Mercurial > sdl-ios-xcode
view src/video/wincommon/SDL_syswm.c @ 934:af585d6efec8
Date: Thu, 17 Jun 2004 11:38:51 -0700 (PDT)
From: Eric Wing <ewing2121@yahoo.com>
Subject: New OS X patch (was Re: [SDL] Bug with inverted mouse coordinates in
I have a new patch for OS X I would like to submit.
First, it appears no further action has been taken on
my fix from Apple on the OpenGL windowed mode mouse
inversion problem. The fix would reunify the code, and
no longer require case checking for which version of
the OS you are running. This is probably a good fix
because the behavior with the old code could change
again with future versions of the OS, so those fixes
are included in this new patch.
But in addition, when I was at Apple, I asked them
about the ability to distinguish between the modifier
keys on the left and right sides of the keyboard (e.g.
Left Shift, Right Shift, Left/Right Alt, L/R Cmd, L/R
Ctrl). They told me that starting with Panther, the OS
began supporting this feature. This has always been a
source of annoyance for me when bringing a program
that comes from Windows or Linux to OS X when the
keybindings happened to need distinguishable left-side
and right-side keys. So the rest of the patch I am
submitting contains new code to support this feature
on Panther (and presumably later versions of the OS).
So after removing the OS version checks for the mouse
inversion problem, I reused the OS version checks to
activate the Left/Right detection of modifier keys. If
you are running Panther (or above), the new code will
attempt to distinguish between sides. For the older
OS's, the code path reverts to the original code.
I've tested with Panther on a G4 Cube, G5 dual
processor, and Powerbook Rev C. The Cube and G5
keyboards demonstrated the ability to distinguish
between sides. The Powerbook seems to only have
left-side keys, but the patch was still able to handle
it by producing the same results as before the patch.
I also wanted to test a non-Apple keyboard.
Unfortunately, I don't have any PC USB keyboards.
However, I was able to borrow a Sun Microsystems USB
keyboard, so I tried that out on the G5, and I got the
correct behavior for left and right sides. I'm
expecting that if it worked with a Sun keyboard, most
other keyboards should work with no problems.
author | Sam Lantinga <slouken@libsdl.org> |
---|---|
date | Fri, 20 Aug 2004 22:35:23 +0000 |
parents | 3ac8344e3872 |
children | 51a8702d8ecd |
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" #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; /* 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); } } 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); } } 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); } }