Mercurial > sdl-ios-xcode
annotate src/video/x11/SDL_x11video.h @ 1555:780fd5b61df1
Fixed bug #89
Date: Sun, 23 Oct 2005 16:39:03 +0200
From: "A. Schmid" <sahib@phreaker.net>
Subject: [SDL] no software surfaces with svgalib driver?
Hi,
I noticed that the SDL (1.2.9) svgalib driver only makes use of linear
addressable (framebuffer) video modes. On older systems (like one of
mine), linear addressable modes are often not available.
Especially for cards with VESA VBE < 2.0 the svgalib vesa driver is
unusable, since VESA only supports framebuffering for VBE 2.0 and later.
The changes necessary to add support for software surfaces seem to be
relatively small. I only had to hack src/video/svga/SDL_svgavideo.c (see
attached patch). The code worked fine for me, but it is no more than a
proof of concept and should be reviewed (probably has a memory leak when
switching modes). It also uses the vgagl library (included in the
svgalib package) and needs to be linked against it.
-Alex
| author | Sam Lantinga <slouken@libsdl.org> |
|---|---|
| date | Sun, 19 Mar 2006 12:05:16 +0000 |
| parents | 8d9bb0cf2c2a |
| children | 34cca785be57 |
| rev | line source |
|---|---|
| 0 | 1 /* |
| 2 SDL - Simple DirectMedia Layer | |
|
1312
c9b51268668f
Updated copyright information and removed rcs id lines (problematic in branch merges)
Sam Lantinga <slouken@libsdl.org>
parents:
1306
diff
changeset
|
3 Copyright (C) 1997-2006 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:
1361
diff
changeset
|
22 #include "SDL_config.h" |
| 0 | 23 |
| 24 #ifndef _SDL_x11video_h | |
| 25 #define _SDL_x11video_h | |
| 26 | |
| 27 #include <X11/Xlib.h> | |
| 28 #include <X11/Xutil.h> | |
| 29 #include <X11/Xatom.h> | |
|
1168
045f186426e1
Dynamically load X11 libraries like we currently do for alsa, esd, etc.
Ryan C. Gordon <icculus@icculus.org>
parents:
769
diff
changeset
|
30 |
|
1361
19418e4422cb
New configure-based build system. Still work in progress, but much improved
Sam Lantinga <slouken@libsdl.org>
parents:
1336
diff
changeset
|
31 #include "SDL_mouse.h" |
|
19418e4422cb
New configure-based build system. Still work in progress, but much improved
Sam Lantinga <slouken@libsdl.org>
parents:
1336
diff
changeset
|
32 #include "../SDL_sysvideo.h" |
|
19418e4422cb
New configure-based build system. Still work in progress, but much improved
Sam Lantinga <slouken@libsdl.org>
parents:
1336
diff
changeset
|
33 |
|
19418e4422cb
New configure-based build system. Still work in progress, but much improved
Sam Lantinga <slouken@libsdl.org>
parents:
1336
diff
changeset
|
34 #if SDL_VIDEO_DRIVER_X11_DGAMOUSE |
|
19418e4422cb
New configure-based build system. Still work in progress, but much improved
Sam Lantinga <slouken@libsdl.org>
parents:
1336
diff
changeset
|
35 #include "../Xext/extensions/xf86dga.h" |
| 0 | 36 #endif |
|
1361
19418e4422cb
New configure-based build system. Still work in progress, but much improved
Sam Lantinga <slouken@libsdl.org>
parents:
1336
diff
changeset
|
37 #if SDL_VIDEO_DRIVER_X11_VIDMODE |
|
19418e4422cb
New configure-based build system. Still work in progress, but much improved
Sam Lantinga <slouken@libsdl.org>
parents:
1336
diff
changeset
|
38 #include "../Xext/extensions/xf86vmode.h" |
| 0 | 39 #endif |
|
1361
19418e4422cb
New configure-based build system. Still work in progress, but much improved
Sam Lantinga <slouken@libsdl.org>
parents:
1336
diff
changeset
|
40 #if SDL_VIDEO_DRIVER_X11_XME |
|
19418e4422cb
New configure-based build system. Still work in progress, but much improved
Sam Lantinga <slouken@libsdl.org>
parents:
1336
diff
changeset
|
41 #include "../Xext/extensions/xme.h" |
|
242
4bcb29d3769c
Added support for Xi Graphics XME fullscreen extension
Sam Lantinga <slouken@libsdl.org>
parents:
227
diff
changeset
|
42 #endif |
|
227
24878c14b391
Added X11 Xinerama support - fullscreen starts on screen 0
Sam Lantinga <slouken@libsdl.org>
parents:
0
diff
changeset
|
43 |
|
1168
045f186426e1
Dynamically load X11 libraries like we currently do for alsa, esd, etc.
Ryan C. Gordon <icculus@icculus.org>
parents:
769
diff
changeset
|
44 #include "SDL_x11dyn.h" |
| 0 | 45 |
| 46 /* Hidden "this" pointer for the video functions */ | |
| 47 #define _THIS SDL_VideoDevice *this | |
| 48 | |
| 49 /* Private display data */ | |
| 50 struct SDL_PrivateVideoData { | |
| 51 int local_X11; /* Flag: true if local display */ | |
| 52 Display *X11_Display; /* Used for events and window management */ | |
| 53 Display *GFX_Display; /* Used for graphics and colormap stuff */ | |
| 54 Visual *SDL_Visual; /* The visual used by our window */ | |
| 55 Window WMwindow; /* Input window, managed by window manager */ | |
| 56 Window FSwindow; /* Fullscreen window, completely unmanaged */ | |
| 57 Window SDL_Window; /* Shared by both displays (no X security?) */ | |
| 58 Atom WM_DELETE_WINDOW; /* "close-window" protocol atom */ | |
| 59 WMcursor *BlankCursor; /* The invisible cursor */ | |
|
1178
9867f3d86e44
Real Unicode support for X11. Based on updated version of this patch:
Ryan C. Gordon <icculus@icculus.org>
parents:
1168
diff
changeset
|
60 XIM X11_IM; /* Used to communicate with the input method (IM) server */ |
|
9867f3d86e44
Real Unicode support for X11. Based on updated version of this patch:
Ryan C. Gordon <icculus@icculus.org>
parents:
1168
diff
changeset
|
61 XIC X11_IC; /* Used for retaining the state, properties, and semantics of communication with the input method (IM) server */ |
| 0 | 62 |
| 63 char *SDL_windowid; /* Flag: true if we have been passed a window */ | |
| 64 | |
| 65 /* Direct Graphics Access extension information */ | |
| 66 int using_dga; | |
| 67 | |
| 68 #ifndef NO_SHARED_MEMORY | |
| 69 /* MIT shared memory extension information */ | |
| 70 int use_mitshm; | |
| 71 XShmSegmentInfo shminfo; | |
| 72 #endif | |
| 73 | |
| 74 /* The variables used for displaying graphics */ | |
| 75 XImage *Ximage; /* The X image for our window */ | |
| 76 GC gc; /* The graphic context for drawing */ | |
| 77 | |
| 78 /* The current width and height of the fullscreen mode */ | |
|
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
|
79 int window_w; |
|
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
|
80 int window_h; |
| 0 | 81 |
| 82 /* Support for internal mouse warping */ | |
| 83 struct { | |
| 84 int x; | |
| 85 int y; | |
| 86 } mouse_last; | |
| 87 struct { | |
| 88 int numerator; | |
| 89 int denominator; | |
| 90 int threshold; | |
| 91 } mouse_accel; | |
| 92 int mouse_relative; | |
| 93 | |
| 94 /* The current list of available video modes */ | |
| 95 SDL_Rect **modelist; | |
| 96 | |
| 97 /* available visuals of interest to us, sorted deepest first */ | |
| 98 struct { | |
| 99 Visual *visual; | |
| 100 int depth; /* number of significant bits/pixel */ | |
| 101 int bpp; /* pixel quantum in bits */ | |
| 102 } visuals[2*5]; /* at most 2 entries for 8, 15, 16, 24, 32 */ | |
| 103 int nvisuals; | |
| 104 | |
| 105 Visual *vis; /* current visual in use */ | |
| 106 int depth; /* current visual depth (not bpp) */ | |
| 107 | |
| 108 /* Variables used by the X11 video mode code */ | |
|
1361
19418e4422cb
New configure-based build system. Still work in progress, but much improved
Sam Lantinga <slouken@libsdl.org>
parents:
1336
diff
changeset
|
109 #if SDL_VIDEO_DRIVER_X11_VIDMODE |
|
292
eadc0746dfaf
Added SDL_LockRect() and SDL_UnlockRect()
Sam Lantinga <slouken@libsdl.org>
parents:
270
diff
changeset
|
110 SDL_NAME(XF86VidModeModeInfo) saved_mode; |
| 0 | 111 struct { |
| 112 int x, y; | |
| 113 } saved_view; | |
| 114 #endif | |
|
1361
19418e4422cb
New configure-based build system. Still work in progress, but much improved
Sam Lantinga <slouken@libsdl.org>
parents:
1336
diff
changeset
|
115 #if SDL_VIDEO_DRIVER_X11_XME /* XiG XME fullscreen */ |
|
242
4bcb29d3769c
Added support for Xi Graphics XME fullscreen extension
Sam Lantinga <slouken@libsdl.org>
parents:
227
diff
changeset
|
116 int use_xme; |
|
4bcb29d3769c
Added support for Xi Graphics XME fullscreen extension
Sam Lantinga <slouken@libsdl.org>
parents:
227
diff
changeset
|
117 XiGMiscResolutionInfo saved_res; |
|
4bcb29d3769c
Added support for Xi Graphics XME fullscreen extension
Sam Lantinga <slouken@libsdl.org>
parents:
227
diff
changeset
|
118 #endif |
|
4bcb29d3769c
Added support for Xi Graphics XME fullscreen extension
Sam Lantinga <slouken@libsdl.org>
parents:
227
diff
changeset
|
119 |
|
227
24878c14b391
Added X11 Xinerama support - fullscreen starts on screen 0
Sam Lantinga <slouken@libsdl.org>
parents:
0
diff
changeset
|
120 int xinerama_x; |
|
24878c14b391
Added X11 Xinerama support - fullscreen starts on screen 0
Sam Lantinga <slouken@libsdl.org>
parents:
0
diff
changeset
|
121 int xinerama_y; |
| 0 | 122 int use_vidmode; |
| 123 int currently_fullscreen; | |
| 124 | |
| 125 /* Automatic mode switching support (entering/leaving fullscreen) */ | |
| 126 Uint32 switch_waiting; | |
| 127 Uint32 switch_time; | |
| 128 | |
| 129 /* Prevent too many XSync() calls */ | |
| 130 int blit_queued; | |
| 131 | |
| 132 /* Colormap handling */ | |
| 133 Colormap DisplayColormap; /* The default display colormap */ | |
| 134 Colormap XColorMap; /* The current window colormap */ | |
| 135 int *XPixels; /* pixels value allocation counts */ | |
| 136 float gamma_saved[3]; /* Saved gamma values for VidMode gamma */ | |
| 137 int gamma_changed; /* flag: has VidMode gamma been modified? */ | |
| 138 | |
| 139 short *iconcolors; /* List of colors used by the icon */ | |
| 140 }; | |
| 141 | |
| 142 /* Old variable names */ | |
| 143 #define local_X11 (this->hidden->local_X11) | |
| 144 #define SDL_Display (this->hidden->X11_Display) | |
| 145 #define GFX_Display (this->hidden->GFX_Display) | |
| 146 #define SDL_Screen DefaultScreen(this->hidden->X11_Display) | |
| 147 #define SDL_Visual (this->hidden->vis) | |
| 148 #define SDL_Root RootWindow(SDL_Display, SDL_Screen) | |
| 149 #define WMwindow (this->hidden->WMwindow) | |
| 150 #define FSwindow (this->hidden->FSwindow) | |
| 151 #define SDL_Window (this->hidden->SDL_Window) | |
| 152 #define WM_DELETE_WINDOW (this->hidden->WM_DELETE_WINDOW) | |
| 153 #define SDL_BlankCursor (this->hidden->BlankCursor) | |
| 1327 | 154 #define SDL_IM (this->hidden->X11_IM) |
| 155 #define SDL_IC (this->hidden->X11_IC) | |
| 0 | 156 #define SDL_windowid (this->hidden->SDL_windowid) |
| 157 #define using_dga (this->hidden->using_dga) | |
| 158 #define use_mitshm (this->hidden->use_mitshm) | |
| 159 #define shminfo (this->hidden->shminfo) | |
| 160 #define SDL_Ximage (this->hidden->Ximage) | |
| 161 #define SDL_GC (this->hidden->gc) | |
|
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
|
162 #define window_w (this->hidden->window_w) |
|
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
|
163 #define window_h (this->hidden->window_h) |
| 0 | 164 #define mouse_last (this->hidden->mouse_last) |
| 165 #define mouse_accel (this->hidden->mouse_accel) | |
| 166 #define mouse_relative (this->hidden->mouse_relative) | |
| 167 #define SDL_modelist (this->hidden->modelist) | |
| 168 #define saved_mode (this->hidden->saved_mode) | |
| 169 #define saved_view (this->hidden->saved_view) | |
|
242
4bcb29d3769c
Added support for Xi Graphics XME fullscreen extension
Sam Lantinga <slouken@libsdl.org>
parents:
227
diff
changeset
|
170 #define use_xme (this->hidden->use_xme) |
|
4bcb29d3769c
Added support for Xi Graphics XME fullscreen extension
Sam Lantinga <slouken@libsdl.org>
parents:
227
diff
changeset
|
171 #define saved_res (this->hidden->saved_res) |
|
227
24878c14b391
Added X11 Xinerama support - fullscreen starts on screen 0
Sam Lantinga <slouken@libsdl.org>
parents:
0
diff
changeset
|
172 #define xinerama_x (this->hidden->xinerama_x) |
|
24878c14b391
Added X11 Xinerama support - fullscreen starts on screen 0
Sam Lantinga <slouken@libsdl.org>
parents:
0
diff
changeset
|
173 #define xinerama_y (this->hidden->xinerama_y) |
| 0 | 174 #define use_vidmode (this->hidden->use_vidmode) |
| 175 #define currently_fullscreen (this->hidden->currently_fullscreen) | |
| 176 #define switch_waiting (this->hidden->switch_waiting) | |
| 177 #define switch_time (this->hidden->switch_time) | |
| 178 #define blit_queued (this->hidden->blit_queued) | |
| 179 #define SDL_DisplayColormap (this->hidden->DisplayColormap) | |
| 180 #define SDL_PrivateColormap (this->hidden->PrivateColormap) | |
| 181 #define SDL_XColorMap (this->hidden->XColorMap) | |
| 182 #define SDL_XPixels (this->hidden->XPixels) | |
| 183 #define gamma_saved (this->hidden->gamma_saved) | |
| 184 #define gamma_changed (this->hidden->gamma_changed) | |
| 185 #define SDL_iconcolors (this->hidden->iconcolors) | |
| 186 /* Some versions of XFree86 have bugs - detect if this is one of them */ | |
| 187 #define BUGGY_XFREE86(condition, buggy_version) \ | |
|
1336
3692456e7b0f
Use SDL_ prefixed versions of C library functions.
Sam Lantinga <slouken@libsdl.org>
parents:
1327
diff
changeset
|
188 ((SDL_strcmp(ServerVendor(SDL_Display), "The XFree86 Project, Inc") == 0) && \ |
| 0 | 189 (VendorRelease(SDL_Display) condition buggy_version)) |
| 190 | |
| 191 #endif /* _SDL_x11video_h */ |