X-Git-Url: http://pileus.org/git/?p=aweather;a=blobdiff_plain;f=src%2Faweather.c;h=c96cf190f7ff1a4c3c2551c17d1c52bf43a2c580;hp=a2c33c371758c0e60696475b2cf4bfd94095eb50;hb=b2a5589ec7bc4350a62d374deab69e86465f0432;hpb=33ef5e398a91e8eca3c55fdcf78713efeb7fa2a0

diff --git a/src/aweather.c b/src/aweather.c
index a2c33c3..c96cf19 100644
--- a/src/aweather.c
+++ b/src/aweather.c
@@ -1,41 +1,67 @@
 #include <config.h>
 #include <gtk/gtk.h>
+#include <gtk/gtkgl.h>
+#include <gdk/gdkkeysyms.h>
 
-static void hello(GtkWidget *widget, gpointer data)
+#include "cube.h"
+
+static void destroy(GtkWidget *widget, gpointer data)
 {
-	g_print("Hello World\n");
+	gtk_main_quit();
 }
 
 static gboolean delete_event(GtkWidget *widget, GdkEvent *event, gpointer data)
 {
-	g_print("delete event occurred\n");
+	destroy(widget, data);
 	return FALSE;
 }
 
-static void destroy(GtkWidget *widget, gpointer data)
+static gboolean key_press(GtkWidget *widget, GdkEventKey *event, gpointer data)
 {
-	gtk_main_quit();
+	if (event->keyval == GDK_q)
+		destroy(widget, data);
 }
 
 int main(int argc, char *argv[])
 {
-	GtkWidget *window;
-	GtkWidget *button;
 
 	gtk_init(&argc, &argv);
+	gtk_gl_init(&argc, &argv);
+
+	/* Set up window */
+	GtkWidget *window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
+	gtk_window_set_default_size(GTK_WINDOW(window), 800, 600);
+	g_signal_connect(G_OBJECT(window), "delete-event",    G_CALLBACK(delete_event), NULL);
+	g_signal_connect(G_OBJECT(window), "delete-event",    G_CALLBACK(delete_event), NULL);
+	g_signal_connect(G_OBJECT(window), "key-press-event", G_CALLBACK(key_press),    NULL);
+
+	/* Set up layout */
+	GtkWidget *vbox = gtk_vbox_new(FALSE, 0);
+	gtk_container_add(GTK_CONTAINER(window), vbox);
 
-	window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
-	g_signal_connect(G_OBJECT(window), "delete_event", G_CALLBACK(delete_event), NULL);
-	g_signal_connect(G_OBJECT(window), "destroy",      G_CALLBACK(destroy),      NULL);
+	/* Set up menu bar */
+	GtkWidget *menu                = gtk_menu_bar_new();
+	GtkWidget *menu_file           = gtk_menu_item_new_with_label("File");
+	GtkWidget *menu_file_menu      = gtk_menu_new();
+	GtkWidget *menu_file_menu_quit = gtk_menu_item_new_with_label("Quit");
+	gtk_box_pack_start(GTK_BOX(vbox), menu, FALSE, FALSE, 0);
+	gtk_menu_shell_append(GTK_MENU_SHELL(menu), menu_file);
+	gtk_menu_item_set_submenu(GTK_MENU_ITEM(menu_file), menu_file_menu);
+	gtk_menu_shell_append(GTK_MENU_SHELL(menu_file_menu), menu_file_menu_quit);
+	g_signal_connect(G_OBJECT(menu_file_menu_quit), "activate", G_CALLBACK(destroy), NULL);
 
-	gtk_container_set_border_width(GTK_CONTAINER(window), 10);
-	button = gtk_button_new_with_label("Hello World");
-	g_signal_connect(        G_OBJECT(button), "clicked", G_CALLBACK(hello),              NULL);
-	g_signal_connect_swapped(G_OBJECT(button), "clicked", G_CALLBACK(gtk_widget_destroy), G_OBJECT(window));
+	/* Set up darwing area */
+	GtkWidget *drawing = gtk_drawing_area_new();
+	gtk_box_pack_start(GTK_BOX(vbox), drawing, TRUE, TRUE, 0);
+	//gtk_widget_set_events(drawing, GDK_EXPOSURE_MASK); // needed?
+	GdkGLConfig *glconfig = gdk_gl_config_new_by_mode(GDK_GL_MODE_RGB | GDK_GL_MODE_DEPTH | GDK_GL_MODE_DOUBLE);
+	if (!glconfig) g_assert_not_reached();
+	if (!gtk_widget_set_gl_capability(drawing, glconfig, NULL, TRUE, GDK_GL_RGBA_TYPE)) g_assert_not_reached();
+	g_signal_connect(drawing, "configure-event", G_CALLBACK(configure), NULL);
+	g_signal_connect(drawing, "expose-event",    G_CALLBACK(expose),    NULL);
+	g_timeout_add(1000/60, rotate, drawing);
 
-	gtk_container_add(GTK_CONTAINER(window), button);
-	gtk_widget_show(button);
-	gtk_widget_show(window);
+	gtk_widget_show_all(window);
 	gtk_main();
 
 	return 0;