r532 - trunk/code/unix

[DONOTREPLY at icculus.org]

Author: tma
Date: 2006-02-04 09:11:53 -0500 (Sat, 04 Feb 2006)
New Revision: 532

Modified:
   trunk/code/unix/sdl_glimp.c
Log:
* Do not cull non-ascii keyboard chars at the SDL level any more, these are
  handled in cl_keys.c. (This fixes ctrl-c not working).


Modified: trunk/code/unix/sdl_glimp.c
===================================================================
--- trunk/code/unix/sdl_glimp.c	2006-02-04 00:28:57 UTC (rev 531)
+++ trunk/code/unix/sdl_glimp.c	2006-02-04 14:11:53 UTC (rev 532)
@@ -252,27 +252,20 @@
   default: break;
   } 
 
-  if (*key == K_BACKSPACE)
-    buf[0] = 8;
-  else
+  if( keysym->unicode <= 127 )  // maps to ASCII?
   {
-    if (keysym->unicode <= 255 && keysym->unicode >= 20)  // maps to ASCII?
-    {
-      char ch = (char) keysym->unicode;
-      if (ch == '~')
-        *key = '~'; // console HACK
+    char ch = (char) keysym->unicode;
+    if (ch == '~')
+      *key = '~'; // console HACK
 
-      // The X11 driver converts to lowercase, but apparently we shouldn't.
-      //  There's possibly somewhere else where they covert back. Passing
-      //  uppercase to the engine works fine and fixes all-lower input.
-      //  (https://bugzilla.icculus.org/show_bug.cgi?id=2364)  --ryan.
-      //else if (ch >= 'A' && ch <= 'Z')
-      //  ch = ch - 'A' + 'a';
+    // The X11 driver converts to lowercase, but apparently we shouldn't.
+    //  There's possibly somewhere else where they covert back. Passing
+    //  uppercase to the engine works fine and fixes all-lower input.
+    //  (https://bugzilla.icculus.org/show_bug.cgi?id=2364)  --ryan.
+    //else if (ch >= 'A' && ch <= 'Z')
+    //  ch = ch - 'A' + 'a';
 
-      buf[0] = ch;
-    }
-    else if(keysym->unicode == 8) // ctrl-h
-      buf[0] = 8;
+    buf[0] = ch;
   }
 
   return buf;