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.147 by sf-exg, Wed Oct 13 23:04:57 2010 UTC vs.
Revision 1.171 by sf-exg, Fri Jun 15 14:34:34 2012 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 */
… …
188 RSTRG (Rs_color + Color_cursor2, "cursorColor2", "color"), 192 RSTRG (Rs_color + Color_cursor2, "cursorColor2", "color"),
189#endif /* NO_CURSORCOLOR */ 193#endif /* NO_CURSORCOLOR */
190 STRG (Rs_color + Color_pointer_fg, "pointerColor", "pr", "color", "pointer color"), 194 STRG (Rs_color + Color_pointer_fg, "pointerColor", "pr", "color", "pointer color"),
191 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"),
192 STRG (Rs_color + Color_border, "borderColor", "bd", "color", "border color"), 196 STRG (Rs_color + Color_border, "borderColor", "bd", "color", "border color"),
193#ifdef BG_IMAGE_FROM_FILE 197#if BG_IMAGE_FROM_FILE
194 RSTRG (Rs_path, "path", "search path"), 198 RSTRG (Rs_path, "path", "search path"),
195 STRG (Rs_backgroundPixmap, "backgroundPixmap", "pixmap", "file[;geom]", "background pixmap"), 199 STRG (Rs_backgroundPixmap, "backgroundPixmap", "pixmap", "file[;geom]", "background pixmap"),
196# if ENABLE_EWMH 200# if ENABLE_EWMH
197 STRG (Rs_iconfile, "iconFile", "icon", "file", "path to application icon image"), 201 STRG (Rs_iconfile, "iconFile", "icon", "file", "path to application icon image"),
198# endif 202# endif
… …
203 STRG (Rs_boldFont, "boldFont", "fb", "fontname", "bold font"), 207 STRG (Rs_boldFont, "boldFont", "fb", "fontname", "bold font"),
204 STRG (Rs_italicFont, "italicFont", "fi", "fontname", "italic font"), 208 STRG (Rs_italicFont, "italicFont", "fi", "fontname", "italic font"),
205 STRG (Rs_boldItalicFont, "boldItalicFont", "fbi", "fontname", "bold italic font"), 209 STRG (Rs_boldItalicFont, "boldItalicFont", "fbi", "fontname", "bold italic font"),
206 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"),
207#endif 211#endif
208#ifdef USE_XIM 212#if USE_XIM
209 STRG (Rs_inputMethod, "inputMethod", "im", "name", "name of input method"), 213 STRG (Rs_inputMethod, "inputMethod", "im", "name", "name of input method"),
210 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"),
211 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"),
212 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"),
213#endif /* USE_XIM */ 217#endif /* USE_XIM */
… …
218 STRG (Rs_saveLines, "saveLines", "sl", "number", "number of scrolled lines to save"), 222 STRG (Rs_saveLines, "saveLines", "sl", "number", "number of scrolled lines to save"),
219#if ENABLE_XEMBED 223#if ENABLE_XEMBED
220 STRG (Rs_embed, NULL, "embed", "windowid", "window id to embed terminal in"), 224 STRG (Rs_embed, NULL, "embed", "windowid", "window id to embed terminal in"),
221#endif 225#endif
222#if XFT 226#if XFT
227 BOOL (Rs_buffered, "buffered", NULL, Opt_buffered, 0, NULL),
228#endif
229#if ENABLE_FRILLS
223 STRG (Rs_depth, "depth", "depth", "number", "depth of visual to request"), 230 STRG (Rs_depth, "depth", "depth", "number", "depth of visual to request"),
224 BOOL (Rs_buffered, "buffered", NULL, Opt_buffered, 0, NULL), 231 STRG (Rs_visual, "visual", "visual", "number", "visual id to request"),
225#endif
226#if ENABLE_FRILLS
227 RSTRG (Rs_transient_for, "transient-for", "windowid"), 232 RSTRG (Rs_transient_for, "transient-for", "windowid"),
228 BOOL (Rs_override_redirect, "override-redirect", "override-redirect", Opt_override_redirect, 0, "set override-redirect on the terminal window"), 233 BOOL (Rs_override_redirect, "override-redirect", "override-redirect", Opt_override_redirect, 0, "set override-redirect on the terminal window"),
229 STRG (Rs_pty_fd, NULL, "pty-fd", "fileno", "file descriptor of pty to use"), 234 STRG (Rs_pty_fd, NULL, "pty-fd", "fileno", "file descriptor of pty to use"),
230 BOOL (Rs_hold, "hold", "hold", Opt_hold, 0, "retain window after shell exit"), 235 BOOL (Rs_hold, "hold", "hold", Opt_hold, 0, "retain window after shell exit"),
231 STRG (Rs_ext_bwidth, "externalBorder", "w", "number", "external border in pixels"), 236 STRG (Rs_ext_bwidth, "externalBorder", "w", "number", "external border in pixels"),
… …
266#endif 271#endif
267#if ISO_14755 272#if ISO_14755
268 BOOL (Rs_iso14755, "iso14755", NULL, Opt_iso14755, 0, NULL), 273 BOOL (Rs_iso14755, "iso14755", NULL, Opt_iso14755, 0, NULL),
269 BOOL (Rs_iso14755_52, "iso14755_52", NULL, Opt_iso14755_52, 0, NULL), 274 BOOL (Rs_iso14755_52, "iso14755_52", NULL, Opt_iso14755_52, 0, NULL),
270#endif 275#endif
271#ifdef HAVE_AFTERIMAGE 276#ifndef NO_RESOURCES
272 STRG (Rs_blendtype, "blendType", "blt", "string", "background image blending type - alpha, tint, etc..."), 277 RINFO ("xrm", "string"),
278#endif
279#ifdef KEYSYM_RESOURCE
280 RINFO ("keysym.sym", "keysym"),
273#endif 281#endif
274 INFO ("e", "command arg ...", "command to execute") 282 INFO ("e", "command arg ...", "command to execute")
275 }; 283 };
276 284
277#undef INFO 285#undef INFO
286#undef RINFO
278#undef STRG 287#undef STRG
279#undef RSTRG 288#undef RSTRG
280#undef SWCH 289#undef SWCH
281#undef BOOL 290#undef BOOL
282 291
… …
325#endif 334#endif
326#if defined(ENABLE_TRANSPARENCY) 335#if defined(ENABLE_TRANSPARENCY)
327 "transparent," 336 "transparent,"
328 "tint," 337 "tint,"
329#endif 338#endif
330#if HAVE_AFTERIMAGE 339#if HAVE_PIXBUF
331 "afterimage," 340 "pixbuf,"
332#endif 341#endif
333#if defined(USE_XIM) 342#if defined(USE_XIM)
334 "XIM," 343 "XIM,"
335#endif 344#endif
336#if defined(NO_BACKSPACE_KEY) 345#if defined(NO_BACKSPACE_KEY)
… …
376#if defined(XTERM_SCROLLBAR) 385#if defined(XTERM_SCROLLBAR)
377 "+xterm" 386 "+xterm"
378#endif 387#endif
379 "\nUsage: "; /* Usage */ 388 "\nUsage: "; /* Usage */
380 389
381#define INDENT 18 390#define INDENT 28
382 391
383const char rxvt_term::resval_undef [] = "<undef>"; 392const char rxvt_term::resval_undef [] = "<undef>";
384const char rxvt_term::resval_on [] = "on"; 393const char rxvt_term::resval_on [] = "on";
385const char rxvt_term::resval_off [] = "off"; 394const char rxvt_term::resval_off [] = "off";
386 395
387/*{{{ usage: */ 396/*{{{ usage: */
388/*----------------------------------------------------------------------*/ 397/*----------------------------------------------------------------------*/
389static void 398void
390rxvt_usage (int type) 399rxvt_term::rxvt_usage (int type)
391{ 400{
392 unsigned int i, col; 401 unsigned int i, col;
393 402
394 rxvt_log ("%s%s%s", releasestring, optionsstring, RESNAME); 403 rxvt_log ("%s%s%s", releasestring, optionsstring, RESNAME);
395 404
396 switch (type) 405 switch (type)
397 { 406 {
398 case 0: /* brief listing */ 407 case 0: /* brief listing */
399 rxvt_log (" [-help] [--help]\n"); 408 rxvt_log (" [-help] [--help]\n");
400 409
401 for (col = 1, i = 0; i < optList_size; i++) 410 for (col = 1, i = 0; i < ecb_array_length (optList); i++)
402 if (optList[i].desc != NULL) 411 if (optList[i].desc != NULL)
403 { 412 {
404 int len = 0; 413 int len = 0;
405 414
406 if (optList[i].arg) 415 if (optList[i].arg)
407 len = strlen (optList[i].arg) + 1; 416 len = strlen (optList[i].arg) + 1;
417
408 assert (optList[i].opt != NULL); 418 assert (optList[i].opt != NULL);
409 len += 4 + strlen (optList[i].opt) + (optList_isBool (i) ? 2: 0); 419 len += 4 + strlen (optList[i].opt) + (optList_isBool (i) ? 2 : 0);
410 col += len; 420 col += len;
421
411 if (col > 79) 422 if (col > 79)
412 { 423 {
413 /* assume regular width */ 424 /* assume regular width */
414 rxvt_log ("\n"); 425 rxvt_log ("\n");
415 col = 1 + len; 426 col = 1 + len;
416 } 427 }
417 428
418 rxvt_log (" [-%s%s", (optList_isBool (i) ? "/+" : ""), optList[i].opt); 429 rxvt_log (" [-%s%s", (optList_isBool (i) ? "/+" : ""), optList[i].opt);
430
419 if (optList[i].arg) 431 if (optList[i].arg)
420 rxvt_log (" %s]", optList[i].arg); 432 rxvt_log (" %s]", optList[i].arg);
421 else 433 else
422 rxvt_log ("]"); 434 rxvt_log ("]");
423 } 435 }
424 break; 436 break;
425 437
426 case 1: /* full command-line listing */ 438 case 1: /* full command-line listing */
427 rxvt_log (" [options] [-e command args]\n\nwhere options include:\n"); 439 rxvt_log (" [options] [-e command args]\n\nwhere options include:\n");
428 440
429 for (i = 0; i < optList_size; i++) 441 for (i = 0; i < ecb_array_length (optList); i++)
430 if (optList[i].desc != NULL) 442 if (optList[i].desc != NULL)
431 { 443 {
432 assert (optList[i].opt != NULL); 444 assert (optList[i].opt != NULL);
433 rxvt_log (" %s%s %-*s%s%s\n", 445 rxvt_log (" %s%s %-*s%s%s\n",
434 (optList_isBool (i) ? "-/+" : "-"), optList[i].opt, 446 (optList_isBool (i) ? "-/+" : "-"), optList[i].opt,
… …
436 + (optList_isBool (i) ? 0 : 2)), 448 + (optList_isBool (i) ? 0 : 2)),
437 (optList[i].arg ? optList[i].arg : ""), 449 (optList[i].arg ? optList[i].arg : ""),
438 (optList_isBool (i) ? "turn on/off " : ""), 450 (optList_isBool (i) ? "turn on/off " : ""),
439 optList[i].desc); 451 optList[i].desc);
440 } 452 }
453
454#if ENABLE_PERL
455 rxvt_perl.init (this);
456 rxvt_perl.usage (this, 1);
457#endif
458
441 rxvt_log ("\n --help to list long-options"); 459 rxvt_log ("\n --help to list long-options");
442 break; 460 break;
443 461
444 case 2: /* full resource listing */ 462 case 2: /* full resource listing */
445 rxvt_log (" [options] [-e command args]\n\n" 463 rxvt_log (" [options] [-e command args]\n\n"
446 "where resources (long-options) include:\n"); 464 "where resources (long-options) include:\n");
447 465
448 for (i = 0; i < optList_size; i++) 466 for (i = 0; i < ecb_array_length (optList); i++)
449 if (optList[i].kw != NULL) 467 if (optList[i].kw != NULL)
450 rxvt_log (" %s: %*s%s\n", 468 rxvt_log (" %s: %*s%s\n",
451 optList[i].kw, 469 optList[i].kw,
452 (INDENT - strlen (optList[i].kw)), "", /* XXX */ 470 (INDENT + 2 - strlen (optList[i].kw)), "", /* XXX */
453 (optList_isBool (i) ? "boolean" : optList[i].arg)); 471 (optList_isBool (i) ? "boolean" : optList[i].arg));
454#ifdef KEYSYM_RESOURCE 472
455 rxvt_log (" " "keysym.sym" ": %*s%s\n", 473#if ENABLE_PERL
456 (INDENT - sizeof ("keysym.sym") + 1), "", /* XXX */ 474 rxvt_perl.init (this);
457 "keysym"); 475 rxvt_perl.usage (this, 2);
458#endif 476#endif
477
459 rxvt_log ("\n -help to list options"); 478 rxvt_log ("\n -help to list options");
460 break; 479 break;
461 } 480 }
462 481
463 rxvt_log ("\n\n"); 482 rxvt_log ("\n\n");
464 rxvt_exit_failure (); 483 rxvt_exit_failure ();
465 /* NOTREACHED */
466} 484}
467 485
468/*}}} */ 486/*}}} */
469 487
470/*{{{ get command-line options before getting resources */ 488/*{{{ get command-line options before getting resources */
471void 489const char **
472rxvt_term::get_options (int argc, const char *const *argv) 490rxvt_term::get_options (int argc, const char *const *argv)
473{ 491{
474 int i, bad_option = 0; 492 int i, bad_option = 0;
475 493
476 for (i = 1; i < argc; i++) 494 for (i = 1; i < argc; i++)
… …
507 525
508 if (!strcmp (opt, "h")) 526 if (!strcmp (opt, "h"))
509 rxvt_usage (0); 527 rxvt_usage (0);
510 528
511 /* feature: always try to match long-options */ 529 /* feature: always try to match long-options */
512 for (entry = 0; entry < optList_size; entry++) 530 for (entry = 0; entry < ecb_array_length (optList); entry++)
513 if ((optList[entry].kw && !strcmp (opt, optList[entry].kw)) 531 if ((optList[entry].kw && !strcmp (opt, optList[entry].kw))
514 || (!longopt 532 || (!longopt
515 && optList[entry].opt && !strcmp (opt, optList[entry].opt))) 533 && optList[entry].opt && !strcmp (opt, optList[entry].opt)))
516 break; 534 break;
517 535
518 if (entry < optList_size) 536 if (entry < ecb_array_length (optList)
537 && !optList_isInfo (entry))
519 { 538 {
520 if (optList_isReverse (entry)) 539 if (optList_isReverse (entry))
521 flag = !flag; 540 flag = !flag;
522 541
523 if (optList_isString (entry)) 542 if (optList_isString (entry))
524 { 543 {
525 /* 544 /*
526 * special cases are handled in main.c:main () to allow 545 * special cases are handled in init_resources () to allow
527 * X resources to set these values before we settle for 546 * X resources to set these values before we settle for
528 * default values 547 * default values
529 */ 548 */
530 549
531 if (optList[entry].doff != -1) 550 if (optList[entry].doff != -1)
532 { 551 {
533 if (flag && i+1 == argc) 552 if (flag && i + 1 == argc)
534 rxvt_fatal ("option '%s' requires an argument, aborting.\n", argv [i]); 553 rxvt_fatal ("option '%s' requires an argument, aborting.\n", argv [i]);
535 554
536 rs[optList[entry].doff] = flag ? argv[++i] : resval_undef; 555 rs[optList[entry].doff] = flag ? argv[++i] : resval_undef;
537 } 556 }
538 } 557 }
… …
546 } 565 }
547 } 566 }
548#ifndef NO_RESOURCES 567#ifndef NO_RESOURCES
549 else if (!strcmp (opt, "xrm")) 568 else if (!strcmp (opt, "xrm"))
550 { 569 {
551 if (i+1 < argc) 570 if (i + 1 < argc)
552 XrmPutLineResource (&option_db, argv[++i]); 571 XrmPutLineResource (&option_db, argv[++i]);
553 } 572 }
554#endif 573#endif
555#ifdef KEYSYM_RESOURCE 574#ifdef KEYSYM_RESOURCE
556 else if (!strncmp (opt, "keysym.", sizeof ("keysym.") - 1)) 575 else if (!strncmp (opt, "keysym.", sizeof ("keysym.") - 1))
557 { 576 {
558 if (i+1 < argc) 577 if (i + 1 < argc)
559 { 578 {
560 char *res = rxvt_temp_buf<char> (strlen (opt) + strlen (argv[++i]) + 6); 579 char *res = rxvt_temp_buf<char> (strlen (opt) + strlen (argv[++i]) + 6);
561 sprintf (res, "*.%s: %s\n", opt, argv[i]); 580 sprintf (res, "*.%s: %s\n", opt, argv[i]);
562 XrmPutLineResource (&option_db, res); 581 XrmPutLineResource (&option_db, res);
563 } 582 }
564 } 583 }
565#endif 584#endif
585 else if (!strcmp (opt, "e"))
586 {
587 if (i + 1 < argc)
588 return (const char **)argv + i + 1;
589
590 rxvt_warn ("option '-e' requires an argument, aborting.\n");
591 bad_option = 1;
592 }
566 else 593 else
567 { 594 {
595#if ENABLE_PERL
596 rxvt_perl.init (this);
597
598 if (int flags = rxvt_perl.parse_resource (this, opt, true, longopt, flag, argv [i + 1]))
599 {
600 if (flags & rxvt_perl.RESOURCE_ARG)
601 {
602 if (i + 1 == argc)
603 {
604 rxvt_warn ("option '%s' requires an argument.\n", argv [i]);
568 bad_option = 1; 605 bad_option = 1;
606 }
607 else
608 ++i;
609 }
610 }
611 else
612#endif
613 {
569 rxvt_warn ("\"%s\": unknown or malformed option.\n", opt); 614 rxvt_warn ("\"%s\": unknown or malformed option.\n", opt);
615 bad_option = 1;
616 }
570 } 617 }
571 } 618 }
572 619
573 if (bad_option) 620 if (bad_option)
574 rxvt_usage (0); 621 rxvt_usage (0);
622
623 return 0;
575} 624}
576 625
577/*}}} */ 626/*}}} */
578 627
579#ifndef NO_RESOURCES 628#ifndef NO_RESOURCES
… …
584 * Define key from XrmEnumerateDatabase. 633 * Define key from XrmEnumerateDatabase.
585 * quarks will be something like 634 * quarks will be something like
586 * "rxvt" "keysym" "0xFF01" 635 * "rxvt" "keysym" "0xFF01"
587 * value will be a string 636 * value will be a string
588 */ 637 */
589/* ARGSUSED */ 638static int
590int
591rxvt_define_key (XrmDatabase *database UNUSED, 639rxvt_define_key (XrmDatabase *database ecb_unused,
592 XrmBindingList bindings UNUSED, 640 XrmBindingList bindings ecb_unused,
593 XrmQuarkList quarks, 641 XrmQuarkList quarks,
594 XrmRepresentation *type UNUSED, 642 XrmRepresentation *type ecb_unused,
595 XrmValue *value, 643 XrmValue *value,
596 XPointer closure UNUSED) 644 XPointer closure ecb_unused)
597{ 645{
598 int last; 646 int last;
599 647
600 for (last = 0; quarks[last] != NULLQUARK; last++) /* look for last quark in list */ 648 for (last = 0; quarks[last] != NULLQUARK; last++) /* look for last quark in list */
601 ; 649 ;
… …
664 // parse modifiers 712 // parse modifiers
665 while (str < key) 713 while (str < key)
666 { 714 {
667 unsigned int i; 715 unsigned int i;
668 716
669 for (i=0; i < sizeof (keysym_vocabulary) / sizeof (keysym_vocabulary_t); ++i) 717 for (i = 0; i < ecb_array_length (keysym_vocabulary); ++i)
670 { 718 {
671 if (strncmp (str, keysym_vocabulary [i].name, keysym_vocabulary [i].len) == 0) 719 if (strncmp (str, keysym_vocabulary [i].name, keysym_vocabulary [i].len) == 0)
672 { 720 {
673 state |= keysym_vocabulary[i].value; 721 state |= keysym_vocabulary[i].value;
674 str += keysym_vocabulary[i].len; 722 str += keysym_vocabulary[i].len;
675 break; 723 break;
676 } 724 }
677 } 725 }
678 726
679 if (i >= sizeof (keysym_vocabulary) / sizeof (keysym_vocabulary_t)) 727 if (i >= ecb_array_length (keysym_vocabulary))
680 return -1; 728 return -1;
681 729
682 if (*str == '-') 730 if (*str == '-')
683 ++str; 731 ++str;
684 } 732 }
… …
691 sym = strtol (str, &end, 16); 739 sym = strtol (str, &end, 16);
692 if (*end) 740 if (*end)
693 return -1; 741 return -1;
694 } 742 }
695 743
744 wchar_t *ws = rxvt_mbstowcs (arg);
745 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); 746 keyboard->register_user_translation (sym, state, ws);
747 free (ws);
697 return 1; 748 return 1;
698} 749}
699 750
700# endif /* KEYSYM_RESOURCE */ 751# endif /* KEYSYM_RESOURCE */
701#endif /* NO_RESOURCES */ 752#endif /* NO_RESOURCES */
… …
744 XrmMergeDatabases (option_db, &database); 795 XrmMergeDatabases (option_db, &database);
745 option_db = NULL; 796 option_db = NULL;
746 /* 797 /*
747 * Query resources for options that affect us 798 * Query resources for options that affect us
748 */ 799 */
749 for (int entry = 0; entry < optList_size; entry++) 800 for (int entry = 0; entry < ecb_array_length (optList); entry++)
750 { 801 {
751 int s; 802 int s;
752 const char *kw = optList[entry].kw; 803 const char *kw = optList[entry].kw;
753 804
754 if (kw == NULL || rs[optList[entry].doff] != NULL) 805 if (kw == NULL || rs[optList[entry].doff] != NULL)
… …
774 825
775 set_option (optList[entry].index, s); 826 set_option (optList[entry].index, s);
776 } 827 }
777 } 828 }
778 } 829 }
830#endif /* NO_RESOURCES */
831}
779 832
833void
834rxvt_term::extract_keysym_resources ()
835{
836#ifndef NO_RESOURCES
780 /* 837 /*
781 * [R5 or later]: enumerate the resource database 838 * [R5 or later]: enumerate the resource database
782 */ 839 */
783# ifdef KEYSYM_RESOURCE 840# ifdef KEYSYM_RESOURCE
841 XrmDatabase database = XrmGetDatabase (dpy);
784 XrmName name_prefix[3]; 842 XrmName name_prefix[3];
785 XrmClass class_prefix[3]; 843 XrmClass class_prefix[3];
786 844
787 name_prefix[0] = XrmStringToName (rs[Rs_name]); 845 name_prefix[0] = XrmStringToName (rs[Rs_name]);
788 name_prefix[1] = XrmStringToName ("keysym"); 846 name_prefix[1] = XrmStringToName ("keysym");
… …
792 class_prefix[2] = NULLQUARK; 850 class_prefix[2] = NULLQUARK;
793 /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */ 851 /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */
794 XrmEnumerateDatabase (database, name_prefix, class_prefix, 852 XrmEnumerateDatabase (database, name_prefix, class_prefix,
795 XrmEnumOneLevel, rxvt_define_key, NULL); 853 XrmEnumOneLevel, rxvt_define_key, NULL);
796# ifdef RESFALLBACK 854# ifdef RESFALLBACK
797 name_prefix[0] = XrmStringToName (RESFALLBACK);
798 name_prefix[1] = XrmStringToName ("keysym");
799 class_prefix[0] = XrmStringToName (RESFALLBACK); 855 name_prefix[0] = class_prefix[0] = XrmStringToName (RESFALLBACK);
800 class_prefix[1] = XrmStringToName ("Keysym");
801 /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */ 856 /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */
802 XrmEnumerateDatabase (database, name_prefix, class_prefix, 857 XrmEnumerateDatabase (database, name_prefix, class_prefix,
803 XrmEnumOneLevel, rxvt_define_key, NULL); 858 XrmEnumOneLevel, rxvt_define_key, NULL);
804# endif 859# endif
805# endif 860# endif

Diff Legend

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