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.19 by pcg, Mon Mar 22 15:15:04 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.19 2004/03/22 15:15:04 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 STRG (Rs_modifier, "modifier", "mod", "modifier", 234 STRG (Rs_modifier, "modifier", "mod", "modifier", "meta modifier = alt|meta|hyper|super|mod1|...|mod5"),
246 "meta modifier = alt|meta|hyper|super|mod1|...|mod5"),
247 INFO ("xrm", "string", "X resource"), 235 INFO ("xrm", "string", "X resource"),
248#ifdef CUTCHAR_RESOURCE 236#ifdef CUTCHAR_RESOURCE
249 RSTRG (Rs_cutchars, "cutchars", "string"), 237 RSTRG (Rs_cutchars, "cutchars", "string"),
250#endif /* CUTCHAR_RESOURCE */ 238#endif /* CUTCHAR_RESOURCE */
251 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
252 INFO ("e", "command arg ...", "command to execute") 244 INFO ("e", "command arg ...", "command to execute")
253 }; 245 };
254 246
255#undef INFO 247#undef INFO
256#undef STRG 248#undef STRG
… …
258#undef SWCH 250#undef SWCH
259#undef BOOL 251#undef BOOL
260/*}}} */ 252/*}}} */
261 253
262static const char releasestring[] = "Rxvt v" VERSION " - released: " DATE "\n"; 254static const char releasestring[] = "Rxvt v" VERSION " - released: " DATE "\n";
263static 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
264#if defined(XPM_BACKGROUND) 288#if defined(XPM_BACKGROUND)
265 "XPM," 289 "XPM,"
266#endif 290#endif
267#if defined(TRANSPARENT) 291#if defined(TRANSPARENT)
268 "transparent," 292 "transparent,"
269#endif 293#endif
294#if TINTING
295 "tint,"
296#endif
270#if defined(UTMP_SUPPORT) 297#if defined(UTMP_SUPPORT)
271 "utmp," 298 "utmp,"
272#endif 299#endif
273#if defined(MENUBAR) 300#if defined(MENUBAR)
274 "menubar," 301 "menubar,"
275#endif
276#if !defined(NO_FRILLS)
277 "frills,"
278#endif
279#if !defined(NO_LINESPACE)
280 "linespace,"
281#endif
282#if defined(PREFER_24BIT)
283 "24bit,"
284#endif 302#endif
285#if defined(USE_XIM) 303#if defined(USE_XIM)
286 "XIM," 304 "XIM,"
287#endif 305#endif
288 "scrollbars=" 306 "scrollbars="
… …
316 "no_backspace," 334 "no_backspace,"
317#endif 335#endif
318#if defined(NO_DELETE_KEY) 336#if defined(NO_DELETE_KEY)
319 "no_delete," 337 "no_delete,"
320#endif 338#endif
339#if EIGHT_BIT_CONTROLS
340 "8bitctrls,"
341#endif
321#if !defined(NO_STRINGS) 342#if !defined(NO_STRINGS)
322 "strings," 343 "strings,"
323#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
324#if defined(TTY_256COLOR) 366#if defined(TTY_256COLOR)
325 "256colour," 367 "256colour,"
368#endif
369#if defined(CURSOR_BLINK)
370 "cursorBlink,"
371#endif
372#if defined(POINTER_BLANK)
373 "pointerBlank,"
326#endif 374#endif
327#if defined(NO_RESOURCES) 375#if defined(NO_RESOURCES)
328 "NoResources" 376 "NoResources"
329#else 377#else
330# if defined(USE_XGETDEFAULT) 378# if defined(USE_XGETDEFAULT)
… …
363 len++; /* account for space */ 411 len++; /* account for space */
364 } 412 }
365#ifdef DEBUG_STRICT 413#ifdef DEBUG_STRICT
366 assert (optList[i].opt != NULL); 414 assert (optList[i].opt != NULL);
367#endif 415#endif
368 len += 4 + STRLEN (optList[i].opt) + (optList_isBool (i) ? 2: 0); 416 len += 4 + strlen (optList[i].opt) + (optList_isBool (i) ? 2: 0);
369 col += len; 417 col += len;
370 if (col > 79) 418 if (col > 79)
371 { /* assume regular width */ 419 { /* assume regular width */
372 rxvt_log ("\n"); 420 rxvt_log ("\n");
373 col = 1 + len; 421 col = 1 + len;
… …
390#ifdef DEBUG_STRICT 438#ifdef DEBUG_STRICT
391 assert (optList[i].opt != NULL); 439 assert (optList[i].opt != NULL);
392#endif 440#endif
393 rxvt_log (" %s%s %-*s%s%s\n", 441 rxvt_log (" %s%s %-*s%s%s\n",
394 (optList_isBool (i) ? "-/+" : "-"), optList[i].opt, 442 (optList_isBool (i) ? "-/+" : "-"), optList[i].opt,
395 (INDENT - STRLEN (optList[i].opt) 443 (INDENT - strlen (optList[i].opt)
396 + (optList_isBool (i) ? 0 : 2)), 444 + (optList_isBool (i) ? 0 : 2)),
397 (optList[i].arg ? optList[i].arg : ""), 445 (optList[i].arg ? optList[i].arg : ""),
398 (optList_isBool (i) ? "turn on/off " : ""), 446 (optList_isBool (i) ? "turn on/off " : ""),
399 optList[i].desc); 447 optList[i].desc);
400 } 448 }
… …
407 455
408 for (i = 0; i < optList_size (); i++) 456 for (i = 0; i < optList_size (); i++)
409 if (optList[i].kw != NULL) 457 if (optList[i].kw != NULL)
410 rxvt_log (" %s: %*s%s\n", 458 rxvt_log (" %s: %*s%s\n",
411 optList[i].kw, 459 optList[i].kw,
412 (INDENT - STRLEN (optList[i].kw)), "", /* XXX */ 460 (INDENT - strlen (optList[i].kw)), "", /* XXX */
413 (optList_isBool (i) ? "boolean" : optList[i].arg)); 461 (optList_isBool (i) ? "boolean" : optList[i].arg));
414#ifdef KEYSYM_RESOURCE 462#ifdef KEYSYM_RESOURCE
415 rxvt_log (" " "keysym.sym" ": %*s%s\n", 463 rxvt_log (" " "keysym.sym" ": %*s%s\n",
416 (INDENT - sizeof ("keysym.sym") + 1), "", /* XXX */ 464 (INDENT - sizeof ("keysym.sym") + 1), "", /* XXX */
417 "keysym"); 465 "keysym");
… …
460 bad_option = 1; 508 bad_option = 1;
461 rxvt_warn ("\"%s\": malformed option.\n", opt); 509 rxvt_warn ("\"%s\": malformed option.\n", opt);
462 continue; 510 continue;
463 } 511 }
464 512
465 if (!STRCMP (opt, "help")) 513 if (!strcmp (opt, "help"))
466 rxvt_usage (longopt ? 2 : 1); 514 rxvt_usage (longopt ? 2 : 1);
467 if (!STRCMP (opt, "h")) 515 if (!strcmp (opt, "h"))
468 rxvt_usage (0); 516 rxvt_usage (0);
469 517
470 /* feature: always try to match long-options */ 518 /* feature: always try to match long-options */
471 for (entry = 0; entry < optList_size (); entry++) 519 for (entry = 0; entry < optList_size (); entry++)
472 if ((optList[entry].kw && !STRCMP (opt, optList[entry].kw)) 520 if ((optList[entry].kw && !strcmp (opt, optList[entry].kw))
473 || (!longopt 521 || (!longopt
474 && optList[entry].opt && !STRCMP (opt, optList[entry].opt))) 522 && optList[entry].opt && !strcmp (opt, optList[entry].opt)))
475 break; 523 break;
476 524
477 if (entry < optList_size ()) 525 if (entry < optList_size ())
478 { 526 {
479 if (optList_isReverse (entry)) 527 if (optList_isReverse (entry))
480 flag = flag == On ? Off : On; 528 flag = flag == On ? Off : On;
529
481 if (optList_strlen (entry)) 530 if (optList_strlen (entry))
482 { /* string value */
483 const char *str = argv[++i];
484
485#ifdef DEBUG_RESOURCES
486 fprintf (stderr, "string (%s,%s) = ",
487 optList[entry].opt ? optList[entry].opt : "nil",
488 optList[entry].kw ? optList[entry].kw : "nil");
489#endif
490 if (flag == On && str && (optList[entry].doff != -1))
491 { 531 {
492#ifdef DEBUG_RESOURCES
493 fprintf (stderr, "\"%s\"\n", str);
494#endif
495 rs[optList[entry].doff] = str;
496 /* 532 /*
497 * special cases are handled in main.c:main () to allow 533 * special cases are handled in main.c:main () to allow
498 * X resources to set these values before we settle for 534 * X resources to set these values before we settle for
499 * default values 535 * default values
500 */ 536 */
501 }
502#ifdef DEBUG_RESOURCES
503 else
504 fprintf (stderr, "???\n");
505#endif
506 537
538 if (optList[entry].doff != -1)
539 rs[optList[entry].doff] = flag == On && argv[i+1]
540 ? argv[++i] : 0;
507 } 541 }
508 else 542 else
509 { /* boolean value */ 543 { /* boolean value */
510#ifdef DEBUG_RESOURCES 544#ifdef DEBUG_RESOURCES
511 fprintf (stderr, "boolean (%s,%s) = %s\n", 545 fprintf (stderr, "boolean (%s,%s) = %s\n",
512 optList[entry].opt, optList[entry].kw, flag); 546 optList[entry].opt, optList[entry].kw, flag);
513#endif 547#endif
514 if (flag == On) 548 if (flag == On)
515 Options |= (optList[entry].flag); 549 options |= (optList[entry].flag);
516 else 550 else
517 Options &= ~ (optList[entry].flag); 551 options &= ~ (optList[entry].flag);
518 552
519 if (optList[entry].doff != -1) 553 if (optList[entry].doff != -1)
520 rs[optList[entry].doff] = flag; 554 rs[optList[entry].doff] = flag;
521 } 555 }
522 } 556 }
523 else 557 else
524#ifdef KEYSYM_RESOURCE 558#ifdef KEYSYM_RESOURCE
525 /* if (!STRNCMP (opt, "keysym.", sizeof ("keysym.") - 1)) */ 559 /* if (!strncmp (opt, "keysym.", sizeof ("keysym.") - 1)) */
526 if (rxvt_Str_match (opt, "keysym.")) 560 if (rxvt_Str_match (opt, "keysym."))
527 { 561 {
528 const char *str = argv[++i]; 562 const char *str = argv[++i];
529 563
530 if (str != NULL) 564 if (str != NULL)
… …
599 { 633 {
600 if (str[0] == '0' && toupper (str[1]) == 'X') 634 if (str[0] == '0' && toupper (str[1]) == 'X')
601 str += 2; 635 str += 2;
602 if (arg) 636 if (arg)
603 { 637 {
604 if (sscanf (str, (STRCHR (str, ':') ? "%x:" : "%x"), &sym) != 1) 638 if (sscanf (str, (strchr (str, ':') ? "%x:" : "%x"), &sym) != 1)
605 return -1; 639 return -1;
606 } 640 }
607 else 641 else
608 { 642 {
609 if (sscanf (str, "%x:", &sym) != 1) 643 if (sscanf (str, "%x:", &sym) != 1)
610 return -1; 644 return -1;
611 645
612 /* cue to ':', it's there since sscanf () worked */ 646 /* cue to ':', it's there since sscanf () worked */
613 STRNCPY (newargstr, STRCHR (str, ':') + 1, NEWARGLIM - 1); 647 strncpy (newargstr, strchr (str, ':') + 1, NEWARGLIM - 1);
614 newargstr[NEWARGLIM - 1] = '\0'; 648 newargstr[NEWARGLIM - 1] = '\0';
615 newarg = newargstr; 649 newarg = newargstr;
616 } 650 }
617 } 651 }
618 else 652 else
619 { 653 {
620 /* 654 /*
621 * convert keysym name to keysym number 655 * convert keysym name to keysym number
622 */ 656 */
623 STRNCPY (newargstr, str, NEWARGLIM - 1); 657 strncpy (newargstr, str, NEWARGLIM - 1);
624 newargstr[NEWARGLIM - 1] = '\0'; 658 newargstr[NEWARGLIM - 1] = '\0';
625 if (arg == NULL) 659 if (arg == NULL)
626 { 660 {
627 if ((newarg = STRCHR (newargstr, ':')) == NULL) 661 if ((newarg = strchr (newargstr, ':')) == NULL)
628 return -1; 662 return -1;
629 *newarg++ = '\0'; /* terminate keysym name */ 663 *newarg++ = '\0'; /* terminate keysym name */
630 } 664 }
631 if ((sym = XStringToKeysym (newargstr)) == None) 665 if ((sym = XStringToKeysym (newargstr)) == None)
632 return -1; 666 return -1;
… …
638 if (Keysym_map[sym] != NULL) /* already set ? */ 672 if (Keysym_map[sym] != NULL) /* already set ? */
639 return -1; 673 return -1;
640 674
641 if (newarg == NULL) 675 if (newarg == NULL)
642 { 676 {
643 STRNCPY (newargstr, arg, NEWARGLIM - 1); 677 strncpy (newargstr, arg, NEWARGLIM - 1);
644 newargstr[NEWARGLIM - 1] = '\0'; 678 newargstr[NEWARGLIM - 1] = '\0';
645 newarg = newargstr; 679 newarg = newargstr;
646 } 680 }
647 rxvt_Str_trim (newarg); 681 rxvt_Str_trim (newarg);
648 if (*newarg == '\0' || (n = rxvt_Str_escaped (newarg)) == 0) 682 if (*newarg == '\0' || (n = rxvt_Str_escaped (newarg)) == 0)
649 return -1; 683 return -1;
650 MIN_IT (n, 255); 684 MIN_IT (n, 255);
651 key_string = (char *)rxvt_malloc ((n + 1) * sizeof (char)); 685 key_string = (char *)rxvt_malloc ((n + 1) * sizeof (char));
652 686
653 key_string[0] = n; 687 key_string[0] = n;
654 STRNCPY (key_string + 1, newarg, n); 688 strncpy (key_string + 1, newarg, n);
655 Keysym_map[sym] = (unsigned char *)key_string; 689 Keysym_map[sym] = (unsigned char *)key_string;
656 690
657 return 1; 691 return 1;
658} 692}
659 693
… …
671 char *str, buffer[256]; 705 char *str, buffer[256];
672 706
673 if (stream == NULL) 707 if (stream == NULL)
674 return; 708 return;
675 709
676 len = STRLEN (name); 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))
… …
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;
698 732
699 n = STRLEN (kw); 733 n = strlen (kw);
700 if (str[n] == ':' && rxvt_Str_match (str, kw)) 734 if (str[n] == ':' && rxvt_Str_match (str, kw))
701 { 735 {
702 /* skip `keyword:' */ 736 /* skip `keyword:' */
703 str += n + 1; 737 str += n + 1;
704 rxvt_Str_trim (str); 738 rxvt_Str_trim (str);
705 n = STRLEN (str); 739 n = strlen (str);
706 if (n && rs[optList[entry].doff] == NULL) 740 if (n && rs[optList[entry].doff] == NULL)
707 { 741 {
708 /* not already set */ 742 /* not already set */
709 int s; 743 int s;
710 char *p = 0; 744 char *p = 0;
711 745
712 for (int o = 0;;) 746 for (int o = 0;;)
713 { 747 {
714 p = (char *)rxvt_realloc (p, o + n + 1); 748 p = (char *)rxvt_realloc (p, o + n + 1);
715 MEMCPY (p + o, str, n); 749 memcpy (p + o, str, n);
716 o += n; 750 o += n;
717 p[o] = 0; 751 p[o] = 0;
718 752
719 if (o == 0 || p[o - 1] != '\\') // continuation line 753 if (o == 0 || p[o - 1] != '\\') // continuation line
720 break; 754 break;
… …
723 757
724 if ((str = fgets (buffer, sizeof (buffer), stream)) == NULL) 758 if ((str = fgets (buffer, sizeof (buffer), stream)) == NULL)
725 break; 759 break;
726 760
727 rxvt_Str_trim (str); 761 rxvt_Str_trim (str);
728 n = STRLEN (str); 762 n = strlen (str);
729 } 763 }
730 764
731 rs[optList[entry].doff] = p; 765 rs[optList[entry].doff] = p;
732 allocated.push_back (p); 766 allocated.push_back (p);
733 767
734 if (optList_isBool (entry)) 768 if (optList_isBool (entry))
735 { 769 {
736 s = STRCASECMP (str, "TRUE") == 0 770 s = strcasecmp (str, "TRUE") == 0
737 || STRCASECMP (str, "YES") == 0 771 || strcasecmp (str, "YES") == 0
738 || STRCASECMP (str, "ON") == 0 772 || strcasecmp (str, "ON") == 0
739 || STRCASECMP (str, "1") == 0; 773 || strcasecmp (str, "1") == 0;
740 774
741 if (optList_isReverse (entry)) 775 if (optList_isReverse (entry))
742 s = !s; 776 s = !s;
743 777
744 if (s) 778 if (s)
745 Options |= optList[entry].flag; 779 options |= optList[entry].flag;
746 else 780 else
747 Options &= ~optList[entry].flag; 781 options &= ~optList[entry].flag;
748 } 782 }
749 } 783 }
750 784
751 break; 785 break;
752 } 786 }
… …
818 if ((ptr = (char *)getenv ("HOME")) == NULL) 852 if ((ptr = (char *)getenv ("HOME")) == NULL)
819 ptr = "."; 853 ptr = ".";
820 854
821 for (i = 0; i < (sizeof (xnames) / sizeof (xnames[0])); i++) 855 for (i = 0; i < (sizeof (xnames) / sizeof (xnames[0])); i++)
822 { 856 {
823 sprintf (fname, "%-.*s/%s", sizeof (fname) - STRLEN (xnames[i]) - 2, 857 sprintf (fname, "%-.*s/%s", sizeof (fname) - strlen (xnames[i]) - 2,
824 ptr, xnames[i]); 858 ptr, xnames[i]);
825 if ((rdb1 = XrmGetFileDatabase (fname))) 859 if ((rdb1 = XrmGetFileDatabase (fname)))
826 { 860 {
827 XrmMergeDatabases (rdb1, &database); 861 XrmMergeDatabases (rdb1, &database);
828# ifndef HAVE_BOTH_XRESOURCE_FILES 862# ifndef HAVE_BOTH_XRESOURCE_FILES
… …
873 if (kw == NULL || rs[optList[entry].doff] != NULL) 907 if (kw == NULL || rs[optList[entry].doff] != NULL)
874 continue; /* previously set */ 908 continue; /* previously set */
875 909
876 p = XGetDefault (display, name, kw); 910 p = XGetDefault (display, name, kw);
877 p0 = XGetDefault (display, "!INVALIDPROGRAMMENAMEDONTMATCH!", kw); 911 p0 = XGetDefault (display, "!INVALIDPROGRAMMENAMEDONTMATCH!", kw);
878 if (p == NULL || (p0 && STRCMP (p, p0) == 0)) 912 if (p == NULL || (p0 && strcmp (p, p0) == 0))
879 { 913 {
880 p = XGetDefault (display, RESCLASS, kw); 914 p = XGetDefault (display, RESCLASS, kw);
881#ifdef RESFALLBACK 915#ifdef RESFALLBACK
882 if (p == NULL || (p0 && STRCMP (p, p0) == 0)) 916 if (p == NULL || (p0 && strcmp (p, p0) == 0))
883 p = XGetDefault (display, RESFALLBACK, kw); 917 p = XGetDefault (display, RESFALLBACK, kw);
884#endif 918#endif
885 } 919 }
886 920
887 if (p == NULL && p0) 921 if (p == NULL && p0)
… …
891 { 925 {
892 rs[optList[entry].doff] = p; 926 rs[optList[entry].doff] = p;
893 927
894 if (optList_isBool (entry)) 928 if (optList_isBool (entry))
895 { 929 {
896 s = STRCASECMP (p, "TRUE") == 0 930 s = strcasecmp (p, "TRUE") == 0
897 || STRCASECMP (p, "YES") == 0 931 || strcasecmp (p, "YES") == 0
898 || STRCASECMP (p, "ON") == 0 932 || strcasecmp (p, "ON") == 0
899 || STRCASECMP (p, "1") == 0; 933 || strcasecmp (p, "1") == 0;
900 if (optList_isReverse (entry)) 934 if (optList_isReverse (entry))
901 s = !s; 935 s = !s;
902 if (s) 936 if (s)
903 Options |= (optList[entry].flag); 937 options |= (optList[entry].flag);
904 else 938 else
905 Options &= ~ (optList[entry].flag); 939 options &= ~ (optList[entry].flag);
906 } 940 }
907 } 941 }
908 } 942 }
909 943
910 /* 944 /*
… …
938 FILE *fd = NULL; 972 FILE *fd = NULL;
939 char *home; 973 char *home;
940 974
941 if ((home = getenv ("HOME")) != NULL) 975 if ((home = getenv ("HOME")) != NULL)
942 { 976 {
943 unsigned int i, len = STRLEN (home) + 2; 977 unsigned int i, len = strlen (home) + 2;
944 char *f = NULL; 978 char *f = NULL;
945 979
946 for (i = 0; i < (sizeof (xnames) / sizeof (xnames[0])); i++) 980 for (i = 0; i < (sizeof (xnames) / sizeof (xnames[0])); i++)
947 { 981 {
948 f = (char *)rxvt_realloc (f, (len + STRLEN (xnames[i])) * sizeof (char)); 982 f = (char *)rxvt_realloc (f, (len + strlen (xnames[i])) * sizeof (char));
949 983
950 sprintf (f, "%s/%s", home, xnames[i]); 984 sprintf (f, "%s/%s", home, xnames[i]);
951 985
952 if ((fd = fopen (f, "r")) != NULL) 986 if ((fd = fopen (f, "r")) != NULL)
953 break; 987 break;

Diff Legend

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