… | |
… | |
4 | * |
4 | * |
5 | * All portions of code are copyright by their respective author/s. |
5 | * All portions of code are copyright by their respective author/s. |
6 | * Copyright (c) 1994 Robert Nation <nation@rocket.sanders.lockheed.com> |
6 | * Copyright (c) 1994 Robert Nation <nation@rocket.sanders.lockheed.com> |
7 | * - original version |
7 | * - original version |
8 | * Copyright (c) 1997,1998 mj olesen <olesen@me.queensu.ca> |
8 | * Copyright (c) 1997,1998 mj olesen <olesen@me.queensu.ca> |
9 | * Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com> |
9 | * Copyright (c) 2003-2006 Marc Lehmann <schmorp@schmorp.de> |
10 | * Copyright (c) 2007 Emanuele Giaquinta <e.giaquinta@glauco.it> |
10 | * Copyright (c) 2007 Emanuele Giaquinta <e.giaquinta@glauco.it> |
11 | * |
11 | * |
12 | * This program is free software; you can redistribute it and/or modify |
12 | * This program is free software; you can redistribute it and/or modify |
13 | * it under the terms of the GNU General Public License as published by |
13 | * it under the terms of the GNU General Public License as published by |
14 | * the Free Software Foundation; either version 2 of the License, or |
14 | * the Free Software Foundation; either version 2 of the License, or |
… | |
… | |
34 | |
34 | |
35 | /* place holders used for parsing command-line options */ |
35 | /* place holders used for parsing command-line options */ |
36 | #define Optflag_Reverse 1 |
36 | #define Optflag_Reverse 1 |
37 | #define Optflag_Boolean 2 |
37 | #define Optflag_Boolean 2 |
38 | #define Optflag_Switch 4 |
38 | #define Optflag_Switch 4 |
|
|
39 | #define Optflag_Info 8 |
39 | |
40 | |
40 | /* monolithic option/resource structure: */ |
41 | /* monolithic option/resource structure: */ |
41 | /* |
42 | /* |
42 | * `string' options MUST have a usage argument |
43 | * `string' options MUST have a usage argument |
43 | * `switch' and `boolean' options have no argument |
44 | * `switch' and `boolean' options have no argument |
44 | * if there's no desc (ription), it won't appear in rxvt_usage () |
45 | * if there's no desc (ription), it won't appear in rxvt_usage () |
45 | */ |
46 | */ |
46 | |
47 | |
47 | /* INFO () - descriptive information only */ |
48 | /* INFO () - descriptive information only */ |
48 | #define INFO(opt, arg, desc) \ |
49 | #define INFO(opt, arg, desc) \ |
49 | {0, 0, -1, NULL, (opt), (arg), (desc)} |
50 | {0, Optflag_Info, -1, NULL, (opt), (arg), (desc)} |
50 | |
51 | |
51 | /* STRG () - command-line option, with/without resource */ |
52 | /* STRG () - command-line option, with/without resource */ |
52 | #define STRG(rsp, kw, opt, arg, desc) \ |
53 | #define STRG(rsp, kw, opt, arg, desc) \ |
53 | {0, 0, (rsp), (kw), (opt), (arg), (desc)} |
54 | {0, 0, (rsp), (kw), (opt), (arg), (desc)} |
54 | |
55 | |
… | |
… | |
69 | (optList[i].flag == 0) |
70 | (optList[i].flag == 0) |
70 | #define optList_isBool(i) \ |
71 | #define optList_isBool(i) \ |
71 | (optList[i].flag & Optflag_Boolean) |
72 | (optList[i].flag & Optflag_Boolean) |
72 | #define optList_isReverse(i) \ |
73 | #define optList_isReverse(i) \ |
73 | (optList[i].flag & Optflag_Reverse) |
74 | (optList[i].flag & Optflag_Reverse) |
74 | #define optList_size \ |
75 | #define optList_isInfo(i) \ |
75 | (sizeof (optList) / sizeof (optList[0])) |
76 | (optList[i].flag & Optflag_Info) |
76 | |
77 | |
77 | static const struct |
78 | static const struct |
78 | { |
79 | { |
79 | const uint8_t index; /* Option index */ |
80 | const uint8_t index; /* Option index */ |
80 | const uint8_t flag; /* Option flag */ |
81 | const uint8_t flag; /* Option flag */ |
… | |
… | |
91 | STRG (Rs_geometry, NULL, "g", NULL, NULL), /* short form */ |
92 | STRG (Rs_geometry, NULL, "g", NULL, NULL), /* short form */ |
92 | STRG (Rs_geometry, "geometry", "geometry", "geometry", "size (in characters) and position"), |
93 | STRG (Rs_geometry, "geometry", "geometry", "geometry", "size (in characters) and position"), |
93 | SWCH ("C", Opt_console, 0, "intercept console messages"), |
94 | SWCH ("C", Opt_console, 0, "intercept console messages"), |
94 | SWCH ("iconic", Opt_iconic, 0, "start iconic"), |
95 | SWCH ("iconic", Opt_iconic, 0, "start iconic"), |
95 | SWCH ("ic", Opt_iconic, 0, NULL), /* short form */ |
96 | SWCH ("ic", Opt_iconic, 0, NULL), /* short form */ |
|
|
97 | STRG (Rs_chdir, "chdir", "cd", "string", "start shell in this directory"), |
96 | BOOL (Rs_reverseVideo, "reverseVideo", "rv", Opt_reverseVideo, 0, "reverse video"), |
98 | BOOL (Rs_reverseVideo, "reverseVideo", "rv", Opt_reverseVideo, 0, "reverse video"), |
97 | BOOL (Rs_loginShell, "loginShell", "ls", Opt_loginShell, 0, "login shell"), |
99 | BOOL (Rs_loginShell, "loginShell", "ls", Opt_loginShell, 0, "login shell"), |
98 | BOOL (Rs_jumpScroll, "jumpScroll", "j", Opt_jumpScroll, 0, "jump scrolling"), |
100 | BOOL (Rs_jumpScroll, "jumpScroll", "j", Opt_jumpScroll, 0, "jump scrolling"), |
99 | BOOL (Rs_skipScroll, "skipScroll", "ss", Opt_skipScroll, 0, "skip scrolling"), |
101 | BOOL (Rs_skipScroll, "skipScroll", "ss", Opt_skipScroll, 0, "skip scrolling"), |
100 | BOOL (Rs_pastableTabs, "pastableTabs", "ptab", Opt_pastableTabs, 0, "tab characters are pastable"), |
102 | BOOL (Rs_pastableTabs, "pastableTabs", "ptab", Opt_pastableTabs, 0, "tab characters are pastable"), |
… | |
… | |
111 | #if ENABLE_TRANSPARENCY |
113 | #if ENABLE_TRANSPARENCY |
112 | BOOL (Rs_transparent, "inheritPixmap", "ip", Opt_transparent, 0, "inherit parent pixmap"), |
114 | BOOL (Rs_transparent, "inheritPixmap", "ip", Opt_transparent, 0, "inherit parent pixmap"), |
113 | BOOL (Rs_transparent, "transparent", "tr", Opt_transparent, 0, "inherit parent pixmap"), |
115 | BOOL (Rs_transparent, "transparent", "tr", Opt_transparent, 0, "inherit parent pixmap"), |
114 | STRG (Rs_color + Color_tint, "tintColor", "tint", "color", "tint color"), |
116 | STRG (Rs_color + Color_tint, "tintColor", "tint", "color", "tint color"), |
115 | STRG (Rs_shade, "shading", "sh", "number", "shade background by number %."), |
117 | STRG (Rs_shade, "shading", "sh", "number", "shade background by number %."), |
|
|
118 | STRG (Rs_blurradius, "blurRadius", "blr", "HxV", "gaussian blur radii to apply to the root background"), |
116 | #endif |
119 | #endif |
117 | #if OFF_FOCUS_FADING |
120 | #if OFF_FOCUS_FADING |
118 | STRG (Rs_fade, "fading", "fade", "number", "fade colors by number % when losing focus"), |
121 | 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"), |
122 | STRG (Rs_color + Color_fade, "fadeColor", "fadecolor", "color", "target color for off-focus fading"), |
120 | #endif |
123 | #endif |
… | |
… | |
176 | #ifdef RXVT_SCROLLBAR |
179 | #ifdef RXVT_SCROLLBAR |
177 | RSTRG (Rs_color + Color_trough, "troughColor", "color"), |
180 | RSTRG (Rs_color + Color_trough, "troughColor", "color"), |
178 | #endif |
181 | #endif |
179 | #ifdef OPTION_HC |
182 | #ifdef OPTION_HC |
180 | STRG (Rs_color + Color_HC, "highlightColor", "hc", "color", "highlight color"), |
183 | STRG (Rs_color + Color_HC, "highlightColor", "hc", "color", "highlight color"), |
|
|
184 | RSTRG (Rs_color + Color_HTC, "highlightTextColor", "color"), |
181 | #endif |
185 | #endif |
182 | #ifndef NO_CURSORCOLOR |
186 | #ifndef NO_CURSORCOLOR |
183 | STRG (Rs_color + Color_cursor, "cursorColor", "cr", "color", "cursor color"), |
187 | STRG (Rs_color + Color_cursor, "cursorColor", "cr", "color", "cursor color"), |
184 | /* command-line option = resource name */ |
188 | /* command-line option = resource name */ |
185 | RSTRG (Rs_color + Color_cursor2, "cursorColor2", "color"), |
189 | RSTRG (Rs_color + Color_cursor2, "cursorColor2", "color"), |
… | |
… | |
188 | STRG (Rs_color + Color_pointer_bg, "pointerColor2", "pr2", "color", "pointer bg color"), |
192 | STRG (Rs_color + Color_pointer_bg, "pointerColor2", "pr2", "color", "pointer bg color"), |
189 | STRG (Rs_color + Color_border, "borderColor", "bd", "color", "border color"), |
193 | STRG (Rs_color + Color_border, "borderColor", "bd", "color", "border color"), |
190 | #ifdef BG_IMAGE_FROM_FILE |
194 | #ifdef BG_IMAGE_FROM_FILE |
191 | RSTRG (Rs_path, "path", "search path"), |
195 | RSTRG (Rs_path, "path", "search path"), |
192 | STRG (Rs_backgroundPixmap, "backgroundPixmap", "pixmap", "file[;geom]", "background pixmap"), |
196 | STRG (Rs_backgroundPixmap, "backgroundPixmap", "pixmap", "file[;geom]", "background pixmap"), |
|
|
197 | # if ENABLE_EWMH |
|
|
198 | STRG (Rs_iconfile, "iconFile", "icon", "file", "path to application icon image"), |
|
|
199 | # endif |
193 | #endif |
200 | #endif |
194 | /* fonts: command-line option = resource name */ |
201 | /* fonts: command-line option = resource name */ |
195 | STRG (Rs_font, "font", "fn", "fontname", "normal text font"), |
202 | STRG (Rs_font, "font", "fn", "fontname", "normal text font"), |
196 | #if ENABLE_STYLES |
203 | #if ENABLE_STYLES |
197 | STRG (Rs_boldFont, "boldFont", "fb", "fontname", "bold font"), |
204 | STRG (Rs_boldFont, "boldFont", "fb", "fontname", "bold font"), |
… | |
… | |
226 | STRG (Rs_ext_bwidth, NULL, "bw", NULL, NULL), |
233 | STRG (Rs_ext_bwidth, NULL, "bw", NULL, NULL), |
227 | STRG (Rs_ext_bwidth, NULL, "borderwidth", NULL, NULL), |
234 | STRG (Rs_ext_bwidth, NULL, "borderwidth", NULL, NULL), |
228 | STRG (Rs_int_bwidth, "internalBorder", "b", "number", "internal border in pixels"), |
235 | STRG (Rs_int_bwidth, "internalBorder", "b", "number", "internal border in pixels"), |
229 | BOOL (Rs_borderLess, "borderLess", "bl", Opt_borderLess, 0, "borderless window"), |
236 | BOOL (Rs_borderLess, "borderLess", "bl", Opt_borderLess, 0, "borderless window"), |
230 | STRG (Rs_lineSpace, "lineSpace", "lsp", "number", "number of extra pixels between rows"), |
237 | STRG (Rs_lineSpace, "lineSpace", "lsp", "number", "number of extra pixels between rows"), |
|
|
238 | STRG (Rs_letterSpace, "letterSpace", "letsp", "number", "letter spacing adjustment"), |
231 | #endif |
239 | #endif |
232 | #ifdef BUILTIN_GLYPHS |
240 | #ifdef BUILTIN_GLYPHS |
233 | BOOL (Rs_skipBuiltinGlyphs, "skipBuiltinGlyphs", "sbg", Opt_skipBuiltinGlyphs, 0, "do not use internal glyphs"), |
241 | BOOL (Rs_skipBuiltinGlyphs, "skipBuiltinGlyphs", "sbg", Opt_skipBuiltinGlyphs, 0, "do not use internal glyphs"), |
234 | #endif |
242 | #endif |
235 | #ifdef POINTER_BLANK |
243 | #ifdef POINTER_BLANK |
… | |
… | |
243 | #endif |
251 | #endif |
244 | #ifdef PRINTPIPE |
252 | #ifdef PRINTPIPE |
245 | RSTRG (Rs_print_pipe, "print-pipe", "string"), |
253 | RSTRG (Rs_print_pipe, "print-pipe", "string"), |
246 | #endif |
254 | #endif |
247 | STRG (Rs_modifier, "modifier", "mod", "modifier", "meta modifier = alt|meta|hyper|super|mod1|...|mod5"), |
255 | STRG (Rs_modifier, "modifier", "mod", "modifier", "meta modifier = alt|meta|hyper|super|mod1|...|mod5"), |
248 | #ifdef CUTCHAR_RESOURCE |
|
|
249 | RSTRG (Rs_cutchars, "cutchars", "string"), |
256 | RSTRG (Rs_cutchars, "cutchars", "string"), |
250 | #endif /* CUTCHAR_RESOURCE */ |
|
|
251 | RSTRG (Rs_answerbackstring, "answerbackString", "string"), |
257 | RSTRG (Rs_answerbackstring, "answerbackString", "string"), |
252 | #ifndef NO_SECONDARY_SCREEN |
258 | #ifndef NO_SECONDARY_SCREEN |
253 | BOOL (Rs_secondaryScreen, "secondaryScreen", "ssc", Opt_secondaryScreen, 0, "enable secondary screen"), |
259 | BOOL (Rs_secondaryScreen, "secondaryScreen", "ssc", Opt_secondaryScreen, 0, "enable secondary screen"), |
254 | BOOL (Rs_secondaryScroll, "secondaryScroll", "ssr", Opt_secondaryScroll, 0, "enable secondary screen scroll"), |
260 | BOOL (Rs_secondaryScroll, "secondaryScroll", "ssr", Opt_secondaryScroll, 0, "enable secondary screen scroll"), |
255 | #endif |
261 | #endif |
… | |
… | |
258 | RSTRG (Rs_perl_eval, "perl-eval", "perl-eval"), // "string", "code to be evaluated after all extensions have been loaded"),TODO |
264 | RSTRG (Rs_perl_eval, "perl-eval", "perl-eval"), // "string", "code to be evaluated after all extensions have been loaded"),TODO |
259 | RSTRG (Rs_perl_ext_1, "perl-ext-common", "string"), //, "colon-separated list of perl extensions to enable"),TODO |
265 | RSTRG (Rs_perl_ext_1, "perl-ext-common", "string"), //, "colon-separated list of perl extensions to enable"),TODO |
260 | STRG (Rs_perl_ext_2, "perl-ext", "pe", "string", "colon-separated list of perl extensions to enable for this instance"), |
266 | STRG (Rs_perl_ext_2, "perl-ext", "pe", "string", "colon-separated list of perl extensions to enable for this instance"), |
261 | #endif |
267 | #endif |
262 | #if ISO_14755 |
268 | #if ISO_14755 |
|
|
269 | BOOL (Rs_iso14755, "iso14755", NULL, Opt_iso14755, 0, NULL), |
263 | BOOL (Rs_iso14755_52, "iso14755_52", NULL, Opt_iso14755_52, 0, NULL), |
270 | BOOL (Rs_iso14755_52, "iso14755_52", NULL, Opt_iso14755_52, 0, NULL), |
264 | #endif |
271 | #endif |
265 | #ifdef HAVE_AFTERIMAGE |
272 | #ifdef HAVE_AFTERIMAGE |
266 | STRG (Rs_blendtype, "blendType", "blt", "string", "background image blending type - alpha, tint, etc..."), |
273 | STRG (Rs_blendtype, "blendType", "blt", "string", "background image blending type - alpha, tint, etc..."), |
267 | STRG (Rs_blurradius, "blurRadius", "blr", "HxV", "Gaussian Blur radii to apply to the root background"), |
|
|
268 | #endif |
274 | #endif |
269 | INFO ("e", "command arg ...", "command to execute") |
275 | INFO ("e", "command arg ...", "command to execute") |
270 | }; |
276 | }; |
271 | |
277 | |
272 | #undef INFO |
278 | #undef INFO |
… | |
… | |
323 | "tint," |
329 | "tint," |
324 | #endif |
330 | #endif |
325 | #if HAVE_AFTERIMAGE |
331 | #if HAVE_AFTERIMAGE |
326 | "afterimage," |
332 | "afterimage," |
327 | #endif |
333 | #endif |
|
|
334 | #if HAVE_PIXBUF |
|
|
335 | "pixbuf," |
|
|
336 | #endif |
328 | #if defined(USE_XIM) |
337 | #if defined(USE_XIM) |
329 | "XIM," |
338 | "XIM," |
330 | #endif |
339 | #endif |
331 | #if defined(NO_BACKSPACE_KEY) |
340 | #if defined(NO_BACKSPACE_KEY) |
332 | "no_backspace," |
341 | "no_backspace," |
… | |
… | |
391 | switch (type) |
400 | switch (type) |
392 | { |
401 | { |
393 | case 0: /* brief listing */ |
402 | case 0: /* brief listing */ |
394 | rxvt_log (" [-help] [--help]\n"); |
403 | rxvt_log (" [-help] [--help]\n"); |
395 | |
404 | |
396 | for (col = 1, i = 0; i < optList_size; i++) |
405 | for (col = 1, i = 0; i < ecb_array_length (optList); i++) |
397 | if (optList[i].desc != NULL) |
406 | if (optList[i].desc != NULL) |
398 | { |
407 | { |
399 | int len = 0; |
408 | int len = 0; |
400 | |
409 | |
401 | if (optList[i].arg) |
410 | if (optList[i].arg) |
402 | len = strlen (optList[i].arg) + 1; |
411 | len = strlen (optList[i].arg) + 1; |
403 | #ifdef DEBUG_STRICT |
|
|
404 | assert (optList[i].opt != NULL); |
412 | assert (optList[i].opt != NULL); |
405 | #endif |
|
|
406 | len += 4 + strlen (optList[i].opt) + (optList_isBool (i) ? 2: 0); |
413 | len += 4 + strlen (optList[i].opt) + (optList_isBool (i) ? 2 : 0); |
407 | col += len; |
414 | col += len; |
408 | if (col > 79) |
415 | if (col > 79) |
409 | { |
416 | { |
410 | /* assume regular width */ |
417 | /* assume regular width */ |
411 | rxvt_log ("\n"); |
418 | rxvt_log ("\n"); |
… | |
… | |
421 | break; |
428 | break; |
422 | |
429 | |
423 | case 1: /* full command-line listing */ |
430 | case 1: /* full command-line listing */ |
424 | rxvt_log (" [options] [-e command args]\n\nwhere options include:\n"); |
431 | rxvt_log (" [options] [-e command args]\n\nwhere options include:\n"); |
425 | |
432 | |
426 | for (i = 0; i < optList_size; i++) |
433 | for (i = 0; i < ecb_array_length (optList); i++) |
427 | if (optList[i].desc != NULL) |
434 | if (optList[i].desc != NULL) |
428 | { |
435 | { |
429 | #ifdef DEBUG_STRICT |
|
|
430 | assert (optList[i].opt != NULL); |
436 | assert (optList[i].opt != NULL); |
431 | #endif |
|
|
432 | rxvt_log (" %s%s %-*s%s%s\n", |
437 | rxvt_log (" %s%s %-*s%s%s\n", |
433 | (optList_isBool (i) ? "-/+" : "-"), optList[i].opt, |
438 | (optList_isBool (i) ? "-/+" : "-"), optList[i].opt, |
434 | (INDENT - strlen (optList[i].opt) |
439 | (INDENT - strlen (optList[i].opt) |
435 | + (optList_isBool (i) ? 0 : 2)), |
440 | + (optList_isBool (i) ? 0 : 2)), |
436 | (optList[i].arg ? optList[i].arg : ""), |
441 | (optList[i].arg ? optList[i].arg : ""), |
… | |
… | |
442 | |
447 | |
443 | case 2: /* full resource listing */ |
448 | case 2: /* full resource listing */ |
444 | rxvt_log (" [options] [-e command args]\n\n" |
449 | rxvt_log (" [options] [-e command args]\n\n" |
445 | "where resources (long-options) include:\n"); |
450 | "where resources (long-options) include:\n"); |
446 | |
451 | |
447 | for (i = 0; i < optList_size; i++) |
452 | for (i = 0; i < ecb_array_length (optList); i++) |
448 | if (optList[i].kw != NULL) |
453 | if (optList[i].kw != NULL) |
449 | rxvt_log (" %s: %*s%s\n", |
454 | rxvt_log (" %s: %*s%s\n", |
450 | optList[i].kw, |
455 | optList[i].kw, |
451 | (INDENT - strlen (optList[i].kw)), "", /* XXX */ |
456 | (INDENT - strlen (optList[i].kw)), "", /* XXX */ |
452 | (optList_isBool (i) ? "boolean" : optList[i].arg)); |
457 | (optList_isBool (i) ? "boolean" : optList[i].arg)); |
… | |
… | |
459 | break; |
464 | break; |
460 | } |
465 | } |
461 | |
466 | |
462 | rxvt_log ("\n\n"); |
467 | rxvt_log ("\n\n"); |
463 | rxvt_exit_failure (); |
468 | rxvt_exit_failure (); |
464 | /* NOTREACHED */ |
|
|
465 | } |
469 | } |
466 | |
470 | |
467 | /*}}} */ |
471 | /*}}} */ |
468 | |
472 | |
469 | /*{{{ get command-line options before getting resources */ |
473 | /*{{{ get command-line options before getting resources */ |
470 | void |
474 | const char ** |
471 | rxvt_term::get_options (int argc, const char *const *argv) |
475 | rxvt_term::get_options (int argc, const char *const *argv) |
472 | { |
476 | { |
473 | int i, bad_option = 0; |
477 | int i, bad_option = 0; |
474 | |
478 | |
475 | for (i = 1; i < argc; i++) |
479 | for (i = 1; i < argc; i++) |
… | |
… | |
506 | |
510 | |
507 | if (!strcmp (opt, "h")) |
511 | if (!strcmp (opt, "h")) |
508 | rxvt_usage (0); |
512 | rxvt_usage (0); |
509 | |
513 | |
510 | /* feature: always try to match long-options */ |
514 | /* feature: always try to match long-options */ |
511 | for (entry = 0; entry < optList_size; entry++) |
515 | for (entry = 0; entry < ecb_array_length (optList); entry++) |
512 | if ((optList[entry].kw && !strcmp (opt, optList[entry].kw)) |
516 | if ((optList[entry].kw && !strcmp (opt, optList[entry].kw)) |
513 | || (!longopt |
517 | || (!longopt |
514 | && optList[entry].opt && !strcmp (opt, optList[entry].opt))) |
518 | && optList[entry].opt && !strcmp (opt, optList[entry].opt))) |
515 | break; |
519 | break; |
516 | |
520 | |
517 | if (entry < optList_size) |
521 | if (entry < ecb_array_length (optList) |
|
|
522 | && !optList_isInfo (entry)) |
518 | { |
523 | { |
519 | if (optList_isReverse (entry)) |
524 | if (optList_isReverse (entry)) |
520 | flag = !flag; |
525 | flag = !flag; |
521 | |
526 | |
522 | if (optList_isString (entry)) |
527 | if (optList_isString (entry)) |
523 | { |
528 | { |
524 | /* |
529 | /* |
525 | * special cases are handled in main.c:main () to allow |
530 | * special cases are handled in init_resources () to allow |
526 | * X resources to set these values before we settle for |
531 | * X resources to set these values before we settle for |
527 | * default values |
532 | * default values |
528 | */ |
533 | */ |
529 | |
534 | |
530 | if (optList[entry].doff != -1) |
535 | if (optList[entry].doff != -1) |
… | |
… | |
554 | #ifdef KEYSYM_RESOURCE |
559 | #ifdef KEYSYM_RESOURCE |
555 | else if (!strncmp (opt, "keysym.", sizeof ("keysym.") - 1)) |
560 | else if (!strncmp (opt, "keysym.", sizeof ("keysym.") - 1)) |
556 | { |
561 | { |
557 | if (i+1 < argc) |
562 | if (i+1 < argc) |
558 | { |
563 | { |
559 | char *res = (char *)malloc (strlen (opt) + strlen (argv[++i]) + 6); |
564 | char *res = rxvt_temp_buf<char> (strlen (opt) + strlen (argv[++i]) + 6); |
560 | sprintf (res, "*.%s: %s\n", opt, argv[i]); |
565 | sprintf (res, "*.%s: %s\n", opt, argv[i]); |
561 | XrmPutLineResource (&option_db, res); |
566 | XrmPutLineResource (&option_db, res); |
562 | free (res); |
|
|
563 | } |
567 | } |
564 | } |
568 | } |
565 | #endif |
569 | #endif |
|
|
570 | else if (!strcmp (opt, "e")) |
|
|
571 | { |
|
|
572 | if (i+1 == argc) |
|
|
573 | rxvt_fatal ("option '-e' requires an argument, aborting.\n"); |
|
|
574 | |
|
|
575 | return (const char **)argv + i + 1; |
|
|
576 | } |
566 | else |
577 | else |
567 | { |
578 | { |
568 | bad_option = 1; |
579 | bad_option = 1; |
569 | rxvt_warn ("\"%s\": unknown or malformed option.\n", opt); |
580 | rxvt_warn ("\"%s\": unknown or malformed option.\n", opt); |
570 | } |
581 | } |
571 | } |
582 | } |
572 | |
583 | |
573 | if (bad_option) |
584 | if (bad_option) |
574 | rxvt_usage (0); |
585 | rxvt_usage (0); |
|
|
586 | |
|
|
587 | return 0; |
575 | } |
588 | } |
576 | |
589 | |
577 | /*}}} */ |
590 | /*}}} */ |
578 | |
591 | |
579 | #ifndef NO_RESOURCES |
592 | #ifndef NO_RESOURCES |
… | |
… | |
584 | * Define key from XrmEnumerateDatabase. |
597 | * Define key from XrmEnumerateDatabase. |
585 | * quarks will be something like |
598 | * quarks will be something like |
586 | * "rxvt" "keysym" "0xFF01" |
599 | * "rxvt" "keysym" "0xFF01" |
587 | * value will be a string |
600 | * value will be a string |
588 | */ |
601 | */ |
589 | /* ARGSUSED */ |
602 | static int |
590 | int |
|
|
591 | rxvt_define_key (XrmDatabase *database UNUSED, |
603 | rxvt_define_key (XrmDatabase *database ecb_unused, |
592 | XrmBindingList bindings UNUSED, |
604 | XrmBindingList bindings ecb_unused, |
593 | XrmQuarkList quarks, |
605 | XrmQuarkList quarks, |
594 | XrmRepresentation *type UNUSED, |
606 | XrmRepresentation *type ecb_unused, |
595 | XrmValue *value, |
607 | XrmValue *value, |
596 | XPointer closure UNUSED) |
608 | XPointer closure ecb_unused) |
597 | { |
609 | { |
598 | int last; |
610 | int last; |
599 | |
611 | |
600 | for (last = 0; quarks[last] != NULLQUARK; last++) /* look for last quark in list */ |
612 | for (last = 0; quarks[last] != NULLQUARK; last++) /* look for last quark in list */ |
601 | ; |
613 | ; |
… | |
… | |
664 | // parse modifiers |
676 | // parse modifiers |
665 | while (str < key) |
677 | while (str < key) |
666 | { |
678 | { |
667 | unsigned int i; |
679 | unsigned int i; |
668 | |
680 | |
669 | for (i=0; i < sizeof (keysym_vocabulary) / sizeof (keysym_vocabulary_t); ++i) |
681 | for (i = 0; i < ecb_array_length (keysym_vocabulary); ++i) |
670 | { |
682 | { |
671 | if (strncmp (str, keysym_vocabulary [i].name, keysym_vocabulary [i].len) == 0) |
683 | if (strncmp (str, keysym_vocabulary [i].name, keysym_vocabulary [i].len) == 0) |
672 | { |
684 | { |
673 | state |= keysym_vocabulary[i].value; |
685 | state |= keysym_vocabulary[i].value; |
674 | str += keysym_vocabulary[i].len; |
686 | str += keysym_vocabulary[i].len; |
675 | break; |
687 | break; |
676 | } |
688 | } |
677 | } |
689 | } |
678 | |
690 | |
679 | if (i >= sizeof (keysym_vocabulary) / sizeof (keysym_vocabulary_t)) |
691 | if (i >= ecb_array_length (keysym_vocabulary)) |
680 | return -1; |
692 | return -1; |
681 | |
693 | |
682 | if (*str == '-') |
694 | if (*str == '-') |
683 | ++str; |
695 | ++str; |
684 | } |
696 | } |
… | |
… | |
689 | // fallback on hexadecimal parsing |
701 | // fallback on hexadecimal parsing |
690 | char *end; |
702 | char *end; |
691 | sym = strtol (str, &end, 16); |
703 | sym = strtol (str, &end, 16); |
692 | if (*end) |
704 | if (*end) |
693 | return -1; |
705 | return -1; |
694 | } |
706 | } |
695 | |
707 | |
|
|
708 | wchar_t *ws = rxvt_mbstowcs (arg); |
|
|
709 | if (!HOOK_INVOKE ((this, HOOK_REGISTER_COMMAND, DT_INT, sym, DT_INT, state, DT_WCS_LEN, ws, wcslen (ws), DT_END))) |
696 | keyboard->register_user_translation (sym, state, arg); |
710 | keyboard->register_user_translation (sym, state, ws); |
|
|
711 | free (ws); |
697 | return 1; |
712 | return 1; |
698 | } |
713 | } |
699 | |
714 | |
700 | # endif /* KEYSYM_RESOURCE */ |
715 | # endif /* KEYSYM_RESOURCE */ |
701 | #endif /* NO_RESOURCES */ |
716 | #endif /* NO_RESOURCES */ |
… | |
… | |
744 | XrmMergeDatabases (option_db, &database); |
759 | XrmMergeDatabases (option_db, &database); |
745 | option_db = NULL; |
760 | option_db = NULL; |
746 | /* |
761 | /* |
747 | * Query resources for options that affect us |
762 | * Query resources for options that affect us |
748 | */ |
763 | */ |
749 | for (int entry = 0; entry < optList_size; entry++) |
764 | for (int entry = 0; entry < ecb_array_length (optList); entry++) |
750 | { |
765 | { |
751 | int s; |
766 | int s; |
752 | const char *kw = optList[entry].kw; |
767 | const char *kw = optList[entry].kw; |
753 | |
768 | |
754 | if (kw == NULL || rs[optList[entry].doff] != NULL) |
769 | if (kw == NULL || rs[optList[entry].doff] != NULL) |
… | |
… | |
774 | |
789 | |
775 | set_option (optList[entry].index, s); |
790 | set_option (optList[entry].index, s); |
776 | } |
791 | } |
777 | } |
792 | } |
778 | } |
793 | } |
|
|
794 | #endif /* NO_RESOURCES */ |
|
|
795 | } |
779 | |
796 | |
|
|
797 | void |
|
|
798 | rxvt_term::extract_keysym_resources () |
|
|
799 | { |
|
|
800 | #ifndef NO_RESOURCES |
780 | /* |
801 | /* |
781 | * [R5 or later]: enumerate the resource database |
802 | * [R5 or later]: enumerate the resource database |
782 | */ |
803 | */ |
783 | # ifdef KEYSYM_RESOURCE |
804 | # ifdef KEYSYM_RESOURCE |
|
|
805 | XrmDatabase database = XrmGetDatabase (dpy); |
784 | XrmName name_prefix[3]; |
806 | XrmName name_prefix[3]; |
785 | XrmClass class_prefix[3]; |
807 | XrmClass class_prefix[3]; |
786 | |
808 | |
787 | name_prefix[0] = XrmStringToName (rs[Rs_name]); |
809 | name_prefix[0] = XrmStringToName (rs[Rs_name]); |
788 | name_prefix[1] = XrmStringToName ("keysym"); |
810 | name_prefix[1] = XrmStringToName ("keysym"); |
… | |
… | |
792 | class_prefix[2] = NULLQUARK; |
814 | class_prefix[2] = NULLQUARK; |
793 | /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */ |
815 | /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */ |
794 | XrmEnumerateDatabase (database, name_prefix, class_prefix, |
816 | XrmEnumerateDatabase (database, name_prefix, class_prefix, |
795 | XrmEnumOneLevel, rxvt_define_key, NULL); |
817 | XrmEnumOneLevel, rxvt_define_key, NULL); |
796 | # ifdef RESFALLBACK |
818 | # ifdef RESFALLBACK |
797 | name_prefix[0] = XrmStringToName (RESFALLBACK); |
|
|
798 | name_prefix[1] = XrmStringToName ("keysym"); |
|
|
799 | class_prefix[0] = XrmStringToName (RESFALLBACK); |
819 | name_prefix[0] = class_prefix[0] = XrmStringToName (RESFALLBACK); |
800 | class_prefix[1] = XrmStringToName ("Keysym"); |
|
|
801 | /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */ |
820 | /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */ |
802 | XrmEnumerateDatabase (database, name_prefix, class_prefix, |
821 | XrmEnumerateDatabase (database, name_prefix, class_prefix, |
803 | XrmEnumOneLevel, rxvt_define_key, NULL); |
822 | XrmEnumOneLevel, rxvt_define_key, NULL); |
804 | # endif |
823 | # endif |
805 | # endif |
824 | # endif |