better modularity, initial support for RSL

[grits] / src / cube.c

diff --git a/src/cube.c b/src/cube.c
index cf01dafbe4c2056d2479f9be262d446fcec16d75..c20f702a1bdfb47a4ed14a6c14237f7f314c028c 100644 (file)
--- a/src/cube.c
+++ b/src/cube.c
@@ -5,6 +5,9 @@
 #include <GL/gl.h>
 #include <math.h>
 
+static gboolean expose(GtkWidget *da, GdkEventExpose *event, gpointer user_data);
+static gboolean rotate(gpointer user_data);
+
 static GtkWidget *rotate_button;
 
 float boxv[][3] = {
@@ -21,20 +24,12 @@ float boxv[][3] = {
 
 static float ang = 30.;
 
-gboolean expose (GtkWidget *da, GdkEventExpose *event, gpointer user_data)
+static gboolean expose(GtkWidget *da, GdkEventExpose *event, gpointer user_data)
 {
        GdkGLContext *glcontext = gtk_widget_get_gl_context (da);
        GdkGLDrawable *gldrawable = gtk_widget_get_gl_drawable (da);
 
-       // g_print (" :: expose\n");
-
-       if (!gdk_gl_drawable_gl_begin (gldrawable, glcontext))
-       {
-               g_assert_not_reached ();
-       }
-
        /* draw in here */
-       glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
        glPushMatrix();
        
        glRotatef (ang, 1, 0, 1);
@@ -100,41 +95,10 @@ gboolean expose (GtkWidget *da, GdkEventExpose *event, gpointer user_data)
 
        glPopMatrix ();
 
-       if (gdk_gl_drawable_is_double_buffered (gldrawable))
-               gdk_gl_drawable_swap_buffers (gldrawable);
-
-       else
-               glFlush ();
-
-       gdk_gl_drawable_gl_end (gldrawable);
-
-       return TRUE;
-}
-
-gboolean configure(GtkWidget *da, GdkEventConfigure *event, gpointer user_data)
-{
-       GdkGLContext *glcontext = gtk_widget_get_gl_context (da);
-       GdkGLDrawable *gldrawable = gtk_widget_get_gl_drawable (da);
-
-       if (!gdk_gl_drawable_gl_begin (gldrawable, glcontext))
-       {
-               g_assert_not_reached ();
-       }
-
-       glLoadIdentity();
-       glViewport (0, 0, da->allocation.width, da->allocation.height);
-       glOrtho (-10,10,-10,10,-20050,10000);
-       glEnable (GL_BLEND);
-       glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
-
-       glScalef (10., 10., 10.);
-       
-       gdk_gl_drawable_gl_end (gldrawable);
-
-       return TRUE;
+       return FALSE;
 }
 
-gboolean rotate (gpointer user_data)
+static gboolean rotate(gpointer user_data)
 {
        if (!gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(rotate_button)))
                return TRUE;
@@ -157,7 +121,6 @@ gboolean cube_init(GtkDrawingArea *drawing, GtkNotebook *config)
        gtk_notebook_append_page(GTK_NOTEBOOK(config), rotate_button, label);
 
        /* Set up OpenGL Stuff */
-       g_signal_connect(drawing, "configure-event", G_CALLBACK(configure), NULL);
-       g_signal_connect(drawing, "expose-event",    G_CALLBACK(expose),    NULL);
+       g_signal_connect(drawing, "expose-event", G_CALLBACK(expose), NULL);
        g_timeout_add(1000/60, rotate, drawing);
 }