gnustep/libs-back
0
0
Fork 0
mirror of https://github.com/gnustep/libs-back.git synced 2025-04-22 23:42:16 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Don't give up on xshm when pixmaps aren't supported.

Browse source 
Based on proposal by Derk Fawcus <dfawcus+lists-gnustep-dev@employees.org>.


git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/back/trunk@29359 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Fred Kiefer 2010-01-22 17:18:55 +00:00
parent 4311e19de6
commit 2a93b165fb
2 changed files with 25 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -1,3 +1,9 @@
2010-01-22 Fred Kiefer <FredKiefer@gmx.de>
* Source/x11/XWindowBuffer.m (+windowBufferForWindow:depthInfo:)
(test_xshm): Don't give up on xshm when pixmaps aren't supported.
Based on proposal by Derk Fawcus <dfawcus+lists-gnustep-dev@employees.org>.
2010-01-22 Wolfgang Lux <wolfgang.lux@gmail.com>
* Source/x11/XWindowBuffer.m (+windowBufferForWindow:depthInfo:):

35
Source/x11/XWindowBuffer.m
View file

@ -49,6 +49,7 @@ static int use_shape_hack = 0; /* this is an ugly hack : ) */
static int did_test_xshm = 0;
static int use_xshm = 1;
static Bool use_xshm_pixmaps = 0;
static int num_xshm_test_errors = 0;
static NSString *xshm_warning
@ -86,9 +87,8 @@ static void test_xshm(Display *display, Visual *visual, int drawing_depth)
{
int major, minor;
Bool pixmaps;
if (!XShmQueryVersion(display, &major, &minor, &pixmaps) || !pixmaps)
if (!XShmQueryVersion(display, &major, &minor, &use_xshm_pixmaps))
{
NSLog(@"XShm pixmaps not supported by X server.");
NSLog(xshm_warning);
@ -351,21 +351,24 @@ no_xshm:
goto no_xshm;
}
/* We try to create a shared pixmap using the same buffer, and set
it as the background of the window. This allows X to handle expose
events all by itself, which avoids white flashing when things are
dragged across a window. */
/* TODO: we still get and handle expose events, although we don't
need to. */
wi->pixmap = XShmCreatePixmap(wi->display, wi->drawable,
wi->ximage->data, &wi->shminfo,
wi->window->xframe.size.width,
wi->window->xframe.size.height,
drawing_depth);
if (wi->pixmap) /* TODO: this doesn't work */
if (use_xshm_pixmaps)
{
XSetWindowBackgroundPixmap(wi->display, wi->window->ident,
wi->pixmap);
/* We try to create a shared pixmap using the same buffer, and set
it as the background of the window. This allows X to handle expose
events all by itself, which avoids white flashing when things are
dragged across a window. */
/* TODO: we still get and handle expose events, although we don't
need to. */
wi->pixmap = XShmCreatePixmap(wi->display, wi->drawable,
wi->ximage->data, &wi->shminfo,
wi->window->xframe.size.width,
wi->window->xframe.size.height,
drawing_depth);
if (wi->pixmap) /* TODO: this doesn't work */
{
XSetWindowBackgroundPixmap(wi->display, wi->window->ident,
wi->pixmap);
}
}
/* On some systems (eg. freebsd), X can't attach to the shared segment