… | |
… | |
29 | |
29 | |
30 | #include "../config.h" /* NECESSARY */ |
30 | #include "../config.h" /* NECESSARY */ |
31 | #include "rxvt.h" /* NECESSARY */ |
31 | #include "rxvt.h" /* NECESSARY */ |
32 | #include "version.h" |
32 | #include "version.h" |
33 | |
33 | |
|
|
34 | #ifdef KEYSYM_RESOURCE |
|
|
35 | #include "keyboard.h" |
|
|
36 | #endif |
|
|
37 | |
34 | /* #define DEBUG_RESOURCES */ |
38 | /* #define DEBUG_RESOURCES */ |
35 | |
39 | |
36 | static const char *const xnames[2] = { ".Xdefaults", ".Xresources" }; |
40 | static const char *const xnames[2] = { ".Xdefaults", ".Xresources" }; |
37 | |
41 | |
38 | /*{{{ monolithic option/resource structure: */ |
42 | /*{{{ monolithic option/resource structure: */ |
… | |
… | |
164 | RSTRG (Rs_color + Color_BD, "colorBD", "color"), |
168 | RSTRG (Rs_color + Color_BD, "colorBD", "color"), |
165 | RSTRG (Rs_color + Color_IT, "colorIT", "color"), |
169 | RSTRG (Rs_color + Color_IT, "colorIT", "color"), |
166 | RSTRG (Rs_color + Color_UL, "colorUL", "color"), |
170 | RSTRG (Rs_color + Color_UL, "colorUL", "color"), |
167 | RSTRG (Rs_color + Color_RV, "colorRV", "color"), |
171 | RSTRG (Rs_color + Color_RV, "colorRV", "color"), |
168 | #endif /* ! NO_BOLD_UNDERLINE_REVERSE */ |
172 | #endif /* ! NO_BOLD_UNDERLINE_REVERSE */ |
|
|
173 | #if ENABLE_FRILLS |
|
|
174 | RSTRG (Rs_color + Color_underline, "underlineColor", "color"), |
|
|
175 | #endif |
169 | #ifdef KEEP_SCROLLCOLOR |
176 | #ifdef KEEP_SCROLLCOLOR |
170 | RSTRG (Rs_color + Color_scroll, "scrollColor", "color"), |
177 | RSTRG (Rs_color + Color_scroll, "scrollColor", "color"), |
171 | RSTRG (Rs_color + Color_trough, "troughColor", "color"), |
178 | RSTRG (Rs_color + Color_trough, "troughColor", "color"), |
172 | #endif /* KEEP_SCROLLCOLOR */ |
179 | #endif /* KEEP_SCROLLCOLOR */ |
173 | #ifdef OPTION_HC |
180 | #ifdef OPTION_HC |
… | |
… | |
213 | STRG (Rs_ext_bwidth, "externalBorder", "w", "number", "external border in pixels"), |
220 | STRG (Rs_ext_bwidth, "externalBorder", "w", "number", "external border in pixels"), |
214 | STRG (Rs_ext_bwidth, NULL, "bw", NULL, NULL), |
221 | STRG (Rs_ext_bwidth, NULL, "bw", NULL, NULL), |
215 | STRG (Rs_ext_bwidth, NULL, "borderwidth", NULL, NULL), |
222 | STRG (Rs_ext_bwidth, NULL, "borderwidth", NULL, NULL), |
216 | STRG (Rs_int_bwidth, "internalBorder", "b", "number", "internal border in pixels"), |
223 | STRG (Rs_int_bwidth, "internalBorder", "b", "number", "internal border in pixels"), |
217 | BOOL (Rs_borderLess, "borderLess", "bl", Opt_borderLess, "borderless window"), |
224 | BOOL (Rs_borderLess, "borderLess", "bl", Opt_borderLess, "borderless window"), |
218 | #endif |
|
|
219 | #ifndef NO_LINESPACE |
|
|
220 | STRG (Rs_lineSpace, "lineSpace", "lsp", "number", "number of extra pixels between rows"), |
225 | STRG (Rs_lineSpace, "lineSpace", "lsp", "number", "number of extra pixels between rows"), |
221 | #endif |
226 | #endif |
222 | STRG (Rs_scrollBar_thickness, "thickness", "sbt", "number", "scrollbar thickness/width in pixels"), |
227 | STRG (Rs_scrollBar_thickness, "thickness", "sbt", "number", "scrollbar thickness/width in pixels"), |
223 | #ifdef POINTER_BLANK |
228 | #ifdef POINTER_BLANK |
224 | RSTRG (Rs_pointerBlankDelay, "pointerBlankDelay", "number"), |
229 | RSTRG (Rs_pointerBlankDelay, "pointerBlankDelay", "number"), |
… | |
… | |
355 | "strings," |
360 | "strings," |
356 | #endif |
361 | #endif |
357 | #if defined(ENABLE_FRILLS) |
362 | #if defined(ENABLE_FRILLS) |
358 | "frills," |
363 | "frills," |
359 | #endif |
364 | #endif |
360 | #if !defined(NO_LINESPACE) |
|
|
361 | "linespace," |
|
|
362 | #endif |
|
|
363 | #if defined(PREFER_24BIT) |
365 | #if defined(PREFER_24BIT) |
364 | "24bit," |
366 | "24bit," |
365 | #endif |
367 | #endif |
366 | #if defined(SELECTION_SCROLLING) |
368 | #if defined(SELECTION_SCROLLING) |
367 | "selectionscrolling," |
369 | "selectionscrolling," |
… | |
… | |
622 | * arg will be |
624 | * arg will be |
623 | * NULL for ~/.Xdefaults and |
625 | * NULL for ~/.Xdefaults and |
624 | * non-NULL for command-line options (need to allocate) |
626 | * non-NULL for command-line options (need to allocate) |
625 | */ |
627 | */ |
626 | #define NEWARGLIM 500 /* `reasonable' size */ |
628 | #define NEWARGLIM 500 /* `reasonable' size */ |
|
|
629 | |
|
|
630 | struct keysym_vocabulary_t |
|
|
631 | { |
|
|
632 | const char *name; |
|
|
633 | unsigned short len; |
|
|
634 | unsigned short value; |
|
|
635 | }; |
|
|
636 | keysym_vocabulary_t keysym_vocabulary[] = |
|
|
637 | { |
|
|
638 | { "ISOLevel3", 9, Level3Mask }, |
|
|
639 | { "AppKeypad", 9, AppKeypadMask }, |
|
|
640 | { "Control", 7, ControlMask }, |
|
|
641 | { "NumLock", 7, NumLockMask }, |
|
|
642 | { "Shift", 5, ShiftMask }, |
|
|
643 | { "Meta", 4, MetaMask }, |
|
|
644 | { "Lock", 4, LockMask }, |
|
|
645 | { "Mod1", 4, Mod1Mask }, |
|
|
646 | { "Mod2", 4, Mod2Mask }, |
|
|
647 | { "Mod3", 4, Mod3Mask }, |
|
|
648 | { "Mod4", 4, Mod4Mask }, |
|
|
649 | { "Mod5", 4, Mod5Mask }, |
|
|
650 | { "I", 1, Level3Mask }, |
|
|
651 | { "K", 1, AppKeypadMask }, |
|
|
652 | { "C", 1, ControlMask }, |
|
|
653 | { "N", 1, NumLockMask }, |
|
|
654 | { "S", 1, ShiftMask }, |
|
|
655 | { "M", 1, MetaMask }, |
|
|
656 | { "A", 1, MetaMask }, |
|
|
657 | { "L", 1, LockMask }, |
|
|
658 | { "1", 1, Mod1Mask }, |
|
|
659 | { "2", 1, Mod2Mask }, |
|
|
660 | { "3", 1, Mod3Mask }, |
|
|
661 | { "4", 1, Mod4Mask }, |
|
|
662 | { "5", 1, Mod5Mask }, |
|
|
663 | }; |
|
|
664 | |
627 | int |
665 | int |
628 | rxvt_term::parse_keysym (const char *str, const char *arg) |
666 | rxvt_term::parse_keysym (const char *str, const char *arg) |
629 | { |
667 | { |
630 | int n, sym; |
668 | int n, sym; |
|
|
669 | unsigned int state = 0; |
|
|
670 | const char *pmodend = NULL; |
631 | char *key_string, *newarg = NULL; |
671 | char *newarg = NULL; |
632 | char newargstr[NEWARGLIM]; |
672 | char newargstr[NEWARGLIM]; |
633 | |
673 | |
634 | if (arg == NULL) |
674 | if (arg == NULL) |
635 | { |
675 | { |
636 | if ((n = rxvt_Str_match (str, "keysym.")) == 0) |
676 | if ((n = rxvt_Str_match (str, "keysym.")) == 0) |
637 | return 0; |
677 | return 0; |
|
|
678 | |
638 | str += n; /* skip `keysym.' */ |
679 | str += n; /* skip `keysym.' */ |
|
|
680 | if ((pmodend = strchr (str, ':')) < str) |
|
|
681 | return -1; |
639 | } |
682 | } |
|
|
683 | else |
|
|
684 | pmodend = str + strlen(str); |
|
|
685 | |
|
|
686 | for (--pmodend; str < pmodend; --pmodend) |
|
|
687 | if (*pmodend == '-') |
|
|
688 | break; |
|
|
689 | |
|
|
690 | while (str < pmodend) |
|
|
691 | { |
|
|
692 | unsigned int i; |
|
|
693 | |
|
|
694 | for (i=0; i < sizeof (keysym_vocabulary) / sizeof (keysym_vocabulary_t); ++i) |
|
|
695 | { |
|
|
696 | if (strncmp (str, keysym_vocabulary [i].name, keysym_vocabulary [i].len) == 0) |
|
|
697 | { |
|
|
698 | state |= keysym_vocabulary[i].value; |
|
|
699 | str += keysym_vocabulary[i].len; |
|
|
700 | break; |
|
|
701 | } |
|
|
702 | } |
|
|
703 | |
|
|
704 | if (i >= sizeof (keysym_vocabulary) / sizeof (keysym_vocabulary_t)) |
|
|
705 | return -1; |
|
|
706 | |
|
|
707 | if (*str == '-') |
|
|
708 | ++str; |
|
|
709 | } |
|
|
710 | |
640 | /* some scanf () have trouble with a 0x prefix */ |
711 | /* some scanf () have trouble with a 0x prefix */ |
641 | if (isdigit (str[0])) |
712 | if (str[0] == '0' && toupper (str[1]) == 'X') |
642 | { |
713 | { |
643 | if (str[0] == '0' && toupper (str[1]) == 'X') |
|
|
644 | str += 2; |
714 | str += 2; |
|
|
715 | |
645 | if (arg) |
716 | if (arg) |
646 | { |
717 | { |
647 | if (sscanf (str, (strchr (str, ':') ? "%x:" : "%x"), &sym) != 1) |
718 | if (sscanf (str, (strchr (str, ':') ? "%x:" : "%x"), &sym) != 1) |
648 | return -1; |
719 | return -1; |
649 | } |
720 | } |
… | |
… | |
663 | /* |
734 | /* |
664 | * convert keysym name to keysym number |
735 | * convert keysym name to keysym number |
665 | */ |
736 | */ |
666 | strncpy (newargstr, str, NEWARGLIM - 1); |
737 | strncpy (newargstr, str, NEWARGLIM - 1); |
667 | newargstr[NEWARGLIM - 1] = '\0'; |
738 | newargstr[NEWARGLIM - 1] = '\0'; |
|
|
739 | |
668 | if (arg == NULL) |
740 | if (arg == NULL) |
669 | { |
741 | { |
670 | if ((newarg = strchr (newargstr, ':')) == NULL) |
742 | if ((newarg = strchr (newargstr, ':')) == NULL) |
671 | return -1; |
743 | return -1; |
|
|
744 | |
672 | *newarg++ = '\0'; /* terminate keysym name */ |
745 | *newarg++ = '\0'; /* terminate keysym name */ |
673 | } |
746 | } |
|
|
747 | |
674 | if ((sym = XStringToKeysym (newargstr)) == None) |
748 | if ((sym = XStringToKeysym (newargstr)) == None) |
675 | return -1; |
749 | return -1; |
676 | } |
750 | } |
677 | |
|
|
678 | if (sym < 0xFF00 || sym > 0xFFFF) /* we only do extended keys */ |
|
|
679 | return -1; |
|
|
680 | sym &= 0xFF; |
|
|
681 | if (Keysym_map[sym] != NULL) /* already set ? */ |
|
|
682 | return -1; |
|
|
683 | |
751 | |
684 | if (newarg == NULL) |
752 | if (newarg == NULL) |
685 | { |
753 | { |
686 | strncpy (newargstr, arg, NEWARGLIM - 1); |
754 | strncpy (newargstr, arg, NEWARGLIM - 1); |
687 | newargstr[NEWARGLIM - 1] = '\0'; |
755 | newargstr[NEWARGLIM - 1] = '\0'; |
688 | newarg = newargstr; |
756 | newarg = newargstr; |
689 | } |
757 | } |
|
|
758 | |
690 | rxvt_Str_trim (newarg); |
759 | rxvt_Str_trim (newarg); |
691 | if (*newarg == '\0' || (n = rxvt_Str_escaped (newarg)) == 0) |
760 | if (*newarg == '\0' || (n = rxvt_Str_escaped (newarg)) == 0) |
692 | return -1; |
761 | return -1; |
693 | MIN_IT (n, 255); |
|
|
694 | key_string = (char *)rxvt_malloc ((n + 1) * sizeof (char)); |
|
|
695 | |
762 | |
696 | key_string[0] = n; |
763 | keyboard->register_user_translation (sym, state, newarg); |
697 | strncpy (key_string + 1, newarg, n); |
|
|
698 | Keysym_map[sym] = (unsigned char *)key_string; |
|
|
699 | |
|
|
700 | return 1; |
764 | return 1; |
701 | } |
765 | } |
702 | |
766 | |
703 | # endif /* KEYSYM_RESOURCE */ |
767 | # endif /* KEYSYM_RESOURCE */ |
704 | |
768 | |