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.148 by sf-exg, Thu Oct 14 22:08:45 2010 UTC

… …
112#if ENABLE_TRANSPARENCY 112#if ENABLE_TRANSPARENCY
113 BOOL (Rs_transparent, "inheritPixmap", "ip", Opt_transparent, 0, "inherit parent pixmap"), 113 BOOL (Rs_transparent, "inheritPixmap", "ip", Opt_transparent, 0, "inherit parent pixmap"),
114 BOOL (Rs_transparent, "transparent", "tr", Opt_transparent, 0, "inherit parent pixmap"), 114 BOOL (Rs_transparent, "transparent", "tr", Opt_transparent, 0, "inherit parent pixmap"),
115 STRG (Rs_color + Color_tint, "tintColor", "tint", "color", "tint color"), 115 STRG (Rs_color + Color_tint, "tintColor", "tint", "color", "tint color"),
116 STRG (Rs_shade, "shading", "sh", "number", "shade background by number %."), 116 STRG (Rs_shade, "shading", "sh", "number", "shade background by number %."),
117 STRG (Rs_blurradius, "blurRadius", "blr", "HxV", "gaussian blur radii to apply to the root background"),
117#endif 118#endif
118#if OFF_FOCUS_FADING 119#if OFF_FOCUS_FADING
119 STRG (Rs_fade, "fading", "fade", "number", "fade colors by number % when losing focus"), 120 STRG (Rs_fade, "fading", "fade", "number", "fade colors by number % when losing focus"),
120 STRG (Rs_color + Color_fade, "fadeColor", "fadecolor", "color", "target color for off-focus fading"), 121 STRG (Rs_color + Color_fade, "fadeColor", "fadecolor", "color", "target color for off-focus fading"),
121#endif 122#endif
… …
177#ifdef RXVT_SCROLLBAR 178#ifdef RXVT_SCROLLBAR
178 RSTRG (Rs_color + Color_trough, "troughColor", "color"), 179 RSTRG (Rs_color + Color_trough, "troughColor", "color"),
179#endif 180#endif
180#ifdef OPTION_HC 181#ifdef OPTION_HC
181 STRG (Rs_color + Color_HC, "highlightColor", "hc", "color", "highlight color"), 182 STRG (Rs_color + Color_HC, "highlightColor", "hc", "color", "highlight color"),
183 RSTRG (Rs_color + Color_HTC, "highlightTextColor", "color"),
182#endif 184#endif
183#ifndef NO_CURSORCOLOR 185#ifndef NO_CURSORCOLOR
184 STRG (Rs_color + Color_cursor, "cursorColor", "cr", "color", "cursor color"), 186 STRG (Rs_color + Color_cursor, "cursorColor", "cr", "color", "cursor color"),
185 /* command-line option = resource name */ 187 /* command-line option = resource name */
186 RSTRG (Rs_color + Color_cursor2, "cursorColor2", "color"), 188 RSTRG (Rs_color + Color_cursor2, "cursorColor2", "color"),
… …
189 STRG (Rs_color + Color_pointer_bg, "pointerColor2", "pr2", "color", "pointer bg color"), 191 STRG (Rs_color + Color_pointer_bg, "pointerColor2", "pr2", "color", "pointer bg color"),
190 STRG (Rs_color + Color_border, "borderColor", "bd", "color", "border color"), 192 STRG (Rs_color + Color_border, "borderColor", "bd", "color", "border color"),
191#ifdef BG_IMAGE_FROM_FILE 193#ifdef BG_IMAGE_FROM_FILE
192 RSTRG (Rs_path, "path", "search path"), 194 RSTRG (Rs_path, "path", "search path"),
193 STRG (Rs_backgroundPixmap, "backgroundPixmap", "pixmap", "file[;geom]", "background pixmap"), 195 STRG (Rs_backgroundPixmap, "backgroundPixmap", "pixmap", "file[;geom]", "background pixmap"),
196# if ENABLE_EWMH
197 STRG (Rs_iconfile, "iconFile", "icon", "file", "path to application icon image"),
198# endif
194#endif 199#endif
195 /* fonts: command-line option = resource name */ 200 /* fonts: command-line option = resource name */
196 STRG (Rs_font, "font", "fn", "fontname", "normal text font"), 201 STRG (Rs_font, "font", "fn", "fontname", "normal text font"),
197#if ENABLE_STYLES 202#if ENABLE_STYLES
198 STRG (Rs_boldFont, "boldFont", "fb", "fontname", "bold font"), 203 STRG (Rs_boldFont, "boldFont", "fb", "fontname", "bold font"),
… …
227 STRG (Rs_ext_bwidth, NULL, "bw", NULL, NULL), 232 STRG (Rs_ext_bwidth, NULL, "bw", NULL, NULL),
228 STRG (Rs_ext_bwidth, NULL, "borderwidth", NULL, NULL), 233 STRG (Rs_ext_bwidth, NULL, "borderwidth", NULL, NULL),
229 STRG (Rs_int_bwidth, "internalBorder", "b", "number", "internal border in pixels"), 234 STRG (Rs_int_bwidth, "internalBorder", "b", "number", "internal border in pixels"),
230 BOOL (Rs_borderLess, "borderLess", "bl", Opt_borderLess, 0, "borderless window"), 235 BOOL (Rs_borderLess, "borderLess", "bl", Opt_borderLess, 0, "borderless window"),
231 STRG (Rs_lineSpace, "lineSpace", "lsp", "number", "number of extra pixels between rows"), 236 STRG (Rs_lineSpace, "lineSpace", "lsp", "number", "number of extra pixels between rows"),
237 STRG (Rs_letterSpace, "letterSpace", "letsp", "number", "letter spacing adjustment"),
232#endif 238#endif
233#ifdef BUILTIN_GLYPHS 239#ifdef BUILTIN_GLYPHS
234 BOOL (Rs_skipBuiltinGlyphs, "skipBuiltinGlyphs", "sbg", Opt_skipBuiltinGlyphs, 0, "do not use internal glyphs"), 240 BOOL (Rs_skipBuiltinGlyphs, "skipBuiltinGlyphs", "sbg", Opt_skipBuiltinGlyphs, 0, "do not use internal glyphs"),
235#endif 241#endif
236#ifdef POINTER_BLANK 242#ifdef POINTER_BLANK
… …
257 RSTRG (Rs_perl_eval, "perl-eval", "perl-eval"), // "string", "code to be evaluated after all extensions have been loaded"),TODO 263 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 264 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"), 265 STRG (Rs_perl_ext_2, "perl-ext", "pe", "string", "colon-separated list of perl extensions to enable for this instance"),
260#endif 266#endif
261#if ISO_14755 267#if ISO_14755
268 BOOL (Rs_iso14755, "iso14755", NULL, Opt_iso14755, 0, NULL),
262 BOOL (Rs_iso14755_52, "iso14755_52", NULL, Opt_iso14755_52, 0, NULL), 269 BOOL (Rs_iso14755_52, "iso14755_52", NULL, Opt_iso14755_52, 0, NULL),
263#endif 270#endif
264#ifdef HAVE_AFTERIMAGE 271#ifdef HAVE_AFTERIMAGE
265 STRG (Rs_blendtype, "blendType", "blt", "string", "background image blending type - alpha, tint, etc..."), 272 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#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
… …
321 "transparent," 327 "transparent,"
322 "tint," 328 "tint,"
323#endif 329#endif
324#if HAVE_AFTERIMAGE 330#if HAVE_AFTERIMAGE
325 "afterimage," 331 "afterimage,"
332#endif
333#if HAVE_PIXBUF
334 "pixbuf,"
326#endif 335#endif
327#if defined(USE_XIM) 336#if defined(USE_XIM)
328 "XIM," 337 "XIM,"
329#endif 338#endif
330#if defined(NO_BACKSPACE_KEY) 339#if defined(NO_BACKSPACE_KEY)
… …
397 { 406 {
398 int len = 0; 407 int len = 0;
399 408
400 if (optList[i].arg) 409 if (optList[i].arg)
401 len = strlen (optList[i].arg) + 1; 410 len = strlen (optList[i].arg) + 1;
402#ifdef DEBUG_STRICT
403 assert (optList[i].opt != NULL); 411 assert (optList[i].opt != NULL);
404#endif
405 len += 4 + strlen (optList[i].opt) + (optList_isBool (i) ? 2: 0); 412 len += 4 + strlen (optList[i].opt) + (optList_isBool (i) ? 2: 0);
406 col += len; 413 col += len;
407 if (col > 79) 414 if (col > 79)
408 { 415 {
409 /* assume regular width */ 416 /* assume regular width */
… …
423 rxvt_log (" [options] [-e command args]\n\nwhere options include:\n"); 430 rxvt_log (" [options] [-e command args]\n\nwhere options include:\n");
424 431
425 for (i = 0; i < optList_size; i++) 432 for (i = 0; i < optList_size; i++)
426 if (optList[i].desc != NULL) 433 if (optList[i].desc != NULL)
427 { 434 {
428#ifdef DEBUG_STRICT
429 assert (optList[i].opt != NULL); 435 assert (optList[i].opt != NULL);
430#endif
431 rxvt_log (" %s%s %-*s%s%s\n", 436 rxvt_log (" %s%s %-*s%s%s\n",
432 (optList_isBool (i) ? "-/+" : "-"), optList[i].opt, 437 (optList_isBool (i) ? "-/+" : "-"), optList[i].opt,
433 (INDENT - strlen (optList[i].opt) 438 (INDENT - strlen (optList[i].opt)
434 + (optList_isBool (i) ? 0 : 2)), 439 + (optList_isBool (i) ? 0 : 2)),
435 (optList[i].arg ? optList[i].arg : ""), 440 (optList[i].arg ? optList[i].arg : ""),
… …
553#ifdef KEYSYM_RESOURCE 558#ifdef KEYSYM_RESOURCE
554 else if (!strncmp (opt, "keysym.", sizeof ("keysym.") - 1)) 559 else if (!strncmp (opt, "keysym.", sizeof ("keysym.") - 1))
555 { 560 {
556 if (i+1 < argc) 561 if (i+1 < argc)
557 { 562 {
558 char *res = (char *)malloc (strlen (opt) + strlen (argv[++i]) + 6); 563 char *res = rxvt_temp_buf<char> (strlen (opt) + strlen (argv[++i]) + 6);
559 sprintf (res, "*.%s: %s\n", opt, argv[i]); 564 sprintf (res, "*.%s: %s\n", opt, argv[i]);
560 XrmPutLineResource (&option_db, res); 565 XrmPutLineResource (&option_db, res);
561 free (res);
562 } 566 }
563 } 567 }
564#endif 568#endif
565 else 569 else
566 { 570 {
… …
688 // fallback on hexadecimal parsing 692 // fallback on hexadecimal parsing
689 char *end; 693 char *end;
690 sym = strtol (str, &end, 16); 694 sym = strtol (str, &end, 16);
691 if (*end) 695 if (*end)
692 return -1; 696 return -1;
693 } 697 }
694 698
695 keyboard->register_user_translation (sym, state, arg); 699 keyboard->register_user_translation (sym, state, arg);
696 return 1; 700 return 1;
697} 701}
698 702

Diff Legend

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