Remove eval-when-compile.

[gnu-emacs] / src / dosfns.c

diff --git a/src/dosfns.c b/src/dosfns.c
index b1ba6063a3777852c9728cda856690043ed99cf3..3c1fd8f764b46322546cc9b6744ecd6883b465e1 100644 (file)
--- a/src/dosfns.c
+++ b/src/dosfns.c
@@ -26,6 +26,7 @@ Boston, MA 02111-1307, USA.  */
 /* The entire file is within this conditional */
 
 #include <stdio.h>
+#include <string.h>
 #include <dos.h>
 #include "lisp.h"
 #include "buffer.h"
@@ -36,6 +37,7 @@ Boston, MA 02111-1307, USA.  */
 #include "window.h"
 #include "dosfns.h"
 #include "msdos.h"
+#include "dispextern.h"
 #include <dpmi.h>
 #include <go32.h>
 #include <dirent.h>
@@ -171,11 +173,6 @@ Report whether a mouse is present.")
   else
     return Qnil;
 }
-
-/* Function to translate colour names to integers.  See lisp/term/pc-win.el
-   for its definition.  */
-
-Lisp_Object Qmsdos_color_translate;
 #endif
 
 
@@ -401,6 +398,56 @@ init_dosfns ()
 }
 \f
 #ifndef HAVE_X_WINDOWS
+
+/* Emulation of some X window features from xfns.c and xfaces.c.  */
+
+/* Standard VGA colors, in the order of their standard numbering
+   in the default VGA palette.  */
+static char *vga_colors[16] = {
+  "black", "blue", "green", "cyan", "red", "magenta", "brown",
+  "lightgray", "darkgray", "lightblue", "lightgreen", "lightcyan",
+  "lightred", "lightmagenta", "yellow", "white"
+};
+
+extern char unspecified_fg[], unspecified_bg[];
+
+/* Given a color name, return its index, or -1 if not found.  Note
+   that this only performs case-insensitive comparison against the
+   standard names.  For anything more sophisticated, like matching
+   "gray" with "grey" or translating X color names into their MSDOS
+   equivalents, call the Lisp function Qtty_color_desc (defined
+   on lisp/term/tty-colors.el).  */
+int
+msdos_stdcolor_idx (const char *name)
+{
+  int i;
+
+  for (i = 0; i < sizeof (vga_colors) / sizeof (vga_colors[0]); i++)
+    if (strcasecmp (name, vga_colors[i]) == 0)
+      return i;
+
+  return
+    strcmp (name, unspecified_fg) == 0 ? FACE_TTY_DEFAULT_FG_COLOR
+    : strcmp (name, unspecified_bg) == 0 ? FACE_TTY_DEFAULT_BG_COLOR
+    : FACE_TTY_DEFAULT_COLOR;
+}
+
+/* Given a color index, return its standard name.  */
+Lisp_Object
+msdos_stdcolor_name (int idx)
+{
+  extern Lisp_Object Qunspecified;
+
+  if (idx == FACE_TTY_DEFAULT_FG_COLOR)
+    return build_string (unspecified_fg);
+  else if (idx == FACE_TTY_DEFAULT_BG_COLOR)
+    return build_string (unspecified_bg);
+  else if (idx >= 0 && idx < sizeof (vga_colors) / sizeof (vga_colors[0]))
+    return build_string (vga_colors[idx]);
+  else
+    return Qunspecified;       /* meaning the default */
+}
+
 /* Support for features that are available when we run in a DOS box
    on MS-Windows.  */
 int
@@ -469,6 +516,13 @@ dos_cleanup (void)
 #ifndef HAVE_X_WINDOWS
   restore_parent_vm_title ();
 #endif
+  /* Make sure the termscript file is committed, in case we are
+     crashing and some vital info was written there.  */
+  if (termscript)
+    {
+      fflush (termscript);
+      fsync (fileno (termscript));
+    }
 }
 
 /*
@@ -486,8 +540,6 @@ syms_of_dosfns ()
   defsubr (&Smsdos_mouse_disable);
 #ifndef HAVE_X_WINDOWS
   defsubr (&Smsdos_mouse_p);
-  Qmsdos_color_translate = intern ("msdos-color-translate");
-  staticpro (&Qmsdos_color_translate);
 #endif
 
   DEFVAR_INT ("dos-country-code", &dos_country_code,