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.101 by ayin, Thu May 3 18:11:08 2007 UTC vs.
Revision 1.176 by sf-exg, Fri May 2 20:35:00 2014 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), (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
… …
258 RSTRG (Rs_perl_lib, "perl-lib", "string"), //, "colon-separated directories with extension scripts"),TODO 267 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 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
272#if ISO_14755
273 BOOL (Rs_iso14755, "iso14755", NULL, Opt_iso14755, 0, NULL),
274 BOOL (Rs_iso14755_52, "iso14755_52", NULL, Opt_iso14755_52, 0, NULL),
275#endif
263#ifndef NO_RESOURCES 276#ifndef NO_RESOURCES
264 INFO ("xrm", "string", "X resource"), 277 RINFO ("xrm", "string"),
278#endif
279#ifdef KEYSYM_RESOURCE
280 RINFO ("keysym.sym", "keysym"),
265#endif 281#endif
266 INFO ("e", "command arg ...", "command to execute") 282 INFO ("e", "command arg ...", "command to execute")
267 }; 283 };
268 284
269#undef INFO 285#undef INFO
286#undef RINFO
270#undef STRG 287#undef STRG
271#undef RSTRG 288#undef RSTRG
272#undef SWCH 289#undef SWCH
273#undef BOOL 290#undef BOOL
274 291
… …
313#endif 330#endif
314 "," 331 ","
315#if OFF_FOCUS_FADING 332#if OFF_FOCUS_FADING
316 "fade," 333 "fade,"
317#endif 334#endif
318#if defined(XPM_BACKGROUND)
319 "XPM,"
320#endif
321#if defined(TRANSPARENT) 335#if defined(ENABLE_TRANSPARENCY)
322 "transparent," 336 "transparent,"
323#endif
324#if TINTING
325 "tint," 337 "tint,"
338#endif
339#if HAVE_PIXBUF
340 "pixbuf,"
326#endif 341#endif
327#if defined(USE_XIM) 342#if defined(USE_XIM)
328 "XIM," 343 "XIM,"
329#endif 344#endif
330#if defined(NO_BACKSPACE_KEY) 345#if defined(NO_BACKSPACE_KEY)
… …
358 "pointerBlank," 373 "pointerBlank,"
359#endif 374#endif
360#if defined(NO_RESOURCES) 375#if defined(NO_RESOURCES)
361 "NoResources," 376 "NoResources,"
362#endif 377#endif
363 "scrollbars=" 378 "scrollbars=plain"
364#if !defined(HAVE_SCROLLBARS)
365 "NONE"
366#else
367# if defined(PLAIN_SCROLLBAR)
368 "plain"
369# if defined(RXVT_SCROLLBAR) || defined(NEXT_SCROLLBAR) || defined(XTERM_SCROLLBAR)
370 "+"
371# endif
372# endif
373# if defined(RXVT_SCROLLBAR) 379#if defined(RXVT_SCROLLBAR)
374 "rxvt" 380 "+rxvt"
375# if defined(NEXT_SCROLLBAR) || defined(XTERM_SCROLLBAR)
376 "+"
377# endif
378# endif 381#endif
379# if defined(NEXT_SCROLLBAR) 382#if defined(NEXT_SCROLLBAR)
380 "NeXT" 383 "+NeXT"
381# if defined(XTERM_SCROLLBAR)
382 "+"
383# endif
384# endif 384#endif
385# if defined(XTERM_SCROLLBAR) 385#if defined(XTERM_SCROLLBAR)
386 "xterm" 386 "+xterm"
387# endif
388#endif 387#endif
389 "\nUsage: "; /* Usage */ 388 "\nUsage: "; /* Usage */
390 389
391#define INDENT 18 390#define INDENT 28
392 391
393const char rxvt_term::resval_undef [] = "<undef>"; 392const char rxvt_term::resval_undef [] = "<undef>";
394const char rxvt_term::resval_on [] = "on"; 393const char rxvt_term::resval_on [] = "on";
395const char rxvt_term::resval_off [] = "off"; 394const char rxvt_term::resval_off [] = "off";
396 395
397/*{{{ usage: */ 396/*{{{ usage: */
398/*----------------------------------------------------------------------*/ 397/*----------------------------------------------------------------------*/
399static void 398void
400rxvt_usage (int type) 399rxvt_term::rxvt_usage (int type)
401{ 400{
402 unsigned int i, col; 401 unsigned int i, col;
403 402
404 rxvt_log ("%s%s%s", releasestring, optionsstring, RESNAME); 403 rxvt_log ("%s%s%s", releasestring, optionsstring, RESNAME);
405 404
406 switch (type) 405 switch (type)
407 { 406 {
408 case 0: /* brief listing */ 407 case 0: /* brief listing */
409 rxvt_log (" [-help] [--help]\n"); 408 rxvt_log (" [-help] [--help]\n");
410 409
411 for (col = 1, i = 0; i < optList_size; i++) 410 for (col = 1, i = 0; i < ecb_array_length (optList); i++)
412 if (optList[i].desc != NULL) 411 if (optList[i].desc != NULL)
413 { 412 {
414 int len = 0; 413 int len = 0;
415 414
416 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)
417 { 423 {
418 len = optList_strlen (i);
419 if (len > 0)
420 len++; /* account for space */
421 }
422#ifdef DEBUG_STRICT
423 assert (optList[i].opt != NULL);
424#endif
425 len += 4 + strlen (optList[i].opt) + (optList_isBool (i) ? 2: 0);
426 col += len;
427 if (col > 79)
428 { /* assume regular width */ 424 /* assume regular width */
429 rxvt_log ("\n"); 425 rxvt_log ("\n");
430 col = 1 + len; 426 col = 1 + len;
431 } 427 }
432 428
433 rxvt_log (" [-%s%s", (optList_isBool (i) ? "/+" : ""), optList[i].opt); 429 rxvt_log (" [-%s%s", (optList_isBool (i) ? "/+" : ""), optList[i].opt);
430
434 if (optList_strlen (i)) 431 if (optList[i].arg)
435 rxvt_log (" %s]", optList[i].arg); 432 rxvt_log (" %s]", optList[i].arg);
436 else 433 else
437 rxvt_log ("]"); 434 rxvt_log ("]");
438 } 435 }
439 break; 436 break;
440 437
441 case 1: /* full command-line listing */ 438 case 1: /* full command-line listing */
442 rxvt_log (" [options] [-e command args]\n\nwhere options include:\n"); 439 rxvt_log (" [options] [-e command args]\n\nwhere options include:\n");
443 440
444 for (i = 0; i < optList_size; i++) 441 for (i = 0; i < ecb_array_length (optList); i++)
445 if (optList[i].desc != NULL) 442 if (optList[i].desc != NULL)
446 { 443 {
447#ifdef DEBUG_STRICT
448 assert (optList[i].opt != NULL); 444 assert (optList[i].opt != NULL);
449#endif
450 rxvt_log (" %s%s %-*s%s%s\n", 445 rxvt_log (" %s%s %-*s%s%s\n",
451 (optList_isBool (i) ? "-/+" : "-"), optList[i].opt, 446 (optList_isBool (i) ? "-/+" : "-"), optList[i].opt,
452 (INDENT - strlen (optList[i].opt) 447 (INDENT - strlen (optList[i].opt)
453 + (optList_isBool (i) ? 0 : 2)), 448 + (optList_isBool (i) ? 0 : 2)),
454 (optList[i].arg ? optList[i].arg : ""), 449 (optList[i].arg ? optList[i].arg : ""),
455 (optList_isBool (i) ? "turn on/off " : ""), 450 (optList_isBool (i) ? "turn on/off " : ""),
456 optList[i].desc); 451 optList[i].desc);
457 } 452 }
453
454#if ENABLE_PERL
455 rxvt_perl.init (this);
456 rxvt_perl.usage (this, 1);
457#endif
458
458 rxvt_log ("\n --help to list long-options"); 459 rxvt_log ("\n --help to list long-options");
459 break; 460 break;
460 461
461 case 2: /* full resource listing */ 462 case 2: /* full resource listing */
462 rxvt_log (" [options] [-e command args]\n\n" 463 rxvt_log (" [options] [-e command args]\n\n"
463 "where resources (long-options) include:\n"); 464 "where resources (long-options) include:\n");
464 465
465 for (i = 0; i < optList_size; i++) 466 for (i = 0; i < ecb_array_length (optList); i++)
466 if (optList[i].kw != NULL) 467 if (optList[i].kw != NULL)
467 rxvt_log (" %s: %*s%s\n", 468 rxvt_log (" %s: %*s%s\n",
468 optList[i].kw, 469 optList[i].kw,
469 (INDENT - strlen (optList[i].kw)), "", /* XXX */ 470 (INDENT + 2 - strlen (optList[i].kw)), "", /* XXX */
470 (optList_isBool (i) ? "boolean" : optList[i].arg)); 471 (optList_isBool (i) ? "boolean" : optList[i].arg));
471#ifdef KEYSYM_RESOURCE 472
472 rxvt_log (" " "keysym.sym" ": %*s%s\n", 473#if ENABLE_PERL
473 (INDENT - sizeof ("keysym.sym") + 1), "", /* XXX */ 474 rxvt_perl.init (this);
474 "keysym"); 475 rxvt_perl.usage (this, 2);
475#endif 476#endif
477
476 rxvt_log ("\n -help to list options"); 478 rxvt_log ("\n -help to list options");
477 break; 479 break;
478 } 480 }
479 481
480 rxvt_log ("\n\n"); 482 rxvt_log ("\n\n");
481 rxvt_exit_failure (); 483 rxvt_exit_failure ();
482 /* NOTREACHED */
483} 484}
484 485
485/*}}} */ 486/*}}} */
486 487
487/*{{{ get command-line options before getting resources */ 488/*{{{ get command-line options before getting resources */
488void 489const char **
489rxvt_term::get_options (int argc, const char *const *argv) 490rxvt_term::get_options (int argc, const char *const *argv)
490{ 491{
491 int i, bad_option = 0; 492 int i, bad_option = 0;
492 493
493 for (i = 1; i < argc; i++) 494 for (i = 1; i < argc; i++)
494 { 495 {
495 unsigned int entry, longopt = 0; 496 unsigned int entry, longopt = 0;
496 const char *flag, *opt; 497 const char *opt;
498 int flag;
497 499
498 opt = argv[i]; 500 opt = argv[i];
499 501
500 if (*opt == '-') 502 if (*opt == '-')
501 { 503 {
502 flag = resval_on; 504 flag = 1;
503 505
504 if (*++opt == '-') 506 if (*++opt == '-')
505 longopt = *opt++; /* long option */ 507 longopt = *opt++; /* long option */
506 } 508 }
507 else if (*opt == '+') 509 else if (*opt == '+')
508 { 510 {
509 flag = resval_off; 511 flag = 0;
510 512
511 if (*++opt == '+') 513 if (*++opt == '+')
512 longopt = *opt++; /* long option */ 514 longopt = *opt++; /* long option */
513 } 515 }
514 else 516 else
… …
523 525
524 if (!strcmp (opt, "h")) 526 if (!strcmp (opt, "h"))
525 rxvt_usage (0); 527 rxvt_usage (0);
526 528
527 /* feature: always try to match long-options */ 529 /* feature: always try to match long-options */
528 for (entry = 0; entry < optList_size; entry++) 530 for (entry = 0; entry < ecb_array_length (optList); entry++)
529 if ((optList[entry].kw && !strcmp (opt, optList[entry].kw)) 531 if ((optList[entry].kw && !strcmp (opt, optList[entry].kw))
530 || (!longopt 532 || (!longopt
531 && optList[entry].opt && !strcmp (opt, optList[entry].opt))) 533 && optList[entry].opt && !strcmp (opt, optList[entry].opt)))
532 break; 534 break;
533 535
534 if (entry < optList_size) 536 if (entry < ecb_array_length (optList)
537 && !optList_isInfo (entry))
535 { 538 {
536 if (optList_isReverse (entry)) 539 if (optList_isReverse (entry))
537 flag = flag == resval_on ? resval_off : resval_on; 540 flag = !flag;
538 541
539 if (optList_strlen (entry)) 542 if (optList_isString (entry))
540 { 543 {
541 /* 544 /*
542 * special cases are handled in main.c:main () to allow 545 * special cases are handled in init_resources () to allow
543 * X resources to set these values before we settle for 546 * X resources to set these values before we settle for
544 * default values 547 * default values
545 */ 548 */
546 549
547 if (optList[entry].doff != -1) 550 if (optList[entry].doff != -1)
548 { 551 {
549 if (flag == resval_on && !argv [i+1]) 552 if (flag && i + 1 == argc)
550 rxvt_fatal ("option '%s' needs an argument, aborting.\n", argv [i]); 553 rxvt_fatal ("option '%s' requires an argument, aborting.\n", argv [i]);
551 554
552 rs[optList[entry].doff] = flag == resval_on ? argv[++i] : resval_undef; 555 rs[optList[entry].doff] = flag ? argv[++i] : resval_undef;
553 } 556 }
554 } 557 }
555 else 558 else
559 {
556 { /* boolean value */ 560 /* boolean value */
557 set_option (optList[entry].index, flag == resval_on); 561 set_option (optList[entry].index, flag);
558 562
559 if (optList[entry].doff != -1) 563 if (optList[entry].doff != -1)
560 rs[optList[entry].doff] = flag; 564 rs[optList[entry].doff] = flag ? resval_on : resval_off;
561 } 565 }
562 } 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 }
563 else 593 else
564#ifdef KEYSYM_RESOURCE 594 {
565 /* if (!strncmp (opt, "keysym.", sizeof ("keysym.") - 1)) */ 595#if ENABLE_PERL
566 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]))
567 { 599 {
568 const char *str = argv[++i]; 600 if (flags & rxvt_perl.RESOURCE_ARG)
569 601 {
570 if (str != NULL) 602 if (i + 1 == argc)
571 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 }
572 } 610 }
573 else 611 else
574#endif 612#endif
575 { 613 {
576 bad_option = 1;
577 rxvt_warn ("\"%s\": unknown or malformed option.\n", opt); 614 rxvt_warn ("\"%s\": unknown or malformed option.\n", opt);
615 bad_option = 1;
578 } 616 }
617 }
579 } 618 }
580 619
581 if (bad_option) 620 if (bad_option)
582 rxvt_usage (0); 621 rxvt_usage (0);
622
623 return 0;
583} 624}
584 625
585/*}}} */ 626/*}}} */
586 627
587#ifndef NO_RESOURCES 628#ifndef NO_RESOURCES
… …
592 * Define key from XrmEnumerateDatabase. 633 * Define key from XrmEnumerateDatabase.
593 * quarks will be something like 634 * quarks will be something like
594 * "rxvt" "keysym" "0xFF01" 635 * "rxvt" "keysym" "0xFF01"
595 * value will be a string 636 * value will be a string
596 */ 637 */
597/* ARGSUSED */ 638static int
598int
599rxvt_define_key (XrmDatabase *database UNUSED, 639rxvt_define_key (XrmDatabase *database ecb_unused,
600 XrmBindingList bindings UNUSED, 640 XrmBindingList bindings ecb_unused,
601 XrmQuarkList quarks, 641 XrmQuarkList quarks,
602 XrmRepresentation *type UNUSED, 642 XrmRepresentation *type ecb_unused,
603 XrmValue *value, 643 XrmValue *value,
604 XPointer closure UNUSED) 644 XPointer closure)
605{ 645{
646 rxvt_term *term = (rxvt_term *)closure;
606 int last; 647 int last;
607 648
608 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 */
609 ; 650 ;
610 651
611 last--; 652 last--;
612 GET_R->parse_keysym (XrmQuarkToString (quarks[last]), (char *)value->addr);//D//TODO 653 term->bind_action (XrmQuarkToString (quarks[last]), (char *)value->addr);
613 return False; 654 return False;
614} 655}
615 656
616/* 657/*
617 * look for something like this (XK_Delete) 658 * look for something like this (XK_Delete)
618 * rxvt*keysym.0xFFFF: "\177" 659 * rxvt*keysym.0xFFFF: "\177"
619 *
620 * arg will be
621 * NULL for ~/.Xdefaults and
622 * non-NULL for command-line options (need to allocate)
623 */ 660 */
624#define NEWARGLIM 500 /* `reasonable' size */
625 661
626struct keysym_vocabulary_t 662struct keysym_vocabulary_t
627{ 663{
628 const char *name; 664 const char *name;
629 unsigned short len; 665 unsigned short len;
630 unsigned short value; 666 unsigned short value;
631}; 667};
632keysym_vocabulary_t keysym_vocabulary[] = 668static const keysym_vocabulary_t keysym_vocabulary[] =
633{ 669{
634 { "ISOLevel3", 9, Level3Mask }, 670 { "ISOLevel3", 9, Level3Mask },
635 { "AppKeypad", 9, AppKeypadMask }, 671 { "AppKeypad", 9, AppKeypadMask },
636 { "Control", 7, ControlMask }, 672 { "Control", 7, ControlMask },
637 { "NumLock", 7, NumLockMask }, 673 { "NumLock", 7, NumLockMask },
… …
657 { "4", 1, Mod4Mask }, 693 { "4", 1, Mod4Mask },
658 { "5", 1, Mod5Mask }, 694 { "5", 1, Mod5Mask },
659}; 695};
660 696
661int 697int
662rxvt_term::parse_keysym (const char *str, const char *arg) 698rxvt_term::bind_action (const char *str, const char *arg)
663{ 699{
664 int n, sym; 700 int sym;
665 unsigned int state = 0; 701 unsigned int state = 0;
666 const char *pmodend = NULL; 702 const char *key = strrchr (str, '-');
667 char *newarg = NULL;
668 char newargstr[NEWARGLIM];
669 703
670 if (arg == NULL) 704 if (!key)
671 { 705 key = str;
672 if ((n = rxvt_Str_match (str, "keysym.")) == 0)
673 return 0;
674
675 str += n; /* skip `keysym.' */
676 if (!(pmodend = strchr (str, ':')))
677 return -1;
678 }
679 else 706 else
680 pmodend = str + strlen(str); 707 key++;
681 708
682 for (--pmodend; str < pmodend; --pmodend) 709 // string or key is empty
683 if (*pmodend == '-') 710 if (*arg == '\0' || *key == '\0')
684 break; 711 return -1;
685 712
713 // parse modifiers
686 while (str < pmodend) 714 while (str < key)
687 { 715 {
688 unsigned int i; 716 unsigned int i;
689 717
690 for (i=0; i < sizeof (keysym_vocabulary) / sizeof (keysym_vocabulary_t); ++i) 718 for (i = 0; i < ecb_array_length (keysym_vocabulary); ++i)
691 { 719 {
692 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)
693 { 721 {
694 state |= keysym_vocabulary[i].value; 722 state |= keysym_vocabulary[i].value;
695 str += keysym_vocabulary[i].len; 723 str += keysym_vocabulary[i].len;
696 break; 724 break;
697 } 725 }
698 } 726 }
699 727
700 if (i >= sizeof (keysym_vocabulary) / sizeof (keysym_vocabulary_t)) 728 if (i >= ecb_array_length (keysym_vocabulary))
701 return -1; 729 return -1;
702 730
703 if (*str == '-') 731 if (*str == '-')
704 ++str; 732 ++str;
705 } 733 }
706 734
707 /* some scanf () have trouble with a 0x prefix */ 735 // convert keysym name to keysym number
708 if (str[0] == '0' && toupper (str[1]) == 'X') 736 if ((sym = XStringToKeysym (str)) == None)
709 { 737 {
710 str += 2; 738 // fallback on hexadecimal parsing
711 739 char *end;
740 sym = strtol (str, &end, 16);
712 if (arg) 741 if (*end)
713 {
714 if (sscanf (str, (strchr (str, ':') ? "%x:" : "%x"), &sym) != 1)
715 return -1;
716 }
717 else
718 {
719 if (sscanf (str, "%x:", &sym) != 1)
720 return -1;
721
722 /* cue to ':', it's there since sscanf () worked */
723 strncpy (newargstr, strchr (str, ':') + 1, NEWARGLIM - 1);
724 newargstr[NEWARGLIM - 1] = '\0';
725 newarg = newargstr;
726 }
727 }
728 else
729 {
730 /*
731 * convert keysym name to keysym number
732 */
733 strncpy (newargstr, str, NEWARGLIM - 1);
734 newargstr[NEWARGLIM - 1] = '\0';
735
736 if (arg == NULL)
737 {
738 if ((newarg = strchr (newargstr, ':')) == NULL)
739 return -1;
740
741 *newarg++ = '\0'; /* terminate keysym name */
742 }
743
744 if ((sym = XStringToKeysym (newargstr)) == None)
745 return -1; 742 return -1;
746 } 743 }
747 744
748 if (newarg == NULL) 745 wchar_t *ws = rxvt_mbstowcs (arg);
749 { 746 if (!HOOK_INVOKE ((this, HOOK_REGISTER_COMMAND, DT_INT, sym, DT_INT, state, DT_WCS_LEN, ws, wcslen (ws), DT_END)))
750 strncpy (newargstr, arg, NEWARGLIM - 1);
751 newargstr[NEWARGLIM - 1] = '\0';
752 newarg = newargstr;
753 }
754
755 rxvt_Str_trim (newarg);
756 if (*newarg == '\0' || (n = rxvt_Str_escaped (newarg)) == 0)
757 return -1;
758
759 keyboard->register_user_translation (sym, state, newarg); 747 keyboard->register_action (sym, state, ws);
748
749 free (ws);
760 return 1; 750 return 1;
761} 751}
762 752
763# endif /* KEYSYM_RESOURCE */ 753# endif /* KEYSYM_RESOURCE */
764#endif /* NO_RESOURCES */ 754#endif /* NO_RESOURCES */
765 755
766static char * 756static char *
767get_res (XrmDatabase database, const char *program, const char *option) 757get_res (XrmDatabase database, const char *program, const char *option)
768{ 758{
769 char resource[512]; 759 char resource[512];
… …
801 791
802void 792void
803rxvt_term::extract_resources () 793rxvt_term::extract_resources ()
804{ 794{
805#ifndef NO_RESOURCES 795#ifndef NO_RESOURCES
796 XrmDatabase database = XrmGetDatabase (dpy);
797 XrmMergeDatabases (option_db, &database);
798 option_db = NULL;
806 /* 799 /*
807 * Query resources for options that affect us 800 * Query resources for options that affect us
808 */ 801 */
809 for (int entry = 0; entry < optList_size; entry++) 802 for (int entry = 0; entry < ecb_array_length (optList); entry++)
810 { 803 {
811 int s; 804 int s;
812 const char *kw = optList[entry].kw; 805 const char *kw = optList[entry].kw;
813 806
814 if (kw == NULL || rs[optList[entry].doff] != NULL) 807 if (kw == NULL || rs[optList[entry].doff] != NULL)
… …
834 827
835 set_option (optList[entry].index, s); 828 set_option (optList[entry].index, s);
836 } 829 }
837 } 830 }
838 } 831 }
832#endif /* NO_RESOURCES */
833}
839 834
835void
836rxvt_term::extract_keysym_resources ()
837{
838#ifndef NO_RESOURCES
840 /* 839 /*
841 * [R5 or later]: enumerate the resource database 840 * [R5 or later]: enumerate the resource database
842 */ 841 */
843# ifdef KEYSYM_RESOURCE 842# ifdef KEYSYM_RESOURCE
844 XrmDatabase database = XrmGetDatabase (dpy); 843 XrmDatabase database = XrmGetDatabase (dpy);
… …
851 class_prefix[0] = XrmStringToName (RESCLASS); 850 class_prefix[0] = XrmStringToName (RESCLASS);
852 class_prefix[1] = XrmStringToName ("Keysym"); 851 class_prefix[1] = XrmStringToName ("Keysym");
853 class_prefix[2] = NULLQUARK; 852 class_prefix[2] = NULLQUARK;
854 /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */ 853 /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */
855 XrmEnumerateDatabase (database, name_prefix, class_prefix, 854 XrmEnumerateDatabase (database, name_prefix, class_prefix,
856 XrmEnumOneLevel, rxvt_define_key, NULL); 855 XrmEnumOneLevel, rxvt_define_key, (XPointer)this);
857# ifdef RESFALLBACK 856# ifdef RESFALLBACK
858 name_prefix[0] = XrmStringToName (RESFALLBACK);
859 name_prefix[1] = XrmStringToName ("keysym");
860 class_prefix[0] = XrmStringToName (RESFALLBACK); 857 name_prefix[0] = class_prefix[0] = XrmStringToName (RESFALLBACK);
861 class_prefix[1] = XrmStringToName ("Keysym");
862 /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */ 858 /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */
863 XrmEnumerateDatabase (database, name_prefix, class_prefix, 859 XrmEnumerateDatabase (database, name_prefix, class_prefix,
864 XrmEnumOneLevel, rxvt_define_key, NULL); 860 XrmEnumOneLevel, rxvt_define_key, (XPointer)this);
865# endif 861# endif
866# endif 862# endif
867 863
868#endif /* NO_RESOURCES */ 864#endif /* NO_RESOURCES */
869} 865}
870 866
871/*----------------------- end-of-file (C source) -----------------------*/ 867/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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