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.116 by ayin, Thu Oct 11 16:01:27 2007 UTC vs.
Revision 1.134 by ayin, Sun Jan 27 16:52:13 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 HAVE_SCROLLBARS
177 RSTRG (Rs_color + Color_scroll, "scrollColor", "color"), 178 RSTRG (Rs_color + Color_scroll, "scrollColor", "color"),
179#endif
180#ifdef RXVT_SCROLLBAR
178 RSTRG (Rs_color + Color_trough, "troughColor", "color"), 181 RSTRG (Rs_color + Color_trough, "troughColor", "color"),
179#endif /* KEEP_SCROLLCOLOR */ 182#endif
180#ifdef OPTION_HC 183#ifdef OPTION_HC
181 STRG (Rs_color + Color_HC, "highlightColor", "hc", "color", "highlight color"), 184 STRG (Rs_color + Color_HC, "highlightColor", "hc", "color", "highlight color"),
182#endif 185#endif
183#ifndef NO_CURSORCOLOR 186#ifndef NO_CURSORCOLOR
184 STRG (Rs_color + Color_cursor, "cursorColor", "cr", "color", "cursor color"), 187 STRG (Rs_color + Color_cursor, "cursorColor", "cr", "color", "cursor color"),
185 /* command-line option = resource name */ 188 /* command-line option = resource name */
186 RSTRG (Rs_color + Color_cursor2, "cursorColor2", "color"), 189 RSTRG (Rs_color + Color_cursor2, "cursorColor2", "color"),
187#endif /* NO_CURSORCOLOR */ 190#endif /* NO_CURSORCOLOR */
188 STRG (Rs_color + Color_pointer_fg, "pointerColor", "pr", "color", "pointer color"), 191 STRG (Rs_color + Color_pointer_fg, "pointerColor", "pr", "color", "pointer color"),
189 STRG (Rs_color + Color_pointer_bg, "pointerColor2", "pr2", "color", "pointer bg color"), 192 STRG (Rs_color + Color_pointer_bg, "pointerColor2", "pr2", "color", "pointer bg color"),
190 STRG (Rs_color + Color_border, "borderColor", "bd", "color", "border color"), 193 STRG (Rs_color + Color_border, "borderColor", "bd", "color", "border color"),
191#ifdef BG_IMAGE_FROM_FILE 194#ifdef BG_IMAGE_FROM_FILE
192 RSTRG (Rs_path, "path", "search path"), 195 RSTRG (Rs_path, "path", "search path"),
… …
203#ifdef USE_XIM 206#ifdef USE_XIM
204 STRG (Rs_inputMethod, "inputMethod", "im", "name", "name of input method"), 207 STRG (Rs_inputMethod, "inputMethod", "im", "name", "name of input method"),
205 STRG (Rs_preeditType, "preeditType", "pt", "style", "input style: style = OverTheSpot|OffTheSpot|Root"), 208 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"), 209 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"), 210 STRG (Rs_imFont, "imFont", "imfont", "fontname", "fontset for styles OverTheSpot and OffTheSpot"),
208#endif /* USE_XIM */ 211#endif /* USE_XIM */
209 STRG (Rs_name, NULL, "name", "string", "client instance, icon, and title strings"), 212 STRG (Rs_name, NULL, "name", "string", "client instance, icon, and title strings"),
210 STRG (Rs_title, "title", "title", "string", "title name for window"), 213 STRG (Rs_title, "title", "title", "string", "title name for window"),
211 STRG (Rs_title, NULL, "T", NULL, NULL), /* short form */ 214 STRG (Rs_title, NULL, "T", NULL, NULL), /* short form */
212 STRG (Rs_iconName, "iconName", "n", "string", "icon name for window"), 215 STRG (Rs_iconName, "iconName", "n", "string", "icon name for window"),
213 STRG (Rs_saveLines, "saveLines", "sl", "number", "number of scrolled lines to save"), 216 STRG (Rs_saveLines, "saveLines", "sl", "number", "number of scrolled lines to save"),
214#if ENABLE_XEMBED 217#if ENABLE_XEMBED
215 STRG (Rs_embed, NULL, "embed", "windowid", "window id to embed terminal in"), 218 STRG (Rs_embed, NULL, "embed", "windowid", "window id to embed terminal in"),
216#endif 219#endif
217#if XFT 220#if XFT
218 STRG (Rs_depth, "depth", "depth", "number", "depth of visual to request"), 221 STRG (Rs_depth, "depth", "depth", "number", "depth of visual to request"),
222 BOOL (Rs_buffered, "buffered", NULL, Opt_buffered, 0, NULL),
219#endif 223#endif
220#if ENABLE_FRILLS 224#if ENABLE_FRILLS
221 RSTRG (Rs_transient_for, "transient-for", "windowid"), 225 RSTRG (Rs_transient_for, "transient-for", "windowid"),
222 BOOL (Rs_override_redirect, "override-redirect", "override-redirect", Opt_override_redirect, 0, "set override-redirect on the terminal window"), 226 BOOL (Rs_override_redirect, "override-redirect", "override-redirect", Opt_override_redirect, 0, "set override-redirect on the terminal window"),
223 STRG (Rs_pty_fd, NULL, "pty-fd", "fileno", "file descriptor of pty to use"), 227 STRG (Rs_pty_fd, NULL, "pty-fd", "fileno", "file descriptor of pty to use"),
… …
225 STRG (Rs_ext_bwidth, "externalBorder", "w", "number", "external border in pixels"), 229 STRG (Rs_ext_bwidth, "externalBorder", "w", "number", "external border in pixels"),
226 STRG (Rs_ext_bwidth, NULL, "bw", NULL, NULL), 230 STRG (Rs_ext_bwidth, NULL, "bw", NULL, NULL),
227 STRG (Rs_ext_bwidth, NULL, "borderwidth", NULL, NULL), 231 STRG (Rs_ext_bwidth, NULL, "borderwidth", NULL, NULL),
228 STRG (Rs_int_bwidth, "internalBorder", "b", "number", "internal border in pixels"), 232 STRG (Rs_int_bwidth, "internalBorder", "b", "number", "internal border in pixels"),
229 BOOL (Rs_borderLess, "borderLess", "bl", Opt_borderLess, 0, "borderless window"), 233 BOOL (Rs_borderLess, "borderLess", "bl", Opt_borderLess, 0, "borderless window"),
234 STRG (Rs_lineSpace, "lineSpace", "lsp", "number", "number of extra pixels between rows"),
235#endif
236#ifdef BUILTIN_GLYPHS
230 BOOL (Rs_skipBuiltinGlyphs, "skipBuiltinGlyphs", "sbg", Opt_skipBuiltinGlyphs, 0, "do not use internal glyphs"), 237 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 238#endif
233#ifdef POINTER_BLANK 239#ifdef POINTER_BLANK
234 RSTRG (Rs_pointerBlankDelay, "pointerBlankDelay", "number"), 240 RSTRG (Rs_pointerBlankDelay, "pointerBlankDelay", "number"),
235#endif 241#endif
236#ifndef NO_BACKSPACE_KEY 242#ifndef NO_BACKSPACE_KEY
237 RSTRG (Rs_backspace_key, "backspacekey", "string"), 243 RSTRG (Rs_backspace_key, "backspacekey", "string"),
238#endif 244#endif
239#ifndef NO_DELETE_KEY 245#ifndef NO_DELETE_KEY
240 RSTRG (Rs_delete_key, "deletekey", "string"), 246 RSTRG (Rs_delete_key, "deletekey", "string"),
241#endif 247#endif
242 RSTRG (Rs_selectstyle, "selectstyle", "mode"),
243#ifdef PRINTPIPE 248#ifdef PRINTPIPE
244 RSTRG (Rs_print_pipe, "print-pipe", "string"), 249 RSTRG (Rs_print_pipe, "print-pipe", "string"),
245#endif 250#endif
246 STRG (Rs_modifier, "modifier", "mod", "modifier", "meta modifier = alt|meta|hyper|super|mod1|...|mod5"), 251 STRG (Rs_modifier, "modifier", "mod", "modifier", "meta modifier = alt|meta|hyper|super|mod1|...|mod5"),
247#ifdef CUTCHAR_RESOURCE 252#ifdef CUTCHAR_RESOURCE
248 RSTRG (Rs_cutchars, "cutchars", "string"), 253 RSTRG (Rs_cutchars, "cutchars", "string"),
249#endif /* CUTCHAR_RESOURCE */ 254#endif /* CUTCHAR_RESOURCE */
250 RSTRG (Rs_answerbackstring, "answerbackString", "string"), 255 RSTRG (Rs_answerbackstring, "answerbackString", "string"),
251#ifndef NO_SECONDARY_SCREEN 256#ifndef NO_SECONDARY_SCREEN
252 BOOL (Rs_secondaryScreen, "secondaryScreen", "ssc", Opt_secondaryScreen, 0, "enable secondary screen"), 257 BOOL (Rs_secondaryScreen, "secondaryScreen", "ssc", Opt_secondaryScreen, 0, "enable secondary screen"),
253 BOOL (Rs_secondaryScroll, "secondaryScroll", "ssr", Opt_secondaryScroll, 0, "enable secondary screen scroll"), 258 BOOL (Rs_secondaryScroll, "secondaryScroll", "ssr", Opt_secondaryScroll, 0, "enable secondary screen scroll"),
254#endif 259#endif
… …
262 BOOL (Rs_iso14755_52, "iso14755_52", NULL, Opt_iso14755_52, 0, NULL), 267 BOOL (Rs_iso14755_52, "iso14755_52", NULL, Opt_iso14755_52, 0, NULL),
263#endif 268#endif
264#ifdef HAVE_AFTERIMAGE 269#ifdef HAVE_AFTERIMAGE
265 STRG (Rs_blendtype, "blendType", "blt", "string", "background image blending type - alpha, tint, etc..."), 270 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"), 271 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 272#endif
271 INFO ("e", "command arg ...", "command to execute") 273 INFO ("e", "command arg ...", "command to execute")
272 }; 274 };
273 275
274#undef INFO 276#undef INFO
… …
414 for (col = 1, i = 0; i < optList_size; i++) 416 for (col = 1, i = 0; i < optList_size; i++)
415 if (optList[i].desc != NULL) 417 if (optList[i].desc != NULL)
416 { 418 {
417 int len = 0; 419 int len = 0;
418 420
419 if (!optList_isBool (i)) 421 if (optList[i].arg)
420 { 422 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 423#ifdef DEBUG_STRICT
426 assert (optList[i].opt != NULL); 424 assert (optList[i].opt != NULL);
427#endif 425#endif
428 len += 4 + strlen (optList[i].opt) + (optList_isBool (i) ? 2: 0); 426 len += 4 + strlen (optList[i].opt) + (optList_isBool (i) ? 2: 0);
429 col += len; 427 col += len;
430 if (col > 79) 428 if (col > 79)
429 {
431 { /* assume regular width */ 430 /* assume regular width */
432 rxvt_log ("\n"); 431 rxvt_log ("\n");
433 col = 1 + len; 432 col = 1 + len;
434 } 433 }
435 434
436 rxvt_log (" [-%s%s", (optList_isBool (i) ? "/+" : ""), optList[i].opt); 435 rxvt_log (" [-%s%s", (optList_isBool (i) ? "/+" : ""), optList[i].opt);
437 if (optList_strlen (i)) 436 if (optList[i].arg)
438 rxvt_log (" %s]", optList[i].arg); 437 rxvt_log (" %s]", optList[i].arg);
439 else 438 else
440 rxvt_log ("]"); 439 rxvt_log ("]");
441 } 440 }
442 break; 441 break;
… …
494 int i, bad_option = 0; 493 int i, bad_option = 0;
495 494
496 for (i = 1; i < argc; i++) 495 for (i = 1; i < argc; i++)
497 { 496 {
498 unsigned int entry, longopt = 0; 497 unsigned int entry, longopt = 0;
499 const char *flag, *opt; 498 const char *opt;
499 int flag;
500 500
501 opt = argv[i]; 501 opt = argv[i];
502 502
503 if (*opt == '-') 503 if (*opt == '-')
504 { 504 {
505 flag = resval_on; 505 flag = 1;
506 506
507 if (*++opt == '-') 507 if (*++opt == '-')
508 longopt = *opt++; /* long option */ 508 longopt = *opt++; /* long option */
509 } 509 }
510 else if (*opt == '+') 510 else if (*opt == '+')
511 { 511 {
512 flag = resval_off; 512 flag = 0;
513 513
514 if (*++opt == '+') 514 if (*++opt == '+')
515 longopt = *opt++; /* long option */ 515 longopt = *opt++; /* long option */
516 } 516 }
517 else 517 else
… …
535 break; 535 break;
536 536
537 if (entry < optList_size) 537 if (entry < optList_size)
538 { 538 {
539 if (optList_isReverse (entry)) 539 if (optList_isReverse (entry))
540 flag = flag == resval_on ? resval_off : resval_on; 540 flag = !flag;
541 541
542 if (optList_strlen (entry)) 542 if (optList_isString (entry))
543 { 543 {
544 /* 544 /*
545 * special cases are handled in main.c:main () to allow 545 * special cases are handled in main.c:main () to allow
546 * X resources to set these values before we settle for 546 * X resources to set these values before we settle for
547 * default values 547 * default values
548 */ 548 */
549 549
550 if (optList[entry].doff != -1) 550 if (optList[entry].doff != -1)
551 { 551 {
552 if (flag == resval_on && i+1 == argc) 552 if (flag && i+1 == argc)
553 rxvt_fatal ("option '%s' needs an argument, aborting.\n", argv [i]); 553 rxvt_fatal ("option '%s' requires an argument, aborting.\n", argv [i]);
554 554
555 rs[optList[entry].doff] = flag == resval_on ? argv[++i] : resval_undef; 555 rs[optList[entry].doff] = flag ? argv[++i] : resval_undef;
556 } 556 }
557 } 557 }
558 else 558 else
559 {
559 { /* boolean value */ 560 /* boolean value */
560 set_option (optList[entry].index, flag == resval_on); 561 set_option (optList[entry].index, flag);
561 562
562 if (optList[entry].doff != -1) 563 if (optList[entry].doff != -1)
563 rs[optList[entry].doff] = flag; 564 rs[optList[entry].doff] = flag ? resval_on : resval_off;
564 } 565 }
565 } 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
566 else 586 else
567#ifdef KEYSYM_RESOURCE
568 if (!strncmp (opt, "keysym.", sizeof ("keysym.") - 1))
569 { 587 {
570 if (i+1 < argc)
571 parse_keysym (opt + sizeof ("keysym.") - 1, argv[++i]);
572 }
573 else
574#endif
575 {
576 bad_option = 1; 588 bad_option = 1;
577 rxvt_warn ("\"%s\": unknown or malformed option.\n", opt); 589 rxvt_warn ("\"%s\": unknown or malformed option.\n", opt);
578 } 590 }
579 } 591 }
580 592
581 if (bad_option) 593 if (bad_option)
582 rxvt_usage (0); 594 rxvt_usage (0);
583} 595}
… …
614} 626}
615 627
616/* 628/*
617 * look for something like this (XK_Delete) 629 * look for something like this (XK_Delete)
618 * rxvt*keysym.0xFFFF: "\177" 630 * rxvt*keysym.0xFFFF: "\177"
619 *
620 * arg will be
621 * NULL for ~/.Xdefaults and
622 * non-NULL for command-line options (need to allocate)
623 */ 631 */
624#define NEWARGLIM 500 /* `reasonable' size */
625 632
626struct keysym_vocabulary_t 633struct keysym_vocabulary_t
627{ 634{
628 const char *name; 635 const char *name;
629 unsigned short len; 636 unsigned short len;
630 unsigned short value; 637 unsigned short value;
631}; 638};
632keysym_vocabulary_t keysym_vocabulary[] = 639static const keysym_vocabulary_t keysym_vocabulary[] =
633{ 640{
634 { "ISOLevel3", 9, Level3Mask }, 641 { "ISOLevel3", 9, Level3Mask },
635 { "AppKeypad", 9, AppKeypadMask }, 642 { "AppKeypad", 9, AppKeypadMask },
636 { "Control", 7, ControlMask }, 643 { "Control", 7, ControlMask },
637 { "NumLock", 7, NumLockMask }, 644 { "NumLock", 7, NumLockMask },
… …
659}; 666};
660 667
661int 668int
662rxvt_term::parse_keysym (const char *str, const char *arg) 669rxvt_term::parse_keysym (const char *str, const char *arg)
663{ 670{
664 int n, sym; 671 int sym;
665 unsigned int state = 0; 672 unsigned int state = 0;
666 const char *pmodend = NULL; 673 const char *key = strrchr (str, '-');
667 char *newarg = NULL;
668 char newargstr[NEWARGLIM];
669 674
670 if (arg == NULL) 675 if (!key)
671 { 676 key = str;
672 n = sizeof ("keysym.") - 1;
673 if (strncmp (str, "keysym.", n))
674 return 0;
675
676 str += n; /* skip `keysym.' */
677 if (!(pmodend = strchr (str, ':')))
678 return -1;
679 }
680 else 677 else
681 pmodend = str + strlen(str); 678 key++;
682 679
683 for (--pmodend; str < pmodend; --pmodend) 680 // string or key is empty
684 if (*pmodend == '-') 681 if (*arg == '\0' || *key == '\0')
685 break; 682 return -1;
686 683
684 // parse modifiers
687 while (str < pmodend) 685 while (str < key)
688 { 686 {
689 unsigned int i; 687 unsigned int i;
690 688
691 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)
692 { 690 {
… …
703 701
704 if (*str == '-') 702 if (*str == '-')
705 ++str; 703 ++str;
706 } 704 }
707 705
708 /* some scanf () have trouble with a 0x prefix */ 706 // convert keysym name to keysym number
709 if (str[0] == '0' && toupper (str[1]) == 'X') 707 if ((sym = XStringToKeysym (str)) == None)
710 { 708 {
711 str += 2; 709 // fallback on hexadecimal parsing
712 710 char *end;
711 sym = strtol (str, &end, 16);
713 if (arg) 712 if (*end)
714 {
715 if (sscanf (str, (strchr (str, ':') ? "%x:" : "%x"), &sym) != 1)
716 return -1;
717 }
718 else
719 {
720 if (sscanf (str, "%x:", &sym) != 1)
721 return -1;
722
723 /* cue to ':', it's there since sscanf () worked */
724 strncpy (newargstr, strchr (str, ':') + 1, NEWARGLIM - 1);
725 newargstr[NEWARGLIM - 1] = '\0';
726 newarg = newargstr;
727 }
728 }
729 else
730 {
731 /*
732 * convert keysym name to keysym number
733 */
734 strncpy (newargstr, str, NEWARGLIM - 1);
735 newargstr[NEWARGLIM - 1] = '\0';
736
737 if (arg == NULL)
738 {
739 if ((newarg = strchr (newargstr, ':')) == NULL)
740 return -1;
741
742 *newarg++ = '\0'; /* terminate keysym name */
743 }
744
745 if ((sym = XStringToKeysym (newargstr)) == None)
746 return -1; 713 return -1;
747 } 714 }
748 715
749 if (newarg == NULL)
750 {
751 strncpy (newargstr, arg, NEWARGLIM - 1);
752 newargstr[NEWARGLIM - 1] = '\0';
753 newarg = newargstr;
754 }
755
756 if (*newarg == '\0')
757 return -1;
758
759 keyboard->register_user_translation (sym, state, newarg); 716 keyboard->register_user_translation (sym, state, arg);
760 return 1; 717 return 1;
761} 718}
762 719
763# endif /* KEYSYM_RESOURCE */ 720# endif /* KEYSYM_RESOURCE */
764#endif /* NO_RESOURCES */ 721#endif /* NO_RESOURCES */
765 722
766static char * 723static char *
767get_res (XrmDatabase database, const char *program, const char *option) 724get_res (XrmDatabase database, const char *program, const char *option)
768{ 725{
769 char resource[512]; 726 char resource[512];
… …
774 XrmGetResource (database, resource, resource, &type, &result); 731 XrmGetResource (database, resource, resource, &type, &result);
775 732
776 return result.addr; 733 return result.addr;
777} 734}
778 735
779static const char * 736const char *
780x_resource (const char *name) 737rxvt_term::x_resource (const char *name)
781{ 738{
782 XrmDatabase database = XrmGetDatabase (dpy); 739 XrmDatabase database = XrmGetDatabase (dpy);
783 740
784 const char *p = get_res (database, rs[Rs_name], name); 741 const char *p = get_res (database, rs[Rs_name], name);
785 const char *p0 = get_res (database, "!INVALIDPROGRAMMENAMEDONTMATCH!", name); 742 const char *p0 = get_res (database, "!INVALIDPROGRAMMENAMEDONTMATCH!", name);
… …
801 758
802void 759void
803rxvt_term::extract_resources () 760rxvt_term::extract_resources ()
804{ 761{
805#ifndef NO_RESOURCES 762#ifndef NO_RESOURCES
763 XrmDatabase database = XrmGetDatabase (dpy);
764 XrmMergeDatabases (option_db, &database);
765 option_db = NULL;
806 /* 766 /*
807 * Query resources for options that affect us 767 * Query resources for options that affect us
808 */ 768 */
809 for (int entry = 0; entry < optList_size; entry++) 769 for (int entry = 0; entry < optList_size; entry++)
810 { 770 {
… …
839 799
840 /* 800 /*
841 * [R5 or later]: enumerate the resource database 801 * [R5 or later]: enumerate the resource database
842 */ 802 */
843# ifdef KEYSYM_RESOURCE 803# ifdef KEYSYM_RESOURCE
844 XrmDatabase database = XrmGetDatabase (dpy);
845 XrmName name_prefix[3]; 804 XrmName name_prefix[3];
846 XrmClass class_prefix[3]; 805 XrmClass class_prefix[3];
847 806
848 name_prefix[0] = XrmStringToName (rs[Rs_name]); 807 name_prefix[0] = XrmStringToName (rs[Rs_name]);
849 name_prefix[1] = XrmStringToName ("keysym"); 808 name_prefix[1] = XrmStringToName ("keysym");
… …
863 XrmEnumerateDatabase (database, name_prefix, class_prefix, 822 XrmEnumerateDatabase (database, name_prefix, class_prefix,
864 XrmEnumOneLevel, rxvt_define_key, NULL); 823 XrmEnumOneLevel, rxvt_define_key, NULL);
865# endif 824# endif
866# endif 825# endif
867 826
868#endif /* NO_RESOURCES */ 827#endif /* NO_RESOURCES */
869} 828}
870 829
871/*----------------------- end-of-file (C source) -----------------------*/ 830/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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