readding thomas changes

terminatorlib/config.py

@@ -105,8 +105,8 @@ Defaults = {
     'zoom_normal'      : '<Ctrl>0',
     'new_root_tab'     : '<Ctrl><Shift><Alt>T',
     'new_tab'          : '<Ctrl><Shift>T',
-    'go_next'          : '<Ctrl><Shift>N',
-    'go_prev'          : '<Ctrl><Shift>P',
+    'go_next'          : ('<Ctrl><Shift>N','<Ctrl>Tab'),
+    'go_prev'          : ('<Ctrl><Shift>P','<Ctrl><Shift>Tab'),
     'split_horiz'      : '<Ctrl><Shift>O',
     'split_vert'       : '<Ctrl><Shift>E',
     'close_term'       : '<Ctrl><Shift>W',

terminatorlib/keybindings.py

@@ -32,29 +32,33 @@ class TerminatorKeybindings:
   def reload(self):
     self._lookup = {}
     self._masks = 0
-    for action, binding in self.keys.items():
-      try:
-        keyval, mask = self._parsebinding(binding)
-        #keyval, mask = gtk.accelerator_parse(binding)
-        #mask = int(mask)
-      except KeymapError, e:
-        e.action = action
-        raise e
-      else:
-        if mask & gtk.gdk.SHIFT_MASK:
-          if keyval == gtk.keysyms.Tab:
-            keyval = gtk.keysyms.ISO_Left_Tab
-            mask &= ~gtk.gdk.SHIFT_MASK
-          else:
-            keyvals = gtk.gdk.keyval_convert_case(keyval)
-            if keyvals[0] != keyvals[1]:
-              keyval = keyvals[1]
-              mask &= ~gtk.gdk.SHIFT_MASK
+    for action, bindings in self.keys.items():
+      if not isinstance(bindings, tuple):
+        bindings = (bindings,)
+
+      for binding in bindings:
+        try:
+          keyval, mask = self._parsebinding(binding)
+          # Does much the same, but with poorer error handling.
+          #keyval, mask = gtk.accelerator_parse(binding)
+        except KeymapError, e:
+          e.action = action
+          raise e
         else:
-          keyval = gtk.gdk.keyval_to_lower(keyval)
-        self._lookup.setdefault(mask, {})
-        self._lookup[mask][keyval] = action
-        self._masks |= mask
+          if mask & gtk.gdk.SHIFT_MASK:
+            if keyval == gtk.keysyms.Tab:
+              keyval = gtk.keysyms.ISO_Left_Tab
+              mask &= ~gtk.gdk.SHIFT_MASK
+            else:
+              keyvals = gtk.gdk.keyval_convert_case(keyval)
+              if keyvals[0] != keyvals[1]:
+                keyval = keyvals[1]
+                mask &= ~gtk.gdk.SHIFT_MASK
+          else:
+            keyval = gtk.gdk.keyval_to_lower(keyval)
+          self._lookup.setdefault(mask, {})
+          self._lookup[mask][keyval] = action
+          self._masks |= mask
 
   def _parsebinding(self, binding):
     mask = 0

terminatorlib/prefs_profile.py

@@ -29,17 +29,31 @@ class ProfileEditor:
       value = Defaults[key]
       widget = None
 
-      if type == "bool":
-        widget = gtk.CheckButton ()
-        widget.set_active (value)
-      elif type in ["str", "int", "float"]:
-        widget = gtk.Entry ()
-        widget.set_text (str(value))
-      elif type == "list":
-        continue
+      if key == 'font':
+        #widget = gtk.FontSelection()
+        #widget.set_preview_text("Terminator: The robot future of terminals")
+        #widget.set_font_name(value)
+        widget = gtk.FontButton(value)
+      elif key == 'scrollback_lines':
+        # estimated byte size per line according to g-t:
+        # sizeof(void *) + sizeof(char *) + sizeof(int) + (80 * (sizeof(int32) + 4)
+        widget = gtk.SpinButton()
+        widget.set_digits(0)
+        widget.set_increments(100, 1000)
+        widget.set_range(0, 100000)
+        widget.set_value(value)
       else:
-        print "Unknown type: " + type
-        continue
+        if type == "bool":
+          widget = gtk.CheckButton ()
+          widget.set_active (value)
+        elif type in ["str", "int", "float"]:
+          widget = gtk.Entry ()
+          widget.set_text (str(value))
+        elif type == "list":
+          continue
+        else:
+          print "Unknown type: " + type
+          continue
    
       table.attach (label, 0, 1, row, row + 1)
       table.attach (widget, 1, 2, row, row + 1)