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

Fix a number of obvious XLIB_PROLOGUE/EPILOGUE issues.

Browse source
This commit is contained in:
David Reveman 2008-11-19 17:40:58 -05:00
parent 2fddbd3024
commit 73a8a1aa6c
4 changed files with 17 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
hw/dmx/dmxextension.c
View file

@ -1495,7 +1495,7 @@ dmxAttachScreen (int idx,
return 1;
}
XLIB_PROLOGUE (dmxScreens);
XLIB_PROLOGUE (dmxScreen);
beShape = XShapeQueryExtension (dmxScreen->beDisplay,
&dmxScreen->beShapeEventBase,
&errorBase);
@ -1515,9 +1515,11 @@ dmxAttachScreen (int idx,
if (!dmxScreen->scrnWin)
dmxScreen->scrnWin = DefaultRootWindow (dmxScreen->beDisplay);
XLIB_PROLOGUE (dmxScreen);
XSelectInput (dmxScreen->beDisplay,
dmxScreen->scrnWin,
StructureNotifyMask);
XLIB_EPILOGUE (dmxScreen);
dmxSetErrorHandler(dmxScreen);
dmxGetScreenAttribs(dmxScreen);

11
hw/dmx/dmxinit.c
View file

@ -323,8 +323,17 @@ Bool dmxOpenDisplay(DMXScreenInfo *dmxScreen,
XSetAuthorization ((char *) authType, authTypeLen,
(char *) authData, authDataLen);
if (!(dmxScreen->beDisplay = XOpenDisplay(display)))
dmxScreen->alive = 1;
XLIB_PROLOGUE (dmxScreen);
dmxScreen->beDisplay = XOpenDisplay (display);
XLIB_EPILOGUE (dmxScreen);
if (!dmxScreen->beDisplay)
{
dmxScreen->alive = 0;
return FALSE;
}
dmxScreen->alive = 1;
dmxScreen->broken = 0;

4
hw/dmx/dmxrandr.c
View file

@ -1233,9 +1233,9 @@ dmxRRScreenInit (ScreenPtr pScreen)
if (display && beRandr)
{
XLIB_PROLOGUE (dmxScreens);
XLIB_PROLOGUE (dmxScreen);
r = XRRGetScreenResources (display, DefaultRootWindow (display));
XLIB_EPILOGUE (dmxScreens);
XLIB_EPILOGUE (dmxScreen);
}
if (r)

4
hw/dmx/dmxscrinit.c
View file

@ -150,7 +150,7 @@ void dmxBEScreenInit(ScreenPtr pScreen)
while (--i)
dmxBEPrefetchAtom (dmxScreen, (Atom) i);
XLIB_PROLOGUE (dmxScreens);
XLIB_PROLOGUE (dmxScreen);
dmxScreen->beSelectionAtom = XInternAtom (dmxScreen->beDisplay, buf, 0);
XLIB_EPILOGUE (dmxScreen);
@ -175,7 +175,7 @@ void dmxBEScreenInit(ScreenPtr pScreen)
if ((dmxScreen->bePixmapFormats[i].depth == 1) ||
(dmxScreen->bePixmapFormats[i].depth ==
dmxScreen->beDepths[j])) {
XLIB_PROLOGUE (dmxScreens);
XLIB_PROLOGUE (dmxScreen);
dmxScreen->scrnDefDrawables[i] = (Drawable)
XCreatePixmap(dmxScreen->beDisplay, dmxScreen->scrnWin,
1, 1, dmxScreen->bePixmapFormats[i].depth);