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.123 by ayin, Fri Nov 23 11:17:37 2007 UTC vs.
Revision 1.166 by root, Tue Jun 5 19:32:29 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 BOOL (Rs_transparent, "transparent", "tr", Opt_transparent, 0, "inherit parent pixmap"), 118 BOOL (Rs_transparent, "transparent", "tr", Opt_transparent, 0, "inherit parent pixmap"),
115 STRG (Rs_color + Color_tint, "tintColor", "tint", "color", "tint color"), 119 STRG (Rs_color + Color_tint, "tintColor", "tint", "color", "tint color"),
116 STRG (Rs_shade, "shading", "sh", "%", "shade background by x %."), 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"),
117#endif 122#endif
118#if OFF_FOCUS_FADING 123#if OFF_FOCUS_FADING
119 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"),
120 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"),
121#endif 126#endif
122 BOOL (Rs_utmpInhibit, "utmpInhibit", "ut", Opt_utmpInhibit, 0, "utmp inhibit"), 127 BOOL (Rs_utmpInhibit, "utmpInhibit", "ut", Opt_utmpInhibit, 0, "utmp inhibit"),
123#ifndef NO_BELL 128#ifndef NO_BELL
124# if ENABLE_FRILLS 129# if ENABLE_FRILLS
… …
171 RSTRG (Rs_color + Color_RV, "colorRV", "color"), 176 RSTRG (Rs_color + Color_RV, "colorRV", "color"),
172#endif /* ! NO_BOLD_UNDERLINE_REVERSE */ 177#endif /* ! NO_BOLD_UNDERLINE_REVERSE */
173#if ENABLE_FRILLS 178#if ENABLE_FRILLS
174 RSTRG (Rs_color + Color_underline, "underlineColor", "color"), 179 RSTRG (Rs_color + Color_underline, "underlineColor", "color"),
175#endif 180#endif
176#ifdef KEEP_SCROLLCOLOR
177 RSTRG (Rs_color + Color_scroll, "scrollColor", "color"), 181 RSTRG (Rs_color + Color_scroll, "scrollColor", "color"),
182#ifdef RXVT_SCROLLBAR
178 RSTRG (Rs_color + Color_trough, "troughColor", "color"), 183 RSTRG (Rs_color + Color_trough, "troughColor", "color"),
179#endif /* KEEP_SCROLLCOLOR */ 184#endif
180#ifdef OPTION_HC 185#ifdef OPTION_HC
181 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"),
182#endif 188#endif
183#ifndef NO_CURSORCOLOR 189#ifndef NO_CURSORCOLOR
184 STRG (Rs_color + Color_cursor, "cursorColor", "cr", "color", "cursor color"), 190 STRG (Rs_color + Color_cursor, "cursorColor", "cr", "color", "cursor color"),
185 /* command-line option = resource name */ 191 /* command-line option = resource name */
186 RSTRG (Rs_color + Color_cursor2, "cursorColor2", "color"), 192 RSTRG (Rs_color + Color_cursor2, "cursorColor2", "color"),
187#endif /* NO_CURSORCOLOR */ 193#endif /* NO_CURSORCOLOR */
188 STRG (Rs_color + Color_pointer_fg, "pointerColor", "pr", "color", "pointer color"), 194 STRG (Rs_color + Color_pointer_fg, "pointerColor", "pr", "color", "pointer color"),
189 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"),
190 STRG (Rs_color + Color_border, "borderColor", "bd", "color", "border color"), 196 STRG (Rs_color + Color_border, "borderColor", "bd", "color", "border color"),
191#ifdef BG_IMAGE_FROM_FILE 197#if BG_IMAGE_FROM_FILE
192 RSTRG (Rs_path, "path", "search path"), 198 RSTRG (Rs_path, "path", "search path"),
193 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
194#endif 203#endif
195 /* fonts: command-line option = resource name */ 204 /* fonts: command-line option = resource name */
196 STRG (Rs_font, "font", "fn", "fontname", "normal text font"), 205 STRG (Rs_font, "font", "fn", "fontname", "normal text font"),
197#if ENABLE_STYLES 206#if ENABLE_STYLES
198 STRG (Rs_boldFont, "boldFont", "fb", "fontname", "bold font"), 207 STRG (Rs_boldFont, "boldFont", "fb", "fontname", "bold font"),
199 STRG (Rs_italicFont, "italicFont", "fi", "fontname", "italic font"), 208 STRG (Rs_italicFont, "italicFont", "fi", "fontname", "italic font"),
200 STRG (Rs_boldItalicFont, "boldItalicFont", "fbi", "fontname", "bold italic font"), 209 STRG (Rs_boldItalicFont, "boldItalicFont", "fbi", "fontname", "bold italic font"),
201 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"),
202#endif 211#endif
203#ifdef USE_XIM 212#if USE_XIM
204 STRG (Rs_inputMethod, "inputMethod", "im", "name", "name of input method"), 213 STRG (Rs_inputMethod, "inputMethod", "im", "name", "name of input method"),
205 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"),
206 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"),
207 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"),
208#endif /* USE_XIM */ 217#endif /* USE_XIM */
… …
214#if ENABLE_XEMBED 223#if ENABLE_XEMBED
215 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"),
216#endif 225#endif
217#if XFT 226#if XFT
218 STRG (Rs_depth, "depth", "depth", "number", "depth of visual to request"), 227 STRG (Rs_depth, "depth", "depth", "number", "depth of visual to request"),
228 BOOL (Rs_buffered, "buffered", NULL, Opt_buffered, 0, NULL),
219#endif 229#endif
220#if ENABLE_FRILLS 230#if ENABLE_FRILLS
221 RSTRG (Rs_transient_for, "transient-for", "windowid"), 231 RSTRG (Rs_transient_for, "transient-for", "windowid"),
222 BOOL (Rs_override_redirect, "override-redirect", "override-redirect", Opt_override_redirect, 0, "set override-redirect on the terminal window"), 232 BOOL (Rs_override_redirect, "override-redirect", "override-redirect", Opt_override_redirect, 0, "set override-redirect on the terminal window"),
223 STRG (Rs_pty_fd, NULL, "pty-fd", "fileno", "file descriptor of pty to use"), 233 STRG (Rs_pty_fd, NULL, "pty-fd", "fileno", "file descriptor of pty to use"),
… …
225 STRG (Rs_ext_bwidth, "externalBorder", "w", "number", "external border in pixels"), 235 STRG (Rs_ext_bwidth, "externalBorder", "w", "number", "external border in pixels"),
226 STRG (Rs_ext_bwidth, NULL, "bw", NULL, NULL), 236 STRG (Rs_ext_bwidth, NULL, "bw", NULL, NULL),
227 STRG (Rs_ext_bwidth, NULL, "borderwidth", NULL, NULL), 237 STRG (Rs_ext_bwidth, NULL, "borderwidth", NULL, NULL),
228 STRG (Rs_int_bwidth, "internalBorder", "b", "number", "internal border in pixels"), 238 STRG (Rs_int_bwidth, "internalBorder", "b", "number", "internal border in pixels"),
229 BOOL (Rs_borderLess, "borderLess", "bl", Opt_borderLess, 0, "borderless window"), 239 BOOL (Rs_borderLess, "borderLess", "bl", Opt_borderLess, 0, "borderless window"),
240 STRG (Rs_lineSpace, "lineSpace", "lsp", "number", "number of extra pixels between rows"),
241 STRG (Rs_letterSpace, "letterSpace", "letsp", "number", "letter spacing adjustment"),
242#endif
243#ifdef BUILTIN_GLYPHS
230 BOOL (Rs_skipBuiltinGlyphs, "skipBuiltinGlyphs", "sbg", Opt_skipBuiltinGlyphs, 0, "do not use internal glyphs"), 244 BOOL (Rs_skipBuiltinGlyphs, "skipBuiltinGlyphs", "sbg", Opt_skipBuiltinGlyphs, 0, "do not use internal glyphs"),
231 STRG (Rs_lineSpace, "lineSpace", "lsp", "number", "number of extra pixels between rows"),
232#endif 245#endif
233#ifdef POINTER_BLANK 246#ifdef POINTER_BLANK
234 RSTRG (Rs_pointerBlankDelay, "pointerBlankDelay", "number"), 247 RSTRG (Rs_pointerBlankDelay, "pointerBlankDelay", "number"),
235#endif 248#endif
236#ifndef NO_BACKSPACE_KEY 249#ifndef NO_BACKSPACE_KEY
237 RSTRG (Rs_backspace_key, "backspacekey", "string"), 250 RSTRG (Rs_backspace_key, "backspacekey", "string"),
238#endif 251#endif
239#ifndef NO_DELETE_KEY 252#ifndef NO_DELETE_KEY
240 RSTRG (Rs_delete_key, "deletekey", "string"), 253 RSTRG (Rs_delete_key, "deletekey", "string"),
241#endif 254#endif
242 RSTRG (Rs_selectstyle, "selectstyle", "mode"),
243#ifdef PRINTPIPE 255#ifdef PRINTPIPE
244 RSTRG (Rs_print_pipe, "print-pipe", "string"), 256 RSTRG (Rs_print_pipe, "print-pipe", "string"),
245#endif 257#endif
246 STRG (Rs_modifier, "modifier", "mod", "modifier", "meta modifier = alt|meta|hyper|super|mod1|...|mod5"), 258 STRG (Rs_modifier, "modifier", "mod", "modifier", "meta modifier = alt|meta|hyper|super|mod1|...|mod5"),
247#ifdef CUTCHAR_RESOURCE
248 RSTRG (Rs_cutchars, "cutchars", "string"), 259 RSTRG (Rs_cutchars, "cutchars", "string"),
249#endif /* CUTCHAR_RESOURCE */
250 RSTRG (Rs_answerbackstring, "answerbackString", "string"), 260 RSTRG (Rs_answerbackstring, "answerbackString", "string"),
251#ifndef NO_SECONDARY_SCREEN 261#ifndef NO_SECONDARY_SCREEN
252 BOOL (Rs_secondaryScreen, "secondaryScreen", "ssc", Opt_secondaryScreen, 0, "enable secondary screen"), 262 BOOL (Rs_secondaryScreen, "secondaryScreen", "ssc", Opt_secondaryScreen, 0, "enable secondary screen"),
253 BOOL (Rs_secondaryScroll, "secondaryScroll", "ssr", Opt_secondaryScroll, 0, "enable secondary screen scroll"), 263 BOOL (Rs_secondaryScroll, "secondaryScroll", "ssr", Opt_secondaryScroll, 0, "enable secondary screen scroll"),
254#endif 264#endif
… …
257 RSTRG (Rs_perl_eval, "perl-eval", "perl-eval"), // "string", "code to be evaluated after all extensions have been loaded"),TODO 267 RSTRG (Rs_perl_eval, "perl-eval", "perl-eval"), // "string", "code to be evaluated after all extensions have been loaded"),TODO
258 RSTRG (Rs_perl_ext_1, "perl-ext-common", "string"), //, "colon-separated list of perl extensions to enable"),TODO 268 RSTRG (Rs_perl_ext_1, "perl-ext-common", "string"), //, "colon-separated list of perl extensions to enable"),TODO
259 STRG (Rs_perl_ext_2, "perl-ext", "pe", "string", "colon-separated list of perl extensions to enable for this instance"), 269 STRG (Rs_perl_ext_2, "perl-ext", "pe", "string", "colon-separated list of perl extensions to enable for this instance"),
260#endif 270#endif
261#if ISO_14755 271#if ISO_14755
272 BOOL (Rs_iso14755, "iso14755", NULL, Opt_iso14755, 0, NULL),
262 BOOL (Rs_iso14755_52, "iso14755_52", NULL, Opt_iso14755_52, 0, NULL), 273 BOOL (Rs_iso14755_52, "iso14755_52", NULL, Opt_iso14755_52, 0, NULL),
263#endif 274#endif
264#ifdef HAVE_AFTERIMAGE 275#ifndef NO_RESOURCES
265 STRG (Rs_blendtype, "blendType", "blt", "string", "background image blending type - alpha, tint, etc..."), 276 RINFO ("xrm", "string"),
266 STRG (Rs_blurradius, "blurRadius", "blr", "HxV", "Gaussian Blur radii to apply to the root background"), 277#endif
278#ifdef KEYSYM_RESOURCE
279 RINFO ("keysym.sym", "keysym"),
267#endif 280#endif
268 INFO ("e", "command arg ...", "command to execute") 281 INFO ("e", "command arg ...", "command to execute")
269 }; 282 };
270 283
271#undef INFO 284#undef INFO
285#undef RINFO
272#undef STRG 286#undef STRG
273#undef RSTRG 287#undef RSTRG
274#undef SWCH 288#undef SWCH
275#undef BOOL 289#undef BOOL
276 290
… …
319#endif 333#endif
320#if defined(ENABLE_TRANSPARENCY) 334#if defined(ENABLE_TRANSPARENCY)
321 "transparent," 335 "transparent,"
322 "tint," 336 "tint,"
323#endif 337#endif
324#if HAVE_AFTERIMAGE 338#if HAVE_PIXBUF
325 "afterimage," 339 "pixbuf,"
326#endif 340#endif
327#if defined(USE_XIM) 341#if defined(USE_XIM)
328 "XIM," 342 "XIM,"
329#endif 343#endif
330#if defined(NO_BACKSPACE_KEY) 344#if defined(NO_BACKSPACE_KEY)
… …
358 "pointerBlank," 372 "pointerBlank,"
359#endif 373#endif
360#if defined(NO_RESOURCES) 374#if defined(NO_RESOURCES)
361 "NoResources," 375 "NoResources,"
362#endif 376#endif
363 "scrollbars=" 377 "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) 378#if defined(RXVT_SCROLLBAR)
374 "rxvt" 379 "+rxvt"
375# if defined(NEXT_SCROLLBAR) || defined(XTERM_SCROLLBAR)
376 "+"
377# endif
378# endif 380#endif
379# if defined(NEXT_SCROLLBAR) 381#if defined(NEXT_SCROLLBAR)
380 "NeXT" 382 "+NeXT"
381# if defined(XTERM_SCROLLBAR)
382 "+"
383# endif
384# endif 383#endif
385# if defined(XTERM_SCROLLBAR) 384#if defined(XTERM_SCROLLBAR)
386 "xterm" 385 "+xterm"
387# endif
388#endif 386#endif
389 "\nUsage: "; /* Usage */ 387 "\nUsage: "; /* Usage */
390 388
391#define INDENT 18 389#define INDENT 18
392 390
… …
394const char rxvt_term::resval_on [] = "on"; 392const char rxvt_term::resval_on [] = "on";
395const char rxvt_term::resval_off [] = "off"; 393const char rxvt_term::resval_off [] = "off";
396 394
397/*{{{ usage: */ 395/*{{{ usage: */
398/*----------------------------------------------------------------------*/ 396/*----------------------------------------------------------------------*/
399static void 397void
400rxvt_usage (int type) 398rxvt_term::rxvt_usage (int type)
401{ 399{
402 unsigned int i, col; 400 unsigned int i, col;
403 401
404 rxvt_log ("%s%s%s", releasestring, optionsstring, RESNAME); 402 rxvt_log ("%s%s%s", releasestring, optionsstring, RESNAME);
405 403
406 switch (type) 404 switch (type)
407 { 405 {
408 case 0: /* brief listing */ 406 case 0: /* brief listing */
409 rxvt_log (" [-help] [--help]\n"); 407 rxvt_log (" [-help] [--help]\n");
410 408
411 for (col = 1, i = 0; i < optList_size; i++) 409 for (col = 1, i = 0; i < ecb_array_length (optList); i++)
412 if (optList[i].desc != NULL) 410 if (optList[i].desc != NULL)
413 { 411 {
414 int len = 0; 412 int len = 0;
415 413
416 if (!optList_isBool (i)) 414 if (optList[i].arg)
415 len = strlen (optList[i].arg) + 1;
416
417 assert (optList[i].opt != NULL);
418 len += 4 + strlen (optList[i].opt) + (optList_isBool (i) ? 2 : 0);
419 col += len;
420
421 if (col > 79)
417 { 422 {
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 */ 423 /* assume regular width */
429 rxvt_log ("\n"); 424 rxvt_log ("\n");
430 col = 1 + len; 425 col = 1 + len;
431 } 426 }
432 427
433 rxvt_log (" [-%s%s", (optList_isBool (i) ? "/+" : ""), optList[i].opt); 428 rxvt_log (" [-%s%s", (optList_isBool (i) ? "/+" : ""), optList[i].opt);
429
434 if (optList_strlen (i)) 430 if (optList[i].arg)
435 rxvt_log (" %s]", optList[i].arg); 431 rxvt_log (" %s]", optList[i].arg);
436 else 432 else
437 rxvt_log ("]"); 433 rxvt_log ("]");
438 } 434 }
439 break; 435 break;
440 436
441 case 1: /* full command-line listing */ 437 case 1: /* full command-line listing */
442 rxvt_log (" [options] [-e command args]\n\nwhere options include:\n"); 438 rxvt_log (" [options] [-e command args]\n\nwhere options include:\n");
443 439
444 for (i = 0; i < optList_size; i++) 440 for (i = 0; i < ecb_array_length (optList); i++)
445 if (optList[i].desc != NULL) 441 if (optList[i].desc != NULL)
446 { 442 {
447#ifdef DEBUG_STRICT
448 assert (optList[i].opt != NULL); 443 assert (optList[i].opt != NULL);
449#endif
450 rxvt_log (" %s%s %-*s%s%s\n", 444 rxvt_log (" %s%s %-*s%s%s\n",
451 (optList_isBool (i) ? "-/+" : "-"), optList[i].opt, 445 (optList_isBool (i) ? "-/+" : "-"), optList[i].opt,
452 (INDENT - strlen (optList[i].opt) 446 (INDENT - strlen (optList[i].opt)
453 + (optList_isBool (i) ? 0 : 2)), 447 + (optList_isBool (i) ? 0 : 2)),
454 (optList[i].arg ? optList[i].arg : ""), 448 (optList[i].arg ? optList[i].arg : ""),
… …
460 454
461 case 2: /* full resource listing */ 455 case 2: /* full resource listing */
462 rxvt_log (" [options] [-e command args]\n\n" 456 rxvt_log (" [options] [-e command args]\n\n"
463 "where resources (long-options) include:\n"); 457 "where resources (long-options) include:\n");
464 458
465 for (i = 0; i < optList_size; i++) 459 for (i = 0; i < ecb_array_length (optList); i++)
466 if (optList[i].kw != NULL) 460 if (optList[i].kw != NULL)
467 rxvt_log (" %s: %*s%s\n", 461 rxvt_log (" %s: %*s%s\n",
468 optList[i].kw, 462 optList[i].kw,
469 (INDENT - strlen (optList[i].kw)), "", /* XXX */ 463 (INDENT - strlen (optList[i].kw)), "", /* XXX */
470 (optList_isBool (i) ? "boolean" : optList[i].arg)); 464 (optList_isBool (i) ? "boolean" : optList[i].arg));
471#ifdef KEYSYM_RESOURCE
472 rxvt_log (" " "keysym.sym" ": %*s%s\n",
473 (INDENT - sizeof ("keysym.sym") + 1), "", /* XXX */
474 "keysym");
475#endif
476 rxvt_log ("\n -help to list options"); 465 rxvt_log ("\n -help to list options");
477 break; 466 break;
478 } 467 }
479 468
469#if ENABLE_PERL
470 if (type) // do not initialise perl for type == 0, as perl does not have "short" options
471 {
472 rxvt_perl.init (this);
473 rxvt_perl.usage (type);
474 }
475#endif
476
480 rxvt_log ("\n\n"); 477 rxvt_log ("\n\n");
481 rxvt_exit_failure (); 478 rxvt_exit_failure ();
482 /* NOTREACHED */
483} 479}
484 480
485/*}}} */ 481/*}}} */
486 482
487/*{{{ get command-line options before getting resources */ 483/*{{{ get command-line options before getting resources */
488void 484const char **
489rxvt_term::get_options (int argc, const char *const *argv) 485rxvt_term::get_options (int argc, const char *const *argv)
490{ 486{
491 int i, bad_option = 0; 487 int i, bad_option = 0;
492 488
493 for (i = 1; i < argc; i++) 489 for (i = 1; i < argc; i++)
494 { 490 {
495 unsigned int entry, longopt = 0; 491 unsigned int entry, longopt = 0;
496 const char *flag, *opt; 492 const char *opt;
493 int flag;
497 494
498 opt = argv[i]; 495 opt = argv[i];
499 496
500 if (*opt == '-') 497 if (*opt == '-')
501 { 498 {
502 flag = resval_on; 499 flag = 1;
503 500
504 if (*++opt == '-') 501 if (*++opt == '-')
505 longopt = *opt++; /* long option */ 502 longopt = *opt++; /* long option */
506 } 503 }
507 else if (*opt == '+') 504 else if (*opt == '+')
508 { 505 {
509 flag = resval_off; 506 flag = 0;
510 507
511 if (*++opt == '+') 508 if (*++opt == '+')
512 longopt = *opt++; /* long option */ 509 longopt = *opt++; /* long option */
513 } 510 }
514 else 511 else
… …
523 520
524 if (!strcmp (opt, "h")) 521 if (!strcmp (opt, "h"))
525 rxvt_usage (0); 522 rxvt_usage (0);
526 523
527 /* feature: always try to match long-options */ 524 /* feature: always try to match long-options */
528 for (entry = 0; entry < optList_size; entry++) 525 for (entry = 0; entry < ecb_array_length (optList); entry++)
529 if ((optList[entry].kw && !strcmp (opt, optList[entry].kw)) 526 if ((optList[entry].kw && !strcmp (opt, optList[entry].kw))
530 || (!longopt 527 || (!longopt
531 && optList[entry].opt && !strcmp (opt, optList[entry].opt))) 528 && optList[entry].opt && !strcmp (opt, optList[entry].opt)))
532 break; 529 break;
533 530
534 if (entry < optList_size) 531 if (entry < ecb_array_length (optList)
532 && !optList_isInfo (entry))
535 { 533 {
536 if (optList_isReverse (entry)) 534 if (optList_isReverse (entry))
537 flag = flag == resval_on ? resval_off : resval_on; 535 flag = !flag;
538 536
539 if (optList_strlen (entry)) 537 if (optList_isString (entry))
540 { 538 {
541 /* 539 /*
542 * special cases are handled in main.c:main () to allow 540 * special cases are handled in init_resources () to allow
543 * X resources to set these values before we settle for 541 * X resources to set these values before we settle for
544 * default values 542 * default values
545 */ 543 */
546 544
547 if (optList[entry].doff != -1) 545 if (optList[entry].doff != -1)
548 { 546 {
549 if (flag == resval_on && i+1 == argc) 547 if (flag && i+1 == argc)
550 rxvt_fatal ("option '%s' requires an argument, aborting.\n", argv [i]); 548 rxvt_fatal ("option '%s' requires an argument, aborting.\n", argv [i]);
551 549
552 rs[optList[entry].doff] = flag == resval_on ? argv[++i] : resval_undef; 550 rs[optList[entry].doff] = flag ? argv[++i] : resval_undef;
553 } 551 }
554 } 552 }
555 else 553 else
554 {
556 { /* boolean value */ 555 /* boolean value */
557 set_option (optList[entry].index, flag == resval_on); 556 set_option (optList[entry].index, flag);
558 557
559 if (optList[entry].doff != -1) 558 if (optList[entry].doff != -1)
560 rs[optList[entry].doff] = flag; 559 rs[optList[entry].doff] = flag ? resval_on : resval_off;
561 } 560 }
562 } 561 }
563#ifndef NO_RESOURCES 562#ifndef NO_RESOURCES
564 else if (!strcmp (opt, "xrm")) 563 else if (!strcmp (opt, "xrm"))
565 { 564 {
… …
570#ifdef KEYSYM_RESOURCE 569#ifdef KEYSYM_RESOURCE
571 else if (!strncmp (opt, "keysym.", sizeof ("keysym.") - 1)) 570 else if (!strncmp (opt, "keysym.", sizeof ("keysym.") - 1))
572 { 571 {
573 if (i+1 < argc) 572 if (i+1 < argc)
574 { 573 {
575 char *res = (char *)malloc (strlen (opt) + strlen (argv[++i]) + 6); 574 char *res = rxvt_temp_buf<char> (strlen (opt) + strlen (argv[++i]) + 6);
576 sprintf (res, "*.%s: %s\n", opt, argv[i]); 575 sprintf (res, "*.%s: %s\n", opt, argv[i]);
577 XrmPutLineResource (&option_db, res); 576 XrmPutLineResource (&option_db, res);
578 free (res);
579 } 577 }
580 } 578 }
581#endif 579#endif
580 else if (!strcmp (opt, "e"))
581 {
582 if (i+1 == argc)
583 rxvt_fatal ("option '-e' requires an argument, aborting.\n");
584
585 return (const char **)argv + i + 1;
586 }
582 else 587 else
583 { 588 {
589#if ENABLE_PERL
590 rxvt_perl.init (this);
591
592 if (int flags = rxvt_perl.resource (this, opt, true, longopt, flag, argv [i + 1]))
593 {
594 if ((!flags & rxvt_perl.RESOURCE_BOOLEAN))
595 {
596 if (flag && i + 1 == argc)
597 rxvt_fatal ("option '%s' requires an argument, aborting.\n", argv [i]);
598
599 ++i;
600 }
601 }
602 else
603#endif
604 {
584 bad_option = 1; 605 bad_option = 1;
585 rxvt_warn ("\"%s\": unknown or malformed option.\n", opt); 606 rxvt_warn ("\"%s\": unknown or malformed option.\n", opt);
607 }
586 } 608 }
587 } 609 }
588 610
589 if (bad_option) 611 if (bad_option)
590 rxvt_usage (0); 612 rxvt_usage (0);
613
614 return 0;
591} 615}
592 616
593/*}}} */ 617/*}}} */
594 618
595#ifndef NO_RESOURCES 619#ifndef NO_RESOURCES
… …
600 * Define key from XrmEnumerateDatabase. 624 * Define key from XrmEnumerateDatabase.
601 * quarks will be something like 625 * quarks will be something like
602 * "rxvt" "keysym" "0xFF01" 626 * "rxvt" "keysym" "0xFF01"
603 * value will be a string 627 * value will be a string
604 */ 628 */
605/* ARGSUSED */ 629static int
606int
607rxvt_define_key (XrmDatabase *database UNUSED, 630rxvt_define_key (XrmDatabase *database ecb_unused,
608 XrmBindingList bindings UNUSED, 631 XrmBindingList bindings ecb_unused,
609 XrmQuarkList quarks, 632 XrmQuarkList quarks,
610 XrmRepresentation *type UNUSED, 633 XrmRepresentation *type ecb_unused,
611 XrmValue *value, 634 XrmValue *value,
612 XPointer closure UNUSED) 635 XPointer closure ecb_unused)
613{ 636{
614 int last; 637 int last;
615 638
616 for (last = 0; quarks[last] != NULLQUARK; last++) /* look for last quark in list */ 639 for (last = 0; quarks[last] != NULLQUARK; last++) /* look for last quark in list */
617 ; 640 ;
… …
622} 645}
623 646
624/* 647/*
625 * look for something like this (XK_Delete) 648 * look for something like this (XK_Delete)
626 * rxvt*keysym.0xFFFF: "\177" 649 * rxvt*keysym.0xFFFF: "\177"
627 *
628 * arg will be
629 * NULL for ~/.Xdefaults and
630 * non-NULL for command-line options (need to allocate)
631 */ 650 */
632#define NEWARGLIM 500 /* `reasonable' size */
633 651
634struct keysym_vocabulary_t 652struct keysym_vocabulary_t
635{ 653{
636 const char *name; 654 const char *name;
637 unsigned short len; 655 unsigned short len;
638 unsigned short value; 656 unsigned short value;
639}; 657};
640keysym_vocabulary_t keysym_vocabulary[] = 658static const keysym_vocabulary_t keysym_vocabulary[] =
641{ 659{
642 { "ISOLevel3", 9, Level3Mask }, 660 { "ISOLevel3", 9, Level3Mask },
643 { "AppKeypad", 9, AppKeypadMask }, 661 { "AppKeypad", 9, AppKeypadMask },
644 { "Control", 7, ControlMask }, 662 { "Control", 7, ControlMask },
645 { "NumLock", 7, NumLockMask }, 663 { "NumLock", 7, NumLockMask },
… …
667}; 685};
668 686
669int 687int
670rxvt_term::parse_keysym (const char *str, const char *arg) 688rxvt_term::parse_keysym (const char *str, const char *arg)
671{ 689{
672 int n, sym; 690 int sym;
673 unsigned int state = 0; 691 unsigned int state = 0;
674 const char *pmodend = NULL; 692 const char *key = strrchr (str, '-');
675 char *newarg = NULL;
676 char newargstr[NEWARGLIM];
677 693
678 if (arg == NULL) 694 if (!key)
679 { 695 key = str;
680 n = sizeof ("keysym.") - 1;
681 if (strncmp (str, "keysym.", n))
682 return 0;
683
684 str += n; /* skip `keysym.' */
685 if (!(pmodend = strchr (str, ':')))
686 return -1;
687 }
688 else 696 else
689 pmodend = str + strlen(str); 697 key++;
690 698
691 for (--pmodend; str < pmodend; --pmodend) 699 // string or key is empty
692 if (*pmodend == '-') 700 if (*arg == '\0' || *key == '\0')
693 break; 701 return -1;
694 702
703 // parse modifiers
695 while (str < pmodend) 704 while (str < key)
696 { 705 {
697 unsigned int i; 706 unsigned int i;
698 707
699 for (i=0; i < sizeof (keysym_vocabulary) / sizeof (keysym_vocabulary_t); ++i) 708 for (i = 0; i < ecb_array_length (keysym_vocabulary); ++i)
700 { 709 {
701 if (strncmp (str, keysym_vocabulary [i].name, keysym_vocabulary [i].len) == 0) 710 if (strncmp (str, keysym_vocabulary [i].name, keysym_vocabulary [i].len) == 0)
702 { 711 {
703 state |= keysym_vocabulary[i].value; 712 state |= keysym_vocabulary[i].value;
704 str += keysym_vocabulary[i].len; 713 str += keysym_vocabulary[i].len;
705 break; 714 break;
706 } 715 }
707 } 716 }
708 717
709 if (i >= sizeof (keysym_vocabulary) / sizeof (keysym_vocabulary_t)) 718 if (i >= ecb_array_length (keysym_vocabulary))
710 return -1; 719 return -1;
711 720
712 if (*str == '-') 721 if (*str == '-')
713 ++str; 722 ++str;
714 } 723 }
715 724
716 /* some scanf () have trouble with a 0x prefix */ 725 // convert keysym name to keysym number
717 if (str[0] == '0' && toupper (str[1]) == 'X') 726 if ((sym = XStringToKeysym (str)) == None)
718 { 727 {
719 str += 2; 728 // fallback on hexadecimal parsing
720 729 char *end;
730 sym = strtol (str, &end, 16);
721 if (arg) 731 if (*end)
722 {
723 if (sscanf (str, (strchr (str, ':') ? "%x:" : "%x"), &sym) != 1)
724 return -1;
725 }
726 else
727 {
728 if (sscanf (str, "%x:", &sym) != 1)
729 return -1;
730
731 /* cue to ':', it's there since sscanf () worked */
732 strncpy (newargstr, strchr (str, ':') + 1, NEWARGLIM - 1);
733 newargstr[NEWARGLIM - 1] = '\0';
734 newarg = newargstr;
735 }
736 }
737 else
738 {
739 /*
740 * convert keysym name to keysym number
741 */
742 strncpy (newargstr, str, NEWARGLIM - 1);
743 newargstr[NEWARGLIM - 1] = '\0';
744
745 if (arg == NULL)
746 {
747 if ((newarg = strchr (newargstr, ':')) == NULL)
748 return -1;
749
750 *newarg++ = '\0'; /* terminate keysym name */
751 }
752
753 if ((sym = XStringToKeysym (newargstr)) == None)
754 return -1; 732 return -1;
755 } 733 }
756 734
757 if (newarg == NULL) 735 wchar_t *ws = rxvt_mbstowcs (arg);
758 { 736 if (!HOOK_INVOKE ((this, HOOK_REGISTER_COMMAND, DT_INT, sym, DT_INT, state, DT_WCS_LEN, ws, wcslen (ws), DT_END)))
759 strncpy (newargstr, arg, NEWARGLIM - 1);
760 newargstr[NEWARGLIM - 1] = '\0';
761 newarg = newargstr;
762 }
763
764 if (*newarg == '\0')
765 return -1;
766
767 keyboard->register_user_translation (sym, state, newarg); 737 keyboard->register_user_translation (sym, state, ws);
738 free (ws);
768 return 1; 739 return 1;
769} 740}
770 741
771# endif /* KEYSYM_RESOURCE */ 742# endif /* KEYSYM_RESOURCE */
772#endif /* NO_RESOURCES */ 743#endif /* NO_RESOURCES */
… …
815 XrmMergeDatabases (option_db, &database); 786 XrmMergeDatabases (option_db, &database);
816 option_db = NULL; 787 option_db = NULL;
817 /* 788 /*
818 * Query resources for options that affect us 789 * Query resources for options that affect us
819 */ 790 */
820 for (int entry = 0; entry < optList_size; entry++) 791 for (int entry = 0; entry < ecb_array_length (optList); entry++)
821 { 792 {
822 int s;
823 const char *kw = optList[entry].kw; 793 const char *kw = optList[entry].kw;
824 794
825 if (kw == NULL || rs[optList[entry].doff] != NULL) 795 if (kw == NULL || rs[optList[entry].doff] != NULL)
826 continue; // previously set 796 continue; // previously set
827 797
… …
833 allocated.push_back ((void *)p); 803 allocated.push_back ((void *)p);
834 rs[optList[entry].doff] = p; 804 rs[optList[entry].doff] = p;
835 805
836 if (optList_isBool (entry)) 806 if (optList_isBool (entry))
837 { 807 {
838 s = strcasecmp (p, "TRUE") == 0 808 bool s = parse_bool_resource (p);
839 || strcasecmp (p, "YES") == 0
840 || strcasecmp (p, "ON") == 0
841 || strcasecmp (p, "1") == 0;
842 809
843 if (optList_isReverse (entry)) 810 if (optList_isReverse (entry))
844 s = !s; 811 s = !s;
845 812
846 set_option (optList[entry].index, s); 813 set_option (optList[entry].index, s);
847 } 814 }
848 } 815 }
849 } 816 }
817#endif /* NO_RESOURCES */
818}
850 819
820void
821rxvt_term::extract_keysym_resources ()
822{
823#if !defined NO_RESOURCES && defined KEYSYM_RESOURCE
824 find_resources ("keysym", "Keysym", XrmEnumOneLevel, rxvt_define_key);
825#endif
826}
827
828#if !defined NO_RESOURCES && (defined KEYSYM_RESOURCE || defined BG_IMAGE_FROM_FILE)
829void
830rxvt_term::find_resources (const char *n_prefix, const char *c_prefix, int mode,
831 Bool (*proc)(XrmDatabase *, XrmBindingList, XrmQuarkList, XrmRepresentation *, XrmValue *, XPointer))
832{
851 /* 833 /*
852 * [R5 or later]: enumerate the resource database 834 * [R5 or later]: enumerate the resource database
853 */ 835 */
854# ifdef KEYSYM_RESOURCE 836 XrmDatabase database = XrmGetDatabase (dpy);
855 XrmName name_prefix[3]; 837 XrmName name_prefix[3];
856 XrmClass class_prefix[3]; 838 XrmClass class_prefix[3];
857 839
858 name_prefix[0] = XrmStringToName (rs[Rs_name]); 840 name_prefix[0] = XrmStringToName (rs[Rs_name]);
859 name_prefix[1] = XrmStringToName ("keysym"); 841 name_prefix[1] = XrmStringToName (n_prefix);
860 name_prefix[2] = NULLQUARK; 842 name_prefix[2] = NULLQUARK;
861 class_prefix[0] = XrmStringToName (RESCLASS); 843 class_prefix[0] = XrmStringToName (RESCLASS);
862 class_prefix[1] = XrmStringToName ("Keysym"); 844 class_prefix[1] = XrmStringToName (c_prefix);
863 class_prefix[2] = NULLQUARK; 845 class_prefix[2] = NULLQUARK;
864 /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */ 846 /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */
865 XrmEnumerateDatabase (database, name_prefix, class_prefix, 847 XrmEnumerateDatabase (database, name_prefix, class_prefix,
866 XrmEnumOneLevel, rxvt_define_key, NULL); 848 mode, proc, NULL);
867# ifdef RESFALLBACK 849# ifdef RESFALLBACK
868 name_prefix[0] = XrmStringToName (RESFALLBACK);
869 name_prefix[1] = XrmStringToName ("keysym");
870 class_prefix[0] = XrmStringToName (RESFALLBACK); 850 name_prefix[0] = class_prefix[0] = XrmStringToName (RESFALLBACK);
871 class_prefix[1] = XrmStringToName ("Keysym");
872 /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */ 851 /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */
873 XrmEnumerateDatabase (database, name_prefix, class_prefix, 852 XrmEnumerateDatabase (database, name_prefix, class_prefix,
874 XrmEnumOneLevel, rxvt_define_key, NULL); 853 mode, proc, NULL);
875# endif 854# endif
876# endif
877
878#endif /* NO_RESOURCES */
879} 855}
856#endif
880 857
881/*----------------------- end-of-file (C source) -----------------------*/ 858/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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