ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/xdefaults.C
(Generate patch)

Comparing rxvt-unicode/src/xdefaults.C (file contents):
Revision 1.97 by ayin, Tue May 1 09:34:07 2007 UTC vs.
Revision 1.128 by ayin, Mon Dec 31 01:16:47 2007 UTC

… …
5 * All portions of code are copyright by their respective author/s. 5 * All portions of code are copyright by their respective author/s.
6 * Copyright (c) 1994 Robert Nation <nation@rocket.sanders.lockheed.com> 6 * Copyright (c) 1994 Robert Nation <nation@rocket.sanders.lockheed.com>
7 * - original version 7 * - original version
8 * Copyright (c) 1997,1998 mj olesen <olesen@me.queensu.ca> 8 * Copyright (c) 1997,1998 mj olesen <olesen@me.queensu.ca>
9 * Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com> 9 * Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com>
10 * Copyright (c) 2007 Emanuele Giaquinta <e.giaquinta@glauco.it>
10 * 11 *
11 * This program is free software; you can redistribute it and/or modify 12 * This program is free software; you can redistribute it and/or modify
12 * it under the terms of the GNU General Public License as published by 13 * it under the terms of the GNU General Public License as published by
13 * the Free Software Foundation; either version 2 of the License, or 14 * the Free Software Foundation; either version 2 of the License, or
14 * (at your option) any later version. 15 * (at your option) any later version.
… …
32#endif 33#endif
33 34
34/* place holders used for parsing command-line options */ 35/* place holders used for parsing command-line options */
35#define Optflag_Reverse 1 36#define Optflag_Reverse 1
36#define Optflag_Boolean 2 37#define Optflag_Boolean 2
38#define Optflag_Switch 4
37 39
38/* monolithic option/resource structure: */ 40/* monolithic option/resource structure: */
39/* 41/*
40 * `string' options MUST have a usage argument 42 * `string' options MUST have a usage argument
41 * `switch' and `boolean' options have no argument 43 * `switch' and `boolean' options have no argument
… …
54#define RSTRG(rsp, kw, arg) \ 56#define RSTRG(rsp, kw, arg) \
55 {0, 0, (rsp), (kw), NULL, (arg), NULL} 57 {0, 0, (rsp), (kw), NULL, (arg), NULL}
56 58
57/* BOOL () - regular boolean `-/+' flag */ 59/* BOOL () - regular boolean `-/+' flag */
58#define BOOL(rsp, kw, opt, option, flag, desc) \ 60#define BOOL(rsp, kw, opt, option, flag, desc) \
59 { option ## _idx, (Optflag_Boolean | (flag)), (rsp), (kw), (opt), NULL, (desc)} 61 { (option), (Optflag_Boolean | (flag)), (rsp), (kw), (opt), NULL, (desc)}
60 62
61/* SWCH () - `-' flag */ 63/* SWCH () - `-' flag */
62#define SWCH(opt, option, flag, desc) \ 64#define SWCH(opt, option, flag, desc) \
63 { option ## _idx, (flag), -1, NULL, (opt), NULL, (desc)} 65 { (option), (Optflag_Switch | (flag)), -1, NULL, (opt), NULL, (desc)}
64 66
65/* convenient macros */ 67/* convenient macros */
66#define optList_strlen(i) \ 68#define optList_strlen(i) \
67 (optList[i].flag ? 0 : (optList[i].arg ? strlen (optList[i].arg) : 1)) 69 (optList[i].flag ? 0 : (optList[i].arg ? strlen (optList[i].arg) : 1))
68#define optList_isBool(i) \ 70#define optList_isBool(i) \
… …
74 76
75static const struct 77static const struct
76 { 78 {
77 const uint8_t index; /* Option index */ 79 const uint8_t index; /* Option index */
78 const uint8_t flag; /* Option flag */ 80 const uint8_t flag; /* Option flag */
79 const int doff; /* data offset */ 81 const int16_t doff; /* resource value index or -1 */
80 const char *kw; /* keyword */ 82 const char *kw; /* keyword */
81 const char *opt; /* option */ 83 const char *opt; /* option */
82 const char *arg; /* argument */ 84 const char *arg; /* argument */
83 const char *desc; /* description */ 85 const char *desc; /* description */
84 } 86 }
… …
92 SWCH ("iconic", Opt_iconic, 0, "start iconic"), 94 SWCH ("iconic", Opt_iconic, 0, "start iconic"),
93 SWCH ("ic", Opt_iconic, 0, NULL), /* short form */ 95 SWCH ("ic", Opt_iconic, 0, NULL), /* short form */
94 BOOL (Rs_reverseVideo, "reverseVideo", "rv", Opt_reverseVideo, 0, "reverse video"), 96 BOOL (Rs_reverseVideo, "reverseVideo", "rv", Opt_reverseVideo, 0, "reverse video"),
95 BOOL (Rs_loginShell, "loginShell", "ls", Opt_loginShell, 0, "login shell"), 97 BOOL (Rs_loginShell, "loginShell", "ls", Opt_loginShell, 0, "login shell"),
96 BOOL (Rs_jumpScroll, "jumpScroll", "j", Opt_jumpScroll, 0, "jump scrolling"), 98 BOOL (Rs_jumpScroll, "jumpScroll", "j", Opt_jumpScroll, 0, "jump scrolling"),
99 BOOL (Rs_skipScroll, "skipScroll", "ss", Opt_skipScroll, 0, "skip scrolling"),
97 BOOL (Rs_pastableTabs, "pastableTabs", "ptab", Opt_pastableTabs, 0, "tab characters are pastable"), 100 BOOL (Rs_pastableTabs, "pastableTabs", "ptab", Opt_pastableTabs, 0, "tab characters are pastable"),
98#if HAVE_SCROLLBARS 101#if HAVE_SCROLLBARS
99 RSTRG (Rs_scrollstyle, "scrollstyle", "mode"), 102 RSTRG (Rs_scrollstyle, "scrollstyle", "mode"),
100 BOOL (Rs_scrollBar, "scrollBar", "sb", Opt_scrollBar, 0, "scrollbar"), 103 BOOL (Rs_scrollBar, "scrollBar", "sb", Opt_scrollBar, 0, "scrollbar"),
101 BOOL (Rs_scrollBar_right, "scrollBar_right", "sr", Opt_scrollBar_right, 0, "scrollbar right"), 104 BOOL (Rs_scrollBar_right, "scrollBar_right", "sr", Opt_scrollBar_right, 0, "scrollbar right"),
… …
105#endif 108#endif
106 BOOL (Rs_scrollTtyOutput, "scrollTtyOutput", NULL, Opt_scrollTtyOutput, 0, NULL), 109 BOOL (Rs_scrollTtyOutput, "scrollTtyOutput", NULL, Opt_scrollTtyOutput, 0, NULL),
107 BOOL (Rs_scrollTtyOutput, NULL, "si", Opt_scrollTtyOutput, Optflag_Reverse, "scroll-on-tty-output inhibit"), 110 BOOL (Rs_scrollTtyOutput, NULL, "si", Opt_scrollTtyOutput, Optflag_Reverse, "scroll-on-tty-output inhibit"),
108 BOOL (Rs_scrollTtyKeypress, "scrollTtyKeypress", "sk", Opt_scrollTtyKeypress, 0, "scroll-on-keypress"), 111 BOOL (Rs_scrollTtyKeypress, "scrollTtyKeypress", "sk", Opt_scrollTtyKeypress, 0, "scroll-on-keypress"),
109 BOOL (Rs_scrollWithBuffer, "scrollWithBuffer", "sw", Opt_scrollWithBuffer, 0, "scroll-with-buffer"), 112 BOOL (Rs_scrollWithBuffer, "scrollWithBuffer", "sw", Opt_scrollWithBuffer, 0, "scroll-with-buffer"),
110#if TRANSPARENT 113#if ENABLE_TRANSPARENCY
111 BOOL (Rs_transparent, "inheritPixmap", "ip", Opt_transparent, 0, "inherit parent pixmap"), 114 BOOL (Rs_transparent, "inheritPixmap", "ip", Opt_transparent, 0, "inherit parent pixmap"),
112 SWCH ("tr", Opt_transparent, 0, NULL), 115 BOOL (Rs_transparent, "transparent", "tr", Opt_transparent, 0, "inherit parent pixmap"),
113# if TINTING
114 STRG (Rs_color + Color_tint, "tintColor", "tint", "color", "tint color"), 116 STRG (Rs_color + Color_tint, "tintColor", "tint", "color", "tint color"),
115# endif 117 STRG (Rs_shade, "shading", "sh", "number", "shade background by number %."),
116#endif 118#endif
117#if OFF_FOCUS_FADING 119#if OFF_FOCUS_FADING
118 STRG (Rs_fade, "fading", "fade", "%", "fade colors x% percent when rxvt-unicode is losing focus"), 120 STRG (Rs_fade, "fading", "fade", "number", "fade colors by number % when losing focus"),
119 STRG (Rs_color + Color_fade, "fadeColor", "fadecolor", "color", "target color for off-focus fading"), 121 STRG (Rs_color + Color_fade, "fadeColor", "fadecolor", "color", "target color for off-focus fading"),
120#endif
121#if TINTING
122 STRG (Rs_shade, "shading", "sh", "%", "shade background by x % when tinting."),
123#endif 122#endif
124 BOOL (Rs_utmpInhibit, "utmpInhibit", "ut", Opt_utmpInhibit, 0, "utmp inhibit"), 123 BOOL (Rs_utmpInhibit, "utmpInhibit", "ut", Opt_utmpInhibit, 0, "utmp inhibit"),
125#ifndef NO_BELL 124#ifndef NO_BELL
125# if ENABLE_FRILLS
126 BOOL (Rs_urgentOnBell, "urgentOnBell", NULL, Opt_urgentOnBell, 0, NULL),
127# endif
126 BOOL (Rs_visualBell, "visualBell", "vb", Opt_visualBell, 0, "visual bell"), 128 BOOL (Rs_visualBell, "visualBell", "vb", Opt_visualBell, 0, "visual bell"),
127# if ! defined(NO_MAPALERT) && defined(MAPALERT_OPTION) 129# if ! defined(NO_MAPALERT) && defined(MAPALERT_OPTION)
128 BOOL (Rs_mapAlert, "mapAlert", NULL, Opt_mapAlert, 0, NULL), 130 BOOL (Rs_mapAlert, "mapAlert", NULL, Opt_mapAlert, 0, NULL),
129# endif 131# endif
130#endif 132#endif
… …
166#ifndef NO_BOLD_UNDERLINE_REVERSE 168#ifndef NO_BOLD_UNDERLINE_REVERSE
167 RSTRG (Rs_color + Color_BD, "colorBD", "color"), 169 RSTRG (Rs_color + Color_BD, "colorBD", "color"),
168 RSTRG (Rs_color + Color_IT, "colorIT", "color"), 170 RSTRG (Rs_color + Color_IT, "colorIT", "color"),
169 RSTRG (Rs_color + Color_UL, "colorUL", "color"), 171 RSTRG (Rs_color + Color_UL, "colorUL", "color"),
170 RSTRG (Rs_color + Color_RV, "colorRV", "color"), 172 RSTRG (Rs_color + Color_RV, "colorRV", "color"),
171#endif /* ! NO_BOLD_UNDERLINE_REVERSE */ 173#endif /* ! NO_BOLD_UNDERLINE_REVERSE */
172#if ENABLE_FRILLS 174#if ENABLE_FRILLS
173 RSTRG (Rs_color + Color_underline, "underlineColor", "color"), 175 RSTRG (Rs_color + Color_underline, "underlineColor", "color"),
174#endif 176#endif
175#ifdef KEEP_SCROLLCOLOR 177#ifdef KEEP_SCROLLCOLOR
176 RSTRG (Rs_color + Color_scroll, "scrollColor", "color"), 178 RSTRG (Rs_color + Color_scroll, "scrollColor", "color"),
177 RSTRG (Rs_color + Color_trough, "troughColor", "color"), 179 RSTRG (Rs_color + Color_trough, "troughColor", "color"),
178#endif /* KEEP_SCROLLCOLOR */ 180#endif /* KEEP_SCROLLCOLOR */
179#ifdef OPTION_HC 181#ifdef OPTION_HC
180 STRG (Rs_color + Color_HC, "highlightColor", "hc", "color", "highlight color"), 182 STRG (Rs_color + Color_HC, "highlightColor", "hc", "color", "highlight color"),
181#endif 183#endif
182#ifndef NO_CURSORCOLOR 184#ifndef NO_CURSORCOLOR
183 STRG (Rs_color + Color_cursor, "cursorColor", "cr", "color", "cursor color"), 185 STRG (Rs_color + Color_cursor, "cursorColor", "cr", "color", "cursor color"),
184 /* command-line option = resource name */ 186 /* command-line option = resource name */
185 RSTRG (Rs_color + Color_cursor2, "cursorColor2", "color"), 187 RSTRG (Rs_color + Color_cursor2, "cursorColor2", "color"),
186#endif /* NO_CURSORCOLOR */ 188#endif /* NO_CURSORCOLOR */
187 STRG (Rs_color + Color_pointer_fg, "pointerColor", "pr", "color", "pointer color"), 189 STRG (Rs_color + Color_pointer_fg, "pointerColor", "pr", "color", "pointer color"),
188 STRG (Rs_color + Color_pointer_bg, "pointerColor2", "pr2", "color", "pointer bg color"), 190 STRG (Rs_color + Color_pointer_bg, "pointerColor2", "pr2", "color", "pointer bg color"),
189 STRG (Rs_color + Color_border, "borderColor", "bd", "color", "border color"), 191 STRG (Rs_color + Color_border, "borderColor", "bd", "color", "border color"),
190#ifdef XPM_BACKGROUND 192#ifdef BG_IMAGE_FROM_FILE
191 RSTRG (Rs_path, "path", "search path"), 193 RSTRG (Rs_path, "path", "search path"),
192 STRG (Rs_backgroundPixmap, "backgroundPixmap", "pixmap", "file[;geom]", "background pixmap"), 194 STRG (Rs_backgroundPixmap, "backgroundPixmap", "pixmap", "file[;geom]", "background pixmap"),
193#endif 195#endif
194 /* fonts: command-line option = resource name */ 196 /* fonts: command-line option = resource name */
195 STRG (Rs_font, "font", "fn", "fontname", "normal text font"), 197 STRG (Rs_font, "font", "fn", "fontname", "normal text font"),
… …
202#ifdef USE_XIM 204#ifdef USE_XIM
203 STRG (Rs_inputMethod, "inputMethod", "im", "name", "name of input method"), 205 STRG (Rs_inputMethod, "inputMethod", "im", "name", "name of input method"),
204 STRG (Rs_preeditType, "preeditType", "pt", "style", "input style: style = OverTheSpot|OffTheSpot|Root"), 206 STRG (Rs_preeditType, "preeditType", "pt", "style", "input style: style = OverTheSpot|OffTheSpot|Root"),
205 STRG (Rs_imLocale, "imLocale", "imlocale", "string", "locale to use for input method"), 207 STRG (Rs_imLocale, "imLocale", "imlocale", "string", "locale to use for input method"),
206 STRG (Rs_imFont, "imFont", "imfont", "fontname", "fontset for styles OverTheSpot and OffTheSpot"), 208 STRG (Rs_imFont, "imFont", "imfont", "fontname", "fontset for styles OverTheSpot and OffTheSpot"),
207#endif /* USE_XIM */ 209#endif /* USE_XIM */
208 STRG (Rs_name, NULL, "name", "string", "client instance, icon, and title strings"), 210 STRG (Rs_name, NULL, "name", "string", "client instance, icon, and title strings"),
209 STRG (Rs_title, "title", "title", "string", "title name for window"), 211 STRG (Rs_title, "title", "title", "string", "title name for window"),
210 STRG (Rs_title, NULL, "T", NULL, NULL), /* short form */ 212 STRG (Rs_title, NULL, "T", NULL, NULL), /* short form */
211 STRG (Rs_iconName, "iconName", "n", "string", "icon name for window"), 213 STRG (Rs_iconName, "iconName", "n", "string", "icon name for window"),
212 STRG (Rs_saveLines, "saveLines", "sl", "number", "number of scrolled lines to save"), 214 STRG (Rs_saveLines, "saveLines", "sl", "number", "number of scrolled lines to save"),
… …
224 STRG (Rs_ext_bwidth, "externalBorder", "w", "number", "external border in pixels"), 226 STRG (Rs_ext_bwidth, "externalBorder", "w", "number", "external border in pixels"),
225 STRG (Rs_ext_bwidth, NULL, "bw", NULL, NULL), 227 STRG (Rs_ext_bwidth, NULL, "bw", NULL, NULL),
226 STRG (Rs_ext_bwidth, NULL, "borderwidth", NULL, NULL), 228 STRG (Rs_ext_bwidth, NULL, "borderwidth", NULL, NULL),
227 STRG (Rs_int_bwidth, "internalBorder", "b", "number", "internal border in pixels"), 229 STRG (Rs_int_bwidth, "internalBorder", "b", "number", "internal border in pixels"),
228 BOOL (Rs_borderLess, "borderLess", "bl", Opt_borderLess, 0, "borderless window"), 230 BOOL (Rs_borderLess, "borderLess", "bl", Opt_borderLess, 0, "borderless window"),
231 STRG (Rs_lineSpace, "lineSpace", "lsp", "number", "number of extra pixels between rows"),
232#endif
233#ifdef BUILTIN_GLYPHS
229 BOOL (Rs_skipBuiltinGlyphs, "skipBuiltinGlyphs", "sbg", Opt_skipBuiltinGlyphs, 0, "do not use internal glyphs"), 234 BOOL (Rs_skipBuiltinGlyphs, "skipBuiltinGlyphs", "sbg", Opt_skipBuiltinGlyphs, 0, "do not use internal glyphs"),
230 STRG (Rs_lineSpace, "lineSpace", "lsp", "number", "number of extra pixels between rows"),
231#endif 235#endif
232#ifdef POINTER_BLANK 236#ifdef POINTER_BLANK
233 RSTRG (Rs_pointerBlankDelay, "pointerBlankDelay", "number"), 237 RSTRG (Rs_pointerBlankDelay, "pointerBlankDelay", "number"),
234#endif 238#endif
235#ifndef NO_BACKSPACE_KEY 239#ifndef NO_BACKSPACE_KEY
236 RSTRG (Rs_backspace_key, "backspacekey", "string"), 240 RSTRG (Rs_backspace_key, "backspacekey", "string"),
237#endif 241#endif
238#ifndef NO_DELETE_KEY 242#ifndef NO_DELETE_KEY
239 RSTRG (Rs_delete_key, "deletekey", "string"), 243 RSTRG (Rs_delete_key, "deletekey", "string"),
240#endif 244#endif
241 RSTRG (Rs_selectstyle, "selectstyle", "mode"),
242#ifdef PRINTPIPE 245#ifdef PRINTPIPE
243 RSTRG (Rs_print_pipe, "print-pipe", "string"), 246 RSTRG (Rs_print_pipe, "print-pipe", "string"),
244#endif 247#endif
245 STRG (Rs_modifier, "modifier", "mod", "modifier", "meta modifier = alt|meta|hyper|super|mod1|...|mod5"), 248 STRG (Rs_modifier, "modifier", "mod", "modifier", "meta modifier = alt|meta|hyper|super|mod1|...|mod5"),
246#ifdef CUTCHAR_RESOURCE 249#ifdef CUTCHAR_RESOURCE
247 RSTRG (Rs_cutchars, "cutchars", "string"), 250 RSTRG (Rs_cutchars, "cutchars", "string"),
248#endif /* CUTCHAR_RESOURCE */ 251#endif /* CUTCHAR_RESOURCE */
249 RSTRG (Rs_answerbackstring, "answerbackString", "string"), 252 RSTRG (Rs_answerbackstring, "answerbackString", "string"),
250#ifndef NO_SECONDARY_SCREEN 253#ifndef NO_SECONDARY_SCREEN
251 BOOL (Rs_secondaryScreen, "secondaryScreen", "ssc", Opt_secondaryScreen, 0, "enable secondary screen"), 254 BOOL (Rs_secondaryScreen, "secondaryScreen", "ssc", Opt_secondaryScreen, 0, "enable secondary screen"),
252 BOOL (Rs_secondaryScroll, "secondaryScroll", "ssr", Opt_secondaryScroll, 0, "enable secondary screen scroll"), 255 BOOL (Rs_secondaryScroll, "secondaryScroll", "ssr", Opt_secondaryScroll, 0, "enable secondary screen scroll"),
253#endif 256#endif
… …
255 RSTRG (Rs_perl_lib, "perl-lib", "string"), //, "colon-separated directories with extension scripts"),TODO 258 RSTRG (Rs_perl_lib, "perl-lib", "string"), //, "colon-separated directories with extension scripts"),TODO
256 RSTRG (Rs_perl_eval, "perl-eval", "perl-eval"), // "string", "code to be evaluated after all extensions have been loaded"),TODO 259 RSTRG (Rs_perl_eval, "perl-eval", "perl-eval"), // "string", "code to be evaluated after all extensions have been loaded"),TODO
257 RSTRG (Rs_perl_ext_1, "perl-ext-common", "string"), //, "colon-separated list of perl extensions to enable"),TODO 260 RSTRG (Rs_perl_ext_1, "perl-ext-common", "string"), //, "colon-separated list of perl extensions to enable"),TODO
258 STRG (Rs_perl_ext_2, "perl-ext", "pe", "string", "colon-separated list of perl extensions to enable for this instance"), 261 STRG (Rs_perl_ext_2, "perl-ext", "pe", "string", "colon-separated list of perl extensions to enable for this instance"),
259#endif 262#endif
260#ifndef NO_RESOURCES 263#if ISO_14755
261 INFO ("xrm", "string", "X resource"), 264 BOOL (Rs_iso14755_52, "iso14755_52", NULL, Opt_iso14755_52, 0, NULL),
265#endif
266#ifdef HAVE_AFTERIMAGE
267 STRG (Rs_blendtype, "blendType", "blt", "string", "background image blending type - alpha, tint, etc..."),
268 STRG (Rs_blurradius, "blurRadius", "blr", "HxV", "Gaussian Blur radii to apply to the root background"),
262#endif 269#endif
263 INFO ("e", "command arg ...", "command to execute") 270 INFO ("e", "command arg ...", "command to execute")
264 }; 271 };
265 272
266#undef INFO 273#undef INFO
… …
310#endif 317#endif
311 "," 318 ","
312#if OFF_FOCUS_FADING 319#if OFF_FOCUS_FADING
313 "fade," 320 "fade,"
314#endif 321#endif
315#if defined(XPM_BACKGROUND)
316 "XPM,"
317#endif
318#if defined(TRANSPARENT) 322#if defined(ENABLE_TRANSPARENCY)
319 "transparent," 323 "transparent,"
320#endif
321#if TINTING
322 "tint," 324 "tint,"
325#endif
326#if HAVE_AFTERIMAGE
327 "afterimage,"
323#endif 328#endif
324#if defined(USE_XIM) 329#if defined(USE_XIM)
325 "XIM," 330 "XIM,"
326#endif 331#endif
327#if defined(NO_BACKSPACE_KEY) 332#if defined(NO_BACKSPACE_KEY)
… …
420 assert (optList[i].opt != NULL); 425 assert (optList[i].opt != NULL);
421#endif 426#endif
422 len += 4 + strlen (optList[i].opt) + (optList_isBool (i) ? 2: 0); 427 len += 4 + strlen (optList[i].opt) + (optList_isBool (i) ? 2: 0);
423 col += len; 428 col += len;
424 if (col > 79) 429 if (col > 79)
430 {
425 { /* assume regular width */ 431 /* assume regular width */
426 rxvt_log ("\n"); 432 rxvt_log ("\n");
427 col = 1 + len; 433 col = 1 + len;
428 } 434 }
429 435
430 rxvt_log (" [-%s%s", (optList_isBool (i) ? "/+" : ""), optList[i].opt); 436 rxvt_log (" [-%s%s", (optList_isBool (i) ? "/+" : ""), optList[i].opt);
… …
541 * default values 547 * default values
542 */ 548 */
543 549
544 if (optList[entry].doff != -1) 550 if (optList[entry].doff != -1)
545 { 551 {
546 if (flag == resval_on && !argv [i+1]) 552 if (flag == resval_on && i+1 == argc)
547 rxvt_fatal ("option '%s' needs an argument, aborting.\n", argv [i]); 553 rxvt_fatal ("option '%s' requires an argument, aborting.\n", argv [i]);
548 554
549 rs[optList[entry].doff] = flag == resval_on ? argv[++i] : resval_undef; 555 rs[optList[entry].doff] = flag == resval_on ? argv[++i] : resval_undef;
550 } 556 }
551 } 557 }
552 else 558 else
559 {
553 { /* boolean value */ 560 /* boolean value */
554 set_option (1UL << optList[entry].index, flag == resval_on); 561 set_option (optList[entry].index, flag == resval_on);
555 562
556 if (optList[entry].doff != -1) 563 if (optList[entry].doff != -1)
557 rs[optList[entry].doff] = flag; 564 rs[optList[entry].doff] = flag;
558 } 565 }
559 } 566 }
567#ifndef NO_RESOURCES
568 else if (!strcmp (opt, "xrm"))
569 {
570 if (i+1 < argc)
571 XrmPutLineResource (&option_db, argv[++i]);
572 }
573#endif
574#ifdef KEYSYM_RESOURCE
575 else if (!strncmp (opt, "keysym.", sizeof ("keysym.") - 1))
576 {
577 if (i+1 < argc)
578 {
579 char *res = (char *)malloc (strlen (opt) + strlen (argv[++i]) + 6);
580 sprintf (res, "*.%s: %s\n", opt, argv[i]);
581 XrmPutLineResource (&option_db, res);
582 free (res);
583 }
584 }
585#endif
560 else 586 else
561#ifdef KEYSYM_RESOURCE
562 /* if (!strncmp (opt, "keysym.", sizeof ("keysym.") - 1)) */
563 if (rxvt_Str_match (opt, "keysym."))
564 { 587 {
565 const char *str = argv[++i];
566
567 if (str != NULL)
568 parse_keysym (opt + sizeof ("keysym.") - 1, str);
569 }
570 else
571#endif
572 {
573 bad_option = 1; 588 bad_option = 1;
574 rxvt_warn ("\"%s\": unknown or malformed option.\n", opt); 589 rxvt_warn ("\"%s\": unknown or malformed option.\n", opt);
575 } 590 }
576 } 591 }
577 592
578 if (bad_option) 593 if (bad_option)
579 rxvt_usage (0); 594 rxvt_usage (0);
580} 595}
… …
664 char *newarg = NULL; 679 char *newarg = NULL;
665 char newargstr[NEWARGLIM]; 680 char newargstr[NEWARGLIM];
666 681
667 if (arg == NULL) 682 if (arg == NULL)
668 { 683 {
669 if ((n = rxvt_Str_match (str, "keysym.")) == 0) 684 n = sizeof ("keysym.") - 1;
685 if (strncmp (str, "keysym.", n))
670 return 0; 686 return 0;
671 687
672 str += n; /* skip `keysym.' */ 688 str += n; /* skip `keysym.' */
673 if (!(pmodend = strchr (str, ':'))) 689 if (!(pmodend = strchr (str, ':')))
674 return -1; 690 return -1;
… …
747 strncpy (newargstr, arg, NEWARGLIM - 1); 763 strncpy (newargstr, arg, NEWARGLIM - 1);
748 newargstr[NEWARGLIM - 1] = '\0'; 764 newargstr[NEWARGLIM - 1] = '\0';
749 newarg = newargstr; 765 newarg = newargstr;
750 } 766 }
751 767
752 rxvt_Str_trim (newarg); 768 if (*newarg == '\0')
753 if (*newarg == '\0' || (n = rxvt_Str_escaped (newarg)) == 0)
754 return -1; 769 return -1;
755 770
756 keyboard->register_user_translation (sym, state, newarg); 771 keyboard->register_user_translation (sym, state, newarg);
757 return 1; 772 return 1;
758} 773}
759 774
760# endif /* KEYSYM_RESOURCE */ 775# endif /* KEYSYM_RESOURCE */
761#endif /* NO_RESOURCES */ 776#endif /* NO_RESOURCES */
762 777
763static char * 778static char *
764get_res (XrmDatabase database, const char *program, const char *option) 779get_res (XrmDatabase database, const char *program, const char *option)
765{ 780{
766 char resource[512]; 781 char resource[512];
… …
798 813
799void 814void
800rxvt_term::extract_resources () 815rxvt_term::extract_resources ()
801{ 816{
802#ifndef NO_RESOURCES 817#ifndef NO_RESOURCES
818 XrmDatabase database = XrmGetDatabase (dpy);
819 XrmMergeDatabases (option_db, &database);
820 option_db = NULL;
803 /* 821 /*
804 * Query resources for options that affect us 822 * Query resources for options that affect us
805 */ 823 */
806 for (int entry = 0; entry < optList_size; entry++) 824 for (int entry = 0; entry < optList_size; entry++)
807 { 825 {
… …
827 || strcasecmp (p, "1") == 0; 845 || strcasecmp (p, "1") == 0;
828 846
829 if (optList_isReverse (entry)) 847 if (optList_isReverse (entry))
830 s = !s; 848 s = !s;
831 849
832 set_option (1UL << optList[entry].index, s); 850 set_option (optList[entry].index, s);
833 } 851 }
834 } 852 }
835 } 853 }
836 854
837 /* 855 /*
838 * [R5 or later]: enumerate the resource database 856 * [R5 or later]: enumerate the resource database
839 */ 857 */
840# ifdef KEYSYM_RESOURCE 858# ifdef KEYSYM_RESOURCE
841 XrmDatabase database = XrmGetDatabase (dpy);
842 XrmName name_prefix[3]; 859 XrmName name_prefix[3];
843 XrmClass class_prefix[3]; 860 XrmClass class_prefix[3];
844 861
845 name_prefix[0] = XrmStringToName (rs[Rs_name]); 862 name_prefix[0] = XrmStringToName (rs[Rs_name]);
846 name_prefix[1] = XrmStringToName ("keysym"); 863 name_prefix[1] = XrmStringToName ("keysym");
… …
860 XrmEnumerateDatabase (database, name_prefix, class_prefix, 877 XrmEnumerateDatabase (database, name_prefix, class_prefix,
861 XrmEnumOneLevel, rxvt_define_key, NULL); 878 XrmEnumOneLevel, rxvt_define_key, NULL);
862# endif 879# endif
863# endif 880# endif
864 881
865#endif /* NO_RESOURCES */ 882#endif /* NO_RESOURCES */
866} 883}
867 884
868/*----------------------- end-of-file (C source) -----------------------*/ 885/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines