]> de.git.xonotic.org Git - xonotic/darkplaces.git/commitdiff
Whoops, fix some stupidity on my part, should work better.
authorwarp <warp@d7cf8633-e32d-0410-b094-e92efae38249>
Sun, 12 Oct 2003 09:05:19 +0000 (09:05 +0000)
committerwarp <warp@d7cf8633-e32d-0410-b094-e92efae38249>
Sun, 12 Oct 2003 09:05:19 +0000 (09:05 +0000)
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@3581 d7cf8633-e32d-0410-b094-e92efae38249

keys.c
vid_glx.c

diff --git a/keys.c b/keys.c
index 02a3f8080b13986014b2967a38ee5aa28e3f4429..1e2801e2edfd72e92a3894c6e2a2e711dc19f206 100644 (file)
--- a/keys.c
+++ b/keys.c
@@ -18,6 +18,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 */
 #include "quakedef.h"
+#include <ctype.h>
 
 /*
 
@@ -515,7 +516,7 @@ int Key_StringToKeynum (const char *str)
        if (!str || !str[0])
                return -1;
        if (!str[1])
-               return str[0];
+               return tolower(str[0]);
 
        for (kn=keynames ; kn->name ; kn++)
                if (!strcasecmp(str,kn->name))
index edcfbe623ce023762b9ee0695c57892525835036..1e5bb3a9b5b748216ef8867c2cea0bd7b0b2d9ae 100644 (file)
--- a/vid_glx.c
+++ b/vid_glx.c
@@ -205,6 +205,14 @@ static int XLateKey(XKeyEvent *ev, char *ascii)
                case XK_KP_Divide: key = K_KP_SLASH; break;
 
                default:
+                       if (keysym < 32 && keysym > 126)
+                               break;
+
+                       if (keysym >= 'A' && keysym <= 'Z')
+                               key = keysym - 'A' + 'a';
+                       else
+                               key = keysym;
+
                        break;
        }