joel16/SDL2
1
0
Fork 0
mirror of https://github.com/joel16/SDL2.git synced 2025-03-04 09:27:15 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Date: Fri, 13 Feb 2004 17:03:16 +0100

Browse Source 
From: Max Horn
Subject: Modifier key fix

The internal modifier state can get out of sync with reality. To
trigger this, do for example this:
  1) Launch an SDL app
  2) Alt-click on the desktop (this will hide the SDL app).
  3) Bring the SDL app back to the front
  4) SDL will still think alt is pressed (and as such will treat left
clicks like middle clicks). If you press and release alt, it'll be fine
again.

The attached patch cures this by rechecking the modifier state whenever
we process an event.

--HG--
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%40817
This commit is contained in:
Sam Lantinga 2004-02-13 17:57:16 +00:00
parent 70fe60bc54
commit c5311cee75
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/video/quartz/SDL_QuartzEvents.m
View File

@ -267,6 +267,9 @@ static void QZ_DoModifiers (_THIS, unsigned int newMods) {
int bit; int bit;
SDL_keysym key; SDL_keysym key;
if (current_mods == newMods)
return;
key.scancode = 0; key.scancode = 0;
key.sym = SDLK_UNKNOWN; key.sym = SDLK_UNKNOWN;
key.unicode = 0; key.unicode = 0;
@ -462,6 +465,8 @@ void QZ_PumpEvents (_THIS)
type = [ event type ]; type = [ event type ];
isInGameWin = QZ_IsMouseInWindow (this); isInGameWin = QZ_IsMouseInWindow (this);
QZ_DoModifiers(this, [ event modifierFlags ] );
switch (type) { switch (type) {
case NSLeftMouseDown: case NSLeftMouseDown:
if ( getenv("SDL_HAS3BUTTONMOUSE") ) { if ( getenv("SDL_HAS3BUTTONMOUSE") ) {
@ -613,7 +618,6 @@ void QZ_PumpEvents (_THIS)
QZ_DoKey (this, SDL_PRESSED, event); QZ_DoKey (this, SDL_PRESSED, event);
break; break;
case NSFlagsChanged: case NSFlagsChanged:
QZ_DoModifiers(this, [ event modifierFlags ] );
break; break;
case NSAppKitDefined: case NSAppKitDefined:
switch ( [ event subtype ] ) { switch ( [ event subtype ] ) {

1
src/video/quartz/SDL_QuartzVideo.m
View File

@ -203,6 +203,7 @@ static int QZ_VideoInit (_THIS, SDL_PixelFormat *video_format) {
current_grab_mode = SDL_GRAB_OFF; current_grab_mode = SDL_GRAB_OFF;
cursor_should_be_visible = YES; cursor_should_be_visible = YES;
cursor_visible = YES; cursor_visible = YES;
current_mods = -1;
/* register for sleep notifications so wake from sleep generates SDL_VIDEOEXPOSE */ /* register for sleep notifications so wake from sleep generates SDL_VIDEOEXPOSE */
QZ_RegisterForSleepNotifications (this); QZ_RegisterForSleepNotifications (this);