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.89 by root, Sun Jan 29 22:27:04 2006 UTC vs.
Revision 1.137 by root, Sun Jun 15 13:54:15 2008 UTC

1/*--------------------------------*-C-*---------------------------------* 1/*----------------------------------------------------------------------*
2 * File: xdefaults.C 2 * File: xdefaults.C
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
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 <pcg@goof.com>
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.
… …
21 * You should have received a copy of the GNU General Public License 22 * You should have received a copy of the GNU General Public License
22 * along with this program; if not, write to the Free Software 23 * along with this program; if not, write to the Free Software
23 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 24 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
24 *----------------------------------------------------------------------*/ 25 *----------------------------------------------------------------------*/
25 26
26#include "../config.h" /* NECESSARY */ 27#include "../config.h"
27#include "rxvt.h" /* NECESSARY */ 28#include "rxvt.h"
28#include "version.h" 29#include "version.h"
29 30
30#ifdef KEYSYM_RESOURCE 31#ifdef KEYSYM_RESOURCE
31#include "keyboard.h" 32# include "keyboard.h"
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 0x40000000UL 36#define Optflag_Reverse 1
36#define Optflag_Boolean 0x80000000UL 37#define Optflag_Boolean 2
37#define Optflag_mask 0x3fffffffUL 38#define Optflag_Switch 4
38 39
39/*{{{ monolithic option/resource structure: */ 40/* monolithic option/resource structure: */
40/* 41/*
41 * `string' options MUST have a usage argument 42 * `string' options MUST have a usage argument
42 * `switch' and `boolean' options have no argument 43 * `switch' and `boolean' options have no argument
43 * if there's no desc (ription), it won't appear in rxvt_usage () 44 * if there's no desc (ription), it won't appear in rxvt_usage ()
44 */ 45 */
45 46
46/* INFO () - descriptive information only */ 47/* INFO () - descriptive information only */
47#define INFO(opt, arg, desc) \ 48#define INFO(opt, arg, desc) \
48 {0, -1, NULL, (opt), (arg), (desc)} 49 {0, 0, -1, NULL, (opt), (arg), (desc)}
49 50
50/* STRG () - command-line option, with/without resource */ 51/* STRG () - command-line option, with/without resource */
51#define STRG(rsp, kw, opt, arg, desc) \ 52#define STRG(rsp, kw, opt, arg, desc) \
52 {0, (rsp), (kw), (opt), (arg), (desc)} 53 {0, 0, (rsp), (kw), (opt), (arg), (desc)}
53 54
54/* RSTRG () - resource/long-option */ 55/* RSTRG () - resource/long-option */
55#define RSTRG(rsp, kw, arg) \ 56#define RSTRG(rsp, kw, arg) \
56 {0, (rsp), (kw), NULL, (arg), NULL} 57 {0, 0, (rsp), (kw), NULL, (arg), NULL}
57 58
58/* BOOL () - regular boolean `-/+' flag */ 59/* BOOL () - regular boolean `-/+' flag */
59#define BOOL(rsp, kw, opt, flag, desc) \ 60#define BOOL(rsp, kw, opt, option, flag, desc) \
60 { (Optflag_Boolean | (flag)), (rsp), (kw), (opt), NULL, (desc)} 61 { (option), (Optflag_Boolean | (flag)), (rsp), (kw), (opt), NULL, (desc)}
61 62
62/* SWCH () - `-' flag */ 63/* SWCH () - `-' flag */
63#define SWCH(opt, flag, desc) \ 64#define SWCH(opt, option, flag, desc) \
64 { (flag), -1, NULL, (opt), NULL, (desc)} 65 { (option), (Optflag_Switch | (flag)), -1, NULL, (opt), NULL, (desc)}
65 66
66/* convenient macros */ 67/* convenient macros */
67#define optList_strlen(i) \ 68#define optList_isString(i) \
68 (optList[i].flag ? 0 : (optList[i].arg ? strlen (optList[i].arg) : 1)) 69 (optList[i].flag == 0)
69#define optList_isBool(i) \ 70#define optList_isBool(i) \
70 (optList[i].flag & Optflag_Boolean) 71 (optList[i].flag & Optflag_Boolean)
71#define optList_isReverse(i) \ 72#define optList_isReverse(i) \
72 (optList[i].flag & Optflag_Reverse) 73 (optList[i].flag & Optflag_Reverse)
73#define optList_size \ 74#define optList_size \
74 (sizeof (optList) / sizeof (optList[0])) 75 (sizeof (optList) / sizeof (optList[0]))
75 76
76static const struct 77static const struct
77 { 78 {
79 const uint8_t index; /* Option index */
78 const unsigned long flag; /* Option flag */ 80 const uint8_t flag; /* Option flag */
79 const int doff; /* data offset */ 81 const int16_t doff; /* resource value index or -1 */
80 const char *kw; /* keyword */ 82 const char *kw; /* keyword */
81 const char *opt; /* option */ 83 const char *opt; /* option */
82 const char *arg; /* argument */ 84 const char *arg; /* argument */
83 const char *desc; /* description */ 85 const char *desc; /* description */
84 } 86 }
… …
86 STRG (Rs_display_name, NULL, "d", NULL, NULL), /* short form */ 88 STRG (Rs_display_name, NULL, "d", NULL, NULL), /* short form */
87 STRG (Rs_display_name, NULL, "display", "string", "X server to contact"), 89 STRG (Rs_display_name, NULL, "display", "string", "X server to contact"),
88 STRG (Rs_term_name, "termName", "tn", "string", "value of the TERM environment variable"), 90 STRG (Rs_term_name, "termName", "tn", "string", "value of the TERM environment variable"),
89 STRG (Rs_geometry, NULL, "g", NULL, NULL), /* short form */ 91 STRG (Rs_geometry, NULL, "g", NULL, NULL), /* short form */
90 STRG (Rs_geometry, "geometry", "geometry", "geometry", "size (in characters) and position"), 92 STRG (Rs_geometry, "geometry", "geometry", "geometry", "size (in characters) and position"),
91 SWCH ("C", Opt_console, "intercept console messages"), 93 SWCH ("C", Opt_console, 0, "intercept console messages"),
92 SWCH ("iconic", Opt_iconic, "start iconic"), 94 SWCH ("iconic", Opt_iconic, 0, "start iconic"),
93 SWCH ("ic", Opt_iconic, NULL), /* short form */ 95 SWCH ("ic", Opt_iconic, 0, NULL), /* short form */
96 STRG (Rs_chdir, "chdir", "cd", "string", "start shell in this directory"),
94 BOOL (Rs_reverseVideo, "reverseVideo", "rv", Opt_reverseVideo, "reverse video"), 97 BOOL (Rs_reverseVideo, "reverseVideo", "rv", Opt_reverseVideo, 0, "reverse video"),
95 BOOL (Rs_loginShell, "loginShell", "ls", Opt_loginShell, "login shell"), 98 BOOL (Rs_loginShell, "loginShell", "ls", Opt_loginShell, 0, "login shell"),
96 BOOL (Rs_jumpScroll, "jumpScroll", "j", Opt_jumpScroll, "jump scrolling"), 99 BOOL (Rs_jumpScroll, "jumpScroll", "j", Opt_jumpScroll, 0, "jump scrolling"),
100 BOOL (Rs_skipScroll, "skipScroll", "ss", Opt_skipScroll, 0, "skip scrolling"),
97 BOOL (Rs_pastableTabs, "pastableTabs", "ptab", Opt_pastableTabs, "tab characters are pastable"), 101 BOOL (Rs_pastableTabs, "pastableTabs", "ptab", Opt_pastableTabs, 0, "tab characters are pastable"),
98#if HAVE_SCROLLBARS
99 RSTRG (Rs_scrollstyle, "scrollstyle", "mode"), 102 RSTRG (Rs_scrollstyle, "scrollstyle", "mode"),
100 BOOL (Rs_scrollBar, "scrollBar", "sb", Opt_scrollBar, "scrollbar"), 103 BOOL (Rs_scrollBar, "scrollBar", "sb", Opt_scrollBar, 0, "scrollbar"),
101 BOOL (Rs_scrollBar_right, "scrollBar_right", "sr", Opt_scrollBar_right, "scrollbar right"), 104 BOOL (Rs_scrollBar_right, "scrollBar_right", "sr", Opt_scrollBar_right, 0, "scrollbar right"),
102 BOOL (Rs_scrollBar_floating, "scrollBar_floating", "st", Opt_scrollBar_floating, "scrollbar without a trough"), 105 BOOL (Rs_scrollBar_floating, "scrollBar_floating", "st", Opt_scrollBar_floating, 0, "scrollbar without a trough"),
103 RSTRG (Rs_scrollBar_align, "scrollBar_align", "mode"), 106 RSTRG (Rs_scrollBar_align, "scrollBar_align", "mode"),
104 STRG (Rs_scrollBar_thickness, "thickness", "sbt", "number", "scrollbar thickness/width in pixels"), 107 STRG (Rs_scrollBar_thickness, "thickness", "sbt", "number", "scrollbar thickness/width in pixels"),
105#endif
106 BOOL (Rs_scrollTtyOutput, "scrollTtyOutput", NULL, Opt_scrollTtyOutput, NULL), 108 BOOL (Rs_scrollTtyOutput, "scrollTtyOutput", NULL, Opt_scrollTtyOutput, 0, NULL),
107 BOOL (Rs_scrollTtyOutput, NULL, "si", Optflag_Reverse | Opt_scrollTtyOutput, "scroll-on-tty-output inhibit"), 109 BOOL (Rs_scrollTtyOutput, NULL, "si", Opt_scrollTtyOutput, Optflag_Reverse, "scroll-on-tty-output inhibit"),
108 BOOL (Rs_scrollTtyKeypress, "scrollTtyKeypress", "sk", Opt_scrollTtyKeypress, "scroll-on-keypress"), 110 BOOL (Rs_scrollTtyKeypress, "scrollTtyKeypress", "sk", Opt_scrollTtyKeypress, 0, "scroll-on-keypress"),
109 BOOL (Rs_scrollWithBuffer, "scrollWithBuffer", "sw", Opt_scrollWithBuffer, "scroll-with-buffer"), 111 BOOL (Rs_scrollWithBuffer, "scrollWithBuffer", "sw", Opt_scrollWithBuffer, 0, "scroll-with-buffer"),
110#if TRANSPARENT 112#if ENABLE_TRANSPARENCY
111 BOOL (Rs_transparent, "inheritPixmap", "ip", Opt_transparent, "inherit parent pixmap"), 113 BOOL (Rs_transparent, "inheritPixmap", "ip", Opt_transparent, 0, "inherit parent pixmap"),
112 SWCH ("tr", Opt_transparent, NULL), 114 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"), 115 STRG (Rs_color + Color_tint, "tintColor", "tint", "color", "tint color"),
116 STRG (Rs_shade, "shading", "sh", "number", "shade background by number %."),
117#endif
118#if OFF_FOCUS_FADING
119 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"),
121#endif
122 BOOL (Rs_utmpInhibit, "utmpInhibit", "ut", Opt_utmpInhibit, 0, "utmp inhibit"),
123#ifndef NO_BELL
124# if ENABLE_FRILLS
125 BOOL (Rs_urgentOnBell, "urgentOnBell", NULL, Opt_urgentOnBell, 0, NULL),
115# endif 126# endif
116#endif
117#if OFF_FOCUS_FADING
118 STRG (Rs_fade, "fading", "fade", "%", "fade colors x% percent when rxvt-unicode is losing focus"),
119 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
124 BOOL (Rs_utmpInhibit, "utmpInhibit", "ut", Opt_utmpInhibit, "utmp inhibit"),
125#ifndef NO_BELL
126 BOOL (Rs_visualBell, "visualBell", "vb", Opt_visualBell, "visual bell"), 127 BOOL (Rs_visualBell, "visualBell", "vb", Opt_visualBell, 0, "visual bell"),
127# if ! defined(NO_MAPALERT) && defined(MAPALERT_OPTION) 128# if ! defined(NO_MAPALERT) && defined(MAPALERT_OPTION)
128 BOOL (Rs_mapAlert, "mapAlert", NULL, Opt_mapAlert, NULL), 129 BOOL (Rs_mapAlert, "mapAlert", NULL, Opt_mapAlert, 0, NULL),
129# endif 130# endif
130#endif 131#endif
131#ifdef META8_OPTION 132#ifdef META8_OPTION
132 BOOL (Rs_meta8, "meta8", NULL, Opt_meta8, NULL), 133 BOOL (Rs_meta8, "meta8", NULL, Opt_meta8, 0, NULL),
133#endif 134#endif
134#ifdef MOUSE_WHEEL 135#ifdef MOUSE_WHEEL
135 BOOL (Rs_mouseWheelScrollPage, "mouseWheelScrollPage", NULL, Opt_mouseWheelScrollPage, NULL), 136 BOOL (Rs_mouseWheelScrollPage, "mouseWheelScrollPage", NULL, Opt_mouseWheelScrollPage, 0, NULL),
136#endif 137#endif
137#if ENABLE_FRILLS 138#if ENABLE_FRILLS
138 BOOL (Rs_tripleclickwords, "tripleclickwords", "tcw", Opt_tripleclickwords, "triple click word selection"), 139 BOOL (Rs_tripleclickwords, "tripleclickwords", "tcw", Opt_tripleclickwords, 0, "triple click word selection"),
139 BOOL (Rs_insecure, "insecure", "insecure", Opt_insecure, "enable possibly insecure escape sequences"), 140 BOOL (Rs_insecure, "insecure", "insecure", Opt_insecure, 0, "enable possibly insecure escape sequences"),
140 BOOL (Rs_cursorUnderline, "cursorUnderline", "uc", Opt_cursorUnderline, "underline cursor"), 141 BOOL (Rs_cursorUnderline, "cursorUnderline", "uc", Opt_cursorUnderline, 0, "underline cursor"),
141#endif 142#endif
142#if CURSOR_BLINK 143#if CURSOR_BLINK
143 BOOL (Rs_cursorBlink, "cursorBlink", "bc", Opt_cursorBlink, "blinking cursor"), 144 BOOL (Rs_cursorBlink, "cursorBlink", "bc", Opt_cursorBlink, 0, "blinking cursor"),
144#endif 145#endif
145#ifdef POINTER_BLANK 146#ifdef POINTER_BLANK
146 BOOL (Rs_pointerBlank, "pointerBlank", "pb", Opt_pointerBlank, "switch off pointer after delay"), 147 BOOL (Rs_pointerBlank, "pointerBlank", "pb", Opt_pointerBlank, 0, "switch off pointer after delay"),
147#endif 148#endif
148 STRG (Rs_color + Color_bg, "background", "bg", "color", "background color"), 149 STRG (Rs_color + Color_bg, "background", "bg", "color", "background color"),
149 STRG (Rs_color + Color_fg, "foreground", "fg", "color", "foreground color"), 150 STRG (Rs_color + Color_fg, "foreground", "fg", "color", "foreground color"),
150 RSTRG (Rs_color + minCOLOR + 0, "color0", "color"), 151 RSTRG (Rs_color + minCOLOR + 0, "color0", "color"),
151 RSTRG (Rs_color + minCOLOR + 1, "color1", "color"), 152 RSTRG (Rs_color + minCOLOR + 1, "color1", "color"),
… …
166#ifndef NO_BOLD_UNDERLINE_REVERSE 167#ifndef NO_BOLD_UNDERLINE_REVERSE
167 RSTRG (Rs_color + Color_BD, "colorBD", "color"), 168 RSTRG (Rs_color + Color_BD, "colorBD", "color"),
168 RSTRG (Rs_color + Color_IT, "colorIT", "color"), 169 RSTRG (Rs_color + Color_IT, "colorIT", "color"),
169 RSTRG (Rs_color + Color_UL, "colorUL", "color"), 170 RSTRG (Rs_color + Color_UL, "colorUL", "color"),
170 RSTRG (Rs_color + Color_RV, "colorRV", "color"), 171 RSTRG (Rs_color + Color_RV, "colorRV", "color"),
171#endif /* ! NO_BOLD_UNDERLINE_REVERSE */ 172#endif /* ! NO_BOLD_UNDERLINE_REVERSE */
172#if ENABLE_FRILLS 173#if ENABLE_FRILLS
173 RSTRG (Rs_color + Color_underline, "underlineColor", "color"), 174 RSTRG (Rs_color + Color_underline, "underlineColor", "color"),
174#endif 175#endif
175#ifdef KEEP_SCROLLCOLOR
176 RSTRG (Rs_color + Color_scroll, "scrollColor", "color"), 176 RSTRG (Rs_color + Color_scroll, "scrollColor", "color"),
177#ifdef RXVT_SCROLLBAR
177 RSTRG (Rs_color + Color_trough, "troughColor", "color"), 178 RSTRG (Rs_color + Color_trough, "troughColor", "color"),
178#endif /* KEEP_SCROLLCOLOR */ 179#endif
179#ifdef OPTION_HC 180#ifdef OPTION_HC
180 STRG (Rs_color + Color_HC, "highlightColor", "hc", "color", "highlight color"), 181 STRG (Rs_color + Color_HC, "highlightColor", "hc", "color", "highlight color"),
181#endif 182#endif
182#ifndef NO_CURSORCOLOR 183#ifndef NO_CURSORCOLOR
183 STRG (Rs_color + Color_cursor, "cursorColor", "cr", "color", "cursor color"), 184 STRG (Rs_color + Color_cursor, "cursorColor", "cr", "color", "cursor color"),
184 /* command-line option = resource name */ 185 /* command-line option = resource name */
185 RSTRG (Rs_color + Color_cursor2, "cursorColor2", "color"), 186 RSTRG (Rs_color + Color_cursor2, "cursorColor2", "color"),
186#endif /* NO_CURSORCOLOR */ 187#endif /* NO_CURSORCOLOR */
187 STRG (Rs_color + Color_pointer_fg, "pointerColor", "pr", "color", "pointer color"), 188 STRG (Rs_color + Color_pointer_fg, "pointerColor", "pr", "color", "pointer color"),
188 STRG (Rs_color + Color_pointer_bg, "pointerColor2", "pr2", "color", "pointer bg color"), 189 STRG (Rs_color + Color_pointer_bg, "pointerColor2", "pr2", "color", "pointer bg color"),
189 STRG (Rs_color + Color_border, "borderColor", "bd", "color", "border color"), 190 STRG (Rs_color + Color_border, "borderColor", "bd", "color", "border color"),
190#ifdef XPM_BACKGROUND 191#ifdef BG_IMAGE_FROM_FILE
191 RSTRG (Rs_path, "path", "search path"), 192 RSTRG (Rs_path, "path", "search path"),
192 STRG (Rs_backgroundPixmap, "backgroundPixmap", "pixmap", "file[;geom]", "background pixmap"), 193 STRG (Rs_backgroundPixmap, "backgroundPixmap", "pixmap", "file[;geom]", "background pixmap"),
193#endif 194#endif
194 /* fonts: command-line option = resource name */ 195 /* fonts: command-line option = resource name */
195 STRG (Rs_font, "font", "fn", "fontname", "normal text font"), 196 STRG (Rs_font, "font", "fn", "fontname", "normal text font"),
196#if ENABLE_STYLES 197#if ENABLE_STYLES
197 STRG (Rs_boldFont, "boldFont", "fb", "fontname", "bold font"), 198 STRG (Rs_boldFont, "boldFont", "fb", "fontname", "bold font"),
198 STRG (Rs_italicFont, "italicFont", "fi", "fontname", "italic font"), 199 STRG (Rs_italicFont, "italicFont", "fi", "fontname", "italic font"),
199 STRG (Rs_boldItalicFont, "boldItalicFont", "fbi", "fontname", "bold italic font"), 200 STRG (Rs_boldItalicFont, "boldItalicFont", "fbi", "fontname", "bold italic font"),
200 BOOL (Rs_intensityStyles, "intensityStyles", "is", Opt_intensityStyles, "font styles imply intensity changes"), 201 BOOL (Rs_intensityStyles, "intensityStyles", "is", Opt_intensityStyles, 0, "font styles imply intensity changes"),
201#endif 202#endif
202#ifdef USE_XIM 203#ifdef USE_XIM
203 STRG (Rs_inputMethod, "inputMethod", "im", "name", "name of input method"), 204 STRG (Rs_inputMethod, "inputMethod", "im", "name", "name of input method"),
204 STRG (Rs_preeditType, "preeditType", "pt", "style", "input style: style = OverTheSpot|OffTheSpot|Root"), 205 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"), 206 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"), 207 STRG (Rs_imFont, "imFont", "imfont", "fontname", "fontset for styles OverTheSpot and OffTheSpot"),
207#endif /* USE_XIM */ 208#endif /* USE_XIM */
208 STRG (Rs_name, NULL, "name", "string", "client instance, icon, and title strings"), 209 STRG (Rs_name, NULL, "name", "string", "client instance, icon, and title strings"),
209 STRG (Rs_title, "title", "title", "string", "title name for window"), 210 STRG (Rs_title, "title", "title", "string", "title name for window"),
210 STRG (Rs_title, NULL, "T", NULL, NULL), /* short form */ 211 STRG (Rs_title, NULL, "T", NULL, NULL), /* short form */
211 STRG (Rs_iconName, "iconName", "n", "string", "icon name for window"), 212 STRG (Rs_iconName, "iconName", "n", "string", "icon name for window"),
212 STRG (Rs_saveLines, "saveLines", "sl", "number", "number of scrolled lines to save"), 213 STRG (Rs_saveLines, "saveLines", "sl", "number", "number of scrolled lines to save"),
213#if ENABLE_XEMBED 214#if ENABLE_XEMBED
214 STRG (Rs_embed, NULL, "embed", "windowid", "window id to embed terminal in"), 215 STRG (Rs_embed, NULL, "embed", "windowid", "window id to embed terminal in"),
215#endif 216#endif
216#if XFT 217#if XFT
217 STRG (Rs_depth, "depth", "depth", "number", "depth of visual to request"), 218 STRG (Rs_depth, "depth", "depth", "number", "depth of visual to request"),
219 BOOL (Rs_buffered, "buffered", NULL, Opt_buffered, 0, NULL),
218#endif 220#endif
219#if ENABLE_FRILLS 221#if ENABLE_FRILLS
220 RSTRG (Rs_transient_for, "transient-for", "windowid"), 222 RSTRG (Rs_transient_for, "transient-for", "windowid"),
221 BOOL (Rs_override_redirect, "override-redirect", "override-redirect", Opt_override_redirect, "set override-redirect on the terminal window"), 223 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"), 224 STRG (Rs_pty_fd, NULL, "pty-fd", "fileno", "file descriptor of pty to use"),
223 BOOL (Rs_hold, "hold", "hold", Opt_hold, "retain window after shell exit"), 225 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"), 226 STRG (Rs_ext_bwidth, "externalBorder", "w", "number", "external border in pixels"),
225 STRG (Rs_ext_bwidth, NULL, "bw", NULL, NULL), 227 STRG (Rs_ext_bwidth, NULL, "bw", NULL, NULL),
226 STRG (Rs_ext_bwidth, NULL, "borderwidth", NULL, NULL), 228 STRG (Rs_ext_bwidth, NULL, "borderwidth", NULL, NULL),
227 STRG (Rs_int_bwidth, "internalBorder", "b", "number", "internal border in pixels"), 229 STRG (Rs_int_bwidth, "internalBorder", "b", "number", "internal border in pixels"),
228 BOOL (Rs_borderLess, "borderLess", "bl", Opt_borderLess, "borderless window"), 230 BOOL (Rs_borderLess, "borderLess", "bl", Opt_borderLess, 0, "borderless window"),
229 BOOL (Rs_skipBuiltinGlyphs, "skipBuiltinGlyphs", "sbg", Opt_skipBuiltinGlyphs, "do not use internal glyphs"),
230 STRG (Rs_lineSpace, "lineSpace", "lsp", "number", "number of extra pixels between rows"), 231 STRG (Rs_lineSpace, "lineSpace", "lsp", "number", "number of extra pixels between rows"),
232#endif
233#ifdef BUILTIN_GLYPHS
234 BOOL (Rs_skipBuiltinGlyphs, "skipBuiltinGlyphs", "sbg", Opt_skipBuiltinGlyphs, 0, "do not use internal glyphs"),
231#endif 235#endif
232#ifdef POINTER_BLANK 236#ifdef POINTER_BLANK
233 RSTRG (Rs_pointerBlankDelay, "pointerBlankDelay", "number"), 237 RSTRG (Rs_pointerBlankDelay, "pointerBlankDelay", "number"),
234#endif 238#endif
235#ifndef NO_BACKSPACE_KEY 239#ifndef NO_BACKSPACE_KEY
236 RSTRG (Rs_backspace_key, "backspacekey", "string"), 240 RSTRG (Rs_backspace_key, "backspacekey", "string"),
237#endif 241#endif
238#ifndef NO_DELETE_KEY 242#ifndef NO_DELETE_KEY
239 RSTRG (Rs_delete_key, "deletekey", "string"), 243 RSTRG (Rs_delete_key, "deletekey", "string"),
240#endif 244#endif
241 RSTRG (Rs_selectstyle, "selectstyle", "mode"),
242#ifdef PRINTPIPE 245#ifdef PRINTPIPE
243 RSTRG (Rs_print_pipe, "print-pipe", "string"), 246 RSTRG (Rs_print_pipe, "print-pipe", "string"),
244#endif 247#endif
245 STRG (Rs_modifier, "modifier", "mod", "modifier", "meta modifier = alt|meta|hyper|super|mod1|...|mod5"), 248 STRG (Rs_modifier, "modifier", "mod", "modifier", "meta modifier = alt|meta|hyper|super|mod1|...|mod5"),
246#ifdef CUTCHAR_RESOURCE
247 RSTRG (Rs_cutchars, "cutchars", "string"), 249 RSTRG (Rs_cutchars, "cutchars", "string"),
248#endif /* CUTCHAR_RESOURCE */
249 RSTRG (Rs_answerbackstring, "answerbackString", "string"), 250 RSTRG (Rs_answerbackstring, "answerbackString", "string"),
250#ifndef NO_SECONDARY_SCREEN 251#ifndef NO_SECONDARY_SCREEN
251 BOOL (Rs_secondaryScreen, "secondaryScreen", "ssc", Opt_secondaryScreen, "enable secondary screen"), 252 BOOL (Rs_secondaryScreen, "secondaryScreen", "ssc", Opt_secondaryScreen, 0, "enable secondary screen"),
252 BOOL (Rs_secondaryScroll, "secondaryScroll", "ssr", Opt_secondaryScroll, "enable secondary screen scroll"), 253 BOOL (Rs_secondaryScroll, "secondaryScroll", "ssr", Opt_secondaryScroll, 0, "enable secondary screen scroll"),
253#endif 254#endif
254#if ENABLE_PERL 255#if ENABLE_PERL
255 RSTRG (Rs_perl_lib, "perl-lib", "string"), //, "colon-separated directories with extension scripts"),TODO 256 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 257 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 258 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"), 259 STRG (Rs_perl_ext_2, "perl-ext", "pe", "string", "colon-separated list of perl extensions to enable for this instance"),
259#endif 260#endif
260#ifndef NO_RESOURCES 261#if ISO_14755
261 INFO ("xrm", "string", "X resource"), 262 BOOL (Rs_iso14755_52, "iso14755_52", NULL, Opt_iso14755_52, 0, NULL),
263#endif
264#ifdef HAVE_AFTERIMAGE
265 STRG (Rs_blendtype, "blendType", "blt", "string", "background image blending type - alpha, tint, etc..."),
266 STRG (Rs_blurradius, "blurRadius", "blr", "HxV", "Gaussian Blur radii to apply to the root background"),
262#endif 267#endif
263 INFO ("e", "command arg ...", "command to execute") 268 INFO ("e", "command arg ...", "command to execute")
264 }; 269 };
265 270
266#undef INFO 271#undef INFO
267#undef STRG 272#undef STRG
268#undef RSTRG 273#undef RSTRG
269#undef SWCH 274#undef SWCH
270#undef BOOL 275#undef BOOL
271/*}}} */
272 276
273static const char releasestring[] = "rxvt-unicode (" RXVTNAME ") v" VERSION " - released: " DATE "\n"; 277static const char releasestring[] = "rxvt-unicode (" RXVTNAME ") v" VERSION " - released: " DATE "\n";
274static const char optionsstring[] = "options: " 278static const char optionsstring[] = "options: "
275#if ENABLE_PERL 279#if ENABLE_PERL
276 "perl," 280 "perl,"
… …
311#endif 315#endif
312 "," 316 ","
313#if OFF_FOCUS_FADING 317#if OFF_FOCUS_FADING
314 "fade," 318 "fade,"
315#endif 319#endif
316#if defined(XPM_BACKGROUND)
317 "XPM,"
318#endif
319#if defined(TRANSPARENT) 320#if defined(ENABLE_TRANSPARENCY)
320 "transparent," 321 "transparent,"
321#endif
322#if TINTING
323 "tint," 322 "tint,"
323#endif
324#if HAVE_AFTERIMAGE
325 "afterimage,"
324#endif 326#endif
325#if defined(USE_XIM) 327#if defined(USE_XIM)
326 "XIM," 328 "XIM,"
327#endif 329#endif
328#if defined(NO_BACKSPACE_KEY) 330#if defined(NO_BACKSPACE_KEY)
… …
356 "pointerBlank," 358 "pointerBlank,"
357#endif 359#endif
358#if defined(NO_RESOURCES) 360#if defined(NO_RESOURCES)
359 "NoResources," 361 "NoResources,"
360#endif 362#endif
361 "scrollbars=" 363 "scrollbars=plain"
362#if !defined(HAVE_SCROLLBARS)
363 "NONE"
364#else
365# if defined(PLAIN_SCROLLBAR)
366 "plain"
367# if defined(RXVT_SCROLLBAR) || defined(NEXT_SCROLLBAR) || defined(XTERM_SCROLLBAR)
368 "+"
369# endif
370# endif
371# if defined(RXVT_SCROLLBAR) 364#if defined(RXVT_SCROLLBAR)
372 "rxvt" 365 "+rxvt"
373# if defined(NEXT_SCROLLBAR) || defined(XTERM_SCROLLBAR)
374 "+"
375# endif
376# endif 366#endif
377# if defined(NEXT_SCROLLBAR) 367#if defined(NEXT_SCROLLBAR)
378 "NeXT" 368 "+NeXT"
379# if defined(XTERM_SCROLLBAR)
380 "+"
381# endif
382# endif 369#endif
383# if defined(XTERM_SCROLLBAR) 370#if defined(XTERM_SCROLLBAR)
384 "xterm" 371 "+xterm"
385# endif
386#endif 372#endif
387 "\nUsage: "; /* Usage */ 373 "\nUsage: "; /* Usage */
388 374
389#define INDENT 18 375#define INDENT 18
376
377const char rxvt_term::resval_undef [] = "<undef>";
378const char rxvt_term::resval_on [] = "on";
379const char rxvt_term::resval_off [] = "off";
390 380
391/*{{{ usage: */ 381/*{{{ usage: */
392/*----------------------------------------------------------------------*/ 382/*----------------------------------------------------------------------*/
393static void 383static void
394rxvt_usage (int type) 384rxvt_usage (int type)
… …
403 rxvt_log (" [-help] [--help]\n"); 393 rxvt_log (" [-help] [--help]\n");
404 394
405 for (col = 1, i = 0; i < optList_size; i++) 395 for (col = 1, i = 0; i < optList_size; i++)
406 if (optList[i].desc != NULL) 396 if (optList[i].desc != NULL)
407 { 397 {
408 int len = 0; 398 int len = 0;
409 399
410 if (!optList_isBool (i)) 400 if (optList[i].arg)
411 { 401 len = strlen (optList[i].arg) + 1;
412 len = optList_strlen (i);
413 if (len > 0)
414 len++; /* account for space */
415 }
416#ifdef DEBUG_STRICT 402#ifdef DEBUG_STRICT
417 assert (optList[i].opt != NULL); 403 assert (optList[i].opt != NULL);
418#endif 404#endif
419 len += 4 + strlen (optList[i].opt) + (optList_isBool (i) ? 2: 0); 405 len += 4 + strlen (optList[i].opt) + (optList_isBool (i) ? 2: 0);
420 col += len; 406 col += len;
421 if (col > 79) 407 if (col > 79)
408 {
422 { /* assume regular width */ 409 /* assume regular width */
423 rxvt_log ("\n"); 410 rxvt_log ("\n");
424 col = 1 + len; 411 col = 1 + len;
425 } 412 }
426 413
427 rxvt_log (" [-%s%s", (optList_isBool (i) ? "/+" : ""), optList[i].opt); 414 rxvt_log (" [-%s%s", (optList_isBool (i) ? "/+" : ""), optList[i].opt);
428 if (optList_strlen (i)) 415 if (optList[i].arg)
429 rxvt_log (" %s]", optList[i].arg); 416 rxvt_log (" %s]", optList[i].arg);
430 else 417 else
431 rxvt_log ("]"); 418 rxvt_log ("]");
432 } 419 }
433 break; 420 break;
… …
480 467
481/*{{{ get command-line options before getting resources */ 468/*{{{ get command-line options before getting resources */
482void 469void
483rxvt_term::get_options (int argc, const char *const *argv) 470rxvt_term::get_options (int argc, const char *const *argv)
484{ 471{
485 int i, bad_option = 0; 472 int i, bad_option = 0;
486 static const char On[3] = "ON", Off[4] = "OFF";
487 473
488 for (i = 1; i < argc; i++) 474 for (i = 1; i < argc; i++)
489 { 475 {
490 unsigned int entry, longopt = 0; 476 unsigned int entry, longopt = 0;
491 const char *flag, *opt; 477 const char *opt;
478 int flag;
492 479
493 opt = argv[i]; 480 opt = argv[i];
494 481
495 if (*opt == '-') 482 if (*opt == '-')
496 { 483 {
497 flag = On; 484 flag = 1;
485
498 if (*++opt == '-') 486 if (*++opt == '-')
499 longopt = *opt++; /* long option */ 487 longopt = *opt++; /* long option */
500 } 488 }
501 else if (*opt == '+') 489 else if (*opt == '+')
502 { 490 {
503 flag = Off; 491 flag = 0;
492
504 if (*++opt == '+') 493 if (*++opt == '+')
505 longopt = *opt++; /* long option */ 494 longopt = *opt++; /* long option */
506 } 495 }
507 else 496 else
508 { 497 {
… …
511 continue; 500 continue;
512 } 501 }
513 502
514 if (!strcmp (opt, "help")) 503 if (!strcmp (opt, "help"))
515 rxvt_usage (longopt ? 2 : 1); 504 rxvt_usage (longopt ? 2 : 1);
505
516 if (!strcmp (opt, "h")) 506 if (!strcmp (opt, "h"))
517 rxvt_usage (0); 507 rxvt_usage (0);
518 508
519 /* feature: always try to match long-options */ 509 /* feature: always try to match long-options */
520 for (entry = 0; entry < optList_size; entry++) 510 for (entry = 0; entry < optList_size; entry++)
… …
524 break; 514 break;
525 515
526 if (entry < optList_size) 516 if (entry < optList_size)
527 { 517 {
528 if (optList_isReverse (entry)) 518 if (optList_isReverse (entry))
529 flag = flag == On ? Off : On; 519 flag = !flag;
530 520
531 if (optList_strlen (entry)) 521 if (optList_isString (entry))
532 { 522 {
533 /* 523 /*
534 * special cases are handled in main.c:main () to allow 524 * special cases are handled in main.c:main () to allow
535 * X resources to set these values before we settle for 525 * X resources to set these values before we settle for
536 * default values 526 * default values
537 */ 527 */
538 528
539 if (optList[entry].doff != -1) 529 if (optList[entry].doff != -1)
530 {
531 if (flag && i+1 == argc)
532 rxvt_fatal ("option '%s' requires an argument, aborting.\n", argv [i]);
533
540 rs[optList[entry].doff] = flag == On && argv[i+1] 534 rs[optList[entry].doff] = flag ? argv[++i] : resval_undef;
541 ? argv[++i] : 0; 535 }
542 } 536 }
543 else 537 else
538 {
544 { /* boolean value */ 539 /* boolean value */
545 set_option (optList[entry].flag & Optflag_mask, flag == On); 540 set_option (optList[entry].index, flag);
546 541
547 if (optList[entry].doff != -1) 542 if (optList[entry].doff != -1)
548 rs[optList[entry].doff] = flag; 543 rs[optList[entry].doff] = flag ? resval_on : resval_off;
549 } 544 }
550 } 545 }
546#ifndef NO_RESOURCES
547 else if (!strcmp (opt, "xrm"))
548 {
549 if (i+1 < argc)
550 XrmPutLineResource (&option_db, argv[++i]);
551 }
552#endif
553#ifdef KEYSYM_RESOURCE
554 else if (!strncmp (opt, "keysym.", sizeof ("keysym.") - 1))
555 {
556 if (i+1 < argc)
557 {
558 char *res = (char *)malloc (strlen (opt) + strlen (argv[++i]) + 6);
559 sprintf (res, "*.%s: %s\n", opt, argv[i]);
560 XrmPutLineResource (&option_db, res);
561 free (res);
562 }
563 }
564#endif
551 else 565 else
552#ifdef KEYSYM_RESOURCE
553 /* if (!strncmp (opt, "keysym.", sizeof ("keysym.") - 1)) */
554 if (rxvt_Str_match (opt, "keysym."))
555 { 566 {
556 const char *str = argv[++i];
557
558 if (str != NULL)
559 parse_keysym (opt + sizeof ("keysym.") - 1, str);
560 }
561 else
562#endif
563 {
564 bad_option = 1; 567 bad_option = 1;
565 rxvt_warn ("\"%s\": unknown or malformed option.\n", opt); 568 rxvt_warn ("\"%s\": unknown or malformed option.\n", opt);
566 } 569 }
567 } 570 }
568 571
569 if (bad_option) 572 if (bad_option)
570 rxvt_usage (0); 573 rxvt_usage (0);
571} 574}
… …
602} 605}
603 606
604/* 607/*
605 * look for something like this (XK_Delete) 608 * look for something like this (XK_Delete)
606 * rxvt*keysym.0xFFFF: "\177" 609 * rxvt*keysym.0xFFFF: "\177"
607 *
608 * arg will be
609 * NULL for ~/.Xdefaults and
610 * non-NULL for command-line options (need to allocate)
611 */ 610 */
612#define NEWARGLIM 500 /* `reasonable' size */
613 611
614struct keysym_vocabulary_t 612struct keysym_vocabulary_t
615{ 613{
616 const char *name; 614 const char *name;
617 unsigned short len; 615 unsigned short len;
618 unsigned short value; 616 unsigned short value;
619}; 617};
620keysym_vocabulary_t keysym_vocabulary[] = 618static const keysym_vocabulary_t keysym_vocabulary[] =
621{ 619{
622 { "ISOLevel3", 9, Level3Mask }, 620 { "ISOLevel3", 9, Level3Mask },
623 { "AppKeypad", 9, AppKeypadMask }, 621 { "AppKeypad", 9, AppKeypadMask },
624 { "Control", 7, ControlMask }, 622 { "Control", 7, ControlMask },
625 { "NumLock", 7, NumLockMask }, 623 { "NumLock", 7, NumLockMask },
… …
647}; 645};
648 646
649int 647int
650rxvt_term::parse_keysym (const char *str, const char *arg) 648rxvt_term::parse_keysym (const char *str, const char *arg)
651{ 649{
652 int n, sym; 650 int sym;
653 unsigned int state = 0; 651 unsigned int state = 0;
654 const char *pmodend = NULL; 652 const char *key = strrchr (str, '-');
655 char *newarg = NULL;
656 char newargstr[NEWARGLIM];
657 653
658 if (arg == NULL) 654 if (!key)
659 { 655 key = str;
660 if ((n = rxvt_Str_match (str, "keysym.")) == 0)
661 return 0;
662
663 str += n; /* skip `keysym.' */
664 if (!(pmodend = strchr (str, ':')))
665 return -1;
666 }
667 else 656 else
668 pmodend = str + strlen(str); 657 key++;
669 658
670 for (--pmodend; str < pmodend; --pmodend) 659 // string or key is empty
671 if (*pmodend == '-') 660 if (*arg == '\0' || *key == '\0')
672 break; 661 return -1;
673 662
663 // parse modifiers
674 while (str < pmodend) 664 while (str < key)
675 { 665 {
676 unsigned int i; 666 unsigned int i;
677 667
678 for (i=0; i < sizeof (keysym_vocabulary) / sizeof (keysym_vocabulary_t); ++i) 668 for (i=0; i < sizeof (keysym_vocabulary) / sizeof (keysym_vocabulary_t); ++i)
679 { 669 {
… …
690 680
691 if (*str == '-') 681 if (*str == '-')
692 ++str; 682 ++str;
693 } 683 }
694 684
695 /* some scanf () have trouble with a 0x prefix */ 685 // convert keysym name to keysym number
696 if (str[0] == '0' && toupper (str[1]) == 'X') 686 if ((sym = XStringToKeysym (str)) == None)
697 { 687 {
698 str += 2; 688 // fallback on hexadecimal parsing
699 689 char *end;
690 sym = strtol (str, &end, 16);
700 if (arg) 691 if (*end)
701 {
702 if (sscanf (str, (strchr (str, ':') ? "%x:" : "%x"), &sym) != 1)
703 return -1;
704 }
705 else
706 {
707 if (sscanf (str, "%x:", &sym) != 1)
708 return -1;
709
710 /* cue to ':', it's there since sscanf () worked */
711 strncpy (newargstr, strchr (str, ':') + 1, NEWARGLIM - 1);
712 newargstr[NEWARGLIM - 1] = '\0';
713 newarg = newargstr;
714 }
715 }
716 else
717 {
718 /*
719 * convert keysym name to keysym number
720 */
721 strncpy (newargstr, str, NEWARGLIM - 1);
722 newargstr[NEWARGLIM - 1] = '\0';
723
724 if (arg == NULL)
725 {
726 if ((newarg = strchr (newargstr, ':')) == NULL)
727 return -1;
728
729 *newarg++ = '\0'; /* terminate keysym name */
730 }
731
732 if ((sym = XStringToKeysym (newargstr)) == None)
733 return -1; 692 return -1;
734 } 693 }
735 694
736 if (newarg == NULL)
737 {
738 strncpy (newargstr, arg, NEWARGLIM - 1);
739 newargstr[NEWARGLIM - 1] = '\0';
740 newarg = newargstr;
741 }
742
743 rxvt_Str_trim (newarg);
744 if (*newarg == '\0' || (n = rxvt_Str_escaped (newarg)) == 0)
745 return -1;
746
747 keyboard->register_user_translation (sym, state, newarg); 695 keyboard->register_user_translation (sym, state, arg);
748 return 1; 696 return 1;
749} 697}
750 698
751# endif /* KEYSYM_RESOURCE */ 699# endif /* KEYSYM_RESOURCE */
752#endif /* NO_RESOURCES */ 700#endif /* NO_RESOURCES */
753 701
754static char * 702static char *
755get_res (XrmDatabase database, const char *program, const char *option) 703get_res (XrmDatabase database, const char *program, const char *option)
756{ 704{
757 char resource[512]; 705 char resource[512];
… …
765} 713}
766 714
767const char * 715const char *
768rxvt_term::x_resource (const char *name) 716rxvt_term::x_resource (const char *name)
769{ 717{
770 XrmDatabase database = XrmGetDatabase (xdisp); 718 XrmDatabase database = XrmGetDatabase (dpy);
771 719
772 const char *p = get_res (database, rs[Rs_name], name); 720 const char *p = get_res (database, rs[Rs_name], name);
773 const char *p0 = get_res (database, "!INVALIDPROGRAMMENAMEDONTMATCH!", name); 721 const char *p0 = get_res (database, "!INVALIDPROGRAMMENAMEDONTMATCH!", name);
774 722
775 if (p == NULL || (p0 && strcmp (p, p0) == 0)) 723 if (p == NULL || (p0 && strcmp (p, p0) == 0))
… …
789 737
790void 738void
791rxvt_term::extract_resources () 739rxvt_term::extract_resources ()
792{ 740{
793#ifndef NO_RESOURCES 741#ifndef NO_RESOURCES
742 XrmDatabase database = XrmGetDatabase (dpy);
743 XrmMergeDatabases (option_db, &database);
744 option_db = NULL;
794 /* 745 /*
795 * Query resources for options that affect us 746 * Query resources for options that affect us
796 */ 747 */
797 for (int entry = 0; entry < optList_size; entry++) 748 for (int entry = 0; entry < optList_size; entry++)
798 { 749 {
… …
818 || strcasecmp (p, "1") == 0; 769 || strcasecmp (p, "1") == 0;
819 770
820 if (optList_isReverse (entry)) 771 if (optList_isReverse (entry))
821 s = !s; 772 s = !s;
822 773
823 set_option (optList[entry].flag & Optflag_mask, s); 774 set_option (optList[entry].index, s);
824 } 775 }
825 } 776 }
826 } 777 }
827 778
828 /* 779 /*
829 * [R5 or later]: enumerate the resource database 780 * [R5 or later]: enumerate the resource database
830 */ 781 */
831# ifdef KEYSYM_RESOURCE 782# ifdef KEYSYM_RESOURCE
832 XrmDatabase database = XrmGetDatabase (xdisp);
833 XrmName name_prefix[3]; 783 XrmName name_prefix[3];
834 XrmClass class_prefix[3]; 784 XrmClass class_prefix[3];
835 785
836 name_prefix[0] = XrmStringToName (rs[Rs_name]); 786 name_prefix[0] = XrmStringToName (rs[Rs_name]);
837 name_prefix[1] = XrmStringToName ("keysym"); 787 name_prefix[1] = XrmStringToName ("keysym");
… …
851 XrmEnumerateDatabase (database, name_prefix, class_prefix, 801 XrmEnumerateDatabase (database, name_prefix, class_prefix,
852 XrmEnumOneLevel, rxvt_define_key, NULL); 802 XrmEnumOneLevel, rxvt_define_key, NULL);
853# endif 803# endif
854# endif 804# endif
855 805
856#endif /* NO_RESOURCES */ 806#endif /* NO_RESOURCES */
857} 807}
858 808
859/*----------------------- end-of-file (C source) -----------------------*/ 809/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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