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.160 by sf-exg, Sun Dec 18 02:14:59 2011 UTC vs.
Revision 1.177 by root, Sun May 18 18:09:52 2014 UTC

… …
46 */ 46 */
47 47
48/* INFO () - descriptive information only */ 48/* INFO () - descriptive information only */
49#define INFO(opt, arg, desc) \ 49#define INFO(opt, arg, desc) \
50 {0, Optflag_Info, -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}
51 54
52/* STRG () - command-line option, with/without resource */ 55/* STRG () - command-line option, with/without resource */
53#define STRG(rsp, kw, opt, arg, desc) \ 56#define STRG(rsp, kw, opt, arg, desc) \
54 {0, 0, (rsp), (kw), (opt), (arg), (desc)} 57 {0, 0, (rsp), (kw), (opt), (arg), (desc)}
55 58
… …
108 STRG (Rs_scrollBar_thickness, "thickness", "sbt", "number", "scrollbar thickness/width in pixels"), 111 STRG (Rs_scrollBar_thickness, "thickness", "sbt", "number", "scrollbar thickness/width in pixels"),
109 BOOL (Rs_scrollTtyOutput, "scrollTtyOutput", NULL, Opt_scrollTtyOutput, 0, NULL), 112 BOOL (Rs_scrollTtyOutput, "scrollTtyOutput", NULL, Opt_scrollTtyOutput, 0, NULL),
110 BOOL (Rs_scrollTtyOutput, NULL, "si", Opt_scrollTtyOutput, Optflag_Reverse, "scroll-on-tty-output inhibit"), 113 BOOL (Rs_scrollTtyOutput, NULL, "si", Opt_scrollTtyOutput, Optflag_Reverse, "scroll-on-tty-output inhibit"),
111 BOOL (Rs_scrollTtyKeypress, "scrollTtyKeypress", "sk", Opt_scrollTtyKeypress, 0, "scroll-on-keypress"), 114 BOOL (Rs_scrollTtyKeypress, "scrollTtyKeypress", "sk", Opt_scrollTtyKeypress, 0, "scroll-on-keypress"),
112 BOOL (Rs_scrollWithBuffer, "scrollWithBuffer", "sw", Opt_scrollWithBuffer, 0, "scroll-with-buffer"), 115 BOOL (Rs_scrollWithBuffer, "scrollWithBuffer", "sw", Opt_scrollWithBuffer, 0, "scroll-with-buffer"),
113#if ENABLE_TRANSPARENCY 116#if BG_IMAGE_FROM_ROOT
114 BOOL (Rs_transparent, "inheritPixmap", "ip", Opt_transparent, 0, "inherit parent pixmap"), 117 BOOL (Rs_transparent, "inheritPixmap", "ip", Opt_transparent, 0, "inherit parent pixmap"),
115 BOOL (Rs_transparent, "transparent", "tr", Opt_transparent, 0, "inherit parent pixmap"), 118 BOOL (Rs_transparent, "transparent", "tr", Opt_transparent, 0, "inherit parent pixmap"),
116 STRG (Rs_color + Color_tint, "tintColor", "tint", "color", "tint color"), 119 STRG (Rs_color + Color_tint, "tintColor", "tint", "color", "tint color"),
117 STRG (Rs_shade, "shading", "sh", "number", "shade background by number %."), 120 STRG (Rs_shade, "shading", "sh", "number", "shade background by number %."),
118 STRG (Rs_blurradius, "blurRadius", "blr", "HxV", "gaussian blur radii to apply to the root background"), 121 STRG (Rs_blurradius, "blurRadius", "blr", "HxV", "gaussian blur radii to apply to the root background"),
… …
189 RSTRG (Rs_color + Color_cursor2, "cursorColor2", "color"), 192 RSTRG (Rs_color + Color_cursor2, "cursorColor2", "color"),
190#endif /* NO_CURSORCOLOR */ 193#endif /* NO_CURSORCOLOR */
191 STRG (Rs_color + Color_pointer_fg, "pointerColor", "pr", "color", "pointer color"), 194 STRG (Rs_color + Color_pointer_fg, "pointerColor", "pr", "color", "pointer color"),
192 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"),
193 STRG (Rs_color + Color_border, "borderColor", "bd", "color", "border color"), 196 STRG (Rs_color + Color_border, "borderColor", "bd", "color", "border color"),
194#ifdef BG_IMAGE_FROM_FILE 197#if BG_IMAGE_FROM_FILE
195 RSTRG (Rs_path, "path", "search path"), 198 RSTRG (Rs_path, "path", "search path"),
196 STRG (Rs_backgroundPixmap, "backgroundPixmap", "pixmap", "file[;geom]", "background pixmap"), 199 STRG (Rs_backgroundPixmap, "backgroundPixmap", "pixmap", "file[;geom]", "background pixmap"),
200#endif
197# if ENABLE_EWMH 201#if ENABLE_EWMH
198 STRG (Rs_iconfile, "iconFile", "icon", "file", "path to application icon image"), 202 STRG (Rs_iconfile, "iconFile", "icon", "file", "path to application icon image"),
199# endif
200#endif 203#endif
201 /* fonts: command-line option = resource name */ 204 /* fonts: command-line option = resource name */
202 STRG (Rs_font, "font", "fn", "fontname", "normal text font"), 205 STRG (Rs_font, "font", "fn", "fontname", "normal text font"),
203#if ENABLE_STYLES 206#if ENABLE_STYLES
204 STRG (Rs_boldFont, "boldFont", "fb", "fontname", "bold font"), 207 STRG (Rs_boldFont, "boldFont", "fb", "fontname", "bold font"),
205 STRG (Rs_italicFont, "italicFont", "fi", "fontname", "italic font"), 208 STRG (Rs_italicFont, "italicFont", "fi", "fontname", "italic font"),
206 STRG (Rs_boldItalicFont, "boldItalicFont", "fbi", "fontname", "bold italic font"), 209 STRG (Rs_boldItalicFont, "boldItalicFont", "fbi", "fontname", "bold italic font"),
207 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"),
208#endif 211#endif
209#ifdef USE_XIM 212#if USE_XIM
210 STRG (Rs_inputMethod, "inputMethod", "im", "name", "name of input method"), 213 STRG (Rs_inputMethod, "inputMethod", "im", "name", "name of input method"),
211 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"),
212 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"),
213 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"),
214#endif /* USE_XIM */ 217#endif /* USE_XIM */
… …
219 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"),
220#if ENABLE_XEMBED 223#if ENABLE_XEMBED
221 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"),
222#endif 225#endif
223#if XFT 226#if XFT
227 BOOL (Rs_buffered, "buffered", NULL, Opt_buffered, 0, NULL),
228#endif
229#if ENABLE_FRILLS
224 STRG (Rs_depth, "depth", "depth", "number", "depth of visual to request"), 230 STRG (Rs_depth, "depth", "depth", "number", "depth of visual to request"),
225 BOOL (Rs_buffered, "buffered", NULL, Opt_buffered, 0, NULL), 231 STRG (Rs_visual, "visual", "visual", "number", "visual id to request"),
226#endif
227#if ENABLE_FRILLS
228 RSTRG (Rs_transient_for, "transient-for", "windowid"), 232 RSTRG (Rs_transient_for, "transient-for", "windowid"),
229 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"),
230 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"),
231 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"),
232 STRG (Rs_ext_bwidth, "externalBorder", "w", "number", "external border in pixels"), 236 STRG (Rs_ext_bwidth, "externalBorder", "w", "number", "external border in pixels"),
… …
267#endif 271#endif
268#if ISO_14755 272#if ISO_14755
269 BOOL (Rs_iso14755, "iso14755", NULL, Opt_iso14755, 0, NULL), 273 BOOL (Rs_iso14755, "iso14755", NULL, Opt_iso14755, 0, NULL),
270 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),
271#endif 275#endif
272#ifdef HAVE_AFTERIMAGE 276#ifndef NO_RESOURCES
273 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"),
274#endif 281#endif
275 INFO ("e", "command arg ...", "command to execute") 282 INFO ("e", "command arg ...", "command to execute")
276 }; 283 };
277 284
278#undef INFO 285#undef INFO
286#undef RINFO
279#undef STRG 287#undef STRG
280#undef RSTRG 288#undef RSTRG
281#undef SWCH 289#undef SWCH
282#undef BOOL 290#undef BOOL
283 291
… …
326#endif 334#endif
327#if defined(ENABLE_TRANSPARENCY) 335#if defined(ENABLE_TRANSPARENCY)
328 "transparent," 336 "transparent,"
329 "tint," 337 "tint,"
330#endif 338#endif
331#if HAVE_AFTERIMAGE
332 "afterimage,"
333#endif
334#if HAVE_PIXBUF 339#if HAVE_PIXBUF
335 "pixbuf," 340 "pixbuf,"
336#endif 341#endif
337#if defined(USE_XIM) 342#if defined(USE_XIM)
338 "XIM," 343 "XIM,"
… …
380#if defined(XTERM_SCROLLBAR) 385#if defined(XTERM_SCROLLBAR)
381 "+xterm" 386 "+xterm"
382#endif 387#endif
383 "\nUsage: "; /* Usage */ 388 "\nUsage: "; /* Usage */
384 389
385#define INDENT 18 390#define INDENT 28
386 391
387const char rxvt_term::resval_undef [] = "<undef>"; 392const char rxvt_term::resval_undef [] = "<undef>";
388const char rxvt_term::resval_on [] = "on"; 393const char rxvt_term::resval_on [] = "on";
389const char rxvt_term::resval_off [] = "off"; 394const char rxvt_term::resval_off [] = "off";
390 395
391/*{{{ usage: */ 396/*{{{ usage: */
392/*----------------------------------------------------------------------*/ 397/*----------------------------------------------------------------------*/
393static void 398void
394rxvt_usage (int type) 399rxvt_term::rxvt_usage (int type)
395{ 400{
396 unsigned int i, col; 401 unsigned int i, col;
397 402
398 rxvt_log ("%s%s%s", releasestring, optionsstring, RESNAME); 403 rxvt_log ("%s%s%s", releasestring, optionsstring, RESNAME);
399 404
… …
407 { 412 {
408 int len = 0; 413 int len = 0;
409 414
410 if (optList[i].arg) 415 if (optList[i].arg)
411 len = strlen (optList[i].arg) + 1; 416 len = strlen (optList[i].arg) + 1;
417
412 assert (optList[i].opt != NULL); 418 assert (optList[i].opt != NULL);
413 len += 4 + strlen (optList[i].opt) + (optList_isBool (i) ? 2 : 0); 419 len += 4 + strlen (optList[i].opt) + (optList_isBool (i) ? 2 : 0);
414 col += len; 420 col += len;
421
415 if (col > 79) 422 if (col > 79)
416 { 423 {
417 /* assume regular width */ 424 /* assume regular width */
418 rxvt_log ("\n"); 425 rxvt_log ("\n");
419 col = 1 + len; 426 col = 1 + len;
420 } 427 }
421 428
422 rxvt_log (" [-%s%s", (optList_isBool (i) ? "/+" : ""), optList[i].opt); 429 rxvt_log (" [-%s%s", (optList_isBool (i) ? "/+" : ""), optList[i].opt);
430
423 if (optList[i].arg) 431 if (optList[i].arg)
424 rxvt_log (" %s]", optList[i].arg); 432 rxvt_log (" %s]", optList[i].arg);
425 else 433 else
426 rxvt_log ("]"); 434 rxvt_log ("]");
427 } 435 }
… …
440 + (optList_isBool (i) ? 0 : 2)), 448 + (optList_isBool (i) ? 0 : 2)),
441 (optList[i].arg ? optList[i].arg : ""), 449 (optList[i].arg ? optList[i].arg : ""),
442 (optList_isBool (i) ? "turn on/off " : ""), 450 (optList_isBool (i) ? "turn on/off " : ""),
443 optList[i].desc); 451 optList[i].desc);
444 } 452 }
453
454#if ENABLE_PERL
455 rxvt_perl.init (this);
456 rxvt_perl.usage (this, 1);
457#endif
458
445 rxvt_log ("\n --help to list long-options"); 459 rxvt_log ("\n --help to list long-options");
446 break; 460 break;
447 461
448 case 2: /* full resource listing */ 462 case 2: /* full resource listing */
449 rxvt_log (" [options] [-e command args]\n\n" 463 rxvt_log (" [options] [-e command args]\n\n"
… …
451 465
452 for (i = 0; i < ecb_array_length (optList); i++) 466 for (i = 0; i < ecb_array_length (optList); i++)
453 if (optList[i].kw != NULL) 467 if (optList[i].kw != NULL)
454 rxvt_log (" %s: %*s%s\n", 468 rxvt_log (" %s: %*s%s\n",
455 optList[i].kw, 469 optList[i].kw,
456 (INDENT - strlen (optList[i].kw)), "", /* XXX */ 470 (INDENT + 2 - strlen (optList[i].kw)), "", /* XXX */
457 (optList_isBool (i) ? "boolean" : optList[i].arg)); 471 (optList_isBool (i) ? "boolean" : optList[i].arg));
458#ifdef KEYSYM_RESOURCE 472
459 rxvt_log (" " "keysym.sym" ": %*s%s\n", 473#if ENABLE_PERL
460 (INDENT - sizeof ("keysym.sym") + 1), "", /* XXX */ 474 rxvt_perl.init (this);
461 "keysym"); 475 rxvt_perl.usage (this, 2);
462#endif 476#endif
477
463 rxvt_log ("\n -help to list options"); 478 rxvt_log ("\n -help to list options");
464 break; 479 break;
465 } 480 }
466 481
467 rxvt_log ("\n\n"); 482 rxvt_log ("\n\n");
… …
532 * default values 547 * default values
533 */ 548 */
534 549
535 if (optList[entry].doff != -1) 550 if (optList[entry].doff != -1)
536 { 551 {
537 if (flag && i+1 == argc) 552 if (flag && i + 1 == argc)
538 rxvt_fatal ("option '%s' requires an argument, aborting.\n", argv [i]); 553 rxvt_fatal ("option '%s' requires an argument, aborting.\n", argv [i]);
539 554
540 rs[optList[entry].doff] = flag ? argv[++i] : resval_undef; 555 rs[optList[entry].doff] = flag ? argv[++i] : resval_undef;
541 } 556 }
542 } 557 }
… …
550 } 565 }
551 } 566 }
552#ifndef NO_RESOURCES 567#ifndef NO_RESOURCES
553 else if (!strcmp (opt, "xrm")) 568 else if (!strcmp (opt, "xrm"))
554 { 569 {
555 if (i+1 < argc) 570 if (i + 1 < argc)
556 XrmPutLineResource (&option_db, argv[++i]); 571 XrmPutLineResource (&option_db, argv[++i]);
557 } 572 }
558#endif 573#endif
559#ifdef KEYSYM_RESOURCE 574#ifdef KEYSYM_RESOURCE
560 else if (!strncmp (opt, "keysym.", sizeof ("keysym.") - 1)) 575 else if (!strncmp (opt, "keysym.", sizeof ("keysym.") - 1))
561 { 576 {
562 if (i+1 < argc) 577 if (i + 1 < argc)
563 { 578 {
564 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);
565 sprintf (res, "*.%s: %s\n", opt, argv[i]); 580 sprintf (res, "*.%s: %s\n", opt, argv[i]);
566 XrmPutLineResource (&option_db, res); 581 XrmPutLineResource (&option_db, res);
567 } 582 }
568 } 583 }
569#endif 584#endif
570 else if (!strcmp (opt, "e")) 585 else if (!strcmp (opt, "e"))
571 { 586 {
572 if (i+1 == argc) 587 if (i + 1 < argc)
573 rxvt_fatal ("option '-e' requires an argument, aborting.\n");
574
575 return (const char **)argv + i + 1; 588 return (const char **)argv + i + 1;
589
590 rxvt_warn ("option '-e' requires an argument, aborting.\n");
591 bad_option = 1;
576 } 592 }
577 else 593 else
578 { 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]);
579 bad_option = 1; 605 bad_option = 1;
606 }
607 else
608 ++i;
609 }
610 }
611 else
612#endif
613 {
580 rxvt_warn ("\"%s\": unknown or malformed option.\n", opt); 614 rxvt_warn ("\"%s\": unknown or malformed option.\n", opt);
615 bad_option = 1;
616 }
581 } 617 }
582 } 618 }
583 619
584 if (bad_option) 620 if (bad_option)
585 rxvt_usage (0); 621 rxvt_usage (0);
… …
591 627
592#ifndef NO_RESOURCES 628#ifndef NO_RESOURCES
593/*----------------------------------------------------------------------*/ 629/*----------------------------------------------------------------------*/
594 630
595# ifdef KEYSYM_RESOURCE 631# ifdef KEYSYM_RESOURCE
632static void
633rxvt_define_key (rxvt_term *term, const char *k, const char *v)
634{
635 term->bind_action (k, v);
636}
637
596/* 638/*
597 * Define key from XrmEnumerateDatabase. 639 * Define key from XrmEnumerateDatabase.
598 * quarks will be something like 640 * quarks will be something like
599 * "rxvt" "keysym" "0xFF01" 641 * "rxvt" "keysym" "0xFF01"
600 * value will be a string 642 * value will be a string
601 */ 643 */
602static int 644static int
645rxvt_keysym_enumerate_helper (
603rxvt_define_key (XrmDatabase *database ecb_unused, 646 XrmDatabase *database ecb_unused,
604 XrmBindingList bindings ecb_unused, 647 XrmBindingList bindings ecb_unused,
605 XrmQuarkList quarks, 648 XrmQuarkList quarks,
606 XrmRepresentation *type ecb_unused, 649 XrmRepresentation *type ecb_unused,
607 XrmValue *value, 650 XrmValue *value,
608 XPointer closure ecb_unused) 651 XPointer closure
652)
609{ 653{
610 int last; 654 int last;
611 655
612 for (last = 0; quarks[last] != NULLQUARK; last++) /* look for last quark in list */ 656 for (last = 0; quarks[last] != NULLQUARK; last++) /* look for last quark in list */
613 ; 657 ;
614 658
615 last--; 659 rxvt_term *term = (rxvt_term *)(((void **)closure)[0]);
616 GET_R->parse_keysym (XrmQuarkToString (quarks[last]), (char *)value->addr);//D//TODO 660 void (*cb)(rxvt_term *, const char *, const char *)
661 = (void (*)(rxvt_term *, const char *, const char *))
662 (((void **)closure)[1]);
663
664 cb (term, XrmQuarkToString (quarks[last - 1]), (char *)value->addr);
665
617 return False; 666 return False;
618} 667}
619 668
620/* 669/*
621 * look for something like this (XK_Delete) 670 * look for something like this (XK_Delete)
… …
656 { "4", 1, Mod4Mask }, 705 { "4", 1, Mod4Mask },
657 { "5", 1, Mod5Mask }, 706 { "5", 1, Mod5Mask },
658}; 707};
659 708
660int 709int
661rxvt_term::parse_keysym (const char *str, const char *arg) 710rxvt_term::bind_action (const char *str, const char *arg)
662{ 711{
663 int sym; 712 int sym;
664 unsigned int state = 0; 713 unsigned int state = 0;
665 const char *key = strrchr (str, '-'); 714 const char *key = strrchr (str, '-');
666 715
… …
705 return -1; 754 return -1;
706 } 755 }
707 756
708 wchar_t *ws = rxvt_mbstowcs (arg); 757 wchar_t *ws = rxvt_mbstowcs (arg);
709 if (!HOOK_INVOKE ((this, HOOK_REGISTER_COMMAND, DT_INT, sym, DT_INT, state, DT_WCS_LEN, ws, wcslen (ws), DT_END))) 758 if (!HOOK_INVOKE ((this, HOOK_REGISTER_COMMAND, DT_INT, sym, DT_INT, state, DT_WCS_LEN, ws, wcslen (ws), DT_END)))
710 keyboard->register_user_translation (sym, state, ws); 759 keyboard->register_action (sym, state, ws);
760
711 free (ws); 761 free (ws);
712 return 1; 762 return 1;
713} 763}
714 764
715# endif /* KEYSYM_RESOURCE */ 765# endif /* KEYSYM_RESOURCE */
… …
793 } 843 }
794#endif /* NO_RESOURCES */ 844#endif /* NO_RESOURCES */
795} 845}
796 846
797void 847void
798rxvt_term::extract_keysym_resources () 848rxvt_term::enumerate_keysym_resources (void (*cb)(rxvt_term *, const char *, const char *))
799{ 849{
800#ifndef NO_RESOURCES 850#ifndef NO_RESOURCES
801 /* 851 /*
802 * [R5 or later]: enumerate the resource database 852 * [R5 or later]: enumerate the resource database
803 */ 853 */
804# ifdef KEYSYM_RESOURCE 854# ifdef KEYSYM_RESOURCE
855 void *closure[2] = {
856 (void *)this,
857 (void *)cb,
858 };
859
805 XrmDatabase database = XrmGetDatabase (dpy); 860 XrmDatabase database = XrmGetDatabase (dpy);
806 XrmName name_prefix[3]; 861 XrmName name_prefix[3];
807 XrmClass class_prefix[3]; 862 XrmClass class_prefix[3];
808 863
809 name_prefix[0] = XrmStringToName (rs[Rs_name]); 864 name_prefix[0] = XrmStringToName (rs[Rs_name]);
… …
812 class_prefix[0] = XrmStringToName (RESCLASS); 867 class_prefix[0] = XrmStringToName (RESCLASS);
813 class_prefix[1] = XrmStringToName ("Keysym"); 868 class_prefix[1] = XrmStringToName ("Keysym");
814 class_prefix[2] = NULLQUARK; 869 class_prefix[2] = NULLQUARK;
815 /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */ 870 /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */
816 XrmEnumerateDatabase (database, name_prefix, class_prefix, 871 XrmEnumerateDatabase (database, name_prefix, class_prefix,
817 XrmEnumOneLevel, rxvt_define_key, NULL); 872 XrmEnumOneLevel, rxvt_keysym_enumerate_helper, (XPointer)closure);
818# ifdef RESFALLBACK 873# ifdef RESFALLBACK
819 name_prefix[0] = class_prefix[0] = XrmStringToName (RESFALLBACK); 874 name_prefix[0] = class_prefix[0] = XrmStringToName (RESFALLBACK);
820 /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */ 875 /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */
821 XrmEnumerateDatabase (database, name_prefix, class_prefix, 876 XrmEnumerateDatabase (database, name_prefix, class_prefix,
822 XrmEnumOneLevel, rxvt_define_key, NULL); 877 XrmEnumOneLevel, rxvt_keysym_enumerate_helper, (XPointer)closure);
823# endif 878# endif
824# endif 879# endif
825 880
826#endif /* NO_RESOURCES */ 881#endif /* NO_RESOURCES */
827} 882}
828 883
884void
885rxvt_term::extract_keysym_resources ()
886{
887 enumerate_keysym_resources (rxvt_define_key);
888}
889
829/*----------------------- end-of-file (C source) -----------------------*/ 890/*----------------------- end-of-file (C source) -----------------------*/
891

Diff Legend

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