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.129 by ayin, Mon Jan 7 12:31:49 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);
553 554
554 rs[optList[entry].doff] = flag == resval_on ? argv[++i] : resval_undef; 555 rs[optList[entry].doff] = flag == resval_on ? argv[++i] : resval_undef;
555 } 556 }
556 } 557 }
557 else 558 else
559 {
558 { /* boolean value */ 560 /* boolean value */
559 set_option (optList[entry].index, flag == resval_on); 561 set_option (optList[entry].index, flag == resval_on);
560 562
561 if (optList[entry].doff != -1) 563 if (optList[entry].doff != -1)
562 rs[optList[entry].doff] = flag; 564 rs[optList[entry].doff] = flag;
563 } 565 }
624} 626}
625 627
626/* 628/*
627 * look for something like this (XK_Delete) 629 * look for something like this (XK_Delete)
628 * rxvt*keysym.0xFFFF: "\177" 630 * 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 */ 631 */
634#define NEWARGLIM 500 /* `reasonable' size */
635 632
636struct keysym_vocabulary_t 633struct keysym_vocabulary_t
637{ 634{
638 const char *name; 635 const char *name;
639 unsigned short len; 636 unsigned short len;
669}; 666};
670 667
671int 668int
672rxvt_term::parse_keysym (const char *str, const char *arg) 669rxvt_term::parse_keysym (const char *str, const char *arg)
673{ 670{
674 int n, sym; 671 int sym;
675 unsigned int state = 0; 672 unsigned int state = 0;
676 const char *pmodend = NULL; 673 const char *key = strrchr (str, '-');
677 char *newarg = NULL;
678 char newargstr[NEWARGLIM];
679 674
680 if (arg == NULL) 675 if (!key)
681 { 676 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 677 else
691 pmodend = str + strlen(str); 678 key++;
692 679
693 for (--pmodend; str < pmodend; --pmodend) 680 // string or key is empty
694 if (*pmodend == '-') 681 if (*arg == '\0' || *key == '\0')
695 break; 682 return -1;
696 683
684 // parse modifiers
697 while (str < pmodend) 685 while (str < key)
698 { 686 {
699 unsigned int i; 687 unsigned int i;
700 688
701 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)
702 { 690 {
713 701
714 if (*str == '-') 702 if (*str == '-')
715 ++str; 703 ++str;
716 } 704 }
717 705
718 /* some scanf () have trouble with a 0x prefix */ 706 // convert keysym name to keysym number
719 if (str[0] == '0' && toupper (str[1]) == 'X') 707 if ((sym = XStringToKeysym (str)) == None)
720 { 708 {
721 str += 2; 709 // fallback on hexadecimal parsing
722 710 char *end;
711 sym = strtol (str, &end, 16);
723 if (arg) 712 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; 713 return -1;
757 } 714 }
758 715
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); 716 keyboard->register_user_translation (sym, state, arg);
770 return 1; 717 return 1;
771} 718}
772 719
773# endif /* KEYSYM_RESOURCE */ 720# endif /* KEYSYM_RESOURCE */
774#endif /* NO_RESOURCES */ 721#endif /* NO_RESOURCES */

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines