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.

Adds the non-keypad arrow keys to be detected.
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))
2026-03-16 06:47:22 +00:00 · 2025-05-27 20:23:06 -07:00 · 2025-02-12 11:22:08 -08:00 · 2025-02-03 12:19:50 -08:00 · 2025-02-02 16:31:43 -08:00 · 2025-02-01 19:10:38 -08:00
49 changed files with 391 additions and 396 deletions
--- a/.github/workflows/Dockerfile_builder
+++ b/.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
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -1,6 +1,6 @@
 name: Build

-on: [push, pull_request, workflow_dispatch]
+on: [push, pull_request]

 defaults:
  run:
@@ -11,7 +11,7 @@ jobs:
    runs-on: ${{ matrix.os }}
    strategy:
      matrix:
-        os: [macos-12, macos-13, macos-14, macos-15, ubuntu-24.04, ubuntu-22.04, ubuntu-20.04]
+        os: [macos-11, macos-12, ubuntu-22.04, ubuntu-20.04]
    steps:
      - uses: actions/checkout@v3
      - name: Install X11 dependencies on MacOS
@@ -37,7 +37,7 @@ jobs:
    runs-on: ${{ matrix.os }}
    strategy:
      matrix:
-        os: [macos-12, macos-13, macos-14, macos-15, ubuntu-24.04, ubuntu-22.04, ubuntu-20.04]
+        os: [macos-11, macos-12, ubuntu-22.04, ubuntu-20.04]
    env:
      BUILD_TYPE: Release
    steps:
--- a/.github/workflows/buildBuilderImage.yml
+++ b/.github/workflows/buildBuilderImage.yml
@@ -29,7 +29,7 @@ jobs:

  buildBuilder:

-    runs-on: ubuntu-24.04
+    runs-on: ubuntu-latest

    steps:
      # Checkout maiko
--- a/.github/workflows/buildRelease.yml
+++ b/.github/workflows/buildRelease.yml
@@ -84,7 +84,7 @@ jobs:
  # the result of a workflow_dispatch or a workflow_call

  inputs:
-    runs-on: ubuntu-24.04
+    runs-on: ubuntu-latest
    outputs:
      draft: ${{ steps.one.outputs.draft }}
      force: ${{ steps.one.outputs.force }}
@@ -116,7 +116,7 @@ jobs:

  sentry:
    needs: inputs
-    runs-on: ubuntu-24.04
+    runs-on: ubuntu-latest
    outputs:
      release_not_built: ${{ steps.check.outputs.release_not_built }}

@@ -152,7 +152,7 @@ jobs:
         || needs.inputs.outputs.force == 'true'
      )

-    runs-on: ubuntu-24.04
+    runs-on: ubuntu-22.04

    steps:
      # Checkout the actions for this repo owner
@@ -185,14 +185,14 @@ jobs:

      # Setup the Docker Machine Emulation environment.
      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v3
+        uses: docker/setup-qemu-action@v2
        with:
          platforms: linux/amd64,linux/arm64,linux/arm/v7

      # Setup the Docker Buildx funtion
      - name: Set up Docker Buildx
        id: buildx
-        uses: docker/setup-buildx-action@v3
+        uses: docker/setup-buildx-action@v2

      # Do the Docker Build using the Dockerfile in the repository we
      # checked out.  Save the results in a directory under /tmp to be used
@@ -204,7 +204,7 @@ jobs:
      #       Dockerfile, NOT HERE IN THE WORKFLOW.
      #
      - name: Build Docker Image and Save It Locally
-        uses: docker/build-push-action@v6
+        uses: docker/build-push-action@v4
        with:
          builder: ${{ steps.buildx.outputs.name }}
          build-args: |
@@ -266,7 +266,7 @@ jobs:
          || needs.inputs.outputs.force == 'true'
      )

-    runs-on: macos-12
+    runs-on: macos-latest

    steps:

@@ -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
@@ -487,7 +487,7 @@ jobs:
         || needs.inputs.outputs.force == 'true'
      )

-    runs-on: ubuntu-24.04
+    runs-on: ubuntu-latest

    steps:

@@ -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
@@ -554,7 +555,7 @@ jobs:

  complete:

-    runs-on: ubuntu-24.04
+    runs-on: ubuntu-latest

    outputs:
      build_successful: ${{ steps.output.outputs.build_successful }}
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -80,7 +80,6 @@ IF(MAIKO_DISPLAY_X11)
    inc/xmkicondefs.h
    inc/xrdoptdefs.h
    inc/xscrolldefs.h
-    inc/xscroll.h
    inc/xwinmandefs.h
  )
  MESSAGE("-- Configured for X11 display")
@@ -142,6 +141,9 @@ IF(CMAKE_SYSTEM_NAME STREQUAL "SunOS")
  LIST(APPEND MAIKO_DEFINITIONS
    "-DOS5"
  )
+  LIST(APPEND MAIKO_INIT_DEFINITIONS
+    "-DOS5"
+  )
 ENDIF()

 IF(APPLE)
