fdo-mirrors/xserver
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/xorg/xserver.git synced 2026-01-01 23:30:09 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Make sure beck-end server MIT-SHM support really works before using it.

Browse source
This commit is contained in:
David Reveman 2008-09-16 11:26:46 -04:00
parent f777f9ee7e
commit af2db5f25c
1 changed files with 76 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

82
hw/dmx/dmxshm.c
View file

@ -607,16 +607,23 @@ dmxProcShmPutImage (ClientPtr client)
Bool
dmxShmInit (ScreenPtr pScreen)
{
DMXScreenInfo *dmxScreen = &dmxScreens[pScreen->myNum];
xcb_generic_error_t *error;
xcb_shm_seg_t shmseg;
uint32_t shmid;
char *shmaddr;
DMXScreenInfo *dmxScreen = &dmxScreens[pScreen->myNum];
xcb_generic_error_t *error;
xcb_shm_seg_t shmseg;
xcb_pixmap_t pixmap = 0;
uint32_t shmid;
static char key[] = { 'x', 'd', 'm', 'x' };
char *shmaddr;
xcb_shm_get_image_reply_t *reply;
XlibGC gc;
XGCValues gcvals;
unsigned long mask;
int i;
if (!dmxScreen->beDisplay)
return FALSE;
shmid = shmget (IPC_PRIVATE, 32, IPC_CREAT | 0600);
shmid = shmget (IPC_PRIVATE, sizeof (key), IPC_CREAT | 0600);
if (shmid == -1)
return FALSE;
@ -627,6 +634,8 @@ dmxShmInit (ScreenPtr pScreen)
return FALSE;
}
memset (shmaddr, 0, sizeof (key));
shmseg = xcb_generate_id (dmxScreen->connection);
error = xcb_request_check (dmxScreen->connection,
xcb_shm_attach_checked (dmxScreen->connection,
@ -641,10 +650,71 @@ dmxShmInit (ScreenPtr pScreen)
return FALSE;
}
mask = (GCFunction | GCPlaneMask | GCClipMask);
gcvals.function = GXcopy;
gcvals.plane_mask = AllPlanes;
gcvals.clip_mask = None;
gcvals.foreground = 0;
pixmap = xcb_generate_id (dmxScreen->connection);
xcb_create_pixmap (dmxScreen->connection,
8,
pixmap,
dmxScreen->scrnWin,
sizeof (key),
1);
XLIB_PROLOGUE (dmxScreen);
gc = XCreateGC (dmxScreen->beDisplay, pixmap, mask, &gcvals);
if (gc)
{
for (i = 0; i < sizeof (key); i++)
{
gcvals.foreground = key[i];
XChangeGC (dmxScreen->beDisplay, gc, GCForeground, &gcvals);
XFillRectangle (dmxScreen->beDisplay, pixmap, gc, i, 0, 1, 1);
}
XFreeGC (dmxScreen->beDisplay, gc);
}
XLIB_EPILOGUE (dmxScreen);
reply =
xcb_shm_get_image_reply (dmxScreen->connection,
xcb_shm_get_image (dmxScreen->connection,
pixmap,
0, 0,
sizeof (key), 1,
0xff,
XCB_IMAGE_FORMAT_Z_PIXMAP,
shmseg,
0),
NULL);
xcb_free_pixmap (dmxScreen->connection, pixmap);
if (!reply)
{
xcb_shm_detach (dmxScreen->connection, shmseg);
shmdt (shmaddr);
shmctl (shmid, IPC_RMID, NULL);
return FALSE;
}
free (reply);
for (i = 0; i < sizeof (key); i++)
if (shmaddr[i] != key[i])
break;
xcb_shm_detach (dmxScreen->connection, shmseg);
shmdt (shmaddr);
shmctl (shmid, IPC_RMID, NULL);
if (i < sizeof (key))
return FALSE;
return TRUE;
}