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.114 by sasha, Wed Sep 12 21:06:08 2007 UTC vs.
Revision 1.132 by ayin, Sun Jan 20 01:15:35 2008 UTC

… …
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 <pcg@goof.com>
10 * Copyright (c) 2007 Emanuele Giaquinta <e.giaquinta@glauco.it>
10 * 11 *
11 * 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
12 * 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
13 * the Free Software Foundation; either version 2 of the License, or 14 * the Free Software Foundation; either version 2 of the License, or
14 * (at your option) any later version. 15 * (at your option) any later version.
… …
62/* SWCH () - `-' flag */ 63/* SWCH () - `-' flag */
63#define SWCH(opt, option, flag, desc) \ 64#define SWCH(opt, option, flag, desc) \
64 { (option), (Optflag_Switch | (flag)), -1, NULL, (opt), NULL, (desc)} 65 { (option), (Optflag_Switch | (flag)), -1, NULL, (opt), NULL, (desc)}
65 66
66/* convenient macros */ 67/* convenient macros */
67#define optList_strlen(i) \ 68#define optList_isString(i) \
68 (optList[i].flag ? 0 : (optList[i].arg ? strlen (optList[i].arg) : 1)) 69 (optList[i].flag == 0)
69#define optList_isBool(i) \ 70#define optList_isBool(i) \
70 (optList[i].flag & Optflag_Boolean) 71 (optList[i].flag & Optflag_Boolean)
71#define optList_isReverse(i) \ 72#define optList_isReverse(i) \
72 (optList[i].flag & Optflag_Reverse) 73 (optList[i].flag & Optflag_Reverse)
73#define optList_size \ 74#define optList_size \
… …
109 BOOL (Rs_scrollTtyOutput, NULL, "si", Opt_scrollTtyOutput, Optflag_Reverse, "scroll-on-tty-output inhibit"), 110 BOOL (Rs_scrollTtyOutput, NULL, "si", Opt_scrollTtyOutput, Optflag_Reverse, "scroll-on-tty-output inhibit"),
110 BOOL (Rs_scrollTtyKeypress, "scrollTtyKeypress", "sk", Opt_scrollTtyKeypress, 0, "scroll-on-keypress"), 111 BOOL (Rs_scrollTtyKeypress, "scrollTtyKeypress", "sk", Opt_scrollTtyKeypress, 0, "scroll-on-keypress"),
111 BOOL (Rs_scrollWithBuffer, "scrollWithBuffer", "sw", Opt_scrollWithBuffer, 0, "scroll-with-buffer"), 112 BOOL (Rs_scrollWithBuffer, "scrollWithBuffer", "sw", Opt_scrollWithBuffer, 0, "scroll-with-buffer"),
112#if ENABLE_TRANSPARENCY 113#if ENABLE_TRANSPARENCY
113 BOOL (Rs_transparent, "inheritPixmap", "ip", Opt_transparent, 0, "inherit parent pixmap"), 114 BOOL (Rs_transparent, "inheritPixmap", "ip", Opt_transparent, 0, "inherit parent pixmap"),
114 SWCH ("tr", Opt_transparent, 0, NULL), 115 BOOL (Rs_transparent, "transparent", "tr", Opt_transparent, 0, "inherit parent pixmap"),
115 STRG (Rs_color + Color_tint, "tintColor", "tint", "color", "tint color"), 116 STRG (Rs_color + Color_tint, "tintColor", "tint", "color", "tint color"),
116 STRG (Rs_shade, "shading", "sh", "%", "shade background by x %."), 117 STRG (Rs_shade, "shading", "sh", "number", "shade background by number %."),
117#endif 118#endif
118#if OFF_FOCUS_FADING 119#if OFF_FOCUS_FADING
119 STRG (Rs_fade, "fading", "fade", "%", "fade colors x% percent when rxvt-unicode is losing focus"), 120 STRG (Rs_fade, "fading", "fade", "number", "fade colors by number % when losing focus"),
120 STRG (Rs_color + Color_fade, "fadeColor", "fadecolor", "color", "target color for off-focus fading"), 121 STRG (Rs_color + Color_fade, "fadeColor", "fadecolor", "color", "target color for off-focus fading"),
121#endif 122#endif
122 BOOL (Rs_utmpInhibit, "utmpInhibit", "ut", Opt_utmpInhibit, 0, "utmp inhibit"), 123 BOOL (Rs_utmpInhibit, "utmpInhibit", "ut", Opt_utmpInhibit, 0, "utmp inhibit"),
123#ifndef NO_BELL 124#ifndef NO_BELL
124# if ENABLE_FRILLS 125# if ENABLE_FRILLS
… …
167#ifndef NO_BOLD_UNDERLINE_REVERSE 168#ifndef NO_BOLD_UNDERLINE_REVERSE
168 RSTRG (Rs_color + Color_BD, "colorBD", "color"), 169 RSTRG (Rs_color + Color_BD, "colorBD", "color"),
169 RSTRG (Rs_color + Color_IT, "colorIT", "color"), 170 RSTRG (Rs_color + Color_IT, "colorIT", "color"),
170 RSTRG (Rs_color + Color_UL, "colorUL", "color"), 171 RSTRG (Rs_color + Color_UL, "colorUL", "color"),
171 RSTRG (Rs_color + Color_RV, "colorRV", "color"), 172 RSTRG (Rs_color + Color_RV, "colorRV", "color"),
172#endif /* ! NO_BOLD_UNDERLINE_REVERSE */ 173#endif /* ! NO_BOLD_UNDERLINE_REVERSE */
173#if ENABLE_FRILLS 174#if ENABLE_FRILLS
174 RSTRG (Rs_color + Color_underline, "underlineColor", "color"), 175 RSTRG (Rs_color + Color_underline, "underlineColor", "color"),
175#endif 176#endif
176#ifdef KEEP_SCROLLCOLOR 177#ifdef KEEP_SCROLLCOLOR
177 RSTRG (Rs_color + Color_scroll, "scrollColor", "color"), 178 RSTRG (Rs_color + Color_scroll, "scrollColor", "color"),
178 RSTRG (Rs_color + Color_trough, "troughColor", "color"), 179 RSTRG (Rs_color + Color_trough, "troughColor", "color"),
179#endif /* KEEP_SCROLLCOLOR */ 180#endif /* KEEP_SCROLLCOLOR */
180#ifdef OPTION_HC 181#ifdef OPTION_HC
181 STRG (Rs_color + Color_HC, "highlightColor", "hc", "color", "highlight color"), 182 STRG (Rs_color + Color_HC, "highlightColor", "hc", "color", "highlight color"),
182#endif 183#endif
183#ifndef NO_CURSORCOLOR 184#ifndef NO_CURSORCOLOR
184 STRG (Rs_color + Color_cursor, "cursorColor", "cr", "color", "cursor color"), 185 STRG (Rs_color + Color_cursor, "cursorColor", "cr", "color", "cursor color"),
185 /* command-line option = resource name */ 186 /* command-line option = resource name */
186 RSTRG (Rs_color + Color_cursor2, "cursorColor2", "color"), 187 RSTRG (Rs_color + Color_cursor2, "cursorColor2", "color"),
187#endif /* NO_CURSORCOLOR */ 188#endif /* NO_CURSORCOLOR */
188 STRG (Rs_color + Color_pointer_fg, "pointerColor", "pr", "color", "pointer color"), 189 STRG (Rs_color + Color_pointer_fg, "pointerColor", "pr", "color", "pointer color"),
189 STRG (Rs_color + Color_pointer_bg, "pointerColor2", "pr2", "color", "pointer bg color"), 190 STRG (Rs_color + Color_pointer_bg, "pointerColor2", "pr2", "color", "pointer bg color"),
190 STRG (Rs_color + Color_border, "borderColor", "bd", "color", "border color"), 191 STRG (Rs_color + Color_border, "borderColor", "bd", "color", "border color"),
191#ifdef BG_IMAGE_FROM_FILE 192#ifdef BG_IMAGE_FROM_FILE
192 RSTRG (Rs_path, "path", "search path"), 193 RSTRG (Rs_path, "path", "search path"),
… …
203#ifdef USE_XIM 204#ifdef USE_XIM
204 STRG (Rs_inputMethod, "inputMethod", "im", "name", "name of input method"), 205 STRG (Rs_inputMethod, "inputMethod", "im", "name", "name of input method"),
205 STRG (Rs_preeditType, "preeditType", "pt", "style", "input style: style = OverTheSpot|OffTheSpot|Root"), 206 STRG (Rs_preeditType, "preeditType", "pt", "style", "input style: style = OverTheSpot|OffTheSpot|Root"),
206 STRG (Rs_imLocale, "imLocale", "imlocale", "string", "locale to use for input method"), 207 STRG (Rs_imLocale, "imLocale", "imlocale", "string", "locale to use for input method"),
207 STRG (Rs_imFont, "imFont", "imfont", "fontname", "fontset for styles OverTheSpot and OffTheSpot"), 208 STRG (Rs_imFont, "imFont", "imfont", "fontname", "fontset for styles OverTheSpot and OffTheSpot"),
208#endif /* USE_XIM */ 209#endif /* USE_XIM */
209 STRG (Rs_name, NULL, "name", "string", "client instance, icon, and title strings"), 210 STRG (Rs_name, NULL, "name", "string", "client instance, icon, and title strings"),
210 STRG (Rs_title, "title", "title", "string", "title name for window"), 211 STRG (Rs_title, "title", "title", "string", "title name for window"),
211 STRG (Rs_title, NULL, "T", NULL, NULL), /* short form */ 212 STRG (Rs_title, NULL, "T", NULL, NULL), /* short form */
212 STRG (Rs_iconName, "iconName", "n", "string", "icon name for window"), 213 STRG (Rs_iconName, "iconName", "n", "string", "icon name for window"),
213 STRG (Rs_saveLines, "saveLines", "sl", "number", "number of scrolled lines to save"), 214 STRG (Rs_saveLines, "saveLines", "sl", "number", "number of scrolled lines to save"),
… …
225 STRG (Rs_ext_bwidth, "externalBorder", "w", "number", "external border in pixels"), 226 STRG (Rs_ext_bwidth, "externalBorder", "w", "number", "external border in pixels"),
226 STRG (Rs_ext_bwidth, NULL, "bw", NULL, NULL), 227 STRG (Rs_ext_bwidth, NULL, "bw", NULL, NULL),
227 STRG (Rs_ext_bwidth, NULL, "borderwidth", NULL, NULL), 228 STRG (Rs_ext_bwidth, NULL, "borderwidth", NULL, NULL),
228 STRG (Rs_int_bwidth, "internalBorder", "b", "number", "internal border in pixels"), 229 STRG (Rs_int_bwidth, "internalBorder", "b", "number", "internal border in pixels"),
229 BOOL (Rs_borderLess, "borderLess", "bl", Opt_borderLess, 0, "borderless window"), 230 BOOL (Rs_borderLess, "borderLess", "bl", Opt_borderLess, 0, "borderless window"),
231 STRG (Rs_lineSpace, "lineSpace", "lsp", "number", "number of extra pixels between rows"),
232#endif
233#ifdef BUILTIN_GLYPHS
230 BOOL (Rs_skipBuiltinGlyphs, "skipBuiltinGlyphs", "sbg", Opt_skipBuiltinGlyphs, 0, "do not use internal glyphs"), 234 BOOL (Rs_skipBuiltinGlyphs, "skipBuiltinGlyphs", "sbg", Opt_skipBuiltinGlyphs, 0, "do not use internal glyphs"),
231 STRG (Rs_lineSpace, "lineSpace", "lsp", "number", "number of extra pixels between rows"),
232#endif 235#endif
233#ifdef POINTER_BLANK 236#ifdef POINTER_BLANK
234 RSTRG (Rs_pointerBlankDelay, "pointerBlankDelay", "number"), 237 RSTRG (Rs_pointerBlankDelay, "pointerBlankDelay", "number"),
235#endif 238#endif
236#ifndef NO_BACKSPACE_KEY 239#ifndef NO_BACKSPACE_KEY
237 RSTRG (Rs_backspace_key, "backspacekey", "string"), 240 RSTRG (Rs_backspace_key, "backspacekey", "string"),
238#endif 241#endif
239#ifndef NO_DELETE_KEY 242#ifndef NO_DELETE_KEY
240 RSTRG (Rs_delete_key, "deletekey", "string"), 243 RSTRG (Rs_delete_key, "deletekey", "string"),
241#endif 244#endif
242 RSTRG (Rs_selectstyle, "selectstyle", "mode"),
243#ifdef PRINTPIPE 245#ifdef PRINTPIPE
244 RSTRG (Rs_print_pipe, "print-pipe", "string"), 246 RSTRG (Rs_print_pipe, "print-pipe", "string"),
245#endif 247#endif
246 STRG (Rs_modifier, "modifier", "mod", "modifier", "meta modifier = alt|meta|hyper|super|mod1|...|mod5"), 248 STRG (Rs_modifier, "modifier", "mod", "modifier", "meta modifier = alt|meta|hyper|super|mod1|...|mod5"),
247#ifdef CUTCHAR_RESOURCE 249#ifdef CUTCHAR_RESOURCE
248 RSTRG (Rs_cutchars, "cutchars", "string"), 250 RSTRG (Rs_cutchars, "cutchars", "string"),
249#endif /* CUTCHAR_RESOURCE */ 251#endif /* CUTCHAR_RESOURCE */
250 RSTRG (Rs_answerbackstring, "answerbackString", "string"), 252 RSTRG (Rs_answerbackstring, "answerbackString", "string"),
251#ifndef NO_SECONDARY_SCREEN 253#ifndef NO_SECONDARY_SCREEN
252 BOOL (Rs_secondaryScreen, "secondaryScreen", "ssc", Opt_secondaryScreen, 0, "enable secondary screen"), 254 BOOL (Rs_secondaryScreen, "secondaryScreen", "ssc", Opt_secondaryScreen, 0, "enable secondary screen"),
253 BOOL (Rs_secondaryScroll, "secondaryScroll", "ssr", Opt_secondaryScroll, 0, "enable secondary screen scroll"), 255 BOOL (Rs_secondaryScroll, "secondaryScroll", "ssr", Opt_secondaryScroll, 0, "enable secondary screen scroll"),
254#endif 256#endif
… …
262 BOOL (Rs_iso14755_52, "iso14755_52", NULL, Opt_iso14755_52, 0, NULL), 264 BOOL (Rs_iso14755_52, "iso14755_52", NULL, Opt_iso14755_52, 0, NULL),
263#endif 265#endif
264#ifdef HAVE_AFTERIMAGE 266#ifdef HAVE_AFTERIMAGE
265 STRG (Rs_blendtype, "blendType", "blt", "string", "background image blending type - alpha, tint, etc..."), 267 STRG (Rs_blendtype, "blendType", "blt", "string", "background image blending type - alpha, tint, etc..."),
266 STRG (Rs_blurradius, "blurRadius", "blr", "HxV", "Gaussian Blur radii to apply to the root background"), 268 STRG (Rs_blurradius, "blurRadius", "blr", "HxV", "Gaussian Blur radii to apply to the root background"),
267#endif
268#ifndef NO_RESOURCES
269 INFO ("xrm", "string", "X resource"),
270#endif 269#endif
271 INFO ("e", "command arg ...", "command to execute") 270 INFO ("e", "command arg ...", "command to execute")
272 }; 271 };
273 272
274#undef INFO 273#undef INFO
… …
414 for (col = 1, i = 0; i < optList_size; i++) 413 for (col = 1, i = 0; i < optList_size; i++)
415 if (optList[i].desc != NULL) 414 if (optList[i].desc != NULL)
416 { 415 {
417 int len = 0; 416 int len = 0;
418 417
419 if (!optList_isBool (i)) 418 if (optList[i].arg)
420 { 419 len = strlen (optList[i].arg) + 1;
421 len = optList_strlen (i);
422 if (len > 0)
423 len++; /* account for space */
424 }
425#ifdef DEBUG_STRICT 420#ifdef DEBUG_STRICT
426 assert (optList[i].opt != NULL); 421 assert (optList[i].opt != NULL);
427#endif 422#endif
428 len += 4 + strlen (optList[i].opt) + (optList_isBool (i) ? 2: 0); 423 len += 4 + strlen (optList[i].opt) + (optList_isBool (i) ? 2: 0);
429 col += len; 424 col += len;
430 if (col > 79) 425 if (col > 79)
426 {
431 { /* assume regular width */ 427 /* assume regular width */
432 rxvt_log ("\n"); 428 rxvt_log ("\n");
433 col = 1 + len; 429 col = 1 + len;
434 } 430 }
435 431
436 rxvt_log (" [-%s%s", (optList_isBool (i) ? "/+" : ""), optList[i].opt); 432 rxvt_log (" [-%s%s", (optList_isBool (i) ? "/+" : ""), optList[i].opt);
437 if (optList_strlen (i)) 433 if (optList[i].arg)
438 rxvt_log (" %s]", optList[i].arg); 434 rxvt_log (" %s]", optList[i].arg);
439 else 435 else
440 rxvt_log ("]"); 436 rxvt_log ("]");
441 } 437 }
442 break; 438 break;
… …
494 int i, bad_option = 0; 490 int i, bad_option = 0;
495 491
496 for (i = 1; i < argc; i++) 492 for (i = 1; i < argc; i++)
497 { 493 {
498 unsigned int entry, longopt = 0; 494 unsigned int entry, longopt = 0;
499 const char *flag, *opt; 495 const char *opt;
496 int flag;
500 497
501 opt = argv[i]; 498 opt = argv[i];
502 499
503 if (*opt == '-') 500 if (*opt == '-')
504 { 501 {
505 flag = resval_on; 502 flag = 1;
506 503
507 if (*++opt == '-') 504 if (*++opt == '-')
508 longopt = *opt++; /* long option */ 505 longopt = *opt++; /* long option */
509 } 506 }
510 else if (*opt == '+') 507 else if (*opt == '+')
511 { 508 {
512 flag = resval_off; 509 flag = 0;
513 510
514 if (*++opt == '+') 511 if (*++opt == '+')
515 longopt = *opt++; /* long option */ 512 longopt = *opt++; /* long option */
516 } 513 }
517 else 514 else
… …
535 break; 532 break;
536 533
537 if (entry < optList_size) 534 if (entry < optList_size)
538 { 535 {
539 if (optList_isReverse (entry)) 536 if (optList_isReverse (entry))
540 flag = flag == resval_on ? resval_off : resval_on; 537 flag = !flag;
541 538
542 if (optList_strlen (entry)) 539 if (optList_isString (entry))
543 { 540 {
544 /* 541 /*
545 * special cases are handled in main.c:main () to allow 542 * special cases are handled in main.c:main () to allow
546 * X resources to set these values before we settle for 543 * X resources to set these values before we settle for
547 * default values 544 * default values
548 */ 545 */
549 546
550 if (optList[entry].doff != -1) 547 if (optList[entry].doff != -1)
551 { 548 {
552 if (flag == resval_on && !argv [i+1]) 549 if (flag && i+1 == argc)
553 rxvt_fatal ("option '%s' needs an argument, aborting.\n", argv [i]); 550 rxvt_fatal ("option '%s' requires an argument, aborting.\n", argv [i]);
554 551
555 rs[optList[entry].doff] = flag == resval_on ? argv[++i] : resval_undef; 552 rs[optList[entry].doff] = flag ? argv[++i] : resval_undef;
556 } 553 }
557 } 554 }
558 else 555 else
556 {
559 { /* boolean value */ 557 /* boolean value */
560 set_option (optList[entry].index, flag == resval_on); 558 set_option (optList[entry].index, flag);
561 559
562 if (optList[entry].doff != -1) 560 if (optList[entry].doff != -1)
563 rs[optList[entry].doff] = flag; 561 rs[optList[entry].doff] = flag ? resval_on : resval_off;
564 } 562 }
565 } 563 }
564#ifndef NO_RESOURCES
565 else if (!strcmp (opt, "xrm"))
566 {
567 if (i+1 < argc)
568 XrmPutLineResource (&option_db, argv[++i]);
569 }
570#endif
571#ifdef KEYSYM_RESOURCE
572 else if (!strncmp (opt, "keysym.", sizeof ("keysym.") - 1))
573 {
574 if (i+1 < argc)
575 {
576 char *res = (char *)malloc (strlen (opt) + strlen (argv[++i]) + 6);
577 sprintf (res, "*.%s: %s\n", opt, argv[i]);
578 XrmPutLineResource (&option_db, res);
579 free (res);
580 }
581 }
582#endif
566 else 583 else
567#ifdef KEYSYM_RESOURCE
568 if (!strncmp (opt, "keysym.", sizeof ("keysym.") - 1))
569 { 584 {
570 const char *str = argv[++i];
571
572 if (str != NULL)
573 parse_keysym (opt + sizeof ("keysym.") - 1, str);
574 }
575 else
576#endif
577 {
578 bad_option = 1; 585 bad_option = 1;
579 rxvt_warn ("\"%s\": unknown or malformed option.\n", opt); 586 rxvt_warn ("\"%s\": unknown or malformed option.\n", opt);
580 } 587 }
581 } 588 }
582 589
583 if (bad_option) 590 if (bad_option)
584 rxvt_usage (0); 591 rxvt_usage (0);
585} 592}
… …
616} 623}
617 624
618/* 625/*
619 * look for something like this (XK_Delete) 626 * look for something like this (XK_Delete)
620 * rxvt*keysym.0xFFFF: "\177" 627 * rxvt*keysym.0xFFFF: "\177"
621 *
622 * arg will be
623 * NULL for ~/.Xdefaults and
624 * non-NULL for command-line options (need to allocate)
625 */ 628 */
626#define NEWARGLIM 500 /* `reasonable' size */
627 629
628struct keysym_vocabulary_t 630struct keysym_vocabulary_t
629{ 631{
630 const char *name; 632 const char *name;
631 unsigned short len; 633 unsigned short len;
632 unsigned short value; 634 unsigned short value;
633}; 635};
634keysym_vocabulary_t keysym_vocabulary[] = 636static const keysym_vocabulary_t keysym_vocabulary[] =
635{ 637{
636 { "ISOLevel3", 9, Level3Mask }, 638 { "ISOLevel3", 9, Level3Mask },
637 { "AppKeypad", 9, AppKeypadMask }, 639 { "AppKeypad", 9, AppKeypadMask },
638 { "Control", 7, ControlMask }, 640 { "Control", 7, ControlMask },
639 { "NumLock", 7, NumLockMask }, 641 { "NumLock", 7, NumLockMask },
… …
661}; 663};
662 664
663int 665int
664rxvt_term::parse_keysym (const char *str, const char *arg) 666rxvt_term::parse_keysym (const char *str, const char *arg)
665{ 667{
666 int n, sym; 668 int sym;
667 unsigned int state = 0; 669 unsigned int state = 0;
668 const char *pmodend = NULL; 670 const char *key = strrchr (str, '-');
669 char *newarg = NULL;
670 char newargstr[NEWARGLIM];
671 671
672 if (arg == NULL) 672 if (!key)
673 { 673 key = str;
674 n = sizeof ("keysym.") - 1;
675 if (strncmp (str, "keysym.", n))
676 return 0;
677
678 str += n; /* skip `keysym.' */
679 if (!(pmodend = strchr (str, ':')))
680 return -1;
681 }
682 else 674 else
683 pmodend = str + strlen(str); 675 key++;
684 676
685 for (--pmodend; str < pmodend; --pmodend) 677 // string or key is empty
686 if (*pmodend == '-') 678 if (*arg == '\0' || *key == '\0')
687 break; 679 return -1;
688 680
681 // parse modifiers
689 while (str < pmodend) 682 while (str < key)
690 { 683 {
691 unsigned int i; 684 unsigned int i;
692 685
693 for (i=0; i < sizeof (keysym_vocabulary) / sizeof (keysym_vocabulary_t); ++i) 686 for (i=0; i < sizeof (keysym_vocabulary) / sizeof (keysym_vocabulary_t); ++i)
694 { 687 {
… …
705 698
706 if (*str == '-') 699 if (*str == '-')
707 ++str; 700 ++str;
708 } 701 }
709 702
710 /* some scanf () have trouble with a 0x prefix */ 703 // convert keysym name to keysym number
711 if (str[0] == '0' && toupper (str[1]) == 'X') 704 if ((sym = XStringToKeysym (str)) == None)
712 { 705 {
713 str += 2; 706 // fallback on hexadecimal parsing
714 707 char *end;
708 sym = strtol (str, &end, 16);
715 if (arg) 709 if (*end)
716 {
717 if (sscanf (str, (strchr (str, ':') ? "%x:" : "%x"), &sym) != 1)
718 return -1;
719 }
720 else
721 {
722 if (sscanf (str, "%x:", &sym) != 1)
723 return -1;
724
725 /* cue to ':', it's there since sscanf () worked */
726 strncpy (newargstr, strchr (str, ':') + 1, NEWARGLIM - 1);
727 newargstr[NEWARGLIM - 1] = '\0';
728 newarg = newargstr;
729 }
730 }
731 else
732 {
733 /*
734 * convert keysym name to keysym number
735 */
736 strncpy (newargstr, str, NEWARGLIM - 1);
737 newargstr[NEWARGLIM - 1] = '\0';
738
739 if (arg == NULL)
740 {
741 if ((newarg = strchr (newargstr, ':')) == NULL)
742 return -1;
743
744 *newarg++ = '\0'; /* terminate keysym name */
745 }
746
747 if ((sym = XStringToKeysym (newargstr)) == None)
748 return -1; 710 return -1;
749 } 711 }
750 712
751 if (newarg == NULL)
752 {
753 strncpy (newargstr, arg, NEWARGLIM - 1);
754 newargstr[NEWARGLIM - 1] = '\0';
755 newarg = newargstr;
756 }
757
758 if (*newarg == '\0')
759 return -1;
760
761 keyboard->register_user_translation (sym, state, newarg); 713 keyboard->register_user_translation (sym, state, arg);
762 return 1; 714 return 1;
763} 715}
764 716
765# endif /* KEYSYM_RESOURCE */ 717# endif /* KEYSYM_RESOURCE */
766#endif /* NO_RESOURCES */ 718#endif /* NO_RESOURCES */
767 719
768static char * 720static char *
769get_res (XrmDatabase database, const char *program, const char *option) 721get_res (XrmDatabase database, const char *program, const char *option)
770{ 722{
771 char resource[512]; 723 char resource[512];
… …
803 755
804void 756void
805rxvt_term::extract_resources () 757rxvt_term::extract_resources ()
806{ 758{
807#ifndef NO_RESOURCES 759#ifndef NO_RESOURCES
760 XrmDatabase database = XrmGetDatabase (dpy);
761 XrmMergeDatabases (option_db, &database);
762 option_db = NULL;
808 /* 763 /*
809 * Query resources for options that affect us 764 * Query resources for options that affect us
810 */ 765 */
811 for (int entry = 0; entry < optList_size; entry++) 766 for (int entry = 0; entry < optList_size; entry++)
812 { 767 {
… …
841 796
842 /* 797 /*
843 * [R5 or later]: enumerate the resource database 798 * [R5 or later]: enumerate the resource database
844 */ 799 */
845# ifdef KEYSYM_RESOURCE 800# ifdef KEYSYM_RESOURCE
846 XrmDatabase database = XrmGetDatabase (dpy);
847 XrmName name_prefix[3]; 801 XrmName name_prefix[3];
848 XrmClass class_prefix[3]; 802 XrmClass class_prefix[3];
849 803
850 name_prefix[0] = XrmStringToName (rs[Rs_name]); 804 name_prefix[0] = XrmStringToName (rs[Rs_name]);
851 name_prefix[1] = XrmStringToName ("keysym"); 805 name_prefix[1] = XrmStringToName ("keysym");
… …
865 XrmEnumerateDatabase (database, name_prefix, class_prefix, 819 XrmEnumerateDatabase (database, name_prefix, class_prefix,
866 XrmEnumOneLevel, rxvt_define_key, NULL); 820 XrmEnumOneLevel, rxvt_define_key, NULL);
867# endif 821# endif
868# endif 822# endif
869 823
870#endif /* NO_RESOURCES */ 824#endif /* NO_RESOURCES */
871} 825}
872 826
873/*----------------------- end-of-file (C source) -----------------------*/ 827/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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