ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/xdefaults.C
(Generate patch)

Comparing rxvt-unicode/src/xdefaults.C (file contents):
Revision 1.105 by ayin, Sat Jun 9 09:05:38 2007 UTC vs.
Revision 1.174 by sf-exg, Sat Dec 29 14:23:35 2012 UTC

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

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines