[Refactor] #2170 四天王の残り3人、XAWについて言及していたコメント、プリプロ、ガンマ調整をまとめて削除し、ベルゼバブのいる魔王城の扉を開いた

diff --git a/src/maid-x11.cpp b/src/maid-x11.cpp
index 3d61933..031bc32 100644 (file)
--- a/src/maid-x11.cpp
+++ b/src/maid-x11.cpp
@@ -22,7 +22,7 @@
  *
  * Major fixes and cleanup by Ben Harrison (benh@phial.com).
  *
- * This file is designed to be "included" by "main-x11.c" or "main-xaw.c",
+ * This file is designed to be "included" by "main-x11.c",
  * which will have already "included" several relevant header files.
  */
 
@@ -678,9 +678,7 @@ static XImage *ResizeImageSmooth(Display *dpy, XImage *Im, int ix, int iy, int o
 }
 
 /*
- * Resize an image. XXX XXX XXX
- *
- * Also appears in "main-xaw.c".
+ * Resize an image.
  */
 static XImage *ResizeImage(Display *dpy, XImage *Im, int ix, int iy, int ox, int oy)
 {

diff --git a/src/main-x11.cpp b/src/main-x11.cpp
index 8817773..8b8998b 100644 (file)
--- a/src/main-x11.cpp
+++ b/src/main-x11.cpp
@@ -14,8 +14,6 @@
  * To use this file, compile with "USE_X11" defined, and link against all
  * the various "X11" libraries which may be needed.
  *
- * See also "main-xaw.c".
- *
  * Part of this file provides a user interface package composed of several
  * pseudo-objects, including "metadpy" (a display), "infowin" (a window),
  * "infoclr" (a color), and "infofnt" (a font).  Actually, the package was
@@ -1058,8 +1056,6 @@ static void send_keys(const char *const keys)
 
 /*
  * Process a keypress event
- *
- * Also appears in "main-xaw.c".
  */
 static void react_keypress(XKeyEvent *xev)
 {

diff --git a/src/main.cpp b/src/main.cpp
index a6403cb..824dc43 100644 (file)
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -511,17 +511,6 @@ int main(int argc, char *argv[])
     /* Install "quit" hook */
     quit_aux = quit_hook;
 
-#ifdef USE_XAW
-    /* Attempt to use the "main-xaw.c" support */
-    if (!done && (!mstr || (streq(mstr, "xaw")))) {
-        extern errr init_xaw(int, char **);
-        if (0 == init_xaw(argc, argv)) {
-            ANGBAND_SYS = "xaw";
-            done = true;
-        }
-    }
-#endif
-
 #ifdef USE_X11
     /* Attempt to use the "main-x11.c" support */
     if (!done && (!mstr || (streq(mstr, "x11")))) {

diff --git a/src/main/x11-gamma-builder.cpp b/src/main/x11-gamma-builder.cpp
index e54915a..1532379 100644 (file)
--- a/src/main/x11-gamma-builder.cpp
+++ b/src/main/x11-gamma-builder.cpp
@@ -11,7 +11,7 @@
  * components (Red, Green, Blue), for example, TERM_UMBER is defined
  * as 2/4 Red, 1/4 Green, 0/4 Blue.
  *
- * The following info is from "Torbjorn Lindgren" (see "main-xaw.c").
+ * The following info is from "Torbjorn Lindgren".
  *
  * These values are NOT gamma-corrected.  On most machines (with the
  * Macintosh being an important exception), you must "gamma-correct"