Mercurial > sdl-ios-xcode
annotate src/video/x11/SDL_x11image.c @ 1280:f61f045343d3
Re-query the SDL_WINDOWID each time we initialize the video
| author | Sam Lantinga <slouken@libsdl.org> |
|---|---|
| date | Sun, 29 Jan 2006 06:11:38 +0000 |
| parents | 045f186426e1 |
| children | c9b51268668f |
| rev | line source |
|---|---|
| 0 | 1 /* |
| 2 SDL - Simple DirectMedia Layer | |
|
769
b8d311d90021
Updated copyright information for 2004 (Happy New Year!)
Sam Lantinga <slouken@libsdl.org>
parents:
605
diff
changeset
|
3 Copyright (C) 1997-2004 Sam Lantinga |
| 0 | 4 |
| 5 This library is free software; you can redistribute it and/or | |
| 6 modify it under the terms of the GNU Library General Public | |
| 7 License as published by the Free Software Foundation; either | |
| 8 version 2 of the License, or (at your option) any later version. | |
| 9 | |
| 10 This library is distributed in the hope that it will be useful, | |
| 11 but WITHOUT ANY WARRANTY; without even the implied warranty of | |
| 12 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | |
| 13 Library General Public License for more details. | |
| 14 | |
| 15 You should have received a copy of the GNU Library General Public | |
| 16 License along with this library; if not, write to the Free | |
| 17 Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | |
| 18 | |
| 19 Sam Lantinga | |
|
252
e8157fcb3114
Updated the source with the correct e-mail address
Sam Lantinga <slouken@libsdl.org>
parents:
166
diff
changeset
|
20 slouken@libsdl.org |
| 0 | 21 */ |
| 22 | |
| 23 #ifdef SAVE_RCSID | |
| 24 static char rcsid = | |
| 25 "@(#) $Id$"; | |
| 26 #endif | |
| 27 | |
| 28 #include <stdlib.h> | |
|
166
39877400bd1e
Fixed Solaris nitpicks (thanks Mattias!)
Sam Lantinga <slouken@libsdl.org>
parents:
161
diff
changeset
|
29 #include <unistd.h> |
| 0 | 30 |
| 31 #include "SDL_error.h" | |
| 32 #include "SDL_endian.h" | |
|
161
eb6b76a95f2d
An expose event is now sent when using XVideo output.
Sam Lantinga <slouken@libsdl.org>
parents:
0
diff
changeset
|
33 #include "SDL_events_c.h" |
| 0 | 34 #include "SDL_x11image_c.h" |
| 35 | |
| 36 #ifndef NO_SHARED_MEMORY | |
| 37 | |
| 38 /* Shared memory error handler routine */ | |
| 39 static int shm_error; | |
| 40 static int (*X_handler)(Display *, XErrorEvent *) = NULL; | |
| 41 static int shm_errhandler(Display *d, XErrorEvent *e) | |
| 42 { | |
| 43 if ( e->error_code == BadAccess ) { | |
|
810
26a0e2d69d39
*** empty log message ***
Sam Lantinga <slouken@libsdl.org>
parents:
769
diff
changeset
|
44 shm_error = True; |
| 0 | 45 return(0); |
| 46 } else | |
| 47 return(X_handler(d,e)); | |
| 48 } | |
|
270
37fa1484f71b
From: "Mattias Engdeg�rd" <f91-men@nada.kth.se>
Sam Lantinga <slouken@libsdl.org>
parents:
252
diff
changeset
|
49 |
|
37fa1484f71b
From: "Mattias Engdeg�rd" <f91-men@nada.kth.se>
Sam Lantinga <slouken@libsdl.org>
parents:
252
diff
changeset
|
50 static void try_mitshm(_THIS, SDL_Surface *screen) |
|
37fa1484f71b
From: "Mattias Engdeg�rd" <f91-men@nada.kth.se>
Sam Lantinga <slouken@libsdl.org>
parents:
252
diff
changeset
|
51 { |
|
37fa1484f71b
From: "Mattias Engdeg�rd" <f91-men@nada.kth.se>
Sam Lantinga <slouken@libsdl.org>
parents:
252
diff
changeset
|
52 if(!use_mitshm) |
|
37fa1484f71b
From: "Mattias Engdeg�rd" <f91-men@nada.kth.se>
Sam Lantinga <slouken@libsdl.org>
parents:
252
diff
changeset
|
53 return; |
|
37fa1484f71b
From: "Mattias Engdeg�rd" <f91-men@nada.kth.se>
Sam Lantinga <slouken@libsdl.org>
parents:
252
diff
changeset
|
54 shminfo.shmid = shmget(IPC_PRIVATE, screen->h*screen->pitch, |
|
37fa1484f71b
From: "Mattias Engdeg�rd" <f91-men@nada.kth.se>
Sam Lantinga <slouken@libsdl.org>
parents:
252
diff
changeset
|
55 IPC_CREAT | 0777); |
|
37fa1484f71b
From: "Mattias Engdeg�rd" <f91-men@nada.kth.se>
Sam Lantinga <slouken@libsdl.org>
parents:
252
diff
changeset
|
56 if ( shminfo.shmid >= 0 ) { |
|
37fa1484f71b
From: "Mattias Engdeg�rd" <f91-men@nada.kth.se>
Sam Lantinga <slouken@libsdl.org>
parents:
252
diff
changeset
|
57 shminfo.shmaddr = (char *)shmat(shminfo.shmid, 0, 0); |
|
37fa1484f71b
From: "Mattias Engdeg�rd" <f91-men@nada.kth.se>
Sam Lantinga <slouken@libsdl.org>
parents:
252
diff
changeset
|
58 shminfo.readOnly = False; |
|
37fa1484f71b
From: "Mattias Engdeg�rd" <f91-men@nada.kth.se>
Sam Lantinga <slouken@libsdl.org>
parents:
252
diff
changeset
|
59 if ( shminfo.shmaddr != (char *)-1 ) { |
|
37fa1484f71b
From: "Mattias Engdeg�rd" <f91-men@nada.kth.se>
Sam Lantinga <slouken@libsdl.org>
parents:
252
diff
changeset
|
60 shm_error = False; |
|
1168
045f186426e1
Dynamically load X11 libraries like we currently do for alsa, esd, etc.
Ryan C. Gordon <icculus@icculus.org>
parents:
810
diff
changeset
|
61 X_handler = pXSetErrorHandler(shm_errhandler); |
|
045f186426e1
Dynamically load X11 libraries like we currently do for alsa, esd, etc.
Ryan C. Gordon <icculus@icculus.org>
parents:
810
diff
changeset
|
62 pXShmAttach(SDL_Display, &shminfo); |
|
045f186426e1
Dynamically load X11 libraries like we currently do for alsa, esd, etc.
Ryan C. Gordon <icculus@icculus.org>
parents:
810
diff
changeset
|
63 pXSync(SDL_Display, True); |
|
045f186426e1
Dynamically load X11 libraries like we currently do for alsa, esd, etc.
Ryan C. Gordon <icculus@icculus.org>
parents:
810
diff
changeset
|
64 pXSetErrorHandler(X_handler); |
|
810
26a0e2d69d39
*** empty log message ***
Sam Lantinga <slouken@libsdl.org>
parents:
769
diff
changeset
|
65 if ( shm_error ) |
|
270
37fa1484f71b
From: "Mattias Engdeg�rd" <f91-men@nada.kth.se>
Sam Lantinga <slouken@libsdl.org>
parents:
252
diff
changeset
|
66 shmdt(shminfo.shmaddr); |
|
37fa1484f71b
From: "Mattias Engdeg�rd" <f91-men@nada.kth.se>
Sam Lantinga <slouken@libsdl.org>
parents:
252
diff
changeset
|
67 } else { |
|
37fa1484f71b
From: "Mattias Engdeg�rd" <f91-men@nada.kth.se>
Sam Lantinga <slouken@libsdl.org>
parents:
252
diff
changeset
|
68 shm_error = True; |
|
37fa1484f71b
From: "Mattias Engdeg�rd" <f91-men@nada.kth.se>
Sam Lantinga <slouken@libsdl.org>
parents:
252
diff
changeset
|
69 } |
|
37fa1484f71b
From: "Mattias Engdeg�rd" <f91-men@nada.kth.se>
Sam Lantinga <slouken@libsdl.org>
parents:
252
diff
changeset
|
70 shmctl(shminfo.shmid, IPC_RMID, NULL); |
|
37fa1484f71b
From: "Mattias Engdeg�rd" <f91-men@nada.kth.se>
Sam Lantinga <slouken@libsdl.org>
parents:
252
diff
changeset
|
71 } else { |
|
37fa1484f71b
From: "Mattias Engdeg�rd" <f91-men@nada.kth.se>
Sam Lantinga <slouken@libsdl.org>
parents:
252
diff
changeset
|
72 shm_error = True; |
|
37fa1484f71b
From: "Mattias Engdeg�rd" <f91-men@nada.kth.se>
Sam Lantinga <slouken@libsdl.org>
parents:
252
diff
changeset
|
73 } |
|
37fa1484f71b
From: "Mattias Engdeg�rd" <f91-men@nada.kth.se>
Sam Lantinga <slouken@libsdl.org>
parents:
252
diff
changeset
|
74 if ( shm_error ) |
|
37fa1484f71b
From: "Mattias Engdeg�rd" <f91-men@nada.kth.se>
Sam Lantinga <slouken@libsdl.org>
parents:
252
diff
changeset
|
75 use_mitshm = 0; |
|
37fa1484f71b
From: "Mattias Engdeg�rd" <f91-men@nada.kth.se>
Sam Lantinga <slouken@libsdl.org>
parents:
252
diff
changeset
|
76 if ( use_mitshm ) |
|
37fa1484f71b
From: "Mattias Engdeg�rd" <f91-men@nada.kth.se>
Sam Lantinga <slouken@libsdl.org>
parents:
252
diff
changeset
|
77 screen->pixels = shminfo.shmaddr; |
|
37fa1484f71b
From: "Mattias Engdeg�rd" <f91-men@nada.kth.se>
Sam Lantinga <slouken@libsdl.org>
parents:
252
diff
changeset
|
78 } |
| 0 | 79 #endif /* ! NO_SHARED_MEMORY */ |
| 80 | |
| 81 /* Various screen update functions available */ | |
| 82 static void X11_NormalUpdate(_THIS, int numrects, SDL_Rect *rects); | |
| 83 static void X11_MITSHMUpdate(_THIS, int numrects, SDL_Rect *rects); | |
| 84 | |
| 85 int X11_SetupImage(_THIS, SDL_Surface *screen) | |
| 86 { | |
|
270
37fa1484f71b
From: "Mattias Engdeg�rd" <f91-men@nada.kth.se>
Sam Lantinga <slouken@libsdl.org>
parents:
252
diff
changeset
|
87 #ifndef NO_SHARED_MEMORY |
|
37fa1484f71b
From: "Mattias Engdeg�rd" <f91-men@nada.kth.se>
Sam Lantinga <slouken@libsdl.org>
parents:
252
diff
changeset
|
88 try_mitshm(this, screen); |
|
37fa1484f71b
From: "Mattias Engdeg�rd" <f91-men@nada.kth.se>
Sam Lantinga <slouken@libsdl.org>
parents:
252
diff
changeset
|
89 if(use_mitshm) { |
|
1168
045f186426e1
Dynamically load X11 libraries like we currently do for alsa, esd, etc.
Ryan C. Gordon <icculus@icculus.org>
parents:
810
diff
changeset
|
90 SDL_Ximage = pXShmCreateImage(SDL_Display, SDL_Visual, |
|
270
37fa1484f71b
From: "Mattias Engdeg�rd" <f91-men@nada.kth.se>
Sam Lantinga <slouken@libsdl.org>
parents:
252
diff
changeset
|
91 this->hidden->depth, ZPixmap, |
|
37fa1484f71b
From: "Mattias Engdeg�rd" <f91-men@nada.kth.se>
Sam Lantinga <slouken@libsdl.org>
parents:
252
diff
changeset
|
92 shminfo.shmaddr, &shminfo, |
|
37fa1484f71b
From: "Mattias Engdeg�rd" <f91-men@nada.kth.se>
Sam Lantinga <slouken@libsdl.org>
parents:
252
diff
changeset
|
93 screen->w, screen->h); |
|
37fa1484f71b
From: "Mattias Engdeg�rd" <f91-men@nada.kth.se>
Sam Lantinga <slouken@libsdl.org>
parents:
252
diff
changeset
|
94 if(!SDL_Ximage) { |
|
1168
045f186426e1
Dynamically load X11 libraries like we currently do for alsa, esd, etc.
Ryan C. Gordon <icculus@icculus.org>
parents:
810
diff
changeset
|
95 pXShmDetach(SDL_Display, &shminfo); |
|
045f186426e1
Dynamically load X11 libraries like we currently do for alsa, esd, etc.
Ryan C. Gordon <icculus@icculus.org>
parents:
810
diff
changeset
|
96 pXSync(SDL_Display, False); |
|
270
37fa1484f71b
From: "Mattias Engdeg�rd" <f91-men@nada.kth.se>
Sam Lantinga <slouken@libsdl.org>
parents:
252
diff
changeset
|
97 shmdt(shminfo.shmaddr); |
|
37fa1484f71b
From: "Mattias Engdeg�rd" <f91-men@nada.kth.se>
Sam Lantinga <slouken@libsdl.org>
parents:
252
diff
changeset
|
98 screen->pixels = NULL; |
|
37fa1484f71b
From: "Mattias Engdeg�rd" <f91-men@nada.kth.se>
Sam Lantinga <slouken@libsdl.org>
parents:
252
diff
changeset
|
99 goto error; |
| 0 | 100 } |
|
270
37fa1484f71b
From: "Mattias Engdeg�rd" <f91-men@nada.kth.se>
Sam Lantinga <slouken@libsdl.org>
parents:
252
diff
changeset
|
101 this->UpdateRects = X11_MITSHMUpdate; |
| 0 | 102 } |
|
551
b0c5a13a4243
Doh! Compile error if there was no X11 shared image support
Sam Lantinga <slouken@libsdl.org>
parents:
297
diff
changeset
|
103 if(!use_mitshm) |
|
270
37fa1484f71b
From: "Mattias Engdeg�rd" <f91-men@nada.kth.se>
Sam Lantinga <slouken@libsdl.org>
parents:
252
diff
changeset
|
104 #endif /* not NO_SHARED_MEMORY */ |
|
551
b0c5a13a4243
Doh! Compile error if there was no X11 shared image support
Sam Lantinga <slouken@libsdl.org>
parents:
297
diff
changeset
|
105 { |
|
270
37fa1484f71b
From: "Mattias Engdeg�rd" <f91-men@nada.kth.se>
Sam Lantinga <slouken@libsdl.org>
parents:
252
diff
changeset
|
106 int bpp; |
|
37fa1484f71b
From: "Mattias Engdeg�rd" <f91-men@nada.kth.se>
Sam Lantinga <slouken@libsdl.org>
parents:
252
diff
changeset
|
107 screen->pixels = malloc(screen->h*screen->pitch); |
|
37fa1484f71b
From: "Mattias Engdeg�rd" <f91-men@nada.kth.se>
Sam Lantinga <slouken@libsdl.org>
parents:
252
diff
changeset
|
108 if ( screen->pixels == NULL ) { |
|
37fa1484f71b
From: "Mattias Engdeg�rd" <f91-men@nada.kth.se>
Sam Lantinga <slouken@libsdl.org>
parents:
252
diff
changeset
|
109 SDL_OutOfMemory(); |
|
37fa1484f71b
From: "Mattias Engdeg�rd" <f91-men@nada.kth.se>
Sam Lantinga <slouken@libsdl.org>
parents:
252
diff
changeset
|
110 return -1; |
|
37fa1484f71b
From: "Mattias Engdeg�rd" <f91-men@nada.kth.se>
Sam Lantinga <slouken@libsdl.org>
parents:
252
diff
changeset
|
111 } |
|
37fa1484f71b
From: "Mattias Engdeg�rd" <f91-men@nada.kth.se>
Sam Lantinga <slouken@libsdl.org>
parents:
252
diff
changeset
|
112 bpp = screen->format->BytesPerPixel; |
|
1168
045f186426e1
Dynamically load X11 libraries like we currently do for alsa, esd, etc.
Ryan C. Gordon <icculus@icculus.org>
parents:
810
diff
changeset
|
113 SDL_Ximage = pXCreateImage(SDL_Display, SDL_Visual, |
| 0 | 114 this->hidden->depth, ZPixmap, 0, |
| 115 (char *)screen->pixels, | |
| 116 screen->w, screen->h, | |
|
270
37fa1484f71b
From: "Mattias Engdeg�rd" <f91-men@nada.kth.se>
Sam Lantinga <slouken@libsdl.org>
parents:
252
diff
changeset
|
117 32, 0); |
|
37fa1484f71b
From: "Mattias Engdeg�rd" <f91-men@nada.kth.se>
Sam Lantinga <slouken@libsdl.org>
parents:
252
diff
changeset
|
118 if ( SDL_Ximage == NULL ) |
|
37fa1484f71b
From: "Mattias Engdeg�rd" <f91-men@nada.kth.se>
Sam Lantinga <slouken@libsdl.org>
parents:
252
diff
changeset
|
119 goto error; |
|
37fa1484f71b
From: "Mattias Engdeg�rd" <f91-men@nada.kth.se>
Sam Lantinga <slouken@libsdl.org>
parents:
252
diff
changeset
|
120 /* XPutImage will convert byte sex automatically */ |
|
37fa1484f71b
From: "Mattias Engdeg�rd" <f91-men@nada.kth.se>
Sam Lantinga <slouken@libsdl.org>
parents:
252
diff
changeset
|
121 SDL_Ximage->byte_order = (SDL_BYTEORDER == SDL_BIG_ENDIAN) |
|
37fa1484f71b
From: "Mattias Engdeg�rd" <f91-men@nada.kth.se>
Sam Lantinga <slouken@libsdl.org>
parents:
252
diff
changeset
|
122 ? MSBFirst : LSBFirst; |
|
37fa1484f71b
From: "Mattias Engdeg�rd" <f91-men@nada.kth.se>
Sam Lantinga <slouken@libsdl.org>
parents:
252
diff
changeset
|
123 this->UpdateRects = X11_NormalUpdate; |
| 0 | 124 } |
| 125 screen->pitch = SDL_Ximage->bytes_per_line; | |
|
270
37fa1484f71b
From: "Mattias Engdeg�rd" <f91-men@nada.kth.se>
Sam Lantinga <slouken@libsdl.org>
parents:
252
diff
changeset
|
126 return(0); |
| 0 | 127 |
|
270
37fa1484f71b
From: "Mattias Engdeg�rd" <f91-men@nada.kth.se>
Sam Lantinga <slouken@libsdl.org>
parents:
252
diff
changeset
|
128 error: |
|
37fa1484f71b
From: "Mattias Engdeg�rd" <f91-men@nada.kth.se>
Sam Lantinga <slouken@libsdl.org>
parents:
252
diff
changeset
|
129 SDL_SetError("Couldn't create XImage"); |
|
37fa1484f71b
From: "Mattias Engdeg�rd" <f91-men@nada.kth.se>
Sam Lantinga <slouken@libsdl.org>
parents:
252
diff
changeset
|
130 return 1; |
| 0 | 131 } |
| 132 | |
| 133 void X11_DestroyImage(_THIS, SDL_Surface *screen) | |
| 134 { | |
| 135 if ( SDL_Ximage ) { | |
|
1168
045f186426e1
Dynamically load X11 libraries like we currently do for alsa, esd, etc.
Ryan C. Gordon <icculus@icculus.org>
parents:
810
diff
changeset
|
136 pXDestroyImage(SDL_Ximage); |
| 0 | 137 #ifndef NO_SHARED_MEMORY |
| 138 if ( use_mitshm ) { | |
|
1168
045f186426e1
Dynamically load X11 libraries like we currently do for alsa, esd, etc.
Ryan C. Gordon <icculus@icculus.org>
parents:
810
diff
changeset
|
139 pXShmDetach(SDL_Display, &shminfo); |
|
045f186426e1
Dynamically load X11 libraries like we currently do for alsa, esd, etc.
Ryan C. Gordon <icculus@icculus.org>
parents:
810
diff
changeset
|
140 pXSync(SDL_Display, False); |
| 0 | 141 shmdt(shminfo.shmaddr); |
| 142 } | |
| 143 #endif /* ! NO_SHARED_MEMORY */ | |
| 144 SDL_Ximage = NULL; | |
| 145 } | |
| 146 if ( screen ) { | |
| 147 screen->pixels = NULL; | |
| 148 } | |
| 149 } | |
| 150 | |
|
166
39877400bd1e
Fixed Solaris nitpicks (thanks Mattias!)
Sam Lantinga <slouken@libsdl.org>
parents:
161
diff
changeset
|
151 /* Determine the number of CPUs in the system */ |
| 0 | 152 static int num_CPU(void) |
| 153 { | |
| 154 static int num_cpus = 0; | |
| 155 | |
| 156 if(!num_cpus) { | |
|
166
39877400bd1e
Fixed Solaris nitpicks (thanks Mattias!)
Sam Lantinga <slouken@libsdl.org>
parents:
161
diff
changeset
|
157 #if defined(__linux) |
| 0 | 158 char line[BUFSIZ]; |
| 159 FILE *pstat = fopen("/proc/stat", "r"); | |
| 160 if ( pstat ) { | |
| 161 while ( fgets(line, sizeof(line), pstat) ) { | |
| 162 if (memcmp(line, "cpu", 3) == 0 && line[3] != ' ') { | |
| 163 ++num_cpus; | |
| 164 } | |
| 165 } | |
| 166 fclose(pstat); | |
| 167 } | |
|
605
6399f4e90211
IRIX patches from Andrea Suatoni
Sam Lantinga <slouken@libsdl.org>
parents:
551
diff
changeset
|
168 #elif defined(__sgi) |
|
6399f4e90211
IRIX patches from Andrea Suatoni
Sam Lantinga <slouken@libsdl.org>
parents:
551
diff
changeset
|
169 num_cpus = sysconf(_SC_NPROC_ONLN); |
|
166
39877400bd1e
Fixed Solaris nitpicks (thanks Mattias!)
Sam Lantinga <slouken@libsdl.org>
parents:
161
diff
changeset
|
170 #elif defined(_SC_NPROCESSORS_ONLN) |
|
39877400bd1e
Fixed Solaris nitpicks (thanks Mattias!)
Sam Lantinga <slouken@libsdl.org>
parents:
161
diff
changeset
|
171 /* number of processors online (SVR4.0MP compliant machines) */ |
|
39877400bd1e
Fixed Solaris nitpicks (thanks Mattias!)
Sam Lantinga <slouken@libsdl.org>
parents:
161
diff
changeset
|
172 num_cpus = sysconf(_SC_NPROCESSORS_ONLN); |
|
39877400bd1e
Fixed Solaris nitpicks (thanks Mattias!)
Sam Lantinga <slouken@libsdl.org>
parents:
161
diff
changeset
|
173 #elif defined(_SC_NPROCESSORS_CONF) |
|
39877400bd1e
Fixed Solaris nitpicks (thanks Mattias!)
Sam Lantinga <slouken@libsdl.org>
parents:
161
diff
changeset
|
174 /* number of processors configured (SVR4.0MP compliant machines) */ |
|
39877400bd1e
Fixed Solaris nitpicks (thanks Mattias!)
Sam Lantinga <slouken@libsdl.org>
parents:
161
diff
changeset
|
175 num_cpus = sysconf(_SC_NPROCESSORS_CONF); |
| 0 | 176 #endif |
| 177 if ( num_cpus <= 0 ) { | |
| 178 num_cpus = 1; | |
| 179 } | |
| 180 } | |
| 181 return num_cpus; | |
| 182 } | |
| 183 | |
| 184 int X11_ResizeImage(_THIS, SDL_Surface *screen, Uint32 flags) | |
| 185 { | |
| 186 int retval; | |
| 187 | |
| 188 X11_DestroyImage(this, screen); | |
| 189 if ( flags & SDL_OPENGL ) { /* No image when using GL */ | |
| 190 retval = 0; | |
| 191 } else { | |
| 192 retval = X11_SetupImage(this, screen); | |
| 193 /* We support asynchronous blitting on the display */ | |
| 194 if ( flags & SDL_ASYNCBLIT ) { | |
| 195 /* This is actually slower on single-CPU systems, | |
| 196 probably because of CPU contention between the | |
| 197 X server and the application. | |
| 198 Note: Is this still true with XFree86 4.0? | |
| 199 */ | |
| 200 if ( num_CPU() > 1 ) { | |
| 201 screen->flags |= SDL_ASYNCBLIT; | |
| 202 } | |
| 203 } | |
| 204 } | |
| 205 return(retval); | |
| 206 } | |
| 207 | |
| 208 /* We don't actually allow hardware surfaces other than the main one */ | |
| 209 int X11_AllocHWSurface(_THIS, SDL_Surface *surface) | |
| 210 { | |
| 211 return(-1); | |
| 212 } | |
| 213 void X11_FreeHWSurface(_THIS, SDL_Surface *surface) | |
| 214 { | |
| 215 return; | |
| 216 } | |
| 217 | |
| 218 int X11_LockHWSurface(_THIS, SDL_Surface *surface) | |
| 219 { | |
| 220 if ( (surface == SDL_VideoSurface) && blit_queued ) { | |
|
1168
045f186426e1
Dynamically load X11 libraries like we currently do for alsa, esd, etc.
Ryan C. Gordon <icculus@icculus.org>
parents:
810
diff
changeset
|
221 pXSync(GFX_Display, False); |
| 0 | 222 blit_queued = 0; |
| 223 } | |
| 224 return(0); | |
| 225 } | |
| 226 void X11_UnlockHWSurface(_THIS, SDL_Surface *surface) | |
| 227 { | |
| 228 return; | |
| 229 } | |
| 230 | |
| 231 int X11_FlipHWSurface(_THIS, SDL_Surface *surface) | |
| 232 { | |
| 233 return(0); | |
| 234 } | |
| 235 | |
| 236 static void X11_NormalUpdate(_THIS, int numrects, SDL_Rect *rects) | |
| 237 { | |
| 238 int i; | |
|
270
37fa1484f71b
From: "Mattias Engdeg�rd" <f91-men@nada.kth.se>
Sam Lantinga <slouken@libsdl.org>
parents:
252
diff
changeset
|
239 |
|
37fa1484f71b
From: "Mattias Engdeg�rd" <f91-men@nada.kth.se>
Sam Lantinga <slouken@libsdl.org>
parents:
252
diff
changeset
|
240 for (i = 0; i < numrects; ++i) { |
|
37fa1484f71b
From: "Mattias Engdeg�rd" <f91-men@nada.kth.se>
Sam Lantinga <slouken@libsdl.org>
parents:
252
diff
changeset
|
241 if ( rects[i].w == 0 || rects[i].h == 0 ) { /* Clipped? */ |
|
37fa1484f71b
From: "Mattias Engdeg�rd" <f91-men@nada.kth.se>
Sam Lantinga <slouken@libsdl.org>
parents:
252
diff
changeset
|
242 continue; |
| 0 | 243 } |
|
1168
045f186426e1
Dynamically load X11 libraries like we currently do for alsa, esd, etc.
Ryan C. Gordon <icculus@icculus.org>
parents:
810
diff
changeset
|
244 pXPutImage(GFX_Display, SDL_Window, SDL_GC, SDL_Ximage, |
|
270
37fa1484f71b
From: "Mattias Engdeg�rd" <f91-men@nada.kth.se>
Sam Lantinga <slouken@libsdl.org>
parents:
252
diff
changeset
|
245 rects[i].x, rects[i].y, |
|
37fa1484f71b
From: "Mattias Engdeg�rd" <f91-men@nada.kth.se>
Sam Lantinga <slouken@libsdl.org>
parents:
252
diff
changeset
|
246 rects[i].x, rects[i].y, rects[i].w, rects[i].h); |
| 0 | 247 } |
| 248 if ( SDL_VideoSurface->flags & SDL_ASYNCBLIT ) { | |
|
1168
045f186426e1
Dynamically load X11 libraries like we currently do for alsa, esd, etc.
Ryan C. Gordon <icculus@icculus.org>
parents:
810
diff
changeset
|
249 pXFlush(GFX_Display); |
|
270
37fa1484f71b
From: "Mattias Engdeg�rd" <f91-men@nada.kth.se>
Sam Lantinga <slouken@libsdl.org>
parents:
252
diff
changeset
|
250 blit_queued = 1; |
| 0 | 251 } else { |
|
1168
045f186426e1
Dynamically load X11 libraries like we currently do for alsa, esd, etc.
Ryan C. Gordon <icculus@icculus.org>
parents:
810
diff
changeset
|
252 pXSync(GFX_Display, False); |
| 0 | 253 } |
| 254 } | |
| 255 | |
| 256 static void X11_MITSHMUpdate(_THIS, int numrects, SDL_Rect *rects) | |
| 257 { | |
| 258 #ifndef NO_SHARED_MEMORY | |
| 259 int i; | |
| 260 | |
| 261 for ( i=0; i<numrects; ++i ) { | |
|
270
37fa1484f71b
From: "Mattias Engdeg�rd" <f91-men@nada.kth.se>
Sam Lantinga <slouken@libsdl.org>
parents:
252
diff
changeset
|
262 if ( rects[i].w == 0 || rects[i].h == 0 ) { /* Clipped? */ |
| 0 | 263 continue; |
| 264 } | |
|
1168
045f186426e1
Dynamically load X11 libraries like we currently do for alsa, esd, etc.
Ryan C. Gordon <icculus@icculus.org>
parents:
810
diff
changeset
|
265 pXShmPutImage(GFX_Display, SDL_Window, SDL_GC, SDL_Ximage, |
| 0 | 266 rects[i].x, rects[i].y, |
| 267 rects[i].x, rects[i].y, rects[i].w, rects[i].h, | |
| 268 False); | |
| 269 } | |
| 270 if ( SDL_VideoSurface->flags & SDL_ASYNCBLIT ) { | |
|
1168
045f186426e1
Dynamically load X11 libraries like we currently do for alsa, esd, etc.
Ryan C. Gordon <icculus@icculus.org>
parents:
810
diff
changeset
|
271 pXFlush(GFX_Display); |
|
270
37fa1484f71b
From: "Mattias Engdeg�rd" <f91-men@nada.kth.se>
Sam Lantinga <slouken@libsdl.org>
parents:
252
diff
changeset
|
272 blit_queued = 1; |
| 0 | 273 } else { |
|
1168
045f186426e1
Dynamically load X11 libraries like we currently do for alsa, esd, etc.
Ryan C. Gordon <icculus@icculus.org>
parents:
810
diff
changeset
|
274 pXSync(GFX_Display, False); |
| 0 | 275 } |
| 276 #endif /* ! NO_SHARED_MEMORY */ | |
| 277 } | |
| 278 | |
| 279 /* There's a problem with the automatic refreshing of the display. | |
| 280 Even though the XVideo code uses the GFX_Display to update the | |
| 281 video memory, it appears that updating the window asynchronously | |
| 282 from a different thread will cause "blackouts" of the window. | |
| 283 This is a sort of a hacked workaround for the problem. | |
| 284 */ | |
| 285 static int enable_autorefresh = 1; | |
| 286 | |
| 287 void X11_DisableAutoRefresh(_THIS) | |
| 288 { | |
| 289 --enable_autorefresh; | |
| 290 } | |
| 291 | |
| 292 void X11_EnableAutoRefresh(_THIS) | |
| 293 { | |
| 294 ++enable_autorefresh; | |
| 295 } | |
| 296 | |
| 297 void X11_RefreshDisplay(_THIS) | |
| 298 { | |
|
161
eb6b76a95f2d
An expose event is now sent when using XVideo output.
Sam Lantinga <slouken@libsdl.org>
parents:
0
diff
changeset
|
299 /* Don't refresh a display that doesn't have an image (like GL) |
|
eb6b76a95f2d
An expose event is now sent when using XVideo output.
Sam Lantinga <slouken@libsdl.org>
parents:
0
diff
changeset
|
300 Instead, post an expose event so the application can refresh. |
|
eb6b76a95f2d
An expose event is now sent when using XVideo output.
Sam Lantinga <slouken@libsdl.org>
parents:
0
diff
changeset
|
301 */ |
| 0 | 302 if ( ! SDL_Ximage || (enable_autorefresh <= 0) ) { |
|
161
eb6b76a95f2d
An expose event is now sent when using XVideo output.
Sam Lantinga <slouken@libsdl.org>
parents:
0
diff
changeset
|
303 SDL_PrivateExpose(); |
| 0 | 304 return; |
| 305 } | |
| 306 #ifndef NO_SHARED_MEMORY | |
| 307 if ( this->UpdateRects == X11_MITSHMUpdate ) { | |
|
1168
045f186426e1
Dynamically load X11 libraries like we currently do for alsa, esd, etc.
Ryan C. Gordon <icculus@icculus.org>
parents:
810
diff
changeset
|
308 pXShmPutImage(SDL_Display, SDL_Window, SDL_GC, SDL_Ximage, |
| 0 | 309 0, 0, 0, 0, this->screen->w, this->screen->h, |
| 310 False); | |
|
270
37fa1484f71b
From: "Mattias Engdeg�rd" <f91-men@nada.kth.se>
Sam Lantinga <slouken@libsdl.org>
parents:
252
diff
changeset
|
311 } else |
| 0 | 312 #endif /* ! NO_SHARED_MEMORY */ |
|
270
37fa1484f71b
From: "Mattias Engdeg�rd" <f91-men@nada.kth.se>
Sam Lantinga <slouken@libsdl.org>
parents:
252
diff
changeset
|
313 { |
|
1168
045f186426e1
Dynamically load X11 libraries like we currently do for alsa, esd, etc.
Ryan C. Gordon <icculus@icculus.org>
parents:
810
diff
changeset
|
314 pXPutImage(SDL_Display, SDL_Window, SDL_GC, SDL_Ximage, |
|
270
37fa1484f71b
From: "Mattias Engdeg�rd" <f91-men@nada.kth.se>
Sam Lantinga <slouken@libsdl.org>
parents:
252
diff
changeset
|
315 0, 0, 0, 0, this->screen->w, this->screen->h); |
| 0 | 316 } |
|
1168
045f186426e1
Dynamically load X11 libraries like we currently do for alsa, esd, etc.
Ryan C. Gordon <icculus@icculus.org>
parents:
810
diff
changeset
|
317 pXSync(SDL_Display, False); |
| 0 | 318 } |