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.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 \
412 for (col = 1, i = 0; i < optList_size; i++) 413 for (col = 1, i = 0; i < optList_size; i++)
413 if (optList[i].desc != NULL) 414 if (optList[i].desc != NULL)
414 { 415 {
415 int len = 0; 416 int len = 0;
416 417
417 if (!optList_isBool (i)) 418 if (optList[i].arg)
418 { 419 len = strlen (optList[i].arg) + 1;
419 len = optList_strlen (i);
420 if (len > 0)
421 len++; /* account for space */
422 }
423#ifdef DEBUG_STRICT 420#ifdef DEBUG_STRICT
424 assert (optList[i].opt != NULL); 421 assert (optList[i].opt != NULL);
425#endif 422#endif
426 len += 4 + strlen (optList[i].opt) + (optList_isBool (i) ? 2: 0); 423 len += 4 + strlen (optList[i].opt) + (optList_isBool (i) ? 2: 0);
427 col += len; 424 col += len;
431 rxvt_log ("\n"); 428 rxvt_log ("\n");
432 col = 1 + len; 429 col = 1 + len;
433 } 430 }
434 431
435 rxvt_log (" [-%s%s", (optList_isBool (i) ? "/+" : ""), optList[i].opt); 432 rxvt_log (" [-%s%s", (optList_isBool (i) ? "/+" : ""), optList[i].opt);
436 if (optList_strlen (i)) 433 if (optList[i].arg)
437 rxvt_log (" %s]", optList[i].arg); 434 rxvt_log (" %s]", optList[i].arg);
438 else 435 else
439 rxvt_log ("]"); 436 rxvt_log ("]");
440 } 437 }
441 break; 438 break;
493 int i, bad_option = 0; 490 int i, bad_option = 0;
494 491
495 for (i = 1; i < argc; i++) 492 for (i = 1; i < argc; i++)
496 { 493 {
497 unsigned int entry, longopt = 0; 494 unsigned int entry, longopt = 0;
498 const char *flag, *opt; 495 const char *opt;
496 int flag;
499 497
500 opt = argv[i]; 498 opt = argv[i];
501 499
502 if (*opt == '-') 500 if (*opt == '-')
503 { 501 {
504 flag = resval_on; 502 flag = 1;
505 503
506 if (*++opt == '-') 504 if (*++opt == '-')
507 longopt = *opt++; /* long option */ 505 longopt = *opt++; /* long option */
508 } 506 }
509 else if (*opt == '+') 507 else if (*opt == '+')
510 { 508 {
511 flag = resval_off; 509 flag = 0;
512 510
513 if (*++opt == '+') 511 if (*++opt == '+')
514 longopt = *opt++; /* long option */ 512 longopt = *opt++; /* long option */
515 } 513 }
516 else 514 else
534 break; 532 break;
535 533
536 if (entry < optList_size) 534 if (entry < optList_size)
537 { 535 {
538 if (optList_isReverse (entry)) 536 if (optList_isReverse (entry))
539 flag = flag == resval_on ? resval_off : resval_on; 537 flag = !flag;
540 538
541 if (optList_strlen (entry)) 539 if (optList_isString (entry))
542 { 540 {
543 /* 541 /*
544 * special cases are handled in main.c:main () to allow 542 * special cases are handled in main.c:main () to allow
545 * X resources to set these values before we settle for 543 * X resources to set these values before we settle for
546 * default values 544 * default values
547 */ 545 */
548 546
549 if (optList[entry].doff != -1) 547 if (optList[entry].doff != -1)
550 { 548 {
551 if (flag == resval_on && i+1 == argc) 549 if (flag && i+1 == argc)
552 rxvt_fatal ("option '%s' requires an argument, aborting.\n", argv [i]); 550 rxvt_fatal ("option '%s' requires an argument, aborting.\n", argv [i]);
553 551
554 rs[optList[entry].doff] = flag == resval_on ? argv[++i] : resval_undef; 552 rs[optList[entry].doff] = flag ? argv[++i] : resval_undef;
555 } 553 }
556 } 554 }
557 else 555 else
558 { 556 {
559 /* boolean value */ 557 /* boolean value */
560 set_option (optList[entry].index, flag == resval_on); 558 set_option (optList[entry].index, flag);
561 559
562 if (optList[entry].doff != -1) 560 if (optList[entry].doff != -1)
563 rs[optList[entry].doff] = flag; 561 rs[optList[entry].doff] = flag ? resval_on : resval_off;
564 } 562 }
565 } 563 }
566#ifndef NO_RESOURCES 564#ifndef NO_RESOURCES
567 else if (!strcmp (opt, "xrm")) 565 else if (!strcmp (opt, "xrm"))
568 { 566 {
625} 623}
626 624
627/* 625/*
628 * look for something like this (XK_Delete) 626 * look for something like this (XK_Delete)
629 * rxvt*keysym.0xFFFF: "\177" 627 * 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 */ 628 */
635#define NEWARGLIM 500 /* `reasonable' size */
636 629
637struct keysym_vocabulary_t 630struct keysym_vocabulary_t
638{ 631{
639 const char *name; 632 const char *name;
640 unsigned short len; 633 unsigned short len;
641 unsigned short value; 634 unsigned short value;
642}; 635};
643keysym_vocabulary_t keysym_vocabulary[] = 636static const keysym_vocabulary_t keysym_vocabulary[] =
644{ 637{
645 { "ISOLevel3", 9, Level3Mask }, 638 { "ISOLevel3", 9, Level3Mask },
646 { "AppKeypad", 9, AppKeypadMask }, 639 { "AppKeypad", 9, AppKeypadMask },
647 { "Control", 7, ControlMask }, 640 { "Control", 7, ControlMask },
648 { "NumLock", 7, NumLockMask }, 641 { "NumLock", 7, NumLockMask },
670}; 663};
671 664
672int 665int
673rxvt_term::parse_keysym (const char *str, const char *arg) 666rxvt_term::parse_keysym (const char *str, const char *arg)
674{ 667{
675 int n, sym; 668 int sym;
676 unsigned int state = 0; 669 unsigned int state = 0;
677 const char *pmodend = NULL; 670 const char *key = strrchr (str, '-');
678 char *newarg = NULL;
679 char newargstr[NEWARGLIM];
680 671
681 if (arg == NULL) 672 if (!key)
682 { 673 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 674 else
692 pmodend = str + strlen(str); 675 key++;
693 676
694 for (--pmodend; str < pmodend; --pmodend) 677 // string or key is empty
695 if (*pmodend == '-') 678 if (*arg == '\0' || *key == '\0')
696 break; 679 return -1;
697 680
681 // parse modifiers
698 while (str < pmodend) 682 while (str < key)
699 { 683 {
700 unsigned int i; 684 unsigned int i;
701 685
702 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)
703 { 687 {
714 698
715 if (*str == '-') 699 if (*str == '-')
716 ++str; 700 ++str;
717 } 701 }
718 702
719 /* some scanf () have trouble with a 0x prefix */ 703 // convert keysym name to keysym number
720 if (str[0] == '0' && toupper (str[1]) == 'X') 704 if ((sym = XStringToKeysym (str)) == None)
721 { 705 {
722 str += 2; 706 // fallback on hexadecimal parsing
723 707 char *end;
708 sym = strtol (str, &end, 16);
724 if (arg) 709 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; 710 return -1;
758 } 711 }
759 712
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); 713 keyboard->register_user_translation (sym, state, arg);
771 return 1; 714 return 1;
772} 715}
773 716
774# endif /* KEYSYM_RESOURCE */ 717# endif /* KEYSYM_RESOURCE */
775#endif /* NO_RESOURCES */ 718#endif /* NO_RESOURCES */

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines