From 4a61a3fa6bcf78123dd029ceab37b72c866e9f80 Mon Sep 17 00:00:00 2001
From: Nick Briggs <nicholas.h.briggs@gmail.com>
Date: Sat, 7 Jan 2023 17:38:34 -0800
Subject: [PATCH] Remove unused/obsolete LispWindowFd references/definition

---
 src/bbtsub.c   | 1 -
 src/bitblt.c   | 1 -
 src/common.c   | 2 +-
 src/draw.c     | 1 -
 src/dspsubrs.c | 1 -
 src/initdsp.c  | 1 -
 src/kbdsubrs.c | 1 -
 src/keyevent.c | 2 +-
 src/llstk.c    | 1 -
 src/misc7.c    | 1 -
 src/uraid.c    | 2 +-
 src/vmemsave.c | 1 -
 12 files changed, 3 insertions(+), 12 deletions(-)

diff --git a/src/bbtsub.c b/src/bbtsub.c
index 96a46e4..4730375 100644
--- a/src/bbtsub.c
+++ b/src/bbtsub.c
@@ -224,7 +224,6 @@ typedef struct tbta {
 } TBLTARG;
 #endif /* BYTESWAP */
 
-extern int LispWindowFd;
 extern int ScreenLocked; /* for mouse tracking */
 /*****************************************************************
 (PUTPROPS \SETPBTFUNCTION MACRO
diff --git a/src/bitblt.c b/src/bitblt.c
index c95de6f..087d393 100644
--- a/src/bitblt.c
+++ b/src/bitblt.c
@@ -41,7 +41,6 @@ extern int kbd_for_makeinit;
 extern DspInterface currentdsp;
 #endif
 
-extern int LispWindowFd;
 extern int ScreenLocked;
 
 #ifdef COLOR
diff --git a/src/common.c b/src/common.c
index 077acbb..785941d 100644
--- a/src/common.c
+++ b/src/common.c
@@ -39,7 +39,7 @@ error
 ******************************************************************/
 
 extern fd_set LispReadFds;
-extern int LispWindowFd, LispKbdFd;
+extern int LispKbdFd;
 extern struct screen LispScreen;
 extern int displaywidth, displayheight;
 extern DLword *DisplayRegion68k;
diff --git a/src/draw.c b/src/draw.c
index cd12310..09b314f 100644
--- a/src/draw.c
+++ b/src/draw.c
@@ -37,7 +37,6 @@ extern int displaywidth, displayheight;
 extern int DisplayRasterWidth;
 extern DLword *DisplayRegion68k_end_addr;
 
-extern int LispWindowFd;
 extern int ScreenLocked;
 
 #ifdef COLOR
diff --git a/src/dspsubrs.c b/src/dspsubrs.c
index d2f87dc..b2a9651 100644
--- a/src/dspsubrs.c
+++ b/src/dspsubrs.c
@@ -75,7 +75,6 @@ LispPTR DSP_VideoColor(LispPTR *args) /* args[0] :	black flag	*/
 }
 
 extern struct cursor CurrentCursor;
-extern int LispWindowFd;
 
 /****************************************************
  *
diff --git a/src/initdsp.c b/src/initdsp.c
index 1630545..86c0335 100644
--- a/src/initdsp.c
+++ b/src/initdsp.c
@@ -54,7 +54,6 @@ extern DspInterface currentdsp;
 #endif
 
 
-int LispWindowFd = -1;
 int FrameBufferFd = -1;
 
 extern unsigned displaywidth, displayheight, DisplayRasterWidth, DisplayType, DisplayByteSize;
diff --git a/src/kbdsubrs.c b/src/kbdsubrs.c
index 8eb48e3..3e4fb26 100644
--- a/src/kbdsubrs.c
+++ b/src/kbdsubrs.c
@@ -55,7 +55,6 @@ extern DspInterface currentdsp;
 #include <X11/Xlib.h>
 #endif /* XWINDOW */
 
-extern int LispWindowFd;
 extern fd_set LispReadFds;
 
 void KB_enable(LispPTR *args) /* args[0] :	ON/OFF flag
diff --git a/src/keyevent.c b/src/keyevent.c
index d2b4893..9338df4 100644
--- a/src/keyevent.c
+++ b/src/keyevent.c
@@ -110,7 +110,6 @@ extern DspInterface currentdsp;
 extern DLword *EmMouseX68K, *EmMouseY68K, *EmKbdAd068K, *EmRealUtilin68K, *EmUtilin68K;
 extern DLword *EmKbdAd168K, *EmKbdAd268K, *EmKbdAd368K, *EmKbdAd468K, *EmKbdAd568K;
 extern u_char *SUNLispKeyMap;
-extern int LispWindowFd;
 extern int RS232C_Fd, RS232C_remain_data;
 extern fd_set LispIOFds;
 fd_set LispReadFds;
@@ -218,6 +217,7 @@ DLword ColorCursor_savebitmap[CURSORWIDTH / COLORPIXELS_IN_DLWORD * CURSORHEIGHT
 /*									*/
 /*		  LispWindowFd	The keyboard/window FD, for keyboard	*/
 /*				and mouse events.			*/
+/*				01/07/2023 - unused, obsolete		*/
 /*									*/
 /*		  LispIOFds	A bit vector of TCP FDs, or other	*/
 /*				FDs Lisp is doing async I/O on.		*/
diff --git a/src/llstk.c b/src/llstk.c
index 21de461..faf5d9d 100644
--- a/src/llstk.c
+++ b/src/llstk.c
@@ -466,7 +466,6 @@ void decusecount68k(FX *frame68k) {
 
 #ifdef ORG_FILPCORSORBAR
 extern DLword *EmCursorBitMap68K;
-extern int LispWindowFd;
 
 #ifdef XWINDOW
 extern int Current_Hot_X, Current_Hot_Y;
diff --git a/src/misc7.c b/src/misc7.c
index 37b3c0a..adfb65c 100644
--- a/src/misc7.c
+++ b/src/misc7.c
@@ -33,7 +33,6 @@
 #define OP_READ 2   /* Just read the bit that's there. */
 #define OP_PAINT 3  /* Turn the bit on. */
 
-extern int LispWindowFd;
 extern int ScreenLocked;
 
 /***	N_OP_misc7  -- pseudocolor or fbitmapbit   ***/
diff --git a/src/uraid.c b/src/uraid.c
index b3b823d..df9ecab 100644
--- a/src/uraid.c
+++ b/src/uraid.c
@@ -143,7 +143,7 @@ v filename              Save the virtual memory on the filename(Not Bootable)
 /************************************************************************/
 
 extern int DisplayRasterWidth;
-extern int LispWindowFd, LispKbdFd;
+extern int LispKbdFd;
 extern fd_set LispReadFds;
 extern struct cursor CurrentCursor, InvisibleCursor;
 extern struct screen LispScreen;
diff --git a/src/vmemsave.c b/src/vmemsave.c
index 7a0b4a1..3071e64 100644
--- a/src/vmemsave.c
+++ b/src/vmemsave.c
@@ -68,7 +68,6 @@
 #define FILECANNOTWRITE (S_POSITIVE | 5)
 #define FILETIMEOUT (S_POSITIVE | 6)
 
-extern int LispWindowFd;
 extern struct pixrect *CursorBitMap, *InvisibleCursorBitMap;
 extern struct cursor CurrentCursor, InvisibleCursor;
 #ifdef DOS