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.111 by ayin, Fri Aug 3 23:32:14 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 XPM_BACKGROUND 192#ifdef BG_IMAGE_FROM_FILE
192 RSTRG (Rs_path, "path", "search path"), 193 RSTRG (Rs_path, "path", "search path"),
193 STRG (Rs_backgroundPixmap, "backgroundPixmap", "pixmap", "file[;geom]", "background pixmap"), 194 STRG (Rs_backgroundPixmap, "backgroundPixmap", "pixmap", "file[;geom]", "background pixmap"),
194#endif 195#endif
195 /* fonts: command-line option = resource name */ 196 /* fonts: command-line option = resource name */
196 STRG (Rs_font, "font", "fn", "fontname", "normal text font"), 197 STRG (Rs_font, "font", "fn", "fontname", "normal text font"),
… …
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
… …
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 269#endif
268#ifndef NO_RESOURCES
269 INFO ("xrm", "string", "X resource"),
270#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
275#undef STRG 274#undef STRG
… …
317 "+zh-ext" 316 "+zh-ext"
318#endif 317#endif
319 "," 318 ","
320#if OFF_FOCUS_FADING 319#if OFF_FOCUS_FADING
321 "fade," 320 "fade,"
322#endif
323#if defined(XPM_BACKGROUND)
324 "XPM,"
325#endif 321#endif
326#if defined(ENABLE_TRANSPARENCY) 322#if defined(ENABLE_TRANSPARENCY)
327 "transparent," 323 "transparent,"
328 "tint," 324 "tint,"
329#endif 325#endif
… …
417 for (col = 1, i = 0; i < optList_size; i++) 413 for (col = 1, i = 0; i < optList_size; i++)
418 if (optList[i].desc != NULL) 414 if (optList[i].desc != NULL)
419 { 415 {
420 int len = 0; 416 int len = 0;
421 417
422 if (!optList_isBool (i)) 418 if (optList[i].arg)
423 { 419 len = strlen (optList[i].arg) + 1;
424 len = optList_strlen (i);
425 if (len > 0)
426 len++; /* account for space */
427 }
428#ifdef DEBUG_STRICT 420#ifdef DEBUG_STRICT
429 assert (optList[i].opt != NULL); 421 assert (optList[i].opt != NULL);
430#endif 422#endif
431 len += 4 + strlen (optList[i].opt) + (optList_isBool (i) ? 2: 0); 423 len += 4 + strlen (optList[i].opt) + (optList_isBool (i) ? 2: 0);
432 col += len; 424 col += len;
433 if (col > 79) 425 if (col > 79)
426 {
434 { /* assume regular width */ 427 /* assume regular width */
435 rxvt_log ("\n"); 428 rxvt_log ("\n");
436 col = 1 + len; 429 col = 1 + len;
437 } 430 }
438 431
439 rxvt_log (" [-%s%s", (optList_isBool (i) ? "/+" : ""), optList[i].opt); 432 rxvt_log (" [-%s%s", (optList_isBool (i) ? "/+" : ""), optList[i].opt);
440 if (optList_strlen (i)) 433 if (optList[i].arg)
441 rxvt_log (" %s]", optList[i].arg); 434 rxvt_log (" %s]", optList[i].arg);
442 else 435 else
443 rxvt_log ("]"); 436 rxvt_log ("]");
444 } 437 }
445 break; 438 break;
… …
497 int i, bad_option = 0; 490 int i, bad_option = 0;
498 491
499 for (i = 1; i < argc; i++) 492 for (i = 1; i < argc; i++)
500 { 493 {
501 unsigned int entry, longopt = 0; 494 unsigned int entry, longopt = 0;
502 const char *flag, *opt; 495 const char *opt;
496 int flag;
503 497
504 opt = argv[i]; 498 opt = argv[i];
505 499
506 if (*opt == '-') 500 if (*opt == '-')
507 { 501 {
508 flag = resval_on; 502 flag = 1;
509 503
510 if (*++opt == '-') 504 if (*++opt == '-')
511 longopt = *opt++; /* long option */ 505 longopt = *opt++; /* long option */
512 } 506 }
513 else if (*opt == '+') 507 else if (*opt == '+')
514 { 508 {
515 flag = resval_off; 509 flag = 0;
516 510
517 if (*++opt == '+') 511 if (*++opt == '+')
518 longopt = *opt++; /* long option */ 512 longopt = *opt++; /* long option */
519 } 513 }
520 else 514 else
… …
538 break; 532 break;
539 533
540 if (entry < optList_size) 534 if (entry < optList_size)
541 { 535 {
542 if (optList_isReverse (entry)) 536 if (optList_isReverse (entry))
543 flag = flag == resval_on ? resval_off : resval_on; 537 flag = !flag;
544 538
545 if (optList_strlen (entry)) 539 if (optList_isString (entry))
546 { 540 {
547 /* 541 /*
548 * special cases are handled in main.c:main () to allow 542 * special cases are handled in main.c:main () to allow
549 * X resources to set these values before we settle for 543 * X resources to set these values before we settle for
550 * default values 544 * default values
551 */ 545 */
552 546
553 if (optList[entry].doff != -1) 547 if (optList[entry].doff != -1)
554 { 548 {
555 if (flag == resval_on && !argv [i+1]) 549 if (flag && i+1 == argc)
556 rxvt_fatal ("option '%s' needs an argument, aborting.\n", argv [i]); 550 rxvt_fatal ("option '%s' requires an argument, aborting.\n", argv [i]);
557 551
558 rs[optList[entry].doff] = flag == resval_on ? argv[++i] : resval_undef; 552 rs[optList[entry].doff] = flag ? argv[++i] : resval_undef;
559 } 553 }
560 } 554 }
561 else 555 else
556 {
562 { /* boolean value */ 557 /* boolean value */
563 set_option (optList[entry].index, flag == resval_on); 558 set_option (optList[entry].index, flag);
564 559
565 if (optList[entry].doff != -1) 560 if (optList[entry].doff != -1)
566 rs[optList[entry].doff] = flag; 561 rs[optList[entry].doff] = flag ? resval_on : resval_off;
567 } 562 }
568 } 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
569 else 583 else
570#ifdef KEYSYM_RESOURCE
571 /* if (!strncmp (opt, "keysym.", sizeof ("keysym.") - 1)) */
572 if (rxvt_Str_match (opt, "keysym."))
573 { 584 {
574 const char *str = argv[++i];
575
576 if (str != NULL)
577 parse_keysym (opt + sizeof ("keysym.") - 1, str);
578 }
579 else
580#endif
581 {
582 bad_option = 1; 585 bad_option = 1;
583 rxvt_warn ("\"%s\": unknown or malformed option.\n", opt); 586 rxvt_warn ("\"%s\": unknown or malformed option.\n", opt);
584 } 587 }
585 } 588 }
586 589
587 if (bad_option) 590 if (bad_option)
588 rxvt_usage (0); 591 rxvt_usage (0);
589} 592}
… …
620} 623}
621 624
622/* 625/*
623 * look for something like this (XK_Delete) 626 * look for something like this (XK_Delete)
624 * rxvt*keysym.0xFFFF: "\177" 627 * rxvt*keysym.0xFFFF: "\177"
625 *
626 * arg will be
627 * NULL for ~/.Xdefaults and
628 * non-NULL for command-line options (need to allocate)
629 */ 628 */
630#define NEWARGLIM 500 /* `reasonable' size */
631 629
632struct keysym_vocabulary_t 630struct keysym_vocabulary_t
633{ 631{
634 const char *name; 632 const char *name;
635 unsigned short len; 633 unsigned short len;
636 unsigned short value; 634 unsigned short value;
637}; 635};
638keysym_vocabulary_t keysym_vocabulary[] = 636static const keysym_vocabulary_t keysym_vocabulary[] =
639{ 637{
640 { "ISOLevel3", 9, Level3Mask }, 638 { "ISOLevel3", 9, Level3Mask },
641 { "AppKeypad", 9, AppKeypadMask }, 639 { "AppKeypad", 9, AppKeypadMask },
642 { "Control", 7, ControlMask }, 640 { "Control", 7, ControlMask },
643 { "NumLock", 7, NumLockMask }, 641 { "NumLock", 7, NumLockMask },
… …
665}; 663};
666 664
667int 665int
668rxvt_term::parse_keysym (const char *str, const char *arg) 666rxvt_term::parse_keysym (const char *str, const char *arg)
669{ 667{
670 int n, sym; 668 int sym;
671 unsigned int state = 0; 669 unsigned int state = 0;
672 const char *pmodend = NULL; 670 const char *key = strrchr (str, '-');
673 char *newarg = NULL;
674 char newargstr[NEWARGLIM];
675 671
676 if (arg == NULL) 672 if (!key)
677 { 673 key = str;
678 if ((n = rxvt_Str_match (str, "keysym.")) == 0)
679 return 0;
680
681 str += n; /* skip `keysym.' */
682 if (!(pmodend = strchr (str, ':')))
683 return -1;
684 }
685 else 674 else
686 pmodend = str + strlen(str); 675 key++;
687 676
688 for (--pmodend; str < pmodend; --pmodend) 677 // string or key is empty
689 if (*pmodend == '-') 678 if (*arg == '\0' || *key == '\0')
690 break; 679 return -1;
691 680
681 // parse modifiers
692 while (str < pmodend) 682 while (str < key)
693 { 683 {
694 unsigned int i; 684 unsigned int i;
695 685
696 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)
697 { 687 {
… …
708 698
709 if (*str == '-') 699 if (*str == '-')
710 ++str; 700 ++str;
711 } 701 }
712 702
713 /* some scanf () have trouble with a 0x prefix */ 703 // convert keysym name to keysym number
714 if (str[0] == '0' && toupper (str[1]) == 'X') 704 if ((sym = XStringToKeysym (str)) == None)
715 { 705 {
716 str += 2; 706 // fallback on hexadecimal parsing
717 707 char *end;
708 sym = strtol (str, &end, 16);
718 if (arg) 709 if (*end)
719 {
720 if (sscanf (str, (strchr (str, ':') ? "%x:" : "%x"), &sym) != 1)
721 return -1;
722 }
723 else
724 {
725 if (sscanf (str, "%x:", &sym) != 1)
726 return -1;
727
728 /* cue to ':', it's there since sscanf () worked */
729 strncpy (newargstr, strchr (str, ':') + 1, NEWARGLIM - 1);
730 newargstr[NEWARGLIM - 1] = '\0';
731 newarg = newargstr;
732 }
733 }
734 else
735 {
736 /*
737 * convert keysym name to keysym number
738 */
739 strncpy (newargstr, str, NEWARGLIM - 1);
740 newargstr[NEWARGLIM - 1] = '\0';
741
742 if (arg == NULL)
743 {
744 if ((newarg = strchr (newargstr, ':')) == NULL)
745 return -1;
746
747 *newarg++ = '\0'; /* terminate keysym name */
748 }
749
750 if ((sym = XStringToKeysym (newargstr)) == None)
751 return -1; 710 return -1;
752 } 711 }
753 712
754 if (newarg == NULL)
755 {
756 strncpy (newargstr, arg, NEWARGLIM - 1);
757 newargstr[NEWARGLIM - 1] = '\0';
758 newarg = newargstr;
759 }
760
761 rxvt_Str_trim (newarg);
762 if (*newarg == '\0' || (n = rxvt_Str_escaped (newarg)) == 0)
763 return -1;
764
765 keyboard->register_user_translation (sym, state, newarg); 713 keyboard->register_user_translation (sym, state, arg);
766 return 1; 714 return 1;
767} 715}
768 716
769# endif /* KEYSYM_RESOURCE */ 717# endif /* KEYSYM_RESOURCE */
770#endif /* NO_RESOURCES */ 718#endif /* NO_RESOURCES */
771 719
772static char * 720static char *
773get_res (XrmDatabase database, const char *program, const char *option) 721get_res (XrmDatabase database, const char *program, const char *option)
774{ 722{
775 char resource[512]; 723 char resource[512];
… …
807 755
808void 756void
809rxvt_term::extract_resources () 757rxvt_term::extract_resources ()
810{ 758{
811#ifndef NO_RESOURCES 759#ifndef NO_RESOURCES
760 XrmDatabase database = XrmGetDatabase (dpy);
761 XrmMergeDatabases (option_db, &database);
762 option_db = NULL;
812 /* 763 /*
813 * Query resources for options that affect us 764 * Query resources for options that affect us
814 */ 765 */
815 for (int entry = 0; entry < optList_size; entry++) 766 for (int entry = 0; entry < optList_size; entry++)
816 { 767 {
… …
845 796
846 /* 797 /*
847 * [R5 or later]: enumerate the resource database 798 * [R5 or later]: enumerate the resource database
848 */ 799 */
849# ifdef KEYSYM_RESOURCE 800# ifdef KEYSYM_RESOURCE
850 XrmDatabase database = XrmGetDatabase (dpy);
851 XrmName name_prefix[3]; 801 XrmName name_prefix[3];
852 XrmClass class_prefix[3]; 802 XrmClass class_prefix[3];
853 803
854 name_prefix[0] = XrmStringToName (rs[Rs_name]); 804 name_prefix[0] = XrmStringToName (rs[Rs_name]);
855 name_prefix[1] = XrmStringToName ("keysym"); 805 name_prefix[1] = XrmStringToName ("keysym");
… …
869 XrmEnumerateDatabase (database, name_prefix, class_prefix, 819 XrmEnumerateDatabase (database, name_prefix, class_prefix,
870 XrmEnumOneLevel, rxvt_define_key, NULL); 820 XrmEnumOneLevel, rxvt_define_key, NULL);
871# endif 821# endif
872# endif 822# endif
873 823
874#endif /* NO_RESOURCES */ 824#endif /* NO_RESOURCES */
875} 825}
876 826
877/*----------------------- end-of-file (C source) -----------------------*/ 827/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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