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.145 by sf-exg, Sun Apr 4 18:59:19 2010 UTC

… …
177#ifdef RXVT_SCROLLBAR 177#ifdef RXVT_SCROLLBAR
178 RSTRG (Rs_color + Color_trough, "troughColor", "color"), 178 RSTRG (Rs_color + Color_trough, "troughColor", "color"),
179#endif 179#endif
180#ifdef OPTION_HC 180#ifdef OPTION_HC
181 STRG (Rs_color + Color_HC, "highlightColor", "hc", "color", "highlight color"), 181 STRG (Rs_color + Color_HC, "highlightColor", "hc", "color", "highlight color"),
182 RSTRG (Rs_color + Color_HTC, "highlightTextColor", "color"),
182#endif 183#endif
183#ifndef NO_CURSORCOLOR 184#ifndef NO_CURSORCOLOR
184 STRG (Rs_color + Color_cursor, "cursorColor", "cr", "color", "cursor color"), 185 STRG (Rs_color + Color_cursor, "cursorColor", "cr", "color", "cursor color"),
185 /* command-line option = resource name */ 186 /* command-line option = resource name */
186 RSTRG (Rs_color + Color_cursor2, "cursorColor2", "color"), 187 RSTRG (Rs_color + Color_cursor2, "cursorColor2", "color"),
… …
227 STRG (Rs_ext_bwidth, NULL, "bw", NULL, NULL), 228 STRG (Rs_ext_bwidth, NULL, "bw", NULL, NULL),
228 STRG (Rs_ext_bwidth, NULL, "borderwidth", NULL, NULL), 229 STRG (Rs_ext_bwidth, NULL, "borderwidth", NULL, NULL),
229 STRG (Rs_int_bwidth, "internalBorder", "b", "number", "internal border in pixels"), 230 STRG (Rs_int_bwidth, "internalBorder", "b", "number", "internal border in pixels"),
230 BOOL (Rs_borderLess, "borderLess", "bl", Opt_borderLess, 0, "borderless window"), 231 BOOL (Rs_borderLess, "borderLess", "bl", Opt_borderLess, 0, "borderless window"),
231 STRG (Rs_lineSpace, "lineSpace", "lsp", "number", "number of extra pixels between rows"), 232 STRG (Rs_lineSpace, "lineSpace", "lsp", "number", "number of extra pixels between rows"),
233 STRG (Rs_letterSpace, "letterSpace", "letsp", "number", "letter spacing adjustment"),
232#endif 234#endif
233#ifdef BUILTIN_GLYPHS 235#ifdef BUILTIN_GLYPHS
234 BOOL (Rs_skipBuiltinGlyphs, "skipBuiltinGlyphs", "sbg", Opt_skipBuiltinGlyphs, 0, "do not use internal glyphs"), 236 BOOL (Rs_skipBuiltinGlyphs, "skipBuiltinGlyphs", "sbg", Opt_skipBuiltinGlyphs, 0, "do not use internal glyphs"),
235#endif 237#endif
236#ifdef POINTER_BLANK 238#ifdef POINTER_BLANK
… …
257 RSTRG (Rs_perl_eval, "perl-eval", "perl-eval"), // "string", "code to be evaluated after all extensions have been loaded"),TODO 259 RSTRG (Rs_perl_eval, "perl-eval", "perl-eval"), // "string", "code to be evaluated after all extensions have been loaded"),TODO
258 RSTRG (Rs_perl_ext_1, "perl-ext-common", "string"), //, "colon-separated list of perl extensions to enable"),TODO 260 RSTRG (Rs_perl_ext_1, "perl-ext-common", "string"), //, "colon-separated list of perl extensions to enable"),TODO
259 STRG (Rs_perl_ext_2, "perl-ext", "pe", "string", "colon-separated list of perl extensions to enable for this instance"), 261 STRG (Rs_perl_ext_2, "perl-ext", "pe", "string", "colon-separated list of perl extensions to enable for this instance"),
260#endif 262#endif
261#if ISO_14755 263#if ISO_14755
264 BOOL (Rs_iso14755, "iso14755", NULL, Opt_iso14755, 0, NULL),
262 BOOL (Rs_iso14755_52, "iso14755_52", NULL, Opt_iso14755_52, 0, NULL), 265 BOOL (Rs_iso14755_52, "iso14755_52", NULL, Opt_iso14755_52, 0, NULL),
263#endif 266#endif
264#ifdef HAVE_AFTERIMAGE 267#ifdef HAVE_AFTERIMAGE
265 STRG (Rs_blendtype, "blendType", "blt", "string", "background image blending type - alpha, tint, etc..."), 268 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"), 269 STRG (Rs_blurradius, "blurRadius", "blr", "HxV", "gaussian blur radii to apply to the root background"),
270# if ENABLE_EWMH
271 STRG (Rs_iconfile, "iconFile", "icon", "file", "path to application icon image"),
272# endif
267#endif 273#endif
268 INFO ("e", "command arg ...", "command to execute") 274 INFO ("e", "command arg ...", "command to execute")
269 }; 275 };
270 276
271#undef INFO 277#undef INFO
… …
397 { 403 {
398 int len = 0; 404 int len = 0;
399 405
400 if (optList[i].arg) 406 if (optList[i].arg)
401 len = strlen (optList[i].arg) + 1; 407 len = strlen (optList[i].arg) + 1;
402#ifdef DEBUG_STRICT
403 assert (optList[i].opt != NULL); 408 assert (optList[i].opt != NULL);
404#endif
405 len += 4 + strlen (optList[i].opt) + (optList_isBool (i) ? 2: 0); 409 len += 4 + strlen (optList[i].opt) + (optList_isBool (i) ? 2: 0);
406 col += len; 410 col += len;
407 if (col > 79) 411 if (col > 79)
408 { 412 {
409 /* assume regular width */ 413 /* assume regular width */
… …
423 rxvt_log (" [options] [-e command args]\n\nwhere options include:\n"); 427 rxvt_log (" [options] [-e command args]\n\nwhere options include:\n");
424 428
425 for (i = 0; i < optList_size; i++) 429 for (i = 0; i < optList_size; i++)
426 if (optList[i].desc != NULL) 430 if (optList[i].desc != NULL)
427 { 431 {
428#ifdef DEBUG_STRICT
429 assert (optList[i].opt != NULL); 432 assert (optList[i].opt != NULL);
430#endif
431 rxvt_log (" %s%s %-*s%s%s\n", 433 rxvt_log (" %s%s %-*s%s%s\n",
432 (optList_isBool (i) ? "-/+" : "-"), optList[i].opt, 434 (optList_isBool (i) ? "-/+" : "-"), optList[i].opt,
433 (INDENT - strlen (optList[i].opt) 435 (INDENT - strlen (optList[i].opt)
434 + (optList_isBool (i) ? 0 : 2)), 436 + (optList_isBool (i) ? 0 : 2)),
435 (optList[i].arg ? optList[i].arg : ""), 437 (optList[i].arg ? optList[i].arg : ""),
… …
553#ifdef KEYSYM_RESOURCE 555#ifdef KEYSYM_RESOURCE
554 else if (!strncmp (opt, "keysym.", sizeof ("keysym.") - 1)) 556 else if (!strncmp (opt, "keysym.", sizeof ("keysym.") - 1))
555 { 557 {
556 if (i+1 < argc) 558 if (i+1 < argc)
557 { 559 {
558 char *res = (char *)malloc (strlen (opt) + strlen (argv[++i]) + 6); 560 char *res = rxvt_temp_buf<char> (strlen (opt) + strlen (argv[++i]) + 6);
559 sprintf (res, "*.%s: %s\n", opt, argv[i]); 561 sprintf (res, "*.%s: %s\n", opt, argv[i]);
560 XrmPutLineResource (&option_db, res); 562 XrmPutLineResource (&option_db, res);
561 free (res);
562 } 563 }
563 } 564 }
564#endif 565#endif
565 else 566 else
566 { 567 {
… …
688 // fallback on hexadecimal parsing 689 // fallback on hexadecimal parsing
689 char *end; 690 char *end;
690 sym = strtol (str, &end, 16); 691 sym = strtol (str, &end, 16);
691 if (*end) 692 if (*end)
692 return -1; 693 return -1;
693 } 694 }
694 695
695 keyboard->register_user_translation (sym, state, arg); 696 keyboard->register_user_translation (sym, state, arg);
696 return 1; 697 return 1;
697} 698}
698 699

Diff Legend

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