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.84 by root, Tue Jan 24 19:40:12 2006 UTC vs.
Revision 1.141 by root, Sat Dec 26 10:24:04 2009 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
217#if XFT
218 STRG (Rs_depth, "depth", "depth", "number", "depth of visual to request"),
219 BOOL (Rs_buffered, "buffered", NULL, Opt_buffered, 0, NULL),
220#endif
216#if ENABLE_FRILLS 221#if ENABLE_FRILLS
217 RSTRG (Rs_transient_for, "transient-for", "windowid"), 222 RSTRG (Rs_transient_for, "transient-for", "windowid"),
218 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"),
219 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"),
220 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"),
221 STRG (Rs_ext_bwidth, "externalBorder", "w", "number", "external border in pixels"), 226 STRG (Rs_ext_bwidth, "externalBorder", "w", "number", "external border in pixels"),
222 STRG (Rs_ext_bwidth, NULL, "bw", NULL, NULL), 227 STRG (Rs_ext_bwidth, NULL, "bw", NULL, NULL),
223 STRG (Rs_ext_bwidth, NULL, "borderwidth", NULL, NULL), 228 STRG (Rs_ext_bwidth, NULL, "borderwidth", NULL, NULL),
224 STRG (Rs_int_bwidth, "internalBorder", "b", "number", "internal border in pixels"), 229 STRG (Rs_int_bwidth, "internalBorder", "b", "number", "internal border in pixels"),
225 BOOL (Rs_borderLess, "borderLess", "bl", Opt_borderLess, "borderless window"), 230 BOOL (Rs_borderLess, "borderLess", "bl", Opt_borderLess, 0, "borderless window"),
226 BOOL (Rs_skipBuiltinGlyphs, "skipBuiltinGlyphs", "sbg", Opt_skipBuiltinGlyphs, "do not use internal glyphs"),
227 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 STRG (Rs_letterSpace, "letterSpace", "letsp", "number", "letter spacing adjustment"),
233#endif
234#ifdef BUILTIN_GLYPHS
235 BOOL (Rs_skipBuiltinGlyphs, "skipBuiltinGlyphs", "sbg", Opt_skipBuiltinGlyphs, 0, "do not use internal glyphs"),
228#endif 236#endif
229#ifdef POINTER_BLANK 237#ifdef POINTER_BLANK
230 RSTRG (Rs_pointerBlankDelay, "pointerBlankDelay", "number"), 238 RSTRG (Rs_pointerBlankDelay, "pointerBlankDelay", "number"),
231#endif 239#endif
232#ifndef NO_BACKSPACE_KEY 240#ifndef NO_BACKSPACE_KEY
233 RSTRG (Rs_backspace_key, "backspacekey", "string"), 241 RSTRG (Rs_backspace_key, "backspacekey", "string"),
234#endif 242#endif
235#ifndef NO_DELETE_KEY 243#ifndef NO_DELETE_KEY
236 RSTRG (Rs_delete_key, "deletekey", "string"), 244 RSTRG (Rs_delete_key, "deletekey", "string"),
237#endif 245#endif
238 RSTRG (Rs_selectstyle, "selectstyle", "mode"),
239#ifdef PRINTPIPE 246#ifdef PRINTPIPE
240 RSTRG (Rs_print_pipe, "print-pipe", "string"), 247 RSTRG (Rs_print_pipe, "print-pipe", "string"),
241#endif 248#endif
242 STRG (Rs_modifier, "modifier", "mod", "modifier", "meta modifier = alt|meta|hyper|super|mod1|...|mod5"), 249 STRG (Rs_modifier, "modifier", "mod", "modifier", "meta modifier = alt|meta|hyper|super|mod1|...|mod5"),
243#ifdef CUTCHAR_RESOURCE
244 RSTRG (Rs_cutchars, "cutchars", "string"), 250 RSTRG (Rs_cutchars, "cutchars", "string"),
245#endif /* CUTCHAR_RESOURCE */
246 RSTRG (Rs_answerbackstring, "answerbackString", "string"), 251 RSTRG (Rs_answerbackstring, "answerbackString", "string"),
247#ifndef NO_SECONDARY_SCREEN 252#ifndef NO_SECONDARY_SCREEN
248 BOOL (Rs_secondaryScreen, "secondaryScreen", "ssc", Opt_secondaryScreen, "enable secondary screen"), 253 BOOL (Rs_secondaryScreen, "secondaryScreen", "ssc", Opt_secondaryScreen, 0, "enable secondary screen"),
249 BOOL (Rs_secondaryScroll, "secondaryScroll", "ssr", Opt_secondaryScroll, "enable secondary screen scroll"), 254 BOOL (Rs_secondaryScroll, "secondaryScroll", "ssr", Opt_secondaryScroll, 0, "enable secondary screen scroll"),
250#endif 255#endif
251#if ENABLE_PERL 256#if ENABLE_PERL
252 RSTRG (Rs_perl_lib, "perl-lib", "string"), //, "colon-separated directories with extension scripts"),TODO 257 RSTRG (Rs_perl_lib, "perl-lib", "string"), //, "colon-separated directories with extension scripts"),TODO
253 RSTRG (Rs_perl_eval, "perl-eval", "perl-eval"), // "string", "code to be evaluated after all extensions have been loaded"),TODO 258 RSTRG (Rs_perl_eval, "perl-eval", "perl-eval"), // "string", "code to be evaluated after all extensions have been loaded"),TODO
254 RSTRG (Rs_perl_ext_1, "perl-ext-common", "string"), //, "colon-separated list of perl extensions to enable"),TODO 259 RSTRG (Rs_perl_ext_1, "perl-ext-common", "string"), //, "colon-separated list of perl extensions to enable"),TODO
255 STRG (Rs_perl_ext_2, "perl-ext", "pe", "string", "colon-separated list of perl extensions to enable for this instance"), 260 STRG (Rs_perl_ext_2, "perl-ext", "pe", "string", "colon-separated list of perl extensions to enable for this instance"),
256#endif 261#endif
257#ifndef NO_RESOURCES 262#if ISO_14755
258 INFO ("xrm", "string", "X resource"), 263 BOOL (Rs_iso14755_52, "iso14755_52", NULL, Opt_iso14755_52, 0, NULL),
264#endif
265#ifdef HAVE_AFTERIMAGE
266 STRG (Rs_blendtype, "blendType", "blt", "string", "background image blending type - alpha, tint, etc..."),
267 STRG (Rs_blurradius, "blurRadius", "blr", "HxV", "gaussian blur radii to apply to the root background"),
268# if ENABLE_EWMH
269 STRG (Rs_iconfile, "iconFile", "icon", "file", "path to application icon image"),
270# endif
259#endif 271#endif
260 INFO ("e", "command arg ...", "command to execute") 272 INFO ("e", "command arg ...", "command to execute")
261 }; 273 };
262 274
263#undef INFO 275#undef INFO
264#undef STRG 276#undef STRG
265#undef RSTRG 277#undef RSTRG
266#undef SWCH 278#undef SWCH
267#undef BOOL 279#undef BOOL
268/*}}} */
269 280
270static const char releasestring[] = "rxvt-unicode (" RXVTNAME ") v" VERSION " - released: " DATE "\n"; 281static const char releasestring[] = "rxvt-unicode (" RXVTNAME ") v" VERSION " - released: " DATE "\n";
271static const char optionsstring[] = "options: " 282static const char optionsstring[] = "options: "
272#if ENABLE_PERL 283#if ENABLE_PERL
273 "perl," 284 "perl,"
… …
308#endif 319#endif
309 "," 320 ","
310#if OFF_FOCUS_FADING 321#if OFF_FOCUS_FADING
311 "fade," 322 "fade,"
312#endif 323#endif
313#if defined(XPM_BACKGROUND)
314 "XPM,"
315#endif
316#if defined(TRANSPARENT) 324#if defined(ENABLE_TRANSPARENCY)
317 "transparent," 325 "transparent,"
318#endif
319#if TINTING
320 "tint," 326 "tint,"
327#endif
328#if HAVE_AFTERIMAGE
329 "afterimage,"
321#endif 330#endif
322#if defined(USE_XIM) 331#if defined(USE_XIM)
323 "XIM," 332 "XIM,"
324#endif 333#endif
325 "scrollbars="
326#if !defined(HAVE_SCROLLBARS)
327 "NONE"
328#else
329# if defined(PLAIN_SCROLLBAR)
330 "plain"
331# if defined(RXVT_SCROLLBAR) || defined(NEXT_SCROLLBAR) || defined(XTERM_SCROLLBAR)
332 "+"
333# endif
334# endif
335# if defined(RXVT_SCROLLBAR)
336 "rxvt"
337# if defined(NEXT_SCROLLBAR) || defined(XTERM_SCROLLBAR)
338 "+"
339# endif
340# endif
341# if defined(NEXT_SCROLLBAR)
342 "NeXT"
343# if defined(XTERM_SCROLLBAR)
344 "+"
345# endif
346# endif
347# if defined(XTERM_SCROLLBAR)
348 "xterm"
349# endif
350#endif
351 ","
352#if defined(NO_BACKSPACE_KEY) 334#if defined(NO_BACKSPACE_KEY)
353 "no_backspace," 335 "no_backspace,"
354#endif 336#endif
355#if defined(NO_DELETE_KEY) 337#if defined(NO_DELETE_KEY)
356 "no_delete," 338 "no_delete,"
… …
359 "8bitctrls," 341 "8bitctrls,"
360#endif 342#endif
361#if defined(ENABLE_FRILLS) 343#if defined(ENABLE_FRILLS)
362 "frills," 344 "frills,"
363#endif 345#endif
364#if defined(PREFER_24BIT)
365 "24bit,"
366#endif
367#if defined(SELECTION_SCROLLING) 346#if defined(SELECTION_SCROLLING)
368 "selectionscrolling," 347 "selectionscrolling,"
369#endif 348#endif
370#if MOUSE_WHEEL 349#if MOUSE_WHEEL
371 "wheel," 350 "wheel,"
… …
381#endif 360#endif
382#if defined(POINTER_BLANK) 361#if defined(POINTER_BLANK)
383 "pointerBlank," 362 "pointerBlank,"
384#endif 363#endif
385#if defined(NO_RESOURCES) 364#if defined(NO_RESOURCES)
386 "NoResources" 365 "NoResources,"
366#endif
367 "scrollbars=plain"
368#if defined(RXVT_SCROLLBAR)
369 "+rxvt"
370#endif
371#if defined(NEXT_SCROLLBAR)
372 "+NeXT"
373#endif
374#if defined(XTERM_SCROLLBAR)
375 "+xterm"
387#endif 376#endif
388 "\nUsage: "; /* Usage */ 377 "\nUsage: "; /* Usage */
389 378
390#define INDENT 18 379#define INDENT 18
380
381const char rxvt_term::resval_undef [] = "<undef>";
382const char rxvt_term::resval_on [] = "on";
383const char rxvt_term::resval_off [] = "off";
391 384
392/*{{{ usage: */ 385/*{{{ usage: */
393/*----------------------------------------------------------------------*/ 386/*----------------------------------------------------------------------*/
394static void 387static void
395rxvt_usage (int type) 388rxvt_usage (int type)
… …
404 rxvt_log (" [-help] [--help]\n"); 397 rxvt_log (" [-help] [--help]\n");
405 398
406 for (col = 1, i = 0; i < optList_size; i++) 399 for (col = 1, i = 0; i < optList_size; i++)
407 if (optList[i].desc != NULL) 400 if (optList[i].desc != NULL)
408 { 401 {
409 int len = 0; 402 int len = 0;
410 403
411 if (!optList_isBool (i)) 404 if (optList[i].arg)
412 { 405 len = strlen (optList[i].arg) + 1;
413 len = optList_strlen (i);
414 if (len > 0)
415 len++; /* account for space */
416 }
417#ifdef DEBUG_STRICT
418 assert (optList[i].opt != NULL); 406 assert (optList[i].opt != NULL);
419#endif
420 len += 4 + strlen (optList[i].opt) + (optList_isBool (i) ? 2: 0); 407 len += 4 + strlen (optList[i].opt) + (optList_isBool (i) ? 2: 0);
421 col += len; 408 col += len;
422 if (col > 79) 409 if (col > 79)
410 {
423 { /* assume regular width */ 411 /* assume regular width */
424 rxvt_log ("\n"); 412 rxvt_log ("\n");
425 col = 1 + len; 413 col = 1 + len;
426 } 414 }
427 415
428 rxvt_log (" [-%s%s", (optList_isBool (i) ? "/+" : ""), optList[i].opt); 416 rxvt_log (" [-%s%s", (optList_isBool (i) ? "/+" : ""), optList[i].opt);
429 if (optList_strlen (i)) 417 if (optList[i].arg)
430 rxvt_log (" %s]", optList[i].arg); 418 rxvt_log (" %s]", optList[i].arg);
431 else 419 else
432 rxvt_log ("]"); 420 rxvt_log ("]");
433 } 421 }
434 break; 422 break;
… …
437 rxvt_log (" [options] [-e command args]\n\nwhere options include:\n"); 425 rxvt_log (" [options] [-e command args]\n\nwhere options include:\n");
438 426
439 for (i = 0; i < optList_size; i++) 427 for (i = 0; i < optList_size; i++)
440 if (optList[i].desc != NULL) 428 if (optList[i].desc != NULL)
441 { 429 {
442#ifdef DEBUG_STRICT
443 assert (optList[i].opt != NULL); 430 assert (optList[i].opt != NULL);
444#endif
445 rxvt_log (" %s%s %-*s%s%s\n", 431 rxvt_log (" %s%s %-*s%s%s\n",
446 (optList_isBool (i) ? "-/+" : "-"), optList[i].opt, 432 (optList_isBool (i) ? "-/+" : "-"), optList[i].opt,
447 (INDENT - strlen (optList[i].opt) 433 (INDENT - strlen (optList[i].opt)
448 + (optList_isBool (i) ? 0 : 2)), 434 + (optList_isBool (i) ? 0 : 2)),
449 (optList[i].arg ? optList[i].arg : ""), 435 (optList[i].arg ? optList[i].arg : ""),
… …
481 467
482/*{{{ get command-line options before getting resources */ 468/*{{{ get command-line options before getting resources */
483void 469void
484rxvt_term::get_options (int argc, const char *const *argv) 470rxvt_term::get_options (int argc, const char *const *argv)
485{ 471{
486 int i, bad_option = 0; 472 int i, bad_option = 0;
487 static const char On[3] = "ON", Off[4] = "OFF";
488 473
489 for (i = 1; i < argc; i++) 474 for (i = 1; i < argc; i++)
490 { 475 {
491 unsigned int entry, longopt = 0; 476 unsigned int entry, longopt = 0;
492 const char *flag, *opt; 477 const char *opt;
478 int flag;
493 479
494 opt = argv[i]; 480 opt = argv[i];
495 481
496 if (*opt == '-') 482 if (*opt == '-')
497 { 483 {
498 flag = On; 484 flag = 1;
485
499 if (*++opt == '-') 486 if (*++opt == '-')
500 longopt = *opt++; /* long option */ 487 longopt = *opt++; /* long option */
501 } 488 }
502 else if (*opt == '+') 489 else if (*opt == '+')
503 { 490 {
504 flag = Off; 491 flag = 0;
492
505 if (*++opt == '+') 493 if (*++opt == '+')
506 longopt = *opt++; /* long option */ 494 longopt = *opt++; /* long option */
507 } 495 }
508 else 496 else
509 { 497 {
… …
512 continue; 500 continue;
513 } 501 }
514 502
515 if (!strcmp (opt, "help")) 503 if (!strcmp (opt, "help"))
516 rxvt_usage (longopt ? 2 : 1); 504 rxvt_usage (longopt ? 2 : 1);
505
517 if (!strcmp (opt, "h")) 506 if (!strcmp (opt, "h"))
518 rxvt_usage (0); 507 rxvt_usage (0);
519 508
520 /* feature: always try to match long-options */ 509 /* feature: always try to match long-options */
521 for (entry = 0; entry < optList_size; entry++) 510 for (entry = 0; entry < optList_size; entry++)
… …
525 break; 514 break;
526 515
527 if (entry < optList_size) 516 if (entry < optList_size)
528 { 517 {
529 if (optList_isReverse (entry)) 518 if (optList_isReverse (entry))
530 flag = flag == On ? Off : On; 519 flag = !flag;
531 520
532 if (optList_strlen (entry)) 521 if (optList_isString (entry))
533 { 522 {
534 /* 523 /*
535 * special cases are handled in main.c:main () to allow 524 * special cases are handled in main.c:main () to allow
536 * X resources to set these values before we settle for 525 * X resources to set these values before we settle for
537 * default values 526 * default values
538 */ 527 */
539 528
540 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
541 rs[optList[entry].doff] = flag == On && argv[i+1] 534 rs[optList[entry].doff] = flag ? argv[++i] : resval_undef;
542 ? argv[++i] : 0; 535 }
543 } 536 }
544 else 537 else
538 {
545 { /* boolean value */ 539 /* boolean value */
546 set_option (optList[entry].flag & Optflag_mask, flag == On); 540 set_option (optList[entry].index, flag);
547 541
548 if (optList[entry].doff != -1) 542 if (optList[entry].doff != -1)
549 rs[optList[entry].doff] = flag; 543 rs[optList[entry].doff] = flag ? resval_on : resval_off;
550 } 544 }
551 } 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
552 else 565 else
553#ifdef KEYSYM_RESOURCE
554 /* if (!strncmp (opt, "keysym.", sizeof ("keysym.") - 1)) */
555 if (rxvt_Str_match (opt, "keysym."))
556 { 566 {
557 const char *str = argv[++i];
558
559 if (str != NULL)
560 parse_keysym (opt + sizeof ("keysym.") - 1, str);
561 }
562 else
563#endif
564 {
565 bad_option = 1; 567 bad_option = 1;
566 rxvt_warn ("\"%s\": unknown or malformed option.\n", opt); 568 rxvt_warn ("\"%s\": unknown or malformed option.\n", opt);
567 } 569 }
568 } 570 }
569 571
570 if (bad_option) 572 if (bad_option)
571 rxvt_usage (0); 573 rxvt_usage (0);
572} 574}
… …
603} 605}
604 606
605/* 607/*
606 * look for something like this (XK_Delete) 608 * look for something like this (XK_Delete)
607 * rxvt*keysym.0xFFFF: "\177" 609 * rxvt*keysym.0xFFFF: "\177"
608 *
609 * arg will be
610 * NULL for ~/.Xdefaults and
611 * non-NULL for command-line options (need to allocate)
612 */ 610 */
613#define NEWARGLIM 500 /* `reasonable' size */
614 611
615struct keysym_vocabulary_t 612struct keysym_vocabulary_t
616{ 613{
617 const char *name; 614 const char *name;
618 unsigned short len; 615 unsigned short len;
619 unsigned short value; 616 unsigned short value;
620}; 617};
621keysym_vocabulary_t keysym_vocabulary[] = 618static const keysym_vocabulary_t keysym_vocabulary[] =
622{ 619{
623 { "ISOLevel3", 9, Level3Mask }, 620 { "ISOLevel3", 9, Level3Mask },
624 { "AppKeypad", 9, AppKeypadMask }, 621 { "AppKeypad", 9, AppKeypadMask },
625 { "Control", 7, ControlMask }, 622 { "Control", 7, ControlMask },
626 { "NumLock", 7, NumLockMask }, 623 { "NumLock", 7, NumLockMask },
… …
648}; 645};
649 646
650int 647int
651rxvt_term::parse_keysym (const char *str, const char *arg) 648rxvt_term::parse_keysym (const char *str, const char *arg)
652{ 649{
653 int n, sym; 650 int sym;
654 unsigned int state = 0; 651 unsigned int state = 0;
655 const char *pmodend = NULL; 652 const char *key = strrchr (str, '-');
656 char *newarg = NULL;
657 char newargstr[NEWARGLIM];
658 653
659 if (arg == NULL) 654 if (!key)
660 { 655 key = str;
661 if ((n = rxvt_Str_match (str, "keysym.")) == 0)
662 return 0;
663
664 str += n; /* skip `keysym.' */
665 if (!(pmodend = strchr (str, ':')))
666 return -1;
667 }
668 else 656 else
669 pmodend = str + strlen(str); 657 key++;
670 658
671 for (--pmodend; str < pmodend; --pmodend) 659 // string or key is empty
672 if (*pmodend == '-') 660 if (*arg == '\0' || *key == '\0')
673 break; 661 return -1;
674 662
663 // parse modifiers
675 while (str < pmodend) 664 while (str < key)
676 { 665 {
677 unsigned int i; 666 unsigned int i;
678 667
679 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)
680 { 669 {
… …
691 680
692 if (*str == '-') 681 if (*str == '-')
693 ++str; 682 ++str;
694 } 683 }
695 684
696 /* some scanf () have trouble with a 0x prefix */ 685 // convert keysym name to keysym number
697 if (str[0] == '0' && toupper (str[1]) == 'X') 686 if ((sym = XStringToKeysym (str)) == None)
698 { 687 {
699 str += 2; 688 // fallback on hexadecimal parsing
700 689 char *end;
690 sym = strtol (str, &end, 16);
701 if (arg) 691 if (*end)
702 {
703 if (sscanf (str, (strchr (str, ':') ? "%x:" : "%x"), &sym) != 1)
704 return -1;
705 }
706 else
707 {
708 if (sscanf (str, "%x:", &sym) != 1)
709 return -1;
710
711 /* cue to ':', it's there since sscanf () worked */
712 strncpy (newargstr, strchr (str, ':') + 1, NEWARGLIM - 1);
713 newargstr[NEWARGLIM - 1] = '\0';
714 newarg = newargstr;
715 }
716 }
717 else
718 {
719 /*
720 * convert keysym name to keysym number
721 */
722 strncpy (newargstr, str, NEWARGLIM - 1);
723 newargstr[NEWARGLIM - 1] = '\0';
724
725 if (arg == NULL)
726 {
727 if ((newarg = strchr (newargstr, ':')) == NULL)
728 return -1;
729
730 *newarg++ = '\0'; /* terminate keysym name */
731 }
732
733 if ((sym = XStringToKeysym (newargstr)) == None)
734 return -1; 692 return -1;
735 } 693 }
736 694
737 if (newarg == NULL)
738 {
739 strncpy (newargstr, arg, NEWARGLIM - 1);
740 newargstr[NEWARGLIM - 1] = '\0';
741 newarg = newargstr;
742 }
743
744 rxvt_Str_trim (newarg);
745 if (*newarg == '\0' || (n = rxvt_Str_escaped (newarg)) == 0)
746 return -1;
747
748 keyboard->register_user_translation (sym, state, newarg); 695 keyboard->register_user_translation (sym, state, arg);
749 return 1; 696 return 1;
750} 697}
751 698
752# endif /* KEYSYM_RESOURCE */ 699# endif /* KEYSYM_RESOURCE */
753#endif /* NO_RESOURCES */ 700#endif /* NO_RESOURCES */
754 701
755static char * 702static char *
756get_res (XrmDatabase database, const char *program, const char *option) 703get_res (XrmDatabase database, const char *program, const char *option)
757{ 704{
758 char resource[512]; 705 char resource[512];
… …
766} 713}
767 714
768const char * 715const char *
769rxvt_term::x_resource (const char *name) 716rxvt_term::x_resource (const char *name)
770{ 717{
771 XrmDatabase database = XrmGetDatabase (display->display); 718 XrmDatabase database = XrmGetDatabase (dpy);
772 719
773 const char *p = get_res (database, rs[Rs_name], name); 720 const char *p = get_res (database, rs[Rs_name], name);
774 const char *p0 = get_res (database, "!INVALIDPROGRAMMENAMEDONTMATCH!", name); 721 const char *p0 = get_res (database, "!INVALIDPROGRAMMENAMEDONTMATCH!", name);
775 722
776 if (p == NULL || (p0 && strcmp (p, p0) == 0)) 723 if (p == NULL || (p0 && strcmp (p, p0) == 0))
… …
790 737
791void 738void
792rxvt_term::extract_resources () 739rxvt_term::extract_resources ()
793{ 740{
794#ifndef NO_RESOURCES 741#ifndef NO_RESOURCES
742 XrmDatabase database = XrmGetDatabase (dpy);
743 XrmMergeDatabases (option_db, &database);
744 option_db = NULL;
795 /* 745 /*
796 * Query resources for options that affect us 746 * Query resources for options that affect us
797 */ 747 */
798 for (int entry = 0; entry < optList_size; entry++) 748 for (int entry = 0; entry < optList_size; entry++)
799 { 749 {
… …
819 || strcasecmp (p, "1") == 0; 769 || strcasecmp (p, "1") == 0;
820 770
821 if (optList_isReverse (entry)) 771 if (optList_isReverse (entry))
822 s = !s; 772 s = !s;
823 773
824 set_option (optList[entry].flag & Optflag_mask, s); 774 set_option (optList[entry].index, s);
825 } 775 }
826 } 776 }
827 } 777 }
828 778
829 /* 779 /*
830 * [R5 or later]: enumerate the resource database 780 * [R5 or later]: enumerate the resource database
831 */ 781 */
832# ifdef KEYSYM_RESOURCE 782# ifdef KEYSYM_RESOURCE
833 XrmDatabase database = XrmGetDatabase (display->display);
834 XrmName name_prefix[3]; 783 XrmName name_prefix[3];
835 XrmClass class_prefix[3]; 784 XrmClass class_prefix[3];
836 785
837 name_prefix[0] = XrmStringToName (rs[Rs_name]); 786 name_prefix[0] = XrmStringToName (rs[Rs_name]);
838 name_prefix[1] = XrmStringToName ("keysym"); 787 name_prefix[1] = XrmStringToName ("keysym");
… …
852 XrmEnumerateDatabase (database, name_prefix, class_prefix, 801 XrmEnumerateDatabase (database, name_prefix, class_prefix,
853 XrmEnumOneLevel, rxvt_define_key, NULL); 802 XrmEnumOneLevel, rxvt_define_key, NULL);
854# endif 803# endif
855# endif 804# endif
856 805
857#endif /* NO_RESOURCES */ 806#endif /* NO_RESOURCES */
858} 807}
859 808
860/*----------------------- end-of-file (C source) -----------------------*/ 809/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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