ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/xdefaults.C
(Generate patch)

Comparing rxvt-unicode/src/xdefaults.C (file contents):
Revision 1.136 by ayin, Sat Feb 16 15:56:41 2008 UTC vs.
Revision 1.161 by sf-exg, Sun Dec 18 02:25:12 2011 UTC

… …
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
77static const struct 81static 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 */
… …
91 STRG (Rs_geometry, NULL, "g", NULL, NULL), /* short form */ 95 STRG (Rs_geometry, NULL, "g", NULL, NULL), /* short form */
92 STRG (Rs_geometry, "geometry", "geometry", "geometry", "size (in characters) and position"), 96 STRG (Rs_geometry, "geometry", "geometry", "geometry", "size (in characters) and position"),
93 SWCH ("C", Opt_console, 0, "intercept console messages"), 97 SWCH ("C", Opt_console, 0, "intercept console messages"),
94 SWCH ("iconic", Opt_iconic, 0, "start iconic"), 98 SWCH ("iconic", Opt_iconic, 0, "start iconic"),
95 SWCH ("ic", Opt_iconic, 0, NULL), /* short form */ 99 SWCH ("ic", Opt_iconic, 0, NULL), /* short form */
100 STRG (Rs_chdir, "chdir", "cd", "string", "start shell in this directory"),
96 BOOL (Rs_reverseVideo, "reverseVideo", "rv", Opt_reverseVideo, 0, "reverse video"), 101 BOOL (Rs_reverseVideo, "reverseVideo", "rv", Opt_reverseVideo, 0, "reverse video"),
97 BOOL (Rs_loginShell, "loginShell", "ls", Opt_loginShell, 0, "login shell"), 102 BOOL (Rs_loginShell, "loginShell", "ls", Opt_loginShell, 0, "login shell"),
98 BOOL (Rs_jumpScroll, "jumpScroll", "j", Opt_jumpScroll, 0, "jump scrolling"), 103 BOOL (Rs_jumpScroll, "jumpScroll", "j", Opt_jumpScroll, 0, "jump scrolling"),
99 BOOL (Rs_skipScroll, "skipScroll", "ss", Opt_skipScroll, 0, "skip scrolling"), 104 BOOL (Rs_skipScroll, "skipScroll", "ss", Opt_skipScroll, 0, "skip scrolling"),
100 BOOL (Rs_pastableTabs, "pastableTabs", "ptab", Opt_pastableTabs, 0, "tab characters are pastable"), 105 BOOL (Rs_pastableTabs, "pastableTabs", "ptab", Opt_pastableTabs, 0, "tab characters are pastable"),
… …
111#if ENABLE_TRANSPARENCY 116#if ENABLE_TRANSPARENCY
112 BOOL (Rs_transparent, "inheritPixmap", "ip", Opt_transparent, 0, "inherit parent pixmap"), 117 BOOL (Rs_transparent, "inheritPixmap", "ip", Opt_transparent, 0, "inherit parent pixmap"),
113 BOOL (Rs_transparent, "transparent", "tr", Opt_transparent, 0, "inherit parent pixmap"), 118 BOOL (Rs_transparent, "transparent", "tr", Opt_transparent, 0, "inherit parent pixmap"),
114 STRG (Rs_color + Color_tint, "tintColor", "tint", "color", "tint color"), 119 STRG (Rs_color + Color_tint, "tintColor", "tint", "color", "tint color"),
115 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"),
116#endif 122#endif
117#if OFF_FOCUS_FADING 123#if OFF_FOCUS_FADING
118 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"),
119 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"),
120#endif 126#endif
… …
176#ifdef RXVT_SCROLLBAR 182#ifdef RXVT_SCROLLBAR
177 RSTRG (Rs_color + Color_trough, "troughColor", "color"), 183 RSTRG (Rs_color + Color_trough, "troughColor", "color"),
178#endif 184#endif
179#ifdef OPTION_HC 185#ifdef OPTION_HC
180 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"),
181#endif 188#endif
182#ifndef NO_CURSORCOLOR 189#ifndef NO_CURSORCOLOR
183 STRG (Rs_color + Color_cursor, "cursorColor", "cr", "color", "cursor color"), 190 STRG (Rs_color + Color_cursor, "cursorColor", "cr", "color", "cursor color"),
184 /* command-line option = resource name */ 191 /* command-line option = resource name */
185 RSTRG (Rs_color + Color_cursor2, "cursorColor2", "color"), 192 RSTRG (Rs_color + Color_cursor2, "cursorColor2", "color"),
… …
188 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"),
189 STRG (Rs_color + Color_border, "borderColor", "bd", "color", "border color"), 196 STRG (Rs_color + Color_border, "borderColor", "bd", "color", "border color"),
190#ifdef BG_IMAGE_FROM_FILE 197#ifdef BG_IMAGE_FROM_FILE
191 RSTRG (Rs_path, "path", "search path"), 198 RSTRG (Rs_path, "path", "search path"),
192 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
193#endif 203#endif
194 /* fonts: command-line option = resource name */ 204 /* fonts: command-line option = resource name */
195 STRG (Rs_font, "font", "fn", "fontname", "normal text font"), 205 STRG (Rs_font, "font", "fn", "fontname", "normal text font"),
196#if ENABLE_STYLES 206#if ENABLE_STYLES
197 STRG (Rs_boldFont, "boldFont", "fb", "fontname", "bold font"), 207 STRG (Rs_boldFont, "boldFont", "fb", "fontname", "bold font"),
… …
226 STRG (Rs_ext_bwidth, NULL, "bw", NULL, NULL), 236 STRG (Rs_ext_bwidth, NULL, "bw", NULL, NULL),
227 STRG (Rs_ext_bwidth, NULL, "borderwidth", NULL, NULL), 237 STRG (Rs_ext_bwidth, NULL, "borderwidth", NULL, NULL),
228 STRG (Rs_int_bwidth, "internalBorder", "b", "number", "internal border in pixels"), 238 STRG (Rs_int_bwidth, "internalBorder", "b", "number", "internal border in pixels"),
229 BOOL (Rs_borderLess, "borderLess", "bl", Opt_borderLess, 0, "borderless window"), 239 BOOL (Rs_borderLess, "borderLess", "bl", Opt_borderLess, 0, "borderless window"),
230 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"),
231#endif 242#endif
232#ifdef BUILTIN_GLYPHS 243#ifdef BUILTIN_GLYPHS
233 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"),
234#endif 245#endif
235#ifdef POINTER_BLANK 246#ifdef POINTER_BLANK
… …
256 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
257 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
258 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"),
259#endif 270#endif
260#if ISO_14755 271#if ISO_14755
272 BOOL (Rs_iso14755, "iso14755", NULL, Opt_iso14755, 0, NULL),
261 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),
262#endif 274#endif
263#ifdef HAVE_AFTERIMAGE 275#ifdef HAVE_AFTERIMAGE
264 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..."),
265 STRG (Rs_blurradius, "blurRadius", "blr", "HxV", "Gaussian Blur radii to apply to the root background"), 277#endif
278#ifndef NO_RESOURCES
279 RINFO ("xrm", "string"),
280#endif
281#ifdef KEYSYM_RESOURCE
282 RINFO ("keysym.sym", "keysym"),
266#endif 283#endif
267 INFO ("e", "command arg ...", "command to execute") 284 INFO ("e", "command arg ...", "command to execute")
268 }; 285 };
269 286
270#undef INFO 287#undef INFO
288#undef RINFO
271#undef STRG 289#undef STRG
272#undef RSTRG 290#undef RSTRG
273#undef SWCH 291#undef SWCH
274#undef BOOL 292#undef BOOL
275 293
… …
321 "tint," 339 "tint,"
322#endif 340#endif
323#if HAVE_AFTERIMAGE 341#if HAVE_AFTERIMAGE
324 "afterimage," 342 "afterimage,"
325#endif 343#endif
344#if HAVE_PIXBUF
345 "pixbuf,"
346#endif
326#if defined(USE_XIM) 347#if defined(USE_XIM)
327 "XIM," 348 "XIM,"
328#endif 349#endif
329#if defined(NO_BACKSPACE_KEY) 350#if defined(NO_BACKSPACE_KEY)
330 "no_backspace," 351 "no_backspace,"
… …
389 switch (type) 410 switch (type)
390 { 411 {
391 case 0: /* brief listing */ 412 case 0: /* brief listing */
392 rxvt_log (" [-help] [--help]\n"); 413 rxvt_log (" [-help] [--help]\n");
393 414
394 for (col = 1, i = 0; i < optList_size; i++) 415 for (col = 1, i = 0; i < ecb_array_length (optList); i++)
395 if (optList[i].desc != NULL) 416 if (optList[i].desc != NULL)
396 { 417 {
397 int len = 0; 418 int len = 0;
398 419
399 if (optList[i].arg) 420 if (optList[i].arg)
400 len = strlen (optList[i].arg) + 1; 421 len = strlen (optList[i].arg) + 1;
401#ifdef DEBUG_STRICT
402 assert (optList[i].opt != NULL); 422 assert (optList[i].opt != NULL);
403#endif
404 len += 4 + strlen (optList[i].opt) + (optList_isBool (i) ? 2: 0); 423 len += 4 + strlen (optList[i].opt) + (optList_isBool (i) ? 2 : 0);
405 col += len; 424 col += len;
406 if (col > 79) 425 if (col > 79)
407 { 426 {
408 /* assume regular width */ 427 /* assume regular width */
409 rxvt_log ("\n"); 428 rxvt_log ("\n");
… …
419 break; 438 break;
420 439
421 case 1: /* full command-line listing */ 440 case 1: /* full command-line listing */
422 rxvt_log (" [options] [-e command args]\n\nwhere options include:\n"); 441 rxvt_log (" [options] [-e command args]\n\nwhere options include:\n");
423 442
424 for (i = 0; i < optList_size; i++) 443 for (i = 0; i < ecb_array_length (optList); i++)
425 if (optList[i].desc != NULL) 444 if (optList[i].desc != NULL)
426 { 445 {
427#ifdef DEBUG_STRICT
428 assert (optList[i].opt != NULL); 446 assert (optList[i].opt != NULL);
429#endif
430 rxvt_log (" %s%s %-*s%s%s\n", 447 rxvt_log (" %s%s %-*s%s%s\n",
431 (optList_isBool (i) ? "-/+" : "-"), optList[i].opt, 448 (optList_isBool (i) ? "-/+" : "-"), optList[i].opt,
432 (INDENT - strlen (optList[i].opt) 449 (INDENT - strlen (optList[i].opt)
433 + (optList_isBool (i) ? 0 : 2)), 450 + (optList_isBool (i) ? 0 : 2)),
434 (optList[i].arg ? optList[i].arg : ""), 451 (optList[i].arg ? optList[i].arg : ""),
… …
440 457
441 case 2: /* full resource listing */ 458 case 2: /* full resource listing */
442 rxvt_log (" [options] [-e command args]\n\n" 459 rxvt_log (" [options] [-e command args]\n\n"
443 "where resources (long-options) include:\n"); 460 "where resources (long-options) include:\n");
444 461
445 for (i = 0; i < optList_size; i++) 462 for (i = 0; i < ecb_array_length (optList); i++)
446 if (optList[i].kw != NULL) 463 if (optList[i].kw != NULL)
447 rxvt_log (" %s: %*s%s\n", 464 rxvt_log (" %s: %*s%s\n",
448 optList[i].kw, 465 optList[i].kw,
449 (INDENT - strlen (optList[i].kw)), "", /* XXX */ 466 (INDENT - strlen (optList[i].kw)), "", /* XXX */
450 (optList_isBool (i) ? "boolean" : optList[i].arg)); 467 (optList_isBool (i) ? "boolean" : optList[i].arg));
451#ifdef KEYSYM_RESOURCE
452 rxvt_log (" " "keysym.sym" ": %*s%s\n",
453 (INDENT - sizeof ("keysym.sym") + 1), "", /* XXX */
454 "keysym");
455#endif
456 rxvt_log ("\n -help to list options"); 468 rxvt_log ("\n -help to list options");
457 break; 469 break;
458 } 470 }
459 471
460 rxvt_log ("\n\n"); 472 rxvt_log ("\n\n");
461 rxvt_exit_failure (); 473 rxvt_exit_failure ();
462 /* NOTREACHED */
463} 474}
464 475
465/*}}} */ 476/*}}} */
466 477
467/*{{{ get command-line options before getting resources */ 478/*{{{ get command-line options before getting resources */
468void 479const char **
469rxvt_term::get_options (int argc, const char *const *argv) 480rxvt_term::get_options (int argc, const char *const *argv)
470{ 481{
471 int i, bad_option = 0; 482 int i, bad_option = 0;
472 483
473 for (i = 1; i < argc; i++) 484 for (i = 1; i < argc; i++)
… …
504 515
505 if (!strcmp (opt, "h")) 516 if (!strcmp (opt, "h"))
506 rxvt_usage (0); 517 rxvt_usage (0);
507 518
508 /* feature: always try to match long-options */ 519 /* feature: always try to match long-options */
509 for (entry = 0; entry < optList_size; entry++) 520 for (entry = 0; entry < ecb_array_length (optList); entry++)
510 if ((optList[entry].kw && !strcmp (opt, optList[entry].kw)) 521 if ((optList[entry].kw && !strcmp (opt, optList[entry].kw))
511 || (!longopt 522 || (!longopt
512 && optList[entry].opt && !strcmp (opt, optList[entry].opt))) 523 && optList[entry].opt && !strcmp (opt, optList[entry].opt)))
513 break; 524 break;
514 525
515 if (entry < optList_size) 526 if (entry < ecb_array_length (optList)
527 && !optList_isInfo (entry))
516 { 528 {
517 if (optList_isReverse (entry)) 529 if (optList_isReverse (entry))
518 flag = !flag; 530 flag = !flag;
519 531
520 if (optList_isString (entry)) 532 if (optList_isString (entry))
521 { 533 {
522 /* 534 /*
523 * special cases are handled in main.c:main () to allow 535 * special cases are handled in init_resources () to allow
524 * X resources to set these values before we settle for 536 * X resources to set these values before we settle for
525 * default values 537 * default values
526 */ 538 */
527 539
528 if (optList[entry].doff != -1) 540 if (optList[entry].doff != -1)
… …
552#ifdef KEYSYM_RESOURCE 564#ifdef KEYSYM_RESOURCE
553 else if (!strncmp (opt, "keysym.", sizeof ("keysym.") - 1)) 565 else if (!strncmp (opt, "keysym.", sizeof ("keysym.") - 1))
554 { 566 {
555 if (i+1 < argc) 567 if (i+1 < argc)
556 { 568 {
557 char *res = (char *)malloc (strlen (opt) + strlen (argv[++i]) + 6); 569 char *res = rxvt_temp_buf<char> (strlen (opt) + strlen (argv[++i]) + 6);
558 sprintf (res, "*.%s: %s\n", opt, argv[i]); 570 sprintf (res, "*.%s: %s\n", opt, argv[i]);
559 XrmPutLineResource (&option_db, res); 571 XrmPutLineResource (&option_db, res);
560 free (res);
561 } 572 }
562 } 573 }
563#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 }
564 else 582 else
565 { 583 {
566 bad_option = 1; 584 bad_option = 1;
567 rxvt_warn ("\"%s\": unknown or malformed option.\n", opt); 585 rxvt_warn ("\"%s\": unknown or malformed option.\n", opt);
568 } 586 }
569 } 587 }
570 588
571 if (bad_option) 589 if (bad_option)
572 rxvt_usage (0); 590 rxvt_usage (0);
591
592 return 0;
573} 593}
574 594
575/*}}} */ 595/*}}} */
576 596
577#ifndef NO_RESOURCES 597#ifndef NO_RESOURCES
… …
582 * Define key from XrmEnumerateDatabase. 602 * Define key from XrmEnumerateDatabase.
583 * quarks will be something like 603 * quarks will be something like
584 * "rxvt" "keysym" "0xFF01" 604 * "rxvt" "keysym" "0xFF01"
585 * value will be a string 605 * value will be a string
586 */ 606 */
587/* ARGSUSED */ 607static int
588int
589rxvt_define_key (XrmDatabase *database UNUSED, 608rxvt_define_key (XrmDatabase *database ecb_unused,
590 XrmBindingList bindings UNUSED, 609 XrmBindingList bindings ecb_unused,
591 XrmQuarkList quarks, 610 XrmQuarkList quarks,
592 XrmRepresentation *type UNUSED, 611 XrmRepresentation *type ecb_unused,
593 XrmValue *value, 612 XrmValue *value,
594 XPointer closure UNUSED) 613 XPointer closure ecb_unused)
595{ 614{
596 int last; 615 int last;
597 616
598 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 */
599 ; 618 ;
… …
662 // parse modifiers 681 // parse modifiers
663 while (str < key) 682 while (str < key)
664 { 683 {
665 unsigned int i; 684 unsigned int i;
666 685
667 for (i=0; i < sizeof (keysym_vocabulary) / sizeof (keysym_vocabulary_t); ++i) 686 for (i = 0; i < ecb_array_length (keysym_vocabulary); ++i)
668 { 687 {
669 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)
670 { 689 {
671 state |= keysym_vocabulary[i].value; 690 state |= keysym_vocabulary[i].value;
672 str += keysym_vocabulary[i].len; 691 str += keysym_vocabulary[i].len;
673 break; 692 break;
674 } 693 }
675 } 694 }
676 695
677 if (i >= sizeof (keysym_vocabulary) / sizeof (keysym_vocabulary_t)) 696 if (i >= ecb_array_length (keysym_vocabulary))
678 return -1; 697 return -1;
679 698
680 if (*str == '-') 699 if (*str == '-')
681 ++str; 700 ++str;
682 } 701 }
… …
687 // fallback on hexadecimal parsing 706 // fallback on hexadecimal parsing
688 char *end; 707 char *end;
689 sym = strtol (str, &end, 16); 708 sym = strtol (str, &end, 16);
690 if (*end) 709 if (*end)
691 return -1; 710 return -1;
692 } 711 }
693 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)))
694 keyboard->register_user_translation (sym, state, arg); 715 keyboard->register_user_translation (sym, state, ws);
716 free (ws);
695 return 1; 717 return 1;
696} 718}
697 719
698# endif /* KEYSYM_RESOURCE */ 720# endif /* KEYSYM_RESOURCE */
699#endif /* NO_RESOURCES */ 721#endif /* NO_RESOURCES */
… …
742 XrmMergeDatabases (option_db, &database); 764 XrmMergeDatabases (option_db, &database);
743 option_db = NULL; 765 option_db = NULL;
744 /* 766 /*
745 * Query resources for options that affect us 767 * Query resources for options that affect us
746 */ 768 */
747 for (int entry = 0; entry < optList_size; entry++) 769 for (int entry = 0; entry < ecb_array_length (optList); entry++)
748 { 770 {
749 int s; 771 int s;
750 const char *kw = optList[entry].kw; 772 const char *kw = optList[entry].kw;
751 773
752 if (kw == NULL || rs[optList[entry].doff] != NULL) 774 if (kw == NULL || rs[optList[entry].doff] != NULL)
… …
772 794
773 set_option (optList[entry].index, s); 795 set_option (optList[entry].index, s);
774 } 796 }
775 } 797 }
776 } 798 }
799#endif /* NO_RESOURCES */
800}
777 801
802void
803rxvt_term::extract_keysym_resources ()
804{
805#ifndef NO_RESOURCES
778 /* 806 /*
779 * [R5 or later]: enumerate the resource database 807 * [R5 or later]: enumerate the resource database
780 */ 808 */
781# ifdef KEYSYM_RESOURCE 809# ifdef KEYSYM_RESOURCE
810 XrmDatabase database = XrmGetDatabase (dpy);
782 XrmName name_prefix[3]; 811 XrmName name_prefix[3];
783 XrmClass class_prefix[3]; 812 XrmClass class_prefix[3];
784 813
785 name_prefix[0] = XrmStringToName (rs[Rs_name]); 814 name_prefix[0] = XrmStringToName (rs[Rs_name]);
786 name_prefix[1] = XrmStringToName ("keysym"); 815 name_prefix[1] = XrmStringToName ("keysym");
… …
790 class_prefix[2] = NULLQUARK; 819 class_prefix[2] = NULLQUARK;
791 /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */ 820 /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */
792 XrmEnumerateDatabase (database, name_prefix, class_prefix, 821 XrmEnumerateDatabase (database, name_prefix, class_prefix,
793 XrmEnumOneLevel, rxvt_define_key, NULL); 822 XrmEnumOneLevel, rxvt_define_key, NULL);
794# ifdef RESFALLBACK 823# ifdef RESFALLBACK
795 name_prefix[0] = XrmStringToName (RESFALLBACK);
796 name_prefix[1] = XrmStringToName ("keysym");
797 class_prefix[0] = XrmStringToName (RESFALLBACK); 824 name_prefix[0] = class_prefix[0] = XrmStringToName (RESFALLBACK);
798 class_prefix[1] = XrmStringToName ("Keysym");
799 /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */ 825 /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */
800 XrmEnumerateDatabase (database, name_prefix, class_prefix, 826 XrmEnumerateDatabase (database, name_prefix, class_prefix,
801 XrmEnumOneLevel, rxvt_define_key, NULL); 827 XrmEnumOneLevel, rxvt_define_key, NULL);
802# endif 828# endif
803# endif 829# endif

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines