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.98 by root, Tue May 1 14:46:23 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
… …
54#define RSTRG(rsp, kw, arg) \ 60#define RSTRG(rsp, kw, arg) \
55 {0, 0, (rsp), (kw), NULL, (arg), NULL} 61 {0, 0, (rsp), (kw), NULL, (arg), NULL}
56 62
57/* BOOL () - regular boolean `-/+' flag */ 63/* BOOL () - regular boolean `-/+' flag */
58#define BOOL(rsp, kw, opt, option, flag, desc) \ 64#define BOOL(rsp, kw, opt, option, flag, desc) \
59 { option ## _idx, (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 ## _idx, (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
129# if ENABLE_FRILLS
130 BOOL (Rs_urgentOnBell, "urgentOnBell", NULL, Opt_urgentOnBell, 0, NULL),
131# endif
126 BOOL (Rs_visualBell, "visualBell", "vb", Opt_visualBell, 0, "visual bell"), 132 BOOL (Rs_visualBell, "visualBell", "vb", Opt_visualBell, 0, "visual bell"),
127# if ! defined(NO_MAPALERT) && defined(MAPALERT_OPTION) 133# if ! defined(NO_MAPALERT) && defined(MAPALERT_OPTION)
128 BOOL (Rs_mapAlert, "mapAlert", NULL, Opt_mapAlert, 0, NULL), 134 BOOL (Rs_mapAlert, "mapAlert", NULL, Opt_mapAlert, 0, NULL),
129# endif 135# endif
130#endif 136#endif
… …
166#ifndef NO_BOLD_UNDERLINE_REVERSE 172#ifndef NO_BOLD_UNDERLINE_REVERSE
167 RSTRG (Rs_color + Color_BD, "colorBD", "color"), 173 RSTRG (Rs_color + Color_BD, "colorBD", "color"),
168 RSTRG (Rs_color + Color_IT, "colorIT", "color"), 174 RSTRG (Rs_color + Color_IT, "colorIT", "color"),
169 RSTRG (Rs_color + Color_UL, "colorUL", "color"), 175 RSTRG (Rs_color + Color_UL, "colorUL", "color"),
170 RSTRG (Rs_color + Color_RV, "colorRV", "color"), 176 RSTRG (Rs_color + Color_RV, "colorRV", "color"),
171#endif /* ! NO_BOLD_UNDERLINE_REVERSE */ 177#endif /* ! NO_BOLD_UNDERLINE_REVERSE */
172#if ENABLE_FRILLS 178#if ENABLE_FRILLS
173 RSTRG (Rs_color + Color_underline, "underlineColor", "color"), 179 RSTRG (Rs_color + Color_underline, "underlineColor", "color"),
174#endif 180#endif
175#ifdef KEEP_SCROLLCOLOR
176 RSTRG (Rs_color + Color_scroll, "scrollColor", "color"), 181 RSTRG (Rs_color + Color_scroll, "scrollColor", "color"),
182#ifdef RXVT_SCROLLBAR
177 RSTRG (Rs_color + Color_trough, "troughColor", "color"), 183 RSTRG (Rs_color + Color_trough, "troughColor", "color"),
178#endif /* KEEP_SCROLLCOLOR */ 184#endif
179#ifdef OPTION_HC 185#ifdef OPTION_HC
180 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"),
181#endif 188#endif
182#ifndef NO_CURSORCOLOR 189#ifndef NO_CURSORCOLOR
183 STRG (Rs_color + Color_cursor, "cursorColor", "cr", "color", "cursor color"), 190 STRG (Rs_color + Color_cursor, "cursorColor", "cr", "color", "cursor color"),
184 /* command-line option = resource name */ 191 /* command-line option = resource name */
185 RSTRG (Rs_color + Color_cursor2, "cursorColor2", "color"), 192 RSTRG (Rs_color + Color_cursor2, "cursorColor2", "color"),
186#endif /* NO_CURSORCOLOR */ 193#endif /* NO_CURSORCOLOR */
187 STRG (Rs_color + Color_pointer_fg, "pointerColor", "pr", "color", "pointer color"), 194 STRG (Rs_color + Color_pointer_fg, "pointerColor", "pr", "color", "pointer color"),
188 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"),
189 STRG (Rs_color + Color_border, "borderColor", "bd", "color", "border color"), 196 STRG (Rs_color + Color_border, "borderColor", "bd", "color", "border color"),
190#ifdef XPM_BACKGROUND 197#if BG_IMAGE_FROM_FILE
191 RSTRG (Rs_path, "path", "search path"), 198 RSTRG (Rs_path, "path", "search path"),
192 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"),
193#endif 203#endif
194 /* fonts: command-line option = resource name */ 204 /* fonts: command-line option = resource name */
195 STRG (Rs_font, "font", "fn", "fontname", "normal text font"), 205 STRG (Rs_font, "font", "fn", "fontname", "normal text font"),
196#if ENABLE_STYLES 206#if ENABLE_STYLES
197 STRG (Rs_boldFont, "boldFont", "fb", "fontname", "bold font"), 207 STRG (Rs_boldFont, "boldFont", "fb", "fontname", "bold font"),
198 STRG (Rs_italicFont, "italicFont", "fi", "fontname", "italic font"), 208 STRG (Rs_italicFont, "italicFont", "fi", "fontname", "italic font"),
199 STRG (Rs_boldItalicFont, "boldItalicFont", "fbi", "fontname", "bold italic font"), 209 STRG (Rs_boldItalicFont, "boldItalicFont", "fbi", "fontname", "bold italic font"),
200 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"),
201#endif 211#endif
202#ifdef USE_XIM 212#if USE_XIM
203 STRG (Rs_inputMethod, "inputMethod", "im", "name", "name of input method"), 213 STRG (Rs_inputMethod, "inputMethod", "im", "name", "name of input method"),
204 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"),
205 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"),
206 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"),
207#endif /* USE_XIM */ 217#endif /* USE_XIM */
208 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"),
209 STRG (Rs_title, "title", "title", "string", "title name for window"), 219 STRG (Rs_title, "title", "title", "string", "title name for window"),
210 STRG (Rs_title, NULL, "T", NULL, NULL), /* short form */ 220 STRG (Rs_title, NULL, "T", NULL, NULL), /* short form */
211 STRG (Rs_iconName, "iconName", "n", "string", "icon name for window"), 221 STRG (Rs_iconName, "iconName", "n", "string", "icon name for window"),
212 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"),
213#if ENABLE_XEMBED 223#if ENABLE_XEMBED
214 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"),
215#endif 225#endif
216#if XFT 226#if XFT
227 BOOL (Rs_buffered, "buffered", NULL, Opt_buffered, 0, NULL),
228#endif
229#if ENABLE_FRILLS
217 STRG (Rs_depth, "depth", "depth", "number", "depth of visual to request"), 230 STRG (Rs_depth, "depth", "depth", "number", "depth of visual to request"),
218#endif 231 STRG (Rs_visual, "visual", "visual", "number", "visual id to request"),
219#if ENABLE_FRILLS
220 RSTRG (Rs_transient_for, "transient-for", "windowid"), 232 RSTRG (Rs_transient_for, "transient-for", "windowid"),
221 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"),
222 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"),
223 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"),
224 STRG (Rs_ext_bwidth, "externalBorder", "w", "number", "external border in pixels"), 236 STRG (Rs_ext_bwidth, "externalBorder", "w", "number", "external border in pixels"),
225 STRG (Rs_ext_bwidth, NULL, "bw", NULL, NULL), 237 STRG (Rs_ext_bwidth, NULL, "bw", NULL, NULL),
226 STRG (Rs_ext_bwidth, NULL, "borderwidth", NULL, NULL), 238 STRG (Rs_ext_bwidth, NULL, "borderwidth", NULL, NULL),
227 STRG (Rs_int_bwidth, "internalBorder", "b", "number", "internal border in pixels"), 239 STRG (Rs_int_bwidth, "internalBorder", "b", "number", "internal border in pixels"),
228 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
229 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"),
230 STRG (Rs_lineSpace, "lineSpace", "lsp", "number", "number of extra pixels between rows"),
231#endif 246#endif
232#ifdef POINTER_BLANK 247#ifdef POINTER_BLANK
233 RSTRG (Rs_pointerBlankDelay, "pointerBlankDelay", "number"), 248 RSTRG (Rs_pointerBlankDelay, "pointerBlankDelay", "number"),
234#endif 249#endif
235#ifndef NO_BACKSPACE_KEY 250#ifndef NO_BACKSPACE_KEY
236 RSTRG (Rs_backspace_key, "backspacekey", "string"), 251 RSTRG (Rs_backspace_key, "backspacekey", "string"),
237#endif 252#endif
238#ifndef NO_DELETE_KEY 253#ifndef NO_DELETE_KEY
239 RSTRG (Rs_delete_key, "deletekey", "string"), 254 RSTRG (Rs_delete_key, "deletekey", "string"),
240#endif 255#endif
241 RSTRG (Rs_selectstyle, "selectstyle", "mode"),
242#ifdef PRINTPIPE 256#ifdef PRINTPIPE
243 RSTRG (Rs_print_pipe, "print-pipe", "string"), 257 RSTRG (Rs_print_pipe, "print-pipe", "string"),
244#endif 258#endif
245 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"),
246#ifdef CUTCHAR_RESOURCE
247 RSTRG (Rs_cutchars, "cutchars", "string"), 260 RSTRG (Rs_cutchars, "cutchars", "string"),
248#endif /* CUTCHAR_RESOURCE */
249 RSTRG (Rs_answerbackstring, "answerbackString", "string"), 261 RSTRG (Rs_answerbackstring, "answerbackString", "string"),
250#ifndef NO_SECONDARY_SCREEN 262#ifndef NO_SECONDARY_SCREEN
251 BOOL (Rs_secondaryScreen, "secondaryScreen", "ssc", Opt_secondaryScreen, 0, "enable secondary screen"), 263 BOOL (Rs_secondaryScreen, "secondaryScreen", "ssc", Opt_secondaryScreen, 0, "enable secondary screen"),
252 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"),
253#endif 265#endif
… …
255 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
256 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
257 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
258 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"),
259#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
260#ifndef NO_RESOURCES 276#ifndef NO_RESOURCES
261 INFO ("xrm", "string", "X resource"), 277 RINFO ("xrm", "string"),
278#endif
279#ifdef KEYSYM_RESOURCE
280 RINFO ("keysym.sym", "keysym"),
262#endif 281#endif
263 INFO ("e", "command arg ...", "command to execute") 282 INFO ("e", "command arg ...", "command to execute")
264 }; 283 };
265 284
266#undef INFO 285#undef INFO
286#undef RINFO
267#undef STRG 287#undef STRG
268#undef RSTRG 288#undef RSTRG
269#undef SWCH 289#undef SWCH
270#undef BOOL 290#undef BOOL
271 291
… …
310#endif 330#endif
311 "," 331 ","
312#if OFF_FOCUS_FADING 332#if OFF_FOCUS_FADING
313 "fade," 333 "fade,"
314#endif 334#endif
315#if defined(XPM_BACKGROUND)
316 "XPM,"
317#endif
318#if defined(TRANSPARENT) 335#if defined(ENABLE_TRANSPARENCY)
319 "transparent," 336 "transparent,"
320#endif
321#if TINTING
322 "tint," 337 "tint,"
338#endif
339#if HAVE_PIXBUF
340 "pixbuf,"
323#endif 341#endif
324#if defined(USE_XIM) 342#if defined(USE_XIM)
325 "XIM," 343 "XIM,"
326#endif 344#endif
327#if defined(NO_BACKSPACE_KEY) 345#if defined(NO_BACKSPACE_KEY)
… …
355 "pointerBlank," 373 "pointerBlank,"
356#endif 374#endif
357#if defined(NO_RESOURCES) 375#if defined(NO_RESOURCES)
358 "NoResources," 376 "NoResources,"
359#endif 377#endif
360 "scrollbars=" 378 "scrollbars=plain"
361#if !defined(HAVE_SCROLLBARS)
362 "NONE"
363#else
364# if defined(PLAIN_SCROLLBAR)
365 "plain"
366# if defined(RXVT_SCROLLBAR) || defined(NEXT_SCROLLBAR) || defined(XTERM_SCROLLBAR)
367 "+"
368# endif
369# endif
370# if defined(RXVT_SCROLLBAR) 379#if defined(RXVT_SCROLLBAR)
371 "rxvt" 380 "+rxvt"
372# if defined(NEXT_SCROLLBAR) || defined(XTERM_SCROLLBAR)
373 "+"
374# endif
375# endif 381#endif
376# if defined(NEXT_SCROLLBAR) 382#if defined(NEXT_SCROLLBAR)
377 "NeXT" 383 "+NeXT"
378# if defined(XTERM_SCROLLBAR)
379 "+"
380# endif
381# endif 384#endif
382# if defined(XTERM_SCROLLBAR) 385#if defined(XTERM_SCROLLBAR)
383 "xterm" 386 "+xterm"
384# endif
385#endif 387#endif
386 "\nUsage: "; /* Usage */ 388 "\nUsage: "; /* Usage */
387 389
388#define INDENT 18 390#define INDENT 28
389 391
390const char rxvt_term::resval_undef [] = "<undef>"; 392const char rxvt_term::resval_undef [] = "<undef>";
391const char rxvt_term::resval_on [] = "on"; 393const char rxvt_term::resval_on [] = "on";
392const char rxvt_term::resval_off [] = "off"; 394const char rxvt_term::resval_off [] = "off";
393 395
394/*{{{ usage: */ 396/*{{{ usage: */
395/*----------------------------------------------------------------------*/ 397/*----------------------------------------------------------------------*/
396static void 398void
397rxvt_usage (int type) 399rxvt_term::rxvt_usage (int type)
398{ 400{
399 unsigned int i, col; 401 unsigned int i, col;
400 402
401 rxvt_log ("%s%s%s", releasestring, optionsstring, RESNAME); 403 rxvt_log ("%s%s%s", releasestring, optionsstring, RESNAME);
402 404
403 switch (type) 405 switch (type)
404 { 406 {
405 case 0: /* brief listing */ 407 case 0: /* brief listing */
406 rxvt_log (" [-help] [--help]\n"); 408 rxvt_log (" [-help] [--help]\n");
407 409
408 for (col = 1, i = 0; i < optList_size; i++) 410 for (col = 1, i = 0; i < ecb_array_length (optList); i++)
409 if (optList[i].desc != NULL) 411 if (optList[i].desc != NULL)
410 { 412 {
411 int len = 0; 413 int len = 0;
412 414
413 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)
414 { 423 {
415 len = optList_strlen (i);
416 if (len > 0)
417 len++; /* account for space */
418 }
419#ifdef DEBUG_STRICT
420 assert (optList[i].opt != NULL);
421#endif
422 len += 4 + strlen (optList[i].opt) + (optList_isBool (i) ? 2: 0);
423 col += len;
424 if (col > 79)
425 { /* assume regular width */ 424 /* assume regular width */
426 rxvt_log ("\n"); 425 rxvt_log ("\n");
427 col = 1 + len; 426 col = 1 + len;
428 } 427 }
429 428
430 rxvt_log (" [-%s%s", (optList_isBool (i) ? "/+" : ""), optList[i].opt); 429 rxvt_log (" [-%s%s", (optList_isBool (i) ? "/+" : ""), optList[i].opt);
430
431 if (optList_strlen (i)) 431 if (optList[i].arg)
432 rxvt_log (" %s]", optList[i].arg); 432 rxvt_log (" %s]", optList[i].arg);
433 else 433 else
434 rxvt_log ("]"); 434 rxvt_log ("]");
435 } 435 }
436 break; 436 break;
437 437
438 case 1: /* full command-line listing */ 438 case 1: /* full command-line listing */
439 rxvt_log (" [options] [-e command args]\n\nwhere options include:\n"); 439 rxvt_log (" [options] [-e command args]\n\nwhere options include:\n");
440 440
441 for (i = 0; i < optList_size; i++) 441 for (i = 0; i < ecb_array_length (optList); i++)
442 if (optList[i].desc != NULL) 442 if (optList[i].desc != NULL)
443 { 443 {
444#ifdef DEBUG_STRICT
445 assert (optList[i].opt != NULL); 444 assert (optList[i].opt != NULL);
446#endif
447 rxvt_log (" %s%s %-*s%s%s\n", 445 rxvt_log (" %s%s %-*s%s%s\n",
448 (optList_isBool (i) ? "-/+" : "-"), optList[i].opt, 446 (optList_isBool (i) ? "-/+" : "-"), optList[i].opt,
449 (INDENT - strlen (optList[i].opt) 447 (INDENT - strlen (optList[i].opt)
450 + (optList_isBool (i) ? 0 : 2)), 448 + (optList_isBool (i) ? 0 : 2)),
451 (optList[i].arg ? optList[i].arg : ""), 449 (optList[i].arg ? optList[i].arg : ""),
452 (optList_isBool (i) ? "turn on/off " : ""), 450 (optList_isBool (i) ? "turn on/off " : ""),
453 optList[i].desc); 451 optList[i].desc);
454 } 452 }
453
454#if ENABLE_PERL
455 rxvt_perl.init (this);
456 rxvt_perl.usage (this, 1);
457#endif
458
455 rxvt_log ("\n --help to list long-options"); 459 rxvt_log ("\n --help to list long-options");
456 break; 460 break;
457 461
458 case 2: /* full resource listing */ 462 case 2: /* full resource listing */
459 rxvt_log (" [options] [-e command args]\n\n" 463 rxvt_log (" [options] [-e command args]\n\n"
460 "where resources (long-options) include:\n"); 464 "where resources (long-options) include:\n");
461 465
462 for (i = 0; i < optList_size; i++) 466 for (i = 0; i < ecb_array_length (optList); i++)
463 if (optList[i].kw != NULL) 467 if (optList[i].kw != NULL)
464 rxvt_log (" %s: %*s%s\n", 468 rxvt_log (" %s: %*s%s\n",
465 optList[i].kw, 469 optList[i].kw,
466 (INDENT - strlen (optList[i].kw)), "", /* XXX */ 470 (INDENT + 2 - strlen (optList[i].kw)), "", /* XXX */
467 (optList_isBool (i) ? "boolean" : optList[i].arg)); 471 (optList_isBool (i) ? "boolean" : optList[i].arg));
468#ifdef KEYSYM_RESOURCE 472
469 rxvt_log (" " "keysym.sym" ": %*s%s\n", 473#if ENABLE_PERL
470 (INDENT - sizeof ("keysym.sym") + 1), "", /* XXX */ 474 rxvt_perl.init (this);
471 "keysym"); 475 rxvt_perl.usage (this, 2);
472#endif 476#endif
477
473 rxvt_log ("\n -help to list options"); 478 rxvt_log ("\n -help to list options");
474 break; 479 break;
475 } 480 }
476 481
477 rxvt_log ("\n\n"); 482 rxvt_log ("\n\n");
478 rxvt_exit_failure (); 483 rxvt_exit_failure ();
479 /* NOTREACHED */
480} 484}
481 485
482/*}}} */ 486/*}}} */
483 487
484/*{{{ get command-line options before getting resources */ 488/*{{{ get command-line options before getting resources */
485void 489const char **
486rxvt_term::get_options (int argc, const char *const *argv) 490rxvt_term::get_options (int argc, const char *const *argv)
487{ 491{
488 int i, bad_option = 0; 492 int i, bad_option = 0;
489 493
490 for (i = 1; i < argc; i++) 494 for (i = 1; i < argc; i++)
491 { 495 {
492 unsigned int entry, longopt = 0; 496 unsigned int entry, longopt = 0;
493 const char *flag, *opt; 497 const char *opt;
498 int flag;
494 499
495 opt = argv[i]; 500 opt = argv[i];
496 501
497 if (*opt == '-') 502 if (*opt == '-')
498 { 503 {
499 flag = resval_on; 504 flag = 1;
500 505
501 if (*++opt == '-') 506 if (*++opt == '-')
502 longopt = *opt++; /* long option */ 507 longopt = *opt++; /* long option */
503 } 508 }
504 else if (*opt == '+') 509 else if (*opt == '+')
505 { 510 {
506 flag = resval_off; 511 flag = 0;
507 512
508 if (*++opt == '+') 513 if (*++opt == '+')
509 longopt = *opt++; /* long option */ 514 longopt = *opt++; /* long option */
510 } 515 }
511 else 516 else
… …
520 525
521 if (!strcmp (opt, "h")) 526 if (!strcmp (opt, "h"))
522 rxvt_usage (0); 527 rxvt_usage (0);
523 528
524 /* feature: always try to match long-options */ 529 /* feature: always try to match long-options */
525 for (entry = 0; entry < optList_size; entry++) 530 for (entry = 0; entry < ecb_array_length (optList); entry++)
526 if ((optList[entry].kw && !strcmp (opt, optList[entry].kw)) 531 if ((optList[entry].kw && !strcmp (opt, optList[entry].kw))
527 || (!longopt 532 || (!longopt
528 && optList[entry].opt && !strcmp (opt, optList[entry].opt))) 533 && optList[entry].opt && !strcmp (opt, optList[entry].opt)))
529 break; 534 break;
530 535
531 if (entry < optList_size) 536 if (entry < ecb_array_length (optList)
537 && !optList_isInfo (entry))
532 { 538 {
533 if (optList_isReverse (entry)) 539 if (optList_isReverse (entry))
534 flag = flag == resval_on ? resval_off : resval_on; 540 flag = !flag;
535 541
536 if (optList_strlen (entry)) 542 if (optList_isString (entry))
537 { 543 {
538 /* 544 /*
539 * special cases are handled in main.c:main () to allow 545 * special cases are handled in init_resources () to allow
540 * X resources to set these values before we settle for 546 * X resources to set these values before we settle for
541 * default values 547 * default values
542 */ 548 */
543 549
544 if (optList[entry].doff != -1) 550 if (optList[entry].doff != -1)
545 { 551 {
546 if (flag == resval_on && !argv [i+1]) 552 if (flag && i + 1 == argc)
547 rxvt_fatal ("option '%s' needs an argument, aborting.\n", argv [i]); 553 rxvt_fatal ("option '%s' requires an argument, aborting.\n", argv [i]);
548 554
549 rs[optList[entry].doff] = flag == resval_on ? argv[++i] : resval_undef; 555 rs[optList[entry].doff] = flag ? argv[++i] : resval_undef;
550 } 556 }
551 } 557 }
552 else 558 else
559 {
553 { /* boolean value */ 560 /* boolean value */
554 set_option (1UL << optList[entry].index, flag == resval_on); 561 set_option (optList[entry].index, flag);
555 562
556 if (optList[entry].doff != -1) 563 if (optList[entry].doff != -1)
557 rs[optList[entry].doff] = flag; 564 rs[optList[entry].doff] = flag ? resval_on : resval_off;
558 } 565 }
559 } 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 }
560 else 593 else
561#ifdef KEYSYM_RESOURCE 594 {
562 /* if (!strncmp (opt, "keysym.", sizeof ("keysym.") - 1)) */ 595#if ENABLE_PERL
563 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]))
564 { 599 {
565 const char *str = argv[++i]; 600 if (flags & rxvt_perl.RESOURCE_ARG)
566 601 {
567 if (str != NULL) 602 if (i + 1 == argc)
568 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 }
569 } 610 }
570 else 611 else
571#endif 612#endif
572 { 613 {
573 bad_option = 1;
574 rxvt_warn ("\"%s\": unknown or malformed option.\n", opt); 614 rxvt_warn ("\"%s\": unknown or malformed option.\n", opt);
615 bad_option = 1;
575 } 616 }
617 }
576 } 618 }
577 619
578 if (bad_option) 620 if (bad_option)
579 rxvt_usage (0); 621 rxvt_usage (0);
622
623 return 0;
580} 624}
581 625
582/*}}} */ 626/*}}} */
583 627
584#ifndef NO_RESOURCES 628#ifndef NO_RESOURCES
… …
589 * Define key from XrmEnumerateDatabase. 633 * Define key from XrmEnumerateDatabase.
590 * quarks will be something like 634 * quarks will be something like
591 * "rxvt" "keysym" "0xFF01" 635 * "rxvt" "keysym" "0xFF01"
592 * value will be a string 636 * value will be a string
593 */ 637 */
594/* ARGSUSED */ 638static int
595int
596rxvt_define_key (XrmDatabase *database UNUSED, 639rxvt_define_key (XrmDatabase *database ecb_unused,
597 XrmBindingList bindings UNUSED, 640 XrmBindingList bindings ecb_unused,
598 XrmQuarkList quarks, 641 XrmQuarkList quarks,
599 XrmRepresentation *type UNUSED, 642 XrmRepresentation *type ecb_unused,
600 XrmValue *value, 643 XrmValue *value,
601 XPointer closure UNUSED) 644 XPointer closure)
602{ 645{
646 rxvt_term *term = (rxvt_term *)closure;
603 int last; 647 int last;
604 648
605 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 */
606 ; 650 ;
607 651
608 last--; 652 last--;
609 GET_R->parse_keysym (XrmQuarkToString (quarks[last]), (char *)value->addr);//D//TODO 653 term->parse_keysym (XrmQuarkToString (quarks[last]), (char *)value->addr);
610 return False; 654 return False;
611} 655}
612 656
613/* 657/*
614 * look for something like this (XK_Delete) 658 * look for something like this (XK_Delete)
615 * rxvt*keysym.0xFFFF: "\177" 659 * rxvt*keysym.0xFFFF: "\177"
616 *
617 * arg will be
618 * NULL for ~/.Xdefaults and
619 * non-NULL for command-line options (need to allocate)
620 */ 660 */
621#define NEWARGLIM 500 /* `reasonable' size */
622 661
623struct keysym_vocabulary_t 662struct keysym_vocabulary_t
624{ 663{
625 const char *name; 664 const char *name;
626 unsigned short len; 665 unsigned short len;
627 unsigned short value; 666 unsigned short value;
628}; 667};
629keysym_vocabulary_t keysym_vocabulary[] = 668static const keysym_vocabulary_t keysym_vocabulary[] =
630{ 669{
631 { "ISOLevel3", 9, Level3Mask }, 670 { "ISOLevel3", 9, Level3Mask },
632 { "AppKeypad", 9, AppKeypadMask }, 671 { "AppKeypad", 9, AppKeypadMask },
633 { "Control", 7, ControlMask }, 672 { "Control", 7, ControlMask },
634 { "NumLock", 7, NumLockMask }, 673 { "NumLock", 7, NumLockMask },
… …
656}; 695};
657 696
658int 697int
659rxvt_term::parse_keysym (const char *str, const char *arg) 698rxvt_term::parse_keysym (const char *str, const char *arg)
660{ 699{
661 int n, sym; 700 int sym;
662 unsigned int state = 0; 701 unsigned int state = 0;
663 const char *pmodend = NULL; 702 const char *key = strrchr (str, '-');
664 char *newarg = NULL;
665 char newargstr[NEWARGLIM];
666 703
667 if (arg == NULL) 704 if (!key)
668 { 705 key = str;
669 if ((n = rxvt_Str_match (str, "keysym.")) == 0)
670 return 0;
671
672 str += n; /* skip `keysym.' */
673 if (!(pmodend = strchr (str, ':')))
674 return -1;
675 }
676 else 706 else
677 pmodend = str + strlen(str); 707 key++;
678 708
679 for (--pmodend; str < pmodend; --pmodend) 709 // string or key is empty
680 if (*pmodend == '-') 710 if (*arg == '\0' || *key == '\0')
681 break; 711 return -1;
682 712
713 // parse modifiers
683 while (str < pmodend) 714 while (str < key)
684 { 715 {
685 unsigned int i; 716 unsigned int i;
686 717
687 for (i=0; i < sizeof (keysym_vocabulary) / sizeof (keysym_vocabulary_t); ++i) 718 for (i = 0; i < ecb_array_length (keysym_vocabulary); ++i)
688 { 719 {
689 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)
690 { 721 {
691 state |= keysym_vocabulary[i].value; 722 state |= keysym_vocabulary[i].value;
692 str += keysym_vocabulary[i].len; 723 str += keysym_vocabulary[i].len;
693 break; 724 break;
694 } 725 }
695 } 726 }
696 727
697 if (i >= sizeof (keysym_vocabulary) / sizeof (keysym_vocabulary_t)) 728 if (i >= ecb_array_length (keysym_vocabulary))
698 return -1; 729 return -1;
699 730
700 if (*str == '-') 731 if (*str == '-')
701 ++str; 732 ++str;
702 } 733 }
703 734
704 /* some scanf () have trouble with a 0x prefix */ 735 // convert keysym name to keysym number
705 if (str[0] == '0' && toupper (str[1]) == 'X') 736 if ((sym = XStringToKeysym (str)) == None)
706 { 737 {
707 str += 2; 738 // fallback on hexadecimal parsing
708 739 char *end;
740 sym = strtol (str, &end, 16);
709 if (arg) 741 if (*end)
710 {
711 if (sscanf (str, (strchr (str, ':') ? "%x:" : "%x"), &sym) != 1)
712 return -1;
713 }
714 else
715 {
716 if (sscanf (str, "%x:", &sym) != 1)
717 return -1;
718
719 /* cue to ':', it's there since sscanf () worked */
720 strncpy (newargstr, strchr (str, ':') + 1, NEWARGLIM - 1);
721 newargstr[NEWARGLIM - 1] = '\0';
722 newarg = newargstr;
723 }
724 }
725 else
726 {
727 /*
728 * convert keysym name to keysym number
729 */
730 strncpy (newargstr, str, NEWARGLIM - 1);
731 newargstr[NEWARGLIM - 1] = '\0';
732
733 if (arg == NULL)
734 {
735 if ((newarg = strchr (newargstr, ':')) == NULL)
736 return -1;
737
738 *newarg++ = '\0'; /* terminate keysym name */
739 }
740
741 if ((sym = XStringToKeysym (newargstr)) == None)
742 return -1; 742 return -1;
743 } 743 }
744 744
745 if (newarg == NULL) 745 wchar_t *ws = rxvt_mbstowcs (arg);
746 { 746 if (!HOOK_INVOKE ((this, HOOK_REGISTER_COMMAND, DT_INT, sym, DT_INT, state, DT_WCS_LEN, ws, wcslen (ws), DT_END)))
747 strncpy (newargstr, arg, NEWARGLIM - 1);
748 newargstr[NEWARGLIM - 1] = '\0';
749 newarg = newargstr;
750 }
751
752 rxvt_Str_trim (newarg);
753 if (*newarg == '\0' || (n = rxvt_Str_escaped (newarg)) == 0)
754 return -1;
755
756 keyboard->register_user_translation (sym, state, newarg); 747 keyboard->register_user_translation (sym, state, ws);
748
749 free (ws);
757 return 1; 750 return 1;
758} 751}
759 752
760# endif /* KEYSYM_RESOURCE */ 753# endif /* KEYSYM_RESOURCE */
761#endif /* NO_RESOURCES */ 754#endif /* NO_RESOURCES */
762 755
763static char * 756static char *
764get_res (XrmDatabase database, const char *program, const char *option) 757get_res (XrmDatabase database, const char *program, const char *option)
765{ 758{
766 char resource[512]; 759 char resource[512];
… …
798 791
799void 792void
800rxvt_term::extract_resources () 793rxvt_term::extract_resources ()
801{ 794{
802#ifndef NO_RESOURCES 795#ifndef NO_RESOURCES
796 XrmDatabase database = XrmGetDatabase (dpy);
797 XrmMergeDatabases (option_db, &database);
798 option_db = NULL;
803 /* 799 /*
804 * Query resources for options that affect us 800 * Query resources for options that affect us
805 */ 801 */
806 for (int entry = 0; entry < optList_size; entry++) 802 for (int entry = 0; entry < ecb_array_length (optList); entry++)
807 { 803 {
808 int s; 804 int s;
809 const char *kw = optList[entry].kw; 805 const char *kw = optList[entry].kw;
810 806
811 if (kw == NULL || rs[optList[entry].doff] != NULL) 807 if (kw == NULL || rs[optList[entry].doff] != NULL)
… …
827 || strcasecmp (p, "1") == 0; 823 || strcasecmp (p, "1") == 0;
828 824
829 if (optList_isReverse (entry)) 825 if (optList_isReverse (entry))
830 s = !s; 826 s = !s;
831 827
832 set_option (1UL << optList[entry].index, s); 828 set_option (optList[entry].index, s);
833 } 829 }
834 } 830 }
835 } 831 }
832#endif /* NO_RESOURCES */
833}
836 834
835void
836rxvt_term::extract_keysym_resources ()
837{
838#ifndef NO_RESOURCES
837 /* 839 /*
838 * [R5 or later]: enumerate the resource database 840 * [R5 or later]: enumerate the resource database
839 */ 841 */
840# ifdef KEYSYM_RESOURCE 842# ifdef KEYSYM_RESOURCE
841 XrmDatabase database = XrmGetDatabase (dpy); 843 XrmDatabase database = XrmGetDatabase (dpy);
… …
848 class_prefix[0] = XrmStringToName (RESCLASS); 850 class_prefix[0] = XrmStringToName (RESCLASS);
849 class_prefix[1] = XrmStringToName ("Keysym"); 851 class_prefix[1] = XrmStringToName ("Keysym");
850 class_prefix[2] = NULLQUARK; 852 class_prefix[2] = NULLQUARK;
851 /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */ 853 /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */
852 XrmEnumerateDatabase (database, name_prefix, class_prefix, 854 XrmEnumerateDatabase (database, name_prefix, class_prefix,
853 XrmEnumOneLevel, rxvt_define_key, NULL); 855 XrmEnumOneLevel, rxvt_define_key, (XPointer)this);
854# ifdef RESFALLBACK 856# ifdef RESFALLBACK
855 name_prefix[0] = XrmStringToName (RESFALLBACK);
856 name_prefix[1] = XrmStringToName ("keysym");
857 class_prefix[0] = XrmStringToName (RESFALLBACK); 857 name_prefix[0] = class_prefix[0] = XrmStringToName (RESFALLBACK);
858 class_prefix[1] = XrmStringToName ("Keysym");
859 /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */ 858 /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */
860 XrmEnumerateDatabase (database, name_prefix, class_prefix, 859 XrmEnumerateDatabase (database, name_prefix, class_prefix,
861 XrmEnumOneLevel, rxvt_define_key, NULL); 860 XrmEnumOneLevel, rxvt_define_key, (XPointer)this);
862# endif 861# endif
863# endif 862# endif
864 863
865#endif /* NO_RESOURCES */ 864#endif /* NO_RESOURCES */
866} 865}
867 866
868/*----------------------- end-of-file (C source) -----------------------*/ 867/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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