itdominator
/
terminator
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Ctrl-Tab and Ctrl-Shift-Tab are actually valid keybindings. Teach keybindings.py that some items may have more than one keybinding by supporting optional tuples in defaults.

This commit is contained in:
Thomas Hurst 2008-08-23 23:57:51 +01:00
parent f37324303b
commit 0a6acc19dc
2 changed files with 28 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
terminatorlib/config.py
View File

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

48
terminatorlib/keybindings.py
View File

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