ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/xdefaults.C
(Generate patch)

Comparing rxvt-unicode/src/xdefaults.C (file contents):
Revision 1.15 by pcg, Wed Mar 3 04:07:52 2004 UTC vs.
Revision 1.30 by root, Fri Aug 13 03:36:57 2004 UTC

1/*--------------------------------*-C-*---------------------------------* 1/*--------------------------------*-C-*---------------------------------*
2 * File: xdefaults.c 2 * File: xdefaults.C
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * $Id: xdefaults.C,v 1.15 2004/03/03 04:07:52 pcg Exp $
5 * 4 *
6 * All portions of code are copyright by their respective author/s. 5 * All portions of code are copyright by their respective author/s.
7 * Copyright (c) 1994 Robert Nation <nation@rocket.sanders.lockheed.com> 6 * Copyright (c) 1994 Robert Nation <nation@rocket.sanders.lockheed.com>
8 * - original version 7 * - original version
9 * Copyright (c) 1997,1998 mj olesen <olesen@me.queensu.ca> 8 * Copyright (c) 1997,1998 mj olesen <olesen@me.queensu.ca>
9 * Copyright (c) 2003-2004 Marc Lehmann <pcg@goof.com>
10 * 10 *
11 * This program is free software; you can redistribute it and/or modify 11 * This program is free software; you can redistribute it and/or modify
12 * it under the terms of the GNU General Public License as published by 12 * it under the terms of the GNU General Public License as published by
13 * the Free Software Foundation; either version 2 of the License, or 13 * the Free Software Foundation; either version 2 of the License, or
14 * (at your option) any later version. 14 * (at your option) any later version.
… …
83 const char *desc; /* description */ 83 const char *desc; /* description */
84 } 84 }
85optList[] = { 85optList[] = {
86 STRG (Rs_display_name, NULL, "d", NULL, NULL), /* short form */ 86 STRG (Rs_display_name, NULL, "d", NULL, NULL), /* short form */
87 STRG (Rs_display_name, NULL, "display", "string", "X server to contact"), 87 STRG (Rs_display_name, NULL, "display", "string", "X server to contact"),
88 STRG (Rs_term_name, "termName", "tn", "string", 88 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 */ 89 STRG (Rs_geometry, NULL, "g", NULL, NULL), /* short form */
91 STRG (Rs_geometry, "geometry", "geometry", "geometry", 90 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"), 91 SWCH ("C", Opt_console, "intercept console messages"),
94 SWCH ("iconic", Opt_iconic, "start iconic"), 92 SWCH ("iconic", Opt_iconic, "start iconic"),
95 SWCH ("ic", Opt_iconic, NULL), /* short form */ 93 SWCH ("ic", Opt_iconic, NULL), /* short form */
96 BOOL (Rs_reverseVideo, "reverseVideo", "rv", Opt_reverseVideo, 94 BOOL (Rs_reverseVideo, "reverseVideo", "rv", Opt_reverseVideo, "reverse video"),
97 "reverse video"),
98 BOOL (Rs_loginShell, "loginShell", "ls", Opt_loginShell, "login shell"), 95 BOOL (Rs_loginShell, "loginShell", "ls", Opt_loginShell, "login shell"),
99 BOOL (Rs_jumpScroll, "jumpScroll", "j", Opt_jumpScroll, "jump scrolling"), 96 BOOL (Rs_jumpScroll, "jumpScroll", "j", Opt_jumpScroll, "jump scrolling"),
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 urxvt 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#ifndef NO_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
… …
162 RSTRG (Rs_color + minBrightCOLOR + 5, "color13", "color"), 159 RSTRG (Rs_color + minBrightCOLOR + 5, "color13", "color"),
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
164 BOOL (Rs_realBold, "realBold", "rb", Opt_realBold, "use bold fonts for bold text"),
167 RSTRG (Rs_color + Color_BD, "colorBD", "color"), 165 RSTRG (Rs_color + Color_BD, "colorBD", "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 */
171#ifdef KEEP_SCROLLCOLOR 169#ifdef KEEP_SCROLLCOLOR
… …
177#endif 175#endif
178#if defined (XPM_BACKGROUND) || (MENUBAR_MAX) 176#if defined (XPM_BACKGROUND) || (MENUBAR_MAX)
179 RSTRG (Rs_path, "path", "search path"), 177 RSTRG (Rs_path, "path", "search path"),
180#endif /* defined (XPM_BACKGROUND) || (MENUBAR_MAX) */ 178#endif /* defined (XPM_BACKGROUND) || (MENUBAR_MAX) */
181#ifdef XPM_BACKGROUND 179#ifdef XPM_BACKGROUND
182 STRG (Rs_backgroundPixmap, "backgroundPixmap", "pixmap", "file[;geom]", 180 STRG (Rs_backgroundPixmap, "backgroundPixmap", "pixmap", "file[;geom]", "background pixmap"),
183 "background pixmap"),
184#endif /* XPM_BACKGROUND */ 181#endif /* XPM_BACKGROUND */
185#if (MENUBAR_MAX) 182#if (MENUBAR_MAX)
186 RSTRG (Rs_menu, "menu", "name[;tag]"), 183 RSTRG (Rs_menu, "menu", "name[;tag]"),
187#endif 184#endif
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 /* fonts: command-line option = resource name */
190#ifdef USE_XIM 187#ifdef USE_XIM
191 STRG (Rs_inputMethod, "inputMethod", "im", "name", "name of input method"), 188 STRG (Rs_inputMethod, "inputMethod", "im", "name", "name of input method"),
192 STRG (Rs_preeditType, "preeditType", "pt", "style", 189 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) 190#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
195 STRG (Rs_imLocale, "imLocale", "imlocale", "string", "locale to use for input method"), 191 STRG (Rs_imLocale, "imLocale", "imlocale", "string", "locale to use for input method"),
196#endif 192#endif
197#endif /* USE_XIM */ 193#endif /* USE_XIM */
198 STRG (Rs_name, NULL, "name", "string", 194 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"), 195 STRG (Rs_title, "title", "title", "string", "title name for window"),
201 STRG (Rs_title, NULL, "T", NULL, NULL), /* short form */ 196 STRG (Rs_title, NULL, "T", NULL, NULL), /* short form */
202 STRG (Rs_iconName, "iconName", "n", "string", "icon name for window"), 197 STRG (Rs_iconName, "iconName", "n", "string", "icon name for window"),
203#ifndef NO_CURSORCOLOR 198#ifndef NO_CURSORCOLOR
204 STRG (Rs_color + Color_cursor, "cursorColor", "cr", "color", "cursor color"), 199 STRG (Rs_color + Color_cursor, "cursorColor", "cr", "color", "cursor color"),
205 /* command-line option = resource name */ 200 /* command-line option = resource name */
206 RSTRG (Rs_color + Color_cursor2, "cursorColor2", "color"), 201 RSTRG (Rs_color + Color_cursor2, "cursorColor2", "color"),
207#endif /* NO_CURSORCOLOR */ 202#endif /* NO_CURSORCOLOR */
208 STRG (Rs_color + Color_pointer, "pointerColor", "pr", "color", 203 STRG (Rs_color + Color_pointer_fg, "pointerColor", "pr", "color", "pointer color"),
209 "pointer color"), 204 STRG (Rs_color + Color_pointer_bg, "pointerColor2", "pr2", "color", "pointer bg color"),
210 STRG (Rs_color + Color_border, "borderColor", "bd", "color", 205 STRG (Rs_color + Color_border, "borderColor", "bd", "color", "border color"),
211 "border color"),
212 STRG (Rs_saveLines, "saveLines", "sl", "number", 206 STRG (Rs_saveLines, "saveLines", "sl", "number", "number of scrolled lines to save"),
213 "number of scrolled lines to save"),
214#ifndef NO_FRILLS 207#ifndef NO_FRILLS
215 STRG (Rs_ext_bwidth, "externalBorder", "w", "number", 208 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), 209 STRG (Rs_ext_bwidth, NULL, "bw", NULL, NULL),
218 STRG (Rs_ext_bwidth, NULL, "borderwidth", NULL, NULL), 210 STRG (Rs_ext_bwidth, NULL, "borderwidth", NULL, NULL),
219 STRG (Rs_int_bwidth, "internalBorder", "b", "number", 211 STRG (Rs_int_bwidth, "internalBorder", "b", "number", "internal border in pixels"),
220 "internal border in pixels"), 212 BOOL (Rs_borderLess, "borderLess", "bl", Opt_borderLess, "borderless window"),
221#endif 213#endif
222#ifndef NO_LINESPACE 214#ifndef NO_LINESPACE
223 STRG (Rs_lineSpace, "lineSpace", "lsp", "number", 215 STRG (Rs_lineSpace, "lineSpace", "lsp", "number", "number of extra pixels between rows"),
224 "number of extra pixels between rows"),
225#endif 216#endif
226 STRG (Rs_scrollBar_thickness, "thickness", "sbt", "number", 217 STRG (Rs_scrollBar_thickness, "thickness", "sbt", "number", "scrollbar thickness/width in pixels"),
227 "scrollbar thickness/width in pixels"),
228#ifdef POINTER_BLANK 218#ifdef POINTER_BLANK
229 RSTRG (Rs_pointerBlankDelay, "pointerBlankDelay", "number"), 219 RSTRG (Rs_pointerBlankDelay, "pointerBlankDelay", "number"),
230#endif 220#endif
231#ifndef NO_BACKSPACE_KEY 221#ifndef NO_BACKSPACE_KEY
232 RSTRG (Rs_backspace_key, "backspacekey", "string"), 222 RSTRG (Rs_backspace_key, "backspacekey", "string"),
… …
240 RSTRG (Rs_scrollBar_align, "scrollBar_align", "mode"), 230 RSTRG (Rs_scrollBar_align, "scrollBar_align", "mode"),
241#endif 231#endif
242#ifdef PRINTPIPE 232#ifdef PRINTPIPE
243 RSTRG (Rs_print_pipe, "print-pipe", "string"), 233 RSTRG (Rs_print_pipe, "print-pipe", "string"),
244#endif 234#endif
245#if defined (HOTKEY_CTRL) || defined (HOTKEY_META) 235 STRG (Rs_modifier, "modifier", "mod", "modifier", "meta modifier = alt|meta|hyper|super|mod1|...|mod5"),
246 RSTRG (Rs_bigfont_key, "bigfont_key", "keysym"),
247 RSTRG (Rs_smallfont_key, "smallfont_key", "keysym"),
248#endif
249 STRG (Rs_modifier, "modifier", "mod", "modifier",
250 "meta modifier = alt|meta|hyper|super|mod1|...|mod5"),
251 INFO ("xrm", "string", "X resource"), 236 INFO ("xrm", "string", "X resource"),
252#ifdef CUTCHAR_RESOURCE 237#ifdef CUTCHAR_RESOURCE
253 RSTRG (Rs_cutchars, "cutchars", "string"), 238 RSTRG (Rs_cutchars, "cutchars", "string"),
254#endif /* CUTCHAR_RESOURCE */ 239#endif /* CUTCHAR_RESOURCE */
255#ifdef ACS_ASCII
256 RSTRG (Rs_acs_chars, "acsChars", "string"),
257#endif /* ACS_ASCII */
258 RSTRG (Rs_answerbackstring, "answerbackString", "string"), 240 RSTRG (Rs_answerbackstring, "answerbackString", "string"),
241#ifndef NO_SECONDARY_SCREEN
242 BOOL (Rs_secondaryScreen, "secondaryScreen", "ssc", Opt_secondaryScreen, "enable secondary screen"),
243 BOOL (Rs_secondaryScroll, "secondaryScroll", "ssr", Opt_secondaryScroll, "enable secondary screen scroll"),
244#endif
259 INFO ("e", "command arg ...", "command to execute") 245 INFO ("e", "command arg ...", "command to execute")
260 }; 246 };
261 247
262#undef INFO 248#undef INFO
263#undef STRG 249#undef STRG
… …
266#undef BOOL 252#undef BOOL
267/*}}} */ 253/*}}} */
268 254
269static const char releasestring[] = "Rxvt v" VERSION " - released: " DATE "\n"; 255static const char releasestring[] = "Rxvt v" VERSION " - released: " DATE "\n";
270static const char optionsstring[] = "Options: " 256static const char optionsstring[] = "Options: "
257#if XFT
258 "xft,"
259#endif
260#if UNICODE_3
261 "unicode3,"
262#endif
263 "encodings=eu+vn"
264#if ENCODING_JP
265 "+jp"
266#endif
267#if ENCODING_JP_EXT
268 "+jp-ext"
269#endif
270#if ENCODING_KR
271 "+kr"
272#endif
273#if ENCODING_CN
274 "+cn"
275#endif
276#if ENCODING_CN_EXT
277 "+cn-ext"
278#endif
279 ","
280#if ENABLE_COMBINING
281 "combining,"
282#endif
283#if TEXT_BLINK
284 "blink,"
285#endif
286#if OFF_FOCUS_FADING
287 "fade,"
288#endif
271#if defined(XPM_BACKGROUND) 289#if defined(XPM_BACKGROUND)
272 "XPM," 290 "XPM,"
273#endif 291#endif
274#if defined(TRANSPARENT) 292#if defined(TRANSPARENT)
275 "transparent," 293 "transparent,"
276#endif 294#endif
295#if TINTING
296 "tint,"
297#endif
277#if defined(UTMP_SUPPORT) 298#if defined(UTMP_SUPPORT)
278 "utmp," 299 "utmp,"
279#endif 300#endif
280#if defined(MENUBAR) 301#if defined(MENUBAR)
281 "menubar," 302 "menubar,"
282#endif
283#if !defined(NO_FRILLS)
284 "frills,"
285#endif
286#if !defined(NO_LINESPACE)
287 "linespace,"
288#endif
289#if defined(PREFER_24BIT)
290 "24bit,"
291#endif 303#endif
292#if defined(USE_XIM) 304#if defined(USE_XIM)
293 "XIM," 305 "XIM,"
294#endif 306#endif
295 "scrollbars=" 307 "scrollbars="
… …
323 "no_backspace," 335 "no_backspace,"
324#endif 336#endif
325#if defined(NO_DELETE_KEY) 337#if defined(NO_DELETE_KEY)
326 "no_delete," 338 "no_delete,"
327#endif 339#endif
340#if EIGHT_BIT_CONTROLS
341 "8bitctrls,"
342#endif
328#if !defined(NO_STRINGS) 343#if !defined(NO_STRINGS)
329 "strings," 344 "strings,"
330#endif 345#endif
346#if !defined(NO_FRILLS)
347 "frills,"
348#endif
349#if !defined(NO_LINESPACE)
350 "linespace,"
351#endif
352#if defined(PREFER_24BIT)
353 "24bit,"
354#endif
355#if defined(SELECTION_SCROLLING)
356 "selectionscrolling,"
357#endif
358#if MOUSE_WHEEL
359 "wheel,"
360#endif
361#if MOUSE_SLIP_WHEELING
362 "slipwheel,"
363#endif
364#if defined(SMART_RESIZE)
365 "smart-resize,"
366#endif
331#if defined(TTY_256COLOR) 367#if defined(TTY_256COLOR)
332 "256colour," 368 "256colour,"
369#endif
370#if defined(CURSOR_BLINK)
371 "cursorBlink,"
372#endif
373#if defined(POINTER_BLANK)
374 "pointerBlank,"
333#endif 375#endif
334#if defined(NO_RESOURCES) 376#if defined(NO_RESOURCES)
335 "NoResources" 377 "NoResources"
336#else 378#else
337# if defined(USE_XGETDEFAULT) 379# if defined(USE_XGETDEFAULT)
… …
347/*{{{ usage: */ 389/*{{{ usage: */
348/*----------------------------------------------------------------------*/ 390/*----------------------------------------------------------------------*/
349static void 391static void
350rxvt_usage (int type) 392rxvt_usage (int type)
351{ 393{
352 unsigned int i, col; 394 unsigned int i, col;
353 395
354 write (STDERR_FILENO, releasestring, sizeof (releasestring) - 1); 396 rxvt_log ("%s%s%s", releasestring, optionsstring, RESNAME);
355 write (STDERR_FILENO, optionsstring, sizeof (optionsstring) - 1);
356 write (STDERR_FILENO, RESNAME, sizeof (RESNAME) - 1);
357 397
358 switch (type) 398 switch (type)
359 { 399 {
360 case 0: /* brief listing */ 400 case 0: /* brief listing */
361 fprintf (stderr, " [-help] [--help]\n"); 401 rxvt_log (" [-help] [--help]\n");
402
362 for (col = 1, i = 0; i < optList_size (); i++) 403 for (col = 1, i = 0; i < optList_size (); i++)
363 if (optList[i].desc != NULL) 404 if (optList[i].desc != NULL)
364 { 405 {
365 int len = 0; 406 int len = 0;
366 407
… …
375#endif 416#endif
376 len += 4 + STRLEN (optList[i].opt) + (optList_isBool (i) ? 2: 0); 417 len += 4 + STRLEN (optList[i].opt) + (optList_isBool (i) ? 2: 0);
377 col += len; 418 col += len;
378 if (col > 79) 419 if (col > 79)
379 { /* assume regular width */ 420 { /* assume regular width */
380 putc ('\n', stderr); 421 rxvt_log ("\n");
381 col = 1 + len; 422 col = 1 + len;
382 } 423 }
424
383 fprintf (stderr, " [-%s%s", (optList_isBool (i) ? "/+" : ""), 425 rxvt_log (" [-%s%s", (optList_isBool (i) ? "/+" : ""), optList[i].opt);
384 optList[i].opt);
385 if (optList_strlen (i)) 426 if (optList_strlen (i))
386 fprintf (stderr, " %s]", optList[i].arg); 427 rxvt_log (" %s]", optList[i].arg);
387 else 428 else
388 fprintf (stderr, "]"); 429 rxvt_log ("]");
389 } 430 }
390 break; 431 break;
391 432
392 case 1: /* full command-line listing */ 433 case 1: /* full command-line listing */
393 fprintf (stderr, " [options] [-e command args]\n\n" 434 rxvt_log (" [options] [-e command args]\n\nwhere options include:\n");
394 "where options include:\n"); 435
395 for (i = 0; i < optList_size (); i++) 436 for (i = 0; i < optList_size (); i++)
396 if (optList[i].desc != NULL) 437 if (optList[i].desc != NULL)
397 { 438 {
398#ifdef DEBUG_STRICT 439#ifdef DEBUG_STRICT
399 assert (optList[i].opt != NULL); 440 assert (optList[i].opt != NULL);
400#endif 441#endif
401 fprintf (stderr, " %s%s %-*s%s%s\n", 442 rxvt_log (" %s%s %-*s%s%s\n",
402 (optList_isBool (i) ? "-/+" : "-"), optList[i].opt, 443 (optList_isBool (i) ? "-/+" : "-"), optList[i].opt,
403 (INDENT - STRLEN (optList[i].opt) 444 (INDENT - STRLEN (optList[i].opt)
404 + (optList_isBool (i) ? 0 : 2)), 445 + (optList_isBool (i) ? 0 : 2)),
405 (optList[i].arg ? optList[i].arg : ""), 446 (optList[i].arg ? optList[i].arg : ""),
406 (optList_isBool (i) ? "turn on/off " : ""), 447 (optList_isBool (i) ? "turn on/off " : ""),
407 optList[i].desc); 448 optList[i].desc);
408 } 449 }
409 fprintf (stderr, "\n --help to list long-options"); 450 rxvt_log ("\n --help to list long-options");
410 break; 451 break;
411 452
412 case 2: /* full resource listing */ 453 case 2: /* full resource listing */
413 fprintf (stderr,
414 " [options] [-e command args]\n\n" 454 rxvt_log (" [options] [-e command args]\n\n"
415 "where resources (long-options) include:\n"); 455 "where resources (long-options) include:\n");
416 456
417 for (i = 0; i < optList_size (); i++) 457 for (i = 0; i < optList_size (); i++)
418 if (optList[i].kw != NULL) 458 if (optList[i].kw != NULL)
419 fprintf (stderr, " %s: %*s%s\n", 459 rxvt_log (" %s: %*s%s\n",
420 optList[i].kw, 460 optList[i].kw,
421 (INDENT - STRLEN (optList[i].kw)), "", /* XXX */ 461 (INDENT - STRLEN (optList[i].kw)), "", /* XXX */
422 (optList_isBool (i) ? "boolean" : optList[i].arg)); 462 (optList_isBool (i) ? "boolean" : optList[i].arg));
423#ifdef KEYSYM_RESOURCE 463#ifdef KEYSYM_RESOURCE
424 fprintf (stderr, " " "keysym.sym" ": %*s%s\n", 464 rxvt_log (" " "keysym.sym" ": %*s%s\n",
425 (INDENT - sizeof ("keysym.sym") + 1), "", /* XXX */ 465 (INDENT - sizeof ("keysym.sym") + 1), "", /* XXX */
426 "keysym"); 466 "keysym");
427#endif 467#endif
428 fprintf (stderr, "\n -help to list options"); 468 rxvt_log ("\n -help to list options");
429 break; 469 break;
430 } 470 }
431 fprintf (stderr, "\n\n"); 471
432 exit (EXIT_FAILURE); 472 rxvt_log ("\n\n");
473 rxvt_exit_failure ();
433 /* NOTREACHED */ 474 /* NOTREACHED */
434} 475}
435 476
436/*}}} */ 477/*}}} */
437 478
… …
464 longopt = *opt++; /* long option */ 505 longopt = *opt++; /* long option */
465 } 506 }
466 else 507 else
467 { 508 {
468 bad_option = 1; 509 bad_option = 1;
469 rxvt_print_error ("bad option \"%s\"", opt); 510 rxvt_warn ("\"%s\": malformed option.\n", opt);
470 continue; 511 continue;
471 } 512 }
472 513
473 if (!STRCMP (opt, "help")) 514 if (!STRCMP (opt, "help"))
474 rxvt_usage (longopt ? 2 : 1); 515 rxvt_usage (longopt ? 2 : 1);
… …
484 525
485 if (entry < optList_size ()) 526 if (entry < optList_size ())
486 { 527 {
487 if (optList_isReverse (entry)) 528 if (optList_isReverse (entry))
488 flag = flag == On ? Off : On; 529 flag = flag == On ? Off : On;
530
489 if (optList_strlen (entry)) 531 if (optList_strlen (entry))
490 { /* string value */
491 const char *str = argv[++i];
492
493#ifdef DEBUG_RESOURCES
494 fprintf (stderr, "string (%s,%s) = ",
495 optList[entry].opt ? optList[entry].opt : "nil",
496 optList[entry].kw ? optList[entry].kw : "nil");
497#endif
498 if (flag == On && str && (optList[entry].doff != -1))
499 { 532 {
500#ifdef DEBUG_RESOURCES
501 fprintf (stderr, "\"%s\"\n", str);
502#endif
503 rs[optList[entry].doff] = str;
504 /* 533 /*
505 * special cases are handled in main.c:main () to allow 534 * special cases are handled in main.c:main () to allow
506 * X resources to set these values before we settle for 535 * X resources to set these values before we settle for
507 * default values 536 * default values
508 */ 537 */
509 }
510#ifdef DEBUG_RESOURCES
511 else
512 fprintf (stderr, "???\n");
513#endif
514 538
539 if (optList[entry].doff != -1)
540 rs[optList[entry].doff] = flag == On && argv[i+1]
541 ? argv[++i] : 0;
515 } 542 }
516 else 543 else
517 { /* boolean value */ 544 { /* boolean value */
518#ifdef DEBUG_RESOURCES 545#ifdef DEBUG_RESOURCES
519 fprintf (stderr, "boolean (%s,%s) = %s\n", 546 fprintf (stderr, "boolean (%s,%s) = %s\n",
… …
531 else 558 else
532#ifdef KEYSYM_RESOURCE 559#ifdef KEYSYM_RESOURCE
533 /* if (!STRNCMP (opt, "keysym.", sizeof ("keysym.") - 1)) */ 560 /* if (!STRNCMP (opt, "keysym.", sizeof ("keysym.") - 1)) */
534 if (rxvt_Str_match (opt, "keysym.")) 561 if (rxvt_Str_match (opt, "keysym."))
535 { 562 {
536 const char *str = argv[++i]; 563 const char *str = argv[++i];
537 564
538 if (str != NULL) 565 if (str != NULL)
539 parse_keysym (opt + sizeof ("keysym.") - 1, str); 566 parse_keysym (opt + sizeof ("keysym.") - 1, str);
540 } 567 }
541 else 568 else
542#endif 569#endif
570 {
543 bad_option = 1; 571 bad_option = 1;
572 rxvt_warn ("\"%s\": unknown or malformed option.\n", opt);
573 }
544 } 574 }
545 575
546 if (bad_option) 576 if (bad_option)
547 rxvt_usage (0); 577 rxvt_usage (0);
548} 578}
… …
670 * the matching algorithm used for memory-save fake resources 700 * the matching algorithm used for memory-save fake resources
671 */ 701 */
672void 702void
673rxvt_term::get_xdefaults (FILE *stream, const char *name) 703rxvt_term::get_xdefaults (FILE *stream, const char *name)
674{ 704{
675 unsigned int len; 705 unsigned int len;
676 char *str, buffer[256]; 706 char *str, buffer[256];
677 707
678 if (stream == NULL) 708 if (stream == NULL)
679 return; 709 return;
710
680 len = STRLEN (name); 711 len = STRLEN (name);
681 while ((str = fgets (buffer, sizeof (buffer), stream)) != NULL) 712 while ((str = fgets (buffer, sizeof (buffer), stream)) != NULL)
682 { 713 {
683 unsigned int entry, n; 714 unsigned int entry, n;
684 715
… …
693# ifdef KEYSYM_RESOURCE 724# ifdef KEYSYM_RESOURCE
694 if (!parse_keysym (str, NULL)) 725 if (!parse_keysym (str, NULL))
695# endif /* KEYSYM_RESOURCE */ 726# endif /* KEYSYM_RESOURCE */
696 for (entry = 0; entry < optList_size (); entry++) 727 for (entry = 0; entry < optList_size (); entry++)
697 { 728 {
698 const char *kw = optList[entry].kw; 729 const char *kw = optList[entry].kw;
699 730
700 if (kw == NULL) 731 if (kw == NULL)
701 continue; 732 continue;
733
702 n = STRLEN (kw); 734 n = STRLEN (kw);
703 if (str[n] == ':' && rxvt_Str_match (str, kw)) 735 if (str[n] == ':' && rxvt_Str_match (str, kw))
704 { 736 {
705 /* skip `keyword:' */ 737 /* skip `keyword:' */
706 str += (n + 1); 738 str += n + 1;
707 rxvt_Str_trim (str); 739 rxvt_Str_trim (str);
708 n = STRLEN (str); 740 n = STRLEN (str);
709 if (n && rs[optList[entry].doff] == NULL) 741 if (n && rs[optList[entry].doff] == NULL)
710 { 742 {
711 /* not already set */ 743 /* not already set */
712 int s; 744 int s;
713 char *p = (char *)rxvt_malloc ((n + 1) * sizeof (char)); 745 char *p = 0;
714 746
747 for (int o = 0;;)
748 {
749 p = (char *)rxvt_realloc (p, o + n + 1);
715 STRCPY (p, str); 750 MEMCPY (p + o, str, n);
751 o += n;
752 p[o] = 0;
753
754 if (o == 0 || p[o - 1] != '\\') // continuation line
755 break;
756
757 o--; // eat "\"
758
759 if ((str = fgets (buffer, sizeof (buffer), stream)) == NULL)
760 break;
761
762 rxvt_Str_trim (str);
763 n = STRLEN (str);
764 }
765
716 rs[optList[entry].doff] = p; 766 rs[optList[entry].doff] = p;
767 allocated.push_back (p);
768
717 if (optList_isBool (entry)) 769 if (optList_isBool (entry))
718 { 770 {
719 s = STRCASECMP (str, "TRUE") == 0 771 s = STRCASECMP (str, "TRUE") == 0
720 || STRCASECMP (str, "YES") == 0 772 || STRCASECMP (str, "YES") == 0
721 || STRCASECMP (str, "ON") == 0 773 || STRCASECMP (str, "ON") == 0
722 || STRCASECMP (str, "1") == 0; 774 || STRCASECMP (str, "1") == 0;
775
723 if (optList_isReverse (entry)) 776 if (optList_isReverse (entry))
724 s = !s; 777 s = !s;
778
725 if (s) 779 if (s)
726 Options |= (optList[entry].flag); 780 Options |= optList[entry].flag;
727 else 781 else
728 Options &= ~ (optList[entry].flag); 782 Options &= ~optList[entry].flag;
729 } 783 }
730 } 784 }
785
731 break; 786 break;
732 } 787 }
733 } 788 }
734 } 789 }
790
735 rewind (stream); 791 rewind (stream);
736} 792}
737 793
738/*}}} */ 794/*}}} */
739# endif /* ! USE_XGETDEFAULT */ 795# endif /* ! USE_XGETDEFAULT */
… …
750#ifndef NO_RESOURCES 806#ifndef NO_RESOURCES
751 807
752# if defined XAPPLOADDIR 808# if defined XAPPLOADDIR
753# if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE) 809# if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
754 /* Compute the path of the possibly available localized Rxvt file */ 810 /* Compute the path of the possibly available localized Rxvt file */
755 char *localepath = NULL; 811 char *localepath = NULL;
756 812
757 if (locale != NULL) 813 if (locale != NULL)
758 { /* XXX: must limit length of string */ 814 { /* XXX: must limit length of string */
759 localepath = (char *)rxvt_malloc (256); 815 localepath = (char *)rxvt_malloc (256);
760 sprintf (localepath, XAPPLOADDIRLOCALE "/" RESCLASS, 816 sprintf (localepath, XAPPLOADDIRLOCALE "/" RESCLASS,
… …
768 824
769# ifdef USE_XGETDEFAULT 825# ifdef USE_XGETDEFAULT
770 /* 826 /*
771 * get resources using the X library function 827 * get resources using the X library function
772 */ 828 */
773 int entry; 829 int entry;
774 830
775# ifdef XrmEnumOneLevel 831# ifdef XrmEnumOneLevel
776 int i; 832 int i;
777 char *displayResource, *xe; 833 char *displayResource, *xe;
778 XrmName name_prefix[3]; 834 XrmName name_prefix[3];
779 XrmClass class_prefix[3]; 835 XrmClass class_prefix[3];
780 XrmDatabase database, rdb1; 836 XrmDatabase database, rdb1;
781 char fname[1024]; 837 char fname[1024];
782 838
783 XrmInitialize (); 839 XrmInitialize ();
784 database = NULL; 840 database = NULL;
785 841
786 /* Get any Xserver defaults */ 842 /* Get any Xserver defaults */
… …
799 855
800 for (i = 0; i < (sizeof (xnames) / sizeof (xnames[0])); i++) 856 for (i = 0; i < (sizeof (xnames) / sizeof (xnames[0])); i++)
801 { 857 {
802 sprintf (fname, "%-.*s/%s", sizeof (fname) - STRLEN (xnames[i]) - 2, 858 sprintf (fname, "%-.*s/%s", sizeof (fname) - STRLEN (xnames[i]) - 2,
803 ptr, xnames[i]); 859 ptr, xnames[i]);
804 if ((rdb1 = XrmGetFileDatabase (fname)) != NULL) 860 if ((rdb1 = XrmGetFileDatabase (fname)))
805 { 861 {
806 XrmMergeDatabases (rdb1, &database); 862 XrmMergeDatabases (rdb1, &database);
807# ifndef HAVE_BOTH_XRESOURCE_FILES 863# ifndef HAVE_BOTH_XRESOURCE_FILES
808 break; 864 break;
809# endif 865# endif
… …
960# ifdef RESFALLBACK 1016# ifdef RESFALLBACK
961 get_xdefaults (fd, RESFALLBACK); 1017 get_xdefaults (fd, RESFALLBACK);
962# endif 1018# endif
963 1019
964# if defined(XAPPLOADDIR) && defined(USE_XAPPLOADDIR) 1020# if defined(XAPPLOADDIR) && defined(USE_XAPPLOADDIR)
965
966 { 1021 {
967 FILE *ad = NULL; 1022 FILE *ad = NULL;
968 1023
969# if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE) 1024# if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
970 if (localepath == NULL || (ad = fopen (localepath, "r")) == NULL) 1025 if (localepath == NULL || (ad = fopen (localepath, "r")) == NULL)
971# endif 1026# endif
972 ad = fopen (XAPPLOADDIR "/" RESCLASS, "r"); 1027 ad = fopen (XAPPLOADDIR "/" RESCLASS, "r");
… …
993 free (localepath); 1048 free (localepath);
994# endif 1049# endif
995# endif 1050# endif
996 1051
997#endif /* NO_RESOURCES */ 1052#endif /* NO_RESOURCES */
998
999 /*
1000 * even without resources, at least do this setup for command-line
1001 * options and command-line long options
1002 */
1003
1004#if defined (HOTKEY_CTRL) || defined (HOTKEY_META)
1005 KeySym sym;
1006
1007 if (rs[Rs_bigfont_key]
1008 && ((sym = XStringToKeysym (rs[Rs_bigfont_key])) != 0))
1009 ks_bigfont = sym;
1010 if (rs[Rs_smallfont_key]
1011 && ((sym = XStringToKeysym (rs[Rs_smallfont_key])) != 0))
1012 ks_smallfont = sym;
1013#endif
1014} 1053}
1015 1054
1016/*}}} */ 1055/*}}} */
1017/*----------------------- end-of-file (C source) -----------------------*/ 1056/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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