Mercurial > sdl-ios-xcode
view src/video/ataricommon/SDL_atarikeys.h @ 1629:ef4a796e7f24
Fixed bug #55
From Christian Walther:
When writing my patch for #12, I ended up doing all sorts of changes to the way
application/window activating/deactivating is handled in the Quartz backend,
resulting in the attached patch. It does make the code a bit cleaner IMHO, but
as it might be regarded as a case of "if it ain't broken, don't fix it" I'd
like to hear other people's opinion about it. Please shout if some change
strikes you as unnecessary or wrong, and I'll explain the reasons behind it. As
far as I tested it, it does not introduce any new bugs, but I may well have
missed some.
- The most fundamental change (that triggered most of the others) is irrelevant
for the usual single-window SDL applications, it only affects the people who
are crazy enough to display other Cocoa windows alongside the SDL window (I'm
actually doing this currently, although the additional window only displays
debugging info and won't be present in the final product): Before, some things
were done on the application becoming active, some on the window becoming key,
and some on the window becoming main. Conceptually, all these actions belong to
the window becoming key, so that's what I implemented. However, since in a
single-window application these three events always happen together, the
previous implementation "ain't broken".
- This slightly changed the meaning of the SDL_APPMOUSEFOCUS flag from
SDL_GetAppState(): Before, it meant "window is main and mouse is inside window
(or mode is fullscreen)". Now, it means "window is key and mouse is inside
window (or mode is fullscreen)". It makes more sense to me that way. (See
http://developer.apple.com/documentation/Cocoa/Conceptual/WinPanel/Concepts/ChangingMainKeyWindow.html
for a discussion of what key and main windows are.) The other two flags are
unchanged: SDL_APPACTIVE = application is not hidden and window is not
minimized, SDL_APPINPUTFOCUS = window is key (or mode is fullscreen).
- As a side effect, the reorganization fixes the following two issues (and
maybe others) (but they could also be fixed in less invasive ways):
* A regression that was introduced in revision 1.42 of SDL_QuartzVideo.m
(http://libsdl.org/cgi/cvsweb.cgi/SDL12/src/video/quartz/SDL_QuartzVideo.m.diff?r1=1.41&r2=1.42)
(from half-desirable to undesirable behavior):
Situation: While in windowed mode, hide the cursor using
SDL_ShowCursor(SDL_DISABLE), move the mouse outside of the window so that the
cursor becomes visible again, and SDL_SetVideoMode() to a fullscreen mode.
What happened before revision 1.42: The cursor is visible, but becomes
invisible as soon as the mouse is moved (half-desirable).
What happens in revision 1.42 and after (including current CVS): The cursor is
visible and stays visible (undesirable).
What happens after my patch: The cursor is invisible from the beginning
(desirable).
* When the cursor is hidden and grabbed, switch away from the application using
cmd-tab (which ungrabs and makes the cursor visible), move the cursor outside
of the SDL window, then cmd-tab back to the application. In 1.2.8 and in the
current CVS, the cursor is re-grabbed, but it stays visible (immovable in the
middle of the window). With my patch, the cursor is correctly re-grabbed and
hidden. (For some reason, it still doesn't work correctly if you switch back to
the application using the dock instead of cmd-tab. I haven't been able to
figure out why. I can step over [NSCursor hide] being called in the debugger,
but it seems to have no effect.)
- The patch includes my patch for #12 (it was easier to obtain using cvs diff
that way). If you apply both of them, you will end up with 6 duplicate lines in
SDL_QuartzEvents.m.
| author | Sam Lantinga <slouken@libsdl.org> |
|---|---|
| date | Thu, 13 Apr 2006 14:17:48 +0000 |
| parents | c9b51268668f |
| children | 782fd950bd46 a1b03ba2fcd0 |
line wrap: on
line source
/* SDL - Simple DirectMedia Layer Copyright (C) 1997-2006 Sam Lantinga This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation; either version 2.1 of the License, or (at your option) any later version. This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. You should have received a copy of the GNU Lesser General Public License along with this library; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA Sam Lantinga slouken@libsdl.org */ /* * Atari Scancode definitions * * Patrice Mandin */ #ifndef _SDL_ATARIKEYS_H_ #define _SDL_ATARIKEYS_H_ /* --- Keyboard scancodes --- */ /* taken from svgalib/vgakeyboard.h */ #define SCANCODE_ESCAPE 0x01 #define SCANCODE_1 0x02 #define SCANCODE_2 0x03 #define SCANCODE_3 0x04 #define SCANCODE_4 0x05 #define SCANCODE_5 0x06 #define SCANCODE_6 0x07 #define SCANCODE_7 0x08 #define SCANCODE_8 0x09 #define SCANCODE_9 0x0a #define SCANCODE_0 0x0b #define SCANCODE_MINUS 0x0c #define SCANCODE_EQUAL 0x0d #define SCANCODE_BACKSPACE 0x0e #define SCANCODE_TAB 0x0f #define SCANCODE_Q 0x10 #define SCANCODE_W 0x11 #define SCANCODE_E 0x12 #define SCANCODE_R 0x13 #define SCANCODE_T 0x14 #define SCANCODE_Y 0x15 #define SCANCODE_U 0x16 #define SCANCODE_I 0x17 #define SCANCODE_O 0x18 #define SCANCODE_P 0x19 #define SCANCODE_BRACKET_LEFT 0x1a #define SCANCODE_BRACKET_RIGHT 0x1b #define SCANCODE_ENTER 0x1c #define SCANCODE_DELETE 0x53 #define SCANCODE_LEFTCONTROL 0x1d #define SCANCODE_A 0x1e #define SCANCODE_S 0x1f #define SCANCODE_D 0x20 #define SCANCODE_F 0x21 #define SCANCODE_G 0x22 #define SCANCODE_H 0x23 #define SCANCODE_J 0x24 #define SCANCODE_K 0x25 #define SCANCODE_L 0x26 #define SCANCODE_SEMICOLON 0x27 #define SCANCODE_APOSTROPHE 0x28 #define SCANCODE_GRAVE 0x29 #define SCANCODE_LEFTSHIFT 0x2a #define SCANCODE_BACKSLASH 0x2b #define SCANCODE_Z 0x2c #define SCANCODE_X 0x2d #define SCANCODE_C 0x2e #define SCANCODE_V 0x2f #define SCANCODE_B 0x30 #define SCANCODE_N 0x31 #define SCANCODE_M 0x32 #define SCANCODE_COMMA 0x33 #define SCANCODE_PERIOD 0x34 #define SCANCODE_SLASH 0x35 #define SCANCODE_RIGHTSHIFT 0x36 #define SCANCODE_LEFTALT 0x38 #define SCANCODE_SPACE 0x39 #define SCANCODE_CAPSLOCK 0x3a /* Functions keys */ #define SCANCODE_F1 0x3b #define SCANCODE_F2 0x3c #define SCANCODE_F3 0x3d #define SCANCODE_F4 0x3e #define SCANCODE_F5 0x3f #define SCANCODE_F6 0x40 #define SCANCODE_F7 0x41 #define SCANCODE_F8 0x42 #define SCANCODE_F9 0x43 #define SCANCODE_F10 0x44 /* Numeric keypad */ #define SCANCODE_KP0 0x70 #define SCANCODE_KP1 0x6d #define SCANCODE_KP2 0x6e #define SCANCODE_KP3 0x6f #define SCANCODE_KP4 0x6a #define SCANCODE_KP5 0x6b #define SCANCODE_KP6 0x6c #define SCANCODE_KP7 0x67 #define SCANCODE_KP8 0x68 #define SCANCODE_KP9 0x69 #define SCANCODE_KP_PERIOD 0x71 #define SCANCODE_KP_DIVIDE 0x65 #define SCANCODE_KP_MULTIPLY 0x66 #define SCANCODE_KP_MINUS 0x4a #define SCANCODE_KP_PLUS 0x4e #define SCANCODE_KP_ENTER 0x72 #define SCANCODE_KP_LEFTPAREN 0x63 #define SCANCODE_KP_RIGHTPAREN 0x64 /* Cursor keypad */ #define SCANCODE_HELP 0x62 #define SCANCODE_UNDO 0x61 #define SCANCODE_INSERT 0x52 #define SCANCODE_CLRHOME 0x47 #define SCANCODE_UP 0x48 #define SCANCODE_DOWN 0x50 #define SCANCODE_RIGHT 0x4d #define SCANCODE_LEFT 0x4b #endif /* _SDL_ATARIKEYS_H_ */