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.62 by root, Thu Dec 22 16:44:10 2005 UTC vs.
Revision 1.92 by root, Tue Jan 31 19:55:05 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"),
227 BOOL (Rs_hold, "hold", "hold", Opt_hold, "retain window after shell exit"), 223 BOOL (Rs_hold, "hold", "hold", Opt_hold, "retain window after shell exit"),
228 STRG (Rs_ext_bwidth, "externalBorder", "w", "number", "external border in pixels"), 224 STRG (Rs_ext_bwidth, "externalBorder", "w", "number", "external border in pixels"),
229 STRG (Rs_ext_bwidth, NULL, "bw", NULL, NULL), 225 STRG (Rs_ext_bwidth, NULL, "bw", NULL, NULL),
230 STRG (Rs_ext_bwidth, NULL, "borderwidth", NULL, NULL), 226 STRG (Rs_ext_bwidth, NULL, "borderwidth", NULL, NULL),
231 STRG (Rs_int_bwidth, "internalBorder", "b", "number", "internal border in pixels"), 227 STRG (Rs_int_bwidth, "internalBorder", "b", "number", "internal border in pixels"),
232 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"),
233 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"),
234#endif 231#endif
235#ifdef POINTER_BLANK 232#ifdef POINTER_BLANK
236 RSTRG (Rs_pointerBlankDelay, "pointerBlankDelay", "number"), 233 RSTRG (Rs_pointerBlankDelay, "pointerBlankDelay", "number"),
237#endif 234#endif
… …
252 RSTRG (Rs_answerbackstring, "answerbackString", "string"), 249 RSTRG (Rs_answerbackstring, "answerbackString", "string"),
253#ifndef NO_SECONDARY_SCREEN 250#ifndef NO_SECONDARY_SCREEN
254 BOOL (Rs_secondaryScreen, "secondaryScreen", "ssc", Opt_secondaryScreen, "enable secondary screen"), 251 BOOL (Rs_secondaryScreen, "secondaryScreen", "ssc", Opt_secondaryScreen, "enable secondary screen"),
255 BOOL (Rs_secondaryScroll, "secondaryScroll", "ssr", Opt_secondaryScroll, "enable secondary screen scroll"), 252 BOOL (Rs_secondaryScroll, "secondaryScroll", "ssr", Opt_secondaryScroll, "enable secondary screen scroll"),
256#endif 253#endif
257#if 0 && TODO 254#if ENABLE_PERL
258#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
259 INFO ("xrm", "string", "X resource"), 261 INFO ("xrm", "string", "X resource"),
260#endif
261#endif 262#endif
262 INFO ("e", "command arg ...", "command to execute") 263 INFO ("e", "command arg ...", "command to execute")
263 }; 264 };
264 265
265#undef INFO 266#undef INFO
… …
269#undef BOOL 270#undef BOOL
270/*}}} */ 271/*}}} */
271 272
272static const char releasestring[] = "rxvt-unicode (" RXVTNAME ") v" VERSION " - released: " DATE "\n"; 273static const char releasestring[] = "rxvt-unicode (" RXVTNAME ") v" VERSION " - released: " DATE "\n";
273static const char optionsstring[] = "options: " 274static const char optionsstring[] = "options: "
275#if ENABLE_PERL
276 "perl,"
277#endif
274#if XFT 278#if XFT
275 "xft," 279 "xft,"
276#endif 280#endif
277#if ENABLE_STYLES 281#if ENABLE_STYLES
278 "styles," 282 "styles,"
… …
316 "transparent," 320 "transparent,"
317#endif 321#endif
318#if TINTING 322#if TINTING
319 "tint," 323 "tint,"
320#endif 324#endif
321#if defined(UTMP_SUPPORT)
322 "utmp,"
323#endif
324#if defined(MENUBAR)
325 "menubar,"
326#endif
327#if defined(USE_XIM) 325#if defined(USE_XIM)
328 "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,"
329#endif 360#endif
330 "scrollbars=" 361 "scrollbars="
331#if !defined(HAVE_SCROLLBARS) 362#if !defined(HAVE_SCROLLBARS)
332 "NONE" 363 "NONE"
333#else 364#else
… …
351# endif 382# endif
352# if defined(XTERM_SCROLLBAR) 383# if defined(XTERM_SCROLLBAR)
353 "xterm" 384 "xterm"
354# endif 385# endif
355#endif 386#endif
356 ","
357#if defined(NO_BACKSPACE_KEY)
358 "no_backspace,"
359#endif
360#if defined(NO_DELETE_KEY)
361 "no_delete,"
362#endif
363#if EIGHT_BIT_CONTROLS
364 "8bitctrls,"
365#endif
366#if !defined(NO_STRINGS)
367 "strings,"
368#endif
369#if defined(ENABLE_FRILLS)
370 "frills,"
371#endif
372#if defined(PREFER_24BIT)
373 "24bit,"
374#endif
375#if defined(SELECTION_SCROLLING)
376 "selectionscrolling,"
377#endif
378#if MOUSE_WHEEL
379 "wheel,"
380#endif
381#if MOUSE_SLIP_WHEELING
382 "slipwheel,"
383#endif
384#if defined(SMART_RESIZE)
385 "smart-resize,"
386#endif
387#if defined(CURSOR_BLINK)
388 "cursorBlink,"
389#endif
390#if defined(POINTER_BLANK)
391 "pointerBlank,"
392#endif
393#if defined(NO_RESOURCES)
394 "NoResources"
395#else
396# if defined(USE_XGETDEFAULT)
397 "XGetDefaults"
398# else
399 ".Xdefaults"
400# endif
401#endif
402 "\nUsage: "; /* Usage */ 387 "\nUsage: "; /* Usage */
403 388
404#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";
405 394
406/*{{{ usage: */ 395/*{{{ usage: */
407/*----------------------------------------------------------------------*/ 396/*----------------------------------------------------------------------*/
408static void 397static void
409rxvt_usage (int type) 398rxvt_usage (int type)
… …
418 rxvt_log (" [-help] [--help]\n"); 407 rxvt_log (" [-help] [--help]\n");
419 408
420 for (col = 1, i = 0; i < optList_size; i++) 409 for (col = 1, i = 0; i < optList_size; i++)
421 if (optList[i].desc != NULL) 410 if (optList[i].desc != NULL)
422 { 411 {
423 int len = 0; 412 int len = 0;
424 413
425 if (!optList_isBool (i)) 414 if (!optList_isBool (i))
426 { 415 {
427 len = optList_strlen (i); 416 len = optList_strlen (i);
428 if (len > 0) 417 if (len > 0)
… …
496/*{{{ get command-line options before getting resources */ 485/*{{{ get command-line options before getting resources */
497void 486void
498rxvt_term::get_options (int argc, const char *const *argv) 487rxvt_term::get_options (int argc, const char *const *argv)
499{ 488{
500 int i, bad_option = 0; 489 int i, bad_option = 0;
501 static const char On[3] = "ON", Off[4] = "OFF";
502 490
503 for (i = 1; i < argc; i++) 491 for (i = 1; i < argc; i++)
504 { 492 {
505 unsigned int entry, longopt = 0; 493 unsigned int entry, longopt = 0;
506 const char *flag, *opt; 494 const char *flag, *opt;
507 495
508 opt = argv[i]; 496 opt = argv[i];
509#ifdef DEBUG_RESOURCES 497
510 fprintf (stderr, "argv[%d] = %s: ", i, opt);
511#endif
512 if (*opt == '-') 498 if (*opt == '-')
513 { 499 {
514 flag = On; 500 flag = resval_on;
501
515 if (*++opt == '-') 502 if (*++opt == '-')
516 longopt = *opt++; /* long option */ 503 longopt = *opt++; /* long option */
517 } 504 }
518 else if (*opt == '+') 505 else if (*opt == '+')
519 { 506 {
520 flag = Off; 507 flag = resval_off;
508
521 if (*++opt == '+') 509 if (*++opt == '+')
522 longopt = *opt++; /* long option */ 510 longopt = *opt++; /* long option */
523 } 511 }
524 else 512 else
525 { 513 {
… …
528 continue; 516 continue;
529 } 517 }
530 518
531 if (!strcmp (opt, "help")) 519 if (!strcmp (opt, "help"))
532 rxvt_usage (longopt ? 2 : 1); 520 rxvt_usage (longopt ? 2 : 1);
521
533 if (!strcmp (opt, "h")) 522 if (!strcmp (opt, "h"))
534 rxvt_usage (0); 523 rxvt_usage (0);
535 524
536 /* feature: always try to match long-options */ 525 /* feature: always try to match long-options */
537 for (entry = 0; entry < optList_size; entry++) 526 for (entry = 0; entry < optList_size; entry++)
… …
541 break; 530 break;
542 531
543 if (entry < optList_size) 532 if (entry < optList_size)
544 { 533 {
545 if (optList_isReverse (entry)) 534 if (optList_isReverse (entry))
546 flag = flag == On ? Off : On; 535 flag = flag == resval_on ? resval_off : resval_on;
547 536
548 if (optList_strlen (entry)) 537 if (optList_strlen (entry))
549 { 538 {
550 /* 539 /*
551 * special cases are handled in main.c:main () to allow 540 * special cases are handled in main.c:main () to allow
552 * X resources to set these values before we settle for 541 * X resources to set these values before we settle for
553 * default values 542 * default values
554 */ 543 */
555 544
556 if (optList[entry].doff != -1) 545 if (optList[entry].doff != -1)
557 rs[optList[entry].doff] = flag == On && argv[i+1] 546 rs[optList[entry].doff] = flag == resval_on && argv[i+1]
558 ? argv[++i] : 0; 547 ? argv[++i] : resval_undef;
559 } 548 }
560 else 549 else
561 { /* boolean value */ 550 { /* boolean value */
562#ifdef DEBUG_RESOURCES 551 set_option (optList[entry].flag & Optflag_mask, flag == resval_on);
563 fprintf (stderr, "boolean (%s,%s) = %s\n",
564 optList[entry].opt, optList[entry].kw, flag);
565#endif
566 if (flag == On)
567 options |= optList[entry].flag;
568 else
569 options &= ~optList[entry].flag;
570 552
571 if (optList[entry].doff != -1) 553 if (optList[entry].doff != -1)
572 rs[optList[entry].doff] = flag; 554 rs[optList[entry].doff] = flag;
573 } 555 }
574 } 556 }
… …
606 * "rxvt" "keysym" "0xFF01" 588 * "rxvt" "keysym" "0xFF01"
607 * value will be a string 589 * value will be a string
608 */ 590 */
609/* ARGSUSED */ 591/* ARGSUSED */
610int 592int
611rxvt_define_key (XrmDatabase *database __attribute__((unused)), 593rxvt_define_key (XrmDatabase *database UNUSED,
612 XrmBindingList bindings __attribute__((unused)), 594 XrmBindingList bindings UNUSED,
613 XrmQuarkList quarks, 595 XrmQuarkList quarks,
614 XrmRepresentation *type __attribute__((unused)), 596 XrmRepresentation *type UNUSED,
615 XrmValue *value, 597 XrmValue *value,
616 XPointer closure __attribute__((unused))) 598 XPointer closure UNUSED)
617{ 599{
618 int last; 600 int last;
619 601
620 for (last = 0; quarks[last] != NULLQUARK; last++) /* look for last quark in list */ 602 for (last = 0; quarks[last] != NULLQUARK; last++) /* look for last quark in list */
621 ; 603 ;
… …
683 { 665 {
684 if ((n = rxvt_Str_match (str, "keysym.")) == 0) 666 if ((n = rxvt_Str_match (str, "keysym.")) == 0)
685 return 0; 667 return 0;
686 668
687 str += n; /* skip `keysym.' */ 669 str += n; /* skip `keysym.' */
688 if ((pmodend = strchr (str, ':')) < str) 670 if (!(pmodend = strchr (str, ':')))
689 return -1; 671 return -1;
690 } 672 }
691 else 673 else
692 pmodend = str + strlen(str); 674 pmodend = str + strlen(str);
693 675
… …
771 keyboard->register_user_translation (sym, state, newarg); 753 keyboard->register_user_translation (sym, state, newarg);
772 return 1; 754 return 1;
773} 755}
774 756
775# endif /* KEYSYM_RESOURCE */ 757# endif /* KEYSYM_RESOURCE */
758#endif /* NO_RESOURCES */
776 759
777# ifndef USE_XGETDEFAULT 760static char *
778/*{{{ rxvt_get_xdefaults () */ 761get_res (XrmDatabase database, const char *program, const char *option)
779/*
780 * the matching algorithm used for memory-save fake resources
781 */
782void
783rxvt_term::get_xdefaults (FILE *stream, const char *name)
784{ 762{
785 unsigned int len; 763 char resource[512];
786 char *str, buffer[256]; 764 char *type;
765 XrmValue result;
787 766
788 if (stream == NULL) 767 snprintf (resource, sizeof (resource), "%s.%s", program, option);
789 return; 768 XrmGetResource (database, resource, resource, &type, &result);
790 769
791 len = strlen (name); 770 return result.addr;
792 while ((str = fgets (buffer, sizeof (buffer), stream)) != NULL) 771}
772
773const char *
774rxvt_term::x_resource (const char *name)
775{
776 XrmDatabase database = XrmGetDatabase (xdisp);
777
778 const char *p = get_res (database, rs[Rs_name], name);
779 const char *p0 = get_res (database, "!INVALIDPROGRAMMENAMEDONTMATCH!", name);
780
781 if (p == NULL || (p0 && strcmp (p, p0) == 0))
793 { 782 {
794 unsigned int entry, n; 783 p = get_res (database, RESCLASS, name);
795 784#ifdef RESFALLBACK
796 while (*str && isspace (*str)) 785 if (p == NULL || (p0 && strcmp (p, p0) == 0))
797 str++; /* leading whitespace */ 786 p = get_res (database, RESFALLBACK, name);
798 787#endif
799 if ((str[len] != '*' && str[len] != '.')
800 || (len && strncmp (str, name, len)))
801 continue;
802 str += (len + 1); /* skip `name*' or `name.' */
803
804# ifdef KEYSYM_RESOURCE
805 if (!parse_keysym (str, NULL))
806# endif /* KEYSYM_RESOURCE */
807 for (entry = 0; entry < optList_size; entry++)
808 {
809 const char *kw = optList[entry].kw;
810
811 if (kw == NULL)
812 continue;
813
814 n = strlen (kw);
815 if (str[n] == ':' && rxvt_Str_match (str, kw))
816 {
817 /* skip `keyword:' */
818 str += n + 1;
819 rxvt_Str_trim (str);
820 n = strlen (str);
821
822 if (n && rs[optList[entry].doff] == NULL)
823 {
824 /* not already set */
825 int s;
826 char *p = 0;
827
828 for (int o = 0;;)
829 {
830 p = (char *)rxvt_realloc (p, o + n + 1);
831 memcpy (p + o, str, n);
832 o += n;
833 p[o] = 0;
834
835 if (o == 0 || p[o - 1] != '\\') // continuation line
836 break;
837
838 o--; // eat "\"
839
840 if ((str = fgets (buffer, sizeof (buffer), stream)) == NULL)
841 break;
842
843 rxvt_Str_trim (str);
844 n = strlen (str);
845 }
846
847 rs[optList[entry].doff] = p;
848 allocated.push_back (p);
849
850 if (optList_isBool (entry))
851 {
852 s = strcasecmp (str, "true") == 0
853 || strcasecmp (str, "yes") == 0
854 || strcasecmp (str, "on") == 0
855 || strcmp (str, "1") == 0;
856
857 if (optList_isReverse (entry))
858 s = !s;
859
860 if (s)
861 options |= optList[entry].flag;
862 else
863 options &= ~optList[entry].flag;
864 }
865 }
866
867 break;
868 }
869 }
870 } 788 }
871 789
872 rewind (stream); 790 if (p == NULL && p0)
791 p = p0;
792
793 return p;
873} 794}
874 795
875/*}}} */
876# endif /* ! USE_XGETDEFAULT */
877#endif /* NO_RESOURCES */
878
879/*{{{ read the resources files */
880/*
881 * using XGetDefault () or the hand-rolled replacement
882 */
883/* ARGSUSED */
884void 796void
885rxvt_term::extract_resources () 797rxvt_term::extract_resources ()
886{ 798{
887 dDisp;
888
889#ifndef NO_RESOURCES 799#ifndef NO_RESOURCES
890
891 char *homedir = (char *)getenv ("HOME");
892 char fname[1024];
893
894# if defined XAPPLOADDIR
895# if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
896 /* Compute the path of the possibly available localized Rxvt file */
897 char localepath[1024];
898
899 if (locale)
900 snprintf (localepath, sizeof (localepath), XAPPLOADDIRLOCALE "/" RESCLASS, locale);
901 else
902 localepath[0] = 0;
903# endif
904# endif
905
906# ifdef USE_XGETDEFAULT
907 /*
908 * get resources using the X library function
909 */
910 int entry;
911
912# ifdef XrmEnumOneLevel
913 char *displayResource, *xe;
914 XrmName name_prefix[3];
915 XrmClass class_prefix[3];
916 XrmDatabase database, rdb1;
917
918 XrmInitialize ();
919 database = NULL;
920
921 // for ordering, see for example http://www.faqs.org/faqs/Xt-FAQ/ Subject: 20
922
923 // 6. System wide per application default file.
924 /* Add in Rxvt file */
925# if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
926 if (*localepath
927 && ((rdb1 = XrmGetFileDatabase (localepath))
928 || (rdb1 = XrmGetFileDatabase (XAPPLOADDIR "/" RESCLASS))))
929# endif
930 XrmMergeDatabases (rdb1, &database);
931
932 /* Add in $XAPPLRESDIR/Rxvt only; not bothering with XUSERFILESEARCHPATH */
933 if ((xe = (char *)getenv ("XAPPLRESDIR")))
934 {
935 snprintf (fname, sizeof (fname), "%s/%s", xe, RESCLASS);
936
937 if ((rdb1 = XrmGetFileDatabase (fname)))
938 XrmMergeDatabases (rdb1, &database);
939 }
940
941 // 5. User's per application default file.
942 // none
943
944 // 4. User's defaults file.
945 /* Get any Xserver defaults */
946 displayResource = XResourceManagerString (disp);
947 if (displayResource != NULL)
948 {
949 if ((rdb1 = XrmGetStringDatabase (displayResource)))
950 XrmMergeDatabases (rdb1, &database);
951 }
952 else if (homedir)
953 {
954 snprintf (fname, sizeof (fname), "%s/.Xdefaults", homedir);
955
956 if ((rdb1 = XrmGetFileDatabase (fname)))
957 XrmMergeDatabases (rdb1, &database);
958 }
959
960 /* Get screen specific resources */
961 displayResource = XScreenResourceString (ScreenOfDisplay (disp, display->screen));
962 if (displayResource != NULL)
963 {
964 if ((rdb1 = XrmGetStringDatabase (displayResource)))
965 /* Merge with screen-independent resources */
966 XrmMergeDatabases (rdb1, &database);
967
968 XFree (displayResource);
969 }
970
971 // 3. User's per host defaults file
972 /* Add in XENVIRONMENT file */
973 if ((xe = (char *)getenv ("XENVIRONMENT"))
974 && (rdb1 = XrmGetFileDatabase (xe)))
975 XrmMergeDatabases (rdb1, &database);
976 else if (homedir)
977 {
978 struct utsname un;
979
980 if (!uname (&un))
981 {
982 snprintf (fname, sizeof (fname), "%s/.Xdefaults-%s", homedir, un.nodename);
983
984 if ((rdb1 = XrmGetFileDatabase (fname)))
985 XrmMergeDatabases (rdb1, &database);
986 }
987 }
988
989 XrmSetDatabase (disp, database);
990# endif
991
992 /* 800 /*
993 * Query resources for options that affect us 801 * Query resources for options that affect us
994 */ 802 */
995 for (entry = 0; entry < optList_size; entry++) 803 for (int entry = 0; entry < optList_size; entry++)
996 { 804 {
997 int s; 805 int s;
998 char *p, *p0;
999 const char *kw = optList[entry].kw; 806 const char *kw = optList[entry].kw;
1000 807
1001 if (kw == NULL || rs[optList[entry].doff] != NULL) 808 if (kw == NULL || rs[optList[entry].doff] != NULL)
1002 continue; /* previously set */ 809 continue; // previously set
1003 810
1004 p = XGetDefault (disp, rs[Rs_name], kw); 811 const char *p = x_resource (kw);
1005 p0 = XGetDefault (disp, "!INVALIDPROGRAMMENAMEDONTMATCH!", kw);
1006 if (p == NULL || (p0 && strcmp (p, p0) == 0))
1007 {
1008 p = XGetDefault (disp, RESCLASS, kw);
1009#ifdef RESFALLBACK
1010 if (p == NULL || (p0 && strcmp (p, p0) == 0))
1011 p = XGetDefault (disp, RESFALLBACK, kw);
1012#endif
1013 }
1014
1015 if (p == NULL && p0)
1016 p = p0;
1017 812
1018 if (p) 813 if (p)
1019 { 814 {
815 p = strdup (p);
816 allocated.push_back ((void *)p);
1020 rs[optList[entry].doff] = p; 817 rs[optList[entry].doff] = p;
1021 818
1022 if (optList_isBool (entry)) 819 if (optList_isBool (entry))
1023 { 820 {
1024 s = strcasecmp (p, "TRUE") == 0 821 s = strcasecmp (p, "TRUE") == 0
… …
1027 || strcasecmp (p, "1") == 0; 824 || strcasecmp (p, "1") == 0;
1028 825
1029 if (optList_isReverse (entry)) 826 if (optList_isReverse (entry))
1030 s = !s; 827 s = !s;
1031 828
1032 if (s) 829 set_option (optList[entry].flag & Optflag_mask, s);
1033 options |= optList[entry].flag;
1034 else
1035 options &= ~optList[entry].flag;
1036 } 830 }
1037 } 831 }
1038 } 832 }
1039 833
1040 /* 834 /*
1041 * [R5 or later]: enumerate the resource database 835 * [R5 or later]: enumerate the resource database
1042 */ 836 */
1043# ifdef KEYSYM_RESOURCE 837# ifdef KEYSYM_RESOURCE
838 XrmDatabase database = XrmGetDatabase (xdisp);
839 XrmName name_prefix[3];
840 XrmClass class_prefix[3];
841
1044 name_prefix[0] = XrmStringToName (rs[Rs_name]); 842 name_prefix[0] = XrmStringToName (rs[Rs_name]);
1045 name_prefix[1] = XrmStringToName ("keysym"); 843 name_prefix[1] = XrmStringToName ("keysym");
1046 name_prefix[2] = NULLQUARK; 844 name_prefix[2] = NULLQUARK;
1047 class_prefix[0] = XrmStringToName (RESCLASS); 845 class_prefix[0] = XrmStringToName (RESCLASS);
1048 class_prefix[1] = XrmStringToName ("Keysym"); 846 class_prefix[1] = XrmStringToName ("Keysym");
1049 class_prefix[2] = NULLQUARK; 847 class_prefix[2] = NULLQUARK;
1050 /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */ 848 /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */
1051 XrmEnumerateDatabase (XrmGetDatabase (disp), name_prefix, class_prefix, 849 XrmEnumerateDatabase (database, name_prefix, class_prefix,
1052 XrmEnumOneLevel, rxvt_define_key, NULL); 850 XrmEnumOneLevel, rxvt_define_key, NULL);
1053# ifdef RESFALLBACK 851# ifdef RESFALLBACK
1054 name_prefix[0] = XrmStringToName (RESFALLBACK); 852 name_prefix[0] = XrmStringToName (RESFALLBACK);
1055 name_prefix[1] = XrmStringToName ("keysym"); 853 name_prefix[1] = XrmStringToName ("keysym");
1056 class_prefix[0] = XrmStringToName (RESFALLBACK); 854 class_prefix[0] = XrmStringToName (RESFALLBACK);
1057 class_prefix[1] = XrmStringToName ("Keysym"); 855 class_prefix[1] = XrmStringToName ("Keysym");
1058 /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */ 856 /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */
1059 XrmEnumerateDatabase (XrmGetDatabase (disp), name_prefix, class_prefix, 857 XrmEnumerateDatabase (database, name_prefix, class_prefix,
1060 XrmEnumOneLevel, rxvt_define_key, NULL); 858 XrmEnumOneLevel, rxvt_define_key, NULL);
1061# endif 859# endif
1062# endif 860# endif
1063 861
1064# else /* USE_XGETDEFAULT */
1065 /* get resources the hard way, but save lots of memory */
1066 FILE *fd = NULL;
1067
1068 if (homedir)
1069 {
1070 static const char *const xnames[2] = { ".Xdefaults", ".Xresources" };
1071
1072 for (int i = 0; i < (sizeof (xnames) / sizeof (xnames [0])); i++)
1073 {
1074 snprintf (fname, sizeof (fname), "%s/%s", homedir, xnames [i]);
1075
1076 if ((fd = fopen (fname, "r")) != NULL)
1077 break;
1078 }
1079 }
1080 /*
1081 * The normal order to match resources is the following:
1082 * @ global resources (partial match, ~/.Xdefaults)
1083 * @ application file resources (XAPPLOADDIR/Rxvt)
1084 * @ class resources (~/.Xdefaults)
1085 * @ private resources (~/.Xdefaults)
1086 *
1087 * However, for the hand-rolled resources, the matching algorithm
1088 * checks if a resource string value has already been allocated
1089 * and won't overwrite it with (in this case) a less specific
1090 * resource value.
1091 *
1092 * This avoids multiple allocation. Also, when we've called this
1093 * routine command-line string options have already been applied so we
1094 * needn't to allocate for those resources.
1095 *
1096 * So, search in resources from most to least specific.
1097 *
1098 * Also, use a special sub-class so that we can use either or both of
1099 * "XTerm" and "Rxvt" as class names.
1100 */
1101
1102 get_xdefaults (fd, rs[Rs_name]);
1103 get_xdefaults (fd, RESCLASS);
1104# ifdef RESFALLBACK
1105 get_xdefaults (fd, RESFALLBACK);
1106# endif
1107
1108# if defined(XAPPLOADDIR) && defined(USE_XAPPLOADDIR)
1109 {
1110 FILE *ad = NULL;
1111
1112# if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1113 if (!*localepath || (ad = fopen (localepath, "r")) == NULL)
1114# endif
1115 ad = fopen (XAPPLOADDIR "/" RESCLASS, "r");
1116 if (ad != NULL)
1117 {
1118 get_xdefaults (ad, RESCLASS);
1119 get_xdefaults (ad, "");
1120 fclose (ad);
1121 }
1122 }
1123# endif /* XAPPLOADDIR */
1124
1125 get_xdefaults (fd, ""); /* partial match */
1126 if (fd != NULL)
1127 fclose (fd);
1128# endif /* USE_XGETDEFAULT */
1129
1130#endif /* NO_RESOURCES */ 862#endif /* NO_RESOURCES */
1131} 863}
1132 864
1133/*}}} */
1134/*----------------------- end-of-file (C source) -----------------------*/ 865/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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