1 files changed, 64 insertions, 4 deletions

diff --git a/viz/viewer.py b/viz/viewer.py
index a7871a7..ee5c230 100644
--- a/viz/viewer.py
+++ b/viz/viewer.py
@@ -25,7 +25,7 @@ class GraphContextMenu(gtk.Menu):
             item.show()
             
 class GraphArea(gtk.DrawingArea):
-    HORIZ_PAGE_SCROLL_FACTOR = 4.8
+    HORIZ_PAGE_SCROLL_FACTOR = 10.8
     HORIZ_STEP_SCROLL_FACTOR = 0.8
     VERT_PAGE_SCROLL_FACTOR = 3.0
     VERT_STEP_SCROLL_FACTOR = 0.5
@@ -75,7 +75,13 @@ class GraphArea(gtk.DrawingArea):
             ctx.set_line_width(thickness)
             ctx.set_source_rgb(color[0], color[1], color[2])
             ctx.stroke()
+    
+    def get_renderer(self):
+        return self.renderer
         
+    def get_graph(self):
+        return self.renderer.get_graph()
+            
     def set_scroll_adjustments(self, widget, horizontal, vertical, data=None):
         graph = self.renderer.get_graph()
         width = graph.get_width()
@@ -243,10 +249,60 @@ class GraphWindow(gtk.ScrolledWindow):
     def __init__(self, renderer):
         super(GraphWindow, self).__init__(None, None)
         
+        self.add_events(gtk.gdk.KEY_PRESS_MASK)
+        
+        self.ctr = 0
+        self.connect('key-press-event', self.key_press)
+                                
         self.garea = GraphArea(renderer)
         self.add(self.garea)
         self.garea.show()
     
+    def key_press(self, widget, key_event):
+        hadj = self.get_hadjustment()
+        vadj = self.get_vadjustment()
+        if hadj is None or vadj is None:
+            return
+            
+        hupper = hadj.get_upper()
+        hlower = hadj.get_lower()
+        hpincr = hadj.get_page_increment()
+        hsincr = hadj.get_step_increment()
+        hpsize = hadj.get_page_size()
+        hval = hadj.get_value()
+        vupper = vadj.get_upper()
+        vlower = vadj.get_lower()
+        vval = vadj.get_value()
+        vpincr = vadj.get_page_increment()
+        vsincr = vadj.get_step_increment()
+        vpsize = vadj.get_page_size()
+        
+        ctrl_clicked = key_event.state & gtk.gdk.CONTROL_MASK
+        
+        adj_tuple = {'up' :     (vadj, -vsincr, 0, vval, max),
+                     'ctrl-up' :    (vadj, -vpincr, 0, vval, max),
+                     'down' :   (vadj, vsincr, vupper - vpsize, vval, min),
+                     'ctrl-down' :  (vadj, vpincr, vupper - vpsize, vval, min),
+                     'left' :   (hadj, -hsincr, 0, hval, max),
+                     'ctrl-left' :  (hadj, -hpincr, 0, hval, max),
+                     'right' :  (hadj, hsincr, hupper - hpsize, hval, min),
+                     'ctrl-right' : (hadj, hpincr, hupper - hpsize, hval, min)}
+                     
+        keystr = None
+        keymap = {gtk.keysyms.Up : 'up', gtk.keysyms.Down : 'down',
+                  gtk.keysyms.Left : 'left', gtk.keysyms.Right : 'right'}
+        if key_event.keyval in keymap:        
+            keystr = keymap[key_event.keyval]
+                  
+        if ctrl_clicked:
+            keystr = 'ctrl-' + keystr
+            
+        if keystr is not None:
+            adj, inc, lim, val, extr = adj_tuple[keystr]
+            adj.set_value(extr(val + inc, lim))
+            
+        return True
+        
     def get_graph_area(self):
         return self.garea
                         
@@ -320,9 +376,13 @@ class MainWindow(gtk.Window):
             self.notebook.append_page(gwindow, gtk.Label(title))
         
     def switch_page(self, widget, page, page_num):
-        if self.notebook.last_page >= 0:
-            hvalue = self.notebook.get_nth_page(self.notebook.last_page).get_hadjustment().get_value()
-            self.notebook.get_nth_page(page_num).get_hadjustment().set_value(hvalue)
+        if self.notebook.get_nth_page(self.notebook.last_page) is not None:
+            hadj = self.notebook.get_nth_page(self.notebook.last_page).get_hadjustment()
+            old_value = hadj.get_value()
+            old_ofs = self.notebook.get_nth_page(self.notebook.last_page).get_graph_area().get_graph().get_origin()[0]
+            new_ofs = self.notebook.get_nth_page(page_num).get_graph_area().get_graph().get_origin()[0]
+            new_value = old_value - old_ofs + new_ofs
+            hadj.set_value(new_value)
         
         self.notebook.last_page = page_num