[vlc-commits] XCB/globalhostkeys: add support for meta modifier

[Rémi Denis-Courmont]

vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Wed Nov  6 22:30:10 2013 +0200| [be6723352a807f00fb1c4827790c93ba8949735c] | committer: Rémi Denis-Courmont

XCB/globalhostkeys: add support for meta modifier

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=be6723352a807f00fb1c4827790c93ba8949735c
---

 modules/control/globalhotkeys/xcb.c |   11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/modules/control/globalhotkeys/xcb.c b/modules/control/globalhotkeys/xcb.c
index 8a4cca9..c6a43de 100644
--- a/modules/control/globalhotkeys/xcb.c
+++ b/modules/control/globalhotkeys/xcb.c
@@ -237,12 +237,17 @@ static unsigned GetX11Modifier( xcb_connection_t *p_connection,
     if( i_vlc & KEY_MODIFIER_ALT )
         i_mask |= GetModifier( p_connection, p_symbols, XK_Alt_L ) |
                   GetModifier( p_connection, p_symbols, XK_Alt_R );
-    if( i_vlc & KEY_MODIFIER_CTRL )
-        i_mask |= GetModifier( p_connection, p_symbols, XK_Control_L ) |
-                  GetModifier( p_connection, p_symbols, XK_Control_R );
     if( i_vlc & KEY_MODIFIER_SHIFT )
         i_mask |= GetModifier( p_connection, p_symbols, XK_Shift_L ) |
                   GetModifier( p_connection, p_symbols, XK_Shift_R );
+    if( i_vlc & KEY_MODIFIER_CTRL )
+        i_mask |= GetModifier( p_connection, p_symbols, XK_Control_L ) |
+                  GetModifier( p_connection, p_symbols, XK_Control_R );
+    if( i_vlc & KEY_MODIFIER_META )
+        i_mask |= GetModifier( p_connection, p_symbols, XK_Meta_L ) |
+                  GetModifier( p_connection, p_symbols, XK_Meta_R ) |
+                  GetModifier( p_connection, p_symbols, XK_Super_L ) |
+                  GetModifier( p_connection, p_symbols, XK_Super_R );
     return i_mask;
 }