| … | |
… | |
| 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", "number", "shade background by number %."), |
| 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", "number", "fade colors by number % when 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 |
| 239 | RSTRG (Rs_backspace_key, "backspacekey", "string"), |
239 | RSTRG (Rs_backspace_key, "backspacekey", "string"), |
| 240 | #endif |
240 | #endif |
| 241 | #ifndef NO_DELETE_KEY |
241 | #ifndef NO_DELETE_KEY |
| 242 | RSTRG (Rs_delete_key, "deletekey", "string"), |
242 | RSTRG (Rs_delete_key, "deletekey", "string"), |
| 243 | #endif |
243 | #endif |
| 244 | RSTRG (Rs_selectstyle, "selectstyle", "mode"), |
|
|
| 245 | #ifdef PRINTPIPE |
244 | #ifdef PRINTPIPE |
| 246 | RSTRG (Rs_print_pipe, "print-pipe", "string"), |
245 | RSTRG (Rs_print_pipe, "print-pipe", "string"), |
| 247 | #endif |
246 | #endif |
| 248 | 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"), |
| 249 | #ifdef CUTCHAR_RESOURCE |
248 | #ifdef CUTCHAR_RESOURCE |
| 250 | RSTRG (Rs_cutchars, "cutchars", "string"), |
249 | RSTRG (Rs_cutchars, "cutchars", "string"), |
| 251 | #endif /* CUTCHAR_RESOURCE */ |
250 | #endif /* CUTCHAR_RESOURCE */ |
| 252 | RSTRG (Rs_answerbackstring, "answerbackString", "string"), |
251 | RSTRG (Rs_answerbackstring, "answerbackString", "string"), |
| 253 | #ifndef NO_SECONDARY_SCREEN |
252 | #ifndef NO_SECONDARY_SCREEN |
| 254 | BOOL (Rs_secondaryScreen, "secondaryScreen", "ssc", Opt_secondaryScreen, 0, "enable secondary screen"), |
253 | BOOL (Rs_secondaryScreen, "secondaryScreen", "ssc", Opt_secondaryScreen, 0, "enable secondary screen"), |
| 255 | BOOL (Rs_secondaryScroll, "secondaryScroll", "ssr", Opt_secondaryScroll, 0, "enable secondary screen scroll"), |
254 | BOOL (Rs_secondaryScroll, "secondaryScroll", "ssr", Opt_secondaryScroll, 0, "enable secondary screen scroll"), |
| 256 | #endif |
255 | #endif |
| … | |
… | |
| 258 | RSTRG (Rs_perl_lib, "perl-lib", "string"), //, "colon-separated directories with extension scripts"),TODO |
257 | 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 |
258 | 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 |
259 | 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"), |
260 | STRG (Rs_perl_ext_2, "perl-ext", "pe", "string", "colon-separated list of perl extensions to enable for this instance"), |
| 262 | #endif |
261 | #endif |
| 263 | |
262 | #if ISO_14755 |
|
|
263 | BOOL (Rs_iso14755_52, "iso14755_52", NULL, Opt_iso14755_52, 0, NULL), |
|
|
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", "number", "Gaussian Blur radius 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 |
| … | |
… | |
| 318 | #endif |
316 | #endif |
| 319 | "," |
317 | "," |
| 320 | #if OFF_FOCUS_FADING |
318 | #if OFF_FOCUS_FADING |
| 321 | "fade," |
319 | "fade," |
| 322 | #endif |
320 | #endif |
| 323 | #if defined(XPM_BACKGROUND) |
|
|
| 324 | "XPM," |
|
|
| 325 | #endif |
|
|
| 326 | #if defined(TRANSPARENT) |
321 | #if defined(ENABLE_TRANSPARENCY) |
| 327 | "transparent," |
322 | "transparent," |
| 328 | #endif |
|
|
| 329 | #if TINTING |
|
|
| 330 | "tint," |
323 | "tint," |
|
|
324 | #endif |
|
|
325 | #if HAVE_AFTERIMAGE |
|
|
326 | "afterimage," |
| 331 | #endif |
327 | #endif |
| 332 | #if defined(USE_XIM) |
328 | #if defined(USE_XIM) |
| 333 | "XIM," |
329 | "XIM," |
| 334 | #endif |
330 | #endif |
| 335 | #if defined(NO_BACKSPACE_KEY) |
331 | #if defined(NO_BACKSPACE_KEY) |
| … | |
… | |
| 428 | assert (optList[i].opt != NULL); |
424 | assert (optList[i].opt != NULL); |
| 429 | #endif |
425 | #endif |
| 430 | len += 4 + strlen (optList[i].opt) + (optList_isBool (i) ? 2: 0); |
426 | len += 4 + strlen (optList[i].opt) + (optList_isBool (i) ? 2: 0); |
| 431 | col += len; |
427 | col += len; |
| 432 | if (col > 79) |
428 | if (col > 79) |
|
|
429 | { |
| 433 | { /* assume regular width */ |
430 | /* assume regular width */ |
| 434 | rxvt_log ("\n"); |
431 | rxvt_log ("\n"); |
| 435 | col = 1 + len; |
432 | col = 1 + len; |
| 436 | } |
433 | } |
| 437 | |
434 | |
| 438 | rxvt_log (" [-%s%s", (optList_isBool (i) ? "/+" : ""), optList[i].opt); |
435 | rxvt_log (" [-%s%s", (optList_isBool (i) ? "/+" : ""), optList[i].opt); |
| … | |
… | |
| 546 | /* |
543 | /* |
| 547 | * special cases are handled in main.c:main () to allow |
544 | * special cases are handled in main.c:main () to allow |
| 548 | * X resources to set these values before we settle for |
545 | * X resources to set these values before we settle for |
| 549 | * default values |
546 | * default values |
| 550 | */ |
547 | */ |
|
|
548 | |
| 551 | if (optList[entry].doff != -1) |
549 | if (optList[entry].doff != -1) |
| 552 | { |
550 | { |
| 553 | if (flag == resval_on && !argv [i+1]) |
551 | if (flag == resval_on && i+1 == argc) |
| 554 | rxvt_fatal ("option '%s' needs an argument, aborting.\n", argv [i]); |
552 | rxvt_fatal ("option '%s' requires an argument, aborting.\n", argv [i]); |
| 555 | |
553 | |
| 556 | rs[optList[entry].doff] = flag == resval_on ? argv[++i] : resval_undef; |
554 | rs[optList[entry].doff] = flag == resval_on ? argv[++i] : resval_undef; |
| 557 | } |
555 | } |
| 558 | } |
556 | } |
| 559 | else |
557 | else |
|
|
558 | { |
| 560 | { /* boolean value */ |
559 | /* boolean value */ |
| 561 | set_option (optList[entry].index, flag == resval_on); |
560 | set_option (optList[entry].index, flag == resval_on); |
| 562 | |
561 | |
| 563 | if (optList[entry].doff != -1) |
562 | if (optList[entry].doff != -1) |
| 564 | rs[optList[entry].doff] = flag; |
563 | rs[optList[entry].doff] = flag; |
| 565 | } |
564 | } |
| 566 | } |
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 |
| 567 | else |
585 | else |
| 568 | #ifdef KEYSYM_RESOURCE |
|
|
| 569 | /* if (!strncmp (opt, "keysym.", sizeof ("keysym.") - 1)) */ |
|
|
| 570 | if (rxvt_Str_match (opt, "keysym.")) |
|
|
| 571 | { |
586 | { |
| 572 | const char *str = argv[++i]; |
|
|
| 573 | |
|
|
| 574 | if (str != NULL) |
|
|
| 575 | parse_keysym (opt + sizeof ("keysym.") - 1, str); |
|
|
| 576 | } |
|
|
| 577 | else |
|
|
| 578 | #endif |
|
|
| 579 | { |
|
|
| 580 | bad_option = 1; |
587 | bad_option = 1; |
| 581 | rxvt_warn ("\"%s\": unknown or malformed option.\n", opt); |
588 | rxvt_warn ("\"%s\": unknown or malformed option.\n", opt); |
| 582 | } |
589 | } |
| 583 | } |
590 | } |
| 584 | |
591 | |
| 585 | if (bad_option) |
592 | if (bad_option) |
| 586 | rxvt_usage (0); |
593 | rxvt_usage (0); |
| 587 | } |
594 | } |
| … | |
… | |
| 671 | char *newarg = NULL; |
678 | char *newarg = NULL; |
| 672 | char newargstr[NEWARGLIM]; |
679 | char newargstr[NEWARGLIM]; |
| 673 | |
680 | |
| 674 | if (arg == NULL) |
681 | if (arg == NULL) |
| 675 | { |
682 | { |
| 676 | if ((n = rxvt_Str_match (str, "keysym.")) == 0) |
683 | n = sizeof ("keysym.") - 1; |
|
|
684 | if (strncmp (str, "keysym.", n)) |
| 677 | return 0; |
685 | return 0; |
| 678 | |
686 | |
| 679 | str += n; /* skip `keysym.' */ |
687 | str += n; /* skip `keysym.' */ |
| 680 | if (!(pmodend = strchr (str, ':'))) |
688 | if (!(pmodend = strchr (str, ':'))) |
| 681 | return -1; |
689 | return -1; |
| … | |
… | |
| 754 | strncpy (newargstr, arg, NEWARGLIM - 1); |
762 | strncpy (newargstr, arg, NEWARGLIM - 1); |
| 755 | newargstr[NEWARGLIM - 1] = '\0'; |
763 | newargstr[NEWARGLIM - 1] = '\0'; |
| 756 | newarg = newargstr; |
764 | newarg = newargstr; |
| 757 | } |
765 | } |
| 758 | |
766 | |
| 759 | rxvt_Str_trim (newarg); |
767 | if (*newarg == '\0') |
| 760 | if (*newarg == '\0' || (n = rxvt_Str_escaped (newarg)) == 0) |
|
|
| 761 | return -1; |
768 | return -1; |
| 762 | |
769 | |
| 763 | keyboard->register_user_translation (sym, state, newarg); |
770 | keyboard->register_user_translation (sym, state, newarg); |
| 764 | return 1; |
771 | return 1; |
| 765 | } |
772 | } |
| 766 | |
773 | |
| 767 | # endif /* KEYSYM_RESOURCE */ |
774 | # endif /* KEYSYM_RESOURCE */ |
| 768 | #endif /* NO_RESOURCES */ |
775 | #endif /* NO_RESOURCES */ |
| 769 | |
776 | |
| 770 | static char * |
777 | static char * |
| 771 | get_res (XrmDatabase database, const char *program, const char *option) |
778 | get_res (XrmDatabase database, const char *program, const char *option) |
| 772 | { |
779 | { |
| 773 | char resource[512]; |
780 | char resource[512]; |
| … | |
… | |
| 805 | |
812 | |
| 806 | void |
813 | void |
| 807 | rxvt_term::extract_resources () |
814 | rxvt_term::extract_resources () |
| 808 | { |
815 | { |
| 809 | #ifndef NO_RESOURCES |
816 | #ifndef NO_RESOURCES |
|
|
817 | XrmDatabase database = XrmGetDatabase (dpy); |
|
|
818 | XrmMergeDatabases (option_db, &database); |
|
|
819 | option_db = NULL; |
| 810 | /* |
820 | /* |
| 811 | * Query resources for options that affect us |
821 | * Query resources for options that affect us |
| 812 | */ |
822 | */ |
| 813 | for (int entry = 0; entry < optList_size; entry++) |
823 | for (int entry = 0; entry < optList_size; entry++) |
| 814 | { |
824 | { |
| … | |
… | |
| 843 | |
853 | |
| 844 | /* |
854 | /* |
| 845 | * [R5 or later]: enumerate the resource database |
855 | * [R5 or later]: enumerate the resource database |
| 846 | */ |
856 | */ |
| 847 | # ifdef KEYSYM_RESOURCE |
857 | # ifdef KEYSYM_RESOURCE |
| 848 | XrmDatabase database = XrmGetDatabase (dpy); |
|
|
| 849 | XrmName name_prefix[3]; |
858 | XrmName name_prefix[3]; |
| 850 | XrmClass class_prefix[3]; |
859 | XrmClass class_prefix[3]; |
| 851 | |
860 | |
| 852 | name_prefix[0] = XrmStringToName (rs[Rs_name]); |
861 | name_prefix[0] = XrmStringToName (rs[Rs_name]); |
| 853 | name_prefix[1] = XrmStringToName ("keysym"); |
862 | name_prefix[1] = XrmStringToName ("keysym"); |
| … | |
… | |
| 867 | XrmEnumerateDatabase (database, name_prefix, class_prefix, |
876 | XrmEnumerateDatabase (database, name_prefix, class_prefix, |
| 868 | XrmEnumOneLevel, rxvt_define_key, NULL); |
877 | XrmEnumOneLevel, rxvt_define_key, NULL); |
| 869 | # endif |
878 | # endif |
| 870 | # endif |
879 | # endif |
| 871 | |
880 | |
| 872 | #endif /* NO_RESOURCES */ |
881 | #endif /* NO_RESOURCES */ |
| 873 | } |
882 | } |
| 874 | |
883 | |
| 875 | /*----------------------- end-of-file (C source) -----------------------*/ |
884 | /*----------------------- end-of-file (C source) -----------------------*/ |
