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.144 by sf-exg, Sun Jan 31 09:02:48 2010 UTC

… …
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 HAVE_SCROLLBARS
178 RSTRG (Rs_color + Color_scroll, "scrollColor", "color"), 176 RSTRG (Rs_color + Color_scroll, "scrollColor", "color"),
179#endif
180#ifdef RXVT_SCROLLBAR 177#ifdef RXVT_SCROLLBAR
181 RSTRG (Rs_color + Color_trough, "troughColor", "color"), 178 RSTRG (Rs_color + Color_trough, "troughColor", "color"),
182#endif 179#endif
183#ifdef OPTION_HC 180#ifdef OPTION_HC
184 STRG (Rs_color + Color_HC, "highlightColor", "hc", "color", "highlight color"), 181 STRG (Rs_color + Color_HC, "highlightColor", "hc", "color", "highlight color"),
… …
230 STRG (Rs_ext_bwidth, NULL, "bw", NULL, NULL), 227 STRG (Rs_ext_bwidth, NULL, "bw", NULL, NULL),
231 STRG (Rs_ext_bwidth, NULL, "borderwidth", NULL, NULL), 228 STRG (Rs_ext_bwidth, NULL, "borderwidth", NULL, NULL),
232 STRG (Rs_int_bwidth, "internalBorder", "b", "number", "internal border in pixels"), 229 STRG (Rs_int_bwidth, "internalBorder", "b", "number", "internal border in pixels"),
233 BOOL (Rs_borderLess, "borderLess", "bl", Opt_borderLess, 0, "borderless window"), 230 BOOL (Rs_borderLess, "borderLess", "bl", Opt_borderLess, 0, "borderless window"),
234 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"),
235#endif 233#endif
236#ifdef BUILTIN_GLYPHS 234#ifdef BUILTIN_GLYPHS
237 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"),
238#endif 236#endif
239#ifdef POINTER_BLANK 237#ifdef POINTER_BLANK
… …
247#endif 245#endif
248#ifdef PRINTPIPE 246#ifdef PRINTPIPE
249 RSTRG (Rs_print_pipe, "print-pipe", "string"), 247 RSTRG (Rs_print_pipe, "print-pipe", "string"),
250#endif 248#endif
251 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"),
252#ifdef CUTCHAR_RESOURCE
253 RSTRG (Rs_cutchars, "cutchars", "string"), 250 RSTRG (Rs_cutchars, "cutchars", "string"),
254#endif /* CUTCHAR_RESOURCE */
255 RSTRG (Rs_answerbackstring, "answerbackString", "string"), 251 RSTRG (Rs_answerbackstring, "answerbackString", "string"),
256#ifndef NO_SECONDARY_SCREEN 252#ifndef NO_SECONDARY_SCREEN
257 BOOL (Rs_secondaryScreen, "secondaryScreen", "ssc", Opt_secondaryScreen, 0, "enable secondary screen"), 253 BOOL (Rs_secondaryScreen, "secondaryScreen", "ssc", Opt_secondaryScreen, 0, "enable secondary screen"),
258 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"),
259#endif 255#endif
… …
262 RSTRG (Rs_perl_eval, "perl-eval", "perl-eval"), // "string", "code to be evaluated after all extensions have been loaded"),TODO 258 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 259 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"), 260 STRG (Rs_perl_ext_2, "perl-ext", "pe", "string", "colon-separated list of perl extensions to enable for this instance"),
265#endif 261#endif
266#if ISO_14755 262#if ISO_14755
263 BOOL (Rs_iso14755, "iso14755", NULL, Opt_iso14755, 0, NULL),
267 BOOL (Rs_iso14755_52, "iso14755_52", NULL, Opt_iso14755_52, 0, NULL), 264 BOOL (Rs_iso14755_52, "iso14755_52", NULL, Opt_iso14755_52, 0, NULL),
268#endif 265#endif
269#ifdef HAVE_AFTERIMAGE 266#ifdef HAVE_AFTERIMAGE
270 STRG (Rs_blendtype, "blendType", "blt", "string", "background image blending type - alpha, tint, etc..."), 267 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"), 268 STRG (Rs_blurradius, "blurRadius", "blr", "HxV", "gaussian blur radii to apply to the root background"),
269# if ENABLE_EWMH
270 STRG (Rs_iconfile, "iconFile", "icon", "file", "path to application icon image"),
271# endif
272#endif 272#endif
273 INFO ("e", "command arg ...", "command to execute") 273 INFO ("e", "command arg ...", "command to execute")
274 }; 274 };
275 275
276#undef INFO 276#undef INFO
… …
363 "pointerBlank," 363 "pointerBlank,"
364#endif 364#endif
365#if defined(NO_RESOURCES) 365#if defined(NO_RESOURCES)
366 "NoResources," 366 "NoResources,"
367#endif 367#endif
368 "scrollbars=" 368 "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) 369#if defined(RXVT_SCROLLBAR)
379 "rxvt" 370 "+rxvt"
380# if defined(NEXT_SCROLLBAR) || defined(XTERM_SCROLLBAR)
381 "+"
382# endif
383# endif 371#endif
384# if defined(NEXT_SCROLLBAR) 372#if defined(NEXT_SCROLLBAR)
385 "NeXT" 373 "+NeXT"
386# if defined(XTERM_SCROLLBAR)
387 "+"
388# endif
389# endif 374#endif
390# if defined(XTERM_SCROLLBAR) 375#if defined(XTERM_SCROLLBAR)
391 "xterm" 376 "+xterm"
392# endif
393#endif 377#endif
394 "\nUsage: "; /* Usage */ 378 "\nUsage: "; /* Usage */
395 379
396#define INDENT 18 380#define INDENT 18
397 381
… …
418 { 402 {
419 int len = 0; 403 int len = 0;
420 404
421 if (optList[i].arg) 405 if (optList[i].arg)
422 len = strlen (optList[i].arg) + 1; 406 len = strlen (optList[i].arg) + 1;
423#ifdef DEBUG_STRICT
424 assert (optList[i].opt != NULL); 407 assert (optList[i].opt != NULL);
425#endif
426 len += 4 + strlen (optList[i].opt) + (optList_isBool (i) ? 2: 0); 408 len += 4 + strlen (optList[i].opt) + (optList_isBool (i) ? 2: 0);
427 col += len; 409 col += len;
428 if (col > 79) 410 if (col > 79)
429 { 411 {
430 /* assume regular width */ 412 /* assume regular width */
… …
444 rxvt_log (" [options] [-e command args]\n\nwhere options include:\n"); 426 rxvt_log (" [options] [-e command args]\n\nwhere options include:\n");
445 427
446 for (i = 0; i < optList_size; i++) 428 for (i = 0; i < optList_size; i++)
447 if (optList[i].desc != NULL) 429 if (optList[i].desc != NULL)
448 { 430 {
449#ifdef DEBUG_STRICT
450 assert (optList[i].opt != NULL); 431 assert (optList[i].opt != NULL);
451#endif
452 rxvt_log (" %s%s %-*s%s%s\n", 432 rxvt_log (" %s%s %-*s%s%s\n",
453 (optList_isBool (i) ? "-/+" : "-"), optList[i].opt, 433 (optList_isBool (i) ? "-/+" : "-"), optList[i].opt,
454 (INDENT - strlen (optList[i].opt) 434 (INDENT - strlen (optList[i].opt)
455 + (optList_isBool (i) ? 0 : 2)), 435 + (optList_isBool (i) ? 0 : 2)),
456 (optList[i].arg ? optList[i].arg : ""), 436 (optList[i].arg ? optList[i].arg : ""),
… …
574#ifdef KEYSYM_RESOURCE 554#ifdef KEYSYM_RESOURCE
575 else if (!strncmp (opt, "keysym.", sizeof ("keysym.") - 1)) 555 else if (!strncmp (opt, "keysym.", sizeof ("keysym.") - 1))
576 { 556 {
577 if (i+1 < argc) 557 if (i+1 < argc)
578 { 558 {
579 char *res = (char *)malloc (strlen (opt) + strlen (argv[++i]) + 6); 559 char *res = rxvt_temp_buf<char> (strlen (opt) + strlen (argv[++i]) + 6);
580 sprintf (res, "*.%s: %s\n", opt, argv[i]); 560 sprintf (res, "*.%s: %s\n", opt, argv[i]);
581 XrmPutLineResource (&option_db, res); 561 XrmPutLineResource (&option_db, res);
582 free (res);
583 } 562 }
584 } 563 }
585#endif 564#endif
586 else 565 else
587 { 566 {
… …
709 // fallback on hexadecimal parsing 688 // fallback on hexadecimal parsing
710 char *end; 689 char *end;
711 sym = strtol (str, &end, 16); 690 sym = strtol (str, &end, 16);
712 if (*end) 691 if (*end)
713 return -1; 692 return -1;
714 } 693 }
715 694
716 keyboard->register_user_translation (sym, state, arg); 695 keyboard->register_user_translation (sym, state, arg);
717 return 1; 696 return 1;
718} 697}
719 698

Diff Legend

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