Merge branch 'master' of github.com:Interlisp/maiko

Suppress clang-tidy warnings for uses of bzero()
The only uses of bzero() in the maiko sources come about because it is used in the macOS definition of the FD_ZERO() macro in sys/select.h. Suppress the warning by including -clang-analyzer-security.insecureAPI.bzero in the clang-tidy list of checks. This may well have been replaced by a memset() call in more up-to-date macOS releases.
2026-03-15 22:37:22 +00:00 · 2021-09-03 16:47:02 -07:00 · 2021-09-03 16:39:29 -07:00 · 2021-09-03 12:46:21 -07:00 · 2021-09-02 15:14:32 -07:00 · 2021-09-02 12:42:51 -07:00
68 changed files with 446 additions and 2131 deletions
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -21,14 +21,17 @@ jobs:
        working-directory: bin
        run: ./makeright x

-  build-pi:
-    runs-on: [self-hosted, linux, ARM]
-    if: ${{ github.repository == 'Interlisp/maiko' }}
-    steps:
-      - uses: actions/checkout@v2
-      - name: Build
-        working-directory: bin
-        run: ./makeright x
+#
+# Commented out because the RPi is not online at this time (6 July 2021)
+#
+#  build-pi:
+#    runs-on: [self-hosted, linux, ARM]
+#    if: ${{ github.repository == 'Interlisp/maiko' }}
+#    steps:
+#      - uses: actions/checkout@v2
+#      - name: Build
+#        working-directory: bin
+#        run: ./makeright x

  build-cmake:
    runs-on: ${{ matrix.os }}
--- a/.github/workflows/buildDocker.yml
+++ b/.github/workflows/buildDocker.yml
@@ -0,0 +1,84 @@
+#  based on https://blog.oddbit.com/post/2020-09-25-building-multi-architecture-im/
+---
+# Interlisp workflow to build a Docker Image that supports multiple architectures
+name: 'Build Maiko Docker image'
+
+# Run this workflow on push to master
+# Other branches can be added it needed. 
+on:
+  push:
+    branches:
+      - master
+
+#  Jobs that are run as part of this workflow.
+jobs:
+  # Job to build the docker image
+  # see: https://github.com/docker/build-push-action
+  docker:
+    runs-on: ubuntu-latest
+    steps:
+      # Checkout the branch  
+      - name: Checkout
+        uses: actions/checkout@v2
+
+      # Setup some environment variables
+      - name: Prepare
+        id: prep
+        run: |
+          # Name of the Docker Image. 
+          DOCKER_IMAGE=interlisp/${GITHUB_REPOSITORY#*/}
+          VERSION=latest
+          SHORTREF=${GITHUB_SHA::8}
+          ## Do we want to use tags and or versions 
+          # If this is git tag, use the tag name as a docker tag
+          if [[ $GITHUB_REF == refs/tags/* ]]; then
+            VERSION=${GITHUB_REF#refs/tags/v}
+          fi
+          TAGS="${DOCKER_IMAGE}:${VERSION},${DOCKER_IMAGE}:${SHORTREF}"
+          # If the VERSION looks like a version number, assume that
+          # this is the most recent version of the image and also
+          # tag it 'latest'.
+          if [[ $VERSION =~ ^[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}$ ]]; then
+            TAGS="$TAGS,${DOCKER_IMAGE}:latest"
+          fi
+          # Set output parameters.
+          echo ::set-output name=tags::${TAGS}
+          echo ::set-output name=docker_image::${DOCKER_IMAGE}
+          echo ::set-output name=build_time::$(date -u +'%Y-%m-%dT%H:%M:%SZ')
+      # Setup the Docker Machine Emulation environment.  
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@master
+        with:
+          platforms: all
+
+      # Setup the Docker Buildx funtion
+      - name: Set up Docker Buildx
+        id: buildx
+        uses: docker/setup-buildx-action@master
+
+      # Login into DockerHub - required to store the created image
+      - name: Login to DockerHub
+        if: github.event_name != 'pull_request'
+        uses: docker/login-action@v1
+        with:
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_PASSWORD }}
+
+      # Start the Docker Build using the Dockerfile in the repository we
+      # checked out.  
+      - name: Build
+        uses: docker/build-push-action@v2
+        with:
+          builder: ${{ steps.buildx.outputs.name }}
+          build-args: BUILD_DATE=${{ steps.prep.outputs.build_time }}
+          context: .
+          file: ./Dockerfile
+          # Platforms - Sepecify the platforms to include in the build
+          #  linux/amd64 -- Standard x86_64
+          #  linux/arm64 -- Apple M1
+          #  linux/arm/v7 -- Raspberry pi
+          platforms: linux/amd64,linux/arm64,linux/arm/v7
+          # Push the result to DockerHub
+          push: true
+          # tags to assign to the Docker image
+          tags: ${{ steps.prep.outputs.tags }}
--- a/.gitignore
+++ b/.gitignore
@@ -5,6 +5,7 @@
 \#*#
 .DS_Store
 # build directories
+build/**
 *.386-x/**
 *.386/**
 *.ppc-x/**
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -16,6 +16,19 @@ IF(CMAKE_C_COMPILER_ID MATCHES "SunPro")
  SET(CMAKE_C_FLAGS "-fno-strict-aliasing ${CMAKE_C_FLAGS}")
 ENDIF()

+find_program(
+    CLANG_TIDY_EXE
+    NAMES "clang-tidy" "clang-tidy12" "clang-tidy11" "clang-tidy10"
+    DOC "Path to clang-tidy executable"
+)
+
+IF (CLANG_TIDY_EXE)
+# There are many many warnings for strcpy instances to deal with,
+# but suppress it for now so that other issues are more obvious
+#
+   SET(CMAKE_C_CLANG_TIDY ${CLANG_TIDY_EXE} -checks=-*,cert-*,clang-analyzer-security.*,-clang-analyzer-security.insecureAPI.strcpy,-clang-analyzer-security.insecureAPI.bzero -header-filter=.*)
+ENDIF()
+
 INCLUDE(CheckLibraryExists)
 CHECK_LIBRARY_EXISTS(m fmod "" NEED_LIB_M)
 IF(NEED_LIB_M)
--- a/18
+++ b/18
@@ -0,0 +1,18 @@
+FROM ubuntu:focal
+ARG BUILD_DATE
+LABEL name="Maiko"
+LABEL description="Virtual machine for Interlisp Medley"
+LABEL url="https://github.com/Interlisp/maiko"
+LABEL build-time=$BUILD_DATE
+
+ARG TARGETPLATFORM
+
+RUN apt-get update && apt-get install -y make clang libx11-dev gcc x11vnc xvfb
+
+COPY --chown=nonroot:nonroot . /app/maiko
+RUN rm -rf /app/maiko/linux*
+
+WORKDIR /app/maiko/bin
+RUN ./makeright x
+
+RUN rm -rf /app/maiko/inc /app/maiko/include /app/maiko/src
--- a/README.md
+++ b/README.md
@@ -6,7 +6,7 @@ connecting with Lisp for access to display (via X11) and disk etc.

 For an overview, see [Medley Interlisp Introduction](https://github.com/Interlisp/medley/wiki/Medley-Interlisp-Introduction).

-See [the Medley repository](https://github.org/Interlisp/medley) for
+See [the Medley repository](https://github.com/Interlisp/medley) for
 * [Issues](https://github.com/Interlisp/medley/issues) (note that maiko issues are there too)
 * [Discussions](https://github.com/Interlisp/medley/discussions) (Q&A, announcements, etc)
 * [Medley's README](https://github.com/Interlisp/medley/blob/master/README.md)
--- a/bin/compile-flags
+++ b/bin/compile-flags
@@ -128,5 +128,4 @@ bitbltsub.c:#ifdef GETBASE
 testdisplay.c:#ifdef NOTUSED
 uraid.c:#ifdef ETHERINT
 bitblt.c:#ifndef COLOR
-bitbltsub.c:#ifndef prropstyle
 lispmap.h:#ifdef MEDLEY
--- a/bin/makefile-darwin.386-x
+++ b/bin/makefile-darwin.386-x
@@ -19,7 +19,7 @@ XFLAGS = -I/opt/X11/include -DXWINDOW
 OPTFLAGS =  -O2 -g
 DEBUGFLAGS = # -DDEBUG -DOPTRACE
 DFLAGS = $(DEBUGFLAGS) $(XFLAGS) \
-	-DRELEASE=351 -DSTACKCHECK -DFSBCHECK -DPCTRACE
+	-DRELEASE=351 # -DSTACKCHECK -DFSBCHECK -DPCTRACE

 LDFLAGS = -L/opt/X11/lib -lX11 -lm
 LDELDFLAGS =  -L/opt/X11/lib -lX11 -lm
--- a/bin/makefile-freebsd.386-x
+++ b/bin/makefile-freebsd.386-x
@@ -16,7 +16,7 @@ XFILES = $(OBJECTDIR)xmkicon.o \
 XFLAGS = -I/usr/local/include -DXWINDOW

 # OPTFLAGS is normally -O2.
-OPTFLAGS = -O1 -gdwarf-2
+OPTFLAGS = -O2 -g
 DFLAGS = $(XFLAGS) -DRELEASE=351

 LDFLAGS = -L/usr/local/lib -lX11 -lc -lm
--- a/bin/makefile-freebsd.aarch64-x
+++ b/bin/makefile-freebsd.aarch64-x
@@ -0,0 +1,27 @@
+# Options for FreeBSD, ARMv7 and X-Windows
+
+CC = clang -m64 $(CLANG_CFLAGS)
+
+XFILES = $(OBJECTDIR)xmkicon.o \
+	$(OBJECTDIR)xbbt.o \
+	$(OBJECTDIR)dspif.o \
+	$(OBJECTDIR)xinit.o \
+	$(OBJECTDIR)xscroll.o \
+	$(OBJECTDIR)xcursor.o \
+	$(OBJECTDIR)xlspwin.o \
+	$(OBJECTDIR)xrdopt.o \
+	$(OBJECTDIR)xwinman.o
+
+
+XFLAGS = -I/usr/local/include -DXWINDOW
+
+# OPTFLAGS is normally -O2.
+OPTFLAGS = -O2 -g
+DFLAGS = $(XFLAGS) -DRELEASE=351
+
+LDFLAGS = -L/usr/local/lib -lX11 -lc -lm
+LDELDFLAGS =  -L/usr/local/lib -lX11 -lc -lm
+
+OBJECTDIR = ../$(RELEASENAME)/
+
+default	: ../$(OSARCHNAME)/lde ../$(OSARCHNAME)/ldex
--- a/bin/makefile-freebsd.x86_64-x
+++ b/bin/makefile-freebsd.x86_64-x
@@ -0,0 +1,27 @@
+# Options for FreeBSD, Intel x86_64 and X-Windows
+
+CC = clang -m64 $(CLANG_CFLAGS)
+
+XFILES = $(OBJECTDIR)xmkicon.o \
+	$(OBJECTDIR)xbbt.o \
+	$(OBJECTDIR)dspif.o \
+	$(OBJECTDIR)xinit.o \
+	$(OBJECTDIR)xscroll.o \
+	$(OBJECTDIR)xcursor.o \
+	$(OBJECTDIR)xlspwin.o \
+	$(OBJECTDIR)xrdopt.o \
+	$(OBJECTDIR)xwinman.o
+
+
+XFLAGS = -I/usr/local/include -DXWINDOW
+
+# OPTFLAGS is normally -O2.
+OPTFLAGS = -O2 -g
+DFLAGS = $(XFLAGS) -DRELEASE=351
+
+LDFLAGS = -L/usr/local/lib -lX11 -lc -lm
+LDELDFLAGS =  -L/usr/local/lib -lX11 -lc -lm
+
+OBJECTDIR = ../$(RELEASENAME)/
+
+default	: ../$(OSARCHNAME)/lde ../$(OSARCHNAME)/ldex
--- a/bin/makefile-init-freebsd.386
+++ b/bin/makefile-init-freebsd.386
@@ -0,0 +1,27 @@
+# Options for FreeBSD, Intel 386/486 and X Windows
+
+CC = clang -m32 $(CLANG_CFLAGS)
+
+XFILES = $(OBJECTDIR)xmkicon.o \
+	$(OBJECTDIR)xbbt.o \
+	$(OBJECTDIR)dspif.o \
+	$(OBJECTDIR)xinit.o \
+	$(OBJECTDIR)xscroll.o \
+	$(OBJECTDIR)xcursor.o \
+	$(OBJECTDIR)xlspwin.o \
+	$(OBJECTDIR)xrdopt.o \
+	$(OBJECTDIR)xwinman.o
+
+
+XFLAGS = -I/usr/local/include -DXWINDOW
+
+# OPTFLAGS is normally -O0 for init
+OPTFLAGS = -O0 -g
+DFLAGS = $(XFLAGS) -DRELEASE=351 -DNOVERSION -DINIT
+
+LDFLAGS = -L/usr/local/lib -lX11 -lc -lm
+LDELDFLAGS =  -L/usr/local/lib -lX11 -lc -lm
+
+OBJECTDIR = ../$(RELEASENAME)/
+
+default	: ../$(OSARCHNAME)/ldeinit
--- a/bin/makefile-init-freebsd.aarch64
+++ b/bin/makefile-init-freebsd.aarch64
@@ -0,0 +1,27 @@
+# Options for FreeBSD, ARMv7 and X-Windows
+
+CC = clang -m64 $(CLANG_CFLAGS)
+
+XFILES = $(OBJECTDIR)xmkicon.o \
+	$(OBJECTDIR)xbbt.o \
+	$(OBJECTDIR)dspif.o \
+	$(OBJECTDIR)xinit.o \
+	$(OBJECTDIR)xscroll.o \
+	$(OBJECTDIR)xcursor.o \
+	$(OBJECTDIR)xlspwin.o \
+	$(OBJECTDIR)xrdopt.o \
+	$(OBJECTDIR)xwinman.o
+
+
+XFLAGS = -I/usr/local/include -DXWINDOW
+
+# OPTFLAGS is normally -O0 for init
+OPTFLAGS = -O0 -g
+DFLAGS = $(XFLAGS) -DRELEASE=351 -DNOVERSION -DINIT
+
+LDFLAGS = -L/usr/local/lib -lX11 -lc -lm
+LDELDFLAGS =  -L/usr/local/lib -lX11 -lc -lm
+
+OBJECTDIR = ../$(RELEASENAME)/
+
+default	: ../$(OSARCHNAME)/ldeinit
--- a/bin/makefile-init-freebsd.x86_64
+++ b/bin/makefile-init-freebsd.x86_64
@@ -0,0 +1,27 @@
+# Options for FreeBSD, Intel x86_64 and X-Windows
+
+CC = clang -m64 $(CLANG_CFLAGS)
+
+XFILES = $(OBJECTDIR)xmkicon.o \
+	$(OBJECTDIR)xbbt.o \
+	$(OBJECTDIR)dspif.o \
+	$(OBJECTDIR)xinit.o \
+	$(OBJECTDIR)xscroll.o \
+	$(OBJECTDIR)xcursor.o \
+	$(OBJECTDIR)xlspwin.o \
+	$(OBJECTDIR)xrdopt.o \
+	$(OBJECTDIR)xwinman.o
+
+
+XFLAGS = -I/usr/local/include -DXWINDOW
+
+# OPTFLAGS is normally -O0 for init
+OPTFLAGS = -O0 -g
+DFLAGS = $(XFLAGS) -DRELEASE=351 -DNOVERSION -DINIT
+
+LDFLAGS = -L/usr/local/lib -lX11 -lc -lm
+LDELDFLAGS =  -L/usr/local/lib -lX11 -lc -lm
+
+OBJECTDIR = ../$(RELEASENAME)/
+
+default	: ../$(OSARCHNAME)/ldeinit
--- a/bin/makefile-init-sunos5.sparc
+++ b/bin/makefile-init-sunos5.sparc
@@ -41,7 +41,7 @@ OPTFLAGS = -g3 -O0

 DEBUGFLAGS = # -DSTACKCHECK -DFNSTKCHECK

-MACHINEFLAGS = -DOS5 -DUSE_DLPI -DLOCK_X_UPDATES
+MACHINEFLAGS = -DOS5 -DUSE_DLPI

 # The LDEINIT wants to have NOVERSION set, so we don't hang up on
 # any change-over in versions.
--- a/bin/makefile-sunos5.386-x
+++ b/bin/makefile-sunos5.386-x
@@ -36,7 +36,6 @@ DEBUGFLAGS = # -DSTACKCHECK -DFNSTKCHECK
 DFLAGS = $(XFLAGS) \
 	 $(DEBUGFLAGS) \
 	-DOS5 \
-	-DLOCK_X_UPDATES   \
 	-DRELEASE=351

 LDFLAGS = -L/usr/X11/lib -lX11 -lc -lm -lsocket -lnsl
--- a/bin/makefile-sunos5.i386-x
+++ b/bin/makefile-sunos5.i386-x
@@ -36,7 +36,6 @@ DEBUGFLAGS = # -DSTACKCHECK -DFNSTKCHECK
 DFLAGS = $(XFLAGS) \
 	$(DEBUGFLAGS) \
 	-DOS5 -DUSE_DLPI \
-	-DLOCK_X_UPDATES   \
 	-I$(OPENWINHOME)/include \
 	-DRELEASE=210

--- a/bin/makefile-sunos5.sparc-x
+++ b/bin/makefile-sunos5.sparc-x
@@ -40,7 +40,7 @@ OPTFLAGS =  -O2 -g3

 DEBUGFLAGS = # -DSTACKCHECK -DFNSTKCHECK

-MACHINEFLAGS = -DOS5 -DUSE_DLPI -DLOCK_X_UPDATES
+MACHINEFLAGS = -DOS5 -DUSE_DLPI

 DFLAGS = $(XFLAGS) \
 	 $(DEBUGFLAGS) \
--- a/bin/makefile-sunos5.x86_64-x
+++ b/bin/makefile-sunos5.x86_64-x
@@ -36,7 +36,6 @@ DEBUGFLAGS = # -DSTACKCHECK -DFNSTKCHECK
 DFLAGS = $(XFLAGS) \
 	 $(DEBUGFLAGS) \
 	-DOS5 \
-	-DLOCK_X_UPDATES   \
 	-DUSE_DLPI \
 	-DRELEASE=351

--- a/inc/MyWindow.h
+++ b/inc/MyWindow.h
@@ -77,7 +77,7 @@ typedef struct
 						, White_Pixel ); \
 			XLOCK;					\
 			XFlush( display ); 	\
-			XUNLOCK;		\
+			XUNLOCK( display );                 \
 			(child_win)->parent = parent_win; \
 			if( (child_win)->after_create ) \
 			    ((child_win)->after_create)(parent_win,child_win);\
@@ -96,7 +96,7 @@ typedef struct
 					, (window)->width 					\
 					, (window)->height ); 				\
 			XFlush( display ); 							\
-			XUNLOCK;									\
+			XUNLOCK( display );                               \
 			if( (window)->after_resize ) 				\
 				((window)->after_resize)( window ); 	\
 		} \
@@ -106,7 +106,7 @@ typedef struct
 		XLOCK;													\
 		XDefineCursor( display, (window)->win, *(mycursor) ); \
 		XFlush( display ); 	 \
-		XUNLOCK;										\
+		XUNLOCK( display );            \
 		(window)->cursor = mycursor; \
 }

--- a/inc/bbtsubdefs.h
+++ b/inc/bbtsubdefs.h
@@ -1,36 +1,19 @@
 #ifndef BBTSUBDEFS_H
 #define BBTSUBDEFS_H 1

-/***** Don't use PixRect code on 386i for now *****/
-/***** -or on any machine that doesn't support it (HP, e.g.) *****/
-
 /********************************************************/
 /*                                                      */
-/*      prropstyle is DEFINED when we want to use       */
-/*      pixrect versions of the operations in this      */
-/*      file, and UNDEFINED, when we want to use        */
-/*      Don Charnley's bitblt code to do them.          */
+/*      Don Charnley's bitblt code                      */
 /*                                                      */
 /********************************************************/
 #include "lispemul.h" /* for LispPTR, DLword */

-#if defined(SUNDISPLAY) && \
-    !defined(NOPIXRECT) && \
-    !defined(NEWBITBLT)
-#define prropstyle 1
-#endif
-
 void bitbltsub(LispPTR *argv);
 LispPTR n_new_cursorin(DLword *baseaddr, int dx, int dy, int w, int h);
 LispPTR bitblt_bitmap(LispPTR *args);
 LispPTR bitshade_bitmap(LispPTR *args);
-#ifndef prropstyle
 void bltchar(LispPTR *args);
 void newbltchar(LispPTR *args);
-#else
-LispPTR bltchar(LispPTR *args);
-LispPTR newbltchar(LispPTR *args);
-#endif
 void ccfuncall(unsigned int atom_index, int argnum, int bytenum);
 void tedit_bltchar(LispPTR *args);

--- a/inc/bitblt.h
+++ b/inc/bitblt.h
@@ -54,13 +54,6 @@ extern int DisplayRasterWidth;
 #define ShowCursor { (currentdsp->mouse_visible)(IOPage68K->dlmousex, \
 												  IOPage68K->dlmousey); }

-#elif defined(SUNDISPLAY) && defined(OLD_CURSOR)
-extern struct winlock DisplayLockArea;
-#define	HideCursor	\
-	ioctl( LispWindowFd, WINLOCKSCREEN, &DisplayLockArea)
-
-#define ShowCursor \
-	ioctl( LispWindowFd, WINUNLOCKSCREEN, &DisplayLockArea)
 #else
 extern DLword *EmCursorX68K,*EmCursorY68K;
 #define	HideCursor	{ taking_mouse_down();}
--- a/inc/devif.h
+++ b/inc/devif.h
@@ -264,11 +264,12 @@ typedef struct


 #ifdef XWINDOW
-#define DefineCursor(display, window, mycursor) { \
-	XLOCK;\
-	XDefineCursor( display, window, *(mycursor) );\
-	XUNLOCK;\
-}
+#define DefineCursor(dsp, window, mycursor)                     \
+  do {								\
+    XLOCK;                                                      \
+    XDefineCursor((dsp)->display_id, window, *(mycursor) );     \
+    XUNLOCK(dsp);                                               \
+  } while (0)
 #endif /* XWINDOW */

 #define OUTER_SB_WIDTH(dsp) ((dsp)->ScrollBarWidth + 2*((dsp)->InternalBorderWidth))
