… | |
… | |
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. |
… | |
… | |
109 | BOOL (Rs_scrollTtyOutput, NULL, "si", Opt_scrollTtyOutput, Optflag_Reverse, "scroll-on-tty-output inhibit"), |
110 | BOOL (Rs_scrollTtyOutput, NULL, "si", Opt_scrollTtyOutput, Optflag_Reverse, "scroll-on-tty-output inhibit"), |
110 | BOOL (Rs_scrollTtyKeypress, "scrollTtyKeypress", "sk", Opt_scrollTtyKeypress, 0, "scroll-on-keypress"), |
111 | BOOL (Rs_scrollTtyKeypress, "scrollTtyKeypress", "sk", Opt_scrollTtyKeypress, 0, "scroll-on-keypress"), |
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 | SWCH ("tr", Opt_transparent, 0, NULL), |
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 |
… | |
… | |
167 | #ifndef NO_BOLD_UNDERLINE_REVERSE |
168 | #ifndef NO_BOLD_UNDERLINE_REVERSE |
168 | RSTRG (Rs_color + Color_BD, "colorBD", "color"), |
169 | RSTRG (Rs_color + Color_BD, "colorBD", "color"), |
169 | RSTRG (Rs_color + Color_IT, "colorIT", "color"), |
170 | RSTRG (Rs_color + Color_IT, "colorIT", "color"), |
170 | RSTRG (Rs_color + Color_UL, "colorUL", "color"), |
171 | RSTRG (Rs_color + Color_UL, "colorUL", "color"), |
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 KEEP_SCROLLCOLOR |
177 | RSTRG (Rs_color + Color_scroll, "scrollColor", "color"), |
178 | RSTRG (Rs_color + Color_scroll, "scrollColor", "color"), |
178 | RSTRG (Rs_color + Color_trough, "troughColor", "color"), |
179 | RSTRG (Rs_color + Color_trough, "troughColor", "color"), |
179 | #endif /* KEEP_SCROLLCOLOR */ |
180 | #endif /* KEEP_SCROLLCOLOR */ |
180 | #ifdef OPTION_HC |
181 | #ifdef OPTION_HC |
181 | STRG (Rs_color + Color_HC, "highlightColor", "hc", "color", "highlight color"), |
182 | STRG (Rs_color + Color_HC, "highlightColor", "hc", "color", "highlight color"), |
182 | #endif |
183 | #endif |
183 | #ifndef NO_CURSORCOLOR |
184 | #ifndef NO_CURSORCOLOR |
184 | STRG (Rs_color + Color_cursor, "cursorColor", "cr", "color", "cursor color"), |
185 | STRG (Rs_color + Color_cursor, "cursorColor", "cr", "color", "cursor color"), |
185 | /* command-line option = resource name */ |
186 | /* command-line option = resource name */ |
186 | RSTRG (Rs_color + Color_cursor2, "cursorColor2", "color"), |
187 | RSTRG (Rs_color + Color_cursor2, "cursorColor2", "color"), |
187 | #endif /* NO_CURSORCOLOR */ |
188 | #endif /* NO_CURSORCOLOR */ |
188 | STRG (Rs_color + Color_pointer_fg, "pointerColor", "pr", "color", "pointer color"), |
189 | STRG (Rs_color + Color_pointer_fg, "pointerColor", "pr", "color", "pointer color"), |
189 | STRG (Rs_color + Color_pointer_bg, "pointerColor2", "pr2", "color", "pointer bg color"), |
190 | STRG (Rs_color + Color_pointer_bg, "pointerColor2", "pr2", "color", "pointer bg color"), |
190 | STRG (Rs_color + Color_border, "borderColor", "bd", "color", "border color"), |
191 | STRG (Rs_color + Color_border, "borderColor", "bd", "color", "border color"), |
191 | #ifdef XPM_BACKGROUND |
192 | #ifdef BG_IMAGE_FROM_FILE |
192 | RSTRG (Rs_path, "path", "search path"), |
193 | RSTRG (Rs_path, "path", "search path"), |
193 | STRG (Rs_backgroundPixmap, "backgroundPixmap", "pixmap", "file[;geom]", "background pixmap"), |
194 | STRG (Rs_backgroundPixmap, "backgroundPixmap", "pixmap", "file[;geom]", "background pixmap"), |
194 | #endif |
195 | #endif |
195 | /* fonts: command-line option = resource name */ |
196 | /* fonts: command-line option = resource name */ |
196 | STRG (Rs_font, "font", "fn", "fontname", "normal text font"), |
197 | STRG (Rs_font, "font", "fn", "fontname", "normal text font"), |
… | |
… | |
203 | #ifdef USE_XIM |
204 | #ifdef USE_XIM |
204 | STRG (Rs_inputMethod, "inputMethod", "im", "name", "name of input method"), |
205 | STRG (Rs_inputMethod, "inputMethod", "im", "name", "name of input method"), |
205 | STRG (Rs_preeditType, "preeditType", "pt", "style", "input style: style = OverTheSpot|OffTheSpot|Root"), |
206 | STRG (Rs_preeditType, "preeditType", "pt", "style", "input style: style = OverTheSpot|OffTheSpot|Root"), |
206 | STRG (Rs_imLocale, "imLocale", "imlocale", "string", "locale to use for input method"), |
207 | STRG (Rs_imLocale, "imLocale", "imlocale", "string", "locale to use for input method"), |
207 | STRG (Rs_imFont, "imFont", "imfont", "fontname", "fontset for styles OverTheSpot and OffTheSpot"), |
208 | STRG (Rs_imFont, "imFont", "imfont", "fontname", "fontset for styles OverTheSpot and OffTheSpot"), |
208 | #endif /* USE_XIM */ |
209 | #endif /* USE_XIM */ |
209 | STRG (Rs_name, NULL, "name", "string", "client instance, icon, and title strings"), |
210 | STRG (Rs_name, NULL, "name", "string", "client instance, icon, and title strings"), |
210 | STRG (Rs_title, "title", "title", "string", "title name for window"), |
211 | STRG (Rs_title, "title", "title", "string", "title name for window"), |
211 | STRG (Rs_title, NULL, "T", NULL, NULL), /* short form */ |
212 | STRG (Rs_title, NULL, "T", NULL, NULL), /* short form */ |
212 | STRG (Rs_iconName, "iconName", "n", "string", "icon name for window"), |
213 | STRG (Rs_iconName, "iconName", "n", "string", "icon name for window"), |
213 | STRG (Rs_saveLines, "saveLines", "sl", "number", "number of scrolled lines to save"), |
214 | STRG (Rs_saveLines, "saveLines", "sl", "number", "number of scrolled lines to save"), |
… | |
… | |
225 | STRG (Rs_ext_bwidth, "externalBorder", "w", "number", "external border in pixels"), |
226 | STRG (Rs_ext_bwidth, "externalBorder", "w", "number", "external border in pixels"), |
226 | STRG (Rs_ext_bwidth, NULL, "bw", NULL, NULL), |
227 | STRG (Rs_ext_bwidth, NULL, "bw", NULL, NULL), |
227 | STRG (Rs_ext_bwidth, NULL, "borderwidth", NULL, NULL), |
228 | STRG (Rs_ext_bwidth, NULL, "borderwidth", NULL, NULL), |
228 | STRG (Rs_int_bwidth, "internalBorder", "b", "number", "internal border in pixels"), |
229 | STRG (Rs_int_bwidth, "internalBorder", "b", "number", "internal border in pixels"), |
229 | BOOL (Rs_borderLess, "borderLess", "bl", Opt_borderLess, 0, "borderless window"), |
230 | BOOL (Rs_borderLess, "borderLess", "bl", Opt_borderLess, 0, "borderless window"), |
|
|
231 | STRG (Rs_lineSpace, "lineSpace", "lsp", "number", "number of extra pixels between rows"), |
|
|
232 | #endif |
|
|
233 | #ifdef BUILTIN_GLYPHS |
230 | BOOL (Rs_skipBuiltinGlyphs, "skipBuiltinGlyphs", "sbg", Opt_skipBuiltinGlyphs, 0, "do not use internal glyphs"), |
234 | BOOL (Rs_skipBuiltinGlyphs, "skipBuiltinGlyphs", "sbg", Opt_skipBuiltinGlyphs, 0, "do not use internal glyphs"), |
231 | STRG (Rs_lineSpace, "lineSpace", "lsp", "number", "number of extra pixels between rows"), |
|
|
232 | #endif |
235 | #endif |
233 | #ifdef POINTER_BLANK |
236 | #ifdef POINTER_BLANK |
234 | RSTRG (Rs_pointerBlankDelay, "pointerBlankDelay", "number"), |
237 | RSTRG (Rs_pointerBlankDelay, "pointerBlankDelay", "number"), |
235 | #endif |
238 | #endif |
236 | #ifndef NO_BACKSPACE_KEY |
239 | #ifndef NO_BACKSPACE_KEY |
237 | RSTRG (Rs_backspace_key, "backspacekey", "string"), |
240 | RSTRG (Rs_backspace_key, "backspacekey", "string"), |
238 | #endif |
241 | #endif |
239 | #ifndef NO_DELETE_KEY |
242 | #ifndef NO_DELETE_KEY |
240 | RSTRG (Rs_delete_key, "deletekey", "string"), |
243 | RSTRG (Rs_delete_key, "deletekey", "string"), |
241 | #endif |
244 | #endif |
242 | RSTRG (Rs_selectstyle, "selectstyle", "mode"), |
|
|
243 | #ifdef PRINTPIPE |
245 | #ifdef PRINTPIPE |
244 | RSTRG (Rs_print_pipe, "print-pipe", "string"), |
246 | RSTRG (Rs_print_pipe, "print-pipe", "string"), |
245 | #endif |
247 | #endif |
246 | 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"), |
247 | #ifdef CUTCHAR_RESOURCE |
249 | #ifdef CUTCHAR_RESOURCE |
248 | RSTRG (Rs_cutchars, "cutchars", "string"), |
250 | RSTRG (Rs_cutchars, "cutchars", "string"), |
249 | #endif /* CUTCHAR_RESOURCE */ |
251 | #endif /* CUTCHAR_RESOURCE */ |
250 | RSTRG (Rs_answerbackstring, "answerbackString", "string"), |
252 | RSTRG (Rs_answerbackstring, "answerbackString", "string"), |
251 | #ifndef NO_SECONDARY_SCREEN |
253 | #ifndef NO_SECONDARY_SCREEN |
252 | BOOL (Rs_secondaryScreen, "secondaryScreen", "ssc", Opt_secondaryScreen, 0, "enable secondary screen"), |
254 | BOOL (Rs_secondaryScreen, "secondaryScreen", "ssc", Opt_secondaryScreen, 0, "enable secondary screen"), |
253 | BOOL (Rs_secondaryScroll, "secondaryScroll", "ssr", Opt_secondaryScroll, 0, "enable secondary screen scroll"), |
255 | BOOL (Rs_secondaryScroll, "secondaryScroll", "ssr", Opt_secondaryScroll, 0, "enable secondary screen scroll"), |
254 | #endif |
256 | #endif |
… | |
… | |
263 | #endif |
265 | #endif |
264 | #ifdef HAVE_AFTERIMAGE |
266 | #ifdef HAVE_AFTERIMAGE |
265 | STRG (Rs_blendtype, "blendType", "blt", "string", "background image blending type - alpha, tint, etc..."), |
267 | STRG (Rs_blendtype, "blendType", "blt", "string", "background image blending type - alpha, tint, etc..."), |
266 | STRG (Rs_blurradius, "blurRadius", "blr", "HxV", "Gaussian Blur radii to apply to the root background"), |
268 | STRG (Rs_blurradius, "blurRadius", "blr", "HxV", "Gaussian Blur radii to apply to the root background"), |
267 | #endif |
269 | #endif |
268 | #ifndef NO_RESOURCES |
|
|
269 | INFO ("xrm", "string", "X resource"), |
|
|
270 | #endif |
|
|
271 | INFO ("e", "command arg ...", "command to execute") |
270 | INFO ("e", "command arg ...", "command to execute") |
272 | }; |
271 | }; |
273 | |
272 | |
274 | #undef INFO |
273 | #undef INFO |
275 | #undef STRG |
274 | #undef STRG |
… | |
… | |
317 | "+zh-ext" |
316 | "+zh-ext" |
318 | #endif |
317 | #endif |
319 | "," |
318 | "," |
320 | #if OFF_FOCUS_FADING |
319 | #if OFF_FOCUS_FADING |
321 | "fade," |
320 | "fade," |
322 | #endif |
|
|
323 | #if defined(XPM_BACKGROUND) |
|
|
324 | "XPM," |
|
|
325 | #endif |
321 | #endif |
326 | #if defined(ENABLE_TRANSPARENCY) |
322 | #if defined(ENABLE_TRANSPARENCY) |
327 | "transparent," |
323 | "transparent," |
328 | "tint," |
324 | "tint," |
329 | #endif |
325 | #endif |
… | |
… | |
429 | assert (optList[i].opt != NULL); |
425 | assert (optList[i].opt != NULL); |
430 | #endif |
426 | #endif |
431 | len += 4 + strlen (optList[i].opt) + (optList_isBool (i) ? 2: 0); |
427 | len += 4 + strlen (optList[i].opt) + (optList_isBool (i) ? 2: 0); |
432 | col += len; |
428 | col += len; |
433 | if (col > 79) |
429 | if (col > 79) |
|
|
430 | { |
434 | { /* assume regular width */ |
431 | /* assume regular width */ |
435 | rxvt_log ("\n"); |
432 | rxvt_log ("\n"); |
436 | col = 1 + len; |
433 | col = 1 + len; |
437 | } |
434 | } |
438 | |
435 | |
439 | rxvt_log (" [-%s%s", (optList_isBool (i) ? "/+" : ""), optList[i].opt); |
436 | rxvt_log (" [-%s%s", (optList_isBool (i) ? "/+" : ""), optList[i].opt); |
… | |
… | |
550 | * default values |
547 | * default values |
551 | */ |
548 | */ |
552 | |
549 | |
553 | if (optList[entry].doff != -1) |
550 | if (optList[entry].doff != -1) |
554 | { |
551 | { |
555 | if (flag == resval_on && !argv [i+1]) |
552 | if (flag == resval_on && i+1 == argc) |
556 | rxvt_fatal ("option '%s' needs an argument, aborting.\n", argv [i]); |
553 | rxvt_fatal ("option '%s' requires an argument, aborting.\n", argv [i]); |
557 | |
554 | |
558 | rs[optList[entry].doff] = flag == resval_on ? argv[++i] : resval_undef; |
555 | rs[optList[entry].doff] = flag == resval_on ? argv[++i] : resval_undef; |
559 | } |
556 | } |
560 | } |
557 | } |
561 | else |
558 | else |
|
|
559 | { |
562 | { /* boolean value */ |
560 | /* boolean value */ |
563 | set_option (optList[entry].index, flag == resval_on); |
561 | set_option (optList[entry].index, flag == resval_on); |
564 | |
562 | |
565 | if (optList[entry].doff != -1) |
563 | if (optList[entry].doff != -1) |
566 | rs[optList[entry].doff] = flag; |
564 | rs[optList[entry].doff] = flag; |
567 | } |
565 | } |
568 | } |
566 | } |
|
|
567 | #ifndef NO_RESOURCES |
|
|
568 | else if (!strcmp (opt, "xrm")) |
|
|
569 | { |
|
|
570 | if (i+1 < argc) |
|
|
571 | XrmPutLineResource (&option_db, argv[++i]); |
|
|
572 | } |
|
|
573 | #endif |
|
|
574 | #ifdef KEYSYM_RESOURCE |
|
|
575 | else if (!strncmp (opt, "keysym.", sizeof ("keysym.") - 1)) |
|
|
576 | { |
|
|
577 | if (i+1 < argc) |
|
|
578 | { |
|
|
579 | char *res = (char *)malloc (strlen (opt) + strlen (argv[++i]) + 6); |
|
|
580 | sprintf (res, "*.%s: %s\n", opt, argv[i]); |
|
|
581 | XrmPutLineResource (&option_db, res); |
|
|
582 | free (res); |
|
|
583 | } |
|
|
584 | } |
|
|
585 | #endif |
569 | else |
586 | else |
570 | #ifdef KEYSYM_RESOURCE |
|
|
571 | /* if (!strncmp (opt, "keysym.", sizeof ("keysym.") - 1)) */ |
|
|
572 | if (rxvt_Str_match (opt, "keysym.")) |
|
|
573 | { |
587 | { |
574 | const char *str = argv[++i]; |
|
|
575 | |
|
|
576 | if (str != NULL) |
|
|
577 | parse_keysym (opt + sizeof ("keysym.") - 1, str); |
|
|
578 | } |
|
|
579 | else |
|
|
580 | #endif |
|
|
581 | { |
|
|
582 | bad_option = 1; |
588 | bad_option = 1; |
583 | rxvt_warn ("\"%s\": unknown or malformed option.\n", opt); |
589 | rxvt_warn ("\"%s\": unknown or malformed option.\n", opt); |
584 | } |
590 | } |
585 | } |
591 | } |
586 | |
592 | |
587 | if (bad_option) |
593 | if (bad_option) |
588 | rxvt_usage (0); |
594 | rxvt_usage (0); |
589 | } |
595 | } |
… | |
… | |
620 | } |
626 | } |
621 | |
627 | |
622 | /* |
628 | /* |
623 | * look for something like this (XK_Delete) |
629 | * look for something like this (XK_Delete) |
624 | * rxvt*keysym.0xFFFF: "\177" |
630 | * rxvt*keysym.0xFFFF: "\177" |
625 | * |
|
|
626 | * arg will be |
|
|
627 | * NULL for ~/.Xdefaults and |
|
|
628 | * non-NULL for command-line options (need to allocate) |
|
|
629 | */ |
631 | */ |
630 | #define NEWARGLIM 500 /* `reasonable' size */ |
|
|
631 | |
632 | |
632 | struct keysym_vocabulary_t |
633 | struct keysym_vocabulary_t |
633 | { |
634 | { |
634 | const char *name; |
635 | const char *name; |
635 | unsigned short len; |
636 | unsigned short len; |
… | |
… | |
665 | }; |
666 | }; |
666 | |
667 | |
667 | int |
668 | int |
668 | rxvt_term::parse_keysym (const char *str, const char *arg) |
669 | rxvt_term::parse_keysym (const char *str, const char *arg) |
669 | { |
670 | { |
670 | int n, sym; |
671 | int sym; |
671 | unsigned int state = 0; |
672 | unsigned int state = 0; |
672 | const char *pmodend = NULL; |
673 | const char *key = strrchr (str, '-'); |
673 | char *newarg = NULL; |
|
|
674 | char newargstr[NEWARGLIM]; |
|
|
675 | |
674 | |
676 | if (arg == NULL) |
675 | if (!key) |
677 | { |
676 | key = str; |
678 | if ((n = rxvt_Str_match (str, "keysym.")) == 0) |
|
|
679 | return 0; |
|
|
680 | |
|
|
681 | str += n; /* skip `keysym.' */ |
|
|
682 | if (!(pmodend = strchr (str, ':'))) |
|
|
683 | return -1; |
|
|
684 | } |
|
|
685 | else |
677 | else |
686 | pmodend = str + strlen(str); |
678 | key++; |
687 | |
679 | |
688 | for (--pmodend; str < pmodend; --pmodend) |
680 | // string or key is empty |
689 | if (*pmodend == '-') |
681 | if (*arg == '\0' || *key == '\0') |
690 | break; |
682 | return -1; |
691 | |
683 | |
|
|
684 | // parse modifiers |
692 | while (str < pmodend) |
685 | while (str < key) |
693 | { |
686 | { |
694 | unsigned int i; |
687 | unsigned int i; |
695 | |
688 | |
696 | 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) |
697 | { |
690 | { |
… | |
… | |
708 | |
701 | |
709 | if (*str == '-') |
702 | if (*str == '-') |
710 | ++str; |
703 | ++str; |
711 | } |
704 | } |
712 | |
705 | |
713 | /* some scanf () have trouble with a 0x prefix */ |
706 | // convert keysym name to keysym number |
714 | if (str[0] == '0' && toupper (str[1]) == 'X') |
707 | if ((sym = XStringToKeysym (str)) == None) |
715 | { |
708 | { |
716 | str += 2; |
709 | // fallback on hexadecimal parsing |
717 | |
710 | char *end; |
|
|
711 | sym = strtol (str, &end, 16); |
718 | if (arg) |
712 | if (*end) |
719 | { |
|
|
720 | if (sscanf (str, (strchr (str, ':') ? "%x:" : "%x"), &sym) != 1) |
|
|
721 | return -1; |
|
|
722 | } |
|
|
723 | else |
|
|
724 | { |
|
|
725 | if (sscanf (str, "%x:", &sym) != 1) |
|
|
726 | return -1; |
|
|
727 | |
|
|
728 | /* cue to ':', it's there since sscanf () worked */ |
|
|
729 | strncpy (newargstr, strchr (str, ':') + 1, NEWARGLIM - 1); |
|
|
730 | newargstr[NEWARGLIM - 1] = '\0'; |
|
|
731 | newarg = newargstr; |
|
|
732 | } |
|
|
733 | } |
|
|
734 | else |
|
|
735 | { |
|
|
736 | /* |
|
|
737 | * convert keysym name to keysym number |
|
|
738 | */ |
|
|
739 | strncpy (newargstr, str, NEWARGLIM - 1); |
|
|
740 | newargstr[NEWARGLIM - 1] = '\0'; |
|
|
741 | |
|
|
742 | if (arg == NULL) |
|
|
743 | { |
|
|
744 | if ((newarg = strchr (newargstr, ':')) == NULL) |
|
|
745 | return -1; |
|
|
746 | |
|
|
747 | *newarg++ = '\0'; /* terminate keysym name */ |
|
|
748 | } |
|
|
749 | |
|
|
750 | if ((sym = XStringToKeysym (newargstr)) == None) |
|
|
751 | return -1; |
713 | return -1; |
752 | } |
714 | } |
753 | |
715 | |
754 | if (newarg == NULL) |
|
|
755 | { |
|
|
756 | strncpy (newargstr, arg, NEWARGLIM - 1); |
|
|
757 | newargstr[NEWARGLIM - 1] = '\0'; |
|
|
758 | newarg = newargstr; |
|
|
759 | } |
|
|
760 | |
|
|
761 | rxvt_Str_trim (newarg); |
|
|
762 | if (*newarg == '\0' || (n = rxvt_Str_escaped (newarg)) == 0) |
|
|
763 | return -1; |
|
|
764 | |
|
|
765 | keyboard->register_user_translation (sym, state, newarg); |
716 | keyboard->register_user_translation (sym, state, arg); |
766 | return 1; |
717 | return 1; |
767 | } |
718 | } |
768 | |
719 | |
769 | # endif /* KEYSYM_RESOURCE */ |
720 | # endif /* KEYSYM_RESOURCE */ |
770 | #endif /* NO_RESOURCES */ |
721 | #endif /* NO_RESOURCES */ |
771 | |
722 | |
772 | static char * |
723 | static char * |
773 | get_res (XrmDatabase database, const char *program, const char *option) |
724 | get_res (XrmDatabase database, const char *program, const char *option) |
774 | { |
725 | { |
775 | char resource[512]; |
726 | char resource[512]; |
… | |
… | |
807 | |
758 | |
808 | void |
759 | void |
809 | rxvt_term::extract_resources () |
760 | rxvt_term::extract_resources () |
810 | { |
761 | { |
811 | #ifndef NO_RESOURCES |
762 | #ifndef NO_RESOURCES |
|
|
763 | XrmDatabase database = XrmGetDatabase (dpy); |
|
|
764 | XrmMergeDatabases (option_db, &database); |
|
|
765 | option_db = NULL; |
812 | /* |
766 | /* |
813 | * Query resources for options that affect us |
767 | * Query resources for options that affect us |
814 | */ |
768 | */ |
815 | for (int entry = 0; entry < optList_size; entry++) |
769 | for (int entry = 0; entry < optList_size; entry++) |
816 | { |
770 | { |
… | |
… | |
845 | |
799 | |
846 | /* |
800 | /* |
847 | * [R5 or later]: enumerate the resource database |
801 | * [R5 or later]: enumerate the resource database |
848 | */ |
802 | */ |
849 | # ifdef KEYSYM_RESOURCE |
803 | # ifdef KEYSYM_RESOURCE |
850 | XrmDatabase database = XrmGetDatabase (dpy); |
|
|
851 | XrmName name_prefix[3]; |
804 | XrmName name_prefix[3]; |
852 | XrmClass class_prefix[3]; |
805 | XrmClass class_prefix[3]; |
853 | |
806 | |
854 | name_prefix[0] = XrmStringToName (rs[Rs_name]); |
807 | name_prefix[0] = XrmStringToName (rs[Rs_name]); |
855 | name_prefix[1] = XrmStringToName ("keysym"); |
808 | name_prefix[1] = XrmStringToName ("keysym"); |
… | |
… | |
869 | XrmEnumerateDatabase (database, name_prefix, class_prefix, |
822 | XrmEnumerateDatabase (database, name_prefix, class_prefix, |
870 | XrmEnumOneLevel, rxvt_define_key, NULL); |
823 | XrmEnumOneLevel, rxvt_define_key, NULL); |
871 | # endif |
824 | # endif |
872 | # endif |
825 | # endif |
873 | |
826 | |
874 | #endif /* NO_RESOURCES */ |
827 | #endif /* NO_RESOURCES */ |
875 | } |
828 | } |
876 | |
829 | |
877 | /*----------------------- end-of-file (C source) -----------------------*/ |
830 | /*----------------------- end-of-file (C source) -----------------------*/ |