ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Better separate the XShm using code.

This commit is contained in:
Dmitry Timoshkov 2001-06-25 19:51:04 +00:00 committed by Alexandre Julliard
parent a556f688ec
commit 8d7b7d830c
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
graphics/x11drv/dib.c
View File

@ -34,7 +34,9 @@ DECLARE_DEBUG_CHANNEL(x11drv);
static int ximageDepthTable[32]; static int ximageDepthTable[32];
#ifdef HAVE_LIBXXSHM
static int XShmErrorFlag = 0; static int XShmErrorFlag = 0;
#endif
/* This structure holds the arguments for DIB_SetImageBits() */ /* This structure holds the arguments for DIB_SetImageBits() */
typedef struct typedef struct
@ -2776,6 +2778,7 @@ static int X11DRV_DIB_SetImageBits( const X11DRV_DIB_IMAGEBITS_DESCR *descr )
descr->drawable, descr->gc, bmpImage, descr->drawable, descr->gc, bmpImage,
descr->xSrc, descr->ySrc, descr->xDest, descr->yDest, descr->xSrc, descr->ySrc, descr->xDest, descr->yDest,
descr->width, descr->height); descr->width, descr->height);
#ifdef HAVE_LIBXXSHM
if (descr->useShm) if (descr->useShm)
{ {
XShmPutImage( gdi_display, descr->drawable, descr->gc, bmpImage, XShmPutImage( gdi_display, descr->drawable, descr->gc, bmpImage,
@ -2784,6 +2787,7 @@ static int X11DRV_DIB_SetImageBits( const X11DRV_DIB_IMAGEBITS_DESCR *descr )
XSync( gdi_display, 0 ); XSync( gdi_display, 0 );
} }
else else
#endif
XPutImage( gdi_display, descr->drawable, descr->gc, bmpImage, XPutImage( gdi_display, descr->drawable, descr->gc, bmpImage,
descr->xSrc, descr->ySrc, descr->xDest, descr->yDest, descr->xSrc, descr->ySrc, descr->xDest, descr->yDest,
descr->width, descr->height ); descr->width, descr->height );
@ -3769,6 +3773,7 @@ HBITMAP16 X11DRV_DIB_CreateDIBSection16(
return res; return res;
} }
#ifdef HAVE_LIBXXSHM
/*********************************************************************** /***********************************************************************
* X11DRV_XShmErrorHandler * X11DRV_XShmErrorHandler
* *
@ -3783,8 +3788,6 @@ static int XShmErrorHandler(Display *dpy, XErrorEvent *event)
* X11DRV_XShmCreateImage * X11DRV_XShmCreateImage
* *
*/ */
#ifdef HAVE_LIBXXSHM
static XImage *X11DRV_XShmCreateImage( int width, int height, int bpp, static XImage *X11DRV_XShmCreateImage( int width, int height, int bpp,
XShmSegmentInfo* shminfo) XShmSegmentInfo* shminfo)
{ {