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.61 by root, Mon Nov 28 19:35:04 2005 UTC vs.
Revision 1.90 by root, Tue Jan 31 19:53:31 2006 UTC

… …
4 * 4 *
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-2004 Marc Lehmann <pcg@goof.com> 9 * Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com>
10 * 10 *
11 * This program is free software; you can redistribute it and/or modify 11 * 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 12 * 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 13 * the Free Software Foundation; either version 2 of the License, or
14 * (at your option) any later version. 14 * (at your option) any later version.
… …
20 * 20 *
21 * You should have received a copy of the GNU General Public License 21 * You should have received a copy of the GNU General Public License
22 * along with this program; if not, write to the Free Software 22 * along with this program; if not, write to the Free Software
23 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 23 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
24 *----------------------------------------------------------------------*/ 24 *----------------------------------------------------------------------*/
25/*----------------------------------------------------------------------*
26 * get resources from ~/.Xdefaults or ~/.Xresources with the memory-saving
27 * default or with XGetDefault() (#define USE_XGETDEFAULT)
28 *----------------------------------------------------------------------*/
29 25
30#include "../config.h" /* NECESSARY */ 26#include "../config.h"
31#include "rxvt.h" /* NECESSARY */ 27#include "rxvt.h"
32#include "version.h" 28#include "version.h"
33
34#include <sys/utsname.h>
35 29
36#ifdef KEYSYM_RESOURCE 30#ifdef KEYSYM_RESOURCE
37#include "keyboard.h" 31#include "keyboard.h"
38#endif 32#endif
39 33
40/* #define DEBUG_RESOURCES */ 34/* place holders used for parsing command-line options */
35#define Optflag_Reverse 0x40000000UL
36#define Optflag_Boolean 0x80000000UL
37#define Optflag_mask 0x3fffffffUL
41 38
42/*{{{ monolithic option/resource structure: */ 39/*{{{ monolithic option/resource structure: */
43/* 40/*
44 * `string' options MUST have a usage argument 41 * `string' options MUST have a usage argument
45 * `switch' and `boolean' options have no argument 42 * `switch' and `boolean' options have no argument
… …
58#define RSTRG(rsp, kw, arg) \ 55#define RSTRG(rsp, kw, arg) \
59 {0, (rsp), (kw), NULL, (arg), NULL} 56 {0, (rsp), (kw), NULL, (arg), NULL}
60 57
61/* BOOL () - regular boolean `-/+' flag */ 58/* BOOL () - regular boolean `-/+' flag */
62#define BOOL(rsp, kw, opt, flag, desc) \ 59#define BOOL(rsp, kw, opt, flag, desc) \
63 { (Opt_Boolean| (flag)), (rsp), (kw), (opt), NULL, (desc)} 60 { (Optflag_Boolean | (flag)), (rsp), (kw), (opt), NULL, (desc)}
64 61
65/* SWCH () - `-' flag */ 62/* SWCH () - `-' flag */
66#define SWCH(opt, flag, desc) \ 63#define SWCH(opt, flag, desc) \
67 { (flag), -1, NULL, (opt), NULL, (desc)} 64 { (flag), -1, NULL, (opt), NULL, (desc)}
68 65
69/* convenient macros */ 66/* convenient macros */
70#define optList_strlen(i) \ 67#define optList_strlen(i) \
71 (optList[i].flag ? 0 : (optList[i].arg ? strlen (optList[i].arg) : 1)) 68 (optList[i].flag ? 0 : (optList[i].arg ? strlen (optList[i].arg) : 1))
72#define optList_isBool(i) \ 69#define optList_isBool(i) \
73 (optList[i].flag & Opt_Boolean) 70 (optList[i].flag & Optflag_Boolean)
74#define optList_isReverse(i) \ 71#define optList_isReverse(i) \
75 (optList[i].flag & Opt_Reverse) 72 (optList[i].flag & Optflag_Reverse)
76#define optList_size \ 73#define optList_size \
77 (sizeof (optList) / sizeof (optList[0])) 74 (sizeof (optList) / sizeof (optList[0]))
78 75
79static const struct 76static const struct
80 { 77 {
… …
105 BOOL (Rs_scrollBar_floating, "scrollBar_floating", "st", Opt_scrollBar_floating, "scrollbar without a trough"), 102 BOOL (Rs_scrollBar_floating, "scrollBar_floating", "st", Opt_scrollBar_floating, "scrollbar without a trough"),
106 RSTRG (Rs_scrollBar_align, "scrollBar_align", "mode"), 103 RSTRG (Rs_scrollBar_align, "scrollBar_align", "mode"),
107 STRG (Rs_scrollBar_thickness, "thickness", "sbt", "number", "scrollbar thickness/width in pixels"), 104 STRG (Rs_scrollBar_thickness, "thickness", "sbt", "number", "scrollbar thickness/width in pixels"),
108#endif 105#endif
109 BOOL (Rs_scrollTtyOutput, "scrollTtyOutput", NULL, Opt_scrollTtyOutput, NULL), 106 BOOL (Rs_scrollTtyOutput, "scrollTtyOutput", NULL, Opt_scrollTtyOutput, NULL),
110 BOOL (Rs_scrollTtyOutput, NULL, "si", Opt_Reverse | Opt_scrollTtyOutput, "scroll-on-tty-output inhibit"), 107 BOOL (Rs_scrollTtyOutput, NULL, "si", Optflag_Reverse | Opt_scrollTtyOutput, "scroll-on-tty-output inhibit"),
111 BOOL (Rs_scrollTtyKeypress, "scrollTtyKeypress", "sk", Opt_scrollTtyKeypress, "scroll-on-keypress"), 108 BOOL (Rs_scrollTtyKeypress, "scrollTtyKeypress", "sk", Opt_scrollTtyKeypress, "scroll-on-keypress"),
112 BOOL (Rs_scrollWithBuffer, "scrollWithBuffer", "sw", Opt_scrollWithBuffer, "scroll-with-buffer"), 109 BOOL (Rs_scrollWithBuffer, "scrollWithBuffer", "sw", Opt_scrollWithBuffer, "scroll-with-buffer"),
113#if TRANSPARENT 110#if TRANSPARENT
114 BOOL (Rs_transparent, "inheritPixmap", "ip", Opt_transparent, "inherit parent pixmap"), 111 BOOL (Rs_transparent, "inheritPixmap", "ip", Opt_transparent, "inherit parent pixmap"),
115 SWCH ("tr", Opt_transparent, NULL), 112 SWCH ("tr", Opt_transparent, NULL),
… …
156 RSTRG (Rs_color + minCOLOR + 3, "color3", "color"), 153 RSTRG (Rs_color + minCOLOR + 3, "color3", "color"),
157 RSTRG (Rs_color + minCOLOR + 4, "color4", "color"), 154 RSTRG (Rs_color + minCOLOR + 4, "color4", "color"),
158 RSTRG (Rs_color + minCOLOR + 5, "color5", "color"), 155 RSTRG (Rs_color + minCOLOR + 5, "color5", "color"),
159 RSTRG (Rs_color + minCOLOR + 6, "color6", "color"), 156 RSTRG (Rs_color + minCOLOR + 6, "color6", "color"),
160 RSTRG (Rs_color + minCOLOR + 7, "color7", "color"), 157 RSTRG (Rs_color + minCOLOR + 7, "color7", "color"),
161#ifndef NO_BRIGHTCOLOR
162 RSTRG (Rs_color + minBrightCOLOR + 0, "color8", "color"), 158 RSTRG (Rs_color + minBrightCOLOR + 0, "color8", "color"),
163 RSTRG (Rs_color + minBrightCOLOR + 1, "color9", "color"), 159 RSTRG (Rs_color + minBrightCOLOR + 1, "color9", "color"),
164 RSTRG (Rs_color + minBrightCOLOR + 2, "color10", "color"), 160 RSTRG (Rs_color + minBrightCOLOR + 2, "color10", "color"),
165 RSTRG (Rs_color + minBrightCOLOR + 3, "color11", "color"), 161 RSTRG (Rs_color + minBrightCOLOR + 3, "color11", "color"),
166 RSTRG (Rs_color + minBrightCOLOR + 4, "color12", "color"), 162 RSTRG (Rs_color + minBrightCOLOR + 4, "color12", "color"),
167 RSTRG (Rs_color + minBrightCOLOR + 5, "color13", "color"), 163 RSTRG (Rs_color + minBrightCOLOR + 5, "color13", "color"),
168 RSTRG (Rs_color + minBrightCOLOR + 6, "color14", "color"), 164 RSTRG (Rs_color + minBrightCOLOR + 6, "color14", "color"),
169 RSTRG (Rs_color + minBrightCOLOR + 7, "color15", "color"), 165 RSTRG (Rs_color + minBrightCOLOR + 7, "color15", "color"),
170#endif /* NO_BRIGHTCOLOR */
171#ifndef NO_BOLD_UNDERLINE_REVERSE 166#ifndef NO_BOLD_UNDERLINE_REVERSE
172 RSTRG (Rs_color + Color_BD, "colorBD", "color"), 167 RSTRG (Rs_color + Color_BD, "colorBD", "color"),
173 RSTRG (Rs_color + Color_IT, "colorIT", "color"), 168 RSTRG (Rs_color + Color_IT, "colorIT", "color"),
174 RSTRG (Rs_color + Color_UL, "colorUL", "color"), 169 RSTRG (Rs_color + Color_UL, "colorUL", "color"),
175 RSTRG (Rs_color + Color_RV, "colorRV", "color"), 170 RSTRG (Rs_color + Color_RV, "colorRV", "color"),
… …
190 RSTRG (Rs_color + Color_cursor2, "cursorColor2", "color"), 185 RSTRG (Rs_color + Color_cursor2, "cursorColor2", "color"),
191#endif /* NO_CURSORCOLOR */ 186#endif /* NO_CURSORCOLOR */
192 STRG (Rs_color + Color_pointer_fg, "pointerColor", "pr", "color", "pointer color"), 187 STRG (Rs_color + Color_pointer_fg, "pointerColor", "pr", "color", "pointer color"),
193 STRG (Rs_color + Color_pointer_bg, "pointerColor2", "pr2", "color", "pointer bg color"), 188 STRG (Rs_color + Color_pointer_bg, "pointerColor2", "pr2", "color", "pointer bg color"),
194 STRG (Rs_color + Color_border, "borderColor", "bd", "color", "border color"), 189 STRG (Rs_color + Color_border, "borderColor", "bd", "color", "border color"),
195#if defined (XPM_BACKGROUND) || (MENUBAR_MAX) 190#ifdef XPM_BACKGROUND
196 RSTRG (Rs_path, "path", "search path"), 191 RSTRG (Rs_path, "path", "search path"),
197#endif /* defined (XPM_BACKGROUND) || (MENUBAR_MAX) */
198#ifdef XPM_BACKGROUND
199 STRG (Rs_backgroundPixmap, "backgroundPixmap", "pixmap", "file[;geom]", "background pixmap"), 192 STRG (Rs_backgroundPixmap, "backgroundPixmap", "pixmap", "file[;geom]", "background pixmap"),
200#endif /* XPM_BACKGROUND */
201#if (MENUBAR_MAX)
202 RSTRG (Rs_menu, "menu", "name[;tag]"),
203#endif 193#endif
204 /* fonts: command-line option = resource name */ 194 /* fonts: command-line option = resource name */
205 STRG (Rs_font, "font", "fn", "fontname", "normal text font"), 195 STRG (Rs_font, "font", "fn", "fontname", "normal text font"),
206#if ENABLE_STYLES 196#if ENABLE_STYLES
207 STRG (Rs_boldFont, "boldFont", "fb", "fontname", "bold font"), 197 STRG (Rs_boldFont, "boldFont", "fb", "fontname", "bold font"),
208 STRG (Rs_italicFont, "italicFont", "fi", "fontname", "italic font"), 198 STRG (Rs_italicFont, "italicFont", "fi", "fontname", "italic font"),
209 STRG (Rs_boldItalicFont, "boldItalicFont", "fbi", "fontname", "bold italic font"), 199 STRG (Rs_boldItalicFont, "boldItalicFont", "fbi", "fontname", "bold italic font"),
200 BOOL (Rs_intensityStyles, "intensityStyles", "is", Opt_intensityStyles, "font styles imply intensity changes"),
210#endif 201#endif
211#ifdef USE_XIM 202#ifdef USE_XIM
212 STRG (Rs_inputMethod, "inputMethod", "im", "name", "name of input method"), 203 STRG (Rs_inputMethod, "inputMethod", "im", "name", "name of input method"),
213 STRG (Rs_preeditType, "preeditType", "pt", "style", "input style: style = OverTheSpot|OffTheSpot|Root"), 204 STRG (Rs_preeditType, "preeditType", "pt", "style", "input style: style = OverTheSpot|OffTheSpot|Root"),
214 STRG (Rs_imLocale, "imLocale", "imlocale", "string", "locale to use for input method"), 205 STRG (Rs_imLocale, "imLocale", "imlocale", "string", "locale to use for input method"),
… …
220 STRG (Rs_iconName, "iconName", "n", "string", "icon name for window"), 211 STRG (Rs_iconName, "iconName", "n", "string", "icon name for window"),
221 STRG (Rs_saveLines, "saveLines", "sl", "number", "number of scrolled lines to save"), 212 STRG (Rs_saveLines, "saveLines", "sl", "number", "number of scrolled lines to save"),
222#if ENABLE_XEMBED 213#if ENABLE_XEMBED
223 STRG (Rs_embed, NULL, "embed", "windowid", "window id to embed terminal in"), 214 STRG (Rs_embed, NULL, "embed", "windowid", "window id to embed terminal in"),
224#endif 215#endif
216#if XFT
217 STRG (Rs_depth, "depth", "depth", "number", "depth of visual to request"),
218#endif
225#if ENABLE_FRILLS 219#if ENABLE_FRILLS
220 RSTRG (Rs_transient_for, "transient-for", "windowid"),
221 BOOL (Rs_override_redirect, "override-redirect", "override-redirect", Opt_override_redirect, "set override-redirect on the terminal window"),
226 STRG (Rs_pty_fd, NULL, "pty-fd", "fileno", "file descriptor of pty to use"), 222 STRG (Rs_pty_fd, NULL, "pty-fd", "fileno", "file descriptor of pty to use"),
223 BOOL (Rs_hold, "hold", "hold", Opt_hold, "retain window after shell exit"),
227 STRG (Rs_ext_bwidth, "externalBorder", "w", "number", "external border in pixels"), 224 STRG (Rs_ext_bwidth, "externalBorder", "w", "number", "external border in pixels"),
228 STRG (Rs_ext_bwidth, NULL, "bw", NULL, NULL), 225 STRG (Rs_ext_bwidth, NULL, "bw", NULL, NULL),
229 STRG (Rs_ext_bwidth, NULL, "borderwidth", NULL, NULL), 226 STRG (Rs_ext_bwidth, NULL, "borderwidth", NULL, NULL),
230 STRG (Rs_int_bwidth, "internalBorder", "b", "number", "internal border in pixels"), 227 STRG (Rs_int_bwidth, "internalBorder", "b", "number", "internal border in pixels"),
231 BOOL (Rs_borderLess, "borderLess", "bl", Opt_borderLess, "borderless window"), 228 BOOL (Rs_borderLess, "borderLess", "bl", Opt_borderLess, "borderless window"),
229 BOOL (Rs_skipBuiltinGlyphs, "skipBuiltinGlyphs", "sbg", Opt_skipBuiltinGlyphs, "do not use internal glyphs"),
232 STRG (Rs_lineSpace, "lineSpace", "lsp", "number", "number of extra pixels between rows"), 230 STRG (Rs_lineSpace, "lineSpace", "lsp", "number", "number of extra pixels between rows"),
233#endif 231#endif
234#ifdef POINTER_BLANK 232#ifdef POINTER_BLANK
235 RSTRG (Rs_pointerBlankDelay, "pointerBlankDelay", "number"), 233 RSTRG (Rs_pointerBlankDelay, "pointerBlankDelay", "number"),
236#endif 234#endif
… …
251 RSTRG (Rs_answerbackstring, "answerbackString", "string"), 249 RSTRG (Rs_answerbackstring, "answerbackString", "string"),
252#ifndef NO_SECONDARY_SCREEN 250#ifndef NO_SECONDARY_SCREEN
253 BOOL (Rs_secondaryScreen, "secondaryScreen", "ssc", Opt_secondaryScreen, "enable secondary screen"), 251 BOOL (Rs_secondaryScreen, "secondaryScreen", "ssc", Opt_secondaryScreen, "enable secondary screen"),
254 BOOL (Rs_secondaryScroll, "secondaryScroll", "ssr", Opt_secondaryScroll, "enable secondary screen scroll"), 252 BOOL (Rs_secondaryScroll, "secondaryScroll", "ssr", Opt_secondaryScroll, "enable secondary screen scroll"),
255#endif 253#endif
256#if 0 && TODO 254#if ENABLE_PERL
257#if !defined(NO_RESOURCES) && defined(USE_XGETDEFAULT) 255 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
257 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"),
259#endif
260#ifndef NO_RESOURCES
258 INFO ("xrm", "string", "X resource"), 261 INFO ("xrm", "string", "X resource"),
259#endif
260#endif 262#endif
261 INFO ("e", "command arg ...", "command to execute") 263 INFO ("e", "command arg ...", "command to execute")
262 }; 264 };
263 265
264#undef INFO 266#undef INFO
… …
268#undef BOOL 270#undef BOOL
269/*}}} */ 271/*}}} */
270 272
271static const char releasestring[] = "rxvt-unicode (" RXVTNAME ") v" VERSION " - released: " DATE "\n"; 273static const char releasestring[] = "rxvt-unicode (" RXVTNAME ") v" VERSION " - released: " DATE "\n";
272static const char optionsstring[] = "options: " 274static const char optionsstring[] = "options: "
275#if ENABLE_PERL
276 "perl,"
277#endif
273#if XFT 278#if XFT
274 "xft," 279 "xft,"
275#endif 280#endif
276#if ENABLE_STYLES 281#if ENABLE_STYLES
277 "styles," 282 "styles,"
… …
315 "transparent," 320 "transparent,"
316#endif 321#endif
317#if TINTING 322#if TINTING
318 "tint," 323 "tint,"
319#endif 324#endif
320#if defined(UTMP_SUPPORT)
321 "utmp,"
322#endif
323#if defined(MENUBAR)
324 "menubar,"
325#endif
326#if defined(USE_XIM) 325#if defined(USE_XIM)
327 "XIM," 326 "XIM,"
327#endif
328#if defined(NO_BACKSPACE_KEY)
329 "no_backspace,"
330#endif
331#if defined(NO_DELETE_KEY)
332 "no_delete,"
333#endif
334#if EIGHT_BIT_CONTROLS
335 "8bitctrls,"
336#endif
337#if defined(ENABLE_FRILLS)
338 "frills,"
339#endif
340#if defined(SELECTION_SCROLLING)
341 "selectionscrolling,"
342#endif
343#if MOUSE_WHEEL
344 "wheel,"
345#endif
346#if MOUSE_SLIP_WHEELING
347 "slipwheel,"
348#endif
349#if defined(SMART_RESIZE)
350 "smart-resize,"
351#endif
352#if defined(CURSOR_BLINK)
353 "cursorBlink,"
354#endif
355#if defined(POINTER_BLANK)
356 "pointerBlank,"
357#endif
358#if defined(NO_RESOURCES)
359 "NoResources,"
328#endif 360#endif
329 "scrollbars=" 361 "scrollbars="
330#if !defined(HAVE_SCROLLBARS) 362#if !defined(HAVE_SCROLLBARS)
331 "NONE" 363 "NONE"
332#else 364#else
… …
350# endif 382# endif
351# if defined(XTERM_SCROLLBAR) 383# if defined(XTERM_SCROLLBAR)
352 "xterm" 384 "xterm"
353# endif 385# endif
354#endif 386#endif
355 ","
356#if defined(NO_BACKSPACE_KEY)
357 "no_backspace,"
358#endif
359#if defined(NO_DELETE_KEY)
360 "no_delete,"
361#endif
362#if EIGHT_BIT_CONTROLS
363 "8bitctrls,"
364#endif
365#if !defined(NO_STRINGS)
366 "strings,"
367#endif
368#if defined(ENABLE_FRILLS)
369 "frills,"
370#endif
371#if defined(PREFER_24BIT)
372 "24bit,"
373#endif
374#if defined(SELECTION_SCROLLING)
375 "selectionscrolling,"
376#endif
377#if MOUSE_WHEEL
378 "wheel,"
379#endif
380#if MOUSE_SLIP_WHEELING
381 "slipwheel,"
382#endif
383#if defined(SMART_RESIZE)
384 "smart-resize,"
385#endif
386#if defined(CURSOR_BLINK)
387 "cursorBlink,"
388#endif
389#if defined(POINTER_BLANK)
390 "pointerBlank,"
391#endif
392#if defined(NO_RESOURCES)
393 "NoResources"
394#else
395# if defined(USE_XGETDEFAULT)
396 "XGetDefaults"
397# else
398 ".Xdefaults"
399# endif
400#endif
401 "\nUsage: "; /* Usage */ 387 "\nUsage: "; /* Usage */
402 388
403#define INDENT 18 389#define INDENT 18
390
391const char rxvt_term::resval_undef [] = "<undef>";
392const char rxvt_term::resval_on [] = "on";
393const char rxvt_term::resval_off [] = "off";
404 394
405/*{{{ usage: */ 395/*{{{ usage: */
406/*----------------------------------------------------------------------*/ 396/*----------------------------------------------------------------------*/
407static void 397static void
408rxvt_usage (int type) 398rxvt_usage (int type)
… …
495/*{{{ get command-line options before getting resources */ 485/*{{{ get command-line options before getting resources */
496void 486void
497rxvt_term::get_options (int argc, const char *const *argv) 487rxvt_term::get_options (int argc, const char *const *argv)
498{ 488{
499 int i, bad_option = 0; 489 int i, bad_option = 0;
500 static const char On[3] = "ON", Off[4] = "OFF";
501 490
502 for (i = 1; i < argc; i++) 491 for (i = 1; i < argc; i++)
503 { 492 {
504 unsigned int entry, longopt = 0; 493 unsigned int entry, longopt = 0;
505 const char *flag, *opt; 494 const char *flag, *opt;
506 495
507 opt = argv[i]; 496 opt = argv[i];
508#ifdef DEBUG_RESOURCES 497
509 fprintf (stderr, "argv[%d] = %s: ", i, opt);
510#endif
511 if (*opt == '-') 498 if (*opt == '-')
512 { 499 {
513 flag = On; 500 flag = resval_on;
501
514 if (*++opt == '-') 502 if (*++opt == '-')
515 longopt = *opt++; /* long option */ 503 longopt = *opt++; /* long option */
516 } 504 }
517 else if (*opt == '+') 505 else if (*opt == '+')
518 { 506 {
519 flag = Off; 507 flag = resval_off;
508
520 if (*++opt == '+') 509 if (*++opt == '+')
521 longopt = *opt++; /* long option */ 510 longopt = *opt++; /* long option */
522 } 511 }
523 else 512 else
524 { 513 {
… …
527 continue; 516 continue;
528 } 517 }
529 518
530 if (!strcmp (opt, "help")) 519 if (!strcmp (opt, "help"))
531 rxvt_usage (longopt ? 2 : 1); 520 rxvt_usage (longopt ? 2 : 1);
521
532 if (!strcmp (opt, "h")) 522 if (!strcmp (opt, "h"))
533 rxvt_usage (0); 523 rxvt_usage (0);
534 524
535 /* feature: always try to match long-options */ 525 /* feature: always try to match long-options */
536 for (entry = 0; entry < optList_size; entry++) 526 for (entry = 0; entry < optList_size; entry++)
… …
540 break; 530 break;
541 531
542 if (entry < optList_size) 532 if (entry < optList_size)
543 { 533 {
544 if (optList_isReverse (entry)) 534 if (optList_isReverse (entry))
545 flag = flag == On ? Off : On; 535 flag = flag == resval_on ? resval_off : resval_on;
546 536
547 if (optList_strlen (entry)) 537 if (optList_strlen (entry))
548 { 538 {
549 /* 539 /*
550 * special cases are handled in main.c:main () to allow 540 * special cases are handled in main.c:main () to allow
551 * X resources to set these values before we settle for 541 * X resources to set these values before we settle for
552 * default values 542 * default values
553 */ 543 */
554 544
555 if (optList[entry].doff != -1) 545 if (optList[entry].doff != -1)
556 rs[optList[entry].doff] = flag == On && argv[i+1] 546 rs[optList[entry].doff] = flag == resval_on && argv[i+1]
557 ? argv[++i] : 0; 547 ? argv[++i] : resval_undef;
548
549 if (optList[entry].doff == Rs_color + Color_tint) printf ("doff %d is %s\n",optList[entry].doff,rs[optList[entry].doff]);//D
558 } 550 }
559 else 551 else
560 { /* boolean value */ 552 { /* boolean value */
561#ifdef DEBUG_RESOURCES 553 set_option (optList[entry].flag & Optflag_mask, flag == resval_on);
562 fprintf (stderr, "boolean (%s,%s) = %s\n",
563 optList[entry].opt, optList[entry].kw, flag);
564#endif
565 if (flag == On)
566 options |= optList[entry].flag;
567 else
568 options &= ~optList[entry].flag;
569 554
570 if (optList[entry].doff != -1) 555 if (optList[entry].doff != -1)
571 rs[optList[entry].doff] = flag; 556 rs[optList[entry].doff] = flag;
572 } 557 }
573 } 558 }
… …
605 * "rxvt" "keysym" "0xFF01" 590 * "rxvt" "keysym" "0xFF01"
606 * value will be a string 591 * value will be a string
607 */ 592 */
608/* ARGSUSED */ 593/* ARGSUSED */
609int 594int
610rxvt_define_key (XrmDatabase *database __attribute__((unused)), 595rxvt_define_key (XrmDatabase *database UNUSED,
611 XrmBindingList bindings __attribute__((unused)), 596 XrmBindingList bindings UNUSED,
612 XrmQuarkList quarks, 597 XrmQuarkList quarks,
613 XrmRepresentation *type __attribute__((unused)), 598 XrmRepresentation *type UNUSED,
614 XrmValue *value, 599 XrmValue *value,
615 XPointer closure __attribute__((unused))) 600 XPointer closure UNUSED)
616{ 601{
617 int last; 602 int last;
618 603
619 for (last = 0; quarks[last] != NULLQUARK; last++) /* look for last quark in list */ 604 for (last = 0; quarks[last] != NULLQUARK; last++) /* look for last quark in list */
620 ; 605 ;
… …
682 { 667 {
683 if ((n = rxvt_Str_match (str, "keysym.")) == 0) 668 if ((n = rxvt_Str_match (str, "keysym.")) == 0)
684 return 0; 669 return 0;
685 670
686 str += n; /* skip `keysym.' */ 671 str += n; /* skip `keysym.' */
687 if ((pmodend = strchr (str, ':')) < str) 672 if (!(pmodend = strchr (str, ':')))
688 return -1; 673 return -1;
689 } 674 }
690 else 675 else
691 pmodend = str + strlen(str); 676 pmodend = str + strlen(str);
692 677
… …
770 keyboard->register_user_translation (sym, state, newarg); 755 keyboard->register_user_translation (sym, state, newarg);
771 return 1; 756 return 1;
772} 757}
773 758
774# endif /* KEYSYM_RESOURCE */ 759# endif /* KEYSYM_RESOURCE */
760#endif /* NO_RESOURCES */
775 761
776# ifndef USE_XGETDEFAULT 762static char *
777/*{{{ rxvt_get_xdefaults () */ 763get_res (XrmDatabase database, const char *program, const char *option)
778/*
779 * the matching algorithm used for memory-save fake resources
780 */
781void
782rxvt_term::get_xdefaults (FILE *stream, const char *name)
783{ 764{
784 unsigned int len; 765 char resource[512];
785 char *str, buffer[256]; 766 char *type;
767 XrmValue result;
786 768
787 if (stream == NULL) 769 snprintf (resource, sizeof (resource), "%s.%s", program, option);
788 return; 770 XrmGetResource (database, resource, resource, &type, &result);
789 771
790 len = strlen (name); 772 return result.addr;
791 while ((str = fgets (buffer, sizeof (buffer), stream)) != NULL) 773}
774
775const char *
776rxvt_term::x_resource (const char *name)
777{
778 XrmDatabase database = XrmGetDatabase (xdisp);
779
780 const char *p = get_res (database, rs[Rs_name], name);
781 const char *p0 = get_res (database, "!INVALIDPROGRAMMENAMEDONTMATCH!", name);
782
783 if (p == NULL || (p0 && strcmp (p, p0) == 0))
792 { 784 {
793 unsigned int entry, n; 785 p = get_res (database, RESCLASS, name);
794 786#ifdef RESFALLBACK
795 while (*str && isspace (*str)) 787 if (p == NULL || (p0 && strcmp (p, p0) == 0))
796 str++; /* leading whitespace */ 788 p = get_res (database, RESFALLBACK, name);
797 789#endif
798 if ((str[len] != '*' && str[len] != '.')
799 || (len && strncmp (str, name, len)))
800 continue;
801 str += (len + 1); /* skip `name*' or `name.' */
802
803# ifdef KEYSYM_RESOURCE
804 if (!parse_keysym (str, NULL))
805# endif /* KEYSYM_RESOURCE */
806 for (entry = 0; entry < optList_size; entry++)
807 {
808 const char *kw = optList[entry].kw;
809
810 if (kw == NULL)
811 continue;
812
813 n = strlen (kw);
814 if (str[n] == ':' && rxvt_Str_match (str, kw))
815 {
816 /* skip `keyword:' */
817 str += n + 1;
818 rxvt_Str_trim (str);
819 n = strlen (str);
820
821 if (n && rs[optList[entry].doff] == NULL)
822 {
823 /* not already set */
824 int s;
825 char *p = 0;
826
827 for (int o = 0;;)
828 {
829 p = (char *)rxvt_realloc (p, o + n + 1);
830 memcpy (p + o, str, n);
831 o += n;
832 p[o] = 0;
833
834 if (o == 0 || p[o - 1] != '\\') // continuation line
835 break;
836
837 o--; // eat "\"
838
839 if ((str = fgets (buffer, sizeof (buffer), stream)) == NULL)
840 break;
841
842 rxvt_Str_trim (str);
843 n = strlen (str);
844 }
845
846 rs[optList[entry].doff] = p;
847 allocated.push_back (p);
848
849 if (optList_isBool (entry))
850 {
851 s = strcasecmp (str, "true") == 0
852 || strcasecmp (str, "yes") == 0
853 || strcasecmp (str, "on") == 0
854 || strcmp (str, "1") == 0;
855
856 if (optList_isReverse (entry))
857 s = !s;
858
859 if (s)
860 options |= optList[entry].flag;
861 else
862 options &= ~optList[entry].flag;
863 }
864 }
865
866 break;
867 }
868 }
869 } 790 }
870 791
871 rewind (stream); 792 if (p == NULL && p0)
793 p = p0;
794
795 return p;
872} 796}
873 797
874/*}}} */
875# endif /* ! USE_XGETDEFAULT */
876#endif /* NO_RESOURCES */
877
878/*{{{ read the resources files */
879/*
880 * using XGetDefault () or the hand-rolled replacement
881 */
882/* ARGSUSED */
883void 798void
884rxvt_term::extract_resources () 799rxvt_term::extract_resources ()
885{ 800{
886 dDisp;
887
888#ifndef NO_RESOURCES 801#ifndef NO_RESOURCES
889
890 char *homedir = (char *)getenv ("HOME");
891 char fname[1024];
892
893# if defined XAPPLOADDIR
894# if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
895 /* Compute the path of the possibly available localized Rxvt file */
896 char localepath[1024];
897
898 if (locale)
899 snprintf (localepath, sizeof (localepath), XAPPLOADDIRLOCALE "/" RESCLASS, locale);
900 else
901 localepath[0] = 0;
902# endif
903# endif
904
905# ifdef USE_XGETDEFAULT
906 /*
907 * get resources using the X library function
908 */
909 int entry;
910
911# ifdef XrmEnumOneLevel
912 char *displayResource, *xe;
913 XrmName name_prefix[3];
914 XrmClass class_prefix[3];
915 XrmDatabase database, rdb1;
916
917 XrmInitialize ();
918 database = NULL;
919
920 // for ordering, see for example http://www.faqs.org/faqs/Xt-FAQ/ Subject: 20
921
922 // 6. System wide per application default file.
923 /* Add in Rxvt file */
924# if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
925 if (*localepath
926 && ((rdb1 = XrmGetFileDatabase (localepath))
927 || (rdb1 = XrmGetFileDatabase (XAPPLOADDIR "/" RESCLASS))))
928# endif
929 XrmMergeDatabases (rdb1, &database);
930
931 /* Add in $XAPPLRESDIR/Rxvt only; not bothering with XUSERFILESEARCHPATH */
932 if ((xe = (char *)getenv ("XAPPLRESDIR")))
933 {
934 snprintf (fname, sizeof (fname), "%s/%s", xe, RESCLASS);
935
936 if ((rdb1 = XrmGetFileDatabase (fname)))
937 XrmMergeDatabases (rdb1, &database);
938 }
939
940 // 5. User's per application default file.
941 // none
942
943 // 4. User's defaults file.
944 /* Get any Xserver defaults */
945 displayResource = XResourceManagerString (disp);
946 if (displayResource != NULL)
947 {
948 if ((rdb1 = XrmGetStringDatabase (displayResource)))
949 XrmMergeDatabases (rdb1, &database);
950 }
951 else if (homedir)
952 {
953 snprintf (fname, sizeof (fname), "%s/.Xdefaults", homedir);
954
955 if ((rdb1 = XrmGetFileDatabase (fname)))
956 XrmMergeDatabases (rdb1, &database);
957 }
958
959 /* Get screen specific resources */
960 displayResource = XScreenResourceString (ScreenOfDisplay (disp, display->screen));
961 if (displayResource != NULL)
962 {
963 if ((rdb1 = XrmGetStringDatabase (displayResource)))
964 /* Merge with screen-independent resources */
965 XrmMergeDatabases (rdb1, &database);
966
967 XFree (displayResource);
968 }
969
970 // 3. User's per host defaults file
971 /* Add in XENVIRONMENT file */
972 if ((xe = (char *)getenv ("XENVIRONMENT"))
973 && (rdb1 = XrmGetFileDatabase (xe)))
974 XrmMergeDatabases (rdb1, &database);
975 else if (homedir)
976 {
977 struct utsname un;
978
979 if (!uname (&un))
980 {
981 snprintf (fname, sizeof (fname), "%s/.Xdefaults-%s", homedir, un.nodename);
982
983 if ((rdb1 = XrmGetFileDatabase (fname)))
984 XrmMergeDatabases (rdb1, &database);
985 }
986 }
987
988 XrmSetDatabase (disp, database);
989# endif
990
991 /* 802 /*
992 * Query resources for options that affect us 803 * Query resources for options that affect us
993 */ 804 */
994 for (entry = 0; entry < optList_size; entry++) 805 for (int entry = 0; entry < optList_size; entry++)
995 { 806 {
996 int s; 807 int s;
997 char *p, *p0;
998 const char *kw = optList[entry].kw; 808 const char *kw = optList[entry].kw;
999 809
1000 if (kw == NULL || rs[optList[entry].doff] != NULL) 810 if (kw == NULL || rs[optList[entry].doff] != NULL)
1001 continue; /* previously set */ 811 continue; // previously set
1002 812
1003 p = XGetDefault (disp, rs[Rs_name], kw); 813 const char *p = x_resource (kw);
1004 p0 = XGetDefault (disp, "!INVALIDPROGRAMMENAMEDONTMATCH!", kw);
1005 if (p == NULL || (p0 && strcmp (p, p0) == 0))
1006 {
1007 p = XGetDefault (disp, RESCLASS, kw);
1008#ifdef RESFALLBACK
1009 if (p == NULL || (p0 && strcmp (p, p0) == 0))
1010 p = XGetDefault (disp, RESFALLBACK, kw);
1011#endif
1012 }
1013
1014 if (p == NULL && p0)
1015 p = p0;
1016 814
1017 if (p) 815 if (p)
1018 { 816 {
817 p = strdup (p);
818 allocated.push_back ((void *)p);
1019 rs[optList[entry].doff] = p; 819 rs[optList[entry].doff] = p;
1020 820
1021 if (optList_isBool (entry)) 821 if (optList_isBool (entry))
1022 { 822 {
1023 s = strcasecmp (p, "TRUE") == 0 823 s = strcasecmp (p, "TRUE") == 0
… …
1026 || strcasecmp (p, "1") == 0; 826 || strcasecmp (p, "1") == 0;
1027 827
1028 if (optList_isReverse (entry)) 828 if (optList_isReverse (entry))
1029 s = !s; 829 s = !s;
1030 830
1031 if (s) 831 set_option (optList[entry].flag & Optflag_mask, s);
1032 options |= optList[entry].flag;
1033 else
1034 options &= ~optList[entry].flag;
1035 } 832 }
1036 } 833 }
1037 } 834 }
1038 835
1039 /* 836 /*
1040 * [R5 or later]: enumerate the resource database 837 * [R5 or later]: enumerate the resource database
1041 */ 838 */
1042# ifdef KEYSYM_RESOURCE 839# ifdef KEYSYM_RESOURCE
840 XrmDatabase database = XrmGetDatabase (xdisp);
841 XrmName name_prefix[3];
842 XrmClass class_prefix[3];
843
1043 name_prefix[0] = XrmStringToName (rs[Rs_name]); 844 name_prefix[0] = XrmStringToName (rs[Rs_name]);
1044 name_prefix[1] = XrmStringToName ("keysym"); 845 name_prefix[1] = XrmStringToName ("keysym");
1045 name_prefix[2] = NULLQUARK; 846 name_prefix[2] = NULLQUARK;
1046 class_prefix[0] = XrmStringToName (RESCLASS); 847 class_prefix[0] = XrmStringToName (RESCLASS);
1047 class_prefix[1] = XrmStringToName ("Keysym"); 848 class_prefix[1] = XrmStringToName ("Keysym");
1048 class_prefix[2] = NULLQUARK; 849 class_prefix[2] = NULLQUARK;
1049 /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */ 850 /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */
1050 XrmEnumerateDatabase (XrmGetDatabase (disp), name_prefix, class_prefix, 851 XrmEnumerateDatabase (database, name_prefix, class_prefix,
1051 XrmEnumOneLevel, rxvt_define_key, NULL); 852 XrmEnumOneLevel, rxvt_define_key, NULL);
1052# ifdef RESFALLBACK 853# ifdef RESFALLBACK
1053 name_prefix[0] = XrmStringToName (RESFALLBACK); 854 name_prefix[0] = XrmStringToName (RESFALLBACK);
1054 name_prefix[1] = XrmStringToName ("keysym"); 855 name_prefix[1] = XrmStringToName ("keysym");
1055 class_prefix[0] = XrmStringToName (RESFALLBACK); 856 class_prefix[0] = XrmStringToName (RESFALLBACK);
1056 class_prefix[1] = XrmStringToName ("Keysym"); 857 class_prefix[1] = XrmStringToName ("Keysym");
1057 /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */ 858 /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */
1058 XrmEnumerateDatabase (XrmGetDatabase (disp), name_prefix, class_prefix, 859 XrmEnumerateDatabase (database, name_prefix, class_prefix,
1059 XrmEnumOneLevel, rxvt_define_key, NULL); 860 XrmEnumOneLevel, rxvt_define_key, NULL);
1060# endif 861# endif
1061# endif 862# endif
1062 863
1063# else /* USE_XGETDEFAULT */
1064 /* get resources the hard way, but save lots of memory */
1065 FILE *fd = NULL;
1066
1067 if (homedir)
1068 {
1069 static const char *const xnames[2] = { ".Xdefaults", ".Xresources" };
1070
1071 for (int i = 0; i < (sizeof (xnames) / sizeof (xnames [0])); i++)
1072 {
1073 snprintf (fname, sizeof (fname), "%s/%s", homedir, xnames [i]);
1074
1075 if ((fd = fopen (fname, "r")) != NULL)
1076 break;
1077 }
1078 }
1079 /*
1080 * The normal order to match resources is the following:
1081 * @ global resources (partial match, ~/.Xdefaults)
1082 * @ application file resources (XAPPLOADDIR/Rxvt)
1083 * @ class resources (~/.Xdefaults)
1084 * @ private resources (~/.Xdefaults)
1085 *
1086 * However, for the hand-rolled resources, the matching algorithm
1087 * checks if a resource string value has already been allocated
1088 * and won't overwrite it with (in this case) a less specific
1089 * resource value.
1090 *
1091 * This avoids multiple allocation. Also, when we've called this
1092 * routine command-line string options have already been applied so we
1093 * needn't to allocate for those resources.
1094 *
1095 * So, search in resources from most to least specific.
1096 *
1097 * Also, use a special sub-class so that we can use either or both of
1098 * "XTerm" and "Rxvt" as class names.
1099 */
1100
1101 get_xdefaults (fd, rs[Rs_name]);
1102 get_xdefaults (fd, RESCLASS);
1103# ifdef RESFALLBACK
1104 get_xdefaults (fd, RESFALLBACK);
1105# endif
1106
1107# if defined(XAPPLOADDIR) && defined(USE_XAPPLOADDIR)
1108 {
1109 FILE *ad = NULL;
1110
1111# if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1112 if (!*localepath || (ad = fopen (localepath, "r")) == NULL)
1113# endif
1114 ad = fopen (XAPPLOADDIR "/" RESCLASS, "r");
1115 if (ad != NULL)
1116 {
1117 get_xdefaults (ad, RESCLASS);
1118 get_xdefaults (ad, "");
1119 fclose (ad);
1120 }
1121 }
1122# endif /* XAPPLOADDIR */
1123
1124 get_xdefaults (fd, ""); /* partial match */
1125 if (fd != NULL)
1126 fclose (fd);
1127# endif /* USE_XGETDEFAULT */
1128
1129#endif /* NO_RESOURCES */ 864#endif /* NO_RESOURCES */
1130} 865}
1131 866
1132/*}}} */
1133/*----------------------- end-of-file (C source) -----------------------*/ 867/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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