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.80 by root, Mon Jan 16 15:00:20 2006 UTC vs.
Revision 1.129 by ayin, Mon Jan 7 12:31:49 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/* #define DEBUG_RESOURCES */
40
41/*{{{ monolithic option/resource structure: */ 40/* monolithic option/resource structure: */
42/* 41/*
43 * `string' options MUST have a usage argument 42 * `string' options MUST have a usage argument
44 * `switch' and `boolean' options have no argument 43 * `switch' and `boolean' options have no argument
45 * 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 ()
46 */ 45 */
47 46
48/* INFO () - descriptive information only */ 47/* INFO () - descriptive information only */
49#define INFO(opt, arg, desc) \ 48#define INFO(opt, arg, desc) \
50 {0, -1, NULL, (opt), (arg), (desc)} 49 {0, 0, -1, NULL, (opt), (arg), (desc)}
51 50
52/* STRG () - command-line option, with/without resource */ 51/* STRG () - command-line option, with/without resource */
53#define STRG(rsp, kw, opt, arg, desc) \ 52#define STRG(rsp, kw, opt, arg, desc) \
54 {0, (rsp), (kw), (opt), (arg), (desc)} 53 {0, 0, (rsp), (kw), (opt), (arg), (desc)}
55 54
56/* RSTRG () - resource/long-option */ 55/* RSTRG () - resource/long-option */
57#define RSTRG(rsp, kw, arg) \ 56#define RSTRG(rsp, kw, arg) \
58 {0, (rsp), (kw), NULL, (arg), NULL} 57 {0, 0, (rsp), (kw), NULL, (arg), NULL}
59 58
60/* BOOL () - regular boolean `-/+' flag */ 59/* BOOL () - regular boolean `-/+' flag */
61#define BOOL(rsp, kw, opt, flag, desc) \ 60#define BOOL(rsp, kw, opt, option, flag, desc) \
62 { (Optflag_Boolean | (flag)), (rsp), (kw), (opt), NULL, (desc)} 61 { (option), (Optflag_Boolean | (flag)), (rsp), (kw), (opt), NULL, (desc)}
63 62
64/* SWCH () - `-' flag */ 63/* SWCH () - `-' flag */
65#define SWCH(opt, flag, desc) \ 64#define SWCH(opt, option, flag, desc) \
66 { (flag), -1, NULL, (opt), NULL, (desc)} 65 { (option), (Optflag_Switch | (flag)), -1, NULL, (opt), NULL, (desc)}
67 66
68/* convenient macros */ 67/* convenient macros */
69#define optList_strlen(i) \ 68#define optList_strlen(i) \
70 (optList[i].flag ? 0 : (optList[i].arg ? strlen (optList[i].arg) : 1)) 69 (optList[i].flag ? 0 : (optList[i].arg ? strlen (optList[i].arg) : 1))
71#define optList_isBool(i) \ 70#define optList_isBool(i) \
… …
75#define optList_size \ 74#define optList_size \
76 (sizeof (optList) / sizeof (optList[0])) 75 (sizeof (optList) / sizeof (optList[0]))
77 76
78static const struct 77static const struct
79 { 78 {
79 const uint8_t index; /* Option index */
80 const unsigned long flag; /* Option flag */ 80 const uint8_t flag; /* Option flag */
81 const int doff; /* data offset */ 81 const int16_t doff; /* resource value index or -1 */
82 const char *kw; /* keyword */ 82 const char *kw; /* keyword */
83 const char *opt; /* option */ 83 const char *opt; /* option */
84 const char *arg; /* argument */ 84 const char *arg; /* argument */
85 const char *desc; /* description */ 85 const char *desc; /* description */
86 } 86 }
… …
88 STRG (Rs_display_name, NULL, "d", NULL, NULL), /* short form */ 88 STRG (Rs_display_name, NULL, "d", NULL, NULL), /* short form */
89 STRG (Rs_display_name, NULL, "display", "string", "X server to contact"), 89 STRG (Rs_display_name, NULL, "display", "string", "X server to contact"),
90 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"),
91 STRG (Rs_geometry, NULL, "g", NULL, NULL), /* short form */ 91 STRG (Rs_geometry, NULL, "g", NULL, NULL), /* short form */
92 STRG (Rs_geometry, "geometry", "geometry", "geometry", "size (in characters) and position"), 92 STRG (Rs_geometry, "geometry", "geometry", "geometry", "size (in characters) and position"),
93 SWCH ("C", Opt_console, "intercept console messages"), 93 SWCH ("C", Opt_console, 0, "intercept console messages"),
94 SWCH ("iconic", Opt_iconic, "start iconic"), 94 SWCH ("iconic", Opt_iconic, 0, "start iconic"),
95 SWCH ("ic", Opt_iconic, NULL), /* short form */ 95 SWCH ("ic", Opt_iconic, 0, NULL), /* short form */
96 BOOL (Rs_reverseVideo, "reverseVideo", "rv", Opt_reverseVideo, "reverse video"), 96 BOOL (Rs_reverseVideo, "reverseVideo", "rv", Opt_reverseVideo, 0, "reverse video"),
97 BOOL (Rs_loginShell, "loginShell", "ls", Opt_loginShell, "login shell"), 97 BOOL (Rs_loginShell, "loginShell", "ls", Opt_loginShell, 0, "login shell"),
98 BOOL (Rs_jumpScroll, "jumpScroll", "j", Opt_jumpScroll, "jump scrolling"), 98 BOOL (Rs_jumpScroll, "jumpScroll", "j", Opt_jumpScroll, 0, "jump scrolling"),
99 BOOL (Rs_skipScroll, "skipScroll", "ss", Opt_skipScroll, 0, "skip scrolling"),
99 BOOL (Rs_pastableTabs, "pastableTabs", "ptab", Opt_pastableTabs, "tab characters are pastable"), 100 BOOL (Rs_pastableTabs, "pastableTabs", "ptab", Opt_pastableTabs, 0, "tab characters are pastable"),
100#if HAVE_SCROLLBARS 101#if HAVE_SCROLLBARS
101 RSTRG (Rs_scrollstyle, "scrollstyle", "mode"), 102 RSTRG (Rs_scrollstyle, "scrollstyle", "mode"),
102 BOOL (Rs_scrollBar, "scrollBar", "sb", Opt_scrollBar, "scrollbar"), 103 BOOL (Rs_scrollBar, "scrollBar", "sb", Opt_scrollBar, 0, "scrollbar"),
103 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"),
104 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"),
105 RSTRG (Rs_scrollBar_align, "scrollBar_align", "mode"), 106 RSTRG (Rs_scrollBar_align, "scrollBar_align", "mode"),
106 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"),
107#endif 108#endif
108 BOOL (Rs_scrollTtyOutput, "scrollTtyOutput", NULL, Opt_scrollTtyOutput, NULL), 109 BOOL (Rs_scrollTtyOutput, "scrollTtyOutput", NULL, Opt_scrollTtyOutput, 0, NULL),
109 BOOL (Rs_scrollTtyOutput, NULL, "si", Optflag_Reverse | Opt_scrollTtyOutput, "scroll-on-tty-output inhibit"), 110 BOOL (Rs_scrollTtyOutput, NULL, "si", Opt_scrollTtyOutput, Optflag_Reverse, "scroll-on-tty-output inhibit"),
110 BOOL (Rs_scrollTtyKeypress, "scrollTtyKeypress", "sk", Opt_scrollTtyKeypress, "scroll-on-keypress"), 111 BOOL (Rs_scrollTtyKeypress, "scrollTtyKeypress", "sk", Opt_scrollTtyKeypress, 0, "scroll-on-keypress"),
111 BOOL (Rs_scrollWithBuffer, "scrollWithBuffer", "sw", Opt_scrollWithBuffer, "scroll-with-buffer"), 112 BOOL (Rs_scrollWithBuffer, "scrollWithBuffer", "sw", Opt_scrollWithBuffer, 0, "scroll-with-buffer"),
112#if TRANSPARENT 113#if ENABLE_TRANSPARENCY
113 BOOL (Rs_transparent, "inheritPixmap", "ip", Opt_transparent, "inherit parent pixmap"), 114 BOOL (Rs_transparent, "inheritPixmap", "ip", Opt_transparent, 0, "inherit parent pixmap"),
114 SWCH ("tr", Opt_transparent, NULL), 115 BOOL (Rs_transparent, "transparent", "tr", Opt_transparent, 0, "inherit parent pixmap"),
115# if TINTING
116 STRG (Rs_color + Color_tint, "tintColor", "tint", "color", "tint color"), 116 STRG (Rs_color + Color_tint, "tintColor", "tint", "color", "tint color"),
117 STRG (Rs_shade, "shading", "sh", "number", "shade background by number %."),
118#endif
119#if OFF_FOCUS_FADING
120 STRG (Rs_fade, "fading", "fade", "number", "fade colors by number % when losing focus"),
121 STRG (Rs_color + Color_fade, "fadeColor", "fadecolor", "color", "target color for off-focus fading"),
122#endif
123 BOOL (Rs_utmpInhibit, "utmpInhibit", "ut", Opt_utmpInhibit, 0, "utmp inhibit"),
124#ifndef NO_BELL
125# if ENABLE_FRILLS
126 BOOL (Rs_urgentOnBell, "urgentOnBell", NULL, Opt_urgentOnBell, 0, NULL),
117# endif 127# endif
118#endif
119#if OFF_FOCUS_FADING
120 STRG (Rs_fade, "fading", "fade", "%", "fade colors x% percent when rxvt-unicode is losing focus"),
121 STRG (Rs_color + Color_fade, "fadeColor", "fadecolor", "color", "target color for off-focus fading"),
122#endif
123#if TINTING
124 STRG (Rs_shade, "shading", "sh", "%", "shade background by x% when tinting."),
125#endif
126 BOOL (Rs_utmpInhibit, "utmpInhibit", "ut", Opt_utmpInhibit, "utmp inhibit"),
127#ifndef NO_BELL
128 BOOL (Rs_visualBell, "visualBell", "vb", Opt_visualBell, "visual bell"), 128 BOOL (Rs_visualBell, "visualBell", "vb", Opt_visualBell, 0, "visual bell"),
129# if ! defined(NO_MAPALERT) && defined(MAPALERT_OPTION) 129# if ! defined(NO_MAPALERT) && defined(MAPALERT_OPTION)
130 BOOL (Rs_mapAlert, "mapAlert", NULL, Opt_mapAlert, NULL), 130 BOOL (Rs_mapAlert, "mapAlert", NULL, Opt_mapAlert, 0, NULL),
131# endif 131# endif
132#endif 132#endif
133#ifdef META8_OPTION 133#ifdef META8_OPTION
134 BOOL (Rs_meta8, "meta8", NULL, Opt_meta8, NULL), 134 BOOL (Rs_meta8, "meta8", NULL, Opt_meta8, 0, NULL),
135#endif 135#endif
136#ifdef MOUSE_WHEEL 136#ifdef MOUSE_WHEEL
137 BOOL (Rs_mouseWheelScrollPage, "mouseWheelScrollPage", NULL, Opt_mouseWheelScrollPage, NULL), 137 BOOL (Rs_mouseWheelScrollPage, "mouseWheelScrollPage", NULL, Opt_mouseWheelScrollPage, 0, NULL),
138#endif 138#endif
139#if ENABLE_FRILLS 139#if ENABLE_FRILLS
140 BOOL (Rs_tripleclickwords, "tripleclickwords", "tcw", Opt_tripleclickwords, "triple click word selection"), 140 BOOL (Rs_tripleclickwords, "tripleclickwords", "tcw", Opt_tripleclickwords, 0, "triple click word selection"),
141 BOOL (Rs_insecure, "insecure", "insecure", Opt_insecure, "enable possibly insecure escape sequences"), 141 BOOL (Rs_insecure, "insecure", "insecure", Opt_insecure, 0, "enable possibly insecure escape sequences"),
142 BOOL (Rs_cursorUnderline, "cursorUnderline", "uc", Opt_cursorUnderline, "underline cursor"), 142 BOOL (Rs_cursorUnderline, "cursorUnderline", "uc", Opt_cursorUnderline, 0, "underline cursor"),
143#endif 143#endif
144#if CURSOR_BLINK 144#if CURSOR_BLINK
145 BOOL (Rs_cursorBlink, "cursorBlink", "bc", Opt_cursorBlink, "blinking cursor"), 145 BOOL (Rs_cursorBlink, "cursorBlink", "bc", Opt_cursorBlink, 0, "blinking cursor"),
146#endif 146#endif
147#ifdef POINTER_BLANK 147#ifdef POINTER_BLANK
148 BOOL (Rs_pointerBlank, "pointerBlank", "pb", Opt_pointerBlank, "switch off pointer after delay"), 148 BOOL (Rs_pointerBlank, "pointerBlank", "pb", Opt_pointerBlank, 0, "switch off pointer after delay"),
149#endif 149#endif
150 STRG (Rs_color + Color_bg, "background", "bg", "color", "background color"), 150 STRG (Rs_color + Color_bg, "background", "bg", "color", "background color"),
151 STRG (Rs_color + Color_fg, "foreground", "fg", "color", "foreground color"), 151 STRG (Rs_color + Color_fg, "foreground", "fg", "color", "foreground color"),
152 RSTRG (Rs_color + minCOLOR + 0, "color0", "color"), 152 RSTRG (Rs_color + minCOLOR + 0, "color0", "color"),
153 RSTRG (Rs_color + minCOLOR + 1, "color1", "color"), 153 RSTRG (Rs_color + minCOLOR + 1, "color1", "color"),
… …
168#ifndef NO_BOLD_UNDERLINE_REVERSE 168#ifndef NO_BOLD_UNDERLINE_REVERSE
169 RSTRG (Rs_color + Color_BD, "colorBD", "color"), 169 RSTRG (Rs_color + Color_BD, "colorBD", "color"),
170 RSTRG (Rs_color + Color_IT, "colorIT", "color"), 170 RSTRG (Rs_color + Color_IT, "colorIT", "color"),
171 RSTRG (Rs_color + Color_UL, "colorUL", "color"), 171 RSTRG (Rs_color + Color_UL, "colorUL", "color"),
172 RSTRG (Rs_color + Color_RV, "colorRV", "color"), 172 RSTRG (Rs_color + Color_RV, "colorRV", "color"),
173#endif /* ! NO_BOLD_UNDERLINE_REVERSE */ 173#endif /* ! NO_BOLD_UNDERLINE_REVERSE */
174#if ENABLE_FRILLS 174#if ENABLE_FRILLS
175 RSTRG (Rs_color + Color_underline, "underlineColor", "color"), 175 RSTRG (Rs_color + Color_underline, "underlineColor", "color"),
176#endif 176#endif
177#ifdef KEEP_SCROLLCOLOR 177#ifdef KEEP_SCROLLCOLOR
178 RSTRG (Rs_color + Color_scroll, "scrollColor", "color"), 178 RSTRG (Rs_color + Color_scroll, "scrollColor", "color"),
179 RSTRG (Rs_color + Color_trough, "troughColor", "color"), 179 RSTRG (Rs_color + Color_trough, "troughColor", "color"),
180#endif /* KEEP_SCROLLCOLOR */ 180#endif /* KEEP_SCROLLCOLOR */
181#ifdef OPTION_HC 181#ifdef OPTION_HC
182 STRG (Rs_color + Color_HC, "highlightColor", "hc", "color", "highlight color"), 182 STRG (Rs_color + Color_HC, "highlightColor", "hc", "color", "highlight color"),
183#endif 183#endif
184#ifndef NO_CURSORCOLOR 184#ifndef NO_CURSORCOLOR
185 STRG (Rs_color + Color_cursor, "cursorColor", "cr", "color", "cursor color"), 185 STRG (Rs_color + Color_cursor, "cursorColor", "cr", "color", "cursor color"),
186 /* command-line option = resource name */ 186 /* command-line option = resource name */
187 RSTRG (Rs_color + Color_cursor2, "cursorColor2", "color"), 187 RSTRG (Rs_color + Color_cursor2, "cursorColor2", "color"),
188#endif /* NO_CURSORCOLOR */ 188#endif /* NO_CURSORCOLOR */
189 STRG (Rs_color + Color_pointer_fg, "pointerColor", "pr", "color", "pointer color"), 189 STRG (Rs_color + Color_pointer_fg, "pointerColor", "pr", "color", "pointer color"),
190 STRG (Rs_color + Color_pointer_bg, "pointerColor2", "pr2", "color", "pointer bg color"), 190 STRG (Rs_color + Color_pointer_bg, "pointerColor2", "pr2", "color", "pointer bg color"),
191 STRG (Rs_color + Color_border, "borderColor", "bd", "color", "border color"), 191 STRG (Rs_color + Color_border, "borderColor", "bd", "color", "border color"),
192#ifdef XPM_BACKGROUND 192#ifdef BG_IMAGE_FROM_FILE
193 RSTRG (Rs_path, "path", "search path"), 193 RSTRG (Rs_path, "path", "search path"),
194 STRG (Rs_backgroundPixmap, "backgroundPixmap", "pixmap", "file[;geom]", "background pixmap"), 194 STRG (Rs_backgroundPixmap, "backgroundPixmap", "pixmap", "file[;geom]", "background pixmap"),
195#endif 195#endif
196 /* fonts: command-line option = resource name */ 196 /* fonts: command-line option = resource name */
197 STRG (Rs_font, "font", "fn", "fontname", "normal text font"), 197 STRG (Rs_font, "font", "fn", "fontname", "normal text font"),
198#if ENABLE_STYLES 198#if ENABLE_STYLES
199 STRG (Rs_boldFont, "boldFont", "fb", "fontname", "bold font"), 199 STRG (Rs_boldFont, "boldFont", "fb", "fontname", "bold font"),
200 STRG (Rs_italicFont, "italicFont", "fi", "fontname", "italic font"), 200 STRG (Rs_italicFont, "italicFont", "fi", "fontname", "italic font"),
201 STRG (Rs_boldItalicFont, "boldItalicFont", "fbi", "fontname", "bold italic font"), 201 STRG (Rs_boldItalicFont, "boldItalicFont", "fbi", "fontname", "bold italic font"),
202 BOOL (Rs_intensityStyles, "intensityStyles", "is", Opt_intensityStyles, "font styles imply intensity changes"), 202 BOOL (Rs_intensityStyles, "intensityStyles", "is", Opt_intensityStyles, 0, "font styles imply intensity changes"),
203#endif 203#endif
204#ifdef USE_XIM 204#ifdef USE_XIM
205 STRG (Rs_inputMethod, "inputMethod", "im", "name", "name of input method"), 205 STRG (Rs_inputMethod, "inputMethod", "im", "name", "name of input method"),
206 STRG (Rs_preeditType, "preeditType", "pt", "style", "input style: style = OverTheSpot|OffTheSpot|Root"), 206 STRG (Rs_preeditType, "preeditType", "pt", "style", "input style: style = OverTheSpot|OffTheSpot|Root"),
207 STRG (Rs_imLocale, "imLocale", "imlocale", "string", "locale to use for input method"), 207 STRG (Rs_imLocale, "imLocale", "imlocale", "string", "locale to use for input method"),
208 STRG (Rs_imFont, "imFont", "imfont", "fontname", "fontset for styles OverTheSpot and OffTheSpot"), 208 STRG (Rs_imFont, "imFont", "imfont", "fontname", "fontset for styles OverTheSpot and OffTheSpot"),
209#endif /* USE_XIM */ 209#endif /* USE_XIM */
210 STRG (Rs_name, NULL, "name", "string", "client instance, icon, and title strings"), 210 STRG (Rs_name, NULL, "name", "string", "client instance, icon, and title strings"),
211 STRG (Rs_title, "title", "title", "string", "title name for window"), 211 STRG (Rs_title, "title", "title", "string", "title name for window"),
212 STRG (Rs_title, NULL, "T", NULL, NULL), /* short form */ 212 STRG (Rs_title, NULL, "T", NULL, NULL), /* short form */
213 STRG (Rs_iconName, "iconName", "n", "string", "icon name for window"), 213 STRG (Rs_iconName, "iconName", "n", "string", "icon name for window"),
214 STRG (Rs_saveLines, "saveLines", "sl", "number", "number of scrolled lines to save"), 214 STRG (Rs_saveLines, "saveLines", "sl", "number", "number of scrolled lines to save"),
215#if ENABLE_XEMBED 215#if ENABLE_XEMBED
216 STRG (Rs_embed, NULL, "embed", "windowid", "window id to embed terminal in"), 216 STRG (Rs_embed, NULL, "embed", "windowid", "window id to embed terminal in"),
217#endif 217#endif
218#if XFT
219 STRG (Rs_depth, "depth", "depth", "number", "depth of visual to request"),
220#endif
218#if ENABLE_FRILLS 221#if ENABLE_FRILLS
219 RSTRG (Rs_transient_for, "transient-for", "windowid"), 222 RSTRG (Rs_transient_for, "transient-for", "windowid"),
223 BOOL (Rs_override_redirect, "override-redirect", "override-redirect", Opt_override_redirect, 0, "set override-redirect on the terminal window"),
220 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"),
221 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"),
222 STRG (Rs_ext_bwidth, "externalBorder", "w", "number", "external border in pixels"), 226 STRG (Rs_ext_bwidth, "externalBorder", "w", "number", "external border in pixels"),
223 STRG (Rs_ext_bwidth, NULL, "bw", NULL, NULL), 227 STRG (Rs_ext_bwidth, NULL, "bw", NULL, NULL),
224 STRG (Rs_ext_bwidth, NULL, "borderwidth", NULL, NULL), 228 STRG (Rs_ext_bwidth, NULL, "borderwidth", NULL, NULL),
225 STRG (Rs_int_bwidth, "internalBorder", "b", "number", "internal border in pixels"), 229 STRG (Rs_int_bwidth, "internalBorder", "b", "number", "internal border in pixels"),
226 BOOL (Rs_borderLess, "borderLess", "bl", Opt_borderLess, "borderless window"), 230 BOOL (Rs_borderLess, "borderLess", "bl", Opt_borderLess, 0, "borderless window"),
227 BOOL (Rs_skipBuiltinGlyphs, "skipBuiltinGlyphs", "sbg", Opt_skipBuiltinGlyphs, "do not use internal glyphs"),
228 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"),
229#endif 235#endif
230#ifdef POINTER_BLANK 236#ifdef POINTER_BLANK
231 RSTRG (Rs_pointerBlankDelay, "pointerBlankDelay", "number"), 237 RSTRG (Rs_pointerBlankDelay, "pointerBlankDelay", "number"),
232#endif 238#endif
233#ifndef NO_BACKSPACE_KEY 239#ifndef NO_BACKSPACE_KEY
234 RSTRG (Rs_backspace_key, "backspacekey", "string"), 240 RSTRG (Rs_backspace_key, "backspacekey", "string"),
235#endif 241#endif
236#ifndef NO_DELETE_KEY 242#ifndef NO_DELETE_KEY
237 RSTRG (Rs_delete_key, "deletekey", "string"), 243 RSTRG (Rs_delete_key, "deletekey", "string"),
238#endif 244#endif
239 RSTRG (Rs_selectstyle, "selectstyle", "mode"),
240#ifdef PRINTPIPE 245#ifdef PRINTPIPE
241 RSTRG (Rs_print_pipe, "print-pipe", "string"), 246 RSTRG (Rs_print_pipe, "print-pipe", "string"),
242#endif 247#endif
243 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"),
244#ifdef CUTCHAR_RESOURCE 249#ifdef CUTCHAR_RESOURCE
245 RSTRG (Rs_cutchars, "cutchars", "string"), 250 RSTRG (Rs_cutchars, "cutchars", "string"),
246#endif /* CUTCHAR_RESOURCE */ 251#endif /* CUTCHAR_RESOURCE */
247 RSTRG (Rs_answerbackstring, "answerbackString", "string"), 252 RSTRG (Rs_answerbackstring, "answerbackString", "string"),
248#ifndef NO_SECONDARY_SCREEN 253#ifndef NO_SECONDARY_SCREEN
249 BOOL (Rs_secondaryScreen, "secondaryScreen", "ssc", Opt_secondaryScreen, "enable secondary screen"), 254 BOOL (Rs_secondaryScreen, "secondaryScreen", "ssc", Opt_secondaryScreen, 0, "enable secondary screen"),
250 BOOL (Rs_secondaryScroll, "secondaryScroll", "ssr", Opt_secondaryScroll, "enable secondary screen scroll"), 255 BOOL (Rs_secondaryScroll, "secondaryScroll", "ssr", Opt_secondaryScroll, 0, "enable secondary screen scroll"),
251#endif 256#endif
252#if ENABLE_PERL 257#if ENABLE_PERL
253 RSTRG (Rs_perl_lib, "perl-lib", "string"), //, "colon-separated directories with extension scripts"),TODO 258 RSTRG (Rs_perl_lib, "perl-lib", "string"), //, "colon-separated directories with extension scripts"),TODO
254 RSTRG (Rs_perl_eval, "perl-eval", "perl-eval"), // "string", "code to be evaluated after all extensions have been loaded"),TODO 259 RSTRG (Rs_perl_eval, "perl-eval", "perl-eval"), // "string", "code to be evaluated after all extensions have been loaded"),TODO
255 RSTRG (Rs_perl_ext_1, "perl-ext-common", "string"), //, "colon-separated list of perl extensions to enable"),TODO 260 RSTRG (Rs_perl_ext_1, "perl-ext-common", "string"), //, "colon-separated list of perl extensions to enable"),TODO
256 STRG (Rs_perl_ext_2, "perl-ext", "pe", "string", "colon-separated list of perl extensions to enable for this instance"), 261 STRG (Rs_perl_ext_2, "perl-ext", "pe", "string", "colon-separated list of perl extensions to enable for this instance"),
257#endif 262#endif
258#ifndef NO_RESOURCES 263#if ISO_14755
259 INFO ("xrm", "string", "X resource"), 264 BOOL (Rs_iso14755_52, "iso14755_52", NULL, Opt_iso14755_52, 0, NULL),
265#endif
266#ifdef HAVE_AFTERIMAGE
267 STRG (Rs_blendtype, "blendType", "blt", "string", "background image blending type - alpha, tint, etc..."),
268 STRG (Rs_blurradius, "blurRadius", "blr", "HxV", "Gaussian Blur radii to apply to the root background"),
260#endif 269#endif
261 INFO ("e", "command arg ...", "command to execute") 270 INFO ("e", "command arg ...", "command to execute")
262 }; 271 };
263 272
264#undef INFO 273#undef INFO
265#undef STRG 274#undef STRG
266#undef RSTRG 275#undef RSTRG
267#undef SWCH 276#undef SWCH
268#undef BOOL 277#undef BOOL
269/*}}} */
270 278
271static const char releasestring[] = "rxvt-unicode (" RXVTNAME ") v" VERSION " - released: " DATE "\n"; 279static const char releasestring[] = "rxvt-unicode (" RXVTNAME ") v" VERSION " - released: " DATE "\n";
272static const char optionsstring[] = "options: " 280static const char optionsstring[] = "options: "
273#if ENABLE_PERL 281#if ENABLE_PERL
274 "perl," 282 "perl,"
… …
309#endif 317#endif
310 "," 318 ","
311#if OFF_FOCUS_FADING 319#if OFF_FOCUS_FADING
312 "fade," 320 "fade,"
313#endif 321#endif
314#if defined(XPM_BACKGROUND)
315 "XPM,"
316#endif
317#if defined(TRANSPARENT) 322#if defined(ENABLE_TRANSPARENCY)
318 "transparent," 323 "transparent,"
319#endif
320#if TINTING
321 "tint," 324 "tint,"
322#endif 325#endif
323#if defined(UTMP_SUPPORT) 326#if HAVE_AFTERIMAGE
324 "utmp," 327 "afterimage,"
325#endif 328#endif
326#if defined(USE_XIM) 329#if defined(USE_XIM)
327 "XIM," 330 "XIM,"
331#endif
332#if defined(NO_BACKSPACE_KEY)
333 "no_backspace,"
334#endif
335#if defined(NO_DELETE_KEY)
336 "no_delete,"
337#endif
338#if EIGHT_BIT_CONTROLS
339 "8bitctrls,"
340#endif
341#if defined(ENABLE_FRILLS)
342 "frills,"
343#endif
344#if defined(SELECTION_SCROLLING)
345 "selectionscrolling,"
346#endif
347#if MOUSE_WHEEL
348 "wheel,"
349#endif
350#if MOUSE_SLIP_WHEELING
351 "slipwheel,"
352#endif
353#if defined(SMART_RESIZE)
354 "smart-resize,"
355#endif
356#if defined(CURSOR_BLINK)
357 "cursorBlink,"
358#endif
359#if defined(POINTER_BLANK)
360 "pointerBlank,"
361#endif
362#if defined(NO_RESOURCES)
363 "NoResources,"
328#endif 364#endif
329 "scrollbars=" 365 "scrollbars="
330#if !defined(HAVE_SCROLLBARS) 366#if !defined(HAVE_SCROLLBARS)
331 "NONE" 367 "NONE"
332#else 368#else
… …
350# endif 386# endif
351# if defined(XTERM_SCROLLBAR) 387# if defined(XTERM_SCROLLBAR)
352 "xterm" 388 "xterm"
353# endif 389# endif
354#endif 390#endif
355 ","
356#if defined(NO_BACKSPACE_KEY)
357 "no_backspace,"
358#endif
359#if defined(NO_DELETE_KEY)
360 "no_delete,"
361#endif
362#if EIGHT_BIT_CONTROLS
363 "8bitctrls,"
364#endif
365#if defined(ENABLE_FRILLS)
366 "frills,"
367#endif
368#if defined(PREFER_24BIT)
369 "24bit,"
370#endif
371#if defined(SELECTION_SCROLLING)
372 "selectionscrolling,"
373#endif
374#if MOUSE_WHEEL
375 "wheel,"
376#endif
377#if MOUSE_SLIP_WHEELING
378 "slipwheel,"
379#endif
380#if defined(SMART_RESIZE)
381 "smart-resize,"
382#endif
383#if defined(CURSOR_BLINK)
384 "cursorBlink,"
385#endif
386#if defined(POINTER_BLANK)
387 "pointerBlank,"
388#endif
389#if defined(NO_RESOURCES)
390 "NoResources"
391#endif
392 "\nUsage: "; /* Usage */ 391 "\nUsage: "; /* Usage */
393 392
394#define INDENT 18 393#define INDENT 18
394
395const char rxvt_term::resval_undef [] = "<undef>";
396const char rxvt_term::resval_on [] = "on";
397const char rxvt_term::resval_off [] = "off";
395 398
396/*{{{ usage: */ 399/*{{{ usage: */
397/*----------------------------------------------------------------------*/ 400/*----------------------------------------------------------------------*/
398static void 401static void
399rxvt_usage (int type) 402rxvt_usage (int type)
… …
408 rxvt_log (" [-help] [--help]\n"); 411 rxvt_log (" [-help] [--help]\n");
409 412
410 for (col = 1, i = 0; i < optList_size; i++) 413 for (col = 1, i = 0; i < optList_size; i++)
411 if (optList[i].desc != NULL) 414 if (optList[i].desc != NULL)
412 { 415 {
413 int len = 0; 416 int len = 0;
414 417
415 if (!optList_isBool (i)) 418 if (!optList_isBool (i))
416 { 419 {
417 len = optList_strlen (i); 420 len = optList_strlen (i);
418 if (len > 0) 421 if (len > 0)
… …
422 assert (optList[i].opt != NULL); 425 assert (optList[i].opt != NULL);
423#endif 426#endif
424 len += 4 + strlen (optList[i].opt) + (optList_isBool (i) ? 2: 0); 427 len += 4 + strlen (optList[i].opt) + (optList_isBool (i) ? 2: 0);
425 col += len; 428 col += len;
426 if (col > 79) 429 if (col > 79)
430 {
427 { /* assume regular width */ 431 /* assume regular width */
428 rxvt_log ("\n"); 432 rxvt_log ("\n");
429 col = 1 + len; 433 col = 1 + len;
430 } 434 }
431 435
432 rxvt_log (" [-%s%s", (optList_isBool (i) ? "/+" : ""), optList[i].opt); 436 rxvt_log (" [-%s%s", (optList_isBool (i) ? "/+" : ""), optList[i].opt);
… …
485 489
486/*{{{ get command-line options before getting resources */ 490/*{{{ get command-line options before getting resources */
487void 491void
488rxvt_term::get_options (int argc, const char *const *argv) 492rxvt_term::get_options (int argc, const char *const *argv)
489{ 493{
490 int i, bad_option = 0; 494 int i, bad_option = 0;
491 static const char On[3] = "ON", Off[4] = "OFF";
492 495
493 for (i = 1; i < argc; i++) 496 for (i = 1; i < argc; i++)
494 { 497 {
495 unsigned int entry, longopt = 0; 498 unsigned int entry, longopt = 0;
496 const char *flag, *opt; 499 const char *flag, *opt;
497 500
498 opt = argv[i]; 501 opt = argv[i];
499#ifdef DEBUG_RESOURCES 502
500 fprintf (stderr, "argv[%d] = %s: ", i, opt);
501#endif
502 if (*opt == '-') 503 if (*opt == '-')
503 { 504 {
504 flag = On; 505 flag = resval_on;
506
505 if (*++opt == '-') 507 if (*++opt == '-')
506 longopt = *opt++; /* long option */ 508 longopt = *opt++; /* long option */
507 } 509 }
508 else if (*opt == '+') 510 else if (*opt == '+')
509 { 511 {
510 flag = Off; 512 flag = resval_off;
513
511 if (*++opt == '+') 514 if (*++opt == '+')
512 longopt = *opt++; /* long option */ 515 longopt = *opt++; /* long option */
513 } 516 }
514 else 517 else
515 { 518 {
… …
518 continue; 521 continue;
519 } 522 }
520 523
521 if (!strcmp (opt, "help")) 524 if (!strcmp (opt, "help"))
522 rxvt_usage (longopt ? 2 : 1); 525 rxvt_usage (longopt ? 2 : 1);
526
523 if (!strcmp (opt, "h")) 527 if (!strcmp (opt, "h"))
524 rxvt_usage (0); 528 rxvt_usage (0);
525 529
526 /* feature: always try to match long-options */ 530 /* feature: always try to match long-options */
527 for (entry = 0; entry < optList_size; entry++) 531 for (entry = 0; entry < optList_size; entry++)
… …
531 break; 535 break;
532 536
533 if (entry < optList_size) 537 if (entry < optList_size)
534 { 538 {
535 if (optList_isReverse (entry)) 539 if (optList_isReverse (entry))
536 flag = flag == On ? Off : On; 540 flag = flag == resval_on ? resval_off : resval_on;
537 541
538 if (optList_strlen (entry)) 542 if (optList_strlen (entry))
539 { 543 {
540 /* 544 /*
541 * special cases are handled in main.c:main () to allow 545 * special cases are handled in main.c:main () to allow
542 * X resources to set these values before we settle for 546 * X resources to set these values before we settle for
543 * default values 547 * default values
544 */ 548 */
545 549
546 if (optList[entry].doff != -1) 550 if (optList[entry].doff != -1)
551 {
552 if (flag == resval_on && i+1 == argc)
553 rxvt_fatal ("option '%s' requires an argument, aborting.\n", argv [i]);
554
547 rs[optList[entry].doff] = flag == On && argv[i+1] 555 rs[optList[entry].doff] = flag == resval_on ? argv[++i] : resval_undef;
548 ? argv[++i] : 0; 556 }
549 } 557 }
550 else 558 else
559 {
551 { /* boolean value */ 560 /* boolean value */
552#ifdef DEBUG_RESOURCES 561 set_option (optList[entry].index, flag == resval_on);
553 fprintf (stderr, "boolean (%s,%s) = %s\n",
554 optList[entry].opt, optList[entry].kw, flag);
555#endif
556 set_option (optList[entry].flag & Optflag_mask, flag == On);
557 562
558 if (optList[entry].doff != -1) 563 if (optList[entry].doff != -1)
559 rs[optList[entry].doff] = flag; 564 rs[optList[entry].doff] = flag;
560 } 565 }
561 } 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 = (char *)malloc (strlen (opt) + strlen (argv[++i]) + 6);
580 sprintf (res, "*.%s: %s\n", opt, argv[i]);
581 XrmPutLineResource (&option_db, res);
582 free (res);
583 }
584 }
585#endif
562 else 586 else
563#ifdef KEYSYM_RESOURCE
564 /* if (!strncmp (opt, "keysym.", sizeof ("keysym.") - 1)) */
565 if (rxvt_Str_match (opt, "keysym."))
566 { 587 {
567 const char *str = argv[++i];
568
569 if (str != NULL)
570 parse_keysym (opt + sizeof ("keysym.") - 1, str);
571 }
572 else
573#endif
574 {
575 bad_option = 1; 588 bad_option = 1;
576 rxvt_warn ("\"%s\": unknown or malformed option.\n", opt); 589 rxvt_warn ("\"%s\": unknown or malformed option.\n", opt);
577 } 590 }
578 } 591 }
579 592
580 if (bad_option) 593 if (bad_option)
581 rxvt_usage (0); 594 rxvt_usage (0);
582} 595}
… …
593 * "rxvt" "keysym" "0xFF01" 606 * "rxvt" "keysym" "0xFF01"
594 * value will be a string 607 * value will be a string
595 */ 608 */
596/* ARGSUSED */ 609/* ARGSUSED */
597int 610int
598rxvt_define_key (XrmDatabase *database __attribute__((unused)), 611rxvt_define_key (XrmDatabase *database UNUSED,
599 XrmBindingList bindings __attribute__((unused)), 612 XrmBindingList bindings UNUSED,
600 XrmQuarkList quarks, 613 XrmQuarkList quarks,
601 XrmRepresentation *type __attribute__((unused)), 614 XrmRepresentation *type UNUSED,
602 XrmValue *value, 615 XrmValue *value,
603 XPointer closure __attribute__((unused))) 616 XPointer closure UNUSED)
604{ 617{
605 int last; 618 int last;
606 619
607 for (last = 0; quarks[last] != NULLQUARK; last++) /* look for last quark in list */ 620 for (last = 0; quarks[last] != NULLQUARK; last++) /* look for last quark in list */
608 ; 621 ;
… …
613} 626}
614 627
615/* 628/*
616 * look for something like this (XK_Delete) 629 * look for something like this (XK_Delete)
617 * rxvt*keysym.0xFFFF: "\177" 630 * rxvt*keysym.0xFFFF: "\177"
618 *
619 * arg will be
620 * NULL for ~/.Xdefaults and
621 * non-NULL for command-line options (need to allocate)
622 */ 631 */
623#define NEWARGLIM 500 /* `reasonable' size */
624 632
625struct keysym_vocabulary_t 633struct keysym_vocabulary_t
626{ 634{
627 const char *name; 635 const char *name;
628 unsigned short len; 636 unsigned short len;
… …
658}; 666};
659 667
660int 668int
661rxvt_term::parse_keysym (const char *str, const char *arg) 669rxvt_term::parse_keysym (const char *str, const char *arg)
662{ 670{
663 int n, sym; 671 int sym;
664 unsigned int state = 0; 672 unsigned int state = 0;
665 const char *pmodend = NULL; 673 const char *key = strrchr (str, '-');
666 char *newarg = NULL;
667 char newargstr[NEWARGLIM];
668 674
669 if (arg == NULL) 675 if (!key)
670 { 676 key = str;
671 if ((n = rxvt_Str_match (str, "keysym.")) == 0)
672 return 0;
673
674 str += n; /* skip `keysym.' */
675 if (!(pmodend = strchr (str, ':')))
676 return -1;
677 }
678 else 677 else
679 pmodend = str + strlen(str); 678 key++;
680 679
681 for (--pmodend; str < pmodend; --pmodend) 680 // string or key is empty
682 if (*pmodend == '-') 681 if (*arg == '\0' || *key == '\0')
683 break; 682 return -1;
684 683
684 // parse modifiers
685 while (str < pmodend) 685 while (str < key)
686 { 686 {
687 unsigned int i; 687 unsigned int i;
688 688
689 for (i=0; i < sizeof (keysym_vocabulary) / sizeof (keysym_vocabulary_t); ++i) 689 for (i=0; i < sizeof (keysym_vocabulary) / sizeof (keysym_vocabulary_t); ++i)
690 { 690 {
… …
701 701
702 if (*str == '-') 702 if (*str == '-')
703 ++str; 703 ++str;
704 } 704 }
705 705
706 /* some scanf () have trouble with a 0x prefix */ 706 // convert keysym name to keysym number
707 if (str[0] == '0' && toupper (str[1]) == 'X') 707 if ((sym = XStringToKeysym (str)) == None)
708 { 708 {
709 str += 2; 709 // fallback on hexadecimal parsing
710 710 char *end;
711 sym = strtol (str, &end, 16);
711 if (arg) 712 if (*end)
712 {
713 if (sscanf (str, (strchr (str, ':') ? "%x:" : "%x"), &sym) != 1)
714 return -1;
715 }
716 else
717 {
718 if (sscanf (str, "%x:", &sym) != 1)
719 return -1;
720
721 /* cue to ':', it's there since sscanf () worked */
722 strncpy (newargstr, strchr (str, ':') + 1, NEWARGLIM - 1);
723 newargstr[NEWARGLIM - 1] = '\0';
724 newarg = newargstr;
725 }
726 }
727 else
728 {
729 /*
730 * convert keysym name to keysym number
731 */
732 strncpy (newargstr, str, NEWARGLIM - 1);
733 newargstr[NEWARGLIM - 1] = '\0';
734
735 if (arg == NULL)
736 {
737 if ((newarg = strchr (newargstr, ':')) == NULL)
738 return -1;
739
740 *newarg++ = '\0'; /* terminate keysym name */
741 }
742
743 if ((sym = XStringToKeysym (newargstr)) == None)
744 return -1; 713 return -1;
745 } 714 }
746 715
747 if (newarg == NULL)
748 {
749 strncpy (newargstr, arg, NEWARGLIM - 1);
750 newargstr[NEWARGLIM - 1] = '\0';
751 newarg = newargstr;
752 }
753
754 rxvt_Str_trim (newarg);
755 if (*newarg == '\0' || (n = rxvt_Str_escaped (newarg)) == 0)
756 return -1;
757
758 keyboard->register_user_translation (sym, state, newarg); 716 keyboard->register_user_translation (sym, state, arg);
759 return 1; 717 return 1;
760} 718}
761 719
762# endif /* KEYSYM_RESOURCE */ 720# endif /* KEYSYM_RESOURCE */
763#endif /* NO_RESOURCES */ 721#endif /* NO_RESOURCES */
764 722
765static char * 723static char *
766get_res (XrmDatabase database, const char *program, const char *option) 724get_res (XrmDatabase database, const char *program, const char *option)
767{ 725{
768 char resource[512]; 726 char resource[512];
… …
776} 734}
777 735
778const char * 736const char *
779rxvt_term::x_resource (const char *name) 737rxvt_term::x_resource (const char *name)
780{ 738{
781 XrmDatabase database = XrmGetDatabase (display->display); 739 XrmDatabase database = XrmGetDatabase (dpy);
782 740
783 const char *p = get_res (database, rs[Rs_name], name); 741 const char *p = get_res (database, rs[Rs_name], name);
784 const char *p0 = get_res (database, "!INVALIDPROGRAMMENAMEDONTMATCH!", name); 742 const char *p0 = get_res (database, "!INVALIDPROGRAMMENAMEDONTMATCH!", name);
785 743
786 if (p == NULL || (p0 && strcmp (p, p0) == 0)) 744 if (p == NULL || (p0 && strcmp (p, p0) == 0))
… …
800 758
801void 759void
802rxvt_term::extract_resources () 760rxvt_term::extract_resources ()
803{ 761{
804#ifndef NO_RESOURCES 762#ifndef NO_RESOURCES
763 XrmDatabase database = XrmGetDatabase (dpy);
764 XrmMergeDatabases (option_db, &database);
765 option_db = NULL;
805 /* 766 /*
806 * Query resources for options that affect us 767 * Query resources for options that affect us
807 */ 768 */
808 for (int entry = 0; entry < optList_size; entry++) 769 for (int entry = 0; entry < optList_size; entry++)
809 { 770 {
… …
829 || strcasecmp (p, "1") == 0; 790 || strcasecmp (p, "1") == 0;
830 791
831 if (optList_isReverse (entry)) 792 if (optList_isReverse (entry))
832 s = !s; 793 s = !s;
833 794
834 set_option (optList[entry].flag & Optflag_mask, s); 795 set_option (optList[entry].index, s);
835 } 796 }
836 } 797 }
837 } 798 }
838 799
839 /* 800 /*
840 * [R5 or later]: enumerate the resource database 801 * [R5 or later]: enumerate the resource database
841 */ 802 */
842# ifdef KEYSYM_RESOURCE 803# ifdef KEYSYM_RESOURCE
843 XrmDatabase database = XrmGetDatabase (display->display);
844 XrmName name_prefix[3]; 804 XrmName name_prefix[3];
845 XrmClass class_prefix[3]; 805 XrmClass class_prefix[3];
846 806
847 name_prefix[0] = XrmStringToName (rs[Rs_name]); 807 name_prefix[0] = XrmStringToName (rs[Rs_name]);
848 name_prefix[1] = XrmStringToName ("keysym"); 808 name_prefix[1] = XrmStringToName ("keysym");
… …
862 XrmEnumerateDatabase (database, name_prefix, class_prefix, 822 XrmEnumerateDatabase (database, name_prefix, class_prefix,
863 XrmEnumOneLevel, rxvt_define_key, NULL); 823 XrmEnumOneLevel, rxvt_define_key, NULL);
864# endif 824# endif
865# endif 825# endif
866 826
867#endif /* NO_RESOURCES */ 827#endif /* NO_RESOURCES */
868} 828}
869 829
870/*----------------------- end-of-file (C source) -----------------------*/ 830/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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