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.43 by root, Wed Dec 15 00:53:23 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"),
96 BOOL (Rs_pastableTabs, "pastableTabs", "ptab", Opt_pastableTabs, "tab characters are pastable"),
100#ifdef HAVE_SCROLLBARS 97#ifdef HAVE_SCROLLBARS
101 BOOL (Rs_scrollBar, "scrollBar", "sb", Opt_scrollBar, "scrollbar"), 98 BOOL (Rs_scrollBar, "scrollBar", "sb", Opt_scrollBar, "scrollbar"),
102 BOOL (Rs_scrollBar_right, "scrollBar_right", "sr", Opt_scrollBar_right, 99 BOOL (Rs_scrollBar_right, "scrollBar_right", "sr", Opt_scrollBar_right, "scrollbar right"),
103 "scrollbar right"), 100 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 101#endif
107 BOOL (Rs_scrollTtyOutput, "scrollTtyOutput", NULL, Opt_scrollTtyOutput, 102 BOOL (Rs_scrollTtyOutput, "scrollTtyOutput", NULL, Opt_scrollTtyOutput, NULL),
108 NULL),
109 BOOL (Rs_scrollTtyOutput, NULL, "si", Opt_Reverse | Opt_scrollTtyOutput, 103 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, 104 BOOL (Rs_scrollTtyKeypress, "scrollTtyKeypress", "sk", Opt_scrollTtyKeypress, "scroll-on-keypress"),
112 "scroll-on-keypress"),
113 BOOL (Rs_scrollWithBuffer, "scrollWithBuffer", "sw", Opt_scrollWithBuffer, 105 BOOL (Rs_scrollWithBuffer, "scrollWithBuffer", "sw", Opt_scrollWithBuffer, "scroll-with-buffer"),
114 "scroll-with-buffer"),
115#ifdef TRANSPARENT 106#ifdef TRANSPARENT
116 BOOL (Rs_transparent, "inheritPixmap", "ip", Opt_transparent, 107 BOOL (Rs_transparent, "inheritPixmap", "ip", Opt_transparent, "inherit parent pixmap"),
117 "inherit parent pixmap"),
118 BOOL (Rs_transparent_all, "inheritPixmapforce", "ipf", Opt_transparent_all, 108 BOOL (Rs_transparent_all, "inheritPixmapforce", "ipf", Opt_transparent_all, "forcefully inherit root pixmap"),
119 "forcefully inherit root pixmap"),
120 SWCH ("tr", Opt_transparent, NULL), 109 SWCH ("tr", Opt_transparent, NULL),
110#if TINTING
111 STRG (Rs_color + Color_tint, "tintColor", "tint", "color", "tint color"),
112#endif
113#endif
114#ifdef OFF_FOCUS_FADING
115 STRG (Rs_fade, "fading", "fade", "%", "make colors x% darker when rxvt-unicode is losing focus."),
116#endif
117#ifdef TINTING
118 STRG (Rs_shade, "shading", "sh", "%", "shade background by x% when tinting."),
121#endif 119#endif
122 BOOL (Rs_utmpInhibit, "utmpInhibit", "ut", Opt_utmpInhibit, "utmp inhibit"), 120 BOOL (Rs_utmpInhibit, "utmpInhibit", "ut", Opt_utmpInhibit, "utmp inhibit"),
123#ifndef NO_BELL 121#ifndef NO_BELL
124 BOOL (Rs_visualBell, "visualBell", "vb", Opt_visualBell, "visual bell"), 122 BOOL (Rs_visualBell, "visualBell", "vb", Opt_visualBell, "visual bell"),
125# if ! defined(NO_MAPALERT) && defined(MAPALERT_OPTION) 123# if ! defined(NO_MAPALERT) && defined(MAPALERT_OPTION)
… …
128#endif 126#endif
129#ifdef META8_OPTION 127#ifdef META8_OPTION
130 BOOL (Rs_meta8, "meta8", NULL, Opt_meta8, NULL), 128 BOOL (Rs_meta8, "meta8", NULL, Opt_meta8, NULL),
131#endif 129#endif
132#ifdef MOUSE_WHEEL 130#ifdef MOUSE_WHEEL
133 BOOL (Rs_mouseWheelScrollPage, "mouseWheelScrollPage", NULL, Opt_mouseWheelScrollPage, 131 BOOL (Rs_mouseWheelScrollPage, "mouseWheelScrollPage", NULL, Opt_mouseWheelScrollPage, NULL),
134 NULL),
135#endif 132#endif
136#ifndef NO_FRILLS 133#if ENABLE_FRILLS
137 BOOL (Rs_tripleclickwords, "tripleclickwords", "tcw", Opt_tripleclickwords, 134 BOOL (Rs_tripleclickwords, "tripleclickwords", "tcw", Opt_tripleclickwords, "triple click word selection"),
138 "triple click word selection"), 135 BOOL (Rs_insecure, "insecure", "insecure", Opt_insecure, "enable possibly insecure escape sequences"),
139#endif 136#endif
140#ifdef CURSOR_BLINK 137#ifdef CURSOR_BLINK
141 BOOL (Rs_cursorBlink, "cursorBlink", "bc", Opt_cursorBlink, "blinking cursor"), 138 BOOL (Rs_cursorBlink, "cursorBlink", "bc", Opt_cursorBlink, "blinking cursor"),
142#endif 139#endif
143#ifdef POINTER_BLANK 140#ifdef POINTER_BLANK
… …
163 RSTRG (Rs_color + minBrightCOLOR + 6, "color14", "color"), 160 RSTRG (Rs_color + minBrightCOLOR + 6, "color14", "color"),
164 RSTRG (Rs_color + minBrightCOLOR + 7, "color15", "color"), 161 RSTRG (Rs_color + minBrightCOLOR + 7, "color15", "color"),
165#endif /* NO_BRIGHTCOLOR */ 162#endif /* NO_BRIGHTCOLOR */
166#ifndef NO_BOLD_UNDERLINE_REVERSE 163#ifndef NO_BOLD_UNDERLINE_REVERSE
167 RSTRG (Rs_color + Color_BD, "colorBD", "color"), 164 RSTRG (Rs_color + Color_BD, "colorBD", "color"),
165 RSTRG (Rs_color + Color_IT, "colorIT", "color"),
168 RSTRG (Rs_color + Color_UL, "colorUL", "color"), 166 RSTRG (Rs_color + Color_UL, "colorUL", "color"),
169 RSTRG (Rs_color + Color_RV, "colorRV", "color"), 167 RSTRG (Rs_color + Color_RV, "colorRV", "color"),
170#endif /* ! NO_BOLD_UNDERLINE_REVERSE */ 168#endif /* ! NO_BOLD_UNDERLINE_REVERSE */
169#if ENABLE_FRILLS
170 RSTRG (Rs_color + Color_underline, "underlineColor", "color"),
171#endif
171#ifdef KEEP_SCROLLCOLOR 172#ifdef KEEP_SCROLLCOLOR
172 RSTRG (Rs_color + Color_scroll, "scrollColor", "color"), 173 RSTRG (Rs_color + Color_scroll, "scrollColor", "color"),
173 RSTRG (Rs_color + Color_trough, "troughColor", "color"), 174 RSTRG (Rs_color + Color_trough, "troughColor", "color"),
174#endif /* KEEP_SCROLLCOLOR */ 175#endif /* KEEP_SCROLLCOLOR */
175#ifdef OPTION_HC 176#ifdef OPTION_HC
… …
177#endif 178#endif
178#if defined (XPM_BACKGROUND) || (MENUBAR_MAX) 179#if defined (XPM_BACKGROUND) || (MENUBAR_MAX)
179 RSTRG (Rs_path, "path", "search path"), 180 RSTRG (Rs_path, "path", "search path"),
180#endif /* defined (XPM_BACKGROUND) || (MENUBAR_MAX) */ 181#endif /* defined (XPM_BACKGROUND) || (MENUBAR_MAX) */
181#ifdef XPM_BACKGROUND 182#ifdef XPM_BACKGROUND
182 STRG (Rs_backgroundPixmap, "backgroundPixmap", "pixmap", "file[;geom]", 183 STRG (Rs_backgroundPixmap, "backgroundPixmap", "pixmap", "file[;geom]", "background pixmap"),
183 "background pixmap"),
184#endif /* XPM_BACKGROUND */ 184#endif /* XPM_BACKGROUND */
185#if (MENUBAR_MAX) 185#if (MENUBAR_MAX)
186 RSTRG (Rs_menu, "menu", "name[;tag]"), 186 RSTRG (Rs_menu, "menu", "name[;tag]"),
187#endif 187#endif
188 /* fonts: command-line option = resource name */
188 STRG (Rs_font, "font", "fn", "fontname", "normal text font"), 189 STRG (Rs_font, "font", "fn", "fontname", "normal text font"),
189 /* fonts: command-line option = resource name */ 190#if ENABLE_STYLES
191 STRG (Rs_boldFont, "boldFont", "fb", "fontname", "bold font"),
192 STRG (Rs_italicFont, "italicFont", "fi", "fontname", "italic font"),
193 STRG (Rs_boldItalicFont, "boldItalicFont", "fbi", "fontname", "bold italic font"),
194#endif
190#ifdef USE_XIM 195#ifdef USE_XIM
191 STRG (Rs_inputMethod, "inputMethod", "im", "name", "name of input method"), 196 STRG (Rs_inputMethod, "inputMethod", "im", "name", "name of input method"),
192 STRG (Rs_preeditType, "preeditType", "pt", "style", 197 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) 198#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
195 STRG (Rs_imLocale, "imLocale", "imlocale", "string", "locale to use for input method"), 199 STRG (Rs_imLocale, "imLocale", "imlocale", "string", "locale to use for input method"),
196#endif 200#endif
197#endif /* USE_XIM */ 201#endif /* USE_XIM */
198 STRG (Rs_name, NULL, "name", "string", 202 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"), 203 STRG (Rs_title, "title", "title", "string", "title name for window"),
201 STRG (Rs_title, NULL, "T", NULL, NULL), /* short form */ 204 STRG (Rs_title, NULL, "T", NULL, NULL), /* short form */
202 STRG (Rs_iconName, "iconName", "n", "string", "icon name for window"), 205 STRG (Rs_iconName, "iconName", "n", "string", "icon name for window"),
203#ifndef NO_CURSORCOLOR 206#ifndef NO_CURSORCOLOR
204 STRG (Rs_color + Color_cursor, "cursorColor", "cr", "color", "cursor color"), 207 STRG (Rs_color + Color_cursor, "cursorColor", "cr", "color", "cursor color"),
205 /* command-line option = resource name */ 208 /* command-line option = resource name */
206 RSTRG (Rs_color + Color_cursor2, "cursorColor2", "color"), 209 RSTRG (Rs_color + Color_cursor2, "cursorColor2", "color"),
207#endif /* NO_CURSORCOLOR */ 210#endif /* NO_CURSORCOLOR */
208 STRG (Rs_color + Color_pointer, "pointerColor", "pr", "color", 211 STRG (Rs_color + Color_pointer_fg, "pointerColor", "pr", "color", "pointer color"),
209 "pointer color"), 212 STRG (Rs_color + Color_pointer_bg, "pointerColor2", "pr2", "color", "pointer bg color"),
210 STRG (Rs_color + Color_border, "borderColor", "bd", "color", 213 STRG (Rs_color + Color_border, "borderColor", "bd", "color", "border color"),
211 "border color"),
212 STRG (Rs_saveLines, "saveLines", "sl", "number", 214 STRG (Rs_saveLines, "saveLines", "sl", "number", "number of scrolled lines to save"),
213 "number of scrolled lines to save"), 215#if ENABLE_FRILLS
214#ifndef NO_FRILLS
215 STRG (Rs_ext_bwidth, "externalBorder", "w", "number", 216 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), 217 STRG (Rs_ext_bwidth, NULL, "bw", NULL, NULL),
218 STRG (Rs_ext_bwidth, NULL, "borderwidth", NULL, NULL), 218 STRG (Rs_ext_bwidth, NULL, "borderwidth", NULL, NULL),
219 STRG (Rs_int_bwidth, "internalBorder", "b", "number", 219 STRG (Rs_int_bwidth, "internalBorder", "b", "number", "internal border in pixels"),
220 "internal border in pixels"), 220 BOOL (Rs_borderLess, "borderLess", "bl", Opt_borderLess, "borderless window"),
221#endif 221#endif
222#ifndef NO_LINESPACE 222#ifndef NO_LINESPACE
223 STRG (Rs_lineSpace, "lineSpace", "lsp", "number", 223 STRG (Rs_lineSpace, "lineSpace", "lsp", "number", "number of extra pixels between rows"),
224 "number of extra pixels between rows"),
225#endif 224#endif
226 STRG (Rs_scrollBar_thickness, "thickness", "sbt", "number", 225 STRG (Rs_scrollBar_thickness, "thickness", "sbt", "number", "scrollbar thickness/width in pixels"),
227 "scrollbar thickness/width in pixels"),
228#ifdef POINTER_BLANK 226#ifdef POINTER_BLANK
229 RSTRG (Rs_pointerBlankDelay, "pointerBlankDelay", "number"), 227 RSTRG (Rs_pointerBlankDelay, "pointerBlankDelay", "number"),
230#endif 228#endif
231#ifndef NO_BACKSPACE_KEY 229#ifndef NO_BACKSPACE_KEY
232 RSTRG (Rs_backspace_key, "backspacekey", "string"), 230 RSTRG (Rs_backspace_key, "backspacekey", "string"),
… …
240 RSTRG (Rs_scrollBar_align, "scrollBar_align", "mode"), 238 RSTRG (Rs_scrollBar_align, "scrollBar_align", "mode"),
241#endif 239#endif
242#ifdef PRINTPIPE 240#ifdef PRINTPIPE
243 RSTRG (Rs_print_pipe, "print-pipe", "string"), 241 RSTRG (Rs_print_pipe, "print-pipe", "string"),
244#endif 242#endif
245 STRG (Rs_modifier, "modifier", "mod", "modifier", 243 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"), 244 INFO ("xrm", "string", "X resource"),
248#ifdef CUTCHAR_RESOURCE 245#ifdef CUTCHAR_RESOURCE
249 RSTRG (Rs_cutchars, "cutchars", "string"), 246 RSTRG (Rs_cutchars, "cutchars", "string"),
250#endif /* CUTCHAR_RESOURCE */ 247#endif /* CUTCHAR_RESOURCE */
251 RSTRG (Rs_answerbackstring, "answerbackString", "string"), 248 RSTRG (Rs_answerbackstring, "answerbackString", "string"),
249#ifndef NO_SECONDARY_SCREEN
250 BOOL (Rs_secondaryScreen, "secondaryScreen", "ssc", Opt_secondaryScreen, "enable secondary screen"),
251 BOOL (Rs_secondaryScroll, "secondaryScroll", "ssr", Opt_secondaryScroll, "enable secondary screen scroll"),
252#endif
252 INFO ("e", "command arg ...", "command to execute") 253 INFO ("e", "command arg ...", "command to execute")
253 }; 254 };
254 255
255#undef INFO 256#undef INFO
256#undef STRG 257#undef STRG
257#undef RSTRG 258#undef RSTRG
258#undef SWCH 259#undef SWCH
259#undef BOOL 260#undef BOOL
260/*}}} */ 261/*}}} */
261 262
262static const char releasestring[] = "Rxvt v" VERSION " - released: " DATE "\n"; 263static const char releasestring[] = "rxvt-unicode (" RXVTNAME ") v" VERSION " - released: " DATE "\n";
263static const char optionsstring[] = "Options: " 264static const char optionsstring[] = "options: "
265#if XFT
266 "xft,"
267#endif
268#if ENABLE_STYLES
269 "styles,"
270#endif
271#if ENABLE_COMBINING
272 "combining,"
273#endif
274#if TEXT_BLINK
275 "blink,"
276#endif
277#if ISO_14755
278 "iso14755,"
279#endif
280#if UNICODE_3
281 "unicode3,"
282#endif
283 "encodings=eu+vn"
284#if ENCODING_JP
285 "+jp"
286#endif
287#if ENCODING_JP_EXT
288 "+jp-ext"
289#endif
290#if ENCODING_KR
291 "+kr"
292#endif
293#if ENCODING_ZH
294 "+zh"
295#endif
296#if ENCODING_ZH_EXT
297 "+zh-ext"
298#endif
299 ","
300#if OFF_FOCUS_FADING
301 "fade,"
302#endif
264#if defined(XPM_BACKGROUND) 303#if defined(XPM_BACKGROUND)
265 "XPM," 304 "XPM,"
266#endif 305#endif
267#if defined(TRANSPARENT) 306#if defined(TRANSPARENT)
268 "transparent," 307 "transparent,"
269#endif 308#endif
309#if TINTING
310 "tint,"
311#endif
270#if defined(UTMP_SUPPORT) 312#if defined(UTMP_SUPPORT)
271 "utmp," 313 "utmp,"
272#endif 314#endif
273#if defined(MENUBAR) 315#if defined(MENUBAR)
274 "menubar," 316 "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 317#endif
285#if defined(USE_XIM) 318#if defined(USE_XIM)
286 "XIM," 319 "XIM,"
287#endif 320#endif
288 "scrollbars=" 321 "scrollbars="
… …
316 "no_backspace," 349 "no_backspace,"
317#endif 350#endif
318#if defined(NO_DELETE_KEY) 351#if defined(NO_DELETE_KEY)
319 "no_delete," 352 "no_delete,"
320#endif 353#endif
354#if EIGHT_BIT_CONTROLS
355 "8bitctrls,"
356#endif
321#if !defined(NO_STRINGS) 357#if !defined(NO_STRINGS)
322 "strings," 358 "strings,"
323#endif 359#endif
324#if defined(TTY_256COLOR) 360#if defined(ENABLE_FRILLS)
361 "frills,"
362#endif
363#if !defined(NO_LINESPACE)
364 "linespace,"
365#endif
366#if defined(PREFER_24BIT)
325 "256colour," 367 "24bit,"
368#endif
369#if defined(SELECTION_SCROLLING)
370 "selectionscrolling,"
371#endif
372#if MOUSE_WHEEL
373 "wheel,"
374#endif
375#if MOUSE_SLIP_WHEELING
376 "slipwheel,"
377#endif
378#if defined(SMART_RESIZE)
379 "smart-resize,"
380#endif
381#if defined(CURSOR_BLINK)
382 "cursorBlink,"
383#endif
384#if defined(POINTER_BLANK)
385 "pointerBlank,"
326#endif 386#endif
327#if defined(NO_RESOURCES) 387#if defined(NO_RESOURCES)
328 "NoResources" 388 "NoResources"
329#else 389#else
330# if defined(USE_XGETDEFAULT) 390# if defined(USE_XGETDEFAULT)
… …
363 len++; /* account for space */ 423 len++; /* account for space */
364 } 424 }
365#ifdef DEBUG_STRICT 425#ifdef DEBUG_STRICT
366 assert (optList[i].opt != NULL); 426 assert (optList[i].opt != NULL);
367#endif 427#endif
368 len += 4 + STRLEN (optList[i].opt) + (optList_isBool (i) ? 2: 0); 428 len += 4 + strlen (optList[i].opt) + (optList_isBool (i) ? 2: 0);
369 col += len; 429 col += len;
370 if (col > 79) 430 if (col > 79)
371 { /* assume regular width */ 431 { /* assume regular width */
372 rxvt_log ("\n"); 432 rxvt_log ("\n");
373 col = 1 + len; 433 col = 1 + len;
… …
390#ifdef DEBUG_STRICT 450#ifdef DEBUG_STRICT
391 assert (optList[i].opt != NULL); 451 assert (optList[i].opt != NULL);
392#endif 452#endif
393 rxvt_log (" %s%s %-*s%s%s\n", 453 rxvt_log (" %s%s %-*s%s%s\n",
394 (optList_isBool (i) ? "-/+" : "-"), optList[i].opt, 454 (optList_isBool (i) ? "-/+" : "-"), optList[i].opt,
395 (INDENT - STRLEN (optList[i].opt) 455 (INDENT - strlen (optList[i].opt)
396 + (optList_isBool (i) ? 0 : 2)), 456 + (optList_isBool (i) ? 0 : 2)),
397 (optList[i].arg ? optList[i].arg : ""), 457 (optList[i].arg ? optList[i].arg : ""),
398 (optList_isBool (i) ? "turn on/off " : ""), 458 (optList_isBool (i) ? "turn on/off " : ""),
399 optList[i].desc); 459 optList[i].desc);
400 } 460 }
… …
407 467
408 for (i = 0; i < optList_size (); i++) 468 for (i = 0; i < optList_size (); i++)
409 if (optList[i].kw != NULL) 469 if (optList[i].kw != NULL)
410 rxvt_log (" %s: %*s%s\n", 470 rxvt_log (" %s: %*s%s\n",
411 optList[i].kw, 471 optList[i].kw,
412 (INDENT - STRLEN (optList[i].kw)), "", /* XXX */ 472 (INDENT - strlen (optList[i].kw)), "", /* XXX */
413 (optList_isBool (i) ? "boolean" : optList[i].arg)); 473 (optList_isBool (i) ? "boolean" : optList[i].arg));
414#ifdef KEYSYM_RESOURCE 474#ifdef KEYSYM_RESOURCE
415 rxvt_log (" " "keysym.sym" ": %*s%s\n", 475 rxvt_log (" " "keysym.sym" ": %*s%s\n",
416 (INDENT - sizeof ("keysym.sym") + 1), "", /* XXX */ 476 (INDENT - sizeof ("keysym.sym") + 1), "", /* XXX */
417 "keysym"); 477 "keysym");
… …
460 bad_option = 1; 520 bad_option = 1;
461 rxvt_warn ("\"%s\": malformed option.\n", opt); 521 rxvt_warn ("\"%s\": malformed option.\n", opt);
462 continue; 522 continue;
463 } 523 }
464 524
465 if (!STRCMP (opt, "help")) 525 if (!strcmp (opt, "help"))
466 rxvt_usage (longopt ? 2 : 1); 526 rxvt_usage (longopt ? 2 : 1);
467 if (!STRCMP (opt, "h")) 527 if (!strcmp (opt, "h"))
468 rxvt_usage (0); 528 rxvt_usage (0);
469 529
470 /* feature: always try to match long-options */ 530 /* feature: always try to match long-options */
471 for (entry = 0; entry < optList_size (); entry++) 531 for (entry = 0; entry < optList_size (); entry++)
472 if ((optList[entry].kw && !STRCMP (opt, optList[entry].kw)) 532 if ((optList[entry].kw && !strcmp (opt, optList[entry].kw))
473 || (!longopt 533 || (!longopt
474 && optList[entry].opt && !STRCMP (opt, optList[entry].opt))) 534 && optList[entry].opt && !strcmp (opt, optList[entry].opt)))
475 break; 535 break;
476 536
477 if (entry < optList_size ()) 537 if (entry < optList_size ())
478 { 538 {
479 if (optList_isReverse (entry)) 539 if (optList_isReverse (entry))
480 flag = flag == On ? Off : On; 540 flag = flag == On ? Off : On;
541
481 if (optList_strlen (entry)) 542 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 { 543 {
492#ifdef DEBUG_RESOURCES
493 fprintf (stderr, "\"%s\"\n", str);
494#endif
495 rs[optList[entry].doff] = str;
496 /* 544 /*
497 * special cases are handled in main.c:main () to allow 545 * special cases are handled in main.c:main () to allow
498 * X resources to set these values before we settle for 546 * X resources to set these values before we settle for
499 * default values 547 * default values
500 */ 548 */
501 }
502#ifdef DEBUG_RESOURCES
503 else
504 fprintf (stderr, "???\n");
505#endif
506 549
550 if (optList[entry].doff != -1)
551 rs[optList[entry].doff] = flag == On && argv[i+1]
552 ? argv[++i] : 0;
507 } 553 }
508 else 554 else
509 { /* boolean value */ 555 { /* boolean value */
510#ifdef DEBUG_RESOURCES 556#ifdef DEBUG_RESOURCES
511 fprintf (stderr, "boolean (%s,%s) = %s\n", 557 fprintf (stderr, "boolean (%s,%s) = %s\n",
512 optList[entry].opt, optList[entry].kw, flag); 558 optList[entry].opt, optList[entry].kw, flag);
513#endif 559#endif
514 if (flag == On) 560 if (flag == On)
515 Options |= (optList[entry].flag); 561 options |= (optList[entry].flag);
516 else 562 else
517 Options &= ~ (optList[entry].flag); 563 options &= ~ (optList[entry].flag);
518 564
519 if (optList[entry].doff != -1) 565 if (optList[entry].doff != -1)
520 rs[optList[entry].doff] = flag; 566 rs[optList[entry].doff] = flag;
521 } 567 }
522 } 568 }
523 else 569 else
524#ifdef KEYSYM_RESOURCE 570#ifdef KEYSYM_RESOURCE
525 /* if (!STRNCMP (opt, "keysym.", sizeof ("keysym.") - 1)) */ 571 /* if (!strncmp (opt, "keysym.", sizeof ("keysym.") - 1)) */
526 if (rxvt_Str_match (opt, "keysym.")) 572 if (rxvt_Str_match (opt, "keysym."))
527 { 573 {
528 const char *str = argv[++i]; 574 const char *str = argv[++i];
529 575
530 if (str != NULL) 576 if (str != NULL)
… …
599 { 645 {
600 if (str[0] == '0' && toupper (str[1]) == 'X') 646 if (str[0] == '0' && toupper (str[1]) == 'X')
601 str += 2; 647 str += 2;
602 if (arg) 648 if (arg)
603 { 649 {
604 if (sscanf (str, (STRCHR (str, ':') ? "%x:" : "%x"), &sym) != 1) 650 if (sscanf (str, (strchr (str, ':') ? "%x:" : "%x"), &sym) != 1)
605 return -1; 651 return -1;
606 } 652 }
607 else 653 else
608 { 654 {
609 if (sscanf (str, "%x:", &sym) != 1) 655 if (sscanf (str, "%x:", &sym) != 1)
610 return -1; 656 return -1;
611 657
612 /* cue to ':', it's there since sscanf () worked */ 658 /* cue to ':', it's there since sscanf () worked */
613 STRNCPY (newargstr, STRCHR (str, ':') + 1, NEWARGLIM - 1); 659 strncpy (newargstr, strchr (str, ':') + 1, NEWARGLIM - 1);
614 newargstr[NEWARGLIM - 1] = '\0'; 660 newargstr[NEWARGLIM - 1] = '\0';
615 newarg = newargstr; 661 newarg = newargstr;
616 } 662 }
617 } 663 }
618 else 664 else
619 { 665 {
620 /* 666 /*
621 * convert keysym name to keysym number 667 * convert keysym name to keysym number
622 */ 668 */
623 STRNCPY (newargstr, str, NEWARGLIM - 1); 669 strncpy (newargstr, str, NEWARGLIM - 1);
624 newargstr[NEWARGLIM - 1] = '\0'; 670 newargstr[NEWARGLIM - 1] = '\0';
625 if (arg == NULL) 671 if (arg == NULL)
626 { 672 {
627 if ((newarg = STRCHR (newargstr, ':')) == NULL) 673 if ((newarg = strchr (newargstr, ':')) == NULL)
628 return -1; 674 return -1;
629 *newarg++ = '\0'; /* terminate keysym name */ 675 *newarg++ = '\0'; /* terminate keysym name */
630 } 676 }
631 if ((sym = XStringToKeysym (newargstr)) == None) 677 if ((sym = XStringToKeysym (newargstr)) == None)
632 return -1; 678 return -1;
… …
638 if (Keysym_map[sym] != NULL) /* already set ? */ 684 if (Keysym_map[sym] != NULL) /* already set ? */
639 return -1; 685 return -1;
640 686
641 if (newarg == NULL) 687 if (newarg == NULL)
642 { 688 {
643 STRNCPY (newargstr, arg, NEWARGLIM - 1); 689 strncpy (newargstr, arg, NEWARGLIM - 1);
644 newargstr[NEWARGLIM - 1] = '\0'; 690 newargstr[NEWARGLIM - 1] = '\0';
645 newarg = newargstr; 691 newarg = newargstr;
646 } 692 }
647 rxvt_Str_trim (newarg); 693 rxvt_Str_trim (newarg);
648 if (*newarg == '\0' || (n = rxvt_Str_escaped (newarg)) == 0) 694 if (*newarg == '\0' || (n = rxvt_Str_escaped (newarg)) == 0)
649 return -1; 695 return -1;
650 MIN_IT (n, 255); 696 MIN_IT (n, 255);
651 key_string = (char *)rxvt_malloc ((n + 1) * sizeof (char)); 697 key_string = (char *)rxvt_malloc ((n + 1) * sizeof (char));
652 698
653 key_string[0] = n; 699 key_string[0] = n;
654 STRNCPY (key_string + 1, newarg, n); 700 strncpy (key_string + 1, newarg, n);
655 Keysym_map[sym] = (unsigned char *)key_string; 701 Keysym_map[sym] = (unsigned char *)key_string;
656 702
657 return 1; 703 return 1;
658} 704}
659 705
… …
671 char *str, buffer[256]; 717 char *str, buffer[256];
672 718
673 if (stream == NULL) 719 if (stream == NULL)
674 return; 720 return;
675 721
676 len = STRLEN (name); 722 len = strlen (name);
677 while ((str = fgets (buffer, sizeof (buffer), stream)) != NULL) 723 while ((str = fgets (buffer, sizeof (buffer), stream)) != NULL)
678 { 724 {
679 unsigned int entry, n; 725 unsigned int entry, n;
680 726
681 while (*str && isspace (*str)) 727 while (*str && isspace (*str))
682 str++; /* leading whitespace */ 728 str++; /* leading whitespace */
683 729
684 if ((str[len] != '*' && str[len] != '.') 730 if ((str[len] != '*' && str[len] != '.')
685 || (len && STRNCMP (str, name, len))) 731 || (len && strncmp (str, name, len)))
686 continue; 732 continue;
687 str += (len + 1); /* skip `name*' or `name.' */ 733 str += (len + 1); /* skip `name*' or `name.' */
688 734
689# ifdef KEYSYM_RESOURCE 735# ifdef KEYSYM_RESOURCE
690 if (!parse_keysym (str, NULL)) 736 if (!parse_keysym (str, NULL))
… …
694 const char *kw = optList[entry].kw; 740 const char *kw = optList[entry].kw;
695 741
696 if (kw == NULL) 742 if (kw == NULL)
697 continue; 743 continue;
698 744
699 n = STRLEN (kw); 745 n = strlen (kw);
700 if (str[n] == ':' && rxvt_Str_match (str, kw)) 746 if (str[n] == ':' && rxvt_Str_match (str, kw))
701 { 747 {
702 /* skip `keyword:' */ 748 /* skip `keyword:' */
703 str += n + 1; 749 str += n + 1;
704 rxvt_Str_trim (str); 750 rxvt_Str_trim (str);
705 n = STRLEN (str); 751 n = strlen (str);
706 if (n && rs[optList[entry].doff] == NULL) 752 if (n && rs[optList[entry].doff] == NULL)
707 { 753 {
708 /* not already set */ 754 /* not already set */
709 int s; 755 int s;
710 char *p = 0; 756 char *p = 0;
711 757
712 for (int o = 0;;) 758 for (int o = 0;;)
713 { 759 {
714 p = (char *)rxvt_realloc (p, o + n + 1); 760 p = (char *)rxvt_realloc (p, o + n + 1);
715 MEMCPY (p + o, str, n); 761 memcpy (p + o, str, n);
716 o += n; 762 o += n;
717 p[o] = 0; 763 p[o] = 0;
718 764
719 if (o == 0 || p[o - 1] != '\\') // continuation line 765 if (o == 0 || p[o - 1] != '\\') // continuation line
720 break; 766 break;
… …
723 769
724 if ((str = fgets (buffer, sizeof (buffer), stream)) == NULL) 770 if ((str = fgets (buffer, sizeof (buffer), stream)) == NULL)
725 break; 771 break;
726 772
727 rxvt_Str_trim (str); 773 rxvt_Str_trim (str);
728 n = STRLEN (str); 774 n = strlen (str);
729 } 775 }
730 776
731 rs[optList[entry].doff] = p; 777 rs[optList[entry].doff] = p;
732 allocated.push_back (p); 778 allocated.push_back (p);
733 779
734 if (optList_isBool (entry)) 780 if (optList_isBool (entry))
735 { 781 {
736 s = STRCASECMP (str, "TRUE") == 0 782 s = strcasecmp (str, "TRUE") == 0
737 || STRCASECMP (str, "YES") == 0 783 || strcasecmp (str, "YES") == 0
738 || STRCASECMP (str, "ON") == 0 784 || strcasecmp (str, "ON") == 0
739 || STRCASECMP (str, "1") == 0; 785 || strcasecmp (str, "1") == 0;
740 786
741 if (optList_isReverse (entry)) 787 if (optList_isReverse (entry))
742 s = !s; 788 s = !s;
743 789
744 if (s) 790 if (s)
745 Options |= optList[entry].flag; 791 options |= optList[entry].flag;
746 else 792 else
747 Options &= ~optList[entry].flag; 793 options &= ~optList[entry].flag;
748 } 794 }
749 } 795 }
750 796
751 break; 797 break;
752 } 798 }
… …
811 database = XrmGetStringDatabase (displayResource); 857 database = XrmGetStringDatabase (displayResource);
812 858
813# ifdef HAVE_EXTRA_XRESOURCE_FILES 859# ifdef HAVE_EXTRA_XRESOURCE_FILES
814 /* Add in ~/.Xdefaults or ~/.Xresources */ 860 /* Add in ~/.Xdefaults or ~/.Xresources */
815 { 861 {
816 char *ptr; 862 char *ptr;
817 863
818 if ((ptr = (char *)getenv ("HOME")) == NULL) 864 if ((ptr = (char *)getenv ("HOME")) == NULL)
819 ptr = "."; 865 ptr = ".";
820 866
821 for (i = 0; i < (sizeof (xnames) / sizeof (xnames[0])); i++) 867 for (i = 0; i < (sizeof (xnames) / sizeof (xnames[0])); i++)
822 { 868 {
823 sprintf (fname, "%-.*s/%s", sizeof (fname) - STRLEN (xnames[i]) - 2, 869 sprintf (fname, "%-.*s/%s", sizeof (fname) - strlen (xnames[i]) - 2,
824 ptr, xnames[i]); 870 ptr, xnames[i]);
825 if ((rdb1 = XrmGetFileDatabase (fname))) 871 if ((rdb1 = XrmGetFileDatabase (fname)))
826 { 872 {
827 XrmMergeDatabases (rdb1, &database); 873 XrmMergeDatabases (rdb1, &database);
828# ifndef HAVE_BOTH_XRESOURCE_FILES 874# ifndef HAVE_BOTH_XRESOURCE_FILES
… …
873 if (kw == NULL || rs[optList[entry].doff] != NULL) 919 if (kw == NULL || rs[optList[entry].doff] != NULL)
874 continue; /* previously set */ 920 continue; /* previously set */
875 921
876 p = XGetDefault (display, name, kw); 922 p = XGetDefault (display, name, kw);
877 p0 = XGetDefault (display, "!INVALIDPROGRAMMENAMEDONTMATCH!", kw); 923 p0 = XGetDefault (display, "!INVALIDPROGRAMMENAMEDONTMATCH!", kw);
878 if (p == NULL || (p0 && STRCMP (p, p0) == 0)) 924 if (p == NULL || (p0 && strcmp (p, p0) == 0))
879 { 925 {
880 p = XGetDefault (display, RESCLASS, kw); 926 p = XGetDefault (display, RESCLASS, kw);
881#ifdef RESFALLBACK 927#ifdef RESFALLBACK
882 if (p == NULL || (p0 && STRCMP (p, p0) == 0)) 928 if (p == NULL || (p0 && strcmp (p, p0) == 0))
883 p = XGetDefault (display, RESFALLBACK, kw); 929 p = XGetDefault (display, RESFALLBACK, kw);
884#endif 930#endif
885 } 931 }
886 932
887 if (p == NULL && p0) 933 if (p == NULL && p0)
… …
891 { 937 {
892 rs[optList[entry].doff] = p; 938 rs[optList[entry].doff] = p;
893 939
894 if (optList_isBool (entry)) 940 if (optList_isBool (entry))
895 { 941 {
896 s = STRCASECMP (p, "TRUE") == 0 942 s = strcasecmp (p, "TRUE") == 0
897 || STRCASECMP (p, "YES") == 0 943 || strcasecmp (p, "YES") == 0
898 || STRCASECMP (p, "ON") == 0 944 || strcasecmp (p, "ON") == 0
899 || STRCASECMP (p, "1") == 0; 945 || strcasecmp (p, "1") == 0;
900 if (optList_isReverse (entry)) 946 if (optList_isReverse (entry))
901 s = !s; 947 s = !s;
902 if (s) 948 if (s)
903 Options |= (optList[entry].flag); 949 options |= (optList[entry].flag);
904 else 950 else
905 Options &= ~ (optList[entry].flag); 951 options &= ~ (optList[entry].flag);
906 } 952 }
907 } 953 }
908 } 954 }
909 955
910 /* 956 /*
… …
938 FILE *fd = NULL; 984 FILE *fd = NULL;
939 char *home; 985 char *home;
940 986
941 if ((home = getenv ("HOME")) != NULL) 987 if ((home = getenv ("HOME")) != NULL)
942 { 988 {
943 unsigned int i, len = STRLEN (home) + 2; 989 unsigned int i, len = strlen (home) + 2;
944 char *f = NULL; 990 char *f = NULL;
945 991
946 for (i = 0; i < (sizeof (xnames) / sizeof (xnames[0])); i++) 992 for (i = 0; i < (sizeof (xnames) / sizeof (xnames[0])); i++)
947 { 993 {
948 f = (char *)rxvt_realloc (f, (len + STRLEN (xnames[i])) * sizeof (char)); 994 f = (char *)rxvt_realloc (f, (len + strlen (xnames[i])) * sizeof (char));
949 995
950 sprintf (f, "%s/%s", home, xnames[i]); 996 sprintf (f, "%s/%s", home, xnames[i]);
951 997
952 if ((fd = fopen (f, "r")) != NULL) 998 if ((fd = fopen (f, "r")) != NULL)
953 break; 999 break;

Diff Legend

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