[vlc-devel] commit: Revert "xcb hotkeys: Cherry pick [25cd592]" ( Rafaël Carré )

[git version control]

vlc | branch: 1.0-bugfix | Rafaël Carré <rafael.carre at gmail.com> | Mon Nov 16 22:14:16 2009 +0100| [d5c210e768146dd11eacaa225bdb157182a9f334] | committer: Rafaël Carré 

Revert "xcb hotkeys: Cherry pick [25cd592]"

This reverts commit a3ed7240100c5d897c05f37ad25ec23d54f33439.

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

 modules/control/globalhotkeys/xcb.c |    9 +++++----
 1 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/modules/control/globalhotkeys/xcb.c b/modules/control/globalhotkeys/xcb.c
index 356f233..4b1c45d 100644
--- a/modules/control/globalhotkeys/xcb.c
+++ b/modules/control/globalhotkeys/xcb.c
@@ -274,6 +274,7 @@ static const struct
 
     { XK_Return, KEY_ENTER },
     { XK_KP_Enter, KEY_ENTER },
+    { XK_space, KEY_SPACE },
     { XK_Escape, KEY_ESC },
 
     { XK_Menu, KEY_MENU },
@@ -301,16 +302,16 @@ static const struct
 };
 static xcb_keysym_t GetX11Key( unsigned i_vlc )
 {
-    /* X11 and VLC use ASCII for printable ASCII characters */
-    if( i_vlc >= 32 && i_vlc <= 127 )
-        return i_vlc;
-
     for( int i = 0; x11keys_to_vlckeys[i].i_vlc != 0; i++ )
     {
         if( x11keys_to_vlckeys[i].i_vlc == i_vlc )
             return x11keys_to_vlckeys[i].i_x11;
     }
 
+    /* Copied from xcb, it seems that xcb use ascii code for ascii characters */
+    if( isascii( i_vlc ) )
+        return i_vlc;
+
     return XK_VoidSymbol;
 }