]> git.rm.cloudns.org Git - xonotic/darkplaces.git/commitdiff
add a workaround to make the ^ key work on some X.org systems
authordivverent <divverent@d7cf8633-e32d-0410-b094-e92efae38249>
Sun, 26 Jun 2011 09:09:15 +0000 (09:09 +0000)
committerRudolf Polzer <divVerent@xonotic.org>
Sun, 26 Jun 2011 09:15:11 +0000 (11:15 +0200)
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11217 d7cf8633-e32d-0410-b094-e92efae38249
::stable-branch::merge=61227089d1b7eaf494a1a046081d85c58581951e

vid_glx.c

index 2586beb30311f74697bc0c34d7a0b88ff0b3dfea..9f142bb9a0caf34be92da7fe97f6611d3a111146 100644 (file)
--- a/vid_glx.c
+++ b/vid_glx.c
@@ -278,9 +278,9 @@ static int XLateKey(XKeyEvent *ev, Uchar *ascii)
                case XK_KP_Subtract: key = K_KP_MINUS; break;
                case XK_KP_Divide: key = K_KP_SLASH; break;
 
-               case XK_asciicircum:    key = '^'; break; // for some reason, XLookupString returns "" on this one for Grunt|2
+               case XK_asciicircum:    *ascii = key = '^'; break; // for some reason, XLookupString returns "" on this one for Grunt|2
 
-               case XK_section:        key = '~'; break;
+               case XK_section:        *ascii = key = '~'; break;
 
                default:
                        if (keysym < 32)