aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--nx-X11/programs/Xserver/hw/nxagent/Display.c1
-rw-r--r--nx-X11/programs/Xserver/hw/nxagent/Handlers.c39
-rw-r--r--nx-X11/programs/Xserver/hw/nxagent/Options.c8
-rw-r--r--nx-X11/programs/Xserver/hw/nxagent/Screen.c34
4 files changed, 0 insertions, 82 deletions
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Display.c b/nx-X11/programs/Xserver/hw/nxagent/Display.c
index a93fd2418..587222da7 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Display.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Display.c
@@ -1744,7 +1744,6 @@ FIXME: Is this needed?
nxagentDisplay = NULL;
}
-
Bool nxagentMakeIcon(Display *display, Pixmap *nxIcon, Pixmap *nxMask)
{
char** agentIconData;
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Handlers.c b/nx-X11/programs/Xserver/hw/nxagent/Handlers.c
index f1455b935..559eae719 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Handlers.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Handlers.c
@@ -726,8 +726,6 @@ void nxagentShadowBlockHandler(void * data, struct timeval **timeout, void * mas
}
#endif
- #ifndef __CYGWIN32__
-
if (nxagentReadEvents(nxagentDisplay) > 0 ||
nxagentReadEvents(nxagentShadowDisplay) > 0)
{
@@ -745,19 +743,6 @@ void nxagentShadowBlockHandler(void * data, struct timeval **timeout, void * mas
nxagentShadowAdaptToRatio();
}
- #else
-
- if (nxagentReadEvents(nxagentDisplay) > 0)
- {
- #ifdef TEST
- fprintf(stderr, "nxagentShadowBlockHandler: Reading X events queued.\n");
- #endif
-
- nxagentDispatchEvents(NULL);
- }
-
- #endif
-
changed = 0;
NXShadowGetScreenSize(&width_, &height_);
@@ -800,26 +785,6 @@ FIXME: Must queue multiple writes and handle the events by resembling
*timeout = &zero;
}
- #ifdef __CYGWIN32__
-
- if (nxagentOption(SleepTime) > 0) {
-#ifdef TEST
- fprintf(stderr, "nxagentShadowBlockHandler: sleeping for %d milliseconds for slowdown.\n",
- nxagentOption(SleepTime));
-#endif
- usleep(nxagentOption(SleepTime) * 1000);
- }
-#ifdef TEST
- else if (0 == nxagentOption(SleepTime)) {
- fprintf(stderr, "nxagentShadowBlockHandler: not sleeping for slowdown.\n");
- }
-#endif
-
- (*timeout) -> tv_sec = 0;
- (*timeout) -> tv_usec = 50 * 1000;
-
- #else
-
if (changed == 0)
{
(*timeout) -> tv_sec = 0;
@@ -831,8 +796,6 @@ FIXME: Must queue multiple writes and handle the events by resembling
(*timeout) -> tv_usec = 0;
}
- #endif
-
nxagentPrintGeometry();
#ifdef BLOCKS
@@ -857,7 +820,6 @@ void nxagentShadowWakeupHandler(void * data, int count, void * mask)
if (!SmartScheduleSignalEnable)
{
-
#ifdef DEBUG
fprintf(stderr, "nxagentShadowWakeupHandler: Resetting the dispatch state after wakeup.\n");
#endif
@@ -866,7 +828,6 @@ void nxagentShadowWakeupHandler(void * data, int count, void * mask)
nxagentDispatch.in = nxagentBytesIn;
nxagentDispatch.out = nxagentBytesOut;
-
}
/*
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Options.c b/nx-X11/programs/Xserver/hw/nxagent/Options.c
index 9e11dc5f2..4d5fa3e16 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Options.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Options.c
@@ -107,16 +107,8 @@ void nxagentInitOptions(void)
nxagentOptions.ViewportXSpan = 0;
nxagentOptions.ViewportYSpan = 0;
- #ifndef __CYGWIN32__
-
nxagentOptions.DesktopResize = 1;
- #else
-
- nxagentOptions.DesktopResize = 0;
-
- #endif
-
nxagentOptions.Ratio = DONT_SCALE;
nxagentOptions.XRatio = DONT_SCALE;
nxagentOptions.YRatio = DONT_SCALE;
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Screen.c b/nx-X11/programs/Xserver/hw/nxagent/Screen.c
index 4b9b37a7a..33add9cb5 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Screen.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Screen.c
@@ -2572,8 +2572,6 @@ int nxagentShadowInit(ScreenPtr pScreen, WindowPtr pWin)
nxagentShadowUid);
#endif
-#if !defined (__CYGWIN32__) && !defined (WIN32)
-
if (nxagentShadowUid != -1)
{
NXShadowSetDisplayUid(nxagentShadowUid);
@@ -2584,8 +2582,6 @@ int nxagentShadowInit(ScreenPtr pScreen, WindowPtr pWin)
NXShadowDisableDamage();
}
-#endif
-
if (NXShadowCreate(nxagentDisplay, layout, nxagentShadowDisplayName,
(void *) &nxagentShadowDisplay) != 1)
{
@@ -2602,13 +2598,10 @@ int nxagentShadowInit(ScreenPtr pScreen, WindowPtr pWin)
* server root window in order to notify its presence.
*/
- #ifndef __CYGWIN__
-
XlibAtom nxagentShadowAtom = XInternAtom(nxagentShadowDisplay, "_NX_SHADOW", False);
XChangeProperty(nxagentShadowDisplay, DefaultRootWindow(nxagentShadowDisplay),
nxagentShadowAtom, XA_STRING, 8, PropModeReplace, NULL, 0);
- #endif
if (NXShadowAddUpdaterDisplay(nxagentDisplay, &nxagentShadowWidth,
&nxagentShadowHeight, &nxagentMasterDepth) == 0)
@@ -2621,8 +2614,6 @@ int nxagentShadowInit(ScreenPtr pScreen, WindowPtr pWin)
return -1;
}
- #ifndef __CYGWIN32__
-
if (nxagentOption(Fullscreen) == 1)
{
nxagentShadowSetRatio(WidthOfScreen(DefaultScreenOfDisplay(nxagentDisplay)) * 1.0 / nxagentShadowWidth,
@@ -2671,8 +2662,6 @@ int nxagentShadowInit(ScreenPtr pScreen, WindowPtr pWin)
return -1;
}
- #endif
-
nxagentShadowDepth = pScreen -> rootDepth;
switch (nxagentMasterDepth)
@@ -2757,14 +2746,10 @@ int nxagentShadowInit(ScreenPtr pScreen, WindowPtr pWin)
nxagentBppShadow = 1;
}
-#ifndef __CYGWIN__
-
imageByteOrder = nxagentShadowDisplay -> byte_order;
nxagentShadowXConnectionNumber = XConnectionNumber(nxagentShadowDisplay);
-#endif
-
#ifdef TEST
fprintf(stderr, "nxagentShadowInit: Adding the X connection [%d] "
"to the device set.\n", nxagentShadowXConnectionNumber);
@@ -2985,18 +2970,6 @@ int nxagentShadowPoll(PixmapPtr nxagentShadowPixmapPtr, GCPtr nxagentShadowGCPtr
RegionNull(&updateRegion);
RegionNull(&tempRegion);
-#ifdef __CYGWIN32__
-
- if (NXShadowCaptureCursor(nxagentWindow(nxagentShadowWindowPtr),
- nxagentShadowWindowPtr -> drawable.pScreen -> visuals) == -1)
- {
- #ifdef WARNING
- fprintf(stderr, "nxagentShadowPoll: Failed to capture cursor.\n");
- #endif
- }
-
-#endif
-
int result = NXShadowHasChanged(nxagentUserInput, NULL, suspended);
*changed = result;
@@ -3074,17 +3047,10 @@ int nxagentShadowPoll(PixmapPtr nxagentShadowPixmapPtr, GCPtr nxagentShadowGCPtr
tBuffer = iBuffer;
-#ifdef __CYGWIN32__
- if (nxagentBppMaster == 2)
- {
- NXShadowCorrectColor(length, tBuffer);
- }
-#else
if (nxagentCheckDepth == 1)
{
nxagentShadowAdaptDepth(width, height, line, &tBuffer);
}
-#endif
fbPutImage(nxagentVirtualDrawable((DrawablePtr)nxagentShadowPixmapPtr), nxagentShadowGCPtr,
nxagentShadowDepth, x, y, width, height, 0, ZPixmap, tBuffer);
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-27 13:12:17 +0000