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.122 by ayin, Thu Nov 22 15:07:10 2007 UTC vs.
Revision 1.136 by ayin, Sat Feb 16 15:56:41 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 \
… …
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"),
98 BOOL (Rs_skipScroll, "skipScroll", "ss", Opt_skipScroll, 0, "skip scrolling"), 99 BOOL (Rs_skipScroll, "skipScroll", "ss", Opt_skipScroll, 0, "skip scrolling"),
99 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"),
100#if HAVE_SCROLLBARS
101 RSTRG (Rs_scrollstyle, "scrollstyle", "mode"), 101 RSTRG (Rs_scrollstyle, "scrollstyle", "mode"),
102 BOOL (Rs_scrollBar, "scrollBar", "sb", Opt_scrollBar, 0, "scrollbar"), 102 BOOL (Rs_scrollBar, "scrollBar", "sb", Opt_scrollBar, 0, "scrollbar"),
103 BOOL (Rs_scrollBar_right, "scrollBar_right", "sr", Opt_scrollBar_right, 0, "scrollbar right"), 103 BOOL (Rs_scrollBar_right, "scrollBar_right", "sr", Opt_scrollBar_right, 0, "scrollbar right"),
104 BOOL (Rs_scrollBar_floating, "scrollBar_floating", "st", Opt_scrollBar_floating, 0, "scrollbar without a trough"), 104 BOOL (Rs_scrollBar_floating, "scrollBar_floating", "st", Opt_scrollBar_floating, 0, "scrollbar without a trough"),
105 RSTRG (Rs_scrollBar_align, "scrollBar_align", "mode"), 105 RSTRG (Rs_scrollBar_align, "scrollBar_align", "mode"),
106 STRG (Rs_scrollBar_thickness, "thickness", "sbt", "number", "scrollbar thickness/width in pixels"), 106 STRG (Rs_scrollBar_thickness, "thickness", "sbt", "number", "scrollbar thickness/width in pixels"),
107#endif
108 BOOL (Rs_scrollTtyOutput, "scrollTtyOutput", NULL, Opt_scrollTtyOutput, 0, NULL), 107 BOOL (Rs_scrollTtyOutput, "scrollTtyOutput", NULL, Opt_scrollTtyOutput, 0, NULL),
109 BOOL (Rs_scrollTtyOutput, NULL, "si", Opt_scrollTtyOutput, Optflag_Reverse, "scroll-on-tty-output inhibit"), 108 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"), 109 BOOL (Rs_scrollTtyKeypress, "scrollTtyKeypress", "sk", Opt_scrollTtyKeypress, 0, "scroll-on-keypress"),
111 BOOL (Rs_scrollWithBuffer, "scrollWithBuffer", "sw", Opt_scrollWithBuffer, 0, "scroll-with-buffer"), 110 BOOL (Rs_scrollWithBuffer, "scrollWithBuffer", "sw", Opt_scrollWithBuffer, 0, "scroll-with-buffer"),
112#if ENABLE_TRANSPARENCY 111#if ENABLE_TRANSPARENCY
113 BOOL (Rs_transparent, "inheritPixmap", "ip", Opt_transparent, 0, "inherit parent pixmap"), 112 BOOL (Rs_transparent, "inheritPixmap", "ip", Opt_transparent, 0, "inherit parent pixmap"),
114 BOOL (Rs_transparent, "transparent", "tr", Opt_transparent, 0, "inherit parent pixmap"), 113 BOOL (Rs_transparent, "transparent", "tr", Opt_transparent, 0, "inherit parent pixmap"),
115 STRG (Rs_color + Color_tint, "tintColor", "tint", "color", "tint color"), 114 STRG (Rs_color + Color_tint, "tintColor", "tint", "color", "tint color"),
116 STRG (Rs_shade, "shading", "sh", "%", "shade background by x %."), 115 STRG (Rs_shade, "shading", "sh", "number", "shade background by number %."),
117#endif 116#endif
118#if OFF_FOCUS_FADING 117#if OFF_FOCUS_FADING
119 STRG (Rs_fade, "fading", "fade", "%", "fade colors x% percent when rxvt-unicode is losing focus"), 118 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"), 119 STRG (Rs_color + Color_fade, "fadeColor", "fadecolor", "color", "target color for off-focus fading"),
121#endif 120#endif
122 BOOL (Rs_utmpInhibit, "utmpInhibit", "ut", Opt_utmpInhibit, 0, "utmp inhibit"), 121 BOOL (Rs_utmpInhibit, "utmpInhibit", "ut", Opt_utmpInhibit, 0, "utmp inhibit"),
123#ifndef NO_BELL 122#ifndef NO_BELL
124# if ENABLE_FRILLS 123# if ENABLE_FRILLS
… …
171 RSTRG (Rs_color + Color_RV, "colorRV", "color"), 170 RSTRG (Rs_color + Color_RV, "colorRV", "color"),
172#endif /* ! NO_BOLD_UNDERLINE_REVERSE */ 171#endif /* ! NO_BOLD_UNDERLINE_REVERSE */
173#if ENABLE_FRILLS 172#if ENABLE_FRILLS
174 RSTRG (Rs_color + Color_underline, "underlineColor", "color"), 173 RSTRG (Rs_color + Color_underline, "underlineColor", "color"),
175#endif 174#endif
176#ifdef KEEP_SCROLLCOLOR
177 RSTRG (Rs_color + Color_scroll, "scrollColor", "color"), 175 RSTRG (Rs_color + Color_scroll, "scrollColor", "color"),
176#ifdef RXVT_SCROLLBAR
178 RSTRG (Rs_color + Color_trough, "troughColor", "color"), 177 RSTRG (Rs_color + Color_trough, "troughColor", "color"),
179#endif /* KEEP_SCROLLCOLOR */ 178#endif
180#ifdef OPTION_HC 179#ifdef OPTION_HC
181 STRG (Rs_color + Color_HC, "highlightColor", "hc", "color", "highlight color"), 180 STRG (Rs_color + Color_HC, "highlightColor", "hc", "color", "highlight color"),
182#endif 181#endif
183#ifndef NO_CURSORCOLOR 182#ifndef NO_CURSORCOLOR
184 STRG (Rs_color + Color_cursor, "cursorColor", "cr", "color", "cursor color"), 183 STRG (Rs_color + Color_cursor, "cursorColor", "cr", "color", "cursor color"),
… …
214#if ENABLE_XEMBED 213#if ENABLE_XEMBED
215 STRG (Rs_embed, NULL, "embed", "windowid", "window id to embed terminal in"), 214 STRG (Rs_embed, NULL, "embed", "windowid", "window id to embed terminal in"),
216#endif 215#endif
217#if XFT 216#if XFT
218 STRG (Rs_depth, "depth", "depth", "number", "depth of visual to request"), 217 STRG (Rs_depth, "depth", "depth", "number", "depth of visual to request"),
218 BOOL (Rs_buffered, "buffered", NULL, Opt_buffered, 0, NULL),
219#endif 219#endif
220#if ENABLE_FRILLS 220#if ENABLE_FRILLS
221 RSTRG (Rs_transient_for, "transient-for", "windowid"), 221 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"), 222 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"), 223 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"), 225 STRG (Rs_ext_bwidth, "externalBorder", "w", "number", "external border in pixels"),
226 STRG (Rs_ext_bwidth, NULL, "bw", NULL, NULL), 226 STRG (Rs_ext_bwidth, NULL, "bw", NULL, NULL),
227 STRG (Rs_ext_bwidth, NULL, "borderwidth", NULL, NULL), 227 STRG (Rs_ext_bwidth, NULL, "borderwidth", NULL, NULL),
228 STRG (Rs_int_bwidth, "internalBorder", "b", "number", "internal border in pixels"), 228 STRG (Rs_int_bwidth, "internalBorder", "b", "number", "internal border in pixels"),
229 BOOL (Rs_borderLess, "borderLess", "bl", Opt_borderLess, 0, "borderless window"), 229 BOOL (Rs_borderLess, "borderLess", "bl", Opt_borderLess, 0, "borderless window"),
230 STRG (Rs_lineSpace, "lineSpace", "lsp", "number", "number of extra pixels between rows"),
231#endif
232#ifdef BUILTIN_GLYPHS
230 BOOL (Rs_skipBuiltinGlyphs, "skipBuiltinGlyphs", "sbg", Opt_skipBuiltinGlyphs, 0, "do not use internal glyphs"), 233 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 234#endif
233#ifdef POINTER_BLANK 235#ifdef POINTER_BLANK
234 RSTRG (Rs_pointerBlankDelay, "pointerBlankDelay", "number"), 236 RSTRG (Rs_pointerBlankDelay, "pointerBlankDelay", "number"),
235#endif 237#endif
236#ifndef NO_BACKSPACE_KEY 238#ifndef NO_BACKSPACE_KEY
237 RSTRG (Rs_backspace_key, "backspacekey", "string"), 239 RSTRG (Rs_backspace_key, "backspacekey", "string"),
238#endif 240#endif
239#ifndef NO_DELETE_KEY 241#ifndef NO_DELETE_KEY
240 RSTRG (Rs_delete_key, "deletekey", "string"), 242 RSTRG (Rs_delete_key, "deletekey", "string"),
241#endif 243#endif
242 RSTRG (Rs_selectstyle, "selectstyle", "mode"),
243#ifdef PRINTPIPE 244#ifdef PRINTPIPE
244 RSTRG (Rs_print_pipe, "print-pipe", "string"), 245 RSTRG (Rs_print_pipe, "print-pipe", "string"),
245#endif 246#endif
246 STRG (Rs_modifier, "modifier", "mod", "modifier", "meta modifier = alt|meta|hyper|super|mod1|...|mod5"), 247 STRG (Rs_modifier, "modifier", "mod", "modifier", "meta modifier = alt|meta|hyper|super|mod1|...|mod5"),
247#ifdef CUTCHAR_RESOURCE
248 RSTRG (Rs_cutchars, "cutchars", "string"), 248 RSTRG (Rs_cutchars, "cutchars", "string"),
249#endif /* CUTCHAR_RESOURCE */
250 RSTRG (Rs_answerbackstring, "answerbackString", "string"), 249 RSTRG (Rs_answerbackstring, "answerbackString", "string"),
251#ifndef NO_SECONDARY_SCREEN 250#ifndef NO_SECONDARY_SCREEN
252 BOOL (Rs_secondaryScreen, "secondaryScreen", "ssc", Opt_secondaryScreen, 0, "enable secondary screen"), 251 BOOL (Rs_secondaryScreen, "secondaryScreen", "ssc", Opt_secondaryScreen, 0, "enable secondary screen"),
253 BOOL (Rs_secondaryScroll, "secondaryScroll", "ssr", Opt_secondaryScroll, 0, "enable secondary screen scroll"), 252 BOOL (Rs_secondaryScroll, "secondaryScroll", "ssr", Opt_secondaryScroll, 0, "enable secondary screen scroll"),
254#endif 253#endif
… …
263#endif 262#endif
264#ifdef HAVE_AFTERIMAGE 263#ifdef HAVE_AFTERIMAGE
265 STRG (Rs_blendtype, "blendType", "blt", "string", "background image blending type - alpha, tint, etc..."), 264 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"), 265 STRG (Rs_blurradius, "blurRadius", "blr", "HxV", "Gaussian Blur radii to apply to the root background"),
267#endif 266#endif
268#ifndef NO_RESOURCES
269 INFO ("xrm", "string", "X resource"),
270#endif
271 INFO ("e", "command arg ...", "command to execute") 267 INFO ("e", "command arg ...", "command to execute")
272 }; 268 };
273 269
274#undef INFO 270#undef INFO
275#undef STRG 271#undef STRG
… …
361 "pointerBlank," 357 "pointerBlank,"
362#endif 358#endif
363#if defined(NO_RESOURCES) 359#if defined(NO_RESOURCES)
364 "NoResources," 360 "NoResources,"
365#endif 361#endif
366 "scrollbars=" 362 "scrollbars=plain"
367#if !defined(HAVE_SCROLLBARS)
368 "NONE"
369#else
370# if defined(PLAIN_SCROLLBAR)
371 "plain"
372# if defined(RXVT_SCROLLBAR) || defined(NEXT_SCROLLBAR) || defined(XTERM_SCROLLBAR)
373 "+"
374# endif
375# endif
376# if defined(RXVT_SCROLLBAR) 363#if defined(RXVT_SCROLLBAR)
377 "rxvt" 364 "+rxvt"
378# if defined(NEXT_SCROLLBAR) || defined(XTERM_SCROLLBAR)
379 "+"
380# endif
381# endif 365#endif
382# if defined(NEXT_SCROLLBAR) 366#if defined(NEXT_SCROLLBAR)
383 "NeXT" 367 "+NeXT"
384# if defined(XTERM_SCROLLBAR)
385 "+"
386# endif
387# endif 368#endif
388# if defined(XTERM_SCROLLBAR) 369#if defined(XTERM_SCROLLBAR)
389 "xterm" 370 "+xterm"
390# endif
391#endif 371#endif
392 "\nUsage: "; /* Usage */ 372 "\nUsage: "; /* Usage */
393 373
394#define INDENT 18 374#define INDENT 18
395 375
… …
414 for (col = 1, i = 0; i < optList_size; i++) 394 for (col = 1, i = 0; i < optList_size; i++)
415 if (optList[i].desc != NULL) 395 if (optList[i].desc != NULL)
416 { 396 {
417 int len = 0; 397 int len = 0;
418 398
419 if (!optList_isBool (i)) 399 if (optList[i].arg)
420 { 400 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 401#ifdef DEBUG_STRICT
426 assert (optList[i].opt != NULL); 402 assert (optList[i].opt != NULL);
427#endif 403#endif
428 len += 4 + strlen (optList[i].opt) + (optList_isBool (i) ? 2: 0); 404 len += 4 + strlen (optList[i].opt) + (optList_isBool (i) ? 2: 0);
429 col += len; 405 col += len;
430 if (col > 79) 406 if (col > 79)
407 {
431 { /* assume regular width */ 408 /* assume regular width */
432 rxvt_log ("\n"); 409 rxvt_log ("\n");
433 col = 1 + len; 410 col = 1 + len;
434 } 411 }
435 412
436 rxvt_log (" [-%s%s", (optList_isBool (i) ? "/+" : ""), optList[i].opt); 413 rxvt_log (" [-%s%s", (optList_isBool (i) ? "/+" : ""), optList[i].opt);
437 if (optList_strlen (i)) 414 if (optList[i].arg)
438 rxvt_log (" %s]", optList[i].arg); 415 rxvt_log (" %s]", optList[i].arg);
439 else 416 else
440 rxvt_log ("]"); 417 rxvt_log ("]");
441 } 418 }
442 break; 419 break;
… …
494 int i, bad_option = 0; 471 int i, bad_option = 0;
495 472
496 for (i = 1; i < argc; i++) 473 for (i = 1; i < argc; i++)
497 { 474 {
498 unsigned int entry, longopt = 0; 475 unsigned int entry, longopt = 0;
499 const char *flag, *opt; 476 const char *opt;
477 int flag;
500 478
501 opt = argv[i]; 479 opt = argv[i];
502 480
503 if (*opt == '-') 481 if (*opt == '-')
504 { 482 {
505 flag = resval_on; 483 flag = 1;
506 484
507 if (*++opt == '-') 485 if (*++opt == '-')
508 longopt = *opt++; /* long option */ 486 longopt = *opt++; /* long option */
509 } 487 }
510 else if (*opt == '+') 488 else if (*opt == '+')
511 { 489 {
512 flag = resval_off; 490 flag = 0;
513 491
514 if (*++opt == '+') 492 if (*++opt == '+')
515 longopt = *opt++; /* long option */ 493 longopt = *opt++; /* long option */
516 } 494 }
517 else 495 else
… …
535 break; 513 break;
536 514
537 if (entry < optList_size) 515 if (entry < optList_size)
538 { 516 {
539 if (optList_isReverse (entry)) 517 if (optList_isReverse (entry))
540 flag = flag == resval_on ? resval_off : resval_on; 518 flag = !flag;
541 519
542 if (optList_strlen (entry)) 520 if (optList_isString (entry))
543 { 521 {
544 /* 522 /*
545 * special cases are handled in main.c:main () to allow 523 * special cases are handled in main.c:main () to allow
546 * X resources to set these values before we settle for 524 * X resources to set these values before we settle for
547 * default values 525 * default values
548 */ 526 */
549 527
550 if (optList[entry].doff != -1) 528 if (optList[entry].doff != -1)
551 { 529 {
552 if (flag == resval_on && i+1 == argc) 530 if (flag && i+1 == argc)
553 rxvt_fatal ("option '%s' requires an argument, aborting.\n", argv [i]); 531 rxvt_fatal ("option '%s' requires an argument, aborting.\n", argv [i]);
554 532
555 rs[optList[entry].doff] = flag == resval_on ? argv[++i] : resval_undef; 533 rs[optList[entry].doff] = flag ? argv[++i] : resval_undef;
556 } 534 }
557 } 535 }
558 else 536 else
537 {
559 { /* boolean value */ 538 /* boolean value */
560 set_option (optList[entry].index, flag == resval_on); 539 set_option (optList[entry].index, flag);
561 540
562 if (optList[entry].doff != -1) 541 if (optList[entry].doff != -1)
563 rs[optList[entry].doff] = flag; 542 rs[optList[entry].doff] = flag ? resval_on : resval_off;
564 } 543 }
565 } 544 }
545#ifndef NO_RESOURCES
546 else if (!strcmp (opt, "xrm"))
547 {
548 if (i+1 < argc)
549 XrmPutLineResource (&option_db, argv[++i]);
550 }
551#endif
566#ifdef KEYSYM_RESOURCE 552#ifdef KEYSYM_RESOURCE
567 else if (!strncmp (opt, "keysym.", sizeof ("keysym.") - 1)) 553 else if (!strncmp (opt, "keysym.", sizeof ("keysym.") - 1))
568 { 554 {
569 if (i+1 < argc) 555 if (i+1 < argc)
570 { 556 {
… …
618} 604}
619 605
620/* 606/*
621 * look for something like this (XK_Delete) 607 * look for something like this (XK_Delete)
622 * rxvt*keysym.0xFFFF: "\177" 608 * rxvt*keysym.0xFFFF: "\177"
623 *
624 * arg will be
625 * NULL for ~/.Xdefaults and
626 * non-NULL for command-line options (need to allocate)
627 */ 609 */
628#define NEWARGLIM 500 /* `reasonable' size */
629 610
630struct keysym_vocabulary_t 611struct keysym_vocabulary_t
631{ 612{
632 const char *name; 613 const char *name;
633 unsigned short len; 614 unsigned short len;
634 unsigned short value; 615 unsigned short value;
635}; 616};
636keysym_vocabulary_t keysym_vocabulary[] = 617static const keysym_vocabulary_t keysym_vocabulary[] =
637{ 618{
638 { "ISOLevel3", 9, Level3Mask }, 619 { "ISOLevel3", 9, Level3Mask },
639 { "AppKeypad", 9, AppKeypadMask }, 620 { "AppKeypad", 9, AppKeypadMask },
640 { "Control", 7, ControlMask }, 621 { "Control", 7, ControlMask },
641 { "NumLock", 7, NumLockMask }, 622 { "NumLock", 7, NumLockMask },
… …
663}; 644};
664 645
665int 646int
666rxvt_term::parse_keysym (const char *str, const char *arg) 647rxvt_term::parse_keysym (const char *str, const char *arg)
667{ 648{
668 int n, sym; 649 int sym;
669 unsigned int state = 0; 650 unsigned int state = 0;
670 const char *pmodend = NULL; 651 const char *key = strrchr (str, '-');
671 char *newarg = NULL;
672 char newargstr[NEWARGLIM];
673 652
674 if (arg == NULL) 653 if (!key)
675 { 654 key = str;
676 n = sizeof ("keysym.") - 1;
677 if (strncmp (str, "keysym.", n))
678 return 0;
679
680 str += n; /* skip `keysym.' */
681 if (!(pmodend = strchr (str, ':')))
682 return -1;
683 }
684 else 655 else
685 pmodend = str + strlen(str); 656 key++;
686 657
687 for (--pmodend; str < pmodend; --pmodend) 658 // string or key is empty
688 if (*pmodend == '-') 659 if (*arg == '\0' || *key == '\0')
689 break; 660 return -1;
690 661
662 // parse modifiers
691 while (str < pmodend) 663 while (str < key)
692 { 664 {
693 unsigned int i; 665 unsigned int i;
694 666
695 for (i=0; i < sizeof (keysym_vocabulary) / sizeof (keysym_vocabulary_t); ++i) 667 for (i=0; i < sizeof (keysym_vocabulary) / sizeof (keysym_vocabulary_t); ++i)
696 { 668 {
… …
707 679
708 if (*str == '-') 680 if (*str == '-')
709 ++str; 681 ++str;
710 } 682 }
711 683
712 /* some scanf () have trouble with a 0x prefix */ 684 // convert keysym name to keysym number
713 if (str[0] == '0' && toupper (str[1]) == 'X') 685 if ((sym = XStringToKeysym (str)) == None)
714 { 686 {
715 str += 2; 687 // fallback on hexadecimal parsing
716 688 char *end;
689 sym = strtol (str, &end, 16);
717 if (arg) 690 if (*end)
718 {
719 if (sscanf (str, (strchr (str, ':') ? "%x:" : "%x"), &sym) != 1)
720 return -1;
721 }
722 else
723 {
724 if (sscanf (str, "%x:", &sym) != 1)
725 return -1;
726
727 /* cue to ':', it's there since sscanf () worked */
728 strncpy (newargstr, strchr (str, ':') + 1, NEWARGLIM - 1);
729 newargstr[NEWARGLIM - 1] = '\0';
730 newarg = newargstr;
731 }
732 }
733 else
734 {
735 /*
736 * convert keysym name to keysym number
737 */
738 strncpy (newargstr, str, NEWARGLIM - 1);
739 newargstr[NEWARGLIM - 1] = '\0';
740
741 if (arg == NULL)
742 {
743 if ((newarg = strchr (newargstr, ':')) == NULL)
744 return -1;
745
746 *newarg++ = '\0'; /* terminate keysym name */
747 }
748
749 if ((sym = XStringToKeysym (newargstr)) == None)
750 return -1; 691 return -1;
751 } 692 }
752 693
753 if (newarg == NULL)
754 {
755 strncpy (newargstr, arg, NEWARGLIM - 1);
756 newargstr[NEWARGLIM - 1] = '\0';
757 newarg = newargstr;
758 }
759
760 if (*newarg == '\0')
761 return -1;
762
763 keyboard->register_user_translation (sym, state, newarg); 694 keyboard->register_user_translation (sym, state, arg);
764 return 1; 695 return 1;
765} 696}
766 697
767# endif /* KEYSYM_RESOURCE */ 698# endif /* KEYSYM_RESOURCE */
768#endif /* NO_RESOURCES */ 699#endif /* NO_RESOURCES */

Diff Legend

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