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.12 by pcg, Sun Feb 22 08:09:38 2004 UTC vs.
Revision 1.34 by root, Sun Aug 15 22:09:24 2004 UTC

1/*--------------------------------*-C-*---------------------------------* 1/*--------------------------------*-C-*---------------------------------*
2 * File: xdefaults.c 2 * File: xdefaults.C
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * $Id: xdefaults.C,v 1.12 2004/02/22 08:09:38 pcg Exp $
5 * 4 *
6 * All portions of code are copyright by their respective author/s. 5 * All portions of code are copyright by their respective author/s.
7 * Copyright (c) 1994 Robert Nation <nation@rocket.sanders.lockheed.com> 6 * Copyright (c) 1994 Robert Nation <nation@rocket.sanders.lockheed.com>
8 * - original version 7 * - original version
9 * 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>
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.
… …
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 */
34 33
35/* #define DEBUG_RESOURCES */ 34/* #define DEBUG_RESOURCES */
36 35
37static const char *const xnames[2] = { ".Xdefaults", ".Xresources" }; 36static const char *const xnames[2] = { ".Xdefaults", ".Xresources" };
38 37
… …
63#define SWCH(opt, flag, desc) \ 62#define SWCH(opt, flag, desc) \
64 { (flag), -1, NULL, (opt), NULL, (desc)} 63 { (flag), -1, NULL, (opt), NULL, (desc)}
65 64
66/* convenient macros */ 65/* convenient macros */
67#define optList_strlen(i) \ 66#define optList_strlen(i) \
68 (optList[i].flag ? 0 : (optList[i].arg ? STRLEN (optList[i].arg) : 1)) 67 (optList[i].flag ? 0 : (optList[i].arg ? strlen (optList[i].arg) : 1))
69#define optList_isBool(i) \ 68#define optList_isBool(i) \
70 (optList[i].flag & Opt_Boolean) 69 (optList[i].flag & Opt_Boolean)
71#define optList_isReverse(i) \ 70#define optList_isReverse(i) \
72 (optList[i].flag & Opt_Reverse) 71 (optList[i].flag & Opt_Reverse)
73#define optList_size() \ 72#define optList_size() \
… …
83 const char *desc; /* description */ 82 const char *desc; /* description */
84 } 83 }
85optList[] = { 84optList[] = {
86 STRG (Rs_display_name, NULL, "d", NULL, NULL), /* short form */ 85 STRG (Rs_display_name, NULL, "d", NULL, NULL), /* short form */
87 STRG (Rs_display_name, NULL, "display", "string", "X server to contact"), 86 STRG (Rs_display_name, NULL, "display", "string", "X server to contact"),
88 STRG (Rs_term_name, "termName", "tn", "string", 87 STRG (Rs_term_name, "termName", "tn", "string", "value of the TERM environment variable"),
89 "value of the TERM environment variable"),
90 STRG (Rs_geometry, NULL, "g", NULL, NULL), /* short form */ 88 STRG (Rs_geometry, NULL, "g", NULL, NULL), /* short form */
91 STRG (Rs_geometry, "geometry", "geometry", "geometry", 89 STRG (Rs_geometry, "geometry", "geometry", "geometry", "size (in characters) and position"),
92 "size (in characters) and position"),
93 SWCH ("C", Opt_console, "intercept console messages"), 90 SWCH ("C", Opt_console, "intercept console messages"),
94 SWCH ("iconic", Opt_iconic, "start iconic"), 91 SWCH ("iconic", Opt_iconic, "start iconic"),
95 SWCH ("ic", Opt_iconic, NULL), /* short form */ 92 SWCH ("ic", Opt_iconic, NULL), /* short form */
96 BOOL (Rs_reverseVideo, "reverseVideo", "rv", Opt_reverseVideo, 93 BOOL (Rs_reverseVideo, "reverseVideo", "rv", Opt_reverseVideo, "reverse video"),
97 "reverse video"),
98 BOOL (Rs_loginShell, "loginShell", "ls", Opt_loginShell, "login shell"), 94 BOOL (Rs_loginShell, "loginShell", "ls", Opt_loginShell, "login shell"),
99 BOOL (Rs_jumpScroll, "jumpScroll", "j", Opt_jumpScroll, "jump scrolling"), 95 BOOL (Rs_jumpScroll, "jumpScroll", "j", Opt_jumpScroll, "jump scrolling"),
100#ifdef HAVE_SCROLLBARS 96#ifdef HAVE_SCROLLBARS
101 BOOL (Rs_scrollBar, "scrollBar", "sb", Opt_scrollBar, "scrollbar"), 97 BOOL (Rs_scrollBar, "scrollBar", "sb", Opt_scrollBar, "scrollbar"),
102 BOOL (Rs_scrollBar_right, "scrollBar_right", "sr", Opt_scrollBar_right, 98 BOOL (Rs_scrollBar_right, "scrollBar_right", "sr", Opt_scrollBar_right, "scrollbar right"),
103 "scrollbar right"), 99 BOOL (Rs_scrollBar_floating, "scrollBar_floating", "st", Opt_scrollBar_floating, "scrollbar without a trough"),
104 BOOL (Rs_scrollBar_floating, "scrollBar_floating", "st",
105 Opt_scrollBar_floating, "scrollbar without a trough"),
106#endif 100#endif
107 BOOL (Rs_scrollTtyOutput, "scrollTtyOutput", NULL, Opt_scrollTtyOutput, 101 BOOL (Rs_scrollTtyOutput, "scrollTtyOutput", NULL, Opt_scrollTtyOutput, NULL),
108 NULL),
109 BOOL (Rs_scrollTtyOutput, NULL, "si", Opt_Reverse | Opt_scrollTtyOutput, 102 BOOL (Rs_scrollTtyOutput, NULL, "si", Opt_Reverse | Opt_scrollTtyOutput, "scroll-on-tty-output inhibit"),
110 "scroll-on-tty-output inhibit"),
111 BOOL (Rs_scrollTtyKeypress, "scrollTtyKeypress", "sk", Opt_scrollTtyKeypress, 103 BOOL (Rs_scrollTtyKeypress, "scrollTtyKeypress", "sk", Opt_scrollTtyKeypress, "scroll-on-keypress"),
112 "scroll-on-keypress"),
113 BOOL (Rs_scrollWithBuffer, "scrollWithBuffer", "sw", Opt_scrollWithBuffer, 104 BOOL (Rs_scrollWithBuffer, "scrollWithBuffer", "sw", Opt_scrollWithBuffer, "scroll-with-buffer"),
114 "scroll-with-buffer"),
115#ifdef TRANSPARENT 105#ifdef TRANSPARENT
116 BOOL (Rs_transparent, "inheritPixmap", "ip", Opt_transparent, 106 BOOL (Rs_transparent, "inheritPixmap", "ip", Opt_transparent, "inherit parent pixmap"),
117 "inherit parent pixmap"),
118 BOOL (Rs_transparent_all, "inheritPixmapforce", "ipf", Opt_transparent_all, 107 BOOL (Rs_transparent_all, "inheritPixmapforce", "ipf", Opt_transparent_all, "forcefully inherit root pixmap"),
119 "forcefully inherit root pixmap"),
120 SWCH ("tr", Opt_transparent, NULL), 108 SWCH ("tr", Opt_transparent, NULL),
109#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 urxvt is losing focus."),
115#endif
116#ifdef TINTING
117 STRG (Rs_shade, "shading", "sh", "%", "shade background by x% when tinting."),
121#endif 118#endif
122 BOOL (Rs_utmpInhibit, "utmpInhibit", "ut", Opt_utmpInhibit, "utmp inhibit"), 119 BOOL (Rs_utmpInhibit, "utmpInhibit", "ut", Opt_utmpInhibit, "utmp inhibit"),
123#ifndef NO_BELL 120#ifndef NO_BELL
124 BOOL (Rs_visualBell, "visualBell", "vb", Opt_visualBell, "visual bell"), 121 BOOL (Rs_visualBell, "visualBell", "vb", Opt_visualBell, "visual bell"),
125# if ! defined(NO_MAPALERT) && defined(MAPALERT_OPTION) 122# if ! defined(NO_MAPALERT) && defined(MAPALERT_OPTION)
… …
128#endif 125#endif
129#ifdef META8_OPTION 126#ifdef META8_OPTION
130 BOOL (Rs_meta8, "meta8", NULL, Opt_meta8, NULL), 127 BOOL (Rs_meta8, "meta8", NULL, Opt_meta8, NULL),
131#endif 128#endif
132#ifdef MOUSE_WHEEL 129#ifdef MOUSE_WHEEL
133 BOOL (Rs_mouseWheelScrollPage, "mouseWheelScrollPage", NULL, Opt_mouseWheelScrollPage, 130 BOOL (Rs_mouseWheelScrollPage, "mouseWheelScrollPage", NULL, Opt_mouseWheelScrollPage, NULL),
134 NULL),
135#endif 131#endif
136#ifdef MULTICHAR_SET 132#if ENABLE_FRILLS
137 BOOL (Rs_mc_hack, "multibyte_cursor", "mcc", Opt_mc_hack,
138 "Multibyte character cursor movement"),
139#endif
140#ifndef NO_FRILLS
141 BOOL (Rs_tripleclickwords, "tripleclickwords", "tcw", Opt_tripleclickwords, 133 BOOL (Rs_tripleclickwords, "tripleclickwords", "tcw", Opt_tripleclickwords, "triple click word selection"),
142 "triple click word selection"), 134 BOOL (Rs_insecure, "insecure", "insecure", Opt_insecure, "enable possibly insecure escape sequences"),
143#endif 135#endif
144#ifdef CURSOR_BLINK 136#ifdef CURSOR_BLINK
145 BOOL (Rs_cursorBlink, "cursorBlink", "bc", Opt_cursorBlink, "blinking cursor"), 137 BOOL (Rs_cursorBlink, "cursorBlink", "bc", Opt_cursorBlink, "blinking cursor"),
146#endif 138#endif
147#ifdef POINTER_BLANK 139#ifdef POINTER_BLANK
… …
166 RSTRG (Rs_color + minBrightCOLOR + 5, "color13", "color"), 158 RSTRG (Rs_color + minBrightCOLOR + 5, "color13", "color"),
167 RSTRG (Rs_color + minBrightCOLOR + 6, "color14", "color"), 159 RSTRG (Rs_color + minBrightCOLOR + 6, "color14", "color"),
168 RSTRG (Rs_color + minBrightCOLOR + 7, "color15", "color"), 160 RSTRG (Rs_color + minBrightCOLOR + 7, "color15", "color"),
169#endif /* NO_BRIGHTCOLOR */ 161#endif /* NO_BRIGHTCOLOR */
170#ifndef NO_BOLD_UNDERLINE_REVERSE 162#ifndef NO_BOLD_UNDERLINE_REVERSE
163 BOOL (Rs_realBold, "realBold", "rb", Opt_realBold, "use bold fonts for bold text"),
171 RSTRG (Rs_color + Color_BD, "colorBD", "color"), 164 RSTRG (Rs_color + Color_BD, "colorBD", "color"),
172 RSTRG (Rs_color + Color_UL, "colorUL", "color"), 165 RSTRG (Rs_color + Color_UL, "colorUL", "color"),
173 RSTRG (Rs_color + Color_RV, "colorRV", "color"), 166 RSTRG (Rs_color + Color_RV, "colorRV", "color"),
174#endif /* ! NO_BOLD_UNDERLINE_REVERSE */ 167#endif /* ! NO_BOLD_UNDERLINE_REVERSE */
175#ifdef KEEP_SCROLLCOLOR 168#ifdef KEEP_SCROLLCOLOR
… …
181#endif 174#endif
182#if defined (XPM_BACKGROUND) || (MENUBAR_MAX) 175#if defined (XPM_BACKGROUND) || (MENUBAR_MAX)
183 RSTRG (Rs_path, "path", "search path"), 176 RSTRG (Rs_path, "path", "search path"),
184#endif /* defined (XPM_BACKGROUND) || (MENUBAR_MAX) */ 177#endif /* defined (XPM_BACKGROUND) || (MENUBAR_MAX) */
185#ifdef XPM_BACKGROUND 178#ifdef XPM_BACKGROUND
186 STRG (Rs_backgroundPixmap, "backgroundPixmap", "pixmap", "file[;geom]", 179 STRG (Rs_backgroundPixmap, "backgroundPixmap", "pixmap", "file[;geom]", "background pixmap"),
187 "background pixmap"),
188#endif /* XPM_BACKGROUND */ 180#endif /* XPM_BACKGROUND */
189#if (MENUBAR_MAX) 181#if (MENUBAR_MAX)
190 RSTRG (Rs_menu, "menu", "name[;tag]"), 182 RSTRG (Rs_menu, "menu", "name[;tag]"),
191#endif 183#endif
192 STRG (Rs_font, "font", "fn", "fontname", "normal text font"), 184 STRG (Rs_font, "font", "fn", "fontname", "normal text font"),
193 /* fonts: command-line option = resource name */ 185 /* fonts: command-line option = resource name */
194#ifdef USE_XIM 186#ifdef USE_XIM
195 STRG (Rs_inputMethod, "inputMethod", "im", "name", "name of input method"), 187 STRG (Rs_inputMethod, "inputMethod", "im", "name", "name of input method"),
196 STRG (Rs_preeditType, "preeditType", "pt", "style", 188 STRG (Rs_preeditType, "preeditType", "pt", "style", "input style: style = OverTheSpot|OffTheSpot|Root"),
197 "input style: style = OverTheSpot|OffTheSpot|Root"),
198#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE) 189#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
199 STRG (Rs_imLocale, "imLocale", "imlocale", "string", "locale to use for input method"), 190 STRG (Rs_imLocale, "imLocale", "imlocale", "string", "locale to use for input method"),
200#endif 191#endif
201#endif /* USE_XIM */ 192#endif /* USE_XIM */
202 STRG (Rs_name, NULL, "name", "string", 193 STRG (Rs_name, NULL, "name", "string", "client instance, icon, and title strings"),
203 "client instance, icon, and title strings"),
204 STRG (Rs_title, "title", "title", "string", "title name for window"), 194 STRG (Rs_title, "title", "title", "string", "title name for window"),
205 STRG (Rs_title, NULL, "T", NULL, NULL), /* short form */ 195 STRG (Rs_title, NULL, "T", NULL, NULL), /* short form */
206 STRG (Rs_iconName, "iconName", "n", "string", "icon name for window"), 196 STRG (Rs_iconName, "iconName", "n", "string", "icon name for window"),
207#ifndef NO_CURSORCOLOR 197#ifndef NO_CURSORCOLOR
208 STRG (Rs_color + Color_cursor, "cursorColor", "cr", "color", "cursor color"), 198 STRG (Rs_color + Color_cursor, "cursorColor", "cr", "color", "cursor color"),
209 /* command-line option = resource name */ 199 /* command-line option = resource name */
210 RSTRG (Rs_color + Color_cursor2, "cursorColor2", "color"), 200 RSTRG (Rs_color + Color_cursor2, "cursorColor2", "color"),
211#endif /* NO_CURSORCOLOR */ 201#endif /* NO_CURSORCOLOR */
212 STRG (Rs_color + Color_pointer, "pointerColor", "pr", "color", 202 STRG (Rs_color + Color_pointer_fg, "pointerColor", "pr", "color", "pointer color"),
213 "pointer color"), 203 STRG (Rs_color + Color_pointer_bg, "pointerColor2", "pr2", "color", "pointer bg color"),
214 STRG (Rs_color + Color_border, "borderColor", "bd", "color", 204 STRG (Rs_color + Color_border, "borderColor", "bd", "color", "border color"),
215 "border color"),
216 STRG (Rs_saveLines, "saveLines", "sl", "number", 205 STRG (Rs_saveLines, "saveLines", "sl", "number", "number of scrolled lines to save"),
217 "number of scrolled lines to save"), 206#if ENABLE_FRILLS
218#ifndef NO_FRILLS
219 STRG (Rs_ext_bwidth, "externalBorder", "w", "number", 207 STRG (Rs_ext_bwidth, "externalBorder", "w", "number", "external border in pixels"),
220 "external border in pixels"),
221 STRG (Rs_ext_bwidth, NULL, "bw", NULL, NULL), 208 STRG (Rs_ext_bwidth, NULL, "bw", NULL, NULL),
222 STRG (Rs_ext_bwidth, NULL, "borderwidth", NULL, NULL), 209 STRG (Rs_ext_bwidth, NULL, "borderwidth", NULL, NULL),
223 STRG (Rs_int_bwidth, "internalBorder", "b", "number", 210 STRG (Rs_int_bwidth, "internalBorder", "b", "number", "internal border in pixels"),
224 "internal border in pixels"), 211 BOOL (Rs_borderLess, "borderLess", "bl", Opt_borderLess, "borderless window"),
225#endif 212#endif
226#ifndef NO_LINESPACE 213#ifndef NO_LINESPACE
227 STRG (Rs_lineSpace, "lineSpace", "lsp", "number", 214 STRG (Rs_lineSpace, "lineSpace", "lsp", "number", "number of extra pixels between rows"),
228 "number of extra pixels between rows"),
229#endif 215#endif
230 STRG (Rs_scrollBar_thickness, "thickness", "sbt", "number", 216 STRG (Rs_scrollBar_thickness, "thickness", "sbt", "number", "scrollbar thickness/width in pixels"),
231 "scrollbar thickness/width in pixels"),
232#ifdef POINTER_BLANK 217#ifdef POINTER_BLANK
233 RSTRG (Rs_pointerBlankDelay, "pointerBlankDelay", "number"), 218 RSTRG (Rs_pointerBlankDelay, "pointerBlankDelay", "number"),
234#endif 219#endif
235#ifndef NO_BACKSPACE_KEY 220#ifndef NO_BACKSPACE_KEY
236 RSTRG (Rs_backspace_key, "backspacekey", "string"), 221 RSTRG (Rs_backspace_key, "backspacekey", "string"),
… …
244 RSTRG (Rs_scrollBar_align, "scrollBar_align", "mode"), 229 RSTRG (Rs_scrollBar_align, "scrollBar_align", "mode"),
245#endif 230#endif
246#ifdef PRINTPIPE 231#ifdef PRINTPIPE
247 RSTRG (Rs_print_pipe, "print-pipe", "string"), 232 RSTRG (Rs_print_pipe, "print-pipe", "string"),
248#endif 233#endif
249#if defined (HOTKEY_CTRL) || defined (HOTKEY_META) 234 STRG (Rs_modifier, "modifier", "mod", "modifier", "meta modifier = alt|meta|hyper|super|mod1|...|mod5"),
250 RSTRG (Rs_bigfont_key, "bigfont_key", "keysym"),
251 RSTRG (Rs_smallfont_key, "smallfont_key", "keysym"),
252#endif
253 STRG (Rs_modifier, "modifier", "mod", "modifier",
254 "meta modifier = alt|meta|hyper|super|mod1|...|mod5"),
255 INFO ("xrm", "string", "X resource"), 235 INFO ("xrm", "string", "X resource"),
256#ifdef CUTCHAR_RESOURCE 236#ifdef CUTCHAR_RESOURCE
257 RSTRG (Rs_cutchars, "cutchars", "string"), 237 RSTRG (Rs_cutchars, "cutchars", "string"),
258#endif /* CUTCHAR_RESOURCE */ 238#endif /* CUTCHAR_RESOURCE */
259#ifdef ACS_ASCII
260 RSTRG (Rs_acs_chars, "acsChars", "string"),
261#endif /* ACS_ASCII */
262 RSTRG (Rs_answerbackstring, "answerbackString", "string"), 239 RSTRG (Rs_answerbackstring, "answerbackString", "string"),
240#ifndef NO_SECONDARY_SCREEN
241 BOOL (Rs_secondaryScreen, "secondaryScreen", "ssc", Opt_secondaryScreen, "enable secondary screen"),
242 BOOL (Rs_secondaryScroll, "secondaryScroll", "ssr", Opt_secondaryScroll, "enable secondary screen scroll"),
243#endif
263 INFO ("e", "command arg ...", "command to execute") 244 INFO ("e", "command arg ...", "command to execute")
264 }; 245 };
265 246
266#undef INFO 247#undef INFO
267#undef STRG 248#undef STRG
… …
269#undef SWCH 250#undef SWCH
270#undef BOOL 251#undef BOOL
271/*}}} */ 252/*}}} */
272 253
273static const char releasestring[] = "Rxvt v" VERSION " - released: " DATE "\n"; 254static const char releasestring[] = "Rxvt v" VERSION " - released: " DATE "\n";
274static const char optionsstring[] = "Options: " 255static const char optionsstring[] = "options: "
256#if XFT
257 "xft,"
258#endif
259#if UNICODE_3
260 "unicode3,"
261#endif
262 "encodings=eu+vn"
263#if ENCODING_JP
264 "+jp"
265#endif
266#if ENCODING_JP_EXT
267 "+jp-ext"
268#endif
269#if ENCODING_KR
270 "+kr"
271#endif
272#if ENCODING_CN
273 "+cn"
274#endif
275#if ENCODING_CN_EXT
276 "+cn-ext"
277#endif
278 ","
279#if ENABLE_COMBINING
280 "combining,"
281#endif
282#if TEXT_BLINK
283 "blink,"
284#endif
285#if OFF_FOCUS_FADING
286 "fade,"
287#endif
275#if defined(XPM_BACKGROUND) 288#if defined(XPM_BACKGROUND)
276 "XPM," 289 "XPM,"
277#endif 290#endif
278#if defined(TRANSPARENT) 291#if defined(TRANSPARENT)
279 "transparent," 292 "transparent,"
280#endif 293#endif
294#if TINTING
295 "tint,"
296#endif
281#if defined(UTMP_SUPPORT) 297#if defined(UTMP_SUPPORT)
282 "utmp," 298 "utmp,"
283#endif 299#endif
284#if defined(MENUBAR) 300#if defined(MENUBAR)
285 "menubar," 301 "menubar,"
286#endif 302#endif
287#if !defined(NO_FRILLS)
288 "frills,"
289#endif
290#if !defined(NO_LINESPACE)
291 "linespace,"
292#endif
293#if defined(PREFER_24BIT)
294 "24bit,"
295#endif
296#if defined(USE_XIM) 303#if defined(USE_XIM)
297 "XIM," 304 "XIM,"
298#endif
299#if defined(MULTICHAR_SET)
300 "multichar_languages,"
301#endif 305#endif
302 "scrollbars=" 306 "scrollbars="
303#if !defined(HAVE_SCROLLBARS) 307#if !defined(HAVE_SCROLLBARS)
304 "NONE" 308 "NONE"
305#else 309#else
310# if defined(PLAIN_SCROLLBAR)
311 "plain"
312# if defined(RXVT_SCROLLBAR) || defined(NEXT_SCROLLBAR) || defined(XTERM_SCROLLBAR)
313 "+"
314# endif
315# endif
306# if defined(RXVT_SCROLLBAR) 316# if defined(RXVT_SCROLLBAR)
307 "rxvt" 317 "rxvt"
308# if defined(NEXT_SCROLLBAR) || defined(XTERM_SCROLLBAR) 318# if defined(NEXT_SCROLLBAR) || defined(XTERM_SCROLLBAR)
309 "+" 319 "+"
310# endif 320# endif
… …
324 "no_backspace," 334 "no_backspace,"
325#endif 335#endif
326#if defined(NO_DELETE_KEY) 336#if defined(NO_DELETE_KEY)
327 "no_delete," 337 "no_delete,"
328#endif 338#endif
339#if EIGHT_BIT_CONTROLS
340 "8bitctrls,"
341#endif
329#if !defined(NO_STRINGS) 342#if !defined(NO_STRINGS)
330 "strings," 343 "strings,"
331#endif 344#endif
345#if defined(ENABLE_FRILLS)
346 "frills,"
347#endif
348#if !defined(NO_LINESPACE)
349 "linespace,"
350#endif
351#if defined(PREFER_24BIT)
352 "24bit,"
353#endif
354#if defined(SELECTION_SCROLLING)
355 "selectionscrolling,"
356#endif
357#if MOUSE_WHEEL
358 "wheel,"
359#endif
360#if MOUSE_SLIP_WHEELING
361 "slipwheel,"
362#endif
363#if defined(SMART_RESIZE)
364 "smart-resize,"
365#endif
332#if defined(TTY_256COLOR) 366#if defined(TTY_256COLOR)
333 "256colour," 367 "256colour,"
368#endif
369#if defined(CURSOR_BLINK)
370 "cursorBlink,"
371#endif
372#if defined(POINTER_BLANK)
373 "pointerBlank,"
334#endif 374#endif
335#if defined(NO_RESOURCES) 375#if defined(NO_RESOURCES)
336 "NoResources" 376 "NoResources"
337#else 377#else
338# if defined(USE_XGETDEFAULT) 378# if defined(USE_XGETDEFAULT)
… …
348/*{{{ usage: */ 388/*{{{ usage: */
349/*----------------------------------------------------------------------*/ 389/*----------------------------------------------------------------------*/
350static void 390static void
351rxvt_usage (int type) 391rxvt_usage (int type)
352{ 392{
353 unsigned int i, col; 393 unsigned int i, col;
354 394
355 write (STDERR_FILENO, releasestring, sizeof (releasestring) - 1); 395 rxvt_log ("%s%s%s", releasestring, optionsstring, RESNAME);
356 write (STDERR_FILENO, optionsstring, sizeof (optionsstring) - 1);
357 write (STDERR_FILENO, APL_NAME, sizeof (APL_NAME) - 1);
358 396
359 switch (type) 397 switch (type)
360 { 398 {
361 case 0: /* brief listing */ 399 case 0: /* brief listing */
362 fprintf (stderr, " [-help] [--help]\n"); 400 rxvt_log (" [-help] [--help]\n");
401
363 for (col = 1, i = 0; i < optList_size (); i++) 402 for (col = 1, i = 0; i < optList_size (); i++)
364 if (optList[i].desc != NULL) 403 if (optList[i].desc != NULL)
365 { 404 {
366 int len = 0; 405 int len = 0;
367 406
… …
372 len++; /* account for space */ 411 len++; /* account for space */
373 } 412 }
374#ifdef DEBUG_STRICT 413#ifdef DEBUG_STRICT
375 assert (optList[i].opt != NULL); 414 assert (optList[i].opt != NULL);
376#endif 415#endif
377 len += 4 + STRLEN (optList[i].opt) + (optList_isBool (i) ? 2: 0); 416 len += 4 + strlen (optList[i].opt) + (optList_isBool (i) ? 2: 0);
378 col += len; 417 col += len;
379 if (col > 79) 418 if (col > 79)
380 { /* assume regular width */ 419 { /* assume regular width */
381 putc ('\n', stderr); 420 rxvt_log ("\n");
382 col = 1 + len; 421 col = 1 + len;
383 } 422 }
423
384 fprintf (stderr, " [-%s%s", (optList_isBool (i) ? "/+" : ""), 424 rxvt_log (" [-%s%s", (optList_isBool (i) ? "/+" : ""), optList[i].opt);
385 optList[i].opt);
386 if (optList_strlen (i)) 425 if (optList_strlen (i))
387 fprintf (stderr, " %s]", optList[i].arg); 426 rxvt_log (" %s]", optList[i].arg);
388 else 427 else
389 fprintf (stderr, "]"); 428 rxvt_log ("]");
390 } 429 }
391 break; 430 break;
392 431
393 case 1: /* full command-line listing */ 432 case 1: /* full command-line listing */
394 fprintf (stderr, " [options] [-e command args]\n\n" 433 rxvt_log (" [options] [-e command args]\n\nwhere options include:\n");
395 "where options include:\n"); 434
396 for (i = 0; i < optList_size (); i++) 435 for (i = 0; i < optList_size (); i++)
397 if (optList[i].desc != NULL) 436 if (optList[i].desc != NULL)
398 { 437 {
399#ifdef DEBUG_STRICT 438#ifdef DEBUG_STRICT
400 assert (optList[i].opt != NULL); 439 assert (optList[i].opt != NULL);
401#endif 440#endif
402 fprintf (stderr, " %s%s %-*s%s%s\n", 441 rxvt_log (" %s%s %-*s%s%s\n",
403 (optList_isBool (i) ? "-/+" : "-"), optList[i].opt, 442 (optList_isBool (i) ? "-/+" : "-"), optList[i].opt,
404 (INDENT - STRLEN (optList[i].opt) 443 (INDENT - strlen (optList[i].opt)
405 + (optList_isBool (i) ? 0 : 2)), 444 + (optList_isBool (i) ? 0 : 2)),
406 (optList[i].arg ? optList[i].arg : ""), 445 (optList[i].arg ? optList[i].arg : ""),
407 (optList_isBool (i) ? "turn on/off " : ""), 446 (optList_isBool (i) ? "turn on/off " : ""),
408 optList[i].desc); 447 optList[i].desc);
409 } 448 }
410 fprintf (stderr, "\n --help to list long-options"); 449 rxvt_log ("\n --help to list long-options");
411 break; 450 break;
412 451
413 case 2: /* full resource listing */ 452 case 2: /* full resource listing */
414 fprintf (stderr,
415 " [options] [-e command args]\n\n" 453 rxvt_log (" [options] [-e command args]\n\n"
416 "where resources (long-options) include:\n"); 454 "where resources (long-options) include:\n");
417 455
418 for (i = 0; i < optList_size (); i++) 456 for (i = 0; i < optList_size (); i++)
419 if (optList[i].kw != NULL) 457 if (optList[i].kw != NULL)
420 fprintf (stderr, " %s: %*s%s\n", 458 rxvt_log (" %s: %*s%s\n",
421 optList[i].kw, 459 optList[i].kw,
422 (INDENT - STRLEN (optList[i].kw)), "", /* XXX */ 460 (INDENT - strlen (optList[i].kw)), "", /* XXX */
423 (optList_isBool (i) ? "boolean" : optList[i].arg)); 461 (optList_isBool (i) ? "boolean" : optList[i].arg));
424#ifdef KEYSYM_RESOURCE 462#ifdef KEYSYM_RESOURCE
425 fprintf (stderr, " " "keysym.sym" ": %*s%s\n", 463 rxvt_log (" " "keysym.sym" ": %*s%s\n",
426 (INDENT - sizeof ("keysym.sym") + 1), "", /* XXX */ 464 (INDENT - sizeof ("keysym.sym") + 1), "", /* XXX */
427 "keysym"); 465 "keysym");
428#endif 466#endif
429 fprintf (stderr, "\n -help to list options"); 467 rxvt_log ("\n -help to list options");
430 break; 468 break;
431 } 469 }
432 fprintf (stderr, "\n\n"); 470
433 exit (EXIT_FAILURE); 471 rxvt_log ("\n\n");
472 rxvt_exit_failure ();
434 /* NOTREACHED */ 473 /* NOTREACHED */
435} 474}
436 475
437/*}}} */ 476/*}}} */
438 477
… …
465 longopt = *opt++; /* long option */ 504 longopt = *opt++; /* long option */
466 } 505 }
467 else 506 else
468 { 507 {
469 bad_option = 1; 508 bad_option = 1;
470 rxvt_print_error ("bad option \"%s\"", opt); 509 rxvt_warn ("\"%s\": malformed option.\n", opt);
471 continue; 510 continue;
472 } 511 }
473 512
474 if (!STRCMP (opt, "help")) 513 if (!strcmp (opt, "help"))
475 rxvt_usage (longopt ? 2 : 1); 514 rxvt_usage (longopt ? 2 : 1);
476 if (!STRCMP (opt, "h")) 515 if (!strcmp (opt, "h"))
477 rxvt_usage (0); 516 rxvt_usage (0);
478 517
479 /* feature: always try to match long-options */ 518 /* feature: always try to match long-options */
480 for (entry = 0; entry < optList_size (); entry++) 519 for (entry = 0; entry < optList_size (); entry++)
481 if ((optList[entry].kw && !STRCMP (opt, optList[entry].kw)) 520 if ((optList[entry].kw && !strcmp (opt, optList[entry].kw))
482 || (!longopt 521 || (!longopt
483 && optList[entry].opt && !STRCMP (opt, optList[entry].opt))) 522 && optList[entry].opt && !strcmp (opt, optList[entry].opt)))
484 break; 523 break;
485 524
486 if (entry < optList_size ()) 525 if (entry < optList_size ())
487 { 526 {
488 if (optList_isReverse (entry)) 527 if (optList_isReverse (entry))
489 flag = flag == On ? Off : On; 528 flag = flag == On ? Off : On;
529
490 if (optList_strlen (entry)) 530 if (optList_strlen (entry))
491 { /* string value */
492 const char *str = argv[++i];
493
494#ifdef DEBUG_RESOURCES
495 fprintf (stderr, "string (%s,%s) = ",
496 optList[entry].opt ? optList[entry].opt : "nil",
497 optList[entry].kw ? optList[entry].kw : "nil");
498#endif
499 if (flag == On && str && (optList[entry].doff != -1))
500 { 531 {
501#ifdef DEBUG_RESOURCES
502 fprintf (stderr, "\"%s\"\n", str);
503#endif
504 rs[optList[entry].doff] = str;
505 /* 532 /*
506 * special cases are handled in main.c:main () to allow 533 * special cases are handled in main.c:main () to allow
507 * X resources to set these values before we settle for 534 * X resources to set these values before we settle for
508 * default values 535 * default values
509 */ 536 */
510 }
511#ifdef DEBUG_RESOURCES
512 else
513 fprintf (stderr, "???\n");
514#endif
515 537
538 if (optList[entry].doff != -1)
539 rs[optList[entry].doff] = flag == On && argv[i+1]
540 ? argv[++i] : 0;
516 } 541 }
517 else 542 else
518 { /* boolean value */ 543 { /* boolean value */
519#ifdef DEBUG_RESOURCES 544#ifdef DEBUG_RESOURCES
520 fprintf (stderr, "boolean (%s,%s) = %s\n", 545 fprintf (stderr, "boolean (%s,%s) = %s\n",
521 optList[entry].opt, optList[entry].kw, flag); 546 optList[entry].opt, optList[entry].kw, flag);
522#endif 547#endif
523 if (flag == On) 548 if (flag == On)
524 Options |= (optList[entry].flag); 549 options |= (optList[entry].flag);
525 else 550 else
526 Options &= ~ (optList[entry].flag); 551 options &= ~ (optList[entry].flag);
527 552
528 if (optList[entry].doff != -1) 553 if (optList[entry].doff != -1)
529 rs[optList[entry].doff] = flag; 554 rs[optList[entry].doff] = flag;
530 } 555 }
531 } 556 }
532 else 557 else
533#ifdef KEYSYM_RESOURCE 558#ifdef KEYSYM_RESOURCE
534 /* if (!STRNCMP (opt, "keysym.", sizeof ("keysym.") - 1)) */ 559 /* if (!strncmp (opt, "keysym.", sizeof ("keysym.") - 1)) */
535 if (rxvt_Str_match (opt, "keysym.")) 560 if (rxvt_Str_match (opt, "keysym."))
536 { 561 {
537 const char *str = argv[++i]; 562 const char *str = argv[++i];
538 563
539 if (str != NULL) 564 if (str != NULL)
540 parse_keysym (opt + sizeof ("keysym.") - 1, str); 565 parse_keysym (opt + sizeof ("keysym.") - 1, str);
541 } 566 }
542 else 567 else
543#endif 568#endif
569 {
544 bad_option = 1; 570 bad_option = 1;
571 rxvt_warn ("\"%s\": unknown or malformed option.\n", opt);
572 }
545 } 573 }
546 574
547 if (bad_option) 575 if (bad_option)
548 rxvt_usage (0); 576 rxvt_usage (0);
549} 577}
… …
559 * quarks will be something like 587 * quarks will be something like
560 * "rxvt" "keysym" "0xFF01" 588 * "rxvt" "keysym" "0xFF01"
561 * value will be a string 589 * value will be a string
562 */ 590 */
563/* ARGSUSED */ 591/* ARGSUSED */
564bool 592int
565rxvt_define_key(XrmDatabase *database __attribute__((unused)), XrmBindingList bindings __attribute__((unused)), XrmQuarkList quarks, XrmRepresentation *type __attribute__((unused)), XrmValue *value, XPointer closure __attribute__((unused))) 593rxvt_define_key (XrmDatabase *database __attribute__((unused)),
594 XrmBindingList bindings __attribute__((unused)),
595 XrmQuarkList quarks,
596 XrmRepresentation *type __attribute__((unused)),
597 XrmValue *value,
598 XPointer closure __attribute__((unused)))
566{ 599{
567 int last; 600 int last;
568 601
569 for (last = 0; quarks[last] != NULLQUARK; last++) /* look for last quark in list */ 602 for (last = 0; quarks[last] != NULLQUARK; last++) /* look for last quark in list */
570 ; 603 ;
… …
600 { 633 {
601 if (str[0] == '0' && toupper (str[1]) == 'X') 634 if (str[0] == '0' && toupper (str[1]) == 'X')
602 str += 2; 635 str += 2;
603 if (arg) 636 if (arg)
604 { 637 {
605 if (sscanf (str, (STRCHR (str, ':') ? "%x:" : "%x"), &sym) != 1) 638 if (sscanf (str, (strchr (str, ':') ? "%x:" : "%x"), &sym) != 1)
606 return -1; 639 return -1;
607 } 640 }
608 else 641 else
609 { 642 {
610 if (sscanf (str, "%x:", &sym) != 1) 643 if (sscanf (str, "%x:", &sym) != 1)
611 return -1; 644 return -1;
612 645
613 /* cue to ':', it's there since sscanf () worked */ 646 /* cue to ':', it's there since sscanf () worked */
614 STRNCPY (newargstr, STRCHR (str, ':') + 1, NEWARGLIM - 1); 647 strncpy (newargstr, strchr (str, ':') + 1, NEWARGLIM - 1);
615 newargstr[NEWARGLIM - 1] = '\0'; 648 newargstr[NEWARGLIM - 1] = '\0';
616 newarg = newargstr; 649 newarg = newargstr;
617 } 650 }
618 } 651 }
619 else 652 else
620 { 653 {
621 /* 654 /*
622 * convert keysym name to keysym number 655 * convert keysym name to keysym number
623 */ 656 */
624 STRNCPY (newargstr, str, NEWARGLIM - 1); 657 strncpy (newargstr, str, NEWARGLIM - 1);
625 newargstr[NEWARGLIM - 1] = '\0'; 658 newargstr[NEWARGLIM - 1] = '\0';
626 if (arg == NULL) 659 if (arg == NULL)
627 { 660 {
628 if ((newarg = STRCHR (newargstr, ':')) == NULL) 661 if ((newarg = strchr (newargstr, ':')) == NULL)
629 return -1; 662 return -1;
630 *newarg++ = '\0'; /* terminate keysym name */ 663 *newarg++ = '\0'; /* terminate keysym name */
631 } 664 }
632 if ((sym = XStringToKeysym (newargstr)) == None) 665 if ((sym = XStringToKeysym (newargstr)) == None)
633 return -1; 666 return -1;
… …
639 if (Keysym_map[sym] != NULL) /* already set ? */ 672 if (Keysym_map[sym] != NULL) /* already set ? */
640 return -1; 673 return -1;
641 674
642 if (newarg == NULL) 675 if (newarg == NULL)
643 { 676 {
644 STRNCPY (newargstr, arg, NEWARGLIM - 1); 677 strncpy (newargstr, arg, NEWARGLIM - 1);
645 newargstr[NEWARGLIM - 1] = '\0'; 678 newargstr[NEWARGLIM - 1] = '\0';
646 newarg = newargstr; 679 newarg = newargstr;
647 } 680 }
648 rxvt_Str_trim (newarg); 681 rxvt_Str_trim (newarg);
649 if (*newarg == '\0' || (n = rxvt_Str_escaped (newarg)) == 0) 682 if (*newarg == '\0' || (n = rxvt_Str_escaped (newarg)) == 0)
650 return -1; 683 return -1;
651 MIN_IT (n, 255); 684 MIN_IT (n, 255);
652 key_string = (char *)rxvt_malloc ((n + 1) * sizeof (char)); 685 key_string = (char *)rxvt_malloc ((n + 1) * sizeof (char));
653 686
654 key_string[0] = n; 687 key_string[0] = n;
655 STRNCPY (key_string + 1, newarg, n); 688 strncpy (key_string + 1, newarg, n);
656 Keysym_map[sym] = (unsigned char *)key_string; 689 Keysym_map[sym] = (unsigned char *)key_string;
657 690
658 return 1; 691 return 1;
659} 692}
660 693
… …
666 * the matching algorithm used for memory-save fake resources 699 * the matching algorithm used for memory-save fake resources
667 */ 700 */
668void 701void
669rxvt_term::get_xdefaults (FILE *stream, const char *name) 702rxvt_term::get_xdefaults (FILE *stream, const char *name)
670{ 703{
671 unsigned int len; 704 unsigned int len;
672 char *str, buffer[256]; 705 char *str, buffer[256];
673 706
674 if (stream == NULL) 707 if (stream == NULL)
675 return; 708 return;
676 len = STRLEN (name); 709
710 len = strlen (name);
677 while ((str = fgets (buffer, sizeof (buffer), stream)) != NULL) 711 while ((str = fgets (buffer, sizeof (buffer), stream)) != NULL)
678 { 712 {
679 unsigned int entry, n; 713 unsigned int entry, n;
680 714
681 while (*str && isspace (*str)) 715 while (*str && isspace (*str))
682 str++; /* leading whitespace */ 716 str++; /* leading whitespace */
683 717
684 if ((str[len] != '*' && str[len] != '.') 718 if ((str[len] != '*' && str[len] != '.')
685 || (len && STRNCMP (str, name, len))) 719 || (len && strncmp (str, name, len)))
686 continue; 720 continue;
687 str += (len + 1); /* skip `name*' or `name.' */ 721 str += (len + 1); /* skip `name*' or `name.' */
688 722
689# ifdef KEYSYM_RESOURCE 723# ifdef KEYSYM_RESOURCE
690 if (!parse_keysym (str, NULL)) 724 if (!parse_keysym (str, NULL))
691# endif /* KEYSYM_RESOURCE */ 725# endif /* KEYSYM_RESOURCE */
692 for (entry = 0; entry < optList_size (); entry++) 726 for (entry = 0; entry < optList_size (); entry++)
693 { 727 {
694 const char *kw = optList[entry].kw; 728 const char *kw = optList[entry].kw;
695 729
696 if (kw == NULL) 730 if (kw == NULL)
697 continue; 731 continue;
732
698 n = STRLEN (kw); 733 n = strlen (kw);
699 if (str[n] == ':' && rxvt_Str_match (str, kw)) 734 if (str[n] == ':' && rxvt_Str_match (str, kw))
700 { 735 {
701 /* skip `keyword:' */ 736 /* skip `keyword:' */
702 str += (n + 1); 737 str += n + 1;
703 rxvt_Str_trim (str); 738 rxvt_Str_trim (str);
704 n = STRLEN (str); 739 n = strlen (str);
705 if (n && rs[optList[entry].doff] == NULL) 740 if (n && rs[optList[entry].doff] == NULL)
706 { 741 {
707 /* not already set */ 742 /* not already set */
708 int s; 743 int s;
709 char *p = (char *)rxvt_malloc ((n + 1) * sizeof (char)); 744 char *p = 0;
710 745
711 STRCPY (p, str); 746 for (int o = 0;;)
747 {
748 p = (char *)rxvt_realloc (p, o + n + 1);
749 memcpy (p + o, str, n);
750 o += n;
751 p[o] = 0;
752
753 if (o == 0 || p[o - 1] != '\\') // continuation line
754 break;
755
756 o--; // eat "\"
757
758 if ((str = fgets (buffer, sizeof (buffer), stream)) == NULL)
759 break;
760
761 rxvt_Str_trim (str);
762 n = strlen (str);
763 }
764
712 rs[optList[entry].doff] = p; 765 rs[optList[entry].doff] = p;
766 allocated.push_back (p);
767
713 if (optList_isBool (entry)) 768 if (optList_isBool (entry))
714 { 769 {
715 s = STRCASECMP (str, "TRUE") == 0 770 s = strcasecmp (str, "TRUE") == 0
716 || STRCASECMP (str, "YES") == 0 771 || strcasecmp (str, "YES") == 0
717 || STRCASECMP (str, "ON") == 0 772 || strcasecmp (str, "ON") == 0
718 || STRCASECMP (str, "1") == 0; 773 || strcasecmp (str, "1") == 0;
774
719 if (optList_isReverse (entry)) 775 if (optList_isReverse (entry))
720 s = !s; 776 s = !s;
777
721 if (s) 778 if (s)
722 Options |= (optList[entry].flag); 779 options |= optList[entry].flag;
723 else 780 else
724 Options &= ~ (optList[entry].flag); 781 options &= ~optList[entry].flag;
725 } 782 }
726 } 783 }
784
727 break; 785 break;
728 } 786 }
729 } 787 }
730 } 788 }
789
731 rewind (stream); 790 rewind (stream);
732} 791}
733 792
734/*}}} */ 793/*}}} */
735# endif /* ! USE_XGETDEFAULT */ 794# endif /* ! USE_XGETDEFAULT */
… …
746#ifndef NO_RESOURCES 805#ifndef NO_RESOURCES
747 806
748# if defined XAPPLOADDIR 807# if defined XAPPLOADDIR
749# if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE) 808# if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
750 /* Compute the path of the possibly available localized Rxvt file */ 809 /* Compute the path of the possibly available localized Rxvt file */
751 char *localepath = NULL; 810 char *localepath = NULL;
752 811
753 if (locale != NULL) 812 if (locale != NULL)
754 { /* XXX: must limit length of string */ 813 { /* XXX: must limit length of string */
755 localepath = (char *)rxvt_malloc (256); 814 localepath = (char *)rxvt_malloc (256);
756 sprintf (localepath, XAPPLOADDIRLOCALE "/" APL_SUBCLASS, 815 sprintf (localepath, XAPPLOADDIRLOCALE "/" RESCLASS,
757 (int) (258 - sizeof (XAPPLOADDIRLOCALE) - sizeof (APL_SUBCLASS)), 816 (int) (258 - sizeof (XAPPLOADDIRLOCALE) - sizeof (RESCLASS)),
758 locale); /* 258 = 255 + 4 (-.*s) - 1 (/) */ 817 locale); /* 258 = 255 + 4 (-.*s) - 1 (/) */
759 } 818 }
760 819
761 { 820 {
762# endif 821# endif
… …
764 823
765# ifdef USE_XGETDEFAULT 824# ifdef USE_XGETDEFAULT
766 /* 825 /*
767 * get resources using the X library function 826 * get resources using the X library function
768 */ 827 */
769 int entry; 828 int entry;
770 829
771# ifdef XrmEnumOneLevel 830# ifdef XrmEnumOneLevel
772 int i; 831 int i;
773 char *displayResource, *xe; 832 char *displayResource, *xe;
774 XrmName name_prefix[3]; 833 XrmName name_prefix[3];
775 XrmClass class_prefix[3]; 834 XrmClass class_prefix[3];
776 XrmDatabase database, rdb1; 835 XrmDatabase database, rdb1;
777 char fname[1024]; 836 char fname[1024];
778 837
779 XrmInitialize (); 838 XrmInitialize ();
780 database = NULL; 839 database = NULL;
781 840
782 /* Get any Xserver defaults */ 841 /* Get any Xserver defaults */
… …
793 if ((ptr = (char *)getenv ("HOME")) == NULL) 852 if ((ptr = (char *)getenv ("HOME")) == NULL)
794 ptr = "."; 853 ptr = ".";
795 854
796 for (i = 0; i < (sizeof (xnames) / sizeof (xnames[0])); i++) 855 for (i = 0; i < (sizeof (xnames) / sizeof (xnames[0])); i++)
797 { 856 {
798 sprintf (fname, "%-.*s/%s", sizeof (fname) - STRLEN (xnames[i]) - 2, 857 sprintf (fname, "%-.*s/%s", sizeof (fname) - strlen (xnames[i]) - 2,
799 ptr, xnames[i]); 858 ptr, xnames[i]);
800 if ((rdb1 = XrmGetFileDatabase (fname)) != NULL) 859 if ((rdb1 = XrmGetFileDatabase (fname)))
801 { 860 {
802 XrmMergeDatabases (rdb1, &database); 861 XrmMergeDatabases (rdb1, &database);
803# ifndef HAVE_BOTH_XRESOURCE_FILES 862# ifndef HAVE_BOTH_XRESOURCE_FILES
804 break; 863 break;
805# endif 864# endif
… …
817 876
818 /* Add in Rxvt file */ 877 /* Add in Rxvt file */
819# if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE) 878# if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
820 if (localepath == NULL || (rdb1 = XrmGetFileDatabase (localepath)) == NULL) 879 if (localepath == NULL || (rdb1 = XrmGetFileDatabase (localepath)) == NULL)
821# endif 880# endif
822 rdb1 = XrmGetFileDatabase (XAPPLOADDIR "/" APL_SUBCLASS); 881 rdb1 = XrmGetFileDatabase (XAPPLOADDIR "/" RESCLASS);
882
823 if (rdb1 != NULL) 883 if (rdb1 != NULL)
824 XrmMergeDatabases (rdb1, &database); 884 XrmMergeDatabases (rdb1, &database);
825 885
826 /* Add in $XAPPLRESDIR/Rxvt only; not bothering with XUSERFILESEARCHPATH */ 886 /* Add in $XAPPLRESDIR/Rxvt only; not bothering with XUSERFILESEARCHPATH */
827 if ((xe = (char *)getenv ("XAPPLRESDIR")) != NULL) 887 if ((xe = (char *)getenv ("XAPPLRESDIR")) != NULL)
828 { 888 {
829 sprintf (fname, "%-.*s/" APL_SUBCLASS, sizeof (fname) 889 sprintf (fname, "%-.*s/" RESCLASS, sizeof (fname)
830 - sizeof (APL_SUBCLASS) - 2, xe); 890 - sizeof (RESCLASS) - 2, xe);
831 if ((rdb1 = XrmGetFileDatabase (fname)) != NULL) 891 if ((rdb1 = XrmGetFileDatabase (fname)) != NULL)
832 XrmMergeDatabases (rdb1, &database); 892 XrmMergeDatabases (rdb1, &database);
833 } 893 }
834 894
835 XrmSetDatabase (display, database); 895 XrmSetDatabase (display, database);
… …
847 if (kw == NULL || rs[optList[entry].doff] != NULL) 907 if (kw == NULL || rs[optList[entry].doff] != NULL)
848 continue; /* previously set */ 908 continue; /* previously set */
849 909
850 p = XGetDefault (display, name, kw); 910 p = XGetDefault (display, name, kw);
851 p0 = XGetDefault (display, "!INVALIDPROGRAMMENAMEDONTMATCH!", kw); 911 p0 = XGetDefault (display, "!INVALIDPROGRAMMENAMEDONTMATCH!", kw);
852 if (p == NULL || (p0 && STRCMP (p, p0) == 0)) 912 if (p == NULL || (p0 && strcmp (p, p0) == 0))
853 { 913 {
854 p = XGetDefault (display, APL_SUBCLASS, kw); 914 p = XGetDefault (display, RESCLASS, kw);
915#ifdef RESFALLBACK
855 if (p == NULL || (p0 && STRCMP (p, p0) == 0)) 916 if (p == NULL || (p0 && strcmp (p, p0) == 0))
856 p = XGetDefault (display, APL_CLASS, kw); 917 p = XGetDefault (display, RESFALLBACK, kw);
918#endif
857 } 919 }
920
858 if (p == NULL && p0) 921 if (p == NULL && p0)
859 p = p0; 922 p = p0;
923
860 if (p) 924 if (p)
861 { 925 {
862 rs[optList[entry].doff] = p; 926 rs[optList[entry].doff] = p;
863 927
864 if (optList_isBool (entry)) 928 if (optList_isBool (entry))
865 { 929 {
866 s = STRCASECMP (p, "TRUE") == 0 930 s = strcasecmp (p, "TRUE") == 0
867 || STRCASECMP (p, "YES") == 0 931 || strcasecmp (p, "YES") == 0
868 || STRCASECMP (p, "ON") == 0 932 || strcasecmp (p, "ON") == 0
869 || STRCASECMP (p, "1") == 0; 933 || strcasecmp (p, "1") == 0;
870 if (optList_isReverse (entry)) 934 if (optList_isReverse (entry))
871 s = !s; 935 s = !s;
872 if (s) 936 if (s)
873 Options |= (optList[entry].flag); 937 options |= (optList[entry].flag);
874 else 938 else
875 Options &= ~ (optList[entry].flag); 939 options &= ~ (optList[entry].flag);
876 } 940 }
877 } 941 }
878 } 942 }
879 943
880 /* 944 /*
… …
883# ifdef XrmEnumOneLevel 947# ifdef XrmEnumOneLevel
884# ifdef KEYSYM_RESOURCE 948# ifdef KEYSYM_RESOURCE
885 name_prefix[0] = XrmStringToName (name); 949 name_prefix[0] = XrmStringToName (name);
886 name_prefix[1] = XrmStringToName ("keysym"); 950 name_prefix[1] = XrmStringToName ("keysym");
887 name_prefix[2] = NULLQUARK; 951 name_prefix[2] = NULLQUARK;
888 class_prefix[0] = XrmStringToName (APL_SUBCLASS); 952 class_prefix[0] = XrmStringToName (RESCLASS);
889 class_prefix[1] = XrmStringToName ("Keysym"); 953 class_prefix[1] = XrmStringToName ("Keysym");
890 class_prefix[2] = NULLQUARK; 954 class_prefix[2] = NULLQUARK;
891 /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */ 955 /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */
892 XrmEnumerateDatabase (XrmGetDatabase (display), name_prefix, class_prefix, 956 XrmEnumerateDatabase (XrmGetDatabase (display), name_prefix, class_prefix,
893 XrmEnumOneLevel, rxvt_define_key, NULL); 957 XrmEnumOneLevel, rxvt_define_key, NULL);
958# ifdef RESFALLBACK
894 name_prefix[0] = XrmStringToName (APL_CLASS); 959 name_prefix[0] = XrmStringToName (RESFALLBACK);
895 name_prefix[1] = XrmStringToName ("keysym"); 960 name_prefix[1] = XrmStringToName ("keysym");
896 class_prefix[0] = XrmStringToName (APL_CLASS); 961 class_prefix[0] = XrmStringToName (RESFALLBACK);
897 class_prefix[1] = XrmStringToName ("Keysym"); 962 class_prefix[1] = XrmStringToName ("Keysym");
898 /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */ 963 /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */
899 XrmEnumerateDatabase (XrmGetDatabase (display), name_prefix, class_prefix, 964 XrmEnumerateDatabase (XrmGetDatabase (display), name_prefix, class_prefix,
900 XrmEnumOneLevel, rxvt_define_key, NULL); 965 XrmEnumOneLevel, rxvt_define_key, NULL);
966# endif
901# endif 967# endif
902# endif 968# endif
903 969
904# else /* USE_XGETDEFAULT */ 970# else /* USE_XGETDEFAULT */
905 /* get resources the hard way, but save lots of memory */ 971 /* get resources the hard way, but save lots of memory */
906 FILE *fd = NULL; 972 FILE *fd = NULL;
907 char *home; 973 char *home;
908 974
909 if ((home = getenv ("HOME")) != NULL) 975 if ((home = getenv ("HOME")) != NULL)
910 { 976 {
911 unsigned int i, len = STRLEN (home) + 2; 977 unsigned int i, len = strlen (home) + 2;
912 char *f = NULL; 978 char *f = NULL;
913 979
914 for (i = 0; i < (sizeof (xnames) / sizeof (xnames[0])); i++) 980 for (i = 0; i < (sizeof (xnames) / sizeof (xnames[0])); i++)
915 { 981 {
916 f = (char *)rxvt_realloc (f, (len + STRLEN (xnames[i])) * sizeof (char)); 982 f = (char *)rxvt_realloc (f, (len + strlen (xnames[i])) * sizeof (char));
917 983
918 sprintf (f, "%s/%s", home, xnames[i]); 984 sprintf (f, "%s/%s", home, xnames[i]);
919 985
920 if ((fd = fopen (f, "r")) != NULL) 986 if ((fd = fopen (f, "r")) != NULL)
921 break; 987 break;
… …
943 * Also, use a special sub-class so that we can use either or both of 1009 * Also, use a special sub-class so that we can use either or both of
944 * "XTerm" and "Rxvt" as class names. 1010 * "XTerm" and "Rxvt" as class names.
945 */ 1011 */
946 1012
947 get_xdefaults (fd, name); 1013 get_xdefaults (fd, name);
948 get_xdefaults (fd, APL_SUBCLASS); 1014 get_xdefaults (fd, RESCLASS);
1015# ifdef RESFALLBACK
1016 get_xdefaults (fd, RESFALLBACK);
1017# endif
949 1018
950# if defined(XAPPLOADDIR) && defined(USE_XAPPLOADDIR) 1019# if defined(XAPPLOADDIR) && defined(USE_XAPPLOADDIR)
951
952 { 1020 {
953 FILE *ad = NULL; 1021 FILE *ad = NULL;
954 1022
955# if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE) 1023# if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
956 if (localepath == NULL || (ad = fopen (localepath, "r")) == NULL) 1024 if (localepath == NULL || (ad = fopen (localepath, "r")) == NULL)
957# endif 1025# endif
958 ad = fopen (XAPPLOADDIR "/" APL_SUBCLASS, "r"); 1026 ad = fopen (XAPPLOADDIR "/" RESCLASS, "r");
959 if (ad != NULL) 1027 if (ad != NULL)
960 { 1028 {
961 get_xdefaults (ad, APL_SUBCLASS); 1029 get_xdefaults (ad, RESCLASS);
962 get_xdefaults (ad, ""); 1030 get_xdefaults (ad, "");
963 fclose (ad); 1031 fclose (ad);
964 } 1032 }
965 } 1033 }
966# endif /* XAPPLOADDIR */ 1034# endif /* XAPPLOADDIR */
967 1035
968 get_xdefaults (fd, APL_CLASS);
969 get_xdefaults (fd, ""); /* partial match */ 1036 get_xdefaults (fd, ""); /* partial match */
970 if (fd != NULL) 1037 if (fd != NULL)
971 fclose (fd); 1038 fclose (fd);
972# endif /* USE_XGETDEFAULT */ 1039# endif /* USE_XGETDEFAULT */
973 1040
… …
980 free (localepath); 1047 free (localepath);
981# endif 1048# endif
982# endif 1049# endif
983 1050
984#endif /* NO_RESOURCES */ 1051#endif /* NO_RESOURCES */
985
986 /*
987 * even without resources, at least do this setup for command-line
988 * options and command-line long options
989 */
990
991#if defined (HOTKEY_CTRL) || defined (HOTKEY_META)
992 KeySym sym;
993
994 if (rs[Rs_bigfont_key]
995 && ((sym = XStringToKeysym (rs[Rs_bigfont_key])) != 0))
996 ks_bigfont = sym;
997 if (rs[Rs_smallfont_key]
998 && ((sym = XStringToKeysym (rs[Rs_smallfont_key])) != 0))
999 ks_smallfont = sym;
1000#endif
1001} 1052}
1002 1053
1003/*}}} */ 1054/*}}} */
1004/*----------------------- end-of-file (C source) -----------------------*/ 1055/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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