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.41 by root, Sun Sep 5 09:33:00 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 rxvt-unicode 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
… …
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
167 RSTRG (Rs_color + Color_BD, "colorBD", "color"), 163 RSTRG (Rs_color + Color_BD, "colorBD", "color"),
164 RSTRG (Rs_color + Color_IT, "colorIT", "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
172 RSTRG (Rs_color + Color_scroll, "scrollColor", "color"), 169 RSTRG (Rs_color + Color_scroll, "scrollColor", "color"),
… …
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
184 /* fonts: command-line option = resource name */
188 STRG (Rs_font, "font", "fn", "fontname", "normal text font"), 185 STRG (Rs_font, "font", "fn", "fontname", "normal text font"),
189 /* fonts: command-line option = resource name */ 186#if ENABLE_STYLES
187 STRG (Rs_boldFont, "boldFont", "fb", "fontname", "bold font"),
188 STRG (Rs_italicFont, "italicFont", "fi", "fontname", "italic font"),
189 STRG (Rs_boldItalicFont, "boldItalicFont", "fbi", "fontname", "bold italic font"),
190#endif
190#ifdef USE_XIM 191#ifdef USE_XIM
191 STRG (Rs_inputMethod, "inputMethod", "im", "name", "name of input method"), 192 STRG (Rs_inputMethod, "inputMethod", "im", "name", "name of input method"),
192 STRG (Rs_preeditType, "preeditType", "pt", "style", 193 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) 194#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
195 STRG (Rs_imLocale, "imLocale", "imlocale", "string", "locale to use for input method"), 195 STRG (Rs_imLocale, "imLocale", "imlocale", "string", "locale to use for input method"),
196#endif 196#endif
197#endif /* USE_XIM */ 197#endif /* USE_XIM */
198 STRG (Rs_name, NULL, "name", "string", 198 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"), 199 STRG (Rs_title, "title", "title", "string", "title name for window"),
201 STRG (Rs_title, NULL, "T", NULL, NULL), /* short form */ 200 STRG (Rs_title, NULL, "T", NULL, NULL), /* short form */
202 STRG (Rs_iconName, "iconName", "n", "string", "icon name for window"), 201 STRG (Rs_iconName, "iconName", "n", "string", "icon name for window"),
203#ifndef NO_CURSORCOLOR 202#ifndef NO_CURSORCOLOR
204 STRG (Rs_color + Color_cursor, "cursorColor", "cr", "color", "cursor color"), 203 STRG (Rs_color + Color_cursor, "cursorColor", "cr", "color", "cursor color"),
205 /* command-line option = resource name */ 204 /* command-line option = resource name */
206 RSTRG (Rs_color + Color_cursor2, "cursorColor2", "color"), 205 RSTRG (Rs_color + Color_cursor2, "cursorColor2", "color"),
207#endif /* NO_CURSORCOLOR */ 206#endif /* NO_CURSORCOLOR */
208 STRG (Rs_color + Color_pointer, "pointerColor", "pr", "color", 207 STRG (Rs_color + Color_pointer_fg, "pointerColor", "pr", "color", "pointer color"),
209 "pointer color"), 208 STRG (Rs_color + Color_pointer_bg, "pointerColor2", "pr2", "color", "pointer bg color"),
210 STRG (Rs_color + Color_border, "borderColor", "bd", "color", 209 STRG (Rs_color + Color_border, "borderColor", "bd", "color", "border color"),
211 "border color"),
212 STRG (Rs_saveLines, "saveLines", "sl", "number", 210 STRG (Rs_saveLines, "saveLines", "sl", "number", "number of scrolled lines to save"),
213 "number of scrolled lines to save"), 211#if ENABLE_FRILLS
214#ifndef NO_FRILLS
215 STRG (Rs_ext_bwidth, "externalBorder", "w", "number", 212 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), 213 STRG (Rs_ext_bwidth, NULL, "bw", NULL, NULL),
218 STRG (Rs_ext_bwidth, NULL, "borderwidth", NULL, NULL), 214 STRG (Rs_ext_bwidth, NULL, "borderwidth", NULL, NULL),
219 STRG (Rs_int_bwidth, "internalBorder", "b", "number", 215 STRG (Rs_int_bwidth, "internalBorder", "b", "number", "internal border in pixels"),
220 "internal border in pixels"), 216 BOOL (Rs_borderLess, "borderLess", "bl", Opt_borderLess, "borderless window"),
221#endif 217#endif
222#ifndef NO_LINESPACE 218#ifndef NO_LINESPACE
223 STRG (Rs_lineSpace, "lineSpace", "lsp", "number", 219 STRG (Rs_lineSpace, "lineSpace", "lsp", "number", "number of extra pixels between rows"),
224 "number of extra pixels between rows"),
225#endif 220#endif
226 STRG (Rs_scrollBar_thickness, "thickness", "sbt", "number", 221 STRG (Rs_scrollBar_thickness, "thickness", "sbt", "number", "scrollbar thickness/width in pixels"),
227 "scrollbar thickness/width in pixels"),
228#ifdef POINTER_BLANK 222#ifdef POINTER_BLANK
229 RSTRG (Rs_pointerBlankDelay, "pointerBlankDelay", "number"), 223 RSTRG (Rs_pointerBlankDelay, "pointerBlankDelay", "number"),
230#endif 224#endif
231#ifndef NO_BACKSPACE_KEY 225#ifndef NO_BACKSPACE_KEY
232 RSTRG (Rs_backspace_key, "backspacekey", "string"), 226 RSTRG (Rs_backspace_key, "backspacekey", "string"),
… …
240 RSTRG (Rs_scrollBar_align, "scrollBar_align", "mode"), 234 RSTRG (Rs_scrollBar_align, "scrollBar_align", "mode"),
241#endif 235#endif
242#ifdef PRINTPIPE 236#ifdef PRINTPIPE
243 RSTRG (Rs_print_pipe, "print-pipe", "string"), 237 RSTRG (Rs_print_pipe, "print-pipe", "string"),
244#endif 238#endif
245 STRG (Rs_modifier, "modifier", "mod", "modifier", 239 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"), 240 INFO ("xrm", "string", "X resource"),
248#ifdef CUTCHAR_RESOURCE 241#ifdef CUTCHAR_RESOURCE
249 RSTRG (Rs_cutchars, "cutchars", "string"), 242 RSTRG (Rs_cutchars, "cutchars", "string"),
250#endif /* CUTCHAR_RESOURCE */ 243#endif /* CUTCHAR_RESOURCE */
251 RSTRG (Rs_answerbackstring, "answerbackString", "string"), 244 RSTRG (Rs_answerbackstring, "answerbackString", "string"),
245#ifndef NO_SECONDARY_SCREEN
246 BOOL (Rs_secondaryScreen, "secondaryScreen", "ssc", Opt_secondaryScreen, "enable secondary screen"),
247 BOOL (Rs_secondaryScroll, "secondaryScroll", "ssr", Opt_secondaryScroll, "enable secondary screen scroll"),
248#endif
252 INFO ("e", "command arg ...", "command to execute") 249 INFO ("e", "command arg ...", "command to execute")
253 }; 250 };
254 251
255#undef INFO 252#undef INFO
256#undef STRG 253#undef STRG
257#undef RSTRG 254#undef RSTRG
258#undef SWCH 255#undef SWCH
259#undef BOOL 256#undef BOOL
260/*}}} */ 257/*}}} */
261 258
262static const char releasestring[] = "Rxvt v" VERSION " - released: " DATE "\n"; 259static const char releasestring[] = "rxvt-unicode (" RXVTNAME ") v" VERSION " - released: " DATE "\n";
263static const char optionsstring[] = "Options: " 260static const char optionsstring[] = "options: "
261#if XFT
262 "xft,"
263#endif
264#if ENABLE_STYLES
265 "styles,"
266#endif
267#if ENABLE_COMBINING
268 "combining,"
269#endif
270#if TEXT_BLINK
271 "blink,"
272#endif
273#if ISO_14755
274 "iso14755,"
275#endif
276#if UNICODE_3
277 "unicode3,"
278#endif
279 "encodings=eu+vn"
280#if ENCODING_JP
281 "+jp"
282#endif
283#if ENCODING_JP_EXT
284 "+jp-ext"
285#endif
286#if ENCODING_KR
287 "+kr"
288#endif
289#if ENCODING_ZH
290 "+zh"
291#endif
292#if ENCODING_ZH_EXT
293 "+zh-ext"
294#endif
295 ","
296#if OFF_FOCUS_FADING
297 "fade,"
298#endif
264#if defined(XPM_BACKGROUND) 299#if defined(XPM_BACKGROUND)
265 "XPM," 300 "XPM,"
266#endif 301#endif
267#if defined(TRANSPARENT) 302#if defined(TRANSPARENT)
268 "transparent," 303 "transparent,"
269#endif 304#endif
305#if TINTING
306 "tint,"
307#endif
270#if defined(UTMP_SUPPORT) 308#if defined(UTMP_SUPPORT)
271 "utmp," 309 "utmp,"
272#endif 310#endif
273#if defined(MENUBAR) 311#if defined(MENUBAR)
274 "menubar," 312 "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 313#endif
285#if defined(USE_XIM) 314#if defined(USE_XIM)
286 "XIM," 315 "XIM,"
287#endif 316#endif
288 "scrollbars=" 317 "scrollbars="
… …
316 "no_backspace," 345 "no_backspace,"
317#endif 346#endif
318#if defined(NO_DELETE_KEY) 347#if defined(NO_DELETE_KEY)
319 "no_delete," 348 "no_delete,"
320#endif 349#endif
350#if EIGHT_BIT_CONTROLS
351 "8bitctrls,"
352#endif
321#if !defined(NO_STRINGS) 353#if !defined(NO_STRINGS)
322 "strings," 354 "strings,"
323#endif 355#endif
324#if defined(TTY_256COLOR) 356#if defined(ENABLE_FRILLS)
357 "frills,"
358#endif
359#if !defined(NO_LINESPACE)
360 "linespace,"
361#endif
362#if defined(PREFER_24BIT)
325 "256colour," 363 "24bit,"
364#endif
365#if defined(SELECTION_SCROLLING)
366 "selectionscrolling,"
367#endif
368#if MOUSE_WHEEL
369 "wheel,"
370#endif
371#if MOUSE_SLIP_WHEELING
372 "slipwheel,"
373#endif
374#if defined(SMART_RESIZE)
375 "smart-resize,"
376#endif
377#if defined(CURSOR_BLINK)
378 "cursorBlink,"
379#endif
380#if defined(POINTER_BLANK)
381 "pointerBlank,"
326#endif 382#endif
327#if defined(NO_RESOURCES) 383#if defined(NO_RESOURCES)
328 "NoResources" 384 "NoResources"
329#else 385#else
330# if defined(USE_XGETDEFAULT) 386# if defined(USE_XGETDEFAULT)
… …
363 len++; /* account for space */ 419 len++; /* account for space */
364 } 420 }
365#ifdef DEBUG_STRICT 421#ifdef DEBUG_STRICT
366 assert (optList[i].opt != NULL); 422 assert (optList[i].opt != NULL);
367#endif 423#endif
368 len += 4 + STRLEN (optList[i].opt) + (optList_isBool (i) ? 2: 0); 424 len += 4 + strlen (optList[i].opt) + (optList_isBool (i) ? 2: 0);
369 col += len; 425 col += len;
370 if (col > 79) 426 if (col > 79)
371 { /* assume regular width */ 427 { /* assume regular width */
372 rxvt_log ("\n"); 428 rxvt_log ("\n");
373 col = 1 + len; 429 col = 1 + len;
… …
390#ifdef DEBUG_STRICT 446#ifdef DEBUG_STRICT
391 assert (optList[i].opt != NULL); 447 assert (optList[i].opt != NULL);
392#endif 448#endif
393 rxvt_log (" %s%s %-*s%s%s\n", 449 rxvt_log (" %s%s %-*s%s%s\n",
394 (optList_isBool (i) ? "-/+" : "-"), optList[i].opt, 450 (optList_isBool (i) ? "-/+" : "-"), optList[i].opt,
395 (INDENT - STRLEN (optList[i].opt) 451 (INDENT - strlen (optList[i].opt)
396 + (optList_isBool (i) ? 0 : 2)), 452 + (optList_isBool (i) ? 0 : 2)),
397 (optList[i].arg ? optList[i].arg : ""), 453 (optList[i].arg ? optList[i].arg : ""),
398 (optList_isBool (i) ? "turn on/off " : ""), 454 (optList_isBool (i) ? "turn on/off " : ""),
399 optList[i].desc); 455 optList[i].desc);
400 } 456 }
… …
407 463
408 for (i = 0; i < optList_size (); i++) 464 for (i = 0; i < optList_size (); i++)
409 if (optList[i].kw != NULL) 465 if (optList[i].kw != NULL)
410 rxvt_log (" %s: %*s%s\n", 466 rxvt_log (" %s: %*s%s\n",
411 optList[i].kw, 467 optList[i].kw,
412 (INDENT - STRLEN (optList[i].kw)), "", /* XXX */ 468 (INDENT - strlen (optList[i].kw)), "", /* XXX */
413 (optList_isBool (i) ? "boolean" : optList[i].arg)); 469 (optList_isBool (i) ? "boolean" : optList[i].arg));
414#ifdef KEYSYM_RESOURCE 470#ifdef KEYSYM_RESOURCE
415 rxvt_log (" " "keysym.sym" ": %*s%s\n", 471 rxvt_log (" " "keysym.sym" ": %*s%s\n",
416 (INDENT - sizeof ("keysym.sym") + 1), "", /* XXX */ 472 (INDENT - sizeof ("keysym.sym") + 1), "", /* XXX */
417 "keysym"); 473 "keysym");
… …
460 bad_option = 1; 516 bad_option = 1;
461 rxvt_warn ("\"%s\": malformed option.\n", opt); 517 rxvt_warn ("\"%s\": malformed option.\n", opt);
462 continue; 518 continue;
463 } 519 }
464 520
465 if (!STRCMP (opt, "help")) 521 if (!strcmp (opt, "help"))
466 rxvt_usage (longopt ? 2 : 1); 522 rxvt_usage (longopt ? 2 : 1);
467 if (!STRCMP (opt, "h")) 523 if (!strcmp (opt, "h"))
468 rxvt_usage (0); 524 rxvt_usage (0);
469 525
470 /* feature: always try to match long-options */ 526 /* feature: always try to match long-options */
471 for (entry = 0; entry < optList_size (); entry++) 527 for (entry = 0; entry < optList_size (); entry++)
472 if ((optList[entry].kw && !STRCMP (opt, optList[entry].kw)) 528 if ((optList[entry].kw && !strcmp (opt, optList[entry].kw))
473 || (!longopt 529 || (!longopt
474 && optList[entry].opt && !STRCMP (opt, optList[entry].opt))) 530 && optList[entry].opt && !strcmp (opt, optList[entry].opt)))
475 break; 531 break;
476 532
477 if (entry < optList_size ()) 533 if (entry < optList_size ())
478 { 534 {
479 if (optList_isReverse (entry)) 535 if (optList_isReverse (entry))
480 flag = flag == On ? Off : On; 536 flag = flag == On ? Off : On;
537
481 if (optList_strlen (entry)) 538 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 { 539 {
492#ifdef DEBUG_RESOURCES
493 fprintf (stderr, "\"%s\"\n", str);
494#endif
495 rs[optList[entry].doff] = str;
496 /* 540 /*
497 * special cases are handled in main.c:main () to allow 541 * special cases are handled in main.c:main () to allow
498 * X resources to set these values before we settle for 542 * X resources to set these values before we settle for
499 * default values 543 * default values
500 */ 544 */
501 }
502#ifdef DEBUG_RESOURCES
503 else
504 fprintf (stderr, "???\n");
505#endif
506 545
546 if (optList[entry].doff != -1)
547 rs[optList[entry].doff] = flag == On && argv[i+1]
548 ? argv[++i] : 0;
507 } 549 }
508 else 550 else
509 { /* boolean value */ 551 { /* boolean value */
510#ifdef DEBUG_RESOURCES 552#ifdef DEBUG_RESOURCES
511 fprintf (stderr, "boolean (%s,%s) = %s\n", 553 fprintf (stderr, "boolean (%s,%s) = %s\n",
512 optList[entry].opt, optList[entry].kw, flag); 554 optList[entry].opt, optList[entry].kw, flag);
513#endif 555#endif
514 if (flag == On) 556 if (flag == On)
515 Options |= (optList[entry].flag); 557 options |= (optList[entry].flag);
516 else 558 else
517 Options &= ~ (optList[entry].flag); 559 options &= ~ (optList[entry].flag);
518 560
519 if (optList[entry].doff != -1) 561 if (optList[entry].doff != -1)
520 rs[optList[entry].doff] = flag; 562 rs[optList[entry].doff] = flag;
521 } 563 }
522 } 564 }
523 else 565 else
524#ifdef KEYSYM_RESOURCE 566#ifdef KEYSYM_RESOURCE
525 /* if (!STRNCMP (opt, "keysym.", sizeof ("keysym.") - 1)) */ 567 /* if (!strncmp (opt, "keysym.", sizeof ("keysym.") - 1)) */
526 if (rxvt_Str_match (opt, "keysym.")) 568 if (rxvt_Str_match (opt, "keysym."))
527 { 569 {
528 const char *str = argv[++i]; 570 const char *str = argv[++i];
529 571
530 if (str != NULL) 572 if (str != NULL)
… …
599 { 641 {
600 if (str[0] == '0' && toupper (str[1]) == 'X') 642 if (str[0] == '0' && toupper (str[1]) == 'X')
601 str += 2; 643 str += 2;
602 if (arg) 644 if (arg)
603 { 645 {
604 if (sscanf (str, (STRCHR (str, ':') ? "%x:" : "%x"), &sym) != 1) 646 if (sscanf (str, (strchr (str, ':') ? "%x:" : "%x"), &sym) != 1)
605 return -1; 647 return -1;
606 } 648 }
607 else 649 else
608 { 650 {
609 if (sscanf (str, "%x:", &sym) != 1) 651 if (sscanf (str, "%x:", &sym) != 1)
610 return -1; 652 return -1;
611 653
612 /* cue to ':', it's there since sscanf () worked */ 654 /* cue to ':', it's there since sscanf () worked */
613 STRNCPY (newargstr, STRCHR (str, ':') + 1, NEWARGLIM - 1); 655 strncpy (newargstr, strchr (str, ':') + 1, NEWARGLIM - 1);
614 newargstr[NEWARGLIM - 1] = '\0'; 656 newargstr[NEWARGLIM - 1] = '\0';
615 newarg = newargstr; 657 newarg = newargstr;
616 } 658 }
617 } 659 }
618 else 660 else
619 { 661 {
620 /* 662 /*
621 * convert keysym name to keysym number 663 * convert keysym name to keysym number
622 */ 664 */
623 STRNCPY (newargstr, str, NEWARGLIM - 1); 665 strncpy (newargstr, str, NEWARGLIM - 1);
624 newargstr[NEWARGLIM - 1] = '\0'; 666 newargstr[NEWARGLIM - 1] = '\0';
625 if (arg == NULL) 667 if (arg == NULL)
626 { 668 {
627 if ((newarg = STRCHR (newargstr, ':')) == NULL) 669 if ((newarg = strchr (newargstr, ':')) == NULL)
628 return -1; 670 return -1;
629 *newarg++ = '\0'; /* terminate keysym name */ 671 *newarg++ = '\0'; /* terminate keysym name */
630 } 672 }
631 if ((sym = XStringToKeysym (newargstr)) == None) 673 if ((sym = XStringToKeysym (newargstr)) == None)
632 return -1; 674 return -1;
… …
638 if (Keysym_map[sym] != NULL) /* already set ? */ 680 if (Keysym_map[sym] != NULL) /* already set ? */
639 return -1; 681 return -1;
640 682
641 if (newarg == NULL) 683 if (newarg == NULL)
642 { 684 {
643 STRNCPY (newargstr, arg, NEWARGLIM - 1); 685 strncpy (newargstr, arg, NEWARGLIM - 1);
644 newargstr[NEWARGLIM - 1] = '\0'; 686 newargstr[NEWARGLIM - 1] = '\0';
645 newarg = newargstr; 687 newarg = newargstr;
646 } 688 }
647 rxvt_Str_trim (newarg); 689 rxvt_Str_trim (newarg);
648 if (*newarg == '\0' || (n = rxvt_Str_escaped (newarg)) == 0) 690 if (*newarg == '\0' || (n = rxvt_Str_escaped (newarg)) == 0)
649 return -1; 691 return -1;
650 MIN_IT (n, 255); 692 MIN_IT (n, 255);
651 key_string = (char *)rxvt_malloc ((n + 1) * sizeof (char)); 693 key_string = (char *)rxvt_malloc ((n + 1) * sizeof (char));
652 694
653 key_string[0] = n; 695 key_string[0] = n;
654 STRNCPY (key_string + 1, newarg, n); 696 strncpy (key_string + 1, newarg, n);
655 Keysym_map[sym] = (unsigned char *)key_string; 697 Keysym_map[sym] = (unsigned char *)key_string;
656 698
657 return 1; 699 return 1;
658} 700}
659 701
… …
671 char *str, buffer[256]; 713 char *str, buffer[256];
672 714
673 if (stream == NULL) 715 if (stream == NULL)
674 return; 716 return;
675 717
676 len = STRLEN (name); 718 len = strlen (name);
677 while ((str = fgets (buffer, sizeof (buffer), stream)) != NULL) 719 while ((str = fgets (buffer, sizeof (buffer), stream)) != NULL)
678 { 720 {
679 unsigned int entry, n; 721 unsigned int entry, n;
680 722
681 while (*str && isspace (*str)) 723 while (*str && isspace (*str))
682 str++; /* leading whitespace */ 724 str++; /* leading whitespace */
683 725
684 if ((str[len] != '*' && str[len] != '.') 726 if ((str[len] != '*' && str[len] != '.')
685 || (len && STRNCMP (str, name, len))) 727 || (len && strncmp (str, name, len)))
686 continue; 728 continue;
687 str += (len + 1); /* skip `name*' or `name.' */ 729 str += (len + 1); /* skip `name*' or `name.' */
688 730
689# ifdef KEYSYM_RESOURCE 731# ifdef KEYSYM_RESOURCE
690 if (!parse_keysym (str, NULL)) 732 if (!parse_keysym (str, NULL))
… …
694 const char *kw = optList[entry].kw; 736 const char *kw = optList[entry].kw;
695 737
696 if (kw == NULL) 738 if (kw == NULL)
697 continue; 739 continue;
698 740
699 n = STRLEN (kw); 741 n = strlen (kw);
700 if (str[n] == ':' && rxvt_Str_match (str, kw)) 742 if (str[n] == ':' && rxvt_Str_match (str, kw))
701 { 743 {
702 /* skip `keyword:' */ 744 /* skip `keyword:' */
703 str += n + 1; 745 str += n + 1;
704 rxvt_Str_trim (str); 746 rxvt_Str_trim (str);
705 n = STRLEN (str); 747 n = strlen (str);
706 if (n && rs[optList[entry].doff] == NULL) 748 if (n && rs[optList[entry].doff] == NULL)
707 { 749 {
708 /* not already set */ 750 /* not already set */
709 int s; 751 int s;
710 char *p = 0; 752 char *p = 0;
711 753
712 for (int o = 0;;) 754 for (int o = 0;;)
713 { 755 {
714 p = (char *)rxvt_realloc (p, o + n + 1); 756 p = (char *)rxvt_realloc (p, o + n + 1);
715 MEMCPY (p + o, str, n); 757 memcpy (p + o, str, n);
716 o += n; 758 o += n;
717 p[o] = 0; 759 p[o] = 0;
718 760
719 if (o == 0 || p[o - 1] != '\\') // continuation line 761 if (o == 0 || p[o - 1] != '\\') // continuation line
720 break; 762 break;
… …
723 765
724 if ((str = fgets (buffer, sizeof (buffer), stream)) == NULL) 766 if ((str = fgets (buffer, sizeof (buffer), stream)) == NULL)
725 break; 767 break;
726 768
727 rxvt_Str_trim (str); 769 rxvt_Str_trim (str);
728 n = STRLEN (str); 770 n = strlen (str);
729 } 771 }
730 772
731 rs[optList[entry].doff] = p; 773 rs[optList[entry].doff] = p;
732 allocated.push_back (p); 774 allocated.push_back (p);
733 775
734 if (optList_isBool (entry)) 776 if (optList_isBool (entry))
735 { 777 {
736 s = STRCASECMP (str, "TRUE") == 0 778 s = strcasecmp (str, "TRUE") == 0
737 || STRCASECMP (str, "YES") == 0 779 || strcasecmp (str, "YES") == 0
738 || STRCASECMP (str, "ON") == 0 780 || strcasecmp (str, "ON") == 0
739 || STRCASECMP (str, "1") == 0; 781 || strcasecmp (str, "1") == 0;
740 782
741 if (optList_isReverse (entry)) 783 if (optList_isReverse (entry))
742 s = !s; 784 s = !s;
743 785
744 if (s) 786 if (s)
745 Options |= optList[entry].flag; 787 options |= optList[entry].flag;
746 else 788 else
747 Options &= ~optList[entry].flag; 789 options &= ~optList[entry].flag;
748 } 790 }
749 } 791 }
750 792
751 break; 793 break;
752 } 794 }
… …
811 database = XrmGetStringDatabase (displayResource); 853 database = XrmGetStringDatabase (displayResource);
812 854
813# ifdef HAVE_EXTRA_XRESOURCE_FILES 855# ifdef HAVE_EXTRA_XRESOURCE_FILES
814 /* Add in ~/.Xdefaults or ~/.Xresources */ 856 /* Add in ~/.Xdefaults or ~/.Xresources */
815 { 857 {
816 char *ptr; 858 char *ptr;
817 859
818 if ((ptr = (char *)getenv ("HOME")) == NULL) 860 if ((ptr = (char *)getenv ("HOME")) == NULL)
819 ptr = "."; 861 ptr = ".";
820 862
821 for (i = 0; i < (sizeof (xnames) / sizeof (xnames[0])); i++) 863 for (i = 0; i < (sizeof (xnames) / sizeof (xnames[0])); i++)
822 { 864 {
823 sprintf (fname, "%-.*s/%s", sizeof (fname) - STRLEN (xnames[i]) - 2, 865 sprintf (fname, "%-.*s/%s", sizeof (fname) - strlen (xnames[i]) - 2,
824 ptr, xnames[i]); 866 ptr, xnames[i]);
825 if ((rdb1 = XrmGetFileDatabase (fname))) 867 if ((rdb1 = XrmGetFileDatabase (fname)))
826 { 868 {
827 XrmMergeDatabases (rdb1, &database); 869 XrmMergeDatabases (rdb1, &database);
828# ifndef HAVE_BOTH_XRESOURCE_FILES 870# ifndef HAVE_BOTH_XRESOURCE_FILES
… …
873 if (kw == NULL || rs[optList[entry].doff] != NULL) 915 if (kw == NULL || rs[optList[entry].doff] != NULL)
874 continue; /* previously set */ 916 continue; /* previously set */
875 917
876 p = XGetDefault (display, name, kw); 918 p = XGetDefault (display, name, kw);
877 p0 = XGetDefault (display, "!INVALIDPROGRAMMENAMEDONTMATCH!", kw); 919 p0 = XGetDefault (display, "!INVALIDPROGRAMMENAMEDONTMATCH!", kw);
878 if (p == NULL || (p0 && STRCMP (p, p0) == 0)) 920 if (p == NULL || (p0 && strcmp (p, p0) == 0))
879 { 921 {
880 p = XGetDefault (display, RESCLASS, kw); 922 p = XGetDefault (display, RESCLASS, kw);
881#ifdef RESFALLBACK 923#ifdef RESFALLBACK
882 if (p == NULL || (p0 && STRCMP (p, p0) == 0)) 924 if (p == NULL || (p0 && strcmp (p, p0) == 0))
883 p = XGetDefault (display, RESFALLBACK, kw); 925 p = XGetDefault (display, RESFALLBACK, kw);
884#endif 926#endif
885 } 927 }
886 928
887 if (p == NULL && p0) 929 if (p == NULL && p0)
… …
891 { 933 {
892 rs[optList[entry].doff] = p; 934 rs[optList[entry].doff] = p;
893 935
894 if (optList_isBool (entry)) 936 if (optList_isBool (entry))
895 { 937 {
896 s = STRCASECMP (p, "TRUE") == 0 938 s = strcasecmp (p, "TRUE") == 0
897 || STRCASECMP (p, "YES") == 0 939 || strcasecmp (p, "YES") == 0
898 || STRCASECMP (p, "ON") == 0 940 || strcasecmp (p, "ON") == 0
899 || STRCASECMP (p, "1") == 0; 941 || strcasecmp (p, "1") == 0;
900 if (optList_isReverse (entry)) 942 if (optList_isReverse (entry))
901 s = !s; 943 s = !s;
902 if (s) 944 if (s)
903 Options |= (optList[entry].flag); 945 options |= (optList[entry].flag);
904 else 946 else
905 Options &= ~ (optList[entry].flag); 947 options &= ~ (optList[entry].flag);
906 } 948 }
907 } 949 }
908 } 950 }
909 951
910 /* 952 /*
… …
938 FILE *fd = NULL; 980 FILE *fd = NULL;
939 char *home; 981 char *home;
940 982
941 if ((home = getenv ("HOME")) != NULL) 983 if ((home = getenv ("HOME")) != NULL)
942 { 984 {
943 unsigned int i, len = STRLEN (home) + 2; 985 unsigned int i, len = strlen (home) + 2;
944 char *f = NULL; 986 char *f = NULL;
945 987
946 for (i = 0; i < (sizeof (xnames) / sizeof (xnames[0])); i++) 988 for (i = 0; i < (sizeof (xnames) / sizeof (xnames[0])); i++)
947 { 989 {
948 f = (char *)rxvt_realloc (f, (len + STRLEN (xnames[i])) * sizeof (char)); 990 f = (char *)rxvt_realloc (f, (len + strlen (xnames[i])) * sizeof (char));
949 991
950 sprintf (f, "%s/%s", home, xnames[i]); 992 sprintf (f, "%s/%s", home, xnames[i]);
951 993
952 if ((fd = fopen (f, "r")) != NULL) 994 if ((fd = fopen (f, "r")) != NULL)
953 break; 995 break;

Diff Legend

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