aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--nx-X11/programs/Xserver/hw/nxagent/Client.c2
-rw-r--r--nx-X11/programs/Xserver/hw/nxagent/Display.c30
-rw-r--r--nx-X11/programs/Xserver/hw/nxagent/Events.c10
-rw-r--r--nx-X11/programs/Xserver/hw/nxagent/Events.h4
-rw-r--r--nx-X11/programs/Xserver/hw/nxagent/Handlers.c2
-rw-r--r--nx-X11/programs/Xserver/hw/nxagent/Init.c8
-rw-r--r--nx-X11/programs/Xserver/hw/nxagent/Screen.c62
-rw-r--r--nx-X11/programs/Xserver/hw/nxagent/Split.c4
8 files changed, 61 insertions, 61 deletions
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Client.c b/nx-X11/programs/Xserver/hw/nxagent/Client.c
index e04a03dc1..0b8331b79 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Client.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Client.c
@@ -303,7 +303,7 @@ void nxagentWakeupByReset(ClientPtr client)
#ifndef WAIT_ALL_EVENTS
-static Bool nxagentWaitWakeupBySplitPredicate(Display *display, XEvent *event, XPointer ptr)
+static Bool nxagentWaitWakeupBySplitPredicate(Display *disp, XEvent *event, XPointer ptr)
{
return (event -> type == ClientMessage &&
(event -> xclient.data.l[0] == NXNoSplitNotify ||
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Display.c b/nx-X11/programs/Xserver/hw/nxagent/Display.c
index 3284857c2..c8ad891be 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Display.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Display.c
@@ -110,7 +110,7 @@ Bool nxagentTrue24 = False;
int nxagentNumVisuals;
int nxagentXConnectionNumber;
-int nxagentIOErrorHandler(Display *display);
+int nxagentIOErrorHandler(Display *disp);
static Bool nxagentDisplayInfoSaved = False;
static Display *nxagentDisplayBackup = NULL;
@@ -170,7 +170,7 @@ Pixmap nxagentIconPixmap;
Pixmap nxagentIconShape;
Bool useXpmIcon = False;
-Bool nxagentMakeIcon(Display *display, Pixmap *nxIcon, Pixmap *nxMask);
+Bool nxagentMakeIcon(Display *disp, Pixmap *nxIcon, Pixmap *nxMask);
static void nxagentInitVisuals(void);
@@ -188,7 +188,7 @@ static int nxagentCheckForColormapsCompatibility(int flexibility);
* Save Internal implementation Also called in Reconnect.c.
*/
-Display *nxagentInternalOpenDisplay(char *display);
+Display *nxagentInternalOpenDisplay(char *disp);
#ifdef NXAGENT_TIMESTAMP
unsigned long startTime;
@@ -226,7 +226,7 @@ int nxagentServerOrder(void)
* be probably moved to Handlers.c.
*/
-int nxagentIOErrorHandler(Display *display)
+int nxagentIOErrorHandler(Display *disp)
{
#ifdef TEST
fprintf(stderr, "nxagentIOErrorHandler: Got I/O error with nxagentException.ioError [%d].\n",
@@ -559,7 +559,7 @@ static void nxagentSigchldHandler(int signal)
return;
}
-Display *nxagentInternalOpenDisplay(char *display)
+Display *nxagentInternalOpenDisplay(char *disp)
{
/*
* Stop the smart schedule timer since it uses SIGALRM as we do.
@@ -601,10 +601,10 @@ FIXME: Should print a warning if the user tries to let the agent
#ifdef TEST
fprintf(stderr, "nxagentInternalOpenDisplay: Going to open the display [%s].\n",
- display);
+ disp);
#endif
- Display *newDisplay = XOpenDisplay(display);
+ Display *newDisplay = XOpenDisplay(disp);
alarm(0);
@@ -630,7 +630,7 @@ FIXME: Should print a warning if the user tries to let the agent
return newDisplay;
}
-static void nxagentDisplayBlockHandler(Display *display, int reason)
+static void nxagentDisplayBlockHandler(Display *disp, int reason)
{
if (nxagentDisplay != NULL)
{
@@ -686,7 +686,7 @@ static void nxagentDisplayBlockHandler(Display *display, int reason)
}
}
-static void nxagentDisplayWriteHandler(Display *display, int length)
+static void nxagentDisplayWriteHandler(Display *disp, int length)
{
if (nxagentDisplay != NULL)
{
@@ -717,7 +717,7 @@ int nxagentGetDataRate(void)
return nxagentRate;
}
-static void nxagentDisplayFlushHandler(Display *display, int length)
+static void nxagentDisplayFlushHandler(Display *disp, int length)
{
if (nxagentDisplay != NULL)
{
@@ -768,7 +768,7 @@ static void nxagentDisplayFlushHandler(Display *display, int length)
* rupt was received or if any other event occurred mandating the
+ end of the session."
*/
-static int nxagentDisplayErrorPredicate(Display *display, int error)
+static int nxagentDisplayErrorPredicate(Display *disp, int error)
{
#ifdef TEST
fprintf(stderr, "nxagentDisplayErrorPredicate: CHECK! Error is [%d] with [%d][%d][%d][%d][%d].\n",
@@ -789,7 +789,7 @@ static int nxagentDisplayErrorPredicate(Display *display, int error)
else if (nxagentException.sigHup > 0 ||
nxagentException.ioError > 0)
{
- NXForceDisplayError(display);
+ NXForceDisplayError(disp);
return 1;
}
@@ -1746,7 +1746,7 @@ FIXME: Is this needed?
nxagentDisplay = NULL;
}
-Bool nxagentMakeIcon(Display *display, Pixmap *nxIcon, Pixmap *nxMask)
+Bool nxagentMakeIcon(Display *disp, Pixmap *nxIcon, Pixmap *nxMask)
{
char** agentIconData;
@@ -1764,8 +1764,8 @@ Bool nxagentMakeIcon(Display *display, Pixmap *nxIcon, Pixmap *nxMask)
XlibPixmap IconPixmap;
XlibPixmap IconShape;
- if (XpmSuccess == XpmCreatePixmapFromData(display,
- DefaultRootWindow(display),
+ if (XpmSuccess == XpmCreatePixmapFromData(disp,
+ DefaultRootWindow(disp),
agentIconData,
&IconPixmap,
&IconShape,
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Events.c b/nx-X11/programs/Xserver/hw/nxagent/Events.c
index 45c80909c..b19dda3ac 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Events.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Events.c
@@ -167,7 +167,7 @@ void nxagentHandleCollectPropertyEvent(XEvent*);
void nxagentHandleCollectGrabPointerEvent(int resource);
-Bool nxagentCollectGrabPointerPredicate(Display *display, XEvent *X, XPointer ptr);
+Bool nxagentCollectGrabPointerPredicate(Display *disp, XEvent *X, XPointer ptr);
/*
* Used in Handlers.c to synchronize the agent with the remote X
@@ -702,7 +702,7 @@ static void nxagentToggleAutoGrab(void)
nxagentDisableAutoGrab();
}
-static Bool nxagentExposurePredicate(Display *display, XEvent *event, XPointer window)
+static Bool nxagentExposurePredicate(Display *disp, XEvent *event, XPointer window)
{
/*
* Handle both Expose and ProcessedExpose events. The latters are
@@ -720,12 +720,12 @@ static Bool nxagentExposurePredicate(Display *display, XEvent *event, XPointer w
}
}
-static int nxagentAnyEventPredicate(Display *display, XEvent *event, XPointer parameter)
+static int nxagentAnyEventPredicate(Display *disp, XEvent *event, XPointer parameter)
{
return 1;
}
-int nxagentInputEventPredicate(Display *display, XEvent *event, XPointer parameter)
+int nxagentInputEventPredicate(Display *disp, XEvent *event, XPointer parameter)
{
switch (event -> type)
{
@@ -3883,7 +3883,7 @@ void nxagentDeactivatePointerGrab(void)
}
}
-Bool nxagentCollectGrabPointerPredicate(Display *display, XEvent *X, XPointer ptr)
+Bool nxagentCollectGrabPointerPredicate(Display *disp, XEvent *X, XPointer ptr)
{
return (X -> xclient.window == 0 &&
X -> xclient.message_type == 0 &&
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Events.h b/nx-X11/programs/Xserver/hw/nxagent/Events.h
index 85f585e1f..6df5725d4 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Events.h
+++ b/nx-X11/programs/Xserver/hw/nxagent/Events.h
@@ -68,9 +68,9 @@ typedef int (*GetResourceFuncPtr)(Display*);
int nxagentWaitForResource(GetResourceFuncPtr, PredicateFuncPtr);
-Bool nxagentCollectGrabPointerPredicate(Display *display, XEvent *X, XPointer ptr);
+Bool nxagentCollectGrabPointerPredicate(Display *disp, XEvent *X, XPointer ptr);
-int nxagentInputEventPredicate(Display *display, XEvent *event, XPointer parameter);
+int nxagentInputEventPredicate(Display *disp, XEvent *event, XPointer parameter);
/*
* Enable and disable notification of
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Handlers.c b/nx-X11/programs/Xserver/hw/nxagent/Handlers.c
index 559eae719..fa6b9ce03 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Handlers.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Handlers.c
@@ -941,7 +941,7 @@ void nxagentHandleCollectInputFocusEvent(int resource)
#endif
}
-Bool nxagentCollectInputFocusPredicate(Display *display, XEvent *X, XPointer ptr)
+Bool nxagentCollectInputFocusPredicate(Display *disp, XEvent *X, XPointer ptr)
{
return (X -> xclient.window == 0 &&
X -> xclient.message_type == 0 &&
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Init.c b/nx-X11/programs/Xserver/hw/nxagent/Init.c
index 3cba1a89d..0b6b36547 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Init.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Init.c
@@ -203,7 +203,7 @@ void checkX2goAgent(void)
/*
* Called at X server's initialization.
*/
-void InitOutput(ScreenInfo *screenInfo, int argc, char *argv[])
+void InitOutput(ScreenInfo *scrInfo, int argc, char *argv[])
{
/*
* Print our pid and version information.
@@ -329,13 +329,13 @@ FIXME: These variables, if not removed at all because have probably
* Initialize the basic screen info.
*/
- nxagentSetScreenInfo(screenInfo);
+ nxagentSetScreenInfo(scrInfo);
/*
* Initialize pixmap formats for this screen.
*/
- nxagentSetPixmapFormats(screenInfo);
+ nxagentSetPixmapFormats(scrInfo);
/*
* Get our own privates' index.
@@ -370,7 +370,7 @@ FIXME: These variables, if not removed at all because have probably
AddScreen(nxagentOpenScreen, argc, argv);
}
- nxagentNumScreens = screenInfo->numScreens;
+ nxagentNumScreens = scrInfo->numScreens;
/*
* Initialize the GCs used by the synchronization put images. We do
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Screen.c b/nx-X11/programs/Xserver/hw/nxagent/Screen.c
index 2ed7d9593..bf614ffdc 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Screen.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Screen.c
@@ -236,7 +236,7 @@ int nxagentBitsPerPixel(int depth)
else return 32;
}
-void nxagentSetScreenInfo(ScreenInfo *screenInfo)
+void nxagentSetScreenInfo(ScreenInfo *scrInfo)
{
/*
* Setup global screen info parameters. In the Xnest
@@ -248,34 +248,34 @@ void nxagentSetScreenInfo(ScreenInfo *screenInfo)
*
* From a standard implementation:
*
- * screenInfo->imageByteOrder = IMAGE_BYTE_ORDER;
- * screenInfo->bitmapScanlinePad = BITMAP_SCANLINE_PAD;
- * screenInfo->bitmapScanlineUnit = BITMAP_SCANLINE_UNIT;
- * screenInfo->bitmapBitOrder = BITMAP_BIT_ORDER;
+ * scrInfo->imageByteOrder = IMAGE_BYTE_ORDER;
+ * scrInfo->bitmapScanlinePad = BITMAP_SCANLINE_PAD;
+ * scrInfo->bitmapScanlineUnit = BITMAP_SCANLINE_UNIT;
+ * scrInfo->bitmapBitOrder = BITMAP_BIT_ORDER;
*
* From Xnest implementation:
*
- * screenInfo -> imageByteOrder = ImageByteOrder(nxagentDisplay);
- * screenInfo -> bitmapScanlineUnit = BitmapUnit(nxagentDisplay);
- * screenInfo -> bitmapScanlinePad = BitmapPad(nxagentDisplay);
- * screenInfo -> bitmapBitOrder = BitmapBitOrder(nxagentDisplay);
+ * scrInfo -> imageByteOrder = ImageByteOrder(nxagentDisplay);
+ * scrInfo -> bitmapScanlineUnit = BitmapUnit(nxagentDisplay);
+ * scrInfo -> bitmapScanlinePad = BitmapPad(nxagentDisplay);
+ * scrInfo -> bitmapBitOrder = BitmapBitOrder(nxagentDisplay);
*/
- screenInfo -> imageByteOrder = IMAGE_BYTE_ORDER;
- screenInfo -> bitmapScanlinePad = BITMAP_SCANLINE_PAD;
- screenInfo -> bitmapScanlineUnit = BITMAP_SCANLINE_UNIT;
- screenInfo -> bitmapBitOrder = BITMAP_BIT_ORDER;
+ scrInfo -> imageByteOrder = IMAGE_BYTE_ORDER;
+ scrInfo -> bitmapScanlinePad = BITMAP_SCANLINE_PAD;
+ scrInfo -> bitmapScanlineUnit = BITMAP_SCANLINE_UNIT;
+ scrInfo -> bitmapBitOrder = BITMAP_BIT_ORDER;
#ifdef TEST
fprintf(stderr, "nxagentSetScreenInfo: Server image order is [%d] bitmap order is [%d].\n",
- screenInfo -> imageByteOrder, screenInfo -> bitmapBitOrder);
+ scrInfo -> imageByteOrder, scrInfo -> bitmapBitOrder);
fprintf(stderr, "nxagentSetScreenInfo: Server scanline unit is [%d] scanline pad is [%d].\n",
- screenInfo -> bitmapScanlineUnit, screenInfo -> bitmapScanlinePad);
+ scrInfo -> bitmapScanlineUnit, scrInfo -> bitmapScanlinePad);
#endif
}
-void nxagentSetPixmapFormats(ScreenInfo *screenInfo)
+void nxagentSetPixmapFormats(ScreenInfo *scrInfo)
{
/*
* Formats are created with no care of which are supported
@@ -284,19 +284,19 @@ void nxagentSetPixmapFormats(ScreenInfo *screenInfo)
* of session from a display to another.
*/
- screenInfo -> numPixmapFormats = nxagentNumPixmapFormats;
+ scrInfo -> numPixmapFormats = nxagentNumPixmapFormats;
for (int i = 0; i < nxagentNumPixmapFormats; i++)
{
- screenInfo -> formats[i].depth = nxagentPixmapFormats[i].depth;
- screenInfo -> formats[i].bitsPerPixel = nxagentPixmapFormats[i].bits_per_pixel;
- screenInfo -> formats[i].scanlinePad = nxagentPixmapFormats[i].scanline_pad;
+ scrInfo -> formats[i].depth = nxagentPixmapFormats[i].depth;
+ scrInfo -> formats[i].bitsPerPixel = nxagentPixmapFormats[i].bits_per_pixel;
+ scrInfo -> formats[i].scanlinePad = nxagentPixmapFormats[i].scanline_pad;
#ifdef TEST
fprintf(stderr, "nxagentSetPixmapFormats: Set format at index [%d] to depth [%d] "
"bits per pixel [%d] scanline pad [%d].\n", i,
- screenInfo -> formats[i].depth, screenInfo -> formats[i].bitsPerPixel,
- screenInfo -> formats[i].scanlinePad);
+ scrInfo -> formats[i].depth, scrInfo -> formats[i].bitsPerPixel,
+ scrInfo -> formats[i].scanlinePad);
#endif
}
}
@@ -2950,9 +2950,9 @@ int nxagentShadowSendUpdates(int *suspended)
return 1;
}
-int nxagentShadowPoll(PixmapPtr nxagentShadowPixmapPtr, GCPtr nxagentShadowGCPtr,
- unsigned char nxagentShadowDepth, int nxagentShadowWidth,
- int nxagentShadowHeight, char *nxagentShadowBuffer, int *changed, int *suspended)
+int nxagentShadowPoll(PixmapPtr shadowPixmapPtr, GCPtr shadowGCPtr,
+ unsigned char shadowDepth, int shadowWidth,
+ int shadowHeight, char *shadowBuffer, int *changed, int *suspended)
{
RegionRec updateRegion;
RegionRec tempRegion;
@@ -2977,7 +2977,7 @@ int nxagentShadowPoll(PixmapPtr nxagentShadowPixmapPtr, GCPtr nxagentShadowGCPtr
BoxRec *pBox = (BoxRec *)ptBox;
#ifdef TEST
- fprintf(stderr, "nxagentShadowPoll: nRects[%ld], pBox[%p] depth[%d].\n", numRects, (void *) pBox, nxagentShadowDepth);
+ fprintf(stderr, "nxagentShadowPoll: nRects[%ld], pBox[%p] depth[%d].\n", numRects, (void *) pBox, shadowDepth);
#endif
for (int n = 0; n < numRects; n++)
@@ -2994,7 +2994,7 @@ int nxagentShadowPoll(PixmapPtr nxagentShadowPixmapPtr, GCPtr nxagentShadowGCPtr
unsigned int width = pBox[n].y1 - pBox[n].x1;/* y1 = x2 */
unsigned int height = y2 - pBox[n].x2; /* x2 = y1 */
- if((x + width) > nxagentShadowWidth || (y + height) > nxagentShadowHeight)
+ if((x + width) > shadowWidth || (y + height) > shadowHeight)
{
/*
* Out of bounds. Maybe a resize of the master session is going on.
@@ -3028,8 +3028,8 @@ int nxagentShadowPoll(PixmapPtr nxagentShadowPixmapPtr, GCPtr nxagentShadowGCPtr
for (int c = 0; c + y < y2; c++)
{
- memcpy(tBuffer, nxagentShadowBuffer + x * nxagentBppMaster +
- (y + c) * nxagentShadowWidth * nxagentBppMaster, line);
+ memcpy(tBuffer, shadowBuffer + x * nxagentBppMaster +
+ (y + c) * shadowWidth * nxagentBppMaster, line);
tBuffer += line;
@@ -3042,8 +3042,8 @@ int nxagentShadowPoll(PixmapPtr nxagentShadowPixmapPtr, GCPtr nxagentShadowGCPtr
nxagentShadowAdaptDepth(width, height, line, &tBuffer);
}
- fbPutImage(nxagentVirtualDrawable((DrawablePtr)nxagentShadowPixmapPtr), nxagentShadowGCPtr,
- nxagentShadowDepth, x, y, width, height, 0, ZPixmap, tBuffer);
+ fbPutImage(nxagentVirtualDrawable((DrawablePtr)shadowPixmapPtr), shadowGCPtr,
+ shadowDepth, x, y, width, height, 0, ZPixmap, tBuffer);
BoxRec box = {.x1 = x, .x2 = x + width, .y1 = y, .y2 = y + height};
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Split.c b/nx-X11/programs/Xserver/hw/nxagent/Split.c
index 4dac8f5b2..850056c21 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Split.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Split.c
@@ -780,7 +780,7 @@ void nxagentWaitDrawable(DrawablePtr pDrawable)
}
}
-static Bool nxagentCommitSplitPredicate(Display *display, XEvent *event, XPointer ptr)
+static Bool nxagentCommitSplitPredicate(Display *disp, XEvent *event, XPointer ptr)
{
return (event -> type == ClientMessage &&
event -> xclient.data.l[0] == NXCommitSplitNotify &&
@@ -820,7 +820,7 @@ void nxagentWaitCommitEvent(int resource)
}
}
-static Bool nxagentWaitSplitPredicate(Display *display, XEvent *event, XPointer ptr)
+static Bool nxagentWaitSplitPredicate(Display *disp, XEvent *event, XPointer ptr)
{
return (event -> type == ClientMessage &&
(event -> xclient.data.l[0] == NXNoSplitNotify ||
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-30 04:23:34 +0000