mouse rotation

1 files changed, 13 insertions, 9 deletions

diff --git a/Smoke/gtk.c b/Smoke/gtk.c
index 5c46c96..91c9ea6 100644
--- a/Smoke/gtk.c
+++ b/Smoke/gtk.c
@@ -122,6 +122,7 @@ realize (GtkWidget *widget,
     return;
 
   /*** Fill in the details here. ***/
+  init_gl();
 
   gdk_gl_drawable_gl_end (gldrawable);
   /*** OpenGL END ***/
@@ -277,6 +278,7 @@ motion_notify_event (GtkWidget      *widget,
   if (event->state & GDK_BUTTON2_MASK)
     {
       //g_print (" 2");
+      mouse_rotate((int)event->x, (int)event->y);
     }
 
   if (event->state & GDK_BUTTON3_MASK)
@@ -323,24 +325,28 @@ button_press_event (GtkWidget      *widget,
   
 //  g_print ("%s: \"button_press_event\": ", gtk_widget_get_name (widget));
 
-  if (event->button == 1)
-    {
+  click(event->button, (event->type == GDK_BUTTON_PRESS) ? 0 : 1, (int)event->x, (int)event->y);
+  if (event->button == 1) {
       /*** Fill in the details here. ***/
       //g_print ("button 1\n");
-      // fluids
-      click(1, (event->type == GDK_BUTTON_PRESS) ? 0 : 1, (int)event->x, (int)event->y);
-      // endf
+      //click(event->button, (event->type == GDK_BUTTON_PRESS) ? 0 : 1, (int)event->x, (int)event->y);
 
       return TRUE;
     }
 
-  if (event->button == 2)
-    {
+  if (event->button == 2) {
       /*** Fill in the details here. ***/
       //g_print ("button 2\n");
 
       return TRUE;
     }
+  if (event->button == 3) {
+      /*** Fill in the details here. ***/
+      //g_print ("button 3\n");
+   // click(3, (event->type == GDK_BUTTON_PRESS) ? 0 : 1, (int)event->x, (int)event->y);
+    return TRUE;
+
+  }
 
   //g_print ("\n");
 
@@ -864,8 +870,6 @@ main (int   argc,
   window = create_window (glconfig, field);
   gtk_widget_show (window);
 
-  init_gl();
-
   gtk_main();
 
 //    printf("Colormap RGB: %lf, %lf, %lf\n", 0.2, 0.44, 0.666);