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

Diff Legend

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