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.77 by root, Wed Jan 11 00:59:58 2006 UTC vs.
Revision 1.136 by ayin, Sat Feb 16 15:56:41 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 RSTRG (Rs_scrollstyle, "scrollstyle", "mode"), 101 RSTRG (Rs_scrollstyle, "scrollstyle", "mode"),
102 BOOL (Rs_scrollBar, "scrollBar", "sb", Opt_scrollBar, "scrollbar"), 102 BOOL (Rs_scrollBar, "scrollBar", "sb", Opt_scrollBar, 0, "scrollbar"),
103 BOOL (Rs_scrollBar_right, "scrollBar_right", "sr", Opt_scrollBar_right, "scrollbar right"), 103 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"), 104 BOOL (Rs_scrollBar_floating, "scrollBar_floating", "st", Opt_scrollBar_floating, 0, "scrollbar without a trough"),
105 RSTRG (Rs_scrollBar_align, "scrollBar_align", "mode"), 105 RSTRG (Rs_scrollBar_align, "scrollBar_align", "mode"),
106 STRG (Rs_scrollBar_thickness, "thickness", "sbt", "number", "scrollbar thickness/width in pixels"), 106 STRG (Rs_scrollBar_thickness, "thickness", "sbt", "number", "scrollbar thickness/width in pixels"),
107#endif
108 BOOL (Rs_scrollTtyOutput, "scrollTtyOutput", NULL, Opt_scrollTtyOutput, NULL), 107 BOOL (Rs_scrollTtyOutput, "scrollTtyOutput", NULL, Opt_scrollTtyOutput, 0, NULL),
109 BOOL (Rs_scrollTtyOutput, NULL, "si", Optflag_Reverse | Opt_scrollTtyOutput, "scroll-on-tty-output inhibit"), 108 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"), 109 BOOL (Rs_scrollTtyKeypress, "scrollTtyKeypress", "sk", Opt_scrollTtyKeypress, 0, "scroll-on-keypress"),
111 BOOL (Rs_scrollWithBuffer, "scrollWithBuffer", "sw", Opt_scrollWithBuffer, "scroll-with-buffer"), 110 BOOL (Rs_scrollWithBuffer, "scrollWithBuffer", "sw", Opt_scrollWithBuffer, 0, "scroll-with-buffer"),
112#if TRANSPARENT 111#if ENABLE_TRANSPARENCY
113 BOOL (Rs_transparent, "inheritPixmap", "ip", Opt_transparent, "inherit parent pixmap"), 112 BOOL (Rs_transparent, "inheritPixmap", "ip", Opt_transparent, 0, "inherit parent pixmap"),
114 SWCH ("tr", Opt_transparent, NULL), 113 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"), 114 STRG (Rs_color + Color_tint, "tintColor", "tint", "color", "tint color"),
115 STRG (Rs_shade, "shading", "sh", "number", "shade background by number %."),
116#endif
117#if OFF_FOCUS_FADING
118 STRG (Rs_fade, "fading", "fade", "number", "fade colors by number % when losing focus"),
119 STRG (Rs_color + Color_fade, "fadeColor", "fadecolor", "color", "target color for off-focus fading"),
120#endif
121 BOOL (Rs_utmpInhibit, "utmpInhibit", "ut", Opt_utmpInhibit, 0, "utmp inhibit"),
122#ifndef NO_BELL
123# if ENABLE_FRILLS
124 BOOL (Rs_urgentOnBell, "urgentOnBell", NULL, Opt_urgentOnBell, 0, NULL),
117# endif 125# 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"), 126 BOOL (Rs_visualBell, "visualBell", "vb", Opt_visualBell, 0, "visual bell"),
129# if ! defined(NO_MAPALERT) && defined(MAPALERT_OPTION) 127# if ! defined(NO_MAPALERT) && defined(MAPALERT_OPTION)
130 BOOL (Rs_mapAlert, "mapAlert", NULL, Opt_mapAlert, NULL), 128 BOOL (Rs_mapAlert, "mapAlert", NULL, Opt_mapAlert, 0, NULL),
131# endif 129# endif
132#endif 130#endif
133#ifdef META8_OPTION 131#ifdef META8_OPTION
134 BOOL (Rs_meta8, "meta8", NULL, Opt_meta8, NULL), 132 BOOL (Rs_meta8, "meta8", NULL, Opt_meta8, 0, NULL),
135#endif 133#endif
136#ifdef MOUSE_WHEEL 134#ifdef MOUSE_WHEEL
137 BOOL (Rs_mouseWheelScrollPage, "mouseWheelScrollPage", NULL, Opt_mouseWheelScrollPage, NULL), 135 BOOL (Rs_mouseWheelScrollPage, "mouseWheelScrollPage", NULL, Opt_mouseWheelScrollPage, 0, NULL),
138#endif 136#endif
139#if ENABLE_FRILLS 137#if ENABLE_FRILLS
140 BOOL (Rs_tripleclickwords, "tripleclickwords", "tcw", Opt_tripleclickwords, "triple click word selection"), 138 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"), 139 BOOL (Rs_insecure, "insecure", "insecure", Opt_insecure, 0, "enable possibly insecure escape sequences"),
142 BOOL (Rs_cursorUnderline, "cursorUnderline", "uc", Opt_cursorUnderline, "underline cursor"), 140 BOOL (Rs_cursorUnderline, "cursorUnderline", "uc", Opt_cursorUnderline, 0, "underline cursor"),
143#endif 141#endif
144#if CURSOR_BLINK 142#if CURSOR_BLINK
145 BOOL (Rs_cursorBlink, "cursorBlink", "bc", Opt_cursorBlink, "blinking cursor"), 143 BOOL (Rs_cursorBlink, "cursorBlink", "bc", Opt_cursorBlink, 0, "blinking cursor"),
146#endif 144#endif
147#ifdef POINTER_BLANK 145#ifdef POINTER_BLANK
148 BOOL (Rs_pointerBlank, "pointerBlank", "pb", Opt_pointerBlank, "switch off pointer after delay"), 146 BOOL (Rs_pointerBlank, "pointerBlank", "pb", Opt_pointerBlank, 0, "switch off pointer after delay"),
149#endif 147#endif
150 STRG (Rs_color + Color_bg, "background", "bg", "color", "background color"), 148 STRG (Rs_color + Color_bg, "background", "bg", "color", "background color"),
151 STRG (Rs_color + Color_fg, "foreground", "fg", "color", "foreground color"), 149 STRG (Rs_color + Color_fg, "foreground", "fg", "color", "foreground color"),
152 RSTRG (Rs_color + minCOLOR + 0, "color0", "color"), 150 RSTRG (Rs_color + minCOLOR + 0, "color0", "color"),
153 RSTRG (Rs_color + minCOLOR + 1, "color1", "color"), 151 RSTRG (Rs_color + minCOLOR + 1, "color1", "color"),
… …
168#ifndef NO_BOLD_UNDERLINE_REVERSE 166#ifndef NO_BOLD_UNDERLINE_REVERSE
169 RSTRG (Rs_color + Color_BD, "colorBD", "color"), 167 RSTRG (Rs_color + Color_BD, "colorBD", "color"),
170 RSTRG (Rs_color + Color_IT, "colorIT", "color"), 168 RSTRG (Rs_color + Color_IT, "colorIT", "color"),
171 RSTRG (Rs_color + Color_UL, "colorUL", "color"), 169 RSTRG (Rs_color + Color_UL, "colorUL", "color"),
172 RSTRG (Rs_color + Color_RV, "colorRV", "color"), 170 RSTRG (Rs_color + Color_RV, "colorRV", "color"),
173#endif /* ! NO_BOLD_UNDERLINE_REVERSE */ 171#endif /* ! NO_BOLD_UNDERLINE_REVERSE */
174#if ENABLE_FRILLS 172#if ENABLE_FRILLS
175 RSTRG (Rs_color + Color_underline, "underlineColor", "color"), 173 RSTRG (Rs_color + Color_underline, "underlineColor", "color"),
176#endif 174#endif
177#ifdef KEEP_SCROLLCOLOR
178 RSTRG (Rs_color + Color_scroll, "scrollColor", "color"), 175 RSTRG (Rs_color + Color_scroll, "scrollColor", "color"),
176#ifdef RXVT_SCROLLBAR
179 RSTRG (Rs_color + Color_trough, "troughColor", "color"), 177 RSTRG (Rs_color + Color_trough, "troughColor", "color"),
180#endif /* KEEP_SCROLLCOLOR */ 178#endif
181#ifdef OPTION_HC 179#ifdef OPTION_HC
182 STRG (Rs_color + Color_HC, "highlightColor", "hc", "color", "highlight color"), 180 STRG (Rs_color + Color_HC, "highlightColor", "hc", "color", "highlight color"),
183#endif 181#endif
184#ifndef NO_CURSORCOLOR 182#ifndef NO_CURSORCOLOR
185 STRG (Rs_color + Color_cursor, "cursorColor", "cr", "color", "cursor color"), 183 STRG (Rs_color + Color_cursor, "cursorColor", "cr", "color", "cursor color"),
186 /* command-line option = resource name */ 184 /* command-line option = resource name */
187 RSTRG (Rs_color + Color_cursor2, "cursorColor2", "color"), 185 RSTRG (Rs_color + Color_cursor2, "cursorColor2", "color"),
188#endif /* NO_CURSORCOLOR */ 186#endif /* NO_CURSORCOLOR */
189 STRG (Rs_color + Color_pointer_fg, "pointerColor", "pr", "color", "pointer color"), 187 STRG (Rs_color + Color_pointer_fg, "pointerColor", "pr", "color", "pointer color"),
190 STRG (Rs_color + Color_pointer_bg, "pointerColor2", "pr2", "color", "pointer bg color"), 188 STRG (Rs_color + Color_pointer_bg, "pointerColor2", "pr2", "color", "pointer bg color"),
191 STRG (Rs_color + Color_border, "borderColor", "bd", "color", "border color"), 189 STRG (Rs_color + Color_border, "borderColor", "bd", "color", "border color"),
192#if defined (XPM_BACKGROUND) || (MENUBAR_MAX) 190#ifdef BG_IMAGE_FROM_FILE
193 RSTRG (Rs_path, "path", "search path"), 191 RSTRG (Rs_path, "path", "search path"),
194#endif /* defined (XPM_BACKGROUND) || (MENUBAR_MAX) */
195#ifdef XPM_BACKGROUND
196 STRG (Rs_backgroundPixmap, "backgroundPixmap", "pixmap", "file[;geom]", "background pixmap"), 192 STRG (Rs_backgroundPixmap, "backgroundPixmap", "pixmap", "file[;geom]", "background pixmap"),
197#endif /* XPM_BACKGROUND */
198#if (MENUBAR_MAX)
199 RSTRG (Rs_menu, "menu", "name[;tag]"),
200#endif 193#endif
201 /* fonts: command-line option = resource name */ 194 /* fonts: command-line option = resource name */
202 STRG (Rs_font, "font", "fn", "fontname", "normal text font"), 195 STRG (Rs_font, "font", "fn", "fontname", "normal text font"),
203#if ENABLE_STYLES 196#if ENABLE_STYLES
204 STRG (Rs_boldFont, "boldFont", "fb", "fontname", "bold font"), 197 STRG (Rs_boldFont, "boldFont", "fb", "fontname", "bold font"),
205 STRG (Rs_italicFont, "italicFont", "fi", "fontname", "italic font"), 198 STRG (Rs_italicFont, "italicFont", "fi", "fontname", "italic font"),
206 STRG (Rs_boldItalicFont, "boldItalicFont", "fbi", "fontname", "bold italic font"), 199 STRG (Rs_boldItalicFont, "boldItalicFont", "fbi", "fontname", "bold italic font"),
207 BOOL (Rs_intensityStyles, "intensityStyles", "is", Opt_intensityStyles, "font styles imply intensity changes"), 200 BOOL (Rs_intensityStyles, "intensityStyles", "is", Opt_intensityStyles, 0, "font styles imply intensity changes"),
208#endif 201#endif
209#ifdef USE_XIM 202#ifdef USE_XIM
210 STRG (Rs_inputMethod, "inputMethod", "im", "name", "name of input method"), 203 STRG (Rs_inputMethod, "inputMethod", "im", "name", "name of input method"),
211 STRG (Rs_preeditType, "preeditType", "pt", "style", "input style: style = OverTheSpot|OffTheSpot|Root"), 204 STRG (Rs_preeditType, "preeditType", "pt", "style", "input style: style = OverTheSpot|OffTheSpot|Root"),
212 STRG (Rs_imLocale, "imLocale", "imlocale", "string", "locale to use for input method"), 205 STRG (Rs_imLocale, "imLocale", "imlocale", "string", "locale to use for input method"),
213 STRG (Rs_imFont, "imFont", "imfont", "fontname", "fontset for styles OverTheSpot and OffTheSpot"), 206 STRG (Rs_imFont, "imFont", "imfont", "fontname", "fontset for styles OverTheSpot and OffTheSpot"),
214#endif /* USE_XIM */ 207#endif /* USE_XIM */
215 STRG (Rs_name, NULL, "name", "string", "client instance, icon, and title strings"), 208 STRG (Rs_name, NULL, "name", "string", "client instance, icon, and title strings"),
216 STRG (Rs_title, "title", "title", "string", "title name for window"), 209 STRG (Rs_title, "title", "title", "string", "title name for window"),
217 STRG (Rs_title, NULL, "T", NULL, NULL), /* short form */ 210 STRG (Rs_title, NULL, "T", NULL, NULL), /* short form */
218 STRG (Rs_iconName, "iconName", "n", "string", "icon name for window"), 211 STRG (Rs_iconName, "iconName", "n", "string", "icon name for window"),
219 STRG (Rs_saveLines, "saveLines", "sl", "number", "number of scrolled lines to save"), 212 STRG (Rs_saveLines, "saveLines", "sl", "number", "number of scrolled lines to save"),
220#if ENABLE_XEMBED 213#if ENABLE_XEMBED
221 STRG (Rs_embed, NULL, "embed", "windowid", "window id to embed terminal in"), 214 STRG (Rs_embed, NULL, "embed", "windowid", "window id to embed terminal in"),
222#endif 215#endif
216#if XFT
217 STRG (Rs_depth, "depth", "depth", "number", "depth of visual to request"),
218 BOOL (Rs_buffered, "buffered", NULL, Opt_buffered, 0, NULL),
219#endif
223#if ENABLE_FRILLS 220#if ENABLE_FRILLS
224 RSTRG (Rs_transient_for, "transient-for", "windowid"), 221 RSTRG (Rs_transient_for, "transient-for", "windowid"),
222 BOOL (Rs_override_redirect, "override-redirect", "override-redirect", Opt_override_redirect, 0, "set override-redirect on the terminal window"),
225 STRG (Rs_pty_fd, NULL, "pty-fd", "fileno", "file descriptor of pty to use"), 223 STRG (Rs_pty_fd, NULL, "pty-fd", "fileno", "file descriptor of pty to use"),
226 BOOL (Rs_hold, "hold", "hold", Opt_hold, "retain window after shell exit"), 224 BOOL (Rs_hold, "hold", "hold", Opt_hold, 0, "retain window after shell exit"),
227 STRG (Rs_ext_bwidth, "externalBorder", "w", "number", "external border in pixels"), 225 STRG (Rs_ext_bwidth, "externalBorder", "w", "number", "external border in pixels"),
228 STRG (Rs_ext_bwidth, NULL, "bw", NULL, NULL), 226 STRG (Rs_ext_bwidth, NULL, "bw", NULL, NULL),
229 STRG (Rs_ext_bwidth, NULL, "borderwidth", NULL, NULL), 227 STRG (Rs_ext_bwidth, NULL, "borderwidth", NULL, NULL),
230 STRG (Rs_int_bwidth, "internalBorder", "b", "number", "internal border in pixels"), 228 STRG (Rs_int_bwidth, "internalBorder", "b", "number", "internal border in pixels"),
231 BOOL (Rs_borderLess, "borderLess", "bl", Opt_borderLess, "borderless window"), 229 BOOL (Rs_borderLess, "borderLess", "bl", Opt_borderLess, 0, "borderless window"),
232 BOOL (Rs_skipBuiltinGlyphs, "skipBuiltinGlyphs", "sbg", Opt_skipBuiltinGlyphs, "do not use internal glyphs"),
233 STRG (Rs_lineSpace, "lineSpace", "lsp", "number", "number of extra pixels between rows"), 230 STRG (Rs_lineSpace, "lineSpace", "lsp", "number", "number of extra pixels between rows"),
231#endif
232#ifdef BUILTIN_GLYPHS
233 BOOL (Rs_skipBuiltinGlyphs, "skipBuiltinGlyphs", "sbg", Opt_skipBuiltinGlyphs, 0, "do not use internal glyphs"),
234#endif 234#endif
235#ifdef POINTER_BLANK 235#ifdef POINTER_BLANK
236 RSTRG (Rs_pointerBlankDelay, "pointerBlankDelay", "number"), 236 RSTRG (Rs_pointerBlankDelay, "pointerBlankDelay", "number"),
237#endif 237#endif
238#ifndef NO_BACKSPACE_KEY 238#ifndef NO_BACKSPACE_KEY
239 RSTRG (Rs_backspace_key, "backspacekey", "string"), 239 RSTRG (Rs_backspace_key, "backspacekey", "string"),
240#endif 240#endif
241#ifndef NO_DELETE_KEY 241#ifndef NO_DELETE_KEY
242 RSTRG (Rs_delete_key, "deletekey", "string"), 242 RSTRG (Rs_delete_key, "deletekey", "string"),
243#endif 243#endif
244 RSTRG (Rs_selectstyle, "selectstyle", "mode"),
245#ifdef PRINTPIPE 244#ifdef PRINTPIPE
246 RSTRG (Rs_print_pipe, "print-pipe", "string"), 245 RSTRG (Rs_print_pipe, "print-pipe", "string"),
247#endif 246#endif
248 STRG (Rs_modifier, "modifier", "mod", "modifier", "meta modifier = alt|meta|hyper|super|mod1|...|mod5"), 247 STRG (Rs_modifier, "modifier", "mod", "modifier", "meta modifier = alt|meta|hyper|super|mod1|...|mod5"),
249#ifdef CUTCHAR_RESOURCE
250 RSTRG (Rs_cutchars, "cutchars", "string"), 248 RSTRG (Rs_cutchars, "cutchars", "string"),
251#endif /* CUTCHAR_RESOURCE */
252 RSTRG (Rs_answerbackstring, "answerbackString", "string"), 249 RSTRG (Rs_answerbackstring, "answerbackString", "string"),
253#ifndef NO_SECONDARY_SCREEN 250#ifndef NO_SECONDARY_SCREEN
254 BOOL (Rs_secondaryScreen, "secondaryScreen", "ssc", Opt_secondaryScreen, "enable secondary screen"), 251 BOOL (Rs_secondaryScreen, "secondaryScreen", "ssc", Opt_secondaryScreen, 0, "enable secondary screen"),
255 BOOL (Rs_secondaryScroll, "secondaryScroll", "ssr", Opt_secondaryScroll, "enable secondary screen scroll"), 252 BOOL (Rs_secondaryScroll, "secondaryScroll", "ssr", Opt_secondaryScroll, 0, "enable secondary screen scroll"),
256#endif 253#endif
257#if ENABLE_PERL 254#if ENABLE_PERL
258 RSTRG (Rs_perl_lib, "perl-lib", "string"), //, "colon-separated directories with extension scripts"),TODO 255 RSTRG (Rs_perl_lib, "perl-lib", "string"), //, "colon-separated directories with extension scripts"),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_eval, "perl-eval", "perl-eval"), // "string", "code to be evaluated after all extensions have been loaded"),TODO
260 RSTRG (Rs_perl_ext_1, "perl-ext-common", "string"), //, "colon-separated list of perl extensions to enable"),TODO 257 RSTRG (Rs_perl_ext_1, "perl-ext-common", "string"), //, "colon-separated list of perl extensions to enable"),TODO
261 STRG (Rs_perl_ext_2, "perl-ext", "pe", "string", "colon-separated list of perl extensions to enable for this instance"), 258 STRG (Rs_perl_ext_2, "perl-ext", "pe", "string", "colon-separated list of perl extensions to enable for this instance"),
262#endif 259#endif
263#ifndef NO_RESOURCES 260#if ISO_14755
264 INFO ("xrm", "string", "X resource"), 261 BOOL (Rs_iso14755_52, "iso14755_52", NULL, Opt_iso14755_52, 0, NULL),
262#endif
263#ifdef HAVE_AFTERIMAGE
264 STRG (Rs_blendtype, "blendType", "blt", "string", "background image blending type - alpha, tint, etc..."),
265 STRG (Rs_blurradius, "blurRadius", "blr", "HxV", "Gaussian Blur radii to apply to the root background"),
265#endif 266#endif
266 INFO ("e", "command arg ...", "command to execute") 267 INFO ("e", "command arg ...", "command to execute")
267 }; 268 };
268 269
269#undef INFO 270#undef INFO
270#undef STRG 271#undef STRG
271#undef RSTRG 272#undef RSTRG
272#undef SWCH 273#undef SWCH
273#undef BOOL 274#undef BOOL
274/*}}} */
275 275
276static const char releasestring[] = "rxvt-unicode (" RXVTNAME ") v" VERSION " - released: " DATE "\n"; 276static const char releasestring[] = "rxvt-unicode (" RXVTNAME ") v" VERSION " - released: " DATE "\n";
277static const char optionsstring[] = "options: " 277static const char optionsstring[] = "options: "
278#if ENABLE_PERL 278#if ENABLE_PERL
279 "perl," 279 "perl,"
… …
314#endif 314#endif
315 "," 315 ","
316#if OFF_FOCUS_FADING 316#if OFF_FOCUS_FADING
317 "fade," 317 "fade,"
318#endif 318#endif
319#if defined(XPM_BACKGROUND)
320 "XPM,"
321#endif
322#if defined(TRANSPARENT) 319#if defined(ENABLE_TRANSPARENCY)
323 "transparent," 320 "transparent,"
324#endif
325#if TINTING
326 "tint," 321 "tint,"
327#endif 322#endif
328#if defined(UTMP_SUPPORT) 323#if HAVE_AFTERIMAGE
329 "utmp," 324 "afterimage,"
330#endif
331#if defined(MENUBAR)
332 "menubar,"
333#endif 325#endif
334#if defined(USE_XIM) 326#if defined(USE_XIM)
335 "XIM," 327 "XIM,"
336#endif 328#endif
337 "scrollbars="
338#if !defined(HAVE_SCROLLBARS)
339 "NONE"
340#else
341# if defined(PLAIN_SCROLLBAR)
342 "plain"
343# if defined(RXVT_SCROLLBAR) || defined(NEXT_SCROLLBAR) || defined(XTERM_SCROLLBAR)
344 "+"
345# endif
346# endif
347# if defined(RXVT_SCROLLBAR)
348 "rxvt"
349# if defined(NEXT_SCROLLBAR) || defined(XTERM_SCROLLBAR)
350 "+"
351# endif
352# endif
353# if defined(NEXT_SCROLLBAR)
354 "NeXT"
355# if defined(XTERM_SCROLLBAR)
356 "+"
357# endif
358# endif
359# if defined(XTERM_SCROLLBAR)
360 "xterm"
361# endif
362#endif
363 ","
364#if defined(NO_BACKSPACE_KEY) 329#if defined(NO_BACKSPACE_KEY)
365 "no_backspace," 330 "no_backspace,"
366#endif 331#endif
367#if defined(NO_DELETE_KEY) 332#if defined(NO_DELETE_KEY)
368 "no_delete," 333 "no_delete,"
369#endif 334#endif
370#if EIGHT_BIT_CONTROLS 335#if EIGHT_BIT_CONTROLS
371 "8bitctrls," 336 "8bitctrls,"
372#endif 337#endif
373#if !defined(NO_STRINGS)
374 "strings,"
375#endif
376#if defined(ENABLE_FRILLS) 338#if defined(ENABLE_FRILLS)
377 "frills," 339 "frills,"
378#endif 340#endif
379#if defined(PREFER_24BIT)
380 "24bit,"
381#endif
382#if defined(SELECTION_SCROLLING) 341#if defined(SELECTION_SCROLLING)
383 "selectionscrolling," 342 "selectionscrolling,"
384#endif 343#endif
385#if MOUSE_WHEEL 344#if MOUSE_WHEEL
386 "wheel," 345 "wheel,"
… …
396#endif 355#endif
397#if defined(POINTER_BLANK) 356#if defined(POINTER_BLANK)
398 "pointerBlank," 357 "pointerBlank,"
399#endif 358#endif
400#if defined(NO_RESOURCES) 359#if defined(NO_RESOURCES)
401 "NoResources" 360 "NoResources,"
361#endif
362 "scrollbars=plain"
363#if defined(RXVT_SCROLLBAR)
364 "+rxvt"
365#endif
366#if defined(NEXT_SCROLLBAR)
367 "+NeXT"
368#endif
369#if defined(XTERM_SCROLLBAR)
370 "+xterm"
402#endif 371#endif
403 "\nUsage: "; /* Usage */ 372 "\nUsage: "; /* Usage */
404 373
405#define INDENT 18 374#define INDENT 18
375
376const char rxvt_term::resval_undef [] = "<undef>";
377const char rxvt_term::resval_on [] = "on";
378const char rxvt_term::resval_off [] = "off";
406 379
407/*{{{ usage: */ 380/*{{{ usage: */
408/*----------------------------------------------------------------------*/ 381/*----------------------------------------------------------------------*/
409static void 382static void
410rxvt_usage (int type) 383rxvt_usage (int type)
… …
419 rxvt_log (" [-help] [--help]\n"); 392 rxvt_log (" [-help] [--help]\n");
420 393
421 for (col = 1, i = 0; i < optList_size; i++) 394 for (col = 1, i = 0; i < optList_size; i++)
422 if (optList[i].desc != NULL) 395 if (optList[i].desc != NULL)
423 { 396 {
424 int len = 0; 397 int len = 0;
425 398
426 if (!optList_isBool (i)) 399 if (optList[i].arg)
427 { 400 len = strlen (optList[i].arg) + 1;
428 len = optList_strlen (i);
429 if (len > 0)
430 len++; /* account for space */
431 }
432#ifdef DEBUG_STRICT 401#ifdef DEBUG_STRICT
433 assert (optList[i].opt != NULL); 402 assert (optList[i].opt != NULL);
434#endif 403#endif
435 len += 4 + strlen (optList[i].opt) + (optList_isBool (i) ? 2: 0); 404 len += 4 + strlen (optList[i].opt) + (optList_isBool (i) ? 2: 0);
436 col += len; 405 col += len;
437 if (col > 79) 406 if (col > 79)
407 {
438 { /* assume regular width */ 408 /* assume regular width */
439 rxvt_log ("\n"); 409 rxvt_log ("\n");
440 col = 1 + len; 410 col = 1 + len;
441 } 411 }
442 412
443 rxvt_log (" [-%s%s", (optList_isBool (i) ? "/+" : ""), optList[i].opt); 413 rxvt_log (" [-%s%s", (optList_isBool (i) ? "/+" : ""), optList[i].opt);
444 if (optList_strlen (i)) 414 if (optList[i].arg)
445 rxvt_log (" %s]", optList[i].arg); 415 rxvt_log (" %s]", optList[i].arg);
446 else 416 else
447 rxvt_log ("]"); 417 rxvt_log ("]");
448 } 418 }
449 break; 419 break;
… …
496 466
497/*{{{ get command-line options before getting resources */ 467/*{{{ get command-line options before getting resources */
498void 468void
499rxvt_term::get_options (int argc, const char *const *argv) 469rxvt_term::get_options (int argc, const char *const *argv)
500{ 470{
501 int i, bad_option = 0; 471 int i, bad_option = 0;
502 static const char On[3] = "ON", Off[4] = "OFF";
503 472
504 for (i = 1; i < argc; i++) 473 for (i = 1; i < argc; i++)
505 { 474 {
506 unsigned int entry, longopt = 0; 475 unsigned int entry, longopt = 0;
507 const char *flag, *opt; 476 const char *opt;
477 int flag;
508 478
509 opt = argv[i]; 479 opt = argv[i];
510#ifdef DEBUG_RESOURCES 480
511 fprintf (stderr, "argv[%d] = %s: ", i, opt);
512#endif
513 if (*opt == '-') 481 if (*opt == '-')
514 { 482 {
515 flag = On; 483 flag = 1;
484
516 if (*++opt == '-') 485 if (*++opt == '-')
517 longopt = *opt++; /* long option */ 486 longopt = *opt++; /* long option */
518 } 487 }
519 else if (*opt == '+') 488 else if (*opt == '+')
520 { 489 {
521 flag = Off; 490 flag = 0;
491
522 if (*++opt == '+') 492 if (*++opt == '+')
523 longopt = *opt++; /* long option */ 493 longopt = *opt++; /* long option */
524 } 494 }
525 else 495 else
526 { 496 {
… …
529 continue; 499 continue;
530 } 500 }
531 501
532 if (!strcmp (opt, "help")) 502 if (!strcmp (opt, "help"))
533 rxvt_usage (longopt ? 2 : 1); 503 rxvt_usage (longopt ? 2 : 1);
504
534 if (!strcmp (opt, "h")) 505 if (!strcmp (opt, "h"))
535 rxvt_usage (0); 506 rxvt_usage (0);
536 507
537 /* feature: always try to match long-options */ 508 /* feature: always try to match long-options */
538 for (entry = 0; entry < optList_size; entry++) 509 for (entry = 0; entry < optList_size; entry++)
… …
542 break; 513 break;
543 514
544 if (entry < optList_size) 515 if (entry < optList_size)
545 { 516 {
546 if (optList_isReverse (entry)) 517 if (optList_isReverse (entry))
547 flag = flag == On ? Off : On; 518 flag = !flag;
548 519
549 if (optList_strlen (entry)) 520 if (optList_isString (entry))
550 { 521 {
551 /* 522 /*
552 * special cases are handled in main.c:main () to allow 523 * special cases are handled in main.c:main () to allow
553 * X resources to set these values before we settle for 524 * X resources to set these values before we settle for
554 * default values 525 * default values
555 */ 526 */
556 527
557 if (optList[entry].doff != -1) 528 if (optList[entry].doff != -1)
529 {
530 if (flag && i+1 == argc)
531 rxvt_fatal ("option '%s' requires an argument, aborting.\n", argv [i]);
532
558 rs[optList[entry].doff] = flag == On && argv[i+1] 533 rs[optList[entry].doff] = flag ? argv[++i] : resval_undef;
559 ? argv[++i] : 0; 534 }
560 } 535 }
561 else 536 else
537 {
562 { /* boolean value */ 538 /* boolean value */
563#ifdef DEBUG_RESOURCES 539 set_option (optList[entry].index, flag);
564 fprintf (stderr, "boolean (%s,%s) = %s\n",
565 optList[entry].opt, optList[entry].kw, flag);
566#endif
567 set_option (optList[entry].flag & Optflag_mask, flag == On);
568 540
569 if (optList[entry].doff != -1) 541 if (optList[entry].doff != -1)
570 rs[optList[entry].doff] = flag; 542 rs[optList[entry].doff] = flag ? resval_on : resval_off;
571 } 543 }
572 } 544 }
545#ifndef NO_RESOURCES
546 else if (!strcmp (opt, "xrm"))
547 {
548 if (i+1 < argc)
549 XrmPutLineResource (&option_db, argv[++i]);
550 }
551#endif
552#ifdef KEYSYM_RESOURCE
553 else if (!strncmp (opt, "keysym.", sizeof ("keysym.") - 1))
554 {
555 if (i+1 < argc)
556 {
557 char *res = (char *)malloc (strlen (opt) + strlen (argv[++i]) + 6);
558 sprintf (res, "*.%s: %s\n", opt, argv[i]);
559 XrmPutLineResource (&option_db, res);
560 free (res);
561 }
562 }
563#endif
573 else 564 else
574#ifdef KEYSYM_RESOURCE
575 /* if (!strncmp (opt, "keysym.", sizeof ("keysym.") - 1)) */
576 if (rxvt_Str_match (opt, "keysym."))
577 { 565 {
578 const char *str = argv[++i];
579
580 if (str != NULL)
581 parse_keysym (opt + sizeof ("keysym.") - 1, str);
582 }
583 else
584#endif
585 {
586 bad_option = 1; 566 bad_option = 1;
587 rxvt_warn ("\"%s\": unknown or malformed option.\n", opt); 567 rxvt_warn ("\"%s\": unknown or malformed option.\n", opt);
588 } 568 }
589 } 569 }
590 570
591 if (bad_option) 571 if (bad_option)
592 rxvt_usage (0); 572 rxvt_usage (0);
593} 573}
… …
604 * "rxvt" "keysym" "0xFF01" 584 * "rxvt" "keysym" "0xFF01"
605 * value will be a string 585 * value will be a string
606 */ 586 */
607/* ARGSUSED */ 587/* ARGSUSED */
608int 588int
609rxvt_define_key (XrmDatabase *database __attribute__((unused)), 589rxvt_define_key (XrmDatabase *database UNUSED,
610 XrmBindingList bindings __attribute__((unused)), 590 XrmBindingList bindings UNUSED,
611 XrmQuarkList quarks, 591 XrmQuarkList quarks,
612 XrmRepresentation *type __attribute__((unused)), 592 XrmRepresentation *type UNUSED,
613 XrmValue *value, 593 XrmValue *value,
614 XPointer closure __attribute__((unused))) 594 XPointer closure UNUSED)
615{ 595{
616 int last; 596 int last;
617 597
618 for (last = 0; quarks[last] != NULLQUARK; last++) /* look for last quark in list */ 598 for (last = 0; quarks[last] != NULLQUARK; last++) /* look for last quark in list */
619 ; 599 ;
… …
624} 604}
625 605
626/* 606/*
627 * look for something like this (XK_Delete) 607 * look for something like this (XK_Delete)
628 * rxvt*keysym.0xFFFF: "\177" 608 * rxvt*keysym.0xFFFF: "\177"
629 *
630 * arg will be
631 * NULL for ~/.Xdefaults and
632 * non-NULL for command-line options (need to allocate)
633 */ 609 */
634#define NEWARGLIM 500 /* `reasonable' size */
635 610
636struct keysym_vocabulary_t 611struct keysym_vocabulary_t
637{ 612{
638 const char *name; 613 const char *name;
639 unsigned short len; 614 unsigned short len;
640 unsigned short value; 615 unsigned short value;
641}; 616};
642keysym_vocabulary_t keysym_vocabulary[] = 617static const keysym_vocabulary_t keysym_vocabulary[] =
643{ 618{
644 { "ISOLevel3", 9, Level3Mask }, 619 { "ISOLevel3", 9, Level3Mask },
645 { "AppKeypad", 9, AppKeypadMask }, 620 { "AppKeypad", 9, AppKeypadMask },
646 { "Control", 7, ControlMask }, 621 { "Control", 7, ControlMask },
647 { "NumLock", 7, NumLockMask }, 622 { "NumLock", 7, NumLockMask },
… …
669}; 644};
670 645
671int 646int
672rxvt_term::parse_keysym (const char *str, const char *arg) 647rxvt_term::parse_keysym (const char *str, const char *arg)
673{ 648{
674 int n, sym; 649 int sym;
675 unsigned int state = 0; 650 unsigned int state = 0;
676 const char *pmodend = NULL; 651 const char *key = strrchr (str, '-');
677 char *newarg = NULL;
678 char newargstr[NEWARGLIM];
679 652
680 if (arg == NULL) 653 if (!key)
681 { 654 key = str;
682 if ((n = rxvt_Str_match (str, "keysym.")) == 0)
683 return 0;
684
685 str += n; /* skip `keysym.' */
686 if (!(pmodend = strchr (str, ':')))
687 return -1;
688 }
689 else 655 else
690 pmodend = str + strlen(str); 656 key++;
691 657
692 for (--pmodend; str < pmodend; --pmodend) 658 // string or key is empty
693 if (*pmodend == '-') 659 if (*arg == '\0' || *key == '\0')
694 break; 660 return -1;
695 661
662 // parse modifiers
696 while (str < pmodend) 663 while (str < key)
697 { 664 {
698 unsigned int i; 665 unsigned int i;
699 666
700 for (i=0; i < sizeof (keysym_vocabulary) / sizeof (keysym_vocabulary_t); ++i) 667 for (i=0; i < sizeof (keysym_vocabulary) / sizeof (keysym_vocabulary_t); ++i)
701 { 668 {
… …
712 679
713 if (*str == '-') 680 if (*str == '-')
714 ++str; 681 ++str;
715 } 682 }
716 683
717 /* some scanf () have trouble with a 0x prefix */ 684 // convert keysym name to keysym number
718 if (str[0] == '0' && toupper (str[1]) == 'X') 685 if ((sym = XStringToKeysym (str)) == None)
719 { 686 {
720 str += 2; 687 // fallback on hexadecimal parsing
721 688 char *end;
689 sym = strtol (str, &end, 16);
722 if (arg) 690 if (*end)
723 {
724 if (sscanf (str, (strchr (str, ':') ? "%x:" : "%x"), &sym) != 1)
725 return -1;
726 }
727 else
728 {
729 if (sscanf (str, "%x:", &sym) != 1)
730 return -1;
731
732 /* cue to ':', it's there since sscanf () worked */
733 strncpy (newargstr, strchr (str, ':') + 1, NEWARGLIM - 1);
734 newargstr[NEWARGLIM - 1] = '\0';
735 newarg = newargstr;
736 }
737 }
738 else
739 {
740 /*
741 * convert keysym name to keysym number
742 */
743 strncpy (newargstr, str, NEWARGLIM - 1);
744 newargstr[NEWARGLIM - 1] = '\0';
745
746 if (arg == NULL)
747 {
748 if ((newarg = strchr (newargstr, ':')) == NULL)
749 return -1;
750
751 *newarg++ = '\0'; /* terminate keysym name */
752 }
753
754 if ((sym = XStringToKeysym (newargstr)) == None)
755 return -1; 691 return -1;
756 } 692 }
757 693
758 if (newarg == NULL)
759 {
760 strncpy (newargstr, arg, NEWARGLIM - 1);
761 newargstr[NEWARGLIM - 1] = '\0';
762 newarg = newargstr;
763 }
764
765 rxvt_Str_trim (newarg);
766 if (*newarg == '\0' || (n = rxvt_Str_escaped (newarg)) == 0)
767 return -1;
768
769 keyboard->register_user_translation (sym, state, newarg); 694 keyboard->register_user_translation (sym, state, arg);
770 return 1; 695 return 1;
771} 696}
772 697
773# endif /* KEYSYM_RESOURCE */ 698# endif /* KEYSYM_RESOURCE */
774#endif /* NO_RESOURCES */ 699#endif /* NO_RESOURCES */
775 700
701static char *
776char *get_res (XrmDatabase database, const char *program, const char *option) 702get_res (XrmDatabase database, const char *program, const char *option)
777{ 703{
778 char resource[512]; 704 char resource[512];
779 char *type; 705 char *type;
780 XrmValue result; 706 XrmValue result;
781 707
… …
783 XrmGetResource (database, resource, resource, &type, &result); 709 XrmGetResource (database, resource, resource, &type, &result);
784 710
785 return result.addr; 711 return result.addr;
786} 712}
787 713
788/*{{{ read the resources files */ 714const char *
789/* 715rxvt_term::x_resource (const char *name)
790 * using XGetDefault () or the hand-rolled replacement 716{
791 */ 717 XrmDatabase database = XrmGetDatabase (dpy);
792/* ARGSUSED */ 718
719 const char *p = get_res (database, rs[Rs_name], name);
720 const char *p0 = get_res (database, "!INVALIDPROGRAMMENAMEDONTMATCH!", name);
721
722 if (p == NULL || (p0 && strcmp (p, p0) == 0))
723 {
724 p = get_res (database, RESCLASS, name);
725#ifdef RESFALLBACK
726 if (p == NULL || (p0 && strcmp (p, p0) == 0))
727 p = get_res (database, RESFALLBACK, name);
728#endif
729 }
730
731 if (p == NULL && p0)
732 p = p0;
733
734 return p;
735}
736
793void 737void
794rxvt_term::extract_resources () 738rxvt_term::extract_resources ()
795{ 739{
796 dDisp;
797
798#ifndef NO_RESOURCES 740#ifndef NO_RESOURCES
799 XrmDatabase database = XrmGetDatabase (display->display); 741 XrmDatabase database = XrmGetDatabase (dpy);
800 742 XrmMergeDatabases (option_db, &database);
743 option_db = NULL;
801 /* 744 /*
802 * Query resources for options that affect us 745 * Query resources for options that affect us
803 */ 746 */
804 for (int entry = 0; entry < optList_size; entry++) 747 for (int entry = 0; entry < optList_size; entry++)
805 { 748 {
806 int s; 749 int s;
807 char *p, *p0;
808 const char *kw = optList[entry].kw; 750 const char *kw = optList[entry].kw;
809 751
810 if (kw == NULL || rs[optList[entry].doff] != NULL) 752 if (kw == NULL || rs[optList[entry].doff] != NULL)
811 continue; // previously set 753 continue; // previously set
812 754
813 p = get_res (database, rs[Rs_name], kw); 755 const char *p = x_resource (kw);
814 p0 = get_res (database, "!INVALIDPROGRAMMENAMEDONTMATCH!", kw);
815 if (p == NULL || (p0 && strcmp (p, p0) == 0))
816 {
817 p = get_res (database, RESCLASS, kw);
818#ifdef RESFALLBACK
819 if (p == NULL || (p0 && strcmp (p, p0) == 0))
820 p = get_res (database, RESFALLBACK, kw);
821#endif
822 }
823
824 if (p == NULL && p0)
825 p = p0;
826 756
827 if (p) 757 if (p)
828 { 758 {
829 p = strdup (p); 759 p = strdup (p);
830 allocated.push_back (p); 760 allocated.push_back ((void *)p);
831 rs[optList[entry].doff] = p; 761 rs[optList[entry].doff] = p;
832 762
833 if (optList_isBool (entry)) 763 if (optList_isBool (entry))
834 { 764 {
835 s = strcasecmp (p, "TRUE") == 0 765 s = strcasecmp (p, "TRUE") == 0
… …
838 || strcasecmp (p, "1") == 0; 768 || strcasecmp (p, "1") == 0;
839 769
840 if (optList_isReverse (entry)) 770 if (optList_isReverse (entry))
841 s = !s; 771 s = !s;
842 772
843 set_option (optList[entry].flag & Optflag_mask, s); 773 set_option (optList[entry].index, s);
844 } 774 }
845 } 775 }
846 } 776 }
847 777
848 /* 778 /*
… …
870 XrmEnumerateDatabase (database, name_prefix, class_prefix, 800 XrmEnumerateDatabase (database, name_prefix, class_prefix,
871 XrmEnumOneLevel, rxvt_define_key, NULL); 801 XrmEnumOneLevel, rxvt_define_key, NULL);
872# endif 802# endif
873# endif 803# endif
874 804
875#endif /* NO_RESOURCES */ 805#endif /* NO_RESOURCES */
876} 806}
877 807
878/*}}} */
879/*----------------------- end-of-file (C source) -----------------------*/ 808/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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