(BASE_PURESIZE): Increment base size.

[gnu-emacs] / src / w32reg.c

diff --git a/src/w32reg.c b/src/w32reg.c
index 73214d787d50ab1a0ebd251ad9916b9b738c62c4..6d3137f1d4f770ad0e80d1d21ebca9a208c50f0d 100644 (file)
--- a/src/w32reg.c
+++ b/src/w32reg.c
@@ -30,6 +30,33 @@ Boston, MA 02111-1307, USA.  */
 
 #define REG_ROOT "SOFTWARE\\GNU\\Emacs"
 
+/* Default system colors from the Display Control Panel settings.  */
+#define SYSTEM_DEFAULT_RESOURCES                          \
+  "emacs.foreground:SystemWindowText\0"                          \
+  "emacs.background:SystemWindow\0"                       \
+  "emacs.tooltip.attributeForeground:SystemInfoText\0"    \
+  "emacs.tooltip.attributeBackground:SystemInfoWindow\0"  \
+  "emacs.tool-bar.attributeForeground:SystemButtonText\0" \
+  "emacs.tool-bar.attributeBackground:SystemButtonFace\0" \
+  "emacs.menu.attributeForeground:SystemMenuText\0"       \
+  "emacs.menu.attributeBackground:SystemMenu\0"           \
+  "emacs.scroll-bar.attributeForeground:SystemScrollbar"
+
+/* Other possibilities for default faces:
+
+  region: Could use SystemHilight, but interferes with our ability to
+  see most syntax highlighting through the region face.
+
+  modeline: Could use System(In)ActiveTitle, gradient versions (not
+  supported on 95 and NT), but modeline is more like a status bar
+  really (which don't appear to be configurable in Windows).
+
+  highlight: Could use SystemHotTrackingColor, but it is not supported
+  on Windows 95 or NT, and other apps only seem to use it for menus
+  anyway.
+
+*/
+
 static char *
 w32_get_rdb_resource (rdb, resource)
      char *rdb;
@@ -109,7 +136,9 @@ w32_get_string_resource (name, class, dwexptype)
          hive = HKEY_LOCAL_MACHINE;
          goto trykey;
        }
-      return (NULL);
+
+      /* Check if there are Windows specific defaults defined.  */
+      return w32_get_rdb_resource (SYSTEM_DEFAULT_RESOURCES, name);
     }
   return (lpvalue);
 }
@@ -119,7 +148,7 @@ w32_get_string_resource (name, class, dwexptype)
 
 char *
 x_get_string_resource (rdb, name, class)
-     char *rdb;
+     XrmDatabase rdb;
      char *name, *class;
 {
   if (rdb)