sdl-ios-xcode: src/video/photon/SDL_ph

annotate src/video/photon/SDL_ph_video.h @ 664:abfdc08eb289

Date: Sun, 3 Aug 2003 22:07:57 +0200 From: Max Horn Subject: SDL OSX fullscreen FIX the attached patch fixes the fullscreen problems on SDL/OSX. The cause was that click events are bounded by winRect. Now, winRect is set to the size of the video surface. But if you e.g. request a 640x420 surface, you might get a 640x480 "real" surface. Still, SDL_VideoSurface->h will be set to 420! Thus, the upper 60 pixels in my example received no mouse down events. My fix simply disables this clipping when in full screen mode - after all, all clicks then should be inside the screen surface. Higher SDL functions ensure that the coordinates then are clipped to 640x420. It works fine in all my tests here. I don't know if it's the right thing to do in multi screen scenarios, though.

author	Sam Lantinga <slouken@libsdl.org>
date	Mon, 04 Aug 2003 01:00:30 +0000
parents	8bedd6d61642
children	04dd6c6d7c30

rev	line source
0 74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1 /*
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	2 SDL - Simple DirectMedia Layer
297 f6ffac90895c Updated copyright information for 2002 Sam Lantinga <slouken@libsdl.org> parents: 266 diff changeset	3 Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002 Sam Lantinga
0 74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	4
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	5 This library is free software; you can redistribute it and/or
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	6 modify it under the terms of the GNU Library General Public
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	7 License as published by the Free Software Foundation; either
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	8 version 2 of the License, or (at your option) any later version.
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	9
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	10 This library is distributed in the hope that it will be useful,
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	11 but WITHOUT ANY WARRANTY; without even the implied warranty of
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	12 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	13 Library General Public License for more details.
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	14
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	15 You should have received a copy of the GNU Library General Public
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	16 License along with this library; if not, write to the Free
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	17 Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	18
74212992fb08 Initial revision 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: 0 diff changeset	20 slouken@libsdl.org
0 74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	21 */
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	22
663 8bedd6d61642 Date: Sat, 2 Aug 2003 16:22:51 +0300 Sam Lantinga <slouken@libsdl.org> parents: 571 diff changeset	23 #ifndef __SDL_PH_VIDEO_H__
8bedd6d61642 Date: Sat, 2 Aug 2003 16:22:51 +0300 Sam Lantinga <slouken@libsdl.org> parents: 571 diff changeset	24 #define __SDL_PH_VIDEO_H__
0 74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	25
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	26 #include "SDL_mouse.h"
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	27 #include "SDL_sysvideo.h"
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	28
663 8bedd6d61642 Date: Sat, 2 Aug 2003 16:22:51 +0300 Sam Lantinga <slouken@libsdl.org> parents: 571 diff changeset	29 #include <Ph.h>
8bedd6d61642 Date: Sat, 2 Aug 2003 16:22:51 +0300 Sam Lantinga <slouken@libsdl.org> parents: 571 diff changeset	30 #include <Pt.h>
0 74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	31 #include <photon/Pg.h>
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	32 #include <photon/PdDirect.h>
663 8bedd6d61642 Date: Sat, 2 Aug 2003 16:22:51 +0300 Sam Lantinga <slouken@libsdl.org> parents: 571 diff changeset	33
309 2de77f7b7a28 * empty log message * Sam Lantinga <slouken@libsdl.org> parents: 297 diff changeset	34 #ifdef HAVE_OPENGL
663 8bedd6d61642 Date: Sat, 2 Aug 2003 16:22:51 +0300 Sam Lantinga <slouken@libsdl.org> parents: 571 diff changeset	35 #include <photon/PdGL.h>
309 2de77f7b7a28 * empty log message * Sam Lantinga <slouken@libsdl.org> parents: 297 diff changeset	36 #endif /* HAVE_OPENGL */
0 74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	37
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	38 /* Hidden "this" pointer for the video functions */
663 8bedd6d61642 Date: Sat, 2 Aug 2003 16:22:51 +0300 Sam Lantinga <slouken@libsdl.org> parents: 571 diff changeset	39 #define _THIS SDL_VideoDevice* this
0 74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	40
266 c6abdda2f666 Added QNX cleanups by Mike Gorchak (thanks!) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	41 #define PH_OGL_MAX_ATTRIBS 32
c6abdda2f666 Added QNX cleanups by Mike Gorchak (thanks!) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	42
315 3333b6e68289 Date: Sat, 23 Mar 2002 13:53:37 +0200 Sam Lantinga <slouken@libsdl.org> parents: 309 diff changeset	43 #define SDLPH_PAL_NONE 0x00000000L
3333b6e68289 Date: Sat, 23 Mar 2002 13:53:37 +0200 Sam Lantinga <slouken@libsdl.org> parents: 309 diff changeset	44 #define SDLPH_PAL_EMULATE 0x00000001L
3333b6e68289 Date: Sat, 23 Mar 2002 13:53:37 +0200 Sam Lantinga <slouken@libsdl.org> parents: 309 diff changeset	45 #define SDLPH_PAL_SYSTEM 0x00000002L
3333b6e68289 Date: Sat, 23 Mar 2002 13:53:37 +0200 Sam Lantinga <slouken@libsdl.org> parents: 309 diff changeset	46
663 8bedd6d61642 Date: Sat, 2 Aug 2003 16:22:51 +0300 Sam Lantinga <slouken@libsdl.org> parents: 571 diff changeset	47 typedef struct
8bedd6d61642 Date: Sat, 2 Aug 2003 16:22:51 +0300 Sam Lantinga <slouken@libsdl.org> parents: 571 diff changeset	48 {
571 8e3ce997621c Date: Thu, 16 Jan 2003 13:48:31 +0200 Sam Lantinga <slouken@libsdl.org> parents: 380 diff changeset	49 unsigned char* Y;
8e3ce997621c Date: Thu, 16 Jan 2003 13:48:31 +0200 Sam Lantinga <slouken@libsdl.org> parents: 380 diff changeset	50 unsigned char* V;
8e3ce997621c Date: Thu, 16 Jan 2003 13:48:31 +0200 Sam Lantinga <slouken@libsdl.org> parents: 380 diff changeset	51 unsigned char* U;
8e3ce997621c Date: Thu, 16 Jan 2003 13:48:31 +0200 Sam Lantinga <slouken@libsdl.org> parents: 380 diff changeset	52 } FRAMEDATA;
0 74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	53
663 8bedd6d61642 Date: Sat, 2 Aug 2003 16:22:51 +0300 Sam Lantinga <slouken@libsdl.org> parents: 571 diff changeset	54 /* Mask values for SDL_ReallocFormat() */
8bedd6d61642 Date: Sat, 2 Aug 2003 16:22:51 +0300 Sam Lantinga <slouken@libsdl.org> parents: 571 diff changeset	55 struct ColourMasks
8bedd6d61642 Date: Sat, 2 Aug 2003 16:22:51 +0300 Sam Lantinga <slouken@libsdl.org> parents: 571 diff changeset	56 {
8bedd6d61642 Date: Sat, 2 Aug 2003 16:22:51 +0300 Sam Lantinga <slouken@libsdl.org> parents: 571 diff changeset	57 Uint32 red;
8bedd6d61642 Date: Sat, 2 Aug 2003 16:22:51 +0300 Sam Lantinga <slouken@libsdl.org> parents: 571 diff changeset	58 Uint32 green;
8bedd6d61642 Date: Sat, 2 Aug 2003 16:22:51 +0300 Sam Lantinga <slouken@libsdl.org> parents: 571 diff changeset	59 Uint32 blue;
8bedd6d61642 Date: Sat, 2 Aug 2003 16:22:51 +0300 Sam Lantinga <slouken@libsdl.org> parents: 571 diff changeset	60 Uint32 alpha;
8bedd6d61642 Date: Sat, 2 Aug 2003 16:22:51 +0300 Sam Lantinga <slouken@libsdl.org> parents: 571 diff changeset	61 Uint32 bpp;
8bedd6d61642 Date: Sat, 2 Aug 2003 16:22:51 +0300 Sam Lantinga <slouken@libsdl.org> parents: 571 diff changeset	62 };
8bedd6d61642 Date: Sat, 2 Aug 2003 16:22:51 +0300 Sam Lantinga <slouken@libsdl.org> parents: 571 diff changeset	63
0 74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	64 /* Private display data */
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	65 struct SDL_PrivateVideoData {
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	66 PgDisplaySettings_t mode_settings;
315 3333b6e68289 Date: Sat, 23 Mar 2002 13:53:37 +0200 Sam Lantinga <slouken@libsdl.org> parents: 309 diff changeset	67 PtWidget_t Window; / used to handle input events */
3333b6e68289 Date: Sat, 23 Mar 2002 13:53:37 +0200 Sam Lantinga <slouken@libsdl.org> parents: 309 diff changeset	68 PhImage_t image; / used to display image */
309 2de77f7b7a28 * empty log message * Sam Lantinga <slouken@libsdl.org> parents: 297 diff changeset	69 #ifdef HAVE_OPENGL
315 3333b6e68289 Date: Sat, 23 Mar 2002 13:53:37 +0200 Sam Lantinga <slouken@libsdl.org> parents: 309 diff changeset	70 PdOpenGLContext_t* OGLContext; /* OpenGL context */
309 2de77f7b7a28 * empty log message * Sam Lantinga <slouken@libsdl.org> parents: 297 diff changeset	71 #endif /* HAVE_OPENGL */
571 8e3ce997621c Date: Thu, 16 Jan 2003 13:48:31 +0200 Sam Lantinga <slouken@libsdl.org> parents: 380 diff changeset	72 PgColor_t savedpal[_Pg_MAX_PALETTE];
8e3ce997621c Date: Thu, 16 Jan 2003 13:48:31 +0200 Sam Lantinga <slouken@libsdl.org> parents: 380 diff changeset	73 PgColor_t syspalph[_Pg_MAX_PALETTE];
0 74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	74
309 2de77f7b7a28 * empty log message * Sam Lantinga <slouken@libsdl.org> parents: 297 diff changeset	75 struct {
571 8e3ce997621c Date: Thu, 16 Jan 2003 13:48:31 +0200 Sam Lantinga <slouken@libsdl.org> parents: 380 diff changeset	76 PdDirectContext_t* direct_context;
8e3ce997621c Date: Thu, 16 Jan 2003 13:48:31 +0200 Sam Lantinga <slouken@libsdl.org> parents: 380 diff changeset	77 PdOffscreenContext_t* offscreen_context;
663 8bedd6d61642 Date: Sat, 2 Aug 2003 16:22:51 +0300 Sam Lantinga <slouken@libsdl.org> parents: 571 diff changeset	78 PdOffscreenContext_t* offscreen_backcontext;
571 8e3ce997621c Date: Thu, 16 Jan 2003 13:48:31 +0200 Sam Lantinga <slouken@libsdl.org> parents: 380 diff changeset	79 PhDrawContext_t* oldDC;
663 8bedd6d61642 Date: Sat, 2 Aug 2003 16:22:51 +0300 Sam Lantinga <slouken@libsdl.org> parents: 571 diff changeset	80 uint8_t* dc_ptr;
571 8e3ce997621c Date: Thu, 16 Jan 2003 13:48:31 +0200 Sam Lantinga <slouken@libsdl.org> parents: 380 diff changeset	81 unsigned char* CurrentFrameData;
8e3ce997621c Date: Thu, 16 Jan 2003 13:48:31 +0200 Sam Lantinga <slouken@libsdl.org> parents: 380 diff changeset	82 unsigned char* FrameData0;
8e3ce997621c Date: Thu, 16 Jan 2003 13:48:31 +0200 Sam Lantinga <slouken@libsdl.org> parents: 380 diff changeset	83 unsigned char* FrameData1;
309 2de77f7b7a28 * empty log message * Sam Lantinga <slouken@libsdl.org> parents: 297 diff changeset	84 int current;
2de77f7b7a28 * empty log message * Sam Lantinga <slouken@libsdl.org> parents: 297 diff changeset	85 long flags;
2de77f7b7a28 * empty log message * Sam Lantinga <slouken@libsdl.org> parents: 297 diff changeset	86 } ocimage;
0 74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	87
315 3333b6e68289 Date: Sat, 23 Mar 2002 13:53:37 +0200 Sam Lantinga <slouken@libsdl.org> parents: 309 diff changeset	88 PgHWCaps_t graphics_card_caps; /* Graphics card caps at the moment of start */
3333b6e68289 Date: Sat, 23 Mar 2002 13:53:37 +0200 Sam Lantinga <slouken@libsdl.org> parents: 309 diff changeset	89 int old_video_mode; /* Stored mode before fullscreen switch */
3333b6e68289 Date: Sat, 23 Mar 2002 13:53:37 +0200 Sam Lantinga <slouken@libsdl.org> parents: 309 diff changeset	90 int old_refresh_rate; /* Stored refresh rate befor fullscreen switch */
0 74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	91
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	92 int mouse_relative;
309 2de77f7b7a28 * empty log message * Sam Lantinga <slouken@libsdl.org> parents: 297 diff changeset	93 WMcursor* BlankCursor;
0 74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	94
663 8bedd6d61642 Date: Sat, 2 Aug 2003 16:22:51 +0300 Sam Lantinga <slouken@libsdl.org> parents: 571 diff changeset	95 int depth; /* current visual depth (not bpp) */
8bedd6d61642 Date: Sat, 2 Aug 2003 16:22:51 +0300 Sam Lantinga <slouken@libsdl.org> parents: 571 diff changeset	96 int desktopbpp; /* bpp of desktop at the moment of start */
8bedd6d61642 Date: Sat, 2 Aug 2003 16:22:51 +0300 Sam Lantinga <slouken@libsdl.org> parents: 571 diff changeset	97 int desktoppal; /* palette mode emulation or system */
0 74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	98
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	99 int currently_fullscreen;
663 8bedd6d61642 Date: Sat, 2 Aug 2003 16:22:51 +0300 Sam Lantinga <slouken@libsdl.org> parents: 571 diff changeset	100 int currently_hided; /* 1 - window hided (minimazed), 0 - normal */
0 74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	101
309 2de77f7b7a28 * empty log message * Sam Lantinga <slouken@libsdl.org> parents: 297 diff changeset	102 PhEvent_t* event;
663 8bedd6d61642 Date: Sat, 2 Aug 2003 16:22:51 +0300 Sam Lantinga <slouken@libsdl.org> parents: 571 diff changeset	103 SDL_Overlay* overlay;
0 74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	104 };
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	105
309 2de77f7b7a28 * empty log message * Sam Lantinga <slouken@libsdl.org> parents: 297 diff changeset	106 #define mode_settings (this->hidden->mode_settings)
2de77f7b7a28 * empty log message * Sam Lantinga <slouken@libsdl.org> parents: 297 diff changeset	107 #define window (this->hidden->Window)
2de77f7b7a28 * empty log message * Sam Lantinga <slouken@libsdl.org> parents: 297 diff changeset	108 #define oglctx (this->hidden->OGLContext)
2de77f7b7a28 * empty log message * Sam Lantinga <slouken@libsdl.org> parents: 297 diff changeset	109 #define SDL_Image (this->hidden->image)
2de77f7b7a28 * empty log message * Sam Lantinga <slouken@libsdl.org> parents: 297 diff changeset	110 #define OCImage (this->hidden->ocimage)
2de77f7b7a28 * empty log message * Sam Lantinga <slouken@libsdl.org> parents: 297 diff changeset	111 #define old_video_mode (this->hidden->old_video_mode)
2de77f7b7a28 * empty log message * Sam Lantinga <slouken@libsdl.org> parents: 297 diff changeset	112 #define old_refresh_rate (this->hidden->old_refresh_rate)
2de77f7b7a28 * empty log message * Sam Lantinga <slouken@libsdl.org> parents: 297 diff changeset	113 #define graphics_card_caps (this->hidden->graphics_card_caps)
315 3333b6e68289 Date: Sat, 23 Mar 2002 13:53:37 +0200 Sam Lantinga <slouken@libsdl.org> parents: 309 diff changeset	114 #define desktopbpp (this->hidden->desktopbpp)
3333b6e68289 Date: Sat, 23 Mar 2002 13:53:37 +0200 Sam Lantinga <slouken@libsdl.org> parents: 309 diff changeset	115 #define desktoppal (this->hidden->desktoppal)
571 8e3ce997621c Date: Thu, 16 Jan 2003 13:48:31 +0200 Sam Lantinga <slouken@libsdl.org> parents: 380 diff changeset	116 #define savedpal (this->hidden->savedpal)
8e3ce997621c Date: Thu, 16 Jan 2003 13:48:31 +0200 Sam Lantinga <slouken@libsdl.org> parents: 380 diff changeset	117 #define syspalph (this->hidden->syspalph)
663 8bedd6d61642 Date: Sat, 2 Aug 2003 16:22:51 +0300 Sam Lantinga <slouken@libsdl.org> parents: 571 diff changeset	118 #define currently_fullscreen (this->hidden->currently_fullscreen)
8bedd6d61642 Date: Sat, 2 Aug 2003 16:22:51 +0300 Sam Lantinga <slouken@libsdl.org> parents: 571 diff changeset	119 #define currently_hided (this->hidden->currently_hided)
8bedd6d61642 Date: Sat, 2 Aug 2003 16:22:51 +0300 Sam Lantinga <slouken@libsdl.org> parents: 571 diff changeset	120 #define event (this->hidden->event)
8bedd6d61642 Date: Sat, 2 Aug 2003 16:22:51 +0300 Sam Lantinga <slouken@libsdl.org> parents: 571 diff changeset	121 #define current_overlay (this->hidden->overlay)
0 74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	122
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	123 /* Old variable names */
309 2de77f7b7a28 * empty log message * Sam Lantinga <slouken@libsdl.org> parents: 297 diff changeset	124 #define mouse_relative (this->hidden->mouse_relative)
2de77f7b7a28 * empty log message * Sam Lantinga <slouken@libsdl.org> parents: 297 diff changeset	125 #define SDL_BlankCursor (this->hidden->BlankCursor)
0 74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	126
663 8bedd6d61642 Date: Sat, 2 Aug 2003 16:22:51 +0300 Sam Lantinga <slouken@libsdl.org> parents: 571 diff changeset	127 #endif /* __SDL_PH_VIDEO_H__ */

Mercurial > sdl-ios-xcode

annotate src/video/photon/SDL_ph_video.h @ 664:abfdc08eb289