Commit e4427251 authored by Sam Lantinga's avatar Sam Lantinga

*** empty log message ***

--HG--
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%40899
parent 17d60ba5
...@@ -472,7 +472,7 @@ void QZ_PumpEvents (_THIS) ...@@ -472,7 +472,7 @@ void QZ_PumpEvents (_THIS)
if ( getenv("SDL_HAS3BUTTONMOUSE") ) { if ( getenv("SDL_HAS3BUTTONMOUSE") ) {
DO_MOUSE_DOWN (SDL_BUTTON_LEFT); DO_MOUSE_DOWN (SDL_BUTTON_LEFT);
} else { } else {
if ( NSControlKeyMask & current_mods ) { if ( NSCommandKeyMask & current_mods ) {
last_virtual_button = SDL_BUTTON_RIGHT; last_virtual_button = SDL_BUTTON_RIGHT;
DO_MOUSE_DOWN (SDL_BUTTON_RIGHT); DO_MOUSE_DOWN (SDL_BUTTON_RIGHT);
} }
...@@ -519,18 +519,7 @@ void QZ_PumpEvents (_THIS) ...@@ -519,18 +519,7 @@ void QZ_PumpEvents (_THIS)
case NSLeftMouseDragged: case NSLeftMouseDragged:
case NSRightMouseDragged: case NSRightMouseDragged:
case NSOtherMouseDragged: /* usually middle mouse dragged */ case NSOtherMouseDragged: /* usually middle mouse dragged */
case NSMouseMoved: case NSMouseMoved:
/* Show the cursor if it was hidden by SDL_ShowCursor() */
/* this is how games I've seen work */
if (!cursor_visible) {
if (!isInGameWin && cursor_hidden) {
ShowCursor();
cursor_hidden = NO;
} else if (isInGameWin && !cursor_hidden) {
HideCursor();
cursor_hidden = YES;
}
}
if ( grab_state == QZ_INVISIBLE_GRAB ) { if ( grab_state == QZ_INVISIBLE_GRAB ) {
/* /*
...@@ -653,6 +642,6 @@ void QZ_PumpEvents (_THIS) ...@@ -653,6 +642,6 @@ void QZ_PumpEvents (_THIS)
/* handle accumulated mouse moved events */ /* handle accumulated mouse moved events */
if (dx != 0 || dy != 0) if (dx != 0 || dy != 0)
SDL_PrivateMouseMotion (0, 1, dx, dy); SDL_PrivateMouseMotion (0, 1, dx, dy);
[ pool release ]; [ pool release ];
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment