Date: Sat, 1 Jun 2002 17:56:45 -0500
From: Darrell Walisser <dwaliss1@purdue.edu> Subject: mac patch In this patch: - yuv code - links to QuickTime - tabs -> 4 spaces - mouse events fix - SDLMain path parsing fix - BUGS updates - some miscellaneous docs/comments/code cleanup --HG-- extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%40391
This commit is contained in:
Sam Lantinga
parent
455d014f8a
commit
aba4b443c9
7 changed files with 1207 additions and 904 deletions
8
BUGS
8
BUGS
|
|
@ -72,26 +72,20 @@ MacOS X:
|
||||||
|
|
||||||
Joystick code is not extensively tested yet.
|
Joystick code is not extensively tested yet.
|
||||||
|
|
||||||
Window may not close when unsetting video mode and resetting.
|
|
||||||
|
|
||||||
Resizeable windows aren't implemented yet.
|
Resizeable windows aren't implemented yet.
|
||||||
|
|
||||||
Depth switching for windowed mode isn't implemented yet.
|
Depth switching for windowed mode isn't implemented yet.
|
||||||
|
|
||||||
Palette handling isn't implemented in windowed mode yet.
|
Palette handling isn't implemented in windowed mode yet.
|
||||||
|
|
||||||
Command-line arguments Dialog is not implemented yet.
|
Command-line arguments dialog is not implemented yet.
|
||||||
|
|
||||||
Fullscreen drawing has some artifacts.
|
Fullscreen drawing has some artifacts.
|
||||||
|
|
||||||
Fullscreen window covers *all* other windows - even force quit.
|
|
||||||
|
|
||||||
Fullscreen OpenGL for the software renderer is broken.
|
Fullscreen OpenGL for the software renderer is broken.
|
||||||
|
|
||||||
Some OpenGL parameters are not accounted for, for example color bits customization.
|
Some OpenGL parameters are not accounted for, for example color bits customization.
|
||||||
|
|
||||||
Getting OpenGL context parameters is not implemented.
|
|
||||||
|
|
||||||
Continuous mouse motion perhaps is not as smooth as it should be.
|
Continuous mouse motion perhaps is not as smooth as it should be.
|
||||||
|
|
||||||
SDL_WM_GrabInput() is implemented, but it "freezes" the hardware
|
SDL_WM_GrabInput() is implemented, but it "freezes" the hardware
|
||||||
|
|
|
||||||
|
|
@ -51,24 +51,25 @@ static BOOL gFinderLaunch;
|
||||||
/* Set the working directory to the .app's parent directory */
|
/* Set the working directory to the .app's parent directory */
|
||||||
- (void) setupWorkingDirectory:(BOOL)shouldChdir
|
- (void) setupWorkingDirectory:(BOOL)shouldChdir
|
||||||
{
|
{
|
||||||
char parentdir[MAXPATHLEN];
|
|
||||||
char *c;
|
|
||||||
|
|
||||||
strncpy ( parentdir, gArgv[0], sizeof(parentdir) );
|
|
||||||
c = (char*) parentdir;
|
|
||||||
|
|
||||||
while (*c != '\0') /* go to end */
|
|
||||||
c++;
|
|
||||||
|
|
||||||
while (*c != '/') /* back up to parent */
|
|
||||||
c--;
|
|
||||||
|
|
||||||
*c++ = '\0'; /* cut off last part (binary name) */
|
|
||||||
|
|
||||||
if (shouldChdir)
|
if (shouldChdir)
|
||||||
{
|
{
|
||||||
assert ( chdir (parentdir) == 0 ); /* chdir to the binary app's parent */
|
char parentdir[MAXPATHLEN];
|
||||||
assert ( chdir ("../../../") == 0 ); /* chdir to the .app's parent */
|
char *c;
|
||||||
|
|
||||||
|
strncpy ( parentdir, gArgv[0], sizeof(parentdir) );
|
||||||
|
c = (char*) parentdir;
|
||||||
|
|
||||||
|
while (*c != '\0') /* go to end */
|
||||||
|
c++;
|
||||||
|
|
||||||
|
while (*c != '/') /* back up to parent */
|
||||||
|
c--;
|
||||||
|
|
||||||
|
*c++ = '\0'; /* cut off last part (binary name) */
|
||||||
|
|
||||||
|
assert ( chdir (parentdir) == 0 ); /* chdir to the binary app's parent */
|
||||||
|
assert ( chdir ("../../../") == 0 ); /* chdir to the .app's parent */
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,23 +1,23 @@
|
||||||
/*
|
/*
|
||||||
SDL - Simple DirectMedia Layer
|
SDL - Simple DirectMedia Layer
|
||||||
Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002 Sam Lantinga
|
Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002 Sam Lantinga
|
||||||
|
|
||||||
This library is free software; you can redistribute it and/or
|
This library is free software; you can redistribute it and/or
|
||||||
modify it under the terms of the GNU Library General Public
|
modify it under the terms of the GNU Library General Public
|
||||||
License as published by the Free Software Foundation; either
|
License as published by the Free Software Foundation; either
|
||||||
version 2 of the License, or (at your option) any later version.
|
version 2 of the License, or (at your option) any later version.
|
||||||
|
|
||||||
This library is distributed in the hope that it will be useful,
|
This library is distributed in the hope that it will be useful,
|
||||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||||||
Library General Public License for more details.
|
Library General Public License for more details.
|
||||||
|
|
||||||
You should have received a copy of the GNU Library General Public
|
You should have received a copy of the GNU Library General Public
|
||||||
License along with this library; if not, write to the Free
|
License along with this library; if not, write to the Free
|
||||||
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||||
|
|
||||||
Sam Lantinga
|
Sam Lantinga
|
||||||
slouken@libsdl.org
|
slouken@libsdl.org
|
||||||
*/
|
*/
|
||||||
#include <sys/time.h>
|
#include <sys/time.h>
|
||||||
|
|
||||||
|
|
@ -27,479 +27,473 @@ static SDLKey keymap[256];
|
||||||
static unsigned int currentMods = 0; /* Current keyboard modifiers, to track modifier state */
|
static unsigned int currentMods = 0; /* Current keyboard modifiers, to track modifier state */
|
||||||
static int last_virtual_button = 0; /* Last virtual mouse button pressed */
|
static int last_virtual_button = 0; /* Last virtual mouse button pressed */
|
||||||
|
|
||||||
static void QZ_InitOSKeymap (_THIS) {
|
static void QZ_InitOSKeymap (_THIS) {
|
||||||
const void *KCHRPtr;
|
const void *KCHRPtr;
|
||||||
UInt32 state;
|
UInt32 state;
|
||||||
UInt32 value;
|
UInt32 value;
|
||||||
int i;
|
int i;
|
||||||
int world = SDLK_WORLD_0;
|
int world = SDLK_WORLD_0;
|
||||||
|
|
||||||
for ( i=0; i<SDL_TABLESIZE(keymap); ++i )
|
|
||||||
keymap[i] = SDLK_UNKNOWN;
|
|
||||||
|
|
||||||
/* This keymap is almost exactly the same as the OS 9 one */
|
for ( i=0; i<SDL_TABLESIZE(keymap); ++i )
|
||||||
keymap[QZ_ESCAPE] = SDLK_ESCAPE;
|
keymap[i] = SDLK_UNKNOWN;
|
||||||
keymap[QZ_F1] = SDLK_F1;
|
|
||||||
keymap[QZ_F2] = SDLK_F2;
|
/* This keymap is almost exactly the same as the OS 9 one */
|
||||||
keymap[QZ_F3] = SDLK_F3;
|
keymap[QZ_ESCAPE] = SDLK_ESCAPE;
|
||||||
keymap[QZ_F4] = SDLK_F4;
|
keymap[QZ_F1] = SDLK_F1;
|
||||||
keymap[QZ_F5] = SDLK_F5;
|
keymap[QZ_F2] = SDLK_F2;
|
||||||
keymap[QZ_F6] = SDLK_F6;
|
keymap[QZ_F3] = SDLK_F3;
|
||||||
keymap[QZ_F7] = SDLK_F7;
|
keymap[QZ_F4] = SDLK_F4;
|
||||||
keymap[QZ_F8] = SDLK_F8;
|
keymap[QZ_F5] = SDLK_F5;
|
||||||
keymap[QZ_F9] = SDLK_F9;
|
keymap[QZ_F6] = SDLK_F6;
|
||||||
keymap[QZ_F10] = SDLK_F10;
|
keymap[QZ_F7] = SDLK_F7;
|
||||||
keymap[QZ_F11] = SDLK_F11;
|
keymap[QZ_F8] = SDLK_F8;
|
||||||
keymap[QZ_F12] = SDLK_F12;
|
keymap[QZ_F9] = SDLK_F9;
|
||||||
keymap[QZ_PRINT] = SDLK_PRINT;
|
keymap[QZ_F10] = SDLK_F10;
|
||||||
keymap[QZ_SCROLLOCK] = SDLK_SCROLLOCK;
|
keymap[QZ_F11] = SDLK_F11;
|
||||||
keymap[QZ_PAUSE] = SDLK_PAUSE;
|
keymap[QZ_F12] = SDLK_F12;
|
||||||
keymap[QZ_POWER] = SDLK_POWER;
|
keymap[QZ_PRINT] = SDLK_PRINT;
|
||||||
keymap[QZ_BACKQUOTE] = SDLK_BACKQUOTE;
|
keymap[QZ_SCROLLOCK] = SDLK_SCROLLOCK;
|
||||||
keymap[QZ_1] = SDLK_1;
|
keymap[QZ_PAUSE] = SDLK_PAUSE;
|
||||||
keymap[QZ_2] = SDLK_2;
|
keymap[QZ_POWER] = SDLK_POWER;
|
||||||
keymap[QZ_3] = SDLK_3;
|
keymap[QZ_BACKQUOTE] = SDLK_BACKQUOTE;
|
||||||
keymap[QZ_4] = SDLK_4;
|
keymap[QZ_1] = SDLK_1;
|
||||||
keymap[QZ_5] = SDLK_5;
|
keymap[QZ_2] = SDLK_2;
|
||||||
keymap[QZ_6] = SDLK_6;
|
keymap[QZ_3] = SDLK_3;
|
||||||
keymap[QZ_7] = SDLK_7;
|
keymap[QZ_4] = SDLK_4;
|
||||||
keymap[QZ_8] = SDLK_8;
|
keymap[QZ_5] = SDLK_5;
|
||||||
keymap[QZ_9] = SDLK_9;
|
keymap[QZ_6] = SDLK_6;
|
||||||
keymap[QZ_0] = SDLK_0;
|
keymap[QZ_7] = SDLK_7;
|
||||||
keymap[QZ_MINUS] = SDLK_MINUS;
|
keymap[QZ_8] = SDLK_8;
|
||||||
keymap[QZ_EQUALS] = SDLK_EQUALS;
|
keymap[QZ_9] = SDLK_9;
|
||||||
keymap[QZ_BACKSPACE] = SDLK_BACKSPACE;
|
keymap[QZ_0] = SDLK_0;
|
||||||
keymap[QZ_INSERT] = SDLK_INSERT;
|
keymap[QZ_MINUS] = SDLK_MINUS;
|
||||||
keymap[QZ_HOME] = SDLK_HOME;
|
keymap[QZ_EQUALS] = SDLK_EQUALS;
|
||||||
keymap[QZ_PAGEUP] = SDLK_PAGEUP;
|
keymap[QZ_BACKSPACE] = SDLK_BACKSPACE;
|
||||||
keymap[QZ_NUMLOCK] = SDLK_NUMLOCK;
|
keymap[QZ_INSERT] = SDLK_INSERT;
|
||||||
keymap[QZ_KP_EQUALS] = SDLK_KP_EQUALS;
|
keymap[QZ_HOME] = SDLK_HOME;
|
||||||
keymap[QZ_KP_DIVIDE] = SDLK_KP_DIVIDE;
|
keymap[QZ_PAGEUP] = SDLK_PAGEUP;
|
||||||
keymap[QZ_KP_MULTIPLY] = SDLK_KP_MULTIPLY;
|
keymap[QZ_NUMLOCK] = SDLK_NUMLOCK;
|
||||||
keymap[QZ_TAB] = SDLK_TAB;
|
keymap[QZ_KP_EQUALS] = SDLK_KP_EQUALS;
|
||||||
keymap[QZ_q] = SDLK_q;
|
keymap[QZ_KP_DIVIDE] = SDLK_KP_DIVIDE;
|
||||||
keymap[QZ_w] = SDLK_w;
|
keymap[QZ_KP_MULTIPLY] = SDLK_KP_MULTIPLY;
|
||||||
keymap[QZ_e] = SDLK_e;
|
keymap[QZ_TAB] = SDLK_TAB;
|
||||||
keymap[QZ_r] = SDLK_r;
|
keymap[QZ_q] = SDLK_q;
|
||||||
keymap[QZ_t] = SDLK_t;
|
keymap[QZ_w] = SDLK_w;
|
||||||
keymap[QZ_y] = SDLK_y;
|
keymap[QZ_e] = SDLK_e;
|
||||||
keymap[QZ_u] = SDLK_u;
|
keymap[QZ_r] = SDLK_r;
|
||||||
keymap[QZ_i] = SDLK_i;
|
keymap[QZ_t] = SDLK_t;
|
||||||
keymap[QZ_o] = SDLK_o;
|
keymap[QZ_y] = SDLK_y;
|
||||||
keymap[QZ_p] = SDLK_p;
|
keymap[QZ_u] = SDLK_u;
|
||||||
keymap[QZ_LEFTBRACKET] = SDLK_LEFTBRACKET;
|
keymap[QZ_i] = SDLK_i;
|
||||||
keymap[QZ_RIGHTBRACKET] = SDLK_RIGHTBRACKET;
|
keymap[QZ_o] = SDLK_o;
|
||||||
keymap[QZ_BACKSLASH] = SDLK_BACKSLASH;
|
keymap[QZ_p] = SDLK_p;
|
||||||
keymap[QZ_DELETE] = SDLK_DELETE;
|
keymap[QZ_LEFTBRACKET] = SDLK_LEFTBRACKET;
|
||||||
keymap[QZ_END] = SDLK_END;
|
keymap[QZ_RIGHTBRACKET] = SDLK_RIGHTBRACKET;
|
||||||
keymap[QZ_PAGEDOWN] = SDLK_PAGEDOWN;
|
keymap[QZ_BACKSLASH] = SDLK_BACKSLASH;
|
||||||
keymap[QZ_KP7] = SDLK_KP7;
|
keymap[QZ_DELETE] = SDLK_DELETE;
|
||||||
keymap[QZ_KP8] = SDLK_KP8;
|
keymap[QZ_END] = SDLK_END;
|
||||||
keymap[QZ_KP9] = SDLK_KP9;
|
keymap[QZ_PAGEDOWN] = SDLK_PAGEDOWN;
|
||||||
keymap[QZ_KP_MINUS] = SDLK_KP_MINUS;
|
keymap[QZ_KP7] = SDLK_KP7;
|
||||||
keymap[QZ_CAPSLOCK] = SDLK_CAPSLOCK;
|
keymap[QZ_KP8] = SDLK_KP8;
|
||||||
keymap[QZ_a] = SDLK_a;
|
keymap[QZ_KP9] = SDLK_KP9;
|
||||||
keymap[QZ_s] = SDLK_s;
|
keymap[QZ_KP_MINUS] = SDLK_KP_MINUS;
|
||||||
keymap[QZ_d] = SDLK_d;
|
keymap[QZ_CAPSLOCK] = SDLK_CAPSLOCK;
|
||||||
keymap[QZ_f] = SDLK_f;
|
keymap[QZ_a] = SDLK_a;
|
||||||
keymap[QZ_g] = SDLK_g;
|
keymap[QZ_s] = SDLK_s;
|
||||||
keymap[QZ_h] = SDLK_h;
|
keymap[QZ_d] = SDLK_d;
|
||||||
keymap[QZ_j] = SDLK_j;
|
keymap[QZ_f] = SDLK_f;
|
||||||
keymap[QZ_k] = SDLK_k;
|
keymap[QZ_g] = SDLK_g;
|
||||||
keymap[QZ_l] = SDLK_l;
|
keymap[QZ_h] = SDLK_h;
|
||||||
keymap[QZ_SEMICOLON] = SDLK_SEMICOLON;
|
keymap[QZ_j] = SDLK_j;
|
||||||
keymap[QZ_QUOTE] = SDLK_QUOTE;
|
keymap[QZ_k] = SDLK_k;
|
||||||
keymap[QZ_RETURN] = SDLK_RETURN;
|
keymap[QZ_l] = SDLK_l;
|
||||||
keymap[QZ_KP4] = SDLK_KP4;
|
keymap[QZ_SEMICOLON] = SDLK_SEMICOLON;
|
||||||
keymap[QZ_KP5] = SDLK_KP5;
|
keymap[QZ_QUOTE] = SDLK_QUOTE;
|
||||||
keymap[QZ_KP6] = SDLK_KP6;
|
keymap[QZ_RETURN] = SDLK_RETURN;
|
||||||
keymap[QZ_KP_PLUS] = SDLK_KP_PLUS;
|
keymap[QZ_KP4] = SDLK_KP4;
|
||||||
keymap[QZ_LSHIFT] = SDLK_LSHIFT;
|
keymap[QZ_KP5] = SDLK_KP5;
|
||||||
keymap[QZ_z] = SDLK_z;
|
keymap[QZ_KP6] = SDLK_KP6;
|
||||||
keymap[QZ_x] = SDLK_x;
|
keymap[QZ_KP_PLUS] = SDLK_KP_PLUS;
|
||||||
keymap[QZ_c] = SDLK_c;
|
keymap[QZ_LSHIFT] = SDLK_LSHIFT;
|
||||||
keymap[QZ_v] = SDLK_v;
|
keymap[QZ_z] = SDLK_z;
|
||||||
keymap[QZ_b] = SDLK_b;
|
keymap[QZ_x] = SDLK_x;
|
||||||
keymap[QZ_n] = SDLK_n;
|
keymap[QZ_c] = SDLK_c;
|
||||||
keymap[QZ_m] = SDLK_m;
|
keymap[QZ_v] = SDLK_v;
|
||||||
keymap[QZ_COMMA] = SDLK_COMMA;
|
keymap[QZ_b] = SDLK_b;
|
||||||
keymap[QZ_PERIOD] = SDLK_PERIOD;
|
keymap[QZ_n] = SDLK_n;
|
||||||
keymap[QZ_SLASH] = SDLK_SLASH;
|
keymap[QZ_m] = SDLK_m;
|
||||||
keymap[QZ_UP] = SDLK_UP;
|
keymap[QZ_COMMA] = SDLK_COMMA;
|
||||||
keymap[QZ_KP1] = SDLK_KP1;
|
keymap[QZ_PERIOD] = SDLK_PERIOD;
|
||||||
keymap[QZ_KP2] = SDLK_KP2;
|
keymap[QZ_SLASH] = SDLK_SLASH;
|
||||||
keymap[QZ_KP3] = SDLK_KP3;
|
keymap[QZ_UP] = SDLK_UP;
|
||||||
keymap[QZ_KP_ENTER] = SDLK_KP_ENTER;
|
keymap[QZ_KP1] = SDLK_KP1;
|
||||||
keymap[QZ_LCTRL] = SDLK_LCTRL;
|
keymap[QZ_KP2] = SDLK_KP2;
|
||||||
keymap[QZ_LALT] = SDLK_LALT;
|
keymap[QZ_KP3] = SDLK_KP3;
|
||||||
keymap[QZ_LMETA] = SDLK_LMETA;
|
keymap[QZ_KP_ENTER] = SDLK_KP_ENTER;
|
||||||
keymap[QZ_SPACE] = SDLK_SPACE;
|
keymap[QZ_LCTRL] = SDLK_LCTRL;
|
||||||
keymap[QZ_LEFT] = SDLK_LEFT;
|
keymap[QZ_LALT] = SDLK_LALT;
|
||||||
keymap[QZ_DOWN] = SDLK_DOWN;
|
keymap[QZ_LMETA] = SDLK_LMETA;
|
||||||
keymap[QZ_RIGHT] = SDLK_RIGHT;
|
keymap[QZ_SPACE] = SDLK_SPACE;
|
||||||
keymap[QZ_KP0] = SDLK_KP0;
|
keymap[QZ_LEFT] = SDLK_LEFT;
|
||||||
keymap[QZ_KP_PERIOD] = SDLK_KP_PERIOD;
|
keymap[QZ_DOWN] = SDLK_DOWN;
|
||||||
keymap[QZ_IBOOK_ENTER] = SDLK_KP_ENTER;
|
keymap[QZ_RIGHT] = SDLK_RIGHT;
|
||||||
keymap[QZ_IBOOK_RIGHT] = SDLK_RIGHT;
|
keymap[QZ_KP0] = SDLK_KP0;
|
||||||
keymap[QZ_IBOOK_DOWN] = SDLK_DOWN;
|
keymap[QZ_KP_PERIOD] = SDLK_KP_PERIOD;
|
||||||
keymap[QZ_IBOOK_UP] = SDLK_UP;
|
keymap[QZ_IBOOK_ENTER] = SDLK_KP_ENTER;
|
||||||
keymap[QZ_IBOOK_LEFT] = SDLK_LEFT;
|
keymap[QZ_IBOOK_RIGHT] = SDLK_RIGHT;
|
||||||
|
keymap[QZ_IBOOK_DOWN] = SDLK_DOWN;
|
||||||
/* Up there we setup a static scancode->keysym map. However, it will not
|
keymap[QZ_IBOOK_UP] = SDLK_UP;
|
||||||
* work very well on international keyboard. Hence we now query MacOS
|
keymap[QZ_IBOOK_LEFT] = SDLK_LEFT;
|
||||||
* for its own keymap to adjust our own mapping table. However, this is
|
|
||||||
* bascially only useful for ascii char keys. This is also the reason
|
/* Up there we setup a static scancode->keysym map. However, it will not
|
||||||
* why we keep the static table, too.
|
* work very well on international keyboard. Hence we now query MacOS
|
||||||
*/
|
* for its own keymap to adjust our own mapping table. However, this is
|
||||||
|
* bascially only useful for ascii char keys. This is also the reason
|
||||||
/* Get a pointer to the systems cached KCHR */
|
* why we keep the static table, too.
|
||||||
KCHRPtr = (void *)GetScriptManagerVariable(smKCHRCache);
|
*/
|
||||||
if (KCHRPtr)
|
|
||||||
{
|
/* Get a pointer to the systems cached KCHR */
|
||||||
/* Loop over all 127 possible scan codes */
|
KCHRPtr = (void *)GetScriptManagerVariable(smKCHRCache);
|
||||||
for (i = 0; i < 0x7F; i++)
|
if (KCHRPtr)
|
||||||
{
|
{
|
||||||
/* We pretend a clean start to begin with (i.e. no dead keys active */
|
/* Loop over all 127 possible scan codes */
|
||||||
state = 0;
|
for (i = 0; i < 0x7F; i++)
|
||||||
|
{
|
||||||
/* Now translate the key code to a key value */
|
/* We pretend a clean start to begin with (i.e. no dead keys active */
|
||||||
value = KeyTranslate(KCHRPtr, i, &state) & 0xff;
|
state = 0;
|
||||||
|
|
||||||
/* If the state become 0, it was a dead key. We need to translate again,
|
/* Now translate the key code to a key value */
|
||||||
passing in the new state, to get the actual key value */
|
value = KeyTranslate(KCHRPtr, i, &state) & 0xff;
|
||||||
if (state != 0)
|
|
||||||
value = KeyTranslate(KCHRPtr, i, &state) & 0xff;
|
/* If the state become 0, it was a dead key. We need to translate again,
|
||||||
|
passing in the new state, to get the actual key value */
|
||||||
/* Now we should have an ascii value, or 0. Try to figure out to which SDL symbol it maps */
|
if (state != 0)
|
||||||
if (value >= 128) /* Some non-ASCII char, map it to SDLK_WORLD_* */
|
value = KeyTranslate(KCHRPtr, i, &state) & 0xff;
|
||||||
keymap[i] = world++;
|
|
||||||
else if (value >= 32) /* non-control ASCII char */
|
/* Now we should have an ascii value, or 0. Try to figure out to which SDL symbol it maps */
|
||||||
keymap[i] = value;
|
if (value >= 128) /* Some non-ASCII char, map it to SDLK_WORLD_* */
|
||||||
}
|
keymap[i] = world++;
|
||||||
}
|
else if (value >= 32) /* non-control ASCII char */
|
||||||
|
keymap[i] = value;
|
||||||
/* The keypad codes are re-setup here, because the loop above cannot
|
}
|
||||||
* distinguish between a key on the keypad and a regular key. We maybe
|
}
|
||||||
* could get around this problem in another fashion: NSEvent's flags
|
|
||||||
* include a "NSNumericPadKeyMask" bit; we could check that and modify
|
/* The keypad codes are re-setup here, because the loop above cannot
|
||||||
* the symbol we return on the fly. However, this flag seems to exhibit
|
* distinguish between a key on the keypad and a regular key. We maybe
|
||||||
* some weird behaviour related to the num lock key
|
* could get around this problem in another fashion: NSEvent's flags
|
||||||
*/
|
* include a "NSNumericPadKeyMask" bit; we could check that and modify
|
||||||
keymap[QZ_KP0] = SDLK_KP0;
|
* the symbol we return on the fly. However, this flag seems to exhibit
|
||||||
keymap[QZ_KP1] = SDLK_KP1;
|
* some weird behaviour related to the num lock key
|
||||||
keymap[QZ_KP2] = SDLK_KP2;
|
*/
|
||||||
keymap[QZ_KP3] = SDLK_KP3;
|
keymap[QZ_KP0] = SDLK_KP0;
|
||||||
keymap[QZ_KP4] = SDLK_KP4;
|
keymap[QZ_KP1] = SDLK_KP1;
|
||||||
keymap[QZ_KP5] = SDLK_KP5;
|
keymap[QZ_KP2] = SDLK_KP2;
|
||||||
keymap[QZ_KP6] = SDLK_KP6;
|
keymap[QZ_KP3] = SDLK_KP3;
|
||||||
keymap[QZ_KP7] = SDLK_KP7;
|
keymap[QZ_KP4] = SDLK_KP4;
|
||||||
keymap[QZ_KP8] = SDLK_KP8;
|
keymap[QZ_KP5] = SDLK_KP5;
|
||||||
keymap[QZ_KP9] = SDLK_KP9;
|
keymap[QZ_KP6] = SDLK_KP6;
|
||||||
keymap[QZ_KP_MINUS] = SDLK_KP_MINUS;
|
keymap[QZ_KP7] = SDLK_KP7;
|
||||||
keymap[QZ_KP_PLUS] = SDLK_KP_PLUS;
|
keymap[QZ_KP8] = SDLK_KP8;
|
||||||
keymap[QZ_KP_PERIOD] = SDLK_KP_PERIOD;
|
keymap[QZ_KP9] = SDLK_KP9;
|
||||||
keymap[QZ_KP_EQUALS] = SDLK_KP_EQUALS;
|
keymap[QZ_KP_MINUS] = SDLK_KP_MINUS;
|
||||||
keymap[QZ_KP_DIVIDE] = SDLK_KP_DIVIDE;
|
keymap[QZ_KP_PLUS] = SDLK_KP_PLUS;
|
||||||
keymap[QZ_KP_MULTIPLY] = SDLK_KP_MULTIPLY;
|
keymap[QZ_KP_PERIOD] = SDLK_KP_PERIOD;
|
||||||
keymap[QZ_KP_ENTER] = SDLK_KP_ENTER;
|
keymap[QZ_KP_EQUALS] = SDLK_KP_EQUALS;
|
||||||
|
keymap[QZ_KP_DIVIDE] = SDLK_KP_DIVIDE;
|
||||||
|
keymap[QZ_KP_MULTIPLY] = SDLK_KP_MULTIPLY;
|
||||||
|
keymap[QZ_KP_ENTER] = SDLK_KP_ENTER;
|
||||||
}
|
}
|
||||||
|
|
||||||
static void QZ_DoKey (int state, NSEvent *event) {
|
static void QZ_DoKey (int state, NSEvent *event) {
|
||||||
|
|
||||||
NSString *chars;
|
NSString *chars;
|
||||||
int i;
|
int i;
|
||||||
SDL_keysym key;
|
SDL_keysym key;
|
||||||
|
|
||||||
/* An event can contain multiple characters */
|
/* An event can contain multiple characters */
|
||||||
/* I'll ignore this fact for now, since there is only one virtual key code per event */
|
/* I'll ignore this fact for now, since there is only one virtual key code per event */
|
||||||
chars = [ event characters ];
|
chars = [ event characters ];
|
||||||
for (i =0; i < 1 /*[ chars length ] */; i++) {
|
for (i =0; i < 1 /*[ chars length ] */; i++) {
|
||||||
|
|
||||||
key.scancode = [ event keyCode ];
|
key.scancode = [ event keyCode ];
|
||||||
key.sym = keymap [ key.scancode ];
|
key.sym = keymap [ key.scancode ];
|
||||||
key.unicode = [ chars characterAtIndex:i];
|
key.unicode = [ chars characterAtIndex:i];
|
||||||
key.mod = KMOD_NONE;
|
key.mod = KMOD_NONE;
|
||||||
|
|
||||||
SDL_PrivateKeyboard (state, &key);
|
SDL_PrivateKeyboard (state, &key);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
static void QZ_DoModifiers (unsigned int newMods) {
|
static void QZ_DoModifiers (unsigned int newMods) {
|
||||||
|
|
||||||
const int mapping[] = { SDLK_CAPSLOCK, SDLK_LSHIFT, SDLK_LCTRL, SDLK_LALT, SDLK_LMETA } ;
|
const int mapping[] = { SDLK_CAPSLOCK, SDLK_LSHIFT, SDLK_LCTRL, SDLK_LALT, SDLK_LMETA } ;
|
||||||
|
|
||||||
int i;
|
int i;
|
||||||
int bit;
|
int bit;
|
||||||
SDL_keysym key;
|
SDL_keysym key;
|
||||||
|
|
||||||
key.scancode = 0;
|
key.scancode = 0;
|
||||||
key.sym = SDLK_UNKNOWN;
|
key.sym = SDLK_UNKNOWN;
|
||||||
key.unicode = 0;
|
key.unicode = 0;
|
||||||
key.mod = KMOD_NONE;
|
key.mod = KMOD_NONE;
|
||||||
|
|
||||||
/* Iterate through the bits, testing each against the current modifiers */
|
|
||||||
for (i = 0, bit = NSAlphaShiftKeyMask; bit <= NSCommandKeyMask; bit <<= 1, ++i) {
|
|
||||||
|
|
||||||
unsigned int currentMask, newMask;
|
|
||||||
|
|
||||||
currentMask = currentMods & bit;
|
|
||||||
newMask = newMods & bit;
|
|
||||||
|
|
||||||
if ( currentMask &&
|
|
||||||
currentMask != newMask ) { /* modifier up event */
|
|
||||||
|
|
||||||
key.sym = mapping[i];
|
/* Iterate through the bits, testing each against the current modifiers */
|
||||||
/* If this was Caps Lock, we need some additional voodoo to make SDL happy */
|
for (i = 0, bit = NSAlphaShiftKeyMask; bit <= NSCommandKeyMask; bit <<= 1, ++i) {
|
||||||
if (bit == NSAlphaShiftKeyMask)
|
|
||||||
SDL_PrivateKeyboard (SDL_PRESSED, &key);
|
unsigned int currentMask, newMask;
|
||||||
SDL_PrivateKeyboard (SDL_RELEASED, &key);
|
|
||||||
}
|
currentMask = currentMods & bit;
|
||||||
else
|
newMask = newMods & bit;
|
||||||
if ( newMask &&
|
|
||||||
currentMask != newMask ) { /* modifier down event */
|
if ( currentMask &&
|
||||||
|
currentMask != newMask ) { /* modifier up event */
|
||||||
key.sym = mapping[i];
|
|
||||||
SDL_PrivateKeyboard (SDL_PRESSED, &key);
|
key.sym = mapping[i];
|
||||||
/* If this was Caps Lock, we need some additional voodoo to make SDL happy */
|
/* If this was Caps Lock, we need some additional voodoo to make SDL happy */
|
||||||
if (bit == NSAlphaShiftKeyMask)
|
if (bit == NSAlphaShiftKeyMask)
|
||||||
SDL_PrivateKeyboard (SDL_RELEASED, &key);
|
SDL_PrivateKeyboard (SDL_PRESSED, &key);
|
||||||
}
|
SDL_PrivateKeyboard (SDL_RELEASED, &key);
|
||||||
}
|
}
|
||||||
|
else if ( newMask &&
|
||||||
currentMods = newMods;
|
currentMask != newMask ) { /* modifier down event */
|
||||||
|
|
||||||
|
key.sym = mapping[i];
|
||||||
|
SDL_PrivateKeyboard (SDL_PRESSED, &key);
|
||||||
|
/* If this was Caps Lock, we need some additional voodoo to make SDL happy */
|
||||||
|
if (bit == NSAlphaShiftKeyMask)
|
||||||
|
SDL_PrivateKeyboard (SDL_RELEASED, &key);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
currentMods = newMods;
|
||||||
}
|
}
|
||||||
|
|
||||||
static void QZ_DoActivate (_THIS)
|
static void QZ_DoActivate (_THIS)
|
||||||
{
|
{
|
||||||
inForeground = YES;
|
inForeground = YES;
|
||||||
|
|
||||||
/* Regrab the mouse */
|
/* Regrab the mouse */
|
||||||
if (currentGrabMode == SDL_GRAB_ON) {
|
if (currentGrabMode == SDL_GRAB_ON) {
|
||||||
QZ_WarpWMCursor (this, SDL_VideoSurface->w / 2, SDL_VideoSurface->h / 2);
|
QZ_WarpWMCursor (this, SDL_VideoSurface->w / 2, SDL_VideoSurface->h / 2);
|
||||||
CGAssociateMouseAndMouseCursorPosition (0);
|
CGAssociateMouseAndMouseCursorPosition (0);
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Hide the mouse cursor if inside the app window */
|
/* Hide the mouse cursor if inside the app window */
|
||||||
if (!QZ_cursor_visible) {
|
if (!QZ_cursor_visible) {
|
||||||
HideCursor ();
|
HideCursor ();
|
||||||
}
|
}
|
||||||
|
|
||||||
SDL_PrivateAppActive (1, SDL_APPINPUTFOCUS);
|
SDL_PrivateAppActive (1, SDL_APPINPUTFOCUS);
|
||||||
}
|
}
|
||||||
|
|
||||||
static void QZ_DoDeactivate (_THIS) {
|
static void QZ_DoDeactivate (_THIS) {
|
||||||
|
|
||||||
inForeground = NO;
|
|
||||||
|
|
||||||
/* Ungrab mouse if it is grabbed */
|
inForeground = NO;
|
||||||
if (currentGrabMode == SDL_GRAB_ON) {
|
|
||||||
CGAssociateMouseAndMouseCursorPosition (1);
|
|
||||||
}
|
|
||||||
|
|
||||||
/* Show the mouse cursor */
|
/* Ungrab mouse if it is grabbed */
|
||||||
if (!QZ_cursor_visible) {
|
if (currentGrabMode == SDL_GRAB_ON) {
|
||||||
ShowCursor ();
|
CGAssociateMouseAndMouseCursorPosition (1);
|
||||||
}
|
}
|
||||||
|
|
||||||
SDL_PrivateAppActive (0, SDL_APPINPUTFOCUS);
|
/* Show the mouse cursor */
|
||||||
|
if (!QZ_cursor_visible) {
|
||||||
|
ShowCursor ();
|
||||||
|
}
|
||||||
|
|
||||||
|
SDL_PrivateAppActive (0, SDL_APPINPUTFOCUS);
|
||||||
}
|
}
|
||||||
|
|
||||||
static void QZ_PumpEvents (_THIS)
|
static void QZ_PumpEvents (_THIS)
|
||||||
{
|
{
|
||||||
|
static NSPoint lastMouse;
|
||||||
static NSPoint lastMouse;
|
NSPoint mouse, saveMouse;
|
||||||
NSPoint mouse, saveMouse;
|
Point qdMouse;
|
||||||
Point qdMouse;
|
CGMouseDelta dx, dy;
|
||||||
CGMouseDelta dx, dy;
|
|
||||||
|
NSDate *distantPast;
|
||||||
NSDate *distantPast;
|
NSEvent *event;
|
||||||
NSEvent *event;
|
NSRect winRect;
|
||||||
NSRect winRect;
|
NSRect titleBarRect;
|
||||||
NSRect titleBarRect;
|
NSAutoreleasePool *pool;
|
||||||
NSAutoreleasePool *pool;
|
|
||||||
|
pool = [ [ NSAutoreleasePool alloc ] init ];
|
||||||
pool = [ [ NSAutoreleasePool alloc ] init ];
|
distantPast = [ NSDate distantPast ];
|
||||||
distantPast = [ NSDate distantPast ];
|
|
||||||
|
winRect = NSMakeRect (0, 0, SDL_VideoSurface->w, SDL_VideoSurface->h);
|
||||||
winRect = NSMakeRect (0, 0, SDL_VideoSurface->w, SDL_VideoSurface->h);
|
titleBarRect = NSMakeRect ( 0, SDL_VideoSurface->h, SDL_VideoSurface->w,
|
||||||
titleBarRect = NSMakeRect ( 0, SDL_VideoSurface->h, SDL_VideoSurface->w,
|
SDL_VideoSurface->h + 22 );
|
||||||
SDL_VideoSurface->h + 22 );
|
|
||||||
|
if (currentGrabMode != SDL_GRAB_ON) { /* if grabbed, the cursor can't move! (see fallback below) */
|
||||||
if (currentGrabMode != SDL_GRAB_ON) { /* if grabbed, the cursor can't move! (see fallback below) */
|
|
||||||
|
/* 1/2 second after a warp, the mouse cannot move (don't ask me why) */
|
||||||
/* 1/2 second after a warp, the mouse cannot move (don't ask me why) */
|
/* So, approximate motion with CGGetLastMouseDelta, which still works, somehow */
|
||||||
/* So, approximate motion with CGGetLastMouseDelta, which still works, somehow */
|
if (! warp_flag) {
|
||||||
if (! warp_flag) {
|
|
||||||
|
GetGlobalMouse (&qdMouse); /* use Carbon since [ NSEvent mouseLocation ] is broken */
|
||||||
GetGlobalMouse (&qdMouse); /* use Carbon since [ NSEvent mouseLocation ] is broken */
|
mouse = NSMakePoint (qdMouse.h, qdMouse.v);
|
||||||
mouse = NSMakePoint (qdMouse.h, qdMouse.v);
|
saveMouse = mouse;
|
||||||
saveMouse = mouse;
|
|
||||||
|
if (mouse.x != lastMouse.x || mouse.y != lastMouse.y) {
|
||||||
if (mouse.x != lastMouse.x || mouse.y != lastMouse.y) {
|
|
||||||
|
QZ_PrivateCGToSDL (this, &mouse);
|
||||||
QZ_PrivateCGToSDL (this, &mouse);
|
/* -note- we now generate mouse motion events if the mouse isn't over the window */
|
||||||
if (inForeground && NSPointInRect (mouse, winRect)) {
|
if (inForeground /* && NSPointInRect (mouse, winRect)*/) {
|
||||||
//printf ("Mouse Loc: (%f, %f)\n", mouse.x, mouse.y);
|
//printf ("Mouse Loc: (%f, %f)\n", mouse.x, mouse.y);
|
||||||
SDL_PrivateMouseMotion (0, 0, mouse.x, mouse.y);
|
SDL_PrivateMouseMotion (0, 0, mouse.x, mouse.y);
|
||||||
}
|
|
||||||
}
|
}
|
||||||
lastMouse = saveMouse;
|
}
|
||||||
|
lastMouse = saveMouse;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/* accumulate any mouse events into one SDL mouse event */
|
||||||
|
dx = 0;
|
||||||
|
dy = 0;
|
||||||
|
|
||||||
|
do {
|
||||||
|
|
||||||
|
/* Poll for an event. This will not block */
|
||||||
|
event = [ NSApp nextEventMatchingMask:NSAnyEventMask
|
||||||
|
untilDate:distantPast
|
||||||
|
inMode: NSDefaultRunLoopMode dequeue:YES ];
|
||||||
|
|
||||||
|
if (event != nil) {
|
||||||
|
|
||||||
|
unsigned int type;
|
||||||
|
BOOL isForGameWin;
|
||||||
|
|
||||||
|
#define DO_MOUSE_DOWN(button, sendToWindow) do { \
|
||||||
|
if ( inForeground ) { \
|
||||||
|
if ( (SDL_VideoSurface->flags & SDL_FULLSCREEN) || \
|
||||||
|
NSPointInRect([event locationInWindow], winRect) ) \
|
||||||
|
SDL_PrivateMouseButton (SDL_PRESSED, button, 0, 0); \
|
||||||
|
} \
|
||||||
|
else { \
|
||||||
|
QZ_DoActivate (this); \
|
||||||
|
} \
|
||||||
|
[ NSApp sendEvent:event ]; \
|
||||||
|
} while(0)
|
||||||
|
|
||||||
|
#define DO_MOUSE_UP(button, sendToWindow) do { \
|
||||||
|
if ( (SDL_VideoSurface->flags & SDL_FULLSCREEN) || \
|
||||||
|
!NSPointInRect([event locationInWindow], titleBarRect) ) \
|
||||||
|
SDL_PrivateMouseButton (SDL_RELEASED, button, 0, 0); \
|
||||||
|
[ NSApp sendEvent:event ]; \
|
||||||
|
} while(0)
|
||||||
|
|
||||||
|
type = [ event type ];
|
||||||
|
isForGameWin = (qz_window == [ event window ]);
|
||||||
|
switch (type) {
|
||||||
|
|
||||||
|
case NSLeftMouseDown:
|
||||||
|
if ( NSCommandKeyMask & currentMods ) {
|
||||||
|
last_virtual_button = 3;
|
||||||
|
DO_MOUSE_DOWN (3, 0);
|
||||||
|
}
|
||||||
|
else if ( NSAlternateKeyMask & currentMods ) {
|
||||||
|
last_virtual_button = 2;
|
||||||
|
DO_MOUSE_DOWN (2, 0);
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
DO_MOUSE_DOWN (1, 1);
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
case NSOtherMouseDown: DO_MOUSE_DOWN (2, 0); break;
|
||||||
|
case NSRightMouseDown: DO_MOUSE_DOWN (3, 0); break;
|
||||||
|
case NSLeftMouseUp:
|
||||||
|
if ( last_virtual_button != 0 ) {
|
||||||
|
DO_MOUSE_UP (last_virtual_button, 0);
|
||||||
|
last_virtual_button = 0;
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
DO_MOUSE_UP (1, 1);
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
case NSOtherMouseUp: DO_MOUSE_UP (2, 0); break;
|
||||||
|
case NSRightMouseUp: DO_MOUSE_UP (3, 0); break;
|
||||||
|
case NSSystemDefined:
|
||||||
|
//if ([event subtype] == 7) {
|
||||||
|
// unsigned int buttons; // up to 32 mouse button states!
|
||||||
|
// buttons = [ event data2 ];
|
||||||
|
//}
|
||||||
|
break;
|
||||||
|
case NSLeftMouseDragged:
|
||||||
|
case NSRightMouseDragged:
|
||||||
|
case 27:
|
||||||
|
case NSMouseMoved:
|
||||||
|
if (currentGrabMode == SDL_GRAB_ON) {
|
||||||
|
|
||||||
|
/**
|
||||||
|
* If input is grabbed, we'll wing it and try to send some mouse
|
||||||
|
* moved events with CGGetLastMouseDelta(). Not optimal, but better
|
||||||
|
* than nothing.
|
||||||
|
**/
|
||||||
|
CGMouseDelta dx1, dy1;
|
||||||
|
CGGetLastMouseDelta (&dx1, &dy1);
|
||||||
|
dx += dx1;
|
||||||
|
dy += dy1;
|
||||||
|
}
|
||||||
|
else if (warp_flag) {
|
||||||
|
|
||||||
|
Uint32 ticks;
|
||||||
|
|
||||||
|
ticks = SDL_GetTicks();
|
||||||
|
if (ticks - warp_ticks < 150) {
|
||||||
|
|
||||||
|
CGMouseDelta dx1, dy1;
|
||||||
|
CGGetLastMouseDelta (&dx1, &dy1);
|
||||||
|
dx += dx1;
|
||||||
|
dy += dy1;
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
|
||||||
|
warp_flag = 0;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
case NSScrollWheel:
|
||||||
|
if (NSPointInRect([ event locationInWindow ], winRect)) {
|
||||||
|
float dy;
|
||||||
|
dy = [ event deltaY ];
|
||||||
|
if ( dy > 0.0 ) /* Scroll up */
|
||||||
|
SDL_PrivateMouseButton (SDL_PRESSED, 4, 0, 0);
|
||||||
|
else /* Scroll down */
|
||||||
|
SDL_PrivateMouseButton (SDL_PRESSED, 5, 0, 0);
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
case NSKeyUp:
|
||||||
|
QZ_DoKey (SDL_RELEASED, event);
|
||||||
|
break;
|
||||||
|
case NSKeyDown:
|
||||||
|
QZ_DoKey (SDL_PRESSED, event);
|
||||||
|
break;
|
||||||
|
case NSFlagsChanged:
|
||||||
|
QZ_DoModifiers( [ event modifierFlags ] );
|
||||||
|
break;
|
||||||
|
case NSAppKitDefined:
|
||||||
|
switch ( [ event subtype ] ) {
|
||||||
|
case NSApplicationActivatedEventType:
|
||||||
|
QZ_DoActivate (this);
|
||||||
|
break;
|
||||||
|
case NSApplicationDeactivatedEventType:
|
||||||
|
QZ_DoDeactivate (this);
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
[ NSApp sendEvent:event ];
|
||||||
|
break;
|
||||||
|
/* case NSApplicationDefined: break; */
|
||||||
|
/* case NSPeriodic: break; */
|
||||||
|
/* case NSCursorUpdate: break; */
|
||||||
|
default:
|
||||||
|
[ NSApp sendEvent:event ];
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
} while (event != nil);
|
||||||
/* accumulate any mouse events into one SDL mouse event */
|
|
||||||
dx = 0;
|
/* check for accumulated mouse events */
|
||||||
dy = 0;
|
if (dx != 0 || dy != 0)
|
||||||
|
SDL_PrivateMouseMotion (0, 1, dx, dy);
|
||||||
do {
|
|
||||||
|
[ pool release ];
|
||||||
/* Poll for an event. This will not block */
|
|
||||||
event = [ NSApp nextEventMatchingMask:NSAnyEventMask
|
|
||||||
untilDate:distantPast
|
|
||||||
inMode: NSDefaultRunLoopMode dequeue:YES ];
|
|
||||||
|
|
||||||
if (event != nil) {
|
|
||||||
unsigned int type;
|
|
||||||
BOOL isForGameWin;
|
|
||||||
|
|
||||||
#define DO_MOUSE_DOWN(button, sendToWindow) do { \
|
|
||||||
if ( inForeground ) { \
|
|
||||||
if ( (SDL_VideoSurface->flags & SDL_FULLSCREEN) || \
|
|
||||||
NSPointInRect([event locationInWindow], winRect) ) \
|
|
||||||
SDL_PrivateMouseButton (SDL_PRESSED, button, 0, 0); \
|
|
||||||
} \
|
|
||||||
else { \
|
|
||||||
QZ_DoActivate (this); \
|
|
||||||
} \
|
|
||||||
[ NSApp sendEvent:event ]; \
|
|
||||||
} while(0)
|
|
||||||
|
|
||||||
#define DO_MOUSE_UP(button, sendToWindow) do { \
|
|
||||||
if ( (SDL_VideoSurface->flags & SDL_FULLSCREEN) || \
|
|
||||||
!NSPointInRect([event locationInWindow], titleBarRect) ) \
|
|
||||||
SDL_PrivateMouseButton (SDL_RELEASED, button, 0, 0); \
|
|
||||||
[ NSApp sendEvent:event ]; \
|
|
||||||
} while(0)
|
|
||||||
|
|
||||||
type = [ event type ];
|
|
||||||
isForGameWin = (qz_window == [ event window ]);
|
|
||||||
switch (type) {
|
|
||||||
|
|
||||||
case NSLeftMouseDown:
|
|
||||||
if ( NSCommandKeyMask & currentMods ) {
|
|
||||||
last_virtual_button = 3;
|
|
||||||
DO_MOUSE_DOWN (3, 0);
|
|
||||||
}
|
|
||||||
else if ( NSAlternateKeyMask & currentMods ) {
|
|
||||||
last_virtual_button = 2;
|
|
||||||
DO_MOUSE_DOWN (2, 0);
|
|
||||||
}
|
|
||||||
else {
|
|
||||||
DO_MOUSE_DOWN (1, 1);
|
|
||||||
}
|
|
||||||
break;
|
|
||||||
case NSOtherMouseDown: DO_MOUSE_DOWN (2, 0); break;
|
|
||||||
case NSRightMouseDown: DO_MOUSE_DOWN (3, 0); break;
|
|
||||||
case NSLeftMouseUp:
|
|
||||||
|
|
||||||
if ( last_virtual_button != 0 ) {
|
|
||||||
DO_MOUSE_UP (last_virtual_button, 0);
|
|
||||||
last_virtual_button = 0;
|
|
||||||
}
|
|
||||||
else {
|
|
||||||
DO_MOUSE_UP (1, 1);
|
|
||||||
}
|
|
||||||
break;
|
|
||||||
case NSOtherMouseUp: DO_MOUSE_UP (2, 0); break;
|
|
||||||
case NSRightMouseUp: DO_MOUSE_UP (3, 0); break;
|
|
||||||
case NSSystemDefined:
|
|
||||||
//if ([event subtype] == 7) {
|
|
||||||
// unsigned int buttons; // up to 32 mouse button states!
|
|
||||||
// buttons = [ event data2 ];
|
|
||||||
//}
|
|
||||||
break;
|
|
||||||
case NSLeftMouseDragged:
|
|
||||||
case NSRightMouseDragged:
|
|
||||||
case 27:
|
|
||||||
case NSMouseMoved:
|
|
||||||
|
|
||||||
if (currentGrabMode == SDL_GRAB_ON) {
|
|
||||||
|
|
||||||
/**
|
|
||||||
* If input is grabbed, we'll wing it and try to send some mouse
|
|
||||||
* moved events with CGGetLastMouseDelta(). Not optimal, but better
|
|
||||||
* than nothing.
|
|
||||||
**/
|
|
||||||
CGMouseDelta dx1, dy1;
|
|
||||||
CGGetLastMouseDelta (&dx1, &dy1);
|
|
||||||
dx += dx1;
|
|
||||||
dy += dy1;
|
|
||||||
}
|
|
||||||
else if (warp_flag) {
|
|
||||||
|
|
||||||
Uint32 ticks;
|
|
||||||
|
|
||||||
ticks = SDL_GetTicks();
|
|
||||||
if (ticks - warp_ticks < 150) {
|
|
||||||
|
|
||||||
CGMouseDelta dx1, dy1;
|
|
||||||
CGGetLastMouseDelta (&dx1, &dy1);
|
|
||||||
dx += dx1;
|
|
||||||
dy += dy1;
|
|
||||||
}
|
|
||||||
else {
|
|
||||||
|
|
||||||
warp_flag = 0;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
break;
|
|
||||||
case NSScrollWheel:
|
|
||||||
{
|
|
||||||
if (NSPointInRect([ event locationInWindow ], winRect)) {
|
|
||||||
float dy;
|
|
||||||
dy = [ event deltaY ];
|
|
||||||
if ( dy > 0.0 ) /* Scroll up */
|
|
||||||
SDL_PrivateMouseButton (SDL_PRESSED, 4, 0, 0);
|
|
||||||
else /* Scroll down */
|
|
||||||
SDL_PrivateMouseButton (SDL_PRESSED, 5, 0, 0);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
break;
|
|
||||||
case NSKeyUp:
|
|
||||||
QZ_DoKey (SDL_RELEASED, event);
|
|
||||||
break;
|
|
||||||
case NSKeyDown:
|
|
||||||
QZ_DoKey (SDL_PRESSED, event);
|
|
||||||
break;
|
|
||||||
case NSFlagsChanged:
|
|
||||||
QZ_DoModifiers( [ event modifierFlags ] );
|
|
||||||
break;
|
|
||||||
case NSAppKitDefined:
|
|
||||||
switch ( [ event subtype ] ) {
|
|
||||||
case NSApplicationActivatedEventType:
|
|
||||||
QZ_DoActivate (this);
|
|
||||||
break;
|
|
||||||
case NSApplicationDeactivatedEventType:
|
|
||||||
QZ_DoDeactivate (this);
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
[ NSApp sendEvent:event ];
|
|
||||||
break;
|
|
||||||
/* case NSApplicationDefined: break; */
|
|
||||||
/* case NSPeriodic: break; */
|
|
||||||
/* case NSCursorUpdate: break; */
|
|
||||||
|
|
||||||
default:
|
|
||||||
[ NSApp sendEvent:event ];
|
|
||||||
}
|
|
||||||
}
|
|
||||||
} while (event != nil);
|
|
||||||
|
|
||||||
/* check for accumulated mouse events */
|
|
||||||
if (dx != 0 || dy != 0)
|
|
||||||
SDL_PrivateMouseMotion (0, 1, dx, dy);
|
|
||||||
|
|
||||||
[ pool release ];
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,24 +1,24 @@
|
||||||
/*
|
/*
|
||||||
SDL - Simple DirectMedia Layer
|
SDL - Simple DirectMedia Layer
|
||||||
Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002 Sam Lantinga
|
Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002 Sam Lantinga
|
||||||
|
|
||||||
This library is free software; you can redistribute it and/or
|
This library is free software; you can redistribute it and/or
|
||||||
modify it under the terms of the GNU Library General Public
|
modify it under the terms of the GNU Library General Public
|
||||||
License as published by the Free Software Foundation; either
|
License as published by the Free Software Foundation; either
|
||||||
version 2 of the License, or (at your option) any later version.
|
version 2 of the License, or (at your option) any later version.
|
||||||
|
|
||||||
This library is distributed in the hope that it will be useful,
|
This library is distributed in the hope that it will be useful,
|
||||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||||||
Library General Public License for more details.
|
Library General Public License for more details.
|
||||||
|
|
||||||
You should have received a copy of the GNU Library General Public
|
You should have received a copy of the GNU Library General Public
|
||||||
License along with this library; if not, write to the Free
|
License along with this library; if not, write to the Free
|
||||||
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||||
|
|
||||||
Sam Lantinga
|
Sam Lantinga
|
||||||
slouken@libsdl.org
|
slouken@libsdl.org
|
||||||
*/
|
*/
|
||||||
|
|
||||||
/* These are the Macintosh key scancode constants -- from Inside Macintosh */
|
/* These are the Macintosh key scancode constants -- from Inside Macintosh */
|
||||||
|
|
||||||
|
|
@ -36,10 +36,10 @@
|
||||||
#define QZ_F11 0x67
|
#define QZ_F11 0x67
|
||||||
#define QZ_F12 0x6F
|
#define QZ_F12 0x6F
|
||||||
#define QZ_PRINT 0x69
|
#define QZ_PRINT 0x69
|
||||||
#define QZ_SCROLLOCK 0x6B
|
#define QZ_SCROLLOCK 0x6B
|
||||||
#define QZ_PAUSE 0x71
|
#define QZ_PAUSE 0x71
|
||||||
#define QZ_POWER 0x7F
|
#define QZ_POWER 0x7F
|
||||||
#define QZ_BACKQUOTE 0x32
|
#define QZ_BACKQUOTE 0x32
|
||||||
#define QZ_1 0x12
|
#define QZ_1 0x12
|
||||||
#define QZ_2 0x13
|
#define QZ_2 0x13
|
||||||
#define QZ_3 0x14
|
#define QZ_3 0x14
|
||||||
|
|
@ -52,14 +52,14 @@
|
||||||
#define QZ_0 0x1D
|
#define QZ_0 0x1D
|
||||||
#define QZ_MINUS 0x1B
|
#define QZ_MINUS 0x1B
|
||||||
#define QZ_EQUALS 0x18
|
#define QZ_EQUALS 0x18
|
||||||
#define QZ_BACKSPACE 0x33
|
#define QZ_BACKSPACE 0x33
|
||||||
#define QZ_INSERT 0x72
|
#define QZ_INSERT 0x72
|
||||||
#define QZ_HOME 0x73
|
#define QZ_HOME 0x73
|
||||||
#define QZ_PAGEUP 0x74
|
#define QZ_PAGEUP 0x74
|
||||||
#define QZ_NUMLOCK 0x47
|
#define QZ_NUMLOCK 0x47
|
||||||
#define QZ_KP_EQUALS 0x51
|
#define QZ_KP_EQUALS 0x51
|
||||||
#define QZ_KP_DIVIDE 0x4B
|
#define QZ_KP_DIVIDE 0x4B
|
||||||
#define QZ_KP_MULTIPLY 0x43
|
#define QZ_KP_MULTIPLY 0x43
|
||||||
#define QZ_TAB 0x30
|
#define QZ_TAB 0x30
|
||||||
#define QZ_q 0x0C
|
#define QZ_q 0x0C
|
||||||
#define QZ_w 0x0D
|
#define QZ_w 0x0D
|
||||||
|
|
@ -71,9 +71,9 @@
|
||||||
#define QZ_i 0x22
|
#define QZ_i 0x22
|
||||||
#define QZ_o 0x1F
|
#define QZ_o 0x1F
|
||||||
#define QZ_p 0x23
|
#define QZ_p 0x23
|
||||||
#define QZ_LEFTBRACKET 0x21
|
#define QZ_LEFTBRACKET 0x21
|
||||||
#define QZ_RIGHTBRACKET 0x1E
|
#define QZ_RIGHTBRACKET 0x1E
|
||||||
#define QZ_BACKSLASH 0x2A
|
#define QZ_BACKSLASH 0x2A
|
||||||
#define QZ_DELETE 0x75
|
#define QZ_DELETE 0x75
|
||||||
#define QZ_END 0x77
|
#define QZ_END 0x77
|
||||||
#define QZ_PAGEDOWN 0x79
|
#define QZ_PAGEDOWN 0x79
|
||||||
|
|
@ -91,7 +91,7 @@
|
||||||
#define QZ_j 0x26
|
#define QZ_j 0x26
|
||||||
#define QZ_k 0x28
|
#define QZ_k 0x28
|
||||||
#define QZ_l 0x25
|
#define QZ_l 0x25
|
||||||
#define QZ_SEMICOLON 0x29
|
#define QZ_SEMICOLON 0x29
|
||||||
#define QZ_QUOTE 0x27
|
#define QZ_QUOTE 0x27
|
||||||
#define QZ_RETURN 0x24
|
#define QZ_RETURN 0x24
|
||||||
#define QZ_KP4 0x56
|
#define QZ_KP4 0x56
|
||||||
|
|
@ -130,11 +130,11 @@
|
||||||
#define QZ_DOWN 0x7D
|
#define QZ_DOWN 0x7D
|
||||||
#define QZ_RIGHT 0x7C
|
#define QZ_RIGHT 0x7C
|
||||||
#define QZ_KP0 0x52
|
#define QZ_KP0 0x52
|
||||||
#define QZ_KP_PERIOD 0x41
|
#define QZ_KP_PERIOD 0x41
|
||||||
|
|
||||||
/* Wierd, these keys are on my iBook under MacOS X */
|
/* Wierd, these keys are on my iBook under MacOS X */
|
||||||
#define QZ_IBOOK_ENTER 0x34
|
#define QZ_IBOOK_ENTER 0x34
|
||||||
#define QZ_IBOOK_LEFT 0x3B
|
#define QZ_IBOOK_LEFT 0x3B
|
||||||
#define QZ_IBOOK_RIGHT 0x3C
|
#define QZ_IBOOK_RIGHT 0x3C
|
||||||
#define QZ_IBOOK_DOWN 0x3D
|
#define QZ_IBOOK_DOWN 0x3D
|
||||||
#define QZ_IBOOK_UP 0x3E
|
#define QZ_IBOOK_UP 0x3E
|
||||||
|
|
|
||||||
|
|
@ -20,7 +20,7 @@
|
||||||
slouken@libsdl.org
|
slouken@libsdl.org
|
||||||
*/
|
*/
|
||||||
|
|
||||||
/*
|
/*
|
||||||
@file SDL_QuartzVideo.h
|
@file SDL_QuartzVideo.h
|
||||||
@author Darrell Walisser
|
@author Darrell Walisser
|
||||||
|
|
||||||
|
|
@ -33,16 +33,15 @@
|
||||||
- Keyboard repeat/mouse speed adjust (if needed)
|
- Keyboard repeat/mouse speed adjust (if needed)
|
||||||
- Multiple monitor support (currently only main display)
|
- Multiple monitor support (currently only main display)
|
||||||
- Accelerated blitting support
|
- Accelerated blitting support
|
||||||
- Set the window icon (dock icon when API is available)
|
- Fix white OpenGL window on minimize (fixed)
|
||||||
- Fix white OpenGL window on minimize
|
|
||||||
- Find out what events should be sent/ignored if window is mimimized
|
- Find out what events should be sent/ignored if window is mimimized
|
||||||
- Find a better way to deal with resolution/depth switch while app is running
|
- Find a way to deal with external resolution/depth switch while app is running
|
||||||
- Resizeable windows
|
- Resizeable windows
|
||||||
- Check accuracy of QZ_SetGamma()
|
- Check accuracy of QZ_SetGamma()
|
||||||
Problems:
|
Problems:
|
||||||
- OGL not working in full screen with software renderer
|
- OGL not working in full screen with software renderer
|
||||||
- SetColors sets palette correctly but clears framebuffer
|
- SetColors sets palette correctly but clears framebuffer
|
||||||
- Crash in CG after several mode switches
|
- Crash in CG after several mode switches (I think this has been fixed)
|
||||||
- Retained windows don't draw their title bar quite right (OS Bug) (not using retained windows)
|
- Retained windows don't draw their title bar quite right (OS Bug) (not using retained windows)
|
||||||
- Cursor in 8 bit modes is screwy (might just be Radeon PCI bug)
|
- Cursor in 8 bit modes is screwy (might just be Radeon PCI bug)
|
||||||
- Warping cursor delays mouse events for a fraction of a second,
|
- Warping cursor delays mouse events for a fraction of a second,
|
||||||
|
|
@ -52,6 +51,7 @@
|
||||||
#include <Cocoa/Cocoa.h>
|
#include <Cocoa/Cocoa.h>
|
||||||
#include <OpenGL/OpenGL.h>
|
#include <OpenGL/OpenGL.h>
|
||||||
#include <Carbon/Carbon.h>
|
#include <Carbon/Carbon.h>
|
||||||
|
#include <QuickTime/QuickTime.h>
|
||||||
|
|
||||||
#include "SDL_video.h"
|
#include "SDL_video.h"
|
||||||
#include "SDL_error.h"
|
#include "SDL_error.h"
|
||||||
|
|
@ -102,10 +102,17 @@ typedef struct SDL_PrivateVideoData {
|
||||||
Uint32 warp_ticks; /* timestamp when the warp occured */
|
Uint32 warp_ticks; /* timestamp when the warp occured */
|
||||||
NSWindow *window; /* Cocoa window to implement the SDL window */
|
NSWindow *window; /* Cocoa window to implement the SDL window */
|
||||||
NSQuickDrawView *view; /* the window's view; draw 2D into this view */
|
NSQuickDrawView *view; /* the window's view; draw 2D into this view */
|
||||||
|
ImageDescriptionHandle yuv_idh;
|
||||||
|
MatrixRecordPtr yuv_matrix;
|
||||||
|
DecompressorComponent yuv_codec;
|
||||||
|
ImageSequence yuv_seq;
|
||||||
|
PlanarPixmapInfoYUV420 *yuv_pixmap;
|
||||||
|
Sint16 yuv_width, yuv_height;
|
||||||
|
CGrafPtr yuv_port;
|
||||||
|
|
||||||
} SDL_PrivateVideoData ;
|
} SDL_PrivateVideoData ;
|
||||||
|
|
||||||
#define _THIS SDL_VideoDevice *this
|
#define _THIS SDL_VideoDevice *this
|
||||||
#define display_id (this->hidden->display)
|
#define display_id (this->hidden->display)
|
||||||
#define mode (this->hidden->mode)
|
#define mode (this->hidden->mode)
|
||||||
#define save_mode (this->hidden->save_mode)
|
#define save_mode (this->hidden->save_mode)
|
||||||
|
|
@ -121,6 +128,15 @@ typedef struct SDL_PrivateVideoData {
|
||||||
#define video_set (this->hidden->video_set)
|
#define video_set (this->hidden->video_set)
|
||||||
#define warp_ticks (this->hidden->warp_ticks)
|
#define warp_ticks (this->hidden->warp_ticks)
|
||||||
#define warp_flag (this->hidden->warp_flag)
|
#define warp_flag (this->hidden->warp_flag)
|
||||||
|
#define yuv_idh (this->hidden->yuv_idh)
|
||||||
|
#define yuv_matrix (this->hidden->yuv_matrix)
|
||||||
|
#define yuv_codec (this->hidden->yuv_codec)
|
||||||
|
#define yuv_seq (this->hidden->yuv_seq)
|
||||||
|
#define yuv_pixmap (this->hidden->yuv_pixmap)
|
||||||
|
#define yuv_data (this->hidden->yuv_data)
|
||||||
|
#define yuv_width (this->hidden->yuv_width)
|
||||||
|
#define yuv_height (this->hidden->yuv_height)
|
||||||
|
#define yuv_port (this->hidden->yuv_port)
|
||||||
|
|
||||||
/* Obscuring code: maximum number of windows above ours (inclusive) */
|
/* Obscuring code: maximum number of windows above ours (inclusive) */
|
||||||
#define kMaxWindows 256
|
#define kMaxWindows 256
|
||||||
|
|
@ -144,16 +160,16 @@ typedef struct SDL_PrivateVideoData {
|
||||||
*/
|
*/
|
||||||
|
|
||||||
typedef CGError CGSError;
|
typedef CGError CGSError;
|
||||||
typedef long CGSWindowCount;
|
typedef long CGSWindowCount;
|
||||||
typedef void * CGSConnectionID;
|
typedef void * CGSConnectionID;
|
||||||
typedef int CGSWindowID;
|
typedef int CGSWindowID;
|
||||||
typedef CGSWindowID* CGSWindowIDList;
|
typedef CGSWindowID* CGSWindowIDList;
|
||||||
typedef CGWindowLevel CGSWindowLevel;
|
typedef CGWindowLevel CGSWindowLevel;
|
||||||
typedef NSRect CGSRect;
|
typedef NSRect CGSRect;
|
||||||
|
|
||||||
extern CGSConnectionID _CGSDefaultConnection ();
|
extern CGSConnectionID _CGSDefaultConnection ();
|
||||||
|
|
||||||
extern CGSError CGSGetOnScreenWindowList (CGSConnectionID cid,
|
extern CGSError CGSGetOnScreenWindowList (CGSConnectionID cid,
|
||||||
CGSConnectionID owner,
|
CGSConnectionID owner,
|
||||||
CGSWindowCount listCapacity,
|
CGSWindowCount listCapacity,
|
||||||
CGSWindowIDList list,
|
CGSWindowIDList list,
|
||||||
|
|
@ -166,9 +182,9 @@ extern CGSError CGSGetScreenRectForWindow (CGSConnectionID cid,
|
||||||
extern CGWindowLevel CGSGetWindowLevel (CGSConnectionID cid,
|
extern CGWindowLevel CGSGetWindowLevel (CGSConnectionID cid,
|
||||||
CGSWindowID wid,
|
CGSWindowID wid,
|
||||||
CGSWindowLevel *level);
|
CGSWindowLevel *level);
|
||||||
|
|
||||||
extern CGSError CGSDisplayHWFill (CGDirectDisplayID id, unsigned int x, unsigned int y,
|
extern CGSError CGSDisplayHWFill (CGDirectDisplayID id, unsigned int x, unsigned int y,
|
||||||
unsigned int w, unsigned int h, unsigned int color);
|
unsigned int w, unsigned int h, unsigned int color);
|
||||||
|
|
||||||
extern CGSError CGSDisplayCanHWFill (CGDirectDisplayID id);
|
extern CGSError CGSDisplayCanHWFill (CGDirectDisplayID id);
|
||||||
|
|
||||||
|
|
@ -182,16 +198,16 @@ static void QZ_DeleteDevice (SDL_VideoDevice *device);
|
||||||
/* Initialization, Query, Setup, and Redrawing functions */
|
/* Initialization, Query, Setup, and Redrawing functions */
|
||||||
static int QZ_VideoInit (_THIS, SDL_PixelFormat *video_format);
|
static int QZ_VideoInit (_THIS, SDL_PixelFormat *video_format);
|
||||||
|
|
||||||
static SDL_Rect** QZ_ListModes (_THIS, SDL_PixelFormat *format,
|
static SDL_Rect** QZ_ListModes (_THIS, SDL_PixelFormat *format,
|
||||||
Uint32 flags);
|
Uint32 flags);
|
||||||
static void QZ_UnsetVideoMode (_THIS);
|
static void QZ_UnsetVideoMode (_THIS);
|
||||||
|
|
||||||
static SDL_Surface* QZ_SetVideoMode (_THIS, SDL_Surface *current,
|
static SDL_Surface* QZ_SetVideoMode (_THIS, SDL_Surface *current,
|
||||||
int width, int height, int bpp,
|
int width, int height, int bpp,
|
||||||
Uint32 flags);
|
Uint32 flags);
|
||||||
static int QZ_ToggleFullScreen (_THIS, int on);
|
static int QZ_ToggleFullScreen (_THIS, int on);
|
||||||
static int QZ_SetColors (_THIS, int first_color,
|
static int QZ_SetColors (_THIS, int first_color,
|
||||||
int num_colors, SDL_Color *colors);
|
int num_colors, SDL_Color *colors);
|
||||||
static void QZ_DirectUpdate (_THIS, int num_rects, SDL_Rect *rects);
|
static void QZ_DirectUpdate (_THIS, int num_rects, SDL_Rect *rects);
|
||||||
static void QZ_UpdateRects (_THIS, int num_rects, SDL_Rect *rects);
|
static void QZ_UpdateRects (_THIS, int num_rects, SDL_Rect *rects);
|
||||||
static void QZ_VideoQuit (_THIS);
|
static void QZ_VideoQuit (_THIS);
|
||||||
|
|
@ -223,8 +239,8 @@ static void QZ_PrivateWarpCursor (_THIS, int x, int y);
|
||||||
|
|
||||||
/* Cursor and Mouse functions */
|
/* Cursor and Mouse functions */
|
||||||
static void QZ_FreeWMCursor (_THIS, WMcursor *cursor);
|
static void QZ_FreeWMCursor (_THIS, WMcursor *cursor);
|
||||||
static WMcursor* QZ_CreateWMCursor (_THIS, Uint8 *data, Uint8 *mask,
|
static WMcursor* QZ_CreateWMCursor (_THIS, Uint8 *data, Uint8 *mask,
|
||||||
int w, int h, int hot_x, int hot_y);
|
int w, int h, int hot_x, int hot_y);
|
||||||
static int QZ_ShowWMCursor (_THIS, WMcursor *cursor);
|
static int QZ_ShowWMCursor (_THIS, WMcursor *cursor);
|
||||||
static void QZ_WarpWMCursor (_THIS, Uint16 x, Uint16 y);
|
static void QZ_WarpWMCursor (_THIS, Uint16 x, Uint16 y);
|
||||||
static void QZ_MoveWMCursor (_THIS, int x, int y);
|
static void QZ_MoveWMCursor (_THIS, int x, int y);
|
||||||
|
|
@ -241,3 +257,7 @@ static int QZ_IconifyWindow (_THIS);
|
||||||
static SDL_GrabMode QZ_GrabInput (_THIS, SDL_GrabMode grab_mode);
|
static SDL_GrabMode QZ_GrabInput (_THIS, SDL_GrabMode grab_mode);
|
||||||
/*static int QZ_GetWMInfo (_THIS, SDL_SysWMinfo *info);*/
|
/*static int QZ_GetWMInfo (_THIS, SDL_SysWMinfo *info);*/
|
||||||
|
|
||||||
|
/* YUV functions */
|
||||||
|
static SDL_Overlay* QZ_CreateYUVOverlay (_THIS, int width, int height,
|
||||||
|
Uint32 format, SDL_Surface *display);
|
||||||
|
|
||||||
|
|
|
||||||
File diff suppressed because it is too large
Load diff
|
|
@ -32,17 +32,17 @@ static void QZ_FreeWMCursor (_THIS, WMcursor *cursor) {
|
||||||
|
|
||||||
/* Use the Carbon cursor routines for now */
|
/* Use the Carbon cursor routines for now */
|
||||||
static WMcursor* QZ_CreateWMCursor (_THIS, Uint8 *data, Uint8 *mask,
|
static WMcursor* QZ_CreateWMCursor (_THIS, Uint8 *data, Uint8 *mask,
|
||||||
int w, int h, int hot_x, int hot_y) {
|
int w, int h, int hot_x, int hot_y) {
|
||||||
WMcursor *cursor;
|
WMcursor *cursor;
|
||||||
int row, bytes;
|
int row, bytes;
|
||||||
|
|
||||||
/* Allocate the cursor memory */
|
/* Allocate the cursor memory */
|
||||||
cursor = (WMcursor *)malloc(sizeof(WMcursor));
|
cursor = (WMcursor *)malloc(sizeof(WMcursor));
|
||||||
if ( cursor == NULL ) {
|
if ( cursor == NULL ) {
|
||||||
SDL_OutOfMemory();
|
SDL_OutOfMemory();
|
||||||
return(NULL);
|
return(NULL);
|
||||||
}
|
}
|
||||||
memset(cursor, 0, sizeof(*cursor));
|
memset(cursor, 0, sizeof(*cursor));
|
||||||
|
|
||||||
if (w > 16)
|
if (w > 16)
|
||||||
w = 16;
|
w = 16;
|
||||||
|
|
@ -50,19 +50,19 @@ static WMcursor* QZ_CreateWMCursor (_THIS, Uint8 *data, Uint8 *mask,
|
||||||
if (h > 16)
|
if (h > 16)
|
||||||
h = 16;
|
h = 16;
|
||||||
|
|
||||||
bytes = (w+7)/8;
|
bytes = (w+7)/8;
|
||||||
|
|
||||||
for ( row=0; row<h; ++row ) {
|
for ( row=0; row<h; ++row ) {
|
||||||
memcpy(&cursor->curs.data[row], data, bytes);
|
memcpy(&cursor->curs.data[row], data, bytes);
|
||||||
data += bytes;
|
data += bytes;
|
||||||
}
|
}
|
||||||
for ( row=0; row<h; ++row ) {
|
for ( row=0; row<h; ++row ) {
|
||||||
memcpy(&cursor->curs.mask[row], mask, bytes);
|
memcpy(&cursor->curs.mask[row], mask, bytes);
|
||||||
mask += bytes;
|
mask += bytes;
|
||||||
}
|
}
|
||||||
cursor->curs.hotSpot.h = hot_x;
|
cursor->curs.hotSpot.h = hot_x;
|
||||||
cursor->curs.hotSpot.v = hot_y;
|
cursor->curs.hotSpot.v = hot_y;
|
||||||
|
|
||||||
return(cursor);
|
return(cursor);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -246,18 +246,18 @@ static void QZ_SetIcon (_THIS, SDL_Surface *icon, Uint8 *mask)
|
||||||
#define ALPHASHIFT 3
|
#define ALPHASHIFT 3
|
||||||
for (i=0;i<masksize;i+=8)
|
for (i=0;i<masksize;i+=8)
|
||||||
for (j=0;j<8;j++)
|
for (j=0;j<8;j++)
|
||||||
surfPtr[ALPHASHIFT+((i+j)<<2)]=(mask[i>>3]&(1<<(7-j)))?0xFF:0x00;
|
surfPtr[ALPHASHIFT+((i+j)<<2)]=(mask[i>>3]&(1<<(7-j)))?0xFF:0x00;
|
||||||
}
|
}
|
||||||
imgrep = [[NSBitmapImageRep alloc]
|
imgrep = [ [ NSBitmapImageRep alloc]
|
||||||
initWithBitmapDataPlanes:(unsigned char **)&mergedSurface->pixels
|
initWithBitmapDataPlanes:(unsigned char **)&mergedSurface->pixels
|
||||||
pixelsWide:icon->w pixelsHigh:icon->h bitsPerSample:8 samplesPerPixel:4
|
pixelsWide:icon->w pixelsHigh:icon->h bitsPerSample:8 samplesPerPixel:4
|
||||||
hasAlpha:YES isPlanar:NO colorSpaceName:NSDeviceRGBColorSpace
|
hasAlpha:YES isPlanar:NO colorSpaceName:NSDeviceRGBColorSpace
|
||||||
bytesPerRow:icon->w<<2 bitsPerPixel:32];
|
bytesPerRow:icon->w<<2 bitsPerPixel:32 ];
|
||||||
img = [[NSImage alloc] initWithSize:imgSize];
|
img = [ [ NSImage alloc ] initWithSize:imgSize ];
|
||||||
[img addRepresentation: imgrep];
|
[ img addRepresentation: imgrep ];
|
||||||
[NSApp setApplicationIconImage:img];
|
[ NSApp setApplicationIconImage:img ];
|
||||||
[img release];
|
[ img release ];
|
||||||
[imgrep release];
|
[ imgrep release ];
|
||||||
SDL_FreeSurface(mergedSurface);
|
SDL_FreeSurface(mergedSurface);
|
||||||
freePool:
|
freePool:
|
||||||
[pool release];
|
[pool release];
|
||||||
|
|
@ -285,19 +285,18 @@ static int QZ_GetWMInfo (_THIS, SDL_SysWMinfo *info) {
|
||||||
static SDL_GrabMode QZ_GrabInput (_THIS, SDL_GrabMode grab_mode) {
|
static SDL_GrabMode QZ_GrabInput (_THIS, SDL_GrabMode grab_mode) {
|
||||||
|
|
||||||
switch (grab_mode) {
|
switch (grab_mode) {
|
||||||
case SDL_GRAB_QUERY:
|
case SDL_GRAB_QUERY:
|
||||||
break;
|
break;
|
||||||
case SDL_GRAB_OFF:
|
case SDL_GRAB_OFF:
|
||||||
CGAssociateMouseAndMouseCursorPosition (1);
|
CGAssociateMouseAndMouseCursorPosition (1);
|
||||||
currentGrabMode = SDL_GRAB_OFF;
|
currentGrabMode = SDL_GRAB_OFF;
|
||||||
break;
|
break;
|
||||||
case SDL_GRAB_ON:
|
case SDL_GRAB_ON:
|
||||||
QZ_WarpWMCursor (this, SDL_VideoSurface->w / 2, SDL_VideoSurface->h / 2);
|
QZ_WarpWMCursor (this, SDL_VideoSurface->w / 2, SDL_VideoSurface->h / 2);
|
||||||
CGAssociateMouseAndMouseCursorPosition (0);
|
CGAssociateMouseAndMouseCursorPosition (0);
|
||||||
currentGrabMode = SDL_GRAB_ON;
|
currentGrabMode = SDL_GRAB_ON;
|
||||||
break;
|
break;
|
||||||
case SDL_GRAB_FULLSCREEN:
|
case SDL_GRAB_FULLSCREEN:
|
||||||
|
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue