Mercurial > sdl-ios-xcode
view src/video/bwindow/SDL_sysmouse.cc @ 172:37e3ca9254c7
Date: Sat, 8 Sep 2001 04:42:23 +0200
From: Max Horn <max@quendi.de>
Subject: SDL/OSX: Joystick; Better key handling
I just finished implementing improved keyhandling for OS X (in fact
the code should be easily ported to the "normal" MacOS part of SDL, I
just had no chance yet). Works like this:
First init the mapping table statically like before. Them, it queries
the OS for the "official" key table, then iterates over all 127
scancode and gets the associates ascii code. It ignores everythng
below 32 (has to, as it would lead to many problems if we did not...
e.g. both ESC and NUM LOCk produce an ascii code 27 on my keyboard),
and all stuff above 127 is mapped to SDLK_WORLD_* simply in the order
it is encountered.
In addition, caps lock is now working, too.
The code work flawless for me, but since I only have one keyboard, I
may have not encountered some serious problem... but I am pretty
confident that it is better than the old code in most cases.
The joystick driver works fine for me, too. I think it can be added
to CVS already. It would simply be helpful if more people would test
it. Hm, I wonder if Maelstrom or GLTron has Joystick support? That
would be a wonderful test application :)
I also took the liberty of modifying some text files like BUGS,
README.CVS, README.MacOSX (which now contains the OS X docs I long
promised)
author | Sam Lantinga <slouken@libsdl.org> |
---|---|
date | Tue, 11 Sep 2001 19:00:18 +0000 |
parents | 74212992fb08 |
children | e8157fcb3114 |
line wrap: on
line source
/* SDL - Simple DirectMedia Layer Copyright (C) 1997, 1998, 1999, 2000, 2001 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@devolution.com */ #ifdef SAVE_RCSID static char rcsid = "@(#) $Id$"; #endif #include <stdlib.h> #include <string.h> #include <AppKit.h> #include <GameKit.h> #include "SDL_error.h" #include "SDL_BWin.h" extern "C" { #include "SDL_sysmouse_c.h" /* Convert bits to padded bytes */ #define PADDED_BITS(bits) ((bits+7)/8) /* The implementation dependent data for the window manager cursor */ struct WMcursor { char *bits; }; /* Can this be done in the BeOS? */ WMcursor *BE_CreateWMCursor(_THIS, Uint8 *data, Uint8 *mask, int w, int h, int hot_x, int hot_y) { WMcursor *cursor; int allowed_x; int allowed_y; int run, pad, i; char *cptr; allowed_x = 16; /* BeOS limitation */ allowed_y = 16; /* BeOS limitation */ if ( (w > allowed_x) || (h > allowed_y) ) { SDL_SetError("Only cursors of dimension (%dx%d) are allowed", allowed_x, allowed_y); return(NULL); } /* Allocate the cursor */ cursor = (WMcursor *)malloc(sizeof(WMcursor)); if ( cursor == NULL ) { SDL_OutOfMemory(); return(NULL); } cursor->bits = (char *)malloc(4+2*((allowed_x/8)*allowed_y)); if ( cursor->bits == NULL ) { free(cursor); SDL_OutOfMemory(); return(NULL); } cursor->bits[0] = allowed_y; /* Size of the cursor */ cursor->bits[1] = 1; /* Bit depth of cursor */ cursor->bits[2] = hot_y; cursor->bits[3] = hot_x; cptr = &cursor->bits[4]; /* Pad out to the normal cursor size */ run = PADDED_BITS(w); pad = PADDED_BITS(allowed_x)-run; for ( i=0; i<h; ++i ) { memcpy(cptr, data, run); memset(cptr+run, 0, pad); data += run; cptr += (run+pad); } for ( ; i<allowed_y; ++i ) { memset(cptr, 0, run+pad); cptr += (run+pad); } for ( i=0; i<h; ++i ) { /* FIXME: The mask should be OR'd with the data to turn inverted color pixels black, since inverted color pixels aren't supported under BeOS. */ memcpy(cptr, mask, run); memset(cptr+run, 0, pad); mask += run; cptr += (run+pad); } for ( ; i<allowed_y; ++i ) { memset(cptr, 0, run+pad); cptr += (run+pad); } return(cursor); } int BE_ShowWMCursor(_THIS, WMcursor *cursor) { if ( be_app->Lock() ) { if ( cursor == NULL ) { if ( SDL_BlankCursor != NULL ) { be_app->SetCursor(SDL_BlankCursor->bits); } } else { be_app->SetCursor(cursor->bits); } be_app->Unlock(); } return(1); } void BE_FreeWMCursor(_THIS, WMcursor *cursor) { free(cursor->bits); free(cursor); } /* Implementation by Christian Bauer <cbauer@student.physik.uni-mainz.de> */ void BE_WarpWMCursor(_THIS, Uint16 x, Uint16 y) { BPoint pt(x, y); SDL_Win->Lock(); SDL_Win->ConvertToScreen(&pt); SDL_Win->Unlock(); set_mouse_position((int32)pt.x, (int32)pt.y); } }; /* Extern C */