(w32_get_rdb_resource): New function.

(x_get_string_resource): Use it, so resources passed with -xrm supercede the
ones in the registry.

2 files changed, 47 insertions, 1 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 5d33debc93d..711f99351ba 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,19 @@
+2003-03-06  Juanma Barranquero  <lektu@terra.es>
+
+        * w32term.h (struct w32_display_info): Add xrdb member to support
+        passing resources via -xrm on Windows.
+
+        * w32term.c (w32_make_rdb): New function.
+        (w32_term_init): Use it to initialize xrdb member of w32_display_info
+        struct.  Delete leftover code.
+
+        * w32fns.c (Fx_get_resource, x_get_resource_string): Pass xrdb to check
+        for resources passed on the command line.
+
+        * w32reg.c (w32_get_rdb_resource): New function.
+        (x_get_string_resource): Use it, so resources passed with -xrm
+        supercede the ones in the registry.
+
 2003-03-04  Jan Dj,Ad(Brv  <jan.h.d@swipnet.se>
 
         * xterm.c (x_detect_focus_change): Call x_any_window_to_frame
diff --git a/src/w32reg.c b/src/w32reg.c
index 3a2bd1b68d9..73214d787d5 100644
--- a/src/w32reg.c
+++ b/src/w32reg.c
@@ -30,6 +30,26 @@ Boston, MA 02111-1307, USA.  */
 
 #define REG_ROOT "SOFTWARE\\GNU\\Emacs"
 
+static char *
+w32_get_rdb_resource (rdb, resource)
+     char *rdb;
+     char *resource;
+{
+  char *value = rdb;
+  int len = strlen (resource);
+
+  while (*value)
+    {
+      /* Comparison is case-insensitive because registry searches are too.  */
+      if ((strnicmp (value, resource, len) == 0) && (value[len] == ':'))
+        return xstrdup (&value[len + 1]);
+
+      value = strchr (value, '\0') + 1;
+    }
+
+  return NULL;
+}
+
 LPBYTE
 w32_get_string_resource (name, class, dwexptype)
      char *name, *class;
@@ -99,8 +119,18 @@ w32_get_string_resource (name, class, dwexptype)
 
 char *
 x_get_string_resource (rdb, name, class)
-     int rdb;
+     char *rdb;
      char *name, *class;
 {
+  if (rdb)
+    {
+      char *resource;
+
+      if (resource = w32_get_rdb_resource (rdb, name))
+        return resource;
+      if (resource = w32_get_rdb_resource (rdb, class))
+        return resource;
+    }
+
   return (w32_get_string_resource (name, class, REG_SZ));
 }