… | |
… | |
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)} |
|
|
51 | |
|
|
52 | #define RINFO(kw, arg) \ |
|
|
53 | {0, Optflag_Info, -1, (kw), NULL, (arg), NULL} |
50 | |
54 | |
51 | /* STRG () - command-line option, with/without resource */ |
55 | /* STRG () - command-line option, with/without resource */ |
52 | #define STRG(rsp, kw, opt, arg, desc) \ |
56 | #define STRG(rsp, kw, opt, arg, desc) \ |
53 | {0, 0, (rsp), (kw), (opt), (arg), (desc)} |
57 | {0, 0, (rsp), (kw), (opt), (arg), (desc)} |
54 | |
58 | |
… | |
… | |
69 | (optList[i].flag == 0) |
73 | (optList[i].flag == 0) |
70 | #define optList_isBool(i) \ |
74 | #define optList_isBool(i) \ |
71 | (optList[i].flag & Optflag_Boolean) |
75 | (optList[i].flag & Optflag_Boolean) |
72 | #define optList_isReverse(i) \ |
76 | #define optList_isReverse(i) \ |
73 | (optList[i].flag & Optflag_Reverse) |
77 | (optList[i].flag & Optflag_Reverse) |
74 | #define optList_size \ |
78 | #define optList_isInfo(i) \ |
75 | (sizeof (optList) / sizeof (optList[0])) |
79 | (optList[i].flag & Optflag_Info) |
76 | |
80 | |
77 | static const struct |
81 | static const struct |
78 | { |
82 | { |
79 | const uint8_t index; /* Option index */ |
83 | const uint8_t index; /* Option index */ |
80 | const uint8_t flag; /* Option flag */ |
84 | const uint8_t flag; /* Option flag */ |
… | |
… | |
112 | #if ENABLE_TRANSPARENCY |
116 | #if ENABLE_TRANSPARENCY |
113 | BOOL (Rs_transparent, "inheritPixmap", "ip", Opt_transparent, 0, "inherit parent pixmap"), |
117 | BOOL (Rs_transparent, "inheritPixmap", "ip", Opt_transparent, 0, "inherit parent pixmap"), |
114 | BOOL (Rs_transparent, "transparent", "tr", Opt_transparent, 0, "inherit parent pixmap"), |
118 | BOOL (Rs_transparent, "transparent", "tr", Opt_transparent, 0, "inherit parent pixmap"), |
115 | STRG (Rs_color + Color_tint, "tintColor", "tint", "color", "tint color"), |
119 | STRG (Rs_color + Color_tint, "tintColor", "tint", "color", "tint color"), |
116 | STRG (Rs_shade, "shading", "sh", "number", "shade background by number %."), |
120 | STRG (Rs_shade, "shading", "sh", "number", "shade background by number %."), |
|
|
121 | STRG (Rs_blurradius, "blurRadius", "blr", "HxV", "gaussian blur radii to apply to the root background"), |
117 | #endif |
122 | #endif |
118 | #if OFF_FOCUS_FADING |
123 | #if OFF_FOCUS_FADING |
119 | STRG (Rs_fade, "fading", "fade", "number", "fade colors by number % when losing focus"), |
124 | 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"), |
125 | STRG (Rs_color + Color_fade, "fadeColor", "fadecolor", "color", "target color for off-focus fading"), |
121 | #endif |
126 | #endif |
… | |
… | |
177 | #ifdef RXVT_SCROLLBAR |
182 | #ifdef RXVT_SCROLLBAR |
178 | RSTRG (Rs_color + Color_trough, "troughColor", "color"), |
183 | RSTRG (Rs_color + Color_trough, "troughColor", "color"), |
179 | #endif |
184 | #endif |
180 | #ifdef OPTION_HC |
185 | #ifdef OPTION_HC |
181 | STRG (Rs_color + Color_HC, "highlightColor", "hc", "color", "highlight color"), |
186 | STRG (Rs_color + Color_HC, "highlightColor", "hc", "color", "highlight color"), |
|
|
187 | RSTRG (Rs_color + Color_HTC, "highlightTextColor", "color"), |
182 | #endif |
188 | #endif |
183 | #ifndef NO_CURSORCOLOR |
189 | #ifndef NO_CURSORCOLOR |
184 | STRG (Rs_color + Color_cursor, "cursorColor", "cr", "color", "cursor color"), |
190 | STRG (Rs_color + Color_cursor, "cursorColor", "cr", "color", "cursor color"), |
185 | /* command-line option = resource name */ |
191 | /* command-line option = resource name */ |
186 | RSTRG (Rs_color + Color_cursor2, "cursorColor2", "color"), |
192 | RSTRG (Rs_color + Color_cursor2, "cursorColor2", "color"), |
187 | #endif /* NO_CURSORCOLOR */ |
193 | #endif /* NO_CURSORCOLOR */ |
188 | STRG (Rs_color + Color_pointer_fg, "pointerColor", "pr", "color", "pointer color"), |
194 | STRG (Rs_color + Color_pointer_fg, "pointerColor", "pr", "color", "pointer color"), |
189 | STRG (Rs_color + Color_pointer_bg, "pointerColor2", "pr2", "color", "pointer bg color"), |
195 | STRG (Rs_color + Color_pointer_bg, "pointerColor2", "pr2", "color", "pointer bg color"), |
190 | STRG (Rs_color + Color_border, "borderColor", "bd", "color", "border color"), |
196 | STRG (Rs_color + Color_border, "borderColor", "bd", "color", "border color"), |
191 | #ifdef BG_IMAGE_FROM_FILE |
197 | #if BG_IMAGE_FROM_FILE |
192 | RSTRG (Rs_path, "path", "search path"), |
198 | RSTRG (Rs_path, "path", "search path"), |
193 | STRG (Rs_backgroundPixmap, "backgroundPixmap", "pixmap", "file[;geom]", "background pixmap"), |
199 | STRG (Rs_backgroundPixmap, "backgroundPixmap", "pixmap", "file[;geom]", "background pixmap"), |
|
|
200 | # if ENABLE_EWMH |
|
|
201 | STRG (Rs_iconfile, "iconFile", "icon", "file", "path to application icon image"), |
|
|
202 | # endif |
194 | #endif |
203 | #endif |
195 | /* fonts: command-line option = resource name */ |
204 | /* fonts: command-line option = resource name */ |
196 | STRG (Rs_font, "font", "fn", "fontname", "normal text font"), |
205 | STRG (Rs_font, "font", "fn", "fontname", "normal text font"), |
197 | #if ENABLE_STYLES |
206 | #if ENABLE_STYLES |
198 | STRG (Rs_boldFont, "boldFont", "fb", "fontname", "bold font"), |
207 | STRG (Rs_boldFont, "boldFont", "fb", "fontname", "bold font"), |
199 | STRG (Rs_italicFont, "italicFont", "fi", "fontname", "italic font"), |
208 | STRG (Rs_italicFont, "italicFont", "fi", "fontname", "italic font"), |
200 | STRG (Rs_boldItalicFont, "boldItalicFont", "fbi", "fontname", "bold italic font"), |
209 | STRG (Rs_boldItalicFont, "boldItalicFont", "fbi", "fontname", "bold italic font"), |
201 | BOOL (Rs_intensityStyles, "intensityStyles", "is", Opt_intensityStyles, 0, "font styles imply intensity changes"), |
210 | BOOL (Rs_intensityStyles, "intensityStyles", "is", Opt_intensityStyles, 0, "font styles imply intensity changes"), |
202 | #endif |
211 | #endif |
203 | #ifdef USE_XIM |
212 | #if USE_XIM |
204 | STRG (Rs_inputMethod, "inputMethod", "im", "name", "name of input method"), |
213 | STRG (Rs_inputMethod, "inputMethod", "im", "name", "name of input method"), |
205 | STRG (Rs_preeditType, "preeditType", "pt", "style", "input style: style = OverTheSpot|OffTheSpot|Root"), |
214 | 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"), |
215 | 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"), |
216 | STRG (Rs_imFont, "imFont", "imfont", "fontname", "fontset for styles OverTheSpot and OffTheSpot"), |
208 | #endif /* USE_XIM */ |
217 | #endif /* USE_XIM */ |
… | |
… | |
227 | STRG (Rs_ext_bwidth, NULL, "bw", NULL, NULL), |
236 | STRG (Rs_ext_bwidth, NULL, "bw", NULL, NULL), |
228 | STRG (Rs_ext_bwidth, NULL, "borderwidth", NULL, NULL), |
237 | STRG (Rs_ext_bwidth, NULL, "borderwidth", NULL, NULL), |
229 | STRG (Rs_int_bwidth, "internalBorder", "b", "number", "internal border in pixels"), |
238 | STRG (Rs_int_bwidth, "internalBorder", "b", "number", "internal border in pixels"), |
230 | BOOL (Rs_borderLess, "borderLess", "bl", Opt_borderLess, 0, "borderless window"), |
239 | BOOL (Rs_borderLess, "borderLess", "bl", Opt_borderLess, 0, "borderless window"), |
231 | STRG (Rs_lineSpace, "lineSpace", "lsp", "number", "number of extra pixels between rows"), |
240 | STRG (Rs_lineSpace, "lineSpace", "lsp", "number", "number of extra pixels between rows"), |
|
|
241 | STRG (Rs_letterSpace, "letterSpace", "letsp", "number", "letter spacing adjustment"), |
232 | #endif |
242 | #endif |
233 | #ifdef BUILTIN_GLYPHS |
243 | #ifdef BUILTIN_GLYPHS |
234 | BOOL (Rs_skipBuiltinGlyphs, "skipBuiltinGlyphs", "sbg", Opt_skipBuiltinGlyphs, 0, "do not use internal glyphs"), |
244 | BOOL (Rs_skipBuiltinGlyphs, "skipBuiltinGlyphs", "sbg", Opt_skipBuiltinGlyphs, 0, "do not use internal glyphs"), |
235 | #endif |
245 | #endif |
236 | #ifdef POINTER_BLANK |
246 | #ifdef POINTER_BLANK |
… | |
… | |
257 | RSTRG (Rs_perl_eval, "perl-eval", "perl-eval"), // "string", "code to be evaluated after all extensions have been loaded"),TODO |
267 | RSTRG (Rs_perl_eval, "perl-eval", "perl-eval"), // "string", "code to be evaluated after all extensions have been loaded"),TODO |
258 | RSTRG (Rs_perl_ext_1, "perl-ext-common", "string"), //, "colon-separated list of perl extensions to enable"),TODO |
268 | RSTRG (Rs_perl_ext_1, "perl-ext-common", "string"), //, "colon-separated list of perl extensions to enable"),TODO |
259 | STRG (Rs_perl_ext_2, "perl-ext", "pe", "string", "colon-separated list of perl extensions to enable for this instance"), |
269 | STRG (Rs_perl_ext_2, "perl-ext", "pe", "string", "colon-separated list of perl extensions to enable for this instance"), |
260 | #endif |
270 | #endif |
261 | #if ISO_14755 |
271 | #if ISO_14755 |
|
|
272 | BOOL (Rs_iso14755, "iso14755", NULL, Opt_iso14755, 0, NULL), |
262 | BOOL (Rs_iso14755_52, "iso14755_52", NULL, Opt_iso14755_52, 0, NULL), |
273 | BOOL (Rs_iso14755_52, "iso14755_52", NULL, Opt_iso14755_52, 0, NULL), |
263 | #endif |
274 | #endif |
264 | #ifdef HAVE_AFTERIMAGE |
275 | #ifndef NO_RESOURCES |
265 | STRG (Rs_blendtype, "blendType", "blt", "string", "background image blending type - alpha, tint, etc..."), |
276 | RINFO ("xrm", "string"), |
266 | STRG (Rs_blurradius, "blurRadius", "blr", "HxV", "gaussian blur radii to apply to the root background"), |
|
|
267 | # if ENABLE_EWMH |
|
|
268 | STRG (Rs_iconfile, "iconFile", "icon", "file", "path to application icon image"), |
|
|
269 | # endif |
277 | #endif |
|
|
278 | #ifdef KEYSYM_RESOURCE |
|
|
279 | RINFO ("keysym.sym", "keysym"), |
270 | #endif |
280 | #endif |
271 | INFO ("e", "command arg ...", "command to execute") |
281 | INFO ("e", "command arg ...", "command to execute") |
272 | }; |
282 | }; |
273 | |
283 | |
274 | #undef INFO |
284 | #undef INFO |
|
|
285 | #undef RINFO |
275 | #undef STRG |
286 | #undef STRG |
276 | #undef RSTRG |
287 | #undef RSTRG |
277 | #undef SWCH |
288 | #undef SWCH |
278 | #undef BOOL |
289 | #undef BOOL |
279 | |
290 | |
… | |
… | |
322 | #endif |
333 | #endif |
323 | #if defined(ENABLE_TRANSPARENCY) |
334 | #if defined(ENABLE_TRANSPARENCY) |
324 | "transparent," |
335 | "transparent," |
325 | "tint," |
336 | "tint," |
326 | #endif |
337 | #endif |
327 | #if HAVE_AFTERIMAGE |
338 | #if HAVE_PIXBUF |
328 | "afterimage," |
339 | "pixbuf," |
329 | #endif |
340 | #endif |
330 | #if defined(USE_XIM) |
341 | #if defined(USE_XIM) |
331 | "XIM," |
342 | "XIM," |
332 | #endif |
343 | #endif |
333 | #if defined(NO_BACKSPACE_KEY) |
344 | #if defined(NO_BACKSPACE_KEY) |
… | |
… | |
393 | switch (type) |
404 | switch (type) |
394 | { |
405 | { |
395 | case 0: /* brief listing */ |
406 | case 0: /* brief listing */ |
396 | rxvt_log (" [-help] [--help]\n"); |
407 | rxvt_log (" [-help] [--help]\n"); |
397 | |
408 | |
398 | for (col = 1, i = 0; i < optList_size; i++) |
409 | for (col = 1, i = 0; i < ecb_array_length (optList); i++) |
399 | if (optList[i].desc != NULL) |
410 | if (optList[i].desc != NULL) |
400 | { |
411 | { |
401 | int len = 0; |
412 | int len = 0; |
402 | |
413 | |
403 | if (optList[i].arg) |
414 | if (optList[i].arg) |
404 | len = strlen (optList[i].arg) + 1; |
415 | len = strlen (optList[i].arg) + 1; |
405 | #ifdef DEBUG_STRICT |
|
|
406 | assert (optList[i].opt != NULL); |
416 | assert (optList[i].opt != NULL); |
407 | #endif |
|
|
408 | len += 4 + strlen (optList[i].opt) + (optList_isBool (i) ? 2: 0); |
417 | len += 4 + strlen (optList[i].opt) + (optList_isBool (i) ? 2 : 0); |
409 | col += len; |
418 | col += len; |
410 | if (col > 79) |
419 | if (col > 79) |
411 | { |
420 | { |
412 | /* assume regular width */ |
421 | /* assume regular width */ |
413 | rxvt_log ("\n"); |
422 | rxvt_log ("\n"); |
… | |
… | |
423 | break; |
432 | break; |
424 | |
433 | |
425 | case 1: /* full command-line listing */ |
434 | case 1: /* full command-line listing */ |
426 | rxvt_log (" [options] [-e command args]\n\nwhere options include:\n"); |
435 | rxvt_log (" [options] [-e command args]\n\nwhere options include:\n"); |
427 | |
436 | |
428 | for (i = 0; i < optList_size; i++) |
437 | for (i = 0; i < ecb_array_length (optList); i++) |
429 | if (optList[i].desc != NULL) |
438 | if (optList[i].desc != NULL) |
430 | { |
439 | { |
431 | #ifdef DEBUG_STRICT |
|
|
432 | assert (optList[i].opt != NULL); |
440 | assert (optList[i].opt != NULL); |
433 | #endif |
|
|
434 | rxvt_log (" %s%s %-*s%s%s\n", |
441 | rxvt_log (" %s%s %-*s%s%s\n", |
435 | (optList_isBool (i) ? "-/+" : "-"), optList[i].opt, |
442 | (optList_isBool (i) ? "-/+" : "-"), optList[i].opt, |
436 | (INDENT - strlen (optList[i].opt) |
443 | (INDENT - strlen (optList[i].opt) |
437 | + (optList_isBool (i) ? 0 : 2)), |
444 | + (optList_isBool (i) ? 0 : 2)), |
438 | (optList[i].arg ? optList[i].arg : ""), |
445 | (optList[i].arg ? optList[i].arg : ""), |
… | |
… | |
444 | |
451 | |
445 | case 2: /* full resource listing */ |
452 | case 2: /* full resource listing */ |
446 | rxvt_log (" [options] [-e command args]\n\n" |
453 | rxvt_log (" [options] [-e command args]\n\n" |
447 | "where resources (long-options) include:\n"); |
454 | "where resources (long-options) include:\n"); |
448 | |
455 | |
449 | for (i = 0; i < optList_size; i++) |
456 | for (i = 0; i < ecb_array_length (optList); i++) |
450 | if (optList[i].kw != NULL) |
457 | if (optList[i].kw != NULL) |
451 | rxvt_log (" %s: %*s%s\n", |
458 | rxvt_log (" %s: %*s%s\n", |
452 | optList[i].kw, |
459 | optList[i].kw, |
453 | (INDENT - strlen (optList[i].kw)), "", /* XXX */ |
460 | (INDENT - strlen (optList[i].kw)), "", /* XXX */ |
454 | (optList_isBool (i) ? "boolean" : optList[i].arg)); |
461 | (optList_isBool (i) ? "boolean" : optList[i].arg)); |
455 | #ifdef KEYSYM_RESOURCE |
|
|
456 | rxvt_log (" " "keysym.sym" ": %*s%s\n", |
|
|
457 | (INDENT - sizeof ("keysym.sym") + 1), "", /* XXX */ |
|
|
458 | "keysym"); |
|
|
459 | #endif |
|
|
460 | rxvt_log ("\n -help to list options"); |
462 | rxvt_log ("\n -help to list options"); |
461 | break; |
463 | break; |
462 | } |
464 | } |
463 | |
465 | |
464 | rxvt_log ("\n\n"); |
466 | rxvt_log ("\n\n"); |
465 | rxvt_exit_failure (); |
467 | rxvt_exit_failure (); |
466 | /* NOTREACHED */ |
|
|
467 | } |
468 | } |
468 | |
469 | |
469 | /*}}} */ |
470 | /*}}} */ |
470 | |
471 | |
471 | /*{{{ get command-line options before getting resources */ |
472 | /*{{{ get command-line options before getting resources */ |
472 | void |
473 | const char ** |
473 | rxvt_term::get_options (int argc, const char *const *argv) |
474 | rxvt_term::get_options (int argc, const char *const *argv) |
474 | { |
475 | { |
475 | int i, bad_option = 0; |
476 | int i, bad_option = 0; |
476 | |
477 | |
477 | for (i = 1; i < argc; i++) |
478 | for (i = 1; i < argc; i++) |
… | |
… | |
508 | |
509 | |
509 | if (!strcmp (opt, "h")) |
510 | if (!strcmp (opt, "h")) |
510 | rxvt_usage (0); |
511 | rxvt_usage (0); |
511 | |
512 | |
512 | /* feature: always try to match long-options */ |
513 | /* feature: always try to match long-options */ |
513 | for (entry = 0; entry < optList_size; entry++) |
514 | for (entry = 0; entry < ecb_array_length (optList); entry++) |
514 | if ((optList[entry].kw && !strcmp (opt, optList[entry].kw)) |
515 | if ((optList[entry].kw && !strcmp (opt, optList[entry].kw)) |
515 | || (!longopt |
516 | || (!longopt |
516 | && optList[entry].opt && !strcmp (opt, optList[entry].opt))) |
517 | && optList[entry].opt && !strcmp (opt, optList[entry].opt))) |
517 | break; |
518 | break; |
518 | |
519 | |
519 | if (entry < optList_size) |
520 | if (entry < ecb_array_length (optList) |
|
|
521 | && !optList_isInfo (entry)) |
520 | { |
522 | { |
521 | if (optList_isReverse (entry)) |
523 | if (optList_isReverse (entry)) |
522 | flag = !flag; |
524 | flag = !flag; |
523 | |
525 | |
524 | if (optList_isString (entry)) |
526 | if (optList_isString (entry)) |
525 | { |
527 | { |
526 | /* |
528 | /* |
527 | * special cases are handled in main.c:main () to allow |
529 | * special cases are handled in init_resources () to allow |
528 | * X resources to set these values before we settle for |
530 | * X resources to set these values before we settle for |
529 | * default values |
531 | * default values |
530 | */ |
532 | */ |
531 | |
533 | |
532 | if (optList[entry].doff != -1) |
534 | if (optList[entry].doff != -1) |
… | |
… | |
556 | #ifdef KEYSYM_RESOURCE |
558 | #ifdef KEYSYM_RESOURCE |
557 | else if (!strncmp (opt, "keysym.", sizeof ("keysym.") - 1)) |
559 | else if (!strncmp (opt, "keysym.", sizeof ("keysym.") - 1)) |
558 | { |
560 | { |
559 | if (i+1 < argc) |
561 | if (i+1 < argc) |
560 | { |
562 | { |
561 | char *res = (char *)malloc (strlen (opt) + strlen (argv[++i]) + 6); |
563 | char *res = rxvt_temp_buf<char> (strlen (opt) + strlen (argv[++i]) + 6); |
562 | sprintf (res, "*.%s: %s\n", opt, argv[i]); |
564 | sprintf (res, "*.%s: %s\n", opt, argv[i]); |
563 | XrmPutLineResource (&option_db, res); |
565 | XrmPutLineResource (&option_db, res); |
564 | free (res); |
|
|
565 | } |
566 | } |
566 | } |
567 | } |
567 | #endif |
568 | #endif |
|
|
569 | else if (!strcmp (opt, "e")) |
|
|
570 | { |
|
|
571 | if (i+1 == argc) |
|
|
572 | rxvt_fatal ("option '-e' requires an argument, aborting.\n"); |
|
|
573 | |
|
|
574 | return (const char **)argv + i + 1; |
|
|
575 | } |
568 | else |
576 | else |
569 | { |
577 | { |
570 | bad_option = 1; |
578 | bad_option = 1; |
571 | rxvt_warn ("\"%s\": unknown or malformed option.\n", opt); |
579 | rxvt_warn ("\"%s\": unknown or malformed option.\n", opt); |
572 | } |
580 | } |
573 | } |
581 | } |
574 | |
582 | |
575 | if (bad_option) |
583 | if (bad_option) |
576 | rxvt_usage (0); |
584 | rxvt_usage (0); |
|
|
585 | |
|
|
586 | return 0; |
577 | } |
587 | } |
578 | |
588 | |
579 | /*}}} */ |
589 | /*}}} */ |
580 | |
590 | |
581 | #ifndef NO_RESOURCES |
591 | #ifndef NO_RESOURCES |
… | |
… | |
586 | * Define key from XrmEnumerateDatabase. |
596 | * Define key from XrmEnumerateDatabase. |
587 | * quarks will be something like |
597 | * quarks will be something like |
588 | * "rxvt" "keysym" "0xFF01" |
598 | * "rxvt" "keysym" "0xFF01" |
589 | * value will be a string |
599 | * value will be a string |
590 | */ |
600 | */ |
591 | /* ARGSUSED */ |
601 | static int |
592 | int |
|
|
593 | rxvt_define_key (XrmDatabase *database UNUSED, |
602 | rxvt_define_key (XrmDatabase *database ecb_unused, |
594 | XrmBindingList bindings UNUSED, |
603 | XrmBindingList bindings ecb_unused, |
595 | XrmQuarkList quarks, |
604 | XrmQuarkList quarks, |
596 | XrmRepresentation *type UNUSED, |
605 | XrmRepresentation *type ecb_unused, |
597 | XrmValue *value, |
606 | XrmValue *value, |
598 | XPointer closure UNUSED) |
607 | XPointer closure ecb_unused) |
599 | { |
608 | { |
600 | int last; |
609 | int last; |
601 | |
610 | |
602 | for (last = 0; quarks[last] != NULLQUARK; last++) /* look for last quark in list */ |
611 | for (last = 0; quarks[last] != NULLQUARK; last++) /* look for last quark in list */ |
603 | ; |
612 | ; |
… | |
… | |
666 | // parse modifiers |
675 | // parse modifiers |
667 | while (str < key) |
676 | while (str < key) |
668 | { |
677 | { |
669 | unsigned int i; |
678 | unsigned int i; |
670 | |
679 | |
671 | for (i=0; i < sizeof (keysym_vocabulary) / sizeof (keysym_vocabulary_t); ++i) |
680 | for (i = 0; i < ecb_array_length (keysym_vocabulary); ++i) |
672 | { |
681 | { |
673 | if (strncmp (str, keysym_vocabulary [i].name, keysym_vocabulary [i].len) == 0) |
682 | if (strncmp (str, keysym_vocabulary [i].name, keysym_vocabulary [i].len) == 0) |
674 | { |
683 | { |
675 | state |= keysym_vocabulary[i].value; |
684 | state |= keysym_vocabulary[i].value; |
676 | str += keysym_vocabulary[i].len; |
685 | str += keysym_vocabulary[i].len; |
677 | break; |
686 | break; |
678 | } |
687 | } |
679 | } |
688 | } |
680 | |
689 | |
681 | if (i >= sizeof (keysym_vocabulary) / sizeof (keysym_vocabulary_t)) |
690 | if (i >= ecb_array_length (keysym_vocabulary)) |
682 | return -1; |
691 | return -1; |
683 | |
692 | |
684 | if (*str == '-') |
693 | if (*str == '-') |
685 | ++str; |
694 | ++str; |
686 | } |
695 | } |
… | |
… | |
691 | // fallback on hexadecimal parsing |
700 | // fallback on hexadecimal parsing |
692 | char *end; |
701 | char *end; |
693 | sym = strtol (str, &end, 16); |
702 | sym = strtol (str, &end, 16); |
694 | if (*end) |
703 | if (*end) |
695 | return -1; |
704 | return -1; |
696 | } |
705 | } |
697 | |
706 | |
|
|
707 | wchar_t *ws = rxvt_mbstowcs (arg); |
|
|
708 | if (!HOOK_INVOKE ((this, HOOK_REGISTER_COMMAND, DT_INT, sym, DT_INT, state, DT_WCS_LEN, ws, wcslen (ws), DT_END))) |
698 | keyboard->register_user_translation (sym, state, arg); |
709 | keyboard->register_user_translation (sym, state, ws); |
|
|
710 | free (ws); |
699 | return 1; |
711 | return 1; |
700 | } |
712 | } |
701 | |
713 | |
702 | # endif /* KEYSYM_RESOURCE */ |
714 | # endif /* KEYSYM_RESOURCE */ |
703 | #endif /* NO_RESOURCES */ |
715 | #endif /* NO_RESOURCES */ |
… | |
… | |
746 | XrmMergeDatabases (option_db, &database); |
758 | XrmMergeDatabases (option_db, &database); |
747 | option_db = NULL; |
759 | option_db = NULL; |
748 | /* |
760 | /* |
749 | * Query resources for options that affect us |
761 | * Query resources for options that affect us |
750 | */ |
762 | */ |
751 | for (int entry = 0; entry < optList_size; entry++) |
763 | for (int entry = 0; entry < ecb_array_length (optList); entry++) |
752 | { |
764 | { |
753 | int s; |
|
|
754 | const char *kw = optList[entry].kw; |
765 | const char *kw = optList[entry].kw; |
755 | |
766 | |
756 | if (kw == NULL || rs[optList[entry].doff] != NULL) |
767 | if (kw == NULL || rs[optList[entry].doff] != NULL) |
757 | continue; // previously set |
768 | continue; // previously set |
758 | |
769 | |
… | |
… | |
764 | allocated.push_back ((void *)p); |
775 | allocated.push_back ((void *)p); |
765 | rs[optList[entry].doff] = p; |
776 | rs[optList[entry].doff] = p; |
766 | |
777 | |
767 | if (optList_isBool (entry)) |
778 | if (optList_isBool (entry)) |
768 | { |
779 | { |
769 | s = strcasecmp (p, "TRUE") == 0 |
780 | bool s = parse_bool_resource (p); |
770 | || strcasecmp (p, "YES") == 0 |
|
|
771 | || strcasecmp (p, "ON") == 0 |
|
|
772 | || strcasecmp (p, "1") == 0; |
|
|
773 | |
781 | |
774 | if (optList_isReverse (entry)) |
782 | if (optList_isReverse (entry)) |
775 | s = !s; |
783 | s = !s; |
776 | |
784 | |
777 | set_option (optList[entry].index, s); |
785 | set_option (optList[entry].index, s); |
778 | } |
786 | } |
779 | } |
787 | } |
780 | } |
788 | } |
|
|
789 | #endif /* NO_RESOURCES */ |
|
|
790 | } |
781 | |
791 | |
|
|
792 | void |
|
|
793 | rxvt_term::extract_keysym_resources () |
|
|
794 | { |
|
|
795 | #if !defined NO_RESOURCES && defined KEYSYM_RESOURCE |
|
|
796 | find_resources ("keysym", "Keysym", XrmEnumOneLevel, rxvt_define_key); |
|
|
797 | #endif |
|
|
798 | } |
|
|
799 | |
|
|
800 | #if !defined NO_RESOURCES && (defined KEYSYM_RESOURCE || defined BG_IMAGE_FROM_FILE) |
|
|
801 | void |
|
|
802 | rxvt_term::find_resources (const char *n_prefix, const char *c_prefix, int mode, |
|
|
803 | Bool (*proc)(XrmDatabase *, XrmBindingList, XrmQuarkList, XrmRepresentation *, XrmValue *, XPointer)) |
|
|
804 | { |
782 | /* |
805 | /* |
783 | * [R5 or later]: enumerate the resource database |
806 | * [R5 or later]: enumerate the resource database |
784 | */ |
807 | */ |
785 | # ifdef KEYSYM_RESOURCE |
808 | XrmDatabase database = XrmGetDatabase (dpy); |
786 | XrmName name_prefix[3]; |
809 | XrmName name_prefix[3]; |
787 | XrmClass class_prefix[3]; |
810 | XrmClass class_prefix[3]; |
788 | |
811 | |
789 | name_prefix[0] = XrmStringToName (rs[Rs_name]); |
812 | name_prefix[0] = XrmStringToName (rs[Rs_name]); |
790 | name_prefix[1] = XrmStringToName ("keysym"); |
813 | name_prefix[1] = XrmStringToName (n_prefix); |
791 | name_prefix[2] = NULLQUARK; |
814 | name_prefix[2] = NULLQUARK; |
792 | class_prefix[0] = XrmStringToName (RESCLASS); |
815 | class_prefix[0] = XrmStringToName (RESCLASS); |
793 | class_prefix[1] = XrmStringToName ("Keysym"); |
816 | class_prefix[1] = XrmStringToName (c_prefix); |
794 | class_prefix[2] = NULLQUARK; |
817 | class_prefix[2] = NULLQUARK; |
795 | /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */ |
818 | /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */ |
796 | XrmEnumerateDatabase (database, name_prefix, class_prefix, |
819 | XrmEnumerateDatabase (database, name_prefix, class_prefix, |
797 | XrmEnumOneLevel, rxvt_define_key, NULL); |
820 | mode, proc, NULL); |
798 | # ifdef RESFALLBACK |
821 | # ifdef RESFALLBACK |
799 | name_prefix[0] = XrmStringToName (RESFALLBACK); |
|
|
800 | name_prefix[1] = XrmStringToName ("keysym"); |
|
|
801 | class_prefix[0] = XrmStringToName (RESFALLBACK); |
822 | name_prefix[0] = class_prefix[0] = XrmStringToName (RESFALLBACK); |
802 | class_prefix[1] = XrmStringToName ("Keysym"); |
|
|
803 | /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */ |
823 | /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */ |
804 | XrmEnumerateDatabase (database, name_prefix, class_prefix, |
824 | XrmEnumerateDatabase (database, name_prefix, class_prefix, |
805 | XrmEnumOneLevel, rxvt_define_key, NULL); |
825 | mode, proc, NULL); |
806 | # endif |
826 | # endif |
807 | # endif |
|
|
808 | |
|
|
809 | #endif /* NO_RESOURCES */ |
|
|
810 | } |
827 | } |
|
|
828 | #endif |
811 | |
829 | |
812 | /*----------------------- end-of-file (C source) -----------------------*/ |
830 | /*----------------------- end-of-file (C source) -----------------------*/ |