--- a/inc/keyeventdefs.h
+++ b/inc/keyeventdefs.h
@@ -1,7 +1,7 @@
 #ifndef KEYEVENTDEFS_H
 #define KEYEVENTDEFS_H 1
 #include <sys/types.h>
-void getsignaldata(int sig);
+void process_io_events();
 void kb_trans(u_short keycode, u_short upflg);
 void taking_mouse_down(void);
 void copy_cursor(int newx, int newy);
--- a/inc/ldeXdefs.h
+++ b/inc/ldeXdefs.h
@@ -13,23 +13,24 @@
 /************************************************************************/

 #ifdef LOCK_X_UPDATES
-#define XLOCK { XLocked++; /* printf("L"); fflush(stdout);*/}
-#define XUNLOCK					\
-  { XLocked--;/* printf("U"); fflush(stdout);*/	\
-    if (XNeedSignal)				\
+#define XLOCK do { XLocked++; } while (0)
+#define XUNLOCK(dsp)				\
+  do { 						\
+    if (XLocked == 1 && XNeedSignal)		\
      {						\
 	XNeedSignal = 0;			\
-	kill(getpid(), SIGPOLL);		\
-      };						\
-  }
+	getXsignaldata(dsp);			\
+      };					\
+    XLocked--;					\
+  } while (0)
 #else
 #define XLOCK
 #define XUNLOCK
 #endif	/* LOCK_X_UPDATES */

-extern int XLocked;
-extern int XNeedSignal;
-/* this is !0 if we're locked; it should be 0 or larger always */
+#include <signal.h>
+extern volatile sig_atomic_t XLocked;
+extern volatile sig_atomic_t XNeedSignal;

 #endif

--- a/inc/mkcelldefs.h
+++ b/inc/mkcelldefs.h
@@ -3,5 +3,4 @@
 #include "lispemul.h" /* for LispPTR, DLword */
 LispPTR N_OP_createcell(register LispPTR tos);
 DLword *createcell68k(unsigned int type);
-LispPTR Create_n_Set_Cell(unsigned int type, LispPTR value);
 #endif
--- a/inc/return.h
+++ b/inc/return.h
@@ -35,7 +35,7 @@
 /* FAST case return use */
 #ifndef RESWAPPEDCODESTREAM
 #define FastRetCALL							\
-  {									\
+  do {									\
    /* Get IVar from Returnee's IVAR offset slot(BF) */ 			\
    IVar = Addr68k_from_LADDR(STK_OFFSET | GETWORD((DLword *)CURRENTFX -1)); \
    /* Get FuncObj from Returnee's FNHEAD slot in FX */ 			\
@@ -43,10 +43,10 @@
 		Addr68k_from_LADDR(FX_FNHEADER);	\
    /* Get PC from Returnee's pc slot in FX */ 				\
    PC = (ByteCode *)FuncObj + CURRENTFX->pc ; 				\
-  }
+  } while (0)
 #else
 #define FastRetCALL							\
-  {									\
+  do {									\
    /* Get IVar from Returnee's IVAR offset slot(BF) */ 			\
    IVar = Addr68k_from_LADDR(STK_OFFSET | GETWORD((DLword *)CURRENTFX -1)); \
    /* Get FuncObj from Returnee's FNHEAD slot in FX */ 			\
@@ -59,7 +59,7 @@
 	byte_swap_code_block(FuncObj);				\
 	FuncObj->byteswapped = 1;				\
      }								\
-  }
+  } while (0)
 #endif /* RESWAPPEDCODESTREAM */


--- a/inc/testtooldefs.h
+++ b/inc/testtooldefs.h
@@ -33,6 +33,7 @@ LispPTR *MakeAtom68k(char *string);
 void GETTOPVAL(char *string);
 void all_stack_dump(DLword start, DLword end, DLword silent);
 void dtd_chain(DLword type);
+void check_dtd_chain(DLword type);
 void Trace_FNCall(int numargs, int atomindex, int arg1, LispPTR *tos);
 void Trace_APPLY(int atomindex);
 #endif
