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

annotate src/video/photon/SDL_ph_modes.c @ 4170:092c0bc69155 SDL-1.2

Fixed bug #618 Description From Tim Angus 2008-08-30 12:23:56 (-) [reply] As we all know SDL 1.2 doesn't handle dead keys well since one key press potentially equals two (or more) characters. For example, on many layouts, keying <backquote>,<space> results in <no character>,<backquote><space>. Since the unicode member of the SDL_keysym struct only has room for one character, only one can be returned. On Linux, the first character is returned. On Windows however, unless the exact number of characters generated by the keypress is 1, nothing is returned. The following patch addresses this inconsistency. Updated patch which includes a further fix to the handling of the numpad when numlock is on. This further fix is courtesy Amanieu d'Antras.

author	Sam Lantinga <slouken@libsdl.org>
date	Mon, 13 Apr 2009 08:42:09 +0000
parents	a1b03ba2fcd0
children

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
4159 a1b03ba2fcd0 Updated copyright date Sam Lantinga <slouken@libsdl.org> parents: 1402 diff changeset	3 Copyright (C) 1997-2009 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
1312 c9b51268668f Updated copyright information and removed rcs id lines (problematic in branch merges) Sam Lantinga <slouken@libsdl.org> parents: 1289 diff changeset	6 modify it under the terms of the GNU Lesser General Public
0 74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	7 License as published by the Free Software Foundation; either
1312 c9b51268668f Updated copyright information and removed rcs id lines (problematic in branch merges) Sam Lantinga <slouken@libsdl.org> parents: 1289 diff changeset	8 version 2.1 of the License, or (at your option) any later version.
0 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
1312 c9b51268668f Updated copyright information and removed rcs id lines (problematic in branch merges) Sam Lantinga <slouken@libsdl.org> parents: 1289 diff changeset	13 Lesser General Public License for more details.
0 74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	14
1312 c9b51268668f Updated copyright information and removed rcs id lines (problematic in branch merges) Sam Lantinga <slouken@libsdl.org> parents: 1289 diff changeset	15 You should have received a copy of the GNU Lesser General Public
c9b51268668f Updated copyright information and removed rcs id lines (problematic in branch merges) Sam Lantinga <slouken@libsdl.org> parents: 1289 diff changeset	16 License along with this library; if not, write to the Free Software
c9b51268668f Updated copyright information and removed rcs id lines (problematic in branch merges) Sam Lantinga <slouken@libsdl.org> parents: 1289 diff changeset	17 Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
0 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: 204 diff changeset	20 slouken@libsdl.org
0 74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	21 */
1402 d910939febfa Use consistent identifiers for the various platforms we support. Sam Lantinga <slouken@libsdl.org> parents: 1361 diff changeset	22 #include "SDL_config.h"
0 74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	23
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	24 #include "SDL_ph_modes_c.h"
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	25
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	26 static PgVideoModeInfo_t mode_info;
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	27 static PgVideoModes_t mode_list;
266 c6abdda2f666 Added QNX cleanups by Mike Gorchak (thanks!) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	28
571 8e3ce997621c Date: Thu, 16 Jan 2003 13:48:31 +0200 Sam Lantinga <slouken@libsdl.org> parents: 315 diff changeset	29 /* The current list of available video modes */
266 c6abdda2f666 Added QNX cleanups by Mike Gorchak (thanks!) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	30 SDL_Rect SDL_modelist[PH_MAX_VIDEOMODES];
c6abdda2f666 Added QNX cleanups by Mike Gorchak (thanks!) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	31 SDL_Rect* SDL_modearray[PH_MAX_VIDEOMODES];
0 74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	32
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	33 static int compare_modes_by_res(const void* mode1, const void* mode2)
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	34 {
966 f72cc0c7305f Video modes are sorted width first, then height Sam Lantinga <slouken@libsdl.org> parents: 910 diff changeset	35 PgVideoModeInfo_t mode1_info;
f72cc0c7305f Video modes are sorted width first, then height Sam Lantinga <slouken@libsdl.org> parents: 910 diff changeset	36 PgVideoModeInfo_t mode2_info;
0 74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	37
966 f72cc0c7305f Video modes are sorted width first, then height Sam Lantinga <slouken@libsdl.org> parents: 910 diff changeset	38 if (PgGetVideoModeInfo((unsigned short)mode1, &mode1_info) < 0)
571 8e3ce997621c Date: Thu, 16 Jan 2003 13:48:31 +0200 Sam Lantinga <slouken@libsdl.org> parents: 315 diff changeset	39 {
8e3ce997621c Date: Thu, 16 Jan 2003 13:48:31 +0200 Sam Lantinga <slouken@libsdl.org> parents: 315 diff changeset	40 return 0;
8e3ce997621c Date: Thu, 16 Jan 2003 13:48:31 +0200 Sam Lantinga <slouken@libsdl.org> parents: 315 diff changeset	41 }
0 74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	42
966 f72cc0c7305f Video modes are sorted width first, then height Sam Lantinga <slouken@libsdl.org> parents: 910 diff changeset	43 if (PgGetVideoModeInfo((unsigned short)mode2, &mode2_info) < 0)
f72cc0c7305f Video modes are sorted width first, then height Sam Lantinga <slouken@libsdl.org> parents: 910 diff changeset	44 {
f72cc0c7305f Video modes are sorted width first, then height Sam Lantinga <slouken@libsdl.org> parents: 910 diff changeset	45 return 0;
f72cc0c7305f Video modes are sorted width first, then height Sam Lantinga <slouken@libsdl.org> parents: 910 diff changeset	46 }
571 8e3ce997621c Date: Thu, 16 Jan 2003 13:48:31 +0200 Sam Lantinga <slouken@libsdl.org> parents: 315 diff changeset	47
966 f72cc0c7305f Video modes are sorted width first, then height Sam Lantinga <slouken@libsdl.org> parents: 910 diff changeset	48 if (mode1_info.width == mode2_info.width)
663 8bedd6d61642 Date: Sat, 2 Aug 2003 16:22:51 +0300 Sam Lantinga <slouken@libsdl.org> parents: 571 diff changeset	49 {
966 f72cc0c7305f Video modes are sorted width first, then height Sam Lantinga <slouken@libsdl.org> parents: 910 diff changeset	50 return mode2_info.height - mode1_info.height;
663 8bedd6d61642 Date: Sat, 2 Aug 2003 16:22:51 +0300 Sam Lantinga <slouken@libsdl.org> parents: 571 diff changeset	51 }
571 8e3ce997621c Date: Thu, 16 Jan 2003 13:48:31 +0200 Sam Lantinga <slouken@libsdl.org> parents: 315 diff changeset	52 else
663 8bedd6d61642 Date: Sat, 2 Aug 2003 16:22:51 +0300 Sam Lantinga <slouken@libsdl.org> parents: 571 diff changeset	53 {
966 f72cc0c7305f Video modes are sorted width first, then height Sam Lantinga <slouken@libsdl.org> parents: 910 diff changeset	54 return mode2_info.width - mode1_info.width;
663 8bedd6d61642 Date: Sat, 2 Aug 2003 16:22:51 +0300 Sam Lantinga <slouken@libsdl.org> parents: 571 diff changeset	55 }
0 74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	56 }
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	57
266 c6abdda2f666 Added QNX cleanups by Mike Gorchak (thanks!) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	58 SDL_Rect *ph_ListModes(_THIS, SDL_PixelFormat format, Uint32 flags)
0 74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	59 {
309 2de77f7b7a28 * empty log message * Sam Lantinga <slouken@libsdl.org> parents: 297 diff changeset	60 int i = 0;
2de77f7b7a28 * empty log message * Sam Lantinga <slouken@libsdl.org> parents: 297 diff changeset	61 int j = 0;
2de77f7b7a28 * empty log message * Sam Lantinga <slouken@libsdl.org> parents: 297 diff changeset	62 SDL_Rect Amodelist[PH_MAX_VIDEOMODES];
0 74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	63
309 2de77f7b7a28 * empty log message * Sam Lantinga <slouken@libsdl.org> parents: 297 diff changeset	64 for (i=0; i<PH_MAX_VIDEOMODES; i++)
2de77f7b7a28 * empty log message * Sam Lantinga <slouken@libsdl.org> parents: 297 diff changeset	65 {
2de77f7b7a28 * empty log message * Sam Lantinga <slouken@libsdl.org> parents: 297 diff changeset	66 SDL_modearray[i]=&SDL_modelist[i];
2de77f7b7a28 * empty log message * Sam Lantinga <slouken@libsdl.org> parents: 297 diff changeset	67 }
0 74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	68
821 30168104389f Date: Sat, 14 Feb 2004 14:52:40 +0200 Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	69 if (PgGetVideoModeList(&mode_list) < 0)
309 2de77f7b7a28 * empty log message * Sam Lantinga <slouken@libsdl.org> parents: 297 diff changeset	70 {
663 8bedd6d61642 Date: Sat, 2 Aug 2003 16:22:51 +0300 Sam Lantinga <slouken@libsdl.org> parents: 571 diff changeset	71 SDL_SetError("ph_ListModes(): PgGetVideoModeList() function failed !\n");
309 2de77f7b7a28 * empty log message * Sam Lantinga <slouken@libsdl.org> parents: 297 diff changeset	72 return NULL;
2de77f7b7a28 * empty log message * Sam Lantinga <slouken@libsdl.org> parents: 297 diff changeset	73 }
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 mode_info.bits_per_pixel = 0;
0 74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	76
309 2de77f7b7a28 * empty log message * Sam Lantinga <slouken@libsdl.org> parents: 297 diff changeset	77 for (i=0; i < mode_list.num_modes; i++)
2de77f7b7a28 * empty log message * Sam Lantinga <slouken@libsdl.org> parents: 297 diff changeset	78 {
2de77f7b7a28 * empty log message * Sam Lantinga <slouken@libsdl.org> parents: 297 diff changeset	79 if (PgGetVideoModeInfo(mode_list.modes[i], &mode_info) < 0)
2de77f7b7a28 * empty log message * Sam Lantinga <slouken@libsdl.org> parents: 297 diff changeset	80 {
663 8bedd6d61642 Date: Sat, 2 Aug 2003 16:22:51 +0300 Sam Lantinga <slouken@libsdl.org> parents: 571 diff changeset	81 SDL_SetError("ph_ListModes(): PgGetVideoModeInfo() function failed on mode: 0x%X.\n", mode_list.modes[i]);
309 2de77f7b7a28 * empty log message * Sam Lantinga <slouken@libsdl.org> parents: 297 diff changeset	82 return NULL;
2de77f7b7a28 * empty log message * Sam Lantinga <slouken@libsdl.org> parents: 297 diff changeset	83 }
2de77f7b7a28 * empty log message * Sam Lantinga <slouken@libsdl.org> parents: 297 diff changeset	84 if(mode_info.bits_per_pixel == format->BitsPerPixel)
2de77f7b7a28 * empty log message * Sam Lantinga <slouken@libsdl.org> parents: 297 diff changeset	85 {
2de77f7b7a28 * empty log message * Sam Lantinga <slouken@libsdl.org> parents: 297 diff changeset	86 Amodelist[j].w = mode_info.width;
2de77f7b7a28 * empty log message * Sam Lantinga <slouken@libsdl.org> parents: 297 diff changeset	87 Amodelist[j].h = mode_info.height;
2de77f7b7a28 * empty log message * Sam Lantinga <slouken@libsdl.org> parents: 297 diff changeset	88 Amodelist[j].x = 0;
2de77f7b7a28 * empty log message * Sam Lantinga <slouken@libsdl.org> parents: 297 diff changeset	89 Amodelist[j].y = 0;
2de77f7b7a28 * empty log message * Sam Lantinga <slouken@libsdl.org> parents: 297 diff changeset	90 j++;
2de77f7b7a28 * empty log message * Sam Lantinga <slouken@libsdl.org> parents: 297 diff changeset	91 }
2de77f7b7a28 * empty log message * Sam Lantinga <slouken@libsdl.org> parents: 297 diff changeset	92 }
2de77f7b7a28 * empty log message * Sam Lantinga <slouken@libsdl.org> parents: 297 diff changeset	93
2de77f7b7a28 * empty log message * Sam Lantinga <slouken@libsdl.org> parents: 297 diff changeset	94 /* reorder biggest for smallest, assume width dominates */
266 c6abdda2f666 Added QNX cleanups by Mike Gorchak (thanks!) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	95
309 2de77f7b7a28 * empty log message * Sam Lantinga <slouken@libsdl.org> parents: 297 diff changeset	96 for(i=0; i<j; i++)
2de77f7b7a28 * empty log message * Sam Lantinga <slouken@libsdl.org> parents: 297 diff changeset	97 {
821 30168104389f Date: Sat, 14 Feb 2004 14:52:40 +0200 Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	98 SDL_modelist[i].w = Amodelist[j - i - 1].w;
30168104389f Date: Sat, 14 Feb 2004 14:52:40 +0200 Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	99 SDL_modelist[i].h = Amodelist[j - i - 1].h;
30168104389f Date: Sat, 14 Feb 2004 14:52:40 +0200 Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	100 SDL_modelist[i].x = Amodelist[j - i - 1].x;
30168104389f Date: Sat, 14 Feb 2004 14:52:40 +0200 Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	101 SDL_modelist[i].y = Amodelist[j - i - 1].y;
309 2de77f7b7a28 * empty log message * Sam Lantinga <slouken@libsdl.org> parents: 297 diff changeset	102 }
2de77f7b7a28 * empty log message * Sam Lantinga <slouken@libsdl.org> parents: 297 diff changeset	103 SDL_modearray[j]=NULL;
0 74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	104
309 2de77f7b7a28 * empty log message * Sam Lantinga <slouken@libsdl.org> parents: 297 diff changeset	105 return SDL_modearray;
0 74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	106 }
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	107
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	108 void ph_FreeVideoModes(_THIS)
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	109 {
266 c6abdda2f666 Added QNX cleanups by Mike Gorchak (thanks!) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	110 return;
0 74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	111 }
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	112
309 2de77f7b7a28 * empty log message * Sam Lantinga <slouken@libsdl.org> parents: 297 diff changeset	113 /* return the mode associated with width, height and bpp */
2de77f7b7a28 * empty log message * Sam Lantinga <slouken@libsdl.org> parents: 297 diff changeset	114 /* if there is no mode then zero is returned */
663 8bedd6d61642 Date: Sat, 2 Aug 2003 16:22:51 +0300 Sam Lantinga <slouken@libsdl.org> parents: 571 diff changeset	115 int ph_GetVideoMode(int width, int height, int bpp)
0 74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	116 {
309 2de77f7b7a28 * empty log message * Sam Lantinga <slouken@libsdl.org> parents: 297 diff changeset	117 int i;
821 30168104389f Date: Sat, 14 Feb 2004 14:52:40 +0200 Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	118 int modestage=0;
30168104389f Date: Sat, 14 Feb 2004 14:52:40 +0200 Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	119 int closestmode=0;
0 74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	120
309 2de77f7b7a28 * empty log message * Sam Lantinga <slouken@libsdl.org> parents: 297 diff changeset	121 if (PgGetVideoModeList(&mode_list) < 0)
2de77f7b7a28 * empty log message * Sam Lantinga <slouken@libsdl.org> parents: 297 diff changeset	122 {
2de77f7b7a28 * empty log message * Sam Lantinga <slouken@libsdl.org> parents: 297 diff changeset	123 return -1;
2de77f7b7a28 * empty log message * Sam Lantinga <slouken@libsdl.org> parents: 297 diff changeset	124 }
2de77f7b7a28 * empty log message * Sam Lantinga <slouken@libsdl.org> parents: 297 diff changeset	125
821 30168104389f Date: Sat, 14 Feb 2004 14:52:40 +0200 Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	126 /* special case for the double-sized 320x200 mode */
30168104389f Date: Sat, 14 Feb 2004 14:52:40 +0200 Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	127 if ((width==640) && (height==400))
30168104389f Date: Sat, 14 Feb 2004 14:52:40 +0200 Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	128 {
30168104389f Date: Sat, 14 Feb 2004 14:52:40 +0200 Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	129 modestage=1;
30168104389f Date: Sat, 14 Feb 2004 14:52:40 +0200 Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	130 }
30168104389f Date: Sat, 14 Feb 2004 14:52:40 +0200 Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	131
309 2de77f7b7a28 * empty log message * Sam Lantinga <slouken@libsdl.org> parents: 297 diff changeset	132 /* search list for exact match */
821 30168104389f Date: Sat, 14 Feb 2004 14:52:40 +0200 Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	133 for (i=0; i<mode_list.num_modes; i++)
309 2de77f7b7a28 * empty log message * Sam Lantinga <slouken@libsdl.org> parents: 297 diff changeset	134 {
2de77f7b7a28 * empty log message * Sam Lantinga <slouken@libsdl.org> parents: 297 diff changeset	135 if (PgGetVideoModeInfo(mode_list.modes[i], &mode_info) < 0)
2de77f7b7a28 * empty log message * Sam Lantinga <slouken@libsdl.org> parents: 297 diff changeset	136 {
2de77f7b7a28 * empty log message * Sam Lantinga <slouken@libsdl.org> parents: 297 diff changeset	137 return 0;
2de77f7b7a28 * empty log message * Sam Lantinga <slouken@libsdl.org> parents: 297 diff changeset	138 }
2de77f7b7a28 * empty log message * Sam Lantinga <slouken@libsdl.org> parents: 297 diff changeset	139
821 30168104389f Date: Sat, 14 Feb 2004 14:52:40 +0200 Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	140 if ((mode_info.width == width) && (mode_info.height == height) &&
309 2de77f7b7a28 * empty log message * Sam Lantinga <slouken@libsdl.org> parents: 297 diff changeset	141 (mode_info.bits_per_pixel == bpp))
2de77f7b7a28 * empty log message * Sam Lantinga <slouken@libsdl.org> parents: 297 diff changeset	142 {
2de77f7b7a28 * empty log message * Sam Lantinga <slouken@libsdl.org> parents: 297 diff changeset	143 return mode_list.modes[i];
2de77f7b7a28 * empty log message * Sam Lantinga <slouken@libsdl.org> parents: 297 diff changeset	144 }
821 30168104389f Date: Sat, 14 Feb 2004 14:52:40 +0200 Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	145 else
30168104389f Date: Sat, 14 Feb 2004 14:52:40 +0200 Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	146 {
30168104389f Date: Sat, 14 Feb 2004 14:52:40 +0200 Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	147 if ((modestage) && (mode_info.width == width) && (mode_info.height == height+80) &&
30168104389f Date: Sat, 14 Feb 2004 14:52:40 +0200 Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	148 (mode_info.bits_per_pixel == bpp))
30168104389f Date: Sat, 14 Feb 2004 14:52:40 +0200 Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	149 {
30168104389f Date: Sat, 14 Feb 2004 14:52:40 +0200 Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	150 modestage=2;
30168104389f Date: Sat, 14 Feb 2004 14:52:40 +0200 Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	151 closestmode=mode_list.modes[i];
30168104389f Date: Sat, 14 Feb 2004 14:52:40 +0200 Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	152 }
30168104389f Date: Sat, 14 Feb 2004 14:52:40 +0200 Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	153 }
30168104389f Date: Sat, 14 Feb 2004 14:52:40 +0200 Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	154 }
30168104389f Date: Sat, 14 Feb 2004 14:52:40 +0200 Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	155
30168104389f Date: Sat, 14 Feb 2004 14:52:40 +0200 Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	156 /* if we are here, then no 640x400xbpp mode found and we'll emulate it via 640x480xbpp mode */
30168104389f Date: Sat, 14 Feb 2004 14:52:40 +0200 Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	157 if (modestage==2)
30168104389f Date: Sat, 14 Feb 2004 14:52:40 +0200 Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	158 {
30168104389f Date: Sat, 14 Feb 2004 14:52:40 +0200 Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	159 return closestmode;
309 2de77f7b7a28 * empty log message * Sam Lantinga <slouken@libsdl.org> parents: 297 diff changeset	160 }
2de77f7b7a28 * empty log message * Sam Lantinga <slouken@libsdl.org> parents: 297 diff changeset	161
2de77f7b7a28 * empty log message * Sam Lantinga <slouken@libsdl.org> parents: 297 diff changeset	162 return (i == mode_list.num_modes) ? 0 : mode_list.modes[i];
0 74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	163 }
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	164
821 30168104389f Date: Sat, 14 Feb 2004 14:52:40 +0200 Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	165 /* return the mode associated with width, height and bpp */
0 74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	166 /* if requested bpp is not found the mode with closest bpp is returned */
663 8bedd6d61642 Date: Sat, 2 Aug 2003 16:22:51 +0300 Sam Lantinga <slouken@libsdl.org> parents: 571 diff changeset	167 int get_mode_any_format(int width, int height, int bpp)
0 74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	168 {
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	169 int i, closest, delta, min_delta;
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	170
663 8bedd6d61642 Date: Sat, 2 Aug 2003 16:22:51 +0300 Sam Lantinga <slouken@libsdl.org> parents: 571 diff changeset	171 if (PgGetVideoModeList(&mode_list) < 0)
8bedd6d61642 Date: Sat, 2 Aug 2003 16:22:51 +0300 Sam Lantinga <slouken@libsdl.org> parents: 571 diff changeset	172 {
8bedd6d61642 Date: Sat, 2 Aug 2003 16:22:51 +0300 Sam Lantinga <slouken@libsdl.org> parents: 571 diff changeset	173 return -1;
8bedd6d61642 Date: Sat, 2 Aug 2003 16:22:51 +0300 Sam Lantinga <slouken@libsdl.org> parents: 571 diff changeset	174 }
8bedd6d61642 Date: Sat, 2 Aug 2003 16:22:51 +0300 Sam Lantinga <slouken@libsdl.org> parents: 571 diff changeset	175
1338 604d73db6802 Removed uses of stdlib.h and string.h Sam Lantinga <slouken@libsdl.org> parents: 1336 diff changeset	176 SDL_qsort(mode_list.modes, mode_list.num_modes, sizeof(unsigned short), compare_modes_by_res);
0 74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	177
663 8bedd6d61642 Date: Sat, 2 Aug 2003 16:22:51 +0300 Sam Lantinga <slouken@libsdl.org> parents: 571 diff changeset	178 for(i=0;i<mode_list.num_modes;i++)
8bedd6d61642 Date: Sat, 2 Aug 2003 16:22:51 +0300 Sam Lantinga <slouken@libsdl.org> parents: 571 diff changeset	179 {
8bedd6d61642 Date: Sat, 2 Aug 2003 16:22:51 +0300 Sam Lantinga <slouken@libsdl.org> parents: 571 diff changeset	180 if (PgGetVideoModeInfo(mode_list.modes[i], &mode_info) < 0)
8bedd6d61642 Date: Sat, 2 Aug 2003 16:22:51 +0300 Sam Lantinga <slouken@libsdl.org> parents: 571 diff changeset	181 {
8bedd6d61642 Date: Sat, 2 Aug 2003 16:22:51 +0300 Sam Lantinga <slouken@libsdl.org> parents: 571 diff changeset	182 return 0;
8bedd6d61642 Date: Sat, 2 Aug 2003 16:22:51 +0300 Sam Lantinga <slouken@libsdl.org> parents: 571 diff changeset	183 }
8bedd6d61642 Date: Sat, 2 Aug 2003 16:22:51 +0300 Sam Lantinga <slouken@libsdl.org> parents: 571 diff changeset	184 if ((mode_info.width == width) && (mode_info.height == height))
8bedd6d61642 Date: Sat, 2 Aug 2003 16:22:51 +0300 Sam Lantinga <slouken@libsdl.org> parents: 571 diff changeset	185 {
0 74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	186 break;
663 8bedd6d61642 Date: Sat, 2 Aug 2003 16:22:51 +0300 Sam Lantinga <slouken@libsdl.org> parents: 571 diff changeset	187 }
8bedd6d61642 Date: Sat, 2 Aug 2003 16:22:51 +0300 Sam Lantinga <slouken@libsdl.org> parents: 571 diff changeset	188 }
8bedd6d61642 Date: Sat, 2 Aug 2003 16:22:51 +0300 Sam Lantinga <slouken@libsdl.org> parents: 571 diff changeset	189
8bedd6d61642 Date: Sat, 2 Aug 2003 16:22:51 +0300 Sam Lantinga <slouken@libsdl.org> parents: 571 diff changeset	190 if (i<mode_list.num_modes)
8bedd6d61642 Date: Sat, 2 Aug 2003 16:22:51 +0300 Sam Lantinga <slouken@libsdl.org> parents: 571 diff changeset	191 {
8bedd6d61642 Date: Sat, 2 Aug 2003 16:22:51 +0300 Sam Lantinga <slouken@libsdl.org> parents: 571 diff changeset	192 /* get closest bpp */
8bedd6d61642 Date: Sat, 2 Aug 2003 16:22:51 +0300 Sam Lantinga <slouken@libsdl.org> parents: 571 diff changeset	193 closest = i++;
8bedd6d61642 Date: Sat, 2 Aug 2003 16:22:51 +0300 Sam Lantinga <slouken@libsdl.org> parents: 571 diff changeset	194 if (mode_info.bits_per_pixel == bpp)
8bedd6d61642 Date: Sat, 2 Aug 2003 16:22:51 +0300 Sam Lantinga <slouken@libsdl.org> parents: 571 diff changeset	195 {
8bedd6d61642 Date: Sat, 2 Aug 2003 16:22:51 +0300 Sam Lantinga <slouken@libsdl.org> parents: 571 diff changeset	196 return mode_list.modes[closest];
8bedd6d61642 Date: Sat, 2 Aug 2003 16:22:51 +0300 Sam Lantinga <slouken@libsdl.org> parents: 571 diff changeset	197 }
8bedd6d61642 Date: Sat, 2 Aug 2003 16:22:51 +0300 Sam Lantinga <slouken@libsdl.org> parents: 571 diff changeset	198
8bedd6d61642 Date: Sat, 2 Aug 2003 16:22:51 +0300 Sam Lantinga <slouken@libsdl.org> parents: 571 diff changeset	199 min_delta = abs(mode_info.bits_per_pixel - bpp);
0 74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	200
663 8bedd6d61642 Date: Sat, 2 Aug 2003 16:22:51 +0300 Sam Lantinga <slouken@libsdl.org> parents: 571 diff changeset	201 while(1)
8bedd6d61642 Date: Sat, 2 Aug 2003 16:22:51 +0300 Sam Lantinga <slouken@libsdl.org> parents: 571 diff changeset	202 {
8bedd6d61642 Date: Sat, 2 Aug 2003 16:22:51 +0300 Sam Lantinga <slouken@libsdl.org> parents: 571 diff changeset	203 if (PgGetVideoModeInfo(mode_list.modes[i], &mode_info) < 0)
8bedd6d61642 Date: Sat, 2 Aug 2003 16:22:51 +0300 Sam Lantinga <slouken@libsdl.org> parents: 571 diff changeset	204 {
8bedd6d61642 Date: Sat, 2 Aug 2003 16:22:51 +0300 Sam Lantinga <slouken@libsdl.org> parents: 571 diff changeset	205 return 0;
8bedd6d61642 Date: Sat, 2 Aug 2003 16:22:51 +0300 Sam Lantinga <slouken@libsdl.org> parents: 571 diff changeset	206 }
0 74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	207
663 8bedd6d61642 Date: Sat, 2 Aug 2003 16:22:51 +0300 Sam Lantinga <slouken@libsdl.org> parents: 571 diff changeset	208 if ((mode_info.width != width) \|\| (mode_info.height != height))
8bedd6d61642 Date: Sat, 2 Aug 2003 16:22:51 +0300 Sam Lantinga <slouken@libsdl.org> parents: 571 diff changeset	209 {
8bedd6d61642 Date: Sat, 2 Aug 2003 16:22:51 +0300 Sam Lantinga <slouken@libsdl.org> parents: 571 diff changeset	210 break;
8bedd6d61642 Date: Sat, 2 Aug 2003 16:22:51 +0300 Sam Lantinga <slouken@libsdl.org> parents: 571 diff changeset	211 }
8bedd6d61642 Date: Sat, 2 Aug 2003 16:22:51 +0300 Sam Lantinga <slouken@libsdl.org> parents: 571 diff changeset	212 else
8bedd6d61642 Date: Sat, 2 Aug 2003 16:22:51 +0300 Sam Lantinga <slouken@libsdl.org> parents: 571 diff changeset	213 {
8bedd6d61642 Date: Sat, 2 Aug 2003 16:22:51 +0300 Sam Lantinga <slouken@libsdl.org> parents: 571 diff changeset	214 if (mode_info.bits_per_pixel == bpp)
8bedd6d61642 Date: Sat, 2 Aug 2003 16:22:51 +0300 Sam Lantinga <slouken@libsdl.org> parents: 571 diff changeset	215 {
8bedd6d61642 Date: Sat, 2 Aug 2003 16:22:51 +0300 Sam Lantinga <slouken@libsdl.org> parents: 571 diff changeset	216 closest = i;
8bedd6d61642 Date: Sat, 2 Aug 2003 16:22:51 +0300 Sam Lantinga <slouken@libsdl.org> parents: 571 diff changeset	217 break;
8bedd6d61642 Date: Sat, 2 Aug 2003 16:22:51 +0300 Sam Lantinga <slouken@libsdl.org> parents: 571 diff changeset	218 }
8bedd6d61642 Date: Sat, 2 Aug 2003 16:22:51 +0300 Sam Lantinga <slouken@libsdl.org> parents: 571 diff changeset	219 else
8bedd6d61642 Date: Sat, 2 Aug 2003 16:22:51 +0300 Sam Lantinga <slouken@libsdl.org> parents: 571 diff changeset	220 {
8bedd6d61642 Date: Sat, 2 Aug 2003 16:22:51 +0300 Sam Lantinga <slouken@libsdl.org> parents: 571 diff changeset	221 delta = abs(mode_info.bits_per_pixel - bpp);
8bedd6d61642 Date: Sat, 2 Aug 2003 16:22:51 +0300 Sam Lantinga <slouken@libsdl.org> parents: 571 diff changeset	222 if (delta < min_delta)
8bedd6d61642 Date: Sat, 2 Aug 2003 16:22:51 +0300 Sam Lantinga <slouken@libsdl.org> parents: 571 diff changeset	223 {
8bedd6d61642 Date: Sat, 2 Aug 2003 16:22:51 +0300 Sam Lantinga <slouken@libsdl.org> parents: 571 diff changeset	224 closest = i;
8bedd6d61642 Date: Sat, 2 Aug 2003 16:22:51 +0300 Sam Lantinga <slouken@libsdl.org> parents: 571 diff changeset	225 min_delta = delta;
8bedd6d61642 Date: Sat, 2 Aug 2003 16:22:51 +0300 Sam Lantinga <slouken@libsdl.org> parents: 571 diff changeset	226 }
8bedd6d61642 Date: Sat, 2 Aug 2003 16:22:51 +0300 Sam Lantinga <slouken@libsdl.org> parents: 571 diff changeset	227 i++;
8bedd6d61642 Date: Sat, 2 Aug 2003 16:22:51 +0300 Sam Lantinga <slouken@libsdl.org> parents: 571 diff changeset	228 }
8bedd6d61642 Date: Sat, 2 Aug 2003 16:22:51 +0300 Sam Lantinga <slouken@libsdl.org> parents: 571 diff changeset	229 }
8bedd6d61642 Date: Sat, 2 Aug 2003 16:22:51 +0300 Sam Lantinga <slouken@libsdl.org> parents: 571 diff changeset	230 }
8bedd6d61642 Date: Sat, 2 Aug 2003 16:22:51 +0300 Sam Lantinga <slouken@libsdl.org> parents: 571 diff changeset	231 return mode_list.modes[closest];
8bedd6d61642 Date: Sat, 2 Aug 2003 16:22:51 +0300 Sam Lantinga <slouken@libsdl.org> parents: 571 diff changeset	232 }
8bedd6d61642 Date: Sat, 2 Aug 2003 16:22:51 +0300 Sam Lantinga <slouken@libsdl.org> parents: 571 diff changeset	233
309 2de77f7b7a28 * empty log message * Sam Lantinga <slouken@libsdl.org> parents: 297 diff changeset	234 return 0;
0 74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	235 }
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	236
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	237 int ph_ToggleFullScreen(_THIS, int on)
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	238 {
663 8bedd6d61642 Date: Sat, 2 Aug 2003 16:22:51 +0300 Sam Lantinga <slouken@libsdl.org> parents: 571 diff changeset	239 return -1;
0 74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	240 }
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	241
910 4ab6d1fd028f Date: Sat, 26 Jun 2004 14:58:42 +0300 Sam Lantinga <slouken@libsdl.org> parents: 821 diff changeset	242 int ph_EnterFullScreen(_THIS, SDL_Surface* screen, int fmode)
0 74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	243 {
663 8bedd6d61642 Date: Sat, 2 Aug 2003 16:22:51 +0300 Sam Lantinga <slouken@libsdl.org> parents: 571 diff changeset	244 PgDisplaySettings_t settings;
8bedd6d61642 Date: Sat, 2 Aug 2003 16:22:51 +0300 Sam Lantinga <slouken@libsdl.org> parents: 571 diff changeset	245 int mode;
821 30168104389f Date: Sat, 14 Feb 2004 14:52:40 +0200 Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	246 char* refreshrate;
30168104389f Date: Sat, 14 Feb 2004 14:52:40 +0200 Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	247 int refreshratenum;
663 8bedd6d61642 Date: Sat, 2 Aug 2003 16:22:51 +0300 Sam Lantinga <slouken@libsdl.org> parents: 571 diff changeset	248
309 2de77f7b7a28 * empty log message * Sam Lantinga <slouken@libsdl.org> parents: 297 diff changeset	249 if (!currently_fullscreen)
2de77f7b7a28 * empty log message * Sam Lantinga <slouken@libsdl.org> parents: 297 diff changeset	250 {
663 8bedd6d61642 Date: Sat, 2 Aug 2003 16:22:51 +0300 Sam Lantinga <slouken@libsdl.org> parents: 571 diff changeset	251 /* Get the video mode and set it */
8bedd6d61642 Date: Sat, 2 Aug 2003 16:22:51 +0300 Sam Lantinga <slouken@libsdl.org> parents: 571 diff changeset	252 if (screen->flags & SDL_ANYFORMAT)
8bedd6d61642 Date: Sat, 2 Aug 2003 16:22:51 +0300 Sam Lantinga <slouken@libsdl.org> parents: 571 diff changeset	253 {
8bedd6d61642 Date: Sat, 2 Aug 2003 16:22:51 +0300 Sam Lantinga <slouken@libsdl.org> parents: 571 diff changeset	254 if ((mode = get_mode_any_format(screen->w, screen->h, screen->format->BitsPerPixel)) == 0)
8bedd6d61642 Date: Sat, 2 Aug 2003 16:22:51 +0300 Sam Lantinga <slouken@libsdl.org> parents: 571 diff changeset	255 {
8bedd6d61642 Date: Sat, 2 Aug 2003 16:22:51 +0300 Sam Lantinga <slouken@libsdl.org> parents: 571 diff changeset	256 SDL_SetError("ph_EnterFullScreen(): can't find appropriate video mode !\n");
8bedd6d61642 Date: Sat, 2 Aug 2003 16:22:51 +0300 Sam Lantinga <slouken@libsdl.org> parents: 571 diff changeset	257 return 0;
8bedd6d61642 Date: Sat, 2 Aug 2003 16:22:51 +0300 Sam Lantinga <slouken@libsdl.org> parents: 571 diff changeset	258 }
8bedd6d61642 Date: Sat, 2 Aug 2003 16:22:51 +0300 Sam Lantinga <slouken@libsdl.org> parents: 571 diff changeset	259 }
8bedd6d61642 Date: Sat, 2 Aug 2003 16:22:51 +0300 Sam Lantinga <slouken@libsdl.org> parents: 571 diff changeset	260 else
8bedd6d61642 Date: Sat, 2 Aug 2003 16:22:51 +0300 Sam Lantinga <slouken@libsdl.org> parents: 571 diff changeset	261 {
8bedd6d61642 Date: Sat, 2 Aug 2003 16:22:51 +0300 Sam Lantinga <slouken@libsdl.org> parents: 571 diff changeset	262 if ((mode = ph_GetVideoMode(screen->w, screen->h, screen->format->BitsPerPixel)) == 0)
8bedd6d61642 Date: Sat, 2 Aug 2003 16:22:51 +0300 Sam Lantinga <slouken@libsdl.org> parents: 571 diff changeset	263 {
8bedd6d61642 Date: Sat, 2 Aug 2003 16:22:51 +0300 Sam Lantinga <slouken@libsdl.org> parents: 571 diff changeset	264 SDL_SetError("ph_EnterFullScreen(): can't find appropriate video mode !\n");
8bedd6d61642 Date: Sat, 2 Aug 2003 16:22:51 +0300 Sam Lantinga <slouken@libsdl.org> parents: 571 diff changeset	265 return 0;
8bedd6d61642 Date: Sat, 2 Aug 2003 16:22:51 +0300 Sam Lantinga <slouken@libsdl.org> parents: 571 diff changeset	266 }
821 30168104389f Date: Sat, 14 Feb 2004 14:52:40 +0200 Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	267 if (PgGetVideoModeInfo(mode, &mode_info) < 0)
30168104389f Date: Sat, 14 Feb 2004 14:52:40 +0200 Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	268 {
30168104389f Date: Sat, 14 Feb 2004 14:52:40 +0200 Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	269 SDL_SetError("ph_EnterFullScreen(): can't get video mode capabilities !\n");
30168104389f Date: Sat, 14 Feb 2004 14:52:40 +0200 Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	270 return 0;
30168104389f Date: Sat, 14 Feb 2004 14:52:40 +0200 Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	271 }
30168104389f Date: Sat, 14 Feb 2004 14:52:40 +0200 Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	272 if (mode_info.height != screen->h)
30168104389f Date: Sat, 14 Feb 2004 14:52:40 +0200 Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	273 {
30168104389f Date: Sat, 14 Feb 2004 14:52:40 +0200 Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	274 if ((mode_info.height==480) && (screen->h==400))
30168104389f Date: Sat, 14 Feb 2004 14:52:40 +0200 Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	275 {
30168104389f Date: Sat, 14 Feb 2004 14:52:40 +0200 Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	276 videomode_emulatemode=1;
30168104389f Date: Sat, 14 Feb 2004 14:52:40 +0200 Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	277 }
30168104389f Date: Sat, 14 Feb 2004 14:52:40 +0200 Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	278 }
30168104389f Date: Sat, 14 Feb 2004 14:52:40 +0200 Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	279 else
30168104389f Date: Sat, 14 Feb 2004 14:52:40 +0200 Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	280 {
30168104389f Date: Sat, 14 Feb 2004 14:52:40 +0200 Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	281 videomode_emulatemode=0;
30168104389f Date: Sat, 14 Feb 2004 14:52:40 +0200 Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	282 }
663 8bedd6d61642 Date: Sat, 2 Aug 2003 16:22:51 +0300 Sam Lantinga <slouken@libsdl.org> parents: 571 diff changeset	283 }
8bedd6d61642 Date: Sat, 2 Aug 2003 16:22:51 +0300 Sam Lantinga <slouken@libsdl.org> parents: 571 diff changeset	284
8bedd6d61642 Date: Sat, 2 Aug 2003 16:22:51 +0300 Sam Lantinga <slouken@libsdl.org> parents: 571 diff changeset	285 /* save old video mode caps */
8bedd6d61642 Date: Sat, 2 Aug 2003 16:22:51 +0300 Sam Lantinga <slouken@libsdl.org> parents: 571 diff changeset	286 PgGetVideoMode(&settings);
8bedd6d61642 Date: Sat, 2 Aug 2003 16:22:51 +0300 Sam Lantinga <slouken@libsdl.org> parents: 571 diff changeset	287 old_video_mode=settings.mode;
8bedd6d61642 Date: Sat, 2 Aug 2003 16:22:51 +0300 Sam Lantinga <slouken@libsdl.org> parents: 571 diff changeset	288 old_refresh_rate=settings.refresh;
8bedd6d61642 Date: Sat, 2 Aug 2003 16:22:51 +0300 Sam Lantinga <slouken@libsdl.org> parents: 571 diff changeset	289
8bedd6d61642 Date: Sat, 2 Aug 2003 16:22:51 +0300 Sam Lantinga <slouken@libsdl.org> parents: 571 diff changeset	290 /* setup new video mode */
8bedd6d61642 Date: Sat, 2 Aug 2003 16:22:51 +0300 Sam Lantinga <slouken@libsdl.org> parents: 571 diff changeset	291 settings.mode = mode;
8bedd6d61642 Date: Sat, 2 Aug 2003 16:22:51 +0300 Sam Lantinga <slouken@libsdl.org> parents: 571 diff changeset	292 settings.refresh = 0;
8bedd6d61642 Date: Sat, 2 Aug 2003 16:22:51 +0300 Sam Lantinga <slouken@libsdl.org> parents: 571 diff changeset	293 settings.flags = 0;
8bedd6d61642 Date: Sat, 2 Aug 2003 16:22:51 +0300 Sam Lantinga <slouken@libsdl.org> parents: 571 diff changeset	294
1336 3692456e7b0f Use SDL_ prefixed versions of C library functions. Sam Lantinga <slouken@libsdl.org> parents: 1312 diff changeset	295 refreshrate=SDL_getenv("SDL_PHOTON_FULLSCREEN_REFRESH");
821 30168104389f Date: Sat, 14 Feb 2004 14:52:40 +0200 Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	296 if (refreshrate!=NULL)
30168104389f Date: Sat, 14 Feb 2004 14:52:40 +0200 Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	297 {
1336 3692456e7b0f Use SDL_ prefixed versions of C library functions. Sam Lantinga <slouken@libsdl.org> parents: 1312 diff changeset	298 if (SDL_sscanf(refreshrate, "%d", &refreshratenum)==1)
821 30168104389f Date: Sat, 14 Feb 2004 14:52:40 +0200 Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	299 {
30168104389f Date: Sat, 14 Feb 2004 14:52:40 +0200 Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	300 settings.refresh = refreshratenum;
30168104389f Date: Sat, 14 Feb 2004 14:52:40 +0200 Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	301 }
30168104389f Date: Sat, 14 Feb 2004 14:52:40 +0200 Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	302 }
30168104389f Date: Sat, 14 Feb 2004 14:52:40 +0200 Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	303
663 8bedd6d61642 Date: Sat, 2 Aug 2003 16:22:51 +0300 Sam Lantinga <slouken@libsdl.org> parents: 571 diff changeset	304 if (PgSetVideoMode(&settings) < 0)
8bedd6d61642 Date: Sat, 2 Aug 2003 16:22:51 +0300 Sam Lantinga <slouken@libsdl.org> parents: 571 diff changeset	305 {
8bedd6d61642 Date: Sat, 2 Aug 2003 16:22:51 +0300 Sam Lantinga <slouken@libsdl.org> parents: 571 diff changeset	306 SDL_SetError("ph_EnterFullScreen(): PgSetVideoMode() call failed !\n");
8bedd6d61642 Date: Sat, 2 Aug 2003 16:22:51 +0300 Sam Lantinga <slouken@libsdl.org> parents: 571 diff changeset	307 return 0;
8bedd6d61642 Date: Sat, 2 Aug 2003 16:22:51 +0300 Sam Lantinga <slouken@libsdl.org> parents: 571 diff changeset	308 }
8bedd6d61642 Date: Sat, 2 Aug 2003 16:22:51 +0300 Sam Lantinga <slouken@libsdl.org> parents: 571 diff changeset	309
315 3333b6e68289 Date: Sat, 23 Mar 2002 13:53:37 +0200 Sam Lantinga <slouken@libsdl.org> parents: 309 diff changeset	310 if (this->screen)
309 2de77f7b7a28 * empty log message * Sam Lantinga <slouken@libsdl.org> parents: 297 diff changeset	311 {
315 3333b6e68289 Date: Sat, 23 Mar 2002 13:53:37 +0200 Sam Lantinga <slouken@libsdl.org> parents: 309 diff changeset	312 if ((this->screen->flags & SDL_OPENGL)==SDL_OPENGL)
3333b6e68289 Date: Sat, 23 Mar 2002 13:53:37 +0200 Sam Lantinga <slouken@libsdl.org> parents: 309 diff changeset	313 {
1361 19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: 1358 diff changeset	314 #if !SDL_VIDEO_OPENGL \|\| (_NTO_VERSION < 630)
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: 1358 diff changeset	315 return 0; /* 6.3.0 */
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: 1358 diff changeset	316 #endif
315 3333b6e68289 Date: Sat, 23 Mar 2002 13:53:37 +0200 Sam Lantinga <slouken@libsdl.org> parents: 309 diff changeset	317 }
309 2de77f7b7a28 * empty log message * Sam Lantinga <slouken@libsdl.org> parents: 297 diff changeset	318 }
315 3333b6e68289 Date: Sat, 23 Mar 2002 13:53:37 +0200 Sam Lantinga <slouken@libsdl.org> parents: 309 diff changeset	319
910 4ab6d1fd028f Date: Sat, 26 Jun 2004 14:58:42 +0300 Sam Lantinga <slouken@libsdl.org> parents: 821 diff changeset	320 if (fmode==0)
309 2de77f7b7a28 * empty log message * Sam Lantinga <slouken@libsdl.org> parents: 297 diff changeset	321 {
910 4ab6d1fd028f Date: Sat, 26 Jun 2004 14:58:42 +0300 Sam Lantinga <slouken@libsdl.org> parents: 821 diff changeset	322 if (OCImage.direct_context==NULL)
663 8bedd6d61642 Date: Sat, 2 Aug 2003 16:22:51 +0300 Sam Lantinga <slouken@libsdl.org> parents: 571 diff changeset	323 {
910 4ab6d1fd028f Date: Sat, 26 Jun 2004 14:58:42 +0300 Sam Lantinga <slouken@libsdl.org> parents: 821 diff changeset	324 OCImage.direct_context=(PdDirectContext_t*)PdCreateDirectContext();
4ab6d1fd028f Date: Sat, 26 Jun 2004 14:58:42 +0300 Sam Lantinga <slouken@libsdl.org> parents: 821 diff changeset	325 if (!OCImage.direct_context)
4ab6d1fd028f Date: Sat, 26 Jun 2004 14:58:42 +0300 Sam Lantinga <slouken@libsdl.org> parents: 821 diff changeset	326 {
4ab6d1fd028f Date: Sat, 26 Jun 2004 14:58:42 +0300 Sam Lantinga <slouken@libsdl.org> parents: 821 diff changeset	327 SDL_SetError("ph_EnterFullScreen(): Can't create direct context !\n");
4ab6d1fd028f Date: Sat, 26 Jun 2004 14:58:42 +0300 Sam Lantinga <slouken@libsdl.org> parents: 821 diff changeset	328 ph_LeaveFullScreen(this);
4ab6d1fd028f Date: Sat, 26 Jun 2004 14:58:42 +0300 Sam Lantinga <slouken@libsdl.org> parents: 821 diff changeset	329 return 0;
4ab6d1fd028f Date: Sat, 26 Jun 2004 14:58:42 +0300 Sam Lantinga <slouken@libsdl.org> parents: 821 diff changeset	330 }
663 8bedd6d61642 Date: Sat, 2 Aug 2003 16:22:51 +0300 Sam Lantinga <slouken@libsdl.org> parents: 571 diff changeset	331 }
910 4ab6d1fd028f Date: Sat, 26 Jun 2004 14:58:42 +0300 Sam Lantinga <slouken@libsdl.org> parents: 821 diff changeset	332 OCImage.oldDC=PdDirectStart(OCImage.direct_context);
315 3333b6e68289 Date: Sat, 23 Mar 2002 13:53:37 +0200 Sam Lantinga <slouken@libsdl.org> parents: 309 diff changeset	333 }
0 74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	334
315 3333b6e68289 Date: Sat, 23 Mar 2002 13:53:37 +0200 Sam Lantinga <slouken@libsdl.org> parents: 309 diff changeset	335 currently_fullscreen = 1;
309 2de77f7b7a28 * empty log message * Sam Lantinga <slouken@libsdl.org> parents: 297 diff changeset	336 }
692 04dd6c6d7c30 Date: Fri, 15 Aug 2003 09:13:59 +0300 Sam Lantinga <slouken@libsdl.org> parents: 663 diff changeset	337 PgFlush();
0 74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	338
309 2de77f7b7a28 * empty log message * Sam Lantinga <slouken@libsdl.org> parents: 297 diff changeset	339 return 1;
0 74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	340 }
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	341
315 3333b6e68289 Date: Sat, 23 Mar 2002 13:53:37 +0200 Sam Lantinga <slouken@libsdl.org> parents: 309 diff changeset	342 int ph_LeaveFullScreen(_THIS)
0 74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	343 {
692 04dd6c6d7c30 Date: Fri, 15 Aug 2003 09:13:59 +0300 Sam Lantinga <slouken@libsdl.org> parents: 663 diff changeset	344 PgDisplaySettings_t oldmode_settings;
0 74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	345
309 2de77f7b7a28 * empty log message * Sam Lantinga <slouken@libsdl.org> parents: 297 diff changeset	346 if (currently_fullscreen)
2de77f7b7a28 * empty log message * Sam Lantinga <slouken@libsdl.org> parents: 297 diff changeset	347 {
663 8bedd6d61642 Date: Sat, 2 Aug 2003 16:22:51 +0300 Sam Lantinga <slouken@libsdl.org> parents: 571 diff changeset	348 if ((this->screen) && ((this->screen->flags & SDL_OPENGL)==SDL_OPENGL))
309 2de77f7b7a28 * empty log message * Sam Lantinga <slouken@libsdl.org> parents: 297 diff changeset	349 {
1361 19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: 1358 diff changeset	350 #if !SDL_VIDEO_OPENGL \|\| (_NTO_VERSION < 630)
910 4ab6d1fd028f Date: Sat, 26 Jun 2004 14:58:42 +0300 Sam Lantinga <slouken@libsdl.org> parents: 821 diff changeset	351 return 0;
1361 19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: 1358 diff changeset	352 #endif
309 2de77f7b7a28 * empty log message * Sam Lantinga <slouken@libsdl.org> parents: 297 diff changeset	353 }
910 4ab6d1fd028f Date: Sat, 26 Jun 2004 14:58:42 +0300 Sam Lantinga <slouken@libsdl.org> parents: 821 diff changeset	354
4ab6d1fd028f Date: Sat, 26 Jun 2004 14:58:42 +0300 Sam Lantinga <slouken@libsdl.org> parents: 821 diff changeset	355 /* release routines starts here */
309 2de77f7b7a28 * empty log message * Sam Lantinga <slouken@libsdl.org> parents: 297 diff changeset	356 {
663 8bedd6d61642 Date: Sat, 2 Aug 2003 16:22:51 +0300 Sam Lantinga <slouken@libsdl.org> parents: 571 diff changeset	357 if (OCImage.direct_context)
8bedd6d61642 Date: Sat, 2 Aug 2003 16:22:51 +0300 Sam Lantinga <slouken@libsdl.org> parents: 571 diff changeset	358 {
8bedd6d61642 Date: Sat, 2 Aug 2003 16:22:51 +0300 Sam Lantinga <slouken@libsdl.org> parents: 571 diff changeset	359 PdDirectStop(OCImage.direct_context);
8bedd6d61642 Date: Sat, 2 Aug 2003 16:22:51 +0300 Sam Lantinga <slouken@libsdl.org> parents: 571 diff changeset	360 PdReleaseDirectContext(OCImage.direct_context);
8bedd6d61642 Date: Sat, 2 Aug 2003 16:22:51 +0300 Sam Lantinga <slouken@libsdl.org> parents: 571 diff changeset	361 OCImage.direct_context=NULL;
8bedd6d61642 Date: Sat, 2 Aug 2003 16:22:51 +0300 Sam Lantinga <slouken@libsdl.org> parents: 571 diff changeset	362 }
8bedd6d61642 Date: Sat, 2 Aug 2003 16:22:51 +0300 Sam Lantinga <slouken@libsdl.org> parents: 571 diff changeset	363 if (OCImage.oldDC)
8bedd6d61642 Date: Sat, 2 Aug 2003 16:22:51 +0300 Sam Lantinga <slouken@libsdl.org> parents: 571 diff changeset	364 {
8bedd6d61642 Date: Sat, 2 Aug 2003 16:22:51 +0300 Sam Lantinga <slouken@libsdl.org> parents: 571 diff changeset	365 PhDCSetCurrent(OCImage.oldDC);
8bedd6d61642 Date: Sat, 2 Aug 2003 16:22:51 +0300 Sam Lantinga <slouken@libsdl.org> parents: 571 diff changeset	366 OCImage.oldDC=NULL;
8bedd6d61642 Date: Sat, 2 Aug 2003 16:22:51 +0300 Sam Lantinga <slouken@libsdl.org> parents: 571 diff changeset	367 }
571 8e3ce997621c Date: Thu, 16 Jan 2003 13:48:31 +0200 Sam Lantinga <slouken@libsdl.org> parents: 315 diff changeset	368
315 3333b6e68289 Date: Sat, 23 Mar 2002 13:53:37 +0200 Sam Lantinga <slouken@libsdl.org> parents: 309 diff changeset	369 currently_fullscreen=0;
0 74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	370
309 2de77f7b7a28 * empty log message * Sam Lantinga <slouken@libsdl.org> parents: 297 diff changeset	371 /* Restore old video mode */
2de77f7b7a28 * empty log message * Sam Lantinga <slouken@libsdl.org> parents: 297 diff changeset	372 if (old_video_mode != -1)
2de77f7b7a28 * empty log message * Sam Lantinga <slouken@libsdl.org> parents: 297 diff changeset	373 {
692 04dd6c6d7c30 Date: Fri, 15 Aug 2003 09:13:59 +0300 Sam Lantinga <slouken@libsdl.org> parents: 663 diff changeset	374 oldmode_settings.mode = (unsigned short) old_video_mode;
04dd6c6d7c30 Date: Fri, 15 Aug 2003 09:13:59 +0300 Sam Lantinga <slouken@libsdl.org> parents: 663 diff changeset	375 oldmode_settings.refresh = (unsigned short) old_refresh_rate;
04dd6c6d7c30 Date: Fri, 15 Aug 2003 09:13:59 +0300 Sam Lantinga <slouken@libsdl.org> parents: 663 diff changeset	376 oldmode_settings.flags = 0;
315 3333b6e68289 Date: Sat, 23 Mar 2002 13:53:37 +0200 Sam Lantinga <slouken@libsdl.org> parents: 309 diff changeset	377
692 04dd6c6d7c30 Date: Fri, 15 Aug 2003 09:13:59 +0300 Sam Lantinga <slouken@libsdl.org> parents: 663 diff changeset	378 if (PgSetVideoMode(&oldmode_settings) < 0)
309 2de77f7b7a28 * empty log message * Sam Lantinga <slouken@libsdl.org> parents: 297 diff changeset	379 {
663 8bedd6d61642 Date: Sat, 2 Aug 2003 16:22:51 +0300 Sam Lantinga <slouken@libsdl.org> parents: 571 diff changeset	380 SDL_SetError("Ph_LeaveFullScreen(): PgSetVideoMode() function failed !\n");
571 8e3ce997621c Date: Thu, 16 Jan 2003 13:48:31 +0200 Sam Lantinga <slouken@libsdl.org> parents: 315 diff changeset	381 return 0;
309 2de77f7b7a28 * empty log message * Sam Lantinga <slouken@libsdl.org> parents: 297 diff changeset	382 }
2de77f7b7a28 * empty log message * Sam Lantinga <slouken@libsdl.org> parents: 297 diff changeset	383 }
2de77f7b7a28 * empty log message * Sam Lantinga <slouken@libsdl.org> parents: 297 diff changeset	384
2de77f7b7a28 * empty log message * Sam Lantinga <slouken@libsdl.org> parents: 297 diff changeset	385 old_video_mode=-1;
315 3333b6e68289 Date: Sat, 23 Mar 2002 13:53:37 +0200 Sam Lantinga <slouken@libsdl.org> parents: 309 diff changeset	386 old_refresh_rate=-1;
309 2de77f7b7a28 * empty log message * Sam Lantinga <slouken@libsdl.org> parents: 297 diff changeset	387 }
2de77f7b7a28 * empty log message * Sam Lantinga <slouken@libsdl.org> parents: 297 diff changeset	388 }
2de77f7b7a28 * empty log message * Sam Lantinga <slouken@libsdl.org> parents: 297 diff changeset	389 return 1;
0 74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	390 }

Mercurial > sdl-ios-xcode

annotate src/video/photon/SDL_ph_modes.c @ 4170:092c0bc69155 SDL-1.2