From 1c25e92b9ea5811d8ab9c2bfdc0dcb2e4d21bd0a Mon Sep 17 00:00:00 2001 From: Reinhard Tartler Date: Mon, 10 Oct 2011 17:58:31 +0200 Subject: Imported nxagent-3.2.0-10.tar.gz Summary: Imported nxagent-3.2.0-10.tar.gz Keywords: Imported nxagent-3.2.0-10.tar.gz into Git repository --- .../Xserver/hw/nxagent/X/NXwindow.c.NX.original | 21 +++++++-------------- 1 file changed, 7 insertions(+), 14 deletions(-) (limited to 'nx-X11/programs/Xserver/hw/nxagent/X/NXwindow.c.NX.original') diff --git a/nx-X11/programs/Xserver/hw/nxagent/X/NXwindow.c.NX.original b/nx-X11/programs/Xserver/hw/nxagent/X/NXwindow.c.NX.original index 7ba468ac0..24dad322f 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/X/NXwindow.c.NX.original +++ b/nx-X11/programs/Xserver/hw/nxagent/X/NXwindow.c.NX.original @@ -153,6 +153,9 @@ extern Bool nxagentScreenTrap; * ******/ +static unsigned char _back_lsb[4] = {0x88, 0x22, 0x44, 0x11}; +static unsigned char _back_msb[4] = {0x11, 0x44, 0x22, 0x88}; + int screenIsSaved = SCREEN_SAVER_OFF; ScreenSaverStuffRec savedScreenInfo[MAXSCREENS]; @@ -355,18 +358,7 @@ void nxagentClearSplash(WindowPtr pW) (*pScreen->ChangeWindowAttributes)(pW, CWBackPixmap|CWBackPixel); } -static void -#if NeedFunctionPrototypes -MakeRootTile(WindowPtr pWin) -#else -MakeRootTile(pWin) - WindowPtr pWin; -#endif -{ - nxagentRootTileWindow = pWin; -} - -#else /* NXAGENT_SERVER */ +#endif /* NXAGENT_SERVER */ static void MakeRootTile(WindowPtr pWin) @@ -412,9 +404,10 @@ MakeRootTile(WindowPtr pWin) FreeScratchGC(pGC); -} - +#ifdef NXAGENT_SERVER + nxagentRootTileWindow = pWin; #endif /* NXAGENT_SERVER */ +} WindowPtr AllocateWindow(ScreenPtr pScreen) -- cgit v1.2.3