From d2aff9a9b240da5b078d6ff88a11ae446f9d9398 Mon Sep 17 00:00:00 2001
From: nhmall <nhmall@nethack.org>
Date: Tue, 14 Jan 2025 12:13:39 -0500
Subject: [PATCH] remove some xchar vestiges

---
 outdated/include/wingem.h     | 2 +-
 outdated/sys/amiga/winami.p   | 2 +-
 outdated/sys/amiga/winfuncs.c | 5 ++---
 outdated/sys/amiga/winproto.h | 2 +-
 outdated/sys/mac/mrecover.c   | 4 ++--
 outdated/win/gem/wingem.c     | 8 ++++----
 outdated/win/gem/wingem1.c    | 3 +--
 win/tty/wintty.c              | 3 +--
 8 files changed, 13 insertions(+), 16 deletions(-)

diff --git a/outdated/include/wingem.h b/outdated/include/wingem.h
index c7a935ef2..4c1378c0e 100644
--- a/outdated/include/wingem.h
+++ b/outdated/include/wingem.h
@@ -83,7 +83,7 @@ extern void Gem_cliparound(int, int);
 #ifdef POSITIONBAR
 extern void Gem_update_positionbar(char *);
 #endif
-extern void Gem_print_glyph(winid, xchar, xchar, const glyph_info *,
+extern void Gem_print_glyph(winid, coordxy, coordxy, const glyph_info *,
                        const glyph_info *);
 extern void Gem_raw_print(const char *);
 extern void Gem_raw_print_bold(const char *);
diff --git a/outdated/sys/amiga/winami.p b/outdated/sys/amiga/winami.p
index 0fd69a38f..2e26cfb10 100644
--- a/outdated/sys/amiga/winami.p
+++ b/outdated/sys/amiga/winami.p
@@ -35,7 +35,7 @@ int amii_doprev_message (void);
 void amii_display_nhwindow(winid  , boolean );
 void amii_display_file(const char * , boolean );
 void amii_curs(winid  , int  , int );
-void amii_print_glyph(winid  , xchar  , xchar  , int, int );
+void amii_print_glyph(winid  , coordxy  , coordxy  , int, int );
 void DoMenuScroll(int  , int );
 void DisplayData(int  , int  , int );
 void SetPropInfo(struct Window * , struct Gadget * , long  , long  , long );
diff --git a/outdated/sys/amiga/winfuncs.c b/outdated/sys/amiga/winfuncs.c
index 3624e3815..28a811ba7 100644
--- a/outdated/sys/amiga/winfuncs.c
+++ b/outdated/sys/amiga/winfuncs.c
@@ -1515,8 +1515,7 @@ boolean blocking;
 void
 amii_curs(window, x, y)
 winid window;
-register int x, y; /* not xchar: perhaps xchar is unsigned and
-              curx-x would be unsigned as well */
+register int x, y;
 {
     register struct amii_WinDesc *cw;
     register struct Window *w;
@@ -1954,7 +1953,7 @@ port_help()
 void
 amii_print_glyph(win, x, y, glyph, bkglyph)
 winid win;
-xchar x, y;
+coordxy x, y;
 int glyph, bkglyph;
 {
     struct amii_WinDesc *cw;
diff --git a/outdated/sys/amiga/winproto.h b/outdated/sys/amiga/winproto.h
index eb2b588d8..efa1e9b58 100644
--- a/outdated/sys/amiga/winproto.h
+++ b/outdated/sys/amiga/winproto.h
@@ -101,7 +101,7 @@ void amii_resume_nhwindows(void);
 void amii_bell(void);
 void removetopl(int cnt);
 void port_help(void);
-void amii_print_glyph(winid win, xchar x, xchar y, int glyph, int bkglyph);
+void amii_print_glyph(winid win, coordxy x, coordxy y, int glyph, int bkglyph);
 void amii_raw_print(const char *s);
 void amii_raw_print_bold(const char *s);
 void amii_update_inventory(void);
diff --git a/outdated/sys/mac/mrecover.c b/outdated/sys/mac/mrecover.c
index 01ea7587b..9a42c4889 100644
--- a/outdated/sys/mac/mrecover.c
+++ b/outdated/sys/mac/mrecover.c
@@ -1192,7 +1192,7 @@ restore_savefile()
 {
     static int savelev;
     long saveTemp, lev;
-    xchar levc;
+    xint8 levc;
     struct version_info version_data;
 
     /* level 0 file contains:
@@ -1264,7 +1264,7 @@ restore_savefile()
         levRefNum = open_levelfile(lev);
         if (levRefNum >= 0) {
             /* any or all of these may not exist */
-            levc = (xchar) lev;
+            levc = (xint8) lev;
 
             (void) write_savefile(saveRefNum, (Ptr) &levc, sizeof(levc));
 
diff --git a/outdated/win/gem/wingem.c b/outdated/win/gem/wingem.c
index 15024f853..078a2d2a7 100644
--- a/outdated/win/gem/wingem.c
+++ b/outdated/win/gem/wingem.c
@@ -880,7 +880,7 @@ int x, y;
  *  position and glyph are always correct (checked there)!
  */
 
-void mar_print_gl_char(winid, xchar, xchar, int);
+void mar_print_gl_char(winid, coordxy, coordxy, int);
 
 extern int mar_set_rogue(int);
 
@@ -889,7 +889,7 @@ extern void mar_add_pet_sign(winid, int, int);
 void
 Gem_print_glyph(window, x, y, glyph, bkglyph)
 winid window;
-xchar x, y;
+coordxy x, y;
 int glyph, bkglyph;
 {
     /* Move the cursor. */
@@ -908,12 +908,12 @@ int glyph, bkglyph;
         mar_print_gl_char(window, x, y, glyph);
 }
 
-void mar_print_char(winid, xchar, xchar, char, int);
+void mar_print_char(winid, coordxy, coordxy, char, int);
 
 void
 mar_print_gl_char(window, x, y, glyph)
 winid window;
-xchar x, y;
+coordxy x, y;
 int glyph;
 {
     int ch;
diff --git a/outdated/win/gem/wingem1.c b/outdated/win/gem/wingem1.c
index 75c96918d..594c3ccbf 100644
--- a/outdated/win/gem/wingem1.c
+++ b/outdated/win/gem/wingem1.c
@@ -26,11 +26,10 @@ typedef signed char schar;
 #define CHAR_P char
 #define SCHAR_P schar
 #define UCHAR_P uchar
-#define XCHAR_P xchar
+#define COORDXY_P coordxy
 #define SHORT_P short
 #define BOOLEAN_P boolean
 #define ALIGNTYP_P aligntyp
-typedef signed char xchar;
 #include "wingem.h"
 #undef CHAR_P
 #undef SCHAR_P
diff --git a/win/tty/wintty.c b/win/tty/wintty.c
index 288653e5c..dbdf57363 100644
--- a/win/tty/wintty.c
+++ b/win/tty/wintty.c
@@ -2036,8 +2036,7 @@ erase_tty_screen(void)
 void
 tty_curs(
     winid window,
-    int x, int y) /* not xchar: perhaps xchar is unsigned
-                   * then curx-x would be unsigned too */
+    int x, int y)  /* coordinates (and curx-x) must be signed */
 {
     struct WinDesc *cw = 0;
     int cx = ttyDisplay->curx;