Mercurial > sdl-ios-xcode
annotate src/video/x11/SDL_x11modes.c @ 614:0b4c3f5ff63d
Date: Wed, 9 Apr 2003 18:21:33 -0230
From: Stephen Anthony <stephena@roadrunner.nf.net>
Subject: [SDL] First patch concerning 4.3 and refresh rates
OK, here's my first draft of the patch for the above subject.
A short explanation:
X 4.3 introduces many more modelines than older versions. This would be
fine, except it introduces many modes with the *same* resolution but
different refresh rates. And SDL won't necessarily pick the one with the
highest refresh rate.
So this patch restores SDL to X 4.2 functionality. That is, there is only
ever one refresh rate *per* resolution, and it is the highest possible.
This functionality can be totally disabled by using the environment
variable 'SDL_VIDEO_X11_USE_ALL_MODES' set equal to 1.
| author | Sam Lantinga <slouken@libsdl.org> |
|---|---|
| date | Sun, 20 Apr 2003 05:36:52 +0000 |
| parents | f8710950cddc |
| children | 6862d4294870 |
| rev | line source |
|---|---|
| 0 | 1 /* |
| 2 SDL - Simple DirectMedia Layer | |
|
297
f6ffac90895c
Updated copyright information for 2002
Sam Lantinga <slouken@libsdl.org>
parents:
292
diff
changeset
|
3 Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002 Sam Lantinga |
| 0 | 4 |
| 5 This library is free software; you can redistribute it and/or | |
| 6 modify it under the terms of the GNU Library General Public | |
| 7 License as published by the Free Software Foundation; either | |
| 8 version 2 of the License, or (at your option) any later version. | |
| 9 | |
| 10 This library is distributed in the hope that it will be useful, | |
| 11 but WITHOUT ANY WARRANTY; without even the implied warranty of | |
| 12 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | |
| 13 Library General Public License for more details. | |
| 14 | |
| 15 You should have received a copy of the GNU Library General Public | |
| 16 License along with this library; if not, write to the Free | |
| 17 Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | |
| 18 | |
| 19 Sam Lantinga | |
|
252
e8157fcb3114
Updated the source with the correct e-mail address
Sam Lantinga <slouken@libsdl.org>
parents:
242
diff
changeset
|
20 slouken@libsdl.org |
| 0 | 21 */ |
| 22 | |
| 23 #ifdef SAVE_RCSID | |
| 24 static char rcsid = | |
| 25 "@(#) $Id$"; | |
| 26 #endif | |
| 27 | |
| 28 /* Utilities for getting and setting the X display mode */ | |
| 29 | |
| 30 #include <stdlib.h> | |
| 31 #include <string.h> | |
| 32 | |
| 33 #include "SDL_timer.h" | |
| 34 #include "SDL_error.h" | |
| 35 #include "SDL_events.h" | |
| 36 #include "SDL_events_c.h" | |
| 37 #include "SDL_x11video.h" | |
| 38 #include "SDL_x11wm_c.h" | |
| 39 #include "SDL_x11modes_c.h" | |
|
88
71774090f286
Hopefully fixed the fullscreen mode code for KDE
Sam Lantinga <slouken@lokigames.com>
parents:
0
diff
changeset
|
40 #include "SDL_x11image_c.h" |
| 0 | 41 |
|
227
24878c14b391
Added X11 Xinerama support - fullscreen starts on screen 0
Sam Lantinga <slouken@libsdl.org>
parents:
100
diff
changeset
|
42 #ifdef HAVE_XINERAMA |
|
292
eadc0746dfaf
Added SDL_LockRect() and SDL_UnlockRect()
Sam Lantinga <slouken@libsdl.org>
parents:
252
diff
changeset
|
43 #include <XFree86/extensions/Xinerama.h> |
|
227
24878c14b391
Added X11 Xinerama support - fullscreen starts on screen 0
Sam Lantinga <slouken@libsdl.org>
parents:
100
diff
changeset
|
44 #endif |
| 0 | 45 |
|
499
f480ecd70499
Added an aborted try at making fullscreen work on Xinerama screen != 0
Sam Lantinga <slouken@libsdl.org>
parents:
297
diff
changeset
|
46 #define MAX(a, b) (a > b ? a : b) |
|
614
0b4c3f5ff63d
Date: Wed, 9 Apr 2003 18:21:33 -0230
Sam Lantinga <slouken@libsdl.org>
parents:
607
diff
changeset
|
47 #define V_INTERLACE 0x010 |
|
0b4c3f5ff63d
Date: Wed, 9 Apr 2003 18:21:33 -0230
Sam Lantinga <slouken@libsdl.org>
parents:
607
diff
changeset
|
48 #define V_DBLSCAN 0x020 |
|
230
275a934573a7
Greatly improved Xinerama video mode support
Sam Lantinga <slouken@libsdl.org>
parents:
227
diff
changeset
|
49 |
| 0 | 50 #ifdef XFREE86_VM |
|
292
eadc0746dfaf
Added SDL_LockRect() and SDL_UnlockRect()
Sam Lantinga <slouken@libsdl.org>
parents:
252
diff
changeset
|
51 Bool SDL_NAME(XF86VidModeGetModeInfo)(Display *dpy, int scr, SDL_NAME(XF86VidModeModeInfo) *info) |
| 0 | 52 { |
|
292
eadc0746dfaf
Added SDL_LockRect() and SDL_UnlockRect()
Sam Lantinga <slouken@libsdl.org>
parents:
252
diff
changeset
|
53 SDL_NAME(XF86VidModeModeLine) *l = (SDL_NAME(XF86VidModeModeLine)*)((char*)info + sizeof info->dotclock); |
|
eadc0746dfaf
Added SDL_LockRect() and SDL_UnlockRect()
Sam Lantinga <slouken@libsdl.org>
parents:
252
diff
changeset
|
54 return SDL_NAME(XF86VidModeGetModeLine)(dpy, scr, &info->dotclock, l); |
| 0 | 55 } |
| 56 #endif /* XFREE86_VM */ | |
| 57 | |
| 58 #ifdef XFREE86_VM | |
| 59 static void save_mode(_THIS) | |
| 60 { | |
| 61 memset(&saved_mode, 0, sizeof(saved_mode)); | |
|
292
eadc0746dfaf
Added SDL_LockRect() and SDL_UnlockRect()
Sam Lantinga <slouken@libsdl.org>
parents:
252
diff
changeset
|
62 SDL_NAME(XF86VidModeGetModeInfo)(SDL_Display,SDL_Screen,&saved_mode); |
|
eadc0746dfaf
Added SDL_LockRect() and SDL_UnlockRect()
Sam Lantinga <slouken@libsdl.org>
parents:
252
diff
changeset
|
63 SDL_NAME(XF86VidModeGetViewPort)(SDL_Display,SDL_Screen,&saved_view.x,&saved_view.y); |
| 0 | 64 } |
| 65 #endif | |
| 66 | |
| 67 #ifdef XFREE86_VM | |
| 68 static void restore_mode(_THIS) | |
| 69 { | |
|
292
eadc0746dfaf
Added SDL_LockRect() and SDL_UnlockRect()
Sam Lantinga <slouken@libsdl.org>
parents:
252
diff
changeset
|
70 SDL_NAME(XF86VidModeModeLine) mode; |
| 0 | 71 int unused; |
| 72 | |
|
292
eadc0746dfaf
Added SDL_LockRect() and SDL_UnlockRect()
Sam Lantinga <slouken@libsdl.org>
parents:
252
diff
changeset
|
73 if ( SDL_NAME(XF86VidModeGetModeLine)(SDL_Display, SDL_Screen, &unused, &mode) ) { |
| 0 | 74 if ( (saved_mode.hdisplay != mode.hdisplay) || |
| 75 (saved_mode.vdisplay != mode.vdisplay) ) { | |
|
292
eadc0746dfaf
Added SDL_LockRect() and SDL_UnlockRect()
Sam Lantinga <slouken@libsdl.org>
parents:
252
diff
changeset
|
76 SDL_NAME(XF86VidModeSwitchToMode)(SDL_Display, SDL_Screen, &saved_mode); |
| 0 | 77 } |
| 78 } | |
| 79 if ( (saved_view.x != 0) || (saved_view.y != 0) ) { | |
|
292
eadc0746dfaf
Added SDL_LockRect() and SDL_UnlockRect()
Sam Lantinga <slouken@libsdl.org>
parents:
252
diff
changeset
|
80 SDL_NAME(XF86VidModeSetViewPort)(SDL_Display, SDL_Screen, saved_view.x, saved_view.y); |
| 0 | 81 } |
| 82 } | |
| 83 #endif | |
| 84 | |
| 85 #ifdef XFREE86_VM | |
| 86 static int cmpmodes(const void *va, const void *vb) | |
| 87 { | |
|
292
eadc0746dfaf
Added SDL_LockRect() and SDL_UnlockRect()
Sam Lantinga <slouken@libsdl.org>
parents:
252
diff
changeset
|
88 const SDL_NAME(XF86VidModeModeInfo) *a = *(const SDL_NAME(XF86VidModeModeInfo)**)va; |
|
eadc0746dfaf
Added SDL_LockRect() and SDL_UnlockRect()
Sam Lantinga <slouken@libsdl.org>
parents:
252
diff
changeset
|
89 const SDL_NAME(XF86VidModeModeInfo) *b = *(const SDL_NAME(XF86VidModeModeInfo)**)vb; |
| 0 | 90 if(a->hdisplay > b->hdisplay) |
| 91 return -1; | |
| 92 return b->vdisplay - a->vdisplay; | |
| 93 } | |
| 94 #endif | |
| 95 | |
|
614
0b4c3f5ff63d
Date: Wed, 9 Apr 2003 18:21:33 -0230
Sam Lantinga <slouken@libsdl.org>
parents:
607
diff
changeset
|
96 #ifdef XFREE86_VM |
|
0b4c3f5ff63d
Date: Wed, 9 Apr 2003 18:21:33 -0230
Sam Lantinga <slouken@libsdl.org>
parents:
607
diff
changeset
|
97 static int get_vidmode_filter(SDL_NAME(XF86VidModeModeInfo) **modes, int nmodes, char **bitmap) |
|
0b4c3f5ff63d
Date: Wed, 9 Apr 2003 18:21:33 -0230
Sam Lantinga <slouken@libsdl.org>
parents:
607
diff
changeset
|
98 { |
|
0b4c3f5ff63d
Date: Wed, 9 Apr 2003 18:21:33 -0230
Sam Lantinga <slouken@libsdl.org>
parents:
607
diff
changeset
|
99 int i, result = 0; |
|
0b4c3f5ff63d
Date: Wed, 9 Apr 2003 18:21:33 -0230
Sam Lantinga <slouken@libsdl.org>
parents:
607
diff
changeset
|
100 int use_all_modes, use_specific_mode; |
|
0b4c3f5ff63d
Date: Wed, 9 Apr 2003 18:21:33 -0230
Sam Lantinga <slouken@libsdl.org>
parents:
607
diff
changeset
|
101 const char *variable; |
|
0b4c3f5ff63d
Date: Wed, 9 Apr 2003 18:21:33 -0230
Sam Lantinga <slouken@libsdl.org>
parents:
607
diff
changeset
|
102 char *temp; |
|
0b4c3f5ff63d
Date: Wed, 9 Apr 2003 18:21:33 -0230
Sam Lantinga <slouken@libsdl.org>
parents:
607
diff
changeset
|
103 |
|
0b4c3f5ff63d
Date: Wed, 9 Apr 2003 18:21:33 -0230
Sam Lantinga <slouken@libsdl.org>
parents:
607
diff
changeset
|
104 if (!nmodes) |
|
0b4c3f5ff63d
Date: Wed, 9 Apr 2003 18:21:33 -0230
Sam Lantinga <slouken@libsdl.org>
parents:
607
diff
changeset
|
105 return 0; |
|
0b4c3f5ff63d
Date: Wed, 9 Apr 2003 18:21:33 -0230
Sam Lantinga <slouken@libsdl.org>
parents:
607
diff
changeset
|
106 |
|
0b4c3f5ff63d
Date: Wed, 9 Apr 2003 18:21:33 -0230
Sam Lantinga <slouken@libsdl.org>
parents:
607
diff
changeset
|
107 temp = (char *)malloc((nmodes)*sizeof(char)); |
|
0b4c3f5ff63d
Date: Wed, 9 Apr 2003 18:21:33 -0230
Sam Lantinga <slouken@libsdl.org>
parents:
607
diff
changeset
|
108 if (!temp) |
|
0b4c3f5ff63d
Date: Wed, 9 Apr 2003 18:21:33 -0230
Sam Lantinga <slouken@libsdl.org>
parents:
607
diff
changeset
|
109 return 0; |
|
0b4c3f5ff63d
Date: Wed, 9 Apr 2003 18:21:33 -0230
Sam Lantinga <slouken@libsdl.org>
parents:
607
diff
changeset
|
110 |
|
0b4c3f5ff63d
Date: Wed, 9 Apr 2003 18:21:33 -0230
Sam Lantinga <slouken@libsdl.org>
parents:
607
diff
changeset
|
111 for ( i = 0; i < nmodes; ++i ) |
|
0b4c3f5ff63d
Date: Wed, 9 Apr 2003 18:21:33 -0230
Sam Lantinga <slouken@libsdl.org>
parents:
607
diff
changeset
|
112 temp[i] = 0; |
|
0b4c3f5ff63d
Date: Wed, 9 Apr 2003 18:21:33 -0230
Sam Lantinga <slouken@libsdl.org>
parents:
607
diff
changeset
|
113 |
|
0b4c3f5ff63d
Date: Wed, 9 Apr 2003 18:21:33 -0230
Sam Lantinga <slouken@libsdl.org>
parents:
607
diff
changeset
|
114 variable = getenv("SDL_VIDEO_X11_USE_ALL_MODES"); |
|
0b4c3f5ff63d
Date: Wed, 9 Apr 2003 18:21:33 -0230
Sam Lantinga <slouken@libsdl.org>
parents:
607
diff
changeset
|
115 use_all_modes = variable ? atoi(variable) : 0; |
|
0b4c3f5ff63d
Date: Wed, 9 Apr 2003 18:21:33 -0230
Sam Lantinga <slouken@libsdl.org>
parents:
607
diff
changeset
|
116 variable = getenv("SDL_VIDEO_X11_USE_SPECIFIC_MODE"); |
|
0b4c3f5ff63d
Date: Wed, 9 Apr 2003 18:21:33 -0230
Sam Lantinga <slouken@libsdl.org>
parents:
607
diff
changeset
|
117 use_specific_mode = variable ? atoi(variable) : 0; |
|
0b4c3f5ff63d
Date: Wed, 9 Apr 2003 18:21:33 -0230
Sam Lantinga <slouken@libsdl.org>
parents:
607
diff
changeset
|
118 |
|
0b4c3f5ff63d
Date: Wed, 9 Apr 2003 18:21:33 -0230
Sam Lantinga <slouken@libsdl.org>
parents:
607
diff
changeset
|
119 qsort(modes, nmodes, sizeof *modes, cmpmodes); |
|
0b4c3f5ff63d
Date: Wed, 9 Apr 2003 18:21:33 -0230
Sam Lantinga <slouken@libsdl.org>
parents:
607
diff
changeset
|
120 |
|
0b4c3f5ff63d
Date: Wed, 9 Apr 2003 18:21:33 -0230
Sam Lantinga <slouken@libsdl.org>
parents:
607
diff
changeset
|
121 if ( use_all_modes ) { |
|
0b4c3f5ff63d
Date: Wed, 9 Apr 2003 18:21:33 -0230
Sam Lantinga <slouken@libsdl.org>
parents:
607
diff
changeset
|
122 for ( i = 0; i < nmodes; ++i ) |
|
0b4c3f5ff63d
Date: Wed, 9 Apr 2003 18:21:33 -0230
Sam Lantinga <slouken@libsdl.org>
parents:
607
diff
changeset
|
123 temp[i] = 1; |
|
0b4c3f5ff63d
Date: Wed, 9 Apr 2003 18:21:33 -0230
Sam Lantinga <slouken@libsdl.org>
parents:
607
diff
changeset
|
124 result = 1; |
|
0b4c3f5ff63d
Date: Wed, 9 Apr 2003 18:21:33 -0230
Sam Lantinga <slouken@libsdl.org>
parents:
607
diff
changeset
|
125 /* } else if ( use_specific_mode ) { ... */ |
|
0b4c3f5ff63d
Date: Wed, 9 Apr 2003 18:21:33 -0230
Sam Lantinga <slouken@libsdl.org>
parents:
607
diff
changeset
|
126 } else { |
|
0b4c3f5ff63d
Date: Wed, 9 Apr 2003 18:21:33 -0230
Sam Lantinga <slouken@libsdl.org>
parents:
607
diff
changeset
|
127 int previous_refresh, current_refresh; |
|
0b4c3f5ff63d
Date: Wed, 9 Apr 2003 18:21:33 -0230
Sam Lantinga <slouken@libsdl.org>
parents:
607
diff
changeset
|
128 SDL_NAME(XF86VidModeModeInfo) *previous, *current; |
|
0b4c3f5ff63d
Date: Wed, 9 Apr 2003 18:21:33 -0230
Sam Lantinga <slouken@libsdl.org>
parents:
607
diff
changeset
|
129 |
|
0b4c3f5ff63d
Date: Wed, 9 Apr 2003 18:21:33 -0230
Sam Lantinga <slouken@libsdl.org>
parents:
607
diff
changeset
|
130 previous = modes[0]; |
|
0b4c3f5ff63d
Date: Wed, 9 Apr 2003 18:21:33 -0230
Sam Lantinga <slouken@libsdl.org>
parents:
607
diff
changeset
|
131 previous_refresh = (int)(previous->dotclock * 1000.0 / |
|
0b4c3f5ff63d
Date: Wed, 9 Apr 2003 18:21:33 -0230
Sam Lantinga <slouken@libsdl.org>
parents:
607
diff
changeset
|
132 (previous->htotal * previous->vtotal)); |
|
0b4c3f5ff63d
Date: Wed, 9 Apr 2003 18:21:33 -0230
Sam Lantinga <slouken@libsdl.org>
parents:
607
diff
changeset
|
133 if ( previous->flags & V_INTERLACE ) previous_refresh *= 2; |
|
0b4c3f5ff63d
Date: Wed, 9 Apr 2003 18:21:33 -0230
Sam Lantinga <slouken@libsdl.org>
parents:
607
diff
changeset
|
134 else if ( previous->flags & V_DBLSCAN ) previous_refresh /= 2; |
|
0b4c3f5ff63d
Date: Wed, 9 Apr 2003 18:21:33 -0230
Sam Lantinga <slouken@libsdl.org>
parents:
607
diff
changeset
|
135 |
|
0b4c3f5ff63d
Date: Wed, 9 Apr 2003 18:21:33 -0230
Sam Lantinga <slouken@libsdl.org>
parents:
607
diff
changeset
|
136 temp[0] = 1; |
|
0b4c3f5ff63d
Date: Wed, 9 Apr 2003 18:21:33 -0230
Sam Lantinga <slouken@libsdl.org>
parents:
607
diff
changeset
|
137 for ( i = 1; i < nmodes; ++i ) { |
|
0b4c3f5ff63d
Date: Wed, 9 Apr 2003 18:21:33 -0230
Sam Lantinga <slouken@libsdl.org>
parents:
607
diff
changeset
|
138 current = modes[i]; |
|
0b4c3f5ff63d
Date: Wed, 9 Apr 2003 18:21:33 -0230
Sam Lantinga <slouken@libsdl.org>
parents:
607
diff
changeset
|
139 current_refresh = (int)(current->dotclock * 1000.0 / |
|
0b4c3f5ff63d
Date: Wed, 9 Apr 2003 18:21:33 -0230
Sam Lantinga <slouken@libsdl.org>
parents:
607
diff
changeset
|
140 (current->htotal * current->vtotal)); |
|
0b4c3f5ff63d
Date: Wed, 9 Apr 2003 18:21:33 -0230
Sam Lantinga <slouken@libsdl.org>
parents:
607
diff
changeset
|
141 if ( current->flags & V_INTERLACE ) current_refresh *= 2; |
|
0b4c3f5ff63d
Date: Wed, 9 Apr 2003 18:21:33 -0230
Sam Lantinga <slouken@libsdl.org>
parents:
607
diff
changeset
|
142 else if ( current->flags & V_DBLSCAN ) current_refresh /= 2; |
|
0b4c3f5ff63d
Date: Wed, 9 Apr 2003 18:21:33 -0230
Sam Lantinga <slouken@libsdl.org>
parents:
607
diff
changeset
|
143 |
|
0b4c3f5ff63d
Date: Wed, 9 Apr 2003 18:21:33 -0230
Sam Lantinga <slouken@libsdl.org>
parents:
607
diff
changeset
|
144 /* Compare this mode to the previous one */ |
|
0b4c3f5ff63d
Date: Wed, 9 Apr 2003 18:21:33 -0230
Sam Lantinga <slouken@libsdl.org>
parents:
607
diff
changeset
|
145 if ( current->hdisplay == previous->hdisplay && |
|
0b4c3f5ff63d
Date: Wed, 9 Apr 2003 18:21:33 -0230
Sam Lantinga <slouken@libsdl.org>
parents:
607
diff
changeset
|
146 current->vdisplay == previous->vdisplay ) { |
|
0b4c3f5ff63d
Date: Wed, 9 Apr 2003 18:21:33 -0230
Sam Lantinga <slouken@libsdl.org>
parents:
607
diff
changeset
|
147 #ifdef XFREE86_DEBUG |
|
0b4c3f5ff63d
Date: Wed, 9 Apr 2003 18:21:33 -0230
Sam Lantinga <slouken@libsdl.org>
parents:
607
diff
changeset
|
148 printf("Comparing %dx%d at %d Hz and %d Hz\n", |
|
0b4c3f5ff63d
Date: Wed, 9 Apr 2003 18:21:33 -0230
Sam Lantinga <slouken@libsdl.org>
parents:
607
diff
changeset
|
149 current->hdisplay, current->vdisplay, |
|
0b4c3f5ff63d
Date: Wed, 9 Apr 2003 18:21:33 -0230
Sam Lantinga <slouken@libsdl.org>
parents:
607
diff
changeset
|
150 current_refresh, previous_refresh); |
|
0b4c3f5ff63d
Date: Wed, 9 Apr 2003 18:21:33 -0230
Sam Lantinga <slouken@libsdl.org>
parents:
607
diff
changeset
|
151 #endif |
|
0b4c3f5ff63d
Date: Wed, 9 Apr 2003 18:21:33 -0230
Sam Lantinga <slouken@libsdl.org>
parents:
607
diff
changeset
|
152 if ( current_refresh > previous_refresh ) { |
|
0b4c3f5ff63d
Date: Wed, 9 Apr 2003 18:21:33 -0230
Sam Lantinga <slouken@libsdl.org>
parents:
607
diff
changeset
|
153 temp[i-1] = 0; |
|
0b4c3f5ff63d
Date: Wed, 9 Apr 2003 18:21:33 -0230
Sam Lantinga <slouken@libsdl.org>
parents:
607
diff
changeset
|
154 temp[i] = 1; |
|
0b4c3f5ff63d
Date: Wed, 9 Apr 2003 18:21:33 -0230
Sam Lantinga <slouken@libsdl.org>
parents:
607
diff
changeset
|
155 } |
|
0b4c3f5ff63d
Date: Wed, 9 Apr 2003 18:21:33 -0230
Sam Lantinga <slouken@libsdl.org>
parents:
607
diff
changeset
|
156 else |
|
0b4c3f5ff63d
Date: Wed, 9 Apr 2003 18:21:33 -0230
Sam Lantinga <slouken@libsdl.org>
parents:
607
diff
changeset
|
157 temp[i] = 0; |
|
0b4c3f5ff63d
Date: Wed, 9 Apr 2003 18:21:33 -0230
Sam Lantinga <slouken@libsdl.org>
parents:
607
diff
changeset
|
158 } |
|
0b4c3f5ff63d
Date: Wed, 9 Apr 2003 18:21:33 -0230
Sam Lantinga <slouken@libsdl.org>
parents:
607
diff
changeset
|
159 else |
|
0b4c3f5ff63d
Date: Wed, 9 Apr 2003 18:21:33 -0230
Sam Lantinga <slouken@libsdl.org>
parents:
607
diff
changeset
|
160 temp[i] = 1; |
|
0b4c3f5ff63d
Date: Wed, 9 Apr 2003 18:21:33 -0230
Sam Lantinga <slouken@libsdl.org>
parents:
607
diff
changeset
|
161 |
|
0b4c3f5ff63d
Date: Wed, 9 Apr 2003 18:21:33 -0230
Sam Lantinga <slouken@libsdl.org>
parents:
607
diff
changeset
|
162 previous = current; |
|
0b4c3f5ff63d
Date: Wed, 9 Apr 2003 18:21:33 -0230
Sam Lantinga <slouken@libsdl.org>
parents:
607
diff
changeset
|
163 previous_refresh = current_refresh; |
|
0b4c3f5ff63d
Date: Wed, 9 Apr 2003 18:21:33 -0230
Sam Lantinga <slouken@libsdl.org>
parents:
607
diff
changeset
|
164 } |
|
0b4c3f5ff63d
Date: Wed, 9 Apr 2003 18:21:33 -0230
Sam Lantinga <slouken@libsdl.org>
parents:
607
diff
changeset
|
165 result = 1; |
|
0b4c3f5ff63d
Date: Wed, 9 Apr 2003 18:21:33 -0230
Sam Lantinga <slouken@libsdl.org>
parents:
607
diff
changeset
|
166 } |
|
0b4c3f5ff63d
Date: Wed, 9 Apr 2003 18:21:33 -0230
Sam Lantinga <slouken@libsdl.org>
parents:
607
diff
changeset
|
167 *bitmap = temp; |
|
0b4c3f5ff63d
Date: Wed, 9 Apr 2003 18:21:33 -0230
Sam Lantinga <slouken@libsdl.org>
parents:
607
diff
changeset
|
168 return result; |
|
0b4c3f5ff63d
Date: Wed, 9 Apr 2003 18:21:33 -0230
Sam Lantinga <slouken@libsdl.org>
parents:
607
diff
changeset
|
169 } |
|
0b4c3f5ff63d
Date: Wed, 9 Apr 2003 18:21:33 -0230
Sam Lantinga <slouken@libsdl.org>
parents:
607
diff
changeset
|
170 #endif |
|
0b4c3f5ff63d
Date: Wed, 9 Apr 2003 18:21:33 -0230
Sam Lantinga <slouken@libsdl.org>
parents:
607
diff
changeset
|
171 |
|
242
4bcb29d3769c
Added support for Xi Graphics XME fullscreen extension
Sam Lantinga <slouken@libsdl.org>
parents:
230
diff
changeset
|
172 static void get_real_resolution(_THIS, int* w, int* h); |
|
4bcb29d3769c
Added support for Xi Graphics XME fullscreen extension
Sam Lantinga <slouken@libsdl.org>
parents:
230
diff
changeset
|
173 |
| 0 | 174 static void set_best_resolution(_THIS, int width, int height) |
| 175 { | |
| 176 #ifdef XFREE86_VM | |
| 177 if ( use_vidmode ) { | |
|
292
eadc0746dfaf
Added SDL_LockRect() and SDL_UnlockRect()
Sam Lantinga <slouken@libsdl.org>
parents:
252
diff
changeset
|
178 SDL_NAME(XF86VidModeModeLine) mode; |
|
eadc0746dfaf
Added SDL_LockRect() and SDL_UnlockRect()
Sam Lantinga <slouken@libsdl.org>
parents:
252
diff
changeset
|
179 SDL_NAME(XF86VidModeModeInfo) **modes; |
| 0 | 180 int i; |
| 181 int nmodes; | |
|
614
0b4c3f5ff63d
Date: Wed, 9 Apr 2003 18:21:33 -0230
Sam Lantinga <slouken@libsdl.org>
parents:
607
diff
changeset
|
182 char *bitmap; |
| 0 | 183 |
|
292
eadc0746dfaf
Added SDL_LockRect() and SDL_UnlockRect()
Sam Lantinga <slouken@libsdl.org>
parents:
252
diff
changeset
|
184 if ( SDL_NAME(XF86VidModeGetModeLine)(SDL_Display, SDL_Screen, &i, &mode) && |
|
614
0b4c3f5ff63d
Date: Wed, 9 Apr 2003 18:21:33 -0230
Sam Lantinga <slouken@libsdl.org>
parents:
607
diff
changeset
|
185 SDL_NAME(XF86VidModeGetAllModeLines)(SDL_Display,SDL_Screen,&nmodes,&modes) && |
|
0b4c3f5ff63d
Date: Wed, 9 Apr 2003 18:21:33 -0230
Sam Lantinga <slouken@libsdl.org>
parents:
607
diff
changeset
|
186 get_vidmode_filter(modes, nmodes, &bitmap) ) { |
| 0 | 187 #ifdef XFREE86_DEBUG |
|
227
24878c14b391
Added X11 Xinerama support - fullscreen starts on screen 0
Sam Lantinga <slouken@libsdl.org>
parents:
100
diff
changeset
|
188 printf("Available modes:\n"); |
|
24878c14b391
Added X11 Xinerama support - fullscreen starts on screen 0
Sam Lantinga <slouken@libsdl.org>
parents:
100
diff
changeset
|
189 for ( i = 0; i < nmodes; ++i ) { |
|
24878c14b391
Added X11 Xinerama support - fullscreen starts on screen 0
Sam Lantinga <slouken@libsdl.org>
parents:
100
diff
changeset
|
190 printf("Mode %d: %dx%d\n", i, |
|
24878c14b391
Added X11 Xinerama support - fullscreen starts on screen 0
Sam Lantinga <slouken@libsdl.org>
parents:
100
diff
changeset
|
191 modes[i]->hdisplay, modes[i]->vdisplay); |
|
24878c14b391
Added X11 Xinerama support - fullscreen starts on screen 0
Sam Lantinga <slouken@libsdl.org>
parents:
100
diff
changeset
|
192 } |
| 0 | 193 #endif |
| 194 for ( i = nmodes-1; i > 0 ; --i ) { | |
|
604
31d3af76488b
Date: Mon, 24 Feb 2003 16:31:25 -0500
Sam Lantinga <slouken@libsdl.org>
parents:
499
diff
changeset
|
195 if ( (modes[i]->hdisplay == width) && |
|
614
0b4c3f5ff63d
Date: Wed, 9 Apr 2003 18:21:33 -0230
Sam Lantinga <slouken@libsdl.org>
parents:
607
diff
changeset
|
196 (modes[i]->vdisplay == height) && |
|
0b4c3f5ff63d
Date: Wed, 9 Apr 2003 18:21:33 -0230
Sam Lantinga <slouken@libsdl.org>
parents:
607
diff
changeset
|
197 (bitmap[i] == 1) ) |
|
604
31d3af76488b
Date: Mon, 24 Feb 2003 16:31:25 -0500
Sam Lantinga <slouken@libsdl.org>
parents:
499
diff
changeset
|
198 goto match; |
|
31d3af76488b
Date: Mon, 24 Feb 2003 16:31:25 -0500
Sam Lantinga <slouken@libsdl.org>
parents:
499
diff
changeset
|
199 } |
|
31d3af76488b
Date: Mon, 24 Feb 2003 16:31:25 -0500
Sam Lantinga <slouken@libsdl.org>
parents:
499
diff
changeset
|
200 for ( i = nmodes-1; i > 0 ; --i ) { |
| 0 | 201 if ( (modes[i]->hdisplay >= width) && |
|
614
0b4c3f5ff63d
Date: Wed, 9 Apr 2003 18:21:33 -0230
Sam Lantinga <slouken@libsdl.org>
parents:
607
diff
changeset
|
202 (modes[i]->vdisplay >= height) && |
|
0b4c3f5ff63d
Date: Wed, 9 Apr 2003 18:21:33 -0230
Sam Lantinga <slouken@libsdl.org>
parents:
607
diff
changeset
|
203 (bitmap[i] == 1) ) |
| 0 | 204 break; |
| 205 } | |
|
604
31d3af76488b
Date: Mon, 24 Feb 2003 16:31:25 -0500
Sam Lantinga <slouken@libsdl.org>
parents:
499
diff
changeset
|
206 match: |
| 0 | 207 if ( (modes[i]->hdisplay != mode.hdisplay) || |
| 208 (modes[i]->vdisplay != mode.vdisplay) ) { | |
|
292
eadc0746dfaf
Added SDL_LockRect() and SDL_UnlockRect()
Sam Lantinga <slouken@libsdl.org>
parents:
252
diff
changeset
|
209 SDL_NAME(XF86VidModeSwitchToMode)(SDL_Display, SDL_Screen, modes[i]); |
| 0 | 210 } |
| 211 XFree(modes); | |
|
614
0b4c3f5ff63d
Date: Wed, 9 Apr 2003 18:21:33 -0230
Sam Lantinga <slouken@libsdl.org>
parents:
607
diff
changeset
|
212 if (bitmap) free(bitmap); |
| 0 | 213 } |
| 214 } | |
| 215 #endif /* XFREE86_VM */ | |
|
242
4bcb29d3769c
Added support for Xi Graphics XME fullscreen extension
Sam Lantinga <slouken@libsdl.org>
parents:
230
diff
changeset
|
216 |
|
499
f480ecd70499
Added an aborted try at making fullscreen work on Xinerama screen != 0
Sam Lantinga <slouken@libsdl.org>
parents:
297
diff
changeset
|
217 /* XiG */ |
|
242
4bcb29d3769c
Added support for Xi Graphics XME fullscreen extension
Sam Lantinga <slouken@libsdl.org>
parents:
230
diff
changeset
|
218 #ifdef HAVE_XIGXME |
|
4bcb29d3769c
Added support for Xi Graphics XME fullscreen extension
Sam Lantinga <slouken@libsdl.org>
parents:
230
diff
changeset
|
219 #ifdef XIG_DEBUG |
|
4bcb29d3769c
Added support for Xi Graphics XME fullscreen extension
Sam Lantinga <slouken@libsdl.org>
parents:
230
diff
changeset
|
220 fprintf(stderr, "XME: set_best_resolution(): w = %d, h = %d\n", |
|
499
f480ecd70499
Added an aborted try at making fullscreen work on Xinerama screen != 0
Sam Lantinga <slouken@libsdl.org>
parents:
297
diff
changeset
|
221 width, height); |
|
242
4bcb29d3769c
Added support for Xi Graphics XME fullscreen extension
Sam Lantinga <slouken@libsdl.org>
parents:
230
diff
changeset
|
222 #endif |
|
4bcb29d3769c
Added support for Xi Graphics XME fullscreen extension
Sam Lantinga <slouken@libsdl.org>
parents:
230
diff
changeset
|
223 if ( SDL_modelist ) { |
|
499
f480ecd70499
Added an aborted try at making fullscreen work on Xinerama screen != 0
Sam Lantinga <slouken@libsdl.org>
parents:
297
diff
changeset
|
224 int i; |
|
242
4bcb29d3769c
Added support for Xi Graphics XME fullscreen extension
Sam Lantinga <slouken@libsdl.org>
parents:
230
diff
changeset
|
225 |
|
4bcb29d3769c
Added support for Xi Graphics XME fullscreen extension
Sam Lantinga <slouken@libsdl.org>
parents:
230
diff
changeset
|
226 for ( i=0; SDL_modelist[i]; ++i ) { |
|
499
f480ecd70499
Added an aborted try at making fullscreen work on Xinerama screen != 0
Sam Lantinga <slouken@libsdl.org>
parents:
297
diff
changeset
|
227 if ( (SDL_modelist[i]->w >= width) && |
|
242
4bcb29d3769c
Added support for Xi Graphics XME fullscreen extension
Sam Lantinga <slouken@libsdl.org>
parents:
230
diff
changeset
|
228 (SDL_modelist[i]->h >= height) ) { |
|
499
f480ecd70499
Added an aborted try at making fullscreen work on Xinerama screen != 0
Sam Lantinga <slouken@libsdl.org>
parents:
297
diff
changeset
|
229 break; |
|
f480ecd70499
Added an aborted try at making fullscreen work on Xinerama screen != 0
Sam Lantinga <slouken@libsdl.org>
parents:
297
diff
changeset
|
230 } |
|
242
4bcb29d3769c
Added support for Xi Graphics XME fullscreen extension
Sam Lantinga <slouken@libsdl.org>
parents:
230
diff
changeset
|
231 } |
|
499
f480ecd70499
Added an aborted try at making fullscreen work on Xinerama screen != 0
Sam Lantinga <slouken@libsdl.org>
parents:
297
diff
changeset
|
232 |
|
f480ecd70499
Added an aborted try at making fullscreen work on Xinerama screen != 0
Sam Lantinga <slouken@libsdl.org>
parents:
297
diff
changeset
|
233 if ( SDL_modelist[i] ) { /* found one, lets try it */ |
|
f480ecd70499
Added an aborted try at making fullscreen work on Xinerama screen != 0
Sam Lantinga <slouken@libsdl.org>
parents:
297
diff
changeset
|
234 int w, h; |
|
242
4bcb29d3769c
Added support for Xi Graphics XME fullscreen extension
Sam Lantinga <slouken@libsdl.org>
parents:
230
diff
changeset
|
235 |
|
4bcb29d3769c
Added support for Xi Graphics XME fullscreen extension
Sam Lantinga <slouken@libsdl.org>
parents:
230
diff
changeset
|
236 /* check current mode so we can avoid uneccessary mode changes */ |
|
499
f480ecd70499
Added an aborted try at making fullscreen work on Xinerama screen != 0
Sam Lantinga <slouken@libsdl.org>
parents:
297
diff
changeset
|
237 get_real_resolution(this, &w, &h); |
|
242
4bcb29d3769c
Added support for Xi Graphics XME fullscreen extension
Sam Lantinga <slouken@libsdl.org>
parents:
230
diff
changeset
|
238 |
|
499
f480ecd70499
Added an aborted try at making fullscreen work on Xinerama screen != 0
Sam Lantinga <slouken@libsdl.org>
parents:
297
diff
changeset
|
239 if ( (SDL_modelist[i]->w != w) || (SDL_modelist[i]->h != h) ) { |
|
242
4bcb29d3769c
Added support for Xi Graphics XME fullscreen extension
Sam Lantinga <slouken@libsdl.org>
parents:
230
diff
changeset
|
240 # ifdef XIG_DEBUG |
|
499
f480ecd70499
Added an aborted try at making fullscreen work on Xinerama screen != 0
Sam Lantinga <slouken@libsdl.org>
parents:
297
diff
changeset
|
241 fprintf(stderr, "XME: set_best_resolution: " |
|
f480ecd70499
Added an aborted try at making fullscreen work on Xinerama screen != 0
Sam Lantinga <slouken@libsdl.org>
parents:
297
diff
changeset
|
242 "XiGMiscChangeResolution: %d %d\n", |
|
f480ecd70499
Added an aborted try at making fullscreen work on Xinerama screen != 0
Sam Lantinga <slouken@libsdl.org>
parents:
297
diff
changeset
|
243 SDL_modelist[s]->w, SDL_modelist[s]->h); |
|
242
4bcb29d3769c
Added support for Xi Graphics XME fullscreen extension
Sam Lantinga <slouken@libsdl.org>
parents:
230
diff
changeset
|
244 # endif |
|
499
f480ecd70499
Added an aborted try at making fullscreen work on Xinerama screen != 0
Sam Lantinga <slouken@libsdl.org>
parents:
297
diff
changeset
|
245 XiGMiscChangeResolution(SDL_Display, |
|
f480ecd70499
Added an aborted try at making fullscreen work on Xinerama screen != 0
Sam Lantinga <slouken@libsdl.org>
parents:
297
diff
changeset
|
246 SDL_Screen, |
|
f480ecd70499
Added an aborted try at making fullscreen work on Xinerama screen != 0
Sam Lantinga <slouken@libsdl.org>
parents:
297
diff
changeset
|
247 0, /* view */ |
|
f480ecd70499
Added an aborted try at making fullscreen work on Xinerama screen != 0
Sam Lantinga <slouken@libsdl.org>
parents:
297
diff
changeset
|
248 SDL_modelist[i]->w, |
|
f480ecd70499
Added an aborted try at making fullscreen work on Xinerama screen != 0
Sam Lantinga <slouken@libsdl.org>
parents:
297
diff
changeset
|
249 SDL_modelist[i]->h, |
|
f480ecd70499
Added an aborted try at making fullscreen work on Xinerama screen != 0
Sam Lantinga <slouken@libsdl.org>
parents:
297
diff
changeset
|
250 0); |
|
f480ecd70499
Added an aborted try at making fullscreen work on Xinerama screen != 0
Sam Lantinga <slouken@libsdl.org>
parents:
297
diff
changeset
|
251 XSync(SDL_Display, False); |
|
242
4bcb29d3769c
Added support for Xi Graphics XME fullscreen extension
Sam Lantinga <slouken@libsdl.org>
parents:
230
diff
changeset
|
252 } |
|
4bcb29d3769c
Added support for Xi Graphics XME fullscreen extension
Sam Lantinga <slouken@libsdl.org>
parents:
230
diff
changeset
|
253 } |
|
4bcb29d3769c
Added support for Xi Graphics XME fullscreen extension
Sam Lantinga <slouken@libsdl.org>
parents:
230
diff
changeset
|
254 } |
|
4bcb29d3769c
Added support for Xi Graphics XME fullscreen extension
Sam Lantinga <slouken@libsdl.org>
parents:
230
diff
changeset
|
255 #endif /* HAVE_XIGXME */ |
|
4bcb29d3769c
Added support for Xi Graphics XME fullscreen extension
Sam Lantinga <slouken@libsdl.org>
parents:
230
diff
changeset
|
256 |
| 0 | 257 } |
| 258 | |
| 259 static void get_real_resolution(_THIS, int* w, int* h) | |
| 260 { | |
| 261 #ifdef XFREE86_VM | |
| 262 if ( use_vidmode ) { | |
|
292
eadc0746dfaf
Added SDL_LockRect() and SDL_UnlockRect()
Sam Lantinga <slouken@libsdl.org>
parents:
252
diff
changeset
|
263 SDL_NAME(XF86VidModeModeLine) mode; |
| 0 | 264 int unused; |
| 265 | |
|
292
eadc0746dfaf
Added SDL_LockRect() and SDL_UnlockRect()
Sam Lantinga <slouken@libsdl.org>
parents:
252
diff
changeset
|
266 if ( SDL_NAME(XF86VidModeGetModeLine)(SDL_Display, SDL_Screen, &unused, &mode) ) { |
| 0 | 267 *w = mode.hdisplay; |
| 268 *h = mode.vdisplay; | |
| 269 return; | |
| 270 } | |
| 271 } | |
| 272 #endif | |
|
242
4bcb29d3769c
Added support for Xi Graphics XME fullscreen extension
Sam Lantinga <slouken@libsdl.org>
parents:
230
diff
changeset
|
273 |
|
4bcb29d3769c
Added support for Xi Graphics XME fullscreen extension
Sam Lantinga <slouken@libsdl.org>
parents:
230
diff
changeset
|
274 #ifdef HAVE_XIGXME |
|
4bcb29d3769c
Added support for Xi Graphics XME fullscreen extension
Sam Lantinga <slouken@libsdl.org>
parents:
230
diff
changeset
|
275 if ( use_xme ) { |
|
4bcb29d3769c
Added support for Xi Graphics XME fullscreen extension
Sam Lantinga <slouken@libsdl.org>
parents:
230
diff
changeset
|
276 int ractive; |
|
4bcb29d3769c
Added support for Xi Graphics XME fullscreen extension
Sam Lantinga <slouken@libsdl.org>
parents:
230
diff
changeset
|
277 XiGMiscResolutionInfo *modelist; |
|
4bcb29d3769c
Added support for Xi Graphics XME fullscreen extension
Sam Lantinga <slouken@libsdl.org>
parents:
230
diff
changeset
|
278 |
|
4bcb29d3769c
Added support for Xi Graphics XME fullscreen extension
Sam Lantinga <slouken@libsdl.org>
parents:
230
diff
changeset
|
279 XiGMiscQueryResolutions(SDL_Display, SDL_Screen, |
|
499
f480ecd70499
Added an aborted try at making fullscreen work on Xinerama screen != 0
Sam Lantinga <slouken@libsdl.org>
parents:
297
diff
changeset
|
280 0, /* view */ |
|
f480ecd70499
Added an aborted try at making fullscreen work on Xinerama screen != 0
Sam Lantinga <slouken@libsdl.org>
parents:
297
diff
changeset
|
281 &ractive, &modelist); |
|
242
4bcb29d3769c
Added support for Xi Graphics XME fullscreen extension
Sam Lantinga <slouken@libsdl.org>
parents:
230
diff
changeset
|
282 *w = modelist[ractive].width; |
|
4bcb29d3769c
Added support for Xi Graphics XME fullscreen extension
Sam Lantinga <slouken@libsdl.org>
parents:
230
diff
changeset
|
283 *h = modelist[ractive].height; |
|
4bcb29d3769c
Added support for Xi Graphics XME fullscreen extension
Sam Lantinga <slouken@libsdl.org>
parents:
230
diff
changeset
|
284 #ifdef XIG_DEBUG |
|
4bcb29d3769c
Added support for Xi Graphics XME fullscreen extension
Sam Lantinga <slouken@libsdl.org>
parents:
230
diff
changeset
|
285 fprintf(stderr, "XME: get_real_resolution: w = %d h = %d\n", *w, *h); |
|
4bcb29d3769c
Added support for Xi Graphics XME fullscreen extension
Sam Lantinga <slouken@libsdl.org>
parents:
230
diff
changeset
|
286 #endif |
|
4bcb29d3769c
Added support for Xi Graphics XME fullscreen extension
Sam Lantinga <slouken@libsdl.org>
parents:
230
diff
changeset
|
287 XFree(modelist); |
|
4bcb29d3769c
Added support for Xi Graphics XME fullscreen extension
Sam Lantinga <slouken@libsdl.org>
parents:
230
diff
changeset
|
288 return; |
|
4bcb29d3769c
Added support for Xi Graphics XME fullscreen extension
Sam Lantinga <slouken@libsdl.org>
parents:
230
diff
changeset
|
289 } |
|
4bcb29d3769c
Added support for Xi Graphics XME fullscreen extension
Sam Lantinga <slouken@libsdl.org>
parents:
230
diff
changeset
|
290 #endif /* XIG_XME */ |
|
4bcb29d3769c
Added support for Xi Graphics XME fullscreen extension
Sam Lantinga <slouken@libsdl.org>
parents:
230
diff
changeset
|
291 |
| 0 | 292 *w = DisplayWidth(SDL_Display, SDL_Screen); |
| 293 *h = DisplayHeight(SDL_Display, SDL_Screen); | |
| 294 } | |
| 295 | |
| 296 /* Called after mapping a window - waits until the window is mapped */ | |
| 297 void X11_WaitMapped(_THIS, Window win) | |
| 298 { | |
| 299 XEvent event; | |
| 300 do { | |
| 301 XMaskEvent(SDL_Display, StructureNotifyMask, &event); | |
| 302 } while ( (event.type != MapNotify) || (event.xmap.event != win) ); | |
| 303 } | |
| 304 | |
| 305 /* Called after unmapping a window - waits until the window is unmapped */ | |
| 306 void X11_WaitUnmapped(_THIS, Window win) | |
| 307 { | |
| 308 XEvent event; | |
| 309 do { | |
| 310 XMaskEvent(SDL_Display, StructureNotifyMask, &event); | |
| 311 } while ( (event.type != UnmapNotify) || (event.xunmap.event != win) ); | |
| 312 } | |
| 313 | |
| 314 static void move_cursor_to(_THIS, int x, int y) | |
| 315 { | |
| 316 XWarpPointer(SDL_Display, None, SDL_Root, 0, 0, 0, 0, x, y); | |
| 317 } | |
| 318 | |
| 319 static int add_visual(_THIS, int depth, int class) | |
| 320 { | |
| 321 XVisualInfo vi; | |
| 322 if(XMatchVisualInfo(SDL_Display, SDL_Screen, depth, class, &vi)) { | |
|
499
f480ecd70499
Added an aborted try at making fullscreen work on Xinerama screen != 0
Sam Lantinga <slouken@libsdl.org>
parents:
297
diff
changeset
|
323 int n = this->hidden->nvisuals; |
|
f480ecd70499
Added an aborted try at making fullscreen work on Xinerama screen != 0
Sam Lantinga <slouken@libsdl.org>
parents:
297
diff
changeset
|
324 this->hidden->visuals[n].depth = vi.depth; |
|
f480ecd70499
Added an aborted try at making fullscreen work on Xinerama screen != 0
Sam Lantinga <slouken@libsdl.org>
parents:
297
diff
changeset
|
325 this->hidden->visuals[n].visual = vi.visual; |
|
f480ecd70499
Added an aborted try at making fullscreen work on Xinerama screen != 0
Sam Lantinga <slouken@libsdl.org>
parents:
297
diff
changeset
|
326 this->hidden->nvisuals++; |
| 0 | 327 } |
| 328 return(this->hidden->nvisuals); | |
| 329 } | |
| 330 static int add_visual_byid(_THIS, const char *visual_id) | |
| 331 { | |
| 332 XVisualInfo *vi, template; | |
| 333 int nvis; | |
| 334 | |
| 335 if ( visual_id ) { | |
| 336 memset(&template, 0, (sizeof template)); | |
| 337 template.visualid = strtol(visual_id, NULL, 0); | |
| 338 vi = XGetVisualInfo(SDL_Display, VisualIDMask, &template, &nvis); | |
| 339 if ( vi ) { | |
|
499
f480ecd70499
Added an aborted try at making fullscreen work on Xinerama screen != 0
Sam Lantinga <slouken@libsdl.org>
parents:
297
diff
changeset
|
340 int n = this->hidden->nvisuals; |
|
f480ecd70499
Added an aborted try at making fullscreen work on Xinerama screen != 0
Sam Lantinga <slouken@libsdl.org>
parents:
297
diff
changeset
|
341 this->hidden->visuals[n].depth = vi->depth; |
|
f480ecd70499
Added an aborted try at making fullscreen work on Xinerama screen != 0
Sam Lantinga <slouken@libsdl.org>
parents:
297
diff
changeset
|
342 this->hidden->visuals[n].visual = vi->visual; |
|
f480ecd70499
Added an aborted try at making fullscreen work on Xinerama screen != 0
Sam Lantinga <slouken@libsdl.org>
parents:
297
diff
changeset
|
343 this->hidden->nvisuals++; |
| 0 | 344 XFree(vi); |
| 345 } | |
| 346 } | |
| 347 return(this->hidden->nvisuals); | |
| 348 } | |
| 349 | |
| 350 /* Global for the error handler */ | |
| 351 int vm_event, vm_error = -1; | |
| 352 | |
| 353 int X11_GetVideoModes(_THIS) | |
| 354 { | |
| 355 #ifdef XFREE86_VM | |
| 356 int buggy_X11; | |
| 357 int vm_major, vm_minor; | |
| 358 int nmodes; | |
|
292
eadc0746dfaf
Added SDL_LockRect() and SDL_UnlockRect()
Sam Lantinga <slouken@libsdl.org>
parents:
252
diff
changeset
|
359 SDL_NAME(XF86VidModeModeInfo) **modes; |
|
614
0b4c3f5ff63d
Date: Wed, 9 Apr 2003 18:21:33 -0230
Sam Lantinga <slouken@libsdl.org>
parents:
607
diff
changeset
|
360 char *bitmap = (char*)0; |
| 0 | 361 #endif |
|
242
4bcb29d3769c
Added support for Xi Graphics XME fullscreen extension
Sam Lantinga <slouken@libsdl.org>
parents:
230
diff
changeset
|
362 #ifdef HAVE_XIGXME |
|
4bcb29d3769c
Added support for Xi Graphics XME fullscreen extension
Sam Lantinga <slouken@libsdl.org>
parents:
230
diff
changeset
|
363 int xme_major, xme_minor; |
|
4bcb29d3769c
Added support for Xi Graphics XME fullscreen extension
Sam Lantinga <slouken@libsdl.org>
parents:
230
diff
changeset
|
364 int ractive, nummodes; |
|
4bcb29d3769c
Added support for Xi Graphics XME fullscreen extension
Sam Lantinga <slouken@libsdl.org>
parents:
230
diff
changeset
|
365 XiGMiscResolutionInfo *modelist; |
|
4bcb29d3769c
Added support for Xi Graphics XME fullscreen extension
Sam Lantinga <slouken@libsdl.org>
parents:
230
diff
changeset
|
366 #endif |
|
230
275a934573a7
Greatly improved Xinerama video mode support
Sam Lantinga <slouken@libsdl.org>
parents:
227
diff
changeset
|
367 int i, n; |
|
275a934573a7
Greatly improved Xinerama video mode support
Sam Lantinga <slouken@libsdl.org>
parents:
227
diff
changeset
|
368 int screen_w; |
|
275a934573a7
Greatly improved Xinerama video mode support
Sam Lantinga <slouken@libsdl.org>
parents:
227
diff
changeset
|
369 int screen_h; |
| 0 | 370 |
| 371 vm_error = -1; | |
| 372 use_vidmode = 0; | |
|
230
275a934573a7
Greatly improved Xinerama video mode support
Sam Lantinga <slouken@libsdl.org>
parents:
227
diff
changeset
|
373 screen_w = DisplayWidth(SDL_Display, SDL_Screen); |
|
275a934573a7
Greatly improved Xinerama video mode support
Sam Lantinga <slouken@libsdl.org>
parents:
227
diff
changeset
|
374 screen_h = DisplayHeight(SDL_Display, SDL_Screen); |
|
275a934573a7
Greatly improved Xinerama video mode support
Sam Lantinga <slouken@libsdl.org>
parents:
227
diff
changeset
|
375 |
| 0 | 376 #ifdef XFREE86_VM |
| 377 /* Metro-X 4.3.0 and earlier has a broken implementation of | |
| 378 XF86VidModeGetAllModeLines() - it hangs the client. | |
| 379 */ | |
| 380 buggy_X11 = 0; | |
| 381 if ( strcmp(ServerVendor(SDL_Display), "Metro Link Incorporated") == 0 ) { | |
| 382 FILE *metro_fp; | |
| 383 | |
| 384 metro_fp = fopen("/usr/X11R6/lib/X11/Metro/.version", "r"); | |
| 385 if ( metro_fp != NULL ) { | |
| 386 int major, minor, patch, version; | |
| 387 major = 0; minor = 0; patch = 0; | |
| 388 fscanf(metro_fp, "%d.%d.%d", &major, &minor, &patch); | |
| 389 version = major*100+minor*10+patch; | |
| 390 if ( version < 431 ) { | |
| 391 buggy_X11 = 1; | |
| 392 } | |
| 393 fclose(metro_fp); | |
| 394 } | |
| 395 } | |
|
607
f8710950cddc
Date: Sat, 1 Mar 2003 16:13:57 -0500
Sam Lantinga <slouken@libsdl.org>
parents:
604
diff
changeset
|
396 #if defined(__alpha__) || defined(__sparc64__) || defined(__powerpc__) |
|
f8710950cddc
Date: Sat, 1 Mar 2003 16:13:57 -0500
Sam Lantinga <slouken@libsdl.org>
parents:
604
diff
changeset
|
397 /* The alpha, sparc64 and PPC XFree86 servers are also buggy */ |
| 0 | 398 buggy_X11 = 1; |
| 399 #endif | |
| 400 /* Enumerate the available fullscreen modes */ | |
| 401 if ( ! buggy_X11 ) { | |
|
292
eadc0746dfaf
Added SDL_LockRect() and SDL_UnlockRect()
Sam Lantinga <slouken@libsdl.org>
parents:
252
diff
changeset
|
402 if ( SDL_NAME(XF86VidModeQueryExtension)(SDL_Display, &vm_event, &vm_error) && |
|
eadc0746dfaf
Added SDL_LockRect() and SDL_UnlockRect()
Sam Lantinga <slouken@libsdl.org>
parents:
252
diff
changeset
|
403 SDL_NAME(XF86VidModeQueryVersion)(SDL_Display, &vm_major, &vm_minor) ) { |
| 0 | 404 #ifdef BROKEN_XFREE86_4001 |
| 405 #ifdef X_XF86VidModeGetDotClocks /* Compiled under XFree86 4.0 */ | |
| 406 /* Earlier X servers hang when doing vidmode */ | |
|
499
f480ecd70499
Added an aborted try at making fullscreen work on Xinerama screen != 0
Sam Lantinga <slouken@libsdl.org>
parents:
297
diff
changeset
|
407 if ( vm_major < 2 ) { |
|
227
24878c14b391
Added X11 Xinerama support - fullscreen starts on screen 0
Sam Lantinga <slouken@libsdl.org>
parents:
100
diff
changeset
|
408 #ifdef XFREE86_DEBUG |
|
24878c14b391
Added X11 Xinerama support - fullscreen starts on screen 0
Sam Lantinga <slouken@libsdl.org>
parents:
100
diff
changeset
|
409 printf("Compiled under XFree86 4.0, server is XFree86 3.X\n"); |
| 0 | 410 #endif |
| 411 buggy_X11 = 1; | |
| 412 } | |
| 413 #else | |
|
499
f480ecd70499
Added an aborted try at making fullscreen work on Xinerama screen != 0
Sam Lantinga <slouken@libsdl.org>
parents:
297
diff
changeset
|
414 /* XFree86 3.X code works with XFree86 4.0 servers */; |
| 0 | 415 #endif /* XFree86 4.0 */ |
| 416 #endif /* XFree86 4.02 and newer are fixed wrt backwards compatibility */ | |
| 417 } else { | |
| 418 buggy_X11 = 1; | |
| 419 } | |
| 420 } | |
| 421 if ( ! buggy_X11 && | |
|
614
0b4c3f5ff63d
Date: Wed, 9 Apr 2003 18:21:33 -0230
Sam Lantinga <slouken@libsdl.org>
parents:
607
diff
changeset
|
422 SDL_NAME(XF86VidModeGetAllModeLines)(SDL_Display, SDL_Screen,&nmodes,&modes) && |
|
0b4c3f5ff63d
Date: Wed, 9 Apr 2003 18:21:33 -0230
Sam Lantinga <slouken@libsdl.org>
parents:
607
diff
changeset
|
423 get_vidmode_filter(modes, nmodes, &bitmap) ) { |
| 0 | 424 |
|
230
275a934573a7
Greatly improved Xinerama video mode support
Sam Lantinga <slouken@libsdl.org>
parents:
227
diff
changeset
|
425 SDL_modelist = (SDL_Rect **)malloc((nmodes+2)*sizeof(SDL_Rect *)); |
| 0 | 426 if ( SDL_modelist ) { |
|
230
275a934573a7
Greatly improved Xinerama video mode support
Sam Lantinga <slouken@libsdl.org>
parents:
227
diff
changeset
|
427 n = 0; |
| 0 | 428 for ( i=0; i<nmodes; ++i ) { |
|
230
275a934573a7
Greatly improved Xinerama video mode support
Sam Lantinga <slouken@libsdl.org>
parents:
227
diff
changeset
|
429 int w, h; |
|
275a934573a7
Greatly improved Xinerama video mode support
Sam Lantinga <slouken@libsdl.org>
parents:
227
diff
changeset
|
430 |
|
614
0b4c3f5ff63d
Date: Wed, 9 Apr 2003 18:21:33 -0230
Sam Lantinga <slouken@libsdl.org>
parents:
607
diff
changeset
|
431 /* Exclude those vidmodes that have been filtered out */ |
|
0b4c3f5ff63d
Date: Wed, 9 Apr 2003 18:21:33 -0230
Sam Lantinga <slouken@libsdl.org>
parents:
607
diff
changeset
|
432 if (!bitmap[i]) continue; |
|
0b4c3f5ff63d
Date: Wed, 9 Apr 2003 18:21:33 -0230
Sam Lantinga <slouken@libsdl.org>
parents:
607
diff
changeset
|
433 |
|
230
275a934573a7
Greatly improved Xinerama video mode support
Sam Lantinga <slouken@libsdl.org>
parents:
227
diff
changeset
|
434 /* Check to see if we should add the screen size (Xinerama) */ |
|
275a934573a7
Greatly improved Xinerama video mode support
Sam Lantinga <slouken@libsdl.org>
parents:
227
diff
changeset
|
435 w = modes[i]->hdisplay; |
|
275a934573a7
Greatly improved Xinerama video mode support
Sam Lantinga <slouken@libsdl.org>
parents:
227
diff
changeset
|
436 h = modes[i]->vdisplay; |
|
275a934573a7
Greatly improved Xinerama video mode support
Sam Lantinga <slouken@libsdl.org>
parents:
227
diff
changeset
|
437 if ( (screen_w * screen_h) >= (w * h) ) { |
|
275a934573a7
Greatly improved Xinerama video mode support
Sam Lantinga <slouken@libsdl.org>
parents:
227
diff
changeset
|
438 if ( (screen_w != w) || (screen_h != h) ) { |
|
275a934573a7
Greatly improved Xinerama video mode support
Sam Lantinga <slouken@libsdl.org>
parents:
227
diff
changeset
|
439 SDL_modelist[n] = (SDL_Rect *)malloc(sizeof(SDL_Rect)); |
|
275a934573a7
Greatly improved Xinerama video mode support
Sam Lantinga <slouken@libsdl.org>
parents:
227
diff
changeset
|
440 if ( SDL_modelist[n] ) { |
|
275a934573a7
Greatly improved Xinerama video mode support
Sam Lantinga <slouken@libsdl.org>
parents:
227
diff
changeset
|
441 SDL_modelist[n]->x = 0; |
|
275a934573a7
Greatly improved Xinerama video mode support
Sam Lantinga <slouken@libsdl.org>
parents:
227
diff
changeset
|
442 SDL_modelist[n]->y = 0; |
|
275a934573a7
Greatly improved Xinerama video mode support
Sam Lantinga <slouken@libsdl.org>
parents:
227
diff
changeset
|
443 SDL_modelist[n]->w = screen_w; |
|
275a934573a7
Greatly improved Xinerama video mode support
Sam Lantinga <slouken@libsdl.org>
parents:
227
diff
changeset
|
444 SDL_modelist[n]->h = screen_h; |
|
275a934573a7
Greatly improved Xinerama video mode support
Sam Lantinga <slouken@libsdl.org>
parents:
227
diff
changeset
|
445 ++n; |
|
275a934573a7
Greatly improved Xinerama video mode support
Sam Lantinga <slouken@libsdl.org>
parents:
227
diff
changeset
|
446 } |
|
275a934573a7
Greatly improved Xinerama video mode support
Sam Lantinga <slouken@libsdl.org>
parents:
227
diff
changeset
|
447 } |
|
275a934573a7
Greatly improved Xinerama video mode support
Sam Lantinga <slouken@libsdl.org>
parents:
227
diff
changeset
|
448 screen_w = 0; |
|
275a934573a7
Greatly improved Xinerama video mode support
Sam Lantinga <slouken@libsdl.org>
parents:
227
diff
changeset
|
449 screen_h = 0; |
|
275a934573a7
Greatly improved Xinerama video mode support
Sam Lantinga <slouken@libsdl.org>
parents:
227
diff
changeset
|
450 } |
|
275a934573a7
Greatly improved Xinerama video mode support
Sam Lantinga <slouken@libsdl.org>
parents:
227
diff
changeset
|
451 |
|
275a934573a7
Greatly improved Xinerama video mode support
Sam Lantinga <slouken@libsdl.org>
parents:
227
diff
changeset
|
452 /* Add the size from the video mode list */ |
|
275a934573a7
Greatly improved Xinerama video mode support
Sam Lantinga <slouken@libsdl.org>
parents:
227
diff
changeset
|
453 SDL_modelist[n] = (SDL_Rect *)malloc(sizeof(SDL_Rect)); |
|
275a934573a7
Greatly improved Xinerama video mode support
Sam Lantinga <slouken@libsdl.org>
parents:
227
diff
changeset
|
454 if ( SDL_modelist[n] == NULL ) { |
| 0 | 455 break; |
| 456 } | |
|
230
275a934573a7
Greatly improved Xinerama video mode support
Sam Lantinga <slouken@libsdl.org>
parents:
227
diff
changeset
|
457 SDL_modelist[n]->x = 0; |
|
275a934573a7
Greatly improved Xinerama video mode support
Sam Lantinga <slouken@libsdl.org>
parents:
227
diff
changeset
|
458 SDL_modelist[n]->y = 0; |
|
275a934573a7
Greatly improved Xinerama video mode support
Sam Lantinga <slouken@libsdl.org>
parents:
227
diff
changeset
|
459 SDL_modelist[n]->w = w; |
|
275a934573a7
Greatly improved Xinerama video mode support
Sam Lantinga <slouken@libsdl.org>
parents:
227
diff
changeset
|
460 SDL_modelist[n]->h = h; |
|
275a934573a7
Greatly improved Xinerama video mode support
Sam Lantinga <slouken@libsdl.org>
parents:
227
diff
changeset
|
461 ++n; |
| 0 | 462 } |
|
230
275a934573a7
Greatly improved Xinerama video mode support
Sam Lantinga <slouken@libsdl.org>
parents:
227
diff
changeset
|
463 SDL_modelist[n] = NULL; |
| 0 | 464 } |
| 465 XFree(modes); | |
|
614
0b4c3f5ff63d
Date: Wed, 9 Apr 2003 18:21:33 -0230
Sam Lantinga <slouken@libsdl.org>
parents:
607
diff
changeset
|
466 if (bitmap) free(bitmap); |
| 0 | 467 |
|
100
a1c973c35fef
Fixed using the video mode extension on older servers
Sam Lantinga <slouken@lokigames.com>
parents:
98
diff
changeset
|
468 use_vidmode = vm_major * 100 + vm_minor; |
| 0 | 469 save_mode(this); |
| 470 } | |
| 471 #endif /* XFREE86_VM */ | |
| 472 | |
|
499
f480ecd70499
Added an aborted try at making fullscreen work on Xinerama screen != 0
Sam Lantinga <slouken@libsdl.org>
parents:
297
diff
changeset
|
473 /* XiG */ |
|
242
4bcb29d3769c
Added support for Xi Graphics XME fullscreen extension
Sam Lantinga <slouken@libsdl.org>
parents:
230
diff
changeset
|
474 #ifdef HAVE_XIGXME |
|
4bcb29d3769c
Added support for Xi Graphics XME fullscreen extension
Sam Lantinga <slouken@libsdl.org>
parents:
230
diff
changeset
|
475 /* first lets make sure we have the extension, and it's at least v2.0 */ |
|
4bcb29d3769c
Added support for Xi Graphics XME fullscreen extension
Sam Lantinga <slouken@libsdl.org>
parents:
230
diff
changeset
|
476 if (XiGMiscQueryVersion(SDL_Display, &xme_major, &xme_minor)) { |
|
4bcb29d3769c
Added support for Xi Graphics XME fullscreen extension
Sam Lantinga <slouken@libsdl.org>
parents:
230
diff
changeset
|
477 #ifdef XIG_DEBUG |
|
499
f480ecd70499
Added an aborted try at making fullscreen work on Xinerama screen != 0
Sam Lantinga <slouken@libsdl.org>
parents:
297
diff
changeset
|
478 fprintf(stderr, "XME: XiGMiscQueryVersion: V%d.%d\n", |
|
f480ecd70499
Added an aborted try at making fullscreen work on Xinerama screen != 0
Sam Lantinga <slouken@libsdl.org>
parents:
297
diff
changeset
|
479 xme_major, xme_minor); |
|
242
4bcb29d3769c
Added support for Xi Graphics XME fullscreen extension
Sam Lantinga <slouken@libsdl.org>
parents:
230
diff
changeset
|
480 #endif |
|
499
f480ecd70499
Added an aborted try at making fullscreen work on Xinerama screen != 0
Sam Lantinga <slouken@libsdl.org>
parents:
297
diff
changeset
|
481 /* work around a XiGMisc bogosity in our version of libXext */ |
|
f480ecd70499
Added an aborted try at making fullscreen work on Xinerama screen != 0
Sam Lantinga <slouken@libsdl.org>
parents:
297
diff
changeset
|
482 if (xme_major == 0 && xme_major == 0) { |
|
f480ecd70499
Added an aborted try at making fullscreen work on Xinerama screen != 0
Sam Lantinga <slouken@libsdl.org>
parents:
297
diff
changeset
|
483 /* Ideally libxme would spit this out, but the problem is that |
|
f480ecd70499
Added an aborted try at making fullscreen work on Xinerama screen != 0
Sam Lantinga <slouken@libsdl.org>
parents:
297
diff
changeset
|
484 the right Query func will never be called if using the bogus |
|
f480ecd70499
Added an aborted try at making fullscreen work on Xinerama screen != 0
Sam Lantinga <slouken@libsdl.org>
parents:
297
diff
changeset
|
485 libXext version. |
|
f480ecd70499
Added an aborted try at making fullscreen work on Xinerama screen != 0
Sam Lantinga <slouken@libsdl.org>
parents:
297
diff
changeset
|
486 */ |
|
f480ecd70499
Added an aborted try at making fullscreen work on Xinerama screen != 0
Sam Lantinga <slouken@libsdl.org>
parents:
297
diff
changeset
|
487 fprintf(stderr, |
|
242
4bcb29d3769c
Added support for Xi Graphics XME fullscreen extension
Sam Lantinga <slouken@libsdl.org>
parents:
230
diff
changeset
|
488 "XME: If you are using Xi Graphics CDE and a Summit server, you need to\n" |
|
4bcb29d3769c
Added support for Xi Graphics XME fullscreen extension
Sam Lantinga <slouken@libsdl.org>
parents:
230
diff
changeset
|
489 "XME: get the libXext update from our ftp site before fullscreen switching\n" |
|
4bcb29d3769c
Added support for Xi Graphics XME fullscreen extension
Sam Lantinga <slouken@libsdl.org>
parents:
230
diff
changeset
|
490 "XME: will work. Fullscreen switching is only supported on Summit Servers\n"); |
|
499
f480ecd70499
Added an aborted try at making fullscreen work on Xinerama screen != 0
Sam Lantinga <slouken@libsdl.org>
parents:
297
diff
changeset
|
491 } |
|
242
4bcb29d3769c
Added support for Xi Graphics XME fullscreen extension
Sam Lantinga <slouken@libsdl.org>
parents:
230
diff
changeset
|
492 } else { |
|
4bcb29d3769c
Added support for Xi Graphics XME fullscreen extension
Sam Lantinga <slouken@libsdl.org>
parents:
230
diff
changeset
|
493 /* not there. Bummer. */ |
|
499
f480ecd70499
Added an aborted try at making fullscreen work on Xinerama screen != 0
Sam Lantinga <slouken@libsdl.org>
parents:
297
diff
changeset
|
494 xme_major = xme_minor = 0; |
|
242
4bcb29d3769c
Added support for Xi Graphics XME fullscreen extension
Sam Lantinga <slouken@libsdl.org>
parents:
230
diff
changeset
|
495 } |
|
4bcb29d3769c
Added support for Xi Graphics XME fullscreen extension
Sam Lantinga <slouken@libsdl.org>
parents:
230
diff
changeset
|
496 |
|
4bcb29d3769c
Added support for Xi Graphics XME fullscreen extension
Sam Lantinga <slouken@libsdl.org>
parents:
230
diff
changeset
|
497 modelist = NULL; |
|
4bcb29d3769c
Added support for Xi Graphics XME fullscreen extension
Sam Lantinga <slouken@libsdl.org>
parents:
230
diff
changeset
|
498 if (xme_major >= 2 && (nummodes = XiGMiscQueryResolutions(SDL_Display, |
|
499
f480ecd70499
Added an aborted try at making fullscreen work on Xinerama screen != 0
Sam Lantinga <slouken@libsdl.org>
parents:
297
diff
changeset
|
499 SDL_Screen, |
|
f480ecd70499
Added an aborted try at making fullscreen work on Xinerama screen != 0
Sam Lantinga <slouken@libsdl.org>
parents:
297
diff
changeset
|
500 0, /* view */ |
|
f480ecd70499
Added an aborted try at making fullscreen work on Xinerama screen != 0
Sam Lantinga <slouken@libsdl.org>
parents:
297
diff
changeset
|
501 &ractive, |
|
f480ecd70499
Added an aborted try at making fullscreen work on Xinerama screen != 0
Sam Lantinga <slouken@libsdl.org>
parents:
297
diff
changeset
|
502 &modelist)) > 1) |
|
f480ecd70499
Added an aborted try at making fullscreen work on Xinerama screen != 0
Sam Lantinga <slouken@libsdl.org>
parents:
297
diff
changeset
|
503 { /* then we actually have some */ |
|
f480ecd70499
Added an aborted try at making fullscreen work on Xinerama screen != 0
Sam Lantinga <slouken@libsdl.org>
parents:
297
diff
changeset
|
504 int j; |
|
242
4bcb29d3769c
Added support for Xi Graphics XME fullscreen extension
Sam Lantinga <slouken@libsdl.org>
parents:
230
diff
changeset
|
505 |
|
4bcb29d3769c
Added support for Xi Graphics XME fullscreen extension
Sam Lantinga <slouken@libsdl.org>
parents:
230
diff
changeset
|
506 #ifdef XIG_DEBUG |
|
499
f480ecd70499
Added an aborted try at making fullscreen work on Xinerama screen != 0
Sam Lantinga <slouken@libsdl.org>
parents:
297
diff
changeset
|
507 fprintf(stderr, "XME: nummodes = %d, active mode = %d\n", |
|
f480ecd70499
Added an aborted try at making fullscreen work on Xinerama screen != 0
Sam Lantinga <slouken@libsdl.org>
parents:
297
diff
changeset
|
508 nummodes, ractive); |
|
242
4bcb29d3769c
Added support for Xi Graphics XME fullscreen extension
Sam Lantinga <slouken@libsdl.org>
parents:
230
diff
changeset
|
509 #endif |
|
4bcb29d3769c
Added support for Xi Graphics XME fullscreen extension
Sam Lantinga <slouken@libsdl.org>
parents:
230
diff
changeset
|
510 |
|
499
f480ecd70499
Added an aborted try at making fullscreen work on Xinerama screen != 0
Sam Lantinga <slouken@libsdl.org>
parents:
297
diff
changeset
|
511 SDL_modelist = (SDL_Rect **)malloc((nummodes+1)*sizeof(SDL_Rect *)); |
|
242
4bcb29d3769c
Added support for Xi Graphics XME fullscreen extension
Sam Lantinga <slouken@libsdl.org>
parents:
230
diff
changeset
|
512 |
|
499
f480ecd70499
Added an aborted try at making fullscreen work on Xinerama screen != 0
Sam Lantinga <slouken@libsdl.org>
parents:
297
diff
changeset
|
513 /* we get the list already sorted in */ |
|
f480ecd70499
Added an aborted try at making fullscreen work on Xinerama screen != 0
Sam Lantinga <slouken@libsdl.org>
parents:
297
diff
changeset
|
514 /* descending order. We'll copy it in */ |
|
f480ecd70499
Added an aborted try at making fullscreen work on Xinerama screen != 0
Sam Lantinga <slouken@libsdl.org>
parents:
297
diff
changeset
|
515 /* reverse order so SDL is happy */ |
|
f480ecd70499
Added an aborted try at making fullscreen work on Xinerama screen != 0
Sam Lantinga <slouken@libsdl.org>
parents:
297
diff
changeset
|
516 if (SDL_modelist) { |
|
f480ecd70499
Added an aborted try at making fullscreen work on Xinerama screen != 0
Sam Lantinga <slouken@libsdl.org>
parents:
297
diff
changeset
|
517 for ( i=0, j=nummodes-1; j>=0; i++, j-- ) { |
|
f480ecd70499
Added an aborted try at making fullscreen work on Xinerama screen != 0
Sam Lantinga <slouken@libsdl.org>
parents:
297
diff
changeset
|
518 if ((SDL_modelist[i] = |
|
f480ecd70499
Added an aborted try at making fullscreen work on Xinerama screen != 0
Sam Lantinga <slouken@libsdl.org>
parents:
297
diff
changeset
|
519 (SDL_Rect *)malloc(sizeof(SDL_Rect))) == NULL) |
|
f480ecd70499
Added an aborted try at making fullscreen work on Xinerama screen != 0
Sam Lantinga <slouken@libsdl.org>
parents:
297
diff
changeset
|
520 break; |
|
242
4bcb29d3769c
Added support for Xi Graphics XME fullscreen extension
Sam Lantinga <slouken@libsdl.org>
parents:
230
diff
changeset
|
521 #ifdef XIG_DEBUG |
|
499
f480ecd70499
Added an aborted try at making fullscreen work on Xinerama screen != 0
Sam Lantinga <slouken@libsdl.org>
parents:
297
diff
changeset
|
522 fprintf(stderr, "XME: mode = %4d, w = %4d, h = %4d\n", |
|
f480ecd70499
Added an aborted try at making fullscreen work on Xinerama screen != 0
Sam Lantinga <slouken@libsdl.org>
parents:
297
diff
changeset
|
523 i, modelist[i].width, modelist[i].height); |
|
242
4bcb29d3769c
Added support for Xi Graphics XME fullscreen extension
Sam Lantinga <slouken@libsdl.org>
parents:
230
diff
changeset
|
524 #endif |
|
499
f480ecd70499
Added an aborted try at making fullscreen work on Xinerama screen != 0
Sam Lantinga <slouken@libsdl.org>
parents:
297
diff
changeset
|
525 |
|
f480ecd70499
Added an aborted try at making fullscreen work on Xinerama screen != 0
Sam Lantinga <slouken@libsdl.org>
parents:
297
diff
changeset
|
526 SDL_modelist[i]->x = 0; |
|
f480ecd70499
Added an aborted try at making fullscreen work on Xinerama screen != 0
Sam Lantinga <slouken@libsdl.org>
parents:
297
diff
changeset
|
527 SDL_modelist[i]->y = 0; |
|
f480ecd70499
Added an aborted try at making fullscreen work on Xinerama screen != 0
Sam Lantinga <slouken@libsdl.org>
parents:
297
diff
changeset
|
528 SDL_modelist[i]->w = modelist[j].width; |
|
f480ecd70499
Added an aborted try at making fullscreen work on Xinerama screen != 0
Sam Lantinga <slouken@libsdl.org>
parents:
297
diff
changeset
|
529 SDL_modelist[i]->h = modelist[j].height; |
|
f480ecd70499
Added an aborted try at making fullscreen work on Xinerama screen != 0
Sam Lantinga <slouken@libsdl.org>
parents:
297
diff
changeset
|
530 |
|
f480ecd70499
Added an aborted try at making fullscreen work on Xinerama screen != 0
Sam Lantinga <slouken@libsdl.org>
parents:
297
diff
changeset
|
531 } |
|
242
4bcb29d3769c
Added support for Xi Graphics XME fullscreen extension
Sam Lantinga <slouken@libsdl.org>
parents:
230
diff
changeset
|
532 SDL_modelist[i] = NULL; /* terminator */ |
|
499
f480ecd70499
Added an aborted try at making fullscreen work on Xinerama screen != 0
Sam Lantinga <slouken@libsdl.org>
parents:
297
diff
changeset
|
533 } |
|
f480ecd70499
Added an aborted try at making fullscreen work on Xinerama screen != 0
Sam Lantinga <slouken@libsdl.org>
parents:
297
diff
changeset
|
534 use_xme = 1; |
|
f480ecd70499
Added an aborted try at making fullscreen work on Xinerama screen != 0
Sam Lantinga <slouken@libsdl.org>
parents:
297
diff
changeset
|
535 saved_res = modelist[ractive]; /* save the current resolution */ |
|
242
4bcb29d3769c
Added support for Xi Graphics XME fullscreen extension
Sam Lantinga <slouken@libsdl.org>
parents:
230
diff
changeset
|
536 } else { |
|
4bcb29d3769c
Added support for Xi Graphics XME fullscreen extension
Sam Lantinga <slouken@libsdl.org>
parents:
230
diff
changeset
|
537 use_xme = 0; |
|
4bcb29d3769c
Added support for Xi Graphics XME fullscreen extension
Sam Lantinga <slouken@libsdl.org>
parents:
230
diff
changeset
|
538 } |
|
4bcb29d3769c
Added support for Xi Graphics XME fullscreen extension
Sam Lantinga <slouken@libsdl.org>
parents:
230
diff
changeset
|
539 if ( modelist ) { |
|
4bcb29d3769c
Added support for Xi Graphics XME fullscreen extension
Sam Lantinga <slouken@libsdl.org>
parents:
230
diff
changeset
|
540 XFree(modelist); |
|
4bcb29d3769c
Added support for Xi Graphics XME fullscreen extension
Sam Lantinga <slouken@libsdl.org>
parents:
230
diff
changeset
|
541 } |
|
4bcb29d3769c
Added support for Xi Graphics XME fullscreen extension
Sam Lantinga <slouken@libsdl.org>
parents:
230
diff
changeset
|
542 #endif /* HAVE_XIGXME */ |
|
4bcb29d3769c
Added support for Xi Graphics XME fullscreen extension
Sam Lantinga <slouken@libsdl.org>
parents:
230
diff
changeset
|
543 |
| 0 | 544 { |
|
499
f480ecd70499
Added an aborted try at making fullscreen work on Xinerama screen != 0
Sam Lantinga <slouken@libsdl.org>
parents:
297
diff
changeset
|
545 static int depth_list[] = { 32, 24, 16, 15, 8 }; |
|
f480ecd70499
Added an aborted try at making fullscreen work on Xinerama screen != 0
Sam Lantinga <slouken@libsdl.org>
parents:
297
diff
changeset
|
546 int j, np; |
|
f480ecd70499
Added an aborted try at making fullscreen work on Xinerama screen != 0
Sam Lantinga <slouken@libsdl.org>
parents:
297
diff
changeset
|
547 int use_directcolor = 1; |
|
f480ecd70499
Added an aborted try at making fullscreen work on Xinerama screen != 0
Sam Lantinga <slouken@libsdl.org>
parents:
297
diff
changeset
|
548 XPixmapFormatValues *pf; |
| 0 | 549 |
|
499
f480ecd70499
Added an aborted try at making fullscreen work on Xinerama screen != 0
Sam Lantinga <slouken@libsdl.org>
parents:
297
diff
changeset
|
550 /* Search for the visuals in deepest-first order, so that the first |
|
f480ecd70499
Added an aborted try at making fullscreen work on Xinerama screen != 0
Sam Lantinga <slouken@libsdl.org>
parents:
297
diff
changeset
|
551 will be the richest one */ |
|
f480ecd70499
Added an aborted try at making fullscreen work on Xinerama screen != 0
Sam Lantinga <slouken@libsdl.org>
parents:
297
diff
changeset
|
552 if ( getenv("SDL_VIDEO_X11_NODIRECTCOLOR") ) { |
|
f480ecd70499
Added an aborted try at making fullscreen work on Xinerama screen != 0
Sam Lantinga <slouken@libsdl.org>
parents:
297
diff
changeset
|
553 use_directcolor = 0; |
|
f480ecd70499
Added an aborted try at making fullscreen work on Xinerama screen != 0
Sam Lantinga <slouken@libsdl.org>
parents:
297
diff
changeset
|
554 } |
|
f480ecd70499
Added an aborted try at making fullscreen work on Xinerama screen != 0
Sam Lantinga <slouken@libsdl.org>
parents:
297
diff
changeset
|
555 this->hidden->nvisuals = 0; |
|
f480ecd70499
Added an aborted try at making fullscreen work on Xinerama screen != 0
Sam Lantinga <slouken@libsdl.org>
parents:
297
diff
changeset
|
556 if ( ! add_visual_byid(this, getenv("SDL_VIDEO_X11_VISUALID")) ) { |
|
f480ecd70499
Added an aborted try at making fullscreen work on Xinerama screen != 0
Sam Lantinga <slouken@libsdl.org>
parents:
297
diff
changeset
|
557 for ( i=0; i<SDL_TABLESIZE(depth_list); ++i ) { |
|
f480ecd70499
Added an aborted try at making fullscreen work on Xinerama screen != 0
Sam Lantinga <slouken@libsdl.org>
parents:
297
diff
changeset
|
558 if ( depth_list[i] > 8 ) { |
|
f480ecd70499
Added an aborted try at making fullscreen work on Xinerama screen != 0
Sam Lantinga <slouken@libsdl.org>
parents:
297
diff
changeset
|
559 if ( use_directcolor ) { |
|
f480ecd70499
Added an aborted try at making fullscreen work on Xinerama screen != 0
Sam Lantinga <slouken@libsdl.org>
parents:
297
diff
changeset
|
560 add_visual(this, depth_list[i], DirectColor); |
|
f480ecd70499
Added an aborted try at making fullscreen work on Xinerama screen != 0
Sam Lantinga <slouken@libsdl.org>
parents:
297
diff
changeset
|
561 } |
|
f480ecd70499
Added an aborted try at making fullscreen work on Xinerama screen != 0
Sam Lantinga <slouken@libsdl.org>
parents:
297
diff
changeset
|
562 add_visual(this, depth_list[i], TrueColor); |
|
f480ecd70499
Added an aborted try at making fullscreen work on Xinerama screen != 0
Sam Lantinga <slouken@libsdl.org>
parents:
297
diff
changeset
|
563 } else { |
|
f480ecd70499
Added an aborted try at making fullscreen work on Xinerama screen != 0
Sam Lantinga <slouken@libsdl.org>
parents:
297
diff
changeset
|
564 add_visual(this, depth_list[i], PseudoColor); |
|
f480ecd70499
Added an aborted try at making fullscreen work on Xinerama screen != 0
Sam Lantinga <slouken@libsdl.org>
parents:
297
diff
changeset
|
565 add_visual(this, depth_list[i], StaticColor); |
|
f480ecd70499
Added an aborted try at making fullscreen work on Xinerama screen != 0
Sam Lantinga <slouken@libsdl.org>
parents:
297
diff
changeset
|
566 } |
|
f480ecd70499
Added an aborted try at making fullscreen work on Xinerama screen != 0
Sam Lantinga <slouken@libsdl.org>
parents:
297
diff
changeset
|
567 } |
|
f480ecd70499
Added an aborted try at making fullscreen work on Xinerama screen != 0
Sam Lantinga <slouken@libsdl.org>
parents:
297
diff
changeset
|
568 } |
|
f480ecd70499
Added an aborted try at making fullscreen work on Xinerama screen != 0
Sam Lantinga <slouken@libsdl.org>
parents:
297
diff
changeset
|
569 if ( this->hidden->nvisuals == 0 ) { |
|
f480ecd70499
Added an aborted try at making fullscreen work on Xinerama screen != 0
Sam Lantinga <slouken@libsdl.org>
parents:
297
diff
changeset
|
570 SDL_SetError("Found no sufficiently capable X11 visuals"); |
|
f480ecd70499
Added an aborted try at making fullscreen work on Xinerama screen != 0
Sam Lantinga <slouken@libsdl.org>
parents:
297
diff
changeset
|
571 return -1; |
|
f480ecd70499
Added an aborted try at making fullscreen work on Xinerama screen != 0
Sam Lantinga <slouken@libsdl.org>
parents:
297
diff
changeset
|
572 } |
|
f480ecd70499
Added an aborted try at making fullscreen work on Xinerama screen != 0
Sam Lantinga <slouken@libsdl.org>
parents:
297
diff
changeset
|
573 |
|
f480ecd70499
Added an aborted try at making fullscreen work on Xinerama screen != 0
Sam Lantinga <slouken@libsdl.org>
parents:
297
diff
changeset
|
574 /* look up the pixel quantum for each depth */ |
|
f480ecd70499
Added an aborted try at making fullscreen work on Xinerama screen != 0
Sam Lantinga <slouken@libsdl.org>
parents:
297
diff
changeset
|
575 pf = XListPixmapFormats(SDL_Display, &np); |
|
f480ecd70499
Added an aborted try at making fullscreen work on Xinerama screen != 0
Sam Lantinga <slouken@libsdl.org>
parents:
297
diff
changeset
|
576 for(i = 0; i < this->hidden->nvisuals; i++) { |
|
f480ecd70499
Added an aborted try at making fullscreen work on Xinerama screen != 0
Sam Lantinga <slouken@libsdl.org>
parents:
297
diff
changeset
|
577 int d = this->hidden->visuals[i].depth; |
|
f480ecd70499
Added an aborted try at making fullscreen work on Xinerama screen != 0
Sam Lantinga <slouken@libsdl.org>
parents:
297
diff
changeset
|
578 for(j = 0; j < np; j++) |
|
f480ecd70499
Added an aborted try at making fullscreen work on Xinerama screen != 0
Sam Lantinga <slouken@libsdl.org>
parents:
297
diff
changeset
|
579 if(pf[j].depth == d) |
|
f480ecd70499
Added an aborted try at making fullscreen work on Xinerama screen != 0
Sam Lantinga <slouken@libsdl.org>
parents:
297
diff
changeset
|
580 break; |
|
f480ecd70499
Added an aborted try at making fullscreen work on Xinerama screen != 0
Sam Lantinga <slouken@libsdl.org>
parents:
297
diff
changeset
|
581 this->hidden->visuals[i].bpp = j < np ? pf[j].bits_per_pixel : d; |
|
f480ecd70499
Added an aborted try at making fullscreen work on Xinerama screen != 0
Sam Lantinga <slouken@libsdl.org>
parents:
297
diff
changeset
|
582 } |
| 0 | 583 |
|
499
f480ecd70499
Added an aborted try at making fullscreen work on Xinerama screen != 0
Sam Lantinga <slouken@libsdl.org>
parents:
297
diff
changeset
|
584 XFree(pf); |
| 0 | 585 } |
| 586 | |
| 587 if ( SDL_modelist == NULL ) { | |
| 588 SDL_modelist = (SDL_Rect **)malloc((1+1)*sizeof(SDL_Rect *)); | |
| 589 if ( SDL_modelist ) { | |
|
230
275a934573a7
Greatly improved Xinerama video mode support
Sam Lantinga <slouken@libsdl.org>
parents:
227
diff
changeset
|
590 n = 0; |
|
275a934573a7
Greatly improved Xinerama video mode support
Sam Lantinga <slouken@libsdl.org>
parents:
227
diff
changeset
|
591 SDL_modelist[n] = (SDL_Rect *)malloc(sizeof(SDL_Rect)); |
|
275a934573a7
Greatly improved Xinerama video mode support
Sam Lantinga <slouken@libsdl.org>
parents:
227
diff
changeset
|
592 if ( SDL_modelist[n] ) { |
|
275a934573a7
Greatly improved Xinerama video mode support
Sam Lantinga <slouken@libsdl.org>
parents:
227
diff
changeset
|
593 SDL_modelist[n]->x = 0; |
|
275a934573a7
Greatly improved Xinerama video mode support
Sam Lantinga <slouken@libsdl.org>
parents:
227
diff
changeset
|
594 SDL_modelist[n]->y = 0; |
|
275a934573a7
Greatly improved Xinerama video mode support
Sam Lantinga <slouken@libsdl.org>
parents:
227
diff
changeset
|
595 SDL_modelist[n]->w = screen_w; |
|
275a934573a7
Greatly improved Xinerama video mode support
Sam Lantinga <slouken@libsdl.org>
parents:
227
diff
changeset
|
596 SDL_modelist[n]->h = screen_h; |
|
275a934573a7
Greatly improved Xinerama video mode support
Sam Lantinga <slouken@libsdl.org>
parents:
227
diff
changeset
|
597 ++n; |
| 0 | 598 } |
|
230
275a934573a7
Greatly improved Xinerama video mode support
Sam Lantinga <slouken@libsdl.org>
parents:
227
diff
changeset
|
599 SDL_modelist[n] = NULL; |
| 0 | 600 } |
| 601 } | |
| 602 | |
|
242
4bcb29d3769c
Added support for Xi Graphics XME fullscreen extension
Sam Lantinga <slouken@libsdl.org>
parents:
230
diff
changeset
|
603 #if defined(XFREE86_DEBUG) || defined(XIG_DEBUG) |
| 0 | 604 if ( use_vidmode ) { |
|
227
24878c14b391
Added X11 Xinerama support - fullscreen starts on screen 0
Sam Lantinga <slouken@libsdl.org>
parents:
100
diff
changeset
|
605 printf("XFree86 VidMode is enabled\n"); |
| 0 | 606 } |
|
242
4bcb29d3769c
Added support for Xi Graphics XME fullscreen extension
Sam Lantinga <slouken@libsdl.org>
parents:
230
diff
changeset
|
607 |
|
4bcb29d3769c
Added support for Xi Graphics XME fullscreen extension
Sam Lantinga <slouken@libsdl.org>
parents:
230
diff
changeset
|
608 #ifdef HAVE_XIGXME |
|
4bcb29d3769c
Added support for Xi Graphics XME fullscreen extension
Sam Lantinga <slouken@libsdl.org>
parents:
230
diff
changeset
|
609 if ( use_xme ) |
|
4bcb29d3769c
Added support for Xi Graphics XME fullscreen extension
Sam Lantinga <slouken@libsdl.org>
parents:
230
diff
changeset
|
610 printf("Xi Graphics XME fullscreen is enabled\n"); |
|
4bcb29d3769c
Added support for Xi Graphics XME fullscreen extension
Sam Lantinga <slouken@libsdl.org>
parents:
230
diff
changeset
|
611 else |
|
4bcb29d3769c
Added support for Xi Graphics XME fullscreen extension
Sam Lantinga <slouken@libsdl.org>
parents:
230
diff
changeset
|
612 printf("Xi Graphics XME fullscreen is not available\n"); |
|
4bcb29d3769c
Added support for Xi Graphics XME fullscreen extension
Sam Lantinga <slouken@libsdl.org>
parents:
230
diff
changeset
|
613 #endif |
|
4bcb29d3769c
Added support for Xi Graphics XME fullscreen extension
Sam Lantinga <slouken@libsdl.org>
parents:
230
diff
changeset
|
614 |
| 0 | 615 if ( SDL_modelist ) { |
|
227
24878c14b391
Added X11 Xinerama support - fullscreen starts on screen 0
Sam Lantinga <slouken@libsdl.org>
parents:
100
diff
changeset
|
616 printf("X11 video mode list:\n"); |
| 0 | 617 for ( i=0; SDL_modelist[i]; ++i ) { |
|
227
24878c14b391
Added X11 Xinerama support - fullscreen starts on screen 0
Sam Lantinga <slouken@libsdl.org>
parents:
100
diff
changeset
|
618 printf("\t%dx%d\n", SDL_modelist[i]->w, SDL_modelist[i]->h); |
| 0 | 619 } |
| 620 } | |
|
242
4bcb29d3769c
Added support for Xi Graphics XME fullscreen extension
Sam Lantinga <slouken@libsdl.org>
parents:
230
diff
changeset
|
621 #endif /* XFREE86_DEBUG || XIG_DEBUG */ |
|
227
24878c14b391
Added X11 Xinerama support - fullscreen starts on screen 0
Sam Lantinga <slouken@libsdl.org>
parents:
100
diff
changeset
|
622 |
|
24878c14b391
Added X11 Xinerama support - fullscreen starts on screen 0
Sam Lantinga <slouken@libsdl.org>
parents:
100
diff
changeset
|
623 /* The default X/Y fullscreen offset is 0/0 */ |
|
24878c14b391
Added X11 Xinerama support - fullscreen starts on screen 0
Sam Lantinga <slouken@libsdl.org>
parents:
100
diff
changeset
|
624 xinerama_x = 0; |
|
24878c14b391
Added X11 Xinerama support - fullscreen starts on screen 0
Sam Lantinga <slouken@libsdl.org>
parents:
100
diff
changeset
|
625 xinerama_y = 0; |
|
24878c14b391
Added X11 Xinerama support - fullscreen starts on screen 0
Sam Lantinga <slouken@libsdl.org>
parents:
100
diff
changeset
|
626 |
|
24878c14b391
Added X11 Xinerama support - fullscreen starts on screen 0
Sam Lantinga <slouken@libsdl.org>
parents:
100
diff
changeset
|
627 #ifdef HAVE_XINERAMA |
|
24878c14b391
Added X11 Xinerama support - fullscreen starts on screen 0
Sam Lantinga <slouken@libsdl.org>
parents:
100
diff
changeset
|
628 /* Query Xinerama extention */ |
|
292
eadc0746dfaf
Added SDL_LockRect() and SDL_UnlockRect()
Sam Lantinga <slouken@libsdl.org>
parents:
252
diff
changeset
|
629 if ( SDL_NAME(XineramaQueryExtension)(SDL_Display, &i, &i) && |
|
eadc0746dfaf
Added SDL_LockRect() and SDL_UnlockRect()
Sam Lantinga <slouken@libsdl.org>
parents:
252
diff
changeset
|
630 SDL_NAME(XineramaIsActive)(SDL_Display) ) { |
|
499
f480ecd70499
Added an aborted try at making fullscreen work on Xinerama screen != 0
Sam Lantinga <slouken@libsdl.org>
parents:
297
diff
changeset
|
631 /* Find out which screen is the desired one */ |
|
f480ecd70499
Added an aborted try at making fullscreen work on Xinerama screen != 0
Sam Lantinga <slouken@libsdl.org>
parents:
297
diff
changeset
|
632 int desired = 0; |
|
227
24878c14b391
Added X11 Xinerama support - fullscreen starts on screen 0
Sam Lantinga <slouken@libsdl.org>
parents:
100
diff
changeset
|
633 int screens; |
|
292
eadc0746dfaf
Added SDL_LockRect() and SDL_UnlockRect()
Sam Lantinga <slouken@libsdl.org>
parents:
252
diff
changeset
|
634 SDL_NAME(XineramaScreenInfo) *xinerama; |
|
227
24878c14b391
Added X11 Xinerama support - fullscreen starts on screen 0
Sam Lantinga <slouken@libsdl.org>
parents:
100
diff
changeset
|
635 |
|
24878c14b391
Added X11 Xinerama support - fullscreen starts on screen 0
Sam Lantinga <slouken@libsdl.org>
parents:
100
diff
changeset
|
636 #ifdef XINERAMA_DEBUG |
|
24878c14b391
Added X11 Xinerama support - fullscreen starts on screen 0
Sam Lantinga <slouken@libsdl.org>
parents:
100
diff
changeset
|
637 printf("X11 detected Xinerama:\n"); |
|
24878c14b391
Added X11 Xinerama support - fullscreen starts on screen 0
Sam Lantinga <slouken@libsdl.org>
parents:
100
diff
changeset
|
638 #endif |
|
499
f480ecd70499
Added an aborted try at making fullscreen work on Xinerama screen != 0
Sam Lantinga <slouken@libsdl.org>
parents:
297
diff
changeset
|
639 #if 0 /* Apparently the vidmode extension doesn't work with Xinerama */ |
|
f480ecd70499
Added an aborted try at making fullscreen work on Xinerama screen != 0
Sam Lantinga <slouken@libsdl.org>
parents:
297
diff
changeset
|
640 const char *variable = getenv("SDL_VIDEO_X11_XINERAMA_SCREEN"); |
|
f480ecd70499
Added an aborted try at making fullscreen work on Xinerama screen != 0
Sam Lantinga <slouken@libsdl.org>
parents:
297
diff
changeset
|
641 if ( variable ) { |
|
f480ecd70499
Added an aborted try at making fullscreen work on Xinerama screen != 0
Sam Lantinga <slouken@libsdl.org>
parents:
297
diff
changeset
|
642 desired = atoi(variable); |
|
f480ecd70499
Added an aborted try at making fullscreen work on Xinerama screen != 0
Sam Lantinga <slouken@libsdl.org>
parents:
297
diff
changeset
|
643 } |
|
f480ecd70499
Added an aborted try at making fullscreen work on Xinerama screen != 0
Sam Lantinga <slouken@libsdl.org>
parents:
297
diff
changeset
|
644 #endif |
|
292
eadc0746dfaf
Added SDL_LockRect() and SDL_UnlockRect()
Sam Lantinga <slouken@libsdl.org>
parents:
252
diff
changeset
|
645 xinerama = SDL_NAME(XineramaQueryScreens)(SDL_Display, &screens); |
|
227
24878c14b391
Added X11 Xinerama support - fullscreen starts on screen 0
Sam Lantinga <slouken@libsdl.org>
parents:
100
diff
changeset
|
646 for ( i = 0; i < screens; i++ ) { |
|
24878c14b391
Added X11 Xinerama support - fullscreen starts on screen 0
Sam Lantinga <slouken@libsdl.org>
parents:
100
diff
changeset
|
647 #ifdef XINERAMA_DEBUG |
|
24878c14b391
Added X11 Xinerama support - fullscreen starts on screen 0
Sam Lantinga <slouken@libsdl.org>
parents:
100
diff
changeset
|
648 printf("xinerama %d: %dx%d+%d+%d\n", |
|
24878c14b391
Added X11 Xinerama support - fullscreen starts on screen 0
Sam Lantinga <slouken@libsdl.org>
parents:
100
diff
changeset
|
649 xinerama[i].screen_number, |
|
24878c14b391
Added X11 Xinerama support - fullscreen starts on screen 0
Sam Lantinga <slouken@libsdl.org>
parents:
100
diff
changeset
|
650 xinerama[i].width, xinerama[i].height, |
|
24878c14b391
Added X11 Xinerama support - fullscreen starts on screen 0
Sam Lantinga <slouken@libsdl.org>
parents:
100
diff
changeset
|
651 xinerama[i].x_org, xinerama[i].y_org); |
|
24878c14b391
Added X11 Xinerama support - fullscreen starts on screen 0
Sam Lantinga <slouken@libsdl.org>
parents:
100
diff
changeset
|
652 #endif |
|
499
f480ecd70499
Added an aborted try at making fullscreen work on Xinerama screen != 0
Sam Lantinga <slouken@libsdl.org>
parents:
297
diff
changeset
|
653 if ( xinerama[i].screen_number == desired ) { |
|
227
24878c14b391
Added X11 Xinerama support - fullscreen starts on screen 0
Sam Lantinga <slouken@libsdl.org>
parents:
100
diff
changeset
|
654 xinerama_x = xinerama[i].x_org; |
|
24878c14b391
Added X11 Xinerama support - fullscreen starts on screen 0
Sam Lantinga <slouken@libsdl.org>
parents:
100
diff
changeset
|
655 xinerama_y = xinerama[i].y_org; |
|
24878c14b391
Added X11 Xinerama support - fullscreen starts on screen 0
Sam Lantinga <slouken@libsdl.org>
parents:
100
diff
changeset
|
656 } |
|
24878c14b391
Added X11 Xinerama support - fullscreen starts on screen 0
Sam Lantinga <slouken@libsdl.org>
parents:
100
diff
changeset
|
657 } |
|
24878c14b391
Added X11 Xinerama support - fullscreen starts on screen 0
Sam Lantinga <slouken@libsdl.org>
parents:
100
diff
changeset
|
658 XFree(xinerama); |
|
24878c14b391
Added X11 Xinerama support - fullscreen starts on screen 0
Sam Lantinga <slouken@libsdl.org>
parents:
100
diff
changeset
|
659 } |
|
24878c14b391
Added X11 Xinerama support - fullscreen starts on screen 0
Sam Lantinga <slouken@libsdl.org>
parents:
100
diff
changeset
|
660 #endif /* HAVE_XINERAMA */ |
|
24878c14b391
Added X11 Xinerama support - fullscreen starts on screen 0
Sam Lantinga <slouken@libsdl.org>
parents:
100
diff
changeset
|
661 |
| 0 | 662 return 0; |
| 663 } | |
| 664 | |
| 665 int X11_SupportedVisual(_THIS, SDL_PixelFormat *format) | |
| 666 { | |
| 667 int i; | |
| 668 for(i = 0; i < this->hidden->nvisuals; i++) | |
|
499
f480ecd70499
Added an aborted try at making fullscreen work on Xinerama screen != 0
Sam Lantinga <slouken@libsdl.org>
parents:
297
diff
changeset
|
669 if(this->hidden->visuals[i].bpp == format->BitsPerPixel) |
|
f480ecd70499
Added an aborted try at making fullscreen work on Xinerama screen != 0
Sam Lantinga <slouken@libsdl.org>
parents:
297
diff
changeset
|
670 return 1; |
| 0 | 671 return 0; |
| 672 } | |
| 673 | |
| 674 SDL_Rect **X11_ListModes(_THIS, SDL_PixelFormat *format, Uint32 flags) | |
| 675 { | |
| 676 if ( X11_SupportedVisual(this, format) ) { | |
| 677 if ( flags & SDL_FULLSCREEN ) { | |
| 678 return(SDL_modelist); | |
| 679 } else { | |
| 680 return((SDL_Rect **)-1); | |
| 681 } | |
| 682 } else { | |
| 683 return((SDL_Rect **)0); | |
| 684 } | |
| 685 } | |
| 686 | |
| 687 void X11_FreeVideoModes(_THIS) | |
| 688 { | |
| 689 int i; | |
| 690 | |
| 691 if ( SDL_modelist ) { | |
| 692 for ( i=0; SDL_modelist[i]; ++i ) { | |
| 693 free(SDL_modelist[i]); | |
| 694 } | |
| 695 free(SDL_modelist); | |
| 696 SDL_modelist = NULL; | |
| 697 } | |
| 698 } | |
| 699 | |
| 700 int X11_ResizeFullScreen(_THIS) | |
| 701 { | |
| 702 int x, y; | |
| 703 int real_w, real_h; | |
|
230
275a934573a7
Greatly improved Xinerama video mode support
Sam Lantinga <slouken@libsdl.org>
parents:
227
diff
changeset
|
704 int screen_w; |
|
275a934573a7
Greatly improved Xinerama video mode support
Sam Lantinga <slouken@libsdl.org>
parents:
227
diff
changeset
|
705 int screen_h; |
|
275a934573a7
Greatly improved Xinerama video mode support
Sam Lantinga <slouken@libsdl.org>
parents:
227
diff
changeset
|
706 |
|
275a934573a7
Greatly improved Xinerama video mode support
Sam Lantinga <slouken@libsdl.org>
parents:
227
diff
changeset
|
707 screen_w = DisplayWidth(SDL_Display, SDL_Screen); |
|
275a934573a7
Greatly improved Xinerama video mode support
Sam Lantinga <slouken@libsdl.org>
parents:
227
diff
changeset
|
708 screen_h = DisplayHeight(SDL_Display, SDL_Screen); |
| 0 | 709 |
|
227
24878c14b391
Added X11 Xinerama support - fullscreen starts on screen 0
Sam Lantinga <slouken@libsdl.org>
parents:
100
diff
changeset
|
710 x = xinerama_x; |
|
24878c14b391
Added X11 Xinerama support - fullscreen starts on screen 0
Sam Lantinga <slouken@libsdl.org>
parents:
100
diff
changeset
|
711 y = xinerama_y; |
| 0 | 712 if ( currently_fullscreen ) { |
| 713 /* Switch resolution and cover it with the FSwindow */ | |
|
227
24878c14b391
Added X11 Xinerama support - fullscreen starts on screen 0
Sam Lantinga <slouken@libsdl.org>
parents:
100
diff
changeset
|
714 move_cursor_to(this, x, y); |
| 0 | 715 set_best_resolution(this, current_w, current_h); |
|
227
24878c14b391
Added X11 Xinerama support - fullscreen starts on screen 0
Sam Lantinga <slouken@libsdl.org>
parents:
100
diff
changeset
|
716 move_cursor_to(this, x, y); |
| 0 | 717 get_real_resolution(this, &real_w, &real_h); |
|
230
275a934573a7
Greatly improved Xinerama video mode support
Sam Lantinga <slouken@libsdl.org>
parents:
227
diff
changeset
|
718 if ( current_w > real_w ) { |
|
275a934573a7
Greatly improved Xinerama video mode support
Sam Lantinga <slouken@libsdl.org>
parents:
227
diff
changeset
|
719 real_w = MAX(real_w, screen_w); |
|
275a934573a7
Greatly improved Xinerama video mode support
Sam Lantinga <slouken@libsdl.org>
parents:
227
diff
changeset
|
720 } |
|
275a934573a7
Greatly improved Xinerama video mode support
Sam Lantinga <slouken@libsdl.org>
parents:
227
diff
changeset
|
721 if ( current_h > real_h ) { |
|
275a934573a7
Greatly improved Xinerama video mode support
Sam Lantinga <slouken@libsdl.org>
parents:
227
diff
changeset
|
722 real_h = MAX(real_h, screen_h); |
|
275a934573a7
Greatly improved Xinerama video mode support
Sam Lantinga <slouken@libsdl.org>
parents:
227
diff
changeset
|
723 } |
|
227
24878c14b391
Added X11 Xinerama support - fullscreen starts on screen 0
Sam Lantinga <slouken@libsdl.org>
parents:
100
diff
changeset
|
724 XMoveResizeWindow(SDL_Display, FSwindow, x, y, real_w, real_h); |
| 0 | 725 move_cursor_to(this, real_w/2, real_h/2); |
| 726 | |
| 727 /* Center and reparent the drawing window */ | |
| 728 x = (real_w - current_w)/2; | |
| 729 y = (real_h - current_h)/2; | |
| 730 XReparentWindow(SDL_Display, SDL_Window, FSwindow, x, y); | |
| 731 /* FIXME: move the mouse to the old relative location */ | |
| 732 XSync(SDL_Display, True); /* Flush spurious mode change events */ | |
| 733 } | |
| 734 return(1); | |
| 735 } | |
| 736 | |
| 737 void X11_QueueEnterFullScreen(_THIS) | |
| 738 { | |
| 739 switch_waiting = 0x01 | SDL_FULLSCREEN; | |
| 740 switch_time = SDL_GetTicks() + 1500; | |
| 741 #if 0 /* This causes a BadMatch error if the window is iconified (not needed) */ | |
| 742 XSetInputFocus(SDL_Display, WMwindow, RevertToNone, CurrentTime); | |
| 743 #endif | |
| 744 } | |
| 745 | |
| 746 int X11_EnterFullScreen(_THIS) | |
| 747 { | |
| 748 int okay; | |
| 749 #if 0 | |
| 750 Window tmpwin, *windows; | |
| 751 int i, nwindows; | |
| 752 #endif | |
|
98
8a5aff5c1294
Fixed some problems with the fullscreen code. Wooo. :)
Sam Lantinga <slouken@lokigames.com>
parents:
91
diff
changeset
|
753 int real_w, real_h; |
|
230
275a934573a7
Greatly improved Xinerama video mode support
Sam Lantinga <slouken@libsdl.org>
parents:
227
diff
changeset
|
754 int screen_w; |
|
275a934573a7
Greatly improved Xinerama video mode support
Sam Lantinga <slouken@libsdl.org>
parents:
227
diff
changeset
|
755 int screen_h; |
| 0 | 756 |
| 757 okay = 1; | |
|
98
8a5aff5c1294
Fixed some problems with the fullscreen code. Wooo. :)
Sam Lantinga <slouken@lokigames.com>
parents:
91
diff
changeset
|
758 if ( currently_fullscreen ) { |
|
8a5aff5c1294
Fixed some problems with the fullscreen code. Wooo. :)
Sam Lantinga <slouken@lokigames.com>
parents:
91
diff
changeset
|
759 return(okay); |
|
8a5aff5c1294
Fixed some problems with the fullscreen code. Wooo. :)
Sam Lantinga <slouken@lokigames.com>
parents:
91
diff
changeset
|
760 } |
| 0 | 761 |
|
98
8a5aff5c1294
Fixed some problems with the fullscreen code. Wooo. :)
Sam Lantinga <slouken@lokigames.com>
parents:
91
diff
changeset
|
762 /* Ungrab the input so that we can move the mouse around */ |
|
8a5aff5c1294
Fixed some problems with the fullscreen code. Wooo. :)
Sam Lantinga <slouken@lokigames.com>
parents:
91
diff
changeset
|
763 X11_GrabInputNoLock(this, SDL_GRAB_OFF); |
|
8a5aff5c1294
Fixed some problems with the fullscreen code. Wooo. :)
Sam Lantinga <slouken@lokigames.com>
parents:
91
diff
changeset
|
764 |
|
8a5aff5c1294
Fixed some problems with the fullscreen code. Wooo. :)
Sam Lantinga <slouken@lokigames.com>
parents:
91
diff
changeset
|
765 /* Map the fullscreen window to blank the screen */ |
|
230
275a934573a7
Greatly improved Xinerama video mode support
Sam Lantinga <slouken@libsdl.org>
parents:
227
diff
changeset
|
766 screen_w = DisplayWidth(SDL_Display, SDL_Screen); |
|
275a934573a7
Greatly improved Xinerama video mode support
Sam Lantinga <slouken@libsdl.org>
parents:
227
diff
changeset
|
767 screen_h = DisplayHeight(SDL_Display, SDL_Screen); |
|
98
8a5aff5c1294
Fixed some problems with the fullscreen code. Wooo. :)
Sam Lantinga <slouken@lokigames.com>
parents:
91
diff
changeset
|
768 get_real_resolution(this, &real_w, &real_h); |
|
230
275a934573a7
Greatly improved Xinerama video mode support
Sam Lantinga <slouken@libsdl.org>
parents:
227
diff
changeset
|
769 if ( current_w > real_w ) { |
|
275a934573a7
Greatly improved Xinerama video mode support
Sam Lantinga <slouken@libsdl.org>
parents:
227
diff
changeset
|
770 real_w = MAX(real_w, screen_w); |
|
275a934573a7
Greatly improved Xinerama video mode support
Sam Lantinga <slouken@libsdl.org>
parents:
227
diff
changeset
|
771 } |
|
275a934573a7
Greatly improved Xinerama video mode support
Sam Lantinga <slouken@libsdl.org>
parents:
227
diff
changeset
|
772 if ( current_h > real_h ) { |
|
275a934573a7
Greatly improved Xinerama video mode support
Sam Lantinga <slouken@libsdl.org>
parents:
227
diff
changeset
|
773 real_h = MAX(real_h, screen_h); |
|
275a934573a7
Greatly improved Xinerama video mode support
Sam Lantinga <slouken@libsdl.org>
parents:
227
diff
changeset
|
774 } |
|
499
f480ecd70499
Added an aborted try at making fullscreen work on Xinerama screen != 0
Sam Lantinga <slouken@libsdl.org>
parents:
297
diff
changeset
|
775 XMoveResizeWindow(SDL_Display, FSwindow, |
|
f480ecd70499
Added an aborted try at making fullscreen work on Xinerama screen != 0
Sam Lantinga <slouken@libsdl.org>
parents:
297
diff
changeset
|
776 xinerama_x, xinerama_y, real_w, real_h); |
|
98
8a5aff5c1294
Fixed some problems with the fullscreen code. Wooo. :)
Sam Lantinga <slouken@lokigames.com>
parents:
91
diff
changeset
|
777 XMapRaised(SDL_Display, FSwindow); |
|
8a5aff5c1294
Fixed some problems with the fullscreen code. Wooo. :)
Sam Lantinga <slouken@lokigames.com>
parents:
91
diff
changeset
|
778 X11_WaitMapped(this, FSwindow); |
| 0 | 779 |
| 780 #if 0 /* This seems to break WindowMaker in focus-follows-mouse mode */ | |
|
98
8a5aff5c1294
Fixed some problems with the fullscreen code. Wooo. :)
Sam Lantinga <slouken@lokigames.com>
parents:
91
diff
changeset
|
781 /* Make sure we got to the top of the window stack */ |
|
8a5aff5c1294
Fixed some problems with the fullscreen code. Wooo. :)
Sam Lantinga <slouken@lokigames.com>
parents:
91
diff
changeset
|
782 if ( XQueryTree(SDL_Display, SDL_Root, &tmpwin, &tmpwin, |
|
8a5aff5c1294
Fixed some problems with the fullscreen code. Wooo. :)
Sam Lantinga <slouken@lokigames.com>
parents:
91
diff
changeset
|
783 &windows, &nwindows) && windows ) { |
|
8a5aff5c1294
Fixed some problems with the fullscreen code. Wooo. :)
Sam Lantinga <slouken@lokigames.com>
parents:
91
diff
changeset
|
784 /* If not, try to put us there - if fail... oh well */ |
|
8a5aff5c1294
Fixed some problems with the fullscreen code. Wooo. :)
Sam Lantinga <slouken@lokigames.com>
parents:
91
diff
changeset
|
785 if ( windows[nwindows-1] != FSwindow ) { |
|
8a5aff5c1294
Fixed some problems with the fullscreen code. Wooo. :)
Sam Lantinga <slouken@lokigames.com>
parents:
91
diff
changeset
|
786 tmpwin = windows[nwindows-1]; |
|
8a5aff5c1294
Fixed some problems with the fullscreen code. Wooo. :)
Sam Lantinga <slouken@lokigames.com>
parents:
91
diff
changeset
|
787 for ( i=0; i<nwindows; ++i ) { |
|
8a5aff5c1294
Fixed some problems with the fullscreen code. Wooo. :)
Sam Lantinga <slouken@lokigames.com>
parents:
91
diff
changeset
|
788 if ( windows[i] == FSwindow ) { |
|
8a5aff5c1294
Fixed some problems with the fullscreen code. Wooo. :)
Sam Lantinga <slouken@lokigames.com>
parents:
91
diff
changeset
|
789 memcpy(&windows[i], &windows[i+1], |
|
8a5aff5c1294
Fixed some problems with the fullscreen code. Wooo. :)
Sam Lantinga <slouken@lokigames.com>
parents:
91
diff
changeset
|
790 (nwindows-i-1)*sizeof(windows[i])); |
|
8a5aff5c1294
Fixed some problems with the fullscreen code. Wooo. :)
Sam Lantinga <slouken@lokigames.com>
parents:
91
diff
changeset
|
791 break; |
| 0 | 792 } |
| 793 } | |
|
98
8a5aff5c1294
Fixed some problems with the fullscreen code. Wooo. :)
Sam Lantinga <slouken@lokigames.com>
parents:
91
diff
changeset
|
794 windows[nwindows-1] = FSwindow; |
|
8a5aff5c1294
Fixed some problems with the fullscreen code. Wooo. :)
Sam Lantinga <slouken@lokigames.com>
parents:
91
diff
changeset
|
795 XRestackWindows(SDL_Display, windows, nwindows); |
|
8a5aff5c1294
Fixed some problems with the fullscreen code. Wooo. :)
Sam Lantinga <slouken@lokigames.com>
parents:
91
diff
changeset
|
796 XSync(SDL_Display, False); |
| 0 | 797 } |
|
98
8a5aff5c1294
Fixed some problems with the fullscreen code. Wooo. :)
Sam Lantinga <slouken@lokigames.com>
parents:
91
diff
changeset
|
798 XFree(windows); |
|
8a5aff5c1294
Fixed some problems with the fullscreen code. Wooo. :)
Sam Lantinga <slouken@lokigames.com>
parents:
91
diff
changeset
|
799 } |
| 0 | 800 #else |
|
98
8a5aff5c1294
Fixed some problems with the fullscreen code. Wooo. :)
Sam Lantinga <slouken@lokigames.com>
parents:
91
diff
changeset
|
801 XRaiseWindow(SDL_Display, FSwindow); |
| 0 | 802 #endif |
| 803 | |
| 804 #ifdef XFREE86_VM | |
|
98
8a5aff5c1294
Fixed some problems with the fullscreen code. Wooo. :)
Sam Lantinga <slouken@lokigames.com>
parents:
91
diff
changeset
|
805 /* Save the current video mode */ |
|
8a5aff5c1294
Fixed some problems with the fullscreen code. Wooo. :)
Sam Lantinga <slouken@lokigames.com>
parents:
91
diff
changeset
|
806 if ( use_vidmode ) { |
|
292
eadc0746dfaf
Added SDL_LockRect() and SDL_UnlockRect()
Sam Lantinga <slouken@libsdl.org>
parents:
252
diff
changeset
|
807 SDL_NAME(XF86VidModeLockModeSwitch)(SDL_Display, SDL_Screen, True); |
|
98
8a5aff5c1294
Fixed some problems with the fullscreen code. Wooo. :)
Sam Lantinga <slouken@lokigames.com>
parents:
91
diff
changeset
|
808 } |
| 0 | 809 #endif |
|
98
8a5aff5c1294
Fixed some problems with the fullscreen code. Wooo. :)
Sam Lantinga <slouken@lokigames.com>
parents:
91
diff
changeset
|
810 currently_fullscreen = 1; |
| 0 | 811 |
|
98
8a5aff5c1294
Fixed some problems with the fullscreen code. Wooo. :)
Sam Lantinga <slouken@lokigames.com>
parents:
91
diff
changeset
|
812 /* Set the new resolution */ |
|
8a5aff5c1294
Fixed some problems with the fullscreen code. Wooo. :)
Sam Lantinga <slouken@lokigames.com>
parents:
91
diff
changeset
|
813 okay = X11_ResizeFullScreen(this); |
|
8a5aff5c1294
Fixed some problems with the fullscreen code. Wooo. :)
Sam Lantinga <slouken@lokigames.com>
parents:
91
diff
changeset
|
814 if ( ! okay ) { |
|
8a5aff5c1294
Fixed some problems with the fullscreen code. Wooo. :)
Sam Lantinga <slouken@lokigames.com>
parents:
91
diff
changeset
|
815 X11_LeaveFullScreen(this); |
|
8a5aff5c1294
Fixed some problems with the fullscreen code. Wooo. :)
Sam Lantinga <slouken@lokigames.com>
parents:
91
diff
changeset
|
816 } |
|
8a5aff5c1294
Fixed some problems with the fullscreen code. Wooo. :)
Sam Lantinga <slouken@lokigames.com>
parents:
91
diff
changeset
|
817 /* Set the colormap */ |
|
8a5aff5c1294
Fixed some problems with the fullscreen code. Wooo. :)
Sam Lantinga <slouken@lokigames.com>
parents:
91
diff
changeset
|
818 if ( SDL_XColorMap ) { |
|
8a5aff5c1294
Fixed some problems with the fullscreen code. Wooo. :)
Sam Lantinga <slouken@lokigames.com>
parents:
91
diff
changeset
|
819 XInstallColormap(SDL_Display, SDL_XColorMap); |
| 0 | 820 } |
|
88
71774090f286
Hopefully fixed the fullscreen mode code for KDE
Sam Lantinga <slouken@lokigames.com>
parents:
0
diff
changeset
|
821 if ( okay ) |
|
71774090f286
Hopefully fixed the fullscreen mode code for KDE
Sam Lantinga <slouken@lokigames.com>
parents:
0
diff
changeset
|
822 X11_GrabInputNoLock(this, this->input_grab | SDL_GRAB_FULLSCREEN); |
|
71774090f286
Hopefully fixed the fullscreen mode code for KDE
Sam Lantinga <slouken@lokigames.com>
parents:
0
diff
changeset
|
823 |
|
71774090f286
Hopefully fixed the fullscreen mode code for KDE
Sam Lantinga <slouken@lokigames.com>
parents:
0
diff
changeset
|
824 /* We may need to refresh the screen at this point (no backing store) |
|
71774090f286
Hopefully fixed the fullscreen mode code for KDE
Sam Lantinga <slouken@lokigames.com>
parents:
0
diff
changeset
|
825 We also don't get an event, which is why we explicitly refresh. */ |
|
71774090f286
Hopefully fixed the fullscreen mode code for KDE
Sam Lantinga <slouken@lokigames.com>
parents:
0
diff
changeset
|
826 if ( this->screen ) { |
|
71774090f286
Hopefully fixed the fullscreen mode code for KDE
Sam Lantinga <slouken@lokigames.com>
parents:
0
diff
changeset
|
827 if ( this->screen->flags & SDL_OPENGL ) { |
|
71774090f286
Hopefully fixed the fullscreen mode code for KDE
Sam Lantinga <slouken@lokigames.com>
parents:
0
diff
changeset
|
828 SDL_PrivateExpose(); |
|
71774090f286
Hopefully fixed the fullscreen mode code for KDE
Sam Lantinga <slouken@lokigames.com>
parents:
0
diff
changeset
|
829 } else { |
|
71774090f286
Hopefully fixed the fullscreen mode code for KDE
Sam Lantinga <slouken@lokigames.com>
parents:
0
diff
changeset
|
830 X11_RefreshDisplay(this); |
|
71774090f286
Hopefully fixed the fullscreen mode code for KDE
Sam Lantinga <slouken@lokigames.com>
parents:
0
diff
changeset
|
831 } |
|
71774090f286
Hopefully fixed the fullscreen mode code for KDE
Sam Lantinga <slouken@lokigames.com>
parents:
0
diff
changeset
|
832 } |
|
71774090f286
Hopefully fixed the fullscreen mode code for KDE
Sam Lantinga <slouken@lokigames.com>
parents:
0
diff
changeset
|
833 |
| 0 | 834 return(okay); |
| 835 } | |
| 836 | |
| 837 int X11_LeaveFullScreen(_THIS) | |
| 838 { | |
| 839 if ( currently_fullscreen ) { | |
| 840 XReparentWindow(SDL_Display, SDL_Window, WMwindow, 0, 0); | |
| 841 #ifdef XFREE86_VM | |
| 842 if ( use_vidmode ) { | |
| 843 restore_mode(this); | |
|
292
eadc0746dfaf
Added SDL_LockRect() and SDL_UnlockRect()
Sam Lantinga <slouken@libsdl.org>
parents:
252
diff
changeset
|
844 SDL_NAME(XF86VidModeLockModeSwitch)(SDL_Display, SDL_Screen, False); |
| 0 | 845 } |
| 846 #endif | |
|
242
4bcb29d3769c
Added support for Xi Graphics XME fullscreen extension
Sam Lantinga <slouken@libsdl.org>
parents:
230
diff
changeset
|
847 |
|
4bcb29d3769c
Added support for Xi Graphics XME fullscreen extension
Sam Lantinga <slouken@libsdl.org>
parents:
230
diff
changeset
|
848 #ifdef HAVE_XIGXME |
|
499
f480ecd70499
Added an aborted try at making fullscreen work on Xinerama screen != 0
Sam Lantinga <slouken@libsdl.org>
parents:
297
diff
changeset
|
849 if ( use_xme ) { |
|
f480ecd70499
Added an aborted try at making fullscreen work on Xinerama screen != 0
Sam Lantinga <slouken@libsdl.org>
parents:
297
diff
changeset
|
850 int rw, rh; |
|
f480ecd70499
Added an aborted try at making fullscreen work on Xinerama screen != 0
Sam Lantinga <slouken@libsdl.org>
parents:
297
diff
changeset
|
851 |
|
242
4bcb29d3769c
Added support for Xi Graphics XME fullscreen extension
Sam Lantinga <slouken@libsdl.org>
parents:
230
diff
changeset
|
852 /* check current mode so we can avoid uneccessary mode changes */ |
|
499
f480ecd70499
Added an aborted try at making fullscreen work on Xinerama screen != 0
Sam Lantinga <slouken@libsdl.org>
parents:
297
diff
changeset
|
853 get_real_resolution(this, &rw, &rh); |
|
242
4bcb29d3769c
Added support for Xi Graphics XME fullscreen extension
Sam Lantinga <slouken@libsdl.org>
parents:
230
diff
changeset
|
854 |
|
499
f480ecd70499
Added an aborted try at making fullscreen work on Xinerama screen != 0
Sam Lantinga <slouken@libsdl.org>
parents:
297
diff
changeset
|
855 if (rw != saved_res.width || rh != saved_res.height) { |
|
f480ecd70499
Added an aborted try at making fullscreen work on Xinerama screen != 0
Sam Lantinga <slouken@libsdl.org>
parents:
297
diff
changeset
|
856 XiGMiscChangeResolution(SDL_Display, |
|
f480ecd70499
Added an aborted try at making fullscreen work on Xinerama screen != 0
Sam Lantinga <slouken@libsdl.org>
parents:
297
diff
changeset
|
857 SDL_Screen, |
|
f480ecd70499
Added an aborted try at making fullscreen work on Xinerama screen != 0
Sam Lantinga <slouken@libsdl.org>
parents:
297
diff
changeset
|
858 0, /* view */ |
|
f480ecd70499
Added an aborted try at making fullscreen work on Xinerama screen != 0
Sam Lantinga <slouken@libsdl.org>
parents:
297
diff
changeset
|
859 saved_res.width, |
|
f480ecd70499
Added an aborted try at making fullscreen work on Xinerama screen != 0
Sam Lantinga <slouken@libsdl.org>
parents:
297
diff
changeset
|
860 saved_res.height, |
|
f480ecd70499
Added an aborted try at making fullscreen work on Xinerama screen != 0
Sam Lantinga <slouken@libsdl.org>
parents:
297
diff
changeset
|
861 0); |
|
f480ecd70499
Added an aborted try at making fullscreen work on Xinerama screen != 0
Sam Lantinga <slouken@libsdl.org>
parents:
297
diff
changeset
|
862 XSync(SDL_Display, False); |
|
f480ecd70499
Added an aborted try at making fullscreen work on Xinerama screen != 0
Sam Lantinga <slouken@libsdl.org>
parents:
297
diff
changeset
|
863 } |
|
f480ecd70499
Added an aborted try at making fullscreen work on Xinerama screen != 0
Sam Lantinga <slouken@libsdl.org>
parents:
297
diff
changeset
|
864 } |
|
242
4bcb29d3769c
Added support for Xi Graphics XME fullscreen extension
Sam Lantinga <slouken@libsdl.org>
parents:
230
diff
changeset
|
865 #endif |
|
4bcb29d3769c
Added support for Xi Graphics XME fullscreen extension
Sam Lantinga <slouken@libsdl.org>
parents:
230
diff
changeset
|
866 |
| 0 | 867 XUnmapWindow(SDL_Display, FSwindow); |
| 868 X11_WaitUnmapped(this, FSwindow); | |
| 869 XSync(SDL_Display, True); /* Flush spurious mode change events */ | |
| 870 currently_fullscreen = 0; | |
| 871 } | |
| 872 /* If we get popped out of fullscreen mode for some reason, input_grab | |
| 873 will still have the SDL_GRAB_FULLSCREEN flag set, since this is only | |
| 874 temporary. In this case, release the grab unless the input has been | |
| 875 explicitly grabbed. | |
| 876 */ | |
| 877 X11_GrabInputNoLock(this, this->input_grab & ~SDL_GRAB_FULLSCREEN); | |
|
88
71774090f286
Hopefully fixed the fullscreen mode code for KDE
Sam Lantinga <slouken@lokigames.com>
parents:
0
diff
changeset
|
878 |
|
71774090f286
Hopefully fixed the fullscreen mode code for KDE
Sam Lantinga <slouken@lokigames.com>
parents:
0
diff
changeset
|
879 /* We may need to refresh the screen at this point (no backing store) |
|
71774090f286
Hopefully fixed the fullscreen mode code for KDE
Sam Lantinga <slouken@lokigames.com>
parents:
0
diff
changeset
|
880 We also don't get an event, which is why we explicitly refresh. */ |
|
71774090f286
Hopefully fixed the fullscreen mode code for KDE
Sam Lantinga <slouken@lokigames.com>
parents:
0
diff
changeset
|
881 if ( this->screen ) { |
|
71774090f286
Hopefully fixed the fullscreen mode code for KDE
Sam Lantinga <slouken@lokigames.com>
parents:
0
diff
changeset
|
882 if ( this->screen->flags & SDL_OPENGL ) { |
|
71774090f286
Hopefully fixed the fullscreen mode code for KDE
Sam Lantinga <slouken@lokigames.com>
parents:
0
diff
changeset
|
883 SDL_PrivateExpose(); |
|
71774090f286
Hopefully fixed the fullscreen mode code for KDE
Sam Lantinga <slouken@lokigames.com>
parents:
0
diff
changeset
|
884 } else { |
|
71774090f286
Hopefully fixed the fullscreen mode code for KDE
Sam Lantinga <slouken@lokigames.com>
parents:
0
diff
changeset
|
885 X11_RefreshDisplay(this); |
|
71774090f286
Hopefully fixed the fullscreen mode code for KDE
Sam Lantinga <slouken@lokigames.com>
parents:
0
diff
changeset
|
886 } |
|
71774090f286
Hopefully fixed the fullscreen mode code for KDE
Sam Lantinga <slouken@lokigames.com>
parents:
0
diff
changeset
|
887 } |
|
71774090f286
Hopefully fixed the fullscreen mode code for KDE
Sam Lantinga <slouken@lokigames.com>
parents:
0
diff
changeset
|
888 |
| 0 | 889 return(0); |
| 890 } |