From 6bdf9c2faea6d245882db55174dffe5888659d35 Mon Sep 17 00:00:00 2001 From: Ulrich Sibiller Date: Thu, 27 Jun 2019 21:44:31 +0200 Subject: Drop Ipaq support Did we ever provide a binary? --- nx-X11/programs/Xserver/hw/nxagent/Args.c | 9 ------- nx-X11/programs/Xserver/hw/nxagent/Args.h | 1 - nx-X11/programs/Xserver/hw/nxagent/Events.c | 5 ---- nx-X11/programs/Xserver/hw/nxagent/Keystroke.c | 8 ------ nx-X11/programs/Xserver/hw/nxagent/Screen.c | 37 ++++---------------------- nx-X11/programs/Xserver/hw/nxagent/Window.c | 6 ----- 6 files changed, 5 insertions(+), 61 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..ded6bd836 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Events.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Events.c @@ -1214,11 +1214,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)) { 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 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)); - } } /* -- cgit v1.2.3 From 738686685d5da2602f2a4bb9e3b9dc37bb2dc828 Mon Sep 17 00:00:00 2001 From: Ulrich Sibiller Date: Thu, 27 Jun 2019 21:50:53 +0200 Subject: drop onscreen keyboard support With the removal of the Ipaq code there's no path anymore to open the onscreen keyboard. Also nxkbd is not available and we do not have tested that feature with any onscreen keyboard yet. So there's no point in integrating that code. Fixes ArcticaProject/nx-libs#405 --- nx-X11/programs/Xserver/hw/nxagent/Events.c | 75 +---------------------------- nx-X11/programs/Xserver/hw/nxagent/Events.h | 1 - 2 files changed, 1 insertion(+), 75 deletions(-) diff --git a/nx-X11/programs/Xserver/hw/nxagent/Events.c b/nx-X11/programs/Xserver/hw/nxagent/Events.c index ded6bd836..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; @@ -2171,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, -- cgit v1.2.3