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.25 by root, Mon Jul 26 14:57:12 2004 UTC vs.
Revision 1.70 by root, Wed Jan 4 05:35:34 2006 UTC

28 *----------------------------------------------------------------------*/ 28 *----------------------------------------------------------------------*/
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#include "xdefaults.intpro" /* PROTOS for internal routines */ 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
34 44
35/* #define DEBUG_RESOURCES */ 45/* #define DEBUG_RESOURCES */
36
37static const char *const xnames[2] = { ".Xdefaults", ".Xresources" };
38 46
39/*{{{ monolithic option/resource structure: */ 47/*{{{ monolithic option/resource structure: */
40/* 48/*
41 * `string' options MUST have a usage argument 49 * `string' options MUST have a usage argument
42 * `switch' and `boolean' options have no argument 50 * `switch' and `boolean' options have no argument
55#define RSTRG(rsp, kw, arg) \ 63#define RSTRG(rsp, kw, arg) \
56 {0, (rsp), (kw), NULL, (arg), NULL} 64 {0, (rsp), (kw), NULL, (arg), NULL}
57 65
58/* BOOL () - regular boolean `-/+' flag */ 66/* BOOL () - regular boolean `-/+' flag */
59#define BOOL(rsp, kw, opt, flag, desc) \ 67#define BOOL(rsp, kw, opt, flag, desc) \
60 { (Opt_Boolean| (flag)), (rsp), (kw), (opt), NULL, (desc)} 68 { (Optflag_Boolean | (flag)), (rsp), (kw), (opt), NULL, (desc)}
61 69
62/* SWCH () - `-' flag */ 70/* SWCH () - `-' flag */
63#define SWCH(opt, flag, desc) \ 71#define SWCH(opt, flag, desc) \
64 { (flag), -1, NULL, (opt), NULL, (desc)} 72 { (flag), -1, NULL, (opt), NULL, (desc)}
65 73
66/* convenient macros */ 74/* convenient macros */
67#define optList_strlen(i) \ 75#define optList_strlen(i) \
68 (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))
69#define optList_isBool(i) \ 77#define optList_isBool(i) \
70 (optList[i].flag & Opt_Boolean) 78 (optList[i].flag & Optflag_Boolean)
71#define optList_isReverse(i) \ 79#define optList_isReverse(i) \
72 (optList[i].flag & Opt_Reverse) 80 (optList[i].flag & Optflag_Reverse)
73#define optList_size() \ 81#define optList_size \
74 (sizeof (optList) / sizeof (optList[0])) 82 (sizeof (optList) / sizeof (optList[0]))
75 83
76static const struct 84static const struct
77 { 85 {
78 const unsigned long flag; /* Option flag */ 86 const unsigned long flag; /* Option flag */
92 SWCH ("iconic", Opt_iconic, "start iconic"), 100 SWCH ("iconic", Opt_iconic, "start iconic"),
93 SWCH ("ic", Opt_iconic, NULL), /* short form */ 101 SWCH ("ic", Opt_iconic, NULL), /* short form */
94 BOOL (Rs_reverseVideo, "reverseVideo", "rv", Opt_reverseVideo, "reverse video"), 102 BOOL (Rs_reverseVideo, "reverseVideo", "rv", Opt_reverseVideo, "reverse video"),
95 BOOL (Rs_loginShell, "loginShell", "ls", Opt_loginShell, "login shell"), 103 BOOL (Rs_loginShell, "loginShell", "ls", Opt_loginShell, "login shell"),
96 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"),
97#ifdef HAVE_SCROLLBARS 106#if HAVE_SCROLLBARS
107 RSTRG (Rs_scrollstyle, "scrollstyle", "mode"),
98 BOOL (Rs_scrollBar, "scrollBar", "sb", Opt_scrollBar, "scrollbar"), 108 BOOL (Rs_scrollBar, "scrollBar", "sb", Opt_scrollBar, "scrollbar"),
99 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"),
100 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"),
101#endif 113#endif
102 BOOL (Rs_scrollTtyOutput, "scrollTtyOutput", NULL, Opt_scrollTtyOutput, NULL), 114 BOOL (Rs_scrollTtyOutput, "scrollTtyOutput", NULL, Opt_scrollTtyOutput, NULL),
103 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"),
104 BOOL (Rs_scrollTtyKeypress, "scrollTtyKeypress", "sk", Opt_scrollTtyKeypress, "scroll-on-keypress"), 116 BOOL (Rs_scrollTtyKeypress, "scrollTtyKeypress", "sk", Opt_scrollTtyKeypress, "scroll-on-keypress"),
105 BOOL (Rs_scrollWithBuffer, "scrollWithBuffer", "sw", Opt_scrollWithBuffer, "scroll-with-buffer"), 117 BOOL (Rs_scrollWithBuffer, "scrollWithBuffer", "sw", Opt_scrollWithBuffer, "scroll-with-buffer"),
106#ifdef TRANSPARENT 118#if TRANSPARENT
107 BOOL (Rs_transparent, "inheritPixmap", "ip", Opt_transparent, "inherit parent pixmap"), 119 BOOL (Rs_transparent, "inheritPixmap", "ip", Opt_transparent, "inherit parent pixmap"),
108 BOOL (Rs_transparent_all, "inheritPixmapforce", "ipf", Opt_transparent_all, "forcefully inherit root pixmap"),
109 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
110#if TINTING 129#if TINTING
111 STRG (Rs_color + Color_tint, "tintColor", "tint", "color", "tint color"), 130 STRG (Rs_shade, "shading", "sh", "%", "shade background by x% when tinting."),
112#endif
113#endif 131#endif
114 BOOL (Rs_utmpInhibit, "utmpInhibit", "ut", Opt_utmpInhibit, "utmp inhibit"), 132 BOOL (Rs_utmpInhibit, "utmpInhibit", "ut", Opt_utmpInhibit, "utmp inhibit"),
115#ifndef NO_BELL 133#ifndef NO_BELL
116 BOOL (Rs_visualBell, "visualBell", "vb", Opt_visualBell, "visual bell"), 134 BOOL (Rs_visualBell, "visualBell", "vb", Opt_visualBell, "visual bell"),
117# if ! defined(NO_MAPALERT) && defined(MAPALERT_OPTION) 135# if ! defined(NO_MAPALERT) && defined(MAPALERT_OPTION)
122 BOOL (Rs_meta8, "meta8", NULL, Opt_meta8, NULL), 140 BOOL (Rs_meta8, "meta8", NULL, Opt_meta8, NULL),
123#endif 141#endif
124#ifdef MOUSE_WHEEL 142#ifdef MOUSE_WHEEL
125 BOOL (Rs_mouseWheelScrollPage, "mouseWheelScrollPage", NULL, Opt_mouseWheelScrollPage, NULL), 143 BOOL (Rs_mouseWheelScrollPage, "mouseWheelScrollPage", NULL, Opt_mouseWheelScrollPage, NULL),
126#endif 144#endif
127#ifndef NO_FRILLS 145#if ENABLE_FRILLS
128 BOOL (Rs_tripleclickwords, "tripleclickwords", "tcw", Opt_tripleclickwords, "triple click word selection"), 146 BOOL (Rs_tripleclickwords, "tripleclickwords", "tcw", Opt_tripleclickwords, "triple click word selection"),
129 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"),
130#endif 149#endif
131#ifdef CURSOR_BLINK 150#if CURSOR_BLINK
132 BOOL (Rs_cursorBlink, "cursorBlink", "bc", Opt_cursorBlink, "blinking cursor"), 151 BOOL (Rs_cursorBlink, "cursorBlink", "bc", Opt_cursorBlink, "blinking cursor"),
133#endif 152#endif
134#ifdef POINTER_BLANK 153#ifdef POINTER_BLANK
135 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"),
136#endif 155#endif
153 RSTRG (Rs_color + minBrightCOLOR + 5, "color13", "color"), 172 RSTRG (Rs_color + minBrightCOLOR + 5, "color13", "color"),
154 RSTRG (Rs_color + minBrightCOLOR + 6, "color14", "color"), 173 RSTRG (Rs_color + minBrightCOLOR + 6, "color14", "color"),
155 RSTRG (Rs_color + minBrightCOLOR + 7, "color15", "color"), 174 RSTRG (Rs_color + minBrightCOLOR + 7, "color15", "color"),
156#endif /* NO_BRIGHTCOLOR */ 175#endif /* NO_BRIGHTCOLOR */
157#ifndef NO_BOLD_UNDERLINE_REVERSE 176#ifndef NO_BOLD_UNDERLINE_REVERSE
158 BOOL (Rs_realBold, "realBold", "rb", Opt_realBold, "use bold fonts for bold text"),
159 RSTRG (Rs_color + Color_BD, "colorBD", "color"), 177 RSTRG (Rs_color + Color_BD, "colorBD", "color"),
178 RSTRG (Rs_color + Color_IT, "colorIT", "color"),
160 RSTRG (Rs_color + Color_UL, "colorUL", "color"), 179 RSTRG (Rs_color + Color_UL, "colorUL", "color"),
161 RSTRG (Rs_color + Color_RV, "colorRV", "color"), 180 RSTRG (Rs_color + Color_RV, "colorRV", "color"),
162#endif /* ! NO_BOLD_UNDERLINE_REVERSE */ 181#endif /* ! NO_BOLD_UNDERLINE_REVERSE */
182#if ENABLE_FRILLS
183 RSTRG (Rs_color + Color_underline, "underlineColor", "color"),
184#endif
163#ifdef KEEP_SCROLLCOLOR 185#ifdef KEEP_SCROLLCOLOR
164 RSTRG (Rs_color + Color_scroll, "scrollColor", "color"), 186 RSTRG (Rs_color + Color_scroll, "scrollColor", "color"),
165 RSTRG (Rs_color + Color_trough, "troughColor", "color"), 187 RSTRG (Rs_color + Color_trough, "troughColor", "color"),
166#endif /* KEEP_SCROLLCOLOR */ 188#endif /* KEEP_SCROLLCOLOR */
167#ifdef OPTION_HC 189#ifdef OPTION_HC
168 STRG (Rs_color + Color_HC, "highlightColor", "hc", "color", "highlight color"), 190 STRG (Rs_color + Color_HC, "highlightColor", "hc", "color", "highlight color"),
169#endif 191#endif
192#ifndef NO_CURSORCOLOR
193 STRG (Rs_color + Color_cursor, "cursorColor", "cr", "color", "cursor color"),
194 /* command-line option = resource name */
195 RSTRG (Rs_color + Color_cursor2, "cursorColor2", "color"),
196#endif /* NO_CURSORCOLOR */
197 STRG (Rs_color + Color_pointer_fg, "pointerColor", "pr", "color", "pointer color"),
198 STRG (Rs_color + Color_pointer_bg, "pointerColor2", "pr2", "color", "pointer bg color"),
199 STRG (Rs_color + Color_border, "borderColor", "bd", "color", "border color"),
170#if defined (XPM_BACKGROUND) || (MENUBAR_MAX) 200#if defined (XPM_BACKGROUND) || (MENUBAR_MAX)
171 RSTRG (Rs_path, "path", "search path"), 201 RSTRG (Rs_path, "path", "search path"),
172#endif /* defined (XPM_BACKGROUND) || (MENUBAR_MAX) */ 202#endif /* defined (XPM_BACKGROUND) || (MENUBAR_MAX) */
173#ifdef XPM_BACKGROUND 203#ifdef XPM_BACKGROUND
174 STRG (Rs_backgroundPixmap, "backgroundPixmap", "pixmap", "file[;geom]", "background pixmap"), 204 STRG (Rs_backgroundPixmap, "backgroundPixmap", "pixmap", "file[;geom]", "background pixmap"),
175#endif /* XPM_BACKGROUND */ 205#endif /* XPM_BACKGROUND */
176#if (MENUBAR_MAX) 206#if (MENUBAR_MAX)
177 RSTRG (Rs_menu, "menu", "name[;tag]"), 207 RSTRG (Rs_menu, "menu", "name[;tag]"),
178#endif 208#endif
209 /* fonts: command-line option = resource name */
179 STRG (Rs_font, "font", "fn", "fontname", "normal text font"), 210 STRG (Rs_font, "font", "fn", "fontname", "normal text font"),
180 /* fonts: command-line option = resource name */ 211#if ENABLE_STYLES
212 STRG (Rs_boldFont, "boldFont", "fb", "fontname", "bold font"),
213 STRG (Rs_italicFont, "italicFont", "fi", "fontname", "italic font"),
214 STRG (Rs_boldItalicFont, "boldItalicFont", "fbi", "fontname", "bold italic font"),
215 BOOL (Rs_intensityStyles, "intensityStyles", "is", Opt_intensityStyles, "font styles imply intensity changes"),
216#endif
181#ifdef USE_XIM 217#ifdef USE_XIM
182 STRG (Rs_inputMethod, "inputMethod", "im", "name", "name of input method"), 218 STRG (Rs_inputMethod, "inputMethod", "im", "name", "name of input method"),
183 STRG (Rs_preeditType, "preeditType", "pt", "style", "input style: style = OverTheSpot|OffTheSpot|Root"), 219 STRG (Rs_preeditType, "preeditType", "pt", "style", "input style: style = OverTheSpot|OffTheSpot|Root"),
184#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
185 STRG (Rs_imLocale, "imLocale", "imlocale", "string", "locale to use for input method"), 220 STRG (Rs_imLocale, "imLocale", "imlocale", "string", "locale to use for input method"),
186#endif 221 STRG (Rs_imFont, "imFont", "imfont", "fontname", "fontset for styles OverTheSpot and OffTheSpot"),
187#endif /* USE_XIM */ 222#endif /* USE_XIM */
188 STRG (Rs_name, NULL, "name", "string", "client instance, icon, and title strings"), 223 STRG (Rs_name, NULL, "name", "string", "client instance, icon, and title strings"),
189 STRG (Rs_title, "title", "title", "string", "title name for window"), 224 STRG (Rs_title, "title", "title", "string", "title name for window"),
190 STRG (Rs_title, NULL, "T", NULL, NULL), /* short form */ 225 STRG (Rs_title, NULL, "T", NULL, NULL), /* short form */
191 STRG (Rs_iconName, "iconName", "n", "string", "icon name for window"), 226 STRG (Rs_iconName, "iconName", "n", "string", "icon name for window"),
192#ifndef NO_CURSORCOLOR
193 STRG (Rs_color + Color_cursor, "cursorColor", "cr", "color", "cursor color"),
194 /* command-line option = resource name */
195 RSTRG (Rs_color + Color_cursor2, "cursorColor2", "color"),
196#endif /* NO_CURSORCOLOR */
197 STRG (Rs_color + Color_pointer_fg, "pointerColor", "pr", "color", "pointer color"),
198 STRG (Rs_color + Color_pointer_bg, "pointerColor2", "pr2", "color", "pointer bg color"),
199 STRG (Rs_color + Color_border, "borderColor", "bd", "color", "border color"),
200 STRG (Rs_saveLines, "saveLines", "sl", "number", "number of scrolled lines to save"), 227 STRG (Rs_saveLines, "saveLines", "sl", "number", "number of scrolled lines to save"),
201#ifndef NO_FRILLS 228#if ENABLE_XEMBED
229 STRG (Rs_embed, NULL, "embed", "windowid", "window id to embed terminal in"),
230#endif
231#if ENABLE_FRILLS
232 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"),
202 STRG (Rs_ext_bwidth, "externalBorder", "w", "number", "external border in pixels"), 234 STRG (Rs_ext_bwidth, "externalBorder", "w", "number", "external border in pixels"),
203 STRG (Rs_ext_bwidth, NULL, "bw", NULL, NULL), 235 STRG (Rs_ext_bwidth, NULL, "bw", NULL, NULL),
204 STRG (Rs_ext_bwidth, NULL, "borderwidth", NULL, NULL), 236 STRG (Rs_ext_bwidth, NULL, "borderwidth", NULL, NULL),
205 STRG (Rs_int_bwidth, "internalBorder", "b", "number", "internal border in pixels"), 237 STRG (Rs_int_bwidth, "internalBorder", "b", "number", "internal border in pixels"),
206#endif 238 BOOL (Rs_borderLess, "borderLess", "bl", Opt_borderLess, "borderless window"),
207#ifndef NO_LINESPACE
208 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"),
209#endif 240#endif
210 STRG (Rs_scrollBar_thickness, "thickness", "sbt", "number", "scrollbar thickness/width in pixels"),
211#ifdef POINTER_BLANK 241#ifdef POINTER_BLANK
212 RSTRG (Rs_pointerBlankDelay, "pointerBlankDelay", "number"), 242 RSTRG (Rs_pointerBlankDelay, "pointerBlankDelay", "number"),
213#endif 243#endif
214#ifndef NO_BACKSPACE_KEY 244#ifndef NO_BACKSPACE_KEY
215 RSTRG (Rs_backspace_key, "backspacekey", "string"), 245 RSTRG (Rs_backspace_key, "backspacekey", "string"),
216#endif 246#endif
217#ifndef NO_DELETE_KEY 247#ifndef NO_DELETE_KEY
218 RSTRG (Rs_delete_key, "deletekey", "string"), 248 RSTRG (Rs_delete_key, "deletekey", "string"),
219#endif 249#endif
220 RSTRG (Rs_selectstyle, "selectstyle", "mode"), 250 RSTRG (Rs_selectstyle, "selectstyle", "mode"),
221 RSTRG (Rs_scrollstyle, "scrollstyle", "mode"),
222#ifdef HAVE_SCROLLBARS
223 RSTRG (Rs_scrollBar_align, "scrollBar_align", "mode"),
224#endif
225#ifdef PRINTPIPE 251#ifdef PRINTPIPE
226 RSTRG (Rs_print_pipe, "print-pipe", "string"), 252 RSTRG (Rs_print_pipe, "print-pipe", "string"),
227#endif 253#endif
228 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"),
229 INFO ("xrm", "string", "X resource"),
230#ifdef CUTCHAR_RESOURCE 255#ifdef CUTCHAR_RESOURCE
231 RSTRG (Rs_cutchars, "cutchars", "string"), 256 RSTRG (Rs_cutchars, "cutchars", "string"),
232#endif /* CUTCHAR_RESOURCE */ 257#endif /* CUTCHAR_RESOURCE */
233 RSTRG (Rs_answerbackstring, "answerbackString", "string"), 258 RSTRG (Rs_answerbackstring, "answerbackString", "string"),
234#ifndef NO_SECONDARY_SCREEN 259#ifndef NO_SECONDARY_SCREEN
235 BOOL (Rs_secondaryScreen, "secondaryScreen", "ssc", Opt_secondaryScreen, "enable secondary screen"), 260 BOOL (Rs_secondaryScreen, "secondaryScreen", "ssc", Opt_secondaryScreen, "enable secondary screen"),
236 BOOL (Rs_secondaryScroll, "secondaryScroll", "ssr", Opt_secondaryScroll, "enable secondary screen scroll"), 261 BOOL (Rs_secondaryScroll, "secondaryScroll", "ssr", Opt_secondaryScroll, "enable secondary screen scroll"),
237#endif 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
273#endif
238 INFO ("e", "command arg ...", "command to execute") 274 INFO ("e", "command arg ...", "command to execute")
239 }; 275 };
240 276
241#undef INFO 277#undef INFO
242#undef STRG 278#undef STRG
243#undef RSTRG 279#undef RSTRG
244#undef SWCH 280#undef SWCH
245#undef BOOL 281#undef BOOL
246/*}}} */ 282/*}}} */
247 283
248static const char releasestring[] = "Rxvt v" VERSION " - released: " DATE "\n"; 284static const char releasestring[] = "rxvt-unicode (" RXVTNAME ") v" VERSION " - released: " DATE "\n";
249static const char optionsstring[] = "Options: " 285static const char optionsstring[] = "options: "
286#if XFT
287 "xft,"
288#endif
289#if ENABLE_STYLES
290 "styles,"
291#endif
292#if ENABLE_COMBINING
293 "combining,"
294#endif
295#if TEXT_BLINK
296 "blink,"
297#endif
298#if ISO_14755
299 "iso14755,"
300#endif
301#if UNICODE_3
302 "unicode3,"
303#endif
304 "encodings=eu+vn"
305#if ENCODING_JP
306 "+jp"
307#endif
308#if ENCODING_JP_EXT
309 "+jp-ext"
310#endif
311#if ENCODING_KR
312 "+kr"
313#endif
314#if ENCODING_ZH
315 "+zh"
316#endif
317#if ENCODING_ZH_EXT
318 "+zh-ext"
319#endif
320 ","
321#if OFF_FOCUS_FADING
322 "fade,"
323#endif
250#if defined(XPM_BACKGROUND) 324#if defined(XPM_BACKGROUND)
251 "XPM," 325 "XPM,"
252#endif 326#endif
253#if defined(TRANSPARENT) 327#if defined(TRANSPARENT)
254 "transparent," 328 "transparent,"
255#endif 329#endif
330#if TINTING
331 "tint,"
332#endif
256#if defined(UTMP_SUPPORT) 333#if defined(UTMP_SUPPORT)
257 "utmp," 334 "utmp,"
258#endif 335#endif
259#if defined(MENUBAR) 336#if defined(MENUBAR)
260 "menubar," 337 "menubar,"
261#endif
262#if !defined(NO_FRILLS)
263 "frills,"
264#endif
265#if !defined(NO_LINESPACE)
266 "linespace,"
267#endif
268#if defined(PREFER_24BIT)
269 "24bit,"
270#endif 338#endif
271#if defined(USE_XIM) 339#if defined(USE_XIM)
272 "XIM," 340 "XIM,"
273#endif 341#endif
274 "scrollbars=" 342 "scrollbars="
302 "no_backspace," 370 "no_backspace,"
303#endif 371#endif
304#if defined(NO_DELETE_KEY) 372#if defined(NO_DELETE_KEY)
305 "no_delete," 373 "no_delete,"
306#endif 374#endif
375#if EIGHT_BIT_CONTROLS
376 "8bitctrls,"
377#endif
307#if !defined(NO_STRINGS) 378#if !defined(NO_STRINGS)
308 "strings," 379 "strings,"
309#endif 380#endif
310#if defined(TTY_256COLOR) 381#if defined(ENABLE_FRILLS)
382 "frills,"
383#endif
384#if defined(PREFER_24BIT)
311 "256colour," 385 "24bit,"
386#endif
387#if defined(SELECTION_SCROLLING)
388 "selectionscrolling,"
389#endif
390#if MOUSE_WHEEL
391 "wheel,"
392#endif
393#if MOUSE_SLIP_WHEELING
394 "slipwheel,"
395#endif
396#if defined(SMART_RESIZE)
397 "smart-resize,"
398#endif
399#if defined(CURSOR_BLINK)
400 "cursorBlink,"
401#endif
402#if defined(POINTER_BLANK)
403 "pointerBlank,"
312#endif 404#endif
313#if defined(NO_RESOURCES) 405#if defined(NO_RESOURCES)
314 "NoResources" 406 "NoResources"
315#else 407#else
316# if defined(USE_XGETDEFAULT) 408# if defined(USE_XGETDEFAULT)
335 switch (type) 427 switch (type)
336 { 428 {
337 case 0: /* brief listing */ 429 case 0: /* brief listing */
338 rxvt_log (" [-help] [--help]\n"); 430 rxvt_log (" [-help] [--help]\n");
339 431
340 for (col = 1, i = 0; i < optList_size (); i++) 432 for (col = 1, i = 0; i < optList_size; i++)
341 if (optList[i].desc != NULL) 433 if (optList[i].desc != NULL)
342 { 434 {
343 int len = 0; 435 int len = 0;
344 436
345 if (!optList_isBool (i)) 437 if (!optList_isBool (i))
349 len++; /* account for space */ 441 len++; /* account for space */
350 } 442 }
351#ifdef DEBUG_STRICT 443#ifdef DEBUG_STRICT
352 assert (optList[i].opt != NULL); 444 assert (optList[i].opt != NULL);
353#endif 445#endif
354 len += 4 + STRLEN (optList[i].opt) + (optList_isBool (i) ? 2: 0); 446 len += 4 + strlen (optList[i].opt) + (optList_isBool (i) ? 2: 0);
355 col += len; 447 col += len;
356 if (col > 79) 448 if (col > 79)
357 { /* assume regular width */ 449 { /* assume regular width */
358 rxvt_log ("\n"); 450 rxvt_log ("\n");
359 col = 1 + len; 451 col = 1 + len;
368 break; 460 break;
369 461
370 case 1: /* full command-line listing */ 462 case 1: /* full command-line listing */
371 rxvt_log (" [options] [-e command args]\n\nwhere options include:\n"); 463 rxvt_log (" [options] [-e command args]\n\nwhere options include:\n");
372 464
373 for (i = 0; i < optList_size (); i++) 465 for (i = 0; i < optList_size; i++)
374 if (optList[i].desc != NULL) 466 if (optList[i].desc != NULL)
375 { 467 {
376#ifdef DEBUG_STRICT 468#ifdef DEBUG_STRICT
377 assert (optList[i].opt != NULL); 469 assert (optList[i].opt != NULL);
378#endif 470#endif
379 rxvt_log (" %s%s %-*s%s%s\n", 471 rxvt_log (" %s%s %-*s%s%s\n",
380 (optList_isBool (i) ? "-/+" : "-"), optList[i].opt, 472 (optList_isBool (i) ? "-/+" : "-"), optList[i].opt,
381 (INDENT - STRLEN (optList[i].opt) 473 (INDENT - strlen (optList[i].opt)
382 + (optList_isBool (i) ? 0 : 2)), 474 + (optList_isBool (i) ? 0 : 2)),
383 (optList[i].arg ? optList[i].arg : ""), 475 (optList[i].arg ? optList[i].arg : ""),
384 (optList_isBool (i) ? "turn on/off " : ""), 476 (optList_isBool (i) ? "turn on/off " : ""),
385 optList[i].desc); 477 optList[i].desc);
386 } 478 }
389 481
390 case 2: /* full resource listing */ 482 case 2: /* full resource listing */
391 rxvt_log (" [options] [-e command args]\n\n" 483 rxvt_log (" [options] [-e command args]\n\n"
392 "where resources (long-options) include:\n"); 484 "where resources (long-options) include:\n");
393 485
394 for (i = 0; i < optList_size (); i++) 486 for (i = 0; i < optList_size; i++)
395 if (optList[i].kw != NULL) 487 if (optList[i].kw != NULL)
396 rxvt_log (" %s: %*s%s\n", 488 rxvt_log (" %s: %*s%s\n",
397 optList[i].kw, 489 optList[i].kw,
398 (INDENT - STRLEN (optList[i].kw)), "", /* XXX */ 490 (INDENT - strlen (optList[i].kw)), "", /* XXX */
399 (optList_isBool (i) ? "boolean" : optList[i].arg)); 491 (optList_isBool (i) ? "boolean" : optList[i].arg));
400#ifdef KEYSYM_RESOURCE 492#ifdef KEYSYM_RESOURCE
401 rxvt_log (" " "keysym.sym" ": %*s%s\n", 493 rxvt_log (" " "keysym.sym" ": %*s%s\n",
402 (INDENT - sizeof ("keysym.sym") + 1), "", /* XXX */ 494 (INDENT - sizeof ("keysym.sym") + 1), "", /* XXX */
403 "keysym"); 495 "keysym");
420 int i, bad_option = 0; 512 int i, bad_option = 0;
421 static const char On[3] = "ON", Off[4] = "OFF"; 513 static const char On[3] = "ON", Off[4] = "OFF";
422 514
423 for (i = 1; i < argc; i++) 515 for (i = 1; i < argc; i++)
424 { 516 {
425 unsigned int entry, longopt = 0; 517 unsigned int entry, longopt = 0;
426 const char *flag, *opt; 518 const char *flag, *opt;
427 519
428 opt = argv[i]; 520 opt = argv[i];
429#ifdef DEBUG_RESOURCES 521#ifdef DEBUG_RESOURCES
430 fprintf (stderr, "argv[%d] = %s: ", i, opt); 522 fprintf (stderr, "argv[%d] = %s: ", i, opt);
431#endif 523#endif
446 bad_option = 1; 538 bad_option = 1;
447 rxvt_warn ("\"%s\": malformed option.\n", opt); 539 rxvt_warn ("\"%s\": malformed option.\n", opt);
448 continue; 540 continue;
449 } 541 }
450 542
451 if (!STRCMP (opt, "help")) 543 if (!strcmp (opt, "help"))
452 rxvt_usage (longopt ? 2 : 1); 544 rxvt_usage (longopt ? 2 : 1);
453 if (!STRCMP (opt, "h")) 545 if (!strcmp (opt, "h"))
454 rxvt_usage (0); 546 rxvt_usage (0);
455 547
456 /* feature: always try to match long-options */ 548 /* feature: always try to match long-options */
457 for (entry = 0; entry < optList_size (); entry++) 549 for (entry = 0; entry < optList_size; entry++)
458 if ((optList[entry].kw && !STRCMP (opt, optList[entry].kw)) 550 if ((optList[entry].kw && !strcmp (opt, optList[entry].kw))
459 || (!longopt 551 || (!longopt
460 && optList[entry].opt && !STRCMP (opt, optList[entry].opt))) 552 && optList[entry].opt && !strcmp (opt, optList[entry].opt)))
461 break; 553 break;
462 554
463 if (entry < optList_size ()) 555 if (entry < optList_size)
464 { 556 {
465 if (optList_isReverse (entry)) 557 if (optList_isReverse (entry))
466 flag = flag == On ? Off : On; 558 flag = flag == On ? Off : On;
559
467 if (optList_strlen (entry)) 560 if (optList_strlen (entry))
468 { /* string value */
469 const char *str = argv[++i];
470
471#ifdef DEBUG_RESOURCES
472 fprintf (stderr, "string (%s,%s) = ",
473 optList[entry].opt ? optList[entry].opt : "nil",
474 optList[entry].kw ? optList[entry].kw : "nil");
475#endif
476 if (flag == On && str && (optList[entry].doff != -1))
477 { 561 {
478#ifdef DEBUG_RESOURCES
479 fprintf (stderr, "\"%s\"\n", str);
480#endif
481 rs[optList[entry].doff] = str;
482 /* 562 /*
483 * special cases are handled in main.c:main () to allow 563 * special cases are handled in main.c:main () to allow
484 * X resources to set these values before we settle for 564 * X resources to set these values before we settle for
485 * default values 565 * default values
486 */ 566 */
487 }
488#ifdef DEBUG_RESOURCES
489 else
490 fprintf (stderr, "???\n");
491#endif
492 567
568 if (optList[entry].doff != -1)
569 rs[optList[entry].doff] = flag == On && argv[i+1]
570 ? argv[++i] : 0;
493 } 571 }
494 else 572 else
495 { /* boolean value */ 573 { /* boolean value */
496#ifdef DEBUG_RESOURCES 574#ifdef DEBUG_RESOURCES
497 fprintf (stderr, "boolean (%s,%s) = %s\n", 575 fprintf (stderr, "boolean (%s,%s) = %s\n",
498 optList[entry].opt, optList[entry].kw, flag); 576 optList[entry].opt, optList[entry].kw, flag);
499#endif 577#endif
500 if (flag == On) 578 if (flag == On)
501 Options |= (optList[entry].flag); 579 SET_OPTION (optList[entry].flag & Optflag_mask);
502 else 580 else
503 Options &= ~ (optList[entry].flag); 581 CLR_OPTION (optList[entry].flag & Optflag_mask);
504 582
505 if (optList[entry].doff != -1) 583 if (optList[entry].doff != -1)
506 rs[optList[entry].doff] = flag; 584 rs[optList[entry].doff] = flag;
507 } 585 }
508 } 586 }
509 else 587 else
510#ifdef KEYSYM_RESOURCE 588#ifdef KEYSYM_RESOURCE
511 /* if (!STRNCMP (opt, "keysym.", sizeof ("keysym.") - 1)) */ 589 /* if (!strncmp (opt, "keysym.", sizeof ("keysym.") - 1)) */
512 if (rxvt_Str_match (opt, "keysym.")) 590 if (rxvt_Str_match (opt, "keysym."))
513 { 591 {
514 const char *str = argv[++i]; 592 const char *str = argv[++i];
515 593
516 if (str != NULL) 594 if (str != NULL)
547 XrmQuarkList quarks, 625 XrmQuarkList quarks,
548 XrmRepresentation *type __attribute__((unused)), 626 XrmRepresentation *type __attribute__((unused)),
549 XrmValue *value, 627 XrmValue *value,
550 XPointer closure __attribute__((unused))) 628 XPointer closure __attribute__((unused)))
551{ 629{
552 int last; 630 int last;
553 631
554 for (last = 0; quarks[last] != NULLQUARK; last++) /* look for last quark in list */ 632 for (last = 0; quarks[last] != NULLQUARK; last++) /* look for last quark in list */
555 ; 633 ;
634
556 last--; 635 last--;
557 GET_R->parse_keysym (XrmQuarkToString (quarks[last]), (char *)value->addr);//D//TODO 636 GET_R->parse_keysym (XrmQuarkToString (quarks[last]), (char *)value->addr);//D//TODO
558 return False; 637 return False;
559} 638}
560 639
565 * arg will be 644 * arg will be
566 * NULL for ~/.Xdefaults and 645 * NULL for ~/.Xdefaults and
567 * non-NULL for command-line options (need to allocate) 646 * non-NULL for command-line options (need to allocate)
568 */ 647 */
569#define NEWARGLIM 500 /* `reasonable' size */ 648#define NEWARGLIM 500 /* `reasonable' size */
649
650struct keysym_vocabulary_t
651{
652 const char *name;
653 unsigned short len;
654 unsigned short value;
655};
656keysym_vocabulary_t keysym_vocabulary[] =
657{
658 { "ISOLevel3", 9, Level3Mask },
659 { "AppKeypad", 9, AppKeypadMask },
660 { "Control", 7, ControlMask },
661 { "NumLock", 7, NumLockMask },
662 { "Shift", 5, ShiftMask },
663 { "Meta", 4, MetaMask },
664 { "Lock", 4, LockMask },
665 { "Mod1", 4, Mod1Mask },
666 { "Mod2", 4, Mod2Mask },
667 { "Mod3", 4, Mod3Mask },
668 { "Mod4", 4, Mod4Mask },
669 { "Mod5", 4, Mod5Mask },
670 { "I", 1, Level3Mask },
671 { "K", 1, AppKeypadMask },
672 { "C", 1, ControlMask },
673 { "N", 1, NumLockMask },
674 { "S", 1, ShiftMask },
675 { "M", 1, MetaMask },
676 { "A", 1, MetaMask },
677 { "L", 1, LockMask },
678 { "1", 1, Mod1Mask },
679 { "2", 1, Mod2Mask },
680 { "3", 1, Mod3Mask },
681 { "4", 1, Mod4Mask },
682 { "5", 1, Mod5Mask },
683};
684
570int 685int
571rxvt_term::parse_keysym (const char *str, const char *arg) 686rxvt_term::parse_keysym (const char *str, const char *arg)
572{ 687{
573 int n, sym; 688 int n, sym;
574 char *key_string, *newarg = NULL; 689 unsigned int state = 0;
690 const char *pmodend = NULL;
691 char *newarg = NULL;
575 char newargstr[NEWARGLIM]; 692 char newargstr[NEWARGLIM];
576 693
577 if (arg == NULL) 694 if (arg == NULL)
578 { 695 {
579 if ((n = rxvt_Str_match (str, "keysym.")) == 0) 696 if ((n = rxvt_Str_match (str, "keysym.")) == 0)
580 return 0; 697 return 0;
698
581 str += n; /* skip `keysym.' */ 699 str += n; /* skip `keysym.' */
700 if ((pmodend = strchr (str, ':')) < str)
701 return -1;
702 }
703 else
704 pmodend = str + strlen(str);
705
706 for (--pmodend; str < pmodend; --pmodend)
707 if (*pmodend == '-')
708 break;
709
710 while (str < pmodend)
582 } 711 {
712 unsigned int i;
713
714 for (i=0; i < sizeof (keysym_vocabulary) / sizeof (keysym_vocabulary_t); ++i)
715 {
716 if (strncmp (str, keysym_vocabulary [i].name, keysym_vocabulary [i].len) == 0)
717 {
718 state |= keysym_vocabulary[i].value;
719 str += keysym_vocabulary[i].len;
720 break;
721 }
722 }
723
724 if (i >= sizeof (keysym_vocabulary) / sizeof (keysym_vocabulary_t))
725 return -1;
726
727 if (*str == '-')
728 ++str;
729 }
730
583 /* some scanf () have trouble with a 0x prefix */ 731 /* some scanf () have trouble with a 0x prefix */
584 if (isdigit (str[0]))
585 {
586 if (str[0] == '0' && toupper (str[1]) == 'X') 732 if (str[0] == '0' && toupper (str[1]) == 'X')
733 {
587 str += 2; 734 str += 2;
735
588 if (arg) 736 if (arg)
589 { 737 {
590 if (sscanf (str, (STRCHR (str, ':') ? "%x:" : "%x"), &sym) != 1) 738 if (sscanf (str, (strchr (str, ':') ? "%x:" : "%x"), &sym) != 1)
591 return -1; 739 return -1;
592 } 740 }
593 else 741 else
594 { 742 {
595 if (sscanf (str, "%x:", &sym) != 1) 743 if (sscanf (str, "%x:", &sym) != 1)
596 return -1; 744 return -1;
597 745
598 /* cue to ':', it's there since sscanf () worked */ 746 /* cue to ':', it's there since sscanf () worked */
599 STRNCPY (newargstr, STRCHR (str, ':') + 1, NEWARGLIM - 1); 747 strncpy (newargstr, strchr (str, ':') + 1, NEWARGLIM - 1);
600 newargstr[NEWARGLIM - 1] = '\0'; 748 newargstr[NEWARGLIM - 1] = '\0';
601 newarg = newargstr; 749 newarg = newargstr;
602 } 750 }
603 } 751 }
604 else 752 else
605 { 753 {
606 /* 754 /*
607 * convert keysym name to keysym number 755 * convert keysym name to keysym number
608 */ 756 */
609 STRNCPY (newargstr, str, NEWARGLIM - 1); 757 strncpy (newargstr, str, NEWARGLIM - 1);
610 newargstr[NEWARGLIM - 1] = '\0'; 758 newargstr[NEWARGLIM - 1] = '\0';
759
611 if (arg == NULL) 760 if (arg == NULL)
612 { 761 {
613 if ((newarg = STRCHR (newargstr, ':')) == NULL) 762 if ((newarg = strchr (newargstr, ':')) == NULL)
614 return -1; 763 return -1;
764
615 *newarg++ = '\0'; /* terminate keysym name */ 765 *newarg++ = '\0'; /* terminate keysym name */
616 } 766 }
767
617 if ((sym = XStringToKeysym (newargstr)) == None) 768 if ((sym = XStringToKeysym (newargstr)) == None)
618 return -1; 769 return -1;
619 } 770 }
620 771
621 if (sym < 0xFF00 || sym > 0xFFFF) /* we only do extended keys */
622 return -1;
623 sym &= 0xFF;
624 if (Keysym_map[sym] != NULL) /* already set ? */
625 return -1;
626
627 if (newarg == NULL) 772 if (newarg == NULL)
628 { 773 {
629 STRNCPY (newargstr, arg, NEWARGLIM - 1); 774 strncpy (newargstr, arg, NEWARGLIM - 1);
630 newargstr[NEWARGLIM - 1] = '\0'; 775 newargstr[NEWARGLIM - 1] = '\0';
631 newarg = newargstr; 776 newarg = newargstr;
632 } 777 }
778
633 rxvt_Str_trim (newarg); 779 rxvt_Str_trim (newarg);
634 if (*newarg == '\0' || (n = rxvt_Str_escaped (newarg)) == 0) 780 if (*newarg == '\0' || (n = rxvt_Str_escaped (newarg)) == 0)
635 return -1; 781 return -1;
636 MIN_IT (n, 255);
637 key_string = (char *)rxvt_malloc ((n + 1) * sizeof (char));
638 782
639 key_string[0] = n; 783 keyboard->register_user_translation (sym, state, newarg);
640 STRNCPY (key_string + 1, newarg, n);
641 Keysym_map[sym] = (unsigned char *)key_string;
642
643 return 1; 784 return 1;
644} 785}
645 786
646# endif /* KEYSYM_RESOURCE */ 787# endif /* KEYSYM_RESOURCE */
647 788
657 char *str, buffer[256]; 798 char *str, buffer[256];
658 799
659 if (stream == NULL) 800 if (stream == NULL)
660 return; 801 return;
661 802
662 len = STRLEN (name); 803 len = strlen (name);
663 while ((str = fgets (buffer, sizeof (buffer), stream)) != NULL) 804 while ((str = fgets (buffer, sizeof (buffer), stream)) != NULL)
664 { 805 {
665 unsigned int entry, n; 806 unsigned int entry, n;
666 807
667 while (*str && isspace (*str)) 808 while (*str && isspace (*str))
668 str++; /* leading whitespace */ 809 str++; /* leading whitespace */
669 810
670 if ((str[len] != '*' && str[len] != '.') 811 if ((str[len] != '*' && str[len] != '.')
671 || (len && STRNCMP (str, name, len))) 812 || (len && strncmp (str, name, len)))
672 continue; 813 continue;
673 str += (len + 1); /* skip `name*' or `name.' */ 814 str += (len + 1); /* skip `name*' or `name.' */
674 815
675# ifdef KEYSYM_RESOURCE 816# ifdef KEYSYM_RESOURCE
676 if (!parse_keysym (str, NULL)) 817 if (!parse_keysym (str, NULL))
677# endif /* KEYSYM_RESOURCE */ 818# endif /* KEYSYM_RESOURCE */
678 for (entry = 0; entry < optList_size (); entry++) 819 for (entry = 0; entry < optList_size; entry++)
679 { 820 {
680 const char *kw = optList[entry].kw; 821 const char *kw = optList[entry].kw;
681 822
682 if (kw == NULL) 823 if (kw == NULL)
683 continue; 824 continue;
684 825
685 n = STRLEN (kw); 826 n = strlen (kw);
686 if (str[n] == ':' && rxvt_Str_match (str, kw)) 827 if (str[n] == ':' && rxvt_Str_match (str, kw))
687 { 828 {
688 /* skip `keyword:' */ 829 /* skip `keyword:' */
689 str += n + 1; 830 str += n + 1;
690 rxvt_Str_trim (str); 831 rxvt_Str_trim (str);
691 n = STRLEN (str); 832 n = strlen (str);
833
692 if (n && rs[optList[entry].doff] == NULL) 834 if (n && rs[optList[entry].doff] == NULL)
693 { 835 {
694 /* not already set */ 836 /* not already set */
695 int s; 837 int s;
696 char *p = 0; 838 char *p = 0;
697 839
698 for (int o = 0;;) 840 for (int o = 0;;)
699 { 841 {
700 p = (char *)rxvt_realloc (p, o + n + 1); 842 p = (char *)rxvt_realloc (p, o + n + 1);
701 MEMCPY (p + o, str, n); 843 memcpy (p + o, str, n);
702 o += n; 844 o += n;
703 p[o] = 0; 845 p[o] = 0;
704 846
705 if (o == 0 || p[o - 1] != '\\') // continuation line 847 if (o == 0 || p[o - 1] != '\\') // continuation line
706 break; 848 break;
709 851
710 if ((str = fgets (buffer, sizeof (buffer), stream)) == NULL) 852 if ((str = fgets (buffer, sizeof (buffer), stream)) == NULL)
711 break; 853 break;
712 854
713 rxvt_Str_trim (str); 855 rxvt_Str_trim (str);
714 n = STRLEN (str); 856 n = strlen (str);
715 } 857 }
716 858
717 rs[optList[entry].doff] = p; 859 rs[optList[entry].doff] = p;
718 allocated.push_back (p); 860 allocated.push_back (p);
719 861
720 if (optList_isBool (entry)) 862 if (optList_isBool (entry))
721 { 863 {
722 s = STRCASECMP (str, "TRUE") == 0 864 s = strcasecmp (str, "true") == 0
723 || STRCASECMP (str, "YES") == 0 865 || strcasecmp (str, "yes") == 0
724 || STRCASECMP (str, "ON") == 0 866 || strcasecmp (str, "on") == 0
725 || STRCASECMP (str, "1") == 0; 867 || strcmp (str, "1") == 0;
726 868
727 if (optList_isReverse (entry)) 869 if (optList_isReverse (entry))
728 s = !s; 870 s = !s;
729 871
730 if (s) 872 if (s)
731 Options |= optList[entry].flag; 873 SET_OPTION (optList[entry].flag & Optflag_mask);
732 else 874 else
733 Options &= ~optList[entry].flag; 875 CLR_OPTION (optList[entry].flag & Optflag_mask);
734 } 876 }
735 } 877 }
736 878
737 break; 879 break;
738 } 880 }
750/* 892/*
751 * using XGetDefault () or the hand-rolled replacement 893 * using XGetDefault () or the hand-rolled replacement
752 */ 894 */
753/* ARGSUSED */ 895/* ARGSUSED */
754void 896void
755rxvt_term::extract_resources (Display *display __attribute__ ((unused)), const char *name) 897rxvt_term::extract_resources ()
756{ 898{
899 dDisp;
900
757#ifndef NO_RESOURCES 901#ifndef NO_RESOURCES
902
903 char *homedir = (char *)getenv ("HOME");
904 char fname[1024];
758 905
759# if defined XAPPLOADDIR 906# if defined XAPPLOADDIR
760# if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE) 907# if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
761 /* Compute the path of the possibly available localized Rxvt file */ 908 /* Compute the path of the possibly available localized Rxvt file */
762 char *localepath = NULL; 909 char localepath[1024];
763 910
764 if (locale != NULL) 911 if (locale)
765 { /* XXX: must limit length of string */
766 localepath = (char *)rxvt_malloc (256);
767 sprintf (localepath, XAPPLOADDIRLOCALE "/" RESCLASS, 912 snprintf (localepath, sizeof (localepath), XAPPLOADDIRLOCALE "/" RESCLASS, locale);
768 (int) (258 - sizeof (XAPPLOADDIRLOCALE) - sizeof (RESCLASS)), 913 else
769 locale); /* 258 = 255 + 4 (-.*s) - 1 (/) */ 914 localepath[0] = 0;
770 }
771
772 {
773# endif 915# endif
774# endif 916# endif
775 917
776# ifdef USE_XGETDEFAULT 918# ifdef USE_XGETDEFAULT
777 /* 919 /*
778 * get resources using the X library function 920 * get resources using the X library function
779 */ 921 */
780 int entry; 922 int entry;
781 923
782# ifdef XrmEnumOneLevel 924# ifdef XrmEnumOneLevel
783 int i;
784 char *displayResource, *xe; 925 char *displayResource, *xe;
785 XrmName name_prefix[3]; 926 XrmName name_prefix[3];
786 XrmClass class_prefix[3]; 927 XrmClass class_prefix[3];
787 XrmDatabase database, rdb1; 928 XrmDatabase database, rdb1;
788 char fname[1024];
789 929
790 XrmInitialize (); 930 XrmInitialize ();
791 database = NULL; 931 database = NULL;
792 932
933 // for ordering, see for example http://www.faqs.org/faqs/Xt-FAQ/ Subject: 20
934
935 // 6. System wide per application default file.
936 /* Add in Rxvt file */
937# if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
938 if (*localepath
939 && ((rdb1 = XrmGetFileDatabase (localepath))
940 || (rdb1 = XrmGetFileDatabase (XAPPLOADDIR "/" RESCLASS))))
941# endif
942 XrmMergeDatabases (rdb1, &database);
943
944 /* Add in $XAPPLRESDIR/Rxvt only; not bothering with XUSERFILESEARCHPATH */
945 if ((xe = (char *)getenv ("XAPPLRESDIR")))
946 {
947 snprintf (fname, sizeof (fname), "%s/%s", xe, RESCLASS);
948
949 if ((rdb1 = XrmGetFileDatabase (fname)))
950 XrmMergeDatabases (rdb1, &database);
951 }
952
953 // 5. User's per application default file.
954 // none
955
956 // 4. User's defaults file.
793 /* Get any Xserver defaults */ 957 /* Get any Xserver defaults */
794
795 displayResource = XResourceManagerString (display); 958 displayResource = XResourceManagerString (disp);
796 if (displayResource != NULL) 959 if (displayResource != NULL)
960 {
797 database = XrmGetStringDatabase (displayResource); 961 if ((rdb1 = XrmGetStringDatabase (displayResource)))
798 962 XrmMergeDatabases (rdb1, &database);
799# ifdef HAVE_EXTRA_XRESOURCE_FILES
800 /* Add in ~/.Xdefaults or ~/.Xresources */
801 { 963 }
802 char *ptr; 964 else if (homedir)
965 {
966 snprintf (fname, sizeof (fname), "%s/.Xdefaults", homedir);
803 967
804 if ((ptr = (char *)getenv ("HOME")) == NULL) 968 if ((rdb1 = XrmGetFileDatabase (fname)))
805 ptr = "."; 969 XrmMergeDatabases (rdb1, &database);
970 }
806 971
807 for (i = 0; i < (sizeof (xnames) / sizeof (xnames[0])); i++) 972 /* Get screen specific resources */
973 displayResource = XScreenResourceString (ScreenOfDisplay (disp, display->screen));
974 if (displayResource != NULL)
975 {
976 if ((rdb1 = XrmGetStringDatabase (displayResource)))
977 /* Merge with screen-independent resources */
978 XrmMergeDatabases (rdb1, &database);
979
980 XFree (displayResource);
981 }
982
983 // 3. User's per host defaults file
984 /* Add in XENVIRONMENT file */
985 if ((xe = (char *)getenv ("XENVIRONMENT"))
986 && (rdb1 = XrmGetFileDatabase (xe)))
987 XrmMergeDatabases (rdb1, &database);
988 else if (homedir)
989 {
990 struct utsname un;
991
992 if (!uname (&un))
808 { 993 {
809 sprintf (fname, "%-.*s/%s", sizeof (fname) - STRLEN (xnames[i]) - 2, 994 snprintf (fname, sizeof (fname), "%s/.Xdefaults-%s", homedir, un.nodename);
810 ptr, xnames[i]); 995
811 if ((rdb1 = XrmGetFileDatabase (fname))) 996 if ((rdb1 = XrmGetFileDatabase (fname)))
997 XrmMergeDatabases (rdb1, &database);
998 }
999 }
1000
1001 XrmSetDatabase (disp, database);
1002# endif
1003
1004 /*
1005 * Query resources for options that affect us
1006 */
1007 for (entry = 0; entry < optList_size; entry++)
1008 {
1009 int s;
1010 char *p, *p0;
1011 const char *kw = optList[entry].kw;
1012
1013 if (kw == NULL || rs[optList[entry].doff] != NULL)
1014 continue; /* previously set */
1015
1016 p = XGetDefault (disp, rs[Rs_name], kw);
1017 p0 = XGetDefault (disp, "!INVALIDPROGRAMMENAMEDONTMATCH!", kw);
1018 if (p == NULL || (p0 && strcmp (p, p0) == 0))
1019 {
1020 p = XGetDefault (disp, RESCLASS, kw);
1021#ifdef RESFALLBACK
1022 if (p == NULL || (p0 && strcmp (p, p0) == 0))
1023 p = XGetDefault (disp, RESFALLBACK, kw);
1024#endif
1025 }
1026
1027 if (p == NULL && p0)
1028 p = p0;
1029
1030 if (p)
1031 {
1032 rs[optList[entry].doff] = p;
1033
1034 if (optList_isBool (entry))
812 { 1035 {
813 XrmMergeDatabases (rdb1, &database); 1036 s = strcasecmp (p, "TRUE") == 0
814# ifndef HAVE_BOTH_XRESOURCE_FILES 1037 || strcasecmp (p, "YES") == 0
1038 || strcasecmp (p, "ON") == 0
1039 || strcasecmp (p, "1") == 0;
1040
1041 if (optList_isReverse (entry))
1042 s = !s;
1043
1044 if (s)
1045 SET_OPTION (optList[entry].flag & Optflag_mask);
815 break; 1046 else
816# endif 1047 CLR_OPTION (optList[entry].flag & Optflag_mask);
817
818 } 1048 }
819 } 1049 }
820 } 1050 }
821# endif
822 1051
823 /* Add in XENVIRONMENT file */
824
825 if ((xe = (char *)getenv ("XENVIRONMENT")) != NULL
826 && (rdb1 = XrmGetFileDatabase (xe)) != NULL)
827 XrmMergeDatabases (rdb1, &database);
828
829 /* Add in Rxvt file */
830# if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
831 if (localepath == NULL || (rdb1 = XrmGetFileDatabase (localepath)) == NULL)
832# endif
833 rdb1 = XrmGetFileDatabase (XAPPLOADDIR "/" RESCLASS);
834
835 if (rdb1 != NULL)
836 XrmMergeDatabases (rdb1, &database);
837
838 /* Add in $XAPPLRESDIR/Rxvt only; not bothering with XUSERFILESEARCHPATH */
839 if ((xe = (char *)getenv ("XAPPLRESDIR")) != NULL)
840 {
841 sprintf (fname, "%-.*s/" RESCLASS, sizeof (fname)
842 - sizeof (RESCLASS) - 2, xe);
843 if ((rdb1 = XrmGetFileDatabase (fname)) != NULL)
844 XrmMergeDatabases (rdb1, &database);
845 }
846
847 XrmSetDatabase (display, database);
848# endif
849
850 /* 1052 /*
851 * Query resources for options that affect us
852 */
853 for (entry = 0; entry < optList_size (); entry++)
854 {
855 int s;
856 char *p, *p0;
857 const char *kw = optList[entry].kw;
858
859 if (kw == NULL || rs[optList[entry].doff] != NULL)
860 continue; /* previously set */
861
862 p = XGetDefault (display, name, kw);
863 p0 = XGetDefault (display, "!INVALIDPROGRAMMENAMEDONTMATCH!", kw);
864 if (p == NULL || (p0 && STRCMP (p, p0) == 0))
865 {
866 p = XGetDefault (display, RESCLASS, kw);
867#ifdef RESFALLBACK
868 if (p == NULL || (p0 && STRCMP (p, p0) == 0))
869 p = XGetDefault (display, RESFALLBACK, kw);
870#endif
871 }
872
873 if (p == NULL && p0)
874 p = p0;
875
876 if (p)
877 {
878 rs[optList[entry].doff] = p;
879
880 if (optList_isBool (entry))
881 {
882 s = STRCASECMP (p, "TRUE") == 0
883 || STRCASECMP (p, "YES") == 0
884 || STRCASECMP (p, "ON") == 0
885 || STRCASECMP (p, "1") == 0;
886 if (optList_isReverse (entry))
887 s = !s;
888 if (s)
889 Options |= (optList[entry].flag);
890 else
891 Options &= ~ (optList[entry].flag);
892 }
893 }
894 }
895
896 /*
897 * [R5 or later]: enumerate the resource database 1053 * [R5 or later]: enumerate the resource database
898 */ 1054 */
899# ifdef XrmEnumOneLevel
900# ifdef KEYSYM_RESOURCE 1055# ifdef KEYSYM_RESOURCE
901 name_prefix[0] = XrmStringToName (name); 1056 name_prefix[0] = XrmStringToName (rs[Rs_name]);
902 name_prefix[1] = XrmStringToName ("keysym"); 1057 name_prefix[1] = XrmStringToName ("keysym");
903 name_prefix[2] = NULLQUARK; 1058 name_prefix[2] = NULLQUARK;
904 class_prefix[0] = XrmStringToName (RESCLASS); 1059 class_prefix[0] = XrmStringToName (RESCLASS);
905 class_prefix[1] = XrmStringToName ("Keysym"); 1060 class_prefix[1] = XrmStringToName ("Keysym");
906 class_prefix[2] = NULLQUARK; 1061 class_prefix[2] = NULLQUARK;
907 /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */ 1062 /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */
908 XrmEnumerateDatabase (XrmGetDatabase (display), name_prefix, class_prefix, 1063 XrmEnumerateDatabase (XrmGetDatabase (disp), name_prefix, class_prefix,
909 XrmEnumOneLevel, rxvt_define_key, NULL); 1064 XrmEnumOneLevel, rxvt_define_key, NULL);
910# ifdef RESFALLBACK 1065# ifdef RESFALLBACK
911 name_prefix[0] = XrmStringToName (RESFALLBACK); 1066 name_prefix[0] = XrmStringToName (RESFALLBACK);
912 name_prefix[1] = XrmStringToName ("keysym"); 1067 name_prefix[1] = XrmStringToName ("keysym");
913 class_prefix[0] = XrmStringToName (RESFALLBACK); 1068 class_prefix[0] = XrmStringToName (RESFALLBACK);
914 class_prefix[1] = XrmStringToName ("Keysym"); 1069 class_prefix[1] = XrmStringToName ("Keysym");
915 /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */ 1070 /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */
916 XrmEnumerateDatabase (XrmGetDatabase (display), name_prefix, class_prefix, 1071 XrmEnumerateDatabase (XrmGetDatabase (disp), name_prefix, class_prefix,
917 XrmEnumOneLevel, rxvt_define_key, NULL); 1072 XrmEnumOneLevel, rxvt_define_key, NULL);
918# endif
919# endif 1073# endif
920# endif 1074# endif
921 1075
922# else /* USE_XGETDEFAULT */ 1076# else /* USE_XGETDEFAULT */
923 /* get resources the hard way, but save lots of memory */ 1077 /* get resources the hard way, but save lots of memory */
1078 FILE *fd = NULL;
1079
1080 if (homedir)
1081 {
1082 static const char *const xnames[2] = { ".Xdefaults", ".Xresources" };
1083
1084 for (int i = 0; i < (sizeof (xnames) / sizeof (xnames [0])); i++)
1085 {
1086 snprintf (fname, sizeof (fname), "%s/%s", homedir, xnames [i]);
1087
1088 if ((fd = fopen (fname, "r")) != NULL)
1089 break;
1090 }
1091 }
1092 /*
1093 * The normal order to match resources is the following:
1094 * @ global resources (partial match, ~/.Xdefaults)
1095 * @ application file resources (XAPPLOADDIR/Rxvt)
1096 * @ class resources (~/.Xdefaults)
1097 * @ private resources (~/.Xdefaults)
1098 *
1099 * However, for the hand-rolled resources, the matching algorithm
1100 * checks if a resource string value has already been allocated
1101 * and won't overwrite it with (in this case) a less specific
1102 * resource value.
1103 *
1104 * This avoids multiple allocation. Also, when we've called this
1105 * routine command-line string options have already been applied so we
1106 * needn't to allocate for those resources.
1107 *
1108 * So, search in resources from most to least specific.
1109 *
1110 * Also, use a special sub-class so that we can use either or both of
1111 * "XTerm" and "Rxvt" as class names.
1112 */
1113
1114 get_xdefaults (fd, rs[Rs_name]);
1115 get_xdefaults (fd, RESCLASS);
1116# ifdef RESFALLBACK
1117 get_xdefaults (fd, RESFALLBACK);
1118# endif
1119
1120# if defined(XAPPLOADDIR) && defined(USE_XAPPLOADDIR)
1121 {
924 FILE *fd = NULL; 1122 FILE *ad = NULL;
925 char *home;
926 1123
927 if ((home = getenv ("HOME")) != NULL) 1124# if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1125 if (!*localepath || (ad = fopen (localepath, "r")) == NULL)
1126# endif
1127 ad = fopen (XAPPLOADDIR "/" RESCLASS, "r");
1128 if (ad != NULL)
928 { 1129 {
929 unsigned int i, len = STRLEN (home) + 2; 1130 get_xdefaults (ad, RESCLASS);
930 char *f = NULL; 1131 get_xdefaults (ad, "");
931
932 for (i = 0; i < (sizeof (xnames) / sizeof (xnames[0])); i++)
933 {
934 f = (char *)rxvt_realloc (f, (len + STRLEN (xnames[i])) * sizeof (char));
935
936 sprintf (f, "%s/%s", home, xnames[i]);
937
938 if ((fd = fopen (f, "r")) != NULL)
939 break;
940 }
941 free (f); 1132 fclose (ad);
942 } 1133 }
943 /*
944 * The normal order to match resources is the following:
945 * @ global resources (partial match, ~/.Xdefaults)
946 * @ application file resources (XAPPLOADDIR/Rxvt)
947 * @ class resources (~/.Xdefaults)
948 * @ private resources (~/.Xdefaults)
949 *
950 * However, for the hand-rolled resources, the matching algorithm
951 * checks if a resource string value has already been allocated
952 * and won't overwrite it with (in this case) a less specific
953 * resource value.
954 *
955 * This avoids multiple allocation. Also, when we've called this
956 * routine command-line string options have already been applied so we
957 * needn't to allocate for those resources.
958 *
959 * So, search in resources from most to least specific.
960 *
961 * Also, use a special sub-class so that we can use either or both of
962 * "XTerm" and "Rxvt" as class names.
963 */
964
965 get_xdefaults (fd, name);
966 get_xdefaults (fd, RESCLASS);
967# ifdef RESFALLBACK
968 get_xdefaults (fd, RESFALLBACK);
969# endif
970
971# if defined(XAPPLOADDIR) && defined(USE_XAPPLOADDIR)
972 {
973 FILE *ad = NULL;
974
975# if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
976 if (localepath == NULL || (ad = fopen (localepath, "r")) == NULL)
977# endif
978 ad = fopen (XAPPLOADDIR "/" RESCLASS, "r");
979 if (ad != NULL)
980 {
981 get_xdefaults (ad, RESCLASS);
982 get_xdefaults (ad, "");
983 fclose (ad);
984 }
985 } 1134 }
986# endif /* XAPPLOADDIR */ 1135# endif /* XAPPLOADDIR */
987 1136
988 get_xdefaults (fd, ""); /* partial match */ 1137 get_xdefaults (fd, ""); /* partial match */
989 if (fd != NULL) 1138 if (fd != NULL)
990 fclose (fd); 1139 fclose (fd);
991# endif /* USE_XGETDEFAULT */ 1140# endif /* USE_XGETDEFAULT */
992
993# if defined XAPPLOADDIR
994# if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
995
996 }
997
998 /* Free the path of the possibly available localized Rxvt file */
999 free (localepath);
1000# endif
1001# endif
1002 1141
1003#endif /* NO_RESOURCES */ 1142#endif /* NO_RESOURCES */
1004} 1143}
1005 1144
1006/*}}} */ 1145/*}}} */

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines