… | |
… | |
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: */ |
… | |
… | |
91 | SWCH ("iconic", Opt_iconic, "start iconic"), |
95 | SWCH ("iconic", Opt_iconic, "start iconic"), |
92 | SWCH ("ic", Opt_iconic, NULL), /* short form */ |
96 | SWCH ("ic", Opt_iconic, NULL), /* short form */ |
93 | BOOL (Rs_reverseVideo, "reverseVideo", "rv", Opt_reverseVideo, "reverse video"), |
97 | BOOL (Rs_reverseVideo, "reverseVideo", "rv", Opt_reverseVideo, "reverse video"), |
94 | BOOL (Rs_loginShell, "loginShell", "ls", Opt_loginShell, "login shell"), |
98 | BOOL (Rs_loginShell, "loginShell", "ls", Opt_loginShell, "login shell"), |
95 | BOOL (Rs_jumpScroll, "jumpScroll", "j", Opt_jumpScroll, "jump scrolling"), |
99 | BOOL (Rs_jumpScroll, "jumpScroll", "j", Opt_jumpScroll, "jump scrolling"), |
|
|
100 | BOOL (Rs_pastableTabs, "pastableTabs", "ptab", Opt_pastableTabs, "tab characters are pastable"), |
96 | #ifdef HAVE_SCROLLBARS |
101 | #ifdef HAVE_SCROLLBARS |
|
|
102 | RSTRG (Rs_scrollstyle, "scrollstyle", "mode"), |
97 | BOOL (Rs_scrollBar, "scrollBar", "sb", Opt_scrollBar, "scrollbar"), |
103 | BOOL (Rs_scrollBar, "scrollBar", "sb", Opt_scrollBar, "scrollbar"), |
98 | BOOL (Rs_scrollBar_right, "scrollBar_right", "sr", Opt_scrollBar_right, "scrollbar right"), |
104 | BOOL (Rs_scrollBar_right, "scrollBar_right", "sr", Opt_scrollBar_right, "scrollbar right"), |
99 | BOOL (Rs_scrollBar_floating, "scrollBar_floating", "st", Opt_scrollBar_floating, "scrollbar without a trough"), |
105 | BOOL (Rs_scrollBar_floating, "scrollBar_floating", "st", Opt_scrollBar_floating, "scrollbar without a trough"), |
|
|
106 | RSTRG (Rs_scrollBar_align, "scrollBar_align", "mode"), |
|
|
107 | STRG (Rs_scrollBar_thickness, "thickness", "sbt", "number", "scrollbar thickness/width in pixels"), |
100 | #endif |
108 | #endif |
101 | BOOL (Rs_scrollTtyOutput, "scrollTtyOutput", NULL, Opt_scrollTtyOutput, NULL), |
109 | BOOL (Rs_scrollTtyOutput, "scrollTtyOutput", NULL, Opt_scrollTtyOutput, NULL), |
102 | BOOL (Rs_scrollTtyOutput, NULL, "si", Opt_Reverse | Opt_scrollTtyOutput, "scroll-on-tty-output inhibit"), |
110 | BOOL (Rs_scrollTtyOutput, NULL, "si", Opt_Reverse | Opt_scrollTtyOutput, "scroll-on-tty-output inhibit"), |
103 | BOOL (Rs_scrollTtyKeypress, "scrollTtyKeypress", "sk", Opt_scrollTtyKeypress, "scroll-on-keypress"), |
111 | BOOL (Rs_scrollTtyKeypress, "scrollTtyKeypress", "sk", Opt_scrollTtyKeypress, "scroll-on-keypress"), |
104 | BOOL (Rs_scrollWithBuffer, "scrollWithBuffer", "sw", Opt_scrollWithBuffer, "scroll-with-buffer"), |
112 | BOOL (Rs_scrollWithBuffer, "scrollWithBuffer", "sw", Opt_scrollWithBuffer, "scroll-with-buffer"), |
… | |
… | |
163 | RSTRG (Rs_color + Color_BD, "colorBD", "color"), |
171 | RSTRG (Rs_color + Color_BD, "colorBD", "color"), |
164 | RSTRG (Rs_color + Color_IT, "colorIT", "color"), |
172 | RSTRG (Rs_color + Color_IT, "colorIT", "color"), |
165 | RSTRG (Rs_color + Color_UL, "colorUL", "color"), |
173 | RSTRG (Rs_color + Color_UL, "colorUL", "color"), |
166 | RSTRG (Rs_color + Color_RV, "colorRV", "color"), |
174 | RSTRG (Rs_color + Color_RV, "colorRV", "color"), |
167 | #endif /* ! NO_BOLD_UNDERLINE_REVERSE */ |
175 | #endif /* ! NO_BOLD_UNDERLINE_REVERSE */ |
|
|
176 | #if ENABLE_FRILLS |
|
|
177 | RSTRG (Rs_color + Color_underline, "underlineColor", "color"), |
|
|
178 | #endif |
168 | #ifdef KEEP_SCROLLCOLOR |
179 | #ifdef KEEP_SCROLLCOLOR |
169 | RSTRG (Rs_color + Color_scroll, "scrollColor", "color"), |
180 | RSTRG (Rs_color + Color_scroll, "scrollColor", "color"), |
170 | RSTRG (Rs_color + Color_trough, "troughColor", "color"), |
181 | RSTRG (Rs_color + Color_trough, "troughColor", "color"), |
171 | #endif /* KEEP_SCROLLCOLOR */ |
182 | #endif /* KEEP_SCROLLCOLOR */ |
172 | #ifdef OPTION_HC |
183 | #ifdef OPTION_HC |
173 | STRG (Rs_color + Color_HC, "highlightColor", "hc", "color", "highlight color"), |
184 | STRG (Rs_color + Color_HC, "highlightColor", "hc", "color", "highlight color"), |
174 | #endif |
185 | #endif |
|
|
186 | #ifndef NO_CURSORCOLOR |
|
|
187 | STRG (Rs_color + Color_cursor, "cursorColor", "cr", "color", "cursor color"), |
|
|
188 | /* command-line option = resource name */ |
|
|
189 | RSTRG (Rs_color + Color_cursor2, "cursorColor2", "color"), |
|
|
190 | #endif /* NO_CURSORCOLOR */ |
|
|
191 | STRG (Rs_color + Color_pointer_fg, "pointerColor", "pr", "color", "pointer color"), |
|
|
192 | STRG (Rs_color + Color_pointer_bg, "pointerColor2", "pr2", "color", "pointer bg color"), |
|
|
193 | STRG (Rs_color + Color_border, "borderColor", "bd", "color", "border color"), |
175 | #if defined (XPM_BACKGROUND) || (MENUBAR_MAX) |
194 | #if defined (XPM_BACKGROUND) || (MENUBAR_MAX) |
176 | RSTRG (Rs_path, "path", "search path"), |
195 | RSTRG (Rs_path, "path", "search path"), |
177 | #endif /* defined (XPM_BACKGROUND) || (MENUBAR_MAX) */ |
196 | #endif /* defined (XPM_BACKGROUND) || (MENUBAR_MAX) */ |
178 | #ifdef XPM_BACKGROUND |
197 | #ifdef XPM_BACKGROUND |
179 | STRG (Rs_backgroundPixmap, "backgroundPixmap", "pixmap", "file[;geom]", "background pixmap"), |
198 | STRG (Rs_backgroundPixmap, "backgroundPixmap", "pixmap", "file[;geom]", "background pixmap"), |
… | |
… | |
189 | STRG (Rs_boldItalicFont, "boldItalicFont", "fbi", "fontname", "bold italic font"), |
208 | STRG (Rs_boldItalicFont, "boldItalicFont", "fbi", "fontname", "bold italic font"), |
190 | #endif |
209 | #endif |
191 | #ifdef USE_XIM |
210 | #ifdef USE_XIM |
192 | STRG (Rs_inputMethod, "inputMethod", "im", "name", "name of input method"), |
211 | STRG (Rs_inputMethod, "inputMethod", "im", "name", "name of input method"), |
193 | STRG (Rs_preeditType, "preeditType", "pt", "style", "input style: style = OverTheSpot|OffTheSpot|Root"), |
212 | STRG (Rs_preeditType, "preeditType", "pt", "style", "input style: style = OverTheSpot|OffTheSpot|Root"), |
194 | #if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE) |
|
|
195 | STRG (Rs_imLocale, "imLocale", "imlocale", "string", "locale to use for input method"), |
213 | STRG (Rs_imLocale, "imLocale", "imlocale", "string", "locale to use for input method"), |
196 | #endif |
214 | STRG (Rs_imFont, "imFont", "imfont", "fontname", "fontset for styles OverTheSpot and OffTheSpot"), |
197 | #endif /* USE_XIM */ |
215 | #endif /* USE_XIM */ |
198 | STRG (Rs_name, NULL, "name", "string", "client instance, icon, and title strings"), |
216 | STRG (Rs_name, NULL, "name", "string", "client instance, icon, and title strings"), |
199 | STRG (Rs_title, "title", "title", "string", "title name for window"), |
217 | STRG (Rs_title, "title", "title", "string", "title name for window"), |
200 | STRG (Rs_title, NULL, "T", NULL, NULL), /* short form */ |
218 | STRG (Rs_title, NULL, "T", NULL, NULL), /* short form */ |
201 | STRG (Rs_iconName, "iconName", "n", "string", "icon name for window"), |
219 | STRG (Rs_iconName, "iconName", "n", "string", "icon name for window"), |
202 | #ifndef NO_CURSORCOLOR |
|
|
203 | STRG (Rs_color + Color_cursor, "cursorColor", "cr", "color", "cursor color"), |
|
|
204 | /* command-line option = resource name */ |
|
|
205 | RSTRG (Rs_color + Color_cursor2, "cursorColor2", "color"), |
|
|
206 | #endif /* NO_CURSORCOLOR */ |
|
|
207 | STRG (Rs_color + Color_pointer_fg, "pointerColor", "pr", "color", "pointer color"), |
|
|
208 | STRG (Rs_color + Color_pointer_bg, "pointerColor2", "pr2", "color", "pointer bg color"), |
|
|
209 | STRG (Rs_color + Color_border, "borderColor", "bd", "color", "border color"), |
|
|
210 | STRG (Rs_saveLines, "saveLines", "sl", "number", "number of scrolled lines to save"), |
220 | STRG (Rs_saveLines, "saveLines", "sl", "number", "number of scrolled lines to save"), |
211 | #if ENABLE_FRILLS |
221 | #if ENABLE_FRILLS |
212 | STRG (Rs_ext_bwidth, "externalBorder", "w", "number", "external border in pixels"), |
222 | STRG (Rs_ext_bwidth, "externalBorder", "w", "number", "external border in pixels"), |
213 | STRG (Rs_ext_bwidth, NULL, "bw", NULL, NULL), |
223 | STRG (Rs_ext_bwidth, NULL, "bw", NULL, NULL), |
214 | STRG (Rs_ext_bwidth, NULL, "borderwidth", NULL, NULL), |
224 | STRG (Rs_ext_bwidth, NULL, "borderwidth", NULL, NULL), |
215 | STRG (Rs_int_bwidth, "internalBorder", "b", "number", "internal border in pixels"), |
225 | STRG (Rs_int_bwidth, "internalBorder", "b", "number", "internal border in pixels"), |
216 | BOOL (Rs_borderLess, "borderLess", "bl", Opt_borderLess, "borderless window"), |
226 | BOOL (Rs_borderLess, "borderLess", "bl", Opt_borderLess, "borderless window"), |
217 | #endif |
|
|
218 | #ifndef NO_LINESPACE |
|
|
219 | STRG (Rs_lineSpace, "lineSpace", "lsp", "number", "number of extra pixels between rows"), |
227 | STRG (Rs_lineSpace, "lineSpace", "lsp", "number", "number of extra pixels between rows"), |
220 | #endif |
228 | #endif |
221 | STRG (Rs_scrollBar_thickness, "thickness", "sbt", "number", "scrollbar thickness/width in pixels"), |
|
|
222 | #ifdef POINTER_BLANK |
229 | #ifdef POINTER_BLANK |
223 | RSTRG (Rs_pointerBlankDelay, "pointerBlankDelay", "number"), |
230 | RSTRG (Rs_pointerBlankDelay, "pointerBlankDelay", "number"), |
224 | #endif |
231 | #endif |
225 | #ifndef NO_BACKSPACE_KEY |
232 | #ifndef NO_BACKSPACE_KEY |
226 | RSTRG (Rs_backspace_key, "backspacekey", "string"), |
233 | RSTRG (Rs_backspace_key, "backspacekey", "string"), |
227 | #endif |
234 | #endif |
228 | #ifndef NO_DELETE_KEY |
235 | #ifndef NO_DELETE_KEY |
229 | RSTRG (Rs_delete_key, "deletekey", "string"), |
236 | RSTRG (Rs_delete_key, "deletekey", "string"), |
230 | #endif |
237 | #endif |
231 | RSTRG (Rs_selectstyle, "selectstyle", "mode"), |
238 | RSTRG (Rs_selectstyle, "selectstyle", "mode"), |
232 | RSTRG (Rs_scrollstyle, "scrollstyle", "mode"), |
|
|
233 | #ifdef HAVE_SCROLLBARS |
|
|
234 | RSTRG (Rs_scrollBar_align, "scrollBar_align", "mode"), |
|
|
235 | #endif |
|
|
236 | #ifdef PRINTPIPE |
239 | #ifdef PRINTPIPE |
237 | RSTRG (Rs_print_pipe, "print-pipe", "string"), |
240 | RSTRG (Rs_print_pipe, "print-pipe", "string"), |
238 | #endif |
241 | #endif |
239 | STRG (Rs_modifier, "modifier", "mod", "modifier", "meta modifier = alt|meta|hyper|super|mod1|...|mod5"), |
242 | STRG (Rs_modifier, "modifier", "mod", "modifier", "meta modifier = alt|meta|hyper|super|mod1|...|mod5"), |
240 | INFO ("xrm", "string", "X resource"), |
|
|
241 | #ifdef CUTCHAR_RESOURCE |
243 | #ifdef CUTCHAR_RESOURCE |
242 | RSTRG (Rs_cutchars, "cutchars", "string"), |
244 | RSTRG (Rs_cutchars, "cutchars", "string"), |
243 | #endif /* CUTCHAR_RESOURCE */ |
245 | #endif /* CUTCHAR_RESOURCE */ |
244 | RSTRG (Rs_answerbackstring, "answerbackString", "string"), |
246 | RSTRG (Rs_answerbackstring, "answerbackString", "string"), |
245 | #ifndef NO_SECONDARY_SCREEN |
247 | #ifndef NO_SECONDARY_SCREEN |
246 | BOOL (Rs_secondaryScreen, "secondaryScreen", "ssc", Opt_secondaryScreen, "enable secondary screen"), |
248 | BOOL (Rs_secondaryScreen, "secondaryScreen", "ssc", Opt_secondaryScreen, "enable secondary screen"), |
247 | BOOL (Rs_secondaryScroll, "secondaryScroll", "ssr", Opt_secondaryScroll, "enable secondary screen scroll"), |
249 | BOOL (Rs_secondaryScroll, "secondaryScroll", "ssr", Opt_secondaryScroll, "enable secondary screen scroll"), |
|
|
250 | #endif |
|
|
251 | #if !defined(NO_RESOURCES) && defined(USE_XGETDEFAULT) |
|
|
252 | INFO ("xrm", "string", "X resource"), |
248 | #endif |
253 | #endif |
249 | INFO ("e", "command arg ...", "command to execute") |
254 | INFO ("e", "command arg ...", "command to execute") |
250 | }; |
255 | }; |
251 | |
256 | |
252 | #undef INFO |
257 | #undef INFO |
… | |
… | |
354 | "strings," |
359 | "strings," |
355 | #endif |
360 | #endif |
356 | #if defined(ENABLE_FRILLS) |
361 | #if defined(ENABLE_FRILLS) |
357 | "frills," |
362 | "frills," |
358 | #endif |
363 | #endif |
359 | #if !defined(NO_LINESPACE) |
|
|
360 | "linespace," |
|
|
361 | #endif |
|
|
362 | #if defined(PREFER_24BIT) |
364 | #if defined(PREFER_24BIT) |
363 | "24bit," |
365 | "24bit," |
364 | #endif |
366 | #endif |
365 | #if defined(SELECTION_SCROLLING) |
367 | #if defined(SELECTION_SCROLLING) |
366 | "selectionscrolling," |
368 | "selectionscrolling," |
… | |
… | |
603 | XrmQuarkList quarks, |
605 | XrmQuarkList quarks, |
604 | XrmRepresentation *type __attribute__((unused)), |
606 | XrmRepresentation *type __attribute__((unused)), |
605 | XrmValue *value, |
607 | XrmValue *value, |
606 | XPointer closure __attribute__((unused))) |
608 | XPointer closure __attribute__((unused))) |
607 | { |
609 | { |
608 | int last; |
610 | int last; |
609 | |
611 | |
610 | for (last = 0; quarks[last] != NULLQUARK; last++) /* look for last quark in list */ |
612 | for (last = 0; quarks[last] != NULLQUARK; last++) /* look for last quark in list */ |
611 | ; |
613 | ; |
|
|
614 | |
612 | last--; |
615 | last--; |
613 | GET_R->parse_keysym (XrmQuarkToString (quarks[last]), (char *)value->addr);//D//TODO |
616 | GET_R->parse_keysym (XrmQuarkToString (quarks[last]), (char *)value->addr);//D//TODO |
614 | return False; |
617 | return False; |
615 | } |
618 | } |
616 | |
619 | |
… | |
… | |
621 | * arg will be |
624 | * arg will be |
622 | * NULL for ~/.Xdefaults and |
625 | * NULL for ~/.Xdefaults and |
623 | * non-NULL for command-line options (need to allocate) |
626 | * non-NULL for command-line options (need to allocate) |
624 | */ |
627 | */ |
625 | #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 | |
626 | int |
665 | int |
627 | rxvt_term::parse_keysym (const char *str, const char *arg) |
666 | rxvt_term::parse_keysym (const char *str, const char *arg) |
628 | { |
667 | { |
629 | int n, sym; |
668 | int n, sym; |
630 | char *key_string, *newarg = NULL; |
669 | unsigned int state = 0; |
|
|
670 | const char *pmodend = NULL; |
|
|
671 | char *newarg = NULL; |
631 | char newargstr[NEWARGLIM]; |
672 | char newargstr[NEWARGLIM]; |
632 | |
673 | |
633 | if (arg == NULL) |
674 | if (arg == NULL) |
634 | { |
675 | { |
635 | if ((n = rxvt_Str_match (str, "keysym.")) == 0) |
676 | if ((n = rxvt_Str_match (str, "keysym.")) == 0) |
636 | return 0; |
677 | return 0; |
|
|
678 | |
637 | str += n; /* skip `keysym.' */ |
679 | str += n; /* skip `keysym.' */ |
|
|
680 | if ((pmodend = strchr (str, ':')) < str) |
|
|
681 | return -1; |
638 | } |
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 | |
639 | /* some scanf () have trouble with a 0x prefix */ |
711 | /* some scanf () have trouble with a 0x prefix */ |
640 | if (isdigit (str[0])) |
712 | if (str[0] == '0' && toupper (str[1]) == 'X') |
641 | { |
713 | { |
642 | if (str[0] == '0' && toupper (str[1]) == 'X') |
|
|
643 | str += 2; |
714 | str += 2; |
|
|
715 | |
644 | if (arg) |
716 | if (arg) |
645 | { |
717 | { |
646 | if (sscanf (str, (strchr (str, ':') ? "%x:" : "%x"), &sym) != 1) |
718 | if (sscanf (str, (strchr (str, ':') ? "%x:" : "%x"), &sym) != 1) |
647 | return -1; |
719 | return -1; |
648 | } |
720 | } |
… | |
… | |
662 | /* |
734 | /* |
663 | * convert keysym name to keysym number |
735 | * convert keysym name to keysym number |
664 | */ |
736 | */ |
665 | strncpy (newargstr, str, NEWARGLIM - 1); |
737 | strncpy (newargstr, str, NEWARGLIM - 1); |
666 | newargstr[NEWARGLIM - 1] = '\0'; |
738 | newargstr[NEWARGLIM - 1] = '\0'; |
|
|
739 | |
667 | if (arg == NULL) |
740 | if (arg == NULL) |
668 | { |
741 | { |
669 | if ((newarg = strchr (newargstr, ':')) == NULL) |
742 | if ((newarg = strchr (newargstr, ':')) == NULL) |
670 | return -1; |
743 | return -1; |
|
|
744 | |
671 | *newarg++ = '\0'; /* terminate keysym name */ |
745 | *newarg++ = '\0'; /* terminate keysym name */ |
672 | } |
746 | } |
|
|
747 | |
673 | if ((sym = XStringToKeysym (newargstr)) == None) |
748 | if ((sym = XStringToKeysym (newargstr)) == None) |
674 | return -1; |
749 | return -1; |
675 | } |
750 | } |
676 | |
|
|
677 | if (sym < 0xFF00 || sym > 0xFFFF) /* we only do extended keys */ |
|
|
678 | return -1; |
|
|
679 | sym &= 0xFF; |
|
|
680 | if (Keysym_map[sym] != NULL) /* already set ? */ |
|
|
681 | return -1; |
|
|
682 | |
751 | |
683 | if (newarg == NULL) |
752 | if (newarg == NULL) |
684 | { |
753 | { |
685 | strncpy (newargstr, arg, NEWARGLIM - 1); |
754 | strncpy (newargstr, arg, NEWARGLIM - 1); |
686 | newargstr[NEWARGLIM - 1] = '\0'; |
755 | newargstr[NEWARGLIM - 1] = '\0'; |
687 | newarg = newargstr; |
756 | newarg = newargstr; |
688 | } |
757 | } |
|
|
758 | |
689 | rxvt_Str_trim (newarg); |
759 | rxvt_Str_trim (newarg); |
690 | if (*newarg == '\0' || (n = rxvt_Str_escaped (newarg)) == 0) |
760 | if (*newarg == '\0' || (n = rxvt_Str_escaped (newarg)) == 0) |
691 | return -1; |
761 | return -1; |
692 | MIN_IT (n, 255); |
|
|
693 | key_string = (char *)rxvt_malloc ((n + 1) * sizeof (char)); |
|
|
694 | |
762 | |
695 | key_string[0] = n; |
763 | keyboard->register_user_translation (sym, state, newarg); |
696 | strncpy (key_string + 1, newarg, n); |
|
|
697 | Keysym_map[sym] = (unsigned char *)key_string; |
|
|
698 | |
|
|
699 | return 1; |
764 | return 1; |
700 | } |
765 | } |
701 | |
766 | |
702 | # endif /* KEYSYM_RESOURCE */ |
767 | # endif /* KEYSYM_RESOURCE */ |
703 | |
768 | |
… | |
… | |
868 | { |
933 | { |
869 | XrmMergeDatabases (rdb1, &database); |
934 | XrmMergeDatabases (rdb1, &database); |
870 | # ifndef HAVE_BOTH_XRESOURCE_FILES |
935 | # ifndef HAVE_BOTH_XRESOURCE_FILES |
871 | break; |
936 | break; |
872 | # endif |
937 | # endif |
873 | |
|
|
874 | } |
938 | } |
875 | } |
939 | } |
876 | } |
940 | } |
877 | # endif |
941 | # endif |
878 | |
942 | |
… | |
… | |
975 | # endif |
1039 | # endif |
976 | # endif |
1040 | # endif |
977 | |
1041 | |
978 | # else /* USE_XGETDEFAULT */ |
1042 | # else /* USE_XGETDEFAULT */ |
979 | /* get resources the hard way, but save lots of memory */ |
1043 | /* get resources the hard way, but save lots of memory */ |
980 | FILE *fd = NULL; |
1044 | FILE *fd = NULL; |
981 | char *home; |
1045 | char *home; |
982 | |
1046 | |
983 | if ((home = getenv ("HOME")) != NULL) |
1047 | if ((home = getenv ("HOME")) != NULL) |
984 | { |
1048 | { |
985 | unsigned int i, len = strlen (home) + 2; |
1049 | unsigned int i, len = strlen (home) + 2; |
986 | char *f = NULL; |
1050 | char *f = NULL; |
987 | |
1051 | |
988 | for (i = 0; i < (sizeof (xnames) / sizeof (xnames[0])); i++) |
1052 | for (i = 0; i < (sizeof (xnames) / sizeof (xnames[0])); i++) |
989 | { |
1053 | { |
990 | f = (char *)rxvt_realloc (f, (len + strlen (xnames[i])) * sizeof (char)); |
1054 | f = (char *)rxvt_realloc (f, len + strlen (xnames[i])); |
991 | |
1055 | |
992 | sprintf (f, "%s/%s", home, xnames[i]); |
1056 | sprintf (f, "%s/%s", home, xnames[i]); |
993 | |
1057 | |
994 | if ((fd = fopen (f, "r")) != NULL) |
1058 | if ((fd = fopen (f, "r")) != NULL) |
995 | break; |
1059 | break; |
996 | } |
1060 | } |
|
|
1061 | |
997 | free (f); |
1062 | free (f); |
998 | } |
1063 | } |
999 | /* |
1064 | /* |
1000 | * The normal order to match resources is the following: |
1065 | * The normal order to match resources is the following: |
1001 | * @ global resources (partial match, ~/.Xdefaults) |
1066 | * @ global resources (partial match, ~/.Xdefaults) |