… | |
… | |
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"), |
… | |
… | |
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 | #ifdef 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"), |
… | |
… | |
258 | 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 |
259 | 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 |
260 | 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"), |
261 | #endif |
270 | #endif |
262 | #if ISO_14755 |
271 | #if ISO_14755 |
|
|
272 | BOOL (Rs_iso14755, "iso14755", NULL, Opt_iso14755, 0, NULL), |
263 | 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), |
264 | #endif |
274 | #endif |
265 | #ifdef HAVE_AFTERIMAGE |
275 | #ifdef HAVE_AFTERIMAGE |
266 | STRG (Rs_blendtype, "blendType", "blt", "string", "background image blending type - alpha, tint, etc..."), |
276 | 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 | # if ENABLE_EWMH |
|
|
269 | STRG (Rs_iconfile, "iconFile", "icon", "file", "path to application icon image"), |
|
|
270 | # endif |
277 | #endif |
|
|
278 | #ifndef NO_RESOURCES |
|
|
279 | RINFO ("xrm", "string"), |
|
|
280 | #endif |
|
|
281 | #ifdef KEYSYM_RESOURCE |
|
|
282 | RINFO ("keysym.sym", "keysym"), |
271 | #endif |
283 | #endif |
272 | INFO ("e", "command arg ...", "command to execute") |
284 | INFO ("e", "command arg ...", "command to execute") |
273 | }; |
285 | }; |
274 | |
286 | |
275 | #undef INFO |
287 | #undef INFO |
|
|
288 | #undef RINFO |
276 | #undef STRG |
289 | #undef STRG |
277 | #undef RSTRG |
290 | #undef RSTRG |
278 | #undef SWCH |
291 | #undef SWCH |
279 | #undef BOOL |
292 | #undef BOOL |
280 | |
293 | |
… | |
… | |
326 | "tint," |
339 | "tint," |
327 | #endif |
340 | #endif |
328 | #if HAVE_AFTERIMAGE |
341 | #if HAVE_AFTERIMAGE |
329 | "afterimage," |
342 | "afterimage," |
330 | #endif |
343 | #endif |
|
|
344 | #if HAVE_PIXBUF |
|
|
345 | "pixbuf," |
|
|
346 | #endif |
331 | #if defined(USE_XIM) |
347 | #if defined(USE_XIM) |
332 | "XIM," |
348 | "XIM," |
333 | #endif |
349 | #endif |
334 | #if defined(NO_BACKSPACE_KEY) |
350 | #if defined(NO_BACKSPACE_KEY) |
335 | "no_backspace," |
351 | "no_backspace," |
… | |
… | |
394 | switch (type) |
410 | switch (type) |
395 | { |
411 | { |
396 | case 0: /* brief listing */ |
412 | case 0: /* brief listing */ |
397 | rxvt_log (" [-help] [--help]\n"); |
413 | rxvt_log (" [-help] [--help]\n"); |
398 | |
414 | |
399 | for (col = 1, i = 0; i < optList_size; i++) |
415 | for (col = 1, i = 0; i < ecb_array_length (optList); i++) |
400 | if (optList[i].desc != NULL) |
416 | if (optList[i].desc != NULL) |
401 | { |
417 | { |
402 | int len = 0; |
418 | int len = 0; |
403 | |
419 | |
404 | if (optList[i].arg) |
420 | if (optList[i].arg) |
405 | len = strlen (optList[i].arg) + 1; |
421 | len = strlen (optList[i].arg) + 1; |
406 | assert (optList[i].opt != NULL); |
422 | assert (optList[i].opt != NULL); |
407 | len += 4 + strlen (optList[i].opt) + (optList_isBool (i) ? 2: 0); |
423 | len += 4 + strlen (optList[i].opt) + (optList_isBool (i) ? 2 : 0); |
408 | col += len; |
424 | col += len; |
409 | if (col > 79) |
425 | if (col > 79) |
410 | { |
426 | { |
411 | /* assume regular width */ |
427 | /* assume regular width */ |
412 | rxvt_log ("\n"); |
428 | rxvt_log ("\n"); |
… | |
… | |
422 | break; |
438 | break; |
423 | |
439 | |
424 | case 1: /* full command-line listing */ |
440 | case 1: /* full command-line listing */ |
425 | rxvt_log (" [options] [-e command args]\n\nwhere options include:\n"); |
441 | rxvt_log (" [options] [-e command args]\n\nwhere options include:\n"); |
426 | |
442 | |
427 | for (i = 0; i < optList_size; i++) |
443 | for (i = 0; i < ecb_array_length (optList); i++) |
428 | if (optList[i].desc != NULL) |
444 | if (optList[i].desc != NULL) |
429 | { |
445 | { |
430 | assert (optList[i].opt != NULL); |
446 | assert (optList[i].opt != NULL); |
431 | rxvt_log (" %s%s %-*s%s%s\n", |
447 | rxvt_log (" %s%s %-*s%s%s\n", |
432 | (optList_isBool (i) ? "-/+" : "-"), optList[i].opt, |
448 | (optList_isBool (i) ? "-/+" : "-"), optList[i].opt, |
… | |
… | |
441 | |
457 | |
442 | case 2: /* full resource listing */ |
458 | case 2: /* full resource listing */ |
443 | rxvt_log (" [options] [-e command args]\n\n" |
459 | rxvt_log (" [options] [-e command args]\n\n" |
444 | "where resources (long-options) include:\n"); |
460 | "where resources (long-options) include:\n"); |
445 | |
461 | |
446 | for (i = 0; i < optList_size; i++) |
462 | for (i = 0; i < ecb_array_length (optList); i++) |
447 | if (optList[i].kw != NULL) |
463 | if (optList[i].kw != NULL) |
448 | rxvt_log (" %s: %*s%s\n", |
464 | rxvt_log (" %s: %*s%s\n", |
449 | optList[i].kw, |
465 | optList[i].kw, |
450 | (INDENT - strlen (optList[i].kw)), "", /* XXX */ |
466 | (INDENT - strlen (optList[i].kw)), "", /* XXX */ |
451 | (optList_isBool (i) ? "boolean" : optList[i].arg)); |
467 | (optList_isBool (i) ? "boolean" : optList[i].arg)); |
452 | #ifdef KEYSYM_RESOURCE |
|
|
453 | rxvt_log (" " "keysym.sym" ": %*s%s\n", |
|
|
454 | (INDENT - sizeof ("keysym.sym") + 1), "", /* XXX */ |
|
|
455 | "keysym"); |
|
|
456 | #endif |
|
|
457 | rxvt_log ("\n -help to list options"); |
468 | rxvt_log ("\n -help to list options"); |
458 | break; |
469 | break; |
459 | } |
470 | } |
460 | |
471 | |
461 | rxvt_log ("\n\n"); |
472 | rxvt_log ("\n\n"); |
462 | rxvt_exit_failure (); |
473 | rxvt_exit_failure (); |
463 | /* NOTREACHED */ |
|
|
464 | } |
474 | } |
465 | |
475 | |
466 | /*}}} */ |
476 | /*}}} */ |
467 | |
477 | |
468 | /*{{{ get command-line options before getting resources */ |
478 | /*{{{ get command-line options before getting resources */ |
469 | void |
479 | const char ** |
470 | rxvt_term::get_options (int argc, const char *const *argv) |
480 | rxvt_term::get_options (int argc, const char *const *argv) |
471 | { |
481 | { |
472 | int i, bad_option = 0; |
482 | int i, bad_option = 0; |
473 | |
483 | |
474 | for (i = 1; i < argc; i++) |
484 | for (i = 1; i < argc; i++) |
… | |
… | |
505 | |
515 | |
506 | if (!strcmp (opt, "h")) |
516 | if (!strcmp (opt, "h")) |
507 | rxvt_usage (0); |
517 | rxvt_usage (0); |
508 | |
518 | |
509 | /* feature: always try to match long-options */ |
519 | /* feature: always try to match long-options */ |
510 | for (entry = 0; entry < optList_size; entry++) |
520 | for (entry = 0; entry < ecb_array_length (optList); entry++) |
511 | if ((optList[entry].kw && !strcmp (opt, optList[entry].kw)) |
521 | if ((optList[entry].kw && !strcmp (opt, optList[entry].kw)) |
512 | || (!longopt |
522 | || (!longopt |
513 | && optList[entry].opt && !strcmp (opt, optList[entry].opt))) |
523 | && optList[entry].opt && !strcmp (opt, optList[entry].opt))) |
514 | break; |
524 | break; |
515 | |
525 | |
516 | if (entry < optList_size) |
526 | if (entry < ecb_array_length (optList) |
|
|
527 | && !optList_isInfo (entry)) |
517 | { |
528 | { |
518 | if (optList_isReverse (entry)) |
529 | if (optList_isReverse (entry)) |
519 | flag = !flag; |
530 | flag = !flag; |
520 | |
531 | |
521 | if (optList_isString (entry)) |
532 | if (optList_isString (entry)) |
522 | { |
533 | { |
523 | /* |
534 | /* |
524 | * special cases are handled in main.c:main () to allow |
535 | * special cases are handled in init_resources () to allow |
525 | * X resources to set these values before we settle for |
536 | * X resources to set these values before we settle for |
526 | * default values |
537 | * default values |
527 | */ |
538 | */ |
528 | |
539 | |
529 | if (optList[entry].doff != -1) |
540 | if (optList[entry].doff != -1) |
… | |
… | |
553 | #ifdef KEYSYM_RESOURCE |
564 | #ifdef KEYSYM_RESOURCE |
554 | else if (!strncmp (opt, "keysym.", sizeof ("keysym.") - 1)) |
565 | else if (!strncmp (opt, "keysym.", sizeof ("keysym.") - 1)) |
555 | { |
566 | { |
556 | if (i+1 < argc) |
567 | if (i+1 < argc) |
557 | { |
568 | { |
558 | char *res = (char *)malloc (strlen (opt) + strlen (argv[++i]) + 6); |
569 | char *res = rxvt_temp_buf<char> (strlen (opt) + strlen (argv[++i]) + 6); |
559 | sprintf (res, "*.%s: %s\n", opt, argv[i]); |
570 | sprintf (res, "*.%s: %s\n", opt, argv[i]); |
560 | XrmPutLineResource (&option_db, res); |
571 | XrmPutLineResource (&option_db, res); |
561 | free (res); |
|
|
562 | } |
572 | } |
563 | } |
573 | } |
564 | #endif |
574 | #endif |
|
|
575 | else if (!strcmp (opt, "e")) |
|
|
576 | { |
|
|
577 | if (i+1 == argc) |
|
|
578 | rxvt_fatal ("option '-e' requires an argument, aborting.\n"); |
|
|
579 | |
|
|
580 | return (const char **)argv + i + 1; |
|
|
581 | } |
565 | else |
582 | else |
566 | { |
583 | { |
567 | bad_option = 1; |
584 | bad_option = 1; |
568 | rxvt_warn ("\"%s\": unknown or malformed option.\n", opt); |
585 | rxvt_warn ("\"%s\": unknown or malformed option.\n", opt); |
569 | } |
586 | } |
570 | } |
587 | } |
571 | |
588 | |
572 | if (bad_option) |
589 | if (bad_option) |
573 | rxvt_usage (0); |
590 | rxvt_usage (0); |
|
|
591 | |
|
|
592 | return 0; |
574 | } |
593 | } |
575 | |
594 | |
576 | /*}}} */ |
595 | /*}}} */ |
577 | |
596 | |
578 | #ifndef NO_RESOURCES |
597 | #ifndef NO_RESOURCES |
… | |
… | |
583 | * Define key from XrmEnumerateDatabase. |
602 | * Define key from XrmEnumerateDatabase. |
584 | * quarks will be something like |
603 | * quarks will be something like |
585 | * "rxvt" "keysym" "0xFF01" |
604 | * "rxvt" "keysym" "0xFF01" |
586 | * value will be a string |
605 | * value will be a string |
587 | */ |
606 | */ |
588 | /* ARGSUSED */ |
607 | static int |
589 | int |
|
|
590 | rxvt_define_key (XrmDatabase *database UNUSED, |
608 | rxvt_define_key (XrmDatabase *database ecb_unused, |
591 | XrmBindingList bindings UNUSED, |
609 | XrmBindingList bindings ecb_unused, |
592 | XrmQuarkList quarks, |
610 | XrmQuarkList quarks, |
593 | XrmRepresentation *type UNUSED, |
611 | XrmRepresentation *type ecb_unused, |
594 | XrmValue *value, |
612 | XrmValue *value, |
595 | XPointer closure UNUSED) |
613 | XPointer closure ecb_unused) |
596 | { |
614 | { |
597 | int last; |
615 | int last; |
598 | |
616 | |
599 | for (last = 0; quarks[last] != NULLQUARK; last++) /* look for last quark in list */ |
617 | for (last = 0; quarks[last] != NULLQUARK; last++) /* look for last quark in list */ |
600 | ; |
618 | ; |
… | |
… | |
663 | // parse modifiers |
681 | // parse modifiers |
664 | while (str < key) |
682 | while (str < key) |
665 | { |
683 | { |
666 | unsigned int i; |
684 | unsigned int i; |
667 | |
685 | |
668 | for (i=0; i < sizeof (keysym_vocabulary) / sizeof (keysym_vocabulary_t); ++i) |
686 | for (i = 0; i < ecb_array_length (keysym_vocabulary); ++i) |
669 | { |
687 | { |
670 | if (strncmp (str, keysym_vocabulary [i].name, keysym_vocabulary [i].len) == 0) |
688 | if (strncmp (str, keysym_vocabulary [i].name, keysym_vocabulary [i].len) == 0) |
671 | { |
689 | { |
672 | state |= keysym_vocabulary[i].value; |
690 | state |= keysym_vocabulary[i].value; |
673 | str += keysym_vocabulary[i].len; |
691 | str += keysym_vocabulary[i].len; |
674 | break; |
692 | break; |
675 | } |
693 | } |
676 | } |
694 | } |
677 | |
695 | |
678 | if (i >= sizeof (keysym_vocabulary) / sizeof (keysym_vocabulary_t)) |
696 | if (i >= ecb_array_length (keysym_vocabulary)) |
679 | return -1; |
697 | return -1; |
680 | |
698 | |
681 | if (*str == '-') |
699 | if (*str == '-') |
682 | ++str; |
700 | ++str; |
683 | } |
701 | } |
… | |
… | |
688 | // fallback on hexadecimal parsing |
706 | // fallback on hexadecimal parsing |
689 | char *end; |
707 | char *end; |
690 | sym = strtol (str, &end, 16); |
708 | sym = strtol (str, &end, 16); |
691 | if (*end) |
709 | if (*end) |
692 | return -1; |
710 | return -1; |
693 | } |
711 | } |
694 | |
712 | |
|
|
713 | wchar_t *ws = rxvt_mbstowcs (arg); |
|
|
714 | if (!HOOK_INVOKE ((this, HOOK_REGISTER_COMMAND, DT_INT, sym, DT_INT, state, DT_WCS_LEN, ws, wcslen (ws), DT_END))) |
695 | keyboard->register_user_translation (sym, state, arg); |
715 | keyboard->register_user_translation (sym, state, ws); |
|
|
716 | free (ws); |
696 | return 1; |
717 | return 1; |
697 | } |
718 | } |
698 | |
719 | |
699 | # endif /* KEYSYM_RESOURCE */ |
720 | # endif /* KEYSYM_RESOURCE */ |
700 | #endif /* NO_RESOURCES */ |
721 | #endif /* NO_RESOURCES */ |
… | |
… | |
743 | XrmMergeDatabases (option_db, &database); |
764 | XrmMergeDatabases (option_db, &database); |
744 | option_db = NULL; |
765 | option_db = NULL; |
745 | /* |
766 | /* |
746 | * Query resources for options that affect us |
767 | * Query resources for options that affect us |
747 | */ |
768 | */ |
748 | for (int entry = 0; entry < optList_size; entry++) |
769 | for (int entry = 0; entry < ecb_array_length (optList); entry++) |
749 | { |
770 | { |
750 | int s; |
771 | int s; |
751 | const char *kw = optList[entry].kw; |
772 | const char *kw = optList[entry].kw; |
752 | |
773 | |
753 | if (kw == NULL || rs[optList[entry].doff] != NULL) |
774 | if (kw == NULL || rs[optList[entry].doff] != NULL) |
… | |
… | |
773 | |
794 | |
774 | set_option (optList[entry].index, s); |
795 | set_option (optList[entry].index, s); |
775 | } |
796 | } |
776 | } |
797 | } |
777 | } |
798 | } |
|
|
799 | #endif /* NO_RESOURCES */ |
|
|
800 | } |
778 | |
801 | |
|
|
802 | void |
|
|
803 | rxvt_term::extract_keysym_resources () |
|
|
804 | { |
|
|
805 | #ifndef NO_RESOURCES |
779 | /* |
806 | /* |
780 | * [R5 or later]: enumerate the resource database |
807 | * [R5 or later]: enumerate the resource database |
781 | */ |
808 | */ |
782 | # ifdef KEYSYM_RESOURCE |
809 | # ifdef KEYSYM_RESOURCE |
|
|
810 | XrmDatabase database = XrmGetDatabase (dpy); |
783 | XrmName name_prefix[3]; |
811 | XrmName name_prefix[3]; |
784 | XrmClass class_prefix[3]; |
812 | XrmClass class_prefix[3]; |
785 | |
813 | |
786 | name_prefix[0] = XrmStringToName (rs[Rs_name]); |
814 | name_prefix[0] = XrmStringToName (rs[Rs_name]); |
787 | name_prefix[1] = XrmStringToName ("keysym"); |
815 | name_prefix[1] = XrmStringToName ("keysym"); |
… | |
… | |
791 | class_prefix[2] = NULLQUARK; |
819 | class_prefix[2] = NULLQUARK; |
792 | /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */ |
820 | /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */ |
793 | XrmEnumerateDatabase (database, name_prefix, class_prefix, |
821 | XrmEnumerateDatabase (database, name_prefix, class_prefix, |
794 | XrmEnumOneLevel, rxvt_define_key, NULL); |
822 | XrmEnumOneLevel, rxvt_define_key, NULL); |
795 | # ifdef RESFALLBACK |
823 | # ifdef RESFALLBACK |
796 | name_prefix[0] = XrmStringToName (RESFALLBACK); |
|
|
797 | name_prefix[1] = XrmStringToName ("keysym"); |
|
|
798 | class_prefix[0] = XrmStringToName (RESFALLBACK); |
824 | name_prefix[0] = class_prefix[0] = XrmStringToName (RESFALLBACK); |
799 | class_prefix[1] = XrmStringToName ("Keysym"); |
|
|
800 | /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */ |
825 | /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */ |
801 | XrmEnumerateDatabase (database, name_prefix, class_prefix, |
826 | XrmEnumerateDatabase (database, name_prefix, class_prefix, |
802 | XrmEnumOneLevel, rxvt_define_key, NULL); |
827 | XrmEnumOneLevel, rxvt_define_key, NULL); |
803 | # endif |
828 | # endif |
804 | # endif |
829 | # endif |