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.129 by ayin, Mon Jan 7 12:31:49 2008 UTC vs.
Revision 1.140 by root, Sat May 30 08:51:23 2009 UTC

… …
63/* SWCH () - `-' flag */ 63/* SWCH () - `-' flag */
64#define SWCH(opt, option, flag, desc) \ 64#define SWCH(opt, option, flag, desc) \
65 { (option), (Optflag_Switch | (flag)), -1, NULL, (opt), NULL, (desc)} 65 { (option), (Optflag_Switch | (flag)), -1, NULL, (opt), NULL, (desc)}
66 66
67/* convenient macros */ 67/* convenient macros */
68#define optList_strlen(i) \ 68#define optList_isString(i) \
69 (optList[i].flag ? 0 : (optList[i].arg ? strlen (optList[i].arg) : 1)) 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 \ 74#define optList_size \
… …
91 STRG (Rs_geometry, NULL, "g", NULL, NULL), /* short form */ 91 STRG (Rs_geometry, NULL, "g", NULL, NULL), /* short form */
92 STRG (Rs_geometry, "geometry", "geometry", "geometry", "size (in characters) and position"), 92 STRG (Rs_geometry, "geometry", "geometry", "geometry", "size (in characters) and position"),
93 SWCH ("C", Opt_console, 0, "intercept console messages"), 93 SWCH ("C", Opt_console, 0, "intercept console messages"),
94 SWCH ("iconic", Opt_iconic, 0, "start iconic"), 94 SWCH ("iconic", Opt_iconic, 0, "start iconic"),
95 SWCH ("ic", Opt_iconic, 0, NULL), /* short form */ 95 SWCH ("ic", Opt_iconic, 0, NULL), /* short form */
96 STRG (Rs_chdir, "chdir", "cd", "string", "start shell in this directory"),
96 BOOL (Rs_reverseVideo, "reverseVideo", "rv", Opt_reverseVideo, 0, "reverse video"), 97 BOOL (Rs_reverseVideo, "reverseVideo", "rv", Opt_reverseVideo, 0, "reverse video"),
97 BOOL (Rs_loginShell, "loginShell", "ls", Opt_loginShell, 0, "login shell"), 98 BOOL (Rs_loginShell, "loginShell", "ls", Opt_loginShell, 0, "login shell"),
98 BOOL (Rs_jumpScroll, "jumpScroll", "j", Opt_jumpScroll, 0, "jump scrolling"), 99 BOOL (Rs_jumpScroll, "jumpScroll", "j", Opt_jumpScroll, 0, "jump scrolling"),
99 BOOL (Rs_skipScroll, "skipScroll", "ss", Opt_skipScroll, 0, "skip scrolling"), 100 BOOL (Rs_skipScroll, "skipScroll", "ss", Opt_skipScroll, 0, "skip scrolling"),
100 BOOL (Rs_pastableTabs, "pastableTabs", "ptab", Opt_pastableTabs, 0, "tab characters are pastable"), 101 BOOL (Rs_pastableTabs, "pastableTabs", "ptab", Opt_pastableTabs, 0, "tab characters are pastable"),
101#if HAVE_SCROLLBARS
102 RSTRG (Rs_scrollstyle, "scrollstyle", "mode"), 102 RSTRG (Rs_scrollstyle, "scrollstyle", "mode"),
103 BOOL (Rs_scrollBar, "scrollBar", "sb", Opt_scrollBar, 0, "scrollbar"), 103 BOOL (Rs_scrollBar, "scrollBar", "sb", Opt_scrollBar, 0, "scrollbar"),
104 BOOL (Rs_scrollBar_right, "scrollBar_right", "sr", Opt_scrollBar_right, 0, "scrollbar right"), 104 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"), 105 BOOL (Rs_scrollBar_floating, "scrollBar_floating", "st", Opt_scrollBar_floating, 0, "scrollbar without a trough"),
106 RSTRG (Rs_scrollBar_align, "scrollBar_align", "mode"), 106 RSTRG (Rs_scrollBar_align, "scrollBar_align", "mode"),
107 STRG (Rs_scrollBar_thickness, "thickness", "sbt", "number", "scrollbar thickness/width in pixels"), 107 STRG (Rs_scrollBar_thickness, "thickness", "sbt", "number", "scrollbar thickness/width in pixels"),
108#endif
109 BOOL (Rs_scrollTtyOutput, "scrollTtyOutput", NULL, Opt_scrollTtyOutput, 0, NULL), 108 BOOL (Rs_scrollTtyOutput, "scrollTtyOutput", NULL, Opt_scrollTtyOutput, 0, NULL),
110 BOOL (Rs_scrollTtyOutput, NULL, "si", Opt_scrollTtyOutput, Optflag_Reverse, "scroll-on-tty-output inhibit"), 109 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"), 110 BOOL (Rs_scrollTtyKeypress, "scrollTtyKeypress", "sk", Opt_scrollTtyKeypress, 0, "scroll-on-keypress"),
112 BOOL (Rs_scrollWithBuffer, "scrollWithBuffer", "sw", Opt_scrollWithBuffer, 0, "scroll-with-buffer"), 111 BOOL (Rs_scrollWithBuffer, "scrollWithBuffer", "sw", Opt_scrollWithBuffer, 0, "scroll-with-buffer"),
113#if ENABLE_TRANSPARENCY 112#if ENABLE_TRANSPARENCY
… …
172 RSTRG (Rs_color + Color_RV, "colorRV", "color"), 171 RSTRG (Rs_color + Color_RV, "colorRV", "color"),
173#endif /* ! NO_BOLD_UNDERLINE_REVERSE */ 172#endif /* ! NO_BOLD_UNDERLINE_REVERSE */
174#if ENABLE_FRILLS 173#if ENABLE_FRILLS
175 RSTRG (Rs_color + Color_underline, "underlineColor", "color"), 174 RSTRG (Rs_color + Color_underline, "underlineColor", "color"),
176#endif 175#endif
177#ifdef KEEP_SCROLLCOLOR
178 RSTRG (Rs_color + Color_scroll, "scrollColor", "color"), 176 RSTRG (Rs_color + Color_scroll, "scrollColor", "color"),
177#ifdef RXVT_SCROLLBAR
179 RSTRG (Rs_color + Color_trough, "troughColor", "color"), 178 RSTRG (Rs_color + Color_trough, "troughColor", "color"),
180#endif /* KEEP_SCROLLCOLOR */ 179#endif
181#ifdef OPTION_HC 180#ifdef OPTION_HC
182 STRG (Rs_color + Color_HC, "highlightColor", "hc", "color", "highlight color"), 181 STRG (Rs_color + Color_HC, "highlightColor", "hc", "color", "highlight 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"),
… …
215#if ENABLE_XEMBED 214#if ENABLE_XEMBED
216 STRG (Rs_embed, NULL, "embed", "windowid", "window id to embed terminal in"), 215 STRG (Rs_embed, NULL, "embed", "windowid", "window id to embed terminal in"),
217#endif 216#endif
218#if XFT 217#if XFT
219 STRG (Rs_depth, "depth", "depth", "number", "depth of visual to request"), 218 STRG (Rs_depth, "depth", "depth", "number", "depth of visual to request"),
219 BOOL (Rs_buffered, "buffered", NULL, Opt_buffered, 0, NULL),
220#endif 220#endif
221#if ENABLE_FRILLS 221#if ENABLE_FRILLS
222 RSTRG (Rs_transient_for, "transient-for", "windowid"), 222 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"), 223 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"), 224 STRG (Rs_pty_fd, NULL, "pty-fd", "fileno", "file descriptor of pty to use"),
… …
227 STRG (Rs_ext_bwidth, NULL, "bw", NULL, NULL), 227 STRG (Rs_ext_bwidth, NULL, "bw", NULL, NULL),
228 STRG (Rs_ext_bwidth, NULL, "borderwidth", NULL, NULL), 228 STRG (Rs_ext_bwidth, NULL, "borderwidth", NULL, NULL),
229 STRG (Rs_int_bwidth, "internalBorder", "b", "number", "internal border in pixels"), 229 STRG (Rs_int_bwidth, "internalBorder", "b", "number", "internal border in pixels"),
230 BOOL (Rs_borderLess, "borderLess", "bl", Opt_borderLess, 0, "borderless window"), 230 BOOL (Rs_borderLess, "borderLess", "bl", Opt_borderLess, 0, "borderless window"),
231 STRG (Rs_lineSpace, "lineSpace", "lsp", "number", "number of extra pixels between rows"), 231 STRG (Rs_lineSpace, "lineSpace", "lsp", "number", "number of extra pixels between rows"),
232 STRG (Rs_letterSpace, "letterSpace", "letsp", "number", "letter spacing adjustment"),
232#endif 233#endif
233#ifdef BUILTIN_GLYPHS 234#ifdef BUILTIN_GLYPHS
234 BOOL (Rs_skipBuiltinGlyphs, "skipBuiltinGlyphs", "sbg", Opt_skipBuiltinGlyphs, 0, "do not use internal glyphs"), 235 BOOL (Rs_skipBuiltinGlyphs, "skipBuiltinGlyphs", "sbg", Opt_skipBuiltinGlyphs, 0, "do not use internal glyphs"),
235#endif 236#endif
236#ifdef POINTER_BLANK 237#ifdef POINTER_BLANK
… …
244#endif 245#endif
245#ifdef PRINTPIPE 246#ifdef PRINTPIPE
246 RSTRG (Rs_print_pipe, "print-pipe", "string"), 247 RSTRG (Rs_print_pipe, "print-pipe", "string"),
247#endif 248#endif
248 STRG (Rs_modifier, "modifier", "mod", "modifier", "meta modifier = alt|meta|hyper|super|mod1|...|mod5"), 249 STRG (Rs_modifier, "modifier", "mod", "modifier", "meta modifier = alt|meta|hyper|super|mod1|...|mod5"),
249#ifdef CUTCHAR_RESOURCE
250 RSTRG (Rs_cutchars, "cutchars", "string"), 250 RSTRG (Rs_cutchars, "cutchars", "string"),
251#endif /* CUTCHAR_RESOURCE */
252 RSTRG (Rs_answerbackstring, "answerbackString", "string"), 251 RSTRG (Rs_answerbackstring, "answerbackString", "string"),
253#ifndef NO_SECONDARY_SCREEN 252#ifndef NO_SECONDARY_SCREEN
254 BOOL (Rs_secondaryScreen, "secondaryScreen", "ssc", Opt_secondaryScreen, 0, "enable secondary screen"), 253 BOOL (Rs_secondaryScreen, "secondaryScreen", "ssc", Opt_secondaryScreen, 0, "enable secondary screen"),
255 BOOL (Rs_secondaryScroll, "secondaryScroll", "ssr", Opt_secondaryScroll, 0, "enable secondary screen scroll"), 254 BOOL (Rs_secondaryScroll, "secondaryScroll", "ssr", Opt_secondaryScroll, 0, "enable secondary screen scroll"),
256#endif 255#endif
… …
263#if ISO_14755 262#if ISO_14755
264 BOOL (Rs_iso14755_52, "iso14755_52", NULL, Opt_iso14755_52, 0, NULL), 263 BOOL (Rs_iso14755_52, "iso14755_52", NULL, Opt_iso14755_52, 0, NULL),
265#endif 264#endif
266#ifdef HAVE_AFTERIMAGE 265#ifdef HAVE_AFTERIMAGE
267 STRG (Rs_blendtype, "blendType", "blt", "string", "background image blending type - alpha, tint, etc..."), 266 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"), 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
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
… …
360 "pointerBlank," 362 "pointerBlank,"
361#endif 363#endif
362#if defined(NO_RESOURCES) 364#if defined(NO_RESOURCES)
363 "NoResources," 365 "NoResources,"
364#endif 366#endif
365 "scrollbars=" 367 "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) 368#if defined(RXVT_SCROLLBAR)
376 "rxvt" 369 "+rxvt"
377# if defined(NEXT_SCROLLBAR) || defined(XTERM_SCROLLBAR)
378 "+"
379# endif
380# endif 370#endif
381# if defined(NEXT_SCROLLBAR) 371#if defined(NEXT_SCROLLBAR)
382 "NeXT" 372 "+NeXT"
383# if defined(XTERM_SCROLLBAR)
384 "+"
385# endif
386# endif 373#endif
387# if defined(XTERM_SCROLLBAR) 374#if defined(XTERM_SCROLLBAR)
388 "xterm" 375 "+xterm"
389# endif
390#endif 376#endif
391 "\nUsage: "; /* Usage */ 377 "\nUsage: "; /* Usage */
392 378
393#define INDENT 18 379#define INDENT 18
394 380
… …
413 for (col = 1, i = 0; i < optList_size; i++) 399 for (col = 1, i = 0; i < optList_size; i++)
414 if (optList[i].desc != NULL) 400 if (optList[i].desc != NULL)
415 { 401 {
416 int len = 0; 402 int len = 0;
417 403
418 if (!optList_isBool (i)) 404 if (optList[i].arg)
419 { 405 len = strlen (optList[i].arg) + 1;
420 len = optList_strlen (i);
421 if (len > 0)
422 len++; /* account for space */
423 }
424#ifdef DEBUG_STRICT 406#ifdef DEBUG_STRICT
425 assert (optList[i].opt != NULL); 407 assert (optList[i].opt != NULL);
426#endif 408#endif
427 len += 4 + strlen (optList[i].opt) + (optList_isBool (i) ? 2: 0); 409 len += 4 + strlen (optList[i].opt) + (optList_isBool (i) ? 2: 0);
428 col += len; 410 col += len;
… …
432 rxvt_log ("\n"); 414 rxvt_log ("\n");
433 col = 1 + len; 415 col = 1 + len;
434 } 416 }
435 417
436 rxvt_log (" [-%s%s", (optList_isBool (i) ? "/+" : ""), optList[i].opt); 418 rxvt_log (" [-%s%s", (optList_isBool (i) ? "/+" : ""), optList[i].opt);
437 if (optList_strlen (i)) 419 if (optList[i].arg)
438 rxvt_log (" %s]", optList[i].arg); 420 rxvt_log (" %s]", optList[i].arg);
439 else 421 else
440 rxvt_log ("]"); 422 rxvt_log ("]");
441 } 423 }
442 break; 424 break;
… …
494 int i, bad_option = 0; 476 int i, bad_option = 0;
495 477
496 for (i = 1; i < argc; i++) 478 for (i = 1; i < argc; i++)
497 { 479 {
498 unsigned int entry, longopt = 0; 480 unsigned int entry, longopt = 0;
499 const char *flag, *opt; 481 const char *opt;
482 int flag;
500 483
501 opt = argv[i]; 484 opt = argv[i];
502 485
503 if (*opt == '-') 486 if (*opt == '-')
504 { 487 {
505 flag = resval_on; 488 flag = 1;
506 489
507 if (*++opt == '-') 490 if (*++opt == '-')
508 longopt = *opt++; /* long option */ 491 longopt = *opt++; /* long option */
509 } 492 }
510 else if (*opt == '+') 493 else if (*opt == '+')
511 { 494 {
512 flag = resval_off; 495 flag = 0;
513 496
514 if (*++opt == '+') 497 if (*++opt == '+')
515 longopt = *opt++; /* long option */ 498 longopt = *opt++; /* long option */
516 } 499 }
517 else 500 else
… …
535 break; 518 break;
536 519
537 if (entry < optList_size) 520 if (entry < optList_size)
538 { 521 {
539 if (optList_isReverse (entry)) 522 if (optList_isReverse (entry))
540 flag = flag == resval_on ? resval_off : resval_on; 523 flag = !flag;
541 524
542 if (optList_strlen (entry)) 525 if (optList_isString (entry))
543 { 526 {
544 /* 527 /*
545 * special cases are handled in main.c:main () to allow 528 * special cases are handled in main.c:main () to allow
546 * X resources to set these values before we settle for 529 * X resources to set these values before we settle for
547 * default values 530 * default values
548 */ 531 */
549 532
550 if (optList[entry].doff != -1) 533 if (optList[entry].doff != -1)
551 { 534 {
552 if (flag == resval_on && i+1 == argc) 535 if (flag && i+1 == argc)
553 rxvt_fatal ("option '%s' requires an argument, aborting.\n", argv [i]); 536 rxvt_fatal ("option '%s' requires an argument, aborting.\n", argv [i]);
554 537
555 rs[optList[entry].doff] = flag == resval_on ? argv[++i] : resval_undef; 538 rs[optList[entry].doff] = flag ? argv[++i] : resval_undef;
556 } 539 }
557 } 540 }
558 else 541 else
559 { 542 {
560 /* boolean value */ 543 /* boolean value */
561 set_option (optList[entry].index, flag == resval_on); 544 set_option (optList[entry].index, flag);
562 545
563 if (optList[entry].doff != -1) 546 if (optList[entry].doff != -1)
564 rs[optList[entry].doff] = flag; 547 rs[optList[entry].doff] = flag ? resval_on : resval_off;
565 } 548 }
566 } 549 }
567#ifndef NO_RESOURCES 550#ifndef NO_RESOURCES
568 else if (!strcmp (opt, "xrm")) 551 else if (!strcmp (opt, "xrm"))
569 { 552 {
… …
634{ 617{
635 const char *name; 618 const char *name;
636 unsigned short len; 619 unsigned short len;
637 unsigned short value; 620 unsigned short value;
638}; 621};
639keysym_vocabulary_t keysym_vocabulary[] = 622static const keysym_vocabulary_t keysym_vocabulary[] =
640{ 623{
641 { "ISOLevel3", 9, Level3Mask }, 624 { "ISOLevel3", 9, Level3Mask },
642 { "AppKeypad", 9, AppKeypadMask }, 625 { "AppKeypad", 9, AppKeypadMask },
643 { "Control", 7, ControlMask }, 626 { "Control", 7, ControlMask },
644 { "NumLock", 7, NumLockMask }, 627 { "NumLock", 7, NumLockMask },

Diff Legend

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