Merge lp:~skeuchel/terminator/hyper-modifier into lp:terminator/trunk

[Steven Keuchel]

This patch add hyper to the list of recognized modifiers. To test:

1. Map e.g. CapsLock to Hyper_L

  $ xmodmap -e 'clear lock'
  $ xmodmap -e 'keycode 66 = Hyper_L'
  $ xmodmap -e 'add mod3 = Hyper_L'

2. Assign a keybinding using the Hyper modifier.
3. Restart terminator
3.1 Before the patch you get

  $ /usr/bin/terminator -d 2>&1 | grep keybind
  ConfigBase::load: ConfigBase::load: Processing section: keybindings
  keybindings.reload failed to parse binding '<Hyper>0': Unhandled modifier '<Hyper>'

  And terminator's preferences show the keybinding as 'Disabled'.

3.2 After the patch you only get the first info
  $ terminator -d 2>&1 | grep keybind
  ConfigBase::load: ConfigBase::load: Processing section: keybindings

  And the preferences show the keybindings just fine.

[Stephen Boddy (stephen-j-boddy)]

Approved. However it was added to the gtk3 branch, not the old gtk2 trunk.

review: Approve

=== modified file 'terminatorlib/keybindings.py'
--- terminatorlib/keybindings.py	2012-05-16 23:08:38 +0000
+++ terminatorlib/keybindings.py	2016-01-26 00:36:00 +0000
@@ -40,6 +40,7 @@
         'shift':    gtk.gdk.SHIFT_MASK,
         'alt':      gtk.gdk.MOD1_MASK,
         'super':    gtk.gdk.SUPER_MASK,
+        'hyper':    gtk.gdk.HYPER_MASK,
     }
 
     empty = {}