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.137 by root, Sun Jun 15 13:54:15 2008 UTC vs.
Revision 1.141 by root, Sat Dec 26 10:24:04 2009 UTC

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
261#if ISO_14755 262#if ISO_14755
262 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),
263#endif 264#endif
264#ifdef HAVE_AFTERIMAGE 265#ifdef HAVE_AFTERIMAGE
265 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..."),
266 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
267#endif 271#endif
268 INFO ("e", "command arg ...", "command to execute") 272 INFO ("e", "command arg ...", "command to execute")
269 }; 273 };
270 274
271#undef INFO 275#undef INFO
397 { 401 {
398 int len = 0; 402 int len = 0;
399 403
400 if (optList[i].arg) 404 if (optList[i].arg)
401 len = strlen (optList[i].arg) + 1; 405 len = strlen (optList[i].arg) + 1;
402#ifdef DEBUG_STRICT
403 assert (optList[i].opt != NULL); 406 assert (optList[i].opt != NULL);
404#endif
405 len += 4 + strlen (optList[i].opt) + (optList_isBool (i) ? 2: 0); 407 len += 4 + strlen (optList[i].opt) + (optList_isBool (i) ? 2: 0);
406 col += len; 408 col += len;
407 if (col > 79) 409 if (col > 79)
408 { 410 {
409 /* assume regular width */ 411 /* assume regular width */
423 rxvt_log (" [options] [-e command args]\n\nwhere options include:\n"); 425 rxvt_log (" [options] [-e command args]\n\nwhere options include:\n");
424 426
425 for (i = 0; i < optList_size; i++) 427 for (i = 0; i < optList_size; i++)
426 if (optList[i].desc != NULL) 428 if (optList[i].desc != NULL)
427 { 429 {
428#ifdef DEBUG_STRICT
429 assert (optList[i].opt != NULL); 430 assert (optList[i].opt != NULL);
430#endif
431 rxvt_log (" %s%s %-*s%s%s\n", 431 rxvt_log (" %s%s %-*s%s%s\n",
432 (optList_isBool (i) ? "-/+" : "-"), optList[i].opt, 432 (optList_isBool (i) ? "-/+" : "-"), optList[i].opt,
433 (INDENT - strlen (optList[i].opt) 433 (INDENT - strlen (optList[i].opt)
434 + (optList_isBool (i) ? 0 : 2)), 434 + (optList_isBool (i) ? 0 : 2)),
435 (optList[i].arg ? optList[i].arg : ""), 435 (optList[i].arg ? optList[i].arg : ""),

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines