… | |
… | |
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. |
… | |
… | |
30 | #ifdef KEYSYM_RESOURCE |
31 | #ifdef KEYSYM_RESOURCE |
31 | # include "keyboard.h" |
32 | # include "keyboard.h" |
32 | #endif |
33 | #endif |
33 | |
34 | |
34 | /* place holders used for parsing command-line options */ |
35 | /* place holders used for parsing command-line options */ |
35 | #define Optflag_Reverse 0x40000000UL |
36 | #define Optflag_Reverse 1 |
36 | #define Optflag_Boolean 0x80000000UL |
37 | #define Optflag_Boolean 2 |
37 | #define Optflag_mask 0x3fffffffUL |
38 | #define Optflag_Switch 4 |
38 | |
39 | |
39 | /* monolithic option/resource structure: */ |
40 | /* monolithic option/resource structure: */ |
40 | /* |
41 | /* |
41 | * `string' options MUST have a usage argument |
42 | * `string' options MUST have a usage argument |
42 | * `switch' and `boolean' options have no argument |
43 | * `switch' and `boolean' options have no argument |
43 | * if there's no desc (ription), it won't appear in rxvt_usage () |
44 | * if there's no desc (ription), it won't appear in rxvt_usage () |
44 | */ |
45 | */ |
45 | |
46 | |
46 | /* INFO () - descriptive information only */ |
47 | /* INFO () - descriptive information only */ |
47 | #define INFO(opt, arg, desc) \ |
48 | #define INFO(opt, arg, desc) \ |
48 | {0, -1, NULL, (opt), (arg), (desc)} |
49 | {0, 0, -1, NULL, (opt), (arg), (desc)} |
49 | |
50 | |
50 | /* STRG () - command-line option, with/without resource */ |
51 | /* STRG () - command-line option, with/without resource */ |
51 | #define STRG(rsp, kw, opt, arg, desc) \ |
52 | #define STRG(rsp, kw, opt, arg, desc) \ |
52 | {0, (rsp), (kw), (opt), (arg), (desc)} |
53 | {0, 0, (rsp), (kw), (opt), (arg), (desc)} |
53 | |
54 | |
54 | /* RSTRG () - resource/long-option */ |
55 | /* RSTRG () - resource/long-option */ |
55 | #define RSTRG(rsp, kw, arg) \ |
56 | #define RSTRG(rsp, kw, arg) \ |
56 | {0, (rsp), (kw), NULL, (arg), NULL} |
57 | {0, 0, (rsp), (kw), NULL, (arg), NULL} |
57 | |
58 | |
58 | /* BOOL () - regular boolean `-/+' flag */ |
59 | /* BOOL () - regular boolean `-/+' flag */ |
59 | #define BOOL(rsp, kw, opt, flag, desc) \ |
60 | #define BOOL(rsp, kw, opt, option, flag, desc) \ |
60 | { (Optflag_Boolean | (flag)), (rsp), (kw), (opt), NULL, (desc)} |
61 | { (option), (Optflag_Boolean | (flag)), (rsp), (kw), (opt), NULL, (desc)} |
61 | |
62 | |
62 | /* SWCH () - `-' flag */ |
63 | /* SWCH () - `-' flag */ |
63 | #define SWCH(opt, flag, desc) \ |
64 | #define SWCH(opt, option, flag, desc) \ |
64 | { (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 \ |
74 | (sizeof (optList) / sizeof (optList[0])) |
75 | (sizeof (optList) / sizeof (optList[0])) |
75 | |
76 | |
76 | static const struct |
77 | static const struct |
77 | { |
78 | { |
|
|
79 | const uint8_t index; /* Option index */ |
78 | const unsigned long flag; /* Option flag */ |
80 | const uint8_t flag; /* Option flag */ |
79 | const int doff; /* data offset */ |
81 | const int16_t doff; /* resource value index or -1 */ |
80 | const char *kw; /* keyword */ |
82 | const char *kw; /* keyword */ |
81 | const char *opt; /* option */ |
83 | const char *opt; /* option */ |
82 | const char *arg; /* argument */ |
84 | const char *arg; /* argument */ |
83 | const char *desc; /* description */ |
85 | const char *desc; /* description */ |
84 | } |
86 | } |
… | |
… | |
86 | STRG (Rs_display_name, NULL, "d", NULL, NULL), /* short form */ |
88 | STRG (Rs_display_name, NULL, "d", NULL, NULL), /* short form */ |
87 | STRG (Rs_display_name, NULL, "display", "string", "X server to contact"), |
89 | STRG (Rs_display_name, NULL, "display", "string", "X server to contact"), |
88 | STRG (Rs_term_name, "termName", "tn", "string", "value of the TERM environment variable"), |
90 | STRG (Rs_term_name, "termName", "tn", "string", "value of the TERM environment variable"), |
89 | STRG (Rs_geometry, NULL, "g", NULL, NULL), /* short form */ |
91 | STRG (Rs_geometry, NULL, "g", NULL, NULL), /* short form */ |
90 | STRG (Rs_geometry, "geometry", "geometry", "geometry", "size (in characters) and position"), |
92 | STRG (Rs_geometry, "geometry", "geometry", "geometry", "size (in characters) and position"), |
91 | SWCH ("C", Opt_console, "intercept console messages"), |
93 | SWCH ("C", Opt_console, 0, "intercept console messages"), |
92 | SWCH ("iconic", Opt_iconic, "start iconic"), |
94 | SWCH ("iconic", Opt_iconic, 0, "start iconic"), |
93 | SWCH ("ic", Opt_iconic, NULL), /* short form */ |
95 | SWCH ("ic", Opt_iconic, 0, NULL), /* short form */ |
94 | BOOL (Rs_reverseVideo, "reverseVideo", "rv", Opt_reverseVideo, "reverse video"), |
96 | BOOL (Rs_reverseVideo, "reverseVideo", "rv", Opt_reverseVideo, 0, "reverse video"), |
95 | BOOL (Rs_loginShell, "loginShell", "ls", Opt_loginShell, "login shell"), |
97 | BOOL (Rs_loginShell, "loginShell", "ls", Opt_loginShell, 0, "login shell"), |
96 | BOOL (Rs_jumpScroll, "jumpScroll", "j", Opt_jumpScroll, "jump scrolling"), |
98 | BOOL (Rs_jumpScroll, "jumpScroll", "j", Opt_jumpScroll, 0, "jump scrolling"), |
|
|
99 | BOOL (Rs_skipScroll, "skipScroll", "ss", Opt_skipScroll, 0, "skip scrolling"), |
97 | BOOL (Rs_pastableTabs, "pastableTabs", "ptab", Opt_pastableTabs, "tab characters are pastable"), |
100 | BOOL (Rs_pastableTabs, "pastableTabs", "ptab", Opt_pastableTabs, 0, "tab characters are pastable"), |
98 | #if HAVE_SCROLLBARS |
|
|
99 | RSTRG (Rs_scrollstyle, "scrollstyle", "mode"), |
101 | RSTRG (Rs_scrollstyle, "scrollstyle", "mode"), |
100 | BOOL (Rs_scrollBar, "scrollBar", "sb", Opt_scrollBar, "scrollbar"), |
102 | BOOL (Rs_scrollBar, "scrollBar", "sb", Opt_scrollBar, 0, "scrollbar"), |
101 | BOOL (Rs_scrollBar_right, "scrollBar_right", "sr", Opt_scrollBar_right, "scrollbar right"), |
103 | BOOL (Rs_scrollBar_right, "scrollBar_right", "sr", Opt_scrollBar_right, 0, "scrollbar right"), |
102 | BOOL (Rs_scrollBar_floating, "scrollBar_floating", "st", Opt_scrollBar_floating, "scrollbar without a trough"), |
104 | BOOL (Rs_scrollBar_floating, "scrollBar_floating", "st", Opt_scrollBar_floating, 0, "scrollbar without a trough"), |
103 | RSTRG (Rs_scrollBar_align, "scrollBar_align", "mode"), |
105 | RSTRG (Rs_scrollBar_align, "scrollBar_align", "mode"), |
104 | STRG (Rs_scrollBar_thickness, "thickness", "sbt", "number", "scrollbar thickness/width in pixels"), |
106 | STRG (Rs_scrollBar_thickness, "thickness", "sbt", "number", "scrollbar thickness/width in pixels"), |
105 | #endif |
|
|
106 | BOOL (Rs_scrollTtyOutput, "scrollTtyOutput", NULL, Opt_scrollTtyOutput, NULL), |
107 | BOOL (Rs_scrollTtyOutput, "scrollTtyOutput", NULL, Opt_scrollTtyOutput, 0, NULL), |
107 | BOOL (Rs_scrollTtyOutput, NULL, "si", Optflag_Reverse | Opt_scrollTtyOutput, "scroll-on-tty-output inhibit"), |
108 | BOOL (Rs_scrollTtyOutput, NULL, "si", Opt_scrollTtyOutput, Optflag_Reverse, "scroll-on-tty-output inhibit"), |
108 | BOOL (Rs_scrollTtyKeypress, "scrollTtyKeypress", "sk", Opt_scrollTtyKeypress, "scroll-on-keypress"), |
109 | BOOL (Rs_scrollTtyKeypress, "scrollTtyKeypress", "sk", Opt_scrollTtyKeypress, 0, "scroll-on-keypress"), |
109 | BOOL (Rs_scrollWithBuffer, "scrollWithBuffer", "sw", Opt_scrollWithBuffer, "scroll-with-buffer"), |
110 | BOOL (Rs_scrollWithBuffer, "scrollWithBuffer", "sw", Opt_scrollWithBuffer, 0, "scroll-with-buffer"), |
110 | #if TRANSPARENT |
111 | #if ENABLE_TRANSPARENCY |
111 | BOOL (Rs_transparent, "inheritPixmap", "ip", Opt_transparent, "inherit parent pixmap"), |
112 | BOOL (Rs_transparent, "inheritPixmap", "ip", Opt_transparent, 0, "inherit parent pixmap"), |
112 | SWCH ("tr", Opt_transparent, NULL), |
113 | BOOL (Rs_transparent, "transparent", "tr", Opt_transparent, 0, "inherit parent pixmap"), |
113 | # if TINTING |
|
|
114 | STRG (Rs_color + Color_tint, "tintColor", "tint", "color", "tint color"), |
114 | STRG (Rs_color + Color_tint, "tintColor", "tint", "color", "tint color"), |
|
|
115 | STRG (Rs_shade, "shading", "sh", "number", "shade background by number %."), |
|
|
116 | #endif |
|
|
117 | #if OFF_FOCUS_FADING |
|
|
118 | STRG (Rs_fade, "fading", "fade", "number", "fade colors by number % when losing focus"), |
|
|
119 | STRG (Rs_color + Color_fade, "fadeColor", "fadecolor", "color", "target color for off-focus fading"), |
|
|
120 | #endif |
|
|
121 | BOOL (Rs_utmpInhibit, "utmpInhibit", "ut", Opt_utmpInhibit, 0, "utmp inhibit"), |
|
|
122 | #ifndef NO_BELL |
|
|
123 | # if ENABLE_FRILLS |
|
|
124 | BOOL (Rs_urgentOnBell, "urgentOnBell", NULL, Opt_urgentOnBell, 0, NULL), |
115 | # endif |
125 | # endif |
116 | #endif |
|
|
117 | #if OFF_FOCUS_FADING |
|
|
118 | STRG (Rs_fade, "fading", "fade", "%", "fade colors x% percent when rxvt-unicode is losing focus"), |
|
|
119 | STRG (Rs_color + Color_fade, "fadeColor", "fadecolor", "color", "target color for off-focus fading"), |
|
|
120 | #endif |
|
|
121 | #if TINTING |
|
|
122 | STRG (Rs_shade, "shading", "sh", "%", "shade background by x% when tinting."), |
|
|
123 | #endif |
|
|
124 | BOOL (Rs_utmpInhibit, "utmpInhibit", "ut", Opt_utmpInhibit, "utmp inhibit"), |
|
|
125 | #ifndef NO_BELL |
|
|
126 | BOOL (Rs_visualBell, "visualBell", "vb", Opt_visualBell, "visual bell"), |
126 | BOOL (Rs_visualBell, "visualBell", "vb", Opt_visualBell, 0, "visual bell"), |
127 | # if ! defined(NO_MAPALERT) && defined(MAPALERT_OPTION) |
127 | # if ! defined(NO_MAPALERT) && defined(MAPALERT_OPTION) |
128 | BOOL (Rs_mapAlert, "mapAlert", NULL, Opt_mapAlert, NULL), |
128 | BOOL (Rs_mapAlert, "mapAlert", NULL, Opt_mapAlert, 0, NULL), |
129 | # endif |
129 | # endif |
130 | #endif |
130 | #endif |
131 | #ifdef META8_OPTION |
131 | #ifdef META8_OPTION |
132 | BOOL (Rs_meta8, "meta8", NULL, Opt_meta8, NULL), |
132 | BOOL (Rs_meta8, "meta8", NULL, Opt_meta8, 0, NULL), |
133 | #endif |
133 | #endif |
134 | #ifdef MOUSE_WHEEL |
134 | #ifdef MOUSE_WHEEL |
135 | BOOL (Rs_mouseWheelScrollPage, "mouseWheelScrollPage", NULL, Opt_mouseWheelScrollPage, NULL), |
135 | BOOL (Rs_mouseWheelScrollPage, "mouseWheelScrollPage", NULL, Opt_mouseWheelScrollPage, 0, NULL), |
136 | #endif |
136 | #endif |
137 | #if ENABLE_FRILLS |
137 | #if ENABLE_FRILLS |
138 | BOOL (Rs_tripleclickwords, "tripleclickwords", "tcw", Opt_tripleclickwords, "triple click word selection"), |
138 | BOOL (Rs_tripleclickwords, "tripleclickwords", "tcw", Opt_tripleclickwords, 0, "triple click word selection"), |
139 | BOOL (Rs_insecure, "insecure", "insecure", Opt_insecure, "enable possibly insecure escape sequences"), |
139 | BOOL (Rs_insecure, "insecure", "insecure", Opt_insecure, 0, "enable possibly insecure escape sequences"), |
140 | BOOL (Rs_cursorUnderline, "cursorUnderline", "uc", Opt_cursorUnderline, "underline cursor"), |
140 | BOOL (Rs_cursorUnderline, "cursorUnderline", "uc", Opt_cursorUnderline, 0, "underline cursor"), |
141 | #endif |
141 | #endif |
142 | #if CURSOR_BLINK |
142 | #if CURSOR_BLINK |
143 | BOOL (Rs_cursorBlink, "cursorBlink", "bc", Opt_cursorBlink, "blinking cursor"), |
143 | BOOL (Rs_cursorBlink, "cursorBlink", "bc", Opt_cursorBlink, 0, "blinking cursor"), |
144 | #endif |
144 | #endif |
145 | #ifdef POINTER_BLANK |
145 | #ifdef POINTER_BLANK |
146 | BOOL (Rs_pointerBlank, "pointerBlank", "pb", Opt_pointerBlank, "switch off pointer after delay"), |
146 | BOOL (Rs_pointerBlank, "pointerBlank", "pb", Opt_pointerBlank, 0, "switch off pointer after delay"), |
147 | #endif |
147 | #endif |
148 | STRG (Rs_color + Color_bg, "background", "bg", "color", "background color"), |
148 | STRG (Rs_color + Color_bg, "background", "bg", "color", "background color"), |
149 | STRG (Rs_color + Color_fg, "foreground", "fg", "color", "foreground color"), |
149 | STRG (Rs_color + Color_fg, "foreground", "fg", "color", "foreground color"), |
150 | RSTRG (Rs_color + minCOLOR + 0, "color0", "color"), |
150 | RSTRG (Rs_color + minCOLOR + 0, "color0", "color"), |
151 | RSTRG (Rs_color + minCOLOR + 1, "color1", "color"), |
151 | RSTRG (Rs_color + minCOLOR + 1, "color1", "color"), |
… | |
… | |
166 | #ifndef NO_BOLD_UNDERLINE_REVERSE |
166 | #ifndef NO_BOLD_UNDERLINE_REVERSE |
167 | RSTRG (Rs_color + Color_BD, "colorBD", "color"), |
167 | RSTRG (Rs_color + Color_BD, "colorBD", "color"), |
168 | RSTRG (Rs_color + Color_IT, "colorIT", "color"), |
168 | RSTRG (Rs_color + Color_IT, "colorIT", "color"), |
169 | RSTRG (Rs_color + Color_UL, "colorUL", "color"), |
169 | RSTRG (Rs_color + Color_UL, "colorUL", "color"), |
170 | RSTRG (Rs_color + Color_RV, "colorRV", "color"), |
170 | RSTRG (Rs_color + Color_RV, "colorRV", "color"), |
171 | #endif /* ! NO_BOLD_UNDERLINE_REVERSE */ |
171 | #endif /* ! NO_BOLD_UNDERLINE_REVERSE */ |
172 | #if ENABLE_FRILLS |
172 | #if ENABLE_FRILLS |
173 | RSTRG (Rs_color + Color_underline, "underlineColor", "color"), |
173 | RSTRG (Rs_color + Color_underline, "underlineColor", "color"), |
174 | #endif |
174 | #endif |
175 | #ifdef KEEP_SCROLLCOLOR |
|
|
176 | RSTRG (Rs_color + Color_scroll, "scrollColor", "color"), |
175 | RSTRG (Rs_color + Color_scroll, "scrollColor", "color"), |
|
|
176 | #ifdef RXVT_SCROLLBAR |
177 | RSTRG (Rs_color + Color_trough, "troughColor", "color"), |
177 | RSTRG (Rs_color + Color_trough, "troughColor", "color"), |
178 | #endif /* KEEP_SCROLLCOLOR */ |
178 | #endif |
179 | #ifdef OPTION_HC |
179 | #ifdef OPTION_HC |
180 | STRG (Rs_color + Color_HC, "highlightColor", "hc", "color", "highlight color"), |
180 | STRG (Rs_color + Color_HC, "highlightColor", "hc", "color", "highlight color"), |
181 | #endif |
181 | #endif |
182 | #ifndef NO_CURSORCOLOR |
182 | #ifndef NO_CURSORCOLOR |
183 | STRG (Rs_color + Color_cursor, "cursorColor", "cr", "color", "cursor color"), |
183 | STRG (Rs_color + Color_cursor, "cursorColor", "cr", "color", "cursor color"), |
184 | /* command-line option = resource name */ |
184 | /* command-line option = resource name */ |
185 | RSTRG (Rs_color + Color_cursor2, "cursorColor2", "color"), |
185 | RSTRG (Rs_color + Color_cursor2, "cursorColor2", "color"), |
186 | #endif /* NO_CURSORCOLOR */ |
186 | #endif /* NO_CURSORCOLOR */ |
187 | STRG (Rs_color + Color_pointer_fg, "pointerColor", "pr", "color", "pointer color"), |
187 | STRG (Rs_color + Color_pointer_fg, "pointerColor", "pr", "color", "pointer color"), |
188 | STRG (Rs_color + Color_pointer_bg, "pointerColor2", "pr2", "color", "pointer bg color"), |
188 | STRG (Rs_color + Color_pointer_bg, "pointerColor2", "pr2", "color", "pointer bg color"), |
189 | STRG (Rs_color + Color_border, "borderColor", "bd", "color", "border color"), |
189 | STRG (Rs_color + Color_border, "borderColor", "bd", "color", "border color"), |
190 | #ifdef XPM_BACKGROUND |
190 | #ifdef BG_IMAGE_FROM_FILE |
191 | RSTRG (Rs_path, "path", "search path"), |
191 | RSTRG (Rs_path, "path", "search path"), |
192 | STRG (Rs_backgroundPixmap, "backgroundPixmap", "pixmap", "file[;geom]", "background pixmap"), |
192 | STRG (Rs_backgroundPixmap, "backgroundPixmap", "pixmap", "file[;geom]", "background pixmap"), |
193 | #endif |
193 | #endif |
194 | /* fonts: command-line option = resource name */ |
194 | /* fonts: command-line option = resource name */ |
195 | STRG (Rs_font, "font", "fn", "fontname", "normal text font"), |
195 | STRG (Rs_font, "font", "fn", "fontname", "normal text font"), |
196 | #if ENABLE_STYLES |
196 | #if ENABLE_STYLES |
197 | STRG (Rs_boldFont, "boldFont", "fb", "fontname", "bold font"), |
197 | STRG (Rs_boldFont, "boldFont", "fb", "fontname", "bold font"), |
198 | STRG (Rs_italicFont, "italicFont", "fi", "fontname", "italic font"), |
198 | STRG (Rs_italicFont, "italicFont", "fi", "fontname", "italic font"), |
199 | STRG (Rs_boldItalicFont, "boldItalicFont", "fbi", "fontname", "bold italic font"), |
199 | STRG (Rs_boldItalicFont, "boldItalicFont", "fbi", "fontname", "bold italic font"), |
200 | BOOL (Rs_intensityStyles, "intensityStyles", "is", Opt_intensityStyles, "font styles imply intensity changes"), |
200 | BOOL (Rs_intensityStyles, "intensityStyles", "is", Opt_intensityStyles, 0, "font styles imply intensity changes"), |
201 | #endif |
201 | #endif |
202 | #ifdef USE_XIM |
202 | #ifdef USE_XIM |
203 | STRG (Rs_inputMethod, "inputMethod", "im", "name", "name of input method"), |
203 | STRG (Rs_inputMethod, "inputMethod", "im", "name", "name of input method"), |
204 | STRG (Rs_preeditType, "preeditType", "pt", "style", "input style: style = OverTheSpot|OffTheSpot|Root"), |
204 | STRG (Rs_preeditType, "preeditType", "pt", "style", "input style: style = OverTheSpot|OffTheSpot|Root"), |
205 | STRG (Rs_imLocale, "imLocale", "imlocale", "string", "locale to use for input method"), |
205 | STRG (Rs_imLocale, "imLocale", "imlocale", "string", "locale to use for input method"), |
206 | STRG (Rs_imFont, "imFont", "imfont", "fontname", "fontset for styles OverTheSpot and OffTheSpot"), |
206 | STRG (Rs_imFont, "imFont", "imfont", "fontname", "fontset for styles OverTheSpot and OffTheSpot"), |
207 | #endif /* USE_XIM */ |
207 | #endif /* USE_XIM */ |
208 | STRG (Rs_name, NULL, "name", "string", "client instance, icon, and title strings"), |
208 | STRG (Rs_name, NULL, "name", "string", "client instance, icon, and title strings"), |
209 | STRG (Rs_title, "title", "title", "string", "title name for window"), |
209 | STRG (Rs_title, "title", "title", "string", "title name for window"), |
210 | STRG (Rs_title, NULL, "T", NULL, NULL), /* short form */ |
210 | STRG (Rs_title, NULL, "T", NULL, NULL), /* short form */ |
211 | STRG (Rs_iconName, "iconName", "n", "string", "icon name for window"), |
211 | STRG (Rs_iconName, "iconName", "n", "string", "icon name for window"), |
212 | STRG (Rs_saveLines, "saveLines", "sl", "number", "number of scrolled lines to save"), |
212 | STRG (Rs_saveLines, "saveLines", "sl", "number", "number of scrolled lines to save"), |
213 | #if ENABLE_XEMBED |
213 | #if ENABLE_XEMBED |
214 | STRG (Rs_embed, NULL, "embed", "windowid", "window id to embed terminal in"), |
214 | STRG (Rs_embed, NULL, "embed", "windowid", "window id to embed terminal in"), |
215 | #endif |
215 | #endif |
216 | #if XFT |
216 | #if XFT |
217 | STRG (Rs_depth, "depth", "depth", "number", "depth of visual to request"), |
217 | STRG (Rs_depth, "depth", "depth", "number", "depth of visual to request"), |
|
|
218 | BOOL (Rs_buffered, "buffered", NULL, Opt_buffered, 0, NULL), |
218 | #endif |
219 | #endif |
219 | #if ENABLE_FRILLS |
220 | #if ENABLE_FRILLS |
220 | RSTRG (Rs_transient_for, "transient-for", "windowid"), |
221 | RSTRG (Rs_transient_for, "transient-for", "windowid"), |
221 | BOOL (Rs_override_redirect, "override-redirect", "override-redirect", Opt_override_redirect, "set override-redirect on the terminal window"), |
222 | BOOL (Rs_override_redirect, "override-redirect", "override-redirect", Opt_override_redirect, 0, "set override-redirect on the terminal window"), |
222 | STRG (Rs_pty_fd, NULL, "pty-fd", "fileno", "file descriptor of pty to use"), |
223 | STRG (Rs_pty_fd, NULL, "pty-fd", "fileno", "file descriptor of pty to use"), |
223 | BOOL (Rs_hold, "hold", "hold", Opt_hold, "retain window after shell exit"), |
224 | BOOL (Rs_hold, "hold", "hold", Opt_hold, 0, "retain window after shell exit"), |
224 | STRG (Rs_ext_bwidth, "externalBorder", "w", "number", "external border in pixels"), |
225 | STRG (Rs_ext_bwidth, "externalBorder", "w", "number", "external border in pixels"), |
225 | STRG (Rs_ext_bwidth, NULL, "bw", NULL, NULL), |
226 | STRG (Rs_ext_bwidth, NULL, "bw", NULL, NULL), |
226 | STRG (Rs_ext_bwidth, NULL, "borderwidth", NULL, NULL), |
227 | STRG (Rs_ext_bwidth, NULL, "borderwidth", NULL, NULL), |
227 | STRG (Rs_int_bwidth, "internalBorder", "b", "number", "internal border in pixels"), |
228 | STRG (Rs_int_bwidth, "internalBorder", "b", "number", "internal border in pixels"), |
228 | BOOL (Rs_borderLess, "borderLess", "bl", Opt_borderLess, "borderless window"), |
229 | BOOL (Rs_borderLess, "borderLess", "bl", Opt_borderLess, 0, "borderless window"), |
229 | BOOL (Rs_skipBuiltinGlyphs, "skipBuiltinGlyphs", "sbg", Opt_skipBuiltinGlyphs, "do not use internal glyphs"), |
|
|
230 | STRG (Rs_lineSpace, "lineSpace", "lsp", "number", "number of extra pixels between rows"), |
230 | STRG (Rs_lineSpace, "lineSpace", "lsp", "number", "number of extra pixels between rows"), |
|
|
231 | #endif |
|
|
232 | #ifdef BUILTIN_GLYPHS |
|
|
233 | BOOL (Rs_skipBuiltinGlyphs, "skipBuiltinGlyphs", "sbg", Opt_skipBuiltinGlyphs, 0, "do not use internal glyphs"), |
231 | #endif |
234 | #endif |
232 | #ifdef POINTER_BLANK |
235 | #ifdef POINTER_BLANK |
233 | RSTRG (Rs_pointerBlankDelay, "pointerBlankDelay", "number"), |
236 | RSTRG (Rs_pointerBlankDelay, "pointerBlankDelay", "number"), |
234 | #endif |
237 | #endif |
235 | #ifndef NO_BACKSPACE_KEY |
238 | #ifndef NO_BACKSPACE_KEY |
236 | RSTRG (Rs_backspace_key, "backspacekey", "string"), |
239 | RSTRG (Rs_backspace_key, "backspacekey", "string"), |
237 | #endif |
240 | #endif |
238 | #ifndef NO_DELETE_KEY |
241 | #ifndef NO_DELETE_KEY |
239 | RSTRG (Rs_delete_key, "deletekey", "string"), |
242 | RSTRG (Rs_delete_key, "deletekey", "string"), |
240 | #endif |
243 | #endif |
241 | RSTRG (Rs_selectstyle, "selectstyle", "mode"), |
|
|
242 | #ifdef PRINTPIPE |
244 | #ifdef PRINTPIPE |
243 | RSTRG (Rs_print_pipe, "print-pipe", "string"), |
245 | RSTRG (Rs_print_pipe, "print-pipe", "string"), |
244 | #endif |
246 | #endif |
245 | STRG (Rs_modifier, "modifier", "mod", "modifier", "meta modifier = alt|meta|hyper|super|mod1|...|mod5"), |
247 | STRG (Rs_modifier, "modifier", "mod", "modifier", "meta modifier = alt|meta|hyper|super|mod1|...|mod5"), |
246 | #ifdef CUTCHAR_RESOURCE |
248 | #ifdef CUTCHAR_RESOURCE |
247 | RSTRG (Rs_cutchars, "cutchars", "string"), |
249 | RSTRG (Rs_cutchars, "cutchars", "string"), |
248 | #endif /* CUTCHAR_RESOURCE */ |
250 | #endif /* CUTCHAR_RESOURCE */ |
249 | RSTRG (Rs_answerbackstring, "answerbackString", "string"), |
251 | RSTRG (Rs_answerbackstring, "answerbackString", "string"), |
250 | #ifndef NO_SECONDARY_SCREEN |
252 | #ifndef NO_SECONDARY_SCREEN |
251 | BOOL (Rs_secondaryScreen, "secondaryScreen", "ssc", Opt_secondaryScreen, "enable secondary screen"), |
253 | BOOL (Rs_secondaryScreen, "secondaryScreen", "ssc", Opt_secondaryScreen, 0, "enable secondary screen"), |
252 | BOOL (Rs_secondaryScroll, "secondaryScroll", "ssr", Opt_secondaryScroll, "enable secondary screen scroll"), |
254 | BOOL (Rs_secondaryScroll, "secondaryScroll", "ssr", Opt_secondaryScroll, 0, "enable secondary screen scroll"), |
253 | #endif |
255 | #endif |
254 | #if ENABLE_PERL |
256 | #if ENABLE_PERL |
255 | RSTRG (Rs_perl_lib, "perl-lib", "string"), //, "colon-separated directories with extension scripts"),TODO |
257 | RSTRG (Rs_perl_lib, "perl-lib", "string"), //, "colon-separated directories with extension scripts"),TODO |
256 | RSTRG (Rs_perl_eval, "perl-eval", "perl-eval"), // "string", "code to be evaluated after all extensions have been loaded"),TODO |
258 | RSTRG (Rs_perl_eval, "perl-eval", "perl-eval"), // "string", "code to be evaluated after all extensions have been loaded"),TODO |
257 | RSTRG (Rs_perl_ext_1, "perl-ext-common", "string"), //, "colon-separated list of perl extensions to enable"),TODO |
259 | RSTRG (Rs_perl_ext_1, "perl-ext-common", "string"), //, "colon-separated list of perl extensions to enable"),TODO |
258 | STRG (Rs_perl_ext_2, "perl-ext", "pe", "string", "colon-separated list of perl extensions to enable for this instance"), |
260 | STRG (Rs_perl_ext_2, "perl-ext", "pe", "string", "colon-separated list of perl extensions to enable for this instance"), |
259 | #endif |
261 | #endif |
260 | #ifndef NO_RESOURCES |
262 | #if ISO_14755 |
261 | INFO ("xrm", "string", "X resource"), |
263 | BOOL (Rs_iso14755_52, "iso14755_52", NULL, Opt_iso14755_52, 0, NULL), |
|
|
264 | #endif |
|
|
265 | #ifdef HAVE_AFTERIMAGE |
|
|
266 | STRG (Rs_blendtype, "blendType", "blt", "string", "background image blending type - alpha, tint, etc..."), |
|
|
267 | STRG (Rs_blurradius, "blurRadius", "blr", "HxV", "Gaussian Blur radii to apply to the root background"), |
262 | #endif |
268 | #endif |
263 | INFO ("e", "command arg ...", "command to execute") |
269 | INFO ("e", "command arg ...", "command to execute") |
264 | }; |
270 | }; |
265 | |
271 | |
266 | #undef INFO |
272 | #undef INFO |
… | |
… | |
310 | #endif |
316 | #endif |
311 | "," |
317 | "," |
312 | #if OFF_FOCUS_FADING |
318 | #if OFF_FOCUS_FADING |
313 | "fade," |
319 | "fade," |
314 | #endif |
320 | #endif |
315 | #if defined(XPM_BACKGROUND) |
|
|
316 | "XPM," |
|
|
317 | #endif |
|
|
318 | #if defined(TRANSPARENT) |
321 | #if defined(ENABLE_TRANSPARENCY) |
319 | "transparent," |
322 | "transparent," |
320 | #endif |
|
|
321 | #if TINTING |
|
|
322 | "tint," |
323 | "tint," |
|
|
324 | #endif |
|
|
325 | #if HAVE_AFTERIMAGE |
|
|
326 | "afterimage," |
323 | #endif |
327 | #endif |
324 | #if defined(USE_XIM) |
328 | #if defined(USE_XIM) |
325 | "XIM," |
329 | "XIM," |
326 | #endif |
330 | #endif |
327 | #if defined(NO_BACKSPACE_KEY) |
331 | #if defined(NO_BACKSPACE_KEY) |
… | |
… | |
355 | "pointerBlank," |
359 | "pointerBlank," |
356 | #endif |
360 | #endif |
357 | #if defined(NO_RESOURCES) |
361 | #if defined(NO_RESOURCES) |
358 | "NoResources," |
362 | "NoResources," |
359 | #endif |
363 | #endif |
360 | "scrollbars=" |
364 | "scrollbars=plain" |
361 | #if !defined(HAVE_SCROLLBARS) |
|
|
362 | "NONE" |
|
|
363 | #else |
|
|
364 | # if defined(PLAIN_SCROLLBAR) |
|
|
365 | "plain" |
|
|
366 | # if defined(RXVT_SCROLLBAR) || defined(NEXT_SCROLLBAR) || defined(XTERM_SCROLLBAR) |
|
|
367 | "+" |
|
|
368 | # endif |
|
|
369 | # endif |
|
|
370 | # if defined(RXVT_SCROLLBAR) |
365 | #if defined(RXVT_SCROLLBAR) |
371 | "rxvt" |
366 | "+rxvt" |
372 | # if defined(NEXT_SCROLLBAR) || defined(XTERM_SCROLLBAR) |
|
|
373 | "+" |
|
|
374 | # endif |
|
|
375 | # endif |
367 | #endif |
376 | # if defined(NEXT_SCROLLBAR) |
368 | #if defined(NEXT_SCROLLBAR) |
377 | "NeXT" |
369 | "+NeXT" |
378 | # if defined(XTERM_SCROLLBAR) |
|
|
379 | "+" |
|
|
380 | # endif |
|
|
381 | # endif |
370 | #endif |
382 | # if defined(XTERM_SCROLLBAR) |
371 | #if defined(XTERM_SCROLLBAR) |
383 | "xterm" |
372 | "+xterm" |
384 | # endif |
|
|
385 | #endif |
373 | #endif |
386 | "\nUsage: "; /* Usage */ |
374 | "\nUsage: "; /* Usage */ |
387 | |
375 | |
388 | #define INDENT 18 |
376 | #define INDENT 18 |
389 | |
377 | |
… | |
… | |
408 | for (col = 1, i = 0; i < optList_size; i++) |
396 | for (col = 1, i = 0; i < optList_size; i++) |
409 | if (optList[i].desc != NULL) |
397 | if (optList[i].desc != NULL) |
410 | { |
398 | { |
411 | int len = 0; |
399 | int len = 0; |
412 | |
400 | |
413 | if (!optList_isBool (i)) |
401 | if (optList[i].arg) |
414 | { |
402 | len = strlen (optList[i].arg) + 1; |
415 | len = optList_strlen (i); |
|
|
416 | if (len > 0) |
|
|
417 | len++; /* account for space */ |
|
|
418 | } |
|
|
419 | #ifdef DEBUG_STRICT |
403 | #ifdef DEBUG_STRICT |
420 | assert (optList[i].opt != NULL); |
404 | assert (optList[i].opt != NULL); |
421 | #endif |
405 | #endif |
422 | len += 4 + strlen (optList[i].opt) + (optList_isBool (i) ? 2: 0); |
406 | len += 4 + strlen (optList[i].opt) + (optList_isBool (i) ? 2: 0); |
423 | col += len; |
407 | col += len; |
424 | if (col > 79) |
408 | if (col > 79) |
|
|
409 | { |
425 | { /* assume regular width */ |
410 | /* assume regular width */ |
426 | rxvt_log ("\n"); |
411 | rxvt_log ("\n"); |
427 | col = 1 + len; |
412 | col = 1 + len; |
428 | } |
413 | } |
429 | |
414 | |
430 | rxvt_log (" [-%s%s", (optList_isBool (i) ? "/+" : ""), optList[i].opt); |
415 | rxvt_log (" [-%s%s", (optList_isBool (i) ? "/+" : ""), optList[i].opt); |
431 | if (optList_strlen (i)) |
416 | if (optList[i].arg) |
432 | rxvt_log (" %s]", optList[i].arg); |
417 | rxvt_log (" %s]", optList[i].arg); |
433 | else |
418 | else |
434 | rxvt_log ("]"); |
419 | rxvt_log ("]"); |
435 | } |
420 | } |
436 | break; |
421 | break; |
… | |
… | |
488 | int i, bad_option = 0; |
473 | int i, bad_option = 0; |
489 | |
474 | |
490 | for (i = 1; i < argc; i++) |
475 | for (i = 1; i < argc; i++) |
491 | { |
476 | { |
492 | unsigned int entry, longopt = 0; |
477 | unsigned int entry, longopt = 0; |
493 | const char *flag, *opt; |
478 | const char *opt; |
|
|
479 | int flag; |
494 | |
480 | |
495 | opt = argv[i]; |
481 | opt = argv[i]; |
496 | |
482 | |
497 | if (*opt == '-') |
483 | if (*opt == '-') |
498 | { |
484 | { |
499 | flag = resval_on; |
485 | flag = 1; |
500 | |
486 | |
501 | if (*++opt == '-') |
487 | if (*++opt == '-') |
502 | longopt = *opt++; /* long option */ |
488 | longopt = *opt++; /* long option */ |
503 | } |
489 | } |
504 | else if (*opt == '+') |
490 | else if (*opt == '+') |
505 | { |
491 | { |
506 | flag = resval_off; |
492 | flag = 0; |
507 | |
493 | |
508 | if (*++opt == '+') |
494 | if (*++opt == '+') |
509 | longopt = *opt++; /* long option */ |
495 | longopt = *opt++; /* long option */ |
510 | } |
496 | } |
511 | else |
497 | else |
… | |
… | |
529 | break; |
515 | break; |
530 | |
516 | |
531 | if (entry < optList_size) |
517 | if (entry < optList_size) |
532 | { |
518 | { |
533 | if (optList_isReverse (entry)) |
519 | if (optList_isReverse (entry)) |
534 | flag = flag == resval_on ? resval_off : resval_on; |
520 | flag = !flag; |
535 | |
521 | |
536 | if (optList_strlen (entry)) |
522 | if (optList_isString (entry)) |
537 | { |
523 | { |
538 | /* |
524 | /* |
539 | * special cases are handled in main.c:main () to allow |
525 | * special cases are handled in main.c:main () to allow |
540 | * X resources to set these values before we settle for |
526 | * X resources to set these values before we settle for |
541 | * default values |
527 | * default values |
542 | */ |
528 | */ |
543 | |
529 | |
544 | if (optList[entry].doff != -1) |
530 | if (optList[entry].doff != -1) |
545 | { |
531 | { |
546 | if (flag == resval_on && !argv [i+1]) |
532 | if (flag && i+1 == argc) |
547 | rxvt_fatal ("option '%s' needs an argument, aborting.\n", argv [i]); |
533 | rxvt_fatal ("option '%s' requires an argument, aborting.\n", argv [i]); |
548 | |
534 | |
549 | rs[optList[entry].doff] = flag == resval_on ? argv[++i] : resval_undef; |
535 | rs[optList[entry].doff] = flag ? argv[++i] : resval_undef; |
550 | } |
536 | } |
551 | } |
537 | } |
552 | else |
538 | else |
|
|
539 | { |
553 | { /* boolean value */ |
540 | /* boolean value */ |
554 | set_option (optList[entry].flag & Optflag_mask, flag == resval_on); |
541 | set_option (optList[entry].index, flag); |
555 | |
542 | |
556 | if (optList[entry].doff != -1) |
543 | if (optList[entry].doff != -1) |
557 | rs[optList[entry].doff] = flag; |
544 | rs[optList[entry].doff] = flag ? resval_on : resval_off; |
558 | } |
545 | } |
559 | } |
546 | } |
|
|
547 | #ifndef NO_RESOURCES |
|
|
548 | else if (!strcmp (opt, "xrm")) |
|
|
549 | { |
|
|
550 | if (i+1 < argc) |
|
|
551 | XrmPutLineResource (&option_db, argv[++i]); |
|
|
552 | } |
|
|
553 | #endif |
|
|
554 | #ifdef KEYSYM_RESOURCE |
|
|
555 | else if (!strncmp (opt, "keysym.", sizeof ("keysym.") - 1)) |
|
|
556 | { |
|
|
557 | if (i+1 < argc) |
|
|
558 | { |
|
|
559 | char *res = (char *)malloc (strlen (opt) + strlen (argv[++i]) + 6); |
|
|
560 | sprintf (res, "*.%s: %s\n", opt, argv[i]); |
|
|
561 | XrmPutLineResource (&option_db, res); |
|
|
562 | free (res); |
|
|
563 | } |
|
|
564 | } |
|
|
565 | #endif |
560 | else |
566 | else |
561 | #ifdef KEYSYM_RESOURCE |
|
|
562 | /* if (!strncmp (opt, "keysym.", sizeof ("keysym.") - 1)) */ |
|
|
563 | if (rxvt_Str_match (opt, "keysym.")) |
|
|
564 | { |
567 | { |
565 | const char *str = argv[++i]; |
|
|
566 | |
|
|
567 | if (str != NULL) |
|
|
568 | parse_keysym (opt + sizeof ("keysym.") - 1, str); |
|
|
569 | } |
|
|
570 | else |
|
|
571 | #endif |
|
|
572 | { |
|
|
573 | bad_option = 1; |
568 | bad_option = 1; |
574 | rxvt_warn ("\"%s\": unknown or malformed option.\n", opt); |
569 | rxvt_warn ("\"%s\": unknown or malformed option.\n", opt); |
575 | } |
570 | } |
576 | } |
571 | } |
577 | |
572 | |
578 | if (bad_option) |
573 | if (bad_option) |
579 | rxvt_usage (0); |
574 | rxvt_usage (0); |
580 | } |
575 | } |
… | |
… | |
611 | } |
606 | } |
612 | |
607 | |
613 | /* |
608 | /* |
614 | * look for something like this (XK_Delete) |
609 | * look for something like this (XK_Delete) |
615 | * rxvt*keysym.0xFFFF: "\177" |
610 | * rxvt*keysym.0xFFFF: "\177" |
616 | * |
|
|
617 | * arg will be |
|
|
618 | * NULL for ~/.Xdefaults and |
|
|
619 | * non-NULL for command-line options (need to allocate) |
|
|
620 | */ |
611 | */ |
621 | #define NEWARGLIM 500 /* `reasonable' size */ |
|
|
622 | |
612 | |
623 | struct keysym_vocabulary_t |
613 | struct keysym_vocabulary_t |
624 | { |
614 | { |
625 | const char *name; |
615 | const char *name; |
626 | unsigned short len; |
616 | unsigned short len; |
627 | unsigned short value; |
617 | unsigned short value; |
628 | }; |
618 | }; |
629 | keysym_vocabulary_t keysym_vocabulary[] = |
619 | static const keysym_vocabulary_t keysym_vocabulary[] = |
630 | { |
620 | { |
631 | { "ISOLevel3", 9, Level3Mask }, |
621 | { "ISOLevel3", 9, Level3Mask }, |
632 | { "AppKeypad", 9, AppKeypadMask }, |
622 | { "AppKeypad", 9, AppKeypadMask }, |
633 | { "Control", 7, ControlMask }, |
623 | { "Control", 7, ControlMask }, |
634 | { "NumLock", 7, NumLockMask }, |
624 | { "NumLock", 7, NumLockMask }, |
… | |
… | |
656 | }; |
646 | }; |
657 | |
647 | |
658 | int |
648 | int |
659 | rxvt_term::parse_keysym (const char *str, const char *arg) |
649 | rxvt_term::parse_keysym (const char *str, const char *arg) |
660 | { |
650 | { |
661 | int n, sym; |
651 | int sym; |
662 | unsigned int state = 0; |
652 | unsigned int state = 0; |
663 | const char *pmodend = NULL; |
653 | const char *key = strrchr (str, '-'); |
664 | char *newarg = NULL; |
|
|
665 | char newargstr[NEWARGLIM]; |
|
|
666 | |
654 | |
667 | if (arg == NULL) |
655 | if (!key) |
668 | { |
656 | key = str; |
669 | if ((n = rxvt_Str_match (str, "keysym.")) == 0) |
|
|
670 | return 0; |
|
|
671 | |
|
|
672 | str += n; /* skip `keysym.' */ |
|
|
673 | if (!(pmodend = strchr (str, ':'))) |
|
|
674 | return -1; |
|
|
675 | } |
|
|
676 | else |
657 | else |
677 | pmodend = str + strlen(str); |
658 | key++; |
678 | |
659 | |
679 | for (--pmodend; str < pmodend; --pmodend) |
660 | // string or key is empty |
680 | if (*pmodend == '-') |
661 | if (*arg == '\0' || *key == '\0') |
681 | break; |
662 | return -1; |
682 | |
663 | |
|
|
664 | // parse modifiers |
683 | while (str < pmodend) |
665 | while (str < key) |
684 | { |
666 | { |
685 | unsigned int i; |
667 | unsigned int i; |
686 | |
668 | |
687 | for (i=0; i < sizeof (keysym_vocabulary) / sizeof (keysym_vocabulary_t); ++i) |
669 | for (i=0; i < sizeof (keysym_vocabulary) / sizeof (keysym_vocabulary_t); ++i) |
688 | { |
670 | { |
… | |
… | |
699 | |
681 | |
700 | if (*str == '-') |
682 | if (*str == '-') |
701 | ++str; |
683 | ++str; |
702 | } |
684 | } |
703 | |
685 | |
704 | /* some scanf () have trouble with a 0x prefix */ |
686 | // convert keysym name to keysym number |
705 | if (str[0] == '0' && toupper (str[1]) == 'X') |
687 | if ((sym = XStringToKeysym (str)) == None) |
706 | { |
688 | { |
707 | str += 2; |
689 | // fallback on hexadecimal parsing |
708 | |
690 | char *end; |
|
|
691 | sym = strtol (str, &end, 16); |
709 | if (arg) |
692 | if (*end) |
710 | { |
|
|
711 | if (sscanf (str, (strchr (str, ':') ? "%x:" : "%x"), &sym) != 1) |
|
|
712 | return -1; |
|
|
713 | } |
|
|
714 | else |
|
|
715 | { |
|
|
716 | if (sscanf (str, "%x:", &sym) != 1) |
|
|
717 | return -1; |
|
|
718 | |
|
|
719 | /* cue to ':', it's there since sscanf () worked */ |
|
|
720 | strncpy (newargstr, strchr (str, ':') + 1, NEWARGLIM - 1); |
|
|
721 | newargstr[NEWARGLIM - 1] = '\0'; |
|
|
722 | newarg = newargstr; |
|
|
723 | } |
|
|
724 | } |
|
|
725 | else |
|
|
726 | { |
|
|
727 | /* |
|
|
728 | * convert keysym name to keysym number |
|
|
729 | */ |
|
|
730 | strncpy (newargstr, str, NEWARGLIM - 1); |
|
|
731 | newargstr[NEWARGLIM - 1] = '\0'; |
|
|
732 | |
|
|
733 | if (arg == NULL) |
|
|
734 | { |
|
|
735 | if ((newarg = strchr (newargstr, ':')) == NULL) |
|
|
736 | return -1; |
|
|
737 | |
|
|
738 | *newarg++ = '\0'; /* terminate keysym name */ |
|
|
739 | } |
|
|
740 | |
|
|
741 | if ((sym = XStringToKeysym (newargstr)) == None) |
|
|
742 | return -1; |
693 | return -1; |
743 | } |
694 | } |
744 | |
695 | |
745 | if (newarg == NULL) |
|
|
746 | { |
|
|
747 | strncpy (newargstr, arg, NEWARGLIM - 1); |
|
|
748 | newargstr[NEWARGLIM - 1] = '\0'; |
|
|
749 | newarg = newargstr; |
|
|
750 | } |
|
|
751 | |
|
|
752 | rxvt_Str_trim (newarg); |
|
|
753 | if (*newarg == '\0' || (n = rxvt_Str_escaped (newarg)) == 0) |
|
|
754 | return -1; |
|
|
755 | |
|
|
756 | keyboard->register_user_translation (sym, state, newarg); |
696 | keyboard->register_user_translation (sym, state, arg); |
757 | return 1; |
697 | return 1; |
758 | } |
698 | } |
759 | |
699 | |
760 | # endif /* KEYSYM_RESOURCE */ |
700 | # endif /* KEYSYM_RESOURCE */ |
761 | #endif /* NO_RESOURCES */ |
701 | #endif /* NO_RESOURCES */ |
762 | |
702 | |
763 | static char * |
703 | static char * |
764 | get_res (XrmDatabase database, const char *program, const char *option) |
704 | get_res (XrmDatabase database, const char *program, const char *option) |
765 | { |
705 | { |
766 | char resource[512]; |
706 | char resource[512]; |
… | |
… | |
798 | |
738 | |
799 | void |
739 | void |
800 | rxvt_term::extract_resources () |
740 | rxvt_term::extract_resources () |
801 | { |
741 | { |
802 | #ifndef NO_RESOURCES |
742 | #ifndef NO_RESOURCES |
|
|
743 | XrmDatabase database = XrmGetDatabase (dpy); |
|
|
744 | XrmMergeDatabases (option_db, &database); |
|
|
745 | option_db = NULL; |
803 | /* |
746 | /* |
804 | * Query resources for options that affect us |
747 | * Query resources for options that affect us |
805 | */ |
748 | */ |
806 | for (int entry = 0; entry < optList_size; entry++) |
749 | for (int entry = 0; entry < optList_size; entry++) |
807 | { |
750 | { |
… | |
… | |
827 | || strcasecmp (p, "1") == 0; |
770 | || strcasecmp (p, "1") == 0; |
828 | |
771 | |
829 | if (optList_isReverse (entry)) |
772 | if (optList_isReverse (entry)) |
830 | s = !s; |
773 | s = !s; |
831 | |
774 | |
832 | set_option (optList[entry].flag & Optflag_mask, s); |
775 | set_option (optList[entry].index, s); |
833 | } |
776 | } |
834 | } |
777 | } |
835 | } |
778 | } |
836 | |
779 | |
837 | /* |
780 | /* |
838 | * [R5 or later]: enumerate the resource database |
781 | * [R5 or later]: enumerate the resource database |
839 | */ |
782 | */ |
840 | # ifdef KEYSYM_RESOURCE |
783 | # ifdef KEYSYM_RESOURCE |
841 | XrmDatabase database = XrmGetDatabase (dpy); |
|
|
842 | XrmName name_prefix[3]; |
784 | XrmName name_prefix[3]; |
843 | XrmClass class_prefix[3]; |
785 | XrmClass class_prefix[3]; |
844 | |
786 | |
845 | name_prefix[0] = XrmStringToName (rs[Rs_name]); |
787 | name_prefix[0] = XrmStringToName (rs[Rs_name]); |
846 | name_prefix[1] = XrmStringToName ("keysym"); |
788 | name_prefix[1] = XrmStringToName ("keysym"); |
… | |
… | |
860 | XrmEnumerateDatabase (database, name_prefix, class_prefix, |
802 | XrmEnumerateDatabase (database, name_prefix, class_prefix, |
861 | XrmEnumOneLevel, rxvt_define_key, NULL); |
803 | XrmEnumOneLevel, rxvt_define_key, NULL); |
862 | # endif |
804 | # endif |
863 | # endif |
805 | # endif |
864 | |
806 | |
865 | #endif /* NO_RESOURCES */ |
807 | #endif /* NO_RESOURCES */ |
866 | } |
808 | } |
867 | |
809 | |
868 | /*----------------------- end-of-file (C source) -----------------------*/ |
810 | /*----------------------- end-of-file (C source) -----------------------*/ |