got levels working, plus faster

[grits] / src / aweather.c

diff --git a/src/aweather.c b/src/aweather.c
index c96cf190f7ff1a4c3c2551c17d1c52bf43a2c580..58fc7a857784a7fa7d5ef2970c5cbe9fc724a4f6 100644 (file)
--- a/src/aweather.c
+++ b/src/aweather.c
@@ -32,12 +32,13 @@ int main(int argc, char *argv[])
        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);
+       GtkWidget *paned = gtk_vpaned_new();
+       gtk_box_pack_end(GTK_BOX(vbox), paned, TRUE, TRUE, 0);
 
        /* Set up menu bar */
        GtkWidget *menu                = gtk_menu_bar_new();
@@ -52,14 +53,24 @@ int main(int argc, char *argv[])
 
        /* 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?
+       gtk_paned_pack1(GTK_PANED(paned), drawing, TRUE, FALSE);
+       //gtk_box_pack_end(GTK_BOX(vbox), drawing, TRUE, TRUE, 0);
        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);
+
+       /* Set up tab area */
+       GtkWidget *tab_area = gtk_notebook_new();
+       gtk_notebook_set_tab_pos(GTK_NOTEBOOK(tab_area), GTK_POS_BOTTOM);
+       gtk_paned_pack2(GTK_PANED(paned), tab_area, FALSE, FALSE);
+       //GtkWidget *label = gtk_label_new("Hello");
+       //GtkWidget *contents = gtk_label_new("World");
+       //gtk_notebook_append_page(GTK_NOTEBOOK(tab_area), contents, label);
+
+       /* Load plugins */
+       opengl_init(GTK_DRAWING_AREA(drawing), GTK_NOTEBOOK(tab_area));
+       radar_init (GTK_DRAWING_AREA(drawing), GTK_NOTEBOOK(tab_area));
+       cube_init  (GTK_DRAWING_AREA(drawing), GTK_NOTEBOOK(tab_area));
 
        gtk_widget_show_all(window);
        gtk_main();