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.134 by ayin, Sun Jan 27 16:52:13 2008 UTC vs.
Revision 1.151 by sf-exg, Wed Apr 13 14:00:18 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 HAVE_SCROLLBARS
178 RSTRG (Rs_color + Color_scroll, "scrollColor", "color"), 175 RSTRG (Rs_color + Color_scroll, "scrollColor", "color"),
179#endif
180#ifdef RXVT_SCROLLBAR 176#ifdef RXVT_SCROLLBAR
181 RSTRG (Rs_color + Color_trough, "troughColor", "color"), 177 RSTRG (Rs_color + Color_trough, "troughColor", "color"),
182#endif 178#endif
183#ifdef OPTION_HC 179#ifdef OPTION_HC
184 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"),
185#endif 182#endif
186#ifndef NO_CURSORCOLOR 183#ifndef NO_CURSORCOLOR
187 STRG (Rs_color + Color_cursor, "cursorColor", "cr", "color", "cursor color"), 184 STRG (Rs_color + Color_cursor, "cursorColor", "cr", "color", "cursor color"),
188 /* command-line option = resource name */ 185 /* command-line option = resource name */
189 RSTRG (Rs_color + Color_cursor2, "cursorColor2", "color"), 186 RSTRG (Rs_color + Color_cursor2, "cursorColor2", "color"),
… …
192 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"),
193 STRG (Rs_color + Color_border, "borderColor", "bd", "color", "border color"), 190 STRG (Rs_color + Color_border, "borderColor", "bd", "color", "border color"),
194#ifdef BG_IMAGE_FROM_FILE 191#ifdef BG_IMAGE_FROM_FILE
195 RSTRG (Rs_path, "path", "search path"), 192 RSTRG (Rs_path, "path", "search path"),
196 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
197#endif 197#endif
198 /* fonts: command-line option = resource name */ 198 /* fonts: command-line option = resource name */
199 STRG (Rs_font, "font", "fn", "fontname", "normal text font"), 199 STRG (Rs_font, "font", "fn", "fontname", "normal text font"),
200#if ENABLE_STYLES 200#if ENABLE_STYLES
201 STRG (Rs_boldFont, "boldFont", "fb", "fontname", "bold font"), 201 STRG (Rs_boldFont, "boldFont", "fb", "fontname", "bold font"),
… …
230 STRG (Rs_ext_bwidth, NULL, "bw", NULL, NULL), 230 STRG (Rs_ext_bwidth, NULL, "bw", NULL, NULL),
231 STRG (Rs_ext_bwidth, NULL, "borderwidth", NULL, NULL), 231 STRG (Rs_ext_bwidth, NULL, "borderwidth", NULL, NULL),
232 STRG (Rs_int_bwidth, "internalBorder", "b", "number", "internal border in pixels"), 232 STRG (Rs_int_bwidth, "internalBorder", "b", "number", "internal border in pixels"),
233 BOOL (Rs_borderLess, "borderLess", "bl", Opt_borderLess, 0, "borderless window"), 233 BOOL (Rs_borderLess, "borderLess", "bl", Opt_borderLess, 0, "borderless window"),
234 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"),
235#endif 236#endif
236#ifdef BUILTIN_GLYPHS 237#ifdef BUILTIN_GLYPHS
237 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"),
238#endif 239#endif
239#ifdef POINTER_BLANK 240#ifdef POINTER_BLANK
… …
247#endif 248#endif
248#ifdef PRINTPIPE 249#ifdef PRINTPIPE
249 RSTRG (Rs_print_pipe, "print-pipe", "string"), 250 RSTRG (Rs_print_pipe, "print-pipe", "string"),
250#endif 251#endif
251 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"),
252#ifdef CUTCHAR_RESOURCE
253 RSTRG (Rs_cutchars, "cutchars", "string"), 253 RSTRG (Rs_cutchars, "cutchars", "string"),
254#endif /* CUTCHAR_RESOURCE */
255 RSTRG (Rs_answerbackstring, "answerbackString", "string"), 254 RSTRG (Rs_answerbackstring, "answerbackString", "string"),
256#ifndef NO_SECONDARY_SCREEN 255#ifndef NO_SECONDARY_SCREEN
257 BOOL (Rs_secondaryScreen, "secondaryScreen", "ssc", Opt_secondaryScreen, 0, "enable secondary screen"), 256 BOOL (Rs_secondaryScreen, "secondaryScreen", "ssc", Opt_secondaryScreen, 0, "enable secondary screen"),
258 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"),
259#endif 258#endif
… …
262 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
263 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
264 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"),
265#endif 264#endif
266#if ISO_14755 265#if ISO_14755
266 BOOL (Rs_iso14755, "iso14755", NULL, Opt_iso14755, 0, NULL),
267 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),
268#endif 268#endif
269#ifdef HAVE_AFTERIMAGE 269#ifdef HAVE_AFTERIMAGE
270 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..."),
271 STRG (Rs_blurradius, "blurRadius", "blr", "HxV", "Gaussian Blur radii to apply to the root background"),
272#endif 271#endif
273 INFO ("e", "command arg ...", "command to execute") 272 INFO ("e", "command arg ...", "command to execute")
274 }; 273 };
275 274
276#undef INFO 275#undef INFO
… …
327 "tint," 326 "tint,"
328#endif 327#endif
329#if HAVE_AFTERIMAGE 328#if HAVE_AFTERIMAGE
330 "afterimage," 329 "afterimage,"
331#endif 330#endif
331#if HAVE_PIXBUF
332 "pixbuf,"
333#endif
332#if defined(USE_XIM) 334#if defined(USE_XIM)
333 "XIM," 335 "XIM,"
334#endif 336#endif
335#if defined(NO_BACKSPACE_KEY) 337#if defined(NO_BACKSPACE_KEY)
336 "no_backspace," 338 "no_backspace,"
… …
363 "pointerBlank," 365 "pointerBlank,"
364#endif 366#endif
365#if defined(NO_RESOURCES) 367#if defined(NO_RESOURCES)
366 "NoResources," 368 "NoResources,"
367#endif 369#endif
368 "scrollbars=" 370 "scrollbars=plain"
369#if !defined(HAVE_SCROLLBARS)
370 "NONE"
371#else
372# if defined(PLAIN_SCROLLBAR)
373 "plain"
374# if defined(RXVT_SCROLLBAR) || defined(NEXT_SCROLLBAR) || defined(XTERM_SCROLLBAR)
375 "+"
376# endif
377# endif
378# if defined(RXVT_SCROLLBAR) 371#if defined(RXVT_SCROLLBAR)
379 "rxvt" 372 "+rxvt"
380# if defined(NEXT_SCROLLBAR) || defined(XTERM_SCROLLBAR)
381 "+"
382# endif
383# endif 373#endif
384# if defined(NEXT_SCROLLBAR) 374#if defined(NEXT_SCROLLBAR)
385 "NeXT" 375 "+NeXT"
386# if defined(XTERM_SCROLLBAR)
387 "+"
388# endif
389# endif 376#endif
390# if defined(XTERM_SCROLLBAR) 377#if defined(XTERM_SCROLLBAR)
391 "xterm" 378 "+xterm"
392# endif
393#endif 379#endif
394 "\nUsage: "; /* Usage */ 380 "\nUsage: "; /* Usage */
395 381
396#define INDENT 18 382#define INDENT 18
397 383
… …
411 switch (type) 397 switch (type)
412 { 398 {
413 case 0: /* brief listing */ 399 case 0: /* brief listing */
414 rxvt_log (" [-help] [--help]\n"); 400 rxvt_log (" [-help] [--help]\n");
415 401
416 for (col = 1, i = 0; i < optList_size; i++) 402 for (col = 1, i = 0; i < ARRAY_LENGTH(optList); i++)
417 if (optList[i].desc != NULL) 403 if (optList[i].desc != NULL)
418 { 404 {
419 int len = 0; 405 int len = 0;
420 406
421 if (optList[i].arg) 407 if (optList[i].arg)
422 len = strlen (optList[i].arg) + 1; 408 len = strlen (optList[i].arg) + 1;
423#ifdef DEBUG_STRICT
424 assert (optList[i].opt != NULL); 409 assert (optList[i].opt != NULL);
425#endif
426 len += 4 + strlen (optList[i].opt) + (optList_isBool (i) ? 2: 0); 410 len += 4 + strlen (optList[i].opt) + (optList_isBool (i) ? 2 : 0);
427 col += len; 411 col += len;
428 if (col > 79) 412 if (col > 79)
429 { 413 {
430 /* assume regular width */ 414 /* assume regular width */
431 rxvt_log ("\n"); 415 rxvt_log ("\n");
… …
441 break; 425 break;
442 426
443 case 1: /* full command-line listing */ 427 case 1: /* full command-line listing */
444 rxvt_log (" [options] [-e command args]\n\nwhere options include:\n"); 428 rxvt_log (" [options] [-e command args]\n\nwhere options include:\n");
445 429
446 for (i = 0; i < optList_size; i++) 430 for (i = 0; i < ARRAY_LENGTH(optList); i++)
447 if (optList[i].desc != NULL) 431 if (optList[i].desc != NULL)
448 { 432 {
449#ifdef DEBUG_STRICT
450 assert (optList[i].opt != NULL); 433 assert (optList[i].opt != NULL);
451#endif
452 rxvt_log (" %s%s %-*s%s%s\n", 434 rxvt_log (" %s%s %-*s%s%s\n",
453 (optList_isBool (i) ? "-/+" : "-"), optList[i].opt, 435 (optList_isBool (i) ? "-/+" : "-"), optList[i].opt,
454 (INDENT - strlen (optList[i].opt) 436 (INDENT - strlen (optList[i].opt)
455 + (optList_isBool (i) ? 0 : 2)), 437 + (optList_isBool (i) ? 0 : 2)),
456 (optList[i].arg ? optList[i].arg : ""), 438 (optList[i].arg ? optList[i].arg : ""),
… …
462 444
463 case 2: /* full resource listing */ 445 case 2: /* full resource listing */
464 rxvt_log (" [options] [-e command args]\n\n" 446 rxvt_log (" [options] [-e command args]\n\n"
465 "where resources (long-options) include:\n"); 447 "where resources (long-options) include:\n");
466 448
467 for (i = 0; i < optList_size; i++) 449 for (i = 0; i < ARRAY_LENGTH(optList); i++)
468 if (optList[i].kw != NULL) 450 if (optList[i].kw != NULL)
469 rxvt_log (" %s: %*s%s\n", 451 rxvt_log (" %s: %*s%s\n",
470 optList[i].kw, 452 optList[i].kw,
471 (INDENT - strlen (optList[i].kw)), "", /* XXX */ 453 (INDENT - strlen (optList[i].kw)), "", /* XXX */
472 (optList_isBool (i) ? "boolean" : optList[i].arg)); 454 (optList_isBool (i) ? "boolean" : optList[i].arg));
… …
526 508
527 if (!strcmp (opt, "h")) 509 if (!strcmp (opt, "h"))
528 rxvt_usage (0); 510 rxvt_usage (0);
529 511
530 /* feature: always try to match long-options */ 512 /* feature: always try to match long-options */
531 for (entry = 0; entry < optList_size; entry++) 513 for (entry = 0; entry < ARRAY_LENGTH(optList); entry++)
532 if ((optList[entry].kw && !strcmp (opt, optList[entry].kw)) 514 if ((optList[entry].kw && !strcmp (opt, optList[entry].kw))
533 || (!longopt 515 || (!longopt
534 && optList[entry].opt && !strcmp (opt, optList[entry].opt))) 516 && optList[entry].opt && !strcmp (opt, optList[entry].opt)))
535 break; 517 break;
536 518
537 if (entry < optList_size) 519 if (entry < ARRAY_LENGTH(optList))
538 { 520 {
539 if (optList_isReverse (entry)) 521 if (optList_isReverse (entry))
540 flag = !flag; 522 flag = !flag;
541 523
542 if (optList_isString (entry)) 524 if (optList_isString (entry))
… …
574#ifdef KEYSYM_RESOURCE 556#ifdef KEYSYM_RESOURCE
575 else if (!strncmp (opt, "keysym.", sizeof ("keysym.") - 1)) 557 else if (!strncmp (opt, "keysym.", sizeof ("keysym.") - 1))
576 { 558 {
577 if (i+1 < argc) 559 if (i+1 < argc)
578 { 560 {
579 char *res = (char *)malloc (strlen (opt) + strlen (argv[++i]) + 6); 561 char *res = rxvt_temp_buf<char> (strlen (opt) + strlen (argv[++i]) + 6);
580 sprintf (res, "*.%s: %s\n", opt, argv[i]); 562 sprintf (res, "*.%s: %s\n", opt, argv[i]);
581 XrmPutLineResource (&option_db, res); 563 XrmPutLineResource (&option_db, res);
582 free (res);
583 } 564 }
584 } 565 }
585#endif 566#endif
586 else 567 else
587 { 568 {
… …
684 // parse modifiers 665 // parse modifiers
685 while (str < key) 666 while (str < key)
686 { 667 {
687 unsigned int i; 668 unsigned int i;
688 669
689 for (i=0; i < sizeof (keysym_vocabulary) / sizeof (keysym_vocabulary_t); ++i) 670 for (i=0; i < ARRAY_LENGTH(keysym_vocabulary); ++i)
690 { 671 {
691 if (strncmp (str, keysym_vocabulary [i].name, keysym_vocabulary [i].len) == 0) 672 if (strncmp (str, keysym_vocabulary [i].name, keysym_vocabulary [i].len) == 0)
692 { 673 {
693 state |= keysym_vocabulary[i].value; 674 state |= keysym_vocabulary[i].value;
694 str += keysym_vocabulary[i].len; 675 str += keysym_vocabulary[i].len;
695 break; 676 break;
696 } 677 }
697 } 678 }
698 679
699 if (i >= sizeof (keysym_vocabulary) / sizeof (keysym_vocabulary_t)) 680 if (i >= ARRAY_LENGTH(keysym_vocabulary))
700 return -1; 681 return -1;
701 682
702 if (*str == '-') 683 if (*str == '-')
703 ++str; 684 ++str;
704 } 685 }
… …
709 // fallback on hexadecimal parsing 690 // fallback on hexadecimal parsing
710 char *end; 691 char *end;
711 sym = strtol (str, &end, 16); 692 sym = strtol (str, &end, 16);
712 if (*end) 693 if (*end)
713 return -1; 694 return -1;
714 } 695 }
715 696
716 keyboard->register_user_translation (sym, state, arg); 697 keyboard->register_user_translation (sym, state, arg);
717 return 1; 698 return 1;
718} 699}
719 700
… …
764 XrmMergeDatabases (option_db, &database); 745 XrmMergeDatabases (option_db, &database);
765 option_db = NULL; 746 option_db = NULL;
766 /* 747 /*
767 * Query resources for options that affect us 748 * Query resources for options that affect us
768 */ 749 */
769 for (int entry = 0; entry < optList_size; entry++) 750 for (int entry = 0; entry < ARRAY_LENGTH(optList); entry++)
770 { 751 {
771 int s; 752 int s;
772 const char *kw = optList[entry].kw; 753 const char *kw = optList[entry].kw;
773 754
774 if (kw == NULL || rs[optList[entry].doff] != NULL) 755 if (kw == NULL || rs[optList[entry].doff] != NULL)

Diff Legend

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