Add the -xrm command-line option, to allow specification of an

arbitrary X resource which doesn't have a dedicated command-line
option.

git-svn-id: svn://svn.tartarus.org/sgt/putty@2089 cda61777-01e9-0310-a592-d414129be87e

diff --git a/unix/pterm.1 b/unix/pterm.1
index 2bfcf84..744ff6f 100644 (file)
--- a/unix/pterm.1
+++ b/unix/pterm.1
@@ -97,6 +97,12 @@ enables you to play NetHack with the numeric keypad without having
 to use the NetHack "number_pad" option (which requires you to press
 "n" before any repeat count). So you can move with the numeric
 keypad, and enter repeat counts with the normal number keys.
+.IP "\fB-xrm\fP \fIresource-string\fP"
+This option specifies an X resource string. Useful for setting
+resources which do not have their own command-line options. For
+example:
+
+pterm -xrm 'ScrollbarOnLeft: 1'
 .SH X RESOURCES
 \fIpterm\fP can be more completely configured by means of X
 resources. All of these resources are of the form \fIpterm.FOO\fP

diff --git a/unix/pterm.c b/unix/pterm.c
index 5af9ba1..1e80df4 100644 (file)
--- a/unix/pterm.c
+++ b/unix/pterm.c
@@ -1733,6 +1733,11 @@ int do_cmdline(int argc, char **argv, int do_everything)
        } else if (!strcmp(p, "-name")) {
            EXPECTS_ARG;
            app_name = val;
+
+       } else if (!strcmp(p, "-xrm")) {
+           EXPECTS_ARG;
+           provide_xrm_string(val);
+
        }
     }
 

diff --git a/unix/unix.h b/unix/unix.h
index e175425..488a422 100644 (file)
--- a/unix/unix.h
+++ b/unix/unix.h
@@ -44,6 +44,9 @@ int font_dimension(int which);               /* 0 for width, 1 for height */
 /* Things uxstore.c needs from pterm.c */
 char *app_name;                               /* for doing resource lookups */
 
+/* Things uxstore.c provides to pterm.c */
+void provide_xrm_string(char *string);
+
 #define DEFAULT_CODEPAGE 0            /* FIXME: no idea how to do this */
 
 #endif

diff --git a/unix/uxstore.c b/unix/uxstore.c
index c4ba9dd..06f6d3f 100644 (file)
--- a/unix/uxstore.c
+++ b/unix/uxstore.c
@@ -5,11 +5,13 @@
 
 #include <stdio.h>
 #include <stdlib.h>
+#include <ctype.h>
 #include <gtk/gtk.h>
 #include <gdk/gdkx.h>
 #include <X11/Xlib.h>
 #include "putty.h"
 #include "storage.h"
+#include "tree234.h"
 
 /*
  * For the moment, the only existing Unix utility is pterm and that
@@ -46,6 +48,65 @@ void close_settings_w(void *handle)
 
 static Display *display;
 
+struct xrm_string {
+    char *key;
+    char *value;
+};
+
+static tree234 *xrmtree = NULL;
+
+int xrmcmp(void *av, void *bv)
+{
+    struct xrm_string *a = (struct xrm_string *)av;
+    struct xrm_string *b = (struct xrm_string *)bv;
+    return strcmp(a->key, b->key);
+}
+
+void provide_xrm_string(char *string)
+{
+    char *p, *q;
+    struct xrm_string *xrms, *ret;
+
+    p = q = strchr(string, ':');
+    if (!q) {
+       fprintf(stderr, "pterm: expected a colon in resource string"
+               " \"%s\"\n", string);
+       return;
+    }
+    q++;
+    while (p > string && p[-1] != '.' && p[-1] != '*')
+       p--;
+    xrms = smalloc(sizeof(struct xrm_string));
+    xrms->key = smalloc(q-p);
+    memcpy(xrms->key, p, q-p);
+    xrms->key[q-p-1] = '\0';
+    while (*q && isspace(*q))
+       q++;
+    xrms->value = dupstr(q);
+
+    if (!xrmtree)
+       xrmtree = newtree234(xrmcmp);
+
+    ret = add234(xrmtree, xrms);
+    if (ret) {
+       /* Override an existing string. */
+       del234(xrmtree, ret);
+       add234(xrmtree, xrms);
+    }
+}
+
+char *get_setting(char *key)
+{
+    struct xrm_string tmp, *ret;
+    tmp.key = key;
+    if (xrmtree) {
+       ret = find234(xrmtree, &tmp, NULL);
+       if (ret)
+           return ret->value;
+    }
+    return XGetDefault(display, app_name, key);
+}
+
 void *open_settings_r(char *sessionname)
 {
     static int thing_to_return_an_arbitrary_non_null_pointer_to;
@@ -58,7 +119,7 @@ void *open_settings_r(char *sessionname)
 
 char *read_setting_s(void *handle, char *key, char *buffer, int buflen)
 {
-    char *val = XGetDefault(display, app_name, key);
+    char *val = get_setting(key);
     if (!val)
        return NULL;
     else {
@@ -70,7 +131,7 @@ char *read_setting_s(void *handle, char *key, char *buffer, int buflen)
 
 int read_setting_i(void *handle, char *key, int defvalue)
 {
-    char *val = XGetDefault(display, app_name, key);
+    char *val = get_setting(key);
     if (!val)
        return defvalue;
     else