| … | |
… | |
| 32 | #endif |
32 | #endif |
| 33 | |
33 | |
| 34 | /* place holders used for parsing command-line options */ |
34 | /* place holders used for parsing command-line options */ |
| 35 | #define Optflag_Reverse 1 |
35 | #define Optflag_Reverse 1 |
| 36 | #define Optflag_Boolean 2 |
36 | #define Optflag_Boolean 2 |
|
|
37 | #define Optflag_Switch 4 |
| 37 | |
38 | |
| 38 | /* monolithic option/resource structure: */ |
39 | /* monolithic option/resource structure: */ |
| 39 | /* |
40 | /* |
| 40 | * `string' options MUST have a usage argument |
41 | * `string' options MUST have a usage argument |
| 41 | * `switch' and `boolean' options have no argument |
42 | * `switch' and `boolean' options have no argument |
| … | |
… | |
| 58 | #define BOOL(rsp, kw, opt, option, flag, desc) \ |
59 | #define BOOL(rsp, kw, opt, option, flag, desc) \ |
| 59 | { (option), (Optflag_Boolean | (flag)), (rsp), (kw), (opt), NULL, (desc)} |
60 | { (option), (Optflag_Boolean | (flag)), (rsp), (kw), (opt), NULL, (desc)} |
| 60 | |
61 | |
| 61 | /* SWCH () - `-' flag */ |
62 | /* SWCH () - `-' flag */ |
| 62 | #define SWCH(opt, option, flag, desc) \ |
63 | #define SWCH(opt, option, flag, desc) \ |
| 63 | { (option), (Optflag_Boolean | (flag)), -1, NULL, (opt), NULL, (desc)} |
64 | { (option), (Optflag_Switch | (flag)), -1, NULL, (opt), NULL, (desc)} |
| 64 | |
65 | |
| 65 | /* convenient macros */ |
66 | /* convenient macros */ |
| 66 | #define optList_strlen(i) \ |
67 | #define optList_strlen(i) \ |
| 67 | (optList[i].flag ? 0 : (optList[i].arg ? strlen (optList[i].arg) : 1)) |
68 | (optList[i].flag ? 0 : (optList[i].arg ? strlen (optList[i].arg) : 1)) |
| 68 | #define optList_isBool(i) \ |
69 | #define optList_isBool(i) \ |
| … | |
… | |
| 92 | SWCH ("iconic", Opt_iconic, 0, "start iconic"), |
93 | SWCH ("iconic", Opt_iconic, 0, "start iconic"), |
| 93 | SWCH ("ic", Opt_iconic, 0, NULL), /* short form */ |
94 | SWCH ("ic", Opt_iconic, 0, NULL), /* short form */ |
| 94 | BOOL (Rs_reverseVideo, "reverseVideo", "rv", Opt_reverseVideo, 0, "reverse video"), |
95 | BOOL (Rs_reverseVideo, "reverseVideo", "rv", Opt_reverseVideo, 0, "reverse video"), |
| 95 | BOOL (Rs_loginShell, "loginShell", "ls", Opt_loginShell, 0, "login shell"), |
96 | BOOL (Rs_loginShell, "loginShell", "ls", Opt_loginShell, 0, "login shell"), |
| 96 | BOOL (Rs_jumpScroll, "jumpScroll", "j", Opt_jumpScroll, 0, "jump scrolling"), |
97 | BOOL (Rs_jumpScroll, "jumpScroll", "j", Opt_jumpScroll, 0, "jump scrolling"), |
|
|
98 | BOOL (Rs_skipScroll, "skipScroll", "ss", Opt_skipScroll, 0, "skip scrolling"), |
| 97 | BOOL (Rs_pastableTabs, "pastableTabs", "ptab", Opt_pastableTabs, 0, "tab characters are pastable"), |
99 | BOOL (Rs_pastableTabs, "pastableTabs", "ptab", Opt_pastableTabs, 0, "tab characters are pastable"), |
| 98 | #if HAVE_SCROLLBARS |
100 | #if HAVE_SCROLLBARS |
| 99 | RSTRG (Rs_scrollstyle, "scrollstyle", "mode"), |
101 | RSTRG (Rs_scrollstyle, "scrollstyle", "mode"), |
| 100 | BOOL (Rs_scrollBar, "scrollBar", "sb", Opt_scrollBar, 0, "scrollbar"), |
102 | BOOL (Rs_scrollBar, "scrollBar", "sb", Opt_scrollBar, 0, "scrollbar"), |
| 101 | BOOL (Rs_scrollBar_right, "scrollBar_right", "sr", Opt_scrollBar_right, 0, "scrollbar right"), |
103 | BOOL (Rs_scrollBar_right, "scrollBar_right", "sr", Opt_scrollBar_right, 0, "scrollbar right"), |
| … | |
… | |
| 105 | #endif |
107 | #endif |
| 106 | BOOL (Rs_scrollTtyOutput, "scrollTtyOutput", NULL, Opt_scrollTtyOutput, 0, NULL), |
108 | BOOL (Rs_scrollTtyOutput, "scrollTtyOutput", NULL, Opt_scrollTtyOutput, 0, NULL), |
| 107 | BOOL (Rs_scrollTtyOutput, NULL, "si", Opt_scrollTtyOutput, Optflag_Reverse, "scroll-on-tty-output inhibit"), |
109 | BOOL (Rs_scrollTtyOutput, NULL, "si", Opt_scrollTtyOutput, Optflag_Reverse, "scroll-on-tty-output inhibit"), |
| 108 | BOOL (Rs_scrollTtyKeypress, "scrollTtyKeypress", "sk", Opt_scrollTtyKeypress, 0, "scroll-on-keypress"), |
110 | BOOL (Rs_scrollTtyKeypress, "scrollTtyKeypress", "sk", Opt_scrollTtyKeypress, 0, "scroll-on-keypress"), |
| 109 | BOOL (Rs_scrollWithBuffer, "scrollWithBuffer", "sw", Opt_scrollWithBuffer, 0, "scroll-with-buffer"), |
111 | BOOL (Rs_scrollWithBuffer, "scrollWithBuffer", "sw", Opt_scrollWithBuffer, 0, "scroll-with-buffer"), |
| 110 | #if TRANSPARENT |
112 | #if ENABLE_TRANSPARENCY |
| 111 | BOOL (Rs_transparent, "inheritPixmap", "ip", Opt_transparent, 0, "inherit parent pixmap"), |
113 | BOOL (Rs_transparent, "inheritPixmap", "ip", Opt_transparent, 0, "inherit parent pixmap"), |
| 112 | SWCH ("tr", Opt_transparent, 0, NULL), |
114 | BOOL (Rs_transparent, "transparent", "tr", Opt_transparent, 0, "inherit parent pixmap"), |
| 113 | # if TINTING |
|
|
| 114 | STRG (Rs_color + Color_tint, "tintColor", "tint", "color", "tint color"), |
115 | STRG (Rs_color + Color_tint, "tintColor", "tint", "color", "tint color"), |
| 115 | # endif |
116 | STRG (Rs_shade, "shading", "sh", "%", "shade background by x %."), |
| 116 | #endif |
117 | #endif |
| 117 | #if OFF_FOCUS_FADING |
118 | #if OFF_FOCUS_FADING |
| 118 | STRG (Rs_fade, "fading", "fade", "%", "fade colors x% percent when rxvt-unicode is losing focus"), |
119 | STRG (Rs_fade, "fading", "fade", "%", "fade colors x% percent when rxvt-unicode is losing focus"), |
| 119 | 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"), |
| 120 | #endif |
|
|
| 121 | #if TINTING |
|
|
| 122 | STRG (Rs_shade, "shading", "sh", "%", "shade background by x % when tinting."), |
|
|
| 123 | #endif |
121 | #endif |
| 124 | BOOL (Rs_utmpInhibit, "utmpInhibit", "ut", Opt_utmpInhibit, 0, "utmp inhibit"), |
122 | BOOL (Rs_utmpInhibit, "utmpInhibit", "ut", Opt_utmpInhibit, 0, "utmp inhibit"), |
| 125 | #ifndef NO_BELL |
123 | #ifndef NO_BELL |
| 126 | # if ENABLE_FRILLS |
124 | # if ENABLE_FRILLS |
| 127 | BOOL (Rs_urgentOnBell, "urgentOnBell", NULL, Opt_urgentOnBell, 0, NULL), |
125 | BOOL (Rs_urgentOnBell, "urgentOnBell", NULL, Opt_urgentOnBell, 0, NULL), |
| … | |
… | |
| 169 | #ifndef NO_BOLD_UNDERLINE_REVERSE |
167 | #ifndef NO_BOLD_UNDERLINE_REVERSE |
| 170 | RSTRG (Rs_color + Color_BD, "colorBD", "color"), |
168 | RSTRG (Rs_color + Color_BD, "colorBD", "color"), |
| 171 | RSTRG (Rs_color + Color_IT, "colorIT", "color"), |
169 | RSTRG (Rs_color + Color_IT, "colorIT", "color"), |
| 172 | RSTRG (Rs_color + Color_UL, "colorUL", "color"), |
170 | RSTRG (Rs_color + Color_UL, "colorUL", "color"), |
| 173 | RSTRG (Rs_color + Color_RV, "colorRV", "color"), |
171 | RSTRG (Rs_color + Color_RV, "colorRV", "color"), |
| 174 | #endif /* ! NO_BOLD_UNDERLINE_REVERSE */ |
172 | #endif /* ! NO_BOLD_UNDERLINE_REVERSE */ |
| 175 | #if ENABLE_FRILLS |
173 | #if ENABLE_FRILLS |
| 176 | RSTRG (Rs_color + Color_underline, "underlineColor", "color"), |
174 | RSTRG (Rs_color + Color_underline, "underlineColor", "color"), |
| 177 | #endif |
175 | #endif |
| 178 | #ifdef KEEP_SCROLLCOLOR |
176 | #ifdef KEEP_SCROLLCOLOR |
| 179 | RSTRG (Rs_color + Color_scroll, "scrollColor", "color"), |
177 | RSTRG (Rs_color + Color_scroll, "scrollColor", "color"), |
| 180 | RSTRG (Rs_color + Color_trough, "troughColor", "color"), |
178 | RSTRG (Rs_color + Color_trough, "troughColor", "color"), |
| 181 | #endif /* KEEP_SCROLLCOLOR */ |
179 | #endif /* KEEP_SCROLLCOLOR */ |
| 182 | #ifdef OPTION_HC |
180 | #ifdef OPTION_HC |
| 183 | STRG (Rs_color + Color_HC, "highlightColor", "hc", "color", "highlight color"), |
181 | STRG (Rs_color + Color_HC, "highlightColor", "hc", "color", "highlight color"), |
| 184 | #endif |
182 | #endif |
| 185 | #ifndef NO_CURSORCOLOR |
183 | #ifndef NO_CURSORCOLOR |
| 186 | STRG (Rs_color + Color_cursor, "cursorColor", "cr", "color", "cursor color"), |
184 | STRG (Rs_color + Color_cursor, "cursorColor", "cr", "color", "cursor color"), |
| 187 | /* command-line option = resource name */ |
185 | /* command-line option = resource name */ |
| 188 | RSTRG (Rs_color + Color_cursor2, "cursorColor2", "color"), |
186 | RSTRG (Rs_color + Color_cursor2, "cursorColor2", "color"), |
| 189 | #endif /* NO_CURSORCOLOR */ |
187 | #endif /* NO_CURSORCOLOR */ |
| 190 | STRG (Rs_color + Color_pointer_fg, "pointerColor", "pr", "color", "pointer color"), |
188 | STRG (Rs_color + Color_pointer_fg, "pointerColor", "pr", "color", "pointer color"), |
| 191 | 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"), |
| 192 | STRG (Rs_color + Color_border, "borderColor", "bd", "color", "border color"), |
190 | STRG (Rs_color + Color_border, "borderColor", "bd", "color", "border color"), |
| 193 | #ifdef XPM_BACKGROUND |
191 | #ifdef BG_IMAGE_FROM_FILE |
| 194 | RSTRG (Rs_path, "path", "search path"), |
192 | RSTRG (Rs_path, "path", "search path"), |
| 195 | STRG (Rs_backgroundPixmap, "backgroundPixmap", "pixmap", "file[;geom]", "background pixmap"), |
193 | STRG (Rs_backgroundPixmap, "backgroundPixmap", "pixmap", "file[;geom]", "background pixmap"), |
| 196 | #endif |
194 | #endif |
| 197 | /* fonts: command-line option = resource name */ |
195 | /* fonts: command-line option = resource name */ |
| 198 | STRG (Rs_font, "font", "fn", "fontname", "normal text font"), |
196 | STRG (Rs_font, "font", "fn", "fontname", "normal text font"), |
| … | |
… | |
| 205 | #ifdef USE_XIM |
203 | #ifdef USE_XIM |
| 206 | STRG (Rs_inputMethod, "inputMethod", "im", "name", "name of input method"), |
204 | STRG (Rs_inputMethod, "inputMethod", "im", "name", "name of input method"), |
| 207 | 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"), |
| 208 | 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"), |
| 209 | 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"), |
| 210 | #endif /* USE_XIM */ |
208 | #endif /* USE_XIM */ |
| 211 | 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"), |
| 212 | STRG (Rs_title, "title", "title", "string", "title name for window"), |
210 | STRG (Rs_title, "title", "title", "string", "title name for window"), |
| 213 | STRG (Rs_title, NULL, "T", NULL, NULL), /* short form */ |
211 | STRG (Rs_title, NULL, "T", NULL, NULL), /* short form */ |
| 214 | STRG (Rs_iconName, "iconName", "n", "string", "icon name for window"), |
212 | STRG (Rs_iconName, "iconName", "n", "string", "icon name for window"), |
| 215 | 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"), |
| … | |
… | |
| 227 | STRG (Rs_ext_bwidth, "externalBorder", "w", "number", "external border in pixels"), |
225 | STRG (Rs_ext_bwidth, "externalBorder", "w", "number", "external border in pixels"), |
| 228 | STRG (Rs_ext_bwidth, NULL, "bw", NULL, NULL), |
226 | STRG (Rs_ext_bwidth, NULL, "bw", NULL, NULL), |
| 229 | STRG (Rs_ext_bwidth, NULL, "borderwidth", NULL, NULL), |
227 | STRG (Rs_ext_bwidth, NULL, "borderwidth", NULL, NULL), |
| 230 | STRG (Rs_int_bwidth, "internalBorder", "b", "number", "internal border in pixels"), |
228 | STRG (Rs_int_bwidth, "internalBorder", "b", "number", "internal border in pixels"), |
| 231 | 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 |
| 232 | 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"), |
| 233 | STRG (Rs_lineSpace, "lineSpace", "lsp", "number", "number of extra pixels between rows"), |
|
|
| 234 | #endif |
234 | #endif |
| 235 | #ifdef POINTER_BLANK |
235 | #ifdef POINTER_BLANK |
| 236 | RSTRG (Rs_pointerBlankDelay, "pointerBlankDelay", "number"), |
236 | RSTRG (Rs_pointerBlankDelay, "pointerBlankDelay", "number"), |
| 237 | #endif |
237 | #endif |
| 238 | #ifndef NO_BACKSPACE_KEY |
238 | #ifndef NO_BACKSPACE_KEY |
| … | |
… | |
| 246 | RSTRG (Rs_print_pipe, "print-pipe", "string"), |
246 | RSTRG (Rs_print_pipe, "print-pipe", "string"), |
| 247 | #endif |
247 | #endif |
| 248 | 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"), |
| 249 | #ifdef CUTCHAR_RESOURCE |
249 | #ifdef CUTCHAR_RESOURCE |
| 250 | RSTRG (Rs_cutchars, "cutchars", "string"), |
250 | RSTRG (Rs_cutchars, "cutchars", "string"), |
| 251 | #endif /* CUTCHAR_RESOURCE */ |
251 | #endif /* CUTCHAR_RESOURCE */ |
| 252 | RSTRG (Rs_answerbackstring, "answerbackString", "string"), |
252 | RSTRG (Rs_answerbackstring, "answerbackString", "string"), |
| 253 | #ifndef NO_SECONDARY_SCREEN |
253 | #ifndef NO_SECONDARY_SCREEN |
| 254 | BOOL (Rs_secondaryScreen, "secondaryScreen", "ssc", Opt_secondaryScreen, 0, "enable secondary screen"), |
254 | BOOL (Rs_secondaryScreen, "secondaryScreen", "ssc", Opt_secondaryScreen, 0, "enable secondary screen"), |
| 255 | 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"), |
| 256 | #endif |
256 | #endif |
| … | |
… | |
| 258 | RSTRG (Rs_perl_lib, "perl-lib", "string"), //, "colon-separated directories with extension scripts"),TODO |
258 | RSTRG (Rs_perl_lib, "perl-lib", "string"), //, "colon-separated directories with extension scripts"),TODO |
| 259 | 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 |
| 260 | 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 |
| 261 | 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"), |
| 262 | #endif |
262 | #endif |
| 263 | |
263 | #if ISO_14755 |
|
|
264 | BOOL (Rs_iso14755_52, "iso14755_52", NULL, Opt_iso14755_52, 0, NULL), |
|
|
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", "number", "Gaussian Blur radius 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 |
| … | |
… | |
| 318 | #endif |
317 | #endif |
| 319 | "," |
318 | "," |
| 320 | #if OFF_FOCUS_FADING |
319 | #if OFF_FOCUS_FADING |
| 321 | "fade," |
320 | "fade," |
| 322 | #endif |
321 | #endif |
| 323 | #if defined(XPM_BACKGROUND) |
|
|
| 324 | "XPM," |
|
|
| 325 | #endif |
|
|
| 326 | #if defined(TRANSPARENT) |
322 | #if defined(ENABLE_TRANSPARENCY) |
| 327 | "transparent," |
323 | "transparent," |
| 328 | #endif |
|
|
| 329 | #if TINTING |
|
|
| 330 | "tint," |
324 | "tint," |
|
|
325 | #endif |
|
|
326 | #if HAVE_AFTERIMAGE |
|
|
327 | "afterimage," |
| 331 | #endif |
328 | #endif |
| 332 | #if defined(USE_XIM) |
329 | #if defined(USE_XIM) |
| 333 | "XIM," |
330 | "XIM," |
| 334 | #endif |
331 | #endif |
| 335 | #if defined(NO_BACKSPACE_KEY) |
332 | #if defined(NO_BACKSPACE_KEY) |
| … | |
… | |
| 538 | |
535 | |
| 539 | if (entry < optList_size) |
536 | if (entry < optList_size) |
| 540 | { |
537 | { |
| 541 | if (optList_isReverse (entry)) |
538 | if (optList_isReverse (entry)) |
| 542 | flag = flag == resval_on ? resval_off : resval_on; |
539 | flag = flag == resval_on ? resval_off : resval_on; |
| 543 | fprintf( stderr, "entry = %d, opt = [%s], flag = 0x%X, resval_on = %d\n", entry, opt, *flag, *resval_on ); |
|
|
| 544 | |
540 | |
| 545 | if (optList_strlen (entry)) |
541 | if (optList_strlen (entry)) |
| 546 | { |
542 | { |
| 547 | /* |
543 | /* |
| 548 | * special cases are handled in main.c:main () to allow |
544 | * special cases are handled in main.c:main () to allow |
| 549 | * X resources to set these values before we settle for |
545 | * X resources to set these values before we settle for |
| 550 | * default values |
546 | * default values |
| 551 | */ |
547 | */ |
| 552 | fprintf( stderr, "string\n"); |
548 | |
| 553 | if (optList[entry].doff != -1) |
549 | if (optList[entry].doff != -1) |
| 554 | { |
550 | { |
| 555 | if (flag == resval_on && !argv [i+1]) |
551 | if (flag == resval_on && i+1 == argc) |
| 556 | rxvt_fatal ("option '%s' needs an argument, aborting.\n", argv [i]); |
552 | rxvt_fatal ("option '%s' requires an argument, aborting.\n", argv [i]); |
| 557 | |
553 | |
| 558 | rs[optList[entry].doff] = flag == resval_on ? argv[++i] : resval_undef; |
554 | rs[optList[entry].doff] = flag == resval_on ? argv[++i] : resval_undef; |
| 559 | } |
555 | } |
| 560 | } |
556 | } |
| 561 | else |
557 | else |
| … | |
… | |
| 564 | |
560 | |
| 565 | if (optList[entry].doff != -1) |
561 | if (optList[entry].doff != -1) |
| 566 | rs[optList[entry].doff] = flag; |
562 | rs[optList[entry].doff] = flag; |
| 567 | } |
563 | } |
| 568 | } |
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 |
| 569 | else |
584 | else |
| 570 | #ifdef KEYSYM_RESOURCE |
|
|
| 571 | /* if (!strncmp (opt, "keysym.", sizeof ("keysym.") - 1)) */ |
|
|
| 572 | if (rxvt_Str_match (opt, "keysym.")) |
|
|
| 573 | { |
585 | { |
| 574 | const char *str = argv[++i]; |
|
|
| 575 | |
|
|
| 576 | if (str != NULL) |
|
|
| 577 | parse_keysym (opt + sizeof ("keysym.") - 1, str); |
|
|
| 578 | } |
|
|
| 579 | else |
|
|
| 580 | #endif |
|
|
| 581 | { |
|
|
| 582 | bad_option = 1; |
586 | bad_option = 1; |
| 583 | rxvt_warn ("\"%s\": unknown or malformed option.\n", opt); |
587 | rxvt_warn ("\"%s\": unknown or malformed option.\n", opt); |
| 584 | } |
588 | } |
| 585 | } |
589 | } |
| 586 | |
590 | |
| 587 | if (bad_option) |
591 | if (bad_option) |
| 588 | rxvt_usage (0); |
592 | rxvt_usage (0); |
| 589 | } |
593 | } |
| … | |
… | |
| 673 | char *newarg = NULL; |
677 | char *newarg = NULL; |
| 674 | char newargstr[NEWARGLIM]; |
678 | char newargstr[NEWARGLIM]; |
| 675 | |
679 | |
| 676 | if (arg == NULL) |
680 | if (arg == NULL) |
| 677 | { |
681 | { |
| 678 | if ((n = rxvt_Str_match (str, "keysym.")) == 0) |
682 | n = sizeof ("keysym.") - 1; |
|
|
683 | if (strncmp (str, "keysym.", n)) |
| 679 | return 0; |
684 | return 0; |
| 680 | |
685 | |
| 681 | str += n; /* skip `keysym.' */ |
686 | str += n; /* skip `keysym.' */ |
| 682 | if (!(pmodend = strchr (str, ':'))) |
687 | if (!(pmodend = strchr (str, ':'))) |
| 683 | return -1; |
688 | return -1; |
| … | |
… | |
| 756 | strncpy (newargstr, arg, NEWARGLIM - 1); |
761 | strncpy (newargstr, arg, NEWARGLIM - 1); |
| 757 | newargstr[NEWARGLIM - 1] = '\0'; |
762 | newargstr[NEWARGLIM - 1] = '\0'; |
| 758 | newarg = newargstr; |
763 | newarg = newargstr; |
| 759 | } |
764 | } |
| 760 | |
765 | |
| 761 | rxvt_Str_trim (newarg); |
766 | if (*newarg == '\0') |
| 762 | if (*newarg == '\0' || (n = rxvt_Str_escaped (newarg)) == 0) |
|
|
| 763 | return -1; |
767 | return -1; |
| 764 | |
768 | |
| 765 | keyboard->register_user_translation (sym, state, newarg); |
769 | keyboard->register_user_translation (sym, state, newarg); |
| 766 | return 1; |
770 | return 1; |
| 767 | } |
771 | } |
| 768 | |
772 | |
| 769 | # endif /* KEYSYM_RESOURCE */ |
773 | # endif /* KEYSYM_RESOURCE */ |
| 770 | #endif /* NO_RESOURCES */ |
774 | #endif /* NO_RESOURCES */ |
| 771 | |
775 | |
| 772 | static char * |
776 | static char * |
| 773 | get_res (XrmDatabase database, const char *program, const char *option) |
777 | get_res (XrmDatabase database, const char *program, const char *option) |
| 774 | { |
778 | { |
| 775 | char resource[512]; |
779 | char resource[512]; |
| … | |
… | |
| 807 | |
811 | |
| 808 | void |
812 | void |
| 809 | rxvt_term::extract_resources () |
813 | rxvt_term::extract_resources () |
| 810 | { |
814 | { |
| 811 | #ifndef NO_RESOURCES |
815 | #ifndef NO_RESOURCES |
|
|
816 | XrmDatabase database = XrmGetDatabase (dpy); |
|
|
817 | XrmMergeDatabases (option_db, &database); |
|
|
818 | option_db = NULL; |
| 812 | /* |
819 | /* |
| 813 | * Query resources for options that affect us |
820 | * Query resources for options that affect us |
| 814 | */ |
821 | */ |
| 815 | for (int entry = 0; entry < optList_size; entry++) |
822 | for (int entry = 0; entry < optList_size; entry++) |
| 816 | { |
823 | { |
| … | |
… | |
| 845 | |
852 | |
| 846 | /* |
853 | /* |
| 847 | * [R5 or later]: enumerate the resource database |
854 | * [R5 or later]: enumerate the resource database |
| 848 | */ |
855 | */ |
| 849 | # ifdef KEYSYM_RESOURCE |
856 | # ifdef KEYSYM_RESOURCE |
| 850 | XrmDatabase database = XrmGetDatabase (dpy); |
|
|
| 851 | XrmName name_prefix[3]; |
857 | XrmName name_prefix[3]; |
| 852 | XrmClass class_prefix[3]; |
858 | XrmClass class_prefix[3]; |
| 853 | |
859 | |
| 854 | name_prefix[0] = XrmStringToName (rs[Rs_name]); |
860 | name_prefix[0] = XrmStringToName (rs[Rs_name]); |
| 855 | name_prefix[1] = XrmStringToName ("keysym"); |
861 | name_prefix[1] = XrmStringToName ("keysym"); |
| … | |
… | |
| 869 | XrmEnumerateDatabase (database, name_prefix, class_prefix, |
875 | XrmEnumerateDatabase (database, name_prefix, class_prefix, |
| 870 | XrmEnumOneLevel, rxvt_define_key, NULL); |
876 | XrmEnumOneLevel, rxvt_define_key, NULL); |
| 871 | # endif |
877 | # endif |
| 872 | # endif |
878 | # endif |
| 873 | |
879 | |
| 874 | #endif /* NO_RESOURCES */ |
880 | #endif /* NO_RESOURCES */ |
| 875 | } |
881 | } |
| 876 | |
882 | |
| 877 | /*----------------------- end-of-file (C source) -----------------------*/ |
883 | /*----------------------- end-of-file (C source) -----------------------*/ |
