Skip to content

V
vlc-2-2
Commit be672335 authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont
Browse files
Options

XCB/globalhostkeys: add support for meta modifier

parent d373cb8d
Hide whitespace changes
Inline Side-by-side
Showing with 8 additions and 3 deletions
modules/control/globalhotkeys/xcb.c
View file @ be672335
...@@ -237,12 +237,17 @@ static unsigned GetX11Modifier( xcb_connection_t *p_connection, ...@@ -237,12 +237,17 @@ static unsigned GetX11Modifier( xcb_connection_t *p_connection,
if( i_vlc & KEY_MODIFIER_ALT ) if( i_vlc & KEY_MODIFIER_ALT )
i_mask |= GetModifier( p_connection, p_symbols, XK_Alt_L ) | i_mask |= GetModifier( p_connection, p_symbols, XK_Alt_L ) |
GetModifier( p_connection, p_symbols, XK_Alt_R ); 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 ) if( i_vlc & KEY_MODIFIER_SHIFT )
i_mask |= GetModifier( p_connection, p_symbols, XK_Shift_L ) | i_mask |= GetModifier( p_connection, p_symbols, XK_Shift_L ) |
GetModifier( p_connection, p_symbols, XK_Shift_R ); 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; return i_mask;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment