… | |
… | |
167 | #ifndef NO_BOLD_UNDERLINE_REVERSE |
167 | #ifndef NO_BOLD_UNDERLINE_REVERSE |
168 | RSTRG (Rs_color + Color_BD, "colorBD", "color"), |
168 | RSTRG (Rs_color + Color_BD, "colorBD", "color"), |
169 | RSTRG (Rs_color + Color_IT, "colorIT", "color"), |
169 | RSTRG (Rs_color + Color_IT, "colorIT", "color"), |
170 | RSTRG (Rs_color + Color_UL, "colorUL", "color"), |
170 | RSTRG (Rs_color + Color_UL, "colorUL", "color"), |
171 | RSTRG (Rs_color + Color_RV, "colorRV", "color"), |
171 | RSTRG (Rs_color + Color_RV, "colorRV", "color"), |
172 | #endif /* ! NO_BOLD_UNDERLINE_REVERSE */ |
172 | #endif /* ! NO_BOLD_UNDERLINE_REVERSE */ |
173 | #if ENABLE_FRILLS |
173 | #if ENABLE_FRILLS |
174 | RSTRG (Rs_color + Color_underline, "underlineColor", "color"), |
174 | RSTRG (Rs_color + Color_underline, "underlineColor", "color"), |
175 | #endif |
175 | #endif |
176 | #ifdef KEEP_SCROLLCOLOR |
176 | #ifdef KEEP_SCROLLCOLOR |
177 | RSTRG (Rs_color + Color_scroll, "scrollColor", "color"), |
177 | RSTRG (Rs_color + Color_scroll, "scrollColor", "color"), |
178 | RSTRG (Rs_color + Color_trough, "troughColor", "color"), |
178 | RSTRG (Rs_color + Color_trough, "troughColor", "color"), |
179 | #endif /* KEEP_SCROLLCOLOR */ |
179 | #endif /* KEEP_SCROLLCOLOR */ |
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 | #endif |
182 | #endif |
183 | #ifndef NO_CURSORCOLOR |
183 | #ifndef NO_CURSORCOLOR |
184 | STRG (Rs_color + Color_cursor, "cursorColor", "cr", "color", "cursor color"), |
184 | STRG (Rs_color + Color_cursor, "cursorColor", "cr", "color", "cursor color"), |
185 | /* command-line option = resource name */ |
185 | /* command-line option = resource name */ |
186 | RSTRG (Rs_color + Color_cursor2, "cursorColor2", "color"), |
186 | RSTRG (Rs_color + Color_cursor2, "cursorColor2", "color"), |
187 | #endif /* NO_CURSORCOLOR */ |
187 | #endif /* NO_CURSORCOLOR */ |
188 | STRG (Rs_color + Color_pointer_fg, "pointerColor", "pr", "color", "pointer color"), |
188 | STRG (Rs_color + Color_pointer_fg, "pointerColor", "pr", "color", "pointer color"), |
189 | STRG (Rs_color + Color_pointer_bg, "pointerColor2", "pr2", "color", "pointer bg color"), |
189 | STRG (Rs_color + Color_pointer_bg, "pointerColor2", "pr2", "color", "pointer bg color"), |
190 | STRG (Rs_color + Color_border, "borderColor", "bd", "color", "border color"), |
190 | STRG (Rs_color + Color_border, "borderColor", "bd", "color", "border color"), |
191 | #ifdef BG_IMAGE_FROM_FILE |
191 | #ifdef BG_IMAGE_FROM_FILE |
192 | RSTRG (Rs_path, "path", "search path"), |
192 | RSTRG (Rs_path, "path", "search path"), |
… | |
… | |
203 | #ifdef USE_XIM |
203 | #ifdef USE_XIM |
204 | STRG (Rs_inputMethod, "inputMethod", "im", "name", "name of input method"), |
204 | STRG (Rs_inputMethod, "inputMethod", "im", "name", "name of input method"), |
205 | STRG (Rs_preeditType, "preeditType", "pt", "style", "input style: style = OverTheSpot|OffTheSpot|Root"), |
205 | STRG (Rs_preeditType, "preeditType", "pt", "style", "input style: style = OverTheSpot|OffTheSpot|Root"), |
206 | STRG (Rs_imLocale, "imLocale", "imlocale", "string", "locale to use for input method"), |
206 | STRG (Rs_imLocale, "imLocale", "imlocale", "string", "locale to use for input method"), |
207 | STRG (Rs_imFont, "imFont", "imfont", "fontname", "fontset for styles OverTheSpot and OffTheSpot"), |
207 | STRG (Rs_imFont, "imFont", "imfont", "fontname", "fontset for styles OverTheSpot and OffTheSpot"), |
208 | #endif /* USE_XIM */ |
208 | #endif /* USE_XIM */ |
209 | STRG (Rs_name, NULL, "name", "string", "client instance, icon, and title strings"), |
209 | STRG (Rs_name, NULL, "name", "string", "client instance, icon, and title strings"), |
210 | STRG (Rs_title, "title", "title", "string", "title name for window"), |
210 | STRG (Rs_title, "title", "title", "string", "title name for window"), |
211 | STRG (Rs_title, NULL, "T", NULL, NULL), /* short form */ |
211 | STRG (Rs_title, NULL, "T", NULL, NULL), /* short form */ |
212 | STRG (Rs_iconName, "iconName", "n", "string", "icon name for window"), |
212 | STRG (Rs_iconName, "iconName", "n", "string", "icon name for window"), |
213 | STRG (Rs_saveLines, "saveLines", "sl", "number", "number of scrolled lines to save"), |
213 | STRG (Rs_saveLines, "saveLines", "sl", "number", "number of scrolled lines to save"), |
… | |
… | |
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 |
… | |
… | |
244 | RSTRG (Rs_print_pipe, "print-pipe", "string"), |
246 | RSTRG (Rs_print_pipe, "print-pipe", "string"), |
245 | #endif |
247 | #endif |
246 | STRG (Rs_modifier, "modifier", "mod", "modifier", "meta modifier = alt|meta|hyper|super|mod1|...|mod5"), |
248 | STRG (Rs_modifier, "modifier", "mod", "modifier", "meta modifier = alt|meta|hyper|super|mod1|...|mod5"), |
247 | #ifdef CUTCHAR_RESOURCE |
249 | #ifdef CUTCHAR_RESOURCE |
248 | RSTRG (Rs_cutchars, "cutchars", "string"), |
250 | RSTRG (Rs_cutchars, "cutchars", "string"), |
249 | #endif /* CUTCHAR_RESOURCE */ |
251 | #endif /* CUTCHAR_RESOURCE */ |
250 | RSTRG (Rs_answerbackstring, "answerbackString", "string"), |
252 | RSTRG (Rs_answerbackstring, "answerbackString", "string"), |
251 | #ifndef NO_SECONDARY_SCREEN |
253 | #ifndef NO_SECONDARY_SCREEN |
252 | BOOL (Rs_secondaryScreen, "secondaryScreen", "ssc", Opt_secondaryScreen, 0, "enable secondary screen"), |
254 | BOOL (Rs_secondaryScreen, "secondaryScreen", "ssc", Opt_secondaryScreen, 0, "enable secondary screen"), |
253 | BOOL (Rs_secondaryScroll, "secondaryScroll", "ssr", Opt_secondaryScroll, 0, "enable secondary screen scroll"), |
255 | BOOL (Rs_secondaryScroll, "secondaryScroll", "ssr", Opt_secondaryScroll, 0, "enable secondary screen scroll"), |
254 | #endif |
256 | #endif |
… | |
… | |
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 |
… | |
… | |
548 | */ |
547 | */ |
549 | |
548 | |
550 | if (optList[entry].doff != -1) |
549 | if (optList[entry].doff != -1) |
551 | { |
550 | { |
552 | if (flag == resval_on && i+1 == argc) |
551 | if (flag == resval_on && i+1 == argc) |
553 | rxvt_fatal ("option '%s' needs an argument, aborting.\n", argv [i]); |
552 | rxvt_fatal ("option '%s' requires an argument, aborting.\n", argv [i]); |
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 |
… | |
… | |
561 | |
560 | |
562 | if (optList[entry].doff != -1) |
561 | if (optList[entry].doff != -1) |
563 | rs[optList[entry].doff] = flag; |
562 | rs[optList[entry].doff] = flag; |
564 | } |
563 | } |
565 | } |
564 | } |
|
|
565 | #ifndef NO_RESOURCES |
|
|
566 | else if (!strcmp (opt, "xrm")) |
|
|
567 | { |
|
|
568 | if (i+1 < argc) |
|
|
569 | XrmPutLineResource (&option_db, argv[++i]); |
|
|
570 | } |
|
|
571 | #endif |
|
|
572 | #ifdef KEYSYM_RESOURCE |
|
|
573 | else if (!strncmp (opt, "keysym.", sizeof ("keysym.") - 1)) |
|
|
574 | { |
|
|
575 | if (i+1 < argc) |
|
|
576 | { |
|
|
577 | char *res = (char *)malloc (strlen (opt) + strlen (argv[++i]) + 6); |
|
|
578 | sprintf (res, "*.%s: %s\n", opt, argv[i]); |
|
|
579 | XrmPutLineResource (&option_db, res); |
|
|
580 | free (res); |
|
|
581 | } |
|
|
582 | } |
|
|
583 | #endif |
566 | else |
584 | else |
567 | #ifdef KEYSYM_RESOURCE |
|
|
568 | if (!strncmp (opt, "keysym.", sizeof ("keysym.") - 1)) |
|
|
569 | { |
585 | { |
570 | if (i+1 < argc) |
|
|
571 | parse_keysym (opt + sizeof ("keysym.") - 1, argv[++i]); |
|
|
572 | } |
|
|
573 | else |
|
|
574 | #endif |
|
|
575 | { |
|
|
576 | bad_option = 1; |
586 | bad_option = 1; |
577 | rxvt_warn ("\"%s\": unknown or malformed option.\n", opt); |
587 | rxvt_warn ("\"%s\": unknown or malformed option.\n", opt); |
578 | } |
588 | } |
579 | } |
589 | } |
580 | |
590 | |
581 | if (bad_option) |
591 | if (bad_option) |
582 | rxvt_usage (0); |
592 | rxvt_usage (0); |
583 | } |
593 | } |
… | |
… | |
758 | |
768 | |
759 | keyboard->register_user_translation (sym, state, newarg); |
769 | keyboard->register_user_translation (sym, state, newarg); |
760 | return 1; |
770 | return 1; |
761 | } |
771 | } |
762 | |
772 | |
763 | # endif /* KEYSYM_RESOURCE */ |
773 | # endif /* KEYSYM_RESOURCE */ |
764 | #endif /* NO_RESOURCES */ |
774 | #endif /* NO_RESOURCES */ |
765 | |
775 | |
766 | static char * |
776 | static char * |
767 | get_res (XrmDatabase database, const char *program, const char *option) |
777 | get_res (XrmDatabase database, const char *program, const char *option) |
768 | { |
778 | { |
769 | char resource[512]; |
779 | char resource[512]; |
… | |
… | |
801 | |
811 | |
802 | void |
812 | void |
803 | rxvt_term::extract_resources () |
813 | rxvt_term::extract_resources () |
804 | { |
814 | { |
805 | #ifndef NO_RESOURCES |
815 | #ifndef NO_RESOURCES |
|
|
816 | XrmDatabase database = XrmGetDatabase (dpy); |
|
|
817 | XrmMergeDatabases (option_db, &database); |
|
|
818 | option_db = NULL; |
806 | /* |
819 | /* |
807 | * Query resources for options that affect us |
820 | * Query resources for options that affect us |
808 | */ |
821 | */ |
809 | for (int entry = 0; entry < optList_size; entry++) |
822 | for (int entry = 0; entry < optList_size; entry++) |
810 | { |
823 | { |
… | |
… | |
839 | |
852 | |
840 | /* |
853 | /* |
841 | * [R5 or later]: enumerate the resource database |
854 | * [R5 or later]: enumerate the resource database |
842 | */ |
855 | */ |
843 | # ifdef KEYSYM_RESOURCE |
856 | # ifdef KEYSYM_RESOURCE |
844 | XrmDatabase database = XrmGetDatabase (dpy); |
|
|
845 | XrmName name_prefix[3]; |
857 | XrmName name_prefix[3]; |
846 | XrmClass class_prefix[3]; |
858 | XrmClass class_prefix[3]; |
847 | |
859 | |
848 | name_prefix[0] = XrmStringToName (rs[Rs_name]); |
860 | name_prefix[0] = XrmStringToName (rs[Rs_name]); |
849 | name_prefix[1] = XrmStringToName ("keysym"); |
861 | name_prefix[1] = XrmStringToName ("keysym"); |
… | |
… | |
863 | XrmEnumerateDatabase (database, name_prefix, class_prefix, |
875 | XrmEnumerateDatabase (database, name_prefix, class_prefix, |
864 | XrmEnumOneLevel, rxvt_define_key, NULL); |
876 | XrmEnumOneLevel, rxvt_define_key, NULL); |
865 | # endif |
877 | # endif |
866 | # endif |
878 | # endif |
867 | |
879 | |
868 | #endif /* NO_RESOURCES */ |
880 | #endif /* NO_RESOURCES */ |
869 | } |
881 | } |
870 | |
882 | |
871 | /*----------------------- end-of-file (C source) -----------------------*/ |
883 | /*----------------------- end-of-file (C source) -----------------------*/ |