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.121 by ayin, Thu Nov 22 12:31:49 2007 UTC vs.
Revision 1.126 by ayin, Sun Dec 2 16:19:45 2007 UTC

… …
111 BOOL (Rs_scrollWithBuffer, "scrollWithBuffer", "sw", Opt_scrollWithBuffer, 0, "scroll-with-buffer"), 111 BOOL (Rs_scrollWithBuffer, "scrollWithBuffer", "sw", Opt_scrollWithBuffer, 0, "scroll-with-buffer"),
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", "%", "shade background by x %."), 116 STRG (Rs_shade, "shading", "sh", "number", "shade background by number %."),
117#endif 117#endif
118#if OFF_FOCUS_FADING 118#if OFF_FOCUS_FADING
119 STRG (Rs_fade, "fading", "fade", "%", "fade colors x% percent when rxvt-unicode is losing focus"), 119 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"), 120 STRG (Rs_color + Color_fade, "fadeColor", "fadecolor", "color", "target color for off-focus fading"),
121#endif 121#endif
122 BOOL (Rs_utmpInhibit, "utmpInhibit", "ut", Opt_utmpInhibit, 0, "utmp inhibit"), 122 BOOL (Rs_utmpInhibit, "utmpInhibit", "ut", Opt_utmpInhibit, 0, "utmp inhibit"),
123#ifndef NO_BELL 123#ifndef NO_BELL
124# if ENABLE_FRILLS 124# if ENABLE_FRILLS
… …
225 STRG (Rs_ext_bwidth, "externalBorder", "w", "number", "external border in pixels"), 225 STRG (Rs_ext_bwidth, "externalBorder", "w", "number", "external border in pixels"),
226 STRG (Rs_ext_bwidth, NULL, "bw", NULL, NULL), 226 STRG (Rs_ext_bwidth, NULL, "bw", NULL, NULL),
227 STRG (Rs_ext_bwidth, NULL, "borderwidth", NULL, NULL), 227 STRG (Rs_ext_bwidth, NULL, "borderwidth", NULL, NULL),
228 STRG (Rs_int_bwidth, "internalBorder", "b", "number", "internal border in pixels"), 228 STRG (Rs_int_bwidth, "internalBorder", "b", "number", "internal border in pixels"),
229 BOOL (Rs_borderLess, "borderLess", "bl", Opt_borderLess, 0, "borderless window"), 229 BOOL (Rs_borderLess, "borderLess", "bl", Opt_borderLess, 0, "borderless window"),
230 STRG (Rs_lineSpace, "lineSpace", "lsp", "number", "number of extra pixels between rows"),
231#endif
232#ifdef BUILTIN_GLYPHS
230 BOOL (Rs_skipBuiltinGlyphs, "skipBuiltinGlyphs", "sbg", Opt_skipBuiltinGlyphs, 0, "do not use internal glyphs"), 233 BOOL (Rs_skipBuiltinGlyphs, "skipBuiltinGlyphs", "sbg", Opt_skipBuiltinGlyphs, 0, "do not use internal glyphs"),
231 STRG (Rs_lineSpace, "lineSpace", "lsp", "number", "number of extra pixels between rows"),
232#endif 234#endif
233#ifdef POINTER_BLANK 235#ifdef POINTER_BLANK
234 RSTRG (Rs_pointerBlankDelay, "pointerBlankDelay", "number"), 236 RSTRG (Rs_pointerBlankDelay, "pointerBlankDelay", "number"),
235#endif 237#endif
236#ifndef NO_BACKSPACE_KEY 238#ifndef NO_BACKSPACE_KEY
… …
262 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),
263#endif 265#endif
264#ifdef HAVE_AFTERIMAGE 266#ifdef HAVE_AFTERIMAGE
265 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..."),
266 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"),
267#endif
268#ifndef NO_RESOURCES
269 INFO ("xrm", "string", "X resource"),
270#endif 269#endif
271 INFO ("e", "command arg ...", "command to execute") 270 INFO ("e", "command arg ...", "command to execute")
272 }; 271 };
273 272
274#undef INFO 273#undef INFO
… …
426 assert (optList[i].opt != NULL); 425 assert (optList[i].opt != NULL);
427#endif 426#endif
428 len += 4 + strlen (optList[i].opt) + (optList_isBool (i) ? 2: 0); 427 len += 4 + strlen (optList[i].opt) + (optList_isBool (i) ? 2: 0);
429 col += len; 428 col += len;
430 if (col > 79) 429 if (col > 79)
430 {
431 { /* assume regular width */ 431 /* assume regular width */
432 rxvt_log ("\n"); 432 rxvt_log ("\n");
433 col = 1 + len; 433 col = 1 + len;
434 } 434 }
435 435
436 rxvt_log (" [-%s%s", (optList_isBool (i) ? "/+" : ""), optList[i].opt); 436 rxvt_log (" [-%s%s", (optList_isBool (i) ? "/+" : ""), optList[i].opt);
… …
554 554
555 rs[optList[entry].doff] = flag == resval_on ? argv[++i] : resval_undef; 555 rs[optList[entry].doff] = flag == resval_on ? argv[++i] : resval_undef;
556 } 556 }
557 } 557 }
558 else 558 else
559 {
559 { /* boolean value */ 560 /* boolean value */
560 set_option (optList[entry].index, flag == resval_on); 561 set_option (optList[entry].index, flag == resval_on);
561 562
562 if (optList[entry].doff != -1) 563 if (optList[entry].doff != -1)
563 rs[optList[entry].doff] = flag; 564 rs[optList[entry].doff] = flag;
564 } 565 }
565 } 566 }
567#ifndef NO_RESOURCES
568 else if (!strcmp (opt, "xrm"))
569 {
570 if (i+1 < argc)
571 XrmPutLineResource (&option_db, argv[++i]);
572 }
573#endif
566#ifdef KEYSYM_RESOURCE 574#ifdef KEYSYM_RESOURCE
567 else if (!strncmp (opt, "keysym.", sizeof ("keysym.") - 1)) 575 else if (!strncmp (opt, "keysym.", sizeof ("keysym.") - 1))
568 { 576 {
569 if (i+1 < argc) 577 if (i+1 < argc)
570 parse_keysym (opt + sizeof ("keysym.") - 1, argv[++i]); 578 {
579 char *res = (char *)malloc (strlen (opt) + strlen (argv[++i]) + 6);
580 sprintf (res, "*.%s: %s\n", opt, argv[i]);
581 XrmPutLineResource (&option_db, res);
582 free (res);
583 }
571 } 584 }
572#endif 585#endif
573 else 586 else
574 { 587 {
575 bad_option = 1; 588 bad_option = 1;
… …
800 813
801void 814void
802rxvt_term::extract_resources () 815rxvt_term::extract_resources ()
803{ 816{
804#ifndef NO_RESOURCES 817#ifndef NO_RESOURCES
818 XrmDatabase database = XrmGetDatabase (dpy);
819 XrmMergeDatabases (option_db, &database);
820 option_db = NULL;
805 /* 821 /*
806 * Query resources for options that affect us 822 * Query resources for options that affect us
807 */ 823 */
808 for (int entry = 0; entry < optList_size; entry++) 824 for (int entry = 0; entry < optList_size; entry++)
809 { 825 {
… …
838 854
839 /* 855 /*
840 * [R5 or later]: enumerate the resource database 856 * [R5 or later]: enumerate the resource database
841 */ 857 */
842# ifdef KEYSYM_RESOURCE 858# ifdef KEYSYM_RESOURCE
843 XrmDatabase database = XrmGetDatabase (dpy);
844 XrmName name_prefix[3]; 859 XrmName name_prefix[3];
845 XrmClass class_prefix[3]; 860 XrmClass class_prefix[3];
846 861
847 name_prefix[0] = XrmStringToName (rs[Rs_name]); 862 name_prefix[0] = XrmStringToName (rs[Rs_name]);
848 name_prefix[1] = XrmStringToName ("keysym"); 863 name_prefix[1] = XrmStringToName ("keysym");

Diff Legend

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