sdl-ios-xcode: src/video/cocoa/SDL_cocoakeyboard.m comparison

comparison src/video/cocoa/SDL_cocoakeyboard.m @ 4565:e2d46c5c7483

Fixed key repeat detection on X11, and simplified the code for everyone else.

author	Sam Lantinga <slouken@libsdl.org>
date	Wed, 21 Jul 2010 21:47:12 -0700
parents	95352c671a6e
children	8c229370ddba

comparison

equal deleted inserted replaced

-:ffd169948438
+:e2d46c5c7483
 newMask = newMods & bit;
 if (oldMask && oldMask != newMask) {        /* modifier up event */
 /* If this was Caps Lock, we need some additional voodoo to make SDL happy */
 if (bit == NSAlphaShiftKeyMask) {
-SDL_SendKeyboardKey(SDL_PRESSED, mapping[i], SDL_FALSE);
+SDL_SendKeyboardKey(SDL_PRESSED, mapping[i]);
 }
-SDL_SendKeyboardKey(SDL_RELEASED, mapping[i], SDL_FALSE);
+SDL_SendKeyboardKey(SDL_RELEASED, mapping[i]);
 } else if (newMask && oldMask != newMask) { /* modifier down event */
-SDL_SendKeyboardKey(SDL_PRESSED, mapping[i], SDL_FALSE);
+SDL_SendKeyboardKey(SDL_PRESSED, mapping[i]);
 /* If this was Caps Lock, we need some additional voodoo to make SDL happy */
 if (bit == NSAlphaShiftKeyMask) {
-SDL_SendKeyboardKey(SDL_RELEASED, mapping[i], SDL_FALSE);
+SDL_SendKeyboardKey(SDL_RELEASED, mapping[i]);
 }
 }
 }
 }
 */
 oldMask = oldMods & device_independent_mask;
 newMask = newMods & device_independent_mask;
 if (oldMask && oldMask != newMask) {
-SDL_SendKeyboardKey(SDL_RELEASED, scancode, SDL_FALSE);
+SDL_SendKeyboardKey(SDL_RELEASED, scancode);
 } else if (newMask && oldMask != newMask) {
-SDL_SendKeyboardKey(SDL_PRESSED, scancode, SDL_FALSE);
+SDL_SendKeyboardKey(SDL_PRESSED, scancode);
 }
 }
 /* This is a helper function for HandleModifierSide.
 * This function sets the actual SDL_PrivateKeyboard event.
 /* We now know that this side bit flipped. But we don't know if
 * it went pressed to released or released to pressed, so we must
 * find out which it is.
 */
 if (new_dep_mask && old_dep_mask != new_dep_mask) {
-SDL_SendKeyboardKey(SDL_PRESSED, scancode, SDL_FALSE);
+SDL_SendKeyboardKey(SDL_PRESSED, scancode);
 } else {
-SDL_SendKeyboardKey(SDL_RELEASED, scancode, SDL_FALSE);
+SDL_SendKeyboardKey(SDL_RELEASED, scancode);
 }
 }
 /* This is a helper function for DoSidedModifiers.
 * This function will figure out if the modifier key is the left or right side,
 */
 if ((device_dependent_mask & oldMods) == 0) {
 /* In this case, we can't detect the keyboard, so use the left side
 * to represent both, and release it.
 */
-SDL_SendKeyboardKey(SDL_RELEASED, left_scancode, SDL_FALSE);
+SDL_SendKeyboardKey(SDL_RELEASED, left_scancode);
 return;
 }
 /*
 * This could have been done in an if-else case because at this point,
 * we know that all keys have been released when calling this function.
 * But I'm being paranoid so I want to handle each separately,
 * so I hope this doesn't cause other problems.
 */
 if ( left_device_dependent_mask & oldMods ) {
-SDL_SendKeyboardKey(SDL_RELEASED, left_scancode, SDL_FALSE);
+SDL_SendKeyboardKey(SDL_RELEASED, left_scancode);
 }
 if ( right_device_dependent_mask & oldMods ) {
-SDL_SendKeyboardKey(SDL_RELEASED, right_scancode, SDL_FALSE);
+SDL_SendKeyboardKey(SDL_RELEASED, right_scancode);
 }
 }
 /* This is a helper function for DoSidedModifiers.
 * This function handles the CapsLock case.
 oldMask = oldMods & NSAlphaShiftKeyMask;
 newMask = newMods & NSAlphaShiftKeyMask;
 if (oldMask != newMask) {
-SDL_SendKeyboardKey(SDL_PRESSED, SDL_SCANCODE_CAPSLOCK, SDL_FALSE);
+SDL_SendKeyboardKey(SDL_PRESSED, SDL_SCANCODE_CAPSLOCK);
-SDL_SendKeyboardKey(SDL_RELEASED, SDL_SCANCODE_CAPSLOCK, SDL_FALSE);
+SDL_SendKeyboardKey(SDL_RELEASED, SDL_SCANCODE_CAPSLOCK);
 }
 oldMask = oldMods & NSNumericPadKeyMask;
 newMask = newMods & NSNumericPadKeyMask;
 if (oldMask != newMask) {
-SDL_SendKeyboardKey(SDL_PRESSED, SDL_SCANCODE_NUMLOCKCLEAR, SDL_FALSE);
+SDL_SendKeyboardKey(SDL_PRESSED, SDL_SCANCODE_NUMLOCKCLEAR);
-SDL_SendKeyboardKey(SDL_RELEASED, SDL_SCANCODE_NUMLOCKCLEAR, SDL_FALSE);
+SDL_SendKeyboardKey(SDL_RELEASED, SDL_SCANCODE_NUMLOCKCLEAR);
 }
 }
 /* This function will handle the modifier keys and also determine the
 * correct side of the key.
 Cocoa_HandleKeyEvent(_THIS, NSEvent *event)
 {
 SDL_VideoData *data = (SDL_VideoData *) _this->driverdata;
 unsigned short scancode = [event keyCode];
 SDL_scancode code;
-SDL_bool repeat;
 #if 0
 const char *text;
 #endif
 if ((scancode == 10 || scancode == 50) && KBGetLayoutType(LMGetKbdType()) == kKeyboardISO) {
 code = SDL_SCANCODE_UNKNOWN;
 }
 switch ([event type]) {
 case NSKeyDown:
-repeat = [event isARepeat] ? SDL_TRUE : SDL_FALSE;
+if (![event isARepeat]) {
-if (!repeat) {
 /* See if we need to rebuild the keyboard layout */
 UpdateKeymap(data);
 }
-SDL_SendKeyboardKey(SDL_PRESSED, code, repeat);
+SDL_SendKeyboardKey(SDL_PRESSED, code);
 #if 1
 if (code == SDL_SCANCODE_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>. Mac virtual key code is %d.\n", scancode);
 }
 #endif
 }
 #endif
 }
 break;
 case NSKeyUp:
-SDL_SendKeyboardKey(SDL_RELEASED, code, SDL_FALSE);
+SDL_SendKeyboardKey(SDL_RELEASED, code);
 break;
 case NSFlagsChanged:
 /* FIXME CW 2007-08-14: check if this whole mess that takes up half of this file is really necessary */
 HandleModifiers(_this, scancode, [event modifierFlags]);
 break;

Mercurial > sdl-ios-xcode

comparison src/video/cocoa/SDL_cocoakeyboard.m @ 4565:e2d46c5c7483