gnustep/libs-back
0
0
Fork 0
mirror of https://github.com/gnustep/libs-back.git synced 2025-06-01 09:42:17 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Mark segment as destruction after letting X attach (makes it work on freebsd).

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/back/trunk@14319 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
alexm 2002-08-22 23:54:29 +00:00
parent ce6a32a9ea
commit c1d32ecf82
2 changed files with 14 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
2002-08-23 01:54 Alexander Malmberg <alexander@malmberg.org>
* Source/art/ARTWindowBuffer.m (+artWindowBufferForWindow:): Mark
the segment for destruction after X has attached to it.
2002-08-23 01:44 Alexander Malmberg <alexander@malmberg.org> 2002-08-23 01:44 Alexander Malmberg <alexander@malmberg.org>
* Source/art/ARTContext.m: Implement handling of non-rectangle * Source/art/ARTContext.m: Implement handling of non-rectangle

17
Source/art/ARTWindowBuffer.m
View file

@ -155,21 +155,22 @@ static int use_shape_hack = 0; /* this is an ugly hack :) */
if (!wi->shminfo.shmid == -1) if (!wi->shminfo.shmid == -1)
NSLog(@"shmget() failed"); /* TODO */ NSLog(@"shmget() failed"); /* TODO */
/* printf("shminfo.shmid=%08x %i bytes (%ix%i)\n",
wi->shminfo.shmid, wi->ximage->bytes_per_line * wi->ximage->height,
wi->ximage->width, wi->ximage->height);*/
wi->shminfo.shmaddr = wi->ximage->data = shmat(wi->shminfo.shmid, 0, 0); wi->shminfo.shmaddr = wi->ximage->data = shmat(wi->shminfo.shmid, 0, 0);
wi->shminfo.readOnly = 1;
if (!XShmAttach(wi->display, &wi->shminfo))
NSLog(@"XShmAttach() failed");
/* On some systems (eg. freebsd), X can't attach to the shared
segment if it's marked for destruction, so we make sure it's
attached before marking it. */
XSync(wi->display,False);
/* Mark the segment as destroyed now. Since we're /* Mark the segment as destroyed now. Since we're
attached, it won't actually be destroyed, but if we attached, it won't actually be destroyed, but if we
crashed before doing this, it wouldn't be destroyed crashed before doing this, it wouldn't be destroyed
despite nobody being attached anymore. */ despite nobody being attached anymore. */
shmctl(wi->shminfo.shmid, IPC_RMID, 0); shmctl(wi->shminfo.shmid, IPC_RMID, 0);
// printf("addr=%p\n", wi->shminfo.shmaddr);
wi->shminfo.readOnly = 1;
if (!XShmAttach(wi->display, &wi->shminfo))
NSLog(@"XShmAttach() failed");
} }
else else
{ {