Mercurial > sdl-ios-xcode
annotate src/video/x11/SDL_x11modes.c @ 4278:010efca83dfc SDL-1.2
Fixed building without OpenGL support
| author | Sam Lantinga <slouken@libsdl.org> |
|---|---|
| date | Wed, 07 Oct 2009 06:10:40 +0000 |
| parents | 915406c331dc |
| children | 8ec3036098df |
| rev | line source |
|---|---|
| 0 | 1 /* |
| 2 SDL - Simple DirectMedia Layer | |
| 4159 | 3 Copyright (C) 1997-2009 Sam Lantinga |
| 0 | 4 |
| 5 This library is free software; you can redistribute it and/or | |
|
1312
c9b51268668f
Updated copyright information and removed rcs id lines (problematic in branch merges)
Sam Lantinga <slouken@libsdl.org>
parents:
1306
diff
changeset
|
6 modify it under the terms of the GNU Lesser General Public |
| 0 | 7 License as published by the Free Software Foundation; either |
|
1312
c9b51268668f
Updated copyright information and removed rcs id lines (problematic in branch merges)
Sam Lantinga <slouken@libsdl.org>
parents:
1306
diff
changeset
|
8 version 2.1 of the License, or (at your option) any later version. |
| 0 | 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 | |
|
1312
c9b51268668f
Updated copyright information and removed rcs id lines (problematic in branch merges)
Sam Lantinga <slouken@libsdl.org>
parents:
1306
diff
changeset
|
13 Lesser General Public License for more details. |
| 0 | 14 |
|
1312
c9b51268668f
Updated copyright information and removed rcs id lines (problematic in branch merges)
Sam Lantinga <slouken@libsdl.org>
parents:
1306
diff
changeset
|
15 You should have received a copy of the GNU Lesser General Public |
|
c9b51268668f
Updated copyright information and removed rcs id lines (problematic in branch merges)
Sam Lantinga <slouken@libsdl.org>
parents:
1306
diff
changeset
|
16 License along with this library; if not, write to the Free Software |
|
c9b51268668f
Updated copyright information and removed rcs id lines (problematic in branch merges)
Sam Lantinga <slouken@libsdl.org>
parents:
1306
diff
changeset
|
17 Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA |
| 0 | 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 */ |
|
1402
d910939febfa
Use consistent identifiers for the various platforms we support.
Sam Lantinga <slouken@libsdl.org>
parents:
1379
diff
changeset
|
22 #include "SDL_config.h" |
| 0 | 23 |
| 24 /* Utilities for getting and setting the X display mode */ | |
| 25 | |
|
1338
604d73db6802
Removed uses of stdlib.h and string.h
Sam Lantinga <slouken@libsdl.org>
parents:
1336
diff
changeset
|
26 #include <stdio.h> |
| 0 | 27 |
| 28 #include "SDL_timer.h" | |
| 29 #include "SDL_events.h" | |
|
1361
19418e4422cb
New configure-based build system. Still work in progress, but much improved
Sam Lantinga <slouken@libsdl.org>
parents:
1358
diff
changeset
|
30 #include "../../events/SDL_events_c.h" |
| 0 | 31 #include "SDL_x11video.h" |
| 32 #include "SDL_x11wm_c.h" | |
| 33 #include "SDL_x11modes_c.h" | |
|
88
71774090f286
Hopefully fixed the fullscreen mode code for KDE
Sam Lantinga <slouken@lokigames.com>
parents:
0
diff
changeset
|
34 #include "SDL_x11image_c.h" |
| 0 | 35 |
| 1768 | 36 /*#define X11MODES_DEBUG*/ |
| 37 | |
| 1765 | 38 #define MAX(a, b) (a > b ? a : b) |
| 0 | 39 |
| 1765 | 40 #if SDL_VIDEO_DRIVER_X11_XRANDR |
| 41 static int cmpmodelist(const void *va, const void *vb) | |
| 42 { | |
| 43 const SDL_Rect *a = *(const SDL_Rect **)va; | |
| 44 const SDL_Rect *b = *(const SDL_Rect **)vb; | |
| 45 if ( a->w == b->w ) | |
| 46 return b->h - a->h; | |
| 47 else | |
| 48 return b->w - a->w; | |
| 49 } | |
| 50 #endif | |
|
230
275a934573a7
Greatly improved Xinerama video mode support
Sam Lantinga <slouken@libsdl.org>
parents:
227
diff
changeset
|
51 |
|
1361
19418e4422cb
New configure-based build system. Still work in progress, but much improved
Sam Lantinga <slouken@libsdl.org>
parents:
1358
diff
changeset
|
52 #if SDL_VIDEO_DRIVER_X11_VIDMODE |
|
292
eadc0746dfaf
Added SDL_LockRect() and SDL_UnlockRect()
Sam Lantinga <slouken@libsdl.org>
parents:
252
diff
changeset
|
53 Bool SDL_NAME(XF86VidModeGetModeInfo)(Display *dpy, int scr, SDL_NAME(XF86VidModeModeInfo) *info) |
| 0 | 54 { |
|
4154
db4007f17bc8
Correct fix for Bugzilla #602.
Ryan C. Gordon <icculus@icculus.org>
parents:
1863
diff
changeset
|
55 Bool retval; |
|
db4007f17bc8
Correct fix for Bugzilla #602.
Ryan C. Gordon <icculus@icculus.org>
parents:
1863
diff
changeset
|
56 int dotclock; |
|
db4007f17bc8
Correct fix for Bugzilla #602.
Ryan C. Gordon <icculus@icculus.org>
parents:
1863
diff
changeset
|
57 SDL_NAME(XF86VidModeModeLine) l; |
|
db4007f17bc8
Correct fix for Bugzilla #602.
Ryan C. Gordon <icculus@icculus.org>
parents:
1863
diff
changeset
|
58 SDL_memset(&l, 0, sizeof(l)); |
|
db4007f17bc8
Correct fix for Bugzilla #602.
Ryan C. Gordon <icculus@icculus.org>
parents:
1863
diff
changeset
|
59 retval = SDL_NAME(XF86VidModeGetModeLine)(dpy, scr, &dotclock, &l); |
|
db4007f17bc8
Correct fix for Bugzilla #602.
Ryan C. Gordon <icculus@icculus.org>
parents:
1863
diff
changeset
|
60 info->dotclock = dotclock; |
|
db4007f17bc8
Correct fix for Bugzilla #602.
Ryan C. Gordon <icculus@icculus.org>
parents:
1863
diff
changeset
|
61 info->hdisplay = l.hdisplay; |
|
db4007f17bc8
Correct fix for Bugzilla #602.
Ryan C. Gordon <icculus@icculus.org>
parents:
1863
diff
changeset
|
62 info->hsyncstart = l.hsyncstart; |
|
db4007f17bc8
Correct fix for Bugzilla #602.
Ryan C. Gordon <icculus@icculus.org>
parents:
1863
diff
changeset
|
63 info->hsyncend = l.hsyncend; |
|
db4007f17bc8
Correct fix for Bugzilla #602.
Ryan C. Gordon <icculus@icculus.org>
parents:
1863
diff
changeset
|
64 info->htotal = l.htotal; |
|
db4007f17bc8
Correct fix for Bugzilla #602.
Ryan C. Gordon <icculus@icculus.org>
parents:
1863
diff
changeset
|
65 info->hskew = l.hskew; |
|
db4007f17bc8
Correct fix for Bugzilla #602.
Ryan C. Gordon <icculus@icculus.org>
parents:
1863
diff
changeset
|
66 info->vdisplay = l.vdisplay; |
|
db4007f17bc8
Correct fix for Bugzilla #602.
Ryan C. Gordon <icculus@icculus.org>
parents:
1863
diff
changeset
|
67 info->vsyncstart = l.vsyncstart; |
|
db4007f17bc8
Correct fix for Bugzilla #602.
Ryan C. Gordon <icculus@icculus.org>
parents:
1863
diff
changeset
|
68 info->vsyncend = l.vsyncend; |
|
db4007f17bc8
Correct fix for Bugzilla #602.
Ryan C. Gordon <icculus@icculus.org>
parents:
1863
diff
changeset
|
69 info->vtotal = l.vtotal; |
|
db4007f17bc8
Correct fix for Bugzilla #602.
Ryan C. Gordon <icculus@icculus.org>
parents:
1863
diff
changeset
|
70 info->flags = l.flags; |
|
db4007f17bc8
Correct fix for Bugzilla #602.
Ryan C. Gordon <icculus@icculus.org>
parents:
1863
diff
changeset
|
71 info->privsize = l.privsize; |
|
db4007f17bc8
Correct fix for Bugzilla #602.
Ryan C. Gordon <icculus@icculus.org>
parents:
1863
diff
changeset
|
72 info->private = l.private; |
|
db4007f17bc8
Correct fix for Bugzilla #602.
Ryan C. Gordon <icculus@icculus.org>
parents:
1863
diff
changeset
|
73 return retval; |
| 0 | 74 } |
|
1361
19418e4422cb
New configure-based build system. Still work in progress, but much improved
Sam Lantinga <slouken@libsdl.org>
parents:
1358
diff
changeset
|
75 #endif /* SDL_VIDEO_DRIVER_X11_VIDMODE */ |
| 0 | 76 |
|
1361
19418e4422cb
New configure-based build system. Still work in progress, but much improved
Sam Lantinga <slouken@libsdl.org>
parents:
1358
diff
changeset
|
77 #if SDL_VIDEO_DRIVER_X11_VIDMODE |
| 0 | 78 static void save_mode(_THIS) |
| 79 { | |
|
1336
3692456e7b0f
Use SDL_ prefixed versions of C library functions.
Sam Lantinga <slouken@libsdl.org>
parents:
1318
diff
changeset
|
80 SDL_memset(&saved_mode, 0, sizeof(saved_mode)); |
|
292
eadc0746dfaf
Added SDL_LockRect() and SDL_UnlockRect()
Sam Lantinga <slouken@libsdl.org>
parents:
252
diff
changeset
|
81 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
|
82 SDL_NAME(XF86VidModeGetViewPort)(SDL_Display,SDL_Screen,&saved_view.x,&saved_view.y); |
| 0 | 83 } |
| 84 #endif | |
| 85 | |
|
1361
19418e4422cb
New configure-based build system. Still work in progress, but much improved
Sam Lantinga <slouken@libsdl.org>
parents:
1358
diff
changeset
|
86 #if SDL_VIDEO_DRIVER_X11_VIDMODE |
| 0 | 87 static void restore_mode(_THIS) |
| 88 { | |
|
292
eadc0746dfaf
Added SDL_LockRect() and SDL_UnlockRect()
Sam Lantinga <slouken@libsdl.org>
parents:
252
diff
changeset
|
89 SDL_NAME(XF86VidModeModeLine) mode; |
| 0 | 90 int unused; |
| 91 | |
|
292
eadc0746dfaf
Added SDL_LockRect() and SDL_UnlockRect()
Sam Lantinga <slouken@libsdl.org>
parents:
252
diff
changeset
|
92 if ( SDL_NAME(XF86VidModeGetModeLine)(SDL_Display, SDL_Screen, &unused, &mode) ) { |
| 0 | 93 if ( (saved_mode.hdisplay != mode.hdisplay) || |
| 94 (saved_mode.vdisplay != mode.vdisplay) ) { | |
|
292
eadc0746dfaf
Added SDL_LockRect() and SDL_UnlockRect()
Sam Lantinga <slouken@libsdl.org>
parents:
252
diff
changeset
|
95 SDL_NAME(XF86VidModeSwitchToMode)(SDL_Display, SDL_Screen, &saved_mode); |
| 0 | 96 } |
| 97 } | |
| 98 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
|
99 SDL_NAME(XF86VidModeSetViewPort)(SDL_Display, SDL_Screen, saved_view.x, saved_view.y); |
| 0 | 100 } |
| 101 } | |
| 102 #endif | |
| 103 | |
|
1361
19418e4422cb
New configure-based build system. Still work in progress, but much improved
Sam Lantinga <slouken@libsdl.org>
parents:
1358
diff
changeset
|
104 #if SDL_VIDEO_DRIVER_X11_VIDMODE |
| 0 | 105 static int cmpmodes(const void *va, const void *vb) |
| 106 { | |
|
292
eadc0746dfaf
Added SDL_LockRect() and SDL_UnlockRect()
Sam Lantinga <slouken@libsdl.org>
parents:
252
diff
changeset
|
107 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
|
108 const SDL_NAME(XF86VidModeModeInfo) *b = *(const SDL_NAME(XF86VidModeModeInfo)**)vb; |
|
966
f72cc0c7305f
Video modes are sorted width first, then height
Sam Lantinga <slouken@libsdl.org>
parents:
769
diff
changeset
|
109 if ( a->hdisplay == b->hdisplay ) |
|
f72cc0c7305f
Video modes are sorted width first, then height
Sam Lantinga <slouken@libsdl.org>
parents:
769
diff
changeset
|
110 return b->vdisplay - a->vdisplay; |
|
f72cc0c7305f
Video modes are sorted width first, then height
Sam Lantinga <slouken@libsdl.org>
parents:
769
diff
changeset
|
111 else |
|
f72cc0c7305f
Video modes are sorted width first, then height
Sam Lantinga <slouken@libsdl.org>
parents:
769
diff
changeset
|
112 return b->hdisplay - a->hdisplay; |
| 0 | 113 } |
| 114 #endif | |
| 115 | |
|
242
4bcb29d3769c
Added support for Xi Graphics XME fullscreen extension
Sam Lantinga <slouken@libsdl.org>
parents:
230
diff
changeset
|
116 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
|
117 |
| 0 | 118 static void set_best_resolution(_THIS, int width, int height) |
| 119 { | |
|
1361
19418e4422cb
New configure-based build system. Still work in progress, but much improved
Sam Lantinga <slouken@libsdl.org>
parents:
1358
diff
changeset
|
120 #if SDL_VIDEO_DRIVER_X11_VIDMODE |
| 0 | 121 if ( use_vidmode ) { |
|
292
eadc0746dfaf
Added SDL_LockRect() and SDL_UnlockRect()
Sam Lantinga <slouken@libsdl.org>
parents:
252
diff
changeset
|
122 SDL_NAME(XF86VidModeModeLine) mode; |
|
eadc0746dfaf
Added SDL_LockRect() and SDL_UnlockRect()
Sam Lantinga <slouken@libsdl.org>
parents:
252
diff
changeset
|
123 SDL_NAME(XF86VidModeModeInfo) **modes; |
| 0 | 124 int i; |
| 125 int nmodes; | |
| 1768 | 126 int best = -1; |
| 0 | 127 |
|
292
eadc0746dfaf
Added SDL_LockRect() and SDL_UnlockRect()
Sam Lantinga <slouken@libsdl.org>
parents:
252
diff
changeset
|
128 if ( SDL_NAME(XF86VidModeGetModeLine)(SDL_Display, SDL_Screen, &i, &mode) && |
| 1768 | 129 SDL_NAME(XF86VidModeGetAllModeLines)(SDL_Display,SDL_Screen,&nmodes,&modes) ) { |
|
637
6862d4294870
te: 27 Jun 2003 21:16:01 +0100
Sam Lantinga <slouken@libsdl.org>
parents:
614
diff
changeset
|
130 for ( i = 0; i < nmodes ; i++ ) { |
|
604
31d3af76488b
Date: Mon, 24 Feb 2003 16:31:25 -0500
Sam Lantinga <slouken@libsdl.org>
parents:
499
diff
changeset
|
131 if ( (modes[i]->hdisplay == width) && |
| 1768 | 132 (modes[i]->vdisplay == height) ) { |
| 133 best = i; | |
| 134 break; | |
| 135 } | |
| 136 if ( modes[i]->hdisplay >= width && | |
| 137 modes[i]->vdisplay >= height ) { | |
| 138 if ( best < 0 || | |
| 139 (modes[i]->hdisplay < modes[best]->hdisplay && | |
| 140 modes[i]->vdisplay <= modes[best]->vdisplay) || | |
| 141 (modes[i]->vdisplay < modes[best]->vdisplay && | |
| 142 modes[i]->hdisplay <= modes[best]->hdisplay) ) { | |
| 143 best = i; | |
|
637
6862d4294870
te: 27 Jun 2003 21:16:01 +0100
Sam Lantinga <slouken@libsdl.org>
parents:
614
diff
changeset
|
144 } |
|
6862d4294870
te: 27 Jun 2003 21:16:01 +0100
Sam Lantinga <slouken@libsdl.org>
parents:
614
diff
changeset
|
145 } |
| 0 | 146 } |
| 1768 | 147 if ( best >= 0 && |
| 148 ((modes[best]->hdisplay != mode.hdisplay) || | |
| 149 (modes[best]->vdisplay != mode.vdisplay)) ) { | |
| 150 #ifdef X11MODES_DEBUG | |
| 151 printf("Best Mode %d: %d x %d @ %d\n", best, | |
| 152 modes[best]->hdisplay, modes[best]->vdisplay, | |
| 153 (modes[best]->htotal && modes[best]->vtotal) ? (1000 * modes[best]->dotclock / (modes[best]->htotal * modes[best]->vtotal)) : 0 ); | |
| 154 #endif | |
| 155 SDL_NAME(XF86VidModeSwitchToMode)(SDL_Display, SDL_Screen, modes[best]); | |
| 0 | 156 } |
|
1575
3ba88cb7eb1b
Updated dynamic X11 code. See details in Bugzilla #170.
Ryan C. Gordon <icculus@icculus.org>
parents:
1545
diff
changeset
|
157 XFree(modes); |
| 0 | 158 } |
| 159 } | |
|
1361
19418e4422cb
New configure-based build system. Still work in progress, but much improved
Sam Lantinga <slouken@libsdl.org>
parents:
1358
diff
changeset
|
160 #endif /* SDL_VIDEO_DRIVER_X11_VIDMODE */ |
|
242
4bcb29d3769c
Added support for Xi Graphics XME fullscreen extension
Sam Lantinga <slouken@libsdl.org>
parents:
230
diff
changeset
|
161 |
|
499
f480ecd70499
Added an aborted try at making fullscreen work on Xinerama screen != 0
Sam Lantinga <slouken@libsdl.org>
parents:
297
diff
changeset
|
162 /* XiG */ |
|
1361
19418e4422cb
New configure-based build system. Still work in progress, but much improved
Sam Lantinga <slouken@libsdl.org>
parents:
1358
diff
changeset
|
163 #if SDL_VIDEO_DRIVER_X11_XME |
| 1768 | 164 if ( use_xme && 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
|
165 int i; |
|
242
4bcb29d3769c
Added support for Xi Graphics XME fullscreen extension
Sam Lantinga <slouken@libsdl.org>
parents:
230
diff
changeset
|
166 |
| 1768 | 167 #ifdef X11MODES_DEBUG |
| 168 fprintf(stderr, "XME: set_best_resolution(): w = %d, h = %d\n", | |
| 169 width, height); | |
| 170 #endif | |
|
242
4bcb29d3769c
Added support for Xi Graphics XME fullscreen extension
Sam Lantinga <slouken@libsdl.org>
parents:
230
diff
changeset
|
171 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
|
172 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
|
173 (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
|
174 break; |
|
f480ecd70499
Added an aborted try at making fullscreen work on Xinerama screen != 0
Sam Lantinga <slouken@libsdl.org>
parents:
297
diff
changeset
|
175 } |
|
242
4bcb29d3769c
Added support for Xi Graphics XME fullscreen extension
Sam Lantinga <slouken@libsdl.org>
parents:
230
diff
changeset
|
176 } |
|
499
f480ecd70499
Added an aborted try at making fullscreen work on Xinerama screen != 0
Sam Lantinga <slouken@libsdl.org>
parents:
297
diff
changeset
|
177 |
|
f480ecd70499
Added an aborted try at making fullscreen work on Xinerama screen != 0
Sam Lantinga <slouken@libsdl.org>
parents:
297
diff
changeset
|
178 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
|
179 int w, h; |
|
242
4bcb29d3769c
Added support for Xi Graphics XME fullscreen extension
Sam Lantinga <slouken@libsdl.org>
parents:
230
diff
changeset
|
180 |
|
4bcb29d3769c
Added support for Xi Graphics XME fullscreen extension
Sam Lantinga <slouken@libsdl.org>
parents:
230
diff
changeset
|
181 /* 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
|
182 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
|
183 |
|
499
f480ecd70499
Added an aborted try at making fullscreen work on Xinerama screen != 0
Sam Lantinga <slouken@libsdl.org>
parents:
297
diff
changeset
|
184 if ( (SDL_modelist[i]->w != w) || (SDL_modelist[i]->h != h) ) { |
| 1765 | 185 #ifdef X11MODES_DEBUG |
|
499
f480ecd70499
Added an aborted try at making fullscreen work on Xinerama screen != 0
Sam Lantinga <slouken@libsdl.org>
parents:
297
diff
changeset
|
186 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
|
187 "XiGMiscChangeResolution: %d %d\n", |
| 1768 | 188 SDL_modelist[i]->w, SDL_modelist[i]->h); |
| 189 #endif | |
|
499
f480ecd70499
Added an aborted try at making fullscreen work on Xinerama screen != 0
Sam Lantinga <slouken@libsdl.org>
parents:
297
diff
changeset
|
190 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
|
191 SDL_Screen, |
|
f480ecd70499
Added an aborted try at making fullscreen work on Xinerama screen != 0
Sam Lantinga <slouken@libsdl.org>
parents:
297
diff
changeset
|
192 0, /* view */ |
|
f480ecd70499
Added an aborted try at making fullscreen work on Xinerama screen != 0
Sam Lantinga <slouken@libsdl.org>
parents:
297
diff
changeset
|
193 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
|
194 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
|
195 0); |
|
1575
3ba88cb7eb1b
Updated dynamic X11 code. See details in Bugzilla #170.
Ryan C. Gordon <icculus@icculus.org>
parents:
1545
diff
changeset
|
196 XSync(SDL_Display, False); |
|
242
4bcb29d3769c
Added support for Xi Graphics XME fullscreen extension
Sam Lantinga <slouken@libsdl.org>
parents:
230
diff
changeset
|
197 } |
|
4bcb29d3769c
Added support for Xi Graphics XME fullscreen extension
Sam Lantinga <slouken@libsdl.org>
parents:
230
diff
changeset
|
198 } |
|
4bcb29d3769c
Added support for Xi Graphics XME fullscreen extension
Sam Lantinga <slouken@libsdl.org>
parents:
230
diff
changeset
|
199 } |
|
1361
19418e4422cb
New configure-based build system. Still work in progress, but much improved
Sam Lantinga <slouken@libsdl.org>
parents:
1358
diff
changeset
|
200 #endif /* SDL_VIDEO_DRIVER_X11_XME */ |
|
242
4bcb29d3769c
Added support for Xi Graphics XME fullscreen extension
Sam Lantinga <slouken@libsdl.org>
parents:
230
diff
changeset
|
201 |
|
1589
34cca785be57
Xrandr support in the X11 target.
Ryan C. Gordon <icculus@icculus.org>
parents:
1575
diff
changeset
|
202 #if SDL_VIDEO_DRIVER_X11_XRANDR |
| 1768 | 203 if ( use_xrandr && SDL_modelist ) { |
| 1765 | 204 #ifdef X11MODES_DEBUG |
|
1589
34cca785be57
Xrandr support in the X11 target.
Ryan C. Gordon <icculus@icculus.org>
parents:
1575
diff
changeset
|
205 fprintf(stderr, "XRANDR: set_best_resolution(): w = %d, h = %d\n", |
|
34cca785be57
Xrandr support in the X11 target.
Ryan C. Gordon <icculus@icculus.org>
parents:
1575
diff
changeset
|
206 width, height); |
|
34cca785be57
Xrandr support in the X11 target.
Ryan C. Gordon <icculus@icculus.org>
parents:
1575
diff
changeset
|
207 #endif |
| 1768 | 208 int i, nsizes; |
| 209 XRRScreenSize *sizes; | |
|
1589
34cca785be57
Xrandr support in the X11 target.
Ryan C. Gordon <icculus@icculus.org>
parents:
1575
diff
changeset
|
210 |
| 1768 | 211 /* find the smallest resolution that is at least as big as the user requested */ |
| 212 sizes = XRRConfigSizes(screen_config, &nsizes); | |
| 213 for ( i = (nsizes-1); i >= 0; i-- ) { | |
| 214 if ( (SDL_modelist[i]->w >= width) && | |
| 215 (SDL_modelist[i]->h >= height) ) { | |
| 216 break; | |
|
1589
34cca785be57
Xrandr support in the X11 target.
Ryan C. Gordon <icculus@icculus.org>
parents:
1575
diff
changeset
|
217 } |
| 1768 | 218 } |
|
1589
34cca785be57
Xrandr support in the X11 target.
Ryan C. Gordon <icculus@icculus.org>
parents:
1575
diff
changeset
|
219 |
| 1768 | 220 if ( i >= 0 && SDL_modelist[i] ) { /* found one, lets try it */ |
| 221 int w, h; | |
|
1589
34cca785be57
Xrandr support in the X11 target.
Ryan C. Gordon <icculus@icculus.org>
parents:
1575
diff
changeset
|
222 |
| 1768 | 223 /* check current mode so we can avoid uneccessary mode changes */ |
| 224 get_real_resolution(this, &w, &h); | |
|
1589
34cca785be57
Xrandr support in the X11 target.
Ryan C. Gordon <icculus@icculus.org>
parents:
1575
diff
changeset
|
225 |
| 1768 | 226 if ( (SDL_modelist[i]->w != w) || (SDL_modelist[i]->h != h) ) { |
| 227 int size_id; | |
|
1589
34cca785be57
Xrandr support in the X11 target.
Ryan C. Gordon <icculus@icculus.org>
parents:
1575
diff
changeset
|
228 |
| 1765 | 229 #ifdef X11MODES_DEBUG |
| 1768 | 230 fprintf(stderr, "XRANDR: set_best_resolution: " |
| 231 "XXRSetScreenConfig: %d %d\n", | |
| 232 SDL_modelist[i]->w, SDL_modelist[i]->h); | |
|
1589
34cca785be57
Xrandr support in the X11 target.
Ryan C. Gordon <icculus@icculus.org>
parents:
1575
diff
changeset
|
233 #endif |
|
34cca785be57
Xrandr support in the X11 target.
Ryan C. Gordon <icculus@icculus.org>
parents:
1575
diff
changeset
|
234 |
| 1768 | 235 /* find the matching size entry index */ |
| 236 for ( size_id = 0; size_id < nsizes; ++size_id ) { | |
| 237 if ( (sizes[size_id].width == SDL_modelist[i]->w) && | |
| 238 (sizes[size_id].height == SDL_modelist[i]->h) ) | |
| 239 break; | |
| 240 } | |
|
1589
34cca785be57
Xrandr support in the X11 target.
Ryan C. Gordon <icculus@icculus.org>
parents:
1575
diff
changeset
|
241 |
| 1768 | 242 XRRSetScreenConfig(SDL_Display, screen_config, SDL_Root, |
| 243 size_id, saved_rotation, CurrentTime); | |
|
1589
34cca785be57
Xrandr support in the X11 target.
Ryan C. Gordon <icculus@icculus.org>
parents:
1575
diff
changeset
|
244 } |
|
34cca785be57
Xrandr support in the X11 target.
Ryan C. Gordon <icculus@icculus.org>
parents:
1575
diff
changeset
|
245 } |
|
34cca785be57
Xrandr support in the X11 target.
Ryan C. Gordon <icculus@icculus.org>
parents:
1575
diff
changeset
|
246 } |
|
34cca785be57
Xrandr support in the X11 target.
Ryan C. Gordon <icculus@icculus.org>
parents:
1575
diff
changeset
|
247 #endif /* SDL_VIDEO_DRIVER_X11_XRANDR */ |
| 0 | 248 } |
| 249 | |
| 250 static void get_real_resolution(_THIS, int* w, int* h) | |
| 251 { | |
| 1765 | 252 #if SDL_VIDEO_DRIVER_X11_XME |
| 253 if ( use_xme ) { | |
| 254 int ractive; | |
| 255 XiGMiscResolutionInfo *modelist; | |
| 256 | |
| 257 XiGMiscQueryResolutions(SDL_Display, SDL_Screen, | |
| 258 0, /* view */ | |
| 259 &ractive, &modelist); | |
| 260 *w = modelist[ractive].width; | |
| 261 *h = modelist[ractive].height; | |
| 262 #ifdef X11MODES_DEBUG | |
| 263 fprintf(stderr, "XME: get_real_resolution: w = %d h = %d\n", *w, *h); | |
| 264 #endif | |
| 265 XFree(modelist); | |
| 266 return; | |
| 267 } | |
| 268 #endif /* SDL_VIDEO_DRIVER_X11_XME */ | |
| 269 | |
|
1361
19418e4422cb
New configure-based build system. Still work in progress, but much improved
Sam Lantinga <slouken@libsdl.org>
parents:
1358
diff
changeset
|
270 #if SDL_VIDEO_DRIVER_X11_VIDMODE |
| 0 | 271 if ( use_vidmode ) { |
|
292
eadc0746dfaf
Added SDL_LockRect() and SDL_UnlockRect()
Sam Lantinga <slouken@libsdl.org>
parents:
252
diff
changeset
|
272 SDL_NAME(XF86VidModeModeLine) mode; |
| 0 | 273 int unused; |
| 274 | |
|
292
eadc0746dfaf
Added SDL_LockRect() and SDL_UnlockRect()
Sam Lantinga <slouken@libsdl.org>
parents:
252
diff
changeset
|
275 if ( SDL_NAME(XF86VidModeGetModeLine)(SDL_Display, SDL_Screen, &unused, &mode) ) { |
| 0 | 276 *w = mode.hdisplay; |
| 277 *h = mode.vdisplay; | |
| 278 return; | |
| 279 } | |
| 280 } | |
|
1589
34cca785be57
Xrandr support in the X11 target.
Ryan C. Gordon <icculus@icculus.org>
parents:
1575
diff
changeset
|
281 #endif /* SDL_VIDEO_DRIVER_X11_VIDMODE */ |
|
242
4bcb29d3769c
Added support for Xi Graphics XME fullscreen extension
Sam Lantinga <slouken@libsdl.org>
parents:
230
diff
changeset
|
282 |
|
1589
34cca785be57
Xrandr support in the X11 target.
Ryan C. Gordon <icculus@icculus.org>
parents:
1575
diff
changeset
|
283 #if SDL_VIDEO_DRIVER_X11_XRANDR |
|
34cca785be57
Xrandr support in the X11 target.
Ryan C. Gordon <icculus@icculus.org>
parents:
1575
diff
changeset
|
284 if ( use_xrandr ) { |
|
34cca785be57
Xrandr support in the X11 target.
Ryan C. Gordon <icculus@icculus.org>
parents:
1575
diff
changeset
|
285 int nsizes; |
|
34cca785be57
Xrandr support in the X11 target.
Ryan C. Gordon <icculus@icculus.org>
parents:
1575
diff
changeset
|
286 XRRScreenSize* sizes; |
|
34cca785be57
Xrandr support in the X11 target.
Ryan C. Gordon <icculus@icculus.org>
parents:
1575
diff
changeset
|
287 |
|
34cca785be57
Xrandr support in the X11 target.
Ryan C. Gordon <icculus@icculus.org>
parents:
1575
diff
changeset
|
288 sizes = XRRConfigSizes(screen_config, &nsizes); |
|
34cca785be57
Xrandr support in the X11 target.
Ryan C. Gordon <icculus@icculus.org>
parents:
1575
diff
changeset
|
289 if ( nsizes > 0 ) { |
|
34cca785be57
Xrandr support in the X11 target.
Ryan C. Gordon <icculus@icculus.org>
parents:
1575
diff
changeset
|
290 int cur_size; |
|
34cca785be57
Xrandr support in the X11 target.
Ryan C. Gordon <icculus@icculus.org>
parents:
1575
diff
changeset
|
291 Rotation cur_rotation; |
|
34cca785be57
Xrandr support in the X11 target.
Ryan C. Gordon <icculus@icculus.org>
parents:
1575
diff
changeset
|
292 |
|
34cca785be57
Xrandr support in the X11 target.
Ryan C. Gordon <icculus@icculus.org>
parents:
1575
diff
changeset
|
293 cur_size = XRRConfigCurrentConfiguration(screen_config, &cur_rotation); |
|
34cca785be57
Xrandr support in the X11 target.
Ryan C. Gordon <icculus@icculus.org>
parents:
1575
diff
changeset
|
294 if ( cur_size >= 0 && cur_size < nsizes ) { |
|
34cca785be57
Xrandr support in the X11 target.
Ryan C. Gordon <icculus@icculus.org>
parents:
1575
diff
changeset
|
295 *w = sizes[cur_size].width; |
|
34cca785be57
Xrandr support in the X11 target.
Ryan C. Gordon <icculus@icculus.org>
parents:
1575
diff
changeset
|
296 *h = sizes[cur_size].height; |
|
34cca785be57
Xrandr support in the X11 target.
Ryan C. Gordon <icculus@icculus.org>
parents:
1575
diff
changeset
|
297 } |
| 1765 | 298 #ifdef X11MODES_DEBUG |
|
1589
34cca785be57
Xrandr support in the X11 target.
Ryan C. Gordon <icculus@icculus.org>
parents:
1575
diff
changeset
|
299 fprintf(stderr, "XRANDR: get_real_resolution: w = %d h = %d\n", *w, *h); |
|
34cca785be57
Xrandr support in the X11 target.
Ryan C. Gordon <icculus@icculus.org>
parents:
1575
diff
changeset
|
300 #endif |
|
34cca785be57
Xrandr support in the X11 target.
Ryan C. Gordon <icculus@icculus.org>
parents:
1575
diff
changeset
|
301 return; |
|
34cca785be57
Xrandr support in the X11 target.
Ryan C. Gordon <icculus@icculus.org>
parents:
1575
diff
changeset
|
302 } |
|
34cca785be57
Xrandr support in the X11 target.
Ryan C. Gordon <icculus@icculus.org>
parents:
1575
diff
changeset
|
303 } |
|
34cca785be57
Xrandr support in the X11 target.
Ryan C. Gordon <icculus@icculus.org>
parents:
1575
diff
changeset
|
304 #endif /* SDL_VIDEO_DRIVER_X11_XRANDR */ |
|
242
4bcb29d3769c
Added support for Xi Graphics XME fullscreen extension
Sam Lantinga <slouken@libsdl.org>
parents:
230
diff
changeset
|
305 |
| 1765 | 306 #if SDL_VIDEO_DRIVER_X11_XINERAMA |
| 307 if ( use_xinerama ) { | |
| 308 *w = xinerama_info.width; | |
| 309 *h = xinerama_info.height; | |
| 310 return; | |
| 311 } | |
| 312 #endif /* SDL_VIDEO_DRIVER_X11_XINERAMA */ | |
| 313 | |
| 0 | 314 *w = DisplayWidth(SDL_Display, SDL_Screen); |
| 315 *h = DisplayHeight(SDL_Display, SDL_Screen); | |
| 316 } | |
| 317 | |
| 318 /* Called after mapping a window - waits until the window is mapped */ | |
| 319 void X11_WaitMapped(_THIS, Window win) | |
| 320 { | |
| 321 XEvent event; | |
| 322 do { | |
|
1575
3ba88cb7eb1b
Updated dynamic X11 code. See details in Bugzilla #170.
Ryan C. Gordon <icculus@icculus.org>
parents:
1545
diff
changeset
|
323 XMaskEvent(SDL_Display, StructureNotifyMask, &event); |
| 0 | 324 } while ( (event.type != MapNotify) || (event.xmap.event != win) ); |
| 325 } | |
| 326 | |
| 327 /* Called after unmapping a window - waits until the window is unmapped */ | |
| 328 void X11_WaitUnmapped(_THIS, Window win) | |
| 329 { | |
| 330 XEvent event; | |
| 331 do { | |
|
1575
3ba88cb7eb1b
Updated dynamic X11 code. See details in Bugzilla #170.
Ryan C. Gordon <icculus@icculus.org>
parents:
1545
diff
changeset
|
332 XMaskEvent(SDL_Display, StructureNotifyMask, &event); |
| 0 | 333 } while ( (event.type != UnmapNotify) || (event.xunmap.event != win) ); |
| 334 } | |
| 335 | |
| 336 static void move_cursor_to(_THIS, int x, int y) | |
| 337 { | |
|
1575
3ba88cb7eb1b
Updated dynamic X11 code. See details in Bugzilla #170.
Ryan C. Gordon <icculus@icculus.org>
parents:
1545
diff
changeset
|
338 XWarpPointer(SDL_Display, None, SDL_Root, 0, 0, 0, 0, x, y); |
| 0 | 339 } |
| 340 | |
| 4254 | 341 static int add_default_visual(_THIS) |
| 342 { | |
| 343 int i; | |
| 344 int n = this->hidden->nvisuals; | |
| 345 for (i=0; i<n; i++) { | |
| 346 if (this->hidden->visuals[i].visual == DefaultVisual(SDL_Display, SDL_Screen)) return n; | |
| 347 } | |
| 348 this->hidden->visuals[n].depth = DefaultDepth(SDL_Display, SDL_Screen);; | |
| 349 this->hidden->visuals[n].visual = DefaultVisual(SDL_Display, SDL_Screen);; | |
| 350 this->hidden->nvisuals++; | |
| 351 return(this->hidden->nvisuals); | |
| 352 } | |
| 0 | 353 static int add_visual(_THIS, int depth, int class) |
| 354 { | |
| 355 XVisualInfo vi; | |
|
1575
3ba88cb7eb1b
Updated dynamic X11 code. See details in Bugzilla #170.
Ryan C. Gordon <icculus@icculus.org>
parents:
1545
diff
changeset
|
356 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
|
357 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
|
358 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
|
359 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
|
360 this->hidden->nvisuals++; |
| 0 | 361 } |
| 362 return(this->hidden->nvisuals); | |
| 363 } | |
| 364 static int add_visual_byid(_THIS, const char *visual_id) | |
| 365 { | |
| 366 XVisualInfo *vi, template; | |
| 367 int nvis; | |
| 368 | |
| 369 if ( visual_id ) { | |
|
1336
3692456e7b0f
Use SDL_ prefixed versions of C library functions.
Sam Lantinga <slouken@libsdl.org>
parents:
1318
diff
changeset
|
370 SDL_memset(&template, 0, (sizeof template)); |
|
3692456e7b0f
Use SDL_ prefixed versions of C library functions.
Sam Lantinga <slouken@libsdl.org>
parents:
1318
diff
changeset
|
371 template.visualid = SDL_strtol(visual_id, NULL, 0); |
|
1575
3ba88cb7eb1b
Updated dynamic X11 code. See details in Bugzilla #170.
Ryan C. Gordon <icculus@icculus.org>
parents:
1545
diff
changeset
|
372 vi = XGetVisualInfo(SDL_Display, VisualIDMask, &template, &nvis); |
| 0 | 373 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
|
374 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
|
375 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
|
376 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
|
377 this->hidden->nvisuals++; |
|
1575
3ba88cb7eb1b
Updated dynamic X11 code. See details in Bugzilla #170.
Ryan C. Gordon <icculus@icculus.org>
parents:
1545
diff
changeset
|
378 XFree(vi); |
| 0 | 379 } |
| 380 } | |
| 381 return(this->hidden->nvisuals); | |
| 382 } | |
| 383 | |
| 384 /* Global for the error handler */ | |
| 385 int vm_event, vm_error = -1; | |
| 386 | |
| 1765 | 387 #if SDL_VIDEO_DRIVER_X11_XINERAMA |
| 388 static int CheckXinerama(_THIS, int *major, int *minor) | |
| 389 { | |
| 390 const char *env; | |
| 391 | |
| 392 /* Default the extension not available */ | |
| 393 *major = *minor = 0; | |
| 394 | |
| 395 /* Allow environment override */ | |
| 396 env = getenv("SDL_VIDEO_X11_XINERAMA"); | |
| 397 if ( env && !SDL_atoi(env) ) { | |
| 398 return 0; | |
| 399 } | |
| 400 | |
| 401 /* Query the extension version */ | |
| 402 if ( !SDL_NAME(XineramaQueryExtension)(SDL_Display, major, minor) || | |
| 403 !SDL_NAME(XineramaIsActive)(SDL_Display) ) { | |
| 404 return 0; | |
| 405 } | |
| 406 return 1; | |
| 407 } | |
| 408 #endif /* SDL_VIDEO_DRIVER_X11_XINERAMA */ | |
| 409 | |
|
1746
a0ddae8b43cf
Disable the XRandR extension by default, since KDE maximizes windows which are larger than the new resolution, and then doesn't restore their size and positition when the old resolution is restored.
Sam Lantinga <slouken@libsdl.org>
parents:
1641
diff
changeset
|
410 #if SDL_VIDEO_DRIVER_X11_XRANDR |
|
a0ddae8b43cf
Disable the XRandR extension by default, since KDE maximizes windows which are larger than the new resolution, and then doesn't restore their size and positition when the old resolution is restored.
Sam Lantinga <slouken@libsdl.org>
parents:
1641
diff
changeset
|
411 static int CheckXRandR(_THIS, int *major, int *minor) |
|
a0ddae8b43cf
Disable the XRandR extension by default, since KDE maximizes windows which are larger than the new resolution, and then doesn't restore their size and positition when the old resolution is restored.
Sam Lantinga <slouken@libsdl.org>
parents:
1641
diff
changeset
|
412 { |
| 1765 | 413 const char *env; |
|
1746
a0ddae8b43cf
Disable the XRandR extension by default, since KDE maximizes windows which are larger than the new resolution, and then doesn't restore their size and positition when the old resolution is restored.
Sam Lantinga <slouken@libsdl.org>
parents:
1641
diff
changeset
|
414 |
|
a0ddae8b43cf
Disable the XRandR extension by default, since KDE maximizes windows which are larger than the new resolution, and then doesn't restore their size and positition when the old resolution is restored.
Sam Lantinga <slouken@libsdl.org>
parents:
1641
diff
changeset
|
415 /* Default the extension not available */ |
|
a0ddae8b43cf
Disable the XRandR extension by default, since KDE maximizes windows which are larger than the new resolution, and then doesn't restore their size and positition when the old resolution is restored.
Sam Lantinga <slouken@libsdl.org>
parents:
1641
diff
changeset
|
416 *major = *minor = 0; |
|
a0ddae8b43cf
Disable the XRandR extension by default, since KDE maximizes windows which are larger than the new resolution, and then doesn't restore their size and positition when the old resolution is restored.
Sam Lantinga <slouken@libsdl.org>
parents:
1641
diff
changeset
|
417 |
|
a0ddae8b43cf
Disable the XRandR extension by default, since KDE maximizes windows which are larger than the new resolution, and then doesn't restore their size and positition when the old resolution is restored.
Sam Lantinga <slouken@libsdl.org>
parents:
1641
diff
changeset
|
418 /* Allow environment override */ |
|
a0ddae8b43cf
Disable the XRandR extension by default, since KDE maximizes windows which are larger than the new resolution, and then doesn't restore their size and positition when the old resolution is restored.
Sam Lantinga <slouken@libsdl.org>
parents:
1641
diff
changeset
|
419 env = getenv("SDL_VIDEO_X11_XRANDR"); |
|
a0ddae8b43cf
Disable the XRandR extension by default, since KDE maximizes windows which are larger than the new resolution, and then doesn't restore their size and positition when the old resolution is restored.
Sam Lantinga <slouken@libsdl.org>
parents:
1641
diff
changeset
|
420 if ( env && !SDL_atoi(env) ) { |
|
a0ddae8b43cf
Disable the XRandR extension by default, since KDE maximizes windows which are larger than the new resolution, and then doesn't restore their size and positition when the old resolution is restored.
Sam Lantinga <slouken@libsdl.org>
parents:
1641
diff
changeset
|
421 return 0; |
|
a0ddae8b43cf
Disable the XRandR extension by default, since KDE maximizes windows which are larger than the new resolution, and then doesn't restore their size and positition when the old resolution is restored.
Sam Lantinga <slouken@libsdl.org>
parents:
1641
diff
changeset
|
422 } |
|
a0ddae8b43cf
Disable the XRandR extension by default, since KDE maximizes windows which are larger than the new resolution, and then doesn't restore their size and positition when the old resolution is restored.
Sam Lantinga <slouken@libsdl.org>
parents:
1641
diff
changeset
|
423 |
|
a0ddae8b43cf
Disable the XRandR extension by default, since KDE maximizes windows which are larger than the new resolution, and then doesn't restore their size and positition when the old resolution is restored.
Sam Lantinga <slouken@libsdl.org>
parents:
1641
diff
changeset
|
424 /* This defaults off now, due to KDE window maximize problems */ |
|
a0ddae8b43cf
Disable the XRandR extension by default, since KDE maximizes windows which are larger than the new resolution, and then doesn't restore their size and positition when the old resolution is restored.
Sam Lantinga <slouken@libsdl.org>
parents:
1641
diff
changeset
|
425 if ( !env ) { |
|
a0ddae8b43cf
Disable the XRandR extension by default, since KDE maximizes windows which are larger than the new resolution, and then doesn't restore their size and positition when the old resolution is restored.
Sam Lantinga <slouken@libsdl.org>
parents:
1641
diff
changeset
|
426 return 0; |
|
a0ddae8b43cf
Disable the XRandR extension by default, since KDE maximizes windows which are larger than the new resolution, and then doesn't restore their size and positition when the old resolution is restored.
Sam Lantinga <slouken@libsdl.org>
parents:
1641
diff
changeset
|
427 } |
|
a0ddae8b43cf
Disable the XRandR extension by default, since KDE maximizes windows which are larger than the new resolution, and then doesn't restore their size and positition when the old resolution is restored.
Sam Lantinga <slouken@libsdl.org>
parents:
1641
diff
changeset
|
428 |
|
a0ddae8b43cf
Disable the XRandR extension by default, since KDE maximizes windows which are larger than the new resolution, and then doesn't restore their size and positition when the old resolution is restored.
Sam Lantinga <slouken@libsdl.org>
parents:
1641
diff
changeset
|
429 if ( !SDL_X11_HAVE_XRANDR ) { |
|
a0ddae8b43cf
Disable the XRandR extension by default, since KDE maximizes windows which are larger than the new resolution, and then doesn't restore their size and positition when the old resolution is restored.
Sam Lantinga <slouken@libsdl.org>
parents:
1641
diff
changeset
|
430 return 0; |
|
a0ddae8b43cf
Disable the XRandR extension by default, since KDE maximizes windows which are larger than the new resolution, and then doesn't restore their size and positition when the old resolution is restored.
Sam Lantinga <slouken@libsdl.org>
parents:
1641
diff
changeset
|
431 } |
|
a0ddae8b43cf
Disable the XRandR extension by default, since KDE maximizes windows which are larger than the new resolution, and then doesn't restore their size and positition when the old resolution is restored.
Sam Lantinga <slouken@libsdl.org>
parents:
1641
diff
changeset
|
432 |
|
a0ddae8b43cf
Disable the XRandR extension by default, since KDE maximizes windows which are larger than the new resolution, and then doesn't restore their size and positition when the old resolution is restored.
Sam Lantinga <slouken@libsdl.org>
parents:
1641
diff
changeset
|
433 /* Query the extension version */ |
|
a0ddae8b43cf
Disable the XRandR extension by default, since KDE maximizes windows which are larger than the new resolution, and then doesn't restore their size and positition when the old resolution is restored.
Sam Lantinga <slouken@libsdl.org>
parents:
1641
diff
changeset
|
434 if ( !XRRQueryVersion(SDL_Display, major, minor) ) { |
|
a0ddae8b43cf
Disable the XRandR extension by default, since KDE maximizes windows which are larger than the new resolution, and then doesn't restore their size and positition when the old resolution is restored.
Sam Lantinga <slouken@libsdl.org>
parents:
1641
diff
changeset
|
435 return 0; |
|
a0ddae8b43cf
Disable the XRandR extension by default, since KDE maximizes windows which are larger than the new resolution, and then doesn't restore their size and positition when the old resolution is restored.
Sam Lantinga <slouken@libsdl.org>
parents:
1641
diff
changeset
|
436 } |
|
a0ddae8b43cf
Disable the XRandR extension by default, since KDE maximizes windows which are larger than the new resolution, and then doesn't restore their size and positition when the old resolution is restored.
Sam Lantinga <slouken@libsdl.org>
parents:
1641
diff
changeset
|
437 return 1; |
|
a0ddae8b43cf
Disable the XRandR extension by default, since KDE maximizes windows which are larger than the new resolution, and then doesn't restore their size and positition when the old resolution is restored.
Sam Lantinga <slouken@libsdl.org>
parents:
1641
diff
changeset
|
438 } |
|
a0ddae8b43cf
Disable the XRandR extension by default, since KDE maximizes windows which are larger than the new resolution, and then doesn't restore their size and positition when the old resolution is restored.
Sam Lantinga <slouken@libsdl.org>
parents:
1641
diff
changeset
|
439 #endif /* SDL_VIDEO_DRIVER_X11_XRANDR */ |
|
a0ddae8b43cf
Disable the XRandR extension by default, since KDE maximizes windows which are larger than the new resolution, and then doesn't restore their size and positition when the old resolution is restored.
Sam Lantinga <slouken@libsdl.org>
parents:
1641
diff
changeset
|
440 |
|
a0ddae8b43cf
Disable the XRandR extension by default, since KDE maximizes windows which are larger than the new resolution, and then doesn't restore their size and positition when the old resolution is restored.
Sam Lantinga <slouken@libsdl.org>
parents:
1641
diff
changeset
|
441 #if SDL_VIDEO_DRIVER_X11_VIDMODE |
|
a0ddae8b43cf
Disable the XRandR extension by default, since KDE maximizes windows which are larger than the new resolution, and then doesn't restore their size and positition when the old resolution is restored.
Sam Lantinga <slouken@libsdl.org>
parents:
1641
diff
changeset
|
442 static int CheckVidMode(_THIS, int *major, int *minor) |
|
a0ddae8b43cf
Disable the XRandR extension by default, since KDE maximizes windows which are larger than the new resolution, and then doesn't restore their size and positition when the old resolution is restored.
Sam Lantinga <slouken@libsdl.org>
parents:
1641
diff
changeset
|
443 { |
| 1765 | 444 const char *env; |
|
1746
a0ddae8b43cf
Disable the XRandR extension by default, since KDE maximizes windows which are larger than the new resolution, and then doesn't restore their size and positition when the old resolution is restored.
Sam Lantinga <slouken@libsdl.org>
parents:
1641
diff
changeset
|
445 |
|
a0ddae8b43cf
Disable the XRandR extension by default, since KDE maximizes windows which are larger than the new resolution, and then doesn't restore their size and positition when the old resolution is restored.
Sam Lantinga <slouken@libsdl.org>
parents:
1641
diff
changeset
|
446 /* Default the extension not available */ |
|
a0ddae8b43cf
Disable the XRandR extension by default, since KDE maximizes windows which are larger than the new resolution, and then doesn't restore their size and positition when the old resolution is restored.
Sam Lantinga <slouken@libsdl.org>
parents:
1641
diff
changeset
|
447 *major = *minor = 0; |
|
a0ddae8b43cf
Disable the XRandR extension by default, since KDE maximizes windows which are larger than the new resolution, and then doesn't restore their size and positition when the old resolution is restored.
Sam Lantinga <slouken@libsdl.org>
parents:
1641
diff
changeset
|
448 |
|
a0ddae8b43cf
Disable the XRandR extension by default, since KDE maximizes windows which are larger than the new resolution, and then doesn't restore their size and positition when the old resolution is restored.
Sam Lantinga <slouken@libsdl.org>
parents:
1641
diff
changeset
|
449 /* Allow environment override */ |
|
a0ddae8b43cf
Disable the XRandR extension by default, since KDE maximizes windows which are larger than the new resolution, and then doesn't restore their size and positition when the old resolution is restored.
Sam Lantinga <slouken@libsdl.org>
parents:
1641
diff
changeset
|
450 env = getenv("SDL_VIDEO_X11_VIDMODE"); |
|
a0ddae8b43cf
Disable the XRandR extension by default, since KDE maximizes windows which are larger than the new resolution, and then doesn't restore their size and positition when the old resolution is restored.
Sam Lantinga <slouken@libsdl.org>
parents:
1641
diff
changeset
|
451 if ( env && !SDL_atoi(env) ) { |
|
a0ddae8b43cf
Disable the XRandR extension by default, since KDE maximizes windows which are larger than the new resolution, and then doesn't restore their size and positition when the old resolution is restored.
Sam Lantinga <slouken@libsdl.org>
parents:
1641
diff
changeset
|
452 return 0; |
|
a0ddae8b43cf
Disable the XRandR extension by default, since KDE maximizes windows which are larger than the new resolution, and then doesn't restore their size and positition when the old resolution is restored.
Sam Lantinga <slouken@libsdl.org>
parents:
1641
diff
changeset
|
453 } |
|
a0ddae8b43cf
Disable the XRandR extension by default, since KDE maximizes windows which are larger than the new resolution, and then doesn't restore their size and positition when the old resolution is restored.
Sam Lantinga <slouken@libsdl.org>
parents:
1641
diff
changeset
|
454 |
|
a0ddae8b43cf
Disable the XRandR extension by default, since KDE maximizes windows which are larger than the new resolution, and then doesn't restore their size and positition when the old resolution is restored.
Sam Lantinga <slouken@libsdl.org>
parents:
1641
diff
changeset
|
455 /* Metro-X 4.3.0 and earlier has a broken implementation of |
|
a0ddae8b43cf
Disable the XRandR extension by default, since KDE maximizes windows which are larger than the new resolution, and then doesn't restore their size and positition when the old resolution is restored.
Sam Lantinga <slouken@libsdl.org>
parents:
1641
diff
changeset
|
456 XF86VidModeGetAllModeLines() - it hangs the client. |
|
a0ddae8b43cf
Disable the XRandR extension by default, since KDE maximizes windows which are larger than the new resolution, and then doesn't restore their size and positition when the old resolution is restored.
Sam Lantinga <slouken@libsdl.org>
parents:
1641
diff
changeset
|
457 */ |
|
a0ddae8b43cf
Disable the XRandR extension by default, since KDE maximizes windows which are larger than the new resolution, and then doesn't restore their size and positition when the old resolution is restored.
Sam Lantinga <slouken@libsdl.org>
parents:
1641
diff
changeset
|
458 if ( SDL_strcmp(ServerVendor(SDL_Display), "Metro Link Incorporated") == 0 ) { |
|
a0ddae8b43cf
Disable the XRandR extension by default, since KDE maximizes windows which are larger than the new resolution, and then doesn't restore their size and positition when the old resolution is restored.
Sam Lantinga <slouken@libsdl.org>
parents:
1641
diff
changeset
|
459 FILE *metro_fp; |
|
a0ddae8b43cf
Disable the XRandR extension by default, since KDE maximizes windows which are larger than the new resolution, and then doesn't restore their size and positition when the old resolution is restored.
Sam Lantinga <slouken@libsdl.org>
parents:
1641
diff
changeset
|
460 |
|
a0ddae8b43cf
Disable the XRandR extension by default, since KDE maximizes windows which are larger than the new resolution, and then doesn't restore their size and positition when the old resolution is restored.
Sam Lantinga <slouken@libsdl.org>
parents:
1641
diff
changeset
|
461 metro_fp = fopen("/usr/X11R6/lib/X11/Metro/.version", "r"); |
|
a0ddae8b43cf
Disable the XRandR extension by default, since KDE maximizes windows which are larger than the new resolution, and then doesn't restore their size and positition when the old resolution is restored.
Sam Lantinga <slouken@libsdl.org>
parents:
1641
diff
changeset
|
462 if ( metro_fp != NULL ) { |
|
a0ddae8b43cf
Disable the XRandR extension by default, since KDE maximizes windows which are larger than the new resolution, and then doesn't restore their size and positition when the old resolution is restored.
Sam Lantinga <slouken@libsdl.org>
parents:
1641
diff
changeset
|
463 int major, minor, patch, version; |
|
a0ddae8b43cf
Disable the XRandR extension by default, since KDE maximizes windows which are larger than the new resolution, and then doesn't restore their size and positition when the old resolution is restored.
Sam Lantinga <slouken@libsdl.org>
parents:
1641
diff
changeset
|
464 major = 0; minor = 0; patch = 0; |
|
a0ddae8b43cf
Disable the XRandR extension by default, since KDE maximizes windows which are larger than the new resolution, and then doesn't restore their size and positition when the old resolution is restored.
Sam Lantinga <slouken@libsdl.org>
parents:
1641
diff
changeset
|
465 fscanf(metro_fp, "%d.%d.%d", &major, &minor, &patch); |
|
a0ddae8b43cf
Disable the XRandR extension by default, since KDE maximizes windows which are larger than the new resolution, and then doesn't restore their size and positition when the old resolution is restored.
Sam Lantinga <slouken@libsdl.org>
parents:
1641
diff
changeset
|
466 fclose(metro_fp); |
|
a0ddae8b43cf
Disable the XRandR extension by default, since KDE maximizes windows which are larger than the new resolution, and then doesn't restore their size and positition when the old resolution is restored.
Sam Lantinga <slouken@libsdl.org>
parents:
1641
diff
changeset
|
467 version = major*100+minor*10+patch; |
|
a0ddae8b43cf
Disable the XRandR extension by default, since KDE maximizes windows which are larger than the new resolution, and then doesn't restore their size and positition when the old resolution is restored.
Sam Lantinga <slouken@libsdl.org>
parents:
1641
diff
changeset
|
468 if ( version < 431 ) { |
|
a0ddae8b43cf
Disable the XRandR extension by default, since KDE maximizes windows which are larger than the new resolution, and then doesn't restore their size and positition when the old resolution is restored.
Sam Lantinga <slouken@libsdl.org>
parents:
1641
diff
changeset
|
469 return 0; |
|
a0ddae8b43cf
Disable the XRandR extension by default, since KDE maximizes windows which are larger than the new resolution, and then doesn't restore their size and positition when the old resolution is restored.
Sam Lantinga <slouken@libsdl.org>
parents:
1641
diff
changeset
|
470 } |
|
a0ddae8b43cf
Disable the XRandR extension by default, since KDE maximizes windows which are larger than the new resolution, and then doesn't restore their size and positition when the old resolution is restored.
Sam Lantinga <slouken@libsdl.org>
parents:
1641
diff
changeset
|
471 } |
|
a0ddae8b43cf
Disable the XRandR extension by default, since KDE maximizes windows which are larger than the new resolution, and then doesn't restore their size and positition when the old resolution is restored.
Sam Lantinga <slouken@libsdl.org>
parents:
1641
diff
changeset
|
472 } |
|
a0ddae8b43cf
Disable the XRandR extension by default, since KDE maximizes windows which are larger than the new resolution, and then doesn't restore their size and positition when the old resolution is restored.
Sam Lantinga <slouken@libsdl.org>
parents:
1641
diff
changeset
|
473 |
|
a0ddae8b43cf
Disable the XRandR extension by default, since KDE maximizes windows which are larger than the new resolution, and then doesn't restore their size and positition when the old resolution is restored.
Sam Lantinga <slouken@libsdl.org>
parents:
1641
diff
changeset
|
474 /* Query the extension version */ |
| 1747 | 475 vm_error = -1; |
|
1746
a0ddae8b43cf
Disable the XRandR extension by default, since KDE maximizes windows which are larger than the new resolution, and then doesn't restore their size and positition when the old resolution is restored.
Sam Lantinga <slouken@libsdl.org>
parents:
1641
diff
changeset
|
476 if ( !SDL_NAME(XF86VidModeQueryExtension)(SDL_Display, &vm_event, &vm_error) || |
|
a0ddae8b43cf
Disable the XRandR extension by default, since KDE maximizes windows which are larger than the new resolution, and then doesn't restore their size and positition when the old resolution is restored.
Sam Lantinga <slouken@libsdl.org>
parents:
1641
diff
changeset
|
477 !SDL_NAME(XF86VidModeQueryVersion)(SDL_Display, major, minor) ) { |
|
a0ddae8b43cf
Disable the XRandR extension by default, since KDE maximizes windows which are larger than the new resolution, and then doesn't restore their size and positition when the old resolution is restored.
Sam Lantinga <slouken@libsdl.org>
parents:
1641
diff
changeset
|
478 return 0; |
|
a0ddae8b43cf
Disable the XRandR extension by default, since KDE maximizes windows which are larger than the new resolution, and then doesn't restore their size and positition when the old resolution is restored.
Sam Lantinga <slouken@libsdl.org>
parents:
1641
diff
changeset
|
479 } |
|
a0ddae8b43cf
Disable the XRandR extension by default, since KDE maximizes windows which are larger than the new resolution, and then doesn't restore their size and positition when the old resolution is restored.
Sam Lantinga <slouken@libsdl.org>
parents:
1641
diff
changeset
|
480 return 1; |
|
a0ddae8b43cf
Disable the XRandR extension by default, since KDE maximizes windows which are larger than the new resolution, and then doesn't restore their size and positition when the old resolution is restored.
Sam Lantinga <slouken@libsdl.org>
parents:
1641
diff
changeset
|
481 } |
|
a0ddae8b43cf
Disable the XRandR extension by default, since KDE maximizes windows which are larger than the new resolution, and then doesn't restore their size and positition when the old resolution is restored.
Sam Lantinga <slouken@libsdl.org>
parents:
1641
diff
changeset
|
482 #endif /* SDL_VIDEO_DRIVER_X11_VIDMODE */ |
|
a0ddae8b43cf
Disable the XRandR extension by default, since KDE maximizes windows which are larger than the new resolution, and then doesn't restore their size and positition when the old resolution is restored.
Sam Lantinga <slouken@libsdl.org>
parents:
1641
diff
changeset
|
483 |
|
a0ddae8b43cf
Disable the XRandR extension by default, since KDE maximizes windows which are larger than the new resolution, and then doesn't restore their size and positition when the old resolution is restored.
Sam Lantinga <slouken@libsdl.org>
parents:
1641
diff
changeset
|
484 #if SDL_VIDEO_DRIVER_X11_XME |
|
a0ddae8b43cf
Disable the XRandR extension by default, since KDE maximizes windows which are larger than the new resolution, and then doesn't restore their size and positition when the old resolution is restored.
Sam Lantinga <slouken@libsdl.org>
parents:
1641
diff
changeset
|
485 static int CheckXME(_THIS, int *major, int *minor) |
|
a0ddae8b43cf
Disable the XRandR extension by default, since KDE maximizes windows which are larger than the new resolution, and then doesn't restore their size and positition when the old resolution is restored.
Sam Lantinga <slouken@libsdl.org>
parents:
1641
diff
changeset
|
486 { |
| 1765 | 487 const char *env; |
|
1746
a0ddae8b43cf
Disable the XRandR extension by default, since KDE maximizes windows which are larger than the new resolution, and then doesn't restore their size and positition when the old resolution is restored.
Sam Lantinga <slouken@libsdl.org>
parents:
1641
diff
changeset
|
488 |
|
a0ddae8b43cf
Disable the XRandR extension by default, since KDE maximizes windows which are larger than the new resolution, and then doesn't restore their size and positition when the old resolution is restored.
Sam Lantinga <slouken@libsdl.org>
parents:
1641
diff
changeset
|
489 /* Default the extension not available */ |
|
a0ddae8b43cf
Disable the XRandR extension by default, since KDE maximizes windows which are larger than the new resolution, and then doesn't restore their size and positition when the old resolution is restored.
Sam Lantinga <slouken@libsdl.org>
parents:
1641
diff
changeset
|
490 *major = *minor = 0; |
|
a0ddae8b43cf
Disable the XRandR extension by default, since KDE maximizes windows which are larger than the new resolution, and then doesn't restore their size and positition when the old resolution is restored.
Sam Lantinga <slouken@libsdl.org>
parents:
1641
diff
changeset
|
491 |
|
a0ddae8b43cf
Disable the XRandR extension by default, since KDE maximizes windows which are larger than the new resolution, and then doesn't restore their size and positition when the old resolution is restored.
Sam Lantinga <slouken@libsdl.org>
parents:
1641
diff
changeset
|
492 /* Allow environment override */ |
|
a0ddae8b43cf
Disable the XRandR extension by default, since KDE maximizes windows which are larger than the new resolution, and then doesn't restore their size and positition when the old resolution is restored.
Sam Lantinga <slouken@libsdl.org>
parents:
1641
diff
changeset
|
493 env = getenv("SDL_VIDEO_X11_VIDMODE"); |
|
a0ddae8b43cf
Disable the XRandR extension by default, since KDE maximizes windows which are larger than the new resolution, and then doesn't restore their size and positition when the old resolution is restored.
Sam Lantinga <slouken@libsdl.org>
parents:
1641
diff
changeset
|
494 if ( env && !SDL_atoi(env) ) { |
|
a0ddae8b43cf
Disable the XRandR extension by default, since KDE maximizes windows which are larger than the new resolution, and then doesn't restore their size and positition when the old resolution is restored.
Sam Lantinga <slouken@libsdl.org>
parents:
1641
diff
changeset
|
495 return 0; |
|
a0ddae8b43cf
Disable the XRandR extension by default, since KDE maximizes windows which are larger than the new resolution, and then doesn't restore their size and positition when the old resolution is restored.
Sam Lantinga <slouken@libsdl.org>
parents:
1641
diff
changeset
|
496 } |
|
a0ddae8b43cf
Disable the XRandR extension by default, since KDE maximizes windows which are larger than the new resolution, and then doesn't restore their size and positition when the old resolution is restored.
Sam Lantinga <slouken@libsdl.org>
parents:
1641
diff
changeset
|
497 |
|
a0ddae8b43cf
Disable the XRandR extension by default, since KDE maximizes windows which are larger than the new resolution, and then doesn't restore their size and positition when the old resolution is restored.
Sam Lantinga <slouken@libsdl.org>
parents:
1641
diff
changeset
|
498 /* Query the extension version */ |
|
a0ddae8b43cf
Disable the XRandR extension by default, since KDE maximizes windows which are larger than the new resolution, and then doesn't restore their size and positition when the old resolution is restored.
Sam Lantinga <slouken@libsdl.org>
parents:
1641
diff
changeset
|
499 if ( !XiGMiscQueryVersion(SDL_Display, major, minor) ) { |
|
a0ddae8b43cf
Disable the XRandR extension by default, since KDE maximizes windows which are larger than the new resolution, and then doesn't restore their size and positition when the old resolution is restored.
Sam Lantinga <slouken@libsdl.org>
parents:
1641
diff
changeset
|
500 return 0; |
|
a0ddae8b43cf
Disable the XRandR extension by default, since KDE maximizes windows which are larger than the new resolution, and then doesn't restore their size and positition when the old resolution is restored.
Sam Lantinga <slouken@libsdl.org>
parents:
1641
diff
changeset
|
501 } |
|
a0ddae8b43cf
Disable the XRandR extension by default, since KDE maximizes windows which are larger than the new resolution, and then doesn't restore their size and positition when the old resolution is restored.
Sam Lantinga <slouken@libsdl.org>
parents:
1641
diff
changeset
|
502 return 1; |
|
a0ddae8b43cf
Disable the XRandR extension by default, since KDE maximizes windows which are larger than the new resolution, and then doesn't restore their size and positition when the old resolution is restored.
Sam Lantinga <slouken@libsdl.org>
parents:
1641
diff
changeset
|
503 } |
|
a0ddae8b43cf
Disable the XRandR extension by default, since KDE maximizes windows which are larger than the new resolution, and then doesn't restore their size and positition when the old resolution is restored.
Sam Lantinga <slouken@libsdl.org>
parents:
1641
diff
changeset
|
504 #endif /* SDL_VIDEO_DRIVER_X11_XME */ |
|
a0ddae8b43cf
Disable the XRandR extension by default, since KDE maximizes windows which are larger than the new resolution, and then doesn't restore their size and positition when the old resolution is restored.
Sam Lantinga <slouken@libsdl.org>
parents:
1641
diff
changeset
|
505 |
| 0 | 506 int X11_GetVideoModes(_THIS) |
| 507 { | |
| 1765 | 508 #if SDL_VIDEO_DRIVER_X11_XINERAMA |
| 509 int xinerama_major, xinerama_minor; | |
| 510 #endif | |
|
1746
a0ddae8b43cf
Disable the XRandR extension by default, since KDE maximizes windows which are larger than the new resolution, and then doesn't restore their size and positition when the old resolution is restored.
Sam Lantinga <slouken@libsdl.org>
parents:
1641
diff
changeset
|
511 #if SDL_VIDEO_DRIVER_X11_XRANDR |
|
a0ddae8b43cf
Disable the XRandR extension by default, since KDE maximizes windows which are larger than the new resolution, and then doesn't restore their size and positition when the old resolution is restored.
Sam Lantinga <slouken@libsdl.org>
parents:
1641
diff
changeset
|
512 int xrandr_major, xrandr_minor; |
|
a0ddae8b43cf
Disable the XRandR extension by default, since KDE maximizes windows which are larger than the new resolution, and then doesn't restore their size and positition when the old resolution is restored.
Sam Lantinga <slouken@libsdl.org>
parents:
1641
diff
changeset
|
513 int nsizes; |
|
a0ddae8b43cf
Disable the XRandR extension by default, since KDE maximizes windows which are larger than the new resolution, and then doesn't restore their size and positition when the old resolution is restored.
Sam Lantinga <slouken@libsdl.org>
parents:
1641
diff
changeset
|
514 XRRScreenSize *sizes; |
|
a0ddae8b43cf
Disable the XRandR extension by default, since KDE maximizes windows which are larger than the new resolution, and then doesn't restore their size and positition when the old resolution is restored.
Sam Lantinga <slouken@libsdl.org>
parents:
1641
diff
changeset
|
515 #endif |
|
1361
19418e4422cb
New configure-based build system. Still work in progress, but much improved
Sam Lantinga <slouken@libsdl.org>
parents:
1358
diff
changeset
|
516 #if SDL_VIDEO_DRIVER_X11_VIDMODE |
| 0 | 517 int vm_major, vm_minor; |
| 518 int nmodes; | |
|
292
eadc0746dfaf
Added SDL_LockRect() and SDL_UnlockRect()
Sam Lantinga <slouken@libsdl.org>
parents:
252
diff
changeset
|
519 SDL_NAME(XF86VidModeModeInfo) **modes; |
| 0 | 520 #endif |
|
1361
19418e4422cb
New configure-based build system. Still work in progress, but much improved
Sam Lantinga <slouken@libsdl.org>
parents:
1358
diff
changeset
|
521 #if SDL_VIDEO_DRIVER_X11_XME |
|
242
4bcb29d3769c
Added support for Xi Graphics XME fullscreen extension
Sam Lantinga <slouken@libsdl.org>
parents:
230
diff
changeset
|
522 int xme_major, xme_minor; |
|
4bcb29d3769c
Added support for Xi Graphics XME fullscreen extension
Sam Lantinga <slouken@libsdl.org>
parents:
230
diff
changeset
|
523 int ractive, nummodes; |
|
4bcb29d3769c
Added support for Xi Graphics XME fullscreen extension
Sam Lantinga <slouken@libsdl.org>
parents:
230
diff
changeset
|
524 XiGMiscResolutionInfo *modelist; |
|
4bcb29d3769c
Added support for Xi Graphics XME fullscreen extension
Sam Lantinga <slouken@libsdl.org>
parents:
230
diff
changeset
|
525 #endif |
|
230
275a934573a7
Greatly improved Xinerama video mode support
Sam Lantinga <slouken@libsdl.org>
parents:
227
diff
changeset
|
526 int i, n; |
|
275a934573a7
Greatly improved Xinerama video mode support
Sam Lantinga <slouken@libsdl.org>
parents:
227
diff
changeset
|
527 int screen_w; |
|
275a934573a7
Greatly improved Xinerama video mode support
Sam Lantinga <slouken@libsdl.org>
parents:
227
diff
changeset
|
528 int screen_h; |
| 0 | 529 |
| 1765 | 530 use_xinerama = 0; |
| 531 use_xrandr = 0; | |
| 0 | 532 use_vidmode = 0; |
| 1765 | 533 use_xme = 0; |
|
230
275a934573a7
Greatly improved Xinerama video mode support
Sam Lantinga <slouken@libsdl.org>
parents:
227
diff
changeset
|
534 screen_w = DisplayWidth(SDL_Display, SDL_Screen); |
|
275a934573a7
Greatly improved Xinerama video mode support
Sam Lantinga <slouken@libsdl.org>
parents:
227
diff
changeset
|
535 screen_h = DisplayHeight(SDL_Display, SDL_Screen); |
|
275a934573a7
Greatly improved Xinerama video mode support
Sam Lantinga <slouken@libsdl.org>
parents:
227
diff
changeset
|
536 |
| 1765 | 537 #if SDL_VIDEO_DRIVER_X11_XINERAMA |
| 538 /* Query Xinerama extention */ | |
| 539 if ( CheckXinerama(this, &xinerama_major, &xinerama_minor) ) { | |
| 540 /* Find out which screen is the desired one */ | |
| 4207 | 541 int desired = -1; |
| 1765 | 542 int screens; |
| 543 int w, h; | |
| 544 SDL_NAME(XineramaScreenInfo) *xinerama; | |
| 545 | |
| 546 const char *variable = SDL_getenv("SDL_VIDEO_FULLSCREEN_HEAD"); | |
| 547 if ( variable ) { | |
| 548 desired = SDL_atoi(variable); | |
| 549 } | |
| 550 #ifdef X11MODES_DEBUG | |
| 551 printf("X11 detected Xinerama:\n"); | |
| 552 #endif | |
| 553 xinerama = SDL_NAME(XineramaQueryScreens)(SDL_Display, &screens); | |
| 554 for ( i = 0; i < screens; i++ ) { | |
| 555 #ifdef X11MODES_DEBUG | |
| 556 printf("xinerama %d: %dx%d+%d+%d\n", | |
| 557 xinerama[i].screen_number, | |
| 558 xinerama[i].width, xinerama[i].height, | |
| 559 xinerama[i].x_org, xinerama[i].y_org); | |
| 560 #endif | |
| 561 if ( xinerama[i].screen_number == desired ) { | |
| 562 use_xinerama = 1; | |
| 563 xinerama_info = xinerama[i]; | |
| 564 } | |
| 565 } | |
| 566 XFree(xinerama); | |
| 567 | |
| 568 if ( use_xinerama ) { | |
| 569 SDL_modelist = (SDL_Rect **)SDL_malloc(3*sizeof(SDL_Rect *)); | |
| 570 if ( !SDL_modelist ) { | |
| 571 SDL_OutOfMemory(); | |
| 572 return -1; | |
| 573 } | |
| 574 | |
| 575 /* Add the full xinerama mode */ | |
| 576 n = 0; | |
| 577 w = xinerama_info.width; | |
| 578 h = xinerama_info.height; | |
| 579 if ( screen_w > w || screen_h > h) { | |
| 580 SDL_modelist[n] = (SDL_Rect *)SDL_malloc(sizeof(SDL_Rect)); | |
| 581 if ( SDL_modelist[n] ) { | |
| 582 SDL_modelist[n]->x = 0; | |
| 583 SDL_modelist[n]->y = 0; | |
| 584 SDL_modelist[n]->w = screen_w; | |
| 585 SDL_modelist[n]->h = screen_h; | |
| 586 ++n; | |
| 587 } | |
| 588 } | |
| 589 | |
| 590 /* Add the head xinerama mode */ | |
| 591 SDL_modelist[n] = (SDL_Rect *)SDL_malloc(sizeof(SDL_Rect)); | |
| 592 if ( SDL_modelist[n] ) { | |
| 593 SDL_modelist[n]->x = 0; | |
| 594 SDL_modelist[n]->y = 0; | |
| 595 SDL_modelist[n]->w = w; | |
| 596 SDL_modelist[n]->h = h; | |
| 597 ++n; | |
| 598 } | |
| 599 SDL_modelist[n] = NULL; | |
| 600 } | |
| 601 } | |
| 602 #endif /* SDL_VIDEO_DRIVER_X11_XINERAMA */ | |
| 603 | |
|
1746
a0ddae8b43cf
Disable the XRandR extension by default, since KDE maximizes windows which are larger than the new resolution, and then doesn't restore their size and positition when the old resolution is restored.
Sam Lantinga <slouken@libsdl.org>
parents:
1641
diff
changeset
|
604 #if SDL_VIDEO_DRIVER_X11_XRANDR |
|
1589
34cca785be57
Xrandr support in the X11 target.
Ryan C. Gordon <icculus@icculus.org>
parents:
1575
diff
changeset
|
605 /* XRandR */ |
|
34cca785be57
Xrandr support in the X11 target.
Ryan C. Gordon <icculus@icculus.org>
parents:
1575
diff
changeset
|
606 /* require at least XRandR v1.0 (arbitrary) */ |
|
1746
a0ddae8b43cf
Disable the XRandR extension by default, since KDE maximizes windows which are larger than the new resolution, and then doesn't restore their size and positition when the old resolution is restored.
Sam Lantinga <slouken@libsdl.org>
parents:
1641
diff
changeset
|
607 if ( CheckXRandR(this, &xrandr_major, &xrandr_minor) && (xrandr_major >= 1) ) |
|
a0ddae8b43cf
Disable the XRandR extension by default, since KDE maximizes windows which are larger than the new resolution, and then doesn't restore their size and positition when the old resolution is restored.
Sam Lantinga <slouken@libsdl.org>
parents:
1641
diff
changeset
|
608 { |
| 1765 | 609 #ifdef X11MODES_DEBUG |
|
1589
34cca785be57
Xrandr support in the X11 target.
Ryan C. Gordon <icculus@icculus.org>
parents:
1575
diff
changeset
|
610 fprintf(stderr, "XRANDR: XRRQueryVersion: V%d.%d\n", |
|
34cca785be57
Xrandr support in the X11 target.
Ryan C. Gordon <icculus@icculus.org>
parents:
1575
diff
changeset
|
611 xrandr_major, xrandr_minor); |
|
34cca785be57
Xrandr support in the X11 target.
Ryan C. Gordon <icculus@icculus.org>
parents:
1575
diff
changeset
|
612 #endif |
|
34cca785be57
Xrandr support in the X11 target.
Ryan C. Gordon <icculus@icculus.org>
parents:
1575
diff
changeset
|
613 |
|
34cca785be57
Xrandr support in the X11 target.
Ryan C. Gordon <icculus@icculus.org>
parents:
1575
diff
changeset
|
614 /* save the screen configuration since we must reference it |
|
34cca785be57
Xrandr support in the X11 target.
Ryan C. Gordon <icculus@icculus.org>
parents:
1575
diff
changeset
|
615 each time we toggle modes. |
|
34cca785be57
Xrandr support in the X11 target.
Ryan C. Gordon <icculus@icculus.org>
parents:
1575
diff
changeset
|
616 */ |
|
34cca785be57
Xrandr support in the X11 target.
Ryan C. Gordon <icculus@icculus.org>
parents:
1575
diff
changeset
|
617 screen_config = XRRGetScreenInfo(SDL_Display, SDL_Root); |
|
34cca785be57
Xrandr support in the X11 target.
Ryan C. Gordon <icculus@icculus.org>
parents:
1575
diff
changeset
|
618 |
|
34cca785be57
Xrandr support in the X11 target.
Ryan C. Gordon <icculus@icculus.org>
parents:
1575
diff
changeset
|
619 /* retrieve the list of resolution */ |
|
34cca785be57
Xrandr support in the X11 target.
Ryan C. Gordon <icculus@icculus.org>
parents:
1575
diff
changeset
|
620 sizes = XRRConfigSizes(screen_config, &nsizes); |
|
34cca785be57
Xrandr support in the X11 target.
Ryan C. Gordon <icculus@icculus.org>
parents:
1575
diff
changeset
|
621 if (nsizes > 0) { |
| 1765 | 622 if ( SDL_modelist ) { |
| 623 for ( i = 0; SDL_modelist[i]; ++i ) { | |
| 624 SDL_free(SDL_modelist[i]); | |
| 625 } | |
| 626 SDL_free(SDL_modelist); | |
| 627 } | |
|
1589
34cca785be57
Xrandr support in the X11 target.
Ryan C. Gordon <icculus@icculus.org>
parents:
1575
diff
changeset
|
628 SDL_modelist = (SDL_Rect **)malloc((nsizes+1)*sizeof(SDL_Rect *)); |
| 1765 | 629 if ( !SDL_modelist ) { |
| 630 SDL_OutOfMemory(); | |
| 631 return -1; | |
| 632 } | |
| 633 for ( i=0; i < nsizes; i++ ) { | |
| 634 if ((SDL_modelist[i] = | |
| 635 (SDL_Rect *)malloc(sizeof(SDL_Rect))) == NULL) | |
| 636 break; | |
| 637 #ifdef X11MODES_DEBUG | |
| 638 fprintf(stderr, "XRANDR: mode = %4d, w = %4d, h = %4d\n", | |
| 639 i, sizes[i].width, sizes[i].height); | |
|
1589
34cca785be57
Xrandr support in the X11 target.
Ryan C. Gordon <icculus@icculus.org>
parents:
1575
diff
changeset
|
640 #endif |
|
34cca785be57
Xrandr support in the X11 target.
Ryan C. Gordon <icculus@icculus.org>
parents:
1575
diff
changeset
|
641 |
| 1765 | 642 SDL_modelist[i]->x = 0; |
| 643 SDL_modelist[i]->y = 0; | |
| 644 SDL_modelist[i]->w = sizes[i].width; | |
| 645 SDL_modelist[i]->h = sizes[i].height; | |
|
1589
34cca785be57
Xrandr support in the X11 target.
Ryan C. Gordon <icculus@icculus.org>
parents:
1575
diff
changeset
|
646 |
|
34cca785be57
Xrandr support in the X11 target.
Ryan C. Gordon <icculus@icculus.org>
parents:
1575
diff
changeset
|
647 } |
| 1765 | 648 /* sort the mode list descending as SDL expects */ |
| 1771 | 649 SDL_qsort(SDL_modelist, nsizes, sizeof *SDL_modelist, cmpmodelist); |
| 1765 | 650 SDL_modelist[i] = NULL; /* terminator */ |
| 651 | |
|
1589
34cca785be57
Xrandr support in the X11 target.
Ryan C. Gordon <icculus@icculus.org>
parents:
1575
diff
changeset
|
652 use_xrandr = xrandr_major * 100 + xrandr_minor; |
|
34cca785be57
Xrandr support in the X11 target.
Ryan C. Gordon <icculus@icculus.org>
parents:
1575
diff
changeset
|
653 saved_size_id = XRRConfigCurrentConfiguration(screen_config, &saved_rotation); |
|
34cca785be57
Xrandr support in the X11 target.
Ryan C. Gordon <icculus@icculus.org>
parents:
1575
diff
changeset
|
654 } |
|
34cca785be57
Xrandr support in the X11 target.
Ryan C. Gordon <icculus@icculus.org>
parents:
1575
diff
changeset
|
655 } |
|
34cca785be57
Xrandr support in the X11 target.
Ryan C. Gordon <icculus@icculus.org>
parents:
1575
diff
changeset
|
656 #endif /* SDL_VIDEO_DRIVER_X11_XRANDR */ |
|
34cca785be57
Xrandr support in the X11 target.
Ryan C. Gordon <icculus@icculus.org>
parents:
1575
diff
changeset
|
657 |
|
1361
19418e4422cb
New configure-based build system. Still work in progress, but much improved
Sam Lantinga <slouken@libsdl.org>
parents:
1358
diff
changeset
|
658 #if SDL_VIDEO_DRIVER_X11_VIDMODE |
|
1746
a0ddae8b43cf
Disable the XRandR extension by default, since KDE maximizes windows which are larger than the new resolution, and then doesn't restore their size and positition when the old resolution is restored.
Sam Lantinga <slouken@libsdl.org>
parents:
1641
diff
changeset
|
659 /* XVidMode */ |
| 1765 | 660 if ( !use_xrandr && |
| 1863 | 661 #if SDL_VIDEO_DRIVER_X11_XINERAMA |
| 4207 | 662 (!use_xinerama || xinerama_info.screen_number == -1) && |
| 1863 | 663 #endif |
| 1765 | 664 CheckVidMode(this, &vm_major, &vm_minor) && |
|
1746
a0ddae8b43cf
Disable the XRandR extension by default, since KDE maximizes windows which are larger than the new resolution, and then doesn't restore their size and positition when the old resolution is restored.
Sam Lantinga <slouken@libsdl.org>
parents:
1641
diff
changeset
|
665 SDL_NAME(XF86VidModeGetAllModeLines)(SDL_Display, SDL_Screen,&nmodes,&modes) ) |
|
a0ddae8b43cf
Disable the XRandR extension by default, since KDE maximizes windows which are larger than the new resolution, and then doesn't restore their size and positition when the old resolution is restored.
Sam Lantinga <slouken@libsdl.org>
parents:
1641
diff
changeset
|
666 { |
| 1765 | 667 #ifdef X11MODES_DEBUG |
| 1768 | 668 printf("VidMode modes: (unsorted)\n"); |
|
637
6862d4294870
te: 27 Jun 2003 21:16:01 +0100
Sam Lantinga <slouken@libsdl.org>
parents:
614
diff
changeset
|
669 for ( i = 0; i < nmodes; ++i ) { |
|
6862d4294870
te: 27 Jun 2003 21:16:01 +0100
Sam Lantinga <slouken@libsdl.org>
parents:
614
diff
changeset
|
670 printf("Mode %d: %d x %d @ %d\n", i, |
|
6862d4294870
te: 27 Jun 2003 21:16:01 +0100
Sam Lantinga <slouken@libsdl.org>
parents:
614
diff
changeset
|
671 modes[i]->hdisplay, modes[i]->vdisplay, |
| 1765 | 672 (modes[i]->htotal && modes[i]->vtotal) ? (1000 * modes[i]->dotclock / (modes[i]->htotal * modes[i]->vtotal)) : 0 ); |
|
637
6862d4294870
te: 27 Jun 2003 21:16:01 +0100
Sam Lantinga <slouken@libsdl.org>
parents:
614
diff
changeset
|
673 } |
|
6862d4294870
te: 27 Jun 2003 21:16:01 +0100
Sam Lantinga <slouken@libsdl.org>
parents:
614
diff
changeset
|
674 #endif |
| 1765 | 675 if ( SDL_modelist ) { |
| 676 for ( i = 0; SDL_modelist[i]; ++i ) { | |
| 677 SDL_free(SDL_modelist[i]); | |
| 678 } | |
| 679 SDL_free(SDL_modelist); | |
| 680 } | |
|
1336
3692456e7b0f
Use SDL_ prefixed versions of C library functions.
Sam Lantinga <slouken@libsdl.org>
parents:
1318
diff
changeset
|
681 SDL_modelist = (SDL_Rect **)SDL_malloc((nmodes+2)*sizeof(SDL_Rect *)); |
| 1765 | 682 if ( !SDL_modelist ) { |
| 683 SDL_OutOfMemory(); | |
| 684 return -1; | |
| 685 } | |
| 686 SDL_qsort(modes, nmodes, sizeof *modes, cmpmodes); | |
| 687 n = 0; | |
| 688 for ( i=0; i<nmodes; ++i ) { | |
| 689 int w, h; | |
|
230
275a934573a7
Greatly improved Xinerama video mode support
Sam Lantinga <slouken@libsdl.org>
parents:
227
diff
changeset
|
690 |
| 1765 | 691 /* Eliminate duplicate modes with different refresh rates */ |
| 692 if ( i > 0 && | |
| 693 modes[i]->hdisplay == modes[i-1]->hdisplay && | |
| 694 modes[i]->vdisplay == modes[i-1]->vdisplay ) { | |
| 695 continue; | |
| 696 } | |
|
1318
f95502c6fc72
Eliminate duplicate modes with different refresh rates
Sam Lantinga <slouken@libsdl.org>
parents:
1312
diff
changeset
|
697 |
| 1765 | 698 /* Check to see if we should add the screen size (Xinerama) */ |
| 699 w = modes[i]->hdisplay; | |
| 700 h = modes[i]->vdisplay; | |
| 701 if ( (screen_w * screen_h) >= (w * h) ) { | |
| 702 if ( (screen_w != w) || (screen_h != h) ) { | |
| 703 SDL_modelist[n] = (SDL_Rect *)SDL_malloc(sizeof(SDL_Rect)); | |
| 704 if ( SDL_modelist[n] ) { | |
| 705 SDL_modelist[n]->x = 0; | |
| 706 SDL_modelist[n]->y = 0; | |
| 707 SDL_modelist[n]->w = screen_w; | |
| 708 SDL_modelist[n]->h = screen_h; | |
| 709 ++n; | |
|
230
275a934573a7
Greatly improved Xinerama video mode support
Sam Lantinga <slouken@libsdl.org>
parents:
227
diff
changeset
|
710 } |
|
275a934573a7
Greatly improved Xinerama video mode support
Sam Lantinga <slouken@libsdl.org>
parents:
227
diff
changeset
|
711 } |
| 1765 | 712 screen_w = 0; |
| 713 screen_h = 0; | |
| 714 } | |
|
230
275a934573a7
Greatly improved Xinerama video mode support
Sam Lantinga <slouken@libsdl.org>
parents:
227
diff
changeset
|
715 |
| 1765 | 716 /* Add the size from the video mode list */ |
| 717 SDL_modelist[n] = (SDL_Rect *)SDL_malloc(sizeof(SDL_Rect)); | |
| 718 if ( SDL_modelist[n] == NULL ) { | |
| 719 break; | |
| 0 | 720 } |
| 1765 | 721 SDL_modelist[n]->x = 0; |
| 722 SDL_modelist[n]->y = 0; | |
| 723 SDL_modelist[n]->w = w; | |
| 724 SDL_modelist[n]->h = h; | |
| 725 ++n; | |
| 0 | 726 } |
| 1765 | 727 SDL_modelist[n] = NULL; |
|
1575
3ba88cb7eb1b
Updated dynamic X11 code. See details in Bugzilla #170.
Ryan C. Gordon <icculus@icculus.org>
parents:
1545
diff
changeset
|
728 XFree(modes); |
| 0 | 729 |
|
100
a1c973c35fef
Fixed using the video mode extension on older servers
Sam Lantinga <slouken@lokigames.com>
parents:
98
diff
changeset
|
730 use_vidmode = vm_major * 100 + vm_minor; |
| 0 | 731 save_mode(this); |
| 732 } | |
|
1361
19418e4422cb
New configure-based build system. Still work in progress, but much improved
Sam Lantinga <slouken@libsdl.org>
parents:
1358
diff
changeset
|
733 #endif /* SDL_VIDEO_DRIVER_X11_VIDMODE */ |
| 0 | 734 |
|
1361
19418e4422cb
New configure-based build system. Still work in progress, but much improved
Sam Lantinga <slouken@libsdl.org>
parents:
1358
diff
changeset
|
735 #if SDL_VIDEO_DRIVER_X11_XME |
|
1746
a0ddae8b43cf
Disable the XRandR extension by default, since KDE maximizes windows which are larger than the new resolution, and then doesn't restore their size and positition when the old resolution is restored.
Sam Lantinga <slouken@libsdl.org>
parents:
1641
diff
changeset
|
736 /* XiG */ |
|
a0ddae8b43cf
Disable the XRandR extension by default, since KDE maximizes windows which are larger than the new resolution, and then doesn't restore their size and positition when the old resolution is restored.
Sam Lantinga <slouken@libsdl.org>
parents:
1641
diff
changeset
|
737 modelist = NULL; |
|
242
4bcb29d3769c
Added support for Xi Graphics XME fullscreen extension
Sam Lantinga <slouken@libsdl.org>
parents:
230
diff
changeset
|
738 /* first lets make sure we have the extension, and it's at least v2.0 */ |
|
1746
a0ddae8b43cf
Disable the XRandR extension by default, since KDE maximizes windows which are larger than the new resolution, and then doesn't restore their size and positition when the old resolution is restored.
Sam Lantinga <slouken@libsdl.org>
parents:
1641
diff
changeset
|
739 if ( CheckXME(this, &xme_major, &xme_minor) && xme_major >= 2 && |
|
a0ddae8b43cf
Disable the XRandR extension by default, since KDE maximizes windows which are larger than the new resolution, and then doesn't restore their size and positition when the old resolution is restored.
Sam Lantinga <slouken@libsdl.org>
parents:
1641
diff
changeset
|
740 (nummodes = XiGMiscQueryResolutions(SDL_Display, SDL_Screen, |
|
a0ddae8b43cf
Disable the XRandR extension by default, since KDE maximizes windows which are larger than the new resolution, and then doesn't restore their size and positition when the old resolution is restored.
Sam Lantinga <slouken@libsdl.org>
parents:
1641
diff
changeset
|
741 0, /* view */ |
|
a0ddae8b43cf
Disable the XRandR extension by default, since KDE maximizes windows which are larger than the new resolution, and then doesn't restore their size and positition when the old resolution is restored.
Sam Lantinga <slouken@libsdl.org>
parents:
1641
diff
changeset
|
742 &ractive, &modelist)) > 1 ) |
|
499
f480ecd70499
Added an aborted try at making fullscreen work on Xinerama screen != 0
Sam Lantinga <slouken@libsdl.org>
parents:
297
diff
changeset
|
743 { /* 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
|
744 int j; |
|
242
4bcb29d3769c
Added support for Xi Graphics XME fullscreen extension
Sam Lantinga <slouken@libsdl.org>
parents:
230
diff
changeset
|
745 |
| 1765 | 746 /* We get the list already sorted in descending order. |
| 747 We'll copy it in reverse order so SDL is happy */ | |
| 748 #ifdef X11MODES_DEBUG | |
|
499
f480ecd70499
Added an aborted try at making fullscreen work on Xinerama screen != 0
Sam Lantinga <slouken@libsdl.org>
parents:
297
diff
changeset
|
749 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
|
750 nummodes, ractive); |
|
242
4bcb29d3769c
Added support for Xi Graphics XME fullscreen extension
Sam Lantinga <slouken@libsdl.org>
parents:
230
diff
changeset
|
751 #endif |
| 1765 | 752 if ( SDL_modelist ) { |
| 753 for ( i = 0; SDL_modelist[i]; ++i ) { | |
| 754 SDL_free(SDL_modelist[i]); | |
| 755 } | |
| 756 SDL_free(SDL_modelist); | |
| 757 } | |
|
1336
3692456e7b0f
Use SDL_ prefixed versions of C library functions.
Sam Lantinga <slouken@libsdl.org>
parents:
1318
diff
changeset
|
758 SDL_modelist = (SDL_Rect **)SDL_malloc((nummodes+1)*sizeof(SDL_Rect *)); |
| 1765 | 759 if ( !SDL_modelist ) { |
| 760 SDL_OutOfMemory(); | |
| 761 return -1; | |
| 762 } | |
| 763 for ( i=0, j=nummodes-1; j>=0; i++, j-- ) { | |
| 764 if ((SDL_modelist[i] = | |
| 765 (SDL_Rect *)SDL_malloc(sizeof(SDL_Rect))) == NULL) | |
| 766 break; | |
| 767 #ifdef X11MODES_DEBUG | |
| 768 fprintf(stderr, "XME: mode = %4d, w = %4d, h = %4d\n", | |
| 769 i, modelist[i].width, modelist[i].height); | |
| 770 #endif | |
| 771 | |
| 772 SDL_modelist[i]->x = 0; | |
| 773 SDL_modelist[i]->y = 0; | |
| 774 SDL_modelist[i]->w = modelist[j].width; | |
| 775 SDL_modelist[i]->h = modelist[j].height; | |
| 776 | |
| 777 } | |
| 778 SDL_modelist[i] = NULL; /* terminator */ | |
|
242
4bcb29d3769c
Added support for Xi Graphics XME fullscreen extension
Sam Lantinga <slouken@libsdl.org>
parents:
230
diff
changeset
|
779 |
| 1765 | 780 use_xme = xme_major * 100 + xme_minor; |
|
499
f480ecd70499
Added an aborted try at making fullscreen work on Xinerama screen != 0
Sam Lantinga <slouken@libsdl.org>
parents:
297
diff
changeset
|
781 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
|
782 } |
|
4bcb29d3769c
Added support for Xi Graphics XME fullscreen extension
Sam Lantinga <slouken@libsdl.org>
parents:
230
diff
changeset
|
783 if ( modelist ) { |
|
1575
3ba88cb7eb1b
Updated dynamic X11 code. See details in Bugzilla #170.
Ryan C. Gordon <icculus@icculus.org>
parents:
1545
diff
changeset
|
784 XFree(modelist); |
|
242
4bcb29d3769c
Added support for Xi Graphics XME fullscreen extension
Sam Lantinga <slouken@libsdl.org>
parents:
230
diff
changeset
|
785 } |
|
1361
19418e4422cb
New configure-based build system. Still work in progress, but much improved
Sam Lantinga <slouken@libsdl.org>
parents:
1358
diff
changeset
|
786 #endif /* SDL_VIDEO_DRIVER_X11_XME */ |
|
242
4bcb29d3769c
Added support for Xi Graphics XME fullscreen extension
Sam Lantinga <slouken@libsdl.org>
parents:
230
diff
changeset
|
787 |
| 0 | 788 { |
| 1641 | 789 /* It's interesting to note that if we allow 32 bit depths, |
| 790 we get a visual with an alpha mask on composite servers. | |
|
499
f480ecd70499
Added an aborted try at making fullscreen work on Xinerama screen != 0
Sam Lantinga <slouken@libsdl.org>
parents:
297
diff
changeset
|
791 static int depth_list[] = { 32, 24, 16, 15, 8 }; |
| 1641 | 792 */ |
| 793 static int depth_list[] = { 24, 16, 15, 8 }; | |
|
499
f480ecd70499
Added an aborted try at making fullscreen work on Xinerama screen != 0
Sam Lantinga <slouken@libsdl.org>
parents:
297
diff
changeset
|
794 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
|
795 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
|
796 XPixmapFormatValues *pf; |
| 0 | 797 |
|
499
f480ecd70499
Added an aborted try at making fullscreen work on Xinerama screen != 0
Sam Lantinga <slouken@libsdl.org>
parents:
297
diff
changeset
|
798 /* 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
|
799 will be the richest one */ |
|
1336
3692456e7b0f
Use SDL_ prefixed versions of C library functions.
Sam Lantinga <slouken@libsdl.org>
parents:
1318
diff
changeset
|
800 if ( SDL_getenv("SDL_VIDEO_X11_NODIRECTCOLOR") ) { |
|
499
f480ecd70499
Added an aborted try at making fullscreen work on Xinerama screen != 0
Sam Lantinga <slouken@libsdl.org>
parents:
297
diff
changeset
|
801 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
|
802 } |
|
f480ecd70499
Added an aborted try at making fullscreen work on Xinerama screen != 0
Sam Lantinga <slouken@libsdl.org>
parents:
297
diff
changeset
|
803 this->hidden->nvisuals = 0; |
|
1336
3692456e7b0f
Use SDL_ prefixed versions of C library functions.
Sam Lantinga <slouken@libsdl.org>
parents:
1318
diff
changeset
|
804 if ( ! add_visual_byid(this, SDL_getenv("SDL_VIDEO_X11_VISUALID")) ) { |
|
1379
c0a74f199ecf
Use only safe string functions
Sam Lantinga <slouken@libsdl.org>
parents:
1361
diff
changeset
|
805 for ( i=0; i<SDL_arraysize(depth_list); ++i ) { |
|
499
f480ecd70499
Added an aborted try at making fullscreen work on Xinerama screen != 0
Sam Lantinga <slouken@libsdl.org>
parents:
297
diff
changeset
|
806 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
|
807 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
|
808 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
|
809 } |
|
f480ecd70499
Added an aborted try at making fullscreen work on Xinerama screen != 0
Sam Lantinga <slouken@libsdl.org>
parents:
297
diff
changeset
|
810 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
|
811 } else { |
|
f480ecd70499
Added an aborted try at making fullscreen work on Xinerama screen != 0
Sam Lantinga <slouken@libsdl.org>
parents:
297
diff
changeset
|
812 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
|
813 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
|
814 } |
|
f480ecd70499
Added an aborted try at making fullscreen work on Xinerama screen != 0
Sam Lantinga <slouken@libsdl.org>
parents:
297
diff
changeset
|
815 } |
| 4254 | 816 add_default_visual(this); |
|
499
f480ecd70499
Added an aborted try at making fullscreen work on Xinerama screen != 0
Sam Lantinga <slouken@libsdl.org>
parents:
297
diff
changeset
|
817 } |
|
f480ecd70499
Added an aborted try at making fullscreen work on Xinerama screen != 0
Sam Lantinga <slouken@libsdl.org>
parents:
297
diff
changeset
|
818 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
|
819 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
|
820 return -1; |
|
f480ecd70499
Added an aborted try at making fullscreen work on Xinerama screen != 0
Sam Lantinga <slouken@libsdl.org>
parents:
297
diff
changeset
|
821 } |
|
f480ecd70499
Added an aborted try at making fullscreen work on Xinerama screen != 0
Sam Lantinga <slouken@libsdl.org>
parents:
297
diff
changeset
|
822 |
|
f480ecd70499
Added an aborted try at making fullscreen work on Xinerama screen != 0
Sam Lantinga <slouken@libsdl.org>
parents:
297
diff
changeset
|
823 /* look up the pixel quantum for each depth */ |
|
1575
3ba88cb7eb1b
Updated dynamic X11 code. See details in Bugzilla #170.
Ryan C. Gordon <icculus@icculus.org>
parents:
1545
diff
changeset
|
824 pf = XListPixmapFormats(SDL_Display, &np); |
|
499
f480ecd70499
Added an aborted try at making fullscreen work on Xinerama screen != 0
Sam Lantinga <slouken@libsdl.org>
parents:
297
diff
changeset
|
825 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
|
826 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
|
827 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
|
828 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
|
829 break; |
|
f480ecd70499
Added an aborted try at making fullscreen work on Xinerama screen != 0
Sam Lantinga <slouken@libsdl.org>
parents:
297
diff
changeset
|
830 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
|
831 } |
| 0 | 832 |
|
1575
3ba88cb7eb1b
Updated dynamic X11 code. See details in Bugzilla #170.
Ryan C. Gordon <icculus@icculus.org>
parents:
1545
diff
changeset
|
833 XFree(pf); |
| 0 | 834 } |
| 835 | |
| 836 if ( SDL_modelist == NULL ) { | |
|
1336
3692456e7b0f
Use SDL_ prefixed versions of C library functions.
Sam Lantinga <slouken@libsdl.org>
parents:
1318
diff
changeset
|
837 SDL_modelist = (SDL_Rect **)SDL_malloc((1+1)*sizeof(SDL_Rect *)); |
| 1765 | 838 if ( !SDL_modelist ) { |
| 839 SDL_OutOfMemory(); | |
| 840 return -1; | |
| 0 | 841 } |
| 1765 | 842 n = 0; |
| 843 SDL_modelist[n] = (SDL_Rect *)SDL_malloc(sizeof(SDL_Rect)); | |
| 844 if ( SDL_modelist[n] ) { | |
| 845 SDL_modelist[n]->x = 0; | |
| 846 SDL_modelist[n]->y = 0; | |
| 847 SDL_modelist[n]->w = screen_w; | |
| 848 SDL_modelist[n]->h = screen_h; | |
| 849 ++n; | |
| 850 } | |
| 851 SDL_modelist[n] = NULL; | |
| 0 | 852 } |
| 853 | |
| 1765 | 854 #ifdef X11MODES_DEBUG |
| 855 if ( use_xinerama ) { | |
| 856 printf("Xinerama is enabled\n"); | |
| 857 } | |
| 858 | |
|
1746
a0ddae8b43cf
Disable the XRandR extension by default, since KDE maximizes windows which are larger than the new resolution, and then doesn't restore their size and positition when the old resolution is restored.
Sam Lantinga <slouken@libsdl.org>
parents:
1641
diff
changeset
|
859 if ( use_xrandr ) { |
|
a0ddae8b43cf
Disable the XRandR extension by default, since KDE maximizes windows which are larger than the new resolution, and then doesn't restore their size and positition when the old resolution is restored.
Sam Lantinga <slouken@libsdl.org>
parents:
1641
diff
changeset
|
860 printf("XRandR is enabled\n"); |
|
a0ddae8b43cf
Disable the XRandR extension by default, since KDE maximizes windows which are larger than the new resolution, and then doesn't restore their size and positition when the old resolution is restored.
Sam Lantinga <slouken@libsdl.org>
parents:
1641
diff
changeset
|
861 } |
|
a0ddae8b43cf
Disable the XRandR extension by default, since KDE maximizes windows which are larger than the new resolution, and then doesn't restore their size and positition when the old resolution is restored.
Sam Lantinga <slouken@libsdl.org>
parents:
1641
diff
changeset
|
862 |
| 0 | 863 if ( use_vidmode ) { |
| 1768 | 864 printf("VidMode is enabled\n"); |
| 0 | 865 } |
|
242
4bcb29d3769c
Added support for Xi Graphics XME fullscreen extension
Sam Lantinga <slouken@libsdl.org>
parents:
230
diff
changeset
|
866 |
| 1765 | 867 if ( use_xme ) { |
| 1766 | 868 printf("Xi Graphics XME fullscreen is enabled\n"); |
| 1765 | 869 } |
|
242
4bcb29d3769c
Added support for Xi Graphics XME fullscreen extension
Sam Lantinga <slouken@libsdl.org>
parents:
230
diff
changeset
|
870 |
| 0 | 871 if ( SDL_modelist ) { |
|
227
24878c14b391
Added X11 Xinerama support - fullscreen starts on screen 0
Sam Lantinga <slouken@libsdl.org>
parents:
100
diff
changeset
|
872 printf("X11 video mode list:\n"); |
| 0 | 873 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
|
874 printf("\t%dx%d\n", SDL_modelist[i]->w, SDL_modelist[i]->h); |
| 0 | 875 } |
| 876 } | |
| 1765 | 877 #endif /* X11MODES_DEBUG */ |
|
227
24878c14b391
Added X11 Xinerama support - fullscreen starts on screen 0
Sam Lantinga <slouken@libsdl.org>
parents:
100
diff
changeset
|
878 |
| 0 | 879 return 0; |
| 880 } | |
| 881 | |
| 882 int X11_SupportedVisual(_THIS, SDL_PixelFormat *format) | |
| 883 { | |
| 884 int i; | |
| 885 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
|
886 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
|
887 return 1; |
| 0 | 888 return 0; |
| 889 } | |
| 890 | |
| 891 SDL_Rect **X11_ListModes(_THIS, SDL_PixelFormat *format, Uint32 flags) | |
| 892 { | |
| 893 if ( X11_SupportedVisual(this, format) ) { | |
| 894 if ( flags & SDL_FULLSCREEN ) { | |
| 895 return(SDL_modelist); | |
| 896 } else { | |
| 897 return((SDL_Rect **)-1); | |
| 898 } | |
| 899 } else { | |
| 900 return((SDL_Rect **)0); | |
| 901 } | |
| 902 } | |
| 903 | |
| 904 void X11_FreeVideoModes(_THIS) | |
| 905 { | |
| 906 int i; | |
| 907 | |
| 908 if ( SDL_modelist ) { | |
| 909 for ( i=0; SDL_modelist[i]; ++i ) { | |
|
1336
3692456e7b0f
Use SDL_ prefixed versions of C library functions.
Sam Lantinga <slouken@libsdl.org>
parents:
1318
diff
changeset
|
910 SDL_free(SDL_modelist[i]); |
| 0 | 911 } |
|
1336
3692456e7b0f
Use SDL_ prefixed versions of C library functions.
Sam Lantinga <slouken@libsdl.org>
parents:
1318
diff
changeset
|
912 SDL_free(SDL_modelist); |
| 0 | 913 SDL_modelist = NULL; |
| 914 } | |
|
1589
34cca785be57
Xrandr support in the X11 target.
Ryan C. Gordon <icculus@icculus.org>
parents:
1575
diff
changeset
|
915 |
|
34cca785be57
Xrandr support in the X11 target.
Ryan C. Gordon <icculus@icculus.org>
parents:
1575
diff
changeset
|
916 #if SDL_VIDEO_DRIVER_X11_XRANDR |
|
34cca785be57
Xrandr support in the X11 target.
Ryan C. Gordon <icculus@icculus.org>
parents:
1575
diff
changeset
|
917 /* Free the Xrandr screen configuration */ |
|
34cca785be57
Xrandr support in the X11 target.
Ryan C. Gordon <icculus@icculus.org>
parents:
1575
diff
changeset
|
918 if ( screen_config ) { |
|
34cca785be57
Xrandr support in the X11 target.
Ryan C. Gordon <icculus@icculus.org>
parents:
1575
diff
changeset
|
919 XRRFreeScreenConfigInfo(screen_config); |
|
34cca785be57
Xrandr support in the X11 target.
Ryan C. Gordon <icculus@icculus.org>
parents:
1575
diff
changeset
|
920 screen_config = NULL; |
|
34cca785be57
Xrandr support in the X11 target.
Ryan C. Gordon <icculus@icculus.org>
parents:
1575
diff
changeset
|
921 } |
|
34cca785be57
Xrandr support in the X11 target.
Ryan C. Gordon <icculus@icculus.org>
parents:
1575
diff
changeset
|
922 #endif /* SDL_VIDEO_DRIVER_X11_XRANDR */ |
| 0 | 923 } |
| 924 | |
| 925 int X11_ResizeFullScreen(_THIS) | |
| 926 { | |
| 1765 | 927 int x = 0, y = 0; |
| 0 | 928 int real_w, real_h; |
|
230
275a934573a7
Greatly improved Xinerama video mode support
Sam Lantinga <slouken@libsdl.org>
parents:
227
diff
changeset
|
929 int screen_w; |
|
275a934573a7
Greatly improved Xinerama video mode support
Sam Lantinga <slouken@libsdl.org>
parents:
227
diff
changeset
|
930 int screen_h; |
|
275a934573a7
Greatly improved Xinerama video mode support
Sam Lantinga <slouken@libsdl.org>
parents:
227
diff
changeset
|
931 |
|
275a934573a7
Greatly improved Xinerama video mode support
Sam Lantinga <slouken@libsdl.org>
parents:
227
diff
changeset
|
932 screen_w = DisplayWidth(SDL_Display, SDL_Screen); |
|
275a934573a7
Greatly improved Xinerama video mode support
Sam Lantinga <slouken@libsdl.org>
parents:
227
diff
changeset
|
933 screen_h = DisplayHeight(SDL_Display, SDL_Screen); |
| 0 | 934 |
| 1863 | 935 #if SDL_VIDEO_DRIVER_X11_XINERAMA |
| 1765 | 936 if ( use_xinerama && |
| 937 window_w <= xinerama_info.width && | |
| 938 window_h <= xinerama_info.height ) { | |
| 939 x = xinerama_info.x_org; | |
| 940 y = xinerama_info.y_org; | |
| 941 } | |
| 1863 | 942 #endif /* SDL_VIDEO_DRIVER_X11_XINERAMA */ |
| 943 | |
| 0 | 944 if ( currently_fullscreen ) { |
| 945 /* 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
|
946 move_cursor_to(this, x, y); |
|
1545
8d9bb0cf2c2a
Added current_w and current_h to the SDL_VideoInfo structure, which is set to the desktop resolution during video intialization, and then set to the current resolution when a video mode is set.
Sam Lantinga <slouken@libsdl.org>
parents:
1402
diff
changeset
|
947 set_best_resolution(this, window_w, window_h); |
|
227
24878c14b391
Added X11 Xinerama support - fullscreen starts on screen 0
Sam Lantinga <slouken@libsdl.org>
parents:
100
diff
changeset
|
948 move_cursor_to(this, x, y); |
| 0 | 949 get_real_resolution(this, &real_w, &real_h); |
|
1545
8d9bb0cf2c2a
Added current_w and current_h to the SDL_VideoInfo structure, which is set to the desktop resolution during video intialization, and then set to the current resolution when a video mode is set.
Sam Lantinga <slouken@libsdl.org>
parents:
1402
diff
changeset
|
950 if ( window_w > real_w ) { |
|
230
275a934573a7
Greatly improved Xinerama video mode support
Sam Lantinga <slouken@libsdl.org>
parents:
227
diff
changeset
|
951 real_w = MAX(real_w, screen_w); |
|
275a934573a7
Greatly improved Xinerama video mode support
Sam Lantinga <slouken@libsdl.org>
parents:
227
diff
changeset
|
952 } |
|
1545
8d9bb0cf2c2a
Added current_w and current_h to the SDL_VideoInfo structure, which is set to the desktop resolution during video intialization, and then set to the current resolution when a video mode is set.
Sam Lantinga <slouken@libsdl.org>
parents:
1402
diff
changeset
|
953 if ( window_h > real_h ) { |
|
230
275a934573a7
Greatly improved Xinerama video mode support
Sam Lantinga <slouken@libsdl.org>
parents:
227
diff
changeset
|
954 real_h = MAX(real_h, screen_h); |
|
275a934573a7
Greatly improved Xinerama video mode support
Sam Lantinga <slouken@libsdl.org>
parents:
227
diff
changeset
|
955 } |
|
1575
3ba88cb7eb1b
Updated dynamic X11 code. See details in Bugzilla #170.
Ryan C. Gordon <icculus@icculus.org>
parents:
1545
diff
changeset
|
956 XMoveResizeWindow(SDL_Display, FSwindow, x, y, real_w, real_h); |
| 0 | 957 move_cursor_to(this, real_w/2, real_h/2); |
| 958 | |
| 959 /* Center and reparent the drawing window */ | |
|
1545
8d9bb0cf2c2a
Added current_w and current_h to the SDL_VideoInfo structure, which is set to the desktop resolution during video intialization, and then set to the current resolution when a video mode is set.
Sam Lantinga <slouken@libsdl.org>
parents:
1402
diff
changeset
|
960 x = (real_w - window_w)/2; |
|
8d9bb0cf2c2a
Added current_w and current_h to the SDL_VideoInfo structure, which is set to the desktop resolution during video intialization, and then set to the current resolution when a video mode is set.
Sam Lantinga <slouken@libsdl.org>
parents:
1402
diff
changeset
|
961 y = (real_h - window_h)/2; |
|
1575
3ba88cb7eb1b
Updated dynamic X11 code. See details in Bugzilla #170.
Ryan C. Gordon <icculus@icculus.org>
parents:
1545
diff
changeset
|
962 XReparentWindow(SDL_Display, SDL_Window, FSwindow, x, y); |
| 0 | 963 /* FIXME: move the mouse to the old relative location */ |
|
1575
3ba88cb7eb1b
Updated dynamic X11 code. See details in Bugzilla #170.
Ryan C. Gordon <icculus@icculus.org>
parents:
1545
diff
changeset
|
964 XSync(SDL_Display, True); /* Flush spurious mode change events */ |
| 0 | 965 } |
| 966 return(1); | |
| 967 } | |
| 968 | |
| 969 void X11_QueueEnterFullScreen(_THIS) | |
| 970 { | |
| 971 switch_waiting = 0x01 | SDL_FULLSCREEN; | |
| 972 switch_time = SDL_GetTicks() + 1500; | |
| 973 #if 0 /* This causes a BadMatch error if the window is iconified (not needed) */ | |
|
1575
3ba88cb7eb1b
Updated dynamic X11 code. See details in Bugzilla #170.
Ryan C. Gordon <icculus@icculus.org>
parents:
1545
diff
changeset
|
974 XSetInputFocus(SDL_Display, WMwindow, RevertToNone, CurrentTime); |
| 0 | 975 #endif |
| 976 } | |
| 977 | |
| 978 int X11_EnterFullScreen(_THIS) | |
| 979 { | |
| 980 int okay; | |
| 981 #if 0 | |
| 982 Window tmpwin, *windows; | |
| 983 int i, nwindows; | |
| 984 #endif | |
| 1765 | 985 int x = 0, y = 0; |
|
98
8a5aff5c1294
Fixed some problems with the fullscreen code. Wooo. :)
Sam Lantinga <slouken@lokigames.com>
parents:
91
diff
changeset
|
986 int real_w, real_h; |
|
230
275a934573a7
Greatly improved Xinerama video mode support
Sam Lantinga <slouken@libsdl.org>
parents:
227
diff
changeset
|
987 int screen_w; |
|
275a934573a7
Greatly improved Xinerama video mode support
Sam Lantinga <slouken@libsdl.org>
parents:
227
diff
changeset
|
988 int screen_h; |
| 0 | 989 |
| 990 okay = 1; | |
|
98
8a5aff5c1294
Fixed some problems with the fullscreen code. Wooo. :)
Sam Lantinga <slouken@lokigames.com>
parents:
91
diff
changeset
|
991 if ( currently_fullscreen ) { |
|
8a5aff5c1294
Fixed some problems with the fullscreen code. Wooo. :)
Sam Lantinga <slouken@lokigames.com>
parents:
91
diff
changeset
|
992 return(okay); |
|
8a5aff5c1294
Fixed some problems with the fullscreen code. Wooo. :)
Sam Lantinga <slouken@lokigames.com>
parents:
91
diff
changeset
|
993 } |
| 0 | 994 |
|
98
8a5aff5c1294
Fixed some problems with the fullscreen code. Wooo. :)
Sam Lantinga <slouken@lokigames.com>
parents:
91
diff
changeset
|
995 /* 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
|
996 X11_GrabInputNoLock(this, SDL_GRAB_OFF); |
|
8a5aff5c1294
Fixed some problems with the fullscreen code. Wooo. :)
Sam Lantinga <slouken@lokigames.com>
parents:
91
diff
changeset
|
997 |
| 1863 | 998 #if SDL_VIDEO_DRIVER_X11_XINERAMA |
| 1765 | 999 if ( use_xinerama && |
| 1000 window_w <= xinerama_info.width && | |
| 1001 window_h <= xinerama_info.height ) { | |
| 1002 x = xinerama_info.x_org; | |
| 1003 y = xinerama_info.y_org; | |
| 1004 } | |
| 1863 | 1005 #endif /* SDL_VIDEO_DRIVER_X11_XINERAMA */ |
| 1006 | |
|
98
8a5aff5c1294
Fixed some problems with the fullscreen code. Wooo. :)
Sam Lantinga <slouken@lokigames.com>
parents:
91
diff
changeset
|
1007 /* 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
|
1008 screen_w = DisplayWidth(SDL_Display, SDL_Screen); |
|
275a934573a7
Greatly improved Xinerama video mode support
Sam Lantinga <slouken@libsdl.org>
parents:
227
diff
changeset
|
1009 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
|
1010 get_real_resolution(this, &real_w, &real_h); |
|
4274
915406c331dc
Make the temporary black window be the maximum of all visible dimensions
Sam Lantinga <slouken@libsdl.org>
parents:
4254
diff
changeset
|
1011 real_w = MAX(window_w, MAX(real_w, screen_w)); |
|
915406c331dc
Make the temporary black window be the maximum of all visible dimensions
Sam Lantinga <slouken@libsdl.org>
parents:
4254
diff
changeset
|
1012 real_h = MAX(window_h, MAX(real_h, screen_h)); |
|
1575
3ba88cb7eb1b
Updated dynamic X11 code. See details in Bugzilla #170.
Ryan C. Gordon <icculus@icculus.org>
parents:
1545
diff
changeset
|
1013 XMoveResizeWindow(SDL_Display, FSwindow, |
| 1765 | 1014 x, y, real_w, real_h); |
|
1575
3ba88cb7eb1b
Updated dynamic X11 code. See details in Bugzilla #170.
Ryan C. Gordon <icculus@icculus.org>
parents:
1545
diff
changeset
|
1015 XMapRaised(SDL_Display, FSwindow); |
|
98
8a5aff5c1294
Fixed some problems with the fullscreen code. Wooo. :)
Sam Lantinga <slouken@lokigames.com>
parents:
91
diff
changeset
|
1016 X11_WaitMapped(this, FSwindow); |
| 0 | 1017 |
| 1018 #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
|
1019 /* Make sure we got to the top of the window stack */ |
|
1575
3ba88cb7eb1b
Updated dynamic X11 code. See details in Bugzilla #170.
Ryan C. Gordon <icculus@icculus.org>
parents:
1545
diff
changeset
|
1020 if ( XQueryTree(SDL_Display, SDL_Root, &tmpwin, &tmpwin, |
|
98
8a5aff5c1294
Fixed some problems with the fullscreen code. Wooo. :)
Sam Lantinga <slouken@lokigames.com>
parents:
91
diff
changeset
|
1021 &windows, &nwindows) && windows ) { |
|
8a5aff5c1294
Fixed some problems with the fullscreen code. Wooo. :)
Sam Lantinga <slouken@lokigames.com>
parents:
91
diff
changeset
|
1022 /* 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
|
1023 if ( windows[nwindows-1] != FSwindow ) { |
|
8a5aff5c1294
Fixed some problems with the fullscreen code. Wooo. :)
Sam Lantinga <slouken@lokigames.com>
parents:
91
diff
changeset
|
1024 tmpwin = windows[nwindows-1]; |
|
8a5aff5c1294
Fixed some problems with the fullscreen code. Wooo. :)
Sam Lantinga <slouken@lokigames.com>
parents:
91
diff
changeset
|
1025 for ( i=0; i<nwindows; ++i ) { |
|
8a5aff5c1294
Fixed some problems with the fullscreen code. Wooo. :)
Sam Lantinga <slouken@lokigames.com>
parents:
91
diff
changeset
|
1026 if ( windows[i] == FSwindow ) { |
|
1336
3692456e7b0f
Use SDL_ prefixed versions of C library functions.
Sam Lantinga <slouken@libsdl.org>
parents:
1318
diff
changeset
|
1027 SDL_memcpy(&windows[i], &windows[i+1], |
|
98
8a5aff5c1294
Fixed some problems with the fullscreen code. Wooo. :)
Sam Lantinga <slouken@lokigames.com>
parents:
91
diff
changeset
|
1028 (nwindows-i-1)*sizeof(windows[i])); |
|
8a5aff5c1294
Fixed some problems with the fullscreen code. Wooo. :)
Sam Lantinga <slouken@lokigames.com>
parents:
91
diff
changeset
|
1029 break; |
| 0 | 1030 } |
| 1031 } | |
|
98
8a5aff5c1294
Fixed some problems with the fullscreen code. Wooo. :)
Sam Lantinga <slouken@lokigames.com>
parents:
91
diff
changeset
|
1032 windows[nwindows-1] = FSwindow; |
|
1575
3ba88cb7eb1b
Updated dynamic X11 code. See details in Bugzilla #170.
Ryan C. Gordon <icculus@icculus.org>
parents:
1545
diff
changeset
|
1033 XRestackWindows(SDL_Display, windows, nwindows); |
|
3ba88cb7eb1b
Updated dynamic X11 code. See details in Bugzilla #170.
Ryan C. Gordon <icculus@icculus.org>
parents:
1545
diff
changeset
|
1034 XSync(SDL_Display, False); |
| 0 | 1035 } |
|
1575
3ba88cb7eb1b
Updated dynamic X11 code. See details in Bugzilla #170.
Ryan C. Gordon <icculus@icculus.org>
parents:
1545
diff
changeset
|
1036 XFree(windows); |
|
98
8a5aff5c1294
Fixed some problems with the fullscreen code. Wooo. :)
Sam Lantinga <slouken@lokigames.com>
parents:
91
diff
changeset
|
1037 } |
| 0 | 1038 #else |
|
1575
3ba88cb7eb1b
Updated dynamic X11 code. See details in Bugzilla #170.
Ryan C. Gordon <icculus@icculus.org>
parents:
1545
diff
changeset
|
1039 XRaiseWindow(SDL_Display, FSwindow); |
| 0 | 1040 #endif |
| 1041 | |
|
1361
19418e4422cb
New configure-based build system. Still work in progress, but much improved
Sam Lantinga <slouken@libsdl.org>
parents:
1358
diff
changeset
|
1042 #if SDL_VIDEO_DRIVER_X11_VIDMODE |
|
98
8a5aff5c1294
Fixed some problems with the fullscreen code. Wooo. :)
Sam Lantinga <slouken@lokigames.com>
parents:
91
diff
changeset
|
1043 /* Save the current video mode */ |
|
8a5aff5c1294
Fixed some problems with the fullscreen code. Wooo. :)
Sam Lantinga <slouken@lokigames.com>
parents:
91
diff
changeset
|
1044 if ( use_vidmode ) { |
|
292
eadc0746dfaf
Added SDL_LockRect() and SDL_UnlockRect()
Sam Lantinga <slouken@libsdl.org>
parents:
252
diff
changeset
|
1045 SDL_NAME(XF86VidModeLockModeSwitch)(SDL_Display, SDL_Screen, True); |
| 4223 | 1046 save_mode(this); |
|
98
8a5aff5c1294
Fixed some problems with the fullscreen code. Wooo. :)
Sam Lantinga <slouken@lokigames.com>
parents:
91
diff
changeset
|
1047 } |
| 0 | 1048 #endif |
|
98
8a5aff5c1294
Fixed some problems with the fullscreen code. Wooo. :)
Sam Lantinga <slouken@lokigames.com>
parents:
91
diff
changeset
|
1049 currently_fullscreen = 1; |
| 0 | 1050 |
|
98
8a5aff5c1294
Fixed some problems with the fullscreen code. Wooo. :)
Sam Lantinga <slouken@lokigames.com>
parents:
91
diff
changeset
|
1051 /* Set the new resolution */ |
|
8a5aff5c1294
Fixed some problems with the fullscreen code. Wooo. :)
Sam Lantinga <slouken@lokigames.com>
parents:
91
diff
changeset
|
1052 okay = X11_ResizeFullScreen(this); |
|
8a5aff5c1294
Fixed some problems with the fullscreen code. Wooo. :)
Sam Lantinga <slouken@lokigames.com>
parents:
91
diff
changeset
|
1053 if ( ! okay ) { |
|
8a5aff5c1294
Fixed some problems with the fullscreen code. Wooo. :)
Sam Lantinga <slouken@lokigames.com>
parents:
91
diff
changeset
|
1054 X11_LeaveFullScreen(this); |
|
8a5aff5c1294
Fixed some problems with the fullscreen code. Wooo. :)
Sam Lantinga <slouken@lokigames.com>
parents:
91
diff
changeset
|
1055 } |
|
8a5aff5c1294
Fixed some problems with the fullscreen code. Wooo. :)
Sam Lantinga <slouken@lokigames.com>
parents:
91
diff
changeset
|
1056 /* Set the colormap */ |
|
8a5aff5c1294
Fixed some problems with the fullscreen code. Wooo. :)
Sam Lantinga <slouken@lokigames.com>
parents:
91
diff
changeset
|
1057 if ( SDL_XColorMap ) { |
|
1575
3ba88cb7eb1b
Updated dynamic X11 code. See details in Bugzilla #170.
Ryan C. Gordon <icculus@icculus.org>
parents:
1545
diff
changeset
|
1058 XInstallColormap(SDL_Display, SDL_XColorMap); |
| 0 | 1059 } |
| 1765 | 1060 if ( okay ) { |
|
88
71774090f286
Hopefully fixed the fullscreen mode code for KDE
Sam Lantinga <slouken@lokigames.com>
parents:
0
diff
changeset
|
1061 X11_GrabInputNoLock(this, this->input_grab | SDL_GRAB_FULLSCREEN); |
| 1765 | 1062 } |
|
88
71774090f286
Hopefully fixed the fullscreen mode code for KDE
Sam Lantinga <slouken@lokigames.com>
parents:
0
diff
changeset
|
1063 |
|
71774090f286
Hopefully fixed the fullscreen mode code for KDE
Sam Lantinga <slouken@lokigames.com>
parents:
0
diff
changeset
|
1064 /* 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
|
1065 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
|
1066 if ( this->screen ) { |
|
71774090f286
Hopefully fixed the fullscreen mode code for KDE
Sam Lantinga <slouken@lokigames.com>
parents:
0
diff
changeset
|
1067 if ( this->screen->flags & SDL_OPENGL ) { |
|
71774090f286
Hopefully fixed the fullscreen mode code for KDE
Sam Lantinga <slouken@lokigames.com>
parents:
0
diff
changeset
|
1068 SDL_PrivateExpose(); |
|
71774090f286
Hopefully fixed the fullscreen mode code for KDE
Sam Lantinga <slouken@lokigames.com>
parents:
0
diff
changeset
|
1069 } else { |
|
71774090f286
Hopefully fixed the fullscreen mode code for KDE
Sam Lantinga <slouken@lokigames.com>
parents:
0
diff
changeset
|
1070 X11_RefreshDisplay(this); |
|
71774090f286
Hopefully fixed the fullscreen mode code for KDE
Sam Lantinga <slouken@lokigames.com>
parents:
0
diff
changeset
|
1071 } |
|
71774090f286
Hopefully fixed the fullscreen mode code for KDE
Sam Lantinga <slouken@lokigames.com>
parents:
0
diff
changeset
|
1072 } |
|
71774090f286
Hopefully fixed the fullscreen mode code for KDE
Sam Lantinga <slouken@lokigames.com>
parents:
0
diff
changeset
|
1073 |
| 0 | 1074 return(okay); |
| 1075 } | |
| 1076 | |
| 1077 int X11_LeaveFullScreen(_THIS) | |
| 1078 { | |
| 1079 if ( currently_fullscreen ) { | |
|
1575
3ba88cb7eb1b
Updated dynamic X11 code. See details in Bugzilla #170.
Ryan C. Gordon <icculus@icculus.org>
parents:
1545
diff
changeset
|
1080 XReparentWindow(SDL_Display, SDL_Window, WMwindow, 0, 0); |
|
1361
19418e4422cb
New configure-based build system. Still work in progress, but much improved
Sam Lantinga <slouken@libsdl.org>
parents:
1358
diff
changeset
|
1081 #if SDL_VIDEO_DRIVER_X11_VIDMODE |
| 0 | 1082 if ( use_vidmode ) { |
| 1083 restore_mode(this); | |
|
292
eadc0746dfaf
Added SDL_LockRect() and SDL_UnlockRect()
Sam Lantinga <slouken@libsdl.org>
parents:
252
diff
changeset
|
1084 SDL_NAME(XF86VidModeLockModeSwitch)(SDL_Display, SDL_Screen, False); |
| 0 | 1085 } |
| 1086 #endif | |
|
242
4bcb29d3769c
Added support for Xi Graphics XME fullscreen extension
Sam Lantinga <slouken@libsdl.org>
parents:
230
diff
changeset
|
1087 |
|
1361
19418e4422cb
New configure-based build system. Still work in progress, but much improved
Sam Lantinga <slouken@libsdl.org>
parents:
1358
diff
changeset
|
1088 #if SDL_VIDEO_DRIVER_X11_XME |
|
499
f480ecd70499
Added an aborted try at making fullscreen work on Xinerama screen != 0
Sam Lantinga <slouken@libsdl.org>
parents:
297
diff
changeset
|
1089 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
|
1090 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
|
1091 |
|
242
4bcb29d3769c
Added support for Xi Graphics XME fullscreen extension
Sam Lantinga <slouken@libsdl.org>
parents:
230
diff
changeset
|
1092 /* 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
|
1093 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
|
1094 |
|
499
f480ecd70499
Added an aborted try at making fullscreen work on Xinerama screen != 0
Sam Lantinga <slouken@libsdl.org>
parents:
297
diff
changeset
|
1095 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
|
1096 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
|
1097 SDL_Screen, |
|
f480ecd70499
Added an aborted try at making fullscreen work on Xinerama screen != 0
Sam Lantinga <slouken@libsdl.org>
parents:
297
diff
changeset
|
1098 0, /* view */ |
|
f480ecd70499
Added an aborted try at making fullscreen work on Xinerama screen != 0
Sam Lantinga <slouken@libsdl.org>
parents:
297
diff
changeset
|
1099 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
|
1100 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
|
1101 0); |
|
1575
3ba88cb7eb1b
Updated dynamic X11 code. See details in Bugzilla #170.
Ryan C. Gordon <icculus@icculus.org>
parents:
1545
diff
changeset
|
1102 XSync(SDL_Display, False); |
|
499
f480ecd70499
Added an aborted try at making fullscreen work on Xinerama screen != 0
Sam Lantinga <slouken@libsdl.org>
parents:
297
diff
changeset
|
1103 } |
|
f480ecd70499
Added an aborted try at making fullscreen work on Xinerama screen != 0
Sam Lantinga <slouken@libsdl.org>
parents:
297
diff
changeset
|
1104 } |
|
242
4bcb29d3769c
Added support for Xi Graphics XME fullscreen extension
Sam Lantinga <slouken@libsdl.org>
parents:
230
diff
changeset
|
1105 #endif |
|
4bcb29d3769c
Added support for Xi Graphics XME fullscreen extension
Sam Lantinga <slouken@libsdl.org>
parents:
230
diff
changeset
|
1106 |
|
1589
34cca785be57
Xrandr support in the X11 target.
Ryan C. Gordon <icculus@icculus.org>
parents:
1575
diff
changeset
|
1107 #if SDL_VIDEO_DRIVER_X11_XRANDR |
|
34cca785be57
Xrandr support in the X11 target.
Ryan C. Gordon <icculus@icculus.org>
parents:
1575
diff
changeset
|
1108 if ( use_xrandr ) { |
|
34cca785be57
Xrandr support in the X11 target.
Ryan C. Gordon <icculus@icculus.org>
parents:
1575
diff
changeset
|
1109 XRRSetScreenConfig(SDL_Display, screen_config, SDL_Root, |
|
34cca785be57
Xrandr support in the X11 target.
Ryan C. Gordon <icculus@icculus.org>
parents:
1575
diff
changeset
|
1110 saved_size_id, saved_rotation, CurrentTime); |
|
34cca785be57
Xrandr support in the X11 target.
Ryan C. Gordon <icculus@icculus.org>
parents:
1575
diff
changeset
|
1111 } |
|
34cca785be57
Xrandr support in the X11 target.
Ryan C. Gordon <icculus@icculus.org>
parents:
1575
diff
changeset
|
1112 #endif |
|
34cca785be57
Xrandr support in the X11 target.
Ryan C. Gordon <icculus@icculus.org>
parents:
1575
diff
changeset
|
1113 |
|
1575
3ba88cb7eb1b
Updated dynamic X11 code. See details in Bugzilla #170.
Ryan C. Gordon <icculus@icculus.org>
parents:
1545
diff
changeset
|
1114 XUnmapWindow(SDL_Display, FSwindow); |
| 0 | 1115 X11_WaitUnmapped(this, FSwindow); |
|
1575
3ba88cb7eb1b
Updated dynamic X11 code. See details in Bugzilla #170.
Ryan C. Gordon <icculus@icculus.org>
parents:
1545
diff
changeset
|
1116 XSync(SDL_Display, True); /* Flush spurious mode change events */ |
| 0 | 1117 currently_fullscreen = 0; |
| 1118 } | |
| 1119 /* If we get popped out of fullscreen mode for some reason, input_grab | |
| 1120 will still have the SDL_GRAB_FULLSCREEN flag set, since this is only | |
| 1121 temporary. In this case, release the grab unless the input has been | |
| 1122 explicitly grabbed. | |
| 1123 */ | |
| 1124 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
|
1125 |
|
71774090f286
Hopefully fixed the fullscreen mode code for KDE
Sam Lantinga <slouken@lokigames.com>
parents:
0
diff
changeset
|
1126 /* 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
|
1127 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
|
1128 if ( this->screen ) { |
|
71774090f286
Hopefully fixed the fullscreen mode code for KDE
Sam Lantinga <slouken@lokigames.com>
parents:
0
diff
changeset
|
1129 if ( this->screen->flags & SDL_OPENGL ) { |
|
71774090f286
Hopefully fixed the fullscreen mode code for KDE
Sam Lantinga <slouken@lokigames.com>
parents:
0
diff
changeset
|
1130 SDL_PrivateExpose(); |
|
71774090f286
Hopefully fixed the fullscreen mode code for KDE
Sam Lantinga <slouken@lokigames.com>
parents:
0
diff
changeset
|
1131 } else { |
|
71774090f286
Hopefully fixed the fullscreen mode code for KDE
Sam Lantinga <slouken@lokigames.com>
parents:
0
diff
changeset
|
1132 X11_RefreshDisplay(this); |
|
71774090f286
Hopefully fixed the fullscreen mode code for KDE
Sam Lantinga <slouken@lokigames.com>
parents:
0
diff
changeset
|
1133 } |
|
71774090f286
Hopefully fixed the fullscreen mode code for KDE
Sam Lantinga <slouken@lokigames.com>
parents:
0
diff
changeset
|
1134 } |
|
71774090f286
Hopefully fixed the fullscreen mode code for KDE
Sam Lantinga <slouken@lokigames.com>
parents:
0
diff
changeset
|
1135 |
| 0 | 1136 return(0); |
| 1137 } |