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.41 by root, Sun Sep 5 09:33:00 2004 UTC vs.
Revision 1.74 by root, Sun Jan 8 01:02:15 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.
… …
29 29
30#include "../config.h" /* NECESSARY */ 30#include "../config.h" /* NECESSARY */
31#include "rxvt.h" /* NECESSARY */ 31#include "rxvt.h" /* NECESSARY */
32#include "version.h" 32#include "version.h"
33 33
34#include <sys/utsname.h>
35
36#ifdef KEYSYM_RESOURCE
37#include "keyboard.h"
38#endif
39
40/* place holders used for parsing command-line options */
41#define Optflag_Reverse 0x40000000UL
42#define Optflag_Boolean 0x80000000UL
43#define Optflag_mask 0x3fffffffUL
44
34/* #define DEBUG_RESOURCES */ 45/* #define DEBUG_RESOURCES */
35
36static const char *const xnames[2] = { ".Xdefaults", ".Xresources" };
37 46
38/*{{{ monolithic option/resource structure: */ 47/*{{{ monolithic option/resource structure: */
39/* 48/*
40 * `string' options MUST have a usage argument 49 * `string' options MUST have a usage argument
41 * `switch' and `boolean' options have no argument 50 * `switch' and `boolean' options have no argument
… …
54#define RSTRG(rsp, kw, arg) \ 63#define RSTRG(rsp, kw, arg) \
55 {0, (rsp), (kw), NULL, (arg), NULL} 64 {0, (rsp), (kw), NULL, (arg), NULL}
56 65
57/* BOOL () - regular boolean `-/+' flag */ 66/* BOOL () - regular boolean `-/+' flag */
58#define BOOL(rsp, kw, opt, flag, desc) \ 67#define BOOL(rsp, kw, opt, flag, desc) \
59 { (Opt_Boolean| (flag)), (rsp), (kw), (opt), NULL, (desc)} 68 { (Optflag_Boolean | (flag)), (rsp), (kw), (opt), NULL, (desc)}
60 69
61/* SWCH () - `-' flag */ 70/* SWCH () - `-' flag */
62#define SWCH(opt, flag, desc) \ 71#define SWCH(opt, flag, desc) \
63 { (flag), -1, NULL, (opt), NULL, (desc)} 72 { (flag), -1, NULL, (opt), NULL, (desc)}
64 73
65/* convenient macros */ 74/* convenient macros */
66#define optList_strlen(i) \ 75#define optList_strlen(i) \
67 (optList[i].flag ? 0 : (optList[i].arg ? strlen (optList[i].arg) : 1)) 76 (optList[i].flag ? 0 : (optList[i].arg ? strlen (optList[i].arg) : 1))
68#define optList_isBool(i) \ 77#define optList_isBool(i) \
69 (optList[i].flag & Opt_Boolean) 78 (optList[i].flag & Optflag_Boolean)
70#define optList_isReverse(i) \ 79#define optList_isReverse(i) \
71 (optList[i].flag & Opt_Reverse) 80 (optList[i].flag & Optflag_Reverse)
72#define optList_size() \ 81#define optList_size \
73 (sizeof (optList) / sizeof (optList[0])) 82 (sizeof (optList) / sizeof (optList[0]))
74 83
75static const struct 84static const struct
76 { 85 {
77 const unsigned long flag; /* Option flag */ 86 const unsigned long flag; /* Option flag */
… …
91 SWCH ("iconic", Opt_iconic, "start iconic"), 100 SWCH ("iconic", Opt_iconic, "start iconic"),
92 SWCH ("ic", Opt_iconic, NULL), /* short form */ 101 SWCH ("ic", Opt_iconic, NULL), /* short form */
93 BOOL (Rs_reverseVideo, "reverseVideo", "rv", Opt_reverseVideo, "reverse video"), 102 BOOL (Rs_reverseVideo, "reverseVideo", "rv", Opt_reverseVideo, "reverse video"),
94 BOOL (Rs_loginShell, "loginShell", "ls", Opt_loginShell, "login shell"), 103 BOOL (Rs_loginShell, "loginShell", "ls", Opt_loginShell, "login shell"),
95 BOOL (Rs_jumpScroll, "jumpScroll", "j", Opt_jumpScroll, "jump scrolling"), 104 BOOL (Rs_jumpScroll, "jumpScroll", "j", Opt_jumpScroll, "jump scrolling"),
105 BOOL (Rs_pastableTabs, "pastableTabs", "ptab", Opt_pastableTabs, "tab characters are pastable"),
96#ifdef HAVE_SCROLLBARS 106#if HAVE_SCROLLBARS
107 RSTRG (Rs_scrollstyle, "scrollstyle", "mode"),
97 BOOL (Rs_scrollBar, "scrollBar", "sb", Opt_scrollBar, "scrollbar"), 108 BOOL (Rs_scrollBar, "scrollBar", "sb", Opt_scrollBar, "scrollbar"),
98 BOOL (Rs_scrollBar_right, "scrollBar_right", "sr", Opt_scrollBar_right, "scrollbar right"), 109 BOOL (Rs_scrollBar_right, "scrollBar_right", "sr", Opt_scrollBar_right, "scrollbar right"),
99 BOOL (Rs_scrollBar_floating, "scrollBar_floating", "st", Opt_scrollBar_floating, "scrollbar without a trough"), 110 BOOL (Rs_scrollBar_floating, "scrollBar_floating", "st", Opt_scrollBar_floating, "scrollbar without a trough"),
111 RSTRG (Rs_scrollBar_align, "scrollBar_align", "mode"),
112 STRG (Rs_scrollBar_thickness, "thickness", "sbt", "number", "scrollbar thickness/width in pixels"),
100#endif 113#endif
101 BOOL (Rs_scrollTtyOutput, "scrollTtyOutput", NULL, Opt_scrollTtyOutput, NULL), 114 BOOL (Rs_scrollTtyOutput, "scrollTtyOutput", NULL, Opt_scrollTtyOutput, NULL),
102 BOOL (Rs_scrollTtyOutput, NULL, "si", Opt_Reverse | Opt_scrollTtyOutput, "scroll-on-tty-output inhibit"), 115 BOOL (Rs_scrollTtyOutput, NULL, "si", Optflag_Reverse | Opt_scrollTtyOutput, "scroll-on-tty-output inhibit"),
103 BOOL (Rs_scrollTtyKeypress, "scrollTtyKeypress", "sk", Opt_scrollTtyKeypress, "scroll-on-keypress"), 116 BOOL (Rs_scrollTtyKeypress, "scrollTtyKeypress", "sk", Opt_scrollTtyKeypress, "scroll-on-keypress"),
104 BOOL (Rs_scrollWithBuffer, "scrollWithBuffer", "sw", Opt_scrollWithBuffer, "scroll-with-buffer"), 117 BOOL (Rs_scrollWithBuffer, "scrollWithBuffer", "sw", Opt_scrollWithBuffer, "scroll-with-buffer"),
105#ifdef TRANSPARENT 118#if TRANSPARENT
106 BOOL (Rs_transparent, "inheritPixmap", "ip", Opt_transparent, "inherit parent pixmap"), 119 BOOL (Rs_transparent, "inheritPixmap", "ip", Opt_transparent, "inherit parent pixmap"),
107 BOOL (Rs_transparent_all, "inheritPixmapforce", "ipf", Opt_transparent_all, "forcefully inherit root pixmap"),
108 SWCH ("tr", Opt_transparent, NULL), 120 SWCH ("tr", Opt_transparent, NULL),
121# if TINTING
122 STRG (Rs_color + Color_tint, "tintColor", "tint", "color", "tint color"),
123# endif
124#endif
125#if OFF_FOCUS_FADING
126 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"),
128#endif
109#if TINTING 129#if TINTING
110 STRG (Rs_color + Color_tint, "tintColor", "tint", "color", "tint color"),
111#endif
112#endif
113#ifdef OFF_FOCUS_FADING
114 STRG (Rs_fade, "fading", "fade", "%", "make colors x% darker when rxvt-unicode is losing focus."),
115#endif
116#ifdef TINTING
117 STRG (Rs_shade, "shading", "sh", "%", "shade background by x% when tinting."), 130 STRG (Rs_shade, "shading", "sh", "%", "shade background by x% when tinting."),
118#endif 131#endif
119 BOOL (Rs_utmpInhibit, "utmpInhibit", "ut", Opt_utmpInhibit, "utmp inhibit"), 132 BOOL (Rs_utmpInhibit, "utmpInhibit", "ut", Opt_utmpInhibit, "utmp inhibit"),
120#ifndef NO_BELL 133#ifndef NO_BELL
121 BOOL (Rs_visualBell, "visualBell", "vb", Opt_visualBell, "visual bell"), 134 BOOL (Rs_visualBell, "visualBell", "vb", Opt_visualBell, "visual bell"),
… …
130 BOOL (Rs_mouseWheelScrollPage, "mouseWheelScrollPage", NULL, Opt_mouseWheelScrollPage, NULL), 143 BOOL (Rs_mouseWheelScrollPage, "mouseWheelScrollPage", NULL, Opt_mouseWheelScrollPage, NULL),
131#endif 144#endif
132#if ENABLE_FRILLS 145#if ENABLE_FRILLS
133 BOOL (Rs_tripleclickwords, "tripleclickwords", "tcw", Opt_tripleclickwords, "triple click word selection"), 146 BOOL (Rs_tripleclickwords, "tripleclickwords", "tcw", Opt_tripleclickwords, "triple click word selection"),
134 BOOL (Rs_insecure, "insecure", "insecure", Opt_insecure, "enable possibly insecure escape sequences"), 147 BOOL (Rs_insecure, "insecure", "insecure", Opt_insecure, "enable possibly insecure escape sequences"),
148 BOOL (Rs_cursorUnderline, "cursorUnderline", "uc", Opt_cursorUnderline, "underline cursor"),
135#endif 149#endif
136#ifdef CURSOR_BLINK 150#if CURSOR_BLINK
137 BOOL (Rs_cursorBlink, "cursorBlink", "bc", Opt_cursorBlink, "blinking cursor"), 151 BOOL (Rs_cursorBlink, "cursorBlink", "bc", Opt_cursorBlink, "blinking cursor"),
138#endif 152#endif
139#ifdef POINTER_BLANK 153#ifdef POINTER_BLANK
140 BOOL (Rs_pointerBlank, "pointerBlank", "pb", Opt_pointerBlank, "switch off pointer after delay"), 154 BOOL (Rs_pointerBlank, "pointerBlank", "pb", Opt_pointerBlank, "switch off pointer after delay"),
141#endif 155#endif
… …
147 RSTRG (Rs_color + minCOLOR + 3, "color3", "color"), 161 RSTRG (Rs_color + minCOLOR + 3, "color3", "color"),
148 RSTRG (Rs_color + minCOLOR + 4, "color4", "color"), 162 RSTRG (Rs_color + minCOLOR + 4, "color4", "color"),
149 RSTRG (Rs_color + minCOLOR + 5, "color5", "color"), 163 RSTRG (Rs_color + minCOLOR + 5, "color5", "color"),
150 RSTRG (Rs_color + minCOLOR + 6, "color6", "color"), 164 RSTRG (Rs_color + minCOLOR + 6, "color6", "color"),
151 RSTRG (Rs_color + minCOLOR + 7, "color7", "color"), 165 RSTRG (Rs_color + minCOLOR + 7, "color7", "color"),
152#ifndef NO_BRIGHTCOLOR
153 RSTRG (Rs_color + minBrightCOLOR + 0, "color8", "color"), 166 RSTRG (Rs_color + minBrightCOLOR + 0, "color8", "color"),
154 RSTRG (Rs_color + minBrightCOLOR + 1, "color9", "color"), 167 RSTRG (Rs_color + minBrightCOLOR + 1, "color9", "color"),
155 RSTRG (Rs_color + minBrightCOLOR + 2, "color10", "color"), 168 RSTRG (Rs_color + minBrightCOLOR + 2, "color10", "color"),
156 RSTRG (Rs_color + minBrightCOLOR + 3, "color11", "color"), 169 RSTRG (Rs_color + minBrightCOLOR + 3, "color11", "color"),
157 RSTRG (Rs_color + minBrightCOLOR + 4, "color12", "color"), 170 RSTRG (Rs_color + minBrightCOLOR + 4, "color12", "color"),
158 RSTRG (Rs_color + minBrightCOLOR + 5, "color13", "color"), 171 RSTRG (Rs_color + minBrightCOLOR + 5, "color13", "color"),
159 RSTRG (Rs_color + minBrightCOLOR + 6, "color14", "color"), 172 RSTRG (Rs_color + minBrightCOLOR + 6, "color14", "color"),
160 RSTRG (Rs_color + minBrightCOLOR + 7, "color15", "color"), 173 RSTRG (Rs_color + minBrightCOLOR + 7, "color15", "color"),
161#endif /* NO_BRIGHTCOLOR */
162#ifndef NO_BOLD_UNDERLINE_REVERSE 174#ifndef NO_BOLD_UNDERLINE_REVERSE
163 RSTRG (Rs_color + Color_BD, "colorBD", "color"), 175 RSTRG (Rs_color + Color_BD, "colorBD", "color"),
164 RSTRG (Rs_color + Color_IT, "colorIT", "color"), 176 RSTRG (Rs_color + Color_IT, "colorIT", "color"),
165 RSTRG (Rs_color + Color_UL, "colorUL", "color"), 177 RSTRG (Rs_color + Color_UL, "colorUL", "color"),
166 RSTRG (Rs_color + Color_RV, "colorRV", "color"), 178 RSTRG (Rs_color + Color_RV, "colorRV", "color"),
167#endif /* ! NO_BOLD_UNDERLINE_REVERSE */ 179#endif /* ! NO_BOLD_UNDERLINE_REVERSE */
180#if ENABLE_FRILLS
181 RSTRG (Rs_color + Color_underline, "underlineColor", "color"),
182#endif
168#ifdef KEEP_SCROLLCOLOR 183#ifdef KEEP_SCROLLCOLOR
169 RSTRG (Rs_color + Color_scroll, "scrollColor", "color"), 184 RSTRG (Rs_color + Color_scroll, "scrollColor", "color"),
170 RSTRG (Rs_color + Color_trough, "troughColor", "color"), 185 RSTRG (Rs_color + Color_trough, "troughColor", "color"),
171#endif /* KEEP_SCROLLCOLOR */ 186#endif /* KEEP_SCROLLCOLOR */
172#ifdef OPTION_HC 187#ifdef OPTION_HC
173 STRG (Rs_color + Color_HC, "highlightColor", "hc", "color", "highlight color"), 188 STRG (Rs_color + Color_HC, "highlightColor", "hc", "color", "highlight color"),
174#endif 189#endif
190#ifndef NO_CURSORCOLOR
191 STRG (Rs_color + Color_cursor, "cursorColor", "cr", "color", "cursor color"),
192 /* command-line option = resource name */
193 RSTRG (Rs_color + Color_cursor2, "cursorColor2", "color"),
194#endif /* NO_CURSORCOLOR */
195 STRG (Rs_color + Color_pointer_fg, "pointerColor", "pr", "color", "pointer color"),
196 STRG (Rs_color + Color_pointer_bg, "pointerColor2", "pr2", "color", "pointer bg color"),
197 STRG (Rs_color + Color_border, "borderColor", "bd", "color", "border color"),
175#if defined (XPM_BACKGROUND) || (MENUBAR_MAX) 198#if defined (XPM_BACKGROUND) || (MENUBAR_MAX)
176 RSTRG (Rs_path, "path", "search path"), 199 RSTRG (Rs_path, "path", "search path"),
177#endif /* defined (XPM_BACKGROUND) || (MENUBAR_MAX) */ 200#endif /* defined (XPM_BACKGROUND) || (MENUBAR_MAX) */
178#ifdef XPM_BACKGROUND 201#ifdef XPM_BACKGROUND
179 STRG (Rs_backgroundPixmap, "backgroundPixmap", "pixmap", "file[;geom]", "background pixmap"), 202 STRG (Rs_backgroundPixmap, "backgroundPixmap", "pixmap", "file[;geom]", "background pixmap"),
… …
185 STRG (Rs_font, "font", "fn", "fontname", "normal text font"), 208 STRG (Rs_font, "font", "fn", "fontname", "normal text font"),
186#if ENABLE_STYLES 209#if ENABLE_STYLES
187 STRG (Rs_boldFont, "boldFont", "fb", "fontname", "bold font"), 210 STRG (Rs_boldFont, "boldFont", "fb", "fontname", "bold font"),
188 STRG (Rs_italicFont, "italicFont", "fi", "fontname", "italic font"), 211 STRG (Rs_italicFont, "italicFont", "fi", "fontname", "italic font"),
189 STRG (Rs_boldItalicFont, "boldItalicFont", "fbi", "fontname", "bold italic font"), 212 STRG (Rs_boldItalicFont, "boldItalicFont", "fbi", "fontname", "bold italic font"),
213 BOOL (Rs_intensityStyles, "intensityStyles", "is", Opt_intensityStyles, "font styles imply intensity changes"),
190#endif 214#endif
191#ifdef USE_XIM 215#ifdef USE_XIM
192 STRG (Rs_inputMethod, "inputMethod", "im", "name", "name of input method"), 216 STRG (Rs_inputMethod, "inputMethod", "im", "name", "name of input method"),
193 STRG (Rs_preeditType, "preeditType", "pt", "style", "input style: style = OverTheSpot|OffTheSpot|Root"), 217 STRG (Rs_preeditType, "preeditType", "pt", "style", "input style: style = OverTheSpot|OffTheSpot|Root"),
194#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
195 STRG (Rs_imLocale, "imLocale", "imlocale", "string", "locale to use for input method"), 218 STRG (Rs_imLocale, "imLocale", "imlocale", "string", "locale to use for input method"),
196#endif 219 STRG (Rs_imFont, "imFont", "imfont", "fontname", "fontset for styles OverTheSpot and OffTheSpot"),
197#endif /* USE_XIM */ 220#endif /* USE_XIM */
198 STRG (Rs_name, NULL, "name", "string", "client instance, icon, and title strings"), 221 STRG (Rs_name, NULL, "name", "string", "client instance, icon, and title strings"),
199 STRG (Rs_title, "title", "title", "string", "title name for window"), 222 STRG (Rs_title, "title", "title", "string", "title name for window"),
200 STRG (Rs_title, NULL, "T", NULL, NULL), /* short form */ 223 STRG (Rs_title, NULL, "T", NULL, NULL), /* short form */
201 STRG (Rs_iconName, "iconName", "n", "string", "icon name for window"), 224 STRG (Rs_iconName, "iconName", "n", "string", "icon name for window"),
202#ifndef NO_CURSORCOLOR
203 STRG (Rs_color + Color_cursor, "cursorColor", "cr", "color", "cursor color"),
204 /* command-line option = resource name */
205 RSTRG (Rs_color + Color_cursor2, "cursorColor2", "color"),
206#endif /* NO_CURSORCOLOR */
207 STRG (Rs_color + Color_pointer_fg, "pointerColor", "pr", "color", "pointer color"),
208 STRG (Rs_color + Color_pointer_bg, "pointerColor2", "pr2", "color", "pointer bg color"),
209 STRG (Rs_color + Color_border, "borderColor", "bd", "color", "border color"),
210 STRG (Rs_saveLines, "saveLines", "sl", "number", "number of scrolled lines to save"), 225 STRG (Rs_saveLines, "saveLines", "sl", "number", "number of scrolled lines to save"),
226#if ENABLE_XEMBED
227 STRG (Rs_embed, NULL, "embed", "windowid", "window id to embed terminal in"),
228#endif
211#if ENABLE_FRILLS 229#if ENABLE_FRILLS
230 RSTRG (Rs_transient_for, "transient-for", "windowid"),
231 STRG (Rs_pty_fd, NULL, "pty-fd", "fileno", "file descriptor of pty to use"),
232 BOOL (Rs_hold, "hold", "hold", Opt_hold, "retain window after shell exit"),
212 STRG (Rs_ext_bwidth, "externalBorder", "w", "number", "external border in pixels"), 233 STRG (Rs_ext_bwidth, "externalBorder", "w", "number", "external border in pixels"),
213 STRG (Rs_ext_bwidth, NULL, "bw", NULL, NULL), 234 STRG (Rs_ext_bwidth, NULL, "bw", NULL, NULL),
214 STRG (Rs_ext_bwidth, NULL, "borderwidth", NULL, NULL), 235 STRG (Rs_ext_bwidth, NULL, "borderwidth", NULL, NULL),
215 STRG (Rs_int_bwidth, "internalBorder", "b", "number", "internal border in pixels"), 236 STRG (Rs_int_bwidth, "internalBorder", "b", "number", "internal border in pixels"),
216 BOOL (Rs_borderLess, "borderLess", "bl", Opt_borderLess, "borderless window"), 237 BOOL (Rs_borderLess, "borderLess", "bl", Opt_borderLess, "borderless window"),
217#endif 238 BOOL (Rs_skipBuiltinGlyphs, "skipBuiltinGlyphs", "sbg", Opt_skipBuiltinGlyphs, "do not use internal glyphs"),
218#ifndef NO_LINESPACE
219 STRG (Rs_lineSpace, "lineSpace", "lsp", "number", "number of extra pixels between rows"), 239 STRG (Rs_lineSpace, "lineSpace", "lsp", "number", "number of extra pixels between rows"),
220#endif 240#endif
221 STRG (Rs_scrollBar_thickness, "thickness", "sbt", "number", "scrollbar thickness/width in pixels"),
222#ifdef POINTER_BLANK 241#ifdef POINTER_BLANK
223 RSTRG (Rs_pointerBlankDelay, "pointerBlankDelay", "number"), 242 RSTRG (Rs_pointerBlankDelay, "pointerBlankDelay", "number"),
224#endif 243#endif
225#ifndef NO_BACKSPACE_KEY 244#ifndef NO_BACKSPACE_KEY
226 RSTRG (Rs_backspace_key, "backspacekey", "string"), 245 RSTRG (Rs_backspace_key, "backspacekey", "string"),
227#endif 246#endif
228#ifndef NO_DELETE_KEY 247#ifndef NO_DELETE_KEY
229 RSTRG (Rs_delete_key, "deletekey", "string"), 248 RSTRG (Rs_delete_key, "deletekey", "string"),
230#endif 249#endif
231 RSTRG (Rs_selectstyle, "selectstyle", "mode"), 250 RSTRG (Rs_selectstyle, "selectstyle", "mode"),
232 RSTRG (Rs_scrollstyle, "scrollstyle", "mode"),
233#ifdef HAVE_SCROLLBARS
234 RSTRG (Rs_scrollBar_align, "scrollBar_align", "mode"),
235#endif
236#ifdef PRINTPIPE 251#ifdef PRINTPIPE
237 RSTRG (Rs_print_pipe, "print-pipe", "string"), 252 RSTRG (Rs_print_pipe, "print-pipe", "string"),
238#endif 253#endif
239 STRG (Rs_modifier, "modifier", "mod", "modifier", "meta modifier = alt|meta|hyper|super|mod1|...|mod5"), 254 STRG (Rs_modifier, "modifier", "mod", "modifier", "meta modifier = alt|meta|hyper|super|mod1|...|mod5"),
240 INFO ("xrm", "string", "X resource"),
241#ifdef CUTCHAR_RESOURCE 255#ifdef CUTCHAR_RESOURCE
242 RSTRG (Rs_cutchars, "cutchars", "string"), 256 RSTRG (Rs_cutchars, "cutchars", "string"),
243#endif /* CUTCHAR_RESOURCE */ 257#endif /* CUTCHAR_RESOURCE */
244 RSTRG (Rs_answerbackstring, "answerbackString", "string"), 258 RSTRG (Rs_answerbackstring, "answerbackString", "string"),
245#ifndef NO_SECONDARY_SCREEN 259#ifndef NO_SECONDARY_SCREEN
246 BOOL (Rs_secondaryScreen, "secondaryScreen", "ssc", Opt_secondaryScreen, "enable secondary screen"), 260 BOOL (Rs_secondaryScreen, "secondaryScreen", "ssc", Opt_secondaryScreen, "enable secondary screen"),
247 BOOL (Rs_secondaryScroll, "secondaryScroll", "ssr", Opt_secondaryScroll, "enable secondary screen scroll"), 261 BOOL (Rs_secondaryScroll, "secondaryScroll", "ssr", Opt_secondaryScroll, "enable secondary screen scroll"),
262#endif
263#if ENABLE_PERL
264 RSTRG (Rs_perl_lib, "perl-lib", "string"), //, "colon-separated directories with extension scripts"),TODO
265 RSTRG (Rs_perl_eval, "perl-eval", "perl-eval"), // "string", "code to be evaluated after all extensions have been loaded"),TODO
266 RSTRG (Rs_perl_ext_1, "perl-ext-common", "string"), //, "colon-separated list of perl extensions to enable"),TODO
267 STRG (Rs_perl_ext_2, "perl-ext", "pe", "string", "colon-separated list of perl extensions to enable for this instance"),
268#endif
269#if 0 && TODO
270#if !defined(NO_RESOURCES) && defined(USE_XGETDEFAULT)
271 INFO ("xrm", "string", "X resource"),
272#endif
248#endif 273#endif
249 INFO ("e", "command arg ...", "command to execute") 274 INFO ("e", "command arg ...", "command to execute")
250 }; 275 };
251 276
252#undef INFO 277#undef INFO
… …
354 "strings," 379 "strings,"
355#endif 380#endif
356#if defined(ENABLE_FRILLS) 381#if defined(ENABLE_FRILLS)
357 "frills," 382 "frills,"
358#endif 383#endif
359#if !defined(NO_LINESPACE)
360 "linespace,"
361#endif
362#if defined(PREFER_24BIT) 384#if defined(PREFER_24BIT)
363 "24bit," 385 "24bit,"
364#endif 386#endif
365#if defined(SELECTION_SCROLLING) 387#if defined(SELECTION_SCROLLING)
366 "selectionscrolling," 388 "selectionscrolling,"
… …
405 switch (type) 427 switch (type)
406 { 428 {
407 case 0: /* brief listing */ 429 case 0: /* brief listing */
408 rxvt_log (" [-help] [--help]\n"); 430 rxvt_log (" [-help] [--help]\n");
409 431
410 for (col = 1, i = 0; i < optList_size (); i++) 432 for (col = 1, i = 0; i < optList_size; i++)
411 if (optList[i].desc != NULL) 433 if (optList[i].desc != NULL)
412 { 434 {
413 int len = 0; 435 int len = 0;
414 436
415 if (!optList_isBool (i)) 437 if (!optList_isBool (i))
… …
438 break; 460 break;
439 461
440 case 1: /* full command-line listing */ 462 case 1: /* full command-line listing */
441 rxvt_log (" [options] [-e command args]\n\nwhere options include:\n"); 463 rxvt_log (" [options] [-e command args]\n\nwhere options include:\n");
442 464
443 for (i = 0; i < optList_size (); i++) 465 for (i = 0; i < optList_size; i++)
444 if (optList[i].desc != NULL) 466 if (optList[i].desc != NULL)
445 { 467 {
446#ifdef DEBUG_STRICT 468#ifdef DEBUG_STRICT
447 assert (optList[i].opt != NULL); 469 assert (optList[i].opt != NULL);
448#endif 470#endif
… …
459 481
460 case 2: /* full resource listing */ 482 case 2: /* full resource listing */
461 rxvt_log (" [options] [-e command args]\n\n" 483 rxvt_log (" [options] [-e command args]\n\n"
462 "where resources (long-options) include:\n"); 484 "where resources (long-options) include:\n");
463 485
464 for (i = 0; i < optList_size (); i++) 486 for (i = 0; i < optList_size; i++)
465 if (optList[i].kw != NULL) 487 if (optList[i].kw != NULL)
466 rxvt_log (" %s: %*s%s\n", 488 rxvt_log (" %s: %*s%s\n",
467 optList[i].kw, 489 optList[i].kw,
468 (INDENT - strlen (optList[i].kw)), "", /* XXX */ 490 (INDENT - strlen (optList[i].kw)), "", /* XXX */
469 (optList_isBool (i) ? "boolean" : optList[i].arg)); 491 (optList_isBool (i) ? "boolean" : optList[i].arg));
… …
490 int i, bad_option = 0; 512 int i, bad_option = 0;
491 static const char On[3] = "ON", Off[4] = "OFF"; 513 static const char On[3] = "ON", Off[4] = "OFF";
492 514
493 for (i = 1; i < argc; i++) 515 for (i = 1; i < argc; i++)
494 { 516 {
495 unsigned int entry, longopt = 0; 517 unsigned int entry, longopt = 0;
496 const char *flag, *opt; 518 const char *flag, *opt;
497 519
498 opt = argv[i]; 520 opt = argv[i];
499#ifdef DEBUG_RESOURCES 521#ifdef DEBUG_RESOURCES
500 fprintf (stderr, "argv[%d] = %s: ", i, opt); 522 fprintf (stderr, "argv[%d] = %s: ", i, opt);
501#endif 523#endif
… …
522 rxvt_usage (longopt ? 2 : 1); 544 rxvt_usage (longopt ? 2 : 1);
523 if (!strcmp (opt, "h")) 545 if (!strcmp (opt, "h"))
524 rxvt_usage (0); 546 rxvt_usage (0);
525 547
526 /* feature: always try to match long-options */ 548 /* feature: always try to match long-options */
527 for (entry = 0; entry < optList_size (); entry++) 549 for (entry = 0; entry < optList_size; entry++)
528 if ((optList[entry].kw && !strcmp (opt, optList[entry].kw)) 550 if ((optList[entry].kw && !strcmp (opt, optList[entry].kw))
529 || (!longopt 551 || (!longopt
530 && optList[entry].opt && !strcmp (opt, optList[entry].opt))) 552 && optList[entry].opt && !strcmp (opt, optList[entry].opt)))
531 break; 553 break;
532 554
533 if (entry < optList_size ()) 555 if (entry < optList_size)
534 { 556 {
535 if (optList_isReverse (entry)) 557 if (optList_isReverse (entry))
536 flag = flag == On ? Off : On; 558 flag = flag == On ? Off : On;
537 559
538 if (optList_strlen (entry)) 560 if (optList_strlen (entry))
… …
551 { /* boolean value */ 573 { /* boolean value */
552#ifdef DEBUG_RESOURCES 574#ifdef DEBUG_RESOURCES
553 fprintf (stderr, "boolean (%s,%s) = %s\n", 575 fprintf (stderr, "boolean (%s,%s) = %s\n",
554 optList[entry].opt, optList[entry].kw, flag); 576 optList[entry].opt, optList[entry].kw, flag);
555#endif 577#endif
556 if (flag == On) 578 set_option (optList[entry].flag & Optflag_mask, flag == On);
557 options |= (optList[entry].flag);
558 else
559 options &= ~ (optList[entry].flag);
560 579
561 if (optList[entry].doff != -1) 580 if (optList[entry].doff != -1)
562 rs[optList[entry].doff] = flag; 581 rs[optList[entry].doff] = flag;
563 } 582 }
564 } 583 }
… …
603 XrmQuarkList quarks, 622 XrmQuarkList quarks,
604 XrmRepresentation *type __attribute__((unused)), 623 XrmRepresentation *type __attribute__((unused)),
605 XrmValue *value, 624 XrmValue *value,
606 XPointer closure __attribute__((unused))) 625 XPointer closure __attribute__((unused)))
607{ 626{
608 int last; 627 int last;
609 628
610 for (last = 0; quarks[last] != NULLQUARK; last++) /* look for last quark in list */ 629 for (last = 0; quarks[last] != NULLQUARK; last++) /* look for last quark in list */
611 ; 630 ;
631
612 last--; 632 last--;
613 GET_R->parse_keysym (XrmQuarkToString (quarks[last]), (char *)value->addr);//D//TODO 633 GET_R->parse_keysym (XrmQuarkToString (quarks[last]), (char *)value->addr);//D//TODO
614 return False; 634 return False;
615} 635}
616 636
… …
621 * arg will be 641 * arg will be
622 * NULL for ~/.Xdefaults and 642 * NULL for ~/.Xdefaults and
623 * non-NULL for command-line options (need to allocate) 643 * non-NULL for command-line options (need to allocate)
624 */ 644 */
625#define NEWARGLIM 500 /* `reasonable' size */ 645#define NEWARGLIM 500 /* `reasonable' size */
646
647struct keysym_vocabulary_t
648{
649 const char *name;
650 unsigned short len;
651 unsigned short value;
652};
653keysym_vocabulary_t keysym_vocabulary[] =
654{
655 { "ISOLevel3", 9, Level3Mask },
656 { "AppKeypad", 9, AppKeypadMask },
657 { "Control", 7, ControlMask },
658 { "NumLock", 7, NumLockMask },
659 { "Shift", 5, ShiftMask },
660 { "Meta", 4, MetaMask },
661 { "Lock", 4, LockMask },
662 { "Mod1", 4, Mod1Mask },
663 { "Mod2", 4, Mod2Mask },
664 { "Mod3", 4, Mod3Mask },
665 { "Mod4", 4, Mod4Mask },
666 { "Mod5", 4, Mod5Mask },
667 { "I", 1, Level3Mask },
668 { "K", 1, AppKeypadMask },
669 { "C", 1, ControlMask },
670 { "N", 1, NumLockMask },
671 { "S", 1, ShiftMask },
672 { "M", 1, MetaMask },
673 { "A", 1, MetaMask },
674 { "L", 1, LockMask },
675 { "1", 1, Mod1Mask },
676 { "2", 1, Mod2Mask },
677 { "3", 1, Mod3Mask },
678 { "4", 1, Mod4Mask },
679 { "5", 1, Mod5Mask },
680};
681
626int 682int
627rxvt_term::parse_keysym (const char *str, const char *arg) 683rxvt_term::parse_keysym (const char *str, const char *arg)
628{ 684{
629 int n, sym; 685 int n, sym;
630 char *key_string, *newarg = NULL; 686 unsigned int state = 0;
687 const char *pmodend = NULL;
688 char *newarg = NULL;
631 char newargstr[NEWARGLIM]; 689 char newargstr[NEWARGLIM];
632 690
633 if (arg == NULL) 691 if (arg == NULL)
634 { 692 {
635 if ((n = rxvt_Str_match (str, "keysym.")) == 0) 693 if ((n = rxvt_Str_match (str, "keysym.")) == 0)
636 return 0; 694 return 0;
695
637 str += n; /* skip `keysym.' */ 696 str += n; /* skip `keysym.' */
697 if ((pmodend = strchr (str, ':')) < str)
698 return -1;
699 }
700 else
701 pmodend = str + strlen(str);
702
703 for (--pmodend; str < pmodend; --pmodend)
704 if (*pmodend == '-')
705 break;
706
707 while (str < pmodend)
638 } 708 {
709 unsigned int i;
710
711 for (i=0; i < sizeof (keysym_vocabulary) / sizeof (keysym_vocabulary_t); ++i)
712 {
713 if (strncmp (str, keysym_vocabulary [i].name, keysym_vocabulary [i].len) == 0)
714 {
715 state |= keysym_vocabulary[i].value;
716 str += keysym_vocabulary[i].len;
717 break;
718 }
719 }
720
721 if (i >= sizeof (keysym_vocabulary) / sizeof (keysym_vocabulary_t))
722 return -1;
723
724 if (*str == '-')
725 ++str;
726 }
727
639 /* some scanf () have trouble with a 0x prefix */ 728 /* some scanf () have trouble with a 0x prefix */
640 if (isdigit (str[0]))
641 {
642 if (str[0] == '0' && toupper (str[1]) == 'X') 729 if (str[0] == '0' && toupper (str[1]) == 'X')
730 {
643 str += 2; 731 str += 2;
732
644 if (arg) 733 if (arg)
645 { 734 {
646 if (sscanf (str, (strchr (str, ':') ? "%x:" : "%x"), &sym) != 1) 735 if (sscanf (str, (strchr (str, ':') ? "%x:" : "%x"), &sym) != 1)
647 return -1; 736 return -1;
648 } 737 }
… …
662 /* 751 /*
663 * convert keysym name to keysym number 752 * convert keysym name to keysym number
664 */ 753 */
665 strncpy (newargstr, str, NEWARGLIM - 1); 754 strncpy (newargstr, str, NEWARGLIM - 1);
666 newargstr[NEWARGLIM - 1] = '\0'; 755 newargstr[NEWARGLIM - 1] = '\0';
756
667 if (arg == NULL) 757 if (arg == NULL)
668 { 758 {
669 if ((newarg = strchr (newargstr, ':')) == NULL) 759 if ((newarg = strchr (newargstr, ':')) == NULL)
670 return -1; 760 return -1;
761
671 *newarg++ = '\0'; /* terminate keysym name */ 762 *newarg++ = '\0'; /* terminate keysym name */
672 } 763 }
764
673 if ((sym = XStringToKeysym (newargstr)) == None) 765 if ((sym = XStringToKeysym (newargstr)) == None)
674 return -1; 766 return -1;
675 } 767 }
676
677 if (sym < 0xFF00 || sym > 0xFFFF) /* we only do extended keys */
678 return -1;
679 sym &= 0xFF;
680 if (Keysym_map[sym] != NULL) /* already set ? */
681 return -1;
682 768
683 if (newarg == NULL) 769 if (newarg == NULL)
684 { 770 {
685 strncpy (newargstr, arg, NEWARGLIM - 1); 771 strncpy (newargstr, arg, NEWARGLIM - 1);
686 newargstr[NEWARGLIM - 1] = '\0'; 772 newargstr[NEWARGLIM - 1] = '\0';
687 newarg = newargstr; 773 newarg = newargstr;
688 } 774 }
775
689 rxvt_Str_trim (newarg); 776 rxvt_Str_trim (newarg);
690 if (*newarg == '\0' || (n = rxvt_Str_escaped (newarg)) == 0) 777 if (*newarg == '\0' || (n = rxvt_Str_escaped (newarg)) == 0)
691 return -1; 778 return -1;
692 MIN_IT (n, 255);
693 key_string = (char *)rxvt_malloc ((n + 1) * sizeof (char));
694 779
695 key_string[0] = n; 780 keyboard->register_user_translation (sym, state, newarg);
696 strncpy (key_string + 1, newarg, n);
697 Keysym_map[sym] = (unsigned char *)key_string;
698
699 return 1; 781 return 1;
700} 782}
701 783
702# endif /* KEYSYM_RESOURCE */ 784# endif /* KEYSYM_RESOURCE */
703 785
… …
716 return; 798 return;
717 799
718 len = strlen (name); 800 len = strlen (name);
719 while ((str = fgets (buffer, sizeof (buffer), stream)) != NULL) 801 while ((str = fgets (buffer, sizeof (buffer), stream)) != NULL)
720 { 802 {
721 unsigned int entry, n; 803 unsigned int entry, n;
722 804
723 while (*str && isspace (*str)) 805 while (*str && isspace (*str))
724 str++; /* leading whitespace */ 806 str++; /* leading whitespace */
725 807
726 if ((str[len] != '*' && str[len] != '.') 808 if ((str[len] != '*' && str[len] != '.')
… …
729 str += (len + 1); /* skip `name*' or `name.' */ 811 str += (len + 1); /* skip `name*' or `name.' */
730 812
731# ifdef KEYSYM_RESOURCE 813# ifdef KEYSYM_RESOURCE
732 if (!parse_keysym (str, NULL)) 814 if (!parse_keysym (str, NULL))
733# endif /* KEYSYM_RESOURCE */ 815# endif /* KEYSYM_RESOURCE */
734 for (entry = 0; entry < optList_size (); entry++) 816 for (entry = 0; entry < optList_size; entry++)
735 { 817 {
736 const char *kw = optList[entry].kw; 818 const char *kw = optList[entry].kw;
737 819
738 if (kw == NULL) 820 if (kw == NULL)
739 continue; 821 continue;
… …
743 { 825 {
744 /* skip `keyword:' */ 826 /* skip `keyword:' */
745 str += n + 1; 827 str += n + 1;
746 rxvt_Str_trim (str); 828 rxvt_Str_trim (str);
747 n = strlen (str); 829 n = strlen (str);
830
748 if (n && rs[optList[entry].doff] == NULL) 831 if (n && rs[optList[entry].doff] == NULL)
749 { 832 {
750 /* not already set */ 833 /* not already set */
751 int s; 834 int s;
752 char *p = 0; 835 char *p = 0;
… …
773 rs[optList[entry].doff] = p; 856 rs[optList[entry].doff] = p;
774 allocated.push_back (p); 857 allocated.push_back (p);
775 858
776 if (optList_isBool (entry)) 859 if (optList_isBool (entry))
777 { 860 {
778 s = strcasecmp (str, "TRUE") == 0 861 s = strcasecmp (str, "true") == 0
779 || strcasecmp (str, "YES") == 0 862 || strcasecmp (str, "yes") == 0
780 || strcasecmp (str, "ON") == 0 863 || strcasecmp (str, "on") == 0
781 || strcasecmp (str, "1") == 0; 864 || strcmp (str, "1") == 0;
782 865
783 if (optList_isReverse (entry)) 866 if (optList_isReverse (entry))
784 s = !s; 867 s = !s;
785 868
786 if (s)
787 options |= optList[entry].flag; 869 set_option (optList[entry].flag & Optflag_mask, s);
788 else
789 options &= ~optList[entry].flag;
790 } 870 }
791 } 871 }
792 872
793 break; 873 break;
794 } 874 }
… …
806/* 886/*
807 * using XGetDefault () or the hand-rolled replacement 887 * using XGetDefault () or the hand-rolled replacement
808 */ 888 */
809/* ARGSUSED */ 889/* ARGSUSED */
810void 890void
811rxvt_term::extract_resources (Display *display __attribute__ ((unused)), const char *name) 891rxvt_term::extract_resources ()
812{ 892{
893 dDisp;
894
813#ifndef NO_RESOURCES 895#ifndef NO_RESOURCES
896
897 char *homedir = (char *)getenv ("HOME");
898 char fname[1024];
814 899
815# if defined XAPPLOADDIR 900# if defined XAPPLOADDIR
816# if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE) 901# if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
817 /* Compute the path of the possibly available localized Rxvt file */ 902 /* Compute the path of the possibly available localized Rxvt file */
818 char *localepath = NULL; 903 char localepath[1024];
819 904
820 if (locale != NULL) 905 if (locale)
821 { /* XXX: must limit length of string */
822 localepath = (char *)rxvt_malloc (256);
823 sprintf (localepath, XAPPLOADDIRLOCALE "/" RESCLASS, 906 snprintf (localepath, sizeof (localepath), XAPPLOADDIRLOCALE "/" RESCLASS, locale);
824 (int) (258 - sizeof (XAPPLOADDIRLOCALE) - sizeof (RESCLASS)), 907 else
825 locale); /* 258 = 255 + 4 (-.*s) - 1 (/) */ 908 localepath[0] = 0;
826 }
827
828 {
829# endif 909# endif
830# endif 910# endif
831 911
832# ifdef USE_XGETDEFAULT 912# ifdef USE_XGETDEFAULT
833 /* 913 /*
834 * get resources using the X library function 914 * get resources using the X library function
835 */ 915 */
836 int entry; 916 int entry;
837 917
838# ifdef XrmEnumOneLevel 918# ifdef XrmEnumOneLevel
839 int i;
840 char *displayResource, *xe; 919 char *displayResource, *xe;
841 XrmName name_prefix[3]; 920 XrmName name_prefix[3];
842 XrmClass class_prefix[3]; 921 XrmClass class_prefix[3];
843 XrmDatabase database, rdb1; 922 XrmDatabase database, rdb1;
844 char fname[1024];
845 923
846 XrmInitialize (); 924 XrmInitialize ();
847 database = NULL; 925 database = NULL;
848 926
927 // for ordering, see for example http://www.faqs.org/faqs/Xt-FAQ/ Subject: 20
928
929 // 6. System wide per application default file.
930 /* Add in Rxvt file */
931# if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
932 if (*localepath
933 && ((rdb1 = XrmGetFileDatabase (localepath))
934 || (rdb1 = XrmGetFileDatabase (XAPPLOADDIR "/" RESCLASS))))
935# endif
936 XrmMergeDatabases (rdb1, &database);
937
938 /* Add in $XAPPLRESDIR/Rxvt only; not bothering with XUSERFILESEARCHPATH */
939 if ((xe = (char *)getenv ("XAPPLRESDIR")))
940 {
941 snprintf (fname, sizeof (fname), "%s/%s", xe, RESCLASS);
942
943 if ((rdb1 = XrmGetFileDatabase (fname)))
944 XrmMergeDatabases (rdb1, &database);
945 }
946
947 // 5. User's per application default file.
948 // none
949
950 // 4. User's defaults file.
849 /* Get any Xserver defaults */ 951 /* Get any Xserver defaults */
850
851 displayResource = XResourceManagerString (display); 952 displayResource = XResourceManagerString (disp);
852 if (displayResource != NULL) 953 if (displayResource != NULL)
954 {
853 database = XrmGetStringDatabase (displayResource); 955 if ((rdb1 = XrmGetStringDatabase (displayResource)))
854 956 XrmMergeDatabases (rdb1, &database);
855# ifdef HAVE_EXTRA_XRESOURCE_FILES
856 /* Add in ~/.Xdefaults or ~/.Xresources */
857 { 957 }
858 char *ptr; 958 else if (homedir)
959 {
960 snprintf (fname, sizeof (fname), "%s/.Xdefaults", homedir);
859 961
860 if ((ptr = (char *)getenv ("HOME")) == NULL) 962 if ((rdb1 = XrmGetFileDatabase (fname)))
861 ptr = "."; 963 XrmMergeDatabases (rdb1, &database);
964 }
862 965
863 for (i = 0; i < (sizeof (xnames) / sizeof (xnames[0])); i++) 966 /* Get screen specific resources */
967 displayResource = XScreenResourceString (ScreenOfDisplay (disp, display->screen));
968 if (displayResource != NULL)
969 {
970 if ((rdb1 = XrmGetStringDatabase (displayResource)))
971 /* Merge with screen-independent resources */
972 XrmMergeDatabases (rdb1, &database);
973
974 XFree (displayResource);
975 }
976
977 // 3. User's per host defaults file
978 /* Add in XENVIRONMENT file */
979 if ((xe = (char *)getenv ("XENVIRONMENT"))
980 && (rdb1 = XrmGetFileDatabase (xe)))
981 XrmMergeDatabases (rdb1, &database);
982 else if (homedir)
983 {
984 struct utsname un;
985
986 if (!uname (&un))
864 { 987 {
865 sprintf (fname, "%-.*s/%s", sizeof (fname) - strlen (xnames[i]) - 2, 988 snprintf (fname, sizeof (fname), "%s/.Xdefaults-%s", homedir, un.nodename);
866 ptr, xnames[i]); 989
867 if ((rdb1 = XrmGetFileDatabase (fname))) 990 if ((rdb1 = XrmGetFileDatabase (fname)))
991 XrmMergeDatabases (rdb1, &database);
992 }
993 }
994
995 XrmSetDatabase (disp, database);
996# endif
997
998 /*
999 * Query resources for options that affect us
1000 */
1001 for (entry = 0; entry < optList_size; entry++)
1002 {
1003 int s;
1004 char *p, *p0;
1005 const char *kw = optList[entry].kw;
1006
1007 if (kw == NULL || rs[optList[entry].doff] != NULL)
1008 continue; /* previously set */
1009
1010 p = XGetDefault (disp, rs[Rs_name], kw);
1011 p0 = XGetDefault (disp, "!INVALIDPROGRAMMENAMEDONTMATCH!", kw);
1012 if (p == NULL || (p0 && strcmp (p, p0) == 0))
1013 {
1014 p = XGetDefault (disp, RESCLASS, kw);
1015#ifdef RESFALLBACK
1016 if (p == NULL || (p0 && strcmp (p, p0) == 0))
1017 p = XGetDefault (disp, RESFALLBACK, kw);
1018#endif
1019 }
1020
1021 if (p == NULL && p0)
1022 p = p0;
1023
1024 if (p)
1025 {
1026 rs[optList[entry].doff] = p;
1027
1028 if (optList_isBool (entry))
868 { 1029 {
869 XrmMergeDatabases (rdb1, &database); 1030 s = strcasecmp (p, "TRUE") == 0
870# ifndef HAVE_BOTH_XRESOURCE_FILES 1031 || strcasecmp (p, "YES") == 0
871 break; 1032 || strcasecmp (p, "ON") == 0
872# endif 1033 || strcasecmp (p, "1") == 0;
873 1034
1035 if (optList_isReverse (entry))
1036 s = !s;
1037
1038 set_option (optList[entry].flag & Optflag_mask, s);
874 } 1039 }
875 } 1040 }
876 } 1041 }
877# endif
878 1042
879 /* Add in XENVIRONMENT file */
880
881 if ((xe = (char *)getenv ("XENVIRONMENT")) != NULL
882 && (rdb1 = XrmGetFileDatabase (xe)) != NULL)
883 XrmMergeDatabases (rdb1, &database);
884
885 /* Add in Rxvt file */
886# if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
887 if (localepath == NULL || (rdb1 = XrmGetFileDatabase (localepath)) == NULL)
888# endif
889 rdb1 = XrmGetFileDatabase (XAPPLOADDIR "/" RESCLASS);
890
891 if (rdb1 != NULL)
892 XrmMergeDatabases (rdb1, &database);
893
894 /* Add in $XAPPLRESDIR/Rxvt only; not bothering with XUSERFILESEARCHPATH */
895 if ((xe = (char *)getenv ("XAPPLRESDIR")) != NULL)
896 {
897 sprintf (fname, "%-.*s/" RESCLASS, sizeof (fname)
898 - sizeof (RESCLASS) - 2, xe);
899 if ((rdb1 = XrmGetFileDatabase (fname)) != NULL)
900 XrmMergeDatabases (rdb1, &database);
901 }
902
903 XrmSetDatabase (display, database);
904# endif
905
906 /* 1043 /*
907 * Query resources for options that affect us
908 */
909 for (entry = 0; entry < optList_size (); entry++)
910 {
911 int s;
912 char *p, *p0;
913 const char *kw = optList[entry].kw;
914
915 if (kw == NULL || rs[optList[entry].doff] != NULL)
916 continue; /* previously set */
917
918 p = XGetDefault (display, name, kw);
919 p0 = XGetDefault (display, "!INVALIDPROGRAMMENAMEDONTMATCH!", kw);
920 if (p == NULL || (p0 && strcmp (p, p0) == 0))
921 {
922 p = XGetDefault (display, RESCLASS, kw);
923#ifdef RESFALLBACK
924 if (p == NULL || (p0 && strcmp (p, p0) == 0))
925 p = XGetDefault (display, RESFALLBACK, kw);
926#endif
927 }
928
929 if (p == NULL && p0)
930 p = p0;
931
932 if (p)
933 {
934 rs[optList[entry].doff] = p;
935
936 if (optList_isBool (entry))
937 {
938 s = strcasecmp (p, "TRUE") == 0
939 || strcasecmp (p, "YES") == 0
940 || strcasecmp (p, "ON") == 0
941 || strcasecmp (p, "1") == 0;
942 if (optList_isReverse (entry))
943 s = !s;
944 if (s)
945 options |= (optList[entry].flag);
946 else
947 options &= ~ (optList[entry].flag);
948 }
949 }
950 }
951
952 /*
953 * [R5 or later]: enumerate the resource database 1044 * [R5 or later]: enumerate the resource database
954 */ 1045 */
955# ifdef XrmEnumOneLevel
956# ifdef KEYSYM_RESOURCE 1046# ifdef KEYSYM_RESOURCE
957 name_prefix[0] = XrmStringToName (name); 1047 name_prefix[0] = XrmStringToName (rs[Rs_name]);
958 name_prefix[1] = XrmStringToName ("keysym"); 1048 name_prefix[1] = XrmStringToName ("keysym");
959 name_prefix[2] = NULLQUARK; 1049 name_prefix[2] = NULLQUARK;
960 class_prefix[0] = XrmStringToName (RESCLASS); 1050 class_prefix[0] = XrmStringToName (RESCLASS);
961 class_prefix[1] = XrmStringToName ("Keysym"); 1051 class_prefix[1] = XrmStringToName ("Keysym");
962 class_prefix[2] = NULLQUARK; 1052 class_prefix[2] = NULLQUARK;
963 /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */ 1053 /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */
964 XrmEnumerateDatabase (XrmGetDatabase (display), name_prefix, class_prefix, 1054 XrmEnumerateDatabase (XrmGetDatabase (disp), name_prefix, class_prefix,
965 XrmEnumOneLevel, rxvt_define_key, NULL); 1055 XrmEnumOneLevel, rxvt_define_key, NULL);
966# ifdef RESFALLBACK 1056# ifdef RESFALLBACK
967 name_prefix[0] = XrmStringToName (RESFALLBACK); 1057 name_prefix[0] = XrmStringToName (RESFALLBACK);
968 name_prefix[1] = XrmStringToName ("keysym"); 1058 name_prefix[1] = XrmStringToName ("keysym");
969 class_prefix[0] = XrmStringToName (RESFALLBACK); 1059 class_prefix[0] = XrmStringToName (RESFALLBACK);
970 class_prefix[1] = XrmStringToName ("Keysym"); 1060 class_prefix[1] = XrmStringToName ("Keysym");
971 /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */ 1061 /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */
972 XrmEnumerateDatabase (XrmGetDatabase (display), name_prefix, class_prefix, 1062 XrmEnumerateDatabase (XrmGetDatabase (disp), name_prefix, class_prefix,
973 XrmEnumOneLevel, rxvt_define_key, NULL); 1063 XrmEnumOneLevel, rxvt_define_key, NULL);
974# endif
975# endif 1064# endif
976# endif 1065# endif
977 1066
978# else /* USE_XGETDEFAULT */ 1067# else /* USE_XGETDEFAULT */
979 /* get resources the hard way, but save lots of memory */ 1068 /* get resources the hard way, but save lots of memory */
1069 FILE *fd = NULL;
1070
1071 if (homedir)
1072 {
1073 static const char *const xnames[2] = { ".Xdefaults", ".Xresources" };
1074
1075 for (int i = 0; i < (sizeof (xnames) / sizeof (xnames [0])); i++)
1076 {
1077 snprintf (fname, sizeof (fname), "%s/%s", homedir, xnames [i]);
1078
1079 if ((fd = fopen (fname, "r")) != NULL)
1080 break;
1081 }
1082 }
1083 /*
1084 * The normal order to match resources is the following:
1085 * @ global resources (partial match, ~/.Xdefaults)
1086 * @ application file resources (XAPPLOADDIR/Rxvt)
1087 * @ class resources (~/.Xdefaults)
1088 * @ private resources (~/.Xdefaults)
1089 *
1090 * However, for the hand-rolled resources, the matching algorithm
1091 * checks if a resource string value has already been allocated
1092 * and won't overwrite it with (in this case) a less specific
1093 * resource value.
1094 *
1095 * This avoids multiple allocation. Also, when we've called this
1096 * routine command-line string options have already been applied so we
1097 * needn't to allocate for those resources.
1098 *
1099 * So, search in resources from most to least specific.
1100 *
1101 * Also, use a special sub-class so that we can use either or both of
1102 * "XTerm" and "Rxvt" as class names.
1103 */
1104
1105 get_xdefaults (fd, rs[Rs_name]);
1106 get_xdefaults (fd, RESCLASS);
1107# ifdef RESFALLBACK
1108 get_xdefaults (fd, RESFALLBACK);
1109# endif
1110
1111# if defined(XAPPLOADDIR) && defined(USE_XAPPLOADDIR)
1112 {
980 FILE *fd = NULL; 1113 FILE *ad = NULL;
981 char *home;
982 1114
983 if ((home = getenv ("HOME")) != NULL) 1115# if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1116 if (!*localepath || (ad = fopen (localepath, "r")) == NULL)
1117# endif
1118 ad = fopen (XAPPLOADDIR "/" RESCLASS, "r");
1119 if (ad != NULL)
984 { 1120 {
985 unsigned int i, len = strlen (home) + 2; 1121 get_xdefaults (ad, RESCLASS);
986 char *f = NULL; 1122 get_xdefaults (ad, "");
987
988 for (i = 0; i < (sizeof (xnames) / sizeof (xnames[0])); i++)
989 {
990 f = (char *)rxvt_realloc (f, (len + strlen (xnames[i])) * sizeof (char));
991
992 sprintf (f, "%s/%s", home, xnames[i]);
993
994 if ((fd = fopen (f, "r")) != NULL)
995 break;
996 }
997 free (f); 1123 fclose (ad);
998 } 1124 }
999 /*
1000 * The normal order to match resources is the following:
1001 * @ global resources (partial match, ~/.Xdefaults)
1002 * @ application file resources (XAPPLOADDIR/Rxvt)
1003 * @ class resources (~/.Xdefaults)
1004 * @ private resources (~/.Xdefaults)
1005 *
1006 * However, for the hand-rolled resources, the matching algorithm
1007 * checks if a resource string value has already been allocated
1008 * and won't overwrite it with (in this case) a less specific
1009 * resource value.
1010 *
1011 * This avoids multiple allocation. Also, when we've called this
1012 * routine command-line string options have already been applied so we
1013 * needn't to allocate for those resources.
1014 *
1015 * So, search in resources from most to least specific.
1016 *
1017 * Also, use a special sub-class so that we can use either or both of
1018 * "XTerm" and "Rxvt" as class names.
1019 */
1020
1021 get_xdefaults (fd, name);
1022 get_xdefaults (fd, RESCLASS);
1023# ifdef RESFALLBACK
1024 get_xdefaults (fd, RESFALLBACK);
1025# endif
1026
1027# if defined(XAPPLOADDIR) && defined(USE_XAPPLOADDIR)
1028 {
1029 FILE *ad = NULL;
1030
1031# if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1032 if (localepath == NULL || (ad = fopen (localepath, "r")) == NULL)
1033# endif
1034 ad = fopen (XAPPLOADDIR "/" RESCLASS, "r");
1035 if (ad != NULL)
1036 {
1037 get_xdefaults (ad, RESCLASS);
1038 get_xdefaults (ad, "");
1039 fclose (ad);
1040 }
1041 } 1125 }
1042# endif /* XAPPLOADDIR */ 1126# endif /* XAPPLOADDIR */
1043 1127
1044 get_xdefaults (fd, ""); /* partial match */ 1128 get_xdefaults (fd, ""); /* partial match */
1045 if (fd != NULL) 1129 if (fd != NULL)
1046 fclose (fd); 1130 fclose (fd);
1047# endif /* USE_XGETDEFAULT */ 1131# endif /* USE_XGETDEFAULT */
1048
1049# if defined XAPPLOADDIR
1050# if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1051
1052 }
1053
1054 /* Free the path of the possibly available localized Rxvt file */
1055 free (localepath);
1056# endif
1057# endif
1058 1132
1059#endif /* NO_RESOURCES */ 1133#endif /* NO_RESOURCES */
1060} 1134}
1061 1135
1062/*}}} */ 1136/*}}} */

Diff Legend

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