sdl-ios-xcode: src/video/x11/SDL

annotate src/video/x11/SDL_x11image.c @ 1585:980d2a0dc2a3

Date: Tue, 4 Mar 2003 15:05:31 -0800 From: "Jim" Subject: [SDL] Frame Buffer patches... Okay I'm new at patch generation - so please tell me if there's a better way I could have done this. Attached are two patch files generated with 'cvs diff -u' SDL-fb-open-lock.patch applies to SDL_fbvideo.c Modifies the open loop to check /dev/fb/0 found on devfs... Modifies the lock code to return failure if the current virtual terminal is not the one opened for frame buffer writing... Lock would hang forever if switched away (ctrl-alt-F1) ... SDL-fb-mousedrv-screensave.patch applies to SDL_fbevents.c Switches default mouse mode based on SDL_MOUSEDRV - currently only accepts PS2 - otherwise default is MS Mouse. When the screen is switched - exisiting code (wrapped in ifdef SAVE_SCREEN_COTENTS) would save the wrong bit of the screen.... ( I run frame buffer 1600x1200, the size I requested was 800x600 - the save would save the top 800 lines (non biased) and restore them... Adding screen->offset fixed that ) However, if that option is not set, then a call to SDL_UpdateRect (full screen) is made. (which may have had it's contents changed since the screen is not entirely locked because of lock-failure patch) Jim [patches slightly tweaked for SDL 1.2.10]

author	Sam Lantinga <slouken@libsdl.org>
date	Wed, 22 Mar 2006 07:48:22 +0000
parents	3ba88cb7eb1b
children	e49147870aac c121d94672cb a1b03ba2fcd0

rev	line source
0 74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1 /*
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	2 SDL - Simple DirectMedia Layer
1312 c9b51268668f Updated copyright information and removed rcs id lines (problematic in branch merges) Sam Lantinga <slouken@libsdl.org> parents: 1168 diff changeset	3 Copyright (C) 1997-2006 Sam Lantinga
0 74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	4
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	5 This library is free software; you can redistribute it and/or
1312 c9b51268668f Updated copyright information and removed rcs id lines (problematic in branch merges) Sam Lantinga <slouken@libsdl.org> parents: 1168 diff changeset	6 modify it under the terms of the GNU Lesser General Public
0 74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	7 License as published by the Free Software Foundation; either
1312 c9b51268668f Updated copyright information and removed rcs id lines (problematic in branch merges) Sam Lantinga <slouken@libsdl.org> parents: 1168 diff changeset	8 version 2.1 of the License, or (at your option) any later version.
0 74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	9
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	10 This library is distributed in the hope that it will be useful,
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	11 but WITHOUT ANY WARRANTY; without even the implied warranty of
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	12 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
1312 c9b51268668f Updated copyright information and removed rcs id lines (problematic in branch merges) Sam Lantinga <slouken@libsdl.org> parents: 1168 diff changeset	13 Lesser General Public License for more details.
0 74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	14
1312 c9b51268668f Updated copyright information and removed rcs id lines (problematic in branch merges) Sam Lantinga <slouken@libsdl.org> parents: 1168 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: 1168 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: 1168 diff changeset	17 Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
0 74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	18
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	19 Sam Lantinga
252 e8157fcb3114 Updated the source with the correct e-mail address Sam Lantinga <slouken@libsdl.org> parents: 166 diff changeset	20 slouken@libsdl.org
0 74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	21 */
1402 d910939febfa Use consistent identifiers for the various platforms we support. Sam Lantinga <slouken@libsdl.org> parents: 1361 diff changeset	22 #include "SDL_config.h"
0 74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	23
1338 604d73db6802 Removed uses of stdlib.h and string.h Sam Lantinga <slouken@libsdl.org> parents: 1336 diff changeset	24 #include <stdio.h>
166 39877400bd1e Fixed Solaris nitpicks (thanks Mattias!) Sam Lantinga <slouken@libsdl.org> parents: 161 diff changeset	25 #include <unistd.h>
0 74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	26
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	27 #include "SDL_endian.h"
1361 19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: 1358 diff changeset	28 #include "../../events/SDL_events_c.h"
0 74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	29 #include "SDL_x11image_c.h"
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	30
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	31 #ifndef NO_SHARED_MEMORY
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	32
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	33 /* Shared memory error handler routine */
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	34 static int shm_error;
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	35 static int (X_handler)(Display , XErrorEvent *) = NULL;
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	36 static int shm_errhandler(Display d, XErrorEvent e)
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	37 {
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	38 if ( e->error_code == BadAccess ) {
810 26a0e2d69d39 * empty log message * Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	39 shm_error = True;
0 74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	40 return(0);
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	41 } else
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	42 return(X_handler(d,e));
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	43 }
270 37fa1484f71b From: "Mattias Engdeg�rd" <f91-men@nada.kth.se> Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	44
37fa1484f71b From: "Mattias Engdeg�rd" <f91-men@nada.kth.se> Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	45 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	46 {
1575 3ba88cb7eb1b Updated dynamic X11 code. See details in Bugzilla #170. Ryan C. Gordon <icculus@icculus.org> parents: 1402 diff changeset	47 /* Dynamic X11 may not have SHM entry points on this box. */
3ba88cb7eb1b Updated dynamic X11 code. See details in Bugzilla #170. Ryan C. Gordon <icculus@icculus.org> parents: 1402 diff changeset	48 if ((use_mitshm) && (!SDL_X11_HAVE_SHM))
3ba88cb7eb1b Updated dynamic X11 code. See details in Bugzilla #170. Ryan C. Gordon <icculus@icculus.org> parents: 1402 diff changeset	49 use_mitshm = 0;
3ba88cb7eb1b Updated dynamic X11 code. See details in Bugzilla #170. Ryan C. Gordon <icculus@icculus.org> parents: 1402 diff changeset	50
270 37fa1484f71b From: "Mattias Engdeg�rd" <f91-men@nada.kth.se> Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	51 if(!use_mitshm)
37fa1484f71b From: "Mattias Engdeg�rd" <f91-men@nada.kth.se> Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	52 return;
37fa1484f71b From: "Mattias Engdeg�rd" <f91-men@nada.kth.se> Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	53 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	54 IPC_CREAT \| 0777);
37fa1484f71b From: "Mattias Engdeg�rd" <f91-men@nada.kth.se> Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	55 if ( shminfo.shmid >= 0 ) {
37fa1484f71b From: "Mattias Engdeg�rd" <f91-men@nada.kth.se> Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	56 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	57 shminfo.readOnly = False;
37fa1484f71b From: "Mattias Engdeg�rd" <f91-men@nada.kth.se> Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	58 if ( shminfo.shmaddr != (char *)-1 ) {
37fa1484f71b From: "Mattias Engdeg�rd" <f91-men@nada.kth.se> Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	59 shm_error = False;
1575 3ba88cb7eb1b Updated dynamic X11 code. See details in Bugzilla #170. Ryan C. Gordon <icculus@icculus.org> parents: 1402 diff changeset	60 X_handler = XSetErrorHandler(shm_errhandler);
3ba88cb7eb1b Updated dynamic X11 code. See details in Bugzilla #170. Ryan C. Gordon <icculus@icculus.org> parents: 1402 diff changeset	61 XShmAttach(SDL_Display, &shminfo);
3ba88cb7eb1b Updated dynamic X11 code. See details in Bugzilla #170. Ryan C. Gordon <icculus@icculus.org> parents: 1402 diff changeset	62 XSync(SDL_Display, True);
3ba88cb7eb1b Updated dynamic X11 code. See details in Bugzilla #170. Ryan C. Gordon <icculus@icculus.org> parents: 1402 diff changeset	63 XSetErrorHandler(X_handler);
810 26a0e2d69d39 * empty log message * Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	64 if ( shm_error )
270 37fa1484f71b From: "Mattias Engdeg�rd" <f91-men@nada.kth.se> Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	65 shmdt(shminfo.shmaddr);
37fa1484f71b From: "Mattias Engdeg�rd" <f91-men@nada.kth.se> Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	66 } else {
37fa1484f71b From: "Mattias Engdeg�rd" <f91-men@nada.kth.se> Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	67 shm_error = True;
37fa1484f71b From: "Mattias Engdeg�rd" <f91-men@nada.kth.se> Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	68 }
37fa1484f71b From: "Mattias Engdeg�rd" <f91-men@nada.kth.se> Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	69 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	70 } else {
37fa1484f71b From: "Mattias Engdeg�rd" <f91-men@nada.kth.se> Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	71 shm_error = True;
37fa1484f71b From: "Mattias Engdeg�rd" <f91-men@nada.kth.se> Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	72 }
37fa1484f71b From: "Mattias Engdeg�rd" <f91-men@nada.kth.se> Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	73 if ( shm_error )
37fa1484f71b From: "Mattias Engdeg�rd" <f91-men@nada.kth.se> Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	74 use_mitshm = 0;
37fa1484f71b From: "Mattias Engdeg�rd" <f91-men@nada.kth.se> Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	75 if ( use_mitshm )
37fa1484f71b From: "Mattias Engdeg�rd" <f91-men@nada.kth.se> Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	76 screen->pixels = shminfo.shmaddr;
37fa1484f71b From: "Mattias Engdeg�rd" <f91-men@nada.kth.se> Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	77 }
0 74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	78 #endif /* ! NO_SHARED_MEMORY */
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	79
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	80 /* Various screen update functions available */
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	81 static void X11_NormalUpdate(_THIS, int numrects, SDL_Rect *rects);
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	82 static void X11_MITSHMUpdate(_THIS, int numrects, SDL_Rect *rects);
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	83
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	84 int X11_SetupImage(_THIS, SDL_Surface *screen)
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	85 {
270 37fa1484f71b From: "Mattias Engdeg�rd" <f91-men@nada.kth.se> Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	86 #ifndef NO_SHARED_MEMORY
37fa1484f71b From: "Mattias Engdeg�rd" <f91-men@nada.kth.se> Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	87 try_mitshm(this, screen);
37fa1484f71b From: "Mattias Engdeg�rd" <f91-men@nada.kth.se> Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	88 if(use_mitshm) {
1575 3ba88cb7eb1b Updated dynamic X11 code. See details in Bugzilla #170. Ryan C. Gordon <icculus@icculus.org> parents: 1402 diff changeset	89 SDL_Ximage = XShmCreateImage(SDL_Display, SDL_Visual,
270 37fa1484f71b From: "Mattias Engdeg�rd" <f91-men@nada.kth.se> Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	90 this->hidden->depth, ZPixmap,
37fa1484f71b From: "Mattias Engdeg�rd" <f91-men@nada.kth.se> Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	91 shminfo.shmaddr, &shminfo,
37fa1484f71b From: "Mattias Engdeg�rd" <f91-men@nada.kth.se> Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	92 screen->w, screen->h);
37fa1484f71b From: "Mattias Engdeg�rd" <f91-men@nada.kth.se> Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	93 if(!SDL_Ximage) {
1575 3ba88cb7eb1b Updated dynamic X11 code. See details in Bugzilla #170. Ryan C. Gordon <icculus@icculus.org> parents: 1402 diff changeset	94 XShmDetach(SDL_Display, &shminfo);
3ba88cb7eb1b Updated dynamic X11 code. See details in Bugzilla #170. Ryan C. Gordon <icculus@icculus.org> parents: 1402 diff changeset	95 XSync(SDL_Display, False);
270 37fa1484f71b From: "Mattias Engdeg�rd" <f91-men@nada.kth.se> Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	96 shmdt(shminfo.shmaddr);
37fa1484f71b From: "Mattias Engdeg�rd" <f91-men@nada.kth.se> Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	97 screen->pixels = NULL;
37fa1484f71b From: "Mattias Engdeg�rd" <f91-men@nada.kth.se> Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	98 goto error;
0 74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	99 }
270 37fa1484f71b From: "Mattias Engdeg�rd" <f91-men@nada.kth.se> Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	100 this->UpdateRects = X11_MITSHMUpdate;
0 74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	101 }
551 b0c5a13a4243 Doh! Compile error if there was no X11 shared image support Sam Lantinga <slouken@libsdl.org> parents: 297 diff changeset	102 if(!use_mitshm)
270 37fa1484f71b From: "Mattias Engdeg�rd" <f91-men@nada.kth.se> Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	103 #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	104 {
270 37fa1484f71b From: "Mattias Engdeg�rd" <f91-men@nada.kth.se> Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	105 int bpp;
1336 3692456e7b0f Use SDL_ prefixed versions of C library functions. Sam Lantinga <slouken@libsdl.org> parents: 1312 diff changeset	106 screen->pixels = SDL_malloc(screen->h*screen->pitch);
270 37fa1484f71b From: "Mattias Engdeg�rd" <f91-men@nada.kth.se> Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	107 if ( screen->pixels == NULL ) {
37fa1484f71b From: "Mattias Engdeg�rd" <f91-men@nada.kth.se> Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	108 SDL_OutOfMemory();
37fa1484f71b From: "Mattias Engdeg�rd" <f91-men@nada.kth.se> Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	109 return -1;
37fa1484f71b From: "Mattias Engdeg�rd" <f91-men@nada.kth.se> Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	110 }
37fa1484f71b From: "Mattias Engdeg�rd" <f91-men@nada.kth.se> Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	111 bpp = screen->format->BytesPerPixel;
1575 3ba88cb7eb1b Updated dynamic X11 code. See details in Bugzilla #170. Ryan C. Gordon <icculus@icculus.org> parents: 1402 diff changeset	112 SDL_Ximage = XCreateImage(SDL_Display, SDL_Visual,
0 74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	113 this->hidden->depth, ZPixmap, 0,
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	114 (char *)screen->pixels,
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	115 screen->w, screen->h,
270 37fa1484f71b From: "Mattias Engdeg�rd" <f91-men@nada.kth.se> Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	116 32, 0);
37fa1484f71b From: "Mattias Engdeg�rd" <f91-men@nada.kth.se> Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	117 if ( SDL_Ximage == NULL )
37fa1484f71b From: "Mattias Engdeg�rd" <f91-men@nada.kth.se> Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	118 goto error;
37fa1484f71b From: "Mattias Engdeg�rd" <f91-men@nada.kth.se> Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	119 /* 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	120 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	121 ? MSBFirst : LSBFirst;
37fa1484f71b From: "Mattias Engdeg�rd" <f91-men@nada.kth.se> Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	122 this->UpdateRects = X11_NormalUpdate;
0 74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	123 }
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	124 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	125 return(0);
0 74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	126
270 37fa1484f71b From: "Mattias Engdeg�rd" <f91-men@nada.kth.se> Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	127 error:
37fa1484f71b From: "Mattias Engdeg�rd" <f91-men@nada.kth.se> Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	128 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	129 return 1;
0 74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	130 }
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	131
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	132 void X11_DestroyImage(_THIS, SDL_Surface *screen)
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	133 {
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	134 if ( SDL_Ximage ) {
1575 3ba88cb7eb1b Updated dynamic X11 code. See details in Bugzilla #170. Ryan C. Gordon <icculus@icculus.org> parents: 1402 diff changeset	135 XDestroyImage(SDL_Ximage);
0 74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	136 #ifndef NO_SHARED_MEMORY
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	137 if ( use_mitshm ) {
1575 3ba88cb7eb1b Updated dynamic X11 code. See details in Bugzilla #170. Ryan C. Gordon <icculus@icculus.org> parents: 1402 diff changeset	138 XShmDetach(SDL_Display, &shminfo);
3ba88cb7eb1b Updated dynamic X11 code. See details in Bugzilla #170. Ryan C. Gordon <icculus@icculus.org> parents: 1402 diff changeset	139 XSync(SDL_Display, False);
0 74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	140 shmdt(shminfo.shmaddr);
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	141 }
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	142 #endif /* ! NO_SHARED_MEMORY */
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	143 SDL_Ximage = NULL;
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	144 }
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	145 if ( screen ) {
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	146 screen->pixels = NULL;
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	147 }
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	148 }
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	149
166 39877400bd1e Fixed Solaris nitpicks (thanks Mattias!) Sam Lantinga <slouken@libsdl.org> parents: 161 diff changeset	150 /* Determine the number of CPUs in the system */
0 74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	151 static int num_CPU(void)
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	152 {
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	153 static int num_cpus = 0;
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	154
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	155 if(!num_cpus) {
1402 d910939febfa Use consistent identifiers for the various platforms we support. Sam Lantinga <slouken@libsdl.org> parents: 1361 diff changeset	156 #if defined(__LINUX__)
0 74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	157 char line[BUFSIZ];
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	158 FILE *pstat = fopen("/proc/stat", "r");
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	159 if ( pstat ) {
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	160 while ( fgets(line, sizeof(line), pstat) ) {
1336 3692456e7b0f Use SDL_ prefixed versions of C library functions. Sam Lantinga <slouken@libsdl.org> parents: 1312 diff changeset	161 if (SDL_memcmp(line, "cpu", 3) == 0 && line[3] != ' ') {
0 74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	162 ++num_cpus;
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	163 }
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	164 }
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	165 fclose(pstat);
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	166 }
1402 d910939febfa Use consistent identifiers for the various platforms we support. Sam Lantinga <slouken@libsdl.org> parents: 1361 diff changeset	167 #elif defined(__IRIX__)
605 6399f4e90211 IRIX patches from Andrea Suatoni Sam Lantinga <slouken@libsdl.org> parents: 551 diff changeset	168 num_cpus = sysconf(_SC_NPROC_ONLN);
166 39877400bd1e Fixed Solaris nitpicks (thanks Mattias!) Sam Lantinga <slouken@libsdl.org> parents: 161 diff changeset	169 #elif defined(_SC_NPROCESSORS_ONLN)
39877400bd1e Fixed Solaris nitpicks (thanks Mattias!) Sam Lantinga <slouken@libsdl.org> parents: 161 diff changeset	170 /* number of processors online (SVR4.0MP compliant machines) */
39877400bd1e Fixed Solaris nitpicks (thanks Mattias!) Sam Lantinga <slouken@libsdl.org> parents: 161 diff changeset	171 num_cpus = sysconf(_SC_NPROCESSORS_ONLN);
39877400bd1e Fixed Solaris nitpicks (thanks Mattias!) Sam Lantinga <slouken@libsdl.org> parents: 161 diff changeset	172 #elif defined(_SC_NPROCESSORS_CONF)
39877400bd1e Fixed Solaris nitpicks (thanks Mattias!) Sam Lantinga <slouken@libsdl.org> parents: 161 diff changeset	173 /* number of processors configured (SVR4.0MP compliant machines) */
39877400bd1e Fixed Solaris nitpicks (thanks Mattias!) Sam Lantinga <slouken@libsdl.org> parents: 161 diff changeset	174 num_cpus = sysconf(_SC_NPROCESSORS_CONF);
0 74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	175 #endif
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	176 if ( num_cpus <= 0 ) {
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	177 num_cpus = 1;
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	178 }
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	179 }
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	180 return num_cpus;
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	181 }
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	182
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	183 int X11_ResizeImage(_THIS, SDL_Surface *screen, Uint32 flags)
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	184 {
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	185 int retval;
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	186
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	187 X11_DestroyImage(this, screen);
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	188 if ( flags & SDL_OPENGL ) { /* No image when using GL */
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	189 retval = 0;
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	190 } else {
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	191 retval = X11_SetupImage(this, screen);
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	192 /* We support asynchronous blitting on the display */
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	193 if ( flags & SDL_ASYNCBLIT ) {
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	194 /* This is actually slower on single-CPU systems,
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	195 probably because of CPU contention between the
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	196 X server and the application.
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	197 Note: Is this still true with XFree86 4.0?
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	198 */
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	199 if ( num_CPU() > 1 ) {
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	200 screen->flags \|= SDL_ASYNCBLIT;
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	201 }
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	202 }
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	203 }
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	204 return(retval);
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	205 }
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	206
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	207 /* We don't actually allow hardware surfaces other than the main one */
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	208 int X11_AllocHWSurface(_THIS, SDL_Surface *surface)
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	209 {
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	210 return(-1);
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	211 }
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	212 void X11_FreeHWSurface(_THIS, SDL_Surface *surface)
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	213 {
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	214 return;
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	215 }
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	216
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	217 int X11_LockHWSurface(_THIS, SDL_Surface *surface)
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	218 {
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	219 if ( (surface == SDL_VideoSurface) && blit_queued ) {
1575 3ba88cb7eb1b Updated dynamic X11 code. See details in Bugzilla #170. Ryan C. Gordon <icculus@icculus.org> parents: 1402 diff changeset	220 XSync(GFX_Display, False);
0 74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	221 blit_queued = 0;
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	222 }
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	223 return(0);
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	224 }
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	225 void X11_UnlockHWSurface(_THIS, SDL_Surface *surface)
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	226 {
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	227 return;
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	228 }
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	229
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	230 int X11_FlipHWSurface(_THIS, SDL_Surface *surface)
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	231 {
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	232 return(0);
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	233 }
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	234
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	235 static void X11_NormalUpdate(_THIS, int numrects, SDL_Rect *rects)
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	236 {
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	237 int i;
270 37fa1484f71b From: "Mattias Engdeg�rd" <f91-men@nada.kth.se> Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	238
37fa1484f71b From: "Mattias Engdeg�rd" <f91-men@nada.kth.se> Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	239 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	240 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	241 continue;
0 74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	242 }
1575 3ba88cb7eb1b Updated dynamic X11 code. See details in Bugzilla #170. Ryan C. Gordon <icculus@icculus.org> parents: 1402 diff changeset	243 XPutImage(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	244 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	245 rects[i].x, rects[i].y, rects[i].w, rects[i].h);
0 74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	246 }
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	247 if ( SDL_VideoSurface->flags & SDL_ASYNCBLIT ) {
1575 3ba88cb7eb1b Updated dynamic X11 code. See details in Bugzilla #170. Ryan C. Gordon <icculus@icculus.org> parents: 1402 diff changeset	248 XFlush(GFX_Display);
270 37fa1484f71b From: "Mattias Engdeg�rd" <f91-men@nada.kth.se> Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	249 blit_queued = 1;
0 74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	250 } else {
1575 3ba88cb7eb1b Updated dynamic X11 code. See details in Bugzilla #170. Ryan C. Gordon <icculus@icculus.org> parents: 1402 diff changeset	251 XSync(GFX_Display, False);
0 74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	252 }
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	253 }
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	254
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	255 static void X11_MITSHMUpdate(_THIS, int numrects, SDL_Rect *rects)
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	256 {
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	257 #ifndef NO_SHARED_MEMORY
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	258 int i;
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	259
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	260 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	261 if ( rects[i].w == 0 \|\| rects[i].h == 0 ) { /* Clipped? */
0 74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	262 continue;
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	263 }
1575 3ba88cb7eb1b Updated dynamic X11 code. See details in Bugzilla #170. Ryan C. Gordon <icculus@icculus.org> parents: 1402 diff changeset	264 XShmPutImage(GFX_Display, SDL_Window, SDL_GC, SDL_Ximage,
0 74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	265 rects[i].x, rects[i].y,
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	266 rects[i].x, rects[i].y, rects[i].w, rects[i].h,
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	267 False);
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	268 }
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	269 if ( SDL_VideoSurface->flags & SDL_ASYNCBLIT ) {
1575 3ba88cb7eb1b Updated dynamic X11 code. See details in Bugzilla #170. Ryan C. Gordon <icculus@icculus.org> parents: 1402 diff changeset	270 XFlush(GFX_Display);
270 37fa1484f71b From: "Mattias Engdeg�rd" <f91-men@nada.kth.se> Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	271 blit_queued = 1;
0 74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	272 } else {
1575 3ba88cb7eb1b Updated dynamic X11 code. See details in Bugzilla #170. Ryan C. Gordon <icculus@icculus.org> parents: 1402 diff changeset	273 XSync(GFX_Display, False);
0 74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	274 }
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	275 #endif /* ! NO_SHARED_MEMORY */
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	276 }
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	277
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	278 /* There's a problem with the automatic refreshing of the display.
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	279 Even though the XVideo code uses the GFX_Display to update the
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	280 video memory, it appears that updating the window asynchronously
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	281 from a different thread will cause "blackouts" of the window.
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	282 This is a sort of a hacked workaround for the problem.
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	283 */
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	284 static int enable_autorefresh = 1;
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	285
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	286 void X11_DisableAutoRefresh(_THIS)
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	287 {
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	288 --enable_autorefresh;
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	289 }
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	290
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	291 void X11_EnableAutoRefresh(_THIS)
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	292 {
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	293 ++enable_autorefresh;
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	294 }
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	295
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	296 void X11_RefreshDisplay(_THIS)
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	297 {
161 eb6b76a95f2d An expose event is now sent when using XVideo output. Sam Lantinga <slouken@libsdl.org> parents: 0 diff changeset	298 /* 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	299 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	300 */
0 74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	301 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	302 SDL_PrivateExpose();
0 74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	303 return;
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	304 }
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	305 #ifndef NO_SHARED_MEMORY
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	306 if ( this->UpdateRects == X11_MITSHMUpdate ) {
1575 3ba88cb7eb1b Updated dynamic X11 code. See details in Bugzilla #170. Ryan C. Gordon <icculus@icculus.org> parents: 1402 diff changeset	307 XShmPutImage(SDL_Display, SDL_Window, SDL_GC, SDL_Ximage,
0 74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	308 0, 0, 0, 0, this->screen->w, this->screen->h,
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	309 False);
270 37fa1484f71b From: "Mattias Engdeg�rd" <f91-men@nada.kth.se> Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	310 } else
0 74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	311 #endif /* ! NO_SHARED_MEMORY */
270 37fa1484f71b From: "Mattias Engdeg�rd" <f91-men@nada.kth.se> Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	312 {
1575 3ba88cb7eb1b Updated dynamic X11 code. See details in Bugzilla #170. Ryan C. Gordon <icculus@icculus.org> parents: 1402 diff changeset	313 XPutImage(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	314 0, 0, 0, 0, this->screen->w, this->screen->h);
0 74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	315 }
1575 3ba88cb7eb1b Updated dynamic X11 code. See details in Bugzilla #170. Ryan C. Gordon <icculus@icculus.org> parents: 1402 diff changeset	316 XSync(SDL_Display, False);
0 74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	317 }
1575 3ba88cb7eb1b Updated dynamic X11 code. See details in Bugzilla #170. Ryan C. Gordon <icculus@icculus.org> parents: 1402 diff changeset	318

Mercurial > sdl-ios-xcode

annotate src/video/x11/SDL_x11image.c @ 1585:980d2a0dc2a3