Mercurial > sdl-ios-xcode
view src/video/wincommon/SDL_syswm.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 | 51a8702d8ecd |
children | c9b51268668f |
line wrap: on
line source
/* SDL - Simple DirectMedia Layer Copyright (C) 1997, 1998, 1999 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 <stdio.h> #include <malloc.h> #include <windows.h> #include "SDL_version.h" #include "SDL_error.h" #include "SDL_video.h" #include "SDL_syswm.h" #include "SDL_syswm_c.h" #include "SDL_wingl_c.h" #include "SDL_pixels_c.h" #include "SDL_loadso.h" #ifdef _WIN32_WCE #define DISABLE_ICON_SUPPORT #endif /* RJR: March 28, 2000 we need "SDL_cursor_c.h" for mods to WIN_GrabInput */ #include "SDL_cursor_c.h" /* The screen icon -- needs to be freed on SDL_VideoQuit() */ HICON screen_icn = NULL; #ifdef _WIN32_WCE BOOL (WINAPI *CoreCatchInput)(int flag) = NULL; int input_catched = 0; HINSTANCE coredll = NULL; // the same API call that gx.dll does to catch the input void LoadInputCatchFunc() { coredll = SDL_LoadObject("coredll.dll"); if( coredll ) { CoreCatchInput = (int (WINAPI *)(int)) GetProcAddress(coredll, (const unsigned short *) 1453); } } #endif /* Win32 icon mask semantics are different from those of SDL: SDL applies the mask to the icon and copies result to desktop. Win32 applies the mask to the desktop and XORs the icon on. This means that the SDL mask needs to be applied to the icon and then inverted and passed to Win32. */ void WIN_SetWMIcon(_THIS, SDL_Surface *icon, Uint8 *mask) { #ifdef DISABLE_ICON_SUPPORT return; #else SDL_Palette *pal_256; SDL_Surface *icon_256; Uint8 *pdata, *pwin32; Uint8 *mdata, *mwin32, m = 0; int icon_len; int icon_plen; int icon_mlen; int icon_pitch; int mask_pitch; SDL_Rect bounds; int i, skip; int row, col; struct /* quasi-BMP format */ Win32Icon { Uint32 biSize; Sint32 biWidth; Sint32 biHeight; Uint16 biPlanes; Uint16 biBitCount; Uint32 biCompression; Uint32 biSizeImage; Sint32 biXPelsPerMeter; Sint32 biYPelsPerMeter; Uint32 biClrUsed; Uint32 biClrImportant; struct /* RGBQUAD -- note it's BGR ordered */ { Uint8 rgbBlue; Uint8 rgbGreen; Uint8 rgbRed; Uint8 rgbReserved; } biColors[256]; /* Pixels: Uint8 pixels[] */ /* Mask: Uint8 mask[] */ } *icon_win32; /* Allocate the win32 bmp icon and set everything to zero */ icon_pitch = ((icon->w+3)&~3); mask_pitch = ((icon->w+7)/8); icon_plen = icon->h*icon_pitch; icon_mlen = icon->h*mask_pitch; icon_len = sizeof(*icon_win32)+icon_plen+icon_mlen; icon_win32 = (struct Win32Icon *)alloca(icon_len); if ( icon_win32 == NULL ) { return; } memset(icon_win32, 0, icon_len); /* Set the basic BMP parameters */ icon_win32->biSize = sizeof(*icon_win32)-sizeof(icon_win32->biColors); icon_win32->biWidth = icon->w; icon_win32->biHeight = icon->h*2; icon_win32->biPlanes = 1; icon_win32->biBitCount = 8; icon_win32->biSizeImage = icon_plen+icon_mlen; /* Allocate a standard 256 color icon surface */ icon_256 = SDL_CreateRGBSurface(SDL_SWSURFACE, icon->w, icon->h, icon_win32->biBitCount, 0, 0, 0, 0); if ( icon_256 == NULL ) { return; } pal_256 = icon_256->format->palette; if (icon->format->palette && (icon->format->BitsPerPixel == icon_256->format->BitsPerPixel)){ Uint8 black; memcpy(pal_256->colors, icon->format->palette->colors, pal_256->ncolors*sizeof(SDL_Color)); /* Make sure that 0 is black! */ black = SDL_FindColor(pal_256, 0x00, 0x00, 0x00); pal_256->colors[black] = pal_256->colors[0]; pal_256->colors[0].r = 0x00; pal_256->colors[0].g = 0x00; pal_256->colors[0].b = 0x00; } else { SDL_DitherColors(pal_256->colors, icon_256->format->BitsPerPixel); } /* Now copy color data to the icon BMP */ for ( i=0; i<(1<<icon_win32->biBitCount); ++i ) { icon_win32->biColors[i].rgbRed = pal_256->colors[i].r; icon_win32->biColors[i].rgbGreen = pal_256->colors[i].g; icon_win32->biColors[i].rgbBlue = pal_256->colors[i].b; } /* Convert icon to a standard surface format. This may not always be necessary, as Windows supports a variety of BMP formats, but it greatly simplifies our code. */ bounds.x = 0; bounds.y = 0; bounds.w = icon->w; bounds.h = icon->h; if ( SDL_LowerBlit(icon, &bounds, icon_256, &bounds) < 0 ) { SDL_FreeSurface(icon_256); return; } /* Copy pixels upside-down to icon BMP, masked with the icon mask */ if ( SDL_MUSTLOCK(icon_256) || (icon_256->pitch != icon_pitch) ) { SDL_FreeSurface(icon_256); SDL_SetError("Warning: Unexpected icon_256 characteristics"); return; } pdata = (Uint8 *)icon_256->pixels; mdata = mask; pwin32 = (Uint8 *)icon_win32+sizeof(*icon_win32)+icon_plen-icon_pitch; skip = icon_pitch - icon->w; for ( row=0; row<icon->h; ++row ) { for ( col=0; col<icon->w; ++col ) { if ( (col%8) == 0 ) { m = *mdata++; } if ( (m&0x80) != 0x00 ) { *pwin32 = *pdata; } m <<= 1; ++pdata; ++pwin32; } pdata += skip; pwin32 += skip; pwin32 -= 2*icon_pitch; } SDL_FreeSurface(icon_256); /* Copy mask inverted and upside-down to icon BMP */ mdata = mask; mwin32 = (Uint8 *)icon_win32 +sizeof(*icon_win32)+icon_plen+icon_mlen-mask_pitch; for ( row=0; row<icon->h; ++row ) { for ( col=0; col<mask_pitch; ++col ) { *mwin32++ = ~*mdata++; } mwin32 -= 2*mask_pitch; } /* Finally, create the icon handle and set the window icon */ screen_icn = CreateIconFromResourceEx((Uint8 *)icon_win32, icon_len, TRUE, 0x00030000, icon->w, icon->h, LR_DEFAULTCOLOR); if ( screen_icn == NULL ) { SDL_SetError("Couldn't create Win32 icon handle"); } else { SetClassLong(SDL_Window, GCL_HICON, (LONG)screen_icn); } #endif /* DISABLE_ICON_SUPPORT */ } void WIN_SetWMCaption(_THIS, const char *title, const char *icon) { #ifdef _WIN32_WCE /* WinCE uses the UNICODE version */ int nLen = strlen(title)+1; LPWSTR lpszW = alloca(nLen*2); MultiByteToWideChar(CP_ACP, 0, title, -1, lpszW, nLen); SetWindowText(SDL_Window, lpszW); #else SetWindowText(SDL_Window, title); #endif } int WIN_IconifyWindow(_THIS) { ShowWindow(SDL_Window, SW_MINIMIZE); return(1); } SDL_GrabMode WIN_GrabInput(_THIS, SDL_GrabMode mode) { if ( mode == SDL_GRAB_OFF ) { ClipCursor(NULL); if ( !(SDL_cursorstate & CURSOR_VISIBLE) ) { /* RJR: March 28, 2000 must be leaving relative mode, move mouse from center of window to where it belongs ... */ POINT pt; int x, y; SDL_GetMouseState(&x,&y); pt.x = x; pt.y = y; ClientToScreen(SDL_Window, &pt); SetCursorPos(pt.x,pt.y); } #ifdef _WIN32_WCE if( input_catched ) { if( !CoreCatchInput ) LoadInputCatchFunc(); if( CoreCatchInput ) CoreCatchInput(0); } #endif } else { ClipCursor(&SDL_bounds); if ( !(SDL_cursorstate & CURSOR_VISIBLE) ) { /* RJR: March 28, 2000 must be entering relative mode, get ready by moving mouse to center of window ... */ POINT pt; pt.x = (SDL_VideoSurface->w/2); pt.y = (SDL_VideoSurface->h/2); ClientToScreen(SDL_Window, &pt); SetCursorPos(pt.x, pt.y); } #ifdef _WIN32_WCE if( !input_catched ) { if( !CoreCatchInput ) LoadInputCatchFunc(); if( CoreCatchInput ) CoreCatchInput(1); } #endif } return(mode); } /* If 'info' is the right version, this function fills it and returns 1. Otherwise, in case of a version mismatch, it returns -1. */ int WIN_GetWMInfo(_THIS, SDL_SysWMinfo *info) { if ( info->version.major <= SDL_MAJOR_VERSION ) { info->window = SDL_Window; if ( SDL_VERSIONNUM(info->version.major, info->version.minor, info->version.patch) >= SDL_VERSIONNUM(1, 2, 5) ) { #ifdef HAVE_OPENGL info->hglrc = GL_hrc; #else info->hglrc = NULL; #endif } return(1); } else { SDL_SetError("Application not compiled with SDL %d.%d\n", SDL_MAJOR_VERSION, SDL_MINOR_VERSION); return(-1); } }