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.127 by ayin, Mon Dec 17 23:52:45 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.
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
558 { 560 {
559 /* boolean value */ 561 /* boolean value */
560 set_option (optList[entry].index, flag == resval_on); 562 set_option (optList[entry].index, flag);
561 563
562 if (optList[entry].doff != -1) 564 if (optList[entry].doff != -1)
563 rs[optList[entry].doff] = flag; 565 rs[optList[entry].doff] = flag ? resval_on : resval_off;
564 } 566 }
565 } 567 }
566#ifndef NO_RESOURCES 568#ifndef NO_RESOURCES
567 else if (!strcmp (opt, "xrm")) 569 else if (!strcmp (opt, "xrm"))
568 { 570 {
625} 627}
626 628
627/* 629/*
628 * look for something like this (XK_Delete) 630 * look for something like this (XK_Delete)
629 * rxvt*keysym.0xFFFF: "\177" 631 * rxvt*keysym.0xFFFF: "\177"
630 *
631 * arg will be
632 * NULL for ~/.Xdefaults and
633 * non-NULL for command-line options (need to allocate)
634 */ 632 */
635#define NEWARGLIM 500 /* `reasonable' size */
636 633
637struct keysym_vocabulary_t 634struct keysym_vocabulary_t
638{ 635{
639 const char *name; 636 const char *name;
640 unsigned short len; 637 unsigned short len;
641 unsigned short value; 638 unsigned short value;
642}; 639};
643keysym_vocabulary_t keysym_vocabulary[] = 640static const keysym_vocabulary_t keysym_vocabulary[] =
644{ 641{
645 { "ISOLevel3", 9, Level3Mask }, 642 { "ISOLevel3", 9, Level3Mask },
646 { "AppKeypad", 9, AppKeypadMask }, 643 { "AppKeypad", 9, AppKeypadMask },
647 { "Control", 7, ControlMask }, 644 { "Control", 7, ControlMask },
648 { "NumLock", 7, NumLockMask }, 645 { "NumLock", 7, NumLockMask },
670}; 667};
671 668
672int 669int
673rxvt_term::parse_keysym (const char *str, const char *arg) 670rxvt_term::parse_keysym (const char *str, const char *arg)
674{ 671{
675 int n, sym; 672 int sym;
676 unsigned int state = 0; 673 unsigned int state = 0;
677 const char *pmodend = NULL; 674 const char *key = strrchr (str, '-');
678 char *newarg = NULL;
679 char newargstr[NEWARGLIM];
680 675
681 if (arg == NULL) 676 if (!key)
682 { 677 key = str;
683 n = sizeof ("keysym.") - 1;
684 if (strncmp (str, "keysym.", n))
685 return 0;
686
687 str += n; /* skip `keysym.' */
688 if (!(pmodend = strchr (str, ':')))
689 return -1;
690 }
691 else 678 else
692 pmodend = str + strlen(str); 679 key++;
693 680
694 for (--pmodend; str < pmodend; --pmodend) 681 // string or key is empty
695 if (*pmodend == '-') 682 if (*arg == '\0' || *key == '\0')
696 break; 683 return -1;
697 684
685 // parse modifiers
698 while (str < pmodend) 686 while (str < key)
699 { 687 {
700 unsigned int i; 688 unsigned int i;
701 689
702 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)
703 { 691 {
714 702
715 if (*str == '-') 703 if (*str == '-')
716 ++str; 704 ++str;
717 } 705 }
718 706
719 /* some scanf () have trouble with a 0x prefix */ 707 // convert keysym name to keysym number
720 if (str[0] == '0' && toupper (str[1]) == 'X') 708 if ((sym = XStringToKeysym (str)) == None)
721 { 709 {
722 str += 2; 710 // fallback on hexadecimal parsing
723 711 char *end;
712 sym = strtol (str, &end, 16);
724 if (arg) 713 if (*end)
725 {
726 if (sscanf (str, (strchr (str, ':') ? "%x:" : "%x"), &sym) != 1)
727 return -1;
728 }
729 else
730 {
731 if (sscanf (str, "%x:", &sym) != 1)
732 return -1;
733
734 /* cue to ':', it's there since sscanf () worked */
735 strncpy (newargstr, strchr (str, ':') + 1, NEWARGLIM - 1);
736 newargstr[NEWARGLIM - 1] = '\0';
737 newarg = newargstr;
738 }
739 }
740 else
741 {
742 /*
743 * convert keysym name to keysym number
744 */
745 strncpy (newargstr, str, NEWARGLIM - 1);
746 newargstr[NEWARGLIM - 1] = '\0';
747
748 if (arg == NULL)
749 {
750 if ((newarg = strchr (newargstr, ':')) == NULL)
751 return -1;
752
753 *newarg++ = '\0'; /* terminate keysym name */
754 }
755
756 if ((sym = XStringToKeysym (newargstr)) == None)
757 return -1; 714 return -1;
758 } 715 }
759 716
760 if (newarg == NULL)
761 {
762 strncpy (newargstr, arg, NEWARGLIM - 1);
763 newargstr[NEWARGLIM - 1] = '\0';
764 newarg = newargstr;
765 }
766
767 if (*newarg == '\0')
768 return -1;
769
770 keyboard->register_user_translation (sym, state, newarg); 717 keyboard->register_user_translation (sym, state, arg);
771 return 1; 718 return 1;
772} 719}
773 720
774# endif /* KEYSYM_RESOURCE */ 721# endif /* KEYSYM_RESOURCE */
775#endif /* NO_RESOURCES */ 722#endif /* NO_RESOURCES */

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines