sdl-ios-xcode: src/video/quartz/SDL

annotate src/video/quartz/SDL_QuartzWM.m @ 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	7f08bd66f1ca
children	c9ec00d3e8bc

rev	line source
47 45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1 /*
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	2 SDL - Simple DirectMedia Layer
761 c5b2b6d2d1fe Date: Wed, 31 Dec 2003 21:55:30 +0100 Sam Lantinga <slouken@libsdl.org> parents: 683 diff changeset	3 Copyright (C) 1997-2003 Sam Lantinga
47 45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	4
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	5 This library is free software; you can redistribute it and/or
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	6 modify it under the terms of the GNU Library General Public
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	7 License as published by the Free Software Foundation; either
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	8 version 2 of the License, or (at your option) any later version.
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	9
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	10 This library is distributed in the hope that it will be useful,
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	11 but WITHOUT ANY WARRANTY; without even the implied warranty of
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	12 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	13 Library General Public License for more details.
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	14
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	15 You should have received a copy of the GNU Library General Public
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	16 License along with this library; if not, write to the Free
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	17 Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	18
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	19 Sam Lantinga
252 e8157fcb3114 Updated the source with the correct e-mail address Sam Lantinga <slouken@libsdl.org> parents: 168 diff changeset	20 slouken@libsdl.org
47 45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	21 */
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	22
761 c5b2b6d2d1fe Date: Wed, 31 Dec 2003 21:55:30 +0100 Sam Lantinga <slouken@libsdl.org> parents: 683 diff changeset	23 #include "SDL_QuartzVideo.h"
c5b2b6d2d1fe Date: Wed, 31 Dec 2003 21:55:30 +0100 Sam Lantinga <slouken@libsdl.org> parents: 683 diff changeset	24
563 04dcaf3da918 Massive Quartz input enhancements from Darrell Walisser. His email: Ryan C. Gordon <icculus@icculus.org> parents: 501 diff changeset	25
47 45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	26 struct WMcursor {
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	27 Cursor curs;
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	28 };
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	29
761 c5b2b6d2d1fe Date: Wed, 31 Dec 2003 21:55:30 +0100 Sam Lantinga <slouken@libsdl.org> parents: 683 diff changeset	30 void QZ_FreeWMCursor (_THIS, WMcursor *cursor) {
47 45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	31
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	32 if ( cursor != NULL )
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	33 free (cursor);
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	34 }
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	35
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	36 /* Use the Carbon cursor routines for now */
761 c5b2b6d2d1fe Date: Wed, 31 Dec 2003 21:55:30 +0100 Sam Lantinga <slouken@libsdl.org> parents: 683 diff changeset	37 WMcursor* QZ_CreateWMCursor (_THIS, Uint8 data, Uint8 mask,
390 19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 324 diff changeset	38 int w, int h, int hot_x, int hot_y) {
19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 324 diff changeset	39 WMcursor *cursor;
19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 324 diff changeset	40 int row, bytes;
19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 324 diff changeset	41
19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 324 diff changeset	42 /* Allocate the cursor memory */
19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 324 diff changeset	43 cursor = (WMcursor *)malloc(sizeof(WMcursor));
19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 324 diff changeset	44 if ( cursor == NULL ) {
19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 324 diff changeset	45 SDL_OutOfMemory();
19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 324 diff changeset	46 return(NULL);
19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 324 diff changeset	47 }
19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 324 diff changeset	48 memset(cursor, 0, sizeof(*cursor));
168 e92aa316c517 Added Max's patches for building MacOS X apps on command line Sam Lantinga <slouken@libsdl.org> parents: 158 diff changeset	49
e92aa316c517 Added Max's patches for building MacOS X apps on command line Sam Lantinga <slouken@libsdl.org> parents: 158 diff changeset	50 if (w > 16)
e92aa316c517 Added Max's patches for building MacOS X apps on command line Sam Lantinga <slouken@libsdl.org> parents: 158 diff changeset	51 w = 16;
e92aa316c517 Added Max's patches for building MacOS X apps on command line Sam Lantinga <slouken@libsdl.org> parents: 158 diff changeset	52
e92aa316c517 Added Max's patches for building MacOS X apps on command line Sam Lantinga <slouken@libsdl.org> parents: 158 diff changeset	53 if (h > 16)
e92aa316c517 Added Max's patches for building MacOS X apps on command line Sam Lantinga <slouken@libsdl.org> parents: 158 diff changeset	54 h = 16;
e92aa316c517 Added Max's patches for building MacOS X apps on command line Sam Lantinga <slouken@libsdl.org> parents: 158 diff changeset	55
390 19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 324 diff changeset	56 bytes = (w+7)/8;
168 e92aa316c517 Added Max's patches for building MacOS X apps on command line Sam Lantinga <slouken@libsdl.org> parents: 158 diff changeset	57
390 19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 324 diff changeset	58 for ( row=0; row<h; ++row ) {
19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 324 diff changeset	59 memcpy(&cursor->curs.data[row], data, bytes);
19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 324 diff changeset	60 data += bytes;
19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 324 diff changeset	61 }
19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 324 diff changeset	62 for ( row=0; row<h; ++row ) {
19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 324 diff changeset	63 memcpy(&cursor->curs.mask[row], mask, bytes);
19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 324 diff changeset	64 mask += bytes;
19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 324 diff changeset	65 }
19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 324 diff changeset	66 cursor->curs.hotSpot.h = hot_x;
19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 324 diff changeset	67 cursor->curs.hotSpot.v = hot_y;
19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 324 diff changeset	68
168 e92aa316c517 Added Max's patches for building MacOS X apps on command line Sam Lantinga <slouken@libsdl.org> parents: 158 diff changeset	69 return(cursor);
47 45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	70 }
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	71
761 c5b2b6d2d1fe Date: Wed, 31 Dec 2003 21:55:30 +0100 Sam Lantinga <slouken@libsdl.org> parents: 683 diff changeset	72 void QZ_ShowMouse (_THIS) {
c5b2b6d2d1fe Date: Wed, 31 Dec 2003 21:55:30 +0100 Sam Lantinga <slouken@libsdl.org> parents: 683 diff changeset	73 if (!cursor_visible) {
c5b2b6d2d1fe Date: Wed, 31 Dec 2003 21:55:30 +0100 Sam Lantinga <slouken@libsdl.org> parents: 683 diff changeset	74 [ NSCursor unhide ];
c5b2b6d2d1fe Date: Wed, 31 Dec 2003 21:55:30 +0100 Sam Lantinga <slouken@libsdl.org> parents: 683 diff changeset	75 cursor_visible = YES;
c5b2b6d2d1fe Date: Wed, 31 Dec 2003 21:55:30 +0100 Sam Lantinga <slouken@libsdl.org> parents: 683 diff changeset	76 }
c5b2b6d2d1fe Date: Wed, 31 Dec 2003 21:55:30 +0100 Sam Lantinga <slouken@libsdl.org> parents: 683 diff changeset	77 }
c5b2b6d2d1fe Date: Wed, 31 Dec 2003 21:55:30 +0100 Sam Lantinga <slouken@libsdl.org> parents: 683 diff changeset	78
c5b2b6d2d1fe Date: Wed, 31 Dec 2003 21:55:30 +0100 Sam Lantinga <slouken@libsdl.org> parents: 683 diff changeset	79 void QZ_HideMouse (_THIS) {
779 68c8da837fc0 Date: Tue, 6 Jan 2004 21:54:02 +0100 Sam Lantinga <slouken@libsdl.org> parents: 761 diff changeset	80 BOOL isInGameWin = QZ_IsMouseInWindow (this);
68c8da837fc0 Date: Tue, 6 Jan 2004 21:54:02 +0100 Sam Lantinga <slouken@libsdl.org> parents: 761 diff changeset	81 if (isInGameWin && cursor_visible) {
761 c5b2b6d2d1fe Date: Wed, 31 Dec 2003 21:55:30 +0100 Sam Lantinga <slouken@libsdl.org> parents: 683 diff changeset	82 [ NSCursor hide ];
c5b2b6d2d1fe Date: Wed, 31 Dec 2003 21:55:30 +0100 Sam Lantinga <slouken@libsdl.org> parents: 683 diff changeset	83 cursor_visible = NO;
c5b2b6d2d1fe Date: Wed, 31 Dec 2003 21:55:30 +0100 Sam Lantinga <slouken@libsdl.org> parents: 683 diff changeset	84 }
c5b2b6d2d1fe Date: Wed, 31 Dec 2003 21:55:30 +0100 Sam Lantinga <slouken@libsdl.org> parents: 683 diff changeset	85 }
c5b2b6d2d1fe Date: Wed, 31 Dec 2003 21:55:30 +0100 Sam Lantinga <slouken@libsdl.org> parents: 683 diff changeset	86
779 68c8da837fc0 Date: Tue, 6 Jan 2004 21:54:02 +0100 Sam Lantinga <slouken@libsdl.org> parents: 761 diff changeset	87 BOOL QZ_IsMouseInWindow (_THIS) {
1192 54aa9aa32327 To: sdl@libsdl.org Ryan C. Gordon <icculus@icculus.org> parents: 983 diff changeset	88 if (mode_flags & SDL_FULLSCREEN) return YES;
54aa9aa32327 To: sdl@libsdl.org Ryan C. Gordon <icculus@icculus.org> parents: 983 diff changeset	89 else {
54aa9aa32327 To: sdl@libsdl.org Ryan C. Gordon <icculus@icculus.org> parents: 983 diff changeset	90 NSPoint p = [ qz_window mouseLocationOutsideOfEventStream ];
54aa9aa32327 To: sdl@libsdl.org Ryan C. Gordon <icculus@icculus.org> parents: 983 diff changeset	91 p.y -= 1.0f; /* Apparently y goes from 1 to h, not from 0 to h-1 (i.e. the "location of the mouse" seems to be defined as "the location of the top left corner of the mouse pointer's hot pixel" */
54aa9aa32327 To: sdl@libsdl.org Ryan C. Gordon <icculus@icculus.org> parents: 983 diff changeset	92 return NSPointInRect(p, [ window_view frame ]);
54aa9aa32327 To: sdl@libsdl.org Ryan C. Gordon <icculus@icculus.org> parents: 983 diff changeset	93 }
779 68c8da837fc0 Date: Tue, 6 Jan 2004 21:54:02 +0100 Sam Lantinga <slouken@libsdl.org> parents: 761 diff changeset	94 }
68c8da837fc0 Date: Tue, 6 Jan 2004 21:54:02 +0100 Sam Lantinga <slouken@libsdl.org> parents: 761 diff changeset	95
761 c5b2b6d2d1fe Date: Wed, 31 Dec 2003 21:55:30 +0100 Sam Lantinga <slouken@libsdl.org> parents: 683 diff changeset	96 int QZ_ShowWMCursor (_THIS, WMcursor *cursor) {
47 45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	97
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	98 if ( cursor == NULL) {
761 c5b2b6d2d1fe Date: Wed, 31 Dec 2003 21:55:30 +0100 Sam Lantinga <slouken@libsdl.org> parents: 683 diff changeset	99 if ( cursor_should_be_visible ) {
c5b2b6d2d1fe Date: Wed, 31 Dec 2003 21:55:30 +0100 Sam Lantinga <slouken@libsdl.org> parents: 683 diff changeset	100 QZ_HideMouse (this);
c5b2b6d2d1fe Date: Wed, 31 Dec 2003 21:55:30 +0100 Sam Lantinga <slouken@libsdl.org> parents: 683 diff changeset	101 cursor_should_be_visible = NO;
563 04dcaf3da918 Massive Quartz input enhancements from Darrell Walisser. His email: Ryan C. Gordon <icculus@icculus.org> parents: 501 diff changeset	102 QZ_ChangeGrabState (this, QZ_HIDECURSOR);
47 45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	103 }
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	104 }
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	105 else {
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	106 SetCursor(&cursor->curs);
761 c5b2b6d2d1fe Date: Wed, 31 Dec 2003 21:55:30 +0100 Sam Lantinga <slouken@libsdl.org> parents: 683 diff changeset	107 if ( ! cursor_should_be_visible ) {
c5b2b6d2d1fe Date: Wed, 31 Dec 2003 21:55:30 +0100 Sam Lantinga <slouken@libsdl.org> parents: 683 diff changeset	108 QZ_ShowMouse (this);
c5b2b6d2d1fe Date: Wed, 31 Dec 2003 21:55:30 +0100 Sam Lantinga <slouken@libsdl.org> parents: 683 diff changeset	109 cursor_should_be_visible = YES;
563 04dcaf3da918 Massive Quartz input enhancements from Darrell Walisser. His email: Ryan C. Gordon <icculus@icculus.org> parents: 501 diff changeset	110 QZ_ChangeGrabState (this, QZ_SHOWCURSOR);
47 45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	111 }
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	112 }
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	113
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	114 return 1;
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	115 }
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	116
501 74262d2647ca Lots of cleanups by Darrell, added the ability to resize Cocoa windows. Sam Lantinga <slouken@libsdl.org> parents: 390 diff changeset	117 /*
74262d2647ca Lots of cleanups by Darrell, added the ability to resize Cocoa windows. Sam Lantinga <slouken@libsdl.org> parents: 390 diff changeset	118 Coordinate conversion functions, for convenience
74262d2647ca Lots of cleanups by Darrell, added the ability to resize Cocoa windows. Sam Lantinga <slouken@libsdl.org> parents: 390 diff changeset	119 Cocoa sets the origin at the lower left corner of the window/screen
74262d2647ca Lots of cleanups by Darrell, added the ability to resize Cocoa windows. Sam Lantinga <slouken@libsdl.org> parents: 390 diff changeset	120 SDL, CoreGraphics/WindowServer, and QuickDraw use the origin at the upper left corner
74262d2647ca Lots of cleanups by Darrell, added the ability to resize Cocoa windows. Sam Lantinga <slouken@libsdl.org> parents: 390 diff changeset	121 The routines were written so they could be called before SetVideoMode() has finished;
74262d2647ca Lots of cleanups by Darrell, added the ability to resize Cocoa windows. Sam Lantinga <slouken@libsdl.org> parents: 390 diff changeset	122 this might have limited usefulness at the moment, but the extra cost is trivial.
74262d2647ca Lots of cleanups by Darrell, added the ability to resize Cocoa windows. Sam Lantinga <slouken@libsdl.org> parents: 390 diff changeset	123 */
272 d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 269 diff changeset	124
d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 269 diff changeset	125 /* Convert Cocoa screen coordinate to Cocoa window coordinate */
761 c5b2b6d2d1fe Date: Wed, 31 Dec 2003 21:55:30 +0100 Sam Lantinga <slouken@libsdl.org> parents: 683 diff changeset	126 void QZ_PrivateGlobalToLocal (_THIS, NSPoint *p) {
47 45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	127
272 d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 269 diff changeset	128 p = [ qz_window convertScreenToBase:p ];
d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 269 diff changeset	129 }
d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 269 diff changeset	130
d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 269 diff changeset	131
d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 269 diff changeset	132 /* Convert Cocoa window coordinate to Cocoa screen coordinate */
761 c5b2b6d2d1fe Date: Wed, 31 Dec 2003 21:55:30 +0100 Sam Lantinga <slouken@libsdl.org> parents: 683 diff changeset	133 void QZ_PrivateLocalToGlobal (_THIS, NSPoint *p) {
272 d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 269 diff changeset	134
d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 269 diff changeset	135 p = [ qz_window convertBaseToScreen:p ];
d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 269 diff changeset	136 }
d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 269 diff changeset	137
d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 269 diff changeset	138 /* Convert SDL coordinate to Cocoa coordinate */
761 c5b2b6d2d1fe Date: Wed, 31 Dec 2003 21:55:30 +0100 Sam Lantinga <slouken@libsdl.org> parents: 683 diff changeset	139 void QZ_PrivateSDLToCocoa (_THIS, NSPoint *p) {
272 d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 269 diff changeset	140
d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 269 diff changeset	141 if ( CGDisplayIsCaptured (display_id) ) { /* capture signals fullscreen */
d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 269 diff changeset	142
876 9e84d106ec19 (Said Max Horn on the SDL mailing list...) Ryan C. Gordon <icculus@icculus.org> parents: 779 diff changeset	143 p->y = CGDisplayPixelsHigh (display_id) - p->y;
272 d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 269 diff changeset	144 }
d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 269 diff changeset	145 else {
934 af585d6efec8 Date: Thu, 17 Jun 2004 11:38:51 -0700 (PDT) Sam Lantinga <slouken@libsdl.org> parents: 876 diff changeset	146
af585d6efec8 Date: Thu, 17 Jun 2004 11:38:51 -0700 (PDT) Sam Lantinga <slouken@libsdl.org> parents: 876 diff changeset	147 p = [ window_view convertPoint:p toView: nil ];
1192 54aa9aa32327 To: sdl@libsdl.org Ryan C. Gordon <icculus@icculus.org> parents: 983 diff changeset	148
54aa9aa32327 To: sdl@libsdl.org Ryan C. Gordon <icculus@icculus.org> parents: 983 diff changeset	149 /* We need a workaround in OpenGL mode */
54aa9aa32327 To: sdl@libsdl.org Ryan C. Gordon <icculus@icculus.org> parents: 983 diff changeset	150 if ( SDL_VideoSurface->flags & SDL_OPENGL ) {
54aa9aa32327 To: sdl@libsdl.org Ryan C. Gordon <icculus@icculus.org> parents: 983 diff changeset	151 p->y = [window_view frame].size.height - p->y;
54aa9aa32327 To: sdl@libsdl.org Ryan C. Gordon <icculus@icculus.org> parents: 983 diff changeset	152 }
272 d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 269 diff changeset	153 }
d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 269 diff changeset	154 }
d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 269 diff changeset	155
d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 269 diff changeset	156 /* Convert Cocoa coordinate to SDL coordinate */
761 c5b2b6d2d1fe Date: Wed, 31 Dec 2003 21:55:30 +0100 Sam Lantinga <slouken@libsdl.org> parents: 683 diff changeset	157 void QZ_PrivateCocoaToSDL (_THIS, NSPoint *p) {
272 d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 269 diff changeset	158
683 5d2f027b3349 Date: Sat, 9 Aug 2003 20:14:06 -0400 Sam Lantinga <slouken@libsdl.org> parents: 615 diff changeset	159 if ( CGDisplayIsCaptured (display_id) ) { /* capture signals fullscreen */
5d2f027b3349 Date: Sat, 9 Aug 2003 20:14:06 -0400 Sam Lantinga <slouken@libsdl.org> parents: 615 diff changeset	160
876 9e84d106ec19 (Said Max Horn on the SDL mailing list...) Ryan C. Gordon <icculus@icculus.org> parents: 779 diff changeset	161 p->y = CGDisplayPixelsHigh (display_id) - p->y;
683 5d2f027b3349 Date: Sat, 9 Aug 2003 20:14:06 -0400 Sam Lantinga <slouken@libsdl.org> parents: 615 diff changeset	162 }
5d2f027b3349 Date: Sat, 9 Aug 2003 20:14:06 -0400 Sam Lantinga <slouken@libsdl.org> parents: 615 diff changeset	163 else {
934 af585d6efec8 Date: Thu, 17 Jun 2004 11:38:51 -0700 (PDT) Sam Lantinga <slouken@libsdl.org> parents: 876 diff changeset	164
af585d6efec8 Date: Thu, 17 Jun 2004 11:38:51 -0700 (PDT) Sam Lantinga <slouken@libsdl.org> parents: 876 diff changeset	165 p = [ window_view convertPoint:p fromView: nil ];
683 5d2f027b3349 Date: Sat, 9 Aug 2003 20:14:06 -0400 Sam Lantinga <slouken@libsdl.org> parents: 615 diff changeset	166
983 7f08bd66f1ca Date: Fri, 19 Nov 2004 06:23:53 -0800 (PST) Sam Lantinga <slouken@libsdl.org> parents: 952 diff changeset	167 /* We need a workaround in OpenGL mode */
7f08bd66f1ca Date: Fri, 19 Nov 2004 06:23:53 -0800 (PST) Sam Lantinga <slouken@libsdl.org> parents: 952 diff changeset	168 if ( SDL_VideoSurface->flags & SDL_OPENGL ) {
1192 54aa9aa32327 To: sdl@libsdl.org Ryan C. Gordon <icculus@icculus.org> parents: 983 diff changeset	169 p->y = [window_view frame].size.height - p->y;
952 6f5c8bd997aa Hum. Sam Lantinga <slouken@libsdl.org> parents: 951 diff changeset	170 }
683 5d2f027b3349 Date: Sat, 9 Aug 2003 20:14:06 -0400 Sam Lantinga <slouken@libsdl.org> parents: 615 diff changeset	171 }
272 d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 269 diff changeset	172 }
d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 269 diff changeset	173
d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 269 diff changeset	174 /* Convert SDL coordinate to window server (CoreGraphics) coordinate */
761 c5b2b6d2d1fe Date: Wed, 31 Dec 2003 21:55:30 +0100 Sam Lantinga <slouken@libsdl.org> parents: 683 diff changeset	175 CGPoint QZ_PrivateSDLToCG (_THIS, NSPoint *p) {
272 d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 269 diff changeset	176
d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 269 diff changeset	177 CGPoint cgp;
d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 269 diff changeset	178
d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 269 diff changeset	179 if ( ! CGDisplayIsCaptured (display_id) ) { /* not captured => not fullscreen => local coord */
d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 269 diff changeset	180
d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 269 diff changeset	181 int height;
d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 269 diff changeset	182
d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 269 diff changeset	183 QZ_PrivateSDLToCocoa (this, p);
d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 269 diff changeset	184 QZ_PrivateLocalToGlobal (this, p);
d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 269 diff changeset	185
d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 269 diff changeset	186 height = CGDisplayPixelsHigh (display_id);
d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 269 diff changeset	187 p->y = height - p->y;
d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 269 diff changeset	188 }
d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 269 diff changeset	189
d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 269 diff changeset	190 cgp.x = p->x;
d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 269 diff changeset	191 cgp.y = p->y;
d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 269 diff changeset	192
d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 269 diff changeset	193 return cgp;
d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 269 diff changeset	194 }
d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 269 diff changeset	195
683 5d2f027b3349 Date: Sat, 9 Aug 2003 20:14:06 -0400 Sam Lantinga <slouken@libsdl.org> parents: 615 diff changeset	196 #if 0 /* Dead code */
272 d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 269 diff changeset	197 /* Convert window server (CoreGraphics) coordinate to SDL coordinate */
761 c5b2b6d2d1fe Date: Wed, 31 Dec 2003 21:55:30 +0100 Sam Lantinga <slouken@libsdl.org> parents: 683 diff changeset	198 void QZ_PrivateCGToSDL (_THIS, NSPoint *p) {
272 d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 269 diff changeset	199
d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 269 diff changeset	200 if ( ! CGDisplayIsCaptured (display_id) ) { /* not captured => not fullscreen => local coord */
d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 269 diff changeset	201
d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 269 diff changeset	202 int height;
d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 269 diff changeset	203
d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 269 diff changeset	204 /* Convert CG Global to Cocoa Global */
d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 269 diff changeset	205 height = CGDisplayPixelsHigh (display_id);
d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 269 diff changeset	206 p->y = height - p->y;
d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 269 diff changeset	207
d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 269 diff changeset	208 QZ_PrivateGlobalToLocal (this, p);
d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 269 diff changeset	209 QZ_PrivateCocoaToSDL (this, p);
47 45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	210 }
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	211 }
683 5d2f027b3349 Date: Sat, 9 Aug 2003 20:14:06 -0400 Sam Lantinga <slouken@libsdl.org> parents: 615 diff changeset	212 #endif /* Dead code */
47 45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	213
761 c5b2b6d2d1fe Date: Wed, 31 Dec 2003 21:55:30 +0100 Sam Lantinga <slouken@libsdl.org> parents: 683 diff changeset	214 void QZ_PrivateWarpCursor (_THIS, int x, int y) {
272 d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 269 diff changeset	215
d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 269 diff changeset	216 NSPoint p;
d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 269 diff changeset	217 CGPoint cgp;
47 45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	218
272 d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 269 diff changeset	219 p = NSMakePoint (x, y);
563 04dcaf3da918 Massive Quartz input enhancements from Darrell Walisser. His email: Ryan C. Gordon <icculus@icculus.org> parents: 501 diff changeset	220 cgp = QZ_PrivateSDLToCG (this, &p);
04dcaf3da918 Massive Quartz input enhancements from Darrell Walisser. His email: Ryan C. Gordon <icculus@icculus.org> parents: 501 diff changeset	221
04dcaf3da918 Massive Quartz input enhancements from Darrell Walisser. His email: Ryan C. Gordon <icculus@icculus.org> parents: 501 diff changeset	222 /* this is the magic call that fixes cursor "freezing" after warp */
04dcaf3da918 Massive Quartz input enhancements from Darrell Walisser. His email: Ryan C. Gordon <icculus@icculus.org> parents: 501 diff changeset	223 CGSetLocalEventsSuppressionInterval (0.0);
04dcaf3da918 Massive Quartz input enhancements from Darrell Walisser. His email: Ryan C. Gordon <icculus@icculus.org> parents: 501 diff changeset	224 CGWarpMouseCursorPosition (cgp);
272 d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 269 diff changeset	225 }
d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 269 diff changeset	226
761 c5b2b6d2d1fe Date: Wed, 31 Dec 2003 21:55:30 +0100 Sam Lantinga <slouken@libsdl.org> parents: 683 diff changeset	227 void QZ_WarpWMCursor (_THIS, Uint16 x, Uint16 y) {
272 d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 269 diff changeset	228
47 45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	229 /* Only allow warping when in foreground */
761 c5b2b6d2d1fe Date: Wed, 31 Dec 2003 21:55:30 +0100 Sam Lantinga <slouken@libsdl.org> parents: 683 diff changeset	230 if ( ! [ NSApp isActive ] )
47 45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	231 return;
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	232
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	233 /* Do the actual warp */
272 d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 269 diff changeset	234 QZ_PrivateWarpCursor (this, x, y);
563 04dcaf3da918 Massive Quartz input enhancements from Darrell Walisser. His email: Ryan C. Gordon <icculus@icculus.org> parents: 501 diff changeset	235
04dcaf3da918 Massive Quartz input enhancements from Darrell Walisser. His email: Ryan C. Gordon <icculus@icculus.org> parents: 501 diff changeset	236 /* Generate the mouse moved event */
04dcaf3da918 Massive Quartz input enhancements from Darrell Walisser. His email: Ryan C. Gordon <icculus@icculus.org> parents: 501 diff changeset	237 SDL_PrivateMouseMotion (0, 0, x, y);
47 45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	238 }
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	239
761 c5b2b6d2d1fe Date: Wed, 31 Dec 2003 21:55:30 +0100 Sam Lantinga <slouken@libsdl.org> parents: 683 diff changeset	240 void QZ_MoveWMCursor (_THIS, int x, int y) { }
c5b2b6d2d1fe Date: Wed, 31 Dec 2003 21:55:30 +0100 Sam Lantinga <slouken@libsdl.org> parents: 683 diff changeset	241 void QZ_CheckMouseMode (_THIS) { }
47 45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	242
761 c5b2b6d2d1fe Date: Wed, 31 Dec 2003 21:55:30 +0100 Sam Lantinga <slouken@libsdl.org> parents: 683 diff changeset	243 void QZ_SetCaption (_THIS, const char title, const char icon) {
47 45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	244
158 4382c38dfbee Date: Tue, 21 Aug 2001 03:50:01 +0200 Sam Lantinga <slouken@libsdl.org> parents: 58 diff changeset	245 if ( qz_window != nil ) {
58 bd6b0a910a65 * Removed fullscreen menu option from the "Window" menu Sam Lantinga <slouken@lokigames.com> parents: 47 diff changeset	246 NSString *string;
bd6b0a910a65 * Removed fullscreen menu option from the "Window" menu Sam Lantinga <slouken@lokigames.com> parents: 47 diff changeset	247 if ( title != NULL ) {
951 121f56c1277d Date: Sun, 29 Aug 2004 20:55:54 +0200 Sam Lantinga <slouken@libsdl.org> parents: 934 diff changeset	248 string = [ [ NSString alloc ] initWithUTF8String:title ];
158 4382c38dfbee Date: Tue, 21 Aug 2001 03:50:01 +0200 Sam Lantinga <slouken@libsdl.org> parents: 58 diff changeset	249 [ qz_window setTitle:string ];
58 bd6b0a910a65 * Removed fullscreen menu option from the "Window" menu Sam Lantinga <slouken@lokigames.com> parents: 47 diff changeset	250 [ string release ];
bd6b0a910a65 * Removed fullscreen menu option from the "Window" menu Sam Lantinga <slouken@lokigames.com> parents: 47 diff changeset	251 }
bd6b0a910a65 * Removed fullscreen menu option from the "Window" menu Sam Lantinga <slouken@lokigames.com> parents: 47 diff changeset	252 if ( icon != NULL ) {
951 121f56c1277d Date: Sun, 29 Aug 2004 20:55:54 +0200 Sam Lantinga <slouken@libsdl.org> parents: 934 diff changeset	253 string = [ [ NSString alloc ] initWithUTF8String:icon ];
158 4382c38dfbee Date: Tue, 21 Aug 2001 03:50:01 +0200 Sam Lantinga <slouken@libsdl.org> parents: 58 diff changeset	254 [ qz_window setMiniwindowTitle:string ];
58 bd6b0a910a65 * Removed fullscreen menu option from the "Window" menu Sam Lantinga <slouken@lokigames.com> parents: 47 diff changeset	255 [ string release ];
bd6b0a910a65 * Removed fullscreen menu option from the "Window" menu Sam Lantinga <slouken@lokigames.com> parents: 47 diff changeset	256 }
bd6b0a910a65 * Removed fullscreen menu option from the "Window" menu Sam Lantinga <slouken@lokigames.com> parents: 47 diff changeset	257 }
47 45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	258 }
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	259
761 c5b2b6d2d1fe Date: Wed, 31 Dec 2003 21:55:30 +0100 Sam Lantinga <slouken@libsdl.org> parents: 683 diff changeset	260 void QZ_SetIcon (_THIS, SDL_Surface icon, Uint8 mask)
269 4125b9859c71 Added Quartz version of SDL_SetIcon() for MacOS X (thanks Bob) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	261 {
501 74262d2647ca Lots of cleanups by Darrell, added the ability to resize Cocoa windows. Sam Lantinga <slouken@libsdl.org> parents: 390 diff changeset	262 NSBitmapImageRep *imgrep;
74262d2647ca Lots of cleanups by Darrell, added the ability to resize Cocoa windows. Sam Lantinga <slouken@libsdl.org> parents: 390 diff changeset	263 NSImage *img;
74262d2647ca Lots of cleanups by Darrell, added the ability to resize Cocoa windows. Sam Lantinga <slouken@libsdl.org> parents: 390 diff changeset	264 SDL_Surface *mergedSurface;
592 1970e458070d Fixed crash in SDL_SetIcon() under Quartz (thanks Darrell!) Sam Lantinga <slouken@libsdl.org> parents: 563 diff changeset	265 int i,j;
501 74262d2647ca Lots of cleanups by Darrell, added the ability to resize Cocoa windows. Sam Lantinga <slouken@libsdl.org> parents: 390 diff changeset	266 NSAutoreleasePool *pool;
74262d2647ca Lots of cleanups by Darrell, added the ability to resize Cocoa windows. Sam Lantinga <slouken@libsdl.org> parents: 390 diff changeset	267 SDL_Rect rrect;
74262d2647ca Lots of cleanups by Darrell, added the ability to resize Cocoa windows. Sam Lantinga <slouken@libsdl.org> parents: 390 diff changeset	268 NSSize imgSize = {icon->w, icon->h};
74262d2647ca Lots of cleanups by Darrell, added the ability to resize Cocoa windows. Sam Lantinga <slouken@libsdl.org> parents: 390 diff changeset	269
74262d2647ca Lots of cleanups by Darrell, added the ability to resize Cocoa windows. Sam Lantinga <slouken@libsdl.org> parents: 390 diff changeset	270 pool = [ [ NSAutoreleasePool alloc ] init ];
74262d2647ca Lots of cleanups by Darrell, added the ability to resize Cocoa windows. Sam Lantinga <slouken@libsdl.org> parents: 390 diff changeset	271 SDL_GetClipRect(icon, &rrect);
74262d2647ca Lots of cleanups by Darrell, added the ability to resize Cocoa windows. Sam Lantinga <slouken@libsdl.org> parents: 390 diff changeset	272
74262d2647ca Lots of cleanups by Darrell, added the ability to resize Cocoa windows. Sam Lantinga <slouken@libsdl.org> parents: 390 diff changeset	273 /* create a big endian RGBA surface */
74262d2647ca Lots of cleanups by Darrell, added the ability to resize Cocoa windows. Sam Lantinga <slouken@libsdl.org> parents: 390 diff changeset	274 mergedSurface = SDL_CreateRGBSurface(SDL_SWSURFACE\|SDL_SRCALPHA,
74262d2647ca Lots of cleanups by Darrell, added the ability to resize Cocoa windows. Sam Lantinga <slouken@libsdl.org> parents: 390 diff changeset	275 icon->w, icon->h, 32, 0xff<<24, 0xff<<16, 0xff<<8, 0xff<<0);
74262d2647ca Lots of cleanups by Darrell, added the ability to resize Cocoa windows. Sam Lantinga <slouken@libsdl.org> parents: 390 diff changeset	276 if (mergedSurface==NULL) {
324 f25f666d609a * empty log message * Sam Lantinga <slouken@libsdl.org> parents: 303 diff changeset	277 NSLog(@"Error creating surface for merge");
f25f666d609a * empty log message * Sam Lantinga <slouken@libsdl.org> parents: 303 diff changeset	278 goto freePool;
f25f666d609a * empty log message * Sam Lantinga <slouken@libsdl.org> parents: 303 diff changeset	279 }
501 74262d2647ca Lots of cleanups by Darrell, added the ability to resize Cocoa windows. Sam Lantinga <slouken@libsdl.org> parents: 390 diff changeset	280
592 1970e458070d Fixed crash in SDL_SetIcon() under Quartz (thanks Darrell!) Sam Lantinga <slouken@libsdl.org> parents: 563 diff changeset	281 if (mergedSurface->pitch !=
1970e458070d Fixed crash in SDL_SetIcon() under Quartz (thanks Darrell!) Sam Lantinga <slouken@libsdl.org> parents: 563 diff changeset	282 mergedSurface->format->BytesPerPixel * mergedSurface->w) {
1970e458070d Fixed crash in SDL_SetIcon() under Quartz (thanks Darrell!) Sam Lantinga <slouken@libsdl.org> parents: 563 diff changeset	283 SDL_SetError ("merged surface has wrong format");
1970e458070d Fixed crash in SDL_SetIcon() under Quartz (thanks Darrell!) Sam Lantinga <slouken@libsdl.org> parents: 563 diff changeset	284 SDL_FreeSurface (mergedSurface);
1970e458070d Fixed crash in SDL_SetIcon() under Quartz (thanks Darrell!) Sam Lantinga <slouken@libsdl.org> parents: 563 diff changeset	285 goto freePool;
1970e458070d Fixed crash in SDL_SetIcon() under Quartz (thanks Darrell!) Sam Lantinga <slouken@libsdl.org> parents: 563 diff changeset	286 }
1970e458070d Fixed crash in SDL_SetIcon() under Quartz (thanks Darrell!) Sam Lantinga <slouken@libsdl.org> parents: 563 diff changeset	287
501 74262d2647ca Lots of cleanups by Darrell, added the ability to resize Cocoa windows. Sam Lantinga <slouken@libsdl.org> parents: 390 diff changeset	288 if (SDL_BlitSurface(icon,&rrect,mergedSurface,&rrect)) {
74262d2647ca Lots of cleanups by Darrell, added the ability to resize Cocoa windows. Sam Lantinga <slouken@libsdl.org> parents: 390 diff changeset	289 NSLog(@"Error blitting to mergedSurface");
74262d2647ca Lots of cleanups by Darrell, added the ability to resize Cocoa windows. Sam Lantinga <slouken@libsdl.org> parents: 390 diff changeset	290 goto freePool;
74262d2647ca Lots of cleanups by Darrell, added the ability to resize Cocoa windows. Sam Lantinga <slouken@libsdl.org> parents: 390 diff changeset	291 }
74262d2647ca Lots of cleanups by Darrell, added the ability to resize Cocoa windows. Sam Lantinga <slouken@libsdl.org> parents: 390 diff changeset	292
74262d2647ca Lots of cleanups by Darrell, added the ability to resize Cocoa windows. Sam Lantinga <slouken@libsdl.org> parents: 390 diff changeset	293 if (mask) {
592 1970e458070d Fixed crash in SDL_SetIcon() under Quartz (thanks Darrell!) Sam Lantinga <slouken@libsdl.org> parents: 563 diff changeset	294
1970e458070d Fixed crash in SDL_SetIcon() under Quartz (thanks Darrell!) Sam Lantinga <slouken@libsdl.org> parents: 563 diff changeset	295 Uint32 *pixels = mergedSurface->pixels;
1970e458070d Fixed crash in SDL_SetIcon() under Quartz (thanks Darrell!) Sam Lantinga <slouken@libsdl.org> parents: 563 diff changeset	296 for (i = 0; i < mergedSurface->h; i++) {
1970e458070d Fixed crash in SDL_SetIcon() under Quartz (thanks Darrell!) Sam Lantinga <slouken@libsdl.org> parents: 563 diff changeset	297 for (j = 0; j < mergedSurface->w; j++) {
1970e458070d Fixed crash in SDL_SetIcon() under Quartz (thanks Darrell!) Sam Lantinga <slouken@libsdl.org> parents: 563 diff changeset	298
1970e458070d Fixed crash in SDL_SetIcon() under Quartz (thanks Darrell!) Sam Lantinga <slouken@libsdl.org> parents: 563 diff changeset	299 int index = i * mergedSurface->w + j;
1970e458070d Fixed crash in SDL_SetIcon() under Quartz (thanks Darrell!) Sam Lantinga <slouken@libsdl.org> parents: 563 diff changeset	300 int mindex = index >> 3;
1970e458070d Fixed crash in SDL_SetIcon() under Quartz (thanks Darrell!) Sam Lantinga <slouken@libsdl.org> parents: 563 diff changeset	301 int bindex = 7 - (index & 0x7);
1970e458070d Fixed crash in SDL_SetIcon() under Quartz (thanks Darrell!) Sam Lantinga <slouken@libsdl.org> parents: 563 diff changeset	302
1970e458070d Fixed crash in SDL_SetIcon() under Quartz (thanks Darrell!) Sam Lantinga <slouken@libsdl.org> parents: 563 diff changeset	303 if (mask[mindex] & (1 << bindex))
1970e458070d Fixed crash in SDL_SetIcon() under Quartz (thanks Darrell!) Sam Lantinga <slouken@libsdl.org> parents: 563 diff changeset	304 pixels[index] \|= 0x000000FF;
1970e458070d Fixed crash in SDL_SetIcon() under Quartz (thanks Darrell!) Sam Lantinga <slouken@libsdl.org> parents: 563 diff changeset	305 else
1970e458070d Fixed crash in SDL_SetIcon() under Quartz (thanks Darrell!) Sam Lantinga <slouken@libsdl.org> parents: 563 diff changeset	306 pixels[index] &= 0xFFFFFF00;
1970e458070d Fixed crash in SDL_SetIcon() under Quartz (thanks Darrell!) Sam Lantinga <slouken@libsdl.org> parents: 563 diff changeset	307 }
1970e458070d Fixed crash in SDL_SetIcon() under Quartz (thanks Darrell!) Sam Lantinga <slouken@libsdl.org> parents: 563 diff changeset	308 }
501 74262d2647ca Lots of cleanups by Darrell, added the ability to resize Cocoa windows. Sam Lantinga <slouken@libsdl.org> parents: 390 diff changeset	309 }
74262d2647ca Lots of cleanups by Darrell, added the ability to resize Cocoa windows. Sam Lantinga <slouken@libsdl.org> parents: 390 diff changeset	310
74262d2647ca Lots of cleanups by Darrell, added the ability to resize Cocoa windows. Sam Lantinga <slouken@libsdl.org> parents: 390 diff changeset	311 imgrep = [ [ NSBitmapImageRep alloc]
74262d2647ca Lots of cleanups by Darrell, added the ability to resize Cocoa windows. Sam Lantinga <slouken@libsdl.org> parents: 390 diff changeset	312 initWithBitmapDataPlanes:(unsigned char **)&mergedSurface->pixels
74262d2647ca Lots of cleanups by Darrell, added the ability to resize Cocoa windows. Sam Lantinga <slouken@libsdl.org> parents: 390 diff changeset	313 pixelsWide:icon->w pixelsHigh:icon->h bitsPerSample:8 samplesPerPixel:4
74262d2647ca Lots of cleanups by Darrell, added the ability to resize Cocoa windows. Sam Lantinga <slouken@libsdl.org> parents: 390 diff changeset	314 hasAlpha:YES isPlanar:NO colorSpaceName:NSDeviceRGBColorSpace
74262d2647ca Lots of cleanups by Darrell, added the ability to resize Cocoa windows. Sam Lantinga <slouken@libsdl.org> parents: 390 diff changeset	315 bytesPerRow:icon->w<<2 bitsPerPixel:32 ];
74262d2647ca Lots of cleanups by Darrell, added the ability to resize Cocoa windows. Sam Lantinga <slouken@libsdl.org> parents: 390 diff changeset	316
74262d2647ca Lots of cleanups by Darrell, added the ability to resize Cocoa windows. Sam Lantinga <slouken@libsdl.org> parents: 390 diff changeset	317 img = [ [ NSImage alloc ] initWithSize:imgSize ];
74262d2647ca Lots of cleanups by Darrell, added the ability to resize Cocoa windows. Sam Lantinga <slouken@libsdl.org> parents: 390 diff changeset	318
74262d2647ca Lots of cleanups by Darrell, added the ability to resize Cocoa windows. Sam Lantinga <slouken@libsdl.org> parents: 390 diff changeset	319 [ img addRepresentation: imgrep ];
74262d2647ca Lots of cleanups by Darrell, added the ability to resize Cocoa windows. Sam Lantinga <slouken@libsdl.org> parents: 390 diff changeset	320 [ NSApp setApplicationIconImage:img ];
74262d2647ca Lots of cleanups by Darrell, added the ability to resize Cocoa windows. Sam Lantinga <slouken@libsdl.org> parents: 390 diff changeset	321
74262d2647ca Lots of cleanups by Darrell, added the ability to resize Cocoa windows. Sam Lantinga <slouken@libsdl.org> parents: 390 diff changeset	322 [ img release ];
74262d2647ca Lots of cleanups by Darrell, added the ability to resize Cocoa windows. Sam Lantinga <slouken@libsdl.org> parents: 390 diff changeset	323 [ imgrep release ];
74262d2647ca Lots of cleanups by Darrell, added the ability to resize Cocoa windows. Sam Lantinga <slouken@libsdl.org> parents: 390 diff changeset	324 SDL_FreeSurface(mergedSurface);
269 4125b9859c71 Added Quartz version of SDL_SetIcon() for MacOS X (thanks Bob) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	325 freePool:
501 74262d2647ca Lots of cleanups by Darrell, added the ability to resize Cocoa windows. Sam Lantinga <slouken@libsdl.org> parents: 390 diff changeset	326 [pool release];
47 45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	327 }
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	328
761 c5b2b6d2d1fe Date: Wed, 31 Dec 2003 21:55:30 +0100 Sam Lantinga <slouken@libsdl.org> parents: 683 diff changeset	329 int QZ_IconifyWindow (_THIS) {
47 45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	330
158 4382c38dfbee Date: Tue, 21 Aug 2001 03:50:01 +0200 Sam Lantinga <slouken@libsdl.org> parents: 58 diff changeset	331 if ( ! [ qz_window isMiniaturized ] ) {
4382c38dfbee Date: Tue, 21 Aug 2001 03:50:01 +0200 Sam Lantinga <slouken@libsdl.org> parents: 58 diff changeset	332 [ qz_window miniaturize:nil ];
47 45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	333 return 1;
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	334 }
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	335 else {
501 74262d2647ca Lots of cleanups by Darrell, added the ability to resize Cocoa windows. Sam Lantinga <slouken@libsdl.org> parents: 390 diff changeset	336 SDL_SetError ("window already iconified");
47 45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	337 return 0;
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	338 }
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	339 }
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	340
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	341 /*
761 c5b2b6d2d1fe Date: Wed, 31 Dec 2003 21:55:30 +0100 Sam Lantinga <slouken@libsdl.org> parents: 683 diff changeset	342 int QZ_GetWMInfo (_THIS, SDL_SysWMinfo *info) {
158 4382c38dfbee Date: Tue, 21 Aug 2001 03:50:01 +0200 Sam Lantinga <slouken@libsdl.org> parents: 58 diff changeset	343 info->nsWindowPtr = qz_window;
47 45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	344 return 0;
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	345 }*/
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	346
761 c5b2b6d2d1fe Date: Wed, 31 Dec 2003 21:55:30 +0100 Sam Lantinga <slouken@libsdl.org> parents: 683 diff changeset	347 void QZ_ChangeGrabState (_THIS, int action) {
563 04dcaf3da918 Massive Quartz input enhancements from Darrell Walisser. His email: Ryan C. Gordon <icculus@icculus.org> parents: 501 diff changeset	348
04dcaf3da918 Massive Quartz input enhancements from Darrell Walisser. His email: Ryan C. Gordon <icculus@icculus.org> parents: 501 diff changeset	349 /*
04dcaf3da918 Massive Quartz input enhancements from Darrell Walisser. His email: Ryan C. Gordon <icculus@icculus.org> parents: 501 diff changeset	350 Figure out what the next state should be based on the action.
04dcaf3da918 Massive Quartz input enhancements from Darrell Walisser. His email: Ryan C. Gordon <icculus@icculus.org> parents: 501 diff changeset	351 Ignore actions that can't change the current state.
04dcaf3da918 Massive Quartz input enhancements from Darrell Walisser. His email: Ryan C. Gordon <icculus@icculus.org> parents: 501 diff changeset	352 */
04dcaf3da918 Massive Quartz input enhancements from Darrell Walisser. His email: Ryan C. Gordon <icculus@icculus.org> parents: 501 diff changeset	353 if ( grab_state == QZ_UNGRABBED ) {
04dcaf3da918 Massive Quartz input enhancements from Darrell Walisser. His email: Ryan C. Gordon <icculus@icculus.org> parents: 501 diff changeset	354 if ( action == QZ_ENABLE_GRAB ) {
761 c5b2b6d2d1fe Date: Wed, 31 Dec 2003 21:55:30 +0100 Sam Lantinga <slouken@libsdl.org> parents: 683 diff changeset	355 if ( cursor_should_be_visible )
563 04dcaf3da918 Massive Quartz input enhancements from Darrell Walisser. His email: Ryan C. Gordon <icculus@icculus.org> parents: 501 diff changeset	356 grab_state = QZ_VISIBLE_GRAB;
04dcaf3da918 Massive Quartz input enhancements from Darrell Walisser. His email: Ryan C. Gordon <icculus@icculus.org> parents: 501 diff changeset	357 else
04dcaf3da918 Massive Quartz input enhancements from Darrell Walisser. His email: Ryan C. Gordon <icculus@icculus.org> parents: 501 diff changeset	358 grab_state = QZ_INVISIBLE_GRAB;
04dcaf3da918 Massive Quartz input enhancements from Darrell Walisser. His email: Ryan C. Gordon <icculus@icculus.org> parents: 501 diff changeset	359 }
04dcaf3da918 Massive Quartz input enhancements from Darrell Walisser. His email: Ryan C. Gordon <icculus@icculus.org> parents: 501 diff changeset	360 }
04dcaf3da918 Massive Quartz input enhancements from Darrell Walisser. His email: Ryan C. Gordon <icculus@icculus.org> parents: 501 diff changeset	361 else if ( grab_state == QZ_VISIBLE_GRAB ) {
04dcaf3da918 Massive Quartz input enhancements from Darrell Walisser. His email: Ryan C. Gordon <icculus@icculus.org> parents: 501 diff changeset	362 if ( action == QZ_DISABLE_GRAB )
04dcaf3da918 Massive Quartz input enhancements from Darrell Walisser. His email: Ryan C. Gordon <icculus@icculus.org> parents: 501 diff changeset	363 grab_state = QZ_UNGRABBED;
04dcaf3da918 Massive Quartz input enhancements from Darrell Walisser. His email: Ryan C. Gordon <icculus@icculus.org> parents: 501 diff changeset	364 else if ( action == QZ_HIDECURSOR )
04dcaf3da918 Massive Quartz input enhancements from Darrell Walisser. His email: Ryan C. Gordon <icculus@icculus.org> parents: 501 diff changeset	365 grab_state = QZ_INVISIBLE_GRAB;
04dcaf3da918 Massive Quartz input enhancements from Darrell Walisser. His email: Ryan C. Gordon <icculus@icculus.org> parents: 501 diff changeset	366 }
04dcaf3da918 Massive Quartz input enhancements from Darrell Walisser. His email: Ryan C. Gordon <icculus@icculus.org> parents: 501 diff changeset	367 else {
04dcaf3da918 Massive Quartz input enhancements from Darrell Walisser. His email: Ryan C. Gordon <icculus@icculus.org> parents: 501 diff changeset	368 assert( grab_state == QZ_INVISIBLE_GRAB );
04dcaf3da918 Massive Quartz input enhancements from Darrell Walisser. His email: Ryan C. Gordon <icculus@icculus.org> parents: 501 diff changeset	369
04dcaf3da918 Massive Quartz input enhancements from Darrell Walisser. His email: Ryan C. Gordon <icculus@icculus.org> parents: 501 diff changeset	370 if ( action == QZ_DISABLE_GRAB )
04dcaf3da918 Massive Quartz input enhancements from Darrell Walisser. His email: Ryan C. Gordon <icculus@icculus.org> parents: 501 diff changeset	371 grab_state = QZ_UNGRABBED;
04dcaf3da918 Massive Quartz input enhancements from Darrell Walisser. His email: Ryan C. Gordon <icculus@icculus.org> parents: 501 diff changeset	372 else if ( action == QZ_SHOWCURSOR )
04dcaf3da918 Massive Quartz input enhancements from Darrell Walisser. His email: Ryan C. Gordon <icculus@icculus.org> parents: 501 diff changeset	373 grab_state = QZ_VISIBLE_GRAB;
04dcaf3da918 Massive Quartz input enhancements from Darrell Walisser. His email: Ryan C. Gordon <icculus@icculus.org> parents: 501 diff changeset	374 }
04dcaf3da918 Massive Quartz input enhancements from Darrell Walisser. His email: Ryan C. Gordon <icculus@icculus.org> parents: 501 diff changeset	375
04dcaf3da918 Massive Quartz input enhancements from Darrell Walisser. His email: Ryan C. Gordon <icculus@icculus.org> parents: 501 diff changeset	376 /* now apply the new state */
04dcaf3da918 Massive Quartz input enhancements from Darrell Walisser. His email: Ryan C. Gordon <icculus@icculus.org> parents: 501 diff changeset	377 if (grab_state == QZ_UNGRABBED) {
04dcaf3da918 Massive Quartz input enhancements from Darrell Walisser. His email: Ryan C. Gordon <icculus@icculus.org> parents: 501 diff changeset	378
04dcaf3da918 Massive Quartz input enhancements from Darrell Walisser. His email: Ryan C. Gordon <icculus@icculus.org> parents: 501 diff changeset	379 CGAssociateMouseAndMouseCursorPosition (1);
04dcaf3da918 Massive Quartz input enhancements from Darrell Walisser. His email: Ryan C. Gordon <icculus@icculus.org> parents: 501 diff changeset	380 }
04dcaf3da918 Massive Quartz input enhancements from Darrell Walisser. His email: Ryan C. Gordon <icculus@icculus.org> parents: 501 diff changeset	381 else if (grab_state == QZ_VISIBLE_GRAB) {
04dcaf3da918 Massive Quartz input enhancements from Darrell Walisser. His email: Ryan C. Gordon <icculus@icculus.org> parents: 501 diff changeset	382
04dcaf3da918 Massive Quartz input enhancements from Darrell Walisser. His email: Ryan C. Gordon <icculus@icculus.org> parents: 501 diff changeset	383 CGAssociateMouseAndMouseCursorPosition (1);
04dcaf3da918 Massive Quartz input enhancements from Darrell Walisser. His email: Ryan C. Gordon <icculus@icculus.org> parents: 501 diff changeset	384 }
04dcaf3da918 Massive Quartz input enhancements from Darrell Walisser. His email: Ryan C. Gordon <icculus@icculus.org> parents: 501 diff changeset	385 else {
04dcaf3da918 Massive Quartz input enhancements from Darrell Walisser. His email: Ryan C. Gordon <icculus@icculus.org> parents: 501 diff changeset	386 assert( grab_state == QZ_INVISIBLE_GRAB );
04dcaf3da918 Massive Quartz input enhancements from Darrell Walisser. His email: Ryan C. Gordon <icculus@icculus.org> parents: 501 diff changeset	387
04dcaf3da918 Massive Quartz input enhancements from Darrell Walisser. His email: Ryan C. Gordon <icculus@icculus.org> parents: 501 diff changeset	388 QZ_PrivateWarpCursor (this, SDL_VideoSurface->w / 2, SDL_VideoSurface->h / 2);
04dcaf3da918 Massive Quartz input enhancements from Darrell Walisser. His email: Ryan C. Gordon <icculus@icculus.org> parents: 501 diff changeset	389 CGAssociateMouseAndMouseCursorPosition (0);
04dcaf3da918 Massive Quartz input enhancements from Darrell Walisser. His email: Ryan C. Gordon <icculus@icculus.org> parents: 501 diff changeset	390 }
04dcaf3da918 Massive Quartz input enhancements from Darrell Walisser. His email: Ryan C. Gordon <icculus@icculus.org> parents: 501 diff changeset	391 }
04dcaf3da918 Massive Quartz input enhancements from Darrell Walisser. His email: Ryan C. Gordon <icculus@icculus.org> parents: 501 diff changeset	392
761 c5b2b6d2d1fe Date: Wed, 31 Dec 2003 21:55:30 +0100 Sam Lantinga <slouken@libsdl.org> parents: 683 diff changeset	393 SDL_GrabMode QZ_GrabInput (_THIS, SDL_GrabMode grab_mode) {
47 45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	394
563 04dcaf3da918 Massive Quartz input enhancements from Darrell Walisser. His email: Ryan C. Gordon <icculus@icculus.org> parents: 501 diff changeset	395 int doGrab = grab_mode & SDL_GRAB_ON;
04dcaf3da918 Massive Quartz input enhancements from Darrell Walisser. His email: Ryan C. Gordon <icculus@icculus.org> parents: 501 diff changeset	396 /int fullscreen = grab_mode & SDL_GRAB_FULLSCREEN;/
04dcaf3da918 Massive Quartz input enhancements from Darrell Walisser. His email: Ryan C. Gordon <icculus@icculus.org> parents: 501 diff changeset	397
04dcaf3da918 Massive Quartz input enhancements from Darrell Walisser. His email: Ryan C. Gordon <icculus@icculus.org> parents: 501 diff changeset	398 if ( this->screen == NULL ) {
04dcaf3da918 Massive Quartz input enhancements from Darrell Walisser. His email: Ryan C. Gordon <icculus@icculus.org> parents: 501 diff changeset	399 SDL_SetError ("QZ_GrabInput: screen is NULL");
04dcaf3da918 Massive Quartz input enhancements from Darrell Walisser. His email: Ryan C. Gordon <icculus@icculus.org> parents: 501 diff changeset	400 return SDL_GRAB_OFF;
47 45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	401 }
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	402
563 04dcaf3da918 Massive Quartz input enhancements from Darrell Walisser. His email: Ryan C. Gordon <icculus@icculus.org> parents: 501 diff changeset	403 if ( ! video_set ) {
04dcaf3da918 Massive Quartz input enhancements from Darrell Walisser. His email: Ryan C. Gordon <icculus@icculus.org> parents: 501 diff changeset	404 /SDL_SetError ("QZ_GrabInput: video is not set, grab will take effect on mode switch"); /
04dcaf3da918 Massive Quartz input enhancements from Darrell Walisser. His email: Ryan C. Gordon <icculus@icculus.org> parents: 501 diff changeset	405 current_grab_mode = grab_mode;
04dcaf3da918 Massive Quartz input enhancements from Darrell Walisser. His email: Ryan C. Gordon <icculus@icculus.org> parents: 501 diff changeset	406 return grab_mode; /* Will be set later on mode switch */
04dcaf3da918 Massive Quartz input enhancements from Darrell Walisser. His email: Ryan C. Gordon <icculus@icculus.org> parents: 501 diff changeset	407 }
04dcaf3da918 Massive Quartz input enhancements from Darrell Walisser. His email: Ryan C. Gordon <icculus@icculus.org> parents: 501 diff changeset	408
04dcaf3da918 Massive Quartz input enhancements from Darrell Walisser. His email: Ryan C. Gordon <icculus@icculus.org> parents: 501 diff changeset	409 if ( grab_mode != SDL_GRAB_QUERY ) {
04dcaf3da918 Massive Quartz input enhancements from Darrell Walisser. His email: Ryan C. Gordon <icculus@icculus.org> parents: 501 diff changeset	410 if ( doGrab )
04dcaf3da918 Massive Quartz input enhancements from Darrell Walisser. His email: Ryan C. Gordon <icculus@icculus.org> parents: 501 diff changeset	411 QZ_ChangeGrabState (this, QZ_ENABLE_GRAB);
04dcaf3da918 Massive Quartz input enhancements from Darrell Walisser. His email: Ryan C. Gordon <icculus@icculus.org> parents: 501 diff changeset	412 else
04dcaf3da918 Massive Quartz input enhancements from Darrell Walisser. His email: Ryan C. Gordon <icculus@icculus.org> parents: 501 diff changeset	413 QZ_ChangeGrabState (this, QZ_DISABLE_GRAB);
04dcaf3da918 Massive Quartz input enhancements from Darrell Walisser. His email: Ryan C. Gordon <icculus@icculus.org> parents: 501 diff changeset	414
04dcaf3da918 Massive Quartz input enhancements from Darrell Walisser. His email: Ryan C. Gordon <icculus@icculus.org> parents: 501 diff changeset	415 current_grab_mode = doGrab ? SDL_GRAB_ON : SDL_GRAB_OFF;
04dcaf3da918 Massive Quartz input enhancements from Darrell Walisser. His email: Ryan C. Gordon <icculus@icculus.org> parents: 501 diff changeset	416 }
04dcaf3da918 Massive Quartz input enhancements from Darrell Walisser. His email: Ryan C. Gordon <icculus@icculus.org> parents: 501 diff changeset	417
501 74262d2647ca Lots of cleanups by Darrell, added the ability to resize Cocoa windows. Sam Lantinga <slouken@libsdl.org> parents: 390 diff changeset	418 return current_grab_mode;
47 45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	419 }

Mercurial > sdl-ios-xcode

annotate src/video/quartz/SDL_QuartzWM.m @ 1192:54aa9aa32327