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