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.143 by sf-exg, Sat Jan 30 20:26:04 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"),
… …
226 STRG (Rs_ext_bwidth, NULL, "bw", NULL, NULL), 227 STRG (Rs_ext_bwidth, NULL, "bw", NULL, NULL),
227 STRG (Rs_ext_bwidth, NULL, "borderwidth", NULL, NULL), 228 STRG (Rs_ext_bwidth, NULL, "borderwidth", NULL, NULL),
228 STRG (Rs_int_bwidth, "internalBorder", "b", "number", "internal border in pixels"), 229 STRG (Rs_int_bwidth, "internalBorder", "b", "number", "internal border in pixels"),
229 BOOL (Rs_borderLess, "borderLess", "bl", Opt_borderLess, 0, "borderless window"), 230 BOOL (Rs_borderLess, "borderLess", "bl", Opt_borderLess, 0, "borderless window"),
230 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"),
231#endif 233#endif
232#ifdef BUILTIN_GLYPHS 234#ifdef BUILTIN_GLYPHS
233 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"),
234#endif 236#endif
235#ifdef POINTER_BLANK 237#ifdef POINTER_BLANK
… …
256 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
257 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
258 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"),
259#endif 261#endif
260#if ISO_14755 262#if ISO_14755
263 BOOL (Rs_iso14755, "iso14755", NULL, Opt_iso14755, 0, NULL),
261 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),
262#endif 265#endif
263#ifdef HAVE_AFTERIMAGE 266#ifdef HAVE_AFTERIMAGE
264 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..."),
265 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
266#endif 272#endif
267 INFO ("e", "command arg ...", "command to execute") 273 INFO ("e", "command arg ...", "command to execute")
268 }; 274 };
269 275
270#undef INFO 276#undef INFO
… …
396 { 402 {
397 int len = 0; 403 int len = 0;
398 404
399 if (optList[i].arg) 405 if (optList[i].arg)
400 len = strlen (optList[i].arg) + 1; 406 len = strlen (optList[i].arg) + 1;
401#ifdef DEBUG_STRICT
402 assert (optList[i].opt != NULL); 407 assert (optList[i].opt != NULL);
403#endif
404 len += 4 + strlen (optList[i].opt) + (optList_isBool (i) ? 2: 0); 408 len += 4 + strlen (optList[i].opt) + (optList_isBool (i) ? 2: 0);
405 col += len; 409 col += len;
406 if (col > 79) 410 if (col > 79)
407 { 411 {
408 /* assume regular width */ 412 /* assume regular width */
… …
422 rxvt_log (" [options] [-e command args]\n\nwhere options include:\n"); 426 rxvt_log (" [options] [-e command args]\n\nwhere options include:\n");
423 427
424 for (i = 0; i < optList_size; i++) 428 for (i = 0; i < optList_size; i++)
425 if (optList[i].desc != NULL) 429 if (optList[i].desc != NULL)
426 { 430 {
427#ifdef DEBUG_STRICT
428 assert (optList[i].opt != NULL); 431 assert (optList[i].opt != NULL);
429#endif
430 rxvt_log (" %s%s %-*s%s%s\n", 432 rxvt_log (" %s%s %-*s%s%s\n",
431 (optList_isBool (i) ? "-/+" : "-"), optList[i].opt, 433 (optList_isBool (i) ? "-/+" : "-"), optList[i].opt,
432 (INDENT - strlen (optList[i].opt) 434 (INDENT - strlen (optList[i].opt)
433 + (optList_isBool (i) ? 0 : 2)), 435 + (optList_isBool (i) ? 0 : 2)),
434 (optList[i].arg ? optList[i].arg : ""), 436 (optList[i].arg ? optList[i].arg : ""),
… …
552#ifdef KEYSYM_RESOURCE 554#ifdef KEYSYM_RESOURCE
553 else if (!strncmp (opt, "keysym.", sizeof ("keysym.") - 1)) 555 else if (!strncmp (opt, "keysym.", sizeof ("keysym.") - 1))
554 { 556 {
555 if (i+1 < argc) 557 if (i+1 < argc)
556 { 558 {
557 char *res = (char *)malloc (strlen (opt) + strlen (argv[++i]) + 6); 559 char *res = rxvt_temp_buf<char> (strlen (opt) + strlen (argv[++i]) + 6);
558 sprintf (res, "*.%s: %s\n", opt, argv[i]); 560 sprintf (res, "*.%s: %s\n", opt, argv[i]);
559 XrmPutLineResource (&option_db, res); 561 XrmPutLineResource (&option_db, res);
560 free (res);
561 } 562 }
562 } 563 }
563#endif 564#endif
564 else 565 else
565 { 566 {

Diff Legend

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