Mercurial > sdl-ios-xcode
view src/video/ps2gs/SDL_gsmouse.c @ 1192:54aa9aa32327
To: sdl@libsdl.org
From: Christian Walther <cwalther@gmx.ch>
Date: Fri, 18 Nov 2005 23:39:02 +0100
Subject: [SDL] Mouse position bugs on Mac OS X
The attached patch fixes a few bugs in SDL related to the mouse position
in windowed mode on Mac OS X, reproduced using the attached minimal test
program - at least here on 10.3.9, with SDL CVS from today. Could anyone
test whether the bugs exist and are fixed by the patch on 10.2 and 10.4?
1. When using OpenGL, the vertical mouse positions obtained through
events or SDL_GetMouseState() are off by one.
2. When using OpenGL, SDL_WarpMouse() inverts the y coordinate.
3. Clicks on the topmost pixel row of the window are not recognized.
1 and 2 do not occur in non-OpenGL mode, while 3 does. All three only
occur in windowed mode, not in fullscreen.
The cause for 1 and 3 is that in Cocoa, "the location of the mouse"
seems to be defined as "the location of the top left corner of the mouse
pointer's hot pixel" (this is not documented, it's just what I found out
here), which together with the fact that Cocoa's usual y coordinates
start at the bottom and increase upwards means that the y coordinate of
the mouse runs from 1 to h, not from 0 to h-1, in a window of height h.
If it does work on 10.2 and 10.4 (I'll try to test it as soon as I can,
but at the moment all I have at hand is 10.3.9), can this be applied to
the CVS?
-Christian
To: sdl@libsdl.org
From: Christian Walther <cwalther@gmx.ch>
Date: Mon, 28 Nov 2005 10:41:51 +0100
Subject: [SDL] Re: Mouse position bugs on Mac OS X
I wrote:
> I'll try to test it as soon as I can, but at the moment all I have at hand is 10.3.9
So, here are the results of my tests (with patched and unpatched
frameworks compiled with Xcode 1.5 (gcc 3.3) on 10.3.9):
On 10.1.5, my test program doesn't run because of "Undefined symbols:
SDL undefined reference to _CGMainDisplayID expected to be defined in
Carbon". I guess not supporting 10.1 was a deliberate decision then and
that's OK with me.
On 10.2.8, 10.3.9, and 10.4.0, the bugs exist as described in my
original post and are fixed by my patch. That is, there is no difference
between pre/post 10.3 and the patched version works correctly in all
combinations of GL/non-GL and windowed/fullscreen.
I therefore recommend the patch for inclusion.
-Christian
author | Ryan C. Gordon <icculus@icculus.org> |
---|---|
date | Mon, 28 Nov 2005 13:58:26 +0000 |
parents | e8157fcb3114 |
children | c9b51268668f |
line wrap: on
line source
/* SDL - Simple DirectMedia Layer Copyright (C) 1997, 1998, 1999, 2000 Sam Lantinga This library is free software; you can redistribute it and/or modify it under the terms of the GNU Library General Public License as published by the Free Software Foundation; either version 2 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 Library General Public License for more details. You should have received a copy of the GNU Library General Public License along with this library; if not, write to the Free Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA Sam Lantinga slouken@libsdl.org */ #ifdef SAVE_RCSID static char rcsid = "@(#) $Id$"; #endif #include <stdlib.h> #include <stdio.h> #include <sys/ioctl.h> #include "SDL_error.h" #include "SDL_mouse.h" #include "SDL_events_c.h" #include "SDL_cursor_c.h" #include "SDL_gsvideo.h" #include "SDL_gsmouse_c.h" /* The implementation dependent data for the window manager cursor */ struct WMcursor { int unused; }; /* There isn't any implementation dependent data */ void GS_FreeWMCursor(_THIS, WMcursor *cursor) { return; } /* There isn't any implementation dependent data */ WMcursor *GS_CreateWMCursor(_THIS, Uint8 *data, Uint8 *mask, int w, int h, int hot_x, int hot_y) { return((WMcursor *)0x01); } static void GS_MoveCursor(_THIS, SDL_Cursor *cursor, int x, int y) { SDL_Surface *screen; struct ps2_image image; SDL_Rect area; int mouse_y1, mouse_y2; void *saved_pixels; int screen_updated; /* Lock so we don't interrupt an update with mouse motion */ SDL_LockCursor(); /* Make sure any pending DMA has completed */ if ( dma_pending ) { ioctl(console_fd, PS2IOC_SENDQCT, 1); dma_pending = 0; } /* Remove the cursor image from the DMA area */ screen = this->screen; saved_pixels = screen->pixels; screen->pixels = mapped_mem + screen->offset; screen_updated = 0; if ( cursor_drawn ) { SDL_EraseCursorNoLock(screen); cursor_drawn = 0; screen_updated = 1; } /* Save the current mouse area */ SDL_MouseRect(&area); mouse_y1 = area.y; mouse_y2 = area.y+area.h; /* Only draw the new cursor if there was one passed in */ if ( cursor ) { /* Set the new location */ cursor->area.x = (x - cursor->hot_x); cursor->area.y = (y - cursor->hot_y); /* Draw the cursor at the new location */ if ( (SDL_cursorstate & CURSOR_VISIBLE) && screen->pixels ) { SDL_DrawCursorNoLock(screen); cursor_drawn = 1; screen_updated = 1; } } screen->pixels = saved_pixels; /* Update the affected area of the screen */ if ( screen_updated ) { SDL_MouseRect(&area); if ( area.y < mouse_y1 ) { mouse_y1 = area.y; } if ( (area.y+area.h) > mouse_y2 ) { mouse_y2 = area.y+area.h; } image = screen_image; image.y += screen->offset / screen->pitch + mouse_y1; image.h = mouse_y2 - mouse_y1; image.ptr = mapped_mem + (image.y - screen_image.y) * screen->pitch; ioctl(console_fd, PS2IOC_LOADIMAGE, &image); /* Need to scale offscreen image to TV output */ if ( image.y > 0 ) { scaleimage_nonblock(console_fd, tex_tags_mem, scale_tags_mem); } } /* We're finished */ SDL_UnlockCursor(); } void GS_MoveWMCursor(_THIS, int x, int y) { GS_MoveCursor(this, SDL_cursor, x, y); } int GS_ShowWMCursor(_THIS, WMcursor *wmcursor) { SDL_Cursor *cursor; int x, y; /* Draw the cursor at the appropriate location */ SDL_GetMouseState(&x, &y); if ( wmcursor ) { cursor = SDL_cursor; } else { cursor = NULL; } GS_MoveCursor(this, cursor, x, y); return(1); }