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.141 by root, Sat Dec 26 10:24:04 2009 UTC vs.
Revision 1.149 by sf-exg, Sat Dec 18 18:17:39 2010 UTC

… …
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 */
… …
112#if ENABLE_TRANSPARENCY 110#if ENABLE_TRANSPARENCY
113 BOOL (Rs_transparent, "inheritPixmap", "ip", Opt_transparent, 0, "inherit parent pixmap"), 111 BOOL (Rs_transparent, "inheritPixmap", "ip", Opt_transparent, 0, "inherit parent pixmap"),
114 BOOL (Rs_transparent, "transparent", "tr", Opt_transparent, 0, "inherit parent pixmap"), 112 BOOL (Rs_transparent, "transparent", "tr", Opt_transparent, 0, "inherit parent pixmap"),
115 STRG (Rs_color + Color_tint, "tintColor", "tint", "color", "tint color"), 113 STRG (Rs_color + Color_tint, "tintColor", "tint", "color", "tint color"),
116 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"),
117#endif 116#endif
118#if OFF_FOCUS_FADING 117#if OFF_FOCUS_FADING
119 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"),
120 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"),
121#endif 120#endif
… …
177#ifdef RXVT_SCROLLBAR 176#ifdef RXVT_SCROLLBAR
178 RSTRG (Rs_color + Color_trough, "troughColor", "color"), 177 RSTRG (Rs_color + Color_trough, "troughColor", "color"),
179#endif 178#endif
180#ifdef OPTION_HC 179#ifdef OPTION_HC
181 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"),
182#endif 182#endif
183#ifndef NO_CURSORCOLOR 183#ifndef NO_CURSORCOLOR
184 STRG (Rs_color + Color_cursor, "cursorColor", "cr", "color", "cursor color"), 184 STRG (Rs_color + Color_cursor, "cursorColor", "cr", "color", "cursor color"),
185 /* command-line option = resource name */ 185 /* command-line option = resource name */
186 RSTRG (Rs_color + Color_cursor2, "cursorColor2", "color"), 186 RSTRG (Rs_color + Color_cursor2, "cursorColor2", "color"),
… …
189 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"),
190 STRG (Rs_color + Color_border, "borderColor", "bd", "color", "border color"), 190 STRG (Rs_color + Color_border, "borderColor", "bd", "color", "border color"),
191#ifdef BG_IMAGE_FROM_FILE 191#ifdef BG_IMAGE_FROM_FILE
192 RSTRG (Rs_path, "path", "search path"), 192 RSTRG (Rs_path, "path", "search path"),
193 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
194#endif 197#endif
195 /* fonts: command-line option = resource name */ 198 /* fonts: command-line option = resource name */
196 STRG (Rs_font, "font", "fn", "fontname", "normal text font"), 199 STRG (Rs_font, "font", "fn", "fontname", "normal text font"),
197#if ENABLE_STYLES 200#if ENABLE_STYLES
198 STRG (Rs_boldFont, "boldFont", "fb", "fontname", "bold font"), 201 STRG (Rs_boldFont, "boldFont", "fb", "fontname", "bold font"),
… …
258 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
259 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
260 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"),
261#endif 264#endif
262#if ISO_14755 265#if ISO_14755
266 BOOL (Rs_iso14755, "iso14755", NULL, Opt_iso14755, 0, NULL),
263 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),
264#endif 268#endif
265#ifdef HAVE_AFTERIMAGE 269#ifdef HAVE_AFTERIMAGE
266 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..."),
267 STRG (Rs_blurradius, "blurRadius", "blr", "HxV", "gaussian blur radii to apply to the root background"),
268# if ENABLE_EWMH
269 STRG (Rs_iconfile, "iconFile", "icon", "file", "path to application icon image"),
270# endif
271#endif 271#endif
272 INFO ("e", "command arg ...", "command to execute") 272 INFO ("e", "command arg ...", "command to execute")
273 }; 273 };
274 274
275#undef INFO 275#undef INFO
… …
325 "transparent," 325 "transparent,"
326 "tint," 326 "tint,"
327#endif 327#endif
328#if HAVE_AFTERIMAGE 328#if HAVE_AFTERIMAGE
329 "afterimage," 329 "afterimage,"
330#endif
331#if HAVE_PIXBUF
332 "pixbuf,"
330#endif 333#endif
331#if defined(USE_XIM) 334#if defined(USE_XIM)
332 "XIM," 335 "XIM,"
333#endif 336#endif
334#if defined(NO_BACKSPACE_KEY) 337#if defined(NO_BACKSPACE_KEY)
… …
394 switch (type) 397 switch (type)
395 { 398 {
396 case 0: /* brief listing */ 399 case 0: /* brief listing */
397 rxvt_log (" [-help] [--help]\n"); 400 rxvt_log (" [-help] [--help]\n");
398 401
399 for (col = 1, i = 0; i < optList_size; i++) 402 for (col = 1, i = 0; i < ARRAY_LENGTH(optList); i++)
400 if (optList[i].desc != NULL) 403 if (optList[i].desc != NULL)
401 { 404 {
402 int len = 0; 405 int len = 0;
403 406
404 if (optList[i].arg) 407 if (optList[i].arg)
… …
422 break; 425 break;
423 426
424 case 1: /* full command-line listing */ 427 case 1: /* full command-line listing */
425 rxvt_log (" [options] [-e command args]\n\nwhere options include:\n"); 428 rxvt_log (" [options] [-e command args]\n\nwhere options include:\n");
426 429
427 for (i = 0; i < optList_size; i++) 430 for (i = 0; i < ARRAY_LENGTH(optList); i++)
428 if (optList[i].desc != NULL) 431 if (optList[i].desc != NULL)
429 { 432 {
430 assert (optList[i].opt != NULL); 433 assert (optList[i].opt != NULL);
431 rxvt_log (" %s%s %-*s%s%s\n", 434 rxvt_log (" %s%s %-*s%s%s\n",
432 (optList_isBool (i) ? "-/+" : "-"), optList[i].opt, 435 (optList_isBool (i) ? "-/+" : "-"), optList[i].opt,
… …
441 444
442 case 2: /* full resource listing */ 445 case 2: /* full resource listing */
443 rxvt_log (" [options] [-e command args]\n\n" 446 rxvt_log (" [options] [-e command args]\n\n"
444 "where resources (long-options) include:\n"); 447 "where resources (long-options) include:\n");
445 448
446 for (i = 0; i < optList_size; i++) 449 for (i = 0; i < ARRAY_LENGTH(optList); i++)
447 if (optList[i].kw != NULL) 450 if (optList[i].kw != NULL)
448 rxvt_log (" %s: %*s%s\n", 451 rxvt_log (" %s: %*s%s\n",
449 optList[i].kw, 452 optList[i].kw,
450 (INDENT - strlen (optList[i].kw)), "", /* XXX */ 453 (INDENT - strlen (optList[i].kw)), "", /* XXX */
451 (optList_isBool (i) ? "boolean" : optList[i].arg)); 454 (optList_isBool (i) ? "boolean" : optList[i].arg));
… …
505 508
506 if (!strcmp (opt, "h")) 509 if (!strcmp (opt, "h"))
507 rxvt_usage (0); 510 rxvt_usage (0);
508 511
509 /* feature: always try to match long-options */ 512 /* feature: always try to match long-options */
510 for (entry = 0; entry < optList_size; entry++) 513 for (entry = 0; entry < ARRAY_LENGTH(optList); entry++)
511 if ((optList[entry].kw && !strcmp (opt, optList[entry].kw)) 514 if ((optList[entry].kw && !strcmp (opt, optList[entry].kw))
512 || (!longopt 515 || (!longopt
513 && optList[entry].opt && !strcmp (opt, optList[entry].opt))) 516 && optList[entry].opt && !strcmp (opt, optList[entry].opt)))
514 break; 517 break;
515 518
516 if (entry < optList_size) 519 if (entry < ARRAY_LENGTH(optList))
517 { 520 {
518 if (optList_isReverse (entry)) 521 if (optList_isReverse (entry))
519 flag = !flag; 522 flag = !flag;
520 523
521 if (optList_isString (entry)) 524 if (optList_isString (entry))
… …
553#ifdef KEYSYM_RESOURCE 556#ifdef KEYSYM_RESOURCE
554 else if (!strncmp (opt, "keysym.", sizeof ("keysym.") - 1)) 557 else if (!strncmp (opt, "keysym.", sizeof ("keysym.") - 1))
555 { 558 {
556 if (i+1 < argc) 559 if (i+1 < argc)
557 { 560 {
558 char *res = (char *)malloc (strlen (opt) + strlen (argv[++i]) + 6); 561 char *res = rxvt_temp_buf<char> (strlen (opt) + strlen (argv[++i]) + 6);
559 sprintf (res, "*.%s: %s\n", opt, argv[i]); 562 sprintf (res, "*.%s: %s\n", opt, argv[i]);
560 XrmPutLineResource (&option_db, res); 563 XrmPutLineResource (&option_db, res);
561 free (res);
562 } 564 }
563 } 565 }
564#endif 566#endif
565 else 567 else
566 { 568 {
… …
663 // parse modifiers 665 // parse modifiers
664 while (str < key) 666 while (str < key)
665 { 667 {
666 unsigned int i; 668 unsigned int i;
667 669
668 for (i=0; i < sizeof (keysym_vocabulary) / sizeof (keysym_vocabulary_t); ++i) 670 for (i=0; i < ARRAY_LENGTH(keysym_vocabulary); ++i)
669 { 671 {
670 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)
671 { 673 {
672 state |= keysym_vocabulary[i].value; 674 state |= keysym_vocabulary[i].value;
673 str += keysym_vocabulary[i].len; 675 str += keysym_vocabulary[i].len;
674 break; 676 break;
675 } 677 }
676 } 678 }
677 679
678 if (i >= sizeof (keysym_vocabulary) / sizeof (keysym_vocabulary_t)) 680 if (i >= ARRAY_LENGTH(keysym_vocabulary))
679 return -1; 681 return -1;
680 682
681 if (*str == '-') 683 if (*str == '-')
682 ++str; 684 ++str;
683 } 685 }
… …
688 // fallback on hexadecimal parsing 690 // fallback on hexadecimal parsing
689 char *end; 691 char *end;
690 sym = strtol (str, &end, 16); 692 sym = strtol (str, &end, 16);
691 if (*end) 693 if (*end)
692 return -1; 694 return -1;
693 } 695 }
694 696
695 keyboard->register_user_translation (sym, state, arg); 697 keyboard->register_user_translation (sym, state, arg);
696 return 1; 698 return 1;
697} 699}
698 700
… …
743 XrmMergeDatabases (option_db, &database); 745 XrmMergeDatabases (option_db, &database);
744 option_db = NULL; 746 option_db = NULL;
745 /* 747 /*
746 * Query resources for options that affect us 748 * Query resources for options that affect us
747 */ 749 */
748 for (int entry = 0; entry < optList_size; entry++) 750 for (int entry = 0; entry < ARRAY_LENGTH(optList); entry++)
749 { 751 {
750 int s; 752 int s;
751 const char *kw = optList[entry].kw; 753 const char *kw = optList[entry].kw;
752 754
753 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