From 738686685d5da2602f2a4bb9e3b9dc37bb2dc828 Mon Sep 17 00:00:00 2001
From: Ulrich Sibiller <uli42@gmx.de>
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