Fix Issue#2164 - mouse does not work on WSL1. Root cause is that, like cygwin, WSL1 does not support setitimer(ITIMER_VIRTRUAL ...). Trouble is cannot detect WSL1 using any preprocessor macros and anyway don't want to create yet another platform to run through the whole github actions release process. So in the case of MAIKO_OS_LINUX, we now detect setitimer failure and use emulated timer when such failure occurs. So unlike CYGWIN and Emscripten, the decsion to use emulated timers for WSL1 is made at runtime not compile time. This will add a very small overhead to all non-WSL1 Linux runs but should not effect any other platforms.

With additional Medley calls to KEYACTION (below), they should work in TTYIN (i.e., XCL and Interlisp EXECs).
I didn't try TEDIT.
They are unrecognized in SEDIT. (In any case, their use there probably is pretty restricted by the nature of SEDIT.)

(KEYACTION 'KEYPAD8 '(("Meta,^" 56 NOLOCKSHIFT) . IGNORE))
(KEYACTION 'KEYPAD6 '(("Meta,>" 54 NOLOCKSHIFT) . IGNORE))
(KEYACTION 'KEYPAD4 '(("Meta,<" 52 NOLOCKSHIFT) . IGNORE))
(KEYACTION 'KEYPAD2 '(("Meta,^J" 50 NOLOCKSHIFT) . IGNORE))

.github/workflows/Dockerfile_builder

@@ -8,7 +8,7 @@
 #
 # ******************************************************************************
 
-FROM ubuntu:latest
+FROM ubuntu:22.04
 SHELL ["/bin/bash", "-c"]
 USER root:root
 # Install build tools

.github/workflows/buildRelease.yml

@@ -152,7 +152,7 @@ jobs:
          || needs.inputs.outputs.force == 'true'
       )
 
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
 
     steps:
       # Checkout the actions for this repo owner
@@ -310,8 +310,8 @@ jobs:
         env:
           GH_TOKEN: ${{ github.token }}
         run: |
-          gh release download release-2.26.5 --repo libsdl-org/SDL --pattern SDL2-2.26.5.dmg
-          hdiutil attach SDL2-2.26.5.dmg
+          gh release download release-2.30.11 --repo libsdl-org/SDL --pattern SDL2-2.30.11.dmg
+          hdiutil attach SDL2-2.30.11.dmg
           sudo ditto /Volumes/SDL2/SDL2.framework /Library/Frameworks/SDL2.framework
           hdiutil detach /Volumes/SDL2/
 
@@ -337,7 +337,7 @@ jobs:
           # -DCMAKE_OSX_DEPLOYMENT_TARGET=10.12
           cmake .. \
             -DCMAKE_OSX_ARCHITECTURES="x86_64;arm64" \
-            -DMAIKO_DISPLAY_SDL=ON \
+            -DMAIKO_DISPLAY_SDL=2 \
             -DMAIKO_DISPLAY_X11=ON \
             -DCMAKE_BUILD_TYPE=Release
           cmake --build . --config Release
@@ -503,6 +503,7 @@ jobs:
       - name: Install SDL2
         run: |
           export DEBIAN_FRONTEND=noninteractive
+          sudo -E apt-get update
           sudo -E apt-get install -y libsdl2-dev libsdl2-2.0-0
 
       # Install Emscripten SDK

inc/XKeymap.h

