Mercurial > sdl-ios-xcode

comparison src/video/maccommon/SDL_macevents.c @ 1621:f12379c41042

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fixes bug #195: The proper name of Apple's operating system is "Mac OS X" not "MacOS X", as can bee seen in many places, for example http://www.apple.com/macosx/). This contrasts the naming of the old operating system, which was called "MacOS" and today is often refered to as "MacOS Classic". The attached patches fixes the misuse of the name "MacOS X" in both the SDL12 and sdlweb CVS modules.
author Sam Lantinga <slouken@libsdl.org>
date Thu, 13 Apr 2006 13:08:26 +0000
parents d910939febfa
children e49147870aac c121d94672cb 0f8a812e2855
comparison
equal deleted inserted replaced
1620:2fe5319df0e1 1621:f12379c41042
208 /* Save state for next time */ 208 /* Save state for next time */
209 last_mods = mod; 209 last_mods = mod;
210 } 210 }
211 211
212 /* Check for normal event keys, but we have to scan the 212 /* Check for normal event keys, but we have to scan the
213 actual keyboard state because on MacOS X a keydown event 213 actual keyboard state because on Mac OS X a keydown event
214 is immediately followed by a keyup event. 214 is immediately followed by a keyup event.
215 */ 215 */
216 GetKeys(keys); 216 GetKeys(keys);
217 if ( (keys[0] != last_keys[0]) || (keys[1] != last_keys[1]) || 217 if ( (keys[0] != last_keys[0]) || (keys[1] != last_keys[1]) ||
218 (keys[2] != last_keys[2]) || (keys[3] != last_keys[3]) ) { 218 (keys[2] != last_keys[2]) || (keys[3] != last_keys[3]) ) {
571 MAC_keymap[MK_RIGHT] = SDLK_RIGHT; 571 MAC_keymap[MK_RIGHT] = SDLK_RIGHT;
572 MAC_keymap[MK_KP0] = SDLK_KP0; 572 MAC_keymap[MK_KP0] = SDLK_KP0;
573 MAC_keymap[MK_KP_PERIOD] = SDLK_KP_PERIOD; 573 MAC_keymap[MK_KP_PERIOD] = SDLK_KP_PERIOD;
574 574
575 #if defined(__APPLE__) && defined(__MACH__) 575 #if defined(__APPLE__) && defined(__MACH__)
576 /* Wierd, these keys are on my iBook under MacOS X 576 /* Wierd, these keys are on my iBook under Mac OS X
577 Note that the left arrow keysym is the same as left ctrl!? 577 Note that the left arrow keysym is the same as left ctrl!?
578 */ 578 */
579 MAC_keymap[MK_IBOOK_ENTER] = SDLK_KP_ENTER; 579 MAC_keymap[MK_IBOOK_ENTER] = SDLK_KP_ENTER;
580 MAC_keymap[MK_IBOOK_RIGHT] = SDLK_RIGHT; 580 MAC_keymap[MK_IBOOK_RIGHT] = SDLK_RIGHT;
581 MAC_keymap[MK_IBOOK_DOWN] = SDLK_DOWN; 581 MAC_keymap[MK_IBOOK_DOWN] = SDLK_DOWN;
582 MAC_keymap[MK_IBOOK_UP] = SDLK_UP; 582 MAC_keymap[MK_IBOOK_UP] = SDLK_UP;
583 MAC_keymap[MK_IBOOK_LEFT] = SDLK_LEFT; 583 MAC_keymap[MK_IBOOK_LEFT] = SDLK_LEFT;
584 #endif /* MacOS X */ 584 #endif /* Mac OS X */
585 585
586 /* Up there we setup a static scancode->keysym map. However, it will not 586 /* Up there we setup a static scancode->keysym map. However, it will not
587 * work very well on international keyboard. Hence we now query MacOS 587 * work very well on international keyboard. Hence we now query MacOS
588 * for its own keymap to adjust our own mapping table. However, this is 588 * for its own keymap to adjust our own mapping table. However, this is
589 * bascially only useful for ascii char keys. This is also the reason 589 * bascially only useful for ascii char keys. This is also the reason