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

annotate src/video/quartz/SDL_QuartzWM.m @ 889:eac8c69b5706

ate: Fri, 09 Apr 2004 20:07:10 +0200 From: Hibernatus Subject: [SDL] BUG: changing video mode in opengl + windows In WIN_GL_SetupWindow (SDL12/src/video/wincommon/SDL_wingl.c) you call WIN_GL_ResetWindow when SetPixelFormat fails. WIN_GL_ResetWindow cannot properly work in its current state, because there are several things to update once you've created a new window. At least DirectInput doesn't work anymore here (which is somewhat annoying for the player :). I think you can simply remove that function. Many games don't try to recover from that exception, that's why the newest ATI drivers emulate 16 bpp display in 32 bpp mode so the error never occurs (but the games may run much slower). Having SDL_SetVideoMode return NULL would be better than actually setting the video mode and losing focus, directinput and maybe directsound too. It also made my previous drivers crash (when switching from 32 bpp windowed to 16 bpp fullscreen).

author	Sam Lantinga <slouken@libsdl.org>
date	Sun, 16 May 2004 18:02:48 +0000
parents	9e84d106ec19
children	af585d6efec8

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) {
68c8da837fc0 Date: Tue, 6 Jan 2004 21:54:02 +0100 Sam Lantinga <slouken@libsdl.org> parents: 761 diff changeset	88 return (mode_flags & SDL_FULLSCREEN) ? true : NSPointInRect([ qz_window mouseLocationOutsideOfEventStream ], [ window_view frame ]);
68c8da837fc0 Date: Tue, 6 Jan 2004 21:54:02 +0100 Sam Lantinga <slouken@libsdl.org> parents: 761 diff changeset	89 }
68c8da837fc0 Date: Tue, 6 Jan 2004 21:54:02 +0100 Sam Lantinga <slouken@libsdl.org> parents: 761 diff changeset	90
761 c5b2b6d2d1fe Date: Wed, 31 Dec 2003 21:55:30 +0100 Sam Lantinga <slouken@libsdl.org> parents: 683 diff changeset	91 int QZ_ShowWMCursor (_THIS, WMcursor *cursor) {
47 45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	92
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	93 if ( cursor == NULL) {
761 c5b2b6d2d1fe Date: Wed, 31 Dec 2003 21:55:30 +0100 Sam Lantinga <slouken@libsdl.org> parents: 683 diff changeset	94 if ( cursor_should_be_visible ) {
c5b2b6d2d1fe Date: Wed, 31 Dec 2003 21:55:30 +0100 Sam Lantinga <slouken@libsdl.org> parents: 683 diff changeset	95 QZ_HideMouse (this);
c5b2b6d2d1fe Date: Wed, 31 Dec 2003 21:55:30 +0100 Sam Lantinga <slouken@libsdl.org> parents: 683 diff changeset	96 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	97 QZ_ChangeGrabState (this, QZ_HIDECURSOR);
47 45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	98 }
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	99 }
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	100 else {
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	101 SetCursor(&cursor->curs);
761 c5b2b6d2d1fe Date: Wed, 31 Dec 2003 21:55:30 +0100 Sam Lantinga <slouken@libsdl.org> parents: 683 diff changeset	102 if ( ! cursor_should_be_visible ) {
c5b2b6d2d1fe Date: Wed, 31 Dec 2003 21:55:30 +0100 Sam Lantinga <slouken@libsdl.org> parents: 683 diff changeset	103 QZ_ShowMouse (this);
c5b2b6d2d1fe Date: Wed, 31 Dec 2003 21:55:30 +0100 Sam Lantinga <slouken@libsdl.org> parents: 683 diff changeset	104 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	105 QZ_ChangeGrabState (this, QZ_SHOWCURSOR);
47 45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	106 }
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	107 }
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	108
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	109 return 1;
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	110 }
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	111
501 74262d2647ca Lots of cleanups by Darrell, added the ability to resize Cocoa windows. Sam Lantinga <slouken@libsdl.org> parents: 390 diff changeset	112 /*
74262d2647ca Lots of cleanups by Darrell, added the ability to resize Cocoa windows. Sam Lantinga <slouken@libsdl.org> parents: 390 diff changeset	113 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	114 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	115 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	116 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	117 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	118 */
272 d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 269 diff changeset	119
d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 269 diff changeset	120 /* 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	121 void QZ_PrivateGlobalToLocal (_THIS, NSPoint *p) {
47 45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	122
272 d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 269 diff changeset	123 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	124 }
d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 269 diff changeset	125
d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 269 diff changeset	126
d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 269 diff changeset	127 /* 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	128 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	129
d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 269 diff changeset	130 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	131 }
d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 269 diff changeset	132
d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 269 diff changeset	133 /* 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	134 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	135
d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 269 diff changeset	136 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	137
876 9e84d106ec19 (Said Max Horn on the SDL mailing list...) Ryan C. Gordon <icculus@icculus.org> parents: 779 diff changeset	138 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	139 }
d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 269 diff changeset	140 else {
d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 269 diff changeset	141
683 5d2f027b3349 Date: Sat, 9 Aug 2003 20:14:06 -0400 Sam Lantinga <slouken@libsdl.org> parents: 615 diff changeset	142 NSPoint newPoint;
47 45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	143
683 5d2f027b3349 Date: Sat, 9 Aug 2003 20:14:06 -0400 Sam Lantinga <slouken@libsdl.org> parents: 615 diff changeset	144 newPoint = [ window_view convertPoint:*p toView:[ qz_window contentView ] ];
5d2f027b3349 Date: Sat, 9 Aug 2003 20:14:06 -0400 Sam Lantinga <slouken@libsdl.org> parents: 615 diff changeset	145
5d2f027b3349 Date: Sat, 9 Aug 2003 20:14:06 -0400 Sam Lantinga <slouken@libsdl.org> parents: 615 diff changeset	146 *p = newPoint;
272 d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 269 diff changeset	147 }
d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 269 diff changeset	148 }
d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 269 diff changeset	149
d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 269 diff changeset	150 /* 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	151 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	152
683 5d2f027b3349 Date: Sat, 9 Aug 2003 20:14:06 -0400 Sam Lantinga <slouken@libsdl.org> parents: 615 diff changeset	153 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	154
876 9e84d106ec19 (Said Max Horn on the SDL mailing list...) Ryan C. Gordon <icculus@icculus.org> parents: 779 diff changeset	155 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	156 }
5d2f027b3349 Date: Sat, 9 Aug 2003 20:14:06 -0400 Sam Lantinga <slouken@libsdl.org> parents: 615 diff changeset	157 else {
5d2f027b3349 Date: Sat, 9 Aug 2003 20:14:06 -0400 Sam Lantinga <slouken@libsdl.org> parents: 615 diff changeset	158
5d2f027b3349 Date: Sat, 9 Aug 2003 20:14:06 -0400 Sam Lantinga <slouken@libsdl.org> parents: 615 diff changeset	159 NSPoint newPoint;
5d2f027b3349 Date: Sat, 9 Aug 2003 20:14:06 -0400 Sam Lantinga <slouken@libsdl.org> parents: 615 diff changeset	160
5d2f027b3349 Date: Sat, 9 Aug 2003 20:14:06 -0400 Sam Lantinga <slouken@libsdl.org> parents: 615 diff changeset	161 newPoint = [ window_view convertPoint:*p fromView:[ qz_window contentView ] ];
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 *p = newPoint;
876 9e84d106ec19 (Said Max Horn on the SDL mailing list...) Ryan C. Gordon <icculus@icculus.org> parents: 779 diff changeset	164
9e84d106ec19 (Said Max Horn on the SDL mailing list...) Ryan C. Gordon <icculus@icculus.org> parents: 779 diff changeset	165 /* If OSX version is 10.3.0 or later, we need a workaround in OpenGL mode */
9e84d106ec19 (Said Max Horn on the SDL mailing list...) Ryan C. Gordon <icculus@icculus.org> parents: 779 diff changeset	166 if( system_version >= 0x1030 && (SDL_VideoSurface->flags & (SDL_OPENGL \| SDL_OPENGLBLIT)) ) {
9e84d106ec19 (Said Max Horn on the SDL mailing list...) Ryan C. Gordon <icculus@icculus.org> parents: 779 diff changeset	167 p->y = [window_view frame].size.height - p->y - 1;
9e84d106ec19 (Said Max Horn on the SDL mailing list...) Ryan C. Gordon <icculus@icculus.org> parents: 779 diff changeset	168 }
683 5d2f027b3349 Date: Sat, 9 Aug 2003 20:14:06 -0400 Sam Lantinga <slouken@libsdl.org> parents: 615 diff changeset	169 }
272 d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 269 diff changeset	170 }
d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 269 diff changeset	171
d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 269 diff changeset	172 /* 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	173 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	174
d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 269 diff changeset	175 CGPoint cgp;
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 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	178
d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 269 diff changeset	179 int height;
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 QZ_PrivateSDLToCocoa (this, p);
d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 269 diff changeset	182 QZ_PrivateLocalToGlobal (this, p);
d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 269 diff changeset	183
d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 269 diff changeset	184 height = CGDisplayPixelsHigh (display_id);
d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 269 diff changeset	185 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	186 }
d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 269 diff changeset	187
d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 269 diff changeset	188 cgp.x = p->x;
d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 269 diff changeset	189 cgp.y = p->y;
d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 269 diff changeset	190
d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 269 diff changeset	191 return cgp;
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
683 5d2f027b3349 Date: Sat, 9 Aug 2003 20:14:06 -0400 Sam Lantinga <slouken@libsdl.org> parents: 615 diff changeset	194 #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	195 /* 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	196 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	197
d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 269 diff changeset	198 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	199
d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 269 diff changeset	200 int height;
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 /* 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	203 height = CGDisplayPixelsHigh (display_id);
d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 269 diff changeset	204 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	205
d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 269 diff changeset	206 QZ_PrivateGlobalToLocal (this, p);
d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 269 diff changeset	207 QZ_PrivateCocoaToSDL (this, p);
47 45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	208 }
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	209 }
683 5d2f027b3349 Date: Sat, 9 Aug 2003 20:14:06 -0400 Sam Lantinga <slouken@libsdl.org> parents: 615 diff changeset	210 #endif /* Dead code */
47 45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	211
761 c5b2b6d2d1fe Date: Wed, 31 Dec 2003 21:55:30 +0100 Sam Lantinga <slouken@libsdl.org> parents: 683 diff changeset	212 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	213
d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 269 diff changeset	214 NSPoint p;
d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 269 diff changeset	215 CGPoint cgp;
47 45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	216
272 d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 269 diff changeset	217 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	218 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	219
04dcaf3da918 Massive Quartz input enhancements from Darrell Walisser. His email: Ryan C. Gordon <icculus@icculus.org> parents: 501 diff changeset	220 /* 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	221 CGSetLocalEventsSuppressionInterval (0.0);
04dcaf3da918 Massive Quartz input enhancements from Darrell Walisser. His email: Ryan C. Gordon <icculus@icculus.org> parents: 501 diff changeset	222 CGWarpMouseCursorPosition (cgp);
272 d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 269 diff changeset	223 }
d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 269 diff changeset	224
761 c5b2b6d2d1fe Date: Wed, 31 Dec 2003 21:55:30 +0100 Sam Lantinga <slouken@libsdl.org> parents: 683 diff changeset	225 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	226
47 45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	227 /* 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	228 if ( ! [ NSApp isActive ] )
47 45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	229 return;
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	230
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	231 /* 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	232 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	233
04dcaf3da918 Massive Quartz input enhancements from Darrell Walisser. His email: Ryan C. Gordon <icculus@icculus.org> parents: 501 diff changeset	234 /* 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	235 SDL_PrivateMouseMotion (0, 0, x, y);
47 45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	236 }
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	237
761 c5b2b6d2d1fe Date: Wed, 31 Dec 2003 21:55:30 +0100 Sam Lantinga <slouken@libsdl.org> parents: 683 diff changeset	238 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	239 void QZ_CheckMouseMode (_THIS) { }
47 45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	240
761 c5b2b6d2d1fe Date: Wed, 31 Dec 2003 21:55:30 +0100 Sam Lantinga <slouken@libsdl.org> parents: 683 diff changeset	241 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	242
158 4382c38dfbee Date: Tue, 21 Aug 2001 03:50:01 +0200 Sam Lantinga <slouken@libsdl.org> parents: 58 diff changeset	243 if ( qz_window != nil ) {
58 bd6b0a910a65 * Removed fullscreen menu option from the "Window" menu Sam Lantinga <slouken@lokigames.com> parents: 47 diff changeset	244 NSString *string;
bd6b0a910a65 * Removed fullscreen menu option from the "Window" menu Sam Lantinga <slouken@lokigames.com> parents: 47 diff changeset	245 if ( title != NULL ) {
bd6b0a910a65 * Removed fullscreen menu option from the "Window" menu Sam Lantinga <slouken@lokigames.com> parents: 47 diff changeset	246 string = [ [ NSString alloc ] initWithCString:title ];
158 4382c38dfbee Date: Tue, 21 Aug 2001 03:50:01 +0200 Sam Lantinga <slouken@libsdl.org> parents: 58 diff changeset	247 [ qz_window setTitle:string ];
58 bd6b0a910a65 * Removed fullscreen menu option from the "Window" menu Sam Lantinga <slouken@lokigames.com> parents: 47 diff changeset	248 [ string release ];
bd6b0a910a65 * Removed fullscreen menu option from the "Window" menu Sam Lantinga <slouken@lokigames.com> parents: 47 diff changeset	249 }
bd6b0a910a65 * Removed fullscreen menu option from the "Window" menu Sam Lantinga <slouken@lokigames.com> parents: 47 diff changeset	250 if ( icon != NULL ) {
bd6b0a910a65 * Removed fullscreen menu option from the "Window" menu Sam Lantinga <slouken@lokigames.com> parents: 47 diff changeset	251 string = [ [ NSString alloc ] initWithCString:icon ];
158 4382c38dfbee Date: Tue, 21 Aug 2001 03:50:01 +0200 Sam Lantinga <slouken@libsdl.org> parents: 58 diff changeset	252 [ qz_window setMiniwindowTitle:string ];
58 bd6b0a910a65 * Removed fullscreen menu option from the "Window" menu Sam Lantinga <slouken@lokigames.com> parents: 47 diff changeset	253 [ string release ];
bd6b0a910a65 * Removed fullscreen menu option from the "Window" menu Sam Lantinga <slouken@lokigames.com> parents: 47 diff changeset	254 }
bd6b0a910a65 * Removed fullscreen menu option from the "Window" menu Sam Lantinga <slouken@lokigames.com> parents: 47 diff changeset	255 }
47 45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	256 }
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	257
761 c5b2b6d2d1fe Date: Wed, 31 Dec 2003 21:55:30 +0100 Sam Lantinga <slouken@libsdl.org> parents: 683 diff changeset	258 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	259 {
501 74262d2647ca Lots of cleanups by Darrell, added the ability to resize Cocoa windows. Sam Lantinga <slouken@libsdl.org> parents: 390 diff changeset	260 NSBitmapImageRep *imgrep;
74262d2647ca Lots of cleanups by Darrell, added the ability to resize Cocoa windows. Sam Lantinga <slouken@libsdl.org> parents: 390 diff changeset	261 NSImage *img;
74262d2647ca Lots of cleanups by Darrell, added the ability to resize Cocoa windows. Sam Lantinga <slouken@libsdl.org> parents: 390 diff changeset	262 SDL_Surface *mergedSurface;
592 1970e458070d Fixed crash in SDL_SetIcon() under Quartz (thanks Darrell!) Sam Lantinga <slouken@libsdl.org> parents: 563 diff changeset	263 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	264 NSAutoreleasePool *pool;
74262d2647ca Lots of cleanups by Darrell, added the ability to resize Cocoa windows. Sam Lantinga <slouken@libsdl.org> parents: 390 diff changeset	265 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	266 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	267
74262d2647ca Lots of cleanups by Darrell, added the ability to resize Cocoa windows. Sam Lantinga <slouken@libsdl.org> parents: 390 diff changeset	268 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	269 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	270
74262d2647ca Lots of cleanups by Darrell, added the ability to resize Cocoa windows. Sam Lantinga <slouken@libsdl.org> parents: 390 diff changeset	271 /* 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	272 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	273 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	274 if (mergedSurface==NULL) {
324 f25f666d609a * empty log message * Sam Lantinga <slouken@libsdl.org> parents: 303 diff changeset	275 NSLog(@"Error creating surface for merge");
f25f666d609a * empty log message * Sam Lantinga <slouken@libsdl.org> parents: 303 diff changeset	276 goto freePool;
f25f666d609a * empty log message * Sam Lantinga <slouken@libsdl.org> parents: 303 diff changeset	277 }
501 74262d2647ca Lots of cleanups by Darrell, added the ability to resize Cocoa windows. Sam Lantinga <slouken@libsdl.org> parents: 390 diff changeset	278
592 1970e458070d Fixed crash in SDL_SetIcon() under Quartz (thanks Darrell!) Sam Lantinga <slouken@libsdl.org> parents: 563 diff changeset	279 if (mergedSurface->pitch !=
1970e458070d Fixed crash in SDL_SetIcon() under Quartz (thanks Darrell!) Sam Lantinga <slouken@libsdl.org> parents: 563 diff changeset	280 mergedSurface->format->BytesPerPixel * mergedSurface->w) {
1970e458070d Fixed crash in SDL_SetIcon() under Quartz (thanks Darrell!) Sam Lantinga <slouken@libsdl.org> parents: 563 diff changeset	281 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	282 SDL_FreeSurface (mergedSurface);
1970e458070d Fixed crash in SDL_SetIcon() under Quartz (thanks Darrell!) Sam Lantinga <slouken@libsdl.org> parents: 563 diff changeset	283 goto freePool;
1970e458070d Fixed crash in SDL_SetIcon() under Quartz (thanks Darrell!) Sam Lantinga <slouken@libsdl.org> parents: 563 diff changeset	284 }
1970e458070d Fixed crash in SDL_SetIcon() under Quartz (thanks Darrell!) Sam Lantinga <slouken@libsdl.org> parents: 563 diff changeset	285
501 74262d2647ca Lots of cleanups by Darrell, added the ability to resize Cocoa windows. Sam Lantinga <slouken@libsdl.org> parents: 390 diff changeset	286 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	287 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	288 goto freePool;
74262d2647ca Lots of cleanups by Darrell, added the ability to resize Cocoa windows. Sam Lantinga <slouken@libsdl.org> parents: 390 diff changeset	289 }
74262d2647ca Lots of cleanups by Darrell, added the ability to resize Cocoa windows. Sam Lantinga <slouken@libsdl.org> parents: 390 diff changeset	290
74262d2647ca Lots of cleanups by Darrell, added the ability to resize Cocoa windows. Sam Lantinga <slouken@libsdl.org> parents: 390 diff changeset	291 if (mask) {
592 1970e458070d Fixed crash in SDL_SetIcon() under Quartz (thanks Darrell!) Sam Lantinga <slouken@libsdl.org> parents: 563 diff changeset	292
1970e458070d Fixed crash in SDL_SetIcon() under Quartz (thanks Darrell!) Sam Lantinga <slouken@libsdl.org> parents: 563 diff changeset	293 Uint32 *pixels = mergedSurface->pixels;
1970e458070d Fixed crash in SDL_SetIcon() under Quartz (thanks Darrell!) Sam Lantinga <slouken@libsdl.org> parents: 563 diff changeset	294 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	295 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	296
1970e458070d Fixed crash in SDL_SetIcon() under Quartz (thanks Darrell!) Sam Lantinga <slouken@libsdl.org> parents: 563 diff changeset	297 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	298 int mindex = index >> 3;
1970e458070d Fixed crash in SDL_SetIcon() under Quartz (thanks Darrell!) Sam Lantinga <slouken@libsdl.org> parents: 563 diff changeset	299 int bindex = 7 - (index & 0x7);
1970e458070d Fixed crash in SDL_SetIcon() under Quartz (thanks Darrell!) Sam Lantinga <slouken@libsdl.org> parents: 563 diff changeset	300
1970e458070d Fixed crash in SDL_SetIcon() under Quartz (thanks Darrell!) Sam Lantinga <slouken@libsdl.org> parents: 563 diff changeset	301 if (mask[mindex] & (1 << bindex))
1970e458070d Fixed crash in SDL_SetIcon() under Quartz (thanks Darrell!) Sam Lantinga <slouken@libsdl.org> parents: 563 diff changeset	302 pixels[index] \|= 0x000000FF;
1970e458070d Fixed crash in SDL_SetIcon() under Quartz (thanks Darrell!) Sam Lantinga <slouken@libsdl.org> parents: 563 diff changeset	303 else
1970e458070d Fixed crash in SDL_SetIcon() under Quartz (thanks Darrell!) Sam Lantinga <slouken@libsdl.org> parents: 563 diff changeset	304 pixels[index] &= 0xFFFFFF00;
1970e458070d Fixed crash in SDL_SetIcon() under Quartz (thanks Darrell!) Sam Lantinga <slouken@libsdl.org> parents: 563 diff changeset	305 }
1970e458070d Fixed crash in SDL_SetIcon() under Quartz (thanks Darrell!) Sam Lantinga <slouken@libsdl.org> parents: 563 diff changeset	306 }
501 74262d2647ca Lots of cleanups by Darrell, added the ability to resize Cocoa windows. Sam Lantinga <slouken@libsdl.org> parents: 390 diff changeset	307 }
74262d2647ca Lots of cleanups by Darrell, added the ability to resize Cocoa windows. Sam Lantinga <slouken@libsdl.org> parents: 390 diff changeset	308
74262d2647ca Lots of cleanups by Darrell, added the ability to resize Cocoa windows. Sam Lantinga <slouken@libsdl.org> parents: 390 diff changeset	309 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	310 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	311 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	312 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	313 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	314
74262d2647ca Lots of cleanups by Darrell, added the ability to resize Cocoa windows. Sam Lantinga <slouken@libsdl.org> parents: 390 diff changeset	315 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	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 addRepresentation: imgrep ];
74262d2647ca Lots of cleanups by Darrell, added the ability to resize Cocoa windows. Sam Lantinga <slouken@libsdl.org> parents: 390 diff changeset	318 [ 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	319
74262d2647ca Lots of cleanups by Darrell, added the ability to resize Cocoa windows. Sam Lantinga <slouken@libsdl.org> parents: 390 diff changeset	320 [ img release ];
74262d2647ca Lots of cleanups by Darrell, added the ability to resize Cocoa windows. Sam Lantinga <slouken@libsdl.org> parents: 390 diff changeset	321 [ imgrep release ];
74262d2647ca Lots of cleanups by Darrell, added the ability to resize Cocoa windows. Sam Lantinga <slouken@libsdl.org> parents: 390 diff changeset	322 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	323 freePool:
501 74262d2647ca Lots of cleanups by Darrell, added the ability to resize Cocoa windows. Sam Lantinga <slouken@libsdl.org> parents: 390 diff changeset	324 [pool release];
47 45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	325 }
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	326
761 c5b2b6d2d1fe Date: Wed, 31 Dec 2003 21:55:30 +0100 Sam Lantinga <slouken@libsdl.org> parents: 683 diff changeset	327 int QZ_IconifyWindow (_THIS) {
47 45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	328
158 4382c38dfbee Date: Tue, 21 Aug 2001 03:50:01 +0200 Sam Lantinga <slouken@libsdl.org> parents: 58 diff changeset	329 if ( ! [ qz_window isMiniaturized ] ) {
4382c38dfbee Date: Tue, 21 Aug 2001 03:50:01 +0200 Sam Lantinga <slouken@libsdl.org> parents: 58 diff changeset	330 [ qz_window miniaturize:nil ];
47 45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	331 return 1;
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	332 }
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	333 else {
501 74262d2647ca Lots of cleanups by Darrell, added the ability to resize Cocoa windows. Sam Lantinga <slouken@libsdl.org> parents: 390 diff changeset	334 SDL_SetError ("window already iconified");
47 45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	335 return 0;
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	336 }
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	337 }
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 /*
761 c5b2b6d2d1fe Date: Wed, 31 Dec 2003 21:55:30 +0100 Sam Lantinga <slouken@libsdl.org> parents: 683 diff changeset	340 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	341 info->nsWindowPtr = qz_window;
47 45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	342 return 0;
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	343 }*/
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	344
761 c5b2b6d2d1fe Date: Wed, 31 Dec 2003 21:55:30 +0100 Sam Lantinga <slouken@libsdl.org> parents: 683 diff changeset	345 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	346
04dcaf3da918 Massive Quartz input enhancements from Darrell Walisser. His email: Ryan C. Gordon <icculus@icculus.org> parents: 501 diff changeset	347 /*
04dcaf3da918 Massive Quartz input enhancements from Darrell Walisser. His email: Ryan C. Gordon <icculus@icculus.org> parents: 501 diff changeset	348 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	349 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	350 */
04dcaf3da918 Massive Quartz input enhancements from Darrell Walisser. His email: Ryan C. Gordon <icculus@icculus.org> parents: 501 diff changeset	351 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	352 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	353 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	354 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	355 else
04dcaf3da918 Massive Quartz input enhancements from Darrell Walisser. His email: Ryan C. Gordon <icculus@icculus.org> parents: 501 diff changeset	356 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	357 }
04dcaf3da918 Massive Quartz input enhancements from Darrell Walisser. His email: Ryan C. Gordon <icculus@icculus.org> parents: 501 diff changeset	358 }
04dcaf3da918 Massive Quartz input enhancements from Darrell Walisser. His email: Ryan C. Gordon <icculus@icculus.org> parents: 501 diff changeset	359 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	360 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	361 grab_state = QZ_UNGRABBED;
04dcaf3da918 Massive Quartz input enhancements from Darrell Walisser. His email: Ryan C. Gordon <icculus@icculus.org> parents: 501 diff changeset	362 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	363 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	364 }
04dcaf3da918 Massive Quartz input enhancements from Darrell Walisser. His email: Ryan C. Gordon <icculus@icculus.org> parents: 501 diff changeset	365 else {
04dcaf3da918 Massive Quartz input enhancements from Darrell Walisser. His email: Ryan C. Gordon <icculus@icculus.org> parents: 501 diff changeset	366 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	367
04dcaf3da918 Massive Quartz input enhancements from Darrell Walisser. His email: Ryan C. Gordon <icculus@icculus.org> parents: 501 diff changeset	368 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	369 grab_state = QZ_UNGRABBED;
04dcaf3da918 Massive Quartz input enhancements from Darrell Walisser. His email: Ryan C. Gordon <icculus@icculus.org> parents: 501 diff changeset	370 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	371 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	372 }
04dcaf3da918 Massive Quartz input enhancements from Darrell Walisser. His email: Ryan C. Gordon <icculus@icculus.org> parents: 501 diff changeset	373
04dcaf3da918 Massive Quartz input enhancements from Darrell Walisser. His email: Ryan C. Gordon <icculus@icculus.org> parents: 501 diff changeset	374 /* 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	375 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	376
04dcaf3da918 Massive Quartz input enhancements from Darrell Walisser. His email: Ryan C. Gordon <icculus@icculus.org> parents: 501 diff changeset	377 CGAssociateMouseAndMouseCursorPosition (1);
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 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	380
04dcaf3da918 Massive Quartz input enhancements from Darrell Walisser. His email: Ryan C. Gordon <icculus@icculus.org> parents: 501 diff changeset	381 CGAssociateMouseAndMouseCursorPosition (1);
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 else {
04dcaf3da918 Massive Quartz input enhancements from Darrell Walisser. His email: Ryan C. Gordon <icculus@icculus.org> parents: 501 diff changeset	384 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	385
04dcaf3da918 Massive Quartz input enhancements from Darrell Walisser. His email: Ryan C. Gordon <icculus@icculus.org> parents: 501 diff changeset	386 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	387 CGAssociateMouseAndMouseCursorPosition (0);
04dcaf3da918 Massive Quartz input enhancements from Darrell Walisser. His email: Ryan C. Gordon <icculus@icculus.org> parents: 501 diff changeset	388 }
04dcaf3da918 Massive Quartz input enhancements from Darrell Walisser. His email: Ryan C. Gordon <icculus@icculus.org> parents: 501 diff changeset	389 }
04dcaf3da918 Massive Quartz input enhancements from Darrell Walisser. His email: Ryan C. Gordon <icculus@icculus.org> parents: 501 diff changeset	390
761 c5b2b6d2d1fe Date: Wed, 31 Dec 2003 21:55:30 +0100 Sam Lantinga <slouken@libsdl.org> parents: 683 diff changeset	391 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	392
563 04dcaf3da918 Massive Quartz input enhancements from Darrell Walisser. His email: Ryan C. Gordon <icculus@icculus.org> parents: 501 diff changeset	393 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	394 /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	395
04dcaf3da918 Massive Quartz input enhancements from Darrell Walisser. His email: Ryan C. Gordon <icculus@icculus.org> parents: 501 diff changeset	396 if ( this->screen == NULL ) {
04dcaf3da918 Massive Quartz input enhancements from Darrell Walisser. His email: Ryan C. Gordon <icculus@icculus.org> parents: 501 diff changeset	397 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	398 return SDL_GRAB_OFF;
47 45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	399 }
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	400
563 04dcaf3da918 Massive Quartz input enhancements from Darrell Walisser. His email: Ryan C. Gordon <icculus@icculus.org> parents: 501 diff changeset	401 if ( ! video_set ) {
04dcaf3da918 Massive Quartz input enhancements from Darrell Walisser. His email: Ryan C. Gordon <icculus@icculus.org> parents: 501 diff changeset	402 /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	403 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	404 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	405 }
04dcaf3da918 Massive Quartz input enhancements from Darrell Walisser. His email: Ryan C. Gordon <icculus@icculus.org> parents: 501 diff changeset	406
04dcaf3da918 Massive Quartz input enhancements from Darrell Walisser. His email: Ryan C. Gordon <icculus@icculus.org> parents: 501 diff changeset	407 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	408 if ( doGrab )
04dcaf3da918 Massive Quartz input enhancements from Darrell Walisser. His email: Ryan C. Gordon <icculus@icculus.org> parents: 501 diff changeset	409 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	410 else
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_DISABLE_GRAB);
04dcaf3da918 Massive Quartz input enhancements from Darrell Walisser. His email: Ryan C. Gordon <icculus@icculus.org> parents: 501 diff changeset	412
04dcaf3da918 Massive Quartz input enhancements from Darrell Walisser. His email: Ryan C. Gordon <icculus@icculus.org> parents: 501 diff changeset	413 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	414 }
04dcaf3da918 Massive Quartz input enhancements from Darrell Walisser. His email: Ryan C. Gordon <icculus@icculus.org> parents: 501 diff changeset	415
501 74262d2647ca Lots of cleanups by Darrell, added the ability to resize Cocoa windows. Sam Lantinga <slouken@libsdl.org> parents: 390 diff changeset	416 return current_grab_mode;
47 45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	417 }

Mercurial > sdl-ios-xcode

annotate src/video/quartz/SDL_QuartzWM.m @ 889:eac8c69b5706