Mercurial > sdl-ios-xcode

changeset 2299:a7cbc25071b6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Enabled key board auto repeat in X11_InitKeyboard.c. Had to add a couple of new Xlib symbols.
author Bob Pendleton <bob@pendleton.com>
date Sat, 12 Jan 2008 18:07:06 +0000
parents 41d2599b7117
children c97ad1abe05b
files src/video/x11/SDL_x11events.c src/video/x11/SDL_x11keyboard.c src/video/x11/SDL_x11sym.h
diffstat 3 files changed, 15 insertions(+), 42 deletions(-) [+]
line wrap: on
line diff
--- a/src/video/x11/SDL_x11events.c	Sat Jan 12 16:56:42 2008 +0000
+++ b/src/video/x11/SDL_x11events.c	Sat Jan 12 18:07:06 2008 +0000
@@ -29,29 +29,6 @@
 #include "SDL_x11video.h"
 #include "../../events/SDL_events_c.h"
 
-
-/* Check to see if this is a repeated key.
-   (idea shamelessly lifted from GII -- thanks guys! :)
- */
-static int
-X11_KeyRepeat(Display * display, XEvent * event)
-{
-    XEvent peekevent;
-    int repeated;
-
-    repeated = 0;
-    if (XPending(display)) {
-        XPeekEvent(display, &peekevent);
-        if ((peekevent.type == KeyPress) &&
-            (peekevent.xkey.keycode == event->xkey.keycode) &&
-            ((peekevent.xkey.time - event->xkey.time) < 2)) {
-            repeated = 1;
-            XNextEvent(display, &peekevent);
-        }
-    }
-    return (repeated);
-}
-
 static void
 X11_DispatchEvent(_THIS)
 {
@@ -194,21 +171,18 @@
 #ifdef DEBUG_XEVENTS
             printf("KeyPress (X11 keycode = 0x%X)\n", xevent.xkey.keycode);
 #endif
-            if (!X11_KeyRepeat(videodata->display, &xevent)) {
-                SDLKey physicalKey = videodata->keyCodeToSDLKTable[keycode];
-                SDL_SendKeyboardKey(videodata->keyboard, SDL_PRESSED,
-                                    (Uint8) keycode, physicalKey);
+            SDLKey physicalKey = videodata->keyCodeToSDLKTable[keycode];
+            SDL_SendKeyboardKey(videodata->keyboard, SDL_PRESSED,
+                                (Uint8) keycode, physicalKey);
 #if 1
-                if (physicalKey == SDLK_UNKNOWN) {
-                    fprintf(stderr,
-                            "The key you just pressed is not recognized by SDL. To help get this fixed, report this to the SDL mailing list <sdl@libsdl.org> or to Christian Walther <cwalther@gmx.ch>. X11 KeyCode is %d, X11 KeySym 0x%X.\n",
-                            (int) keycode,
-                            (unsigned int) XKeycodeToKeysym(videodata->
-                                                            display, keycode,
-                                                            0));
-                }
+            if (physicalKey == SDLK_UNKNOWN) {
+                fprintf(stderr,
+                        "The key you just pressed is not recognized by SDL. To help get this fixed, report this to the SDL mailing list <sdl@libsdl.org> or to Christian Walther <cwalther@gmx.ch>. X11 KeyCode is %d, X11 KeySym 0x%X.\n",
+                        (int) keycode,
+                        (unsigned int) XKeycodeToKeysym(videodata->display,
+                                                        keycode, 0));
+            }
 #endif
-            }
         }
         break;
 
@@ -219,11 +193,6 @@
 #ifdef DEBUG_XEVENTS
             printf("KeyRelease (X11 keycode = 0x%X)\n", xevent.xkey.keycode);
 #endif
-            /* Check to see if this is a repeated key */
-            if (X11_KeyRepeat(videodata->display, &xevent)) {
-                break;
-            }
-
             SDL_SendKeyboardKey(videodata->keyboard, SDL_RELEASED,
                                 (Uint8) keycode,
                                 videodata->keyCodeToSDLKTable[keycode]);
--- a/src/video/x11/SDL_x11keyboard.c	Sat Jan 12 16:56:42 2008 +0000
+++ b/src/video/x11/SDL_x11keyboard.c	Sat Jan 12 18:07:06 2008 +0000
@@ -851,6 +851,8 @@
     int code;
     SDLKey sdlkey;
 
+    XAutoRepeatOn(data->display);
+
     /* A random collection of KeySym/SDLKey pairs that should be valid
        in any keyboard layout (if this isn't the case on yours,
        please adjust). Using XKeysymToKeycode on these KeySyms
@@ -904,7 +906,7 @@
                 "The key codes of your X server are unknown to SDL. Keys may not be recognized properly. To help get this fixed, report this to the SDL mailing list <sdl@libsdl.org> or to Christian Walther <cwalther@gmx.ch>.\n");
 #endif
         data->keyCodeToSDLKTable =
-        SDL_malloc(KeyCodeTableSize * sizeof(SDLKey));
+            SDL_malloc(KeyCodeTableSize * sizeof(SDLKey));
         if (data->keyCodeToSDLKTable == NULL) {
             SDL_OutOfMemory();
             return -1;
--- a/src/video/x11/SDL_x11sym.h	Sat Jan 12 16:56:42 2008 +0000
+++ b/src/video/x11/SDL_x11sym.h	Sat Jan 12 18:07:06 2008 +0000
@@ -29,6 +29,8 @@
 SDL_X11_SYM(XSizeHints*,XAllocSizeHints,(void),(),return)
 SDL_X11_SYM(XStandardColormap *,XAllocStandardColormap,(void),(),return)
 SDL_X11_SYM(XWMHints*,XAllocWMHints,(void),(),return)
+SDL_X11_SYM(int,XAutoRepeatOn,(Display* a),(a),return)
+SDL_X11_SYM(int,XAutoRepeatOff,(Display* a),(a),return)
 SDL_X11_SYM(int,XChangePointerControl,(Display* a,Bool b,Bool c,int d,int e,int f),(a,b,c,d,e,f),return)
 SDL_X11_SYM(int,XChangeProperty,(Display* a,Window b,Atom c,Atom d,int e,int f,_Xconst unsigned char* g,int h),(a,b,c,d,e,f,g,h),return)
 SDL_X11_SYM(int,XChangeWindowAttributes,(Display* a,Window b,unsigned long c,XSetWindowAttributes* d),(a,b,c,d),return)