@@ -292,7 +294,7 @@ SET(MAIKO_HDRS
    inc/bindefs.h
    inc/bindsdefs.h
    inc/bitbltdefs.h
-    inc/bitblt.h
+    inc/bbtmacro.h
    inc/bltdefs.h
    inc/byteswapdefs.h
    inc/car-cdrdefs.h
@@ -317,7 +319,6 @@ SET(MAIKO_HDRS
    inc/emlglob.h
    inc/eqfdefs.h
    inc/etherdefs.h
-    inc/ether.h
    inc/fast_dsp.h
    inc/findkeydefs.h
    inc/foreigndefs.h
@@ -396,14 +397,14 @@ SET(MAIKO_HDRS
    inc/opcodes.h
    inc/os.h
    inc/osmsgdefs.h
-    inc/osmsg.h
+    inc/osmsgprint.h
    inc/perrnodefs.h
    inc/picture.h
    inc/pilotbbt.h
    inc/print.h
    inc/rawrs232c.h
+    inc/retmacro.h
    inc/returndefs.h
-    inc/return.h
    inc/rpcdefs.h
    inc/rplconsdefs.h
    inc/rs232c.h
@@ -421,7 +422,6 @@ SET(MAIKO_HDRS
    inc/tos1defs.h
    inc/tosfns.h
    inc/tosret.h
-    inc/tty.h
    inc/typeofdefs.h
    inc/ubf1defs.h
    inc/ubf2defs.h
@@ -437,14 +437,13 @@ SET(MAIKO_HDRS
    inc/vars3defs.h
    inc/version.h
    inc/vmemsavedefs.h
-    inc/vmemsave.h
    inc/xcdefs.h
    inc/z2defs.h
 )

-ADD_CUSTOM_TARGET(gen-vdate
+ADD_CUSTOM_COMMAND(OUTPUT vdate.c
  COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/bin/mkvdate > vdate.c
-  BYPRODUCTS vdate.c
+  DEPENDS ${MAIKO_SRCS} ${MAIKO_HDRS} ${MAIKO_DISPLAY_X11_SRCS} ${MAIKO_DISPLAY_X11_HDRS} ${MAIKO_DISPLAY_SDL_SRCS} ${MAIKO_DISPLAY_SDL_HDRS} 
 )

 ADD_EXECUTABLE(lde src/ldeboot.c src/unixfork.c)
--- a/README.md
+++ b/README.md
@@ -1,8 +1,9 @@
 # Maiko

-Maiko is the implementation of the Medley Interlisp virtual machine, for a
-byte-coded Lisp instruction set and some low-level functions for
-connecting with Lisp for access to display (via X11) and disk etc.
+Maiko is the implementation of the Medley Interlisp virtual machine for a
+byte-coded Lisp instruction set, and some low-level functions for
+connecting Lisp to a display (via X11 or SDL), the local filesystem,
+and a network subsystem.

 For an overview, see [Medley Interlisp Introduction](https://interlisp.org/medley/using/docs/medley/).

@@ -15,13 +16,14 @@ Bug reports, feature requests, fixes and improvements, support for additional pl

 ## Development Platforms

-We are developing on FreeBSD, Linux, macOS, and Solaris currently
-on arm7l, arm64, PowerPC, SPARC, i386, and x86_64 hardware.
+Development has been primarily on macOS, FreeBSD, and Linux, with testing on Solaris and Windows.
+Processor architectures i386, x86\_64, arm64, arm7l, and SPARC.


 ## Building Maiko

-Building requires `clang`, `make`, X11 client libraries (`libx11-dev`). For example, 
+### Building with make
+Building requires a C compiler (`clang` preferred), either `make` or `CMake`, and X11 client libraries (`libx11-dev`), or SDL2. For example, using `make` and X11:

 ``` sh
 $ sudo apt update
@@ -33,17 +35,21 @@ $ cd maiko/bin
 $ ./makeright x
 ```

-* The build will (attempt to) detect the OS-type and cpu-type. It will build binaries `lde` and `ldex` in `../ostype.cputype` (with .o files in `..ostype.cputype-x`. For example, Linux on a 64-bit x86 will use `linux.x86_64`, while macOS 11 on a (new M1) Mac will use `darwin.aarch64`.
-* If you prefer using `gcc` over `clang`, you will need to edit the makefile fragment for your configuration (`makefile-ostype.cputype-x`) and comment out the line (with a #) that defines `CC` for `clang` and uncomment the line (delete the #) for the line that defines `CC` for `gcc`.
-* There is a cmake configuration (TBD To Be Described here).
+* The build will (attempt to) detect the OS-type and cpu-type. It will build binaries `lde` and `ldex` in `../`_`ostype.cputype`_ (with .o files in `../`_`ostype.cputype-x`_. For example, Linux on a 64-bit x86 will use `linux.x86_64`, while macOS 11 on a (new M1) Mac will use `darwin.aarch64`.
+* If you prefer `gcc` over `clang`, you will need to edit the makefile fragment for your configuration (`makefile-ostype.cputype-x`) and comment out the line (with a #) that defines `CC` as `clang` and uncomment the line (delete the #) for the line that defines `CC` as `gcc`.
+
+### Building with CMake
+We provide a `CMakeLists.txt` which provides mostly matching build capabilities to the `make` setup.
+CMake options are provided to control the configuration of the Maiko executables:
+* MAIKO\_DISPLAY\_SDL: [OFF], 2, 3 - selects display subsystem SDL of version specified
+* MAIKO\_DISPLAY\_X11: [ON], OFF - selects X11 display subsystem
+* MAIKO\_NETWORK\_TYPE: [NONE], SUN\_DLPI, SUN\_NIT, NETHUB - network subsystem access
+* MAIKO_RELEASE: [351], various - see `maiko/inc/version.h`
+
+While SDL3 is selectable, the Maiko code has not yet been updated to work with the SDL3 API.

 ### Building For macOS

-* Running on macOS requires an X server, and building on a Mac requires X client libraries.
+* Building/running on macOS requires either an X server and X client libraries or the SDL2 library.
 An X-server for macOS (and X11 client libraries) can be freely obtained at https://www.xquartz.org/releases
-
-### Building for Windows 10
-
-Windows 10 currently requires "Docker for Desktop" or WSL2 and a (Windows X-server).
-See [Medley's README](https://github.com/Interlisp/medley/blob/master/README.md) for more.
-
+The SDL library is freely available from https://libsdl.org
--- a/bin/makefile-dos
+++ b/bin/makefile-dos
@@ -18,7 +18,7 @@ SRCFILES = conspage.c gcoflow.c shift.c dbgtool.c gcr.c         gcrcell.c llstk.
 OFILES = conspage.obj gcoflow.obj shift.obj dbgtool.obj         gcr.obj  gcrcell.obj llstk.obj  gcscan.obj loopsops.obj storage.obj     allocmds.obj dir.obj gvar2.obj lowlev1.obj      subr.obj arithops.obj lowlev2.obj       subr0374.obj doscomm.obj     hardrtn.obj lsthandl.obj sxhash.obj draw.obj main.obj testtool.obj array.obj        dsk.obj inet.obj misc7.obj timer.obj    array2.obj dspif.obj initdsp.obj miscn.obj      typeof.obj array3.obj initkbd.obj ubf1.obj      array4.obj dspsubrs.obj initsout.obj    mkatom.obj ubf2.obj array5.obj eqf.obj  intcall.obj mkcell.obj ubf3.obj array6.obj      ether.obj ufn.obj atom.obj      findkey.obj kbdsubrs.obj mouseif.obj ufs.obj    bbtsub.obj foreign.obj keyevent.obj     unixcomm.obj bin.obj fp.obj binds.obj fvar.obj mvs.obj      unwind.obj bitblt.obj gc.obj    uraid.obj blt.obj gc2.obj       kprint.obj osmsg.obj usrsubr.obj byteswap.obj   gcarray.obj perrno.obj uutils.obj       carcdr.obj asmbbt.obj gccode.obj        vars3.obj gcfinal.obj ldsout.obj        return.obj vmemsave.obj chardev.obj     gchtfind.obj lineblt8.obj rpc.obj xc.obj        common.obj gcmain3.obj lisp2c.obj rplcons.obj   z2.obj  vdate.obj $(COLORFILES) $(ARCHFILES) $(LPFILES)


-HFILES = address.h adr68k.h arithopsdefs.h arith.h cell.h dbprint.h display.h  dspif.h ifpage.h iopage.h lispemul.h lispmap.h  lsptypes.h miscstat.h lspglob.h array.h bb.h    bitblt.h debug.h devconf.h dspdata.h ether.h    fast_dsp.h gcdata.h initatms.h inlinec.h keyboard.h         lispver1.h lispver2.h lldsp.h locfile.h medleyfp.h mouseif.h my.h  opcodes.h osmsg.h pilotbbt.h print.h return.h stack.h stream.h subrs.h timeout.h   tos1defs.h tosfns.h tosret.h vmemsave.h         xdefs.h xbitmaps.h xkeymap.h
+HFILES = address.h adr68k.h arithopsdefs.h arith.h cell.h dbprint.h display.h  dspif.h ifpage.h iopage.h lispemul.h lispmap.h  lsptypes.h miscstat.h lspglob.h array.h bb.h    bbtmacro.h debug.h devconf.h dspdata.h fast_dsp.h gcdata.h initatms.h inlinec.h keyboard.h         lispver1.h lispver2.h lldsp.h locfile.h medleyfp.h mouseif.h my.h  opcodes.h osmsgprint.h pilotbbt.h print.h retmacro.h stack.h stream.h subrs.h timeout.h   tos1defs.h tosfns.h tosret.h xdefs.h xbitmaps.h xkeymap.h



@@ -35,7 +35,7 @@ emul.exe : $(OFILES)
 	del copts
 	@ echo "Executable is now named '$@'"
   
-main.o  :       lispemul.h address.h lsptypes.h adr68k.h stack.h lspglob.h lispmap.h ifpage.h iopage.h return.h debug.h
+main.o  :       lispemul.h address.h lsptypes.h adr68k.h stack.h lspglob.h lispmap.h ifpage.h iopage.h retmacro.h debug.h


 													
--- a/bin/makefile-tail
+++ b/bin/makefile-tail
@@ -192,7 +192,7 @@ $(OBJECTDIR)ldeether.o: $(SRCDIR)ldeether.c $(REQUIRED-INCS)
 $(OBJECTDIR)main.o: $(SRCDIR)main.c $(REQUIRED-INCS) \
 	$(INCDIR)lispemul.h $(INCDIR)dbprint.h \
 	$(INCDIR)emlglob.h $(INCDIR)address.h $(INCDIR)adr68k.h $(INCDIR)stack.h \
-	$(INCDIR)return.h $(INCDIR)lspglob.h $(INCDIR)ifpage.h $(INCDIR)iopage.h \
+	$(INCDIR)retmacro.h $(INCDIR)lspglob.h $(INCDIR)ifpage.h $(INCDIR)iopage.h \
 	$(INCDIR)miscstat.h $(INCDIR)lsptypes.h $(INCDIR)lispmap.h $(INCDIR)debug.h \
 	$(INCDIR)timeout.h $(INCDIR)maindefs.h $(INCDIR)commondefs.h \
 	$(INCDIR)dirdefs.h $(INCDIR)dspifdefs.h $(INCDIR)devif.h \
@@ -292,7 +292,7 @@ $(OBJECTDIR)bitblt.o: $(SRCDIR)bitblt.c $(REQUIRED-INCS) \
 	$(INCDIR)lispemul.h $(INCDIR)lspglob.h \
 	$(INCDIR)ifpage.h $(INCDIR)iopage.h $(INCDIR)miscstat.h $(INCDIR)lispmap.h \
 	$(INCDIR)adr68k.h $(INCDIR)address.h $(INCDIR)pilotbbt.h $(INCDIR)display.h \
-	$(INCDIR)bitblt.h $(INCDIR)bb.h $(INCDIR)bitbltdefs.h $(INCDIR)initdspdefs.h
+	$(INCDIR)bbtmacro.h $(INCDIR)bb.h $(INCDIR)bitbltdefs.h $(INCDIR)initdspdefs.h
 	$(CC) $(RFLAGS) $(SRCDIR)bitblt.c -o $(OBJECTDIR)bitblt.o

 $(OBJECTDIR)bbt68k.o: $(OBJECTDIR)bbt68k.i $(SRCDIR)bbt68k.s
@@ -308,10 +308,10 @@ $(OBJECTDIR)bbtsub.o: $(SRCDIR)bbtsub.c $(REQUIRED-INCS) \
 	$(INCDIR)xdefs.h $(INCDIR)lispemul.h $(INCDIR)lspglob.h $(INCDIR)ifpage.h \
 	$(INCDIR)iopage.h $(INCDIR)miscstat.h $(INCDIR)lispmap.h $(INCDIR)lsptypes.h \
 	$(INCDIR)emlglob.h $(INCDIR)adr68k.h $(INCDIR)address.h $(INCDIR)arith.h \
-	$(INCDIR)stack.h $(INCDIR)return.h $(INCDIR)cell.h $(INCDIR)gcdata.h \
+	$(INCDIR)stack.h $(INCDIR)retmacro.h $(INCDIR)cell.h $(INCDIR)gcdata.h \
 	$(INCDIR)bbtsubdefs.h $(INCDIR)car-cdrdefs.h $(INCDIR)commondefs.h \
 	$(INCDIR)gcarraydefs.h $(INCDIR)initdspdefs.h $(INCDIR)kprintdefs.h \
-	$(INCDIR)llstkdefs.h $(INCDIR)returndefs.h $(INCDIR)bb.h $(INCDIR)bitblt.h \
+	$(INCDIR)llstkdefs.h $(INCDIR)returndefs.h $(INCDIR)bb.h $(INCDIR)bbtmacro.h \
 	$(INCDIR)pilotbbt.h $(INCDIR)dspdata.h $(INCDIR)display.h $(INCDIR)dbprint.h \
 	$(INCDIR)devif.h
 	$(CC) $(RFLAGS) $(SRCDIR)bbtsub.c -o $(OBJECTDIR)bbtsub.o
@@ -340,7 +340,7 @@ $(OBJECTDIR)car-cdr.o: $(SRCDIR)car-cdr.c $(REQUIRED-INCS) \
 $(OBJECTDIR)chardev.o: $(SRCDIR)chardev.c $(REQUIRED-INCS) \
 	$(INCDIR)lispemul.h $(INCDIR)lispmap.h \
 	$(INCDIR)adr68k.h $(INCDIR)lsptypes.h $(INCDIR)arith.h $(INCDIR)timeout.h \
-	$(INCDIR)locfile.h $(INCDIR)lispver2.h $(INCDIR)osmsg.h $(INCDIR)dbprint.h \
+	$(INCDIR)locfile.h $(INCDIR)lispver2.h $(INCDIR)dbprint.h \
 	$(INCDIR)chardevdefs.h $(INCDIR)byteswapdefs.h $(INCDIR)commondefs.h \
 	$(INCDIR)perrnodefs.h
 	$(CC) $(RFLAGS) $(SRCDIR)chardev.c -o $(OBJECTDIR)chardev.o
@@ -348,7 +348,7 @@ $(OBJECTDIR)chardev.o: $(SRCDIR)chardev.c $(REQUIRED-INCS) \
 $(OBJECTDIR)rawcolor.o: $(SRCDIR)rawcolor.c $(REQUIRED-INCS) $(INCDIR)lispemul.h \
 	$(INCDIR)lspglob.h $(INCDIR)lispmap.h $(INCDIR)lsptypes.h \
 	$(INCDIR)emlglob.h $(INCDIR)adr68k.h $(INCDIR)address.h \
-	$(INCDIR)pilotbbt.h $(INCDIR)display.h $(INCDIR)bitblt.h \
+	$(INCDIR)pilotbbt.h $(INCDIR)display.h $(INCDIR)bbtmacro.h \
 	$(INCDIR)arith.h $(INCDIR)cell.h $(INCDIR)dspdata.h $(INCDIR)debug.h \
 	$(INCDIR)stream.h $(INCDIR)bbtsubdefs.h
 	$(CC) $(RFLAGS) $(SRCDIR)rawcolor.c -o $(OBJECTDIR)rawcolor.o
@@ -357,7 +357,7 @@ $(OBJECTDIR)llcolor.o: $(SRCDIR)llcolor.c $(REQUIRED-INCS) \
 	$(INCDIR)lispemul.h $(INCDIR)lispmap.h \
 	$(INCDIR)lsptypes.h $(INCDIR)address.h $(INCDIR)adr68k.h $(INCDIR)lspglob.h \
 	$(INCDIR)ifpage.h $(INCDIR)iopage.h $(INCDIR)miscstat.h $(INCDIR)emlglob.h \
-	$(INCDIR)display.h $(INCDIR)devconf.h $(INCDIR)bb.h $(INCDIR)bitblt.h \
+	$(INCDIR)display.h $(INCDIR)devconf.h $(INCDIR)bb.h $(INCDIR)bbtmacro.h \
 	$(INCDIR)pilotbbt.h $(INCDIR)dbprint.h $(INCDIR)llcolordefs.h
 	$(CC) $(RFLAGS) $(SRCDIR)llcolor.c -o $(OBJECTDIR)llcolor.o

@@ -391,7 +391,7 @@ $(OBJECTDIR)mkcell.o: $(SRCDIR)mkcell.c $(REQUIRED-INCS) \
 $(OBJECTDIR)draw.o: $(SRCDIR)draw.c $(REQUIRED-INCS) \
 	$(INCDIR)lispemul.h $(INCDIR)lspglob.h \
 	$(INCDIR)ifpage.h $(INCDIR)iopage.h $(INCDIR)miscstat.h $(INCDIR)lispmap.h \
-	$(INCDIR)lsptypes.h $(INCDIR)emlglob.h $(INCDIR)adr68k.h $(INCDIR)bitblt.h \
+	$(INCDIR)lsptypes.h $(INCDIR)emlglob.h $(INCDIR)adr68k.h $(INCDIR)bbtmacro.h \
 	$(INCDIR)display.h $(INCDIR)drawdefs.h $(INCDIR)bbtsubdefs.h \
 	$(INCDIR)initdspdefs.h
 	$(CC) $(RFLAGS) $(SRCDIR)draw.c -o $(OBJECTDIR)draw.o
@@ -423,7 +423,7 @@ $(OBJECTDIR)fp.o: $(SRCDIR)fp.c $(REQUIRED-INCS) \
 $(OBJECTDIR)intcall.o: $(SRCDIR)intcall.c $(REQUIRED-INCS) \
 	$(INCDIR)lispemul.h $(INCDIR)address.h \
 	$(INCDIR)adr68k.h $(INCDIR)lsptypes.h $(INCDIR)lispmap.h $(INCDIR)stack.h \
-	$(INCDIR)return.h $(INCDIR)emlglob.h $(INCDIR)lspglob.h $(INCDIR)ifpage.h \
+	$(INCDIR)retmacro.h $(INCDIR)emlglob.h $(INCDIR)lspglob.h $(INCDIR)ifpage.h \
 	$(INCDIR)iopage.h $(INCDIR)miscstat.h $(INCDIR)initatms.h $(INCDIR)cell.h \
 	$(INCDIR)tosfns.h $(INCDIR)intcalldefs.h $(INCDIR)commondefs.h \
 	$(INCDIR)llstkdefs.h $(INCDIR)returndefs.h
@@ -450,7 +450,7 @@ $(OBJECTDIR)ubf3.o: $(SRCDIR)ubf3.c $(REQUIRED-INCS) \
 $(OBJECTDIR)uutils.o: $(SRCDIR)uutils.c $(REQUIRED-INCS) \
 	$(INCDIR)lispemul.h $(INCDIR)adr68k.h \
 	$(INCDIR)lsptypes.h $(INCDIR)lspglob.h $(INCDIR)ifpage.h $(INCDIR)iopage.h \
-	$(INCDIR)miscstat.h $(INCDIR)osmsg.h $(INCDIR)keyboard.h $(INCDIR)uutilsdefs.h \
+	$(INCDIR)miscstat.h $(INCDIR)osmsgprint.h $(INCDIR)keyboard.h $(INCDIR)uutilsdefs.h \
 	$(INCDIR)osmsgdefs.h $(INCDIR)uraiddefs.h
 	$(CC) $(RFLAGS) $(SRCDIR)uutils.c -o $(OBJECTDIR)uutils.o

@@ -478,21 +478,21 @@ $(OBJECTDIR)ether_common.o: $(SRCDIR)ether_common.c $(REQUIRED-INCS) \
 	$(INCDIR)commondefs.h $(INCDIR)lispemul.h \
 	$(INCDIR)lispmap.h $(INCDIR)emlglob.h $(INCDIR)lsptypes.h $(INCDIR)lspglob.h \
 	$(INCDIR)ifpage.h $(INCDIR)iopage.h $(INCDIR)miscstat.h $(INCDIR)adr68k.h \
-	$(INCDIR)ether.h $(INCDIR)dbprint.h $(INCDIR)etherdefs.h
+	$(INCDIR)dbprint.h $(INCDIR)etherdefs.h
 	$(CC) $(RFLAGS) $(SRCDIR)ether_common.c -o $(OBJECTDIR)ether_common.o

 $(OBJECTDIR)ether_sunos.o: $(SRCDIR)ether_sunos.c $(REQUIRED-INCS) \
 	$(INCDIR)commondefs.h $(INCDIR)lispemul.h \
 	$(INCDIR)lispmap.h $(INCDIR)emlglob.h $(INCDIR)lsptypes.h $(INCDIR)lspglob.h \
 	$(INCDIR)ifpage.h $(INCDIR)iopage.h $(INCDIR)miscstat.h $(INCDIR)adr68k.h \
-	$(INCDIR)ether.h $(INCDIR)dbprint.h $(INCDIR)etherdefs.h
+	$(INCDIR)dbprint.h $(INCDIR)etherdefs.h
 	$(CC) $(RFLAGS) $(SRCDIR)ether_sunos.c -o $(OBJECTDIR)ether_sunos.o

 $(OBJECTDIR)ether_nethub.o: $(SRCDIR)ether_nethub.c $(REQUIRED-INCS) \
 	$(INCDIR)commondefs.h $(INCDIR)lispemul.h \
 	$(INCDIR)lispmap.h $(INCDIR)emlglob.h $(INCDIR)lsptypes.h $(INCDIR)lspglob.h \
 	$(INCDIR)ifpage.h $(INCDIR)iopage.h $(INCDIR)miscstat.h $(INCDIR)adr68k.h \
-	$(INCDIR)ether.h $(INCDIR)dbprint.h $(INCDIR)etherdefs.h
+	$(INCDIR)dbprint.h $(INCDIR)etherdefs.h
 	$(CC) $(RFLAGS) $(SRCDIR)ether_nethub.c -o $(OBJECTDIR)ether_nethub.o

 $(OBJECTDIR)findkey.o: $(SRCDIR)findkey.c $(REQUIRED-INCS) \
@@ -505,7 +505,7 @@ $(OBJECTDIR)dsk.o: $(SRCDIR)dsk.c $(REQUIRED-INCS) \
 	$(INCDIR)lispemul.h $(INCDIR)lispmap.h \
 	$(INCDIR)adr68k.h $(INCDIR)lsptypes.h $(INCDIR)lspglob.h $(INCDIR)ifpage.h \
 	$(INCDIR)iopage.h $(INCDIR)miscstat.h $(INCDIR)arith.h $(INCDIR)stream.h \
-	$(INCDIR)timeout.h $(INCDIR)locfile.h $(INCDIR)lispver2.h $(INCDIR)osmsg.h \
+	$(INCDIR)timeout.h $(INCDIR)locfile.h $(INCDIR)lispver2.h \
 	$(INCDIR)dbprint.h $(INCDIR)dskdefs.h $(INCDIR)byteswapdefs.h \
 	$(INCDIR)car-cdrdefs.h $(INCDIR)cell.h $(INCDIR)commondefs.h \
 	$(INCDIR)ufsdefs.h
@@ -632,7 +632,7 @@ $(OBJECTDIR)hardrtn.o: $(SRCDIR)hardrtn.c $(REQUIRED-INCS) \
 	$(INCDIR)lispemul.h $(INCDIR)lispmap.h \
 	$(INCDIR)lsptypes.h $(INCDIR)adr68k.h $(INCDIR)address.h $(INCDIR)lspglob.h \
 	$(INCDIR)ifpage.h $(INCDIR)iopage.h $(INCDIR)miscstat.h $(INCDIR)emlglob.h \
-	$(INCDIR)cell.h $(INCDIR)stack.h $(INCDIR)return.h $(INCDIR)hardrtndefs.h \
+	$(INCDIR)cell.h $(INCDIR)stack.h $(INCDIR)retmacro.h $(INCDIR)hardrtndefs.h \
 	$(INCDIR)commondefs.h $(INCDIR)llstkdefs.h
 	$(CC) $(RFLAGS) $(SRCDIR)hardrtn.c -o $(OBJECTDIR)hardrtn.o

@@ -640,7 +640,7 @@ $(OBJECTDIR)inet.o: $(SRCDIR)inet.c $(REQUIRED-INCS) \
 	$(INCDIR)lispemul.h $(INCDIR)lispmap.h \
 	$(INCDIR)lsptypes.h $(INCDIR)arith.h $(INCDIR)emlglob.h $(INCDIR)lspglob.h \
 	$(INCDIR)ifpage.h $(INCDIR)iopage.h $(INCDIR)miscstat.h $(INCDIR)adr68k.h \
-	$(INCDIR)ether.h $(INCDIR)dbprint.h $(INCDIR)locfile.h $(INCDIR)lispver2.h \
+	$(INCDIR)dbprint.h $(INCDIR)locfile.h $(INCDIR)lispver2.h \
 	$(INCDIR)inetdefs.h $(INCDIR)byteswapdefs.h $(INCDIR)commondefs.h \
 	$(INCDIR)mkcelldefs.h
 	$(CC) $(RFLAGS) $(SRCDIR)inet.c -o $(OBJECTDIR)inet.o
@@ -649,7 +649,7 @@ $(OBJECTDIR)initdsp.o: $(SRCDIR)initdsp.c $(REQUIRED-INCS) \
 	$(INCDIR)lispemul.h $(INCDIR)lispmap.h \
 	$(INCDIR)lsptypes.h $(INCDIR)address.h $(INCDIR)adr68k.h $(INCDIR)lspglob.h \
 	$(INCDIR)ifpage.h $(INCDIR)iopage.h $(INCDIR)miscstat.h $(INCDIR)emlglob.h \
-	$(INCDIR)display.h $(INCDIR)devconf.h $(INCDIR)bb.h $(INCDIR)bitblt.h \
+	$(INCDIR)display.h $(INCDIR)devconf.h $(INCDIR)bb.h $(INCDIR)bbtmacro.h \
 	$(INCDIR)pilotbbt.h $(INCDIR)dbprint.h $(INCDIR)initdspdefs.h \
 	$(INCDIR)byteswapdefs.h $(INCDIR)xcursordefs.h $(INCDIR)devif.h
 	$(CC) $(RFLAGS) $(SRCDIR)initdsp.c -o $(OBJECTDIR)initdsp.o
@@ -682,7 +682,7 @@ $(OBJECTDIR)keyevent.o: $(SRCDIR)keyevent.c $(REQUIRED-INCS) \
 	$(INCDIR)lispemul.h $(INCDIR)lspglob.h \
 	$(INCDIR)ifpage.h $(INCDIR)iopage.h $(INCDIR)miscstat.h $(INCDIR)adr68k.h \
 	$(INCDIR)address.h $(INCDIR)stack.h $(INCDIR)keyboard.h $(INCDIR)display.h \
-	$(INCDIR)lsptypes.h $(INCDIR)bb.h $(INCDIR)bitblt.h $(INCDIR)pilotbbt.h \
+	$(INCDIR)lsptypes.h $(INCDIR)bb.h $(INCDIR)bbtmacro.h $(INCDIR)pilotbbt.h \
 	$(INCDIR)keyeventdefs.h $(INCDIR)osmsgdefs.h $(INCDIR)xwinmandefs.h \
 	$(INCDIR)devif.h $(INCDIR)dbprint.h
 	$(CC) $(RFLAGS) $(SRCDIR)keyevent.c -o $(OBJECTDIR)keyevent.o
@@ -698,7 +698,7 @@ $(OBJECTDIR)llstk.o: $(SRCDIR)llstk.c $(REQUIRED-INCS) \
 	$(INCDIR)lispemul.h $(INCDIR)lispmap.h \
 	$(INCDIR)adr68k.h $(INCDIR)address.h $(INCDIR)lsptypes.h $(INCDIR)initatms.h \
 	$(INCDIR)lspglob.h $(INCDIR)ifpage.h $(INCDIR)iopage.h $(INCDIR)miscstat.h \
-	$(INCDIR)emlglob.h $(INCDIR)cell.h $(INCDIR)stack.h $(INCDIR)return.h \
+	$(INCDIR)emlglob.h $(INCDIR)cell.h $(INCDIR)stack.h $(INCDIR)retmacro.h \
 	$(INCDIR)llstkdefs.h $(INCDIR)commondefs.h $(INCDIR)dbgtooldefs.h \
 	$(INCDIR)testtooldefs.h $(INCDIR)kprintdefs.h $(INCDIR)storagedefs.h
 	$(CC) $(RFLAGS) $(SRCDIR)llstk.c -o $(OBJECTDIR)llstk.o
@@ -758,7 +758,7 @@ $(OBJECTDIR)osmsg.o: $(SRCDIR)osmsg.c $(REQUIRED-INCS) \
 	$(INCDIR)lispemul.h $(INCDIR)lispmap.h \
 	$(INCDIR)adr68k.h $(INCDIR)lsptypes.h $(INCDIR)arith.h $(INCDIR)stream.h \
 	$(INCDIR)lspglob.h $(INCDIR)ifpage.h $(INCDIR)iopage.h $(INCDIR)miscstat.h \
-	$(INCDIR)timeout.h $(INCDIR)locfile.h $(INCDIR)lispver2.h $(INCDIR)osmsg.h \
+	$(INCDIR)timeout.h $(INCDIR)locfile.h $(INCDIR)lispver2.h $(INCDIR)osmsgprint.h \
 	$(INCDIR)dbprint.h $(INCDIR)commondefs.h $(INCDIR)osmsgdefs.h
 	$(CC) $(RFLAGS) $(SRCDIR)osmsg.c -o $(OBJECTDIR)osmsg.o

@@ -766,7 +766,7 @@ $(OBJECTDIR)return.o: $(SRCDIR)return.c $(REQUIRED-INCS) \
 	$(INCDIR)lispemul.h $(INCDIR)address.h \
 	$(INCDIR)adr68k.h $(INCDIR)lsptypes.h $(INCDIR)lispmap.h $(INCDIR)stack.h \
 	$(INCDIR)emlglob.h $(INCDIR)lspglob.h $(INCDIR)ifpage.h $(INCDIR)iopage.h \
-	$(INCDIR)miscstat.h $(INCDIR)initatms.h $(INCDIR)cell.h $(INCDIR)return.h \
+	$(INCDIR)miscstat.h $(INCDIR)initatms.h $(INCDIR)cell.h $(INCDIR)retmacro.h \
 	$(INCDIR)returndefs.h $(INCDIR)commondefs.h
 	$(CC) $(RFLAGS) $(SRCDIR)return.c -o $(OBJECTDIR)return.o

@@ -828,7 +828,7 @@ $(OBJECTDIR)subr0374.o: $(SRCDIR)subr0374.c $(REQUIRED-INCS) \
 	$(CC) $(RFLAGS) $(SRCDIR)subr0374.c -o $(OBJECTDIR)subr0374.o

 $(OBJECTDIR)perrno.o: $(SRCDIR)perrno.c $(REQUIRED-INCS) \
-	$(INCDIR)lispemul.h $(INCDIR)osmsg.h \
+	$(INCDIR)lispemul.h $(INCDIR)osmsgprint.h \
 	$(INCDIR)perrnodefs.h $(INCDIR)osmsgdefs.h
 	$(CC) $(RFLAGS) $(SRCDIR)perrno.c -o $(OBJECTDIR)perrno.o

@@ -843,7 +843,7 @@ $(OBJECTDIR)timer.o: $(SRCDIR)timer.c $(REQUIRED-INCS) \
 $(OBJECTDIR)tty.o: $(SRCDIR)tty.c $(REQUIRED-INCS) \
 	$(INCDIR)lispemul.h $(INCDIR)lispmap.h \
 	$(INCDIR)adr68k.h $(INCDIR)lsptypes.h $(INCDIR)lspglob.h \
-	$(INCDIR)commondefs.h $(INCDIR)tty.h $(INCDIR)ttydefs.h
+	$(INCDIR)commondefs.h $(INCDIR)ttydefs.h
 	$(CC) $(RFLAGS) $(SRCDIR)tty.c -o $(OBJECTDIR)tty.o

 $(OBJECTDIR)typeof.o: $(SRCDIR)typeof.c $(REQUIRED-INCS) \
@@ -876,7 +876,7 @@ $(OBJECTDIR)uraid.o: $(SRCDIR)uraid.c $(REQUIRED-INCS) \
 	$(INCDIR)lispemul.h $(INCDIR)lispmap.h \
 	$(INCDIR)adr68k.h $(INCDIR)lsptypes.h $(INCDIR)lspglob.h $(INCDIR)ifpage.h \
 	$(INCDIR)iopage.h $(INCDIR)miscstat.h $(INCDIR)emlglob.h $(INCDIR)cell.h \
-	$(INCDIR)debug.h $(INCDIR)devconf.h $(INCDIR)display.h $(INCDIR)bitblt.h \
+	$(INCDIR)debug.h $(INCDIR)devconf.h $(INCDIR)display.h $(INCDIR)bbtmacro.h \
 	$(INCDIR)uraiddefs.h $(INCDIR)dbgtooldefs.h $(INCDIR)stack.h \
 	$(INCDIR)gcarraydefs.h $(INCDIR)initdspdefs.h $(INCDIR)initkbddefs.h \
 	$(INCDIR)kprintdefs.h $(INCDIR)llstkdefs.h $(INCDIR)mkatomdefs.h \
@@ -908,7 +908,7 @@ $(OBJECTDIR)vars3.o: $(SRCDIR)vars3.c $(REQUIRED-INCS) \
 $(OBJECTDIR)vmemsave.o: $(SRCDIR)vmemsave.c $(REQUIRED-INCS) \
 	$(INCDIR)lispemul.h \
 	$(INCDIR)lispmap.h $(INCDIR)lspglob.h $(INCDIR)ifpage.h $(INCDIR)iopage.h \
-	$(INCDIR)miscstat.h $(INCDIR)vmemsave.h $(INCDIR)timeout.h $(INCDIR)adr68k.h \
+	$(INCDIR)miscstat.h $(INCDIR)timeout.h $(INCDIR)adr68k.h \
 	$(INCDIR)lsptypes.h $(INCDIR)locfile.h $(INCDIR)lispver2.h $(INCDIR)dbprint.h \
 	$(INCDIR)devif.h $(INCDIR)vmemsavedefs.h $(INCDIR)byteswapdefs.h $(INCDIR)commondefs.h \
 	$(INCDIR)dskdefs.h $(INCDIR)initkbddefs.h $(INCDIR)perrnodefs.h \
@@ -929,7 +929,7 @@ $(OBJECTDIR)usrsubr.o: $(SRCDIR)usrsubr.c $(REQUIRED-INCS) \

 $(OBJECTDIR)xc.o: $(SRCDIR)xc.c $(REQUIRED-INCS) \
 	$(INCDIR)lispemul.h $(INCDIR)emlglob.h \
-	$(INCDIR)address.h $(INCDIR)adr68k.h $(INCDIR)stack.h $(INCDIR)return.h \
+	$(INCDIR)address.h $(INCDIR)adr68k.h $(INCDIR)stack.h $(INCDIR)retmacro.h \
 	$(INCDIR)dbprint.h $(INCDIR)lspglob.h $(INCDIR)ifpage.h $(INCDIR)iopage.h \
 	$(INCDIR)miscstat.h $(INCDIR)lsptypes.h $(INCDIR)lispmap.h $(INCDIR)cell.h \
 	$(INCDIR)initatms.h $(INCDIR)gcdata.h $(INCDIR)arith.h $(INCDIR)stream.h \
@@ -992,7 +992,7 @@ $(OBJECTDIR)xcursor.o: $(SRCDIR)xcursor.c $(REQUIRED-INCS) \

 $(OBJECTDIR)xwinman.o: $(SRCDIR)xwinman.c $(REQUIRED-INCS) \
 	$(INCDIR)lispemul.h $(INCDIR)miscstat.h $(INCDIR)devif.h $(INCDIR)xdefs.h \
-	$(INCDIR)xscroll.h $(INCDIR)xwinmandefs.h $(INCDIR)keyeventdefs.h \
+	$(INCDIR)xwinmandefs.h $(INCDIR)keyeventdefs.h \
 	$(INCDIR)xlspwindefs.h $(INCDIR)xscrolldefs.h
 	$(CC) $(RFLAGS) $(SRCDIR)xwinman.c -o $(OBJECTDIR)xwinman.o

--- a/bin/mkvdate
+++ b/bin/mkvdate
@@ -1,6 +1,22 @@
 #!/bin/sh
+if command -v "git" >/dev/null 2>&1; then
+    MAIKO_REV="$(git status --porcelain)"
+    if [ $? == 0 ]; then
+	if [ ! -z "$(git status --porcelain)" ]; then
+            MAIKO_REV="$(git rev-parse --short HEAD)-dirty"
+	else
+	    MAIKO_REV="$(git rev-parse --short HEAD)"
+	fi
+    else
+	MAIKO_REV="none"
+    fi
+else
+    MAIKO_REV = "none"
+fi
 cat <<EOF
 #include <time.h>
 extern const time_t MDate;
 const time_t MDate = $(date +%s);
+extern const char *MaikoGitVersion;
+const char *MaikoGitVersion = "maiko git version: $MAIKO_REV";
 EOF
--- a/inc/XKeymap.h
+++ b/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  */
--- a/inc/bbtmacro.h
+++ b/inc/bbtmacro.h
@@ -1,10 +1,10 @@
-#ifndef BITBLT_H
-#define BITBLT_H 1
+#ifndef BBTMACRO_H
+#define BBTMACRO_H 1
 /* $Id: bitblt.h,v 1.2 1999/01/03 02:05:54 sybalsky Exp $ (C) Copyright Venue, All Rights Reserved  */
 /*
 *	Copyright (C) 1988 by Fuji Xerox Co., Ltd. All rights reserved.
 *
- *	File :  bitblt.h
+ *	File :  bbtmacro.h (was bitblt.h)
 *
 *	Author :  Osamu Nakamura
 *
@@ -85,4 +85,4 @@ extern DLword *EmCursorX68K,*EmCursorY68K;
 #define UNLOCKSCREEN ScreenLocked = NIL

 #endif /* DOS */
-#endif /* BITBLT_H */
+#endif /* BBTMACRO_H */
--- a/inc/ether.h
+++ b/inc/ether.h
@@ -1,120 +0,0 @@
-#ifndef ETHER_H
-#define ETHER_H 1
-/* $Id: ether.h,v 1.2 1999/01/03 02:05:59 sybalsky Exp $ (C) Copyright Venue, All Rights Reserved  */
-
-/************************************************************************/
-/*									*/
-/*	(C) Copyright 1989-92 Venue. All Rights Reserved.		*/
-/*	Manufactured in the United States of America.			*/
-/*									*/
-/************************************************************************/
-#include "lispemul.h" /* for LispPTR, DLword */
-
-#ifndef BYTESWAP
-
-typedef struct { 
-	DLword	DLLOCALHOST0;
-	DLword	DLLOCALHOST1;
-	DLword	DLLOCALHOST2;
-	DLword	DLFIRSTICB;
-	DLword	DLINPUTMASK;
-	DLword	DLFIRSTOCB;
-	DLword	DLOUTPUTMASK;
-	DLword	DLMISSEDPACKETS;
-	DLword	DLLASTICB;
-	DLword	DLLASTOCB;
-} DLETHERCSB;
-
-typedef struct{ 
-	DLword	DLIOCBLENGTH;
-	DLword	DLIOCBBUFFERLO;
-	DLword	DLIOCBBUFFERHI;
-	DLword	DLRETRANSMISSIONMASK;
-	DLword	DLIOCBBYTESUSED;
-	DLword	DLIOCBSTATUS;
-	DLword	DLNEXTIOCB;
-	DLword	DLFOROUTPUTUSE;
-} DLETHERIOCB;
-
-typedef struct { 
-	unsigned int	NETTYPE : 8;
-	unsigned int	NDBNEXT : 24;
-	unsigned int	NDBPUPNET : 8;
-	unsigned int	NDBNSNET : 24;
-	unsigned int	NDBTASK : 8;
-	unsigned int	NDBBROADCASTP : 24;
-	unsigned int	NDBPUPHOST : 8;
-	unsigned int	NDBTRANSMITTER : 24;
-	unsigned int	nil1: 8;
-	unsigned int	NDBENCAPSULATOR : 24;
-	unsigned int	NDBIQLENGTH : 8; /* DATATYPE */
-	unsigned int	NDBCSB : 24; /* DATATYPE */
-	LispPTR		NDBIQ;
-	LispPTR		NDBTQ;
-	LispPTR		NDBTRANSLATIONS;
-	LispPTR		NDBETHERFLUSHER;
-	LispPTR		NDBWATCHER;
-	LispPTR		NDBCANHEARSELF;
-	LispPTR		NDBIPNET;
-	LispPTR		NDBIPHOST;
-	DLword		NDBPUPTYPE;
-	DLword		nil2;
-	LispPTR		nil3;
-} NDB;
-#else
-	/***********************************************/
-	/* Byte-swapped definitions, for e.g., 80386's */
-	/***********************************************/
-typedef struct { 
-	DLword	DLLOCALHOST1;
-	DLword	DLLOCALHOST0;
-	DLword	DLFIRSTICB;
-	DLword	DLLOCALHOST2;
-	DLword	DLFIRSTOCB;
-	DLword	DLINPUTMASK;
-	DLword	DLMISSEDPACKETS;
-	DLword	DLOUTPUTMASK;
-	DLword	DLLASTOCB;
-	DLword	DLLASTICB;
-} DLETHERCSB;
-
-typedef struct{ 
-	DLword	DLIOCBBUFFERLO;
-	DLword	DLIOCBLENGTH;
-	DLword	DLRETRANSMISSIONMASK;
-	DLword	DLIOCBBUFFERHI;
-	DLword	DLIOCBSTATUS;
-	DLword	DLIOCBBYTESUSED;
-	DLword	DLFOROUTPUTUSE;
-	DLword	DLNEXTIOCB;
-} DLETHERIOCB;
-
-typedef struct { 
-	unsigned int	NDBNEXT : 24;
-	unsigned int	NETTYPE : 8;
-	unsigned int	NDBNSNET : 24;
-	unsigned int	NDBPUPNET : 8;
-	unsigned int	NDBBROADCASTP : 24;
-	unsigned int	NDBTASK : 8;
-	unsigned int	NDBTRANSMITTER : 24;
-	unsigned int	NDBPUPHOST : 8;
-	unsigned int	NDBENCAPSULATOR : 24;
-	unsigned int	nil1: 8;
-	unsigned int	NDBCSB : 24; /* DATATYPE */
-	unsigned int	NDBIQLENGTH : 8; /* DATATYPE */
-	LispPTR		NDBIQ;
-	LispPTR		NDBTQ;
-	LispPTR		NDBTRANSLATIONS;
-	LispPTR		NDBETHERFLUSHER;
-	LispPTR		NDBWATCHER;
-	LispPTR		NDBCANHEARSELF;
-	LispPTR		NDBIPNET;
-	LispPTR		NDBIPHOST;
-	DLword		nil2;
-	DLword		NDBPUPTYPE;
-	LispPTR		nil3;
-} NDB;
-
-#endif /* BYTESWAP */
-
-#endif /* ETHER_H */
--- a/inc/inlineC.h
+++ b/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;                                    \
--- a/inc/lsptypes.h
+++ b/inc/lsptypes.h
@@ -699,4 +699,111 @@ typedef
 			/* low-order 12 bits first.            */
    } BIGNUM;

+
+/* Ethernet records */
+
+#ifndef BYTESWAP
+typedef struct { 
+	DLword	DLLOCALHOST0;
+	DLword	DLLOCALHOST1;
+	DLword	DLLOCALHOST2;
+	DLword	DLFIRSTICB;
+	DLword	DLINPUTMASK;
+	DLword	DLFIRSTOCB;
+	DLword	DLOUTPUTMASK;
+	DLword	DLMISSEDPACKETS;
+	DLword	DLLASTICB;
+	DLword	DLLASTOCB;
+} DLETHERCSB;
+
+typedef struct{ 
+	DLword	DLIOCBLENGTH;
+	DLword	DLIOCBBUFFERLO;
+	DLword	DLIOCBBUFFERHI;
+	DLword	DLRETRANSMISSIONMASK;
+	DLword	DLIOCBBYTESUSED;
+	DLword	DLIOCBSTATUS;
+	DLword	DLNEXTIOCB;
+	DLword	DLFOROUTPUTUSE;
+} DLETHERIOCB;
+
+typedef struct { 
+	unsigned int	NETTYPE : 8;
+	unsigned int	NDBNEXT : 24;
+	unsigned int	NDBPUPNET : 8;
+	unsigned int	NDBNSNET : 24;
+	unsigned int	NDBTASK : 8;
+	unsigned int	NDBBROADCASTP : 24;
+	unsigned int	NDBPUPHOST : 8;
+	unsigned int	NDBTRANSMITTER : 24;
+	unsigned int	nil1: 8;
+	unsigned int	NDBENCAPSULATOR : 24;
+	unsigned int	NDBIQLENGTH : 8; /* DATATYPE */
+	unsigned int	NDBCSB : 24; /* DATATYPE */
+	LispPTR		NDBIQ;
+	LispPTR		NDBTQ;
+	LispPTR		NDBTRANSLATIONS;
+	LispPTR		NDBETHERFLUSHER;
+	LispPTR		NDBWATCHER;
+	LispPTR		NDBCANHEARSELF;
+	LispPTR		NDBIPNET;
+	LispPTR		NDBIPHOST;
+	DLword		NDBPUPTYPE;
+	DLword		nil2;
+	LispPTR		nil3;
+} NDB;
+#else
+	/***********************************************/
+	/* Byte-swapped definitions, for e.g., 80386's */
+	/***********************************************/
+typedef struct { 
+	DLword	DLLOCALHOST1;
+	DLword	DLLOCALHOST0;
+	DLword	DLFIRSTICB;
+	DLword	DLLOCALHOST2;
+	DLword	DLFIRSTOCB;
+	DLword	DLINPUTMASK;
+	DLword	DLMISSEDPACKETS;
+	DLword	DLOUTPUTMASK;
+	DLword	DLLASTOCB;
+	DLword	DLLASTICB;
+} DLETHERCSB;
+
+typedef struct{ 
+	DLword	DLIOCBBUFFERLO;
+	DLword	DLIOCBLENGTH;
+	DLword	DLRETRANSMISSIONMASK;
+	DLword	DLIOCBBUFFERHI;
+	DLword	DLIOCBSTATUS;
+	DLword	DLIOCBBYTESUSED;
+	DLword	DLFOROUTPUTUSE;
+	DLword	DLNEXTIOCB;
+} DLETHERIOCB;
+
+typedef struct { 
+	unsigned int	NDBNEXT : 24;
+	unsigned int	NETTYPE : 8;
+	unsigned int	NDBNSNET : 24;
+	unsigned int	NDBPUPNET : 8;
+	unsigned int	NDBBROADCASTP : 24;
+	unsigned int	NDBTASK : 8;
+	unsigned int	NDBTRANSMITTER : 24;
+	unsigned int	NDBPUPHOST : 8;
+	unsigned int	NDBENCAPSULATOR : 24;
+	unsigned int	nil1: 8;
+	unsigned int	NDBCSB : 24; /* DATATYPE */
+	unsigned int	NDBIQLENGTH : 8; /* DATATYPE */
+	LispPTR		NDBIQ;
+	LispPTR		NDBTQ;
+	LispPTR		NDBTRANSLATIONS;
+	LispPTR		NDBETHERFLUSHER;
+	LispPTR		NDBWATCHER;
+	LispPTR		NDBCANHEARSELF;
+	LispPTR		NDBIPNET;
+	LispPTR		NDBIPHOST;
+	DLword		nil2;
+	DLword		NDBPUPTYPE;
+	LispPTR		nil3;
+} NDB;
+#endif /* BYTESWAP */
 #endif /* LSPTYPES_H */
--- a/inc/osmsgprint.h
+++ b/inc/osmsgprint.h
@@ -1,5 +1,5 @@
-#ifndef OSMSG_H
-#define OSMSG_H 1
+#ifndef OSMSGPRINT_H
+#define OSMSGPRINT_H 1
 /* $Id: osmsg.h,v 1.2 1999/01/03 02:06:20 sybalsky Exp $ (C) Copyright Venue, All Rights Reserved  */


@@ -23,4 +23,4 @@
    print_exp;					\
  } while (0)

-#endif /* OSMSG_H */
+#endif /* OSMSGPRINT_H */
--- a/inc/retmacro.h
+++ b/inc/retmacro.h
@@ -1,12 +1,12 @@
-#ifndef RETURN_H
-#define RETURN_H 1
+#ifndef RETMACRO_H
+#define RETMACRO_H 1
 /* $Id: return.h,v 1.2 1999/01/03 02:06:22 sybalsky Exp $ (C) Copyright Venue, All Rights Reserved  */


 /**************************************************************/
 /*

-	File Name : 	return.h
+	File Name : 	retmacro.h (was return.h)
 	Desc. :		Macros for return,contextsw

 	Written by :	Takeshi Shimizu
@@ -111,4 +111,4 @@
    S_CHECK( EndSTKP > CurrentStackPTR, 				\
 		"End of stack isn't beyond current stk pointer."); 	\
  } while (0)
-#endif /* RETURN_H */
+#endif /* RETMACRO_H */
--- a/inc/tty.h
+++ b/inc/tty.h
@@ -1,67 +0,0 @@
-#ifndef TTY_H
-#define TTY_H 1
-/* $Id: tty.h,v 1.2 1999/01/03 02:06:29 sybalsky Exp $ (C) Copyright Venue, All Rights Reserved  */
-
-/************************************************************************/
-/*									*/
-/*	(C) Copyright 1989-96 Venue. All Rights Reserved.		*/
-/*	Manufactured in the United States of America.			*/
-/*									*/
-/************************************************************************/
-#include "lispemul.h" /* for DLword */
-
-/*
- TTY Command
-*/
-
-#define TTY_GET_STATUS     33280>>8
-#define TTY_ON             33536>>8
-#define TTY_OFF            33792>>8
-#define TTY_BREAK_ON       34304>>8
-#define TTY_BREAK_OFF      34560>>8
-#define PUT_CHAR             128
-#define ABORT_PUT            133
-#define SET_PARAM            129
-#define SET_DSR            33025
-#define SET_CTS            33026
-#define SET_CHAR_LENGTH    33028
-#define SET_PARITY         33032
-#define SET_STOP_BITS      33040
-#define SET_BAUD_RATE      33056
-#define SET_ALL_PARAMETERS 33087
-
-typedef struct {
-	unsigned command             : 8;
-	unsigned outdata             : 8;
-} DLTTY_OUT_COMMAND;
-
-typedef struct {
-	unsigned on_off              : 4;
-	unsigned line_speed          : 4;
-	unsigned stop_bits           : 2;
-	unsigned parity              : 2;
-	unsigned char_length         : 2;
-	unsigned clear_to_send       : 1;
-	unsigned data_set_ready      : 1;
-	DLword  notify_mask;
-} DLTTY_OUT_CSB;
-
-typedef struct {
-	unsigned state               : 1;
-	unsigned nil1                : 7;
-	unsigned success             : 1;
-	unsigned break_detected      : 1;
-	unsigned framing_error       : 1;
-	unsigned data_lost           : 1;
-	unsigned parity_error        : 1;
-	unsigned nil2                : 2;
-	unsigned not_ready           : 1;
-	char     in_data;
-	unsigned data_terminal_ready : 1;
-	unsigned nil3                : 4;
-	unsigned request_to_send     : 1;
-	unsigned rx_ready            : 1;
-	unsigned tx_ready            : 1;
-} DLTTY_IN_CSB;
-
-#endif /* TTY_H */
--- a/inc/uutilsdefs.h
+++ b/inc/uutilsdefs.h
@@ -6,5 +6,5 @@ LispPTR unix_username(LispPTR *args);
 LispPTR unix_getparm(LispPTR *args);
 LispPTR unix_getenv(LispPTR *args);
 LispPTR unix_fullname(LispPTR *args);
-LispPTR suspend_lisp(LispPTR *args);
+LispPTR suspend_lisp(void);
 #endif
--- a/inc/vmemsave.h
+++ b/inc/vmemsave.h
@@ -1,25 +0,0 @@
-#ifndef VMEMSAVE_H
-#define VMEMSAVE_H 1
-/* $Id: vmemsave.h,v 1.2 1999/01/03 02:06:29 sybalsky Exp $ (C) Copyright Venue, All Rights Reserved  */
-
-
-
-/************************************************************************/
-/*									*/
-/*	(C) Copyright 1989-96 Venue. All Rights Reserved.		*/
-/*	Manufactured in the United States of America.			*/
-/*									*/
-/************************************************************************/
-
-
-/*
-	File Name : vmemsave.h
-	DEfinition for vmemsave
-*/
-
-#define	FP_IFPAGE  512			/* IFPAGE address in sysoutfile by Byte */
-#define	DOMINOPAGES  301		/* skip dominopages  in  fptovp */
-#define	SKIPPAGES  301			/* save first filepage  */
-#define	SKIP_DOMINOPAGES  153600	/* Byte size in sysoutfile for dominocode */
-#define	SAVE_IFPAGE	223		/* Virtual address for IFPAGES's buffer page. This value is \EMUSWAPBUFFERS in lisp. */
-#endif /* VMEMSAVE_H */
--- a/inc/vmemsavedefs.h
+++ b/inc/vmemsavedefs.h
@@ -4,5 +4,5 @@
 int lispstringP(LispPTR Lisp);
 LispPTR vmem_save(char *sysout_file_name);
 LispPTR vmem_save0(LispPTR *args);
-void lisp_finish(void);
+void lisp_finish(int exit_status);
 #endif
--- a/inc/xscroll.h
+++ b/inc/xscroll.h
@@ -1,18 +0,0 @@
-#ifndef XSCROLL_H
-#define XSCROLL_H 1
-/************************************************************************/
-/*									*/
-/*			xscroll.h					*/
-/*									*/
-/* Scrolling functions implemented in xscroll.c				*/
-/*									*/
-/************************************************************************/
-#include "devif.h" /* for DspInterface */
-void Scroll(DspInterface dsp, int newX, int newY);
-void JumpScrollVer(DspInterface dsp, int y);
-void JumpScrollHor(DspInterface dsp, int x);
-void ScrollLeft(DspInterface dsp);
-void ScrollRight(DspInterface dsp);
-void ScrollUp(DspInterface dsp);
-void ScrollDown(DspInterface dsp);
-#endif /* XSCROLL_H */
--- a/src/bbtsub.c
+++ b/src/bbtsub.c
@@ -47,7 +47,7 @@
 #include "address.h"
 #include "arith.h"
 #include "stack.h"
-#include "return.h"
+#include "retmacro.h"
 #include "cell.h"

 #include "bbtsubdefs.h"
@@ -60,7 +60,7 @@
 #include "returndefs.h"

 #include "bb.h"
-#include "bitblt.h"
+#include "bbtmacro.h"
 #include "pilotbbt.h"
 #include "dspdata.h"
 #include "display.h"
--- a/src/bitblt.c
+++ b/src/bitblt.c
@@ -25,7 +25,7 @@

 #include "pilotbbt.h"
 #include "display.h"
-#include "bitblt.h"
+#include "bbtmacro.h"
 #include "bb.h"

 #include "bitbltdefs.h"
@@ -126,7 +126,7 @@ LispPTR N_OP_pilotbitblt(LispPTR pilot_bt_tbl, LispPTR tos)
  if (displayflg) (currentdsp->mouse_visible)(IOPage->dlmousex, IOPage->dlmousey);
 #endif /* SUNDISPLAY / DOS */

-#ifdef XWINDOW
+#if defined(XWINDOW) || defined(SDL)
  flush_display_lineregion(dx, dstbase, w, h);
 #endif /* XWINDOW */

--- a/src/chardev.c
+++ b/src/chardev.c
@@ -43,7 +43,6 @@
 #include "arith.h"
 #include "timeout.h"
 #include "locfile.h"
-#include "osmsg.h"
 #include "dbprint.h"

 #include "chardevdefs.h"
--- a/src/draw.c
+++ b/src/draw.c
@@ -20,7 +20,7 @@
 #include <stddef.h>       // for ptrdiff_t
 #include <stdlib.h>       // for abs
 #include "adr68k.h"       // for NativeAligned2FromLAddr
-#include "bitblt.h"       // for MOUSEXR, MOUSEYH
+#include "bbtmacro.h"       // for MOUSEXR, MOUSEYH
 #include "display.h"      // for DISPLAYBUFFER, DisplayRegion68k, in_display...
 #include "drawdefs.h"     // for N_OP_drawline
 #include "emlglob.h"
--- a/src/dsk.c
+++ b/src/dsk.c
@@ -66,6 +66,7 @@ typedef struct filename_entry {
 */
 static struct {
  char name[MAXPATHLEN];     /* lowercase unversioned file name */
+  ino_t dir_ino;             /* inode of the directory */
  struct timespec lastMTime; /* modification time of the directory */
  int allocated;             /* number of entries in the files array */
  int lastUsed;              /* index of the last entry in use in files array */
@@ -3055,11 +3056,13 @@ static int get_version_array(char *dir, char *file)
    *Lisp_errno = errno;
    return(0);
  }
-  if (0 == strcmp(lcased_file, VA.name) &&
+  if (sbuf.st_ino == VA.dir_ino &&
+      0 == strcmp(lcased_file, VA.name) &&
      sbuf.st_mtim.tv_sec == VA.lastMTime.tv_sec &&
      sbuf.st_mtim.tv_nsec == VA.lastMTime.tv_nsec) {
    return (1);
  } else {
+    VA.dir_ino = sbuf.st_ino;
    VA.lastMTime = sbuf.st_mtim;
    strcpy(VA.name, lcased_file);
  }
--- a/src/dspsubrs.c
+++ b/src/dspsubrs.c
@@ -40,7 +40,12 @@ extern int Mouse_Included;
 ****************************************************/

 void DSP_dspbout(LispPTR *args) /* args[0] :	charcode	*/
-{ putc((args[0] & 0xFFFF) & 0x7f, BCPLDISPLAY); }
+{
+  int charcode = (args[0] & 0x7F);
+  /* Interlisp-D uses CR as EOL which isn't useful here */
+  putc((charcode == '\r') ? '\n' : charcode, BCPLDISPLAY);
+  fflush(BCPLDISPLAY);
+}

 /****************************************************
 *
@@ -52,7 +57,16 @@ void DSP_dspbout(LispPTR *args) /* args[0] :	charcode	*/
 extern int DisplayInitialized;

 void DSP_showdisplay(LispPTR *args)
-{ DisplayInitialized = 1; }
+{
+  LispPTR base = args[0];   /* pointer to the display bitmap */
+  LispPTR rasterwidth = args[1];  /* should be a smallp */
+
+  if (base == NIL) {
+    DisplayInitialized = 0;
+  } else {
+    DisplayInitialized = 1;
+  }
+}

 /****************************************************
 *
--- a/src/ether_nethub.c
+++ b/src/ether_nethub.c
@@ -31,7 +31,6 @@
 #include "lsptypes.h"
 #include "lspglob.h"
 #include "adr68k.h"
-#include "ether.h"
 #include "dbprint.h"
 #include "etherdefs.h"
 #include "ifpage.h"
--- a/src/ether_sunos.c
+++ b/src/ether_sunos.c
@@ -71,7 +71,6 @@
 #include "lsptypes.h"
 #include "lspglob.h"
 #include "adr68k.h"
-#include "ether.h"
 #include "dbprint.h"
 #include "etherdefs.h"
 #include "ifpage.h"
--- a/src/hardrtn.c
+++ b/src/hardrtn.c
@@ -32,7 +32,7 @@
 #include "llstkdefs.h"    // for decusecount68k, freestackblock, blt, stack_...
 #include "lspglob.h"
 #include "lsptypes.h"     // for GETWORD
-#include "return.h"       // for AFTER_CONTEXTSW, BEFORE_CONTEXTSW, FastRetCALL
+#include "retmacro.h"       // for AFTER_CONTEXTSW, BEFORE_CONTEXTSW, FastRetCALL
 #include "stack.h"        // for FX, frameex1, Bframe, CHECK_FX, StackWord

 #define MAKE_FXCOPY(fx68k)                                                                   \
--- a/src/inet.c
+++ b/src/inet.c
@@ -41,7 +41,6 @@
 #include "emlglob.h"
 #include "lspglob.h"
 #include "adr68k.h"
-#include "ether.h"
 #include "dbprint.h"
 #include "locfile.h"

--- a/src/initdsp.c
+++ b/src/initdsp.c
@@ -98,6 +98,11 @@ extern int *Xdisplay; /* DAANGER -jarl nilsson 27-apr-92 */
 /************************************************************************/

 void init_cursor(void) {
+  /* init_cursor sets up any OS/hardware that is necessary
+   * for the rest of the display system to get a cursor displayed.
+   * For display subsystems like X11 or SDL there's nothing to do
+   * Originally this did work for memory mapped Sun display boards
+   */
 }

 /************************************************************************/
--- a/src/keyevent.c
+++ b/src/keyevent.c
@@ -51,7 +51,7 @@ void Mouse_hndlr(void); /* Fields mouse events from driver        */
 #include "lsptypes.h"

 #include "bb.h"
-#include "bitblt.h"
+#include "bbtmacro.h"
 #include "pilotbbt.h"

 #include "keyeventdefs.h"
--- a/src/llcolor.c
+++ b/src/llcolor.c
@@ -28,7 +28,7 @@
 #include "devconf.h"

 #include "bb.h"
-#include "bitblt.h"
+#include "bbtmacro.h"
 #include "pilotbbt.h"
 #include "dbprint.h"

--- a/src/llstk.c
+++ b/src/llstk.c
@@ -33,7 +33,7 @@
 #include "llstkdefs.h"    // for blt, check_BF, check_FX, check_stack_rooms
 #include "lspglob.h"      // for InterfacePage, Stackspace, STACKOVERFLOW_word
 #include "lsptypes.h"     // for GETWORD
-#include "return.h"       // for AFTER_CONTEXTSW, BEFORE_CONTEXTSW
+#include "retmacro.h"       // for AFTER_CONTEXTSW, BEFORE_CONTEXTSW
 #include "stack.h"        // for StackWord, Bframe, FX, frameex1, STKWORD
 #include "storagedefs.h"  // for newpage
 // #include "testtooldefs.h" // for print_atomname
--- a/src/main.c
+++ b/src/main.c
@@ -40,7 +40,7 @@
 #include "emlglob.h"
 #include "adr68k.h"
 #include "stack.h"
-#include "return.h"
+#include "retmacro.h"

 #include "lispemul.h"
 #include "lspglob.h"
@@ -246,6 +246,7 @@ extern DspInterface currentdsp;
 #include "sdldefs.h"	/* for init_SDL */
 #endif
 extern const time_t MDate;
+extern const char *MaikoGitVersion;
 extern int nokbdflag;
 extern int nomouseflag;
 #ifdef DOS
@@ -314,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

@@ -326,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;

@@ -407,20 +408,20 @@ int main(int argc, char *argv[])
      }
    }

-    /* -t and -m are undocumented and somewhat dangerous... */
+    /* -timer and -m are undocumented and somewhat dangerous... */

-    else if (!strcmp(argv[i], "-t")) { /**** timer interval	****/
+    else if (!strcmp(argv[i], "-timer")) { /**** timer interval	****/
      if (argc > ++i) {
        errno = 0;
        tmpint = strtol(argv[i], (char **)NULL, 10);
        if (errno == 0 && tmpint > 0) {
          TIMER_INTERVAL = tmpint;
        } else {
-          (void)fprintf(stderr, "Bad value for -t (integer > 0)\n");
+          (void)fprintf(stderr, "Bad value for -timer (integer > 0)\n");
          exit(1);
        }
      } else {
-        (void)fprintf(stderr, "Missing argument after -t\n");
+        (void)fprintf(stderr, "Missing argument after -timer\n");
        exit(1);
      }
    }
@@ -473,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);
@@ -600,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;
@@ -716,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);
@@ -831,6 +832,7 @@ void print_info_lines(void) {
 #endif /* RELEASE */
  printf("Compiled for %s (%s) (%d bit).\n", MAIKO_OS_NAME, MAIKO_ARCH_NAME, MAIKO_ARCH_WORD_BITS);
  printf("Creation date: %s", ctime(&MDate));
+  printf("%s\n", MaikoGitVersion);
 #ifdef LPSOLVE
  printf("Contains lp_solve LP solver.\n");
 #endif /* LPSOLVE */
--- a/src/misc7.c
+++ b/src/misc7.c
@@ -43,7 +43,9 @@ LispPTR N_OP_misc7(LispPTR arg1, LispPTR arg2, LispPTR arg3, LispPTR arg4, LispP
  int offset;
  DLword bmdata;
  DLword bmmask;
+#ifdef REALCURSOR
  int displayflg;
+#endif

  DBPRINT(("MISC7 op with alpha byte %d.\n", alpha));

@@ -58,7 +60,11 @@ LispPTR N_OP_misc7(LispPTR arg1, LispPTR arg2, LispPTR arg3, LispPTR arg4, LispP

  DBPRINT(("MISC7 args OK.\n"));

+#ifdef REALCURSOR
  displayflg = n_new_cursorin(base, x, (heightminus1 - y), 1, 1);
+  if (displayflg)
+    HideCursor();
+#endif

 /* Bitmaps use a positive integer coordinate system with the lower left
   corner pixel at coordinate (0, 0). Storage is allocated in 16-bit words
@@ -79,12 +85,12 @@ LispPTR N_OP_misc7(LispPTR arg1, LispPTR arg2, LispPTR arg3, LispPTR arg4, LispP
  }


-#ifdef XWINDOW
+#if defined(XWINDOW) || defined(SDL)
  if (in_display_segment(base)) {
    /* NB: base + offset doesn't need WORDPTR() wrapper */
    flush_display_ptrregion(base + offset, 0, 16, 1);
  }
-#endif /* XWINDOW */
+#endif /* XWINDOW || SDL */

  ScreenLocked = NIL;
  DBPRINT(("FBITMAPBIT old bit = 0x%x.\n", oldbit));
--- a/src/osmsg.c
+++ b/src/osmsg.c
@@ -44,7 +44,7 @@
 #include "lspglob.h"
 #include "timeout.h"
 #include "locfile.h"
-#include "osmsg.h"
+#include "osmsgprint.h"
 #include "dbprint.h"

 #include "commondefs.h"
--- a/src/perrno.c
+++ b/src/perrno.c
@@ -13,7 +13,7 @@
 #include <errno.h>       // for errno
 #include <stdio.h>       // for fprintf, perror, stderr, NULL
 #include <string.h>      // for strerror
-#include "osmsg.h"       // for OSMESSAGE_PRINT
+#include "osmsgprint.h"  // for OSMESSAGE_PRINT
 #include "perrnodefs.h"  // for err_mess, perrorn

 /************************************************************************/
--- a/src/rawcolor.c
+++ b/src/rawcolor.c
@@ -31,7 +31,7 @@
 #include "pilotbbt.h"
 #include "debug.h"
 #include "arith.h"
-#include "bitblt.h"
+#include "bbtmacro.h"
 #include "lldsp.h"
 #include "bbtsubdefs.h"

--- a/src/return.c
+++ b/src/return.c
@@ -38,7 +38,7 @@
 #include "lspglob.h"
 #include "initatms.h"
 #include "cell.h"
-#include "return.h"
+#include "retmacro.h"
 #include "testtooldefs.h"
 #include "returndefs.h"
 #include "commondefs.h"
--- a/src/subr.c
+++ b/src/subr.c
@@ -29,6 +29,7 @@
 /***********************************************************/

 #include <stdio.h>         // for printf, sprintf, NULL
+#include <stdlib.h>        // for EXIT_FAILURE, EXIT_SUCCESS
 #include <time.h>          // for nanosleep, timespec
 #include "adr68k.h"        // for NativeAligned2FromLAddr, NativeAligned4FromLAddr
 #include "arith.h"         // for N_GETNUMBER, ARITH_SWITCH
@@ -412,16 +413,17 @@ void OP_subrcall(int subr_no, int argnum) {
      break;

    case sb_LISPFINISH:
-    case sb_LISP_FINISH:
+    case sb_LISP_FINISH: {
+      int status;
      POP_SUBR_ARGS;
-      if ((argnum > 0) && (args[0] == S_POSITIVE))
-      /* 8/03/88 This branch impossible to take, subr has no args */
-      {
-        TopOfStack = suspend_lisp(args);
-      } else
-        lisp_finish();
+      if (argnum == 0 || argnum == 1 || (argnum == 2 && args[1] == NIL)) lisp_finish(EXIT_SUCCESS);
+      if (argnum > 2) lisp_finish(EXIT_FAILURE);
+      N_GETNUMBER(args[1], status, exit_fail);
+      lisp_finish(status);
+    exit_fail:
+      lisp_finish(EXIT_FAILURE);
      break;
-
+    }
    case sb_NEWPAGE:
      POP_SUBR_ARGS;
      TopOfStack = newpage(args[0]);
@@ -589,7 +591,7 @@ void OP_subrcall(int subr_no, int argnum) {
    case sb_SUSPEND_LISP:
      POP_SUBR_ARGS;
      /* Suspend Maiko */
-      TopOfStack = suspend_lisp(args);
+      TopOfStack = suspend_lisp();
      break;

    case sb_MONITOR_CONTROL:
--- a/src/timer.c
+++ b/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)
 /*									*/
 /*									*/
 /*									*/
-/*									*/
+/*
 /*									*/
 /*									*/
 /*									*/
--- a/src/tty.c
+++ b/src/tty.c
@@ -22,9 +22,60 @@
 #include "lsptypes.h"
 #include "lspglob.h"
 #include "commondefs.h"
-#include "tty.h"
 #include "ttydefs.h"

+/* TTY Commands and structures for communicating with Lisp */
+
+#define TTY_GET_STATUS     33280>>8
+#define TTY_ON             33536>>8
+#define TTY_OFF            33792>>8
+#define TTY_BREAK_ON       34304>>8
+#define TTY_BREAK_OFF      34560>>8
+#define PUT_CHAR             128
+#define ABORT_PUT            133
+#define SET_PARAM            129
+#define SET_DSR            33025
+#define SET_CTS            33026
+#define SET_CHAR_LENGTH    33028
+#define SET_PARITY         33032
+#define SET_STOP_BITS      33040
+#define SET_BAUD_RATE      33056
+#define SET_ALL_PARAMETERS 33087
+
+typedef struct {
+	unsigned command             : 8;
+	unsigned outdata             : 8;
+} DLTTY_OUT_COMMAND;
+
+typedef struct {
+	unsigned on_off              : 4;
+	unsigned line_speed          : 4;
+	unsigned stop_bits           : 2;
+	unsigned parity              : 2;
+	unsigned char_length         : 2;
+	unsigned clear_to_send       : 1;
+	unsigned data_set_ready      : 1;
+	DLword  notify_mask;
+} DLTTY_OUT_CSB;
+
+typedef struct {
+	unsigned state               : 1;
+	unsigned nil1                : 7;
+	unsigned success             : 1;
+	unsigned break_detected      : 1;
+	unsigned framing_error       : 1;
+	unsigned data_lost           : 1;
+	unsigned parity_error        : 1;
+	unsigned nil2                : 2;
+	unsigned not_ready           : 1;
+	char     in_data;
+	unsigned data_terminal_ready : 1;
+	unsigned nil3                : 4;
+	unsigned request_to_send     : 1;
+	unsigned rx_ready            : 1;
+	unsigned tx_ready            : 1;
+} DLTTY_IN_CSB;
+
 static DLTTY_OUT_COMMAND *DLTTYPortCmd;
 static DLTTY_IN_CSB *DLTTYIn;
 static DLTTY_OUT_CSB *DLTTYOut;
--- a/src/uutils.c
+++ b/src/uutils.c
@@ -32,7 +32,7 @@
 #include "lispemul.h"    // for LispPTR, DLword, NIL, ATOM_T
 #include "lspglob.h"
 #include "lsptypes.h"    // for GETWORD, OneDArray, GetTypeNumber, THIN_CHAR...
-#include "osmsg.h"       // for OSMESSAGE_PRINT
+#include "osmsgprint.h"  // for OSMESSAGE_PRINT
 #include "uraiddefs.h"   // for device_after_raid, device_before_raid
 #include "uutilsdefs.h"  // for c_string_to_lisp_string, check_unix_password

@@ -292,7 +292,7 @@ LispPTR unix_fullname(LispPTR *args) {
 extern DLword *EmMouseX68K, *EmMouseY68K, *EmKbdAd068K, *EmRealUtilin68K, *EmUtilin68K;
 extern DLword *EmKbdAd168K, *EmKbdAd268K, *EmKbdAd368K, *EmKbdAd468K, *EmKbdAd568K;

-LispPTR suspend_lisp(LispPTR *args) {
+LispPTR suspend_lisp(void) {
 #ifndef DOS
  extern DLword *CTopKeyevent;
  extern LispPTR *KEYBUFFERING68k;
--- a/src/vmemsave.c
+++ b/src/vmemsave.c
@@ -41,7 +41,6 @@
 #include "lispemul.h"
 #include "lispmap.h"
 #include "lspglob.h"
-#include "vmemsave.h"
 #include "timeout.h"
 #include "adr68k.h"
 #include "lsptypes.h"
@@ -58,6 +57,12 @@
 #include "perrnodefs.h"
 #include "ufsdefs.h"

+/* Definitions incorporated from vmemsave.h (removed) */
+#define	FP_IFPAGE  512			/* IFPAGE address in sysoutfile by Byte */
+#define	DOMINOPAGES  301		/* skip dominopages  in  fptovp */
+#define	SKIPPAGES  301			/* save first filepage  */
+#define	SKIP_DOMINOPAGES  153600	/* Byte size in sysoutfile for dominocode */
+#define	SAVE_IFPAGE	223		/* Virtual address for IFPAGES's buffer page. This value is \EMUSWAPBUFFERS in lisp. */

 /* Error return values from VMEMSAVE */
 #define COMPLETESYSOUT NIL
@@ -513,7 +518,7 @@ LispPTR vmem_save(char *sysout_file_name)

 /* Make sure that we kill off any Unix subprocesses before we go away */

-void lisp_finish(void) {
+void lisp_finish(int exit_status) {
  char d[4];

  DBPRINT(("finish lisp_finish\n"));
@@ -531,5 +536,5 @@ void lisp_finish(void) {
 #ifdef DOS
  exit_host_filesystem();
 #endif /* DOS */
-  exit(0);
+  exit(exit_status);
 }
--- a/src/xc.c
+++ b/src/xc.c
@@ -41,7 +41,7 @@
 #include "address.h"
 #include "adr68k.h"
 #include "stack.h"
-#include "return.h"
+#include "retmacro.h"
 #include "dbprint.h"

 #include "lspglob.h"
@@ -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) {}
--- a/src/xinit.c
+++ b/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;
--- a/src/xrdopt.c
+++ b/src/xrdopt.c
@@ -36,6 +36,7 @@ extern int LispDisplayRequestedX, LispDisplayRequestedY;
 extern unsigned LispDisplayRequestedWidth, LispDisplayRequestedHeight;

 extern int xsync;
+extern int TIMER_INTERVAL;

 static XrmOptionDescRec opTable[] = {
    {"-help", "*help", XrmoptionIsArg, (XPointer)NULL},
@@ -297,6 +298,14 @@ void read_Xoption(int *argc, char *argv[])
    noscroll = 1;
  }

+  if (XrmGetResource(rDB, "ldex.timer", "Ldex.timer", str_type, &value) == True) {
+    (void)strncpy(tmp, value.addr, value.size);
+    errno = 0;
+    i = (int)strtol(tmp, (char **)NULL, 10);
+    if (errno == 0 && i > 0)
+      TIMER_INTERVAL = i;
+  }
+
  /*    if (XrmGetResource(rDB,
                         "ldex.maxpages",
                         "Ldex.maxpages",
Author	SHA1	Message	Date
Frank Halasz	959f77402f	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.	2025-05-27 20:23:06 -07:00
Matt Heffron	4994982a90	Adds the non-keypad arrow keys to be detected. 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))	2025-02-12 11:22:08 -08:00
Frank Halasz	40d4fca8cc	Merge pull request #530 from Interlisp/fgh_use-22.04-build-builder Specify Ubuntu22.04 instead of Ubuntu-latest in various github action scripts to solve libc version issue crashing online	2025-02-03 12:19:50 -08:00
Nick Briggs	c8dc63d418	Clean up display related variable names differing only in case (#529 ) Unify the LispDisplayRequested... and lispDisplayRequested... variables from the SDL and X11 display modules. Move the storage definitions for LispDisplayRequested... to main.c leaving external references in the modules that utilize them.	2025-02-02 16:31:43 -08:00
Frank Halasz	7fe0f70640	In buildRelease.yml moving to ubuntu-22.04 instead of latest to see if it fixes these random linux arm64 build failures - crashes inside gcc compiler!	2025-02-01 19:10:38 -08:00
Frank Halasz	55e20ea993	In buildRelease.yml added apt update to emscriptem build since it was failing to find some of the packages called for by apt-get install sdl2	2025-02-01 18:48:38 -08:00
Frank Halasz	7d85a59e6f	Change ubuntu version from latest to 22.04 in Dockerfile_builder to handle issue where the Medley-online docker image was failing to find the lastest versions of libc and libm when loading maiko	2025-02-01 17:53:01 -08:00
Nick Briggs	511a1b523e	Eliminate extra gotos in common branch tail code (#528 ) The implementation of various JUMP opcodes tried to use a common tail that did a POP and branched to the next opcode. While the extra gotos probably aren't harmful, neither are they beneficial to code size or speed.	2025-01-30 11:07:29 -08:00
Frank Halasz	04f9905ca0	Fix MacOS SDL build in buildRelease github workflow (#527 ) * Update buildRelease workflow to use sdl2-2.30.11 on MacOS * In buildRelease workflow, update Macos build for SDL to use -DMAIKO_DISPLAY_SDL=2 instead of =ON	2025-01-29 08:51:47 -08:00
Nick Briggs	e61d0f2e6c	Correct {DSK} versioned file cache failures (#526 ) A missing check for the applicability of a versioned file cache caused loadups to fail in the case where the modification timestamp of a directory and its parent were identical, and the file being looked up had the same name (when lowercased) as the directory it was contained within. E.g., looking up TEDIT in library/tedit/ where the modification times of library and library/tedit were identical. The inode number of the directory containing the file must be the same as the inode number of the directory the cache was built from.	2025-01-26 18:38:25 -08:00
Nick Briggs	3c4d9f5393	Modifies LISPFINISH subr to use 2nd argument, if present, for exit status (#525 ) Redesign of exit status handling, instead of overloading the FAST flag of (LOGOUT fast), add an optional 2nd argument, EXITSTATUS. Retains compatability, with behavior unchanged, between new emulator and older sysouts which do not pass the second argument to LISPFINISH. Newer sysouts, which pass the 2nd argument, will continue to work with older emulators though will not get the exit status set.	2025-01-20 12:24:44 -08:00
Nick Briggs	31bb14b9d7	Modifies Lisp exit subr to permit passing an exit status code (#524 ) These changes add (LOGOUT <number>) to the traditional (LOGOUT) and (LOGOUT T) calls. If an integer <number> is provided it will be used as the exit status code, while NIL and T result in an EXIT_SUCCESS. If the argument passed is none of NIL, T, or a number, the exit status code will be a generic EXIT_FAILURE (typically 1). (LOGOUT) and (LOGOUT T) virtual memory behavior is unaffected. When a <number> is passed Lisp will exit without saving the virtual memory state, as is the case for (LOGOUT T), although this behavior is determined by Lisp rather than the Maiko emulator.	2025-01-16 09:57:01 -08:00
Nick Briggs	f23a43f1a0	Merge pull request #522 from Interlisp/nhb-dspbout-and-showdisplay Improves behavior of display subrs DSPBOUT and SHOWDISPLAY	2024-12-22 14:10:37 -08:00
Nick Briggs	e251f26816	Improves behavior of display subrs DSPBOUT and SHOWDISPLAY DSPBOUT is called to output a single character to the "BCPL display", which is the system text output rather than the bitmapped display. Under maiko, this is mapped to "stdout". Interlisp-D uses CR as the EOL character, but that is not appropriate for output to standard output so CR is translated to LF here. Standard output is buffered, but there is no indication of when the output should be flushed, so flush on every character, since this is a low frequency operation. SHOWDISPLAY is called to switch between the "BCPL display" and the bitmapped display. The current display subsystems are not hooked up to this subr, but this is a potential place to hook display size changes in the future, so the code is updated to indicate the parameters passed in and to set/reset the display initialization state variable.	2024-12-18 12:40:29 -08:00
Nick Briggs	51045b402f	Merge pull request #521 from Interlisp/nhb-print-maiko-git-version Adds MaikoGitVersion to information printed with -info option	2024-12-17 11:22:43 -08:00
Nick Briggs	e6c972a62a	Merge pull request #520 from Interlisp/nhb-shadowed-timer-option Replaces shadowed "-t <interval>" with "-timer <interval>"	2024-12-17 11:22:20 -08:00
Nick Briggs	31ad2f2169	Adds MaikoGitVersion to information printed with -info option	2024-12-16 20:13:05 -08:00
Nick Briggs	66721ccc1c	Replaces shadowed "-t <interval>" with "-timer <interval>" At some point option "-t" was introduced as an abbreviation for "-title" but "-t" was already in use, though undocumented, for overriding the timer interval. This commit changes the command line timer option to "-timer" and adds "timer" to the options that are processed from the X11 resources.	2024-12-16 19:59:03 -08:00
Nick Briggs	b13a35e16e	Merge pull request #519 from Interlisp/nhb-fix-sdl-display-bitmap-flushing Fix display bitmap flushing on modification when using SDL display subsystem	2024-12-15 09:25:29 -08:00
Nick Briggs	55d8504060	Corrects interaction of BITMAPBIT with buffered display bitmap Two problems fixed: * only in the case of a software cursor is it necessary to check if the bit being altered is within the region of the display covered by the cursor, and if it is, the cursor must be hidden before operating on the screen bitmap * SDL as well as X requires modifications to the screen bitmap be flushed to the actual display.	2024-12-14 13:22:44 -08:00
Nick Briggs	ecdab720f2	Missing call to flush_display_lineregion() for SDL in PILOTBITBLT When the target for a PILOTBITBLT operation is the display bitmap, and the display bitmap is not memory-mapped from the actual display, the display subsystem needs to be notified to flush the Lisp display bitmap to the display so that changes are immediately visible. The mechanism was present for X11 displays but needed to be implemented for SDL displays.	2024-12-14 12:57:24 -08:00
Nick Briggs	249efce565	Adds comments regarding init_cursor() purpose in initdsp.c	2024-12-03 15:40:37 -08:00
Nick Briggs	1de2e3e954	Update README.md to be slightly more accurate.	2024-12-02 13:57:24 -08:00
Nick Briggs	a2f62159e9	Merge pull request #518 from Interlisp/cmakelists-ldeinit-solaris Updates CMakeLists.txt to add Solaris specific OS5 define to ldeint build	2024-11-24 08:08:49 -08:00
Nick Briggs	b2a22a8ac8	Updates CMakeLists.txt to add Solaris specific define to ldeint build	2024-11-24 02:45:50 -05:00
Nick Briggs	89b2b4f866	Merge pull request #517 from Interlisp/improve-cmake-vdate-depends Improve cmake vdate depends	2024-11-20 12:14:09 -08:00
Nick Briggs	96046c01f0	Adds MaikoGitVersion string to vdate.o The variable MaikoGitVersion will contain a git revision from the head of the source tree along with an indication if the status was "dirty". If git is not present on the system or the directory that the build happened in was not under git control the version will be "none".	2024-11-20 11:18:41 -08:00
Nick Briggs	578b26547a	Updates CMakeLists.txt to avoid recreating vdate.c if nothing has changed Creating vdate.c/vdate.o should not be done unconditionally. It is only necessary to recreate it if one of the input files has changed.	2024-11-19 15:20:44 -08:00
Nick Briggs	13cbc33da3	Merge pull request #516 from Interlisp/include-file-reorganization Include file reorganization (part 1)	2024-11-11 10:26:05 -08:00
Nick Briggs	baeec1b957	Renames bitblt.h to bbtmacro.h and updates all uses	2024-11-07 12:39:55 -08:00
Nick Briggs	99550aaa7c	Renames return.h to retmacro.h and updates all uses	2024-11-06 13:31:46 -08:00
Nick Briggs	99601ede75	Removes incorrect dependency on osmsg.h and renames it to osmsgprint.h	2024-11-05 14:57:00 -08:00
Nick Briggs	4f3cb4d326	Removes ether.h and merges Lisp interface structs into lsptypes.h	2024-11-05 14:24:36 -08:00
Nick Briggs	b98e1612d1	Removes tty.h and merges #defines (all local) and Lisp interface structs into tty.c	2024-11-05 14:07:16 -08:00
Nick Briggs	fe71946f82	Removes vmemsave.h and merges #defines (all local, mostly unused) into vmemsave.c	2024-11-05 14:02:27 -08:00
Nick Briggs	c332c71a3e	Removes unreferenced xscroll.h (dup of xscrolldefs.h)	2024-11-05 13:56:08 -08:00