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.15 by pcg, Wed Mar 3 04:07:52 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.15 2004/03/03 04:07:52 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#ifndef NO_FRILLS 132#if ENABLE_FRILLS
137 BOOL (Rs_tripleclickwords, "tripleclickwords", "tcw", Opt_tripleclickwords, 133 BOOL (Rs_tripleclickwords, "tripleclickwords", "tcw", Opt_tripleclickwords, "triple click word selection"),
138 "triple click word selection"), 134 BOOL (Rs_insecure, "insecure", "insecure", Opt_insecure, "enable possibly insecure escape sequences"),
139#endif 135#endif
140#ifdef CURSOR_BLINK 136#ifdef CURSOR_BLINK
141 BOOL (Rs_cursorBlink, "cursorBlink", "bc", Opt_cursorBlink, "blinking cursor"), 137 BOOL (Rs_cursorBlink, "cursorBlink", "bc", Opt_cursorBlink, "blinking cursor"),
142#endif 138#endif
143#ifdef POINTER_BLANK 139#ifdef POINTER_BLANK
… …
162 RSTRG (Rs_color + minBrightCOLOR + 5, "color13", "color"), 158 RSTRG (Rs_color + minBrightCOLOR + 5, "color13", "color"),
163 RSTRG (Rs_color + minBrightCOLOR + 6, "color14", "color"), 159 RSTRG (Rs_color + minBrightCOLOR + 6, "color14", "color"),
164 RSTRG (Rs_color + minBrightCOLOR + 7, "color15", "color"), 160 RSTRG (Rs_color + minBrightCOLOR + 7, "color15", "color"),
165#endif /* NO_BRIGHTCOLOR */ 161#endif /* NO_BRIGHTCOLOR */
166#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"),
167 RSTRG (Rs_color + Color_BD, "colorBD", "color"), 164 RSTRG (Rs_color + Color_BD, "colorBD", "color"),
168 RSTRG (Rs_color + Color_UL, "colorUL", "color"), 165 RSTRG (Rs_color + Color_UL, "colorUL", "color"),
169 RSTRG (Rs_color + Color_RV, "colorRV", "color"), 166 RSTRG (Rs_color + Color_RV, "colorRV", "color"),
170#endif /* ! NO_BOLD_UNDERLINE_REVERSE */ 167#endif /* ! NO_BOLD_UNDERLINE_REVERSE */
171#ifdef KEEP_SCROLLCOLOR 168#ifdef KEEP_SCROLLCOLOR
… …
177#endif 174#endif
178#if defined (XPM_BACKGROUND) || (MENUBAR_MAX) 175#if defined (XPM_BACKGROUND) || (MENUBAR_MAX)
179 RSTRG (Rs_path, "path", "search path"), 176 RSTRG (Rs_path, "path", "search path"),
180#endif /* defined (XPM_BACKGROUND) || (MENUBAR_MAX) */ 177#endif /* defined (XPM_BACKGROUND) || (MENUBAR_MAX) */
181#ifdef XPM_BACKGROUND 178#ifdef XPM_BACKGROUND
182 STRG (Rs_backgroundPixmap, "backgroundPixmap", "pixmap", "file[;geom]", 179 STRG (Rs_backgroundPixmap, "backgroundPixmap", "pixmap", "file[;geom]", "background pixmap"),
183 "background pixmap"),
184#endif /* XPM_BACKGROUND */ 180#endif /* XPM_BACKGROUND */
185#if (MENUBAR_MAX) 181#if (MENUBAR_MAX)
186 RSTRG (Rs_menu, "menu", "name[;tag]"), 182 RSTRG (Rs_menu, "menu", "name[;tag]"),
187#endif 183#endif
188 STRG (Rs_font, "font", "fn", "fontname", "normal text font"), 184 STRG (Rs_font, "font", "fn", "fontname", "normal text font"),
189 /* fonts: command-line option = resource name */ 185 /* fonts: command-line option = resource name */
190#ifdef USE_XIM 186#ifdef USE_XIM
191 STRG (Rs_inputMethod, "inputMethod", "im", "name", "name of input method"), 187 STRG (Rs_inputMethod, "inputMethod", "im", "name", "name of input method"),
192 STRG (Rs_preeditType, "preeditType", "pt", "style", 188 STRG (Rs_preeditType, "preeditType", "pt", "style", "input style: style = OverTheSpot|OffTheSpot|Root"),
193 "input style: style = OverTheSpot|OffTheSpot|Root"),
194#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE) 189#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
195 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"),
196#endif 191#endif
197#endif /* USE_XIM */ 192#endif /* USE_XIM */
198 STRG (Rs_name, NULL, "name", "string", 193 STRG (Rs_name, NULL, "name", "string", "client instance, icon, and title strings"),
199 "client instance, icon, and title strings"),
200 STRG (Rs_title, "title", "title", "string", "title name for window"), 194 STRG (Rs_title, "title", "title", "string", "title name for window"),
201 STRG (Rs_title, NULL, "T", NULL, NULL), /* short form */ 195 STRG (Rs_title, NULL, "T", NULL, NULL), /* short form */
202 STRG (Rs_iconName, "iconName", "n", "string", "icon name for window"), 196 STRG (Rs_iconName, "iconName", "n", "string", "icon name for window"),
203#ifndef NO_CURSORCOLOR 197#ifndef NO_CURSORCOLOR
204 STRG (Rs_color + Color_cursor, "cursorColor", "cr", "color", "cursor color"), 198 STRG (Rs_color + Color_cursor, "cursorColor", "cr", "color", "cursor color"),
205 /* command-line option = resource name */ 199 /* command-line option = resource name */
206 RSTRG (Rs_color + Color_cursor2, "cursorColor2", "color"), 200 RSTRG (Rs_color + Color_cursor2, "cursorColor2", "color"),
207#endif /* NO_CURSORCOLOR */ 201#endif /* NO_CURSORCOLOR */
208 STRG (Rs_color + Color_pointer, "pointerColor", "pr", "color", 202 STRG (Rs_color + Color_pointer_fg, "pointerColor", "pr", "color", "pointer color"),
209 "pointer color"), 203 STRG (Rs_color + Color_pointer_bg, "pointerColor2", "pr2", "color", "pointer bg color"),
210 STRG (Rs_color + Color_border, "borderColor", "bd", "color", 204 STRG (Rs_color + Color_border, "borderColor", "bd", "color", "border color"),
211 "border color"),
212 STRG (Rs_saveLines, "saveLines", "sl", "number", 205 STRG (Rs_saveLines, "saveLines", "sl", "number", "number of scrolled lines to save"),
213 "number of scrolled lines to save"), 206#if ENABLE_FRILLS
214#ifndef NO_FRILLS
215 STRG (Rs_ext_bwidth, "externalBorder", "w", "number", 207 STRG (Rs_ext_bwidth, "externalBorder", "w", "number", "external border in pixels"),
216 "external border in pixels"),
217 STRG (Rs_ext_bwidth, NULL, "bw", NULL, NULL), 208 STRG (Rs_ext_bwidth, NULL, "bw", NULL, NULL),
218 STRG (Rs_ext_bwidth, NULL, "borderwidth", NULL, NULL), 209 STRG (Rs_ext_bwidth, NULL, "borderwidth", NULL, NULL),
219 STRG (Rs_int_bwidth, "internalBorder", "b", "number", 210 STRG (Rs_int_bwidth, "internalBorder", "b", "number", "internal border in pixels"),
220 "internal border in pixels"), 211 BOOL (Rs_borderLess, "borderLess", "bl", Opt_borderLess, "borderless window"),
221#endif 212#endif
222#ifndef NO_LINESPACE 213#ifndef NO_LINESPACE
223 STRG (Rs_lineSpace, "lineSpace", "lsp", "number", 214 STRG (Rs_lineSpace, "lineSpace", "lsp", "number", "number of extra pixels between rows"),
224 "number of extra pixels between rows"),
225#endif 215#endif
226 STRG (Rs_scrollBar_thickness, "thickness", "sbt", "number", 216 STRG (Rs_scrollBar_thickness, "thickness", "sbt", "number", "scrollbar thickness/width in pixels"),
227 "scrollbar thickness/width in pixels"),
228#ifdef POINTER_BLANK 217#ifdef POINTER_BLANK
229 RSTRG (Rs_pointerBlankDelay, "pointerBlankDelay", "number"), 218 RSTRG (Rs_pointerBlankDelay, "pointerBlankDelay", "number"),
230#endif 219#endif
231#ifndef NO_BACKSPACE_KEY 220#ifndef NO_BACKSPACE_KEY
232 RSTRG (Rs_backspace_key, "backspacekey", "string"), 221 RSTRG (Rs_backspace_key, "backspacekey", "string"),
… …
240 RSTRG (Rs_scrollBar_align, "scrollBar_align", "mode"), 229 RSTRG (Rs_scrollBar_align, "scrollBar_align", "mode"),
241#endif 230#endif
242#ifdef PRINTPIPE 231#ifdef PRINTPIPE
243 RSTRG (Rs_print_pipe, "print-pipe", "string"), 232 RSTRG (Rs_print_pipe, "print-pipe", "string"),
244#endif 233#endif
245#if defined (HOTKEY_CTRL) || defined (HOTKEY_META) 234 STRG (Rs_modifier, "modifier", "mod", "modifier", "meta modifier = alt|meta|hyper|super|mod1|...|mod5"),
246 RSTRG (Rs_bigfont_key, "bigfont_key", "keysym"),
247 RSTRG (Rs_smallfont_key, "smallfont_key", "keysym"),
248#endif
249 STRG (Rs_modifier, "modifier", "mod", "modifier",
250 "meta modifier = alt|meta|hyper|super|mod1|...|mod5"),
251 INFO ("xrm", "string", "X resource"), 235 INFO ("xrm", "string", "X resource"),
252#ifdef CUTCHAR_RESOURCE 236#ifdef CUTCHAR_RESOURCE
253 RSTRG (Rs_cutchars, "cutchars", "string"), 237 RSTRG (Rs_cutchars, "cutchars", "string"),
254#endif /* CUTCHAR_RESOURCE */ 238#endif /* CUTCHAR_RESOURCE */
255#ifdef ACS_ASCII
256 RSTRG (Rs_acs_chars, "acsChars", "string"),
257#endif /* ACS_ASCII */
258 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
259 INFO ("e", "command arg ...", "command to execute") 244 INFO ("e", "command arg ...", "command to execute")
260 }; 245 };
261 246
262#undef INFO 247#undef INFO
263#undef STRG 248#undef STRG
… …
265#undef SWCH 250#undef SWCH
266#undef BOOL 251#undef BOOL
267/*}}} */ 252/*}}} */
268 253
269static const char releasestring[] = "Rxvt v" VERSION " - released: " DATE "\n"; 254static const char releasestring[] = "Rxvt v" VERSION " - released: " DATE "\n";
270static 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
271#if defined(XPM_BACKGROUND) 288#if defined(XPM_BACKGROUND)
272 "XPM," 289 "XPM,"
273#endif 290#endif
274#if defined(TRANSPARENT) 291#if defined(TRANSPARENT)
275 "transparent," 292 "transparent,"
276#endif 293#endif
294#if TINTING
295 "tint,"
296#endif
277#if defined(UTMP_SUPPORT) 297#if defined(UTMP_SUPPORT)
278 "utmp," 298 "utmp,"
279#endif 299#endif
280#if defined(MENUBAR) 300#if defined(MENUBAR)
281 "menubar," 301 "menubar,"
282#endif
283#if !defined(NO_FRILLS)
284 "frills,"
285#endif
286#if !defined(NO_LINESPACE)
287 "linespace,"
288#endif
289#if defined(PREFER_24BIT)
290 "24bit,"
291#endif 302#endif
292#if defined(USE_XIM) 303#if defined(USE_XIM)
293 "XIM," 304 "XIM,"
294#endif 305#endif
295 "scrollbars=" 306 "scrollbars="
… …
323 "no_backspace," 334 "no_backspace,"
324#endif 335#endif
325#if defined(NO_DELETE_KEY) 336#if defined(NO_DELETE_KEY)
326 "no_delete," 337 "no_delete,"
327#endif 338#endif
339#if EIGHT_BIT_CONTROLS
340 "8bitctrls,"
341#endif
328#if !defined(NO_STRINGS) 342#if !defined(NO_STRINGS)
329 "strings," 343 "strings,"
330#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
331#if defined(TTY_256COLOR) 366#if defined(TTY_256COLOR)
332 "256colour," 367 "256colour,"
368#endif
369#if defined(CURSOR_BLINK)
370 "cursorBlink,"
371#endif
372#if defined(POINTER_BLANK)
373 "pointerBlank,"
333#endif 374#endif
334#if defined(NO_RESOURCES) 375#if defined(NO_RESOURCES)
335 "NoResources" 376 "NoResources"
336#else 377#else
337# if defined(USE_XGETDEFAULT) 378# if defined(USE_XGETDEFAULT)
… …
347/*{{{ usage: */ 388/*{{{ usage: */
348/*----------------------------------------------------------------------*/ 389/*----------------------------------------------------------------------*/
349static void 390static void
350rxvt_usage (int type) 391rxvt_usage (int type)
351{ 392{
352 unsigned int i, col; 393 unsigned int i, col;
353 394
354 write (STDERR_FILENO, releasestring, sizeof (releasestring) - 1); 395 rxvt_log ("%s%s%s", releasestring, optionsstring, RESNAME);
355 write (STDERR_FILENO, optionsstring, sizeof (optionsstring) - 1);
356 write (STDERR_FILENO, RESNAME, sizeof (RESNAME) - 1);
357 396
358 switch (type) 397 switch (type)
359 { 398 {
360 case 0: /* brief listing */ 399 case 0: /* brief listing */
361 fprintf (stderr, " [-help] [--help]\n"); 400 rxvt_log (" [-help] [--help]\n");
401
362 for (col = 1, i = 0; i < optList_size (); i++) 402 for (col = 1, i = 0; i < optList_size (); i++)
363 if (optList[i].desc != NULL) 403 if (optList[i].desc != NULL)
364 { 404 {
365 int len = 0; 405 int len = 0;
366 406
… …
371 len++; /* account for space */ 411 len++; /* account for space */
372 } 412 }
373#ifdef DEBUG_STRICT 413#ifdef DEBUG_STRICT
374 assert (optList[i].opt != NULL); 414 assert (optList[i].opt != NULL);
375#endif 415#endif
376 len += 4 + STRLEN (optList[i].opt) + (optList_isBool (i) ? 2: 0); 416 len += 4 + strlen (optList[i].opt) + (optList_isBool (i) ? 2: 0);
377 col += len; 417 col += len;
378 if (col > 79) 418 if (col > 79)
379 { /* assume regular width */ 419 { /* assume regular width */
380 putc ('\n', stderr); 420 rxvt_log ("\n");
381 col = 1 + len; 421 col = 1 + len;
382 } 422 }
423
383 fprintf (stderr, " [-%s%s", (optList_isBool (i) ? "/+" : ""), 424 rxvt_log (" [-%s%s", (optList_isBool (i) ? "/+" : ""), optList[i].opt);
384 optList[i].opt);
385 if (optList_strlen (i)) 425 if (optList_strlen (i))
386 fprintf (stderr, " %s]", optList[i].arg); 426 rxvt_log (" %s]", optList[i].arg);
387 else 427 else
388 fprintf (stderr, "]"); 428 rxvt_log ("]");
389 } 429 }
390 break; 430 break;
391 431
392 case 1: /* full command-line listing */ 432 case 1: /* full command-line listing */
393 fprintf (stderr, " [options] [-e command args]\n\n" 433 rxvt_log (" [options] [-e command args]\n\nwhere options include:\n");
394 "where options include:\n"); 434
395 for (i = 0; i < optList_size (); i++) 435 for (i = 0; i < optList_size (); i++)
396 if (optList[i].desc != NULL) 436 if (optList[i].desc != NULL)
397 { 437 {
398#ifdef DEBUG_STRICT 438#ifdef DEBUG_STRICT
399 assert (optList[i].opt != NULL); 439 assert (optList[i].opt != NULL);
400#endif 440#endif
401 fprintf (stderr, " %s%s %-*s%s%s\n", 441 rxvt_log (" %s%s %-*s%s%s\n",
402 (optList_isBool (i) ? "-/+" : "-"), optList[i].opt, 442 (optList_isBool (i) ? "-/+" : "-"), optList[i].opt,
403 (INDENT - STRLEN (optList[i].opt) 443 (INDENT - strlen (optList[i].opt)
404 + (optList_isBool (i) ? 0 : 2)), 444 + (optList_isBool (i) ? 0 : 2)),
405 (optList[i].arg ? optList[i].arg : ""), 445 (optList[i].arg ? optList[i].arg : ""),
406 (optList_isBool (i) ? "turn on/off " : ""), 446 (optList_isBool (i) ? "turn on/off " : ""),
407 optList[i].desc); 447 optList[i].desc);
408 } 448 }
409 fprintf (stderr, "\n --help to list long-options"); 449 rxvt_log ("\n --help to list long-options");
410 break; 450 break;
411 451
412 case 2: /* full resource listing */ 452 case 2: /* full resource listing */
413 fprintf (stderr,
414 " [options] [-e command args]\n\n" 453 rxvt_log (" [options] [-e command args]\n\n"
415 "where resources (long-options) include:\n"); 454 "where resources (long-options) include:\n");
416 455
417 for (i = 0; i < optList_size (); i++) 456 for (i = 0; i < optList_size (); i++)
418 if (optList[i].kw != NULL) 457 if (optList[i].kw != NULL)
419 fprintf (stderr, " %s: %*s%s\n", 458 rxvt_log (" %s: %*s%s\n",
420 optList[i].kw, 459 optList[i].kw,
421 (INDENT - STRLEN (optList[i].kw)), "", /* XXX */ 460 (INDENT - strlen (optList[i].kw)), "", /* XXX */
422 (optList_isBool (i) ? "boolean" : optList[i].arg)); 461 (optList_isBool (i) ? "boolean" : optList[i].arg));
423#ifdef KEYSYM_RESOURCE 462#ifdef KEYSYM_RESOURCE
424 fprintf (stderr, " " "keysym.sym" ": %*s%s\n", 463 rxvt_log (" " "keysym.sym" ": %*s%s\n",
425 (INDENT - sizeof ("keysym.sym") + 1), "", /* XXX */ 464 (INDENT - sizeof ("keysym.sym") + 1), "", /* XXX */
426 "keysym"); 465 "keysym");
427#endif 466#endif
428 fprintf (stderr, "\n -help to list options"); 467 rxvt_log ("\n -help to list options");
429 break; 468 break;
430 } 469 }
431 fprintf (stderr, "\n\n"); 470
432 exit (EXIT_FAILURE); 471 rxvt_log ("\n\n");
472 rxvt_exit_failure ();
433 /* NOTREACHED */ 473 /* NOTREACHED */
434} 474}
435 475
436/*}}} */ 476/*}}} */
437 477
… …
464 longopt = *opt++; /* long option */ 504 longopt = *opt++; /* long option */
465 } 505 }
466 else 506 else
467 { 507 {
468 bad_option = 1; 508 bad_option = 1;
469 rxvt_print_error ("bad option \"%s\"", opt); 509 rxvt_warn ("\"%s\": malformed option.\n", opt);
470 continue; 510 continue;
471 } 511 }
472 512
473 if (!STRCMP (opt, "help")) 513 if (!strcmp (opt, "help"))
474 rxvt_usage (longopt ? 2 : 1); 514 rxvt_usage (longopt ? 2 : 1);
475 if (!STRCMP (opt, "h")) 515 if (!strcmp (opt, "h"))
476 rxvt_usage (0); 516 rxvt_usage (0);
477 517
478 /* feature: always try to match long-options */ 518 /* feature: always try to match long-options */
479 for (entry = 0; entry < optList_size (); entry++) 519 for (entry = 0; entry < optList_size (); entry++)
480 if ((optList[entry].kw && !STRCMP (opt, optList[entry].kw)) 520 if ((optList[entry].kw && !strcmp (opt, optList[entry].kw))
481 || (!longopt 521 || (!longopt
482 && optList[entry].opt && !STRCMP (opt, optList[entry].opt))) 522 && optList[entry].opt && !strcmp (opt, optList[entry].opt)))
483 break; 523 break;
484 524
485 if (entry < optList_size ()) 525 if (entry < optList_size ())
486 { 526 {
487 if (optList_isReverse (entry)) 527 if (optList_isReverse (entry))
488 flag = flag == On ? Off : On; 528 flag = flag == On ? Off : On;
529
489 if (optList_strlen (entry)) 530 if (optList_strlen (entry))
490 { /* string value */
491 const char *str = argv[++i];
492
493#ifdef DEBUG_RESOURCES
494 fprintf (stderr, "string (%s,%s) = ",
495 optList[entry].opt ? optList[entry].opt : "nil",
496 optList[entry].kw ? optList[entry].kw : "nil");
497#endif
498 if (flag == On && str && (optList[entry].doff != -1))
499 { 531 {
500#ifdef DEBUG_RESOURCES
501 fprintf (stderr, "\"%s\"\n", str);
502#endif
503 rs[optList[entry].doff] = str;
504 /* 532 /*
505 * special cases are handled in main.c:main () to allow 533 * special cases are handled in main.c:main () to allow
506 * X resources to set these values before we settle for 534 * X resources to set these values before we settle for
507 * default values 535 * default values
508 */ 536 */
509 }
510#ifdef DEBUG_RESOURCES
511 else
512 fprintf (stderr, "???\n");
513#endif
514 537
538 if (optList[entry].doff != -1)
539 rs[optList[entry].doff] = flag == On && argv[i+1]
540 ? argv[++i] : 0;
515 } 541 }
516 else 542 else
517 { /* boolean value */ 543 { /* boolean value */
518#ifdef DEBUG_RESOURCES 544#ifdef DEBUG_RESOURCES
519 fprintf (stderr, "boolean (%s,%s) = %s\n", 545 fprintf (stderr, "boolean (%s,%s) = %s\n",
520 optList[entry].opt, optList[entry].kw, flag); 546 optList[entry].opt, optList[entry].kw, flag);
521#endif 547#endif
522 if (flag == On) 548 if (flag == On)
523 Options |= (optList[entry].flag); 549 options |= (optList[entry].flag);
524 else 550 else
525 Options &= ~ (optList[entry].flag); 551 options &= ~ (optList[entry].flag);
526 552
527 if (optList[entry].doff != -1) 553 if (optList[entry].doff != -1)
528 rs[optList[entry].doff] = flag; 554 rs[optList[entry].doff] = flag;
529 } 555 }
530 } 556 }
531 else 557 else
532#ifdef KEYSYM_RESOURCE 558#ifdef KEYSYM_RESOURCE
533 /* if (!STRNCMP (opt, "keysym.", sizeof ("keysym.") - 1)) */ 559 /* if (!strncmp (opt, "keysym.", sizeof ("keysym.") - 1)) */
534 if (rxvt_Str_match (opt, "keysym.")) 560 if (rxvt_Str_match (opt, "keysym."))
535 { 561 {
536 const char *str = argv[++i]; 562 const char *str = argv[++i];
537 563
538 if (str != NULL) 564 if (str != NULL)
539 parse_keysym (opt + sizeof ("keysym.") - 1, str); 565 parse_keysym (opt + sizeof ("keysym.") - 1, str);
540 } 566 }
541 else 567 else
542#endif 568#endif
569 {
543 bad_option = 1; 570 bad_option = 1;
571 rxvt_warn ("\"%s\": unknown or malformed option.\n", opt);
572 }
544 } 573 }
545 574
546 if (bad_option) 575 if (bad_option)
547 rxvt_usage (0); 576 rxvt_usage (0);
548} 577}
… …
604 { 633 {
605 if (str[0] == '0' && toupper (str[1]) == 'X') 634 if (str[0] == '0' && toupper (str[1]) == 'X')
606 str += 2; 635 str += 2;
607 if (arg) 636 if (arg)
608 { 637 {
609 if (sscanf (str, (STRCHR (str, ':') ? "%x:" : "%x"), &sym) != 1) 638 if (sscanf (str, (strchr (str, ':') ? "%x:" : "%x"), &sym) != 1)
610 return -1; 639 return -1;
611 } 640 }
612 else 641 else
613 { 642 {
614 if (sscanf (str, "%x:", &sym) != 1) 643 if (sscanf (str, "%x:", &sym) != 1)
615 return -1; 644 return -1;
616 645
617 /* cue to ':', it's there since sscanf () worked */ 646 /* cue to ':', it's there since sscanf () worked */
618 STRNCPY (newargstr, STRCHR (str, ':') + 1, NEWARGLIM - 1); 647 strncpy (newargstr, strchr (str, ':') + 1, NEWARGLIM - 1);
619 newargstr[NEWARGLIM - 1] = '\0'; 648 newargstr[NEWARGLIM - 1] = '\0';
620 newarg = newargstr; 649 newarg = newargstr;
621 } 650 }
622 } 651 }
623 else 652 else
624 { 653 {
625 /* 654 /*
626 * convert keysym name to keysym number 655 * convert keysym name to keysym number
627 */ 656 */
628 STRNCPY (newargstr, str, NEWARGLIM - 1); 657 strncpy (newargstr, str, NEWARGLIM - 1);
629 newargstr[NEWARGLIM - 1] = '\0'; 658 newargstr[NEWARGLIM - 1] = '\0';
630 if (arg == NULL) 659 if (arg == NULL)
631 { 660 {
632 if ((newarg = STRCHR (newargstr, ':')) == NULL) 661 if ((newarg = strchr (newargstr, ':')) == NULL)
633 return -1; 662 return -1;
634 *newarg++ = '\0'; /* terminate keysym name */ 663 *newarg++ = '\0'; /* terminate keysym name */
635 } 664 }
636 if ((sym = XStringToKeysym (newargstr)) == None) 665 if ((sym = XStringToKeysym (newargstr)) == None)
637 return -1; 666 return -1;
… …
643 if (Keysym_map[sym] != NULL) /* already set ? */ 672 if (Keysym_map[sym] != NULL) /* already set ? */
644 return -1; 673 return -1;
645 674
646 if (newarg == NULL) 675 if (newarg == NULL)
647 { 676 {
648 STRNCPY (newargstr, arg, NEWARGLIM - 1); 677 strncpy (newargstr, arg, NEWARGLIM - 1);
649 newargstr[NEWARGLIM - 1] = '\0'; 678 newargstr[NEWARGLIM - 1] = '\0';
650 newarg = newargstr; 679 newarg = newargstr;
651 } 680 }
652 rxvt_Str_trim (newarg); 681 rxvt_Str_trim (newarg);
653 if (*newarg == '\0' || (n = rxvt_Str_escaped (newarg)) == 0) 682 if (*newarg == '\0' || (n = rxvt_Str_escaped (newarg)) == 0)
654 return -1; 683 return -1;
655 MIN_IT (n, 255); 684 MIN_IT (n, 255);
656 key_string = (char *)rxvt_malloc ((n + 1) * sizeof (char)); 685 key_string = (char *)rxvt_malloc ((n + 1) * sizeof (char));
657 686
658 key_string[0] = n; 687 key_string[0] = n;
659 STRNCPY (key_string + 1, newarg, n); 688 strncpy (key_string + 1, newarg, n);
660 Keysym_map[sym] = (unsigned char *)key_string; 689 Keysym_map[sym] = (unsigned char *)key_string;
661 690
662 return 1; 691 return 1;
663} 692}
664 693
… …
670 * the matching algorithm used for memory-save fake resources 699 * the matching algorithm used for memory-save fake resources
671 */ 700 */
672void 701void
673rxvt_term::get_xdefaults (FILE *stream, const char *name) 702rxvt_term::get_xdefaults (FILE *stream, const char *name)
674{ 703{
675 unsigned int len; 704 unsigned int len;
676 char *str, buffer[256]; 705 char *str, buffer[256];
677 706
678 if (stream == NULL) 707 if (stream == NULL)
679 return; 708 return;
680 len = STRLEN (name); 709
710 len = strlen (name);
681 while ((str = fgets (buffer, sizeof (buffer), stream)) != NULL) 711 while ((str = fgets (buffer, sizeof (buffer), stream)) != NULL)
682 { 712 {
683 unsigned int entry, n; 713 unsigned int entry, n;
684 714
685 while (*str && isspace (*str)) 715 while (*str && isspace (*str))
686 str++; /* leading whitespace */ 716 str++; /* leading whitespace */
687 717
688 if ((str[len] != '*' && str[len] != '.') 718 if ((str[len] != '*' && str[len] != '.')
689 || (len && STRNCMP (str, name, len))) 719 || (len && strncmp (str, name, len)))
690 continue; 720 continue;
691 str += (len + 1); /* skip `name*' or `name.' */ 721 str += (len + 1); /* skip `name*' or `name.' */
692 722
693# ifdef KEYSYM_RESOURCE 723# ifdef KEYSYM_RESOURCE
694 if (!parse_keysym (str, NULL)) 724 if (!parse_keysym (str, NULL))
695# endif /* KEYSYM_RESOURCE */ 725# endif /* KEYSYM_RESOURCE */
696 for (entry = 0; entry < optList_size (); entry++) 726 for (entry = 0; entry < optList_size (); entry++)
697 { 727 {
698 const char *kw = optList[entry].kw; 728 const char *kw = optList[entry].kw;
699 729
700 if (kw == NULL) 730 if (kw == NULL)
701 continue; 731 continue;
732
702 n = STRLEN (kw); 733 n = strlen (kw);
703 if (str[n] == ':' && rxvt_Str_match (str, kw)) 734 if (str[n] == ':' && rxvt_Str_match (str, kw))
704 { 735 {
705 /* skip `keyword:' */ 736 /* skip `keyword:' */
706 str += (n + 1); 737 str += n + 1;
707 rxvt_Str_trim (str); 738 rxvt_Str_trim (str);
708 n = STRLEN (str); 739 n = strlen (str);
709 if (n && rs[optList[entry].doff] == NULL) 740 if (n && rs[optList[entry].doff] == NULL)
710 { 741 {
711 /* not already set */ 742 /* not already set */
712 int s; 743 int s;
713 char *p = (char *)rxvt_malloc ((n + 1) * sizeof (char)); 744 char *p = 0;
714 745
715 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
716 rs[optList[entry].doff] = p; 765 rs[optList[entry].doff] = p;
766 allocated.push_back (p);
767
717 if (optList_isBool (entry)) 768 if (optList_isBool (entry))
718 { 769 {
719 s = STRCASECMP (str, "TRUE") == 0 770 s = strcasecmp (str, "TRUE") == 0
720 || STRCASECMP (str, "YES") == 0 771 || strcasecmp (str, "YES") == 0
721 || STRCASECMP (str, "ON") == 0 772 || strcasecmp (str, "ON") == 0
722 || STRCASECMP (str, "1") == 0; 773 || strcasecmp (str, "1") == 0;
774
723 if (optList_isReverse (entry)) 775 if (optList_isReverse (entry))
724 s = !s; 776 s = !s;
777
725 if (s) 778 if (s)
726 Options |= (optList[entry].flag); 779 options |= optList[entry].flag;
727 else 780 else
728 Options &= ~ (optList[entry].flag); 781 options &= ~optList[entry].flag;
729 } 782 }
730 } 783 }
784
731 break; 785 break;
732 } 786 }
733 } 787 }
734 } 788 }
789
735 rewind (stream); 790 rewind (stream);
736} 791}
737 792
738/*}}} */ 793/*}}} */
739# endif /* ! USE_XGETDEFAULT */ 794# endif /* ! USE_XGETDEFAULT */
… …
750#ifndef NO_RESOURCES 805#ifndef NO_RESOURCES
751 806
752# if defined XAPPLOADDIR 807# if defined XAPPLOADDIR
753# if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE) 808# if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
754 /* Compute the path of the possibly available localized Rxvt file */ 809 /* Compute the path of the possibly available localized Rxvt file */
755 char *localepath = NULL; 810 char *localepath = NULL;
756 811
757 if (locale != NULL) 812 if (locale != NULL)
758 { /* XXX: must limit length of string */ 813 { /* XXX: must limit length of string */
759 localepath = (char *)rxvt_malloc (256); 814 localepath = (char *)rxvt_malloc (256);
760 sprintf (localepath, XAPPLOADDIRLOCALE "/" RESCLASS, 815 sprintf (localepath, XAPPLOADDIRLOCALE "/" RESCLASS,
… …
768 823
769# ifdef USE_XGETDEFAULT 824# ifdef USE_XGETDEFAULT
770 /* 825 /*
771 * get resources using the X library function 826 * get resources using the X library function
772 */ 827 */
773 int entry; 828 int entry;
774 829
775# ifdef XrmEnumOneLevel 830# ifdef XrmEnumOneLevel
776 int i; 831 int i;
777 char *displayResource, *xe; 832 char *displayResource, *xe;
778 XrmName name_prefix[3]; 833 XrmName name_prefix[3];
779 XrmClass class_prefix[3]; 834 XrmClass class_prefix[3];
780 XrmDatabase database, rdb1; 835 XrmDatabase database, rdb1;
781 char fname[1024]; 836 char fname[1024];
782 837
783 XrmInitialize (); 838 XrmInitialize ();
784 database = NULL; 839 database = NULL;
785 840
786 /* Get any Xserver defaults */ 841 /* Get any Xserver defaults */
… …
797 if ((ptr = (char *)getenv ("HOME")) == NULL) 852 if ((ptr = (char *)getenv ("HOME")) == NULL)
798 ptr = "."; 853 ptr = ".";
799 854
800 for (i = 0; i < (sizeof (xnames) / sizeof (xnames[0])); i++) 855 for (i = 0; i < (sizeof (xnames) / sizeof (xnames[0])); i++)
801 { 856 {
802 sprintf (fname, "%-.*s/%s", sizeof (fname) - STRLEN (xnames[i]) - 2, 857 sprintf (fname, "%-.*s/%s", sizeof (fname) - strlen (xnames[i]) - 2,
803 ptr, xnames[i]); 858 ptr, xnames[i]);
804 if ((rdb1 = XrmGetFileDatabase (fname)) != NULL) 859 if ((rdb1 = XrmGetFileDatabase (fname)))
805 { 860 {
806 XrmMergeDatabases (rdb1, &database); 861 XrmMergeDatabases (rdb1, &database);
807# ifndef HAVE_BOTH_XRESOURCE_FILES 862# ifndef HAVE_BOTH_XRESOURCE_FILES
808 break; 863 break;
809# endif 864# endif
… …
852 if (kw == NULL || rs[optList[entry].doff] != NULL) 907 if (kw == NULL || rs[optList[entry].doff] != NULL)
853 continue; /* previously set */ 908 continue; /* previously set */
854 909
855 p = XGetDefault (display, name, kw); 910 p = XGetDefault (display, name, kw);
856 p0 = XGetDefault (display, "!INVALIDPROGRAMMENAMEDONTMATCH!", kw); 911 p0 = XGetDefault (display, "!INVALIDPROGRAMMENAMEDONTMATCH!", kw);
857 if (p == NULL || (p0 && STRCMP (p, p0) == 0)) 912 if (p == NULL || (p0 && strcmp (p, p0) == 0))
858 { 913 {
859 p = XGetDefault (display, RESCLASS, kw); 914 p = XGetDefault (display, RESCLASS, kw);
860#ifdef RESFALLBACK 915#ifdef RESFALLBACK
861 if (p == NULL || (p0 && STRCMP (p, p0) == 0)) 916 if (p == NULL || (p0 && strcmp (p, p0) == 0))
862 p = XGetDefault (display, RESFALLBACK, kw); 917 p = XGetDefault (display, RESFALLBACK, kw);
863#endif 918#endif
864 } 919 }
865 920
866 if (p == NULL && p0) 921 if (p == NULL && p0)
… …
870 { 925 {
871 rs[optList[entry].doff] = p; 926 rs[optList[entry].doff] = p;
872 927
873 if (optList_isBool (entry)) 928 if (optList_isBool (entry))
874 { 929 {
875 s = STRCASECMP (p, "TRUE") == 0 930 s = strcasecmp (p, "TRUE") == 0
876 || STRCASECMP (p, "YES") == 0 931 || strcasecmp (p, "YES") == 0
877 || STRCASECMP (p, "ON") == 0 932 || strcasecmp (p, "ON") == 0
878 || STRCASECMP (p, "1") == 0; 933 || strcasecmp (p, "1") == 0;
879 if (optList_isReverse (entry)) 934 if (optList_isReverse (entry))
880 s = !s; 935 s = !s;
881 if (s) 936 if (s)
882 Options |= (optList[entry].flag); 937 options |= (optList[entry].flag);
883 else 938 else
884 Options &= ~ (optList[entry].flag); 939 options &= ~ (optList[entry].flag);
885 } 940 }
886 } 941 }
887 } 942 }
888 943
889 /* 944 /*
… …
917 FILE *fd = NULL; 972 FILE *fd = NULL;
918 char *home; 973 char *home;
919 974
920 if ((home = getenv ("HOME")) != NULL) 975 if ((home = getenv ("HOME")) != NULL)
921 { 976 {
922 unsigned int i, len = STRLEN (home) + 2; 977 unsigned int i, len = strlen (home) + 2;
923 char *f = NULL; 978 char *f = NULL;
924 979
925 for (i = 0; i < (sizeof (xnames) / sizeof (xnames[0])); i++) 980 for (i = 0; i < (sizeof (xnames) / sizeof (xnames[0])); i++)
926 { 981 {
927 f = (char *)rxvt_realloc (f, (len + STRLEN (xnames[i])) * sizeof (char)); 982 f = (char *)rxvt_realloc (f, (len + strlen (xnames[i])) * sizeof (char));
928 983
929 sprintf (f, "%s/%s", home, xnames[i]); 984 sprintf (f, "%s/%s", home, xnames[i]);
930 985
931 if ((fd = fopen (f, "r")) != NULL) 986 if ((fd = fopen (f, "r")) != NULL)
932 break; 987 break;
… …
960# ifdef RESFALLBACK 1015# ifdef RESFALLBACK
961 get_xdefaults (fd, RESFALLBACK); 1016 get_xdefaults (fd, RESFALLBACK);
962# endif 1017# endif
963 1018
964# if defined(XAPPLOADDIR) && defined(USE_XAPPLOADDIR) 1019# if defined(XAPPLOADDIR) && defined(USE_XAPPLOADDIR)
965
966 { 1020 {
967 FILE *ad = NULL; 1021 FILE *ad = NULL;
968 1022
969# if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE) 1023# if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
970 if (localepath == NULL || (ad = fopen (localepath, "r")) == NULL) 1024 if (localepath == NULL || (ad = fopen (localepath, "r")) == NULL)
971# endif 1025# endif
972 ad = fopen (XAPPLOADDIR "/" RESCLASS, "r"); 1026 ad = fopen (XAPPLOADDIR "/" RESCLASS, "r");
… …
993 free (localepath); 1047 free (localepath);
994# endif 1048# endif
995# endif 1049# endif
996 1050
997#endif /* NO_RESOURCES */ 1051#endif /* NO_RESOURCES */
998
999 /*
1000 * even without resources, at least do this setup for command-line
1001 * options and command-line long options
1002 */
1003
1004#if defined (HOTKEY_CTRL) || defined (HOTKEY_META)
1005 KeySym sym;
1006
1007 if (rs[Rs_bigfont_key]
1008 && ((sym = XStringToKeysym (rs[Rs_bigfont_key])) != 0))
1009 ks_bigfont = sym;
1010 if (rs[Rs_smallfont_key]
1011 && ((sym = XStringToKeysym (rs[Rs_smallfont_key])) != 0))
1012 ks_smallfont = sym;
1013#endif
1014} 1052}
1015 1053
1016/*}}} */ 1054/*}}} */
1017/*----------------------- end-of-file (C source) -----------------------*/ 1055/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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