Mercurial > sdl-ios-xcode
view src/video/ataricommon/SDL_ikbdinterrupt.S @ 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 | 99210400e8b9 |
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 */ /* * IKBD 6301 interrupt routine * * Patrice Mandin */ .text .globl _SDL_AtariIkbdInstall .globl _SDL_AtariIkbdUninstall .globl _SDL_AtariIkbd_keyboard .globl _SDL_AtariIkbd_mouseb .globl _SDL_AtariIkbd_mousex .globl _SDL_AtariIkbd_mousey .globl _SDL_AtariIkbd_joystick .globl _SDL_AtariIkbd_enabled /*--- Install our IKBD vector ---*/ _SDL_AtariIkbdInstall: moveml d0-d1/a0-a1,sp@- | Disable interrupts movew #0x2700,sr | Save MFP registers used for keyboard lea 0xfffffa00:w,a0 btst #6,a0@(0x09) sne ikbd_ierb btst #6,a0@(0x15) sne ikbd_imrb | Set our routine movel 0x118:w,old_ikbd movel #ikbd,0x118:w bset #6,0xfffffa09:w | IERB bset #6,0xfffffa15:w | IMRB | Set mouse relative mode moveb #8,0xfffffc02:w | Reenable interrupts movew #0x2300,sr | Interrupts done movew #0xffff,_SDL_AtariIkbd_enabled moveml sp@+,d0-d1/a0-a1 rts /*--- Uninstall our IKBD vector ---*/ _SDL_AtariIkbdUninstall: movel a0,sp@- | Disable interrupts movew #0x2700,sr | Restore previous MFP registers lea 0xfffffa00:w,a0 bclr #6,a0@(0x09) tstb ikbd_ierb beqs ikbd_restoreierb bset #6,a0@(0x09) ikbd_restoreierb: bclr #6,a0@(0x15) tstb ikbd_imrb beqs ikbd_restoreimrb bset #6,a0@(0x15) ikbd_restoreimrb: movel old_ikbd,0x118:w | Clear keyboard buffer lea 0xfffffc00:w,a0 ikbd_videbuffer: btst #0,a0@ beqs ikbd_finbuffer tstb a0@(0x02) bras ikbd_videbuffer ikbd_finbuffer: | Reenable interrupts movew #0x2300,sr movel sp@+,a0 rts .bss .even .comm ikbd_ierb,1 .comm ikbd_imrb,1 /*--- Our custom IKBD vector ---*/ .text .even .ascii "XBRA" .ascii "LSDL" .comm old_ikbd,4*1 ikbd: | Check if source is IKBD or MIDI btst #0,0xfffffc00.w beqs ikbd_oldmidi moveml d0-d1/a0,sp@- moveb 0xfffffc02:w,d0 | Joystick packet ? cmpb #0xff,d0 beqs ikbd_yes_joystick | Mouse packet ? cmpb #0xf8,d0 bmis ikbd_no_mouse cmpb #0xfc,d0 bpls ikbd_no_mouse | Mouse packet, byte #1 ikbd_yes_mouse: andw #3,d0 movew d0,_SDL_AtariIkbd_mouseb movel #ikbd_mousex,0x118:w bras ikbd_endit_stack | Joystick packet, byte #1 ikbd_yes_joystick: movel #ikbd_joystick,0x118:w bras ikbd_endit_stack | Keyboard press/release ikbd_no_mouse: moveb d0,d1 lea _SDL_AtariIkbd_keyboard,a0 andw #0x7f,d1 tas d0 spl a0@(0,d1:w) | End of interrupt ikbd_endit_stack: moveml sp@+,d0-d1/a0 ikbd_endit: bclr #6,0xfffffa11:w rte | Call old MIDI interrupt ikbd_oldmidi: movel old_ikbd,sp@- rts | Mouse packet, byte #2 ikbd_mousex: | Check if source is IKBD or MIDI btst #0,0xfffffc00.w beqs ikbd_oldmidi movew d0,sp@- moveb 0xfffffc02:w,d0 extw d0 addw d0,_SDL_AtariIkbd_mousex movew sp@+,d0 movel #ikbd_mousey,0x118:w bras ikbd_endit | Mouse packet, byte #3 ikbd_mousey: | Check if source is IKBD or MIDI btst #0,0xfffffc00.w beqs ikbd_oldmidi movew d0,sp@- moveb 0xfffffc02:w,d0 extw d0 addw d0,_SDL_AtariIkbd_mousey movew sp@+,d0 movel #ikbd,0x118:w bras ikbd_endit | Joystick packet, byte #2 ikbd_joystick: | Check if source is IKBD or MIDI btst #0,0xfffffc00.w beqs ikbd_oldmidi moveb 0xfffffc02:w,_SDL_AtariIkbd_joystick+1 movel #ikbd,0x118:w bras ikbd_endit .data .even _SDL_AtariIkbd_enabled: .word 0 .bss .even .comm _SDL_AtariIkbd_keyboard,128 .comm _SDL_AtariIkbd_mousex,2 .comm _SDL_AtariIkbd_mousey,2 .comm _SDL_AtariIkbd_mouseb,2 .comm _SDL_AtariIkbd_joystick,2