aboutsummaryrefslogtreecommitdiff
path: root/nx-X11
diff options
context:
space:
mode:
Diffstat (limited to 'nx-X11')
-rw-r--r--nx-X11/programs/Xserver/hw/nxagent/Args.c9
-rw-r--r--nx-X11/programs/Xserver/hw/nxagent/Args.h1
-rw-r--r--nx-X11/programs/Xserver/hw/nxagent/Events.c80
-rw-r--r--nx-X11/programs/Xserver/hw/nxagent/Events.h1
-rw-r--r--nx-X11/programs/Xserver/hw/nxagent/Keystroke.c8
-rw-r--r--nx-X11/programs/Xserver/hw/nxagent/Screen.c37
-rw-r--r--nx-X11/programs/Xserver/hw/nxagent/Window.c6
7 files changed, 6 insertions, 136 deletions
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Args.c b/nx-X11/programs/Xserver/hw/nxagent/Args.c
index 607dab9bf..161403cd0 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Args.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Args.c
@@ -153,7 +153,6 @@ Bool nxagentReportWindowIds = False;
Bool nxagentReportPrivateWindowIds = False;
Bool nxagentDoDirectColormaps = False;
Window nxagentParentWindow = 0;
-Bool nxagentIpaq = False;
int nxagentLockDeferLevel = 0;
@@ -618,14 +617,6 @@ int ddxProcessArgument(int argc, char *argv[], int i)
nxagentChangeOption(AllScreens, True);
}
- else if (!strcmp(argv[i],"ipaq"))
- {
- nxagentChangeOption(Fullscreen, True);
-
- nxagentChangeOption(AllScreens, True);
-
- nxagentIpaq = True;
- }
else
{
if (nxagentUserGeometry.flag == 0)
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Args.h b/nx-X11/programs/Xserver/hw/nxagent/Args.h
index 8d6f29b06..c8f8907c3 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Args.h
+++ b/nx-X11/programs/Xserver/hw/nxagent/Args.h
@@ -82,7 +82,6 @@ extern Bool nxagentDoDirectColormaps;
extern Window nxagentParentWindow;
extern int nxagentMaxAllowedReset;
extern Bool nxagentResizeDesktopAtStartup;
-extern Bool nxagentIpaq;
extern int nxagentLockDeferLevel;
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Events.c b/nx-X11/programs/Xserver/hw/nxagent/Events.c
index 9d9f5d204..d8bf4df60 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Events.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Events.c
@@ -804,7 +804,6 @@ void nxagentDispatchEvents(PredicateFuncPtr predicate)
ScreenPtr pScreen = NULL;
Bool minimize = False;
- Bool startKbd = False;
Bool closeSession = False;
Bool switchFullscreen = False;
Bool switchAllScreens = False;
@@ -941,7 +940,7 @@ void nxagentDispatchEvents(PredicateFuncPtr predicate)
viewportLastKeyPressResult = result;
}
- if (result != doNothing && result != doStartKbd)
+ if (result != doNothing)
{
pScreen = nxagentScreen(X.xkey.window);
}
@@ -980,12 +979,6 @@ void nxagentDispatchEvents(PredicateFuncPtr predicate)
break;
}
- case doStartKbd:
- {
- startKbd = TRUE;
-
- break;
- }
case doSwitchFullscreen:
{
switchFullscreen = TRUE;
@@ -1214,11 +1207,6 @@ FIXME: Don't enqueue the KeyRelease event if the key was
}
}
- if (nxagentIpaq && nxagentClients <= 0)
- {
- closeSession = TRUE;
- }
-
if (nxagentOption(DesktopResize) == False &&
(X.xbutton.state & (ControlMask | Mod1Mask)) == (ControlMask | Mod1Mask))
{
@@ -2176,72 +2164,6 @@ FIXME: Don't enqueue the KeyRelease event if the key was
}
}
- if (startKbd)
- {
- if (xkbdRunning)
- {
- #ifdef NXAGENT_XKBD_DEBUG
- fprintf(stderr, "Events: nxkbd now is NOT running: %d, %d\n",
- X.xkey.keycode, escapecode);
- #endif
-
- xkbdRunning = False;
-
- kill(pidkbd, 9);
- }
- else
- {
- char kbddisplay[6];
- char *kbdargs[6];
-
- strcpy(kbddisplay,":");
- /* FIXME: why limit to 4? */
- strncat(kbddisplay, display, 4);
-
- kbdargs[0] = "nxkbd";
- kbdargs[1] = "-geometry";
- kbdargs[2] = "240x70+0+250";
- kbdargs[3] = "-display";
- kbdargs[4] = kbddisplay;
- kbdargs[5] = NULL;
-
- switch (pidkbd = fork())
- {
- case 0:
- {
- execvp(kbdargs[0], kbdargs);
-
- #ifdef NXAGENT_XKBD_DEBUG
- fprintf(stderr, "Events: The execvp of nxkbd process failed.\n");
- #endif
-
- exit(1);
-
- break;
- }
- case -1:
- {
- #ifdef NXAGENT_XKBD_DEBUG
- fprintf(stderr, "Events: Can't fork to run the nxkbd process.\n");
- #endif
-
- break;
- }
- default:
- {
- break;
- }
- }
-
- #ifdef NXAGENT_XKBD_DEBUG
- fprintf(stderr, "Events: The nxkbd process now running with [%d][%d].\n",
- X.xkey.keycode, escapecode);
- #endif
-
- xkbdRunning = True;
- }
- }
-
#ifdef BLOCKS
fprintf(stderr, "[End read]\n");
#endif
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Events.h b/nx-X11/programs/Xserver/hw/nxagent/Events.h
index c0eb8780b..5df0e1f05 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Events.h
+++ b/nx-X11/programs/Xserver/hw/nxagent/Events.h
@@ -39,7 +39,6 @@ enum HandleEventResult
doMinimize,
doDebugTree,
doCloseSession,
- doStartKbd,
doSwitchFullscreen,
doSwitchAllScreens,
doViewportMoveUp,
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Keystroke.c b/nx-X11/programs/Xserver/hw/nxagent/Keystroke.c
index 3e02d318d..662da6b04 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Keystroke.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Keystroke.c
@@ -44,7 +44,6 @@
#include <libxml/tree.h>
extern Bool nxagentWMIsRunning;
-extern Bool nxagentIpaq;
extern char *nxagentKeystrokeFile;
#ifdef NX_DEBUG_INPUT
@@ -507,13 +506,6 @@ Bool nxagentCheckSpecialKeystroke(XKeyEvent *X, enum HandleEventResult *result)
* here.
*/
- if (X -> keycode == 130 && nxagentIpaq)
- {
- *result = doStartKbd;
-
- return True;
- }
-
switch (stroke) {
#ifdef DEBUG_TREE
case KEYSTROKE_DEBUG_TREE:
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Screen.c b/nx-X11/programs/Xserver/hw/nxagent/Screen.c
index 44c89e03f..d1dc37dc2 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Screen.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Screen.c
@@ -135,7 +135,6 @@ void nxagentFbRestoreArea(PixmapPtr pPixmap, WindowPtr pWin, int xSrc, int ySrc,
#include "unistd.h"
#endif
-extern Bool nxagentIpaq;
extern Pixmap nxagentIconPixmap;
extern Pixmap nxagentIconShape;
extern Bool useXpmIcon;
@@ -329,12 +328,6 @@ Bool nxagentIsParentOf(Display *d, XlibWindow possible_parent, XlibWindow candid
void nxagentMinimizeFromFullScreen(ScreenPtr pScreen)
{
XUnmapWindow(nxagentDisplay, nxagentFullscreenWindow);
-
- if (nxagentIpaq)
- {
- XMapWindow(nxagentDisplay, nxagentIconWindow);
- }
-
XIconifyWindow(nxagentDisplay, nxagentIconWindow,
DefaultScreen(nxagentDisplay));
}
@@ -349,16 +342,8 @@ void nxagentMinimizeFromFullScreen(ScreenPtr pScreen)
*/
void nxagentMaximizeToFullScreen(ScreenPtr pScreen)
{
- if (nxagentIpaq)
- {
- XUnmapWindow(nxagentDisplay, nxagentIconWindow);
-
- XMapWindow(nxagentDisplay, nxagentFullscreenWindow);
- }
- else
- {
/*
- XUnmapWindow(nxagentDisplay, nxagentIconWindow);
+ XUnmapWindow(nxagentDisplay, nxagentIconWindow);
*/
Window root = RootWindow(nxagentDisplay, DefaultScreen(nxagentDisplay));
@@ -407,10 +392,10 @@ FIXME: We'll check for ReparentNotify and LeaveNotify events after
#endif
}
- XMapRaised(nxagentDisplay, nxagentFullscreenWindow);
+ XMapRaised(nxagentDisplay, nxagentFullscreenWindow);
- XIconifyWindow(nxagentDisplay, nxagentIconWindow,
- DefaultScreen(nxagentDisplay));
+ XIconifyWindow(nxagentDisplay, nxagentIconWindow,
+ DefaultScreen(nxagentDisplay));
/* swallow all LeaveNotify events for the FullscreenWindow;
Normally this does not swallow anything these days, but when
@@ -426,9 +411,8 @@ FIXME: We'll check for ReparentNotify and LeaveNotify events after
}
/*
- XMapWindow(nxagentDisplay, nxagentIconWindow);
+ XMapWindow(nxagentDisplay, nxagentIconWindow);
*/
- }
}
Window nxagentCreateIconWindow(void)
@@ -1922,17 +1906,6 @@ N/A
{
nxagentFullscreenWindow = nxagentDefaultWindows[pScreen->myNum];
}
-
- if (nxagentIpaq)
- {
- XWindowChanges ch;
- unsigned int ch_mask;
-
- ch.stack_mode = Below;
- ch_mask = CWStackMode;
-
- XConfigureWindow(nxagentDisplay, nxagentFullscreenWindow, ch_mask, &ch);
- }
}
if (nxagentOption(Fullscreen))
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Window.c b/nx-X11/programs/Xserver/hw/nxagent/Window.c
index 0e5def294..7d390872e 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Window.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Window.c
@@ -2662,12 +2662,6 @@ void nxagentMapDefaultWindows(void)
#endif
XMapWindow(nxagentDisplay, nxagentIconWindow);
-
- if (nxagentIpaq != 0)
- {
- XIconifyWindow(nxagentDisplay, nxagentIconWindow,
- DefaultScreen(nxagentDisplay));
- }
}
/*
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-04 02:07:40 +0000