This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch 3.6.x in repository nx-libs. commit 6bdf9c2faea6d245882db55174dffe5888659d35 Author: Ulrich Sibiller <uli42@gmx.de> Date: Thu Jun 27 21:44:31 2019 +0200 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 <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)); - } } /* -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/nx-libs.git