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.132 by ayin, Sun Jan 20 01:15:35 2008 UTC vs.
Revision 1.158 by sf-exg, Fri Dec 2 09:02:05 2011 UTC

… …
4 * 4 *
5 * All portions of code are copyright by their respective author/s. 5 * All portions of code are copyright by their respective author/s.
6 * Copyright (c) 1994 Robert Nation <nation@rocket.sanders.lockheed.com> 6 * Copyright (c) 1994 Robert Nation <nation@rocket.sanders.lockheed.com>
7 * - original version 7 * - original version
8 * 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-2006 Marc Lehmann <pcg@goof.com> 9 * Copyright (c) 2003-2006 Marc Lehmann <schmorp@schmorp.de>
10 * Copyright (c) 2007 Emanuele Giaquinta <e.giaquinta@glauco.it> 10 * Copyright (c) 2007 Emanuele Giaquinta <e.giaquinta@glauco.it>
11 * 11 *
12 * This program is free software; you can redistribute it and/or modify 12 * This program is free software; you can redistribute it and/or modify
13 * it under the terms of the GNU General Public License as published by 13 * it under the terms of the GNU General Public License as published by
14 * the Free Software Foundation; either version 2 of the License, or 14 * the Free Software Foundation; either version 2 of the License, or
… …
69 (optList[i].flag == 0) 69 (optList[i].flag == 0)
70#define optList_isBool(i) \ 70#define optList_isBool(i) \
71 (optList[i].flag & Optflag_Boolean) 71 (optList[i].flag & Optflag_Boolean)
72#define optList_isReverse(i) \ 72#define optList_isReverse(i) \
73 (optList[i].flag & Optflag_Reverse) 73 (optList[i].flag & Optflag_Reverse)
74#define optList_size \
75 (sizeof (optList) / sizeof (optList[0]))
76 74
77static const struct 75static const struct
78 { 76 {
79 const uint8_t index; /* Option index */ 77 const uint8_t index; /* Option index */
80 const uint8_t flag; /* Option flag */ 78 const uint8_t flag; /* Option flag */
… …
91 STRG (Rs_geometry, NULL, "g", NULL, NULL), /* short form */ 89 STRG (Rs_geometry, NULL, "g", NULL, NULL), /* short form */
92 STRG (Rs_geometry, "geometry", "geometry", "geometry", "size (in characters) and position"), 90 STRG (Rs_geometry, "geometry", "geometry", "geometry", "size (in characters) and position"),
93 SWCH ("C", Opt_console, 0, "intercept console messages"), 91 SWCH ("C", Opt_console, 0, "intercept console messages"),
94 SWCH ("iconic", Opt_iconic, 0, "start iconic"), 92 SWCH ("iconic", Opt_iconic, 0, "start iconic"),
95 SWCH ("ic", Opt_iconic, 0, NULL), /* short form */ 93 SWCH ("ic", Opt_iconic, 0, NULL), /* short form */
94 STRG (Rs_chdir, "chdir", "cd", "string", "start shell in this directory"),
96 BOOL (Rs_reverseVideo, "reverseVideo", "rv", Opt_reverseVideo, 0, "reverse video"), 95 BOOL (Rs_reverseVideo, "reverseVideo", "rv", Opt_reverseVideo, 0, "reverse video"),
97 BOOL (Rs_loginShell, "loginShell", "ls", Opt_loginShell, 0, "login shell"), 96 BOOL (Rs_loginShell, "loginShell", "ls", Opt_loginShell, 0, "login shell"),
98 BOOL (Rs_jumpScroll, "jumpScroll", "j", Opt_jumpScroll, 0, "jump scrolling"), 97 BOOL (Rs_jumpScroll, "jumpScroll", "j", Opt_jumpScroll, 0, "jump scrolling"),
99 BOOL (Rs_skipScroll, "skipScroll", "ss", Opt_skipScroll, 0, "skip scrolling"), 98 BOOL (Rs_skipScroll, "skipScroll", "ss", Opt_skipScroll, 0, "skip scrolling"),
100 BOOL (Rs_pastableTabs, "pastableTabs", "ptab", Opt_pastableTabs, 0, "tab characters are pastable"), 99 BOOL (Rs_pastableTabs, "pastableTabs", "ptab", Opt_pastableTabs, 0, "tab characters are pastable"),
101#if HAVE_SCROLLBARS
102 RSTRG (Rs_scrollstyle, "scrollstyle", "mode"), 100 RSTRG (Rs_scrollstyle, "scrollstyle", "mode"),
103 BOOL (Rs_scrollBar, "scrollBar", "sb", Opt_scrollBar, 0, "scrollbar"), 101 BOOL (Rs_scrollBar, "scrollBar", "sb", Opt_scrollBar, 0, "scrollbar"),
104 BOOL (Rs_scrollBar_right, "scrollBar_right", "sr", Opt_scrollBar_right, 0, "scrollbar right"), 102 BOOL (Rs_scrollBar_right, "scrollBar_right", "sr", Opt_scrollBar_right, 0, "scrollbar right"),
105 BOOL (Rs_scrollBar_floating, "scrollBar_floating", "st", Opt_scrollBar_floating, 0, "scrollbar without a trough"), 103 BOOL (Rs_scrollBar_floating, "scrollBar_floating", "st", Opt_scrollBar_floating, 0, "scrollbar without a trough"),
106 RSTRG (Rs_scrollBar_align, "scrollBar_align", "mode"), 104 RSTRG (Rs_scrollBar_align, "scrollBar_align", "mode"),
107 STRG (Rs_scrollBar_thickness, "thickness", "sbt", "number", "scrollbar thickness/width in pixels"), 105 STRG (Rs_scrollBar_thickness, "thickness", "sbt", "number", "scrollbar thickness/width in pixels"),
108#endif
109 BOOL (Rs_scrollTtyOutput, "scrollTtyOutput", NULL, Opt_scrollTtyOutput, 0, NULL), 106 BOOL (Rs_scrollTtyOutput, "scrollTtyOutput", NULL, Opt_scrollTtyOutput, 0, NULL),
110 BOOL (Rs_scrollTtyOutput, NULL, "si", Opt_scrollTtyOutput, Optflag_Reverse, "scroll-on-tty-output inhibit"), 107 BOOL (Rs_scrollTtyOutput, NULL, "si", Opt_scrollTtyOutput, Optflag_Reverse, "scroll-on-tty-output inhibit"),
111 BOOL (Rs_scrollTtyKeypress, "scrollTtyKeypress", "sk", Opt_scrollTtyKeypress, 0, "scroll-on-keypress"), 108 BOOL (Rs_scrollTtyKeypress, "scrollTtyKeypress", "sk", Opt_scrollTtyKeypress, 0, "scroll-on-keypress"),
112 BOOL (Rs_scrollWithBuffer, "scrollWithBuffer", "sw", Opt_scrollWithBuffer, 0, "scroll-with-buffer"), 109 BOOL (Rs_scrollWithBuffer, "scrollWithBuffer", "sw", Opt_scrollWithBuffer, 0, "scroll-with-buffer"),
113#if ENABLE_TRANSPARENCY 110#if ENABLE_TRANSPARENCY
114 BOOL (Rs_transparent, "inheritPixmap", "ip", Opt_transparent, 0, "inherit parent pixmap"), 111 BOOL (Rs_transparent, "inheritPixmap", "ip", Opt_transparent, 0, "inherit parent pixmap"),
115 BOOL (Rs_transparent, "transparent", "tr", Opt_transparent, 0, "inherit parent pixmap"), 112 BOOL (Rs_transparent, "transparent", "tr", Opt_transparent, 0, "inherit parent pixmap"),
116 STRG (Rs_color + Color_tint, "tintColor", "tint", "color", "tint color"), 113 STRG (Rs_color + Color_tint, "tintColor", "tint", "color", "tint color"),
117 STRG (Rs_shade, "shading", "sh", "number", "shade background by number %."), 114 STRG (Rs_shade, "shading", "sh", "number", "shade background by number %."),
115 STRG (Rs_blurradius, "blurRadius", "blr", "HxV", "gaussian blur radii to apply to the root background"),
118#endif 116#endif
119#if OFF_FOCUS_FADING 117#if OFF_FOCUS_FADING
120 STRG (Rs_fade, "fading", "fade", "number", "fade colors by number % when losing focus"), 118 STRG (Rs_fade, "fading", "fade", "number", "fade colors by number % when losing focus"),
121 STRG (Rs_color + Color_fade, "fadeColor", "fadecolor", "color", "target color for off-focus fading"), 119 STRG (Rs_color + Color_fade, "fadeColor", "fadecolor", "color", "target color for off-focus fading"),
122#endif 120#endif
… …
172 RSTRG (Rs_color + Color_RV, "colorRV", "color"), 170 RSTRG (Rs_color + Color_RV, "colorRV", "color"),
173#endif /* ! NO_BOLD_UNDERLINE_REVERSE */ 171#endif /* ! NO_BOLD_UNDERLINE_REVERSE */
174#if ENABLE_FRILLS 172#if ENABLE_FRILLS
175 RSTRG (Rs_color + Color_underline, "underlineColor", "color"), 173 RSTRG (Rs_color + Color_underline, "underlineColor", "color"),
176#endif 174#endif
177#ifdef KEEP_SCROLLCOLOR
178 RSTRG (Rs_color + Color_scroll, "scrollColor", "color"), 175 RSTRG (Rs_color + Color_scroll, "scrollColor", "color"),
176#ifdef RXVT_SCROLLBAR
179 RSTRG (Rs_color + Color_trough, "troughColor", "color"), 177 RSTRG (Rs_color + Color_trough, "troughColor", "color"),
180#endif /* KEEP_SCROLLCOLOR */ 178#endif
181#ifdef OPTION_HC 179#ifdef OPTION_HC
182 STRG (Rs_color + Color_HC, "highlightColor", "hc", "color", "highlight color"), 180 STRG (Rs_color + Color_HC, "highlightColor", "hc", "color", "highlight color"),
181 RSTRG (Rs_color + Color_HTC, "highlightTextColor", "color"),
183#endif 182#endif
184#ifndef NO_CURSORCOLOR 183#ifndef NO_CURSORCOLOR
185 STRG (Rs_color + Color_cursor, "cursorColor", "cr", "color", "cursor color"), 184 STRG (Rs_color + Color_cursor, "cursorColor", "cr", "color", "cursor color"),
186 /* command-line option = resource name */ 185 /* command-line option = resource name */
187 RSTRG (Rs_color + Color_cursor2, "cursorColor2", "color"), 186 RSTRG (Rs_color + Color_cursor2, "cursorColor2", "color"),
… …
190 STRG (Rs_color + Color_pointer_bg, "pointerColor2", "pr2", "color", "pointer bg color"), 189 STRG (Rs_color + Color_pointer_bg, "pointerColor2", "pr2", "color", "pointer bg color"),
191 STRG (Rs_color + Color_border, "borderColor", "bd", "color", "border color"), 190 STRG (Rs_color + Color_border, "borderColor", "bd", "color", "border color"),
192#ifdef BG_IMAGE_FROM_FILE 191#ifdef BG_IMAGE_FROM_FILE
193 RSTRG (Rs_path, "path", "search path"), 192 RSTRG (Rs_path, "path", "search path"),
194 STRG (Rs_backgroundPixmap, "backgroundPixmap", "pixmap", "file[;geom]", "background pixmap"), 193 STRG (Rs_backgroundPixmap, "backgroundPixmap", "pixmap", "file[;geom]", "background pixmap"),
194# if ENABLE_EWMH
195 STRG (Rs_iconfile, "iconFile", "icon", "file", "path to application icon image"),
196# endif
195#endif 197#endif
196 /* fonts: command-line option = resource name */ 198 /* fonts: command-line option = resource name */
197 STRG (Rs_font, "font", "fn", "fontname", "normal text font"), 199 STRG (Rs_font, "font", "fn", "fontname", "normal text font"),
198#if ENABLE_STYLES 200#if ENABLE_STYLES
199 STRG (Rs_boldFont, "boldFont", "fb", "fontname", "bold font"), 201 STRG (Rs_boldFont, "boldFont", "fb", "fontname", "bold font"),
… …
215#if ENABLE_XEMBED 217#if ENABLE_XEMBED
216 STRG (Rs_embed, NULL, "embed", "windowid", "window id to embed terminal in"), 218 STRG (Rs_embed, NULL, "embed", "windowid", "window id to embed terminal in"),
217#endif 219#endif
218#if XFT 220#if XFT
219 STRG (Rs_depth, "depth", "depth", "number", "depth of visual to request"), 221 STRG (Rs_depth, "depth", "depth", "number", "depth of visual to request"),
222 BOOL (Rs_buffered, "buffered", NULL, Opt_buffered, 0, NULL),
220#endif 223#endif
221#if ENABLE_FRILLS 224#if ENABLE_FRILLS
222 RSTRG (Rs_transient_for, "transient-for", "windowid"), 225 RSTRG (Rs_transient_for, "transient-for", "windowid"),
223 BOOL (Rs_override_redirect, "override-redirect", "override-redirect", Opt_override_redirect, 0, "set override-redirect on the terminal window"), 226 BOOL (Rs_override_redirect, "override-redirect", "override-redirect", Opt_override_redirect, 0, "set override-redirect on the terminal window"),
224 STRG (Rs_pty_fd, NULL, "pty-fd", "fileno", "file descriptor of pty to use"), 227 STRG (Rs_pty_fd, NULL, "pty-fd", "fileno", "file descriptor of pty to use"),
… …
227 STRG (Rs_ext_bwidth, NULL, "bw", NULL, NULL), 230 STRG (Rs_ext_bwidth, NULL, "bw", NULL, NULL),
228 STRG (Rs_ext_bwidth, NULL, "borderwidth", NULL, NULL), 231 STRG (Rs_ext_bwidth, NULL, "borderwidth", NULL, NULL),
229 STRG (Rs_int_bwidth, "internalBorder", "b", "number", "internal border in pixels"), 232 STRG (Rs_int_bwidth, "internalBorder", "b", "number", "internal border in pixels"),
230 BOOL (Rs_borderLess, "borderLess", "bl", Opt_borderLess, 0, "borderless window"), 233 BOOL (Rs_borderLess, "borderLess", "bl", Opt_borderLess, 0, "borderless window"),
231 STRG (Rs_lineSpace, "lineSpace", "lsp", "number", "number of extra pixels between rows"), 234 STRG (Rs_lineSpace, "lineSpace", "lsp", "number", "number of extra pixels between rows"),
235 STRG (Rs_letterSpace, "letterSpace", "letsp", "number", "letter spacing adjustment"),
232#endif 236#endif
233#ifdef BUILTIN_GLYPHS 237#ifdef BUILTIN_GLYPHS
234 BOOL (Rs_skipBuiltinGlyphs, "skipBuiltinGlyphs", "sbg", Opt_skipBuiltinGlyphs, 0, "do not use internal glyphs"), 238 BOOL (Rs_skipBuiltinGlyphs, "skipBuiltinGlyphs", "sbg", Opt_skipBuiltinGlyphs, 0, "do not use internal glyphs"),
235#endif 239#endif
236#ifdef POINTER_BLANK 240#ifdef POINTER_BLANK
… …
244#endif 248#endif
245#ifdef PRINTPIPE 249#ifdef PRINTPIPE
246 RSTRG (Rs_print_pipe, "print-pipe", "string"), 250 RSTRG (Rs_print_pipe, "print-pipe", "string"),
247#endif 251#endif
248 STRG (Rs_modifier, "modifier", "mod", "modifier", "meta modifier = alt|meta|hyper|super|mod1|...|mod5"), 252 STRG (Rs_modifier, "modifier", "mod", "modifier", "meta modifier = alt|meta|hyper|super|mod1|...|mod5"),
249#ifdef CUTCHAR_RESOURCE
250 RSTRG (Rs_cutchars, "cutchars", "string"), 253 RSTRG (Rs_cutchars, "cutchars", "string"),
251#endif /* CUTCHAR_RESOURCE */
252 RSTRG (Rs_answerbackstring, "answerbackString", "string"), 254 RSTRG (Rs_answerbackstring, "answerbackString", "string"),
253#ifndef NO_SECONDARY_SCREEN 255#ifndef NO_SECONDARY_SCREEN
254 BOOL (Rs_secondaryScreen, "secondaryScreen", "ssc", Opt_secondaryScreen, 0, "enable secondary screen"), 256 BOOL (Rs_secondaryScreen, "secondaryScreen", "ssc", Opt_secondaryScreen, 0, "enable secondary screen"),
255 BOOL (Rs_secondaryScroll, "secondaryScroll", "ssr", Opt_secondaryScroll, 0, "enable secondary screen scroll"), 257 BOOL (Rs_secondaryScroll, "secondaryScroll", "ssr", Opt_secondaryScroll, 0, "enable secondary screen scroll"),
256#endif 258#endif
… …
259 RSTRG (Rs_perl_eval, "perl-eval", "perl-eval"), // "string", "code to be evaluated after all extensions have been loaded"),TODO 261 RSTRG (Rs_perl_eval, "perl-eval", "perl-eval"), // "string", "code to be evaluated after all extensions have been loaded"),TODO
260 RSTRG (Rs_perl_ext_1, "perl-ext-common", "string"), //, "colon-separated list of perl extensions to enable"),TODO 262 RSTRG (Rs_perl_ext_1, "perl-ext-common", "string"), //, "colon-separated list of perl extensions to enable"),TODO
261 STRG (Rs_perl_ext_2, "perl-ext", "pe", "string", "colon-separated list of perl extensions to enable for this instance"), 263 STRG (Rs_perl_ext_2, "perl-ext", "pe", "string", "colon-separated list of perl extensions to enable for this instance"),
262#endif 264#endif
263#if ISO_14755 265#if ISO_14755
266 BOOL (Rs_iso14755, "iso14755", NULL, Opt_iso14755, 0, NULL),
264 BOOL (Rs_iso14755_52, "iso14755_52", NULL, Opt_iso14755_52, 0, NULL), 267 BOOL (Rs_iso14755_52, "iso14755_52", NULL, Opt_iso14755_52, 0, NULL),
265#endif 268#endif
266#ifdef HAVE_AFTERIMAGE 269#ifdef HAVE_AFTERIMAGE
267 STRG (Rs_blendtype, "blendType", "blt", "string", "background image blending type - alpha, tint, etc..."), 270 STRG (Rs_blendtype, "blendType", "blt", "string", "background image blending type - alpha, tint, etc..."),
268 STRG (Rs_blurradius, "blurRadius", "blr", "HxV", "Gaussian Blur radii to apply to the root background"),
269#endif 271#endif
270 INFO ("e", "command arg ...", "command to execute") 272 INFO ("e", "command arg ...", "command to execute")
271 }; 273 };
272 274
273#undef INFO 275#undef INFO
… …
324 "tint," 326 "tint,"
325#endif 327#endif
326#if HAVE_AFTERIMAGE 328#if HAVE_AFTERIMAGE
327 "afterimage," 329 "afterimage,"
328#endif 330#endif
331#if HAVE_PIXBUF
332 "pixbuf,"
333#endif
329#if defined(USE_XIM) 334#if defined(USE_XIM)
330 "XIM," 335 "XIM,"
331#endif 336#endif
332#if defined(NO_BACKSPACE_KEY) 337#if defined(NO_BACKSPACE_KEY)
333 "no_backspace," 338 "no_backspace,"
… …
360 "pointerBlank," 365 "pointerBlank,"
361#endif 366#endif
362#if defined(NO_RESOURCES) 367#if defined(NO_RESOURCES)
363 "NoResources," 368 "NoResources,"
364#endif 369#endif
365 "scrollbars=" 370 "scrollbars=plain"
366#if !defined(HAVE_SCROLLBARS)
367 "NONE"
368#else
369# if defined(PLAIN_SCROLLBAR)
370 "plain"
371# if defined(RXVT_SCROLLBAR) || defined(NEXT_SCROLLBAR) || defined(XTERM_SCROLLBAR)
372 "+"
373# endif
374# endif
375# if defined(RXVT_SCROLLBAR) 371#if defined(RXVT_SCROLLBAR)
376 "rxvt" 372 "+rxvt"
377# if defined(NEXT_SCROLLBAR) || defined(XTERM_SCROLLBAR)
378 "+"
379# endif
380# endif 373#endif
381# if defined(NEXT_SCROLLBAR) 374#if defined(NEXT_SCROLLBAR)
382 "NeXT" 375 "+NeXT"
383# if defined(XTERM_SCROLLBAR)
384 "+"
385# endif
386# endif 376#endif
387# if defined(XTERM_SCROLLBAR) 377#if defined(XTERM_SCROLLBAR)
388 "xterm" 378 "+xterm"
389# endif
390#endif 379#endif
391 "\nUsage: "; /* Usage */ 380 "\nUsage: "; /* Usage */
392 381
393#define INDENT 18 382#define INDENT 18
394 383
… …
408 switch (type) 397 switch (type)
409 { 398 {
410 case 0: /* brief listing */ 399 case 0: /* brief listing */
411 rxvt_log (" [-help] [--help]\n"); 400 rxvt_log (" [-help] [--help]\n");
412 401
413 for (col = 1, i = 0; i < optList_size; i++) 402 for (col = 1, i = 0; i < ecb_array_length (optList); i++)
414 if (optList[i].desc != NULL) 403 if (optList[i].desc != NULL)
415 { 404 {
416 int len = 0; 405 int len = 0;
417 406
418 if (optList[i].arg) 407 if (optList[i].arg)
419 len = strlen (optList[i].arg) + 1; 408 len = strlen (optList[i].arg) + 1;
420#ifdef DEBUG_STRICT
421 assert (optList[i].opt != NULL); 409 assert (optList[i].opt != NULL);
422#endif
423 len += 4 + strlen (optList[i].opt) + (optList_isBool (i) ? 2: 0); 410 len += 4 + strlen (optList[i].opt) + (optList_isBool (i) ? 2 : 0);
424 col += len; 411 col += len;
425 if (col > 79) 412 if (col > 79)
426 { 413 {
427 /* assume regular width */ 414 /* assume regular width */
428 rxvt_log ("\n"); 415 rxvt_log ("\n");
… …
438 break; 425 break;
439 426
440 case 1: /* full command-line listing */ 427 case 1: /* full command-line listing */
441 rxvt_log (" [options] [-e command args]\n\nwhere options include:\n"); 428 rxvt_log (" [options] [-e command args]\n\nwhere options include:\n");
442 429
443 for (i = 0; i < optList_size; i++) 430 for (i = 0; i < ecb_array_length (optList); i++)
444 if (optList[i].desc != NULL) 431 if (optList[i].desc != NULL)
445 { 432 {
446#ifdef DEBUG_STRICT
447 assert (optList[i].opt != NULL); 433 assert (optList[i].opt != NULL);
448#endif
449 rxvt_log (" %s%s %-*s%s%s\n", 434 rxvt_log (" %s%s %-*s%s%s\n",
450 (optList_isBool (i) ? "-/+" : "-"), optList[i].opt, 435 (optList_isBool (i) ? "-/+" : "-"), optList[i].opt,
451 (INDENT - strlen (optList[i].opt) 436 (INDENT - strlen (optList[i].opt)
452 + (optList_isBool (i) ? 0 : 2)), 437 + (optList_isBool (i) ? 0 : 2)),
453 (optList[i].arg ? optList[i].arg : ""), 438 (optList[i].arg ? optList[i].arg : ""),
… …
459 444
460 case 2: /* full resource listing */ 445 case 2: /* full resource listing */
461 rxvt_log (" [options] [-e command args]\n\n" 446 rxvt_log (" [options] [-e command args]\n\n"
462 "where resources (long-options) include:\n"); 447 "where resources (long-options) include:\n");
463 448
464 for (i = 0; i < optList_size; i++) 449 for (i = 0; i < ecb_array_length (optList); i++)
465 if (optList[i].kw != NULL) 450 if (optList[i].kw != NULL)
466 rxvt_log (" %s: %*s%s\n", 451 rxvt_log (" %s: %*s%s\n",
467 optList[i].kw, 452 optList[i].kw,
468 (INDENT - strlen (optList[i].kw)), "", /* XXX */ 453 (INDENT - strlen (optList[i].kw)), "", /* XXX */
469 (optList_isBool (i) ? "boolean" : optList[i].arg)); 454 (optList_isBool (i) ? "boolean" : optList[i].arg));
… …
476 break; 461 break;
477 } 462 }
478 463
479 rxvt_log ("\n\n"); 464 rxvt_log ("\n\n");
480 rxvt_exit_failure (); 465 rxvt_exit_failure ();
481 /* NOTREACHED */
482} 466}
483 467
484/*}}} */ 468/*}}} */
485 469
486/*{{{ get command-line options before getting resources */ 470/*{{{ get command-line options before getting resources */
… …
523 507
524 if (!strcmp (opt, "h")) 508 if (!strcmp (opt, "h"))
525 rxvt_usage (0); 509 rxvt_usage (0);
526 510
527 /* feature: always try to match long-options */ 511 /* feature: always try to match long-options */
528 for (entry = 0; entry < optList_size; entry++) 512 for (entry = 0; entry < ecb_array_length (optList); entry++)
529 if ((optList[entry].kw && !strcmp (opt, optList[entry].kw)) 513 if ((optList[entry].kw && !strcmp (opt, optList[entry].kw))
530 || (!longopt 514 || (!longopt
531 && optList[entry].opt && !strcmp (opt, optList[entry].opt))) 515 && optList[entry].opt && !strcmp (opt, optList[entry].opt)))
532 break; 516 break;
533 517
534 if (entry < optList_size) 518 if (entry < ecb_array_length (optList))
535 { 519 {
536 if (optList_isReverse (entry)) 520 if (optList_isReverse (entry))
537 flag = !flag; 521 flag = !flag;
538 522
539 if (optList_isString (entry)) 523 if (optList_isString (entry))
540 { 524 {
541 /* 525 /*
542 * special cases are handled in main.c:main () to allow 526 * special cases are handled in init_resources () to allow
543 * X resources to set these values before we settle for 527 * X resources to set these values before we settle for
544 * default values 528 * default values
545 */ 529 */
546 530
547 if (optList[entry].doff != -1) 531 if (optList[entry].doff != -1)
… …
571#ifdef KEYSYM_RESOURCE 555#ifdef KEYSYM_RESOURCE
572 else if (!strncmp (opt, "keysym.", sizeof ("keysym.") - 1)) 556 else if (!strncmp (opt, "keysym.", sizeof ("keysym.") - 1))
573 { 557 {
574 if (i+1 < argc) 558 if (i+1 < argc)
575 { 559 {
576 char *res = (char *)malloc (strlen (opt) + strlen (argv[++i]) + 6); 560 char *res = rxvt_temp_buf<char> (strlen (opt) + strlen (argv[++i]) + 6);
577 sprintf (res, "*.%s: %s\n", opt, argv[i]); 561 sprintf (res, "*.%s: %s\n", opt, argv[i]);
578 XrmPutLineResource (&option_db, res); 562 XrmPutLineResource (&option_db, res);
579 free (res);
580 } 563 }
581 } 564 }
582#endif 565#endif
583 else 566 else
584 { 567 {
… …
601 * Define key from XrmEnumerateDatabase. 584 * Define key from XrmEnumerateDatabase.
602 * quarks will be something like 585 * quarks will be something like
603 * "rxvt" "keysym" "0xFF01" 586 * "rxvt" "keysym" "0xFF01"
604 * value will be a string 587 * value will be a string
605 */ 588 */
606/* ARGSUSED */ 589static int
607int
608rxvt_define_key (XrmDatabase *database UNUSED, 590rxvt_define_key (XrmDatabase *database ecb_unused,
609 XrmBindingList bindings UNUSED, 591 XrmBindingList bindings ecb_unused,
610 XrmQuarkList quarks, 592 XrmQuarkList quarks,
611 XrmRepresentation *type UNUSED, 593 XrmRepresentation *type ecb_unused,
612 XrmValue *value, 594 XrmValue *value,
613 XPointer closure UNUSED) 595 XPointer closure ecb_unused)
614{ 596{
615 int last; 597 int last;
616 598
617 for (last = 0; quarks[last] != NULLQUARK; last++) /* look for last quark in list */ 599 for (last = 0; quarks[last] != NULLQUARK; last++) /* look for last quark in list */
618 ; 600 ;
… …
681 // parse modifiers 663 // parse modifiers
682 while (str < key) 664 while (str < key)
683 { 665 {
684 unsigned int i; 666 unsigned int i;
685 667
686 for (i=0; i < sizeof (keysym_vocabulary) / sizeof (keysym_vocabulary_t); ++i) 668 for (i = 0; i < ecb_array_length (keysym_vocabulary); ++i)
687 { 669 {
688 if (strncmp (str, keysym_vocabulary [i].name, keysym_vocabulary [i].len) == 0) 670 if (strncmp (str, keysym_vocabulary [i].name, keysym_vocabulary [i].len) == 0)
689 { 671 {
690 state |= keysym_vocabulary[i].value; 672 state |= keysym_vocabulary[i].value;
691 str += keysym_vocabulary[i].len; 673 str += keysym_vocabulary[i].len;
692 break; 674 break;
693 } 675 }
694 } 676 }
695 677
696 if (i >= sizeof (keysym_vocabulary) / sizeof (keysym_vocabulary_t)) 678 if (i >= ecb_array_length (keysym_vocabulary))
697 return -1; 679 return -1;
698 680
699 if (*str == '-') 681 if (*str == '-')
700 ++str; 682 ++str;
701 } 683 }
… …
706 // fallback on hexadecimal parsing 688 // fallback on hexadecimal parsing
707 char *end; 689 char *end;
708 sym = strtol (str, &end, 16); 690 sym = strtol (str, &end, 16);
709 if (*end) 691 if (*end)
710 return -1; 692 return -1;
711 } 693 }
712 694
695 wchar_t *ws = rxvt_mbstowcs (arg);
713 keyboard->register_user_translation (sym, state, arg); 696 keyboard->register_user_translation (sym, state, ws);
697 free (ws);
714 return 1; 698 return 1;
715} 699}
716 700
717# endif /* KEYSYM_RESOURCE */ 701# endif /* KEYSYM_RESOURCE */
718#endif /* NO_RESOURCES */ 702#endif /* NO_RESOURCES */
… …
761 XrmMergeDatabases (option_db, &database); 745 XrmMergeDatabases (option_db, &database);
762 option_db = NULL; 746 option_db = NULL;
763 /* 747 /*
764 * Query resources for options that affect us 748 * Query resources for options that affect us
765 */ 749 */
766 for (int entry = 0; entry < optList_size; entry++) 750 for (int entry = 0; entry < ecb_array_length (optList); entry++)
767 { 751 {
768 int s; 752 int s;
769 const char *kw = optList[entry].kw; 753 const char *kw = optList[entry].kw;
770 754
771 if (kw == NULL || rs[optList[entry].doff] != NULL) 755 if (kw == NULL || rs[optList[entry].doff] != NULL)
… …
809 class_prefix[2] = NULLQUARK; 793 class_prefix[2] = NULLQUARK;
810 /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */ 794 /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */
811 XrmEnumerateDatabase (database, name_prefix, class_prefix, 795 XrmEnumerateDatabase (database, name_prefix, class_prefix,
812 XrmEnumOneLevel, rxvt_define_key, NULL); 796 XrmEnumOneLevel, rxvt_define_key, NULL);
813# ifdef RESFALLBACK 797# ifdef RESFALLBACK
814 name_prefix[0] = XrmStringToName (RESFALLBACK);
815 name_prefix[1] = XrmStringToName ("keysym");
816 class_prefix[0] = XrmStringToName (RESFALLBACK); 798 name_prefix[0] = class_prefix[0] = XrmStringToName (RESFALLBACK);
817 class_prefix[1] = XrmStringToName ("Keysym");
818 /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */ 799 /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */
819 XrmEnumerateDatabase (database, name_prefix, class_prefix, 800 XrmEnumerateDatabase (database, name_prefix, class_prefix,
820 XrmEnumOneLevel, rxvt_define_key, NULL); 801 XrmEnumOneLevel, rxvt_define_key, NULL);
821# endif 802# endif
822# endif 803# endif

Diff Legend

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