… | |
… | |
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 |
237 | RSTRG (Rs_backspace_key, "backspacekey", "string"), |
239 | RSTRG (Rs_backspace_key, "backspacekey", "string"), |
238 | #endif |
240 | #endif |
239 | #ifndef NO_DELETE_KEY |
241 | #ifndef NO_DELETE_KEY |
240 | RSTRG (Rs_delete_key, "deletekey", "string"), |
242 | RSTRG (Rs_delete_key, "deletekey", "string"), |
241 | #endif |
243 | #endif |
242 | RSTRG (Rs_selectstyle, "selectstyle", "mode"), |
|
|
243 | #ifdef PRINTPIPE |
244 | #ifdef PRINTPIPE |
244 | RSTRG (Rs_print_pipe, "print-pipe", "string"), |
245 | RSTRG (Rs_print_pipe, "print-pipe", "string"), |
245 | #endif |
246 | #endif |
246 | STRG (Rs_modifier, "modifier", "mod", "modifier", "meta modifier = alt|meta|hyper|super|mod1|...|mod5"), |
247 | STRG (Rs_modifier, "modifier", "mod", "modifier", "meta modifier = alt|meta|hyper|super|mod1|...|mod5"), |
247 | #ifdef CUTCHAR_RESOURCE |
248 | #ifdef CUTCHAR_RESOURCE |
… | |
… | |
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"), |
267 | #endif |
|
|
268 | #ifndef NO_RESOURCES |
|
|
269 | INFO ("xrm", "string", "X resource"), |
|
|
270 | #endif |
268 | #endif |
271 | INFO ("e", "command arg ...", "command to execute") |
269 | INFO ("e", "command arg ...", "command to execute") |
272 | }; |
270 | }; |
273 | |
271 | |
274 | #undef INFO |
272 | #undef INFO |
… | |
… | |
426 | assert (optList[i].opt != NULL); |
424 | assert (optList[i].opt != NULL); |
427 | #endif |
425 | #endif |
428 | len += 4 + strlen (optList[i].opt) + (optList_isBool (i) ? 2: 0); |
426 | len += 4 + strlen (optList[i].opt) + (optList_isBool (i) ? 2: 0); |
429 | col += len; |
427 | col += len; |
430 | if (col > 79) |
428 | if (col > 79) |
|
|
429 | { |
431 | { /* assume regular width */ |
430 | /* assume regular width */ |
432 | rxvt_log ("\n"); |
431 | rxvt_log ("\n"); |
433 | col = 1 + len; |
432 | col = 1 + len; |
434 | } |
433 | } |
435 | |
434 | |
436 | rxvt_log (" [-%s%s", (optList_isBool (i) ? "/+" : ""), optList[i].opt); |
435 | rxvt_log (" [-%s%s", (optList_isBool (i) ? "/+" : ""), optList[i].opt); |
… | |
… | |
554 | |
553 | |
555 | rs[optList[entry].doff] = flag == resval_on ? argv[++i] : resval_undef; |
554 | rs[optList[entry].doff] = flag == resval_on ? argv[++i] : resval_undef; |
556 | } |
555 | } |
557 | } |
556 | } |
558 | else |
557 | else |
|
|
558 | { |
559 | { /* boolean value */ |
559 | /* boolean value */ |
560 | set_option (optList[entry].index, flag == resval_on); |
560 | set_option (optList[entry].index, flag == resval_on); |
561 | |
561 | |
562 | if (optList[entry].doff != -1) |
562 | if (optList[entry].doff != -1) |
563 | rs[optList[entry].doff] = flag; |
563 | rs[optList[entry].doff] = flag; |
564 | } |
564 | } |
565 | } |
565 | } |
|
|
566 | #ifndef NO_RESOURCES |
|
|
567 | else if (!strcmp (opt, "xrm")) |
|
|
568 | { |
|
|
569 | if (i+1 < argc) |
|
|
570 | XrmPutLineResource (&option_db, argv[++i]); |
|
|
571 | } |
|
|
572 | #endif |
|
|
573 | #ifdef KEYSYM_RESOURCE |
|
|
574 | else if (!strncmp (opt, "keysym.", sizeof ("keysym.") - 1)) |
|
|
575 | { |
|
|
576 | if (i+1 < argc) |
|
|
577 | { |
|
|
578 | char *res = (char *)malloc (strlen (opt) + strlen (argv[++i]) + 6); |
|
|
579 | sprintf (res, "*.%s: %s\n", opt, argv[i]); |
|
|
580 | XrmPutLineResource (&option_db, res); |
|
|
581 | free (res); |
|
|
582 | } |
|
|
583 | } |
|
|
584 | #endif |
566 | else |
585 | else |
567 | #ifdef KEYSYM_RESOURCE |
|
|
568 | if (!strncmp (opt, "keysym.", sizeof ("keysym.") - 1)) |
|
|
569 | { |
586 | { |
570 | if (i+1 < argc) |
|
|
571 | parse_keysym (opt + sizeof ("keysym.") - 1, argv[++i]); |
|
|
572 | } |
|
|
573 | else |
|
|
574 | #endif |
|
|
575 | { |
|
|
576 | bad_option = 1; |
587 | bad_option = 1; |
577 | rxvt_warn ("\"%s\": unknown or malformed option.\n", opt); |
588 | rxvt_warn ("\"%s\": unknown or malformed option.\n", opt); |
578 | } |
589 | } |
579 | } |
590 | } |
580 | |
591 | |
581 | if (bad_option) |
592 | if (bad_option) |
582 | rxvt_usage (0); |
593 | rxvt_usage (0); |
583 | } |
594 | } |
… | |
… | |
801 | |
812 | |
802 | void |
813 | void |
803 | rxvt_term::extract_resources () |
814 | rxvt_term::extract_resources () |
804 | { |
815 | { |
805 | #ifndef NO_RESOURCES |
816 | #ifndef NO_RESOURCES |
|
|
817 | XrmDatabase database = XrmGetDatabase (dpy); |
|
|
818 | XrmMergeDatabases (option_db, &database); |
|
|
819 | option_db = NULL; |
806 | /* |
820 | /* |
807 | * Query resources for options that affect us |
821 | * Query resources for options that affect us |
808 | */ |
822 | */ |
809 | for (int entry = 0; entry < optList_size; entry++) |
823 | for (int entry = 0; entry < optList_size; entry++) |
810 | { |
824 | { |
… | |
… | |
839 | |
853 | |
840 | /* |
854 | /* |
841 | * [R5 or later]: enumerate the resource database |
855 | * [R5 or later]: enumerate the resource database |
842 | */ |
856 | */ |
843 | # ifdef KEYSYM_RESOURCE |
857 | # ifdef KEYSYM_RESOURCE |
844 | XrmDatabase database = XrmGetDatabase (dpy); |
|
|
845 | XrmName name_prefix[3]; |
858 | XrmName name_prefix[3]; |
846 | XrmClass class_prefix[3]; |
859 | XrmClass class_prefix[3]; |
847 | |
860 | |
848 | name_prefix[0] = XrmStringToName (rs[Rs_name]); |
861 | name_prefix[0] = XrmStringToName (rs[Rs_name]); |
849 | name_prefix[1] = XrmStringToName ("keysym"); |
862 | name_prefix[1] = XrmStringToName ("keysym"); |