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.128 by ayin, Mon Dec 31 01:16:47 2007 UTC vs.
Revision 1.133 by ayin, Sat Jan 26 14:24:43 2008 UTC

… …
63/* SWCH () - `-' flag */ 63/* SWCH () - `-' flag */
64#define SWCH(opt, option, flag, desc) \ 64#define SWCH(opt, option, flag, desc) \
65 { (option), (Optflag_Switch | (flag)), -1, NULL, (opt), NULL, (desc)} 65 { (option), (Optflag_Switch | (flag)), -1, NULL, (opt), NULL, (desc)}
66 66
67/* convenient macros */ 67/* convenient macros */
68#define optList_strlen(i) \ 68#define optList_isString(i) \
69 (optList[i].flag ? 0 : (optList[i].arg ? strlen (optList[i].arg) : 1)) 69 (optList[i].flag == 0)
70#define optList_isBool(i) \ 70#define optList_isBool(i) \
71 (optList[i].flag & Optflag_Boolean) 71 (optList[i].flag & Optflag_Boolean)
72#define optList_isReverse(i) \ 72#define optList_isReverse(i) \
73 (optList[i].flag & Optflag_Reverse) 73 (optList[i].flag & Optflag_Reverse)
74#define optList_size \ 74#define optList_size \
… …
215#if ENABLE_XEMBED 215#if ENABLE_XEMBED
216 STRG (Rs_embed, NULL, "embed", "windowid", "window id to embed terminal in"), 216 STRG (Rs_embed, NULL, "embed", "windowid", "window id to embed terminal in"),
217#endif 217#endif
218#if XFT 218#if XFT
219 STRG (Rs_depth, "depth", "depth", "number", "depth of visual to request"), 219 STRG (Rs_depth, "depth", "depth", "number", "depth of visual to request"),
220 BOOL (Rs_buffered, "buffered", NULL, Opt_buffered, 0, NULL),
220#endif 221#endif
221#if ENABLE_FRILLS 222#if ENABLE_FRILLS
222 RSTRG (Rs_transient_for, "transient-for", "windowid"), 223 RSTRG (Rs_transient_for, "transient-for", "windowid"),
223 BOOL (Rs_override_redirect, "override-redirect", "override-redirect", Opt_override_redirect, 0, "set override-redirect on the terminal window"), 224 BOOL (Rs_override_redirect, "override-redirect", "override-redirect", Opt_override_redirect, 0, "set override-redirect on the terminal window"),
224 STRG (Rs_pty_fd, NULL, "pty-fd", "fileno", "file descriptor of pty to use"), 225 STRG (Rs_pty_fd, NULL, "pty-fd", "fileno", "file descriptor of pty to use"),
… …
413 for (col = 1, i = 0; i < optList_size; i++) 414 for (col = 1, i = 0; i < optList_size; i++)
414 if (optList[i].desc != NULL) 415 if (optList[i].desc != NULL)
415 { 416 {
416 int len = 0; 417 int len = 0;
417 418
418 if (!optList_isBool (i)) 419 if (optList[i].arg)
419 { 420 len = strlen (optList[i].arg) + 1;
420 len = optList_strlen (i);
421 if (len > 0)
422 len++; /* account for space */
423 }
424#ifdef DEBUG_STRICT 421#ifdef DEBUG_STRICT
425 assert (optList[i].opt != NULL); 422 assert (optList[i].opt != NULL);
426#endif 423#endif
427 len += 4 + strlen (optList[i].opt) + (optList_isBool (i) ? 2: 0); 424 len += 4 + strlen (optList[i].opt) + (optList_isBool (i) ? 2: 0);
428 col += len; 425 col += len;
… …
432 rxvt_log ("\n"); 429 rxvt_log ("\n");
433 col = 1 + len; 430 col = 1 + len;
434 } 431 }
435 432
436 rxvt_log (" [-%s%s", (optList_isBool (i) ? "/+" : ""), optList[i].opt); 433 rxvt_log (" [-%s%s", (optList_isBool (i) ? "/+" : ""), optList[i].opt);
437 if (optList_strlen (i)) 434 if (optList[i].arg)
438 rxvt_log (" %s]", optList[i].arg); 435 rxvt_log (" %s]", optList[i].arg);
439 else 436 else
440 rxvt_log ("]"); 437 rxvt_log ("]");
441 } 438 }
442 break; 439 break;
… …
494 int i, bad_option = 0; 491 int i, bad_option = 0;
495 492
496 for (i = 1; i < argc; i++) 493 for (i = 1; i < argc; i++)
497 { 494 {
498 unsigned int entry, longopt = 0; 495 unsigned int entry, longopt = 0;
499 const char *flag, *opt; 496 const char *opt;
497 int flag;
500 498
501 opt = argv[i]; 499 opt = argv[i];
502 500
503 if (*opt == '-') 501 if (*opt == '-')
504 { 502 {
505 flag = resval_on; 503 flag = 1;
506 504
507 if (*++opt == '-') 505 if (*++opt == '-')
508 longopt = *opt++; /* long option */ 506 longopt = *opt++; /* long option */
509 } 507 }
510 else if (*opt == '+') 508 else if (*opt == '+')
511 { 509 {
512 flag = resval_off; 510 flag = 0;
513 511
514 if (*++opt == '+') 512 if (*++opt == '+')
515 longopt = *opt++; /* long option */ 513 longopt = *opt++; /* long option */
516 } 514 }
517 else 515 else
… …
535 break; 533 break;
536 534
537 if (entry < optList_size) 535 if (entry < optList_size)
538 { 536 {
539 if (optList_isReverse (entry)) 537 if (optList_isReverse (entry))
540 flag = flag == resval_on ? resval_off : resval_on; 538 flag = !flag;
541 539
542 if (optList_strlen (entry)) 540 if (optList_isString (entry))
543 { 541 {
544 /* 542 /*
545 * special cases are handled in main.c:main () to allow 543 * special cases are handled in main.c:main () to allow
546 * X resources to set these values before we settle for 544 * X resources to set these values before we settle for
547 * default values 545 * default values
548 */ 546 */
549 547
550 if (optList[entry].doff != -1) 548 if (optList[entry].doff != -1)
551 { 549 {
552 if (flag == resval_on && i+1 == argc) 550 if (flag && i+1 == argc)
553 rxvt_fatal ("option '%s' requires an argument, aborting.\n", argv [i]); 551 rxvt_fatal ("option '%s' requires an argument, aborting.\n", argv [i]);
554 552
555 rs[optList[entry].doff] = flag == resval_on ? argv[++i] : resval_undef; 553 rs[optList[entry].doff] = flag ? argv[++i] : resval_undef;
556 } 554 }
557 } 555 }
558 else 556 else
559 { 557 {
560 /* boolean value */ 558 /* boolean value */
561 set_option (optList[entry].index, flag == resval_on); 559 set_option (optList[entry].index, flag);
562 560
563 if (optList[entry].doff != -1) 561 if (optList[entry].doff != -1)
564 rs[optList[entry].doff] = flag; 562 rs[optList[entry].doff] = flag ? resval_on : resval_off;
565 } 563 }
566 } 564 }
567#ifndef NO_RESOURCES 565#ifndef NO_RESOURCES
568 else if (!strcmp (opt, "xrm")) 566 else if (!strcmp (opt, "xrm"))
569 { 567 {
… …
626} 624}
627 625
628/* 626/*
629 * look for something like this (XK_Delete) 627 * look for something like this (XK_Delete)
630 * rxvt*keysym.0xFFFF: "\177" 628 * rxvt*keysym.0xFFFF: "\177"
631 *
632 * arg will be
633 * NULL for ~/.Xdefaults and
634 * non-NULL for command-line options (need to allocate)
635 */ 629 */
636#define NEWARGLIM 500 /* `reasonable' size */
637 630
638struct keysym_vocabulary_t 631struct keysym_vocabulary_t
639{ 632{
640 const char *name; 633 const char *name;
641 unsigned short len; 634 unsigned short len;
642 unsigned short value; 635 unsigned short value;
643}; 636};
644keysym_vocabulary_t keysym_vocabulary[] = 637static const keysym_vocabulary_t keysym_vocabulary[] =
645{ 638{
646 { "ISOLevel3", 9, Level3Mask }, 639 { "ISOLevel3", 9, Level3Mask },
647 { "AppKeypad", 9, AppKeypadMask }, 640 { "AppKeypad", 9, AppKeypadMask },
648 { "Control", 7, ControlMask }, 641 { "Control", 7, ControlMask },
649 { "NumLock", 7, NumLockMask }, 642 { "NumLock", 7, NumLockMask },
… …
671}; 664};
672 665
673int 666int
674rxvt_term::parse_keysym (const char *str, const char *arg) 667rxvt_term::parse_keysym (const char *str, const char *arg)
675{ 668{
676 int n, sym; 669 int sym;
677 unsigned int state = 0; 670 unsigned int state = 0;
678 const char *pmodend = NULL; 671 const char *key = strrchr (str, '-');
679 char *newarg = NULL;
680 char newargstr[NEWARGLIM];
681 672
682 if (arg == NULL) 673 if (!key)
683 { 674 key = str;
684 n = sizeof ("keysym.") - 1;
685 if (strncmp (str, "keysym.", n))
686 return 0;
687
688 str += n; /* skip `keysym.' */
689 if (!(pmodend = strchr (str, ':')))
690 return -1;
691 }
692 else 675 else
693 pmodend = str + strlen(str); 676 key++;
694 677
695 for (--pmodend; str < pmodend; --pmodend) 678 // string or key is empty
696 if (*pmodend == '-') 679 if (*arg == '\0' || *key == '\0')
697 break; 680 return -1;
698 681
682 // parse modifiers
699 while (str < pmodend) 683 while (str < key)
700 { 684 {
701 unsigned int i; 685 unsigned int i;
702 686
703 for (i=0; i < sizeof (keysym_vocabulary) / sizeof (keysym_vocabulary_t); ++i) 687 for (i=0; i < sizeof (keysym_vocabulary) / sizeof (keysym_vocabulary_t); ++i)
704 { 688 {
… …
715 699
716 if (*str == '-') 700 if (*str == '-')
717 ++str; 701 ++str;
718 } 702 }
719 703
720 /* some scanf () have trouble with a 0x prefix */ 704 // convert keysym name to keysym number
721 if (str[0] == '0' && toupper (str[1]) == 'X') 705 if ((sym = XStringToKeysym (str)) == None)
722 { 706 {
723 str += 2; 707 // fallback on hexadecimal parsing
724 708 char *end;
709 sym = strtol (str, &end, 16);
725 if (arg) 710 if (*end)
726 {
727 if (sscanf (str, (strchr (str, ':') ? "%x:" : "%x"), &sym) != 1)
728 return -1;
729 }
730 else
731 {
732 if (sscanf (str, "%x:", &sym) != 1)
733 return -1;
734
735 /* cue to ':', it's there since sscanf () worked */
736 strncpy (newargstr, strchr (str, ':') + 1, NEWARGLIM - 1);
737 newargstr[NEWARGLIM - 1] = '\0';
738 newarg = newargstr;
739 }
740 }
741 else
742 {
743 /*
744 * convert keysym name to keysym number
745 */
746 strncpy (newargstr, str, NEWARGLIM - 1);
747 newargstr[NEWARGLIM - 1] = '\0';
748
749 if (arg == NULL)
750 {
751 if ((newarg = strchr (newargstr, ':')) == NULL)
752 return -1;
753
754 *newarg++ = '\0'; /* terminate keysym name */
755 }
756
757 if ((sym = XStringToKeysym (newargstr)) == None)
758 return -1; 711 return -1;
759 } 712 }
760 713
761 if (newarg == NULL)
762 {
763 strncpy (newargstr, arg, NEWARGLIM - 1);
764 newargstr[NEWARGLIM - 1] = '\0';
765 newarg = newargstr;
766 }
767
768 if (*newarg == '\0')
769 return -1;
770
771 keyboard->register_user_translation (sym, state, newarg); 714 keyboard->register_user_translation (sym, state, arg);
772 return 1; 715 return 1;
773} 716}
774 717
775# endif /* KEYSYM_RESOURCE */ 718# endif /* KEYSYM_RESOURCE */
776#endif /* NO_RESOURCES */ 719#endif /* NO_RESOURCES */

Diff Legend

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