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.81 by root, Wed Jan 18 19:43:51 2006 UTC vs.
Revision 1.132 by ayin, Sun Jan 20 01:15:35 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_isString(i) \
70 (optList[i].flag ? 0 : (optList[i].arg ? strlen (optList[i].arg) : 1)) 69 (optList[i].flag == 0)
71#define optList_isBool(i) \ 70#define optList_isBool(i) \
72 (optList[i].flag & Optflag_Boolean) 71 (optList[i].flag & Optflag_Boolean)
73#define optList_isReverse(i) \ 72#define optList_isReverse(i) \
74 (optList[i].flag & Optflag_Reverse) 73 (optList[i].flag & Optflag_Reverse)
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"),
220 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"),
221 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"),
222 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"),
223 STRG (Rs_ext_bwidth, "externalBorder", "w", "number", "external border in pixels"), 226 STRG (Rs_ext_bwidth, "externalBorder", "w", "number", "external border in pixels"),
224 STRG (Rs_ext_bwidth, NULL, "bw", NULL, NULL), 227 STRG (Rs_ext_bwidth, NULL, "bw", NULL, NULL),
225 STRG (Rs_ext_bwidth, NULL, "borderwidth", NULL, NULL), 228 STRG (Rs_ext_bwidth, NULL, "borderwidth", NULL, NULL),
226 STRG (Rs_int_bwidth, "internalBorder", "b", "number", "internal border in pixels"), 229 STRG (Rs_int_bwidth, "internalBorder", "b", "number", "internal border in pixels"),
227 BOOL (Rs_borderLess, "borderLess", "bl", Opt_borderLess, "borderless window"), 230 BOOL (Rs_borderLess, "borderLess", "bl", Opt_borderLess, 0, "borderless window"),
228 BOOL (Rs_skipBuiltinGlyphs, "skipBuiltinGlyphs", "sbg", Opt_skipBuiltinGlyphs, "do not use internal glyphs"),
229 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"),
230#endif 235#endif
231#ifdef POINTER_BLANK 236#ifdef POINTER_BLANK
232 RSTRG (Rs_pointerBlankDelay, "pointerBlankDelay", "number"), 237 RSTRG (Rs_pointerBlankDelay, "pointerBlankDelay", "number"),
233#endif 238#endif
234#ifndef NO_BACKSPACE_KEY 239#ifndef NO_BACKSPACE_KEY
235 RSTRG (Rs_backspace_key, "backspacekey", "string"), 240 RSTRG (Rs_backspace_key, "backspacekey", "string"),
236#endif 241#endif
237#ifndef NO_DELETE_KEY 242#ifndef NO_DELETE_KEY
238 RSTRG (Rs_delete_key, "deletekey", "string"), 243 RSTRG (Rs_delete_key, "deletekey", "string"),
239#endif 244#endif
240 RSTRG (Rs_selectstyle, "selectstyle", "mode"),
241#ifdef PRINTPIPE 245#ifdef PRINTPIPE
242 RSTRG (Rs_print_pipe, "print-pipe", "string"), 246 RSTRG (Rs_print_pipe, "print-pipe", "string"),
243#endif 247#endif
244 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"),
245#ifdef CUTCHAR_RESOURCE 249#ifdef CUTCHAR_RESOURCE
246 RSTRG (Rs_cutchars, "cutchars", "string"), 250 RSTRG (Rs_cutchars, "cutchars", "string"),
247#endif /* CUTCHAR_RESOURCE */ 251#endif /* CUTCHAR_RESOURCE */
248 RSTRG (Rs_answerbackstring, "answerbackString", "string"), 252 RSTRG (Rs_answerbackstring, "answerbackString", "string"),
249#ifndef NO_SECONDARY_SCREEN 253#ifndef NO_SECONDARY_SCREEN
250 BOOL (Rs_secondaryScreen, "secondaryScreen", "ssc", Opt_secondaryScreen, "enable secondary screen"), 254 BOOL (Rs_secondaryScreen, "secondaryScreen", "ssc", Opt_secondaryScreen, 0, "enable secondary screen"),
251 BOOL (Rs_secondaryScroll, "secondaryScroll", "ssr", Opt_secondaryScroll, "enable secondary screen scroll"), 255 BOOL (Rs_secondaryScroll, "secondaryScroll", "ssr", Opt_secondaryScroll, 0, "enable secondary screen scroll"),
252#endif 256#endif
253#if ENABLE_PERL 257#if ENABLE_PERL
254 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
255 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
256 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
257 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"),
258#endif 262#endif
259#ifndef NO_RESOURCES 263#if ISO_14755
260 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"),
261#endif 269#endif
262 INFO ("e", "command arg ...", "command to execute") 270 INFO ("e", "command arg ...", "command to execute")
263 }; 271 };
264 272
265#undef INFO 273#undef INFO
266#undef STRG 274#undef STRG
267#undef RSTRG 275#undef RSTRG
268#undef SWCH 276#undef SWCH
269#undef BOOL 277#undef BOOL
270/*}}} */
271 278
272static const char releasestring[] = "rxvt-unicode (" RXVTNAME ") v" VERSION " - released: " DATE "\n"; 279static const char releasestring[] = "rxvt-unicode (" RXVTNAME ") v" VERSION " - released: " DATE "\n";
273static const char optionsstring[] = "options: " 280static const char optionsstring[] = "options: "
274#if ENABLE_PERL 281#if ENABLE_PERL
275 "perl," 282 "perl,"
… …
310#endif 317#endif
311 "," 318 ","
312#if OFF_FOCUS_FADING 319#if OFF_FOCUS_FADING
313 "fade," 320 "fade,"
314#endif 321#endif
315#if defined(XPM_BACKGROUND)
316 "XPM,"
317#endif
318#if defined(TRANSPARENT) 322#if defined(ENABLE_TRANSPARENCY)
319 "transparent," 323 "transparent,"
320#endif
321#if TINTING
322 "tint," 324 "tint,"
323#endif 325#endif
324#if defined(UTMP_SUPPORT) 326#if HAVE_AFTERIMAGE
325 "utmp," 327 "afterimage,"
326#endif 328#endif
327#if defined(USE_XIM) 329#if defined(USE_XIM)
328 "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,"
329#endif 364#endif
330 "scrollbars=" 365 "scrollbars="
331#if !defined(HAVE_SCROLLBARS) 366#if !defined(HAVE_SCROLLBARS)
332 "NONE" 367 "NONE"
333#else 368#else
… …
351# endif 386# endif
352# if defined(XTERM_SCROLLBAR) 387# if defined(XTERM_SCROLLBAR)
353 "xterm" 388 "xterm"
354# endif 389# endif
355#endif 390#endif
356 ","
357#if defined(NO_BACKSPACE_KEY)
358 "no_backspace,"
359#endif
360#if defined(NO_DELETE_KEY)
361 "no_delete,"
362#endif
363#if EIGHT_BIT_CONTROLS
364 "8bitctrls,"
365#endif
366#if defined(ENABLE_FRILLS)
367 "frills,"
368#endif
369#if defined(PREFER_24BIT)
370 "24bit,"
371#endif
372#if defined(SELECTION_SCROLLING)
373 "selectionscrolling,"
374#endif
375#if MOUSE_WHEEL
376 "wheel,"
377#endif
378#if MOUSE_SLIP_WHEELING
379 "slipwheel,"
380#endif
381#if defined(SMART_RESIZE)
382 "smart-resize,"
383#endif
384#if defined(CURSOR_BLINK)
385 "cursorBlink,"
386#endif
387#if defined(POINTER_BLANK)
388 "pointerBlank,"
389#endif
390#if defined(NO_RESOURCES)
391 "NoResources"
392#endif
393 "\nUsage: "; /* Usage */ 391 "\nUsage: "; /* Usage */
394 392
395#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";
396 398
397/*{{{ usage: */ 399/*{{{ usage: */
398/*----------------------------------------------------------------------*/ 400/*----------------------------------------------------------------------*/
399static void 401static void
400rxvt_usage (int type) 402rxvt_usage (int type)
… …
409 rxvt_log (" [-help] [--help]\n"); 411 rxvt_log (" [-help] [--help]\n");
410 412
411 for (col = 1, i = 0; i < optList_size; i++) 413 for (col = 1, i = 0; i < optList_size; i++)
412 if (optList[i].desc != NULL) 414 if (optList[i].desc != NULL)
413 { 415 {
414 int len = 0; 416 int len = 0;
415 417
416 if (!optList_isBool (i)) 418 if (optList[i].arg)
417 { 419 len = strlen (optList[i].arg) + 1;
418 len = optList_strlen (i);
419 if (len > 0)
420 len++; /* account for space */
421 }
422#ifdef DEBUG_STRICT 420#ifdef DEBUG_STRICT
423 assert (optList[i].opt != NULL); 421 assert (optList[i].opt != NULL);
424#endif 422#endif
425 len += 4 + strlen (optList[i].opt) + (optList_isBool (i) ? 2: 0); 423 len += 4 + strlen (optList[i].opt) + (optList_isBool (i) ? 2: 0);
426 col += len; 424 col += len;
427 if (col > 79) 425 if (col > 79)
426 {
428 { /* assume regular width */ 427 /* assume regular width */
429 rxvt_log ("\n"); 428 rxvt_log ("\n");
430 col = 1 + len; 429 col = 1 + len;
431 } 430 }
432 431
433 rxvt_log (" [-%s%s", (optList_isBool (i) ? "/+" : ""), optList[i].opt); 432 rxvt_log (" [-%s%s", (optList_isBool (i) ? "/+" : ""), optList[i].opt);
434 if (optList_strlen (i)) 433 if (optList[i].arg)
435 rxvt_log (" %s]", optList[i].arg); 434 rxvt_log (" %s]", optList[i].arg);
436 else 435 else
437 rxvt_log ("]"); 436 rxvt_log ("]");
438 } 437 }
439 break; 438 break;
… …
486 485
487/*{{{ get command-line options before getting resources */ 486/*{{{ get command-line options before getting resources */
488void 487void
489rxvt_term::get_options (int argc, const char *const *argv) 488rxvt_term::get_options (int argc, const char *const *argv)
490{ 489{
491 int i, bad_option = 0; 490 int i, bad_option = 0;
492 static const char On[3] = "ON", Off[4] = "OFF";
493 491
494 for (i = 1; i < argc; i++) 492 for (i = 1; i < argc; i++)
495 { 493 {
496 unsigned int entry, longopt = 0; 494 unsigned int entry, longopt = 0;
497 const char *flag, *opt; 495 const char *opt;
496 int flag;
498 497
499 opt = argv[i]; 498 opt = argv[i];
500#ifdef DEBUG_RESOURCES 499
501 fprintf (stderr, "argv[%d] = %s: ", i, opt);
502#endif
503 if (*opt == '-') 500 if (*opt == '-')
504 { 501 {
505 flag = On; 502 flag = 1;
503
506 if (*++opt == '-') 504 if (*++opt == '-')
507 longopt = *opt++; /* long option */ 505 longopt = *opt++; /* long option */
508 } 506 }
509 else if (*opt == '+') 507 else if (*opt == '+')
510 { 508 {
511 flag = Off; 509 flag = 0;
510
512 if (*++opt == '+') 511 if (*++opt == '+')
513 longopt = *opt++; /* long option */ 512 longopt = *opt++; /* long option */
514 } 513 }
515 else 514 else
516 { 515 {
… …
519 continue; 518 continue;
520 } 519 }
521 520
522 if (!strcmp (opt, "help")) 521 if (!strcmp (opt, "help"))
523 rxvt_usage (longopt ? 2 : 1); 522 rxvt_usage (longopt ? 2 : 1);
523
524 if (!strcmp (opt, "h")) 524 if (!strcmp (opt, "h"))
525 rxvt_usage (0); 525 rxvt_usage (0);
526 526
527 /* feature: always try to match long-options */ 527 /* feature: always try to match long-options */
528 for (entry = 0; entry < optList_size; entry++) 528 for (entry = 0; entry < optList_size; entry++)
… …
532 break; 532 break;
533 533
534 if (entry < optList_size) 534 if (entry < optList_size)
535 { 535 {
536 if (optList_isReverse (entry)) 536 if (optList_isReverse (entry))
537 flag = flag == On ? Off : On; 537 flag = !flag;
538 538
539 if (optList_strlen (entry)) 539 if (optList_isString (entry))
540 { 540 {
541 /* 541 /*
542 * special cases are handled in main.c:main () to allow 542 * special cases are handled in main.c:main () to allow
543 * X resources to set these values before we settle for 543 * X resources to set these values before we settle for
544 * default values 544 * default values
545 */ 545 */
546 546
547 if (optList[entry].doff != -1) 547 if (optList[entry].doff != -1)
548 {
549 if (flag && i+1 == argc)
550 rxvt_fatal ("option '%s' requires an argument, aborting.\n", argv [i]);
551
548 rs[optList[entry].doff] = flag == On && argv[i+1] 552 rs[optList[entry].doff] = flag ? argv[++i] : resval_undef;
549 ? argv[++i] : 0; 553 }
550 } 554 }
551 else 555 else
556 {
552 { /* boolean value */ 557 /* boolean value */
553#ifdef DEBUG_RESOURCES 558 set_option (optList[entry].index, flag);
554 fprintf (stderr, "boolean (%s,%s) = %s\n",
555 optList[entry].opt, optList[entry].kw, flag);
556#endif
557 set_option (optList[entry].flag & Optflag_mask, flag == On);
558 559
559 if (optList[entry].doff != -1) 560 if (optList[entry].doff != -1)
560 rs[optList[entry].doff] = flag; 561 rs[optList[entry].doff] = flag ? resval_on : resval_off;
561 } 562 }
562 } 563 }
564#ifndef NO_RESOURCES
565 else if (!strcmp (opt, "xrm"))
566 {
567 if (i+1 < argc)
568 XrmPutLineResource (&option_db, argv[++i]);
569 }
570#endif
571#ifdef KEYSYM_RESOURCE
572 else if (!strncmp (opt, "keysym.", sizeof ("keysym.") - 1))
573 {
574 if (i+1 < argc)
575 {
576 char *res = (char *)malloc (strlen (opt) + strlen (argv[++i]) + 6);
577 sprintf (res, "*.%s: %s\n", opt, argv[i]);
578 XrmPutLineResource (&option_db, res);
579 free (res);
580 }
581 }
582#endif
563 else 583 else
564#ifdef KEYSYM_RESOURCE
565 /* if (!strncmp (opt, "keysym.", sizeof ("keysym.") - 1)) */
566 if (rxvt_Str_match (opt, "keysym."))
567 { 584 {
568 const char *str = argv[++i];
569
570 if (str != NULL)
571 parse_keysym (opt + sizeof ("keysym.") - 1, str);
572 }
573 else
574#endif
575 {
576 bad_option = 1; 585 bad_option = 1;
577 rxvt_warn ("\"%s\": unknown or malformed option.\n", opt); 586 rxvt_warn ("\"%s\": unknown or malformed option.\n", opt);
578 } 587 }
579 } 588 }
580 589
581 if (bad_option) 590 if (bad_option)
582 rxvt_usage (0); 591 rxvt_usage (0);
583} 592}
… …
594 * "rxvt" "keysym" "0xFF01" 603 * "rxvt" "keysym" "0xFF01"
595 * value will be a string 604 * value will be a string
596 */ 605 */
597/* ARGSUSED */ 606/* ARGSUSED */
598int 607int
599rxvt_define_key (XrmDatabase *database __attribute__((unused)), 608rxvt_define_key (XrmDatabase *database UNUSED,
600 XrmBindingList bindings __attribute__((unused)), 609 XrmBindingList bindings UNUSED,
601 XrmQuarkList quarks, 610 XrmQuarkList quarks,
602 XrmRepresentation *type __attribute__((unused)), 611 XrmRepresentation *type UNUSED,
603 XrmValue *value, 612 XrmValue *value,
604 XPointer closure __attribute__((unused))) 613 XPointer closure UNUSED)
605{ 614{
606 int last; 615 int last;
607 616
608 for (last = 0; quarks[last] != NULLQUARK; last++) /* look for last quark in list */ 617 for (last = 0; quarks[last] != NULLQUARK; last++) /* look for last quark in list */
609 ; 618 ;
… …
614} 623}
615 624
616/* 625/*
617 * look for something like this (XK_Delete) 626 * look for something like this (XK_Delete)
618 * rxvt*keysym.0xFFFF: "\177" 627 * rxvt*keysym.0xFFFF: "\177"
619 *
620 * arg will be
621 * NULL for ~/.Xdefaults and
622 * non-NULL for command-line options (need to allocate)
623 */ 628 */
624#define NEWARGLIM 500 /* `reasonable' size */
625 629
626struct keysym_vocabulary_t 630struct keysym_vocabulary_t
627{ 631{
628 const char *name; 632 const char *name;
629 unsigned short len; 633 unsigned short len;
630 unsigned short value; 634 unsigned short value;
631}; 635};
632keysym_vocabulary_t keysym_vocabulary[] = 636static const keysym_vocabulary_t keysym_vocabulary[] =
633{ 637{
634 { "ISOLevel3", 9, Level3Mask }, 638 { "ISOLevel3", 9, Level3Mask },
635 { "AppKeypad", 9, AppKeypadMask }, 639 { "AppKeypad", 9, AppKeypadMask },
636 { "Control", 7, ControlMask }, 640 { "Control", 7, ControlMask },
637 { "NumLock", 7, NumLockMask }, 641 { "NumLock", 7, NumLockMask },
… …
659}; 663};
660 664
661int 665int
662rxvt_term::parse_keysym (const char *str, const char *arg) 666rxvt_term::parse_keysym (const char *str, const char *arg)
663{ 667{
664 int n, sym; 668 int sym;
665 unsigned int state = 0; 669 unsigned int state = 0;
666 const char *pmodend = NULL; 670 const char *key = strrchr (str, '-');
667 char *newarg = NULL;
668 char newargstr[NEWARGLIM];
669 671
670 if (arg == NULL) 672 if (!key)
671 { 673 key = str;
672 if ((n = rxvt_Str_match (str, "keysym.")) == 0)
673 return 0;
674
675 str += n; /* skip `keysym.' */
676 if (!(pmodend = strchr (str, ':')))
677 return -1;
678 }
679 else 674 else
680 pmodend = str + strlen(str); 675 key++;
681 676
682 for (--pmodend; str < pmodend; --pmodend) 677 // string or key is empty
683 if (*pmodend == '-') 678 if (*arg == '\0' || *key == '\0')
684 break; 679 return -1;
685 680
681 // parse modifiers
686 while (str < pmodend) 682 while (str < key)
687 { 683 {
688 unsigned int i; 684 unsigned int i;
689 685
690 for (i=0; i < sizeof (keysym_vocabulary) / sizeof (keysym_vocabulary_t); ++i) 686 for (i=0; i < sizeof (keysym_vocabulary) / sizeof (keysym_vocabulary_t); ++i)
691 { 687 {
… …
702 698
703 if (*str == '-') 699 if (*str == '-')
704 ++str; 700 ++str;
705 } 701 }
706 702
707 /* some scanf () have trouble with a 0x prefix */ 703 // convert keysym name to keysym number
708 if (str[0] == '0' && toupper (str[1]) == 'X') 704 if ((sym = XStringToKeysym (str)) == None)
709 { 705 {
710 str += 2; 706 // fallback on hexadecimal parsing
711 707 char *end;
708 sym = strtol (str, &end, 16);
712 if (arg) 709 if (*end)
713 {
714 if (sscanf (str, (strchr (str, ':') ? "%x:" : "%x"), &sym) != 1)
715 return -1;
716 }
717 else
718 {
719 if (sscanf (str, "%x:", &sym) != 1)
720 return -1;
721
722 /* cue to ':', it's there since sscanf () worked */
723 strncpy (newargstr, strchr (str, ':') + 1, NEWARGLIM - 1);
724 newargstr[NEWARGLIM - 1] = '\0';
725 newarg = newargstr;
726 }
727 }
728 else
729 {
730 /*
731 * convert keysym name to keysym number
732 */
733 strncpy (newargstr, str, NEWARGLIM - 1);
734 newargstr[NEWARGLIM - 1] = '\0';
735
736 if (arg == NULL)
737 {
738 if ((newarg = strchr (newargstr, ':')) == NULL)
739 return -1;
740
741 *newarg++ = '\0'; /* terminate keysym name */
742 }
743
744 if ((sym = XStringToKeysym (newargstr)) == None)
745 return -1; 710 return -1;
746 } 711 }
747 712
748 if (newarg == NULL)
749 {
750 strncpy (newargstr, arg, NEWARGLIM - 1);
751 newargstr[NEWARGLIM - 1] = '\0';
752 newarg = newargstr;
753 }
754
755 rxvt_Str_trim (newarg);
756 if (*newarg == '\0' || (n = rxvt_Str_escaped (newarg)) == 0)
757 return -1;
758
759 keyboard->register_user_translation (sym, state, newarg); 713 keyboard->register_user_translation (sym, state, arg);
760 return 1; 714 return 1;
761} 715}
762 716
763# endif /* KEYSYM_RESOURCE */ 717# endif /* KEYSYM_RESOURCE */
764#endif /* NO_RESOURCES */ 718#endif /* NO_RESOURCES */
765 719
766static char * 720static char *
767get_res (XrmDatabase database, const char *program, const char *option) 721get_res (XrmDatabase database, const char *program, const char *option)
768{ 722{
769 char resource[512]; 723 char resource[512];
… …
777} 731}
778 732
779const char * 733const char *
780rxvt_term::x_resource (const char *name) 734rxvt_term::x_resource (const char *name)
781{ 735{
782 XrmDatabase database = XrmGetDatabase (display->display); 736 XrmDatabase database = XrmGetDatabase (dpy);
783 737
784 const char *p = get_res (database, rs[Rs_name], name); 738 const char *p = get_res (database, rs[Rs_name], name);
785 const char *p0 = get_res (database, "!INVALIDPROGRAMMENAMEDONTMATCH!", name); 739 const char *p0 = get_res (database, "!INVALIDPROGRAMMENAMEDONTMATCH!", name);
786 740
787 if (p == NULL || (p0 && strcmp (p, p0) == 0)) 741 if (p == NULL || (p0 && strcmp (p, p0) == 0))
… …
801 755
802void 756void
803rxvt_term::extract_resources () 757rxvt_term::extract_resources ()
804{ 758{
805#ifndef NO_RESOURCES 759#ifndef NO_RESOURCES
760 XrmDatabase database = XrmGetDatabase (dpy);
761 XrmMergeDatabases (option_db, &database);
762 option_db = NULL;
806 /* 763 /*
807 * Query resources for options that affect us 764 * Query resources for options that affect us
808 */ 765 */
809 for (int entry = 0; entry < optList_size; entry++) 766 for (int entry = 0; entry < optList_size; entry++)
810 { 767 {
… …
830 || strcasecmp (p, "1") == 0; 787 || strcasecmp (p, "1") == 0;
831 788
832 if (optList_isReverse (entry)) 789 if (optList_isReverse (entry))
833 s = !s; 790 s = !s;
834 791
835 set_option (optList[entry].flag & Optflag_mask, s); 792 set_option (optList[entry].index, s);
836 } 793 }
837 } 794 }
838 } 795 }
839 796
840 /* 797 /*
841 * [R5 or later]: enumerate the resource database 798 * [R5 or later]: enumerate the resource database
842 */ 799 */
843# ifdef KEYSYM_RESOURCE 800# ifdef KEYSYM_RESOURCE
844 XrmDatabase database = XrmGetDatabase (display->display);
845 XrmName name_prefix[3]; 801 XrmName name_prefix[3];
846 XrmClass class_prefix[3]; 802 XrmClass class_prefix[3];
847 803
848 name_prefix[0] = XrmStringToName (rs[Rs_name]); 804 name_prefix[0] = XrmStringToName (rs[Rs_name]);
849 name_prefix[1] = XrmStringToName ("keysym"); 805 name_prefix[1] = XrmStringToName ("keysym");
… …
863 XrmEnumerateDatabase (database, name_prefix, class_prefix, 819 XrmEnumerateDatabase (database, name_prefix, class_prefix,
864 XrmEnumOneLevel, rxvt_define_key, NULL); 820 XrmEnumOneLevel, rxvt_define_key, NULL);
865# endif 821# endif
866# endif 822# endif
867 823
868#endif /* NO_RESOURCES */ 824#endif /* NO_RESOURCES */
869} 825}
870 826
871/*----------------------- end-of-file (C source) -----------------------*/ 827/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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