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.106 by ayin, Sun Jun 10 14:27:58 2007 UTC vs.
Revision 1.130 by ayin, Tue Jan 8 15:01:15 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.
… …
93 SWCH ("iconic", Opt_iconic, 0, "start iconic"), 94 SWCH ("iconic", Opt_iconic, 0, "start iconic"),
94 SWCH ("ic", Opt_iconic, 0, NULL), /* short form */ 95 SWCH ("ic", Opt_iconic, 0, NULL), /* short form */
95 BOOL (Rs_reverseVideo, "reverseVideo", "rv", Opt_reverseVideo, 0, "reverse video"), 96 BOOL (Rs_reverseVideo, "reverseVideo", "rv", Opt_reverseVideo, 0, "reverse video"),
96 BOOL (Rs_loginShell, "loginShell", "ls", Opt_loginShell, 0, "login shell"), 97 BOOL (Rs_loginShell, "loginShell", "ls", Opt_loginShell, 0, "login shell"),
97 BOOL (Rs_jumpScroll, "jumpScroll", "j", Opt_jumpScroll, 0, "jump scrolling"), 98 BOOL (Rs_jumpScroll, "jumpScroll", "j", Opt_jumpScroll, 0, "jump scrolling"),
99 BOOL (Rs_skipScroll, "skipScroll", "ss", Opt_skipScroll, 0, "skip scrolling"),
98 BOOL (Rs_pastableTabs, "pastableTabs", "ptab", Opt_pastableTabs, 0, "tab characters are pastable"), 100 BOOL (Rs_pastableTabs, "pastableTabs", "ptab", Opt_pastableTabs, 0, "tab characters are pastable"),
99#if HAVE_SCROLLBARS 101#if HAVE_SCROLLBARS
100 RSTRG (Rs_scrollstyle, "scrollstyle", "mode"), 102 RSTRG (Rs_scrollstyle, "scrollstyle", "mode"),
101 BOOL (Rs_scrollBar, "scrollBar", "sb", Opt_scrollBar, 0, "scrollbar"), 103 BOOL (Rs_scrollBar, "scrollBar", "sb", Opt_scrollBar, 0, "scrollbar"),
102 BOOL (Rs_scrollBar_right, "scrollBar_right", "sr", Opt_scrollBar_right, 0, "scrollbar right"), 104 BOOL (Rs_scrollBar_right, "scrollBar_right", "sr", Opt_scrollBar_right, 0, "scrollbar right"),
… …
106#endif 108#endif
107 BOOL (Rs_scrollTtyOutput, "scrollTtyOutput", NULL, Opt_scrollTtyOutput, 0, NULL), 109 BOOL (Rs_scrollTtyOutput, "scrollTtyOutput", NULL, Opt_scrollTtyOutput, 0, NULL),
108 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"),
109 BOOL (Rs_scrollTtyKeypress, "scrollTtyKeypress", "sk", Opt_scrollTtyKeypress, 0, "scroll-on-keypress"), 111 BOOL (Rs_scrollTtyKeypress, "scrollTtyKeypress", "sk", Opt_scrollTtyKeypress, 0, "scroll-on-keypress"),
110 BOOL (Rs_scrollWithBuffer, "scrollWithBuffer", "sw", Opt_scrollWithBuffer, 0, "scroll-with-buffer"), 112 BOOL (Rs_scrollWithBuffer, "scrollWithBuffer", "sw", Opt_scrollWithBuffer, 0, "scroll-with-buffer"),
111#if TRANSPARENT 113#if ENABLE_TRANSPARENCY
112 BOOL (Rs_transparent, "inheritPixmap", "ip", Opt_transparent, 0, "inherit parent pixmap"), 114 BOOL (Rs_transparent, "inheritPixmap", "ip", Opt_transparent, 0, "inherit parent pixmap"),
113 SWCH ("tr", Opt_transparent, 0, NULL), 115 BOOL (Rs_transparent, "transparent", "tr", Opt_transparent, 0, "inherit parent pixmap"),
114# if TINTING
115 STRG (Rs_color + Color_tint, "tintColor", "tint", "color", "tint color"), 116 STRG (Rs_color + Color_tint, "tintColor", "tint", "color", "tint color"),
116# endif 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#if TINTING
123 STRG (Rs_shade, "shading", "sh", "%", "shade background by x % when tinting."),
124#endif 122#endif
125 BOOL (Rs_utmpInhibit, "utmpInhibit", "ut", Opt_utmpInhibit, 0, "utmp inhibit"), 123 BOOL (Rs_utmpInhibit, "utmpInhibit", "ut", Opt_utmpInhibit, 0, "utmp inhibit"),
126#ifndef NO_BELL 124#ifndef NO_BELL
127# if ENABLE_FRILLS 125# if ENABLE_FRILLS
128 BOOL (Rs_urgentOnBell, "urgentOnBell", NULL, Opt_urgentOnBell, 0, NULL), 126 BOOL (Rs_urgentOnBell, "urgentOnBell", NULL, Opt_urgentOnBell, 0, NULL),
… …
170#ifndef NO_BOLD_UNDERLINE_REVERSE 168#ifndef NO_BOLD_UNDERLINE_REVERSE
171 RSTRG (Rs_color + Color_BD, "colorBD", "color"), 169 RSTRG (Rs_color + Color_BD, "colorBD", "color"),
172 RSTRG (Rs_color + Color_IT, "colorIT", "color"), 170 RSTRG (Rs_color + Color_IT, "colorIT", "color"),
173 RSTRG (Rs_color + Color_UL, "colorUL", "color"), 171 RSTRG (Rs_color + Color_UL, "colorUL", "color"),
174 RSTRG (Rs_color + Color_RV, "colorRV", "color"), 172 RSTRG (Rs_color + Color_RV, "colorRV", "color"),
175#endif /* ! NO_BOLD_UNDERLINE_REVERSE */ 173#endif /* ! NO_BOLD_UNDERLINE_REVERSE */
176#if ENABLE_FRILLS 174#if ENABLE_FRILLS
177 RSTRG (Rs_color + Color_underline, "underlineColor", "color"), 175 RSTRG (Rs_color + Color_underline, "underlineColor", "color"),
178#endif 176#endif
179#ifdef KEEP_SCROLLCOLOR 177#ifdef KEEP_SCROLLCOLOR
180 RSTRG (Rs_color + Color_scroll, "scrollColor", "color"), 178 RSTRG (Rs_color + Color_scroll, "scrollColor", "color"),
181 RSTRG (Rs_color + Color_trough, "troughColor", "color"), 179 RSTRG (Rs_color + Color_trough, "troughColor", "color"),
182#endif /* KEEP_SCROLLCOLOR */ 180#endif /* KEEP_SCROLLCOLOR */
183#ifdef OPTION_HC 181#ifdef OPTION_HC
184 STRG (Rs_color + Color_HC, "highlightColor", "hc", "color", "highlight color"), 182 STRG (Rs_color + Color_HC, "highlightColor", "hc", "color", "highlight color"),
185#endif 183#endif
186#ifndef NO_CURSORCOLOR 184#ifndef NO_CURSORCOLOR
187 STRG (Rs_color + Color_cursor, "cursorColor", "cr", "color", "cursor color"), 185 STRG (Rs_color + Color_cursor, "cursorColor", "cr", "color", "cursor color"),
188 /* command-line option = resource name */ 186 /* command-line option = resource name */
189 RSTRG (Rs_color + Color_cursor2, "cursorColor2", "color"), 187 RSTRG (Rs_color + Color_cursor2, "cursorColor2", "color"),
190#endif /* NO_CURSORCOLOR */ 188#endif /* NO_CURSORCOLOR */
191 STRG (Rs_color + Color_pointer_fg, "pointerColor", "pr", "color", "pointer color"), 189 STRG (Rs_color + Color_pointer_fg, "pointerColor", "pr", "color", "pointer color"),
192 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"),
193 STRG (Rs_color + Color_border, "borderColor", "bd", "color", "border color"), 191 STRG (Rs_color + Color_border, "borderColor", "bd", "color", "border color"),
194#ifdef XPM_BACKGROUND 192#ifdef BG_IMAGE_FROM_FILE
195 RSTRG (Rs_path, "path", "search path"), 193 RSTRG (Rs_path, "path", "search path"),
196 STRG (Rs_backgroundPixmap, "backgroundPixmap", "pixmap", "file[;geom]", "background pixmap"), 194 STRG (Rs_backgroundPixmap, "backgroundPixmap", "pixmap", "file[;geom]", "background pixmap"),
197#endif 195#endif
198 /* fonts: command-line option = resource name */ 196 /* fonts: command-line option = resource name */
199 STRG (Rs_font, "font", "fn", "fontname", "normal text font"), 197 STRG (Rs_font, "font", "fn", "fontname", "normal text font"),
… …
206#ifdef USE_XIM 204#ifdef USE_XIM
207 STRG (Rs_inputMethod, "inputMethod", "im", "name", "name of input method"), 205 STRG (Rs_inputMethod, "inputMethod", "im", "name", "name of input method"),
208 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"),
209 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"),
210 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"),
211#endif /* USE_XIM */ 209#endif /* USE_XIM */
212 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"),
213 STRG (Rs_title, "title", "title", "string", "title name for window"), 211 STRG (Rs_title, "title", "title", "string", "title name for window"),
214 STRG (Rs_title, NULL, "T", NULL, NULL), /* short form */ 212 STRG (Rs_title, NULL, "T", NULL, NULL), /* short form */
215 STRG (Rs_iconName, "iconName", "n", "string", "icon name for window"), 213 STRG (Rs_iconName, "iconName", "n", "string", "icon name for window"),
216 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"),
… …
228 STRG (Rs_ext_bwidth, "externalBorder", "w", "number", "external border in pixels"), 226 STRG (Rs_ext_bwidth, "externalBorder", "w", "number", "external border in pixels"),
229 STRG (Rs_ext_bwidth, NULL, "bw", NULL, NULL), 227 STRG (Rs_ext_bwidth, NULL, "bw", NULL, NULL),
230 STRG (Rs_ext_bwidth, NULL, "borderwidth", NULL, NULL), 228 STRG (Rs_ext_bwidth, NULL, "borderwidth", NULL, NULL),
231 STRG (Rs_int_bwidth, "internalBorder", "b", "number", "internal border in pixels"), 229 STRG (Rs_int_bwidth, "internalBorder", "b", "number", "internal border in pixels"),
232 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
233 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"),
234 STRG (Rs_lineSpace, "lineSpace", "lsp", "number", "number of extra pixels between rows"),
235#endif 235#endif
236#ifdef POINTER_BLANK 236#ifdef POINTER_BLANK
237 RSTRG (Rs_pointerBlankDelay, "pointerBlankDelay", "number"), 237 RSTRG (Rs_pointerBlankDelay, "pointerBlankDelay", "number"),
238#endif 238#endif
239#ifndef NO_BACKSPACE_KEY 239#ifndef NO_BACKSPACE_KEY
240 RSTRG (Rs_backspace_key, "backspacekey", "string"), 240 RSTRG (Rs_backspace_key, "backspacekey", "string"),
241#endif 241#endif
242#ifndef NO_DELETE_KEY 242#ifndef NO_DELETE_KEY
243 RSTRG (Rs_delete_key, "deletekey", "string"), 243 RSTRG (Rs_delete_key, "deletekey", "string"),
244#endif 244#endif
245 RSTRG (Rs_selectstyle, "selectstyle", "mode"),
246#ifdef PRINTPIPE 245#ifdef PRINTPIPE
247 RSTRG (Rs_print_pipe, "print-pipe", "string"), 246 RSTRG (Rs_print_pipe, "print-pipe", "string"),
248#endif 247#endif
249 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"),
250#ifdef CUTCHAR_RESOURCE 249#ifdef CUTCHAR_RESOURCE
251 RSTRG (Rs_cutchars, "cutchars", "string"), 250 RSTRG (Rs_cutchars, "cutchars", "string"),
252#endif /* CUTCHAR_RESOURCE */ 251#endif /* CUTCHAR_RESOURCE */
253 RSTRG (Rs_answerbackstring, "answerbackString", "string"), 252 RSTRG (Rs_answerbackstring, "answerbackString", "string"),
254#ifndef NO_SECONDARY_SCREEN 253#ifndef NO_SECONDARY_SCREEN
255 BOOL (Rs_secondaryScreen, "secondaryScreen", "ssc", Opt_secondaryScreen, 0, "enable secondary screen"), 254 BOOL (Rs_secondaryScreen, "secondaryScreen", "ssc", Opt_secondaryScreen, 0, "enable secondary screen"),
256 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"),
257#endif 256#endif
… …
264#if ISO_14755 263#if ISO_14755
265 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),
266#endif 265#endif
267#ifdef HAVE_AFTERIMAGE 266#ifdef HAVE_AFTERIMAGE
268 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..."),
269 STRG (Rs_blurradius, "blurRadius", "blr", "number", "Gaussian Blur radius to apply to the root background"), 268 STRG (Rs_blurradius, "blurRadius", "blr", "HxV", "Gaussian Blur radii to apply to the root background"),
270#endif
271#ifndef NO_RESOURCES
272 INFO ("xrm", "string", "X resource"),
273#endif 269#endif
274 INFO ("e", "command arg ...", "command to execute") 270 INFO ("e", "command arg ...", "command to execute")
275 }; 271 };
276 272
277#undef INFO 273#undef INFO
… …
321#endif 317#endif
322 "," 318 ","
323#if OFF_FOCUS_FADING 319#if OFF_FOCUS_FADING
324 "fade," 320 "fade,"
325#endif 321#endif
326#if defined(XPM_BACKGROUND)
327 "XPM,"
328#endif
329#if defined(TRANSPARENT) 322#if defined(ENABLE_TRANSPARENCY)
330 "transparent," 323 "transparent,"
331#endif
332#if TINTING
333 "tint," 324 "tint,"
325#endif
326#if HAVE_AFTERIMAGE
327 "afterimage,"
334#endif 328#endif
335#if defined(USE_XIM) 329#if defined(USE_XIM)
336 "XIM," 330 "XIM,"
337#endif 331#endif
338#if defined(NO_BACKSPACE_KEY) 332#if defined(NO_BACKSPACE_KEY)
… …
431 assert (optList[i].opt != NULL); 425 assert (optList[i].opt != NULL);
432#endif 426#endif
433 len += 4 + strlen (optList[i].opt) + (optList_isBool (i) ? 2: 0); 427 len += 4 + strlen (optList[i].opt) + (optList_isBool (i) ? 2: 0);
434 col += len; 428 col += len;
435 if (col > 79) 429 if (col > 79)
430 {
436 { /* assume regular width */ 431 /* assume regular width */
437 rxvt_log ("\n"); 432 rxvt_log ("\n");
438 col = 1 + len; 433 col = 1 + len;
439 } 434 }
440 435
441 rxvt_log (" [-%s%s", (optList_isBool (i) ? "/+" : ""), optList[i].opt); 436 rxvt_log (" [-%s%s", (optList_isBool (i) ? "/+" : ""), optList[i].opt);
… …
552 * default values 547 * default values
553 */ 548 */
554 549
555 if (optList[entry].doff != -1) 550 if (optList[entry].doff != -1)
556 { 551 {
557 if (flag == resval_on && !argv [i+1]) 552 if (flag == resval_on && i+1 == argc)
558 rxvt_fatal ("option '%s' needs an argument, aborting.\n", argv [i]); 553 rxvt_fatal ("option '%s' requires an argument, aborting.\n", argv [i]);
559 554
560 rs[optList[entry].doff] = flag == resval_on ? argv[++i] : resval_undef; 555 rs[optList[entry].doff] = flag == resval_on ? argv[++i] : resval_undef;
561 } 556 }
562 } 557 }
563 else 558 else
559 {
564 { /* boolean value */ 560 /* boolean value */
565 set_option (optList[entry].index, flag == resval_on); 561 set_option (optList[entry].index, flag == resval_on);
566 562
567 if (optList[entry].doff != -1) 563 if (optList[entry].doff != -1)
568 rs[optList[entry].doff] = flag; 564 rs[optList[entry].doff] = flag;
569 } 565 }
570 } 566 }
567#ifndef NO_RESOURCES
568 else if (!strcmp (opt, "xrm"))
569 {
570 if (i+1 < argc)
571 XrmPutLineResource (&option_db, argv[++i]);
572 }
573#endif
574#ifdef KEYSYM_RESOURCE
575 else if (!strncmp (opt, "keysym.", sizeof ("keysym.") - 1))
576 {
577 if (i+1 < argc)
578 {
579 char *res = (char *)malloc (strlen (opt) + strlen (argv[++i]) + 6);
580 sprintf (res, "*.%s: %s\n", opt, argv[i]);
581 XrmPutLineResource (&option_db, res);
582 free (res);
583 }
584 }
585#endif
571 else 586 else
572#ifdef KEYSYM_RESOURCE
573 /* if (!strncmp (opt, "keysym.", sizeof ("keysym.") - 1)) */
574 if (rxvt_Str_match (opt, "keysym."))
575 { 587 {
576 const char *str = argv[++i];
577
578 if (str != NULL)
579 parse_keysym (opt + sizeof ("keysym.") - 1, str);
580 }
581 else
582#endif
583 {
584 bad_option = 1; 588 bad_option = 1;
585 rxvt_warn ("\"%s\": unknown or malformed option.\n", opt); 589 rxvt_warn ("\"%s\": unknown or malformed option.\n", opt);
586 } 590 }
587 } 591 }
588 592
589 if (bad_option) 593 if (bad_option)
590 rxvt_usage (0); 594 rxvt_usage (0);
591} 595}
… …
622} 626}
623 627
624/* 628/*
625 * look for something like this (XK_Delete) 629 * look for something like this (XK_Delete)
626 * rxvt*keysym.0xFFFF: "\177" 630 * rxvt*keysym.0xFFFF: "\177"
627 *
628 * arg will be
629 * NULL for ~/.Xdefaults and
630 * non-NULL for command-line options (need to allocate)
631 */ 631 */
632#define NEWARGLIM 500 /* `reasonable' size */
633 632
634struct keysym_vocabulary_t 633struct keysym_vocabulary_t
635{ 634{
636 const char *name; 635 const char *name;
637 unsigned short len; 636 unsigned short len;
638 unsigned short value; 637 unsigned short value;
639}; 638};
640keysym_vocabulary_t keysym_vocabulary[] = 639static const keysym_vocabulary_t keysym_vocabulary[] =
641{ 640{
642 { "ISOLevel3", 9, Level3Mask }, 641 { "ISOLevel3", 9, Level3Mask },
643 { "AppKeypad", 9, AppKeypadMask }, 642 { "AppKeypad", 9, AppKeypadMask },
644 { "Control", 7, ControlMask }, 643 { "Control", 7, ControlMask },
645 { "NumLock", 7, NumLockMask }, 644 { "NumLock", 7, NumLockMask },
… …
667}; 666};
668 667
669int 668int
670rxvt_term::parse_keysym (const char *str, const char *arg) 669rxvt_term::parse_keysym (const char *str, const char *arg)
671{ 670{
672 int n, sym; 671 int sym;
673 unsigned int state = 0; 672 unsigned int state = 0;
674 const char *pmodend = NULL; 673 const char *key = strrchr (str, '-');
675 char *newarg = NULL;
676 char newargstr[NEWARGLIM];
677 674
678 if (arg == NULL) 675 if (!key)
679 { 676 key = str;
680 if ((n = rxvt_Str_match (str, "keysym.")) == 0)
681 return 0;
682
683 str += n; /* skip `keysym.' */
684 if (!(pmodend = strchr (str, ':')))
685 return -1;
686 }
687 else 677 else
688 pmodend = str + strlen(str); 678 key++;
689 679
690 for (--pmodend; str < pmodend; --pmodend) 680 // string or key is empty
691 if (*pmodend == '-') 681 if (*arg == '\0' || *key == '\0')
692 break; 682 return -1;
693 683
684 // parse modifiers
694 while (str < pmodend) 685 while (str < key)
695 { 686 {
696 unsigned int i; 687 unsigned int i;
697 688
698 for (i=0; i < sizeof (keysym_vocabulary) / sizeof (keysym_vocabulary_t); ++i) 689 for (i=0; i < sizeof (keysym_vocabulary) / sizeof (keysym_vocabulary_t); ++i)
699 { 690 {
… …
710 701
711 if (*str == '-') 702 if (*str == '-')
712 ++str; 703 ++str;
713 } 704 }
714 705
715 /* some scanf () have trouble with a 0x prefix */ 706 // convert keysym name to keysym number
716 if (str[0] == '0' && toupper (str[1]) == 'X') 707 if ((sym = XStringToKeysym (str)) == None)
717 { 708 {
718 str += 2; 709 // fallback on hexadecimal parsing
719 710 char *end;
711 sym = strtol (str, &end, 16);
720 if (arg) 712 if (*end)
721 {
722 if (sscanf (str, (strchr (str, ':') ? "%x:" : "%x"), &sym) != 1)
723 return -1;
724 }
725 else
726 {
727 if (sscanf (str, "%x:", &sym) != 1)
728 return -1;
729
730 /* cue to ':', it's there since sscanf () worked */
731 strncpy (newargstr, strchr (str, ':') + 1, NEWARGLIM - 1);
732 newargstr[NEWARGLIM - 1] = '\0';
733 newarg = newargstr;
734 }
735 }
736 else
737 {
738 /*
739 * convert keysym name to keysym number
740 */
741 strncpy (newargstr, str, NEWARGLIM - 1);
742 newargstr[NEWARGLIM - 1] = '\0';
743
744 if (arg == NULL)
745 {
746 if ((newarg = strchr (newargstr, ':')) == NULL)
747 return -1;
748
749 *newarg++ = '\0'; /* terminate keysym name */
750 }
751
752 if ((sym = XStringToKeysym (newargstr)) == None)
753 return -1; 713 return -1;
754 } 714 }
755 715
756 if (newarg == NULL)
757 {
758 strncpy (newargstr, arg, NEWARGLIM - 1);
759 newargstr[NEWARGLIM - 1] = '\0';
760 newarg = newargstr;
761 }
762
763 rxvt_Str_trim (newarg);
764 if (*newarg == '\0' || (n = rxvt_Str_escaped (newarg)) == 0)
765 return -1;
766
767 keyboard->register_user_translation (sym, state, newarg); 716 keyboard->register_user_translation (sym, state, arg);
768 return 1; 717 return 1;
769} 718}
770 719
771# endif /* KEYSYM_RESOURCE */ 720# endif /* KEYSYM_RESOURCE */
772#endif /* NO_RESOURCES */ 721#endif /* NO_RESOURCES */
773 722
774static char * 723static char *
775get_res (XrmDatabase database, const char *program, const char *option) 724get_res (XrmDatabase database, const char *program, const char *option)
776{ 725{
777 char resource[512]; 726 char resource[512];
… …
809 758
810void 759void
811rxvt_term::extract_resources () 760rxvt_term::extract_resources ()
812{ 761{
813#ifndef NO_RESOURCES 762#ifndef NO_RESOURCES
763 XrmDatabase database = XrmGetDatabase (dpy);
764 XrmMergeDatabases (option_db, &database);
765 option_db = NULL;
814 /* 766 /*
815 * Query resources for options that affect us 767 * Query resources for options that affect us
816 */ 768 */
817 for (int entry = 0; entry < optList_size; entry++) 769 for (int entry = 0; entry < optList_size; entry++)
818 { 770 {
… …
847 799
848 /* 800 /*
849 * [R5 or later]: enumerate the resource database 801 * [R5 or later]: enumerate the resource database
850 */ 802 */
851# ifdef KEYSYM_RESOURCE 803# ifdef KEYSYM_RESOURCE
852 XrmDatabase database = XrmGetDatabase (dpy);
853 XrmName name_prefix[3]; 804 XrmName name_prefix[3];
854 XrmClass class_prefix[3]; 805 XrmClass class_prefix[3];
855 806
856 name_prefix[0] = XrmStringToName (rs[Rs_name]); 807 name_prefix[0] = XrmStringToName (rs[Rs_name]);
857 name_prefix[1] = XrmStringToName ("keysym"); 808 name_prefix[1] = XrmStringToName ("keysym");
… …
871 XrmEnumerateDatabase (database, name_prefix, class_prefix, 822 XrmEnumerateDatabase (database, name_prefix, class_prefix,
872 XrmEnumOneLevel, rxvt_define_key, NULL); 823 XrmEnumOneLevel, rxvt_define_key, NULL);
873# endif 824# endif
874# endif 825# endif
875 826
876#endif /* NO_RESOURCES */ 827#endif /* NO_RESOURCES */
877} 828}
878 829
879/*----------------------- end-of-file (C source) -----------------------*/ 830/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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