fixes additions etc

1 files changed, 15 insertions, 14 deletions

diff --git a/Smoke/gtk.c b/Smoke/gtk.c
index 9a6ca0e..753409e 100644
--- a/Smoke/gtk.c
+++ b/Smoke/gtk.c
@@ -50,6 +50,7 @@
 #include "fluids.h"
 
 #include "palette.h"
+#include "interact.h"
 #include "renderer_gl.h"
 #include "gtk_main.h"
 #include "gtk_colormap.h"
@@ -122,7 +123,7 @@ realize (GtkWidget *widget,
     return;
 
   /*** Fill in the details here. ***/
-  init_gl();
+  renderer_init_gl();
 
   gdk_gl_drawable_gl_end (gldrawable);
   /*** OpenGL END ***/
@@ -272,13 +273,21 @@ motion_notify_event (GtkWidget      *widget,
   if (event->state & GDK_BUTTON1_MASK)
     {
       //g_print (" 1");
-      drag((int)event->x, (int)event->y);
+      if (event->state & GDK_SHIFT_MASK) {
+        mouse_move((int)event->x, (int)event->y);
+      } else {
+        drag((int)event->x, (int)event->y);
+      }
     }
 
   if (event->state & GDK_BUTTON2_MASK)
     {
       //g_print (" 2");
-      mouse_rotate((int)event->x, (int)event->y);
+      if (event->state & GDK_SHIFT_MASK) {
+        mouse_roll((int)event->x);
+      } else {
+        mouse_rotate((int)event->x, (int)event->y);
+      }
     }
 
   if (event->state & GDK_BUTTON3_MASK)
@@ -305,9 +314,9 @@ scroll_event (GtkWidget      *widget,
   //g_print ("%s: \"scroll_event\": ", gtk_widget_get_name (widget));
   //if (event->state == GDK_ALT) {
   if (event->direction == GDK_SCROLL_UP) {
-    zoom_in(30);
+    renderer_zoom_in(30);
   } else if (event->direction == GDK_SCROLL_DOWN) {
-    zoom_out(30);
+    renderer_zoom_out(30);
   }
 
   return FALSE;
@@ -449,14 +458,6 @@ key_press_event (GtkWidget   *widget,
 //      g_print ("Escape key\n");
       gtk_main_quit ();
       break;
-    
-    case GDK_r:
-        toggle_mouse_rotate();
-        break;
-    
-    case GDK_e:
-        toggle_seed_insert();
-        break;
 
     default:
 //      g_print("\n");
@@ -740,7 +741,7 @@ create_window (GdkGLConfig *glconfig, fftw_real *field)
   settings_notebook = create_divergence_page();
   gtk_box_pack_start(GTK_BOX(hbox), settings_notebook, FALSE, FALSE, 0);
   gtk_widget_show(settings_notebook);
-  settings_notebook = create_isolines_page();
+  settings_notebook = create_flowvis_page();
   gtk_box_pack_start(GTK_BOX(hbox), settings_notebook, FALSE, FALSE, 0);
   gtk_widget_show(settings_notebook);
 #else