… | |
… | |
4 | * |
4 | * |
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 <schmorp@schmorp.de> |
|
|
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. |
… | |
… | |
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 1 |
36 | #define Optflag_Reverse 1 |
36 | #define Optflag_Boolean 2 |
37 | #define Optflag_Boolean 2 |
|
|
38 | #define Optflag_Switch 4 |
37 | |
39 | |
38 | /* monolithic option/resource structure: */ |
40 | /* monolithic option/resource structure: */ |
39 | /* |
41 | /* |
40 | * `string' options MUST have a usage argument |
42 | * `string' options MUST have a usage argument |
41 | * `switch' and `boolean' options have no argument |
43 | * `switch' and `boolean' options have no argument |
… | |
… | |
58 | #define BOOL(rsp, kw, opt, option, flag, desc) \ |
60 | #define BOOL(rsp, kw, opt, option, flag, desc) \ |
59 | { (option), (Optflag_Boolean | (flag)), (rsp), (kw), (opt), NULL, (desc)} |
61 | { (option), (Optflag_Boolean | (flag)), (rsp), (kw), (opt), NULL, (desc)} |
60 | |
62 | |
61 | /* SWCH () - `-' flag */ |
63 | /* SWCH () - `-' flag */ |
62 | #define SWCH(opt, option, flag, desc) \ |
64 | #define SWCH(opt, option, flag, desc) \ |
63 | { (option), (Optflag_Boolean | (flag)), -1, NULL, (opt), NULL, (desc)} |
65 | { (option), (Optflag_Switch | (flag)), -1, NULL, (opt), NULL, (desc)} |
64 | |
66 | |
65 | /* convenient macros */ |
67 | /* convenient macros */ |
66 | #define optList_strlen(i) \ |
68 | #define optList_isString(i) \ |
67 | (optList[i].flag ? 0 : (optList[i].arg ? strlen (optList[i].arg) : 1)) |
69 | (optList[i].flag == 0) |
68 | #define optList_isBool(i) \ |
70 | #define optList_isBool(i) \ |
69 | (optList[i].flag & Optflag_Boolean) |
71 | (optList[i].flag & Optflag_Boolean) |
70 | #define optList_isReverse(i) \ |
72 | #define optList_isReverse(i) \ |
71 | (optList[i].flag & Optflag_Reverse) |
73 | (optList[i].flag & Optflag_Reverse) |
72 | #define optList_size \ |
|
|
73 | (sizeof (optList) / sizeof (optList[0])) |
|
|
74 | |
74 | |
75 | static const struct |
75 | static const struct |
76 | { |
76 | { |
77 | const uint8_t index; /* Option index */ |
77 | const uint8_t index; /* Option index */ |
78 | const uint8_t flag; /* Option flag */ |
78 | const uint8_t flag; /* Option flag */ |
… | |
… | |
89 | STRG (Rs_geometry, NULL, "g", NULL, NULL), /* short form */ |
89 | STRG (Rs_geometry, NULL, "g", NULL, NULL), /* short form */ |
90 | STRG (Rs_geometry, "geometry", "geometry", "geometry", "size (in characters) and position"), |
90 | STRG (Rs_geometry, "geometry", "geometry", "geometry", "size (in characters) and position"), |
91 | SWCH ("C", Opt_console, 0, "intercept console messages"), |
91 | SWCH ("C", Opt_console, 0, "intercept console messages"), |
92 | SWCH ("iconic", Opt_iconic, 0, "start iconic"), |
92 | SWCH ("iconic", Opt_iconic, 0, "start iconic"), |
93 | SWCH ("ic", Opt_iconic, 0, NULL), /* short form */ |
93 | SWCH ("ic", Opt_iconic, 0, NULL), /* short form */ |
|
|
94 | STRG (Rs_chdir, "chdir", "cd", "string", "start shell in this directory"), |
94 | BOOL (Rs_reverseVideo, "reverseVideo", "rv", Opt_reverseVideo, 0, "reverse video"), |
95 | BOOL (Rs_reverseVideo, "reverseVideo", "rv", Opt_reverseVideo, 0, "reverse video"), |
95 | BOOL (Rs_loginShell, "loginShell", "ls", Opt_loginShell, 0, "login shell"), |
96 | BOOL (Rs_loginShell, "loginShell", "ls", Opt_loginShell, 0, "login shell"), |
96 | BOOL (Rs_jumpScroll, "jumpScroll", "j", Opt_jumpScroll, 0, "jump scrolling"), |
97 | BOOL (Rs_jumpScroll, "jumpScroll", "j", Opt_jumpScroll, 0, "jump scrolling"), |
|
|
98 | BOOL (Rs_skipScroll, "skipScroll", "ss", Opt_skipScroll, 0, "skip scrolling"), |
97 | BOOL (Rs_pastableTabs, "pastableTabs", "ptab", Opt_pastableTabs, 0, "tab characters are pastable"), |
99 | BOOL (Rs_pastableTabs, "pastableTabs", "ptab", Opt_pastableTabs, 0, "tab characters are pastable"), |
98 | #if HAVE_SCROLLBARS |
|
|
99 | RSTRG (Rs_scrollstyle, "scrollstyle", "mode"), |
100 | RSTRG (Rs_scrollstyle, "scrollstyle", "mode"), |
100 | BOOL (Rs_scrollBar, "scrollBar", "sb", Opt_scrollBar, 0, "scrollbar"), |
101 | BOOL (Rs_scrollBar, "scrollBar", "sb", Opt_scrollBar, 0, "scrollbar"), |
101 | BOOL (Rs_scrollBar_right, "scrollBar_right", "sr", Opt_scrollBar_right, 0, "scrollbar right"), |
102 | BOOL (Rs_scrollBar_right, "scrollBar_right", "sr", Opt_scrollBar_right, 0, "scrollbar right"), |
102 | BOOL (Rs_scrollBar_floating, "scrollBar_floating", "st", Opt_scrollBar_floating, 0, "scrollbar without a trough"), |
103 | BOOL (Rs_scrollBar_floating, "scrollBar_floating", "st", Opt_scrollBar_floating, 0, "scrollbar without a trough"), |
103 | RSTRG (Rs_scrollBar_align, "scrollBar_align", "mode"), |
104 | RSTRG (Rs_scrollBar_align, "scrollBar_align", "mode"), |
104 | STRG (Rs_scrollBar_thickness, "thickness", "sbt", "number", "scrollbar thickness/width in pixels"), |
105 | STRG (Rs_scrollBar_thickness, "thickness", "sbt", "number", "scrollbar thickness/width in pixels"), |
105 | #endif |
|
|
106 | BOOL (Rs_scrollTtyOutput, "scrollTtyOutput", NULL, Opt_scrollTtyOutput, 0, NULL), |
106 | BOOL (Rs_scrollTtyOutput, "scrollTtyOutput", NULL, Opt_scrollTtyOutput, 0, NULL), |
107 | BOOL (Rs_scrollTtyOutput, NULL, "si", Opt_scrollTtyOutput, Optflag_Reverse, "scroll-on-tty-output inhibit"), |
107 | BOOL (Rs_scrollTtyOutput, NULL, "si", Opt_scrollTtyOutput, Optflag_Reverse, "scroll-on-tty-output inhibit"), |
108 | BOOL (Rs_scrollTtyKeypress, "scrollTtyKeypress", "sk", Opt_scrollTtyKeypress, 0, "scroll-on-keypress"), |
108 | BOOL (Rs_scrollTtyKeypress, "scrollTtyKeypress", "sk", Opt_scrollTtyKeypress, 0, "scroll-on-keypress"), |
109 | BOOL (Rs_scrollWithBuffer, "scrollWithBuffer", "sw", Opt_scrollWithBuffer, 0, "scroll-with-buffer"), |
109 | BOOL (Rs_scrollWithBuffer, "scrollWithBuffer", "sw", Opt_scrollWithBuffer, 0, "scroll-with-buffer"), |
110 | #if TRANSPARENT |
110 | #if ENABLE_TRANSPARENCY |
111 | BOOL (Rs_transparent, "inheritPixmap", "ip", Opt_transparent, 0, "inherit parent pixmap"), |
111 | BOOL (Rs_transparent, "inheritPixmap", "ip", Opt_transparent, 0, "inherit parent pixmap"), |
112 | SWCH ("tr", Opt_transparent, 0, NULL), |
112 | 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"), |
113 | STRG (Rs_color + Color_tint, "tintColor", "tint", "color", "tint color"), |
115 | # endif |
114 | STRG (Rs_shade, "shading", "sh", "number", "shade background by number %."), |
|
|
115 | STRG (Rs_blurradius, "blurRadius", "blr", "HxV", "gaussian blur radii to apply to the root background"), |
116 | #endif |
116 | #endif |
117 | #if OFF_FOCUS_FADING |
117 | #if OFF_FOCUS_FADING |
118 | STRG (Rs_fade, "fading", "fade", "%", "fade colors x% percent when rxvt-unicode is losing focus"), |
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"), |
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 |
120 | #endif |
124 | BOOL (Rs_utmpInhibit, "utmpInhibit", "ut", Opt_utmpInhibit, 0, "utmp inhibit"), |
121 | BOOL (Rs_utmpInhibit, "utmpInhibit", "ut", Opt_utmpInhibit, 0, "utmp inhibit"), |
125 | #ifndef NO_BELL |
122 | #ifndef NO_BELL |
126 | # if ENABLE_FRILLS |
123 | # if ENABLE_FRILLS |
127 | BOOL (Rs_urgentOnBell, "urgentOnBell", NULL, Opt_urgentOnBell, 0, NULL), |
124 | BOOL (Rs_urgentOnBell, "urgentOnBell", NULL, Opt_urgentOnBell, 0, NULL), |
… | |
… | |
169 | #ifndef NO_BOLD_UNDERLINE_REVERSE |
166 | #ifndef NO_BOLD_UNDERLINE_REVERSE |
170 | RSTRG (Rs_color + Color_BD, "colorBD", "color"), |
167 | RSTRG (Rs_color + Color_BD, "colorBD", "color"), |
171 | RSTRG (Rs_color + Color_IT, "colorIT", "color"), |
168 | RSTRG (Rs_color + Color_IT, "colorIT", "color"), |
172 | RSTRG (Rs_color + Color_UL, "colorUL", "color"), |
169 | RSTRG (Rs_color + Color_UL, "colorUL", "color"), |
173 | RSTRG (Rs_color + Color_RV, "colorRV", "color"), |
170 | RSTRG (Rs_color + Color_RV, "colorRV", "color"), |
174 | #endif /* ! NO_BOLD_UNDERLINE_REVERSE */ |
171 | #endif /* ! NO_BOLD_UNDERLINE_REVERSE */ |
175 | #if ENABLE_FRILLS |
172 | #if ENABLE_FRILLS |
176 | RSTRG (Rs_color + Color_underline, "underlineColor", "color"), |
173 | RSTRG (Rs_color + Color_underline, "underlineColor", "color"), |
177 | #endif |
174 | #endif |
178 | #ifdef KEEP_SCROLLCOLOR |
|
|
179 | RSTRG (Rs_color + Color_scroll, "scrollColor", "color"), |
175 | RSTRG (Rs_color + Color_scroll, "scrollColor", "color"), |
|
|
176 | #ifdef RXVT_SCROLLBAR |
180 | RSTRG (Rs_color + Color_trough, "troughColor", "color"), |
177 | RSTRG (Rs_color + Color_trough, "troughColor", "color"), |
181 | #endif /* KEEP_SCROLLCOLOR */ |
178 | #endif |
182 | #ifdef OPTION_HC |
179 | #ifdef OPTION_HC |
183 | STRG (Rs_color + Color_HC, "highlightColor", "hc", "color", "highlight color"), |
180 | STRG (Rs_color + Color_HC, "highlightColor", "hc", "color", "highlight color"), |
|
|
181 | RSTRG (Rs_color + Color_HTC, "highlightTextColor", "color"), |
184 | #endif |
182 | #endif |
185 | #ifndef NO_CURSORCOLOR |
183 | #ifndef NO_CURSORCOLOR |
186 | STRG (Rs_color + Color_cursor, "cursorColor", "cr", "color", "cursor color"), |
184 | STRG (Rs_color + Color_cursor, "cursorColor", "cr", "color", "cursor color"), |
187 | /* command-line option = resource name */ |
185 | /* command-line option = resource name */ |
188 | RSTRG (Rs_color + Color_cursor2, "cursorColor2", "color"), |
186 | RSTRG (Rs_color + Color_cursor2, "cursorColor2", "color"), |
189 | #endif /* NO_CURSORCOLOR */ |
187 | #endif /* NO_CURSORCOLOR */ |
190 | STRG (Rs_color + Color_pointer_fg, "pointerColor", "pr", "color", "pointer color"), |
188 | STRG (Rs_color + Color_pointer_fg, "pointerColor", "pr", "color", "pointer color"), |
191 | STRG (Rs_color + Color_pointer_bg, "pointerColor2", "pr2", "color", "pointer bg color"), |
189 | STRG (Rs_color + Color_pointer_bg, "pointerColor2", "pr2", "color", "pointer bg color"), |
192 | STRG (Rs_color + Color_border, "borderColor", "bd", "color", "border color"), |
190 | STRG (Rs_color + Color_border, "borderColor", "bd", "color", "border color"), |
193 | #ifdef XPM_BACKGROUND |
191 | #ifdef BG_IMAGE_FROM_FILE |
194 | RSTRG (Rs_path, "path", "search path"), |
192 | RSTRG (Rs_path, "path", "search path"), |
195 | STRG (Rs_backgroundPixmap, "backgroundPixmap", "pixmap", "file[;geom]", "background pixmap"), |
193 | STRG (Rs_backgroundPixmap, "backgroundPixmap", "pixmap", "file[;geom]", "background pixmap"), |
|
|
194 | # if ENABLE_EWMH |
|
|
195 | STRG (Rs_iconfile, "iconFile", "icon", "file", "path to application icon image"), |
|
|
196 | # endif |
196 | #endif |
197 | #endif |
197 | /* fonts: command-line option = resource name */ |
198 | /* fonts: command-line option = resource name */ |
198 | STRG (Rs_font, "font", "fn", "fontname", "normal text font"), |
199 | STRG (Rs_font, "font", "fn", "fontname", "normal text font"), |
199 | #if ENABLE_STYLES |
200 | #if ENABLE_STYLES |
200 | STRG (Rs_boldFont, "boldFont", "fb", "fontname", "bold font"), |
201 | STRG (Rs_boldFont, "boldFont", "fb", "fontname", "bold font"), |
… | |
… | |
205 | #ifdef USE_XIM |
206 | #ifdef USE_XIM |
206 | STRG (Rs_inputMethod, "inputMethod", "im", "name", "name of input method"), |
207 | STRG (Rs_inputMethod, "inputMethod", "im", "name", "name of input method"), |
207 | STRG (Rs_preeditType, "preeditType", "pt", "style", "input style: style = OverTheSpot|OffTheSpot|Root"), |
208 | STRG (Rs_preeditType, "preeditType", "pt", "style", "input style: style = OverTheSpot|OffTheSpot|Root"), |
208 | STRG (Rs_imLocale, "imLocale", "imlocale", "string", "locale to use for input method"), |
209 | STRG (Rs_imLocale, "imLocale", "imlocale", "string", "locale to use for input method"), |
209 | STRG (Rs_imFont, "imFont", "imfont", "fontname", "fontset for styles OverTheSpot and OffTheSpot"), |
210 | STRG (Rs_imFont, "imFont", "imfont", "fontname", "fontset for styles OverTheSpot and OffTheSpot"), |
210 | #endif /* USE_XIM */ |
211 | #endif /* USE_XIM */ |
211 | STRG (Rs_name, NULL, "name", "string", "client instance, icon, and title strings"), |
212 | STRG (Rs_name, NULL, "name", "string", "client instance, icon, and title strings"), |
212 | STRG (Rs_title, "title", "title", "string", "title name for window"), |
213 | STRG (Rs_title, "title", "title", "string", "title name for window"), |
213 | STRG (Rs_title, NULL, "T", NULL, NULL), /* short form */ |
214 | STRG (Rs_title, NULL, "T", NULL, NULL), /* short form */ |
214 | STRG (Rs_iconName, "iconName", "n", "string", "icon name for window"), |
215 | STRG (Rs_iconName, "iconName", "n", "string", "icon name for window"), |
215 | STRG (Rs_saveLines, "saveLines", "sl", "number", "number of scrolled lines to save"), |
216 | STRG (Rs_saveLines, "saveLines", "sl", "number", "number of scrolled lines to save"), |
216 | #if ENABLE_XEMBED |
217 | #if ENABLE_XEMBED |
217 | STRG (Rs_embed, NULL, "embed", "windowid", "window id to embed terminal in"), |
218 | STRG (Rs_embed, NULL, "embed", "windowid", "window id to embed terminal in"), |
218 | #endif |
219 | #endif |
219 | #if XFT |
220 | #if XFT |
220 | STRG (Rs_depth, "depth", "depth", "number", "depth of visual to request"), |
221 | STRG (Rs_depth, "depth", "depth", "number", "depth of visual to request"), |
|
|
222 | BOOL (Rs_buffered, "buffered", NULL, Opt_buffered, 0, NULL), |
221 | #endif |
223 | #endif |
222 | #if ENABLE_FRILLS |
224 | #if ENABLE_FRILLS |
223 | RSTRG (Rs_transient_for, "transient-for", "windowid"), |
225 | RSTRG (Rs_transient_for, "transient-for", "windowid"), |
224 | BOOL (Rs_override_redirect, "override-redirect", "override-redirect", Opt_override_redirect, 0, "set override-redirect on the terminal window"), |
226 | BOOL (Rs_override_redirect, "override-redirect", "override-redirect", Opt_override_redirect, 0, "set override-redirect on the terminal window"), |
225 | STRG (Rs_pty_fd, NULL, "pty-fd", "fileno", "file descriptor of pty to use"), |
227 | STRG (Rs_pty_fd, NULL, "pty-fd", "fileno", "file descriptor of pty to use"), |
… | |
… | |
227 | STRG (Rs_ext_bwidth, "externalBorder", "w", "number", "external border in pixels"), |
229 | STRG (Rs_ext_bwidth, "externalBorder", "w", "number", "external border in pixels"), |
228 | STRG (Rs_ext_bwidth, NULL, "bw", NULL, NULL), |
230 | STRG (Rs_ext_bwidth, NULL, "bw", NULL, NULL), |
229 | STRG (Rs_ext_bwidth, NULL, "borderwidth", NULL, NULL), |
231 | STRG (Rs_ext_bwidth, NULL, "borderwidth", NULL, NULL), |
230 | STRG (Rs_int_bwidth, "internalBorder", "b", "number", "internal border in pixels"), |
232 | STRG (Rs_int_bwidth, "internalBorder", "b", "number", "internal border in pixels"), |
231 | BOOL (Rs_borderLess, "borderLess", "bl", Opt_borderLess, 0, "borderless window"), |
233 | BOOL (Rs_borderLess, "borderLess", "bl", Opt_borderLess, 0, "borderless window"), |
|
|
234 | STRG (Rs_lineSpace, "lineSpace", "lsp", "number", "number of extra pixels between rows"), |
|
|
235 | STRG (Rs_letterSpace, "letterSpace", "letsp", "number", "letter spacing adjustment"), |
|
|
236 | #endif |
|
|
237 | #ifdef BUILTIN_GLYPHS |
232 | BOOL (Rs_skipBuiltinGlyphs, "skipBuiltinGlyphs", "sbg", Opt_skipBuiltinGlyphs, 0, "do not use internal glyphs"), |
238 | BOOL (Rs_skipBuiltinGlyphs, "skipBuiltinGlyphs", "sbg", Opt_skipBuiltinGlyphs, 0, "do not use internal glyphs"), |
233 | STRG (Rs_lineSpace, "lineSpace", "lsp", "number", "number of extra pixels between rows"), |
|
|
234 | #endif |
239 | #endif |
235 | #ifdef POINTER_BLANK |
240 | #ifdef POINTER_BLANK |
236 | RSTRG (Rs_pointerBlankDelay, "pointerBlankDelay", "number"), |
241 | RSTRG (Rs_pointerBlankDelay, "pointerBlankDelay", "number"), |
237 | #endif |
242 | #endif |
238 | #ifndef NO_BACKSPACE_KEY |
243 | #ifndef NO_BACKSPACE_KEY |
239 | RSTRG (Rs_backspace_key, "backspacekey", "string"), |
244 | RSTRG (Rs_backspace_key, "backspacekey", "string"), |
240 | #endif |
245 | #endif |
241 | #ifndef NO_DELETE_KEY |
246 | #ifndef NO_DELETE_KEY |
242 | RSTRG (Rs_delete_key, "deletekey", "string"), |
247 | RSTRG (Rs_delete_key, "deletekey", "string"), |
243 | #endif |
248 | #endif |
244 | RSTRG (Rs_selectstyle, "selectstyle", "mode"), |
|
|
245 | #ifdef PRINTPIPE |
249 | #ifdef PRINTPIPE |
246 | RSTRG (Rs_print_pipe, "print-pipe", "string"), |
250 | RSTRG (Rs_print_pipe, "print-pipe", "string"), |
247 | #endif |
251 | #endif |
248 | STRG (Rs_modifier, "modifier", "mod", "modifier", "meta modifier = alt|meta|hyper|super|mod1|...|mod5"), |
252 | STRG (Rs_modifier, "modifier", "mod", "modifier", "meta modifier = alt|meta|hyper|super|mod1|...|mod5"), |
249 | #ifdef CUTCHAR_RESOURCE |
|
|
250 | RSTRG (Rs_cutchars, "cutchars", "string"), |
253 | RSTRG (Rs_cutchars, "cutchars", "string"), |
251 | #endif /* CUTCHAR_RESOURCE */ |
|
|
252 | RSTRG (Rs_answerbackstring, "answerbackString", "string"), |
254 | RSTRG (Rs_answerbackstring, "answerbackString", "string"), |
253 | #ifndef NO_SECONDARY_SCREEN |
255 | #ifndef NO_SECONDARY_SCREEN |
254 | BOOL (Rs_secondaryScreen, "secondaryScreen", "ssc", Opt_secondaryScreen, 0, "enable secondary screen"), |
256 | BOOL (Rs_secondaryScreen, "secondaryScreen", "ssc", Opt_secondaryScreen, 0, "enable secondary screen"), |
255 | BOOL (Rs_secondaryScroll, "secondaryScroll", "ssr", Opt_secondaryScroll, 0, "enable secondary screen scroll"), |
257 | BOOL (Rs_secondaryScroll, "secondaryScroll", "ssr", Opt_secondaryScroll, 0, "enable secondary screen scroll"), |
256 | #endif |
258 | #endif |
… | |
… | |
258 | RSTRG (Rs_perl_lib, "perl-lib", "string"), //, "colon-separated directories with extension scripts"),TODO |
260 | RSTRG (Rs_perl_lib, "perl-lib", "string"), //, "colon-separated directories with extension scripts"),TODO |
259 | RSTRG (Rs_perl_eval, "perl-eval", "perl-eval"), // "string", "code to be evaluated after all extensions have been loaded"),TODO |
261 | RSTRG (Rs_perl_eval, "perl-eval", "perl-eval"), // "string", "code to be evaluated after all extensions have been loaded"),TODO |
260 | RSTRG (Rs_perl_ext_1, "perl-ext-common", "string"), //, "colon-separated list of perl extensions to enable"),TODO |
262 | RSTRG (Rs_perl_ext_1, "perl-ext-common", "string"), //, "colon-separated list of perl extensions to enable"),TODO |
261 | STRG (Rs_perl_ext_2, "perl-ext", "pe", "string", "colon-separated list of perl extensions to enable for this instance"), |
263 | STRG (Rs_perl_ext_2, "perl-ext", "pe", "string", "colon-separated list of perl extensions to enable for this instance"), |
262 | #endif |
264 | #endif |
263 | |
265 | #if ISO_14755 |
|
|
266 | BOOL (Rs_iso14755, "iso14755", NULL, Opt_iso14755, 0, NULL), |
|
|
267 | BOOL (Rs_iso14755_52, "iso14755_52", NULL, Opt_iso14755_52, 0, NULL), |
|
|
268 | #endif |
264 | #ifdef HAVE_AFTERIMAGE |
269 | #ifdef HAVE_AFTERIMAGE |
265 | STRG (Rs_blendtype, "blendType", "blt", "string", "background image blending type - alpha, tint, etc..."), |
270 | STRG (Rs_blendtype, "blendType", "blt", "string", "background image blending type - alpha, tint, etc..."), |
266 | STRG (Rs_blurradius, "blurRadius", "blr", "number", "Gaussian Blur radius to apply to the root background"), |
|
|
267 | #endif |
|
|
268 | #ifndef NO_RESOURCES |
|
|
269 | INFO ("xrm", "string", "X resource"), |
|
|
270 | #endif |
271 | #endif |
271 | INFO ("e", "command arg ...", "command to execute") |
272 | INFO ("e", "command arg ...", "command to execute") |
272 | }; |
273 | }; |
273 | |
274 | |
274 | #undef INFO |
275 | #undef INFO |
… | |
… | |
318 | #endif |
319 | #endif |
319 | "," |
320 | "," |
320 | #if OFF_FOCUS_FADING |
321 | #if OFF_FOCUS_FADING |
321 | "fade," |
322 | "fade," |
322 | #endif |
323 | #endif |
323 | #if defined(XPM_BACKGROUND) |
|
|
324 | "XPM," |
|
|
325 | #endif |
|
|
326 | #if defined(TRANSPARENT) |
324 | #if defined(ENABLE_TRANSPARENCY) |
327 | "transparent," |
325 | "transparent," |
328 | #endif |
|
|
329 | #if TINTING |
|
|
330 | "tint," |
326 | "tint," |
|
|
327 | #endif |
|
|
328 | #if HAVE_AFTERIMAGE |
|
|
329 | "afterimage," |
|
|
330 | #endif |
|
|
331 | #if HAVE_PIXBUF |
|
|
332 | "pixbuf," |
331 | #endif |
333 | #endif |
332 | #if defined(USE_XIM) |
334 | #if defined(USE_XIM) |
333 | "XIM," |
335 | "XIM," |
334 | #endif |
336 | #endif |
335 | #if defined(NO_BACKSPACE_KEY) |
337 | #if defined(NO_BACKSPACE_KEY) |
… | |
… | |
363 | "pointerBlank," |
365 | "pointerBlank," |
364 | #endif |
366 | #endif |
365 | #if defined(NO_RESOURCES) |
367 | #if defined(NO_RESOURCES) |
366 | "NoResources," |
368 | "NoResources," |
367 | #endif |
369 | #endif |
368 | "scrollbars=" |
370 | "scrollbars=plain" |
369 | #if !defined(HAVE_SCROLLBARS) |
|
|
370 | "NONE" |
|
|
371 | #else |
|
|
372 | # if defined(PLAIN_SCROLLBAR) |
|
|
373 | "plain" |
|
|
374 | # if defined(RXVT_SCROLLBAR) || defined(NEXT_SCROLLBAR) || defined(XTERM_SCROLLBAR) |
|
|
375 | "+" |
|
|
376 | # endif |
|
|
377 | # endif |
|
|
378 | # if defined(RXVT_SCROLLBAR) |
371 | #if defined(RXVT_SCROLLBAR) |
379 | "rxvt" |
372 | "+rxvt" |
380 | # if defined(NEXT_SCROLLBAR) || defined(XTERM_SCROLLBAR) |
|
|
381 | "+" |
|
|
382 | # endif |
|
|
383 | # endif |
373 | #endif |
384 | # if defined(NEXT_SCROLLBAR) |
374 | #if defined(NEXT_SCROLLBAR) |
385 | "NeXT" |
375 | "+NeXT" |
386 | # if defined(XTERM_SCROLLBAR) |
|
|
387 | "+" |
|
|
388 | # endif |
|
|
389 | # endif |
376 | #endif |
390 | # if defined(XTERM_SCROLLBAR) |
377 | #if defined(XTERM_SCROLLBAR) |
391 | "xterm" |
378 | "+xterm" |
392 | # endif |
|
|
393 | #endif |
379 | #endif |
394 | "\nUsage: "; /* Usage */ |
380 | "\nUsage: "; /* Usage */ |
395 | |
381 | |
396 | #define INDENT 18 |
382 | #define INDENT 18 |
397 | |
383 | |
… | |
… | |
411 | switch (type) |
397 | switch (type) |
412 | { |
398 | { |
413 | case 0: /* brief listing */ |
399 | case 0: /* brief listing */ |
414 | rxvt_log (" [-help] [--help]\n"); |
400 | rxvt_log (" [-help] [--help]\n"); |
415 | |
401 | |
416 | for (col = 1, i = 0; i < optList_size; i++) |
402 | for (col = 1, i = 0; i < ecb_array_length (optList); i++) |
417 | if (optList[i].desc != NULL) |
403 | if (optList[i].desc != NULL) |
418 | { |
404 | { |
419 | int len = 0; |
405 | int len = 0; |
420 | |
406 | |
421 | if (!optList_isBool (i)) |
407 | if (optList[i].arg) |
422 | { |
408 | len = strlen (optList[i].arg) + 1; |
423 | len = optList_strlen (i); |
|
|
424 | if (len > 0) |
|
|
425 | len++; /* account for space */ |
|
|
426 | } |
|
|
427 | #ifdef DEBUG_STRICT |
|
|
428 | assert (optList[i].opt != NULL); |
409 | assert (optList[i].opt != NULL); |
429 | #endif |
|
|
430 | len += 4 + strlen (optList[i].opt) + (optList_isBool (i) ? 2: 0); |
410 | len += 4 + strlen (optList[i].opt) + (optList_isBool (i) ? 2 : 0); |
431 | col += len; |
411 | col += len; |
432 | if (col > 79) |
412 | if (col > 79) |
|
|
413 | { |
433 | { /* assume regular width */ |
414 | /* assume regular width */ |
434 | rxvt_log ("\n"); |
415 | rxvt_log ("\n"); |
435 | col = 1 + len; |
416 | col = 1 + len; |
436 | } |
417 | } |
437 | |
418 | |
438 | rxvt_log (" [-%s%s", (optList_isBool (i) ? "/+" : ""), optList[i].opt); |
419 | rxvt_log (" [-%s%s", (optList_isBool (i) ? "/+" : ""), optList[i].opt); |
439 | if (optList_strlen (i)) |
420 | if (optList[i].arg) |
440 | rxvt_log (" %s]", optList[i].arg); |
421 | rxvt_log (" %s]", optList[i].arg); |
441 | else |
422 | else |
442 | rxvt_log ("]"); |
423 | rxvt_log ("]"); |
443 | } |
424 | } |
444 | break; |
425 | break; |
445 | |
426 | |
446 | case 1: /* full command-line listing */ |
427 | case 1: /* full command-line listing */ |
447 | rxvt_log (" [options] [-e command args]\n\nwhere options include:\n"); |
428 | rxvt_log (" [options] [-e command args]\n\nwhere options include:\n"); |
448 | |
429 | |
449 | for (i = 0; i < optList_size; i++) |
430 | for (i = 0; i < ecb_array_length (optList); i++) |
450 | if (optList[i].desc != NULL) |
431 | if (optList[i].desc != NULL) |
451 | { |
432 | { |
452 | #ifdef DEBUG_STRICT |
|
|
453 | assert (optList[i].opt != NULL); |
433 | assert (optList[i].opt != NULL); |
454 | #endif |
|
|
455 | rxvt_log (" %s%s %-*s%s%s\n", |
434 | rxvt_log (" %s%s %-*s%s%s\n", |
456 | (optList_isBool (i) ? "-/+" : "-"), optList[i].opt, |
435 | (optList_isBool (i) ? "-/+" : "-"), optList[i].opt, |
457 | (INDENT - strlen (optList[i].opt) |
436 | (INDENT - strlen (optList[i].opt) |
458 | + (optList_isBool (i) ? 0 : 2)), |
437 | + (optList_isBool (i) ? 0 : 2)), |
459 | (optList[i].arg ? optList[i].arg : ""), |
438 | (optList[i].arg ? optList[i].arg : ""), |
… | |
… | |
465 | |
444 | |
466 | case 2: /* full resource listing */ |
445 | case 2: /* full resource listing */ |
467 | rxvt_log (" [options] [-e command args]\n\n" |
446 | rxvt_log (" [options] [-e command args]\n\n" |
468 | "where resources (long-options) include:\n"); |
447 | "where resources (long-options) include:\n"); |
469 | |
448 | |
470 | for (i = 0; i < optList_size; i++) |
449 | for (i = 0; i < ecb_array_length (optList); i++) |
471 | if (optList[i].kw != NULL) |
450 | if (optList[i].kw != NULL) |
472 | rxvt_log (" %s: %*s%s\n", |
451 | rxvt_log (" %s: %*s%s\n", |
473 | optList[i].kw, |
452 | optList[i].kw, |
474 | (INDENT - strlen (optList[i].kw)), "", /* XXX */ |
453 | (INDENT - strlen (optList[i].kw)), "", /* XXX */ |
475 | (optList_isBool (i) ? "boolean" : optList[i].arg)); |
454 | (optList_isBool (i) ? "boolean" : optList[i].arg)); |
… | |
… | |
482 | break; |
461 | break; |
483 | } |
462 | } |
484 | |
463 | |
485 | rxvt_log ("\n\n"); |
464 | rxvt_log ("\n\n"); |
486 | rxvt_exit_failure (); |
465 | rxvt_exit_failure (); |
487 | /* NOTREACHED */ |
|
|
488 | } |
466 | } |
489 | |
467 | |
490 | /*}}} */ |
468 | /*}}} */ |
491 | |
469 | |
492 | /*{{{ get command-line options before getting resources */ |
470 | /*{{{ get command-line options before getting resources */ |
… | |
… | |
496 | int i, bad_option = 0; |
474 | int i, bad_option = 0; |
497 | |
475 | |
498 | for (i = 1; i < argc; i++) |
476 | for (i = 1; i < argc; i++) |
499 | { |
477 | { |
500 | unsigned int entry, longopt = 0; |
478 | unsigned int entry, longopt = 0; |
501 | const char *flag, *opt; |
479 | const char *opt; |
|
|
480 | int flag; |
502 | |
481 | |
503 | opt = argv[i]; |
482 | opt = argv[i]; |
504 | |
483 | |
505 | if (*opt == '-') |
484 | if (*opt == '-') |
506 | { |
485 | { |
507 | flag = resval_on; |
486 | flag = 1; |
508 | |
487 | |
509 | if (*++opt == '-') |
488 | if (*++opt == '-') |
510 | longopt = *opt++; /* long option */ |
489 | longopt = *opt++; /* long option */ |
511 | } |
490 | } |
512 | else if (*opt == '+') |
491 | else if (*opt == '+') |
513 | { |
492 | { |
514 | flag = resval_off; |
493 | flag = 0; |
515 | |
494 | |
516 | if (*++opt == '+') |
495 | if (*++opt == '+') |
517 | longopt = *opt++; /* long option */ |
496 | longopt = *opt++; /* long option */ |
518 | } |
497 | } |
519 | else |
498 | else |
… | |
… | |
528 | |
507 | |
529 | if (!strcmp (opt, "h")) |
508 | if (!strcmp (opt, "h")) |
530 | rxvt_usage (0); |
509 | rxvt_usage (0); |
531 | |
510 | |
532 | /* feature: always try to match long-options */ |
511 | /* feature: always try to match long-options */ |
533 | for (entry = 0; entry < optList_size; entry++) |
512 | for (entry = 0; entry < ecb_array_length (optList); entry++) |
534 | if ((optList[entry].kw && !strcmp (opt, optList[entry].kw)) |
513 | if ((optList[entry].kw && !strcmp (opt, optList[entry].kw)) |
535 | || (!longopt |
514 | || (!longopt |
536 | && optList[entry].opt && !strcmp (opt, optList[entry].opt))) |
515 | && optList[entry].opt && !strcmp (opt, optList[entry].opt))) |
537 | break; |
516 | break; |
538 | |
517 | |
539 | if (entry < optList_size) |
518 | if (entry < ecb_array_length (optList)) |
540 | { |
519 | { |
541 | if (optList_isReverse (entry)) |
520 | if (optList_isReverse (entry)) |
542 | flag = flag == resval_on ? resval_off : resval_on; |
521 | flag = !flag; |
543 | fprintf( stderr, "entry = %d, opt = [%s], flag = 0x%X, resval_on = %d\n", entry, opt, *flag, *resval_on ); |
|
|
544 | |
522 | |
545 | if (optList_strlen (entry)) |
523 | if (optList_isString (entry)) |
546 | { |
524 | { |
547 | /* |
525 | /* |
548 | * special cases are handled in main.c:main () to allow |
526 | * special cases are handled in init_resources () to allow |
549 | * X resources to set these values before we settle for |
527 | * X resources to set these values before we settle for |
550 | * default values |
528 | * default values |
551 | */ |
529 | */ |
552 | fprintf( stderr, "string\n"); |
530 | |
553 | if (optList[entry].doff != -1) |
531 | if (optList[entry].doff != -1) |
554 | { |
532 | { |
555 | if (flag == resval_on && !argv [i+1]) |
533 | if (flag && i+1 == argc) |
556 | rxvt_fatal ("option '%s' needs an argument, aborting.\n", argv [i]); |
534 | rxvt_fatal ("option '%s' requires an argument, aborting.\n", argv [i]); |
557 | |
535 | |
558 | rs[optList[entry].doff] = flag == resval_on ? argv[++i] : resval_undef; |
536 | rs[optList[entry].doff] = flag ? argv[++i] : resval_undef; |
559 | } |
537 | } |
560 | } |
538 | } |
561 | else |
539 | else |
|
|
540 | { |
562 | { /* boolean value */ |
541 | /* boolean value */ |
563 | set_option (optList[entry].index, flag == resval_on); |
542 | set_option (optList[entry].index, flag); |
564 | |
543 | |
565 | if (optList[entry].doff != -1) |
544 | if (optList[entry].doff != -1) |
566 | rs[optList[entry].doff] = flag; |
545 | rs[optList[entry].doff] = flag ? resval_on : resval_off; |
567 | } |
546 | } |
568 | } |
547 | } |
|
|
548 | #ifndef NO_RESOURCES |
|
|
549 | else if (!strcmp (opt, "xrm")) |
|
|
550 | { |
|
|
551 | if (i+1 < argc) |
|
|
552 | XrmPutLineResource (&option_db, argv[++i]); |
|
|
553 | } |
|
|
554 | #endif |
|
|
555 | #ifdef KEYSYM_RESOURCE |
|
|
556 | else if (!strncmp (opt, "keysym.", sizeof ("keysym.") - 1)) |
|
|
557 | { |
|
|
558 | if (i+1 < argc) |
|
|
559 | { |
|
|
560 | char *res = rxvt_temp_buf<char> (strlen (opt) + strlen (argv[++i]) + 6); |
|
|
561 | sprintf (res, "*.%s: %s\n", opt, argv[i]); |
|
|
562 | XrmPutLineResource (&option_db, res); |
|
|
563 | } |
|
|
564 | } |
|
|
565 | #endif |
569 | else |
566 | else |
570 | #ifdef KEYSYM_RESOURCE |
|
|
571 | /* if (!strncmp (opt, "keysym.", sizeof ("keysym.") - 1)) */ |
|
|
572 | if (rxvt_Str_match (opt, "keysym.")) |
|
|
573 | { |
567 | { |
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; |
568 | bad_option = 1; |
583 | rxvt_warn ("\"%s\": unknown or malformed option.\n", opt); |
569 | rxvt_warn ("\"%s\": unknown or malformed option.\n", opt); |
584 | } |
570 | } |
585 | } |
571 | } |
586 | |
572 | |
587 | if (bad_option) |
573 | if (bad_option) |
588 | rxvt_usage (0); |
574 | rxvt_usage (0); |
589 | } |
575 | } |
… | |
… | |
598 | * Define key from XrmEnumerateDatabase. |
584 | * Define key from XrmEnumerateDatabase. |
599 | * quarks will be something like |
585 | * quarks will be something like |
600 | * "rxvt" "keysym" "0xFF01" |
586 | * "rxvt" "keysym" "0xFF01" |
601 | * value will be a string |
587 | * value will be a string |
602 | */ |
588 | */ |
603 | /* ARGSUSED */ |
|
|
604 | int |
589 | int |
605 | rxvt_define_key (XrmDatabase *database UNUSED, |
590 | rxvt_define_key (XrmDatabase *database ecb_unused, |
606 | XrmBindingList bindings UNUSED, |
591 | XrmBindingList bindings ecb_unused, |
607 | XrmQuarkList quarks, |
592 | XrmQuarkList quarks, |
608 | XrmRepresentation *type UNUSED, |
593 | XrmRepresentation *type ecb_unused, |
609 | XrmValue *value, |
594 | XrmValue *value, |
610 | XPointer closure UNUSED) |
595 | XPointer closure ecb_unused) |
611 | { |
596 | { |
612 | int last; |
597 | int last; |
613 | |
598 | |
614 | for (last = 0; quarks[last] != NULLQUARK; last++) /* look for last quark in list */ |
599 | for (last = 0; quarks[last] != NULLQUARK; last++) /* look for last quark in list */ |
615 | ; |
600 | ; |
… | |
… | |
620 | } |
605 | } |
621 | |
606 | |
622 | /* |
607 | /* |
623 | * look for something like this (XK_Delete) |
608 | * look for something like this (XK_Delete) |
624 | * rxvt*keysym.0xFFFF: "\177" |
609 | * 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 | */ |
610 | */ |
630 | #define NEWARGLIM 500 /* `reasonable' size */ |
|
|
631 | |
611 | |
632 | struct keysym_vocabulary_t |
612 | struct keysym_vocabulary_t |
633 | { |
613 | { |
634 | const char *name; |
614 | const char *name; |
635 | unsigned short len; |
615 | unsigned short len; |
636 | unsigned short value; |
616 | unsigned short value; |
637 | }; |
617 | }; |
638 | keysym_vocabulary_t keysym_vocabulary[] = |
618 | static const keysym_vocabulary_t keysym_vocabulary[] = |
639 | { |
619 | { |
640 | { "ISOLevel3", 9, Level3Mask }, |
620 | { "ISOLevel3", 9, Level3Mask }, |
641 | { "AppKeypad", 9, AppKeypadMask }, |
621 | { "AppKeypad", 9, AppKeypadMask }, |
642 | { "Control", 7, ControlMask }, |
622 | { "Control", 7, ControlMask }, |
643 | { "NumLock", 7, NumLockMask }, |
623 | { "NumLock", 7, NumLockMask }, |
… | |
… | |
665 | }; |
645 | }; |
666 | |
646 | |
667 | int |
647 | int |
668 | rxvt_term::parse_keysym (const char *str, const char *arg) |
648 | rxvt_term::parse_keysym (const char *str, const char *arg) |
669 | { |
649 | { |
670 | int n, sym; |
650 | int sym; |
671 | unsigned int state = 0; |
651 | unsigned int state = 0; |
672 | const char *pmodend = NULL; |
652 | const char *key = strrchr (str, '-'); |
673 | char *newarg = NULL; |
|
|
674 | char newargstr[NEWARGLIM]; |
|
|
675 | |
653 | |
676 | if (arg == NULL) |
654 | if (!key) |
677 | { |
655 | 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 |
656 | else |
686 | pmodend = str + strlen(str); |
657 | key++; |
687 | |
658 | |
688 | for (--pmodend; str < pmodend; --pmodend) |
659 | // string or key is empty |
689 | if (*pmodend == '-') |
660 | if (*arg == '\0' || *key == '\0') |
690 | break; |
661 | return -1; |
691 | |
662 | |
|
|
663 | // parse modifiers |
692 | while (str < pmodend) |
664 | while (str < key) |
693 | { |
665 | { |
694 | unsigned int i; |
666 | unsigned int i; |
695 | |
667 | |
696 | for (i=0; i < sizeof (keysym_vocabulary) / sizeof (keysym_vocabulary_t); ++i) |
668 | for (i = 0; i < ecb_array_length (keysym_vocabulary); ++i) |
697 | { |
669 | { |
698 | if (strncmp (str, keysym_vocabulary [i].name, keysym_vocabulary [i].len) == 0) |
670 | if (strncmp (str, keysym_vocabulary [i].name, keysym_vocabulary [i].len) == 0) |
699 | { |
671 | { |
700 | state |= keysym_vocabulary[i].value; |
672 | state |= keysym_vocabulary[i].value; |
701 | str += keysym_vocabulary[i].len; |
673 | str += keysym_vocabulary[i].len; |
702 | break; |
674 | break; |
703 | } |
675 | } |
704 | } |
676 | } |
705 | |
677 | |
706 | if (i >= sizeof (keysym_vocabulary) / sizeof (keysym_vocabulary_t)) |
678 | if (i >= ecb_array_length (keysym_vocabulary)) |
707 | return -1; |
679 | return -1; |
708 | |
680 | |
709 | if (*str == '-') |
681 | if (*str == '-') |
710 | ++str; |
682 | ++str; |
711 | } |
683 | } |
712 | |
684 | |
713 | /* some scanf () have trouble with a 0x prefix */ |
685 | // convert keysym name to keysym number |
714 | if (str[0] == '0' && toupper (str[1]) == 'X') |
686 | if ((sym = XStringToKeysym (str)) == None) |
715 | { |
687 | { |
716 | str += 2; |
688 | // fallback on hexadecimal parsing |
717 | |
689 | char *end; |
|
|
690 | sym = strtol (str, &end, 16); |
718 | if (arg) |
691 | 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; |
692 | return -1; |
752 | } |
693 | } |
753 | |
694 | |
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); |
695 | keyboard->register_user_translation (sym, state, arg); |
766 | return 1; |
696 | return 1; |
767 | } |
697 | } |
768 | |
698 | |
769 | # endif /* KEYSYM_RESOURCE */ |
699 | # endif /* KEYSYM_RESOURCE */ |
770 | #endif /* NO_RESOURCES */ |
700 | #endif /* NO_RESOURCES */ |
771 | |
701 | |
772 | static char * |
702 | static char * |
773 | get_res (XrmDatabase database, const char *program, const char *option) |
703 | get_res (XrmDatabase database, const char *program, const char *option) |
774 | { |
704 | { |
775 | char resource[512]; |
705 | char resource[512]; |
… | |
… | |
807 | |
737 | |
808 | void |
738 | void |
809 | rxvt_term::extract_resources () |
739 | rxvt_term::extract_resources () |
810 | { |
740 | { |
811 | #ifndef NO_RESOURCES |
741 | #ifndef NO_RESOURCES |
|
|
742 | XrmDatabase database = XrmGetDatabase (dpy); |
|
|
743 | XrmMergeDatabases (option_db, &database); |
|
|
744 | option_db = NULL; |
812 | /* |
745 | /* |
813 | * Query resources for options that affect us |
746 | * Query resources for options that affect us |
814 | */ |
747 | */ |
815 | for (int entry = 0; entry < optList_size; entry++) |
748 | for (int entry = 0; entry < ecb_array_length (optList); entry++) |
816 | { |
749 | { |
817 | int s; |
750 | int s; |
818 | const char *kw = optList[entry].kw; |
751 | const char *kw = optList[entry].kw; |
819 | |
752 | |
820 | if (kw == NULL || rs[optList[entry].doff] != NULL) |
753 | if (kw == NULL || rs[optList[entry].doff] != NULL) |
… | |
… | |
845 | |
778 | |
846 | /* |
779 | /* |
847 | * [R5 or later]: enumerate the resource database |
780 | * [R5 or later]: enumerate the resource database |
848 | */ |
781 | */ |
849 | # ifdef KEYSYM_RESOURCE |
782 | # ifdef KEYSYM_RESOURCE |
850 | XrmDatabase database = XrmGetDatabase (dpy); |
|
|
851 | XrmName name_prefix[3]; |
783 | XrmName name_prefix[3]; |
852 | XrmClass class_prefix[3]; |
784 | XrmClass class_prefix[3]; |
853 | |
785 | |
854 | name_prefix[0] = XrmStringToName (rs[Rs_name]); |
786 | name_prefix[0] = XrmStringToName (rs[Rs_name]); |
855 | name_prefix[1] = XrmStringToName ("keysym"); |
787 | name_prefix[1] = XrmStringToName ("keysym"); |
… | |
… | |
859 | class_prefix[2] = NULLQUARK; |
791 | class_prefix[2] = NULLQUARK; |
860 | /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */ |
792 | /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */ |
861 | XrmEnumerateDatabase (database, name_prefix, class_prefix, |
793 | XrmEnumerateDatabase (database, name_prefix, class_prefix, |
862 | XrmEnumOneLevel, rxvt_define_key, NULL); |
794 | XrmEnumOneLevel, rxvt_define_key, NULL); |
863 | # ifdef RESFALLBACK |
795 | # ifdef RESFALLBACK |
864 | name_prefix[0] = XrmStringToName (RESFALLBACK); |
|
|
865 | name_prefix[1] = XrmStringToName ("keysym"); |
|
|
866 | class_prefix[0] = XrmStringToName (RESFALLBACK); |
796 | name_prefix[0] = class_prefix[0] = XrmStringToName (RESFALLBACK); |
867 | class_prefix[1] = XrmStringToName ("Keysym"); |
|
|
868 | /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */ |
797 | /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */ |
869 | XrmEnumerateDatabase (database, name_prefix, class_prefix, |
798 | XrmEnumerateDatabase (database, name_prefix, class_prefix, |
870 | XrmEnumOneLevel, rxvt_define_key, NULL); |
799 | XrmEnumOneLevel, rxvt_define_key, NULL); |
871 | # endif |
800 | # endif |
872 | # endif |
801 | # endif |
873 | |
802 | |
874 | #endif /* NO_RESOURCES */ |
803 | #endif /* NO_RESOURCES */ |
875 | } |
804 | } |
876 | |
805 | |
877 | /*----------------------- end-of-file (C source) -----------------------*/ |
806 | /*----------------------- end-of-file (C source) -----------------------*/ |