--- a/inc/tosfns.h
+++ b/inc/tosfns.h
@@ -223,22 +223,10 @@
    CSTKPTRL = (LispPTR *)(((DLword *)CSTKPTR) + FRAMESIZE);                           \
    PVARL = (DLword *)CSTKPTR;                                                         \
    {                                                                                  \
-      register int result;                                                             \
-      result = LOCFNCELL->pv;                                                          \
-      if (result >= 0) {                                                               \
-        register LispPTR unboundval;                                                   \
-        unboundval = (LispPTR)0xffffffff;                                              \
+      for (int pv = LOCFNCELL->pv; pv >= 0; pv--) {                                    \
+        const LispPTR unboundval = 0xffffffff;                                         \
        HARD_PUSH(unboundval);                                                         \
        HARD_PUSH(unboundval);                                                         \
-        if (result > 0) {                                                              \
-          HARD_PUSH(unboundval);                                                       \
-          HARD_PUSH(unboundval);                                                       \
-          result -= 1;                                                                 \
-          for (; --result >= 0;) {                                                     \
-            HARD_PUSH(unboundval);                                                     \
-            HARD_PUSH(unboundval);                                                     \
-          }                                                                            \
-        }                                                                              \
      }                                                                                \
    }                                                                                  \
    CSTKPTRL += 1;                                                                     \
@@ -291,22 +279,10 @@
    CSTKPTRL = (LispPTR *)(((DLword *)CSTKPTR) + FRAMESIZE);                           \
    PVARL = (DLword *)CSTKPTR;                                                         \
    {                                                                                  \
-      register int result;                                                             \
-      result = LOCFNCELL->pv;                                                          \
-      if (result >= 0) {                                                               \
-        register LispPTR unboundval;                                                   \
-        unboundval = (LispPTR)0xffffffff;                                              \
+      for (int pv = LOCFNCELL->pv; pv >= 0; pv--) {                                    \
+        const LispPTR unboundval = 0xffffffff;                                         \
        HARD_PUSH(unboundval);                                                         \
        HARD_PUSH(unboundval);                                                         \
-        if (result > 0) {                                                              \
-          HARD_PUSH(unboundval);                                                       \
-          HARD_PUSH(unboundval);                                                       \
-          result -= 1;                                                                 \
-          for (; --result >= 0;) {                                                     \
-            HARD_PUSH(unboundval);                                                     \
-            HARD_PUSH(unboundval);                                                     \
-          }                                                                            \
-        }                                                                              \
      }                                                                                \
    }                                                                                  \
    CSTKPTRL += 1;                                                                     \
--- a/inc/version.h
+++ b/inc/version.h
@@ -223,7 +223,6 @@ error Must specify RELEASE to build Medley.
 #ifdef OS5
 		/* Solaris, sort of SYSV-ish, but not really */
 #define MAIKO_ENABLE_ETHERNET
-#define LOCK_X_UPDATES 1
 #endif /* OS5 */


--- a/inc/xcursordefs.h
+++ b/inc/xcursordefs.h
@@ -6,6 +6,6 @@
 #include "devif.h"     /* for DspInterface */
 void Init_XCursor(void);
 void Set_XCursor(int x, int y);
-void init_Xcursor(Display *display, Window window);
+void init_Xcursor(DspInterface dsp);
 void set_Xcursor(DspInterface dsp, const uint8_t *bitmap, int hotspot_x, int hotspot_y, Cursor *return_cursor, int from_lisp);
 #endif
--- a/inc/xdefs.h
+++ b/inc/xdefs.h
@@ -32,22 +32,25 @@

 #include <unistd.h>
 #include <signal.h>
-extern int XLocked;
-extern int XNeedSignal;
-/* this is !0 if we're locked; it should be 0 or larger always */
+#include "xwinmandefs.h"

-#define XLOCK do { XLocked++; /* printf("L"); fflush(stdout);*/} while (0)
-#define XUNLOCK					\
-  do { XLocked--;/* printf("U"); fflush(stdout);*/	\
-    if (XNeedSignal)				\
+/* this is !0 if we're locked; it should be 0 or larger always */
+extern volatile sig_atomic_t XLocked;
+extern volatile sig_atomic_t XNeedSignal;
+
+#define XLOCK do { XLocked++; } while (0)
+#define XUNLOCK(dsp)				\
+  do { 						\
+    if (XLocked == 1 && XNeedSignal)		\
      {						\
 	XNeedSignal = 0;			\
-	kill(getpid(), SIGPOLL);		\
+	getXsignaldata(dsp);			\
      };					\
+    XLocked--;					\
  } while (0)
 #else
 #define XLOCK
-#define XUNLOCK
+#define XUNLOCK(dsp)
 #endif	/* LOCK_X_UPDATES */

 #endif /* XDEFS_H */
--- a/inc/xwinmandefs.h
+++ b/inc/xwinmandefs.h
@@ -8,5 +8,5 @@ void Set_BitGravity(XButtonEvent *event, DspInterface dsp, Window window, int gr
 void enable_Xkeyboard(DspInterface dsp);
 void disable_Xkeyboard(DspInterface dsp);
 void beep_Xkeyboard(DspInterface dsp);
-void getXsignaldata(DspInterface dsp);
+void process_Xevents(DspInterface dsp);
 #endif
--- a/src/bbtsub.c
+++ b/src/bbtsub.c
@@ -37,12 +37,6 @@
 #include "xdefs.h"
 #endif /* XWINDOW */

-#ifdef SUNDISPLAY
-#ifndef NOPIXRECT
-#include <sunwindow/window_hs.h>
-#include <sunwindow/win_ioctl.h>
-#endif /* NOPIXRECT */
-#endif /* SUNDISPLAY */

 #include "lispemul.h"
 #include "lspglob.h"
@@ -87,10 +81,8 @@ extern int  kbd_for_makeinit;
  };
 #endif

-#if !defined(SUNDISPLAY)
 #include "devif.h"
 extern DspInterface currentdsp;
-#endif /* SUNDISPLAY */

 #ifdef COLOR
 extern int MonoOrColor;
@@ -484,9 +476,7 @@ do_it_now:
 #endif

 #ifdef XWINDOW
-  XLOCK;
  if (in_display_segment(dstbase)) flush_display_region(dx, dty, w, h);
-  XUNLOCK;
 #endif /* XWINDOW */

 #ifdef DOS
@@ -841,9 +831,7 @@ do_it_now:
 #endif

 #ifdef XWINDOW
-  XLOCK;
  if (in_display_segment(dstbase)) flush_display_region(dlx, dty, width, height);
-  XUNLOCK;
 #endif /* XWINDOW */

 #ifdef DOS
@@ -1090,9 +1078,7 @@ do_it_now:
 #endif

 #ifdef XWINDOW
-  XLOCK;
  if (in_display_segment(dstbase)) flush_display_region(left, dty, width, height);
-  XUNLOCK;
 #endif /* XWINDOW */

 #ifdef DOS
@@ -1144,7 +1130,6 @@ bad_arg:
 /*                                                                      */
 /*                                                                      */
 /************************************************************************/
-#ifndef prropstyle
 /********************************************************/
 /*             Non-PIXRECT version of the code          */
 /********************************************************/
@@ -1222,9 +1207,7 @@ void bltchar(LispPTR *args)
 #endif

 #ifdef XWINDOW
-  XLOCK;
  if (in_display_segment(dstbase)) flush_display_lineregion(dx, dstbase, w, h);
-  XUNLOCK;
 #endif /* XWINDOW */

 #ifdef DOS
@@ -1238,100 +1221,6 @@ void bltchar(LispPTR *args)
  UNLOCKSCREEN;
 }

-#else
-/* prropstyle */
-
-LispPTR bltchar(LispPTR *args)
-/*      args[0] :       PILOTBBT
- *      args[1] :       DISPLAYDATA
- *      args[2] :       CHAR8CODE
- *      args[3] :       CURX
- *      args[4] :       LEFT
- *      args[5] :       RIGHT
- */
-{
-  register PILOTBBT *pbt;
-  register DISPLAYDATA *dspdata;
-  int x, y, destbpl, srcebpl, srcebit, distance;
-  int base;
-  register int displayflg;
-  unsigned int pix_op;
-  DLword *dstbase;
-
-  pbt = (PILOTBBT *)Addr68k_from_LADDR(((BLTC *)args)->pilotbbt);
-  dspdata = (DISPLAYDATA *)Addr68k_from_LADDR(((BLTC *)args)->displaydata);
-
-  (mpr_d(SrcePixRect))->md_image =
-      (short *)Addr68k_from_LADDR(VAG2(pbt->pbtsourcehi, pbt->pbtsourcelo));
-
-  dstbase = (mpr_d(DestPixRect))->md_image =
-      (short *)Addr68k_from_LADDR(VAG2(pbt->pbtdesthi, pbt->pbtdestlo));
-
-  SrcePixRect->pr_width = srcebpl = abs(pbt->pbtsourcebpl);
-  DestPixRect->pr_width = destbpl = abs(pbt->pbtdestbpl);
-  SrcePixRect->pr_height = DestPixRect->pr_height = pbt->pbtheight;
-
-  mpr_mdlinebytes(DestPixRect) = (destbpl + 7) >> 3;
-  mpr_mdlinebytes(SrcePixRect) = (srcebpl + 7) >> 3;
-
-  base = GETWORD(Addr68k_from_LADDR(dspdata->ddoffsetscache + ((BLTC *)args)->char8code));
-  srcebit = base + ((BLTC *)args)->left - ((BLTC *)args)->curx;
-
-#ifdef REALCURSOR
-  /* if displayflg != 0 then source or destination is DisplayBitMap
-   * Now we consider about only destination
-   */
-  displayflg = old_cursorin(pbt->pbtdesthi, pbt->pbtdestlo, ((BLTC *)args)->left, (((BLTC *)args)->right - ((BLTC *)args)->left),
-                            pbt->pbtheight, y, pbt->pbtbackward);
-#endif /* REALCURSOR */
-
-  /**** for DEBUG DEBUG DEBUG DEBUG DEBUG DEBUG DEBUG *****/
-  /*      displayflg = T;                                         */
-  /**** for DEBUG DEBUG DEBUG DEBUG DEBUG DEBUG DEBUG *****/
-
-  pix_op = PixOperation(pbt->pbtsourcetype, pbt->pbtoperation);
-
-  LOCKSCREEN;
-
-#ifdef REALCURSOR
-  if (displayflg) HideCursor;
-#endif /* REALCURSOR */
-
-  if (pr_rop(DestPixRect, ((BLTC *)args)->left, 0, (((BLTC *)args)->right - ((BLTC *)args)->left), pbt->pbtheight, pix_op,
-             SrcePixRect, srcebit, 0) != 0)
-    error("pilotbitblt: pr_rop failed\n");
-
-#ifdef DISPLAYBUFFER
-#ifdef COLOR
-  if (MonoOrColor == MONO_SCREEN)
-#endif /* COLOR */
-
-    if (in_display_segment(dstbase)) {
-      /*          DBPRINT(("bltchar pix:  x %x, y %d, w %d, h %d.\n", ((BLTC *)args)->left, dstbase,
-       * (((BLTC *)args)->right - ((BLTC *)args)->left),pbt->pbtheight));
-      */
-      flush_display_lineregion(((BLTC *)args)->left, dstbase, (((BLTC *)args)->right - ((BLTC *)args)->left), pbt->pbtheight);
-    }
-#endif
-
-#ifdef XWINDOW
-  XLOCK;
-  if (in_display_segment(dstbase))
-    flush_display_lineregion(((BLTC *)args)->left, dstbase, (((BLTC *)args)->right - ((BLTC *)args)->left), pbt->pbtheight);
-  XUNLOCK;
-#endif /* XWINDOW */
-
-#ifdef DOS
-  if (in_display_segment(dstbase)) flush_display_lineregion(dx, dstbase, w, h);
-#endif /* DOS */
-
-#ifdef REALCURSOR
-  if (displayflg) ShowCursor;
-#endif /* REALCURSOR */
-
-  ScreenLocked = NIL;
-}
-#endif

 /************************************************************************/
 /*                                                                      */
@@ -1418,7 +1307,6 @@ LispPTR BLTCHAR_index;       /* Atom # for \PUNTBLTCHAR punt fn */
 LispPTR TEDIT_BLTCHAR_index; /* if NIL ,TEDIT is not yet loaded */


-#ifndef prropstyle

 /************************************************************************/
 /*                                                                      */
@@ -1547,150 +1435,6 @@ void newbltchar(LispPTR *args) {

 } /* end of newbltchar */

-#else /* prropstyle */
-
-/************************************************************************/
-/*                                                                      */
-/*                          n e w b l t c h a r                                 */
-/*                           (PIXRECT version)                          */
-/*                                                                      */
-/************************************************************************/
-
-LispPTR newbltchar(LispPTR *args) {
-  register DISPLAYDATA *displaydata68k;
-
-  register int right, left, curx;
-  register PILOTBBT *pbt;
-  register int lmargin, rmargin, xoff;
-  int displayflg; /* T if cursor needs to be taken down */
-  displaydata68k = (DISPLAYDATA *)Addr68k_from_LADDR(((BLTARG *)args)->displaydata);
-
-  if ((displaydata68k->ddcharset & 0xFFFF) != ((BLTARG *)args)->charset) {
-    /* Currently, this has BUG, so I can't call it */
-    /*if(changecharset_display(displaydata68k,((BLTARG *)args)->charset) ==-1)*/
-    { PUNT_TO_BLTCHAR; }
-  }
-
-  if (displaydata68k->ddslowprintingcase) { PUNT_TO_BLTCHAR; /** \SLOWBLTCHAR--return;**/ }
-
-  FGetNum(displaydata68k->ddxposition, curx);
-  FGetNum(displaydata68k->ddrightmargin, rmargin);
-  FGetNum(displaydata68k->ddleftmargin, lmargin);
-  FGetNum(displaydata68k->ddxoffset, xoff);
-
-  right =
-      curx +
-      GETWORD((DLword *)Addr68k_from_LADDR(displaydata68k->ddcharimagewidths + ((BLTARG *)args)->char8code));
-
-  if ((right > rmargin) && (curx > lmargin)) PUNT_TO_BLTCHAR;
-  if (((BLTARG *)args)->displaystream != *TOPWDS68k) PUNT_TO_BLTCHAR;
-  {
-    register int newpos;
-    newpos = curx +
-             GETWORD((DLword *)Addr68k_from_LADDR(displaydata68k->ddwidthscache + ((BLTARG *)args)->char8code));
-
-    if ((0 <= newpos) && (newpos < 65536))
-      (displaydata68k->ddxposition) = (LispPTR)(S_POSITIVE | newpos);
-    else if (-65537 < newpos)
-      (displaydata68k->ddxposition) = (LispPTR)(S_NEGATIVE | (0xffff & newpos));
-    else {
-      PUNT_TO_BLTCHAR;
-    }
-  }
-
-  curx += xoff;
-  right += xoff;
-  if (right > (int)(displaydata68k->ddclippingright)) right = displaydata68k->ddclippingright;
-
-  if (curx > (int)(displaydata68k->ddclippingleft))
-    left = curx;
-  else
-    left = displaydata68k->ddclippingleft;
-
-  if (left < right) {
-    pbt = (PILOTBBT *)Addr68k_from_LADDR(displaydata68k->ddpilotbbt);
-    if (pbt->pbtheight != 0) {
-      /****** OLD bltchar *****/
-      register int destbpl, srcebpl, sourcebit;
-      DLword *dstbase;
-      int base, y;
-
-      (mpr_d(SrcePixRect))->md_image =
-          (short *)Addr68k_from_LADDR(VAG2(pbt->pbtsourcehi, pbt->pbtsourcelo));
-
-      dstbase = (mpr_d(DestPixRect))->md_image =
-          (short *)Addr68k_from_LADDR(VAG2(pbt->pbtdesthi, pbt->pbtdestlo));
-
-      SrcePixRect->pr_width = srcebpl = abs(pbt->pbtsourcebpl);
-      DestPixRect->pr_width = destbpl = abs(pbt->pbtdestbpl);
-      SrcePixRect->pr_height = DestPixRect->pr_height = pbt->pbtheight;
-
-      mpr_mdlinebytes(DestPixRect) = (destbpl + 7) >> 3;
-      mpr_mdlinebytes(SrcePixRect) = (srcebpl + 7) >> 3;
-
-      base = GETBASE(Addr68k_from_LADDR(displaydata68k->ddoffsetscache), ((BLTARG *)args)->char8code);
-      sourcebit = base + left - curx;
-
-      LOCKSCREEN;
-
-#ifdef SUNDISPLAY
-      if (displayflg = old_cursorin(pbt->pbtdesthi, pbt->pbtdestlo, left, (right - left),
-                                    pbt->pbtheight, y, pbt->pbtbackward)) {
-        HideCursor;
-        if (pr_rop(DestPixRect, left, 0, (right - left), pbt->pbtheight,
-                   PixOperation(pbt->pbtsourcetype, pbt->pbtoperation), SrcePixRect, sourcebit,
-                   0) != 0)
-          error("pilotbitblt: pr_rop failed\n");
-/* Save SHOWCURSOR 'til after paint to screen */
-#ifndef DISPLAYBUFFER
-        ShowCursor;
-#endif
-      } /* display case */
-      else {
-        if (pr_rop(DestPixRect, left, 0, (right - left), pbt->pbtheight,
-                   PixOperation(pbt->pbtsourcetype, pbt->pbtoperation), SrcePixRect, sourcebit,
-                   0) != 0)
-          error("pilotbitblt: pr_rop failed\n");
-
-      } /* else */
-
-#ifdef DISPLAYBUFFER
-#ifdef COLOR
-      if (MonoOrColor == MONO_SCREEN)
-#endif /* COLOR */
-
-        if (in_display_segment(dstbase)) {
-          /*               DBPRINT(("newbltchar:  x %d, y 0x%x, w %d, h %d.\n", left, dstbase,
-           * (right - left), pbt->pbtheight)); */
-
-          flush_display_lineregion(left, dstbase, (right - left), pbt->pbtheight);
-          if (displayflg) ShowCursor; /* because hide is done earlier */
-        }
-#endif
-#endif /* SUNDISPLAY */
-
-#ifdef XWINDOW
-      if (pr_rop(DestPixRect, left, 0, (right - left), pbt->pbtheight,
-                 PixOperation(pbt->pbtsourcetype, pbt->pbtoperation), SrcePixRect, sourcebit,
-                 0) != 0)
-        error("pilotbitblt: pr_rop failed\n");
-
-      if (in_display_segment(dstbase))
-        flush_display_lineregion(left, dstbase, (right - left), pbt->pbtheight);
-#endif /* XWINDOW */
-
-#ifdef DOS
-      if (in_display_segment(dstbase)) flush_display_lineregion(dx, dstbase, w, h);
-      if (displayflg) ShowCursor;
-#endif /* DOS */
-
-      ScreenLocked = NIL;
-
-      /****** OLD bltchar *****/
-    }
-  }
-} /* newbltchar */
-#endif

 /******************************************************************/
 #ifndef BYTESWAP
@@ -1988,7 +1732,6 @@ void ccfuncall(register unsigned int atom_index, register int argnum, register i
 /*                                                              */
 /****************************************************************/

-#ifndef prropstyle
 /***************************/
 /*   Non-PIXRECT version   */
 /***************************/
@@ -2046,67 +1789,6 @@ void tedit_bltchar(LispPTR *args)
 #undef backwardflg

 } /* end tedit_bltchar */
-#else
-
-/* pr_op style */
-/**********************/
-/*   PIXRECT version  */
-/**********************/
-
-void tedit_bltchar(LispPTR *args)
-{
-  register DISPLAYDATA *displaydata68k;
-  register int left, right;
-  register PILOTBBT *pbt;
-  register int imagewidth, newx;
-  register displayflg;
-
-  displaydata68k = (DISPLAYDATA *)Addr68k_from_LADDR(((TBLTARG *)args)->displaydata);
-  if (displaydata68k->ddcharset != ((TBLTARG *)args)->charset) {
-    /**if(changecharset_display(displaydata68k, ((TBLTARG *)args)->charset)== -1)**/
-    { PUNT_TO_TEDIT_BLTCHAR; }
-  }
-  imagewidth = *((DLword *)Addr68k_from_LADDR(displaydata68k->ddcharimagewidths + ((TBLTARG *)args)->char8code));
-  newx = ((TBLTARG *)args)->current_x + imagewidth;
-  left = IMAX(0, ((TBLTARG *)args)->current_x);
-  right = IMIN(newx, ((TBLTARG *)args)->clipright);
-  LOCKSCREEN;
-
-  if (left < right) {
-    pbt = (PILOTBBT *)Addr68k_from_LADDR(displaydata68k->ddpilotbbt);
-    if (pbt->pbtheight) {
-      (mpr_d(SrcePixRect))->md_image =
-          (short *)Addr68k_from_LADDR(VAG2(pbt->pbtsourcehi, pbt->pbtsourcelo));
-
-      (mpr_d(DestPixRect))->md_image =
-          (short *)Addr68k_from_LADDR(VAG2(pbt->pbtdesthi, pbt->pbtdestlo));
-      {
-        register int srcebpl, destbpl;
-        SrcePixRect->pr_width = srcebpl = abs(pbt->pbtsourcebpl);
-        DestPixRect->pr_width = destbpl = abs(pbt->pbtdestbpl);
-        SrcePixRect->pr_height = DestPixRect->pr_height = pbt->pbtheight;
-
-        mpr_mdlinebytes(DestPixRect) = (destbpl + 7) >> 3;
-        mpr_mdlinebytes(SrcePixRect) = (srcebpl + 7) >> 3;
-      }
-
-      pbt->pbtwidth = IMIN(imagewidth, (right - left));
-      pbt->pbtsourcebit =
-          GETBASE(Addr68k_from_LADDR(displaydata68k->ddoffsetscache), ((TBLTARG *)args)->char8code);
-
-      if (pr_rop(DestPixRect, left, 0, pbt->pbtwidth, pbt->pbtheight,
-                 PixOperation(pbt->pbtsourcetype, pbt->pbtoperation), SrcePixRect,
-                 pbt->pbtsourcebit, 0) != 0)
-        error("pilotbitblt: pr_rop failed\n");
-
-    } /* if pbt->pbtheight */
-  }   /* if left<right */
-
-  UNLOCKSCREEN;
-
-} /* end tedit_bltchar */
-
-#endif

 #if defined(REALCURSOR) || defined(SUNDISPLAY)
 #ifndef COLOR
--- a/src/binds.c
+++ b/src/binds.c
@@ -33,7 +33,7 @@ LispPTR *N_OP_bind(register LispPTR *stack_pointer, register LispPTR tos, int by
  register int n1;         /* # slots to bind to NIL (0, 0) */
  register int n2;         /* # slots to bind to value in stack */
  register LispPTR *ppvar; /* pointer to argued slot in Pvar area */
-  register int i;          /* temporary for control */
+  register unsigned i;          /* temporary for control */

 #ifdef TRACE
  printPC();
--- a/src/bitblt.c
+++ b/src/bitblt.c
@@ -12,16 +12,6 @@

 #include <stdio.h>

-#ifdef SUNDISPLAY
-#include <sunwindow/window_hs.h>
-#include <sunwindow/win_ioctl.h>
-
-#include <suntool/sunview.h>
-#include <sunwindow/cms_mono.h>
-#include <suntool/canvas.h>
-#include <sys/ioctl.h>
-#include <signal.h>
-#endif

 #ifdef XWINDOW
 #define DISPLAYBUFFER
@@ -127,25 +117,14 @@ LispPTR N_OP_pilotbitblt(LispPTR pilot_bt_tbl,int tos)
  num_gray = ((TEXTUREBBT *)pbt)->pbtgrayheightlessone + 1;
  curr_gray_line = ((TEXTUREBBT *)pbt)->pbtgrayoffset;

-#ifdef SUNDISPLAY
-  if (displayflg) HideCursor;
-#elif DOS
+#if   DOS
  if (displayflg) (currentdsp->mouse_invisible)(currentdsp, IOPage68K);
  ;
 #endif /* SUNDISPLAY / DOS */

  new_bitblt_code

-#ifdef SUNDISPLAY
-#ifdef DISPLAYBUFFER
-#ifdef COLOR
-      if (MonoOrColor == MONO_SCREEN)
-#endif /* COLOR */
-
-          if (in_display_segment(dstbase)) flush_display_lineregion(dx, dstbase, w, h);
-#endif
-  if (displayflg) ShowCursor;
-#elif DOS
+#if   DOS
      flush_display_lineregion(dx, dstbase, w, h);
  if (displayflg) (currentdsp->mouse_visible)(IOPage68K->dlmousex, IOPage68K->dlmousey);
 #endif /* SUNDISPLAY / DOS */
--- a/src/draw.c
+++ b/src/draw.c
@@ -20,11 +20,6 @@
 #include <stdio.h>
 #include <stdlib.h>

-#ifdef SUNDISPLAY
-#include <sys/ioctl.h>
-#include <sunwindow/window_hs.h>
-#include <sunwindow/win_ioctl.h>
-#endif

 #include "lispemul.h"
 #include "lspglob.h"
@@ -133,17 +128,6 @@ int N_OP_drawline(LispPTR ptr, int curbit, int xsize, int width, int ysize, int
  if (MonoOrColor == MONO_SCREEN)
 #endif /* COLOR */

-#ifdef SUNDISPLAY
-#ifndef DISPLAYBUFFER
-    HideCursor; /** Figure out how to be smart later **/
-#else           /* DISPLAYBUFFER */
-#ifndef OLD_CURSOR
-    HideCursor;
-#endif /* OLD_CURSOR */
-
-#endif /* DISPLAYBUFFER */
-
-#endif /* SUNDISPLAY */

  delta &= 0xFFFF;
  op &= 3;
@@ -277,17 +261,6 @@ int N_OP_drawline(LispPTR ptr, int curbit, int xsize, int width, int ysize, int
  if (MonoOrColor == MONO_SCREEN)
 #endif /* COLOR */

-#ifdef SUNDISPLAY
-#ifndef DISPLAYBUFFER
-    ShowCursor; /** figure how to be smart later **/
-#else
-#ifndef OLD_CURSOR
-    ShowCursor;
-#endif /* OLD_CURSOR */
-
-#endif /* DISPLAYBUFFER */
-
-#endif /* SUNDISPLAY */

 #ifdef DISPLAYBUFFER
 #ifdef COLOR
@@ -304,9 +277,6 @@ int N_OP_drawline(LispPTR ptr, int curbit, int xsize, int width, int ysize, int
        ((int)(temp_e = (DLword *)(dataptr - DisplayRegion68k)) >= 0) &&
        ((DLword *)dataptr < DisplayRegion68k_end_addr)) {
      int start_x, start_y, end_x, end_y, w, h;
-#if defined(SUNDISPLAY) && defined(OLD_CURSOR)
-      int displayflg;
-#endif

      start_y = (int)temp_s / DisplayRasterWidth;
      start_x = ((int)temp_s % DisplayRasterWidth) * BITSPER_DLWORD;
@@ -320,18 +290,6 @@ int N_OP_drawline(LispPTR ptr, int curbit, int xsize, int width, int ysize, int
      if (start_x > end_x) start_x = end_x;
      if (start_y > end_y) start_y = end_y;

-#if defined(SUNDISPLAY) && !defined(BYTESWAP)
-#ifdef OLD_CURSOR
-      if ((displayflg = n_new_cursorin_CG6(start_x, start_y, w, h))) HideCursor;
-#endif /* OLD_CURSOR */
-
-      pr_rop(ColorDisplayPixrect, start_x, start_y, w, h, PIX_SRC, DisplayRegionPixrect, start_x,
-             start_y);
-#ifdef OLD_CURSOR
-      if (displayflg) ShowCursor;
-#endif /* OLD_CURSOR */
-
-#endif /* SUNDISPLAY */

 #if defined(XWINDOW) || defined(BYTESWAP)
      flush_display_region(start_x, start_y, w, h);
--- a/src/dsk.c
+++ b/src/dsk.c
@@ -53,9 +53,6 @@
 #include "commondefs.h"
 #include "ufsdefs.h"

-#ifdef GCC386
-#include "inlnPS2.h"
-#endif /* GCC386 */

 extern int *Lisp_errno;
 extern int Dummy_errno;
--- a/src/dspsubrs.c
+++ b/src/dspsubrs.c
@@ -12,9 +12,6 @@
 #include "version.h"

 #include <stdio.h>
-#ifdef SUNDISPLAY
-#include <sunwindow/window_hs.h>
-#endif

 #include "lispemul.h"
 #include "lsptypes.h"
@@ -68,9 +65,7 @@ void DSP_showdisplay(LispPTR *args)
 LispPTR DSP_VideoColor(LispPTR *args) /* args[0] :	black flag	*/
 {
  int invert;
-#ifdef SUNDISPLAY
-  return NIL;
-#elif defined(XWINDOW)
+#if   defined(XWINDOW)
  invert = args[0] & 0xFFFF;
  lisp_Xvideocolor(invert);
  if (invert)
@@ -99,50 +94,7 @@ void DSP_Cursor(LispPTR *args, int argnum)
  extern int ScreenLocked;
  extern DLword *EmCursorX68K, *EmCursorY68K;
  extern int LastCursorX, LastCursorY;
-#if defined(SUNDISPLAY) && !defined(OLD_CURSOR)
-  static int Init = T;
-#endif

-#ifdef SUNDISPLAY
-  if (argnum == 2) {
-    CurrentCursor.cur_xhot = args[0] & 0xffff;
-    CurrentCursor.cur_yhot = args[1] & 0xffff;
-  };
-
-#ifdef OLD_CURSOR
-  win_setcursor(LispWindowFd, &CurrentCursor);
-#else
-#ifndef INIT
-  ScreenLocked = T;
-  if (!Init) {
-    taking_mouse_down();
-    taking_mouse_up(*EmCursorX68K, *EmCursorY68K);
-  } else {
-    Init = NIL;
-    cursor_hidden_bitmap(0, 0);
-    taking_mouse_up(0, 0);
-    *EmCursorX68K = LastCursorX = 0;
-    *EmCursorY68K = LastCursorY = 0;
-  }
-
-  ScreenLocked = NIL;
-#else
-  /* Init specific lde only */
-  ScreenLocked = T;
-  if (!Init) {
-    taking_mouse_down();
-    taking_mouse_up(0, 0);
-  } else {
-    Init = NIL;
-    cursor_hidden_bitmap(0, 0);
-    taking_mouse_up(0, 0);
-  }
-
-  ScreenLocked = NIL;
-#endif /* INIT */
-
-#endif
-#endif /* SUNDISPLAY */

 #ifdef XWINDOW
  /* For X-Windows, set the cursor to the given location. */
@@ -161,32 +113,6 @@ void DSP_Cursor(LispPTR *args, int argnum)
  */
 void DSP_SetMousePos(register LispPTR *args)
 {
-#ifdef SUNDISPLAY
-#ifdef OLD_CURSOR
-  register int x, y;
-  x = GetSmalldata(args[0]);
-  y = GetSmalldata(args[1]); /* debug */
-  win_setmouseposition(LispWindowFd, GetSmalldata(args[0]), GetSmalldata(args[1]));
-#else
-  extern int ScreenLocked;
-  extern DLword *EmCursorX68K, *EmCursorY68K, *EmMouseX68K, *EmMouseY68K;
-  register int x, y;
-  ScreenLocked = T;
-  x = GetSmalldata(args[0]);
-  y = GetSmalldata(args[1]);
-  /* for Suntool's invisible cursor */
-  win_setmouseposition(LispWindowFd, x, y);
-  /* for REAL cursor image */
-  taking_mouse_down();
-  taking_mouse_up(x, y);
-
-#ifndef INIT
-  *EmMouseX68K = x;
-  *EmMouseY68K = y;
-#endif
-  ScreenLocked = NIL;
-#endif
-#endif /* SUNDISPLAY */

 #ifdef XWINDOW
  if (Mouse_Included)
@@ -251,25 +177,6 @@ void flip_cursor() {

 #endif

-#ifdef SUNDISPLAY
-#ifdef OLD_CURSOR
-
-  win_setcursor(LispWindowFd, &CurrentCursor);
-#else
-  ScreenLocked = T;
-  taking_mouse_down();
-#ifndef INIT
-  taking_mouse_up(*EmCursorX68K, *EmCursorY68K);
-#else
-  if (!for_makeinit)
-    taking_mouse_up(*EmCursorX68K, *EmCursorY68K);
-  else
-    taking_mouse_up(0, 0);
-#endif /* INIT */
-
-  ScreenLocked = NIL;
-#endif
-#endif /* SUNDISPLAY */

 #ifdef XWINDOW
  /* JDS 011213: 15- cur y, as function does same! */
--- a/src/fvar.c
+++ b/src/fvar.c
@@ -24,9 +24,6 @@
 #include "commondefs.h"
 #include "gchtfinddefs.h"

-#ifdef GCC386
-#include "inlnPS2.h"
-#endif

 #define MaskShift(x) (((x) << 16) & SEGMASK)

--- a/src/gc2.c
+++ b/src/gc2.c
@@ -34,9 +34,6 @@
 #include "gc2defs.h"
 #include "gcscandefs.h"

-#ifdef GCC386
-#include "inlnPS2.h"
-#endif /* GCC386 */

 /**********************************************************************/
 /*
--- a/src/gcmain3.c
+++ b/src/gcmain3.c
@@ -52,9 +52,6 @@
 #include "gcrcelldefs.h"
 #include "gcscandefs.h"

-#ifdef GCC386
-#include "inlnPS2.h"
-#endif

 #define WORDSPERCELL 2
 #define MAXHTCNT 63
@@ -99,203 +96,6 @@
 #define STKREFBIT 0x200
 #endif /* BIGVM */

-#ifdef GCC386
-/* byte-swapped, 386 assembler version */
-LispPTR gcmapscan() {
-  volatile DLword probe;
-  volatile DLword *entry;
-  volatile DLword offset;
-  volatile LispPTR ptr;
-
-  asm volatile(
-      " \n\
-	movl $32768,%%edi	/ probe = HTSIZE.			\n\
-	.align 4							\n\
-nextentry:			/ nextentry:				\n\
-	decl %%edi							\n\
-	js returNIL							\n\
-	leal 0(,%%edi,2),%%esi						\n\
-	addl HTmain,%%esi	/htlptr = (struct htlinkptr *)(HTmain+probe);	\n\
-	.align 4							\n\
-scanloop:								\n\
-	movl %%esi,%%edx						\n\
-	xorb $2,%%dl							\n\
-	movzwl (%%edx),%%eax	/ contents = ((struct htlinkptr *)WORDPTR(htlptr))->contents	\n\
-	testl %%eax,%%eax	/ if (contents && 			\n\
-	je scanbot							\n\
-	testb $1,%%al							\n\
-	jne scanok							\n\
-	testb $254,%%ah							\n\
-	jne scanbot							\n\
-scanok:									\n\
-	jmp scandone							\n\
-	.align 4							\n\
-scanbot:								\n\
-	addl $-2,%%esi		/ end of while loop.			\n\
-	decl %%edi							\n\
-	jns scanloop							\n\
-	jmp returNIL							\n\
-									\n\
-									\n\
-scandone:								\n\
-	movl %%edx,%0	/ entry = (DLword *) HTmain + probe.		\n\
-retry:	/ retry:							\n\
-	movl %0,%%ecx							\n\
-	movzwl (%%ecx),%%eax						\n\
-	testb $1,%%al		/ if HENTRY->collision,			\n\
-	je nocollision							\n\
-	xorl %%esi,%%esi		/ prev = 0			\n\
-	andl $65534,%%eax						\n\
-linkloop:		// linkloop:					\n\
-	leal 0(,%%eax,2),%%ecx						\n\
-	addl HTcoll,%%ecx						\n\
-	movw 2(%%ecx),%%ax	/ offset = ((struct htcoll *)link)->free_ptr;	\n\
-	testb $254,%%ah		/ if StkCountIsZero(offset)		\n\
-	jne stknz							\n\
-	sall $15,%%eax		/	, (probe << 1));		\n\
-	andl $16711680,%%eax						\n\
-	leal 0(,%%edi,2),%%edx						\n\
-	orl %%eax,%%edx							\n\
-	movl %%edx,%2	/ to ptr.					\n\
-	testl %%esi,%%esi		/ DelLink.  if (prev != 0)	\n\
-	je prevZ							\n\
-	leal 2(%%esi),%%edx	/ GETWORD((DLword *)prev + 1) = GETWORD((DLword *)link + 1)	\n\
-	xorb $2,%%dl							\n\
-	leal 2(%%ecx),%%eax						\n\
-	xorb $2,%%al							\n\
-	movw (%%eax),%%ax						\n\
-	jmp freelink							\n\
-	.align 4							\n\
-prevZ:	\n\
-	movl %0,%%edx	/ else GETWORD((DLword *)entry) = GETWORD((DLword *)link + 1)	\n\
-	leal 2(%%ecx),%%eax	\n\
-	xorb $2,%%al	\n\
-	movw (%%eax),%%ax	\n\
-	orb $1,%%al	\n\
-freelink:	/ FreeLink	\n\
-	movw %%ax,(%%edx)	\n\
-	movl %%ecx,%%eax	\n\
-	xorb $2,%%al	\n\
-	movw $0,(%%eax)	\n\
-	leal 2(%%ecx),%%eax	\n\
-	xorb $2,%%al	\n\
-	movl HTcoll,%%edx	/ GETWORD(link+1) = GETWORD(HTcoll);	\n\
-	xorb $2,%%dl	\n\
-	movw (%%edx),%%dx	\n\
-	movw %%dx,(%%eax)	\n\
-	movl HTcoll,%%edx	/ GETWORD(HTcoll) = (link - HTcoll);	\n\
-	xorb $2,%%dl	\n\
-	movl %%ecx,%%eax	\n\
-	subl HTcoll,%%eax	\n\
-	sarl $1,%%eax	\n\
-	movw %%ax,(%%edx)	\n\
-	movl %0,%%esi	/ link = (DLword *)HTcoll + GetLinkptr(GETWORD((DLword *)entry	\n\
-	movw (%%esi),%%ax	\n\
-	andl $65534,%%eax	\n\
-	addl %%eax,%%eax	\n\
-	movl %%eax,%%ecx	\n\
-	addl HTcoll,%%ecx	\n\
-	leal 2(%%ecx),%%edx	/ if (GETWORD((DLword *)link + 1) == 0) {	\n\
-	xorb $2,%%dl	\n\
-	cmpw $0,(%%edx)	\n\
-	jne sgclp1	\n\
-	movl %%ecx,%%eax	/ GETWORD((DLword *)entry) = GETWORD((DLword *)link)	\n\
-	xorb $2,%%al	\n\
-	movw (%%eax),%%bx	\n\
-	movw %%bx,(%%esi)	\n\
-	movw $0,(%%eax)		/ FreeLink: GETWORD(link) = 0	\n\
-	movl HTcoll,%%eax	/ GETWORD(link+1) = GETWORD(HTcoll)	\n\
-	xorb $2,%%al	\n\
-	movw (%%eax),%%bx	\n\
-	movw %%bx,(%%edx)	\n\
-	movl %%ecx,%%ebx	\n\
-	subl HTcoll,%%ebx	\n\
-	sarl $1,%%ebx	\n\
-	movw %%bx,(%%eax)	\n\
-	.align 4	\n\
-sgclp1:	/ start of gcloop 1 - do setup		\n\
-	movl GcDisabled_word,%%ecx		\n\
-	movl	MDStypetbl,%%ebx		\n\
-gclp1:		/ GcreclaimLp:	\n\
-	pushl %2	\n\
-	call gcreccell	\n\
-	addl $4,%%esp	\n\
-	movl %%eax,%2	\n\
-	testl %%eax,%%eax	\n\
-	je eogclp1	\n\
-	shrl $9,%%eax	\n\
-	leal 0(%%ebx,%%eax,2),%%eax		\n\
-	xorb $2,%%al	\n\
-	cmpw $0,(%%eax)	\n\
-	jl gclp1	\n\
-	cmpl $76,(%%ecx)	\n\
-	je gclp1	\n\
-	pushl $0	\n\
-	pushl %2	\n\
-	call rec_htfind	\n\
-	addl $8,%%esp	\n\
-	jmp gclp1	\n\
-	.align 4	\n\
-	.align 4	\n\
-eogclp1:	\n\
-	movl %0,%%eax	/ if (HTLPTR->contents == 0)	\n\
-	cmpw $0,(%%eax)	\n\
-	je nextentry		/ goto nextentry;	\n\
-	jmp retry	/ else goto retry;	\n\
-	.align 4	\n\
-	.align 4	\n\
-	\n\
-stknz:	\n\
-	movw (%%ecx),%%ax	/ if ((offset = ((struct htcoll *)link)->next_free))	\n\
-	testw %%ax,%%ax	\n\
-	je nextentry	\n\
-	movl %%ecx,%%esi	\n\
-	andl $65535,%%eax	\n\
-	jmp linkloop	\n\
-	.align 4	\n\
-	.align 4	\n\
-nocollision:	\n\
-	testw $65024,(%%ecx)	/ if (StkCntIsZero(HTLPTR->contents)) {	\n\
-	jne nextentry	\n\
-	movw (%%ecx),%%dx	/ptr = VAG2(HENTRY->segnum, (probe << 1));	\n\
-	sall $15,%%edx	\n\
-	andl $16711680,%%edx	\n\
-	leal (,%%edi,2),%%eax	\n\
-	orl %%eax,%%edx	\n\
-	movl %%edx,%2	\n\
-	movw $0,(%%ecx)	/ HTLPTR->contents = 0	\n\
-	.align 4	\n\
-	movl GcDisabled_word,%%ecx	\n\
-	movl MDStypetbl,%%ebx	\n\
-gclp2:	/ GcreclaimLp	\n\
-	pushl %2	\n\
-	call gcreccell	\n\
-	addl $4,%%esp	\n\
-	movl %%eax,%2	\n\
-	testl %%eax,%%eax	\n\
-	je nextentry	\n\
-	shrl $9,%%eax	\n\
-	leal 0(%%ebx,%%eax,2),%%eax	\n\
-	xorb $2,%%al	\n\
-	cmpw $0,(%%eax)	\n\
-	jl gclp2	\n\
-	cmpl $76,(%%ecx)	\n\
-	je gclp2	\n\
-	pushl $0	\n\
-	pushl %2	\n\
-	call rec_htfind	\n\
-	addl $8,%%esp	\n\
-	jmp gclp2	\n\
-	.align 4	\n\
-returNIL:	\n\
-    "
-      : "=g"(entry), "=g"(offset), "=g"(ptr)
-      :
-      : "ax", "dx", "cx", "bx", "si", "di");
-
-  return NIL;
-}
-#else

 LispPTR gcmapscan(void) {
  register GCENTRY probe;
@@ -342,7 +142,6 @@ nextentry:
  }
  return (NIL);
 }
-#endif /* GCC386 */

 LispPTR gcmapunscan(void) {
  register GCENTRY probe;
--- a/src/inet.c
+++ b/src/inet.c
@@ -49,9 +49,6 @@
 #include "commondefs.h"
 #include "mkcelldefs.h"

-#ifdef GCC386
-#include "inlnPS2.h"
-#endif

 #define TCPhostlookup 0
 #define TCPservicelookup 1
--- a/src/initdsp.c
+++ b/src/initdsp.c
@@ -18,20 +18,6 @@
 #include <stdio.h>
 #include <unistd.h>

-#ifdef SUNDISPLAY
-#ifndef NOPIXRECT
-#include <sunwindow/window_hs.h>
-#include <sunwindow/cms.h>
-#include <sunwindow/win_ioctl.h>
-#include <sys/ioctl.h>
-#include <sys/mman.h>
-#include <pixrect/pixrect_hs.h>
-#include <sun/fbio.h>
-#include <sys/ioctl.h>
-#include <sys/file.h>
-#include <pixrect/pr_planegroups.h>
-#endif /* NOPIXRECT */
-#endif /* SUNDISPLAY */

 #ifdef OS4
 #include <vfork.h>
@@ -76,21 +62,6 @@ extern DspInterface currentdsp;
 #define FBTYPE_SUNFAST_COLOR 12
 #endif

-#ifdef SUNDISPLAY
-struct screen LispScreen;
-#ifndef NOPIXRECT
-struct pixrect *CursorBitMap, *InvisibleCursorBitMap;
-struct pixrect *SrcePixRect, *DestPixRect;
-#ifdef DISPLAYBUFFER
-int black = 0, white = -1;
-struct pixrect *ColorDisplayPixrect, *DisplayRegionPixrect;
-#define COPY_PIXRECT_TO_COLOR (PIX_SRC /*| PIX_DONTCLIP */)
-#ifdef DEBUG
-int oldred[2], oldgreen[2], oldblue[2];
-#endif /* DEBUG */
-#endif /* DISPLAYBUFFER */
-#endif /* NOPIXRECT */
-#endif /* SUNDISPLAY */

 int LispWindowFd = -1;
 int FrameBufferFd = -1;
@@ -107,10 +78,6 @@ DLword *DisplayRegion68k_end_addr;
 /* some functions use this variable when undef DISPLAYBUFFER */
 DLword *DISP_MAX_Address;

-#ifdef SUNDISPLAY
-struct cursor CurrentCursor, InvisibleCursor;
-struct winlock DisplayLockArea;
-#endif /* SUNDISPLAY */

 extern DLword *EmCursorBitMap68K;
 extern IFPAGE *InterfacePage;
@@ -127,13 +94,6 @@ DLword *DisplayRegion68k_end_addr;
 extern int *Xdisplay; /* DAANGER -jarl nilsson 27-apr-92 */
 #endif                /* XWINDOW */

-#ifdef SUNDISPLAY
-/* For SunOS4.1 Window Security Feature. */
-int Win_security_p;
-#include <sys/wait.h>
-#define SV_ACQUIRE "/bin/sunview1/sv_acquire"
-#define SV_RELEASE "/bin/sunview1/sv_release"
-#endif /* SUNDISPLAY */

 /************************************************************************/
 /*									*/
@@ -144,30 +104,6 @@ int Win_security_p;
 /************************************************************************/

 void init_cursor() {
-#ifdef SUNDISPLAY
-#ifndef NOPIXRECT
-  CursorBitMap = mem_create(CURSORWIDTH, CURSORHEIGHT, 1);
-  mpr_mdlinebytes(CursorBitMap) = CURSORWIDTH >> 3; /* 2(byte) */
-#endif                                              /* NOPIXRECT */
-
-  CurrentCursor.cur_xhot = 0;
-  CurrentCursor.cur_yhot = 0;
-  CurrentCursor.cur_shape = CursorBitMap;
-  CurrentCursor.cur_function = PIX_SRC | PIX_DST;
-
-  /*  Invisible Cursor */
-
-#ifndef NOPIXRECT
-  InvisibleCursorBitMap = mem_create(0, 0, 1);
-#endif /* NOPIXRECT */
-
-  InvisibleCursor.cur_xhot = 0;
-  InvisibleCursor.cur_yhot = 0;
-  InvisibleCursor.cur_shape = InvisibleCursorBitMap;
-  InvisibleCursor.cur_function = /*PIX_SRC |*/ PIX_DST;
-  win_setcursor(LispWindowFd, &InvisibleCursor);
-  win_setmouseposition(LispWindowFd, 0, 0);
-#endif /* SUNDISPLAY */
 }

 /************************************************************************/
@@ -178,18 +114,6 @@ void init_cursor() {
 /*									*/
 /************************************************************************/
 void set_cursor() {
-#ifdef SUNDISPLAY
-#ifdef OLD_CURSOR
-  (mpr_d(CursorBitMap))->md_image = (short *)(IOPage->dlcursorbitmap);
-  /* BitmapBase of CurrentCursor
-   * is set to IOPage->dlcursorbitmap
-   */
-  if (win_setcursor(LispWindowFd, &CurrentCursor) == -1) perror("SET Cursor");
-  if (win_setmouseposition(LispWindowFd, 0, 0) == -1) perror("SET Mouse POS");
-#else
-  if (win_setcursor(LispWindowFd, &InvisibleCursor) == -1) perror("SET Cursor:");
-#endif
-#endif /* SUNDISPLAY */

 #ifdef XWINDOW
  Init_XCursor();
@@ -208,22 +132,6 @@ void set_cursor() {

 #ifndef COLOR
 void clear_display() {
-#ifdef SUNDISPLAY
-#ifndef DISPLAYBUFFER
-  register short *word;
-  register int w, h;
-  word = (short *)DisplayRegion68k;
-  for (h = displayheight; (h--);) {
-    for (w = DisplayRasterWidth; (w--);) { *word++ = 0; }
-  }
-#else
-  pr_rop(ColorDisplayPixrect, 0, 0, displaywidth, displayheight, PIX_CLR, ColorDisplayPixrect, 0,
-         0);
-/* Original images are still kept in SYSOUT(DisplayRegion)  */
-/*  clear_CG6; */
-#endif /* DISPLAYBUFFER */
-
-#endif /* SUNDISPLAY */

 #ifdef DOS
  TPRINT(("Enter Clear_display\n"));
@@ -261,82 +169,11 @@ void clear_display() {

 void init_display2(DLword *display_addr, int display_max)
 {
-#ifdef SUNDISPLAY
-#ifndef DISPLAYBUFFER
-  int mmapstat;
-#endif
-  int fbgattr_result;
-  struct fbtype my_screen;
-  char groups[PIXPG_OVERLAY + 1];
-  struct fbgattr FBattr;
-  struct pixrect *ColorFb;
-#endif /* SUNDISPLAY */

-#ifdef SUNDISPLAY

-  /* For SunOS4.1 Window Security Feature. */
-
-  union wait status;
-
-  /* Window Security is available? */
-  if (!access(SV_ACQUIRE, F_OK))
-    Win_security_p = 1;
-  else
-    Win_security_p = 0;
-
-  if (Win_security_p) {
-    switch (vfork()) {
-      case -1: /* Error */ (void)fprintf(stderr, "init_display: Fork failed.\n"); exit(1);
-
-      case 0: /* Child */
-        (void)execl(SV_ACQUIRE, "sv_acquire", "0", "256", "250", 0);
-        /* should not return */
-        (void)fprintf(stderr, "init_display: exec for sv_acquire failed\n");
-        exit(1);
-
-      default: /* Parent */
-        /* do nothing */
-        break;
-    }
-    (void)wait(&status); /* child dies after changing 6 */
-
-    if (status.w_retcode != 0) {
-      (void)fprintf(stderr, "init_display: failed to set ownership of win devices\n");
-      exit(1);
-    }
-  }
-
-#endif /* SUNDISPLAY */
-
-#ifdef SUNDISPLAY
-  if ((LispWindowFd = win_screennew(&LispScreen)) == -1) {
-    perror("init_display: can't create LispWindow\n");
-    exit(-1);
-  } else {
-#ifdef KBINT
-/* int_io_open(LispWindowFd);  JDS 4/27/94 move to initkbd, to try preventing the
- * move-mouse-never-get-kbd bug */
-#endif
-    fcntl(LispWindowFd, F_SETFL, fcntl(LispWindowFd, F_GETFL, 0) | O_NONBLOCK);
-  }
-#endif /* SUNDISPLAY */

  DisplayRegion68k = (DLword *)display_addr;

-#ifdef SUNDISPLAY
-  if ((FrameBufferFd = open(LispScreen.scr_fbname, 2)) == -1) {
-    perror("init_display: can't open FrameBuffer\n");
-    exit(-1);
-  }
-
-  /* initialize Display parameters */
-  if (ioctl(FrameBufferFd, FBIOGTYPE, &my_screen) == -1) {
-    perror("init_display: can't find screen parameters\n");
-    exit(-1);
-  }
-  displaywidth = my_screen.fb_width;
-  displayheight = my_screen.fb_height;
-#endif /* SUNDISPLAY */

 #if (defined(XWINDOW) || defined(DOS))
  (currentdsp->device.enter)(currentdsp);
@@ -351,146 +188,7 @@ void init_display2(DLword *display_addr, int display_max)
  DBPRINT(("FBIOGTYPE w x h = %d x %d\n", displaywidth, displayheight));

  DBPRINT(("FBIOGTYPE w x h = %d x %d\n", displaywidth, displayheight));
-#ifdef SUNDISPLAY
-  DBPRINT(("   (real) type  = %d\n", my_screen.fb_type));
-  DBPRINT(("   (real) bpp   = %d\n", my_screen.fb_depth));
-#endif /* SUNDISPLAY */

-#ifdef SUNDISPLAY
-  /** now attempt to use the FBIOGATTR call for more information **/
-
-  fbgattr_result = ioctl(FrameBufferFd, FBIOGATTR, &FBattr);
-  if (fbgattr_result >= 0) {
-    DBPRINT(("FBIOGATTR realtype = %d\n", FBattr.real_type));
-    DBPRINT(("   (real) size = %d x %d\n", FBattr.fbtype.fb_width, FBattr.fbtype.fb_height));
-    DBPRINT(("   (real) type = %d\n", FBattr.fbtype.fb_type));
-    DBPRINT(("   (real) bpp  = %d\n", FBattr.fbtype.fb_depth));
-    DBPRINT(("          emuls= %d %d %d %d\n", FBattr.emu_types[0], FBattr.emu_types[1],
-             FBattr.emu_types[2], FBattr.emu_types[3]));
-  } else { /* fill in defaults */
-    FBattr.real_type = my_screen.fb_type;
-  }
-  DBPRINT(("init_display: FBIOGATTR_result = %d\n", fbgattr_result));
-/* probe for DISPLAY type */
-/**********************************************************************
- *	         FB-TYPE       REAL-TYPE
- * 	BW2      2             x
- *	CG2      3             3
- *	CG3      8             6
- *	CG4      2             8
- *	CG6      8             12
- *	CG8      6             7
- *	CG9(GP1) 4             4    ;gpconfig -f -b
- *	CG9(GP1) 2            13    ;gpconfig gpone0 -f -b cgtwo0
- *	                            ;We assume This config for GXP model
- ***********************************************************************/
-/* Medley supports real (or emulated) BW2, so check for that first */
-#ifndef DISPLAYBUFFER
-
-  if ((my_screen.fb_type == FBTYPE_SUN2BW)        /* real or emulated bwtwo */
-      || (my_screen.fb_type == FBTYPE_SUN3COLOR)) /* Sun 3 color? */
-    switch (FBattr.real_type) {
-      case FBTYPE_SUN2BW: DisplayType = SUN2BW; break;
-
-      case FBTYPE_MEMCOLOR: /* memory 24-bit (CG8) */
-      {
-        DisplayType = SUNMEMCOLOR;
-        ColorFb = pr_open("/dev/fb");
-        pr_available_plane_groups(ColorFb, sizeof(groups), groups);
-        if (groups[PIXPG_OVERLAY] && groups[PIXPG_OVERLAY_ENABLE]) {
-          pr_set_plane_group(ColorFb, PIXPG_OVERLAY_ENABLE);
-          pr_rop(ColorFb, 0, 0, ColorFb->pr_width, ColorFb->pr_height, PIX_SET, 0, 0, 0);
-          pr_set_plane_group(ColorFb, PIXPG_OVERLAY);
-        }
-      } break;
-
-      case FBTYPE_SUN4COLOR:    /* cg4 */
-      case FBTYPE_SUNROP_COLOR: /* cg9(GXP) */
-      {                         /* need to clear overlay plane */
-        DisplayType = SUN4COLOR;
-        ColorFb = pr_open("/dev/fb");
-        pr_available_plane_groups(ColorFb, sizeof(groups), groups);
-        if (groups[PIXPG_OVERLAY] && groups[PIXPG_OVERLAY_ENABLE]) {
-          pr_set_plane_group(ColorFb, PIXPG_OVERLAY_ENABLE);
-          pr_rop(ColorFb, 0, 0, ColorFb->pr_width, ColorFb->pr_height, PIX_SET, 0, 0, 0);
-          pr_set_plane_group(ColorFb, PIXPG_OVERLAY);
-        }
-        break;
-      }
-
-      default:
-        printf("initdisplay: Unsupported FBreal_type %d\n", FBattr.real_type);
-        DisplayType = (my_screen.fb_type) << 3;
-        /* should be able to proceed, since its an emulated bwtwo */
-    }
-  else {                       /* not currently a SUN2BW, perhaps can emulate it? */
-    if (fbgattr_result >= 0) { /* got gattrs, can try sattr */
-#ifdef DEBUG
-      error("fb bwtwo emulation not implemented, q to proceed\n");
-#endif /* DEBUG */
-    } else {
-      error("Not cgfour or bwtwo, q to attempt to proceed");
-    }
-    printf("initdisplay: Unsupported FBreal_type %d\n", FBattr.real_type);
-    DisplayType = (my_screen.fb_type) << 3;
-    /* try to muddle on */
-  }
-#else /* DISPLAYBUFFER is defined, then: */
-  DisplayRegion68k_end_addr = DisplayRegion68k + DisplayRasterWidth * displayheight;
-  if (my_screen.fb_type == FBTYPE_SUN2BW) /* real or emulated bwtwo */
-    switch (FBattr.real_type) {
-      case FBTYPE_SUN4COLOR: { /* need to clear overlay plane */
-        DisplayType = SUN4COLOR;
-        ColorFb = pr_open("/dev/fb");
-        pr_available_plane_groups(ColorFb, sizeof(groups), groups);
-        if (groups[PIXPG_OVERLAY] && groups[PIXPG_OVERLAY_ENABLE]) {
-          pr_set_plane_group(ColorFb, PIXPG_OVERLAY_ENABLE);
-          pr_rop(ColorFb, 0, 0, ColorFb->pr_width, ColorFb->pr_height, PIX_CLR, 0, 0, 0);
-          pr_set_plane_group(ColorFb, PIXPG_8BIT_COLOR);
-        }
-        ColorDisplayPixrect = ColorFb;
-        break;
-      }
-
-      default: ColorDisplayPixrect = pr_open("/dev/fb"); break;
-    }
-
-  else if (my_screen.fb_type == FBTYPE_SUN4COLOR) { /* cg3 or cg6 */
-    switch (FBattr.real_type) {
-      case FBTYPE_SUN3COLOR: /* cg3 */
-                             /*	DisplayType = SUN3COLOR; */
-        DisplayType = (FBattr.real_type) << 3;
-        break;
-      case FBTYPE_SUNFAST_COLOR: /* cg6 */
-                                 /*	DisplayType = SUNFASTCOLOR; */
-        DisplayType = (FBattr.real_type) << 3;
-        break;
-      default: /* unknown display */ DisplayType = (FBattr.real_type) << 3; break;
-    } /* end switch */
-    ColorDisplayPixrect = pr_open("/dev/fb");
-  } /* end else if() */
-
-  else
-    ColorDisplayPixrect = pr_open("/dev/fb");
-  DisplayRegionPixrect = mem_point(displaywidth, displayheight, 1, display_addr);
-
-#ifdef DEBUG
-  pr_getcolormap(ColorDisplayPixrect, 0, 2, oldred, oldgreen, oldblue);
-#endif /* DEBUG */
-  DBPRINT(("Color map for color pixrect:\n  0:  R: %d, G: %d, B: %d\n  1:  R: %d, G: %d, B: %d\n",
-           oldred[0], oldgreen[0], oldblue[0], oldred[1], oldgreen[1], oldblue[1]));
-  DBPRINT(("Color depth = %d.\n", ColorDisplayPixrect->pr_depth));
-  pr_putcolormap(ColorDisplayPixrect, 1, 1, &black, &black, &black);
-  pr_putcolormap(ColorDisplayPixrect, 0, 1, &white, &white, &white);
-  pr_putcolormap(ColorDisplayPixrect, 255, 1, &black, &black, &black);
-  pr_putcolormap(ColorDisplayPixrect, (1 << ColorDisplayPixrect->pr_depth) - 1, 1, &black, &black,
-                 &black);
-#endif
-
-  DisplayLockArea.wl_rect.r_width = displaywidth;
-  DisplayLockArea.wl_rect.r_height = displayheight;
-
-#endif /* SUNDISPLAY */

 #ifdef XWINDOW
  DisplayType = SUN2BW;
@@ -504,25 +202,6 @@ void init_display2(DLword *display_addr, int display_max)
  DBPRINT(("        length : 0x%x\n", DisplayByteSize));
  DBPRINT(("        pg size: 0x%x\n", getpagesize()));

-#ifdef SUNDISPLAY
-#ifndef DISPLAYBUFFER
-  mmapstat = (int)mmap(DisplayRegion68k, DisplayByteSize, PROT_READ | PROT_WRITE,
-#ifdef OS4
-                       MAP_FIXED |
-#endif
-                           MAP_SHARED,
-                       FrameBufferFd, 0);
-
-  DBPRINT(("after mmap: 0x%x\n", mmapstat));
-
-  if (mmapstat == -1) {
-    perror("init_display: ERROR at mmap system call\n");
-    exit(0);
-  }
-#endif /* ifndef DISPLAYBUFFER */
-
-  DBPRINT(("after mem_point\n"));
-#endif /* SUNDISPLAY */

 #ifdef DOS
  (currentdsp->cleardisplay)(currentdsp);
@@ -532,11 +211,6 @@ void init_display2(DLword *display_addr, int display_max)

  DBPRINT(("after clear_display()\n"));

-#if defined(SUNDISPLAY) && !defined(NOPIXRECT)
-  /* initialize pixrect used in pilotbitblt */
-  SrcePixRect = mem_point(0, 0, 1, NULL);
-  DestPixRect = mem_point(0, 0, 1, NULL);
-#endif

  DBPRINT(("exiting init_display\n"));
 }
@@ -549,45 +223,12 @@ void init_display2(DLword *display_addr, int display_max)
 /*									*/
 /************************************************************************/
 void display_before_exit() {
-#ifdef SUNDISPLAY
-  union wait status;
-#endif /* SUNDISPLAY */

 #ifdef TRUECOLOR
  truecolor_before_exit();
 #endif /* TRUECOLOR */

  clear_display();
-#ifdef SUNDISPLAY
-  /*    win_remove( LispWindowFd ); */
-  win_screendestroy(LispWindowFd);
-#ifdef KBINT
-  int_io_close(LispWindowFd);
-#endif
-  close(LispWindowFd);
-
-  if (Win_security_p) {
-    switch (vfork()) {
-      case -1: /* Error */ (void)fprintf(stderr, "display_before_exit: Fork failed.\n"); exit(1);
-
-      case 0: /* Child */
-        (void)execl(SV_RELEASE, "sv_release", 0);
-        /* should not return */
-        (void)fprintf(stderr, "display_before_exit: exec for sv_release failed\n");
-        exit(1);
-
-      default: /* Parent */
-        /* do nothing */
-        break;
-    }
-    (void)wait(&status);
-    if (status.w_retcode != 0) {
-      (void)fprintf(stderr, "display_before_raid: failed to set ownership of win devices\n");
-      exit(1);
-    }
-  }
-
-#endif /* SUNDISPLAY */

 #if defined(XWINDOW) || defined(DOS)
  (currentdsp->device.exit)(currentdsp);
@@ -625,12 +266,6 @@ in_display_segment(baseaddr)
 /************************************************************************/

 void flush_display_buffer() {
-#ifdef SUNDISPLAY
-#ifdef DISPLAYBUFFER
-  pr_rop(ColorDisplayPixrect, 0, 0, displaywidth, displayheight, COPY_PIXRECT_TO_COLOR,
-         DisplayRegionPixrect, 0, 0);
-#endif /* DISPLAYBUFFER */
-#endif /* SUNDISPLAY */

 #ifdef XWINDOW
  (currentdsp->bitblt_to_screen)(currentdsp, DisplayRegion68k, currentdsp->Visible.x,
@@ -662,13 +297,6 @@ void flush_display_buffer() {

 void flush_display_region(int x, int y, int w, int h)
 {
-#ifdef SUNDISPLAY
-#ifdef DISPLAYBUFFER
-
-  pr_rop(ColorDisplayPixrect, x, y, w, h, COPY_PIXRECT_TO_COLOR, DisplayRegionPixrect, x, y);
-#endif /* DISPLAYBUFFER */
-
-#endif /* SUNDISPLAY */

 #if (defined(XWINDOW) || defined(DOS))
  TPRINT(("Enter flush_display_region x=%d, y=%d, w=%d, h=%d\n", x, y, w, h));
@@ -712,13 +340,6 @@ void flush_display_lineregion(UNSIGNED x, DLword *ybase, UNSIGNED w, UNSIGNED h)
 {
  int y;
  y = ((DLword *)ybase - DisplayRegion68k) / DLWORD_PERLINE;
-#ifdef SUNDISPLAY
-#ifdef DISPLAYBUFFER
-
-  pr_rop(ColorDisplayPixrect, x, y, w, h, COPY_PIXRECT_TO_COLOR, DisplayRegionPixrect, x, y);
-#endif /* DISPLAYBUFFER */
-
-#endif /* SUNDISPLAY */

 #if (defined(XWINDOW) || defined(DOS))
  TPRINT(("Enter flush_display_lineregion x=%d, y=%d, w=%d, h=%d\n", x, y, w, h));
@@ -751,9 +372,7 @@ void flush_display_ptrregion(DLword *ybase, UNSIGNED bitoffset, UNSIGNED w, UNSI
  y = baseoffset / DLWORD_PERLINE;
  x = bitoffset + (BITSPERWORD * (baseoffset - (DLWORD_PERLINE * y)));

-#if (defined(SUNDISPLAY) && defined(DISPLAYBUFFER))
-  pr_rop(ColorDisplayPixrect, x, y, w, h, COPY_PIXRECT_TO_COLOR, DisplayRegionPixrect, x, y);
-#elif (defined(XWINDOW) || defined(DOS))
+#if   (defined(XWINDOW) || defined(DOS))
  TPRINT(("Enter flush_display_ptrregion\n x=%d, y=%d, w=%d, h=%d\n", x, y, w, h));
  (currentdsp->bitblt_to_screen)(currentdsp, DisplayRegion68k, x, y, w, h);
  TPRINT(("Exit flush_display_ptrregion\n"));
--- a/src/initkbd.c
+++ b/src/initkbd.c
@@ -31,15 +31,6 @@
 #include <stk.h>
 #endif /* DOS */

-#ifdef SUNDISPLAY
-#include <sundev/kbd.h>
-#include <sundev/kbio.h>
-#include <sunwindow/window_hs.h>
-#include <sunwindow/cms.h>
-#include <sys/ioctl.h>
-#include <sunwindow/win_ioctl.h>
-#include <pixrect/pixrect_hs.h>
-#endif /* SUNDISPLAY */

 #ifdef XWINDOW
 #include <X11/Xlib.h>
@@ -76,9 +67,6 @@ extern MouseInterface currentmouse;
 extern KbdInterface currentkbd;
 extern DspInterface currentdsp;
 #endif /* DOS */
-#ifdef SUNDISPLAY
-extern struct screen LispScreen;
-#endif /* SUNDISPLAY */

 extern int LispWindowFd;
 int LispKbdFd = -1;
@@ -88,9 +76,6 @@ int DebugKBD = NIL;
 FILE *KBlog;

 extern fd_set LispReadFds;
-#ifdef SUNDISPLAY
-struct inputmask LispEventMask;
-#endif /* SUNDISPLAY */

 IOPAGE *IOPage68K;

@@ -214,33 +199,13 @@ u_char DOSLispKeyMap_101[0x80] = {

 void init_keyboard(int flg) /* if 0 init else re-init */
 {
-#ifdef SUNDISPLAY
-  int keytrans;
-#endif

  set_kbd_iopointers();

-#ifdef SUNDISPLAY
-  if ((LispKbdFd = open(LispScreen.scr_kbdname, O_RDWR)) == -1) {
-    fprintf(stderr, "can't open %s\n", LispScreen.scr_kbdname);
-    exit(-1);
-  }
-#endif /* SUNDISPLAY */

  if (flg == 0) { keyboardtype(LispKbdFd); }

-#ifdef SUNDISPLAY
-  keytrans = TR_UNTRANS_EVENT; /* keyboard does not encode key */
-  if (ioctl(LispKbdFd, KIOCTRANS, &keytrans) == -1) {
-    fprintf(stderr, "Error at ioctl errno =%d\n", errno);
-    exit(-1);
-  }
-  close(LispKbdFd);
-#ifdef KBINT
-  int_io_open(LispWindowFd); /* from init_dsp, try to prevent mouse-move-no-kbd bug */
-#endif                       /*  KBINT */
-  seteventmask(&LispEventMask);
-#elif XWINDOW
+#if   XWINDOW
  init_Xevent(currentdsp);

 #elif DOS
@@ -262,22 +227,7 @@ void init_keyboard(int flg) /* if 0 init else re-init */
 /*  ----------------------------------------------------------------*/

 void device_before_exit() {
-#ifdef SUNDISPLAY
-  int keytrans;
-
-  if ((LispKbdFd = open(LispScreen.scr_kbdname, O_RDWR)) == -1) {
-    fprintf(stderr, "can't open %s\n", LispScreen.scr_kbdname);
-    exit(-1);
-  }
-
-  keytrans = TR_EVENT; /* keyboard encodes key */
-  if (ioctl(LispKbdFd, KIOCTRANS, &keytrans) == -1) {
-    fprintf(stderr, "Error at ioctl errno =%d\n", errno);
-    exit(-1);
-  }
-  close(LispKbdFd);
-
-#elif DOS
+#if   DOS
  (currentmouse->device.exit)(currentmouse, currentdsp);
  (currentkbd->device.exit)(currentkbd);
 #endif /* SUNDISPLAY DOS*/
@@ -315,24 +265,6 @@ void set_kbd_iopointers() {

 /*  ----------------------------------------------------------------*/

-#ifdef SUNDISPLAY
-void seteventmask(struct inputmask *eventmask)
-{
-  input_imnull(eventmask);
-  eventmask->im_flags |= IM_ASCII | IM_NEGASCII | IM_NEGEVENT;
-
-  win_setinputcodebit(eventmask, MS_LEFT);
-  win_setinputcodebit(eventmask, MS_MIDDLE);
-  win_setinputcodebit(eventmask, MS_RIGHT);
-  win_setinputcodebit(eventmask, LOC_MOVE);
-  win_unsetinputcodebit(eventmask, LOC_STILL);
-  win_unsetinputcodebit(eventmask, LOC_MOVEWHILEBUTDOWN);
-  win_unsetinputcodebit(eventmask, LOC_WINENTER);
-  win_unsetinputcodebit(eventmask, LOC_WINEXIT);
-
-  win_setinputmask(LispWindowFd, eventmask, eventmask, WIN_NULLLINK);
-}
-#endif /* SUNDISPLAY */

 #define MIN_KEYTYPE 3
 #define KB_AS3000J (7 + MIN_KEYTYPE)
@@ -411,7 +343,7 @@ static u_char *make_X_keymap() {
  XDisplayKeycodes(currentdsp->display_id, &minkey, &maxkey);
  codecount = maxkey + 1 - minkey;
  mapping = XGetKeyboardMapping(currentdsp->display_id, minkey, codecount, &symspercode);
-  XUNLOCK;
+  XUNLOCK(currentdsp);

  for (; *key_sym_pairs != -1;) {
    int reusable = *key_sym_pairs++, code = *key_sym_pairs++, sym = *key_sym_pairs++, xcode;
@@ -500,11 +432,6 @@ void keyboardtype(int fd)
    type = KB_X;
 #elif DOS
    type = KB_DOS;
-#elif SUNDISPLAY
-    if (ioctl(fd, KIOCTYPE, &type) != 0) {
-      error("keyboardtype:IOCTL(KIOCTYPE) fails (cont. w. type-3");
-      type = KB_SUN3;
-    } /* otherwise, type is set */
 #endif /* XWINDOW */
  } /* if end */
  else {
--- a/src/initsout.c
+++ b/src/initsout.c
@@ -20,6 +20,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <time.h>
 #include <unistd.h>

 #ifndef DOS
--- a/src/kbdsubrs.c
+++ b/src/kbdsubrs.c
@@ -22,11 +22,6 @@
 #include <sys/select.h>
 #endif /* DOS */

-#ifdef SUNDISPLAY
-#include <sundev/kbd.h>
-#include <sundev/kbio.h>
-#include <sunwindow/window_hs.h>
-#endif /* SUNDISPLAY */

 #include "lispemul.h"

@@ -55,9 +50,6 @@ extern DspInterface currentdsp;
 *
 ****************************************************/

-#ifdef SUNDISPLAY
-extern struct screen LispScreen;
-#endif /* SUNDISPLAY */

 #ifdef XWINDOW
 #include <X11/Xlib.h>
@@ -72,17 +64,13 @@ void KB_enable(LispPTR *args) /* args[0] :	ON/OFF flag
                                     */
 {
  if (args[0] == ATOM_T) {
-#ifdef SUNDISPLAY
-    FD_SET(LispWindowFd, &LispReadFds);
-#elif XWINDOW
+#if   XWINDOW
    enable_Xkeyboard(currentdsp);
 #elif DOS
    (currentkbd->device.enter)(currentkbd);
 #endif /* DOS */
  } else if (args[0] == NIL) {
-#ifdef SUNDISPLAY
-    FD_CLR(LispWindowFd, &LispReadFds);
-#elif XWINDOW
+#if   XWINDOW
    disable_Xkeyboard(currentdsp);
 #elif DOS
    (currentkbd->device.exit)(currentkbd);
@@ -116,28 +104,7 @@ void KB_beep(LispPTR *args) /* args[0] :	ON/OFF flag
                                   * args[1] :	frequency
                                   */
 {
-#ifdef SUNDISPLAY
-  int keycommand;
-
-  /*	belltime.tv_usec = args[1] & 0xffff;
-          win_bell(LispWindowFd, belltime, 0);
-  */
-  if ((LispKbdFd = open(LispScreen.scr_kbdname, O_RDWR)) == -1)
-    fprintf(stderr, "can't open %s, errno=%d\n", LispScreen.scr_kbdname, errno);
-
-  if (args[0] == ATOM_T) {
-    keycommand = KBD_CMD_BELL; /* Turn on the bell */
-    if (ioctl(LispKbdFd, KIOCCMD, &keycommand) == -1)
-      fprintf(stderr, "Error at ioctl errno =%d\n", errno);
-  } else {
-    keycommand = KBD_CMD_NOBELL; /* Turn off the bell */
-    if (ioctl(LispKbdFd, KIOCCMD, &keycommand) == -1)
-      fprintf(stderr, "Error at ioctl errno =%d\n", errno);
-  }
-
-  close(LispKbdFd);
-
-#elif XWINDOW
+#if   XWINDOW
  if (args[0] == ATOM_T) beep_Xkeyboard(currentdsp);
 #elif DOS
  if (args[0] == ATOM_T) {
--- a/src/keyevent.c
+++ b/src/keyevent.c
@@ -38,12 +38,6 @@
 void Mouse_hndlr(void); /* Fields mouse events from driver        */
                        /*  (during servicing of mouse interrupt) */

-#elif SUNDISPLAY
-#include <sunwindow/window_hs.h>
-#include <sunwindow/win_ioctl.h>
-#include <suntool/window.h>
-#include <ctype.h>
-#include <sundev/kbio.h>
 #endif /* DOS */

 #include "lispemul.h"
@@ -121,10 +115,11 @@ extern DLword *EmMouseX68K, *EmMouseY68K, *EmKbdAd068K, *EmRealUtilin68K, *EmUti
 extern DLword *EmKbdAd168K, *EmKbdAd268K, *EmKbdAd368K, *EmKbdAd468K, *EmKbdAd568K;
 extern u_char *SUNLispKeyMap;
 extern int LispWindowFd;
-extern int RS232C_Fd, RS232C_remain_data, XLocked;
+extern int RS232C_Fd, RS232C_remain_data;
 extern fd_set LispIOFds;
 fd_set LispReadFds;
-int XNeedSignal = 0; /* T if an X interrupt happened while XLOCK asserted */
+extern volatile sig_atomic_t XLocked;
+extern volatile sig_atomic_t XNeedSignal;

 extern int LogFileFd;

@@ -138,10 +133,6 @@ extern DLword *DisplayRegion68k;
 static struct timeval SelectTimeout = {0, 0};
 #endif /* DOS */

-#ifdef XWINDOW
-extern volatile sig_atomic_t Event_Req;
-#endif /* XWINDOW */
-
 extern MISCSTATS *MiscStats;
 LispPTR *LASTUSERACTION68k;
 LispPTR *CLastUserActionCell68k;
@@ -178,25 +169,6 @@ typedef struct {
 /*  EmXXXX68K are already swapped, no need for GETWORD */


-#ifdef SUNDISPLAY
-#ifdef OLD_CURSOR
-#define TrackCursor(cx, cy)                          \
-  {                                                  \
-    *CLastUserActionCell68k = MiscStats->secondstmp; \
-    *EmCursorX68K = cx;                              \
-    *EmCursorY68K = cy;                              \
-  }
-#else
-#define TrackCursor(cx, cy)                          \
-  {                                                  \
-    *CLastUserActionCell68k = MiscStats->secondstmp; \
-    taking_mouse_down();                             \
-    taking_mouse_up(cx, cy);                         \
-    *EmCursorX68K = cx;                              \
-    *EmCursorY68K = cy;                              \
-  }
-#endif /* OLD_CURSOR */
-#endif /* SUNDISPLAY */

 /* commented out is some code that would also clobber
        Irq_Stk_Check & Irq_Stk_End to force
@@ -211,7 +183,7 @@ LispPTR *MOUSECHORDTICKS68k;
 /**NEW GLOBAL***-> will be moved***/
 LispPTR *KEYBOARDEVENTQUEUE68k;
 LispPTR *KEYBUFFERING68k;
-int KBDEventFlg = NIL;
+int KBDEventFlg = 0;
 DLword *CTopKeyevent;

 LispPTR DOBUFFEREDTRANSITION_index;
@@ -237,20 +209,12 @@ DLword ColorCursor_savebitmap[CURSORWIDTH / COLORPIXELS_IN_DLWORD * CURSORHEIGHT

 /************************************************************************/
 /*									*/
-/*			G E T S I G N A L D A T A			*/
-/*									*/
-/*	Handler for the SIGIO interrupt, which happens			*/
-/*		1. When a key transition happens			*/
-/*		2. On mouse moves					*/
-/*		3. When TCP input becomes available.			*/
-/*		4. When a NIT ethernet packet becomes available.	*/
-/*		5. When a console/log/stderr msg needs to be printed.	*/
-/*									*/
-/*									*/
-/*									*/
-/*									*/
-/*									*/
+/*			p r o c e s s _ i o _ e v e n t s		*/
 /*									*/
+/*	Periodically, or After a SIGIO interrupt which happens		*/
+/*		1. When TCP input becomes available.			*/
+/*		2. When a NIT ethernet packet becomes available.	*/
+/*		3. When a console/log/stderr msg needs to be printed.	*/
 /*									*/
 /*									*/
 /*	Statics:  LispReadFds	A 32-bit vector with a 1 for each	*/
@@ -280,65 +244,16 @@ DLword ColorCursor_savebitmap[CURSORWIDTH / COLORPIXELS_IN_DLWORD * CURSORHEIGHT
 /*									*/
 /************************************************************************/

-void getsignaldata(int sig)
+void process_io_events()
 {
 #ifndef DOS
-#ifdef SUNDISPLAY
-  struct inputevent event;
-#endif /* SUNDISPLAY */
-  fd_set rfds, efds;
+  fd_set rfds;
  u_int iflags;
  int i;

-#ifdef XWINDOW
-#if defined(sun)
-  if (Event_Req) {
-    if (!XLocked++)
-      getXsignaldata(currentdsp);
-    else
-      XNeedSignal = 1;
-    Event_Req = FALSE;
-    XLocked--;
-  }
-#endif
-#endif /* XWINDOW */
-
-  /* #ifndef KBINT */
-  /* FD_COPY would be preferred but uses deprecated bcopy() on macOS.  Why? */
  memcpy(&rfds, &LispReadFds, sizeof(rfds));
-  memcpy(&efds, &LispReadFds, sizeof(efds));

-/* label and ifs not needed if only keyboard on SIGIO */
-getmore:
-  if (select(32, &rfds, NULL, &efds, &SelectTimeout) >= 0)
-  {
-      /* need to print out fd sets...
-    DBPRINT(("SIGIO: fd mask(r/e) = 0x%x/0x%x.\n", rfds, efds));
-      */
-
-#ifdef SUNDISPLAY
-    if (LispWindowFd >= 0 && FD_ISSET(LispWindowFd, &rfds)) {
-      /* #endif */
-      while (input_readevent(LispWindowFd, &event) >= 0) {
-        /*if(!kb_event( &event )) {goto getmore;};*/
-        if ((KBDEventFlg += kb_event(&event)) > 0) {
-          /* immediately request for IRQ check */
-          Irq_Stk_End = Irq_Stk_Check = 0;
-        }
-      }
-      /* #ifndef KBINT */
-    }
-#endif /* SUNDISPLAY */
-
-#ifdef XWINDOW
-    if (FD_ISSET(ConnectionNumber(currentdsp->display_id), &rfds)) {
-      if (!XLocked)
-        getXsignaldata(currentdsp);
-      else
-        XNeedSignal = 1;
-    }
-
-#endif /* XWINDOW */
+  if (select(32, &rfds, NULL, NULL, &SelectTimeout) > 0) {

 #ifdef MAIKO_ENABLE_ETHERNET
    if (ether_fd >= 0 && FD_ISSET(ether_fd, &rfds)) { /* Raw ethernet (NIT) I/O happened, so handle it. */
@@ -378,134 +293,8 @@ getmore:
  }
 /* #endif */
 #endif /* DOS */
-} /* end getsignaldata */
+} /* end process_io_events */

-#ifdef SUNDISPLAY
-/************************************************************************/
-/*									*/
-/*			    k b _ e v e n t				*/
-/*									*/
-/*	Given an event from the kbd code, return 1 if a key transition	*/
-/*	occurred, 0 if one didn't occur.				*/
-/*									*/
-/************************************************************************/
-extern int for_makeinit;
-
-int kb_event(struct inputevent *event);
-{
-  register u_int upflg;
-  int kn;
-  DLword w, r;
-  KBEVENT *kbevent;
-
-#ifdef INIT
-
-  /* generate some code to check if we are running as an INIT.  Don't
-     needlessly generate this code, and don't return if we aren't
-     running with the -INIT flag turned on.  --was 2/7/89 */
-
-  if (for_makeinit) { return (0); };
-
-#endif
-
-  upflg = event_is_up(event);
-
-#ifdef SHOWKEYSTROKES
-  printf("Key # %d, upflg %d.\n", (unsigned short)event->ie_code, upflg);
-#endif
-
-  switch (((unsigned short)event->ie_code)) {
-    case LOC_MOVE:
-#ifndef OLD_CURSOR
-      if (!ScreenLocked)
-#endif
-      {
-        ScreenLocked = T;
-        MouseMove(event->ie_locx, event->ie_locy);
-        TrackCursor(event->ie_locx, event->ie_locy);
-        ScreenLocked = NIL;
-      }
-      return (0);
-
-    case MS_LEFT: /*mouse_button( MOUSE_LEFT, upflg );*/
-      PUTBASEBIT68K(EmRealUtilin68K, MOUSE_LEFT, upflg);
-      break;
-
-    case MS_MIDDLE: /*mouse_button( MOUSE_MIDDLE, upflg );*/
-      PUTBASEBIT68K(EmRealUtilin68K, MOUSE_MIDDLE, upflg);
-      break;
-
-    case MS_RIGHT: /*mouse_button( MOUSE_RIGHT, upflg );*/
-      PUTBASEBIT68K(EmRealUtilin68K, MOUSE_RIGHT, upflg);
-      break;
-
-    default: /* keystroke */
-      if ((kn = SUNLispKeyMap[((unsigned short)event->ie_code)]) < 255)
-        kb_trans(kn, upflg);
-      else
-        printf("kb_event: unknown key number=%d\n", event->ie_code);
-
-      break;
-  };
-  {
-  do_ring:
-    /* Emxxx do not use GETWORD */
-    if (((*EmKbdAd268K) & 2113) == 0) { /*Ctrl-shift-NEXT*/
-      error("******  EMERGENCY Interrupt ******");
-      (*EmKbdAd268K) = KB_ALLUP;        /*reset*/
-      ((RING *)CTopKeyevent)->read = 0; /* reset queue */
-      ((RING *)CTopKeyevent)->write = MINKEYEVENT;
-      /*return(0);*/
-    } else if (((*EmKbdAd268K) & 2114) == 0) { /* Ctrl-Shift-DEL */
-      (*EmKbdAd268K) = KB_ALLUP;               /*reset*/
-      URaid_req = T;
-      ((RING *)CTopKeyevent)->read = 0; /* reset queue */
-      ((RING *)CTopKeyevent)->write = MINKEYEVENT;
-
-      /*return(0);*/
-    }
-
-#ifdef OS4_TYPE4BUG
-    else if (((*EmKbdAd268K) & 2120) == 0) { /* Ctrl-Shift-Return */
-      error("******  EMERGENCY Interrupt ******");
-      (*EmKbdAd268K) = KB_ALLUP;        /*reset*/
-      ((RING *)CTopKeyevent)->read = 0; /* reset queue */
-      ((RING *)CTopKeyevent)->write = MINKEYEVENT;
-      /*return(0);*/
-    }
-#endif
-
-    r = RING_READ(CTopKeyevent);
-    w = RING_WRITE(CTopKeyevent);
-
-    if (r == w) goto KBnext; /* event queue FULL */
-
-    kbevent = (KBEVENT *)(CTopKeyevent + w);
-
-    /*	RCLK(kbevent->time); */
-
-    kbevent->W0 = (*EmKbdAd068K); /* Emxxxx do not use GETWORD */
-    kbevent->W1 = (*EmKbdAd168K);
-    kbevent->W2 = (*EmKbdAd268K);
-    kbevent->W3 = (*EmKbdAd368K);
-    kbevent->W4 = (*EmKbdAd468K);
-    kbevent->W5 = (*EmKbdAd568K);
-    kbevent->WU = (*EmRealUtilin68K);
-
-    if (r == 0) /* Queue was empty */
-      ((RING *)CTopKeyevent)->read = w;
-    if (w >= MAXKEYEVENT)
-      ((RING *)CTopKeyevent)->write = MINKEYEVENT;
-    else
-      ((RING *)CTopKeyevent)->write = w + KEYEVENTSIZE;
-
-  KBnext:
-    if (*KEYBUFFERING68k == NIL) *KEYBUFFERING68k = ATOM_T;
-
-  } /* if *EmRealUtilin68K end */
-  return (1);
-}
-#endif /* SUNDISPLAY */

 /************************************************************************/
 /*									*/
--- a/src/ldeboot.c
+++ b/src/ldeboot.c
@@ -105,7 +105,7 @@ int main(int argc, char *argv[])

      /* JRB - call fork_Unix here, while we're REALLY small, unless -NF is
              specified, of course... */
-      for (i = 0; i < argc; i++)
+      for (i = 1; i < argc; i++)
        if (!strcmp(argv[i], "-NF")) break;
      if (i == argc) /* -NF not in arguments */
        fork_Unix();
@@ -181,7 +181,7 @@ int main(int argc, char *argv[])

  /* JRB - call fork_Unix here, while we're REALLY small, unless -NF is
          specified, of course... */
-  for (i = 0; i < argc; i++)
+  for (i = 1; i < argc; i++)
    if (!strcmp(argv[i], "-NF")) break;
  if (i == argc) /* -NF not in arguments */
    fork_Unix();
--- a/src/ldsout.c
+++ b/src/ldsout.c
@@ -30,9 +30,6 @@
 #include "byteswapdefs.h"
 #include "initdspdefs.h"

-#ifdef GCC386
-#include "inlnPS2.h"
-#endif /* GCC386 */

 #define IFPAGE_ADDRESS 512
 #define DEFAULT_MAX_SYSOUTSIZE 64 /* in Mbyte */
--- a/src/llcolor.c
+++ b/src/llcolor.c
@@ -12,15 +12,6 @@

 #include <stdio.h>

-#if defined(COLOR) && !defined(NOPIXRECT)
-#include <sunwindow/window_hs.h>
-#include <sunwindow/cms.h>
-#include <sunwindow/win_ioctl.h>
-#include <pixrect/pixrect_hs.h>
-#include <sun/fbio.h>
-#include <pixrect/pr_planegroups.h>
-#include <sys/mman.h>
-#endif /* COLOR && !NOPIXRECT */

 #include <sys/ioctl.h>
 #include <sys/types.h>
--- a/src/llstk.c
+++ b/src/llstk.c
@@ -482,9 +482,6 @@ extern struct cursor CurrentCursor;
 void flip_cursorbar(int n)
 {
  GETWORD(EmCursorBitMap68K + n) = ~(GETWORD(EmCursorBitMap68K + n));
-#ifdef SUNDISPLAY
-  win_setcursor(LispWindowFd, &CurrentCursor);
-#endif /* SUNDISPLAY */

 #ifdef XWINDOW
  /* JDS 011213 When using current_hot_y, remember fn does 15-it! */
--- a/src/main.c
+++ b/src/main.c
@@ -517,9 +517,6 @@ int main(int argc, char *argv[])

  /* Get OS message to ~/lisp.log and print the message to prompt window */
  if (!for_makeinit) {
-#ifdef SUNDISPLAY
-    mess_init();
-#endif /* SUNDISPLAY */

    init_keyboard(0); /* can't turn on the keyboard yet or you will die
                         in makeinit.  Pilotbitblt will turn it on if
--- a/src/misc7.c
+++ b/src/misc7.c
@@ -32,15 +32,6 @@
 #include "bbtsubdefs.h"
 #include "initdspdefs.h"

-#ifdef SUNDISPLAY
-#include <sunwindow/window_hs.h>
-#include <sunwindow/win_ioctl.h>
-
-#include <suntool/sunview.h>
-#include <signal.h>
-#include <sunwindow/cms_mono.h>
-#include <suntool/canvas.h>
-#endif

 /*************************************************/
 /*  Possible operation fields for FBITMAPBIT     */
@@ -78,9 +69,6 @@ LispPTR N_OP_misc7(LispPTR arg1, LispPTR arg2, LispPTR arg3, LispPTR arg4, LispP
  DBPRINT(("MISC7 args OK.\n"));

  displayflg = n_new_cursorin(base, x, (heightminus1 - y), 1, 1);
-#ifdef SUNDISPLAY
-  if (displayflg) HideCursor;
-#endif /* SUNDISPLAY */

 /* Bitmaps use a positive integer coordinate system with the lower left
   corner pixel at coordinate (0, 0). Storage is allocated in 16-bit words
@@ -100,15 +88,6 @@ LispPTR N_OP_misc7(LispPTR arg1, LispPTR arg2, LispPTR arg3, LispPTR arg4, LispP
  default: GETWORDBASEWORD(base, offset) = bmdata | bmmask;
  };

-#ifdef SUNDISPLAY
-#ifdef DISPLAYBUFFER
-  if (in_display_segment(base)) {
-    /* NB: base + offset doesn't need WORDPTR() wrapper */
-    flush_display_ptrregion(base + offset, 0, 16, 1);
-  }
-#endif
-  if (displayflg) ShowCursor;
-#endif /* SUNDISPLAY */

 #ifdef XWINDOW
  if (in_display_segment(base)) {
--- a/src/mkcell.c
+++ b/src/mkcell.c
@@ -41,6 +41,9 @@
 #include "allocmdsdefs.h"
 #include "commondefs.h"
 #include "gchtfinddefs.h"
+#ifdef DTDDEBUG
+#include "testtooldefs.h"
+#endif

 static LispPTR oldoldfree;
 static LispPTR oldfree;
@@ -155,45 +158,3 @@ retry:
  }

 } /* createcell68k end */
-
-/**********************************************************/
-/*  Create a Cell of Specified Type & Set to given Value  */
-/*  Works with 32 bit typed values only.                  */
-/*  (Initially used only by native code)                  */
-/**********************************************************/
-
-LispPTR Create_n_Set_Cell(unsigned int type, LispPTR value) {
-  register struct dtd *dtd68k;
-  register DLword *ptr, *lastptr;
-  register LispPTR newcell;
-
-  dtd68k = (struct dtd *)GetDTD(type);
-
-  if (dtd68k->dtd_size == 0) error("createcell : Attempt to create a cell not declared yet");
-
-retry:
-  if ((newcell = (dtd68k->dtd_free & POINTERMASK)) != NIL) {
-    ptr = Addr68k_from_LADDR(newcell);
-
-    /* replace dtd_free with newcell's top DLword (it may keep next chain)*/
-
-    dtd68k->dtd_free = (*((LispPTR *)ptr)) & POINTERMASK;
-    dtd68k->dtd_oldcnt++;
-    if (dtd68k->dtd_free & 0x8000000) error("bad entry on free chain.");
-
-    /* clear 0  */
-    for (lastptr = ptr + dtd68k->dtd_size; ptr != lastptr; ptr++) { GETWORD(ptr) = 0; }
-
-    /*	IncAllocCnt(1); */
-    GCLOOKUP(newcell, DELREF);
-    (*((LispPTR *)Addr68k_from_LADDR(newcell))) = value;
-    return (newcell);
-
-  } else {
-    dtd68k->dtd_free = initmdspage(alloc_mdspage(dtd68k->dtd_typeentry), dtd68k->dtd_size, NIL);
-    if (dtd68k->dtd_free & 0x8000000) error("bad entry on free chain.");
-
-    goto retry;
-  }
-
-} /* createcell68k end */
--- a/src/mvs.c
+++ b/src/mvs.c
@@ -28,14 +28,12 @@
 #include "lsptypes.h"
 #include "opcodes.h"
 #include "cell.h"
+#include "byteswapdefs.h"

 #include "mvsdefs.h"
 #include "car-cdrdefs.h"
 #include "conspagedefs.h"

-#ifdef GCC386
-#include "inlnPS2.h"
-#endif /* GCC386 */

 /* to optionally swap the fnhead field of a frame */
 #ifdef BIGVM
--- a/src/return.c
+++ b/src/return.c
@@ -168,7 +168,8 @@ void contextsw(register DLword fxnum, register DLword bytenum, register DLword f
    CHECKFX;
    if (EndSTKP < CurrentStackPTR) error("contextsw:Illegal ESP");
 #endif
-    FastRetCALL return;
+    FastRetCALL;
+    return;
  }

 } /* end contextsw */
--- a/src/rs232c.c
+++ b/src/rs232c.c
@@ -253,7 +253,7 @@ rs232c_read() {
      }
    } else {
      /*
-       * SIGIO handler getsignaldata and the successive
+       * SIGIO handler, process_io_events, and the successive
       * rs232c_read has been called before Lisp prepares
       * the next buffer.  Turn on RS232C_remain_data to
       * specify to read the remaining data after.
--- a/src/testtool.c
+++ b/src/testtool.c
@@ -1241,8 +1241,6 @@ void dtd_chain(DLword type) {

 } /*  dtd_chain end **/

-#ifdef DTDDEBUG
-
 void check_dtd_chain(DLword type)
 {
  register LispPTR next, onext;
@@ -1270,8 +1268,6 @@ void check_dtd_chain(DLword type)
  }
 }

-#endif
-
 /************************************************************************/
 /*									*/
 /*			T R A C E _ F N C A L L				*/
--- a/src/timer.c
+++ b/src/timer.c
@@ -87,9 +87,7 @@ extern DspInterface currentdsp;

 int TIMEOUT_TIME; /* For file system timeout */

-#ifdef XWINDOW
-volatile sig_atomic_t Event_Req = FALSE;
-#endif /* XWINDOW */
+volatile sig_atomic_t IO_Signalled = FALSE;

 static int gettime(int casep);

@@ -403,7 +401,7 @@ void update_timer() {
 /* TIMER_INTERVAL usec ~ 20  per second.  This should live in some
        machine-configuration
        file somewhere - it can be changed as the -t parameter to lisp*/
-int TIMER_INTERVAL = 25000;
+int TIMER_INTERVAL = 10000;

 extern int LispWindowFd;

@@ -423,10 +421,6 @@ static void int_timer_service(int sig)

  Irq_Stk_Check = 0;
  Irq_Stk_End = 0;
-
-#ifdef XWINDOW
-  Event_Req = TRUE;
-#endif
 }

 /************************************************************************/
@@ -466,7 +460,7 @@ static void int_timer_init()

  timer_action.sa_handler = int_timer_service;
  sigemptyset(&timer_action.sa_mask);
-  timer_action.sa_flags = 0;
+  timer_action.sa_flags = SA_RESTART;

  if (sigaction(SIGVTALRM, &timer_action, NULL) == -1) {
    perror("sigaction: SIGVTALRM");
@@ -496,15 +490,10 @@ void int_io_open(int fd)
 {
 #ifdef DOS
 /* would turn on DOS kbd signal handler here */
-#elif KBINT
-
+#elseif defined(O_ASYNC)
  DBPRINT(("int_io_opening %d\n", fd));
-  if (fcntl(fd, F_SETOWN, getpid()) == -1) {
-#ifdef DEBUG
-    perror("fcntl F_SETOWN ERROR");
-#endif
-  };
-  if (fcntl(fd, F_SETFL, fcntl(fd, F_GETFL, 0) | O_ASYNC) == -1) perror("fcntl F_SETFL error");
+  if (fcntl(fd, F_SETOWN, getpid()) == -1) perror("fcntl F_SETOWN error");
+  if (fcntl(fd, F_SETFL, fcntl(fd, F_GETFL, 0) | O_ASYNC) == -1) perror("fcntl F_SETFL on error");
 #endif
 }

@@ -512,11 +501,27 @@ void int_io_close(int fd)
 {
 #ifdef DOS
 /* Turn off signaller here */
-#elif KBINT
-  fcntl(fd, F_SETFL, fcntl(fd, F_GETFL, 0) & ~O_ASYNC);
+#elseif defined(O_ASYNC)
+  if (fcntl(fd, F_SETFL, fcntl(fd, F_GETFL, 0) & ~O_ASYNC) == -1) perror("fcntl_F_SETFL off error");
 #endif
 }

+/************************************************************************/
+/*									*/
+/*		    i n t _ i o _ s e r v i c e				*/
+/*									*/
+/*	Handle SIGIO							*/
+/*									*/
+/*									*/
+/************************************************************************/
+
+static void int_io_service(int sig)
+{
+  Irq_Stk_Check = 0;
+  Irq_Stk_End = 0;
+  IO_Signalled = TRUE;
+}
+
 /************************************************************************/
 /*									*/
 /*			i n t _ i o _ i n i t				*/
@@ -531,7 +536,7 @@ void int_io_close(int fd)
 static void int_io_init() {
 #ifndef DOS
  struct sigaction io_action;
-  io_action.sa_handler = getsignaldata;
+  io_action.sa_handler = int_io_service;
  sigemptyset(&io_action.sa_mask);
  io_action.sa_flags = 0;

@@ -541,11 +546,6 @@ static void int_io_init() {
    DBPRINT(("I/O interrupts enabled\n"));
  }

-#if defined(XWINDOW) && defined(I_SETSIG)
-  if (ioctl(ConnectionNumber(currentdsp->display_id), I_SETSIG, S_INPUT) < 0)
-    perror("ioctl on X fd - SETSIG for input handling failed");
-#endif
-
 #if defined(USE_DLPI)
  DBPRINT(("INIT ETHER:  Doing I_SETSIG.\n"));
  if (ether_fd > 0)
--- a/src/uraid.c
+++ b/src/uraid.c
@@ -35,20 +35,6 @@
 #include <sys/select.h>
 #endif /* DOS */

-#ifdef SUNDISPLAY
-#include <sundev/kbd.h>
-#include <sundev/kbio.h>
-#include <errno.h>
-#ifndef NOPIXRECT
-#include <sunwindow/window_hs.h>
-#include <sunwindow/win_ioctl.h>
-#include <pixrect/pixrect_hs.h>
-#include <sunwindow/win_cursor.h>
-#include <sunwindow/cms.h>
-#include <sys/mman.h>
-extern int Win_security_p;
-#endif /* NOPIXRECT */
-#endif /* SUNDISPLAY */

 #ifdef OS5
 #include <stropts.h>
@@ -149,17 +135,10 @@ v filename              Save the virtual memory on the filename(Not Bootable)

 */
 /************************************************************************/
-#ifndef NOPIXRECT
-extern int black, white;
-extern struct pixrect *ColorDisplayPixrect, *DisplayRegionPixrect;
-#endif /* NOPIXRECT */

 extern int DisplayRasterWidth;
 extern unsigned int LispWindowFd, LispKbdFd;
 extern fd_set LispReadFds;
-#ifndef NOPIXRECT
-extern struct pixrect *CursorBitMap, *InvisibleCursorBitMap;
-#endif /* NOPIXRECT */
 extern struct cursor CurrentCursor, InvisibleCursor;
 extern struct screen LispScreen;
 extern int displaywidth, displayheight;
@@ -798,10 +777,6 @@ LispPTR uraid_commands() {
        printf("VMEMSAVE: v filename (it's NOT bootable)\n");
        return (T);
      }
-#ifndef DISPLAYBUFFER
-      copy_region(HideDisp68k, DisplayRegion68k, DisplayRasterWidth, displayheight);
-#endif /* DISPLAYBUFFER */
-
      if (vmem_save(URaid_arg1) != NIL) {
 #ifndef DISPLAYBUFFER
        clear_display();
@@ -861,17 +836,8 @@ LispPTR uraid_commands() {
 extern struct pixrect *ColorDisplayPixrect, *DisplayRegionPixrect;
 #endif

-#ifdef SUNDISPLAY
-#define SV_ACQUIRE "/bin/sunview1/sv_acquire"
-#define SV_RELEASE "/bin/sunview1/sv_release"
-#endif /* SUNDISPLAY */

 int device_before_raid() {
-#ifdef SUNDISPLAY
-  int size;
-  int keytrans;
-  union wait status;
-#endif /* SUNDISPLAY */
 #ifdef XWINDOW
  sigset_t signals;
 #endif
@@ -885,12 +851,6 @@ int device_before_raid() {
  sigprocmask(SIG_UNBLOCK, &signals, NULL);
 #endif

-#ifdef SUNDISPLAY
-  win_setcursor(LispWindowFd, &InvisibleCursor);
-#ifdef KBINT
-  int_io_close(LispWindowFd);
-#endif
-#endif /* SUNDISPLAY */

 #ifdef MAIKO_ENABLE_ETHERNET
 #ifdef ETHERINT
@@ -903,96 +863,6 @@ int device_before_raid() {
  int_io_close(RS232C_Fd);
 #endif

-#ifdef SUNDISPLAY
-  mess_reset(); /* turn off console-msg handling */
-
-#ifdef FX_AR_124
-  /* For AR 124. Type4 driver bug?? by m.matsuda */
-  {
-    long i;
-    for (i = 0; i < 900000; i++)
-      ;
-  }
-#endif /*  FX_AR_124 */
-
-  if ((LispKbdFd = open(LispScreen.scr_kbdname, O_RDWR)) == -1) {
-    fprintf(stderr, "can't open %s\n", LispScreen.scr_kbdname);
-    return (-1);
-  }
-
-  keytrans = TR_EVENT; /* keyboard encodes key */
-  if (ioctl(LispKbdFd, KIOCTRANS, &keytrans) == -1) {
-    fprintf(stderr, "Error at ioctl errno =%d\n", errno);
-    return (-1);
-  }
-  close(LispKbdFd);
-  close(LispWindowFd);
-
-#ifdef TRUECOLOR
-  truecolor_before_raid();
-#endif /* TRUECOLOR */
-
-#ifndef DISPLAYBUFFER
-  size = ((displaywidth * displayheight / 8 + (getpagesize() - 1)) & -getpagesize());
-
-  if ((HideDisp68k = malloc(size)) == 0) {
-    printf("can't malloc hide space\n");
-    return (-1);
-  }
-
-  copy_region(DisplayRegion68k, HideDisp68k, DisplayRasterWidth, displayheight);
-#endif /* DISPLAYBUFFER */
-
-#ifdef COLOR
-  save_colormap();
-
-#ifndef DISPLAYBUFFER
-  if (Inited_Color) {
-#else
-  if (MonoOrColor == COLOR_SCREEN) {
-#endif /* DISPLAYBUFFER */
-
-    /* save color image */
-    size =
-        ((displaywidth * displayheight + (getpagesize() - 1)) & -getpagesize()); /* 8 bit depth */
-    if ((HideColorDisp68k = malloc(size)) == 0) {
-      printf("can't malloc hide space\n");
-      return (-1);
-    }
-    copy_region(ColorDisplayRegion68k, HideColorDisp68k, DisplayRasterWidth * 8, displayheight);
-  }    /* end if(MonoOrColor) */
-#endif /* COLOR */
-
-  clear_display();
-
-#ifdef DISPLAYBUFFER
-  pr_close(ColorDisplayPixrect);
-  close(FrameBufferFd);
-#endif
-
-  if (Win_security_p) {
-    switch (vfork()) {
-      case -1: /* Error */ (void)fprintf(stderr, "display_before_exit: Fork failed.\n"); exit(1);
-
-      case 0: /* Child */
-        (void)execl(SV_RELEASE, "sv_release", NULL);
-        /* should not return */
-        (void)fprintf(stderr, "display_before_exit: exec for sv_release failed\n");
-        exit(1);
-
-      default: /* Parent */
-        /* do nothing */
-        break;
-    }
-    (void)wait(&status); /* child dies after changing 16 */
-
-    if (status.w_retcode != 0) {
-      (void)fprintf(stderr, "device_before_raid: failed to set ownership of win devices\n");
-      exit(1);
-    }
-  }
-
-#endif /* SUNDISPLAY */

 #if defined(XWINDOW) || defined(DOS)
  (currentdsp->cleardisplay)(currentdsp);
@@ -1103,12 +973,9 @@ int device_after_raid() {

  int_init();

-#ifdef SUNDISPLAY
-  FD_SET(LispWindowFd, &LispReadFds);
-#endif /* SUNDISPLAY */

 #ifdef MAIKO_ENABLE_ETHERNET
-  FD_SET(ether_fd, &LispReadFds);
+  if (ether_fd > 0) FD_SET(ether_fd, &LispReadFds);
 #endif /* MAIKO_ENABLE_ETHERNET */

 #ifdef XWINDOW
@@ -1145,107 +1012,6 @@ int device_after_raid() {

 static int re_init_display(int lisp_display_addr, int display_max)
 {
-#ifdef SUNDISPLAY
-  int mmapstat, size;
-  struct pixrect *ColorFb;
-  extern struct pixrect *ColorDisplayPixrect, *DisplayRegionPixrect;
-  extern int DisplayType;
-
-  union wait status;
-
-  if (Win_security_p) {
-    switch (vfork()) {
-      case -1: /* Error */ (void)fprintf(stderr, "re_init_display: Fork failed.\n"); exit(1);
-
-      case 0: /* Child */
-        (void)execl(SV_ACQUIRE, "sv_acquire", "0", "256", "250", NULL);
-        /* should not return */
-        (void)fprintf(stderr, "re_init_display: exec for sv_acquire failed\n");
-        exit(1);
-
-      default: /* Parent */
-        /* do nothing */
-        break;
-    }
-    (void)wait(&status); /* child dies after changing 6 */
-
-    if (status.w_retcode != 0) {
-      (void)fprintf(stderr, "re_init_display: failed to set ownership of win devices\n");
-      exit(1);
-    }
-  }
-
-  mess_init();
-  if ((LispWindowFd = win_screennew(&LispScreen)) == -1) {
-    fprintf(stderr, "init_display: can't create LispWindow\n");
-    return (-1);
-  } else {
-#ifdef KBINT
-    int_io_open(LispWindowFd);
-    fcntl(LispWindowFd, F_SETFL, fcntl(LispWindowFd, F_GETFL, 0) | O_NONBLOCK);
-
-#ifdef FX_AR_124
-    /* For AR 124. Type4 driver bug?? by m.matsuda */
-    {
-      long i;
-      for (i = 0; i < 900000; i++)
-        ;
-    }
-#endif /* FX_AR_124 */
-
-#endif
-  }
-
-#ifndef DISPLAYBUFFER
-  /* for CGFOUR dev */
-  if (DisplayType == SUN4COLOR) {
-    ColorFb = pr_open("/dev/fb");
-    pr_set_plane_group(ColorFb, PIXPG_OVERLAY_ENABLE);
-    pr_rop(ColorFb, 0, 0, ColorFb->pr_width, ColorFb->pr_height, PIX_SET, 0, 0, 0);
-    pr_set_plane_group(ColorFb, PIXPG_OVERLAY);
-  }
-#else  /* DISPLAYBUFFER is T */
-/*  ColorDisplayPixrect = pr_open("/dev/fb");
-    pr_putcolormap(ColorDisplayPixrect, 1, 1, &black, &black, &black);
-    pr_putcolormap(ColorDisplayPixrect, 0, 1, &white, &white, &white);
-    pr_putcolormap(ColorDisplayPixrect, 255, 1, &black, &black, &black);
-    pr_putcolormap(ColorDisplayPixrect,
-                   (1<<ColorDisplayPixrect->pr_depth)-1, 1,
-                   &black, &black, &black);
-***/
-#endif /* DISPLAYBUFFER */
-
-  init_cursor();
-
-#ifndef DISPLAYBUFFER
-  size = ((displaywidth * displayheight / 8 + (getpagesize() - 1)) & -getpagesize());
-  mmapstat = (int)mmap(DisplayRegion68k, size, PROT_READ | PROT_WRITE,
-#ifdef OS4
-                       MAP_FIXED |
-#endif /* OS4 */
-
-                           MAP_SHARED,
-                       FrameBufferFd, 0);
-
-  if (mmapstat == -1) {
-    fprintf(stderr, "re_init_display: ERROR at mmap system call\n");
-    fprintf(stderr, "errno = %d\n\n", errno);
-    return (0);
-  }
-
-  copy_region(HideDisp68k, DisplayRegion68k, DisplayRasterWidth, displayheight);
-
-  free(HideDisp68k);
-#endif /* DISPLAYBUFFER */
-
-#ifdef DISPLAYBUFFER
-  ColorDisplayPixrect = pr_open("/dev/fb");
-  flush_display_buffer();
-/*     refresh_CG6; */
-
-#endif /* DISPLAYBUFFER */
-
-#endif /* SUNDISPLAY */

  return (0);
 }
@@ -1254,163 +1020,6 @@ static int re_init_display(int lisp_display_addr, int display_max)

 static int re_init_display(int lisp_display_addr, int display_max)
 {
-#ifdef SUNDISPLAY
-  int mmapstat, size;
-  struct pixrect *ColorFb;
-  struct pixrect *color_source;
-  extern int DisplayType;
-  union wait status;
-
-  if (Win_security_p) {
-    switch (vfork()) {
-      case -1: /* Error */ (void)fprintf(stderr, "re_init_display: Fork failed.\n"); exit(1);
-
-      case 0: /* Child */
-        (void)execl(SV_ACQUIRE, "sv_acquire", "0", "256", "250", NULL);
-        /* should not return */
-        (void)fprintf(stderr, "re_init_display: exec for sv_acquire failed\n");
-        exit(1);
-
-      default: /* Parent */
-        /* do nothing */
-        break;
-    }
-    (void)wait(&status); /* child dies after changing 6 */
-
-    if (status.w_retcode != 0) {
-      (void)fprintf(stderr, "re_init_display: failed to set ownership of win devices\n");
-      exit(1);
-    }
-  }
-
-  mess_init();
-  if ((LispWindowFd = win_screennew(&LispScreen)) == -1) {
-    fprintf(stderr, "init_display: can't create LispWindow\n");
-    return (-1);
-  } else {
-#ifdef KBINT
-    int_io_open(LispWindowFd);
-    fcntl(LispWindowFd, F_SETFL, fcntl(LispWindowFd, F_GETFL, 0) | O_NONBLOCK);
-#endif
-  }
-
-#ifdef DISPLAYBUFFER
-  if ((FrameBufferFd = open(LispScreen.scr_fbname, 2)) == -1) {
-    perror("init_display: can't open FrameBuffer\n");
-    exit(-1);
-  }
-#endif /* DISPLAYBUFFER */
-
-  restore_colormap();
-
-  if (MonoOrColor == MONO_SCREEN) {
-#ifndef DISPLAYBUFFER
-    /* for CGFOUR dev */
-    if (DisplayType == SUN4COLOR) {
-      ColorFb = pr_open("/dev/fb");
-      pr_set_plane_group(ColorFb, PIXPG_OVERLAY_ENABLE);
-      pr_rop(ColorFb, 0, 0, ColorFb->pr_width, ColorFb->pr_height, PIX_SET, 0, 0, 0);
-      pr_set_plane_group(ColorFb, PIXPG_OVERLAY);
-    }
-#else  /* DISPLAYBUFFER is T */
-/*  ColorDisplayPixrect = pr_open("/dev/fb");
-    pr_putcolormap(ColorDisplayPixrect, 1, 1, &black, &black, &black);
-    pr_putcolormap(ColorDisplayPixrect, 0, 1, &white, &white, &white);
-    pr_putcolormap(ColorDisplayPixrect, 255, 1, &black, &black, &black);
-    pr_putcolormap(ColorDisplayPixrect,
-                   (1<<ColorDisplayPixrect->pr_depth)-1, 1,
-                   &black, &black, &black);
-***/
-#endif /* DISPLAYBUFFER */
-
-    init_cursor();
-
-#ifndef DISPLAYBUFFER
-    size = ((displaywidth * displayheight / 8 + (getpagesize() - 1)) & -getpagesize());
-
-    mmapstat = (int)mmap(DisplayRegion68k, size, PROT_READ | PROT_WRITE,
-#ifdef OS4
-                         MAP_FIXED |
-#endif /* OS4 */
-
-                             MAP_SHARED,
-                         FrameBufferFd, 0);
-    if (Inited_Color)
-      mmapstat = (int)mmap(ColorDisplayRegion68k, Dispcolorsize, PROT_READ | PROT_WRITE,
-#ifdef OS4
-                           MAP_FIXED |
-#endif /* OS4 */
-
-                               MAP_SHARED,
-                           FrameBufferFd, 0x40000);
-
-    if (mmapstat == -1) {
-      fprintf(stderr, "re_init_display: ERROR at mmap system call\n");
-      fprintf(stderr, "errno = %d\n\n", errno);
-      return (0);
-    }
-    /* restore mono image */
-    copy_region(HideDisp68k, DisplayRegion68k, DisplayRasterWidth, displayheight);
-
-    free(HideDisp68k);
-
-    if (Inited_Color) { /* restore color image */
-      copy_region(HideColorDisp68k, ColorDisplayRegion68k, DisplayRasterWidth * 8, displayheight);
-      free(HideColorDisp68k);
-    } /* end if( Inited_Color ) */
-#endif /* DISPLAYBUFFER */
-
-#ifdef DISPLAYBUFFER
-    ColorDisplayPixrect = pr_open("/dev/fb");
-    flush_display_buffer();
-/*     refresh_CG6; */
-#endif /* DISPLAYBUFFER */
-
-  } else { /* MonoOrColor is COLOR_SCREEN */
-    ColorFb = pr_open("/dev/fb");
-#ifdef DISPLAYBUFFER
-    ColorDisplayPixrect = ColorFb;
-#endif /* DISPLAYBUFFER */
-
-    color_source = mem_point(displaywidth, displayheight, 8, ColorDisplayRegion68k);
-    pr_rop(ColorFb, 0, 0, displaywidth, displayheight, PIX_SRC, color_source, 0, 0);
-#ifndef DISPLAYBUFFER
-    pr_set_plane_group(ColorFb, PIXPG_OVERLAY_ENABLE);
-    pr_rop(ColorFb, 0, 0, ColorFb->pr_width, ColorFb->pr_height, PIX_CLR, 0, 0, 0);
-#endif /* DISPLAYBUFFER */
-
-    pr_set_plane_group(ColorFb, PIXPG_8BIT_COLOR);
-    init_cursor();
-    mmapstat = (int)mmap(ColorDisplayRegion68k, Dispcolorsize, PROT_READ | PROT_WRITE,
-#ifdef OS4
-                         MAP_FIXED |
-#endif
-                             MAP_SHARED,
-                         FrameBufferFd, 0x40000);
-    if (mmapstat == -1) {
-      perror("cgfour_init_color_display: ERROR at mmap system call\n");
-      error(
-          "cgfour_init_color_display: ERROR at mmap system call\n You may be able to continue by "
-          "typing 'q'");
-      /*                  printf("MMAP FAIL:BMBASE=0x%x\nNATIVE:= 0x%x\nLISPBASEN:= 0x%x\n",
-                              color_bitmapbase,ColorDisplayRegion68k,Lisp_world);
-      */
-      return (NIL);
-    } /* end if(mmapstat) */
-
-#ifndef DISPLAYBUFFER
-    /* restore mono image */
-    copy_region(HideDisp68k, DisplayRegion68k, DisplayRasterWidth, displayheight);
-
-    free(HideDisp68k);
-#endif /* DISPLAYBUFFER */
-
-    /* restore coloe image */
-    copy_region(HideColorDisp68k, ColorDisplayRegion68k, DisplayRasterWidth * 8, displayheight);
-
-    free(HideColorDisp68k);
-  } /* end if(MonoOrColor) */
-#endif /* SUNDISPLAY */

  return (0);
 }
--- a/src/vmemsave.c
+++ b/src/vmemsave.c
@@ -36,9 +36,6 @@
 #define alarm(x) 1
 #endif /* DOS */

-#if defined(SUNDISPLAY) && defined(OLD_CURSOR)
-#include <sunwindow/win_cursor.h>
-#endif

 #include "hdw_conf.h"
 #include "lispemul.h"
@@ -61,9 +58,6 @@
 #include "perrnodefs.h"
 #include "ufsdefs.h"

-#ifdef GCC386
-#include "inlnPS2.h"
-#endif

 /* Error return values from VMEMSAVE */
 #define COMPLETESYSOUT NIL
@@ -319,9 +313,6 @@ LispPTR vmem_save(char *sysout_file_name)
  register int i;
  char tempname[MAXPATHLEN];
  register int rval;
-#ifdef SUNDISPLAY
-  /* DLword *bmptr; */
-#endif
 #ifndef DOS
  extern int ScreenLocked;
  extern DLword *EmCursorX68K;
@@ -332,17 +323,7 @@ LispPTR vmem_save(char *sysout_file_name)

 /* remove cursor image from screen */

-#ifdef SUNDISPLAY
-#ifdef OLD_CURSOR
-  win_setcursor(LispWindowFd, &InvisibleCursor);
-#else
-  ScreenLocked = T;
-  taking_mouse_down();
-/*	bmptr = EmCursorBitMap68K;
-    EmCursorBitMap68K= NullCursor;*/
-#endif /* OLD_CURSOR */
-
-#elif DOS
+#if   DOS
  /*  For DOS, must also take the mouse cursor away (it's  */
  /*  written into the display-region bitmap).	     */
  currentdsp->device.locked++;
@@ -515,17 +496,7 @@ LispPTR vmem_save(char *sysout_file_name)
  }

 /* restore cursor image to screen */
-#ifdef SUNDISPLAY
-#ifdef OLD_CURSOR
-  win_setcursor(LispWindowFd, &CurrentCursor);
-#else
-  ScreenLocked = T;
-  /*EmCursorBitMap68K = bmptr ;*/
-  taking_mouse_up(*EmCursorX68K, *EmCursorY68K);
-  ScreenLocked = NIL;
-#endif /* OLD_CURSOR */
-
-#elif DOS
+#if   DOS
  /* Must also put the mouse back. */
  (currentdsp->mouse_visible)(IOPage68K->dlmousex, IOPage68K->dlmousey);
  currentdsp->device.locked--;
--- a/src/xbbt.c
+++ b/src/xbbt.c
@@ -53,7 +53,7 @@ unsigned long clipping_Xbitblt(DspInterface dsp, DLword *dummy, int x, int y, in
    XPutImage(dsp->display_id, dsp->DisplayWindow, dsp->Copy_GC, &dsp->ScreenBitmap, x, y,
              x - dsp->Visible.x, y - dsp->Visible.y, w, h);
    XFlush(dsp->display_id);
-    XUNLOCK;
+    XUNLOCK(dsp);
    return (1);
  }

@@ -80,7 +80,7 @@ unsigned long clipping_Xbitblt(DspInterface dsp, DLword *dummy, int x, int y, in
    XPutImage(dsp->display_id, dsp->DisplayWindow, dsp->Copy_GC, &dsp->ScreenBitmap, x, y,
              x - dsp->Visible.x, y - dsp->Visible.y, w, h);
    XFlush(dsp->display_id);
-    XUNLOCK;
+    XUNLOCK(dsp);
  }
  return (1);

--- a/src/xc.c
+++ b/src/xc.c
@@ -20,6 +20,7 @@
 /*									*/
 /************************************************************************/

+#include <signal.h>
 #include <stdint.h>
 #include <stdio.h>
 #include <sys/types.h>
@@ -98,6 +99,7 @@
 #include "ubf3defs.h"
 #include "unwinddefs.h"
 #include "vars3defs.h"
+#include "xwinmandefs.h"
 #include "z2defs.h"

 #ifdef DOS
@@ -107,17 +109,14 @@ extern IOPAGE *IOPage68K;
 extern KbdInterface currentkbd;
 extern DspInterface currentdsp;
 extern MouseInterface currentmouse;
+#else
+extern DspInterface currentdsp;
 #endif /* DOS */

 typedef struct conspage ConsPage;
 typedef ByteCode *InstPtr;

-#ifdef GCC386
-register InstPtr pccache asm("si");
-register LispPTR *cspcache asm("di");
-register LispPTR tscache asm("bx");
-#include "inlnPS2.h"
-#elif (DOS && OPDISP)
+#if   (DOS && OPDISP)
 #include "inlndos.h"
 register InstPtr pccache asm("si");
 register LispPTR *cspcache asm("di");
@@ -145,11 +144,8 @@ register LispPTR tscache asm("bx");
 #define PVARL PVar
 #define IVARL IVar

-#ifdef XWINDOW
-extern int Event_Req; /* != 0 when it's time to check X events
-                                                 on machines that don't get them reliably
-                                                 (e.g. Suns running OpenWindows) */
-#endif                /* XWINDOW */
+/* used by SIGIO signal handler to indicate I/O may be possible */
+extern volatile sig_atomic_t IO_Signalled;

 #ifdef PCTRACE
 /* For keeping a trace table (ring buffer) of 100 last PCs */
@@ -1116,17 +1112,22 @@ check_interrupt:
      Irq_Stk_End = (UNSIGNED)EndSTKP;
    }

-    /* Check for an IRQ request */
+    /* This is a good time to process keyboard/mouse and ethernet I/O
+     * X events are not managed in the async/SIGIO code while
+     * raw ethernet, serial port, and socket connections are.
+     * If the system is configured with SIGIO handling we have a hint
+     * that allows us to cheaply skip if there's nothing to do
+     */
+    process_Xevents(currentdsp);
+
+    if (IO_Signalled) {
+      IO_Signalled = FALSE;
+      process_io_events();
+    }

    if ((Irq_Stk_End <= 0) || (Irq_Stk_Check <= 0) || need_irq) {
      if (StkOffset_from_68K(CSTKPTR) > InterfacePage->stackbase) {
        /* Interrupts not Disabled */
-        /* XXX: what on earth is this code trying to accomplish by calling
-           getsignaldata
-        */
-#if !defined(KBINT) || defined(OS4)
-        getsignaldata(0);
-#endif
        EXT;
        update_timer();

--- a/src/xcursor.c
+++ b/src/xcursor.c
@@ -66,7 +66,7 @@ void Init_XCursor() {
  cursorlist->next = NULL;
  for (i = 0; i < CURSORHEIGHT; i++) cursorlist->bitmap[i] = newbm[i];
  set_Xcursor(currentdsp, (uint8_t *)newbm, 0, 0, &(cursorlist->Xid), 1);
-  DefineCursor(currentdsp->display_id, currentdsp->DisplayWindow, &(cursorlist->Xid));
+  DefineCursor(currentdsp, currentdsp->DisplayWindow, &(cursorlist->Xid));
 } /* end Init_XCursor */

 /************************************************************************/
@@ -120,8 +120,8 @@ void Set_XCursor(int x, int y)
    clp->next = cursorlist;
    cursorlist = clp;
  }
-  DefineCursor(currentdsp->display_id, currentdsp->DisplayWindow, &(clp->Xid));
-  XUNLOCK; /* Signals OK now */
+  DefineCursor(currentdsp, currentdsp->DisplayWindow, &(clp->Xid));
+  XUNLOCK(currentdsp); /* Signals OK now */

 #ifdef NEWXCURSOR
  /* Save the hotspot for later position reporting/setting */
@@ -140,16 +140,16 @@ void Set_XCursor(int x, int y)
 /*									*/
 /************************************************************************/

-void init_Xcursor(Display *display, Window window)
+void init_Xcursor(DspInterface dsp)
 {
  TPRINT(("TRACE: init_Xcursor()\n"));

  XLOCK; /* Take no X signals during this activity (ISC 386) */

-  XAllocNamedColor(display, Colors, "black", &cursor_fore_xcsd, &xced);
-  XAllocNamedColor(display, Colors, "white", &cursor_back_xcsd, &xced);
+  XAllocNamedColor(dsp->display_id, Colors, "black", &cursor_fore_xcsd, &xced);
+  XAllocNamedColor(dsp->display_id, Colors, "white", &cursor_back_xcsd, &xced);

-  XUNLOCK; /* OK to take signals again */
+  XUNLOCK(dsp); /* OK to take signals again */

 } /* end init_Xcursor */

@@ -190,6 +190,6 @@ void set_Xcursor(DspInterface dsp, const uint8_t *bitmap, int hotspot_x, int hot
  XFreePixmap(dsp->display_id, Cursor_msk);

  XFlush(dsp->display_id);
-  XUNLOCK;
+  XUNLOCK(dsp);

 } /* end set_Xcursor */
--- a/src/xinit.c
+++ b/src/xinit.c
@@ -11,6 +11,7 @@
 #include "version.h"

 #include <assert.h>
+#include <signal.h>
 #include <stdbool.h>
 #include <stdio.h>
 #include <unistd.h>
@@ -29,6 +30,7 @@
 #include "adr68k.h"
 #include "xinitdefs.h"
 #include "dspifdefs.h"
+#include "timerdefs.h"
 #include "xbbtdefs.h"
 #include "xlspwindefs.h"
 #include "xwinmandefs.h"
@@ -62,8 +64,8 @@ unsigned LispDisplayRequestedWidth, LispDisplayRequestedHeight;

 Colormap Colors;

-int XLocked = 0; /* non-zero while doing X ops, to avoid signals */
-extern fd_set LispReadFds;
+volatile sig_atomic_t XLocked = 0; /* non-zero while doing X ops, to avoid signals */
+volatile sig_atomic_t XNeedSignal = 0; /* T if an X interrupt happened while XLOCK asserted */

 /************************************************************************/
 /*									*/
@@ -106,13 +108,11 @@ void lisp_Xexit(DspInterface dsp)
 {
  assert(Lisp_Xinitialized);

-#if defined(OS5) && defined(I_SETSIG)
-  ioctl(ConnectionNumber(dsp->display_id), I_SETSIG, 0); /* so no interrupts happen during */
-#endif
-
+  XLOCK;
  XDestroySubwindows(dsp->display_id, dsp->LispWindow);
  XDestroyWindow(dsp->display_id, dsp->LispWindow);
  XCloseDisplay(dsp->display_id);
+  XUNLOCK(dsp);

  Lisp_Xinitialized = false;
 } /* end lisp_Xexit */
@@ -140,7 +140,7 @@ void Xevent_before_raid(DspInterface dsp)

  XLOCK;
  XFlush(dsp->display_id);
-  XUNLOCK;
+  XUNLOCK(dsp);
 } /* end Xevent_before_raid */

 /************************************************************************/
@@ -158,7 +158,7 @@ void Xevent_after_raid(DspInterface dsp)
                          dsp->Visible.height);
  XLOCK;
  XFlush(dsp->display_id);
-  XUNLOCK;
+  XUNLOCK(dsp);

 } /* end Xevent_after_raid */

@@ -176,9 +176,6 @@ void Open_Display(DspInterface dsp)
 {
  assert(Lisp_Xinitialized == false);

-  FD_SET(ConnectionNumber(dsp->display_id), &LispReadFds);
-  fcntl(ConnectionNumber(dsp->display_id), F_SETOWN, getpid());
-
  /****************************************************/
  /* If debugging, set the X connection so that	*/
  /* we run synchronized--so a debugger can		*/
@@ -196,7 +193,7 @@ void Open_Display(DspInterface dsp)

  Create_LispWindow(dsp); /* Make the main window */
  Lisp_Xinitialized = true;
-  init_Xevent(dsp); /* Turn on the intrpts. */
+  init_Xevent(dsp); /* Turn on the event reporting */
 } /* end OpenDisplay */

 /*********************************************************************/
@@ -322,9 +319,11 @@ DspInterface X_init(DspInterface dsp, char *lispbitmap, int width_hint, int heig
      dsp->ScreenBitmap.bitmap_bit_order = MSBFirst;
      dsp->ScreenBitmap.bitmap_pad = 32;
      dsp->ScreenBitmap.depth = 1;
+      dsp->ScreenBitmap.bits_per_pixel = 1;
      dsp->ScreenBitmap.bytes_per_line =
          ((dsp->Display.width + (BITSPER_DLWORD - 1)) / BITSPER_DLWORD) * (BITSPER_DLWORD / 8);
      break;
  }
+  XInitImage(&dsp->ScreenBitmap);
  return (dsp);
 }
--- a/src/xlspwin.c
+++ b/src/xlspwin.c
@@ -140,7 +140,7 @@ void Create_LispWindow(DspInterface dsp)
                   save_argc, &szhint, &Lisp_WMhints, &xclasshint);

  XSelectInput(dsp->display_id, dsp->LispWindow, dsp->EnableEventMask);
-  init_Xcursor(dsp->display_id, dsp->LispWindow);
+  init_Xcursor(dsp);

  dsp->DisplayWindow = XCreateSimpleWindow(dsp->display_id, dsp->LispWindow, 0, 0,
                                           dsp->Visible.width, dsp->Visible.height, 0,
@@ -195,7 +195,7 @@ void Create_LispWindow(DspInterface dsp)
                                          dsp->ScrollBarWidth,          /* width */
                                          dsp->Visible.height, dsp->InternalBorderWidth,
                                          BlackPixelOfScreen(screen), WhitePixelOfScreen(screen));
-  DefineCursor(dsp->display_id, dsp->VerScrollBar, &VertScrollCursor);
+  DefineCursor(dsp, dsp->VerScrollBar, &VertScrollCursor);
  XMapWindow(dsp->display_id, dsp->VerScrollBar);

  dsp->HorScrollBar = XCreateSimpleWindow(dsp->display_id, dsp->LispWindow,
@@ -203,7 +203,7 @@ void Create_LispWindow(DspInterface dsp)
                                          dsp->Visible.width,                /* width */
                                          dsp->ScrollBarWidth, dsp->InternalBorderWidth,
                                          BlackPixelOfScreen(screen), WhitePixelOfScreen(screen));
-  DefineCursor(dsp->display_id, dsp->HorScrollBar, &HorizScrollCursor);
+  DefineCursor(dsp, dsp->HorScrollBar, &HorizScrollCursor);
  XChangeWindowAttributes(dsp->display_id, dsp->HorScrollBar, CWOverrideRedirect,
                          &Lisp_SetWinAttributes);
  XMapWindow(dsp->display_id, dsp->HorScrollBar);
@@ -237,7 +237,7 @@ void Create_LispWindow(DspInterface dsp)
                                    GravSize, dsp->InternalBorderWidth, BlackPixelOfScreen(screen),
                                    WhitePixelOfScreen(screen));
  XSetWindowBackgroundPixmap(dsp->display_id, dsp->NWGrav, dsp->GravityOnPixmap);
-  DefineCursor(dsp->display_id, dsp->NWGrav, &DefaultCursor);
+  DefineCursor(dsp, dsp->NWGrav, &DefaultCursor);
  XChangeWindowAttributes(dsp->display_id, dsp->NWGrav, CWOverrideRedirect, &Lisp_SetWinAttributes);
  XClearWindow(dsp->display_id, dsp->NWGrav);
  XMapWindow(dsp->display_id, dsp->NWGrav);
@@ -246,7 +246,7 @@ void Create_LispWindow(DspInterface dsp)
                                    GravSize, dsp->InternalBorderWidth, BlackPixelOfScreen(screen),
                                    WhitePixelOfScreen(screen));
  XSetWindowBackgroundPixmap(dsp->display_id, dsp->SEGrav, dsp->GravityOffPixmap);
-  DefineCursor(dsp->display_id, dsp->SEGrav, &DefaultCursor);
+  DefineCursor(dsp, dsp->SEGrav, &DefaultCursor);
  XChangeWindowAttributes(dsp->display_id, dsp->SEGrav, CWOverrideRedirect, &Lisp_SetWinAttributes);
  XClearWindow(dsp->display_id, dsp->NWGrav);
  XMapWindow(dsp->display_id, dsp->SEGrav);
@@ -255,7 +255,7 @@ void Create_LispWindow(DspInterface dsp)
                                    GravSize, dsp->InternalBorderWidth, BlackPixelOfScreen(screen),
                                    WhitePixelOfScreen(screen));
  XSetWindowBackgroundPixmap(dsp->display_id, dsp->SWGrav, dsp->GravityOffPixmap);
-  DefineCursor(dsp->display_id, dsp->SWGrav, &DefaultCursor);
+  DefineCursor(dsp, dsp->SWGrav, &DefaultCursor);
  XClearWindow(dsp->display_id, dsp->NWGrav);
  XMapWindow(dsp->display_id, dsp->SWGrav);

@@ -263,16 +263,16 @@ void Create_LispWindow(DspInterface dsp)
                                    GravSize, dsp->InternalBorderWidth, BlackPixelOfScreen(screen),
                                    WhitePixelOfScreen(screen));
  XSetWindowBackgroundPixmap(dsp->display_id, dsp->NEGrav, dsp->GravityOffPixmap);
-  DefineCursor(dsp->display_id, dsp->NEGrav, &DefaultCursor);
+  DefineCursor(dsp, dsp->NEGrav, &DefaultCursor);
  XClearWindow(dsp->display_id, dsp->NWGrav);
  XMapWindow(dsp->display_id, dsp->NEGrav);

-  /* DefineCursor( dsp->display_id, dsp->DisplayWindow, &WaitCursor ); */
+  /* DefineCursor( dsp, dsp->DisplayWindow, &WaitCursor ); */

  XLOCK;
  XMapWindow(dsp->display_id, dsp->LispWindow);
  XFlush(dsp->display_id);
-  XUNLOCK;
+  XUNLOCK(dsp);
 }

 void lisp_Xvideocolor(int flag)
@@ -303,7 +303,7 @@ void lisp_Xvideocolor(int flag)
  }

  XFlush(currentdsp->display_id);
-  XUNLOCK;
+  XUNLOCK(currentdsp);

 } /* end lisp_Xvideocolor */

@@ -322,7 +322,7 @@ void set_Xmouseposition(int x, int y)
    XWarpPointer(currentdsp->display_id, (Window)NULL, currentdsp->DisplayWindow, 0, 0, 0, 0,
                 dest_x, dest_y);
    XFlush(currentdsp->display_id);
-    XUNLOCK;
+    XUNLOCK(currentdsp);
  }
 } /* end set_Xmouseposition */

@@ -340,8 +340,8 @@ void DoRing() {
  KBEVENT *kbevent;

  TPRINT(("TRACE: DoRing()\n"));
-
 do_ring:
+  /* DEL is not generally present on a Mac X keyboard, Ctrl-shift-ESC would be 18496 */
  if (((*EmKbdAd268K) & 2113) == 0) { /*Ctrl-shift-NEXT*/
    error("******  EMERGENCY Interrupt ******");
    *EmKbdAd268K = KB_ALLUP;          /*reset*/
--- a/src/xwinman.c
+++ b/src/xwinman.c
@@ -83,7 +83,7 @@ void Set_BitGravity(XButtonEvent *event, DspInterface dsp, Window window, int gr

  XSetWindowBackgroundPixmap(event->display, window, dsp->GravityOnPixmap);
  XClearWindow(event->display, window);
-  XUNLOCK;
+  XUNLOCK(dsp);
 } /* end Set_BitGravity */

 static void lisp_Xconfigure(DspInterface dsp, int x, int y, int lspWinWidth, int lspWinHeight)
@@ -137,7 +137,7 @@ static void lisp_Xconfigure(DspInterface dsp, int x, int y, int lspWinWidth, int
  XMoveResizeWindow(dsp->display_id, dsp->SWGrav, Col2, Row3, GravSize, GravSize);
  Scroll(dsp, dsp->Visible.x, dsp->Visible.y);
  XFlush(dsp->display_id);
-  XUNLOCK;
+  XUNLOCK(dsp);
 } /* end lisp_Xconfigure */

 void enable_Xkeyboard(DspInterface dsp)
@@ -145,7 +145,7 @@ void enable_Xkeyboard(DspInterface dsp)
  XLOCK;
  XSelectInput(dsp->display_id, dsp->DisplayWindow, dsp->EnableEventMask);
  XFlush(dsp->display_id);
-  XUNLOCK;
+  XUNLOCK(dsp);
 }

 void disable_Xkeyboard(DspInterface dsp)
@@ -153,7 +153,7 @@ void disable_Xkeyboard(DspInterface dsp)
  XLOCK;
  XSelectInput(dsp->display_id, dsp->DisplayWindow, dsp->DisableEventMask);
  XFlush(dsp->display_id);
-  XUNLOCK;
+  XUNLOCK(dsp);
 }

 void beep_Xkeyboard(DspInterface dsp)
@@ -165,13 +165,13 @@ void beep_Xkeyboard(DspInterface dsp)
  XLOCK;
  XBell(dsp->display_id, (int)50);
  XFlush(dsp->display_id);
-  XUNLOCK;
+  XUNLOCK(dsp);

 } /* end beep_Xkeyboard */

 /************************************************************************/
 /*									*/
-/*		    g e t X s i g n a l d a t a				*/
+/*		    p r o c e s s _ X e v e n t s			*/
 /*									*/
 /*  Take X key/mouse events and turn them into Lisp events		*/
 /*									*/
@@ -179,7 +179,7 @@ void beep_Xkeyboard(DspInterface dsp)

 extern int Current_Hot_X, Current_Hot_Y; /* Cursor hotspot */

-void getXsignaldata(DspInterface dsp)
+void process_Xevents(DspInterface dsp)
 {
  XEvent report;

@@ -193,8 +193,6 @@ void getXsignaldata(DspInterface dsp)
              (short)((report.xmotion.x + dsp->Visible.x) & 0xFFFF) - Current_Hot_X;
          *EmCursorY68K = (*((DLword *)EmMouseY68K)) =
              (short)((report.xmotion.y + dsp->Visible.y) & 0xFFFF) - Current_Hot_Y;
-          DoRing();
-          if ((KBDEventFlg) > 0) Irq_Stk_End = Irq_Stk_Check = 0;
          break;
        case KeyPress:
          kb_trans(SUNLispKeyMap[(report.xkey.keycode) - KEYCODE_OFFSET], FALSE);
@@ -237,11 +235,9 @@ void getXsignaldata(DspInterface dsp)
        case EnterNotify: Mouse_Included = TRUE; break;
        case LeaveNotify: Mouse_Included = FALSE; break;
        case Expose:
-          XLOCK;
          (dsp->bitblt_to_screen)(dsp, 0, report.xexpose.x + dsp->Visible.x,
                                  report.xexpose.y + dsp->Visible.y, report.xexpose.width,
                                  report.xexpose.height);
-          XUNLOCK;
          break;
        default: break;
      }
@@ -266,14 +262,14 @@ void getXsignaldata(DspInterface dsp)
        case ButtonPress:
          switch (report.xbutton.button) {
            case Button1:
-              DefineCursor(dsp->display_id, dsp->HorScrollBar, &ScrollLeftCursor);
+              DefineCursor(dsp, dsp->HorScrollBar, &ScrollLeftCursor);
              ScrollLeft(dsp);
              break;
            case Button2:
-              DefineCursor(dsp->display_id, dsp->HorScrollBar, &HorizThumbCursor);
+              DefineCursor(dsp, dsp->HorScrollBar, &HorizThumbCursor);
              break;
            case Button3:
-              DefineCursor(dsp->display_id, dsp->HorScrollBar, &ScrollRightCursor);
+              DefineCursor(dsp, dsp->HorScrollBar, &ScrollRightCursor);
              ScrollRight(dsp);
              break;
            default: break;
@@ -282,14 +278,14 @@ void getXsignaldata(DspInterface dsp)
        case ButtonRelease:
          switch (report.xbutton.button) {
            case Button1:
-              DefineCursor(dsp->display_id, report.xany.window, &HorizScrollCursor);
+              DefineCursor(dsp, report.xany.window, &HorizScrollCursor);
              break;
            case Button2:
              JumpScrollHor(dsp, report.xbutton.x);
-              DefineCursor(dsp->display_id, report.xany.window, &HorizScrollCursor);
+              DefineCursor(dsp, report.xany.window, &HorizScrollCursor);
              break;
            case Button3:
-              DefineCursor(dsp->display_id, report.xany.window, &HorizScrollCursor);
+              DefineCursor(dsp, report.xany.window, &HorizScrollCursor);
              break;
            default: break;
          } /* end switch */
@@ -300,14 +296,14 @@ void getXsignaldata(DspInterface dsp)
        case ButtonPress:
          switch (report.xbutton.button) {
            case Button1:
-              DefineCursor(dsp->display_id, report.xany.window, &ScrollUpCursor);
+              DefineCursor(dsp, report.xany.window, &ScrollUpCursor);
              ScrollUp(dsp);
              break;
            case Button2:
-              DefineCursor(dsp->display_id, report.xany.window, &VertThumbCursor);
+              DefineCursor(dsp, report.xany.window, &VertThumbCursor);
              break;
            case Button3:
-              DefineCursor(dsp->display_id, report.xany.window, &ScrollDownCursor);
+              DefineCursor(dsp, report.xany.window, &ScrollDownCursor);
              ScrollDown(dsp);
              break;
            default: break;
@@ -316,14 +312,14 @@ void getXsignaldata(DspInterface dsp)
        case ButtonRelease:
          switch (report.xbutton.button) {
            case Button1:
-              DefineCursor(dsp->display_id, report.xany.window, &VertScrollCursor);
+              DefineCursor(dsp, report.xany.window, &VertScrollCursor);
              break;
            case Button3:
-              DefineCursor(dsp->display_id, report.xany.window, &VertScrollCursor);
+              DefineCursor(dsp, report.xany.window, &VertScrollCursor);
              break;
            case Button2:
              JumpScrollVer(dsp, report.xbutton.y);
-              DefineCursor(dsp->display_id, report.xany.window, &VertScrollCursor);
+              DefineCursor(dsp, report.xany.window, &VertScrollCursor);
              break;
            default: break;
          } /* end switch */
@@ -344,4 +340,4 @@ void getXsignaldata(DspInterface dsp)
      Set_BitGravity(&report.xbutton, dsp, dsp->NWGrav, NorthWestGravity);
    XFlush(dsp->display_id);
  } /* end while */
-} /* end getXsignaldata() */
+} /* end process_Xevents */
Author	SHA1	Message	Date
Nick Briggs	85c4ebf0ac	Merge branch 'master' of github.com:Interlisp/maiko	2021-09-03 16:47:02 -07:00
Nick Briggs	7284e19b32	Suppress clang-tidy warnings for uses of bzero() The only uses of bzero() in the maiko sources come about because it is used in the macOS definition of the FD_ZERO() macro in sys/select.h. Suppress the warning by including -clang-analyzer-security.insecureAPI.bzero in the clang-tidy list of checks. This may well have been replaced by a memset() call in more up-to-date macOS releases.	2021-09-03 16:39:29 -07:00
Nick Briggs	0de1b1438b	Left shift is undefined if left argument is negative (#454 ) (#393 )	2021-09-03 12:46:21 -07:00
Nick Briggs	740f012254	Eliminate URaid access to uninitialized pointer when saving post-crash VM image Old code attempted to save the display region through an uninitialized pointer which occurs nowhere else in the system. Removed the save.	2021-09-02 15:14:32 -07:00
Nick Briggs	377a6f3f47	Rewrite keyboard and async I/O handling to improve performance and reduce dependency on async I/O signals (#392 ) * Rewrite keyboard and async I/O handling to improve performance and reduce dependency on async I/O signals Replaces the SIGIO handler, which used to process X events in the interrupt context, with a stub routine that sets a flag to signal processing is required. Actual event processing is moved to the main dispatch loop where Lisp periodic interrupts are handled. Removes the X connection file descriptor from the set of fds contributing to SIGIO events and moves the processing of X events to where the Lisp periodic interrupt is handled in the main dispatch loop. This code is already guarded by a check for XPending() so can be called regardless of whether any file descriptors are known to be ready. Actual processing of async I/O events and X events are handled by procedures process_io_events() and process_Xevents() respectively. For the most part these are a renaming of getsignaldata() and getXsignaldata(). The Lisp periodic timer (VTALRM) was set to operate with a 25000 us period (40 Hz), but on modern hardware it is possible to run this timer with a period of 10000 us (100 Hz) Incidentally, a bug was noted (and fixed) in the X event handling code for motion events: Mouse motion without any keyboard activity should not add an entry to the keyboard event ring buffer as these events do not represent a key state change. Since the ring buffer is of limited size, when it is filled new events are ignored until the buffered events are processed. This resulted in the loss of a key/mouse button transition (up or down) if the mouse was moved about "too much" between keyboard events. A few incidental cleanups were also made: - KBDEventFlg initialization fixed (wrong semantic type) - Event_Req renamed to IO_Signalled (more appropriate name) - int_io_open() sets up process (self) to handle SIGIO generated by O_ASYNC operations - LOCK_X_EVENTS turned off since X library calls can no longer happen in an interrupt context * Use of O_ASYNC must depend on the symbol being defined (looking at you, Cygwin) * Add SA_RESTART flag to sigaction for SIGVTALRM periodic interrupt * LOCK_X_UPDATE is no longer needed and should not be defined by default for Solaris in version.h	2021-09-02 12:42:51 -07:00
Nick Briggs	c07618f55c	Do not attempt to use ether_fd as valid fd if it is -1. Closes medley #450	2021-09-02 10:35:10 -07:00
Nick Briggs	dbbb59b30b	Add clang-tidy to CMakeLists.txt -- run it at compile time if it is found at cmake configuration time	2021-08-29 13:39:07 -07:00
Nick Briggs	e957e331c4	Lock X updates for all systems and lock around X cleanup at exit (#391 ) * Lock X updates for all systems and lock around X cleanup at exit All systems which could generate I/O interrupts on the X file descriptor need to have locking enabled, or there is a high probability that the X library will deadlock. This requirement may be removed in the future with restructuring of the way that the interrupt driven I/O is handled. Ensure that the appropriate XLOCK/XUNLOCK is done around the X window closing code. * Also lock X updates when building with CMake.	2021-08-26 16:29:10 -07:00
Nick Briggs	934a86fbb5	Remove Create_N_Set_Cell() which is unused since native code is not supported.	2021-08-24 12:05:17 -07:00
Nick Briggs	28ea238807	Check for flags in argv[1..n] not argv[0..n]	2021-08-23 21:15:23 -07:00
Nick Briggs	81c36341ef	Fully initialize XImage ScreenBitmap with XInitImage() before using it.	2021-08-22 18:23:41 -07:00
Nick Briggs	6cad51735f	Fix errors preventing the use of -DDTDDEBUG for mkcell.c (#389 )	2021-08-11 11:37:15 -07:00
Nick Briggs	c33386ef44	Remove code for unsupported Sun display configurations (#388 ) * Remove code for unsupported Sun display configurations Initial cleanup removing all code that was #ifdef'd for SUNDISPLAY. Other SunWindows dependent code may also be removeable * prropstyle will never be defined with no SunWindows support and therefore no pixrect code * Remove code that is ifndef NOPIXRECT, since pixrects are part of the obsolete Sun windows code. There are still traces of pixrect dependent code that could be removed.	2021-08-10 16:31:59 -07:00
Nick Briggs	588e804a2f	Merge branch 'master' of github.com:Interlisp/maiko	2021-08-09 13:15:04 -07:00
Nick Briggs	c56cbb2a91	Add missing include of <time.h> to initsout.c	2021-08-09 12:30:34 -07:00
Tim Hawes	ef31b3fe0b	Additional Makefiles for FreeBSD amd64, Raspberry Pi (#387 ) * Add makefiles for FreeBSD amd64 and aarch64 * Add appropriate comments in new makefiles * Add makefile-init files for the new FreeBSD archs	2021-08-08 14:59:15 -07:00
Nick Briggs	ea8d31f590	Set up git workflow to build a maiko docker image with multi-architecture support On pushes to master: builds images for x86_64, Apple M1, and ARMv7 architectures based on Ubuntu Focal release. This builds only the regular lde/ldex and does NOT build the ldeinit, so these are not suitable for doing a loadup from scratch. Commit based on https://github.com/stumbo/maiko/tree/gitHubBuild	2021-07-31 11:34:27 -07:00
Nick Briggs	093fb9a3d5	Merge branch 'master' of github.com:Interlisp/maiko	2021-07-30 18:30:05 -07:00
Nick Briggs	b53620852a	Clean up makefile fragments for FreeBSD on 386 * Add LOCK_X_UPDATES * Increase optimization level to -O2 and adjust -g option * Add makefile-init-freebsd.386 in order to do loadups	2021-07-30 17:46:35 -07:00
Nick Briggs	13163c6772	Add build directory to .gitignore so typical cmake build doesn't generate git changes	2021-07-30 17:25:00 -07:00
Nick Briggs	9e179e66f2	Call getXsignaldata() with XLocked set getXsignaldata() can call additional Xlib procedures which could generate an I/O interrupt. To avoid deadlocks in Xlib, ensure that XLocked is set when getXsignaldata() is called.	2021-07-08 15:18:41 -07:00
Nick Briggs	084d69c6e8	Comment out build-pi in workflows because the RPi system is not online at this time.	2021-07-06 20:21:03 -07:00
Nick Briggs	40e18e6da0	Remove unnecessary XLOCK/XUNLOCK around calls to bitblt_to_screen/clipping_Xbitblt in getXsignaldata()	2021-07-06 20:15:35 -07:00
Nick Briggs	9ed46e6b69	Integer variables referenced from a signal handler (XLocked, XNeedSignal) should be type sig_atomic_t	2021-07-05 14:19:23 -07:00
Nick Briggs	934b15b63b	Correct declaration mismatch for Event_Req between xc.c and other (correct) sites	2021-07-05 14:10:38 -07:00
Nick Briggs	2de44247b5	Include byteswapdefs.h for swapx() and byte_swap_code_block()	2021-07-05 14:03:02 -07:00
Nick Briggs	ef6a6554ac	Remove SIGPOLL usage (#385 ) * Remove unnecessary calls to XLOCK/XUNLOCK The X methods called by flush_display_region() and flush_display_lineregion() handle the locking/unlocking, therefore it is unnecessary to invoke the locking here. * Remove explict signals when doing XUNLOCK() Call getXsignaldata() directly if a signal happened while X code was locked, instead of generating a signal and then handling it. Some macros and functions needed to pass the DspInterface instead of extracting the X display and window and passing those so that the correct structure was available for the XUNLOCK() call.	2021-06-27 19:02:02 -07:00
Nick Briggs	1c47bf5df0	Fix the FastRetCALL macro to use do {} while (0) style (#384 )	2021-06-17 13:21:00 -07:00
Nick Briggs	f42671022f	Remove outdated hand-optimized assembler support for gcc on 386 (#379 )	2021-05-29 17:32:32 -07:00
Nick Briggs	2122f095e8	Simplify OPFN/OPFNX macros by removing hand expansion of 1, 2, N bindings (#383 ) The OPFN and OPFNX macros had been coded with a hand expansion of a loop pushing values on the stack to separately handle the cases of 1, 2, and more values. This actually lead to larger, likely slower, and certainly less obvious code.	2021-05-18 16:35:21 -07:00
Abe Jellinek	91fe7d51f9	Correct Medley GitHub link in README (#380 )	2021-04-14 09:38:11 -07:00