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.161 by sf-exg, Sun Dec 18 02:25:12 2011 UTC vs.
Revision 1.188 by sf-exg, Tue May 12 13:55:04 2015 UTC

… …
9 * Copyright (c) 2003-2006 Marc Lehmann <schmorp@schmorp.de> 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 3 of the License, or
15 * (at your option) any later version. 15 * (at your option) any later version.
16 * 16 *
17 * This program is distributed in the hope that it will be useful, 17 * This program is distributed in the hope that it will be useful,
18 * but WITHOUT ANY WARRANTY; without even the implied warranty of 18 * but WITHOUT ANY WARRANTY; without even the implied warranty of
19 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 19 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
… …
96 STRG (Rs_geometry, "geometry", "geometry", "geometry", "size (in characters) and position"), 96 STRG (Rs_geometry, "geometry", "geometry", "geometry", "size (in characters) and position"),
97 SWCH ("C", Opt_console, 0, "intercept console messages"), 97 SWCH ("C", Opt_console, 0, "intercept console messages"),
98 SWCH ("iconic", Opt_iconic, 0, "start iconic"), 98 SWCH ("iconic", Opt_iconic, 0, "start iconic"),
99 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"), 100 STRG (Rs_chdir, "chdir", "cd", "string", "start shell in this directory"),
101 SWCH ("dockapp", Opt_dockapp, 0, "start as dockapp"),
101 BOOL (Rs_reverseVideo, "reverseVideo", "rv", Opt_reverseVideo, 0, "reverse video"), 102 BOOL (Rs_reverseVideo, "reverseVideo", "rv", Opt_reverseVideo, 0, "reverse video"),
102 BOOL (Rs_loginShell, "loginShell", "ls", Opt_loginShell, 0, "login shell"), 103 BOOL (Rs_loginShell, "loginShell", "ls", Opt_loginShell, 0, "login shell"),
104 STRG (Rs_multiClickTime, "multiClickTime", "mc", "number", "maximum time (in ms) between multi-click selections"),
103 BOOL (Rs_jumpScroll, "jumpScroll", "j", Opt_jumpScroll, 0, "jump scrolling"), 105 BOOL (Rs_jumpScroll, "jumpScroll", "j", Opt_jumpScroll, 0, "jump scrolling"),
104 BOOL (Rs_skipScroll, "skipScroll", "ss", Opt_skipScroll, 0, "skip scrolling"), 106 BOOL (Rs_skipScroll, "skipScroll", "ss", Opt_skipScroll, 0, "skip scrolling"),
105 BOOL (Rs_pastableTabs, "pastableTabs", "ptab", Opt_pastableTabs, 0, "tab characters are pastable"), 107 BOOL (Rs_pastableTabs, "pastableTabs", "ptab", Opt_pastableTabs, 0, "tab characters are pastable"),
106 RSTRG (Rs_scrollstyle, "scrollstyle", "mode"), 108 RSTRG (Rs_scrollstyle, "scrollstyle", "mode"),
107 BOOL (Rs_scrollBar, "scrollBar", "sb", Opt_scrollBar, 0, "scrollbar"), 109 BOOL (Rs_scrollBar, "scrollBar", "sb", Opt_scrollBar, 0, "scrollbar"),
… …
111 STRG (Rs_scrollBar_thickness, "thickness", "sbt", "number", "scrollbar thickness/width in pixels"), 113 STRG (Rs_scrollBar_thickness, "thickness", "sbt", "number", "scrollbar thickness/width in pixels"),
112 BOOL (Rs_scrollTtyOutput, "scrollTtyOutput", NULL, Opt_scrollTtyOutput, 0, NULL), 114 BOOL (Rs_scrollTtyOutput, "scrollTtyOutput", NULL, Opt_scrollTtyOutput, 0, NULL),
113 BOOL (Rs_scrollTtyOutput, NULL, "si", Opt_scrollTtyOutput, Optflag_Reverse, "scroll-on-tty-output inhibit"), 115 BOOL (Rs_scrollTtyOutput, NULL, "si", Opt_scrollTtyOutput, Optflag_Reverse, "scroll-on-tty-output inhibit"),
114 BOOL (Rs_scrollTtyKeypress, "scrollTtyKeypress", "sk", Opt_scrollTtyKeypress, 0, "scroll-on-keypress"), 116 BOOL (Rs_scrollTtyKeypress, "scrollTtyKeypress", "sk", Opt_scrollTtyKeypress, 0, "scroll-on-keypress"),
115 BOOL (Rs_scrollWithBuffer, "scrollWithBuffer", "sw", Opt_scrollWithBuffer, 0, "scroll-with-buffer"), 117 BOOL (Rs_scrollWithBuffer, "scrollWithBuffer", "sw", Opt_scrollWithBuffer, 0, "scroll-with-buffer"),
116#if ENABLE_TRANSPARENCY 118#if BG_IMAGE_FROM_ROOT
117 BOOL (Rs_transparent, "inheritPixmap", "ip", Opt_transparent, 0, "inherit parent pixmap"), 119 BOOL (Rs_transparent, "inheritPixmap", "ip", Opt_transparent, 0, "inherit parent pixmap"),
118 BOOL (Rs_transparent, "transparent", "tr", Opt_transparent, 0, "inherit parent pixmap"), 120 BOOL (Rs_transparent, "transparent", "tr", Opt_transparent, 0, "inherit parent pixmap"),
119 STRG (Rs_color + Color_tint, "tintColor", "tint", "color", "tint color"), 121 STRG (Rs_color + Color_tint, "tintColor", "tint", "color", "tint color"),
120 STRG (Rs_shade, "shading", "sh", "number", "shade background by number %."), 122 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"), 123 STRG (Rs_blurradius, "blurRadius", "blr", "HxV", "gaussian blur radii to apply to the root background"),
… …
192 RSTRG (Rs_color + Color_cursor2, "cursorColor2", "color"), 194 RSTRG (Rs_color + Color_cursor2, "cursorColor2", "color"),
193#endif /* NO_CURSORCOLOR */ 195#endif /* NO_CURSORCOLOR */
194 STRG (Rs_color + Color_pointer_fg, "pointerColor", "pr", "color", "pointer color"), 196 STRG (Rs_color + Color_pointer_fg, "pointerColor", "pr", "color", "pointer color"),
195 STRG (Rs_color + Color_pointer_bg, "pointerColor2", "pr2", "color", "pointer bg color"), 197 STRG (Rs_color + Color_pointer_bg, "pointerColor2", "pr2", "color", "pointer bg color"),
196 STRG (Rs_color + Color_border, "borderColor", "bd", "color", "border color"), 198 STRG (Rs_color + Color_border, "borderColor", "bd", "color", "border color"),
197#ifdef BG_IMAGE_FROM_FILE 199#if BG_IMAGE_FROM_FILE
198 RSTRG (Rs_path, "path", "search path"), 200 RSTRG (Rs_path, "path", "search path"),
199 STRG (Rs_backgroundPixmap, "backgroundPixmap", "pixmap", "file[;geom]", "background pixmap"), 201 STRG (Rs_backgroundPixmap, "backgroundPixmap", "pixmap", "file[;geom]", "background pixmap"),
202#endif
200# if ENABLE_EWMH 203#if ENABLE_EWMH
201 STRG (Rs_iconfile, "iconFile", "icon", "file", "path to application icon image"), 204 STRG (Rs_iconfile, "iconFile", "icon", "file", "path to application icon image"),
202# endif
203#endif 205#endif
204 /* fonts: command-line option = resource name */ 206 /* fonts: command-line option = resource name */
205 STRG (Rs_font, "font", "fn", "fontname", "normal text font"), 207 STRG (Rs_font, "font", "fn", "fontname", "normal text font"),
206#if ENABLE_STYLES 208#if ENABLE_STYLES
207 STRG (Rs_boldFont, "boldFont", "fb", "fontname", "bold font"), 209 STRG (Rs_boldFont, "boldFont", "fb", "fontname", "bold font"),
208 STRG (Rs_italicFont, "italicFont", "fi", "fontname", "italic font"), 210 STRG (Rs_italicFont, "italicFont", "fi", "fontname", "italic font"),
209 STRG (Rs_boldItalicFont, "boldItalicFont", "fbi", "fontname", "bold italic font"), 211 STRG (Rs_boldItalicFont, "boldItalicFont", "fbi", "fontname", "bold italic font"),
210 BOOL (Rs_intensityStyles, "intensityStyles", "is", Opt_intensityStyles, 0, "font styles imply intensity changes"), 212 BOOL (Rs_intensityStyles, "intensityStyles", "is", Opt_intensityStyles, 0, "font styles imply intensity changes"),
211#endif 213#endif
212#ifdef USE_XIM 214#if USE_XIM
213 STRG (Rs_inputMethod, "inputMethod", "im", "name", "name of input method"), 215 STRG (Rs_inputMethod, "inputMethod", "im", "name", "name of input method"),
214 STRG (Rs_preeditType, "preeditType", "pt", "style", "input style: style = OverTheSpot|OffTheSpot|Root"), 216 STRG (Rs_preeditType, "preeditType", "pt", "style", "input style: style = OverTheSpot|OffTheSpot|Root"),
215 STRG (Rs_imLocale, "imLocale", "imlocale", "string", "locale to use for input method"), 217 STRG (Rs_imLocale, "imLocale", "imlocale", "string", "locale to use for input method"),
216 STRG (Rs_imFont, "imFont", "imfont", "fontname", "fontset for styles OverTheSpot and OffTheSpot"), 218 STRG (Rs_imFont, "imFont", "imfont", "fontname", "fontset for styles OverTheSpot and OffTheSpot"),
217#endif /* USE_XIM */ 219#endif /* USE_XIM */
… …
222 STRG (Rs_saveLines, "saveLines", "sl", "number", "number of scrolled lines to save"), 224 STRG (Rs_saveLines, "saveLines", "sl", "number", "number of scrolled lines to save"),
223#if ENABLE_XEMBED 225#if ENABLE_XEMBED
224 STRG (Rs_embed, NULL, "embed", "windowid", "window id to embed terminal in"), 226 STRG (Rs_embed, NULL, "embed", "windowid", "window id to embed terminal in"),
225#endif 227#endif
226#if XFT 228#if XFT
229 BOOL (Rs_buffered, "buffered", NULL, Opt_buffered, 0, NULL),
230#endif
231#if ENABLE_FRILLS
227 STRG (Rs_depth, "depth", "depth", "number", "depth of visual to request"), 232 STRG (Rs_depth, "depth", "depth", "number", "depth of visual to request"),
228 BOOL (Rs_buffered, "buffered", NULL, Opt_buffered, 0, NULL), 233 STRG (Rs_visual, "visual", "visual", "number", "visual id to request"),
229#endif
230#if ENABLE_FRILLS
231 RSTRG (Rs_transient_for, "transient-for", "windowid"), 234 RSTRG (Rs_transient_for, "transient-for", "windowid"),
232 BOOL (Rs_override_redirect, "override-redirect", "override-redirect", Opt_override_redirect, 0, "set override-redirect on the terminal window"), 235 BOOL (Rs_override_redirect, "override-redirect", "override-redirect", Opt_override_redirect, 0, "set override-redirect on the terminal window"),
233 STRG (Rs_pty_fd, NULL, "pty-fd", "fileno", "file descriptor of pty to use"), 236 STRG (Rs_pty_fd, NULL, "pty-fd", "fileno", "file descriptor of pty to use"),
234 BOOL (Rs_hold, "hold", "hold", Opt_hold, 0, "retain window after shell exit"), 237 BOOL (Rs_hold, "hold", "hold", Opt_hold, 0, "retain window after shell exit"),
235 STRG (Rs_ext_bwidth, "externalBorder", "w", "number", "external border in pixels"), 238 STRG (Rs_ext_bwidth, "externalBorder", "w", "number", "external border in pixels"),
… …
270#endif 273#endif
271#if ISO_14755 274#if ISO_14755
272 BOOL (Rs_iso14755, "iso14755", NULL, Opt_iso14755, 0, NULL), 275 BOOL (Rs_iso14755, "iso14755", NULL, Opt_iso14755, 0, NULL),
273 BOOL (Rs_iso14755_52, "iso14755_52", NULL, Opt_iso14755_52, 0, NULL), 276 BOOL (Rs_iso14755_52, "iso14755_52", NULL, Opt_iso14755_52, 0, NULL),
274#endif 277#endif
275#ifdef HAVE_AFTERIMAGE
276 STRG (Rs_blendtype, "blendType", "blt", "string", "background image blending type - alpha, tint, etc..."),
277#endif
278#ifndef NO_RESOURCES 278#ifndef NO_RESOURCES
279 RINFO ("xrm", "string"), 279 RINFO ("xrm", "string"),
280#endif 280#endif
281#ifdef KEYSYM_RESOURCE 281#ifdef KEYSYM_RESOURCE
282 RINFO ("keysym.sym", "keysym"), 282 RINFO ("keysym.sym", "keysym"),
… …
336#endif 336#endif
337#if defined(ENABLE_TRANSPARENCY) 337#if defined(ENABLE_TRANSPARENCY)
338 "transparent," 338 "transparent,"
339 "tint," 339 "tint,"
340#endif 340#endif
341#if HAVE_AFTERIMAGE
342 "afterimage,"
343#endif
344#if HAVE_PIXBUF 341#if HAVE_PIXBUF
345 "pixbuf," 342 "pixbuf,"
346#endif 343#endif
347#if defined(USE_XIM) 344#if defined(USE_XIM)
348 "XIM," 345 "XIM,"
… …
390#if defined(XTERM_SCROLLBAR) 387#if defined(XTERM_SCROLLBAR)
391 "+xterm" 388 "+xterm"
392#endif 389#endif
393 "\nUsage: "; /* Usage */ 390 "\nUsage: "; /* Usage */
394 391
395#define INDENT 18 392#define INDENT 28
396 393
397const char rxvt_term::resval_undef [] = "<undef>"; 394const char rxvt_term::resval_undef [] = "<undef>";
398const char rxvt_term::resval_on [] = "on"; 395const char rxvt_term::resval_on [] = "on";
399const char rxvt_term::resval_off [] = "off"; 396const char rxvt_term::resval_off [] = "off";
400 397
401/*{{{ usage: */ 398/*{{{ usage: */
402/*----------------------------------------------------------------------*/ 399/*----------------------------------------------------------------------*/
403static void 400void
404rxvt_usage (int type) 401rxvt_term::rxvt_usage (int type)
405{ 402{
406 unsigned int i, col; 403 unsigned int i, col;
407 404
408 rxvt_log ("%s%s%s", releasestring, optionsstring, RESNAME); 405 rxvt_log ("%s%s%s", releasestring, optionsstring, RESNAME);
409 406
… …
417 { 414 {
418 int len = 0; 415 int len = 0;
419 416
420 if (optList[i].arg) 417 if (optList[i].arg)
421 len = strlen (optList[i].arg) + 1; 418 len = strlen (optList[i].arg) + 1;
419
422 assert (optList[i].opt != NULL); 420 assert (optList[i].opt != NULL);
423 len += 4 + strlen (optList[i].opt) + (optList_isBool (i) ? 2 : 0); 421 len += 4 + strlen (optList[i].opt) + (optList_isBool (i) ? 2 : 0);
424 col += len; 422 col += len;
423
425 if (col > 79) 424 if (col > 79)
426 { 425 {
427 /* assume regular width */ 426 /* assume regular width */
428 rxvt_log ("\n"); 427 rxvt_log ("\n");
429 col = 1 + len; 428 col = 1 + len;
430 } 429 }
431 430
432 rxvt_log (" [-%s%s", (optList_isBool (i) ? "/+" : ""), optList[i].opt); 431 rxvt_log (" [-%s%s", (optList_isBool (i) ? "/+" : ""), optList[i].opt);
432
433 if (optList[i].arg) 433 if (optList[i].arg)
434 rxvt_log (" %s]", optList[i].arg); 434 rxvt_log (" %s]", optList[i].arg);
435 else 435 else
436 rxvt_log ("]"); 436 rxvt_log ("]");
437 } 437 }
… …
450 + (optList_isBool (i) ? 0 : 2)), 450 + (optList_isBool (i) ? 0 : 2)),
451 (optList[i].arg ? optList[i].arg : ""), 451 (optList[i].arg ? optList[i].arg : ""),
452 (optList_isBool (i) ? "turn on/off " : ""), 452 (optList_isBool (i) ? "turn on/off " : ""),
453 optList[i].desc); 453 optList[i].desc);
454 } 454 }
455
456#if ENABLE_PERL
457 rxvt_perl.init (this);
458 rxvt_perl.usage (this, 1);
459#endif
460
455 rxvt_log ("\n --help to list long-options"); 461 rxvt_log ("\n --help to list long-options");
456 break; 462 break;
457 463
458 case 2: /* full resource listing */ 464 case 2: /* full resource listing */
459 rxvt_log (" [options] [-e command args]\n\n" 465 rxvt_log (" [options] [-e command args]\n\n"
… …
461 467
462 for (i = 0; i < ecb_array_length (optList); i++) 468 for (i = 0; i < ecb_array_length (optList); i++)
463 if (optList[i].kw != NULL) 469 if (optList[i].kw != NULL)
464 rxvt_log (" %s: %*s%s\n", 470 rxvt_log (" %s: %*s%s\n",
465 optList[i].kw, 471 optList[i].kw,
466 (INDENT - strlen (optList[i].kw)), "", /* XXX */ 472 (INDENT + 2 - strlen (optList[i].kw)), "", /* XXX */
467 (optList_isBool (i) ? "boolean" : optList[i].arg)); 473 (optList_isBool (i) ? "boolean" : optList[i].arg));
474
475#if ENABLE_PERL
476 rxvt_perl.init (this);
477 rxvt_perl.usage (this, 2);
478#endif
479
468 rxvt_log ("\n -help to list options"); 480 rxvt_log ("\n -help to list options");
469 break; 481 break;
470 } 482 }
471 483
472 rxvt_log ("\n\n"); 484 rxvt_log ("\n\n");
… …
537 * default values 549 * default values
538 */ 550 */
539 551
540 if (optList[entry].doff != -1) 552 if (optList[entry].doff != -1)
541 { 553 {
542 if (flag && i+1 == argc) 554 if (flag && i + 1 == argc)
543 rxvt_fatal ("option '%s' requires an argument, aborting.\n", argv [i]); 555 rxvt_fatal ("option '%s' requires an argument, aborting.\n", argv [i]);
544 556
545 rs[optList[entry].doff] = flag ? argv[++i] : resval_undef; 557 rs[optList[entry].doff] = flag ? argv[++i] : resval_undef;
546 } 558 }
547 } 559 }
… …
555 } 567 }
556 } 568 }
557#ifndef NO_RESOURCES 569#ifndef NO_RESOURCES
558 else if (!strcmp (opt, "xrm")) 570 else if (!strcmp (opt, "xrm"))
559 { 571 {
560 if (i+1 < argc) 572 if (i + 1 < argc)
561 XrmPutLineResource (&option_db, argv[++i]); 573 XrmPutLineResource (&option_db, argv[++i]);
562 } 574 }
563#endif 575#endif
564#ifdef KEYSYM_RESOURCE 576#ifdef KEYSYM_RESOURCE
565 else if (!strncmp (opt, "keysym.", sizeof ("keysym.") - 1)) 577 else if (!strncmp (opt, "keysym.", sizeof ("keysym.") - 1))
566 { 578 {
567 if (i+1 < argc) 579 if (i + 1 < argc)
568 { 580 {
569 char *res = rxvt_temp_buf<char> (strlen (opt) + strlen (argv[++i]) + 6); 581 char *res = rxvt_temp_buf<char> (strlen (opt) + strlen (argv[++i]) + 6);
570 sprintf (res, "*.%s: %s\n", opt, argv[i]); 582 sprintf (res, "*.%s: %s\n", opt, argv[i]);
571 XrmPutLineResource (&option_db, res); 583 XrmPutLineResource (&option_db, res);
572 } 584 }
573 } 585 }
574#endif 586#endif
575 else if (!strcmp (opt, "e")) 587 else if (!strcmp (opt, "e"))
576 { 588 {
577 if (i+1 == argc) 589 if (i + 1 < argc)
578 rxvt_fatal ("option '-e' requires an argument, aborting.\n");
579
580 return (const char **)argv + i + 1; 590 return (const char **)argv + i + 1;
591
592 rxvt_warn ("option '-e' requires an argument, aborting.\n");
593 bad_option = 1;
581 } 594 }
582 else 595 else
583 { 596 {
597#if ENABLE_PERL
598 rxvt_perl.init (this);
599
600 if (int flags = rxvt_perl.parse_resource (this, opt, true, longopt, flag, argv [i + 1]))
601 {
602 if (flags & rxvt_perl.RESOURCE_ARG)
603 {
604 if (i + 1 == argc)
605 {
606 rxvt_warn ("option '%s' requires an argument.\n", argv [i]);
584 bad_option = 1; 607 bad_option = 1;
608 }
609 else
610 ++i;
611 }
612 }
613 else
614#endif
615 {
585 rxvt_warn ("\"%s\": unknown or malformed option.\n", opt); 616 rxvt_warn ("\"%s\": unknown or malformed option.\n", opt);
617 bad_option = 1;
618 }
586 } 619 }
587 } 620 }
588 621
589 if (bad_option) 622 if (bad_option)
590 rxvt_usage (0); 623 rxvt_usage (0);
… …
592 return 0; 625 return 0;
593} 626}
594 627
595/*}}} */ 628/*}}} */
596 629
597#ifndef NO_RESOURCES
598/*----------------------------------------------------------------------*/ 630/*----------------------------------------------------------------------*/
599 631
600# ifdef KEYSYM_RESOURCE 632#ifdef KEYSYM_RESOURCE
633static void
634rxvt_define_key (rxvt_term *term, const char *k, const char *v)
635{
636 term->bind_action (k, v);
637}
638
601/* 639/*
602 * Define key from XrmEnumerateDatabase. 640 * Define key from XrmEnumerateDatabase.
603 * quarks will be something like 641 * quarks will be something like
604 * "rxvt" "keysym" "0xFF01" 642 * "rxvt" "keysym" "0xFF01"
605 * value will be a string 643 * value will be a string
606 */ 644 */
607static int 645static int
646rxvt_keysym_enumerate_helper (
608rxvt_define_key (XrmDatabase *database ecb_unused, 647 XrmDatabase *database ecb_unused,
609 XrmBindingList bindings ecb_unused, 648 XrmBindingList bindings ecb_unused,
610 XrmQuarkList quarks, 649 XrmQuarkList quarks,
611 XrmRepresentation *type ecb_unused, 650 XrmRepresentation *type ecb_unused,
612 XrmValue *value, 651 XrmValue *value,
613 XPointer closure ecb_unused) 652 XPointer closure
653)
614{ 654{
615 int last; 655 int last;
616 656
617 for (last = 0; quarks[last] != NULLQUARK; last++) /* look for last quark in list */ 657 for (last = 0; quarks[last] != NULLQUARK; last++) /* look for last quark in list */
618 ; 658 ;
619 659
620 last--; 660 rxvt_term *term = (rxvt_term *)(((void **)closure)[0]);
621 GET_R->parse_keysym (XrmQuarkToString (quarks[last]), (char *)value->addr);//D//TODO 661 void (*cb)(rxvt_term *, const char *, const char *)
662 = (void (*)(rxvt_term *, const char *, const char *))
663 (((void **)closure)[1]);
664
665 cb (term, XrmQuarkToString (quarks[last - 1]), (char *)value->addr);
666
622 return False; 667 return False;
623} 668}
624 669
625/* 670/*
626 * look for something like this (XK_Delete) 671 * look for something like this (XK_Delete)
… …
661 { "4", 1, Mod4Mask }, 706 { "4", 1, Mod4Mask },
662 { "5", 1, Mod5Mask }, 707 { "5", 1, Mod5Mask },
663}; 708};
664 709
665int 710int
666rxvt_term::parse_keysym (const char *str, const char *arg) 711rxvt_term::parse_keysym (const char *str, unsigned int &state)
667{ 712{
668 int sym; 713 int sym;
669 unsigned int state = 0;
670 const char *key = strrchr (str, '-'); 714 const char *key = strrchr (str, '-');
715
716 state = 0;
671 717
672 if (!key) 718 if (!key)
673 key = str; 719 key = str;
674 else 720 else
675 key++; 721 key++;
676 722
677 // string or key is empty 723 // string or key is empty
678 if (*arg == '\0' || *key == '\0') 724 if (*key == '\0')
679 return -1; 725 return -1;
680 726
681 // parse modifiers 727 // parse modifiers
682 while (str < key) 728 while (str < key)
683 { 729 {
… …
708 sym = strtol (str, &end, 16); 754 sym = strtol (str, &end, 16);
709 if (*end) 755 if (*end)
710 return -1; 756 return -1;
711 } 757 }
712 758
759 return sym;
760}
761
762int
763rxvt_term::bind_action (const char *str, const char *arg)
764{
765 int sym;
766 unsigned int state;
767
768 if (*arg == '\0' || (sym = parse_keysym (str, state)) == -1)
769 return -1;
770
713 wchar_t *ws = rxvt_mbstowcs (arg); 771 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))) 772 if (!HOOK_INVOKE ((this, HOOK_REGISTER_COMMAND, DT_INT, sym, DT_INT, state, DT_WCS_LEN, ws, wcslen (ws), DT_END)))
715 keyboard->register_user_translation (sym, state, ws); 773 keyboard->register_action (sym, state, ws);
774
716 free (ws); 775 free (ws);
717 return 1; 776 return 1;
718} 777}
719 778
720# endif /* KEYSYM_RESOURCE */ 779#endif /* KEYSYM_RESOURCE */
721#endif /* NO_RESOURCES */
722 780
723static char * 781static char *
724get_res (XrmDatabase database, const char *program, const char *option) 782get_res (XrmDatabase database, const char *program, const char *option)
725{ 783{
726 char resource[512]; 784 char resource[512];
… …
798 } 856 }
799#endif /* NO_RESOURCES */ 857#endif /* NO_RESOURCES */
800} 858}
801 859
802void 860void
803rxvt_term::extract_keysym_resources () 861rxvt_term::enumerate_keysym_resources (void (*cb)(rxvt_term *, const char *, const char *))
804{ 862{
805#ifndef NO_RESOURCES
806 /* 863 /*
807 * [R5 or later]: enumerate the resource database 864 * [R5 or later]: enumerate the resource database
808 */ 865 */
809# ifdef KEYSYM_RESOURCE 866#ifdef KEYSYM_RESOURCE
867 void *closure[2] = {
868 (void *)this,
869 (void *)cb,
870 };
871
810 XrmDatabase database = XrmGetDatabase (dpy); 872 XrmDatabase database = XrmGetDatabase (dpy);
811 XrmName name_prefix[3]; 873 XrmName name_prefix[3];
812 XrmClass class_prefix[3]; 874 XrmClass class_prefix[3];
813 875
814 name_prefix[0] = XrmStringToName (rs[Rs_name]);
815 name_prefix[1] = XrmStringToName ("keysym"); 876 name_prefix[1] = XrmStringToName ("keysym");
816 name_prefix[2] = NULLQUARK; 877 name_prefix[2] = NULLQUARK;
817 class_prefix[0] = XrmStringToName (RESCLASS);
818 class_prefix[1] = XrmStringToName ("Keysym"); 878 class_prefix[1] = XrmStringToName ("Keysym");
819 class_prefix[2] = NULLQUARK; 879 class_prefix[2] = NULLQUARK;
820 /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */ 880
821 XrmEnumerateDatabase (database, name_prefix, class_prefix,
822 XrmEnumOneLevel, rxvt_define_key, NULL);
823# ifdef RESFALLBACK 881# ifdef RESFALLBACK
824 name_prefix[0] = class_prefix[0] = XrmStringToName (RESFALLBACK); 882 name_prefix[0] = class_prefix[0] = XrmStringToName (RESFALLBACK);
825 /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */ 883 /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */
826 XrmEnumerateDatabase (database, name_prefix, class_prefix, 884 XrmEnumerateDatabase (database, name_prefix, class_prefix,
827 XrmEnumOneLevel, rxvt_define_key, NULL); 885 XrmEnumOneLevel, rxvt_keysym_enumerate_helper, (XPointer)closure);
828# endif
829# endif 886# endif
830 887
831#endif /* NO_RESOURCES */ 888 name_prefix[0] = class_prefix[0] = XrmStringToName (RESCLASS);
889 XrmEnumerateDatabase (database, name_prefix, class_prefix,
890 XrmEnumOneLevel, rxvt_keysym_enumerate_helper, (XPointer)closure);
891
892 name_prefix[0] = class_prefix[0] = XrmStringToName (rs[Rs_name]);
893 XrmEnumerateDatabase (database, name_prefix, class_prefix,
894 XrmEnumOneLevel, rxvt_keysym_enumerate_helper, (XPointer)closure);
895#endif
896}
897
898void
899rxvt_term::extract_keysym_resources ()
900{
901#ifdef KEYSYM_RESOURCE
902 enumerate_keysym_resources (rxvt_define_key);
903#endif
832} 904}
833 905
834/*----------------------- end-of-file (C source) -----------------------*/ 906/*----------------------- end-of-file (C source) -----------------------*/
907

Diff Legend

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