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

Diff Legend

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