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.65 by root, Mon Jan 2 18:20:23 2006 UTC vs.
Revision 1.111 by ayin, Fri Aug 3 23:32:14 2007 UTC

1/*--------------------------------*-C-*---------------------------------* 1/*----------------------------------------------------------------------*
2 * File: xdefaults.C 2 * File: xdefaults.C
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
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/* place holders used for parsing command-line options */ 34/* place holders used for parsing command-line options */
41#define Optflag_Reverse 0x40000000UL 35#define Optflag_Reverse 1
42#define Optflag_Boolean 0x80000000UL 36#define Optflag_Boolean 2
43#define Optflag_mask 0x3fffffffUL 37#define Optflag_Switch 4
44 38
45/* #define DEBUG_RESOURCES */
46
47/*{{{ monolithic option/resource structure: */ 39/* monolithic option/resource structure: */
48/* 40/*
49 * `string' options MUST have a usage argument 41 * `string' options MUST have a usage argument
50 * `switch' and `boolean' options have no argument 42 * `switch' and `boolean' options have no argument
51 * 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 ()
52 */ 44 */
53 45
54/* INFO () - descriptive information only */ 46/* INFO () - descriptive information only */
55#define INFO(opt, arg, desc) \ 47#define INFO(opt, arg, desc) \
56 {0, -1, NULL, (opt), (arg), (desc)} 48 {0, 0, -1, NULL, (opt), (arg), (desc)}
57 49
58/* STRG () - command-line option, with/without resource */ 50/* STRG () - command-line option, with/without resource */
59#define STRG(rsp, kw, opt, arg, desc) \ 51#define STRG(rsp, kw, opt, arg, desc) \
60 {0, (rsp), (kw), (opt), (arg), (desc)} 52 {0, 0, (rsp), (kw), (opt), (arg), (desc)}
61 53
62/* RSTRG () - resource/long-option */ 54/* RSTRG () - resource/long-option */
63#define RSTRG(rsp, kw, arg) \ 55#define RSTRG(rsp, kw, arg) \
64 {0, (rsp), (kw), NULL, (arg), NULL} 56 {0, 0, (rsp), (kw), NULL, (arg), NULL}
65 57
66/* BOOL () - regular boolean `-/+' flag */ 58/* BOOL () - regular boolean `-/+' flag */
67#define BOOL(rsp, kw, opt, flag, desc) \ 59#define BOOL(rsp, kw, opt, option, flag, desc) \
68 { (Optflag_Boolean | (flag)), (rsp), (kw), (opt), NULL, (desc)} 60 { (option), (Optflag_Boolean | (flag)), (rsp), (kw), (opt), NULL, (desc)}
69 61
70/* SWCH () - `-' flag */ 62/* SWCH () - `-' flag */
71#define SWCH(opt, flag, desc) \ 63#define SWCH(opt, option, flag, desc) \
72 { (flag), -1, NULL, (opt), NULL, (desc)} 64 { (option), (Optflag_Switch | (flag)), -1, NULL, (opt), NULL, (desc)}
73 65
74/* convenient macros */ 66/* convenient macros */
75#define optList_strlen(i) \ 67#define optList_strlen(i) \
76 (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))
77#define optList_isBool(i) \ 69#define optList_isBool(i) \
… …
81#define optList_size \ 73#define optList_size \
82 (sizeof (optList) / sizeof (optList[0])) 74 (sizeof (optList) / sizeof (optList[0]))
83 75
84static const struct 76static const struct
85 { 77 {
78 const uint8_t index; /* Option index */
86 const unsigned long flag; /* Option flag */ 79 const uint8_t flag; /* Option flag */
87 const int doff; /* data offset */ 80 const int16_t doff; /* resource value index or -1 */
88 const char *kw; /* keyword */ 81 const char *kw; /* keyword */
89 const char *opt; /* option */ 82 const char *opt; /* option */
90 const char *arg; /* argument */ 83 const char *arg; /* argument */
91 const char *desc; /* description */ 84 const char *desc; /* description */
92 } 85 }
… …
94 STRG (Rs_display_name, NULL, "d", NULL, NULL), /* short form */ 87 STRG (Rs_display_name, NULL, "d", NULL, NULL), /* short form */
95 STRG (Rs_display_name, NULL, "display", "string", "X server to contact"), 88 STRG (Rs_display_name, NULL, "display", "string", "X server to contact"),
96 STRG (Rs_term_name, "termName", "tn", "string", "value of the TERM environment variable"), 89 STRG (Rs_term_name, "termName", "tn", "string", "value of the TERM environment variable"),
97 STRG (Rs_geometry, NULL, "g", NULL, NULL), /* short form */ 90 STRG (Rs_geometry, NULL, "g", NULL, NULL), /* short form */
98 STRG (Rs_geometry, "geometry", "geometry", "geometry", "size (in characters) and position"), 91 STRG (Rs_geometry, "geometry", "geometry", "geometry", "size (in characters) and position"),
99 SWCH ("C", Opt_console, "intercept console messages"), 92 SWCH ("C", Opt_console, 0, "intercept console messages"),
100 SWCH ("iconic", Opt_iconic, "start iconic"), 93 SWCH ("iconic", Opt_iconic, 0, "start iconic"),
101 SWCH ("ic", Opt_iconic, NULL), /* short form */ 94 SWCH ("ic", Opt_iconic, 0, NULL), /* short form */
102 BOOL (Rs_reverseVideo, "reverseVideo", "rv", Opt_reverseVideo, "reverse video"), 95 BOOL (Rs_reverseVideo, "reverseVideo", "rv", Opt_reverseVideo, 0, "reverse video"),
103 BOOL (Rs_loginShell, "loginShell", "ls", Opt_loginShell, "login shell"), 96 BOOL (Rs_loginShell, "loginShell", "ls", Opt_loginShell, 0, "login shell"),
104 BOOL (Rs_jumpScroll, "jumpScroll", "j", Opt_jumpScroll, "jump scrolling"), 97 BOOL (Rs_jumpScroll, "jumpScroll", "j", Opt_jumpScroll, 0, "jump scrolling"),
98 BOOL (Rs_skipScroll, "skipScroll", "ss", Opt_skipScroll, 0, "skip scrolling"),
105 BOOL (Rs_pastableTabs, "pastableTabs", "ptab", Opt_pastableTabs, "tab characters are pastable"), 99 BOOL (Rs_pastableTabs, "pastableTabs", "ptab", Opt_pastableTabs, 0, "tab characters are pastable"),
106#if HAVE_SCROLLBARS 100#if HAVE_SCROLLBARS
107 RSTRG (Rs_scrollstyle, "scrollstyle", "mode"), 101 RSTRG (Rs_scrollstyle, "scrollstyle", "mode"),
108 BOOL (Rs_scrollBar, "scrollBar", "sb", Opt_scrollBar, "scrollbar"), 102 BOOL (Rs_scrollBar, "scrollBar", "sb", Opt_scrollBar, 0, "scrollbar"),
109 BOOL (Rs_scrollBar_right, "scrollBar_right", "sr", Opt_scrollBar_right, "scrollbar right"), 103 BOOL (Rs_scrollBar_right, "scrollBar_right", "sr", Opt_scrollBar_right, 0, "scrollbar right"),
110 BOOL (Rs_scrollBar_floating, "scrollBar_floating", "st", Opt_scrollBar_floating, "scrollbar without a trough"), 104 BOOL (Rs_scrollBar_floating, "scrollBar_floating", "st", Opt_scrollBar_floating, 0, "scrollbar without a trough"),
111 RSTRG (Rs_scrollBar_align, "scrollBar_align", "mode"), 105 RSTRG (Rs_scrollBar_align, "scrollBar_align", "mode"),
112 STRG (Rs_scrollBar_thickness, "thickness", "sbt", "number", "scrollbar thickness/width in pixels"), 106 STRG (Rs_scrollBar_thickness, "thickness", "sbt", "number", "scrollbar thickness/width in pixels"),
113#endif 107#endif
114 BOOL (Rs_scrollTtyOutput, "scrollTtyOutput", NULL, Opt_scrollTtyOutput, NULL), 108 BOOL (Rs_scrollTtyOutput, "scrollTtyOutput", NULL, Opt_scrollTtyOutput, 0, NULL),
115 BOOL (Rs_scrollTtyOutput, NULL, "si", Optflag_Reverse | Opt_scrollTtyOutput, "scroll-on-tty-output inhibit"), 109 BOOL (Rs_scrollTtyOutput, NULL, "si", Opt_scrollTtyOutput, Optflag_Reverse, "scroll-on-tty-output inhibit"),
116 BOOL (Rs_scrollTtyKeypress, "scrollTtyKeypress", "sk", Opt_scrollTtyKeypress, "scroll-on-keypress"), 110 BOOL (Rs_scrollTtyKeypress, "scrollTtyKeypress", "sk", Opt_scrollTtyKeypress, 0, "scroll-on-keypress"),
117 BOOL (Rs_scrollWithBuffer, "scrollWithBuffer", "sw", Opt_scrollWithBuffer, "scroll-with-buffer"), 111 BOOL (Rs_scrollWithBuffer, "scrollWithBuffer", "sw", Opt_scrollWithBuffer, 0, "scroll-with-buffer"),
118#if TRANSPARENT 112#if ENABLE_TRANSPARENCY
119 BOOL (Rs_transparent, "inheritPixmap", "ip", Opt_transparent, "inherit parent pixmap"), 113 BOOL (Rs_transparent, "inheritPixmap", "ip", Opt_transparent, 0, "inherit parent pixmap"),
120 SWCH ("tr", Opt_transparent, NULL), 114 SWCH ("tr", Opt_transparent, 0, NULL),
121# if TINTING
122 STRG (Rs_color + Color_tint, "tintColor", "tint", "color", "tint color"), 115 STRG (Rs_color + Color_tint, "tintColor", "tint", "color", "tint color"),
123# endif 116 STRG (Rs_shade, "shading", "sh", "%", "shade background by x %."),
124#endif 117#endif
125#if OFF_FOCUS_FADING 118#if OFF_FOCUS_FADING
126 STRG (Rs_fade, "fading", "fade", "%", "fade colors x% percent when rxvt-unicode is losing focus"), 119 STRG (Rs_fade, "fading", "fade", "%", "fade colors x% percent when rxvt-unicode is losing focus"),
127 STRG (Rs_color + Color_fade, "fadeColor", "fadecolor", "color", "target color for off-focus fading"), 120 STRG (Rs_color + Color_fade, "fadeColor", "fadecolor", "color", "target color for off-focus fading"),
128#endif 121#endif
129#if TINTING
130 STRG (Rs_shade, "shading", "sh", "%", "shade background by x% when tinting."),
131#endif
132 BOOL (Rs_utmpInhibit, "utmpInhibit", "ut", Opt_utmpInhibit, "utmp inhibit"), 122 BOOL (Rs_utmpInhibit, "utmpInhibit", "ut", Opt_utmpInhibit, 0, "utmp inhibit"),
133#ifndef NO_BELL 123#ifndef NO_BELL
124# if ENABLE_FRILLS
125 BOOL (Rs_urgentOnBell, "urgentOnBell", NULL, Opt_urgentOnBell, 0, NULL),
126# endif
134 BOOL (Rs_visualBell, "visualBell", "vb", Opt_visualBell, "visual bell"), 127 BOOL (Rs_visualBell, "visualBell", "vb", Opt_visualBell, 0, "visual bell"),
135# if ! defined(NO_MAPALERT) && defined(MAPALERT_OPTION) 128# if ! defined(NO_MAPALERT) && defined(MAPALERT_OPTION)
136 BOOL (Rs_mapAlert, "mapAlert", NULL, Opt_mapAlert, NULL), 129 BOOL (Rs_mapAlert, "mapAlert", NULL, Opt_mapAlert, 0, NULL),
137# endif 130# endif
138#endif 131#endif
139#ifdef META8_OPTION 132#ifdef META8_OPTION
140 BOOL (Rs_meta8, "meta8", NULL, Opt_meta8, NULL), 133 BOOL (Rs_meta8, "meta8", NULL, Opt_meta8, 0, NULL),
141#endif 134#endif
142#ifdef MOUSE_WHEEL 135#ifdef MOUSE_WHEEL
143 BOOL (Rs_mouseWheelScrollPage, "mouseWheelScrollPage", NULL, Opt_mouseWheelScrollPage, NULL), 136 BOOL (Rs_mouseWheelScrollPage, "mouseWheelScrollPage", NULL, Opt_mouseWheelScrollPage, 0, NULL),
144#endif 137#endif
145#if ENABLE_FRILLS 138#if ENABLE_FRILLS
146 BOOL (Rs_tripleclickwords, "tripleclickwords", "tcw", Opt_tripleclickwords, "triple click word selection"), 139 BOOL (Rs_tripleclickwords, "tripleclickwords", "tcw", Opt_tripleclickwords, 0, "triple click word selection"),
147 BOOL (Rs_insecure, "insecure", "insecure", Opt_insecure, "enable possibly insecure escape sequences"), 140 BOOL (Rs_insecure, "insecure", "insecure", Opt_insecure, 0, "enable possibly insecure escape sequences"),
148 BOOL (Rs_cursorUnderline, "cursorUnderline", "uc", Opt_cursorUnderline, "underline cursor"), 141 BOOL (Rs_cursorUnderline, "cursorUnderline", "uc", Opt_cursorUnderline, 0, "underline cursor"),
149#endif 142#endif
150#if CURSOR_BLINK 143#if CURSOR_BLINK
151 BOOL (Rs_cursorBlink, "cursorBlink", "bc", Opt_cursorBlink, "blinking cursor"), 144 BOOL (Rs_cursorBlink, "cursorBlink", "bc", Opt_cursorBlink, 0, "blinking cursor"),
152#endif 145#endif
153#ifdef POINTER_BLANK 146#ifdef POINTER_BLANK
154 BOOL (Rs_pointerBlank, "pointerBlank", "pb", Opt_pointerBlank, "switch off pointer after delay"), 147 BOOL (Rs_pointerBlank, "pointerBlank", "pb", Opt_pointerBlank, 0, "switch off pointer after delay"),
155#endif 148#endif
156 STRG (Rs_color + Color_bg, "background", "bg", "color", "background color"), 149 STRG (Rs_color + Color_bg, "background", "bg", "color", "background color"),
157 STRG (Rs_color + Color_fg, "foreground", "fg", "color", "foreground color"), 150 STRG (Rs_color + Color_fg, "foreground", "fg", "color", "foreground color"),
158 RSTRG (Rs_color + minCOLOR + 0, "color0", "color"), 151 RSTRG (Rs_color + minCOLOR + 0, "color0", "color"),
159 RSTRG (Rs_color + minCOLOR + 1, "color1", "color"), 152 RSTRG (Rs_color + minCOLOR + 1, "color1", "color"),
… …
161 RSTRG (Rs_color + minCOLOR + 3, "color3", "color"), 154 RSTRG (Rs_color + minCOLOR + 3, "color3", "color"),
162 RSTRG (Rs_color + minCOLOR + 4, "color4", "color"), 155 RSTRG (Rs_color + minCOLOR + 4, "color4", "color"),
163 RSTRG (Rs_color + minCOLOR + 5, "color5", "color"), 156 RSTRG (Rs_color + minCOLOR + 5, "color5", "color"),
164 RSTRG (Rs_color + minCOLOR + 6, "color6", "color"), 157 RSTRG (Rs_color + minCOLOR + 6, "color6", "color"),
165 RSTRG (Rs_color + minCOLOR + 7, "color7", "color"), 158 RSTRG (Rs_color + minCOLOR + 7, "color7", "color"),
166#ifndef NO_BRIGHTCOLOR
167 RSTRG (Rs_color + minBrightCOLOR + 0, "color8", "color"), 159 RSTRG (Rs_color + minBrightCOLOR + 0, "color8", "color"),
168 RSTRG (Rs_color + minBrightCOLOR + 1, "color9", "color"), 160 RSTRG (Rs_color + minBrightCOLOR + 1, "color9", "color"),
169 RSTRG (Rs_color + minBrightCOLOR + 2, "color10", "color"), 161 RSTRG (Rs_color + minBrightCOLOR + 2, "color10", "color"),
170 RSTRG (Rs_color + minBrightCOLOR + 3, "color11", "color"), 162 RSTRG (Rs_color + minBrightCOLOR + 3, "color11", "color"),
171 RSTRG (Rs_color + minBrightCOLOR + 4, "color12", "color"), 163 RSTRG (Rs_color + minBrightCOLOR + 4, "color12", "color"),
172 RSTRG (Rs_color + minBrightCOLOR + 5, "color13", "color"), 164 RSTRG (Rs_color + minBrightCOLOR + 5, "color13", "color"),
173 RSTRG (Rs_color + minBrightCOLOR + 6, "color14", "color"), 165 RSTRG (Rs_color + minBrightCOLOR + 6, "color14", "color"),
174 RSTRG (Rs_color + minBrightCOLOR + 7, "color15", "color"), 166 RSTRG (Rs_color + minBrightCOLOR + 7, "color15", "color"),
175#endif /* NO_BRIGHTCOLOR */
176#ifndef NO_BOLD_UNDERLINE_REVERSE 167#ifndef NO_BOLD_UNDERLINE_REVERSE
177 RSTRG (Rs_color + Color_BD, "colorBD", "color"), 168 RSTRG (Rs_color + Color_BD, "colorBD", "color"),
178 RSTRG (Rs_color + Color_IT, "colorIT", "color"), 169 RSTRG (Rs_color + Color_IT, "colorIT", "color"),
179 RSTRG (Rs_color + Color_UL, "colorUL", "color"), 170 RSTRG (Rs_color + Color_UL, "colorUL", "color"),
180 RSTRG (Rs_color + Color_RV, "colorRV", "color"), 171 RSTRG (Rs_color + Color_RV, "colorRV", "color"),
… …
195 RSTRG (Rs_color + Color_cursor2, "cursorColor2", "color"), 186 RSTRG (Rs_color + Color_cursor2, "cursorColor2", "color"),
196#endif /* NO_CURSORCOLOR */ 187#endif /* NO_CURSORCOLOR */
197 STRG (Rs_color + Color_pointer_fg, "pointerColor", "pr", "color", "pointer color"), 188 STRG (Rs_color + Color_pointer_fg, "pointerColor", "pr", "color", "pointer color"),
198 STRG (Rs_color + Color_pointer_bg, "pointerColor2", "pr2", "color", "pointer bg color"), 189 STRG (Rs_color + Color_pointer_bg, "pointerColor2", "pr2", "color", "pointer bg color"),
199 STRG (Rs_color + Color_border, "borderColor", "bd", "color", "border color"), 190 STRG (Rs_color + Color_border, "borderColor", "bd", "color", "border color"),
200#if defined (XPM_BACKGROUND) || (MENUBAR_MAX) 191#ifdef XPM_BACKGROUND
201 RSTRG (Rs_path, "path", "search path"), 192 RSTRG (Rs_path, "path", "search path"),
202#endif /* defined (XPM_BACKGROUND) || (MENUBAR_MAX) */
203#ifdef XPM_BACKGROUND
204 STRG (Rs_backgroundPixmap, "backgroundPixmap", "pixmap", "file[;geom]", "background pixmap"), 193 STRG (Rs_backgroundPixmap, "backgroundPixmap", "pixmap", "file[;geom]", "background pixmap"),
205#endif /* XPM_BACKGROUND */
206#if (MENUBAR_MAX)
207 RSTRG (Rs_menu, "menu", "name[;tag]"),
208#endif 194#endif
209 /* fonts: command-line option = resource name */ 195 /* fonts: command-line option = resource name */
210 STRG (Rs_font, "font", "fn", "fontname", "normal text font"), 196 STRG (Rs_font, "font", "fn", "fontname", "normal text font"),
211#if ENABLE_STYLES 197#if ENABLE_STYLES
212 STRG (Rs_boldFont, "boldFont", "fb", "fontname", "bold font"), 198 STRG (Rs_boldFont, "boldFont", "fb", "fontname", "bold font"),
213 STRG (Rs_italicFont, "italicFont", "fi", "fontname", "italic font"), 199 STRG (Rs_italicFont, "italicFont", "fi", "fontname", "italic font"),
214 STRG (Rs_boldItalicFont, "boldItalicFont", "fbi", "fontname", "bold italic font"), 200 STRG (Rs_boldItalicFont, "boldItalicFont", "fbi", "fontname", "bold italic font"),
215 BOOL (Rs_intensityStyles, "intensityStyles", "is", Opt_intensityStyles, "font styles imply intensity changes"), 201 BOOL (Rs_intensityStyles, "intensityStyles", "is", Opt_intensityStyles, 0, "font styles imply intensity changes"),
216#endif 202#endif
217#ifdef USE_XIM 203#ifdef USE_XIM
218 STRG (Rs_inputMethod, "inputMethod", "im", "name", "name of input method"), 204 STRG (Rs_inputMethod, "inputMethod", "im", "name", "name of input method"),
219 STRG (Rs_preeditType, "preeditType", "pt", "style", "input style: style = OverTheSpot|OffTheSpot|Root"), 205 STRG (Rs_preeditType, "preeditType", "pt", "style", "input style: style = OverTheSpot|OffTheSpot|Root"),
220 STRG (Rs_imLocale, "imLocale", "imlocale", "string", "locale to use for input method"), 206 STRG (Rs_imLocale, "imLocale", "imlocale", "string", "locale to use for input method"),
… …
226 STRG (Rs_iconName, "iconName", "n", "string", "icon name for window"), 212 STRG (Rs_iconName, "iconName", "n", "string", "icon name for window"),
227 STRG (Rs_saveLines, "saveLines", "sl", "number", "number of scrolled lines to save"), 213 STRG (Rs_saveLines, "saveLines", "sl", "number", "number of scrolled lines to save"),
228#if ENABLE_XEMBED 214#if ENABLE_XEMBED
229 STRG (Rs_embed, NULL, "embed", "windowid", "window id to embed terminal in"), 215 STRG (Rs_embed, NULL, "embed", "windowid", "window id to embed terminal in"),
230#endif 216#endif
217#if XFT
218 STRG (Rs_depth, "depth", "depth", "number", "depth of visual to request"),
219#endif
231#if ENABLE_FRILLS 220#if ENABLE_FRILLS
221 RSTRG (Rs_transient_for, "transient-for", "windowid"),
222 BOOL (Rs_override_redirect, "override-redirect", "override-redirect", Opt_override_redirect, 0, "set override-redirect on the terminal window"),
232 STRG (Rs_pty_fd, NULL, "pty-fd", "fileno", "file descriptor of pty to use"), 223 STRG (Rs_pty_fd, NULL, "pty-fd", "fileno", "file descriptor of pty to use"),
233 BOOL (Rs_hold, "hold", "hold", Opt_hold, "retain window after shell exit"), 224 BOOL (Rs_hold, "hold", "hold", Opt_hold, 0, "retain window after shell exit"),
234 STRG (Rs_ext_bwidth, "externalBorder", "w", "number", "external border in pixels"), 225 STRG (Rs_ext_bwidth, "externalBorder", "w", "number", "external border in pixels"),
235 STRG (Rs_ext_bwidth, NULL, "bw", NULL, NULL), 226 STRG (Rs_ext_bwidth, NULL, "bw", NULL, NULL),
236 STRG (Rs_ext_bwidth, NULL, "borderwidth", NULL, NULL), 227 STRG (Rs_ext_bwidth, NULL, "borderwidth", NULL, NULL),
237 STRG (Rs_int_bwidth, "internalBorder", "b", "number", "internal border in pixels"), 228 STRG (Rs_int_bwidth, "internalBorder", "b", "number", "internal border in pixels"),
238 BOOL (Rs_borderLess, "borderLess", "bl", Opt_borderLess, "borderless window"), 229 BOOL (Rs_borderLess, "borderLess", "bl", Opt_borderLess, 0, "borderless window"),
230 BOOL (Rs_skipBuiltinGlyphs, "skipBuiltinGlyphs", "sbg", Opt_skipBuiltinGlyphs, 0, "do not use internal glyphs"),
239 STRG (Rs_lineSpace, "lineSpace", "lsp", "number", "number of extra pixels between rows"), 231 STRG (Rs_lineSpace, "lineSpace", "lsp", "number", "number of extra pixels between rows"),
240#endif 232#endif
241#ifdef POINTER_BLANK 233#ifdef POINTER_BLANK
242 RSTRG (Rs_pointerBlankDelay, "pointerBlankDelay", "number"), 234 RSTRG (Rs_pointerBlankDelay, "pointerBlankDelay", "number"),
243#endif 235#endif
… …
255#ifdef CUTCHAR_RESOURCE 247#ifdef CUTCHAR_RESOURCE
256 RSTRG (Rs_cutchars, "cutchars", "string"), 248 RSTRG (Rs_cutchars, "cutchars", "string"),
257#endif /* CUTCHAR_RESOURCE */ 249#endif /* CUTCHAR_RESOURCE */
258 RSTRG (Rs_answerbackstring, "answerbackString", "string"), 250 RSTRG (Rs_answerbackstring, "answerbackString", "string"),
259#ifndef NO_SECONDARY_SCREEN 251#ifndef NO_SECONDARY_SCREEN
260 BOOL (Rs_secondaryScreen, "secondaryScreen", "ssc", Opt_secondaryScreen, "enable secondary screen"), 252 BOOL (Rs_secondaryScreen, "secondaryScreen", "ssc", Opt_secondaryScreen, 0, "enable secondary screen"),
261 BOOL (Rs_secondaryScroll, "secondaryScroll", "ssr", Opt_secondaryScroll, "enable secondary screen scroll"), 253 BOOL (Rs_secondaryScroll, "secondaryScroll", "ssr", Opt_secondaryScroll, 0, "enable secondary screen scroll"),
262#endif 254#endif
263#if ENABLE_PERL 255#if ENABLE_PERL
264 STRG (Rs_perl_lib, "perl-lib", 0, "string", "directory where to look for additional extension scripts"), 256 RSTRG (Rs_perl_lib, "perl-lib", "string"), //, "colon-separated directories with extension scripts"),TODO
265 STRG (Rs_perl_eval, "perl-eval", 0, "string", "string to be evaluated after all extensions have been loaded"), 257 RSTRG (Rs_perl_eval, "perl-eval", "perl-eval"), // "string", "code to be evaluated after all extensions have been loaded"),TODO
266 STRG (Rs_perl, "perl", "perl", "string", "unused by urxvt proper, free for extensions to use"), 258 RSTRG (Rs_perl_ext_1, "perl-ext-common", "string"), //, "colon-separated list of perl extensions to enable"),TODO
259 STRG (Rs_perl_ext_2, "perl-ext", "pe", "string", "colon-separated list of perl extensions to enable for this instance"),
267#endif 260#endif
268#if 0 && TODO 261#if ISO_14755
269#if !defined(NO_RESOURCES) && defined(USE_XGETDEFAULT) 262 BOOL (Rs_iso14755_52, "iso14755_52", NULL, Opt_iso14755_52, 0, NULL),
263#endif
264#ifdef HAVE_AFTERIMAGE
265 STRG (Rs_blendtype, "blendType", "blt", "string", "background image blending type - alpha, tint, etc..."),
266 STRG (Rs_blurradius, "blurRadius", "blr", "HxV", "Gaussian Blur radii to apply to the root background"),
267#endif
268#ifndef NO_RESOURCES
270 INFO ("xrm", "string", "X resource"), 269 INFO ("xrm", "string", "X resource"),
271#endif
272#endif 270#endif
273 INFO ("e", "command arg ...", "command to execute") 271 INFO ("e", "command arg ...", "command to execute")
274 }; 272 };
275 273
276#undef INFO 274#undef INFO
277#undef STRG 275#undef STRG
278#undef RSTRG 276#undef RSTRG
279#undef SWCH 277#undef SWCH
280#undef BOOL 278#undef BOOL
281/*}}} */
282 279
283static const char releasestring[] = "rxvt-unicode (" RXVTNAME ") v" VERSION " - released: " DATE "\n"; 280static const char releasestring[] = "rxvt-unicode (" RXVTNAME ") v" VERSION " - released: " DATE "\n";
284static const char optionsstring[] = "options: " 281static const char optionsstring[] = "options: "
282#if ENABLE_PERL
283 "perl,"
284#endif
285#if XFT 285#if XFT
286 "xft," 286 "xft,"
287#endif 287#endif
288#if ENABLE_STYLES 288#if ENABLE_STYLES
289 "styles," 289 "styles,"
… …
321 "fade," 321 "fade,"
322#endif 322#endif
323#if defined(XPM_BACKGROUND) 323#if defined(XPM_BACKGROUND)
324 "XPM," 324 "XPM,"
325#endif 325#endif
326#if defined(TRANSPARENT) 326#if defined(ENABLE_TRANSPARENCY)
327 "transparent," 327 "transparent,"
328#endif
329#if TINTING
330 "tint," 328 "tint,"
331#endif 329#endif
332#if defined(UTMP_SUPPORT) 330#if HAVE_AFTERIMAGE
333 "utmp," 331 "afterimage,"
334#endif
335#if defined(MENUBAR)
336 "menubar,"
337#endif 332#endif
338#if defined(USE_XIM) 333#if defined(USE_XIM)
339 "XIM," 334 "XIM,"
335#endif
336#if defined(NO_BACKSPACE_KEY)
337 "no_backspace,"
338#endif
339#if defined(NO_DELETE_KEY)
340 "no_delete,"
341#endif
342#if EIGHT_BIT_CONTROLS
343 "8bitctrls,"
344#endif
345#if defined(ENABLE_FRILLS)
346 "frills,"
347#endif
348#if defined(SELECTION_SCROLLING)
349 "selectionscrolling,"
350#endif
351#if MOUSE_WHEEL
352 "wheel,"
353#endif
354#if MOUSE_SLIP_WHEELING
355 "slipwheel,"
356#endif
357#if defined(SMART_RESIZE)
358 "smart-resize,"
359#endif
360#if defined(CURSOR_BLINK)
361 "cursorBlink,"
362#endif
363#if defined(POINTER_BLANK)
364 "pointerBlank,"
365#endif
366#if defined(NO_RESOURCES)
367 "NoResources,"
340#endif 368#endif
341 "scrollbars=" 369 "scrollbars="
342#if !defined(HAVE_SCROLLBARS) 370#if !defined(HAVE_SCROLLBARS)
343 "NONE" 371 "NONE"
344#else 372#else
… …
362# endif 390# endif
363# if defined(XTERM_SCROLLBAR) 391# if defined(XTERM_SCROLLBAR)
364 "xterm" 392 "xterm"
365# endif 393# endif
366#endif 394#endif
367 ","
368#if defined(NO_BACKSPACE_KEY)
369 "no_backspace,"
370#endif
371#if defined(NO_DELETE_KEY)
372 "no_delete,"
373#endif
374#if EIGHT_BIT_CONTROLS
375 "8bitctrls,"
376#endif
377#if !defined(NO_STRINGS)
378 "strings,"
379#endif
380#if defined(ENABLE_FRILLS)
381 "frills,"
382#endif
383#if defined(PREFER_24BIT)
384 "24bit,"
385#endif
386#if defined(SELECTION_SCROLLING)
387 "selectionscrolling,"
388#endif
389#if MOUSE_WHEEL
390 "wheel,"
391#endif
392#if MOUSE_SLIP_WHEELING
393 "slipwheel,"
394#endif
395#if defined(SMART_RESIZE)
396 "smart-resize,"
397#endif
398#if defined(CURSOR_BLINK)
399 "cursorBlink,"
400#endif
401#if defined(POINTER_BLANK)
402 "pointerBlank,"
403#endif
404#if defined(NO_RESOURCES)
405 "NoResources"
406#else
407# if defined(USE_XGETDEFAULT)
408 "XGetDefaults"
409# else
410 ".Xdefaults"
411# endif
412#endif
413 "\nUsage: "; /* Usage */ 395 "\nUsage: "; /* Usage */
414 396
415#define INDENT 18 397#define INDENT 18
398
399const char rxvt_term::resval_undef [] = "<undef>";
400const char rxvt_term::resval_on [] = "on";
401const char rxvt_term::resval_off [] = "off";
416 402
417/*{{{ usage: */ 403/*{{{ usage: */
418/*----------------------------------------------------------------------*/ 404/*----------------------------------------------------------------------*/
419static void 405static void
420rxvt_usage (int type) 406rxvt_usage (int type)
… …
429 rxvt_log (" [-help] [--help]\n"); 415 rxvt_log (" [-help] [--help]\n");
430 416
431 for (col = 1, i = 0; i < optList_size; i++) 417 for (col = 1, i = 0; i < optList_size; i++)
432 if (optList[i].desc != NULL) 418 if (optList[i].desc != NULL)
433 { 419 {
434 int len = 0; 420 int len = 0;
435 421
436 if (!optList_isBool (i)) 422 if (!optList_isBool (i))
437 { 423 {
438 len = optList_strlen (i); 424 len = optList_strlen (i);
439 if (len > 0) 425 if (len > 0)
… …
506 492
507/*{{{ get command-line options before getting resources */ 493/*{{{ get command-line options before getting resources */
508void 494void
509rxvt_term::get_options (int argc, const char *const *argv) 495rxvt_term::get_options (int argc, const char *const *argv)
510{ 496{
511 int i, bad_option = 0; 497 int i, bad_option = 0;
512 static const char On[3] = "ON", Off[4] = "OFF";
513 498
514 for (i = 1; i < argc; i++) 499 for (i = 1; i < argc; i++)
515 { 500 {
516 unsigned int entry, longopt = 0; 501 unsigned int entry, longopt = 0;
517 const char *flag, *opt; 502 const char *flag, *opt;
518 503
519 opt = argv[i]; 504 opt = argv[i];
520#ifdef DEBUG_RESOURCES 505
521 fprintf (stderr, "argv[%d] = %s: ", i, opt);
522#endif
523 if (*opt == '-') 506 if (*opt == '-')
524 { 507 {
525 flag = On; 508 flag = resval_on;
509
526 if (*++opt == '-') 510 if (*++opt == '-')
527 longopt = *opt++; /* long option */ 511 longopt = *opt++; /* long option */
528 } 512 }
529 else if (*opt == '+') 513 else if (*opt == '+')
530 { 514 {
531 flag = Off; 515 flag = resval_off;
516
532 if (*++opt == '+') 517 if (*++opt == '+')
533 longopt = *opt++; /* long option */ 518 longopt = *opt++; /* long option */
534 } 519 }
535 else 520 else
536 { 521 {
… …
539 continue; 524 continue;
540 } 525 }
541 526
542 if (!strcmp (opt, "help")) 527 if (!strcmp (opt, "help"))
543 rxvt_usage (longopt ? 2 : 1); 528 rxvt_usage (longopt ? 2 : 1);
529
544 if (!strcmp (opt, "h")) 530 if (!strcmp (opt, "h"))
545 rxvt_usage (0); 531 rxvt_usage (0);
546 532
547 /* feature: always try to match long-options */ 533 /* feature: always try to match long-options */
548 for (entry = 0; entry < optList_size; entry++) 534 for (entry = 0; entry < optList_size; entry++)
… …
552 break; 538 break;
553 539
554 if (entry < optList_size) 540 if (entry < optList_size)
555 { 541 {
556 if (optList_isReverse (entry)) 542 if (optList_isReverse (entry))
557 flag = flag == On ? Off : On; 543 flag = flag == resval_on ? resval_off : resval_on;
558 544
559 if (optList_strlen (entry)) 545 if (optList_strlen (entry))
560 { 546 {
561 /* 547 /*
562 * special cases are handled in main.c:main () to allow 548 * special cases are handled in main.c:main () to allow
563 * X resources to set these values before we settle for 549 * X resources to set these values before we settle for
564 * default values 550 * default values
565 */ 551 */
566 552
567 if (optList[entry].doff != -1) 553 if (optList[entry].doff != -1)
554 {
555 if (flag == resval_on && !argv [i+1])
556 rxvt_fatal ("option '%s' needs an argument, aborting.\n", argv [i]);
557
568 rs[optList[entry].doff] = flag == On && argv[i+1] 558 rs[optList[entry].doff] = flag == resval_on ? argv[++i] : resval_undef;
569 ? argv[++i] : 0; 559 }
570 } 560 }
571 else 561 else
572 { /* boolean value */ 562 { /* boolean value */
573#ifdef DEBUG_RESOURCES 563 set_option (optList[entry].index, flag == resval_on);
574 fprintf (stderr, "boolean (%s,%s) = %s\n",
575 optList[entry].opt, optList[entry].kw, flag);
576#endif
577 if (flag == On)
578 SET_OPTION (optList[entry].flag & Optflag_mask);
579 else
580 CLR_OPTION (optList[entry].flag & Optflag_mask);
581 564
582 if (optList[entry].doff != -1) 565 if (optList[entry].doff != -1)
583 rs[optList[entry].doff] = flag; 566 rs[optList[entry].doff] = flag;
584 } 567 }
585 } 568 }
… …
617 * "rxvt" "keysym" "0xFF01" 600 * "rxvt" "keysym" "0xFF01"
618 * value will be a string 601 * value will be a string
619 */ 602 */
620/* ARGSUSED */ 603/* ARGSUSED */
621int 604int
622rxvt_define_key (XrmDatabase *database __attribute__((unused)), 605rxvt_define_key (XrmDatabase *database UNUSED,
623 XrmBindingList bindings __attribute__((unused)), 606 XrmBindingList bindings UNUSED,
624 XrmQuarkList quarks, 607 XrmQuarkList quarks,
625 XrmRepresentation *type __attribute__((unused)), 608 XrmRepresentation *type UNUSED,
626 XrmValue *value, 609 XrmValue *value,
627 XPointer closure __attribute__((unused))) 610 XPointer closure UNUSED)
628{ 611{
629 int last; 612 int last;
630 613
631 for (last = 0; quarks[last] != NULLQUARK; last++) /* look for last quark in list */ 614 for (last = 0; quarks[last] != NULLQUARK; last++) /* look for last quark in list */
632 ; 615 ;
… …
694 { 677 {
695 if ((n = rxvt_Str_match (str, "keysym.")) == 0) 678 if ((n = rxvt_Str_match (str, "keysym.")) == 0)
696 return 0; 679 return 0;
697 680
698 str += n; /* skip `keysym.' */ 681 str += n; /* skip `keysym.' */
699 if ((pmodend = strchr (str, ':')) < str) 682 if (!(pmodend = strchr (str, ':')))
700 return -1; 683 return -1;
701 } 684 }
702 else 685 else
703 pmodend = str + strlen(str); 686 pmodend = str + strlen(str);
704 687
… …
782 keyboard->register_user_translation (sym, state, newarg); 765 keyboard->register_user_translation (sym, state, newarg);
783 return 1; 766 return 1;
784} 767}
785 768
786# endif /* KEYSYM_RESOURCE */ 769# endif /* KEYSYM_RESOURCE */
770#endif /* NO_RESOURCES */
787 771
788# ifndef USE_XGETDEFAULT 772static char *
789/*{{{ rxvt_get_xdefaults () */ 773get_res (XrmDatabase database, const char *program, const char *option)
790/*
791 * the matching algorithm used for memory-save fake resources
792 */
793void
794rxvt_term::get_xdefaults (FILE *stream, const char *name)
795{ 774{
796 unsigned int len; 775 char resource[512];
797 char *str, buffer[256]; 776 char *type;
777 XrmValue result;
798 778
799 if (stream == NULL) 779 snprintf (resource, sizeof (resource), "%s.%s", program, option);
800 return; 780 XrmGetResource (database, resource, resource, &type, &result);
801 781
802 len = strlen (name); 782 return result.addr;
803 while ((str = fgets (buffer, sizeof (buffer), stream)) != NULL) 783}
784
785const char *
786rxvt_term::x_resource (const char *name)
787{
788 XrmDatabase database = XrmGetDatabase (dpy);
789
790 const char *p = get_res (database, rs[Rs_name], name);
791 const char *p0 = get_res (database, "!INVALIDPROGRAMMENAMEDONTMATCH!", name);
792
793 if (p == NULL || (p0 && strcmp (p, p0) == 0))
804 { 794 {
805 unsigned int entry, n; 795 p = get_res (database, RESCLASS, name);
806 796#ifdef RESFALLBACK
807 while (*str && isspace (*str)) 797 if (p == NULL || (p0 && strcmp (p, p0) == 0))
808 str++; /* leading whitespace */ 798 p = get_res (database, RESFALLBACK, name);
809 799#endif
810 if ((str[len] != '*' && str[len] != '.')
811 || (len && strncmp (str, name, len)))
812 continue;
813 str += (len + 1); /* skip `name*' or `name.' */
814
815# ifdef KEYSYM_RESOURCE
816 if (!parse_keysym (str, NULL))
817# endif /* KEYSYM_RESOURCE */
818 for (entry = 0; entry < optList_size; entry++)
819 {
820 const char *kw = optList[entry].kw;
821
822 if (kw == NULL)
823 continue;
824
825 n = strlen (kw);
826 if (str[n] == ':' && rxvt_Str_match (str, kw))
827 {
828 /* skip `keyword:' */
829 str += n + 1;
830 rxvt_Str_trim (str);
831 n = strlen (str);
832
833 if (n && rs[optList[entry].doff] == NULL)
834 {
835 /* not already set */
836 int s;
837 char *p = 0;
838
839 for (int o = 0;;)
840 {
841 p = (char *)rxvt_realloc (p, o + n + 1);
842 memcpy (p + o, str, n);
843 o += n;
844 p[o] = 0;
845
846 if (o == 0 || p[o - 1] != '\\') // continuation line
847 break;
848
849 o--; // eat "\"
850
851 if ((str = fgets (buffer, sizeof (buffer), stream)) == NULL)
852 break;
853
854 rxvt_Str_trim (str);
855 n = strlen (str);
856 }
857
858 rs[optList[entry].doff] = p;
859 allocated.push_back (p);
860
861 if (optList_isBool (entry))
862 {
863 s = strcasecmp (str, "true") == 0
864 || strcasecmp (str, "yes") == 0
865 || strcasecmp (str, "on") == 0
866 || strcmp (str, "1") == 0;
867
868 if (optList_isReverse (entry))
869 s = !s;
870
871 if (s)
872 SET_OPTION (optList[entry].flag & Optflag_mask);
873 else
874 CLR_OPTION (optList[entry].flag & Optflag_mask);
875 }
876 }
877
878 break;
879 }
880 }
881 } 800 }
882 801
883 rewind (stream); 802 if (p == NULL && p0)
803 p = p0;
804
805 return p;
884} 806}
885 807
886/*}}} */
887# endif /* ! USE_XGETDEFAULT */
888#endif /* NO_RESOURCES */
889
890/*{{{ read the resources files */
891/*
892 * using XGetDefault () or the hand-rolled replacement
893 */
894/* ARGSUSED */
895void 808void
896rxvt_term::extract_resources () 809rxvt_term::extract_resources ()
897{ 810{
898 dDisp;
899
900#ifndef NO_RESOURCES 811#ifndef NO_RESOURCES
901
902 char *homedir = (char *)getenv ("HOME");
903 char fname[1024];
904
905# if defined XAPPLOADDIR
906# if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
907 /* Compute the path of the possibly available localized Rxvt file */
908 char localepath[1024];
909
910 if (locale)
911 snprintf (localepath, sizeof (localepath), XAPPLOADDIRLOCALE "/" RESCLASS, locale);
912 else
913 localepath[0] = 0;
914# endif
915# endif
916
917# ifdef USE_XGETDEFAULT
918 /*
919 * get resources using the X library function
920 */
921 int entry;
922
923# ifdef XrmEnumOneLevel
924 char *displayResource, *xe;
925 XrmName name_prefix[3];
926 XrmClass class_prefix[3];
927 XrmDatabase database, rdb1;
928
929 XrmInitialize ();
930 database = NULL;
931
932 // for ordering, see for example http://www.faqs.org/faqs/Xt-FAQ/ Subject: 20
933
934 // 6. System wide per application default file.
935 /* Add in Rxvt file */
936# if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
937 if (*localepath
938 && ((rdb1 = XrmGetFileDatabase (localepath))
939 || (rdb1 = XrmGetFileDatabase (XAPPLOADDIR "/" RESCLASS))))
940# endif
941 XrmMergeDatabases (rdb1, &database);
942
943 /* Add in $XAPPLRESDIR/Rxvt only; not bothering with XUSERFILESEARCHPATH */
944 if ((xe = (char *)getenv ("XAPPLRESDIR")))
945 {
946 snprintf (fname, sizeof (fname), "%s/%s", xe, RESCLASS);
947
948 if ((rdb1 = XrmGetFileDatabase (fname)))
949 XrmMergeDatabases (rdb1, &database);
950 }
951
952 // 5. User's per application default file.
953 // none
954
955 // 4. User's defaults file.
956 /* Get any Xserver defaults */
957 displayResource = XResourceManagerString (disp);
958 if (displayResource != NULL)
959 {
960 if ((rdb1 = XrmGetStringDatabase (displayResource)))
961 XrmMergeDatabases (rdb1, &database);
962 }
963 else if (homedir)
964 {
965 snprintf (fname, sizeof (fname), "%s/.Xdefaults", homedir);
966
967 if ((rdb1 = XrmGetFileDatabase (fname)))
968 XrmMergeDatabases (rdb1, &database);
969 }
970
971 /* Get screen specific resources */
972 displayResource = XScreenResourceString (ScreenOfDisplay (disp, display->screen));
973 if (displayResource != NULL)
974 {
975 if ((rdb1 = XrmGetStringDatabase (displayResource)))
976 /* Merge with screen-independent resources */
977 XrmMergeDatabases (rdb1, &database);
978
979 XFree (displayResource);
980 }
981
982 // 3. User's per host defaults file
983 /* Add in XENVIRONMENT file */
984 if ((xe = (char *)getenv ("XENVIRONMENT"))
985 && (rdb1 = XrmGetFileDatabase (xe)))
986 XrmMergeDatabases (rdb1, &database);
987 else if (homedir)
988 {
989 struct utsname un;
990
991 if (!uname (&un))
992 {
993 snprintf (fname, sizeof (fname), "%s/.Xdefaults-%s", homedir, un.nodename);
994
995 if ((rdb1 = XrmGetFileDatabase (fname)))
996 XrmMergeDatabases (rdb1, &database);
997 }
998 }
999
1000 XrmSetDatabase (disp, database);
1001# endif
1002
1003 /* 812 /*
1004 * Query resources for options that affect us 813 * Query resources for options that affect us
1005 */ 814 */
1006 for (entry = 0; entry < optList_size; entry++) 815 for (int entry = 0; entry < optList_size; entry++)
1007 { 816 {
1008 int s; 817 int s;
1009 char *p, *p0;
1010 const char *kw = optList[entry].kw; 818 const char *kw = optList[entry].kw;
1011 819
1012 if (kw == NULL || rs[optList[entry].doff] != NULL) 820 if (kw == NULL || rs[optList[entry].doff] != NULL)
1013 continue; /* previously set */ 821 continue; // previously set
1014 822
1015 p = XGetDefault (disp, rs[Rs_name], kw); 823 const char *p = x_resource (kw);
1016 p0 = XGetDefault (disp, "!INVALIDPROGRAMMENAMEDONTMATCH!", kw);
1017 if (p == NULL || (p0 && strcmp (p, p0) == 0))
1018 {
1019 p = XGetDefault (disp, RESCLASS, kw);
1020#ifdef RESFALLBACK
1021 if (p == NULL || (p0 && strcmp (p, p0) == 0))
1022 p = XGetDefault (disp, RESFALLBACK, kw);
1023#endif
1024 }
1025
1026 if (p == NULL && p0)
1027 p = p0;
1028 824
1029 if (p) 825 if (p)
1030 { 826 {
827 p = strdup (p);
828 allocated.push_back ((void *)p);
1031 rs[optList[entry].doff] = p; 829 rs[optList[entry].doff] = p;
1032 830
1033 if (optList_isBool (entry)) 831 if (optList_isBool (entry))
1034 { 832 {
1035 s = strcasecmp (p, "TRUE") == 0 833 s = strcasecmp (p, "TRUE") == 0
… …
1038 || strcasecmp (p, "1") == 0; 836 || strcasecmp (p, "1") == 0;
1039 837
1040 if (optList_isReverse (entry)) 838 if (optList_isReverse (entry))
1041 s = !s; 839 s = !s;
1042 840
1043 if (s) 841 set_option (optList[entry].index, s);
1044 SET_OPTION (optList[entry].flag & Optflag_mask);
1045 else
1046 CLR_OPTION (optList[entry].flag & Optflag_mask);
1047 } 842 }
1048 } 843 }
1049 } 844 }
1050 845
1051 /* 846 /*
1052 * [R5 or later]: enumerate the resource database 847 * [R5 or later]: enumerate the resource database
1053 */ 848 */
1054# ifdef KEYSYM_RESOURCE 849# ifdef KEYSYM_RESOURCE
850 XrmDatabase database = XrmGetDatabase (dpy);
851 XrmName name_prefix[3];
852 XrmClass class_prefix[3];
853
1055 name_prefix[0] = XrmStringToName (rs[Rs_name]); 854 name_prefix[0] = XrmStringToName (rs[Rs_name]);
1056 name_prefix[1] = XrmStringToName ("keysym"); 855 name_prefix[1] = XrmStringToName ("keysym");
1057 name_prefix[2] = NULLQUARK; 856 name_prefix[2] = NULLQUARK;
1058 class_prefix[0] = XrmStringToName (RESCLASS); 857 class_prefix[0] = XrmStringToName (RESCLASS);
1059 class_prefix[1] = XrmStringToName ("Keysym"); 858 class_prefix[1] = XrmStringToName ("Keysym");
1060 class_prefix[2] = NULLQUARK; 859 class_prefix[2] = NULLQUARK;
1061 /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */ 860 /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */
1062 XrmEnumerateDatabase (XrmGetDatabase (disp), name_prefix, class_prefix, 861 XrmEnumerateDatabase (database, name_prefix, class_prefix,
1063 XrmEnumOneLevel, rxvt_define_key, NULL); 862 XrmEnumOneLevel, rxvt_define_key, NULL);
1064# ifdef RESFALLBACK 863# ifdef RESFALLBACK
1065 name_prefix[0] = XrmStringToName (RESFALLBACK); 864 name_prefix[0] = XrmStringToName (RESFALLBACK);
1066 name_prefix[1] = XrmStringToName ("keysym"); 865 name_prefix[1] = XrmStringToName ("keysym");
1067 class_prefix[0] = XrmStringToName (RESFALLBACK); 866 class_prefix[0] = XrmStringToName (RESFALLBACK);
1068 class_prefix[1] = XrmStringToName ("Keysym"); 867 class_prefix[1] = XrmStringToName ("Keysym");
1069 /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */ 868 /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */
1070 XrmEnumerateDatabase (XrmGetDatabase (disp), name_prefix, class_prefix, 869 XrmEnumerateDatabase (database, name_prefix, class_prefix,
1071 XrmEnumOneLevel, rxvt_define_key, NULL); 870 XrmEnumOneLevel, rxvt_define_key, NULL);
1072# endif 871# endif
1073# endif 872# endif
1074 873
1075# else /* USE_XGETDEFAULT */
1076 /* get resources the hard way, but save lots of memory */
1077 FILE *fd = NULL;
1078
1079 if (homedir)
1080 {
1081 static const char *const xnames[2] = { ".Xdefaults", ".Xresources" };
1082
1083 for (int i = 0; i < (sizeof (xnames) / sizeof (xnames [0])); i++)
1084 {
1085 snprintf (fname, sizeof (fname), "%s/%s", homedir, xnames [i]);
1086
1087 if ((fd = fopen (fname, "r")) != NULL)
1088 break;
1089 }
1090 }
1091 /*
1092 * The normal order to match resources is the following:
1093 * @ global resources (partial match, ~/.Xdefaults)
1094 * @ application file resources (XAPPLOADDIR/Rxvt)
1095 * @ class resources (~/.Xdefaults)
1096 * @ private resources (~/.Xdefaults)
1097 *
1098 * However, for the hand-rolled resources, the matching algorithm
1099 * checks if a resource string value has already been allocated
1100 * and won't overwrite it with (in this case) a less specific
1101 * resource value.
1102 *
1103 * This avoids multiple allocation. Also, when we've called this
1104 * routine command-line string options have already been applied so we
1105 * needn't to allocate for those resources.
1106 *
1107 * So, search in resources from most to least specific.
1108 *
1109 * Also, use a special sub-class so that we can use either or both of
1110 * "XTerm" and "Rxvt" as class names.
1111 */
1112
1113 get_xdefaults (fd, rs[Rs_name]);
1114 get_xdefaults (fd, RESCLASS);
1115# ifdef RESFALLBACK
1116 get_xdefaults (fd, RESFALLBACK);
1117# endif
1118
1119# if defined(XAPPLOADDIR) && defined(USE_XAPPLOADDIR)
1120 {
1121 FILE *ad = NULL;
1122
1123# if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1124 if (!*localepath || (ad = fopen (localepath, "r")) == NULL)
1125# endif
1126 ad = fopen (XAPPLOADDIR "/" RESCLASS, "r");
1127 if (ad != NULL)
1128 {
1129 get_xdefaults (ad, RESCLASS);
1130 get_xdefaults (ad, "");
1131 fclose (ad);
1132 }
1133 }
1134# endif /* XAPPLOADDIR */
1135
1136 get_xdefaults (fd, ""); /* partial match */
1137 if (fd != NULL)
1138 fclose (fd);
1139# endif /* USE_XGETDEFAULT */
1140
1141#endif /* NO_RESOURCES */ 874#endif /* NO_RESOURCES */
1142} 875}
1143 876
1144/*}}} */
1145/*----------------------- end-of-file (C source) -----------------------*/ 877/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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