@@ -221,17 +221,17 @@ static const int generic_X_keymap[] = {
     /* keypad digit assignments above, try assigning */
     /* the new arrow-key key#s assigned for RS/6000  */
     /* Failing that, try assigning the keypad #s.    */
+    1, 84, XK_Left,
     0, 129, XK_Left,
-    0, 84, XK_Left,
 
+    1, 82, XK_Up,
     0, 130, XK_Up,
-    0, 82, XK_Up,
 
+    1, 69, XK_Down,
     0, 131, XK_Down,
-    0, 69, XK_Down,
 
+    1, 87, XK_Right,
     0, 132, XK_Right,
-    0, 87, XK_Right,
 
     0, 93, XK_Multi_key,   /* Expand, Sun type-4 */
     0, 93, XK_Alt_R,       /* Expand, RH Alt key  */

inc/inlineC.h

@@ -217,7 +217,7 @@
 
 #define FJUMPMACRO(x)                         \
   do {                                        \
-    if (TOPOFSTACK != 0) { goto PopNextop1; } \
+    if (TOPOFSTACK != 0) { POP; nextop1; }    \
     {                                         \
       CHECK_INTERRUPT;                        \
       POP;                                    \
@@ -227,7 +227,7 @@
   } while (0)
 #define TJUMPMACRO(x)                         \
   do {                                        \
-    if (TOPOFSTACK == 0) { goto PopNextop1; } \
+    if (TOPOFSTACK == 0) { POP; nextop1; }    \
     {                                         \
       CHECK_INTERRUPT;                        \
       POP;                                    \

src/main.c

@@ -315,7 +315,7 @@ const char *nethubHelpstring =
 const char *nethubHelpstring = "";
 #endif
 
-#if defined(MAIKO_EMULATE_TIMER_INTERRUPTS) || defined(MAIKO_EMULATE_ASYNC_INTERRUPTS)
+#if MAIKO_OS_LINUX || defined(MAIKO_EMULATE_TIMER_INTERRUPTS) || defined(MAIKO_EMULATE_ASYNC_INTERRUPTS)
 extern int insnsCountdownForTimerAsyncEmulation;
 #endif
 
@@ -327,10 +327,10 @@ extern char backgroundColorName[64];
 #endif
 char windowTitle[255] = "Medley";
 extern char windowTitle[255];
-int lispDisplayRequestedWidth = 1024;
-extern int lispDisplayRequestedWidth;
-int lispDisplayRequestedHeight = 768;
-extern int lispDisplayRequestedHeight;
+unsigned LispDisplayRequestedWidth = 1024, LispDisplayRequestedHeight = 768;
+extern unsigned LispDisplayRequestedWidth, LispDisplayRequestedHeight;
+int LispDisplayRequestedX = 0, LispDisplayRequestedY = 0;
+extern int LispDisplayRequestedX, LispDisplayRequestedY;
 int pixelScale = 1;
 extern int pixelScale;
 
@@ -474,7 +474,7 @@ int main(int argc, char *argv[])
 #ifdef SDL
     else if ((strcmp(argv[i], "-sc") == 0) || (strcmp(argv[i], "-SC") == 0)) {
       if (argc > ++i) {
-        int read = sscanf(argv[i], "%dx%d", &lispDisplayRequestedWidth, &lispDisplayRequestedHeight);
+        int read = sscanf(argv[i], "%dx%d", &LispDisplayRequestedWidth, &LispDisplayRequestedHeight);
         if(read != 2) {
           (void)fprintf(stderr, "Could not parse -sc argument %s\n", argv[i]);
           exit(1);
@@ -601,7 +601,7 @@ int main(int argc, char *argv[])
     }
 #endif /* MAIKO_ENABLE_NETHUB */
 
-#if defined(MAIKO_EMULATE_TIMER_INTERRUPTS) || defined(MAIKO_EMULATE_ASYNC_INTERRUPTS)
+#if MAIKO_OS_LINUX || defined(MAIKO_EMULATE_TIMER_INTERRUPTS) || defined(MAIKO_EMULATE_ASYNC_INTERRUPTS)
     else if (!strcmp(argv[i], "-intr-emu-insns")) {
       if (argc > ++i) {
         errno = 0;
@@ -717,7 +717,7 @@ int main(int argc, char *argv[])
   make_dsp_instance(currentdsp, 0, 0, 0, 1); /* All defaults the first time */
 #endif                                       /* DOS || XWINDOW */
 #if defined(SDL)
-  init_SDL(windowTitle, lispDisplayRequestedWidth, lispDisplayRequestedHeight, pixelScale);
+  init_SDL(windowTitle, LispDisplayRequestedWidth, LispDisplayRequestedHeight, pixelScale);
 #endif /* SDL */
   /* Load sysout to VM space and returns real sysout_size(not 0) */
   sysout_size = sysout_loader(sysout_name, sysout_size);

src/timer.c

@@ -454,6 +454,11 @@ static void int_timer_service(int sig)
 /*									*/
 /************************************************************************/
 
+#if MAIKO_OS_LINUX
+  // for WSL1, which doesn't support setitimer(ITIMER_VIRTUAL ...)
+  int linux_emulate_timer = 0;
+#endif /* MAIKO_OS_LINUX */
+
 static void int_timer_init(void)
 
 {
@@ -489,6 +494,11 @@ static void int_timer_init(void)
   /* then attach a timer to it and turn it loose */
   timert.it_interval.tv_sec = timert.it_value.tv_sec = 0;
   timert.it_interval.tv_usec = timert.it_value.tv_usec = TIMER_INTERVAL;
+
+#if MAIKO_OS_LINUX
+  // (For WSL1) Capture error output from setittimer to indicate need to emulate timer
+  linux_emulate_timer =
+#endif /* MAIKO_OS_LINUX */
   setitimer(ITIMER_VIRTUAL, &timert, NULL);
 
   DBPRINT(("Timer interval set to %ld usec\n", (long)timert.it_value.tv_usec));
@@ -499,7 +509,7 @@ static void int_timer_init(void)
 /*									*/
 /*									*/
 /*									*/
-/*									*/
+/*
 /*									*/
 /*									*/
 /*									*/

src/xc.c

@@ -173,7 +173,7 @@ static const int n_mask_array[16] = {
 
 extern int TIMER_INTERVAL;
 
-#if defined(MAIKO_EMULATE_TIMER_INTERRUPTS) || defined(MAIKO_EMULATE_ASYNC_INTERRUPTS)
+#if MAIKO_OS_LINUX || defined(MAIKO_EMULATE_TIMER_INTERRUPTS) || defined(MAIKO_EMULATE_ASYNC_INTERRUPTS)
 
 #  if !defined(MAIKO_TIMER_ASYNC_EMULATION_INSNS_COUNTDOWN)
 #    define MAIKO_TIMER_ASYNC_EMULATION_INSNS_COUNTDOWN 20000
@@ -181,7 +181,9 @@ extern int TIMER_INTERVAL;
 
 int insnsCountdownForTimerAsyncEmulation = MAIKO_TIMER_ASYNC_EMULATION_INSNS_COUNTDOWN;
 static int pseudoTimerAsyncCountdown = MAIKO_TIMER_ASYNC_EMULATION_INSNS_COUNTDOWN;
-
+#if MAIKO_OS_LINUX
+extern int linux_emulate_timer;
+#endif /* MAIKO_OS_LINUX */
 #endif
 
 void dispatch(void) {
@@ -282,10 +284,12 @@ nextopcode:
 #endif /* PCTRACE */
 
   /* quick_stack_check();*/ /* JDS 2/12/98 */
-  
-#if defined(MAIKO_EMULATE_TIMER_INTERRUPTS) || defined(MAIKO_EMULATE_ASYNC_INTERRUPTS)
-  if (--pseudoTimerAsyncCountdown <= 0) {
-	  Irq_Stk_Check = 0;
+#if MAIKO_OS_LINUX || defined(MAIKO_EMULATE_TIMER_INTERRUPTS) || defined(MAIKO_EMULATE_ASYNC_INTERRUPTS)
+#if MAIKO_OS_LINUX
+  if (linux_emulate_timer) {
+#endif /* MAIKO_OS_LINUX */
+    if (--pseudoTimerAsyncCountdown <= 0) {
+          Irq_Stk_Check = 0;
 	  Irq_Stk_End = 0;
 #if defined(MAIKO_EMULATE_ASYNC_INTERRUPTS)
 	  IO_Signalled = TRUE;
@@ -294,6 +298,9 @@ nextopcode:
 	  emscripten_sleep(1);
 #endif
 	  pseudoTimerAsyncCountdown = insnsCountdownForTimerAsyncEmulation;
+#if MAIKO_OS_LINUX
+    }
+#endif /* MAIKO_OS_LINUX */
   }
 #endif
 
@@ -814,7 +821,7 @@ nextopcode:
     /******* FJumpx *******/
     case 0262:
     case262 : {
-      if (TOPOFSTACK != 0) { goto PopNextop2; }
+      if (TOPOFSTACK != 0) { POP; nextop2; }
       CHECK_INTERRUPT;
       POP;
       PCMACL += Get_SBYTE_PCMAC1;
@@ -825,7 +832,7 @@ nextopcode:
 
     case 0263:
     case263 : {
-      if (TOPOFSTACK == 0) { goto PopNextop2; }
+      if (TOPOFSTACK == 0) { POP; nextop2; }
       CHECK_INTERRUPT;
       POP;
       PCMACL += Get_SBYTE_PCMAC1;
@@ -836,7 +843,7 @@ nextopcode:
 
     case 0264:
     case264 : {
-      if (TOPOFSTACK != 0) { goto PopNextop2; }
+      if (TOPOFSTACK != 0) { POP; nextop2; }
       CHECK_INTERRUPT;
       PCMACL += Get_SBYTE_PCMAC1;
       nextop0;
@@ -846,7 +853,7 @@ nextopcode:
 
     case 0265:
     case265 : {
-      if (TOPOFSTACK == 0) { goto PopNextop2; }
+      if (TOPOFSTACK == 0) { POP; nextop2; }
       CHECK_INTERRUPT;
       PCMACL += Get_SBYTE_PCMAC1;
       nextop0;
@@ -1261,19 +1268,7 @@ check_interrupt:
       }
     }
   }
-
   nextop0;
-
-/************************************************************************/
-/* Common Jump Tails (they have to jump anyway, so use common Tail) */
-/************************************************************************/
-PopNextop1:
-  POP;
-  nextop1;
-
-PopNextop2:
-  POP;
-  nextop2;
 }
 
 void do_brk(void) {}

src/xinit.c

@@ -50,8 +50,6 @@ unsigned LispWindowRequestedHeight = DEF_WIN_HEIGHT;
 
 extern int LispDisplayRequestedX, LispDisplayRequestedY;
 extern unsigned LispDisplayRequestedWidth, LispDisplayRequestedHeight;
-int LispDisplayRequestedX, LispDisplayRequestedY;
-unsigned LispDisplayRequestedWidth, LispDisplayRequestedHeight;
 
 extern Colormap Colors;
 Colormap Colors;