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.134 by ayin, Sun Jan 27 16:52:13 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 \
… …
171 RSTRG (Rs_color + Color_RV, "colorRV", "color"), 172 RSTRG (Rs_color + Color_RV, "colorRV", "color"),
172#endif /* ! NO_BOLD_UNDERLINE_REVERSE */ 173#endif /* ! NO_BOLD_UNDERLINE_REVERSE */
173#if ENABLE_FRILLS 174#if ENABLE_FRILLS
174 RSTRG (Rs_color + Color_underline, "underlineColor", "color"), 175 RSTRG (Rs_color + Color_underline, "underlineColor", "color"),
175#endif 176#endif
176#ifdef KEEP_SCROLLCOLOR 177#ifdef HAVE_SCROLLBARS
177 RSTRG (Rs_color + Color_scroll, "scrollColor", "color"), 178 RSTRG (Rs_color + Color_scroll, "scrollColor", "color"),
179#endif
180#ifdef RXVT_SCROLLBAR
178 RSTRG (Rs_color + Color_trough, "troughColor", "color"), 181 RSTRG (Rs_color + Color_trough, "troughColor", "color"),
179#endif /* KEEP_SCROLLCOLOR */ 182#endif
180#ifdef OPTION_HC 183#ifdef OPTION_HC
181 STRG (Rs_color + Color_HC, "highlightColor", "hc", "color", "highlight color"), 184 STRG (Rs_color + Color_HC, "highlightColor", "hc", "color", "highlight color"),
182#endif 185#endif
183#ifndef NO_CURSORCOLOR 186#ifndef NO_CURSORCOLOR
184 STRG (Rs_color + Color_cursor, "cursorColor", "cr", "color", "cursor color"), 187 STRG (Rs_color + Color_cursor, "cursorColor", "cr", "color", "cursor color"),
… …
214#if ENABLE_XEMBED 217#if ENABLE_XEMBED
215 STRG (Rs_embed, NULL, "embed", "windowid", "window id to embed terminal in"), 218 STRG (Rs_embed, NULL, "embed", "windowid", "window id to embed terminal in"),
216#endif 219#endif
217#if XFT 220#if XFT
218 STRG (Rs_depth, "depth", "depth", "number", "depth of visual to request"), 221 STRG (Rs_depth, "depth", "depth", "number", "depth of visual to request"),
222 BOOL (Rs_buffered, "buffered", NULL, Opt_buffered, 0, NULL),
219#endif 223#endif
220#if ENABLE_FRILLS 224#if ENABLE_FRILLS
221 RSTRG (Rs_transient_for, "transient-for", "windowid"), 225 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"), 226 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"), 227 STRG (Rs_pty_fd, NULL, "pty-fd", "fileno", "file descriptor of pty to use"),
… …
412 for (col = 1, i = 0; i < optList_size; i++) 416 for (col = 1, i = 0; i < optList_size; i++)
413 if (optList[i].desc != NULL) 417 if (optList[i].desc != NULL)
414 { 418 {
415 int len = 0; 419 int len = 0;
416 420
417 if (!optList_isBool (i)) 421 if (optList[i].arg)
418 { 422 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 423#ifdef DEBUG_STRICT
424 assert (optList[i].opt != NULL); 424 assert (optList[i].opt != NULL);
425#endif 425#endif
426 len += 4 + strlen (optList[i].opt) + (optList_isBool (i) ? 2: 0); 426 len += 4 + strlen (optList[i].opt) + (optList_isBool (i) ? 2: 0);
427 col += len; 427 col += len;
… …
431 rxvt_log ("\n"); 431 rxvt_log ("\n");
432 col = 1 + len; 432 col = 1 + len;
433 } 433 }
434 434
435 rxvt_log (" [-%s%s", (optList_isBool (i) ? "/+" : ""), optList[i].opt); 435 rxvt_log (" [-%s%s", (optList_isBool (i) ? "/+" : ""), optList[i].opt);
436 if (optList_strlen (i)) 436 if (optList[i].arg)
437 rxvt_log (" %s]", optList[i].arg); 437 rxvt_log (" %s]", optList[i].arg);
438 else 438 else
439 rxvt_log ("]"); 439 rxvt_log ("]");
440 } 440 }
441 break; 441 break;
… …
493 int i, bad_option = 0; 493 int i, bad_option = 0;
494 494
495 for (i = 1; i < argc; i++) 495 for (i = 1; i < argc; i++)
496 { 496 {
497 unsigned int entry, longopt = 0; 497 unsigned int entry, longopt = 0;
498 const char *flag, *opt; 498 const char *opt;
499 int flag;
499 500
500 opt = argv[i]; 501 opt = argv[i];
501 502
502 if (*opt == '-') 503 if (*opt == '-')
503 { 504 {
504 flag = resval_on; 505 flag = 1;
505 506
506 if (*++opt == '-') 507 if (*++opt == '-')
507 longopt = *opt++; /* long option */ 508 longopt = *opt++; /* long option */
508 } 509 }
509 else if (*opt == '+') 510 else if (*opt == '+')
510 { 511 {
511 flag = resval_off; 512 flag = 0;
512 513
513 if (*++opt == '+') 514 if (*++opt == '+')
514 longopt = *opt++; /* long option */ 515 longopt = *opt++; /* long option */
515 } 516 }
516 else 517 else
… …
534 break; 535 break;
535 536
536 if (entry < optList_size) 537 if (entry < optList_size)
537 { 538 {
538 if (optList_isReverse (entry)) 539 if (optList_isReverse (entry))
539 flag = flag == resval_on ? resval_off : resval_on; 540 flag = !flag;
540 541
541 if (optList_strlen (entry)) 542 if (optList_isString (entry))
542 { 543 {
543 /* 544 /*
544 * special cases are handled in main.c:main () to allow 545 * special cases are handled in main.c:main () to allow
545 * X resources to set these values before we settle for 546 * X resources to set these values before we settle for
546 * default values 547 * default values
547 */ 548 */
548 549
549 if (optList[entry].doff != -1) 550 if (optList[entry].doff != -1)
550 { 551 {
551 if (flag == resval_on && i+1 == argc) 552 if (flag && i+1 == argc)
552 rxvt_fatal ("option '%s' requires an argument, aborting.\n", argv [i]); 553 rxvt_fatal ("option '%s' requires an argument, aborting.\n", argv [i]);
553 554
554 rs[optList[entry].doff] = flag == resval_on ? argv[++i] : resval_undef; 555 rs[optList[entry].doff] = flag ? argv[++i] : resval_undef;
555 } 556 }
556 } 557 }
557 else 558 else
558 { 559 {
559 /* boolean value */ 560 /* boolean value */
560 set_option (optList[entry].index, flag == resval_on); 561 set_option (optList[entry].index, flag);
561 562
562 if (optList[entry].doff != -1) 563 if (optList[entry].doff != -1)
563 rs[optList[entry].doff] = flag; 564 rs[optList[entry].doff] = flag ? resval_on : resval_off;
564 } 565 }
565 } 566 }
566#ifndef NO_RESOURCES 567#ifndef NO_RESOURCES
567 else if (!strcmp (opt, "xrm")) 568 else if (!strcmp (opt, "xrm"))
568 { 569 {
… …
625} 626}
626 627
627/* 628/*
628 * look for something like this (XK_Delete) 629 * look for something like this (XK_Delete)
629 * rxvt*keysym.0xFFFF: "\177" 630 * 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 */ 631 */
635#define NEWARGLIM 500 /* `reasonable' size */
636 632
637struct keysym_vocabulary_t 633struct keysym_vocabulary_t
638{ 634{
639 const char *name; 635 const char *name;
640 unsigned short len; 636 unsigned short len;
641 unsigned short value; 637 unsigned short value;
642}; 638};
643keysym_vocabulary_t keysym_vocabulary[] = 639static const keysym_vocabulary_t keysym_vocabulary[] =
644{ 640{
645 { "ISOLevel3", 9, Level3Mask }, 641 { "ISOLevel3", 9, Level3Mask },
646 { "AppKeypad", 9, AppKeypadMask }, 642 { "AppKeypad", 9, AppKeypadMask },
647 { "Control", 7, ControlMask }, 643 { "Control", 7, ControlMask },
648 { "NumLock", 7, NumLockMask }, 644 { "NumLock", 7, NumLockMask },
… …
670}; 666};
671 667
672int 668int
673rxvt_term::parse_keysym (const char *str, const char *arg) 669rxvt_term::parse_keysym (const char *str, const char *arg)
674{ 670{
675 int n, sym; 671 int sym;
676 unsigned int state = 0; 672 unsigned int state = 0;
677 const char *pmodend = NULL; 673 const char *key = strrchr (str, '-');
678 char *newarg = NULL;
679 char newargstr[NEWARGLIM];
680 674
681 if (arg == NULL) 675 if (!key)
682 { 676 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 677 else
692 pmodend = str + strlen(str); 678 key++;
693 679
694 for (--pmodend; str < pmodend; --pmodend) 680 // string or key is empty
695 if (*pmodend == '-') 681 if (*arg == '\0' || *key == '\0')
696 break; 682 return -1;
697 683
684 // parse modifiers
698 while (str < pmodend) 685 while (str < key)
699 { 686 {
700 unsigned int i; 687 unsigned int i;
701 688
702 for (i=0; i < sizeof (keysym_vocabulary) / sizeof (keysym_vocabulary_t); ++i) 689 for (i=0; i < sizeof (keysym_vocabulary) / sizeof (keysym_vocabulary_t); ++i)
703 { 690 {
… …
714 701
715 if (*str == '-') 702 if (*str == '-')
716 ++str; 703 ++str;
717 } 704 }
718 705
719 /* some scanf () have trouble with a 0x prefix */ 706 // convert keysym name to keysym number
720 if (str[0] == '0' && toupper (str[1]) == 'X') 707 if ((sym = XStringToKeysym (str)) == None)
721 { 708 {
722 str += 2; 709 // fallback on hexadecimal parsing
723 710 char *end;
711 sym = strtol (str, &end, 16);
724 if (arg) 712 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; 713 return -1;
758 } 714 }
759 715
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); 716 keyboard->register_user_translation (sym, state, arg);
771 return 1; 717 return 1;
772} 718}
773 719
774# endif /* KEYSYM_RESOURCE */ 720# endif /* KEYSYM_RESOURCE */
775#endif /* NO_RESOURCES */ 721#endif /* NO_RESOURCES */

Diff Legend

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