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.124 by ayin, Sat Nov 24 10:32:33 2007 UTC vs.
Revision 1.131 by ayin, Fri Jan 18 23:14:05 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.
… …
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 BOOL (Rs_transparent, "transparent", "tr", Opt_transparent, 0, "inherit parent pixmap"), 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
… …
239 RSTRG (Rs_backspace_key, "backspacekey", "string"), 240 RSTRG (Rs_backspace_key, "backspacekey", "string"),
240#endif 241#endif
241#ifndef NO_DELETE_KEY 242#ifndef NO_DELETE_KEY
242 RSTRG (Rs_delete_key, "deletekey", "string"), 243 RSTRG (Rs_delete_key, "deletekey", "string"),
243#endif 244#endif
244 RSTRG (Rs_selectstyle, "selectstyle", "mode"),
245#ifdef PRINTPIPE 245#ifdef PRINTPIPE
246 RSTRG (Rs_print_pipe, "print-pipe", "string"), 246 RSTRG (Rs_print_pipe, "print-pipe", "string"),
247#endif 247#endif
248 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"),
249#ifdef CUTCHAR_RESOURCE 249#ifdef CUTCHAR_RESOURCE
… …
425 assert (optList[i].opt != NULL); 425 assert (optList[i].opt != NULL);
426#endif 426#endif
427 len += 4 + strlen (optList[i].opt) + (optList_isBool (i) ? 2: 0); 427 len += 4 + strlen (optList[i].opt) + (optList_isBool (i) ? 2: 0);
428 col += len; 428 col += len;
429 if (col > 79) 429 if (col > 79)
430 {
430 { /* assume regular width */ 431 /* assume regular width */
431 rxvt_log ("\n"); 432 rxvt_log ("\n");
432 col = 1 + len; 433 col = 1 + len;
433 } 434 }
434 435
435 rxvt_log (" [-%s%s", (optList_isBool (i) ? "/+" : ""), optList[i].opt); 436 rxvt_log (" [-%s%s", (optList_isBool (i) ? "/+" : ""), optList[i].opt);
… …
493 int i, bad_option = 0; 494 int i, bad_option = 0;
494 495
495 for (i = 1; i < argc; i++) 496 for (i = 1; i < argc; i++)
496 { 497 {
497 unsigned int entry, longopt = 0; 498 unsigned int entry, longopt = 0;
498 const char *flag, *opt; 499 const char *opt;
500 int flag;
499 501
500 opt = argv[i]; 502 opt = argv[i];
501 503
502 if (*opt == '-') 504 if (*opt == '-')
503 { 505 {
504 flag = resval_on; 506 flag = 1;
505 507
506 if (*++opt == '-') 508 if (*++opt == '-')
507 longopt = *opt++; /* long option */ 509 longopt = *opt++; /* long option */
508 } 510 }
509 else if (*opt == '+') 511 else if (*opt == '+')
510 { 512 {
511 flag = resval_off; 513 flag = 0;
512 514
513 if (*++opt == '+') 515 if (*++opt == '+')
514 longopt = *opt++; /* long option */ 516 longopt = *opt++; /* long option */
515 } 517 }
516 else 518 else
… …
534 break; 536 break;
535 537
536 if (entry < optList_size) 538 if (entry < optList_size)
537 { 539 {
538 if (optList_isReverse (entry)) 540 if (optList_isReverse (entry))
539 flag = flag == resval_on ? resval_off : resval_on; 541 flag = !flag;
540 542
541 if (optList_strlen (entry)) 543 if (optList_strlen (entry))
542 { 544 {
543 /* 545 /*
544 * special cases are handled in main.c:main () to allow 546 * special cases are handled in main.c:main () to allow
… …
546 * default values 548 * default values
547 */ 549 */
548 550
549 if (optList[entry].doff != -1) 551 if (optList[entry].doff != -1)
550 { 552 {
551 if (flag == resval_on && i+1 == argc) 553 if (flag && i+1 == argc)
552 rxvt_fatal ("option '%s' requires an argument, aborting.\n", argv [i]); 554 rxvt_fatal ("option '%s' requires an argument, aborting.\n", argv [i]);
553 555
554 rs[optList[entry].doff] = flag == resval_on ? argv[++i] : resval_undef; 556 rs[optList[entry].doff] = flag ? argv[++i] : resval_undef;
555 } 557 }
556 } 558 }
557 else 559 else
560 {
558 { /* boolean value */ 561 /* boolean value */
559 set_option (optList[entry].index, flag == resval_on); 562 set_option (optList[entry].index, flag);
560 563
561 if (optList[entry].doff != -1) 564 if (optList[entry].doff != -1)
562 rs[optList[entry].doff] = flag; 565 rs[optList[entry].doff] = flag ? resval_on : resval_off;
563 } 566 }
564 } 567 }
565#ifndef NO_RESOURCES 568#ifndef NO_RESOURCES
566 else if (!strcmp (opt, "xrm")) 569 else if (!strcmp (opt, "xrm"))
567 { 570 {
… …
624} 627}
625 628
626/* 629/*
627 * look for something like this (XK_Delete) 630 * look for something like this (XK_Delete)
628 * rxvt*keysym.0xFFFF: "\177" 631 * rxvt*keysym.0xFFFF: "\177"
629 *
630 * arg will be
631 * NULL for ~/.Xdefaults and
632 * non-NULL for command-line options (need to allocate)
633 */ 632 */
634#define NEWARGLIM 500 /* `reasonable' size */
635 633
636struct keysym_vocabulary_t 634struct keysym_vocabulary_t
637{ 635{
638 const char *name; 636 const char *name;
639 unsigned short len; 637 unsigned short len;
640 unsigned short value; 638 unsigned short value;
641}; 639};
642keysym_vocabulary_t keysym_vocabulary[] = 640static const keysym_vocabulary_t keysym_vocabulary[] =
643{ 641{
644 { "ISOLevel3", 9, Level3Mask }, 642 { "ISOLevel3", 9, Level3Mask },
645 { "AppKeypad", 9, AppKeypadMask }, 643 { "AppKeypad", 9, AppKeypadMask },
646 { "Control", 7, ControlMask }, 644 { "Control", 7, ControlMask },
647 { "NumLock", 7, NumLockMask }, 645 { "NumLock", 7, NumLockMask },
… …
669}; 667};
670 668
671int 669int
672rxvt_term::parse_keysym (const char *str, const char *arg) 670rxvt_term::parse_keysym (const char *str, const char *arg)
673{ 671{
674 int n, sym; 672 int sym;
675 unsigned int state = 0; 673 unsigned int state = 0;
676 const char *pmodend = NULL; 674 const char *key = strrchr (str, '-');
677 char *newarg = NULL;
678 char newargstr[NEWARGLIM];
679 675
680 if (arg == NULL) 676 if (!key)
681 { 677 key = str;
682 n = sizeof ("keysym.") - 1;
683 if (strncmp (str, "keysym.", n))
684 return 0;
685
686 str += n; /* skip `keysym.' */
687 if (!(pmodend = strchr (str, ':')))
688 return -1;
689 }
690 else 678 else
691 pmodend = str + strlen(str); 679 key++;
692 680
693 for (--pmodend; str < pmodend; --pmodend) 681 // string or key is empty
694 if (*pmodend == '-') 682 if (*arg == '\0' || *key == '\0')
695 break; 683 return -1;
696 684
685 // parse modifiers
697 while (str < pmodend) 686 while (str < key)
698 { 687 {
699 unsigned int i; 688 unsigned int i;
700 689
701 for (i=0; i < sizeof (keysym_vocabulary) / sizeof (keysym_vocabulary_t); ++i) 690 for (i=0; i < sizeof (keysym_vocabulary) / sizeof (keysym_vocabulary_t); ++i)
702 { 691 {
… …
713 702
714 if (*str == '-') 703 if (*str == '-')
715 ++str; 704 ++str;
716 } 705 }
717 706
718 /* some scanf () have trouble with a 0x prefix */ 707 // convert keysym name to keysym number
719 if (str[0] == '0' && toupper (str[1]) == 'X') 708 if ((sym = XStringToKeysym (str)) == None)
720 { 709 {
721 str += 2; 710 // fallback on hexadecimal parsing
722 711 char *end;
712 sym = strtol (str, &end, 16);
723 if (arg) 713 if (*end)
724 {
725 if (sscanf (str, (strchr (str, ':') ? "%x:" : "%x"), &sym) != 1)
726 return -1;
727 }
728 else
729 {
730 if (sscanf (str, "%x:", &sym) != 1)
731 return -1;
732
733 /* cue to ':', it's there since sscanf () worked */
734 strncpy (newargstr, strchr (str, ':') + 1, NEWARGLIM - 1);
735 newargstr[NEWARGLIM - 1] = '\0';
736 newarg = newargstr;
737 }
738 }
739 else
740 {
741 /*
742 * convert keysym name to keysym number
743 */
744 strncpy (newargstr, str, NEWARGLIM - 1);
745 newargstr[NEWARGLIM - 1] = '\0';
746
747 if (arg == NULL)
748 {
749 if ((newarg = strchr (newargstr, ':')) == NULL)
750 return -1;
751
752 *newarg++ = '\0'; /* terminate keysym name */
753 }
754
755 if ((sym = XStringToKeysym (newargstr)) == None)
756 return -1; 714 return -1;
757 } 715 }
758 716
759 if (newarg == NULL)
760 {
761 strncpy (newargstr, arg, NEWARGLIM - 1);
762 newargstr[NEWARGLIM - 1] = '\0';
763 newarg = newargstr;
764 }
765
766 if (*newarg == '\0')
767 return -1;
768
769 keyboard->register_user_translation (sym, state, newarg); 717 keyboard->register_user_translation (sym, state, arg);
770 return 1; 718 return 1;
771} 719}
772 720
773# endif /* KEYSYM_RESOURCE */ 721# endif /* KEYSYM_RESOURCE */
774#endif /* NO_RESOURCES */ 722#endif /* NO_RESOURCES */

Diff Legend

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