diff -aurN NetHack-NetHack-3.6.6_Released.orig/win/X11/winmap.c NetHack-NetHack-3.6.6_Released/win/X11/winmap.c
--- NetHack-NetHack-3.6.6_Released.orig/win/X11/winmap.c	2020-06-20 01:38:35.268488000 +0900
+++ NetHack-NetHack-3.6.6_Released/win/X11/winmap.c	2020-07-02 18:53:49.625156000 +0900
@@ -974,7 +974,7 @@
 
     if ((Is_rogue_level(&u.uz) ? map_info->is_tile
                                : (map_info->is_tile != iflags.wc_tiled_map))
-        && map_info->tile_map.image_width) {
+        && map_info->tile_map.square_width) {
         /* changed map display mode, re-display the full map */
         (void) memset((genericptr_t) map_info->t_start, (char) 0,
                       sizeof(map_info->t_start));
diff -aurN NetHack-NetHack-3.6.6_Released.orig/win/X11/winmesg.c NetHack-NetHack-3.6.6_Released/win/X11/winmesg.c
--- NetHack-NetHack-3.6.6_Released.orig/win/X11/winmesg.c	2020-06-20 01:38:35.269899000 +0900
+++ NetHack-NetHack-3.6.6_Released/win/X11/winmesg.c	2020-07-02 18:47:59.306949000 +0900
@@ -539,13 +539,17 @@
                     mesg_info->char_lbearing, mesg_info->char_ascent + y_base,
                     curr->line, curr->str_length);
 #else
+        GC gc = XCreateGC(XtDisplay(wp->w), XtWindow(wp->w), 0, NULL );
+        XtGCMask mask = GCFunction | GCForeground | GCBackground | GCFont;
+        XCopyGC(XtDisplay(wp->w), mesg_info->gc, mask, gc);
         XmbDrawString(XtDisplay(wp->w), XtWindow(wp->w),
                       mesg_info->fontset,
-                      mesg_info->gc,
+                      gc,
                       mesg_info->char_lbearing,
                       mesg_info->char_ascent + y_base,
                       curr->line,
                       curr->str_length);
+        XFreeGC(XtDisplay(wp->w), gc);
 #endif
         /*
          * This draws a line at the _top_ of the line of text pointed to by
diff -aurN NetHack-NetHack-3.6.6_Released.orig/win/X11/wintext.c NetHack-NetHack-3.6.6_Released/win/X11/wintext.c
--- NetHack-NetHack-3.6.6_Released.orig/win/X11/wintext.c	2020-06-20 01:38:35.272667000 +0900
+++ NetHack-NetHack-3.6.6_Released/win/X11/wintext.c	2020-07-02 18:48:12.252911000 +0900
@@ -642,7 +642,11 @@
     XtGetValues(w, args, 1);
     values.function = GXcopy;
     values.font = WindowFont(w);
+#ifndef XI18N
     gc = XtGetGC(w, mask, &values);
+#else
+    gc = XCreateGC(XtDisplay(w), XtWindow(w), mask, &values);
+#endif
 
     if (rip_pixmap != None) {
         XCopyArea(dpy, rip_pixmap, XtWindow(w), gc, event->x, event->y,
@@ -668,7 +672,11 @@
         y += appResources.tombtext_dy;
     }
 
+#ifndef XI18N
     XtReleaseGC(w, gc);
+#else
+    XFreeGC(XtDisplay(w), gc);
+#endif
 }
 
 /*