nhyatt/putty-source
1
0
Fork 0
mirror of https://git.tartarus.org/simon/putty.git synced 2025-07-05 13:32:48 -05:00
Code Issues Projects Releases Wiki Activity

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

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

[originally from svn r2089]
This commit is contained in:
Simon Tatham
2002-10-16 22:54:58 +00:00
parent e70c66b8b0
commit 3c6a770e9f
4 changed files with 77 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

65
unix/uxstore.c
View File

@ -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