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.86 by root, Wed Jan 25 21:09:22 2006 UTC vs.
Revision 1.157 by root, Thu Dec 1 10:50:53 2011 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 <schmorp@schmorp.de>
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 (sizeof (optList) / sizeof (optList[0]))
75 74
76static const struct 75static const struct
77 { 76 {
77 const uint8_t index; /* Option index */
78 const unsigned long flag; /* Option flag */ 78 const uint8_t flag; /* Option flag */
79 const int doff; /* data offset */ 79 const int16_t doff; /* resource value index or -1 */
80 const char *kw; /* keyword */ 80 const char *kw; /* keyword */
81 const char *opt; /* option */ 81 const char *opt; /* option */
82 const char *arg; /* argument */ 82 const char *arg; /* argument */
83 const char *desc; /* description */ 83 const char *desc; /* description */
84 } 84 }
… …
86 STRG (Rs_display_name, NULL, "d", NULL, NULL), /* short form */ 86 STRG (Rs_display_name, NULL, "d", NULL, NULL), /* short form */
87 STRG (Rs_display_name, NULL, "display", "string", "X server to contact"), 87 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"), 88 STRG (Rs_term_name, "termName", "tn", "string", "value of the TERM environment variable"),
89 STRG (Rs_geometry, NULL, "g", NULL, NULL), /* short form */ 89 STRG (Rs_geometry, NULL, "g", NULL, NULL), /* short form */
90 STRG (Rs_geometry, "geometry", "geometry", "geometry", "size (in characters) and position"), 90 STRG (Rs_geometry, "geometry", "geometry", "geometry", "size (in characters) and position"),
91 SWCH ("C", Opt_console, "intercept console messages"), 91 SWCH ("C", Opt_console, 0, "intercept console messages"),
92 SWCH ("iconic", Opt_iconic, "start iconic"), 92 SWCH ("iconic", Opt_iconic, 0, "start iconic"),
93 SWCH ("ic", Opt_iconic, NULL), /* short form */ 93 SWCH ("ic", Opt_iconic, 0, NULL), /* short form */
94 STRG (Rs_chdir, "chdir", "cd", "string", "start shell in this directory"),
94 BOOL (Rs_reverseVideo, "reverseVideo", "rv", Opt_reverseVideo, "reverse video"), 95 BOOL (Rs_reverseVideo, "reverseVideo", "rv", Opt_reverseVideo, 0, "reverse video"),
95 BOOL (Rs_loginShell, "loginShell", "ls", Opt_loginShell, "login shell"), 96 BOOL (Rs_loginShell, "loginShell", "ls", Opt_loginShell, 0, "login shell"),
96 BOOL (Rs_jumpScroll, "jumpScroll", "j", Opt_jumpScroll, "jump scrolling"), 97 BOOL (Rs_jumpScroll, "jumpScroll", "j", Opt_jumpScroll, 0, "jump scrolling"),
98 BOOL (Rs_skipScroll, "skipScroll", "ss", Opt_skipScroll, 0, "skip scrolling"),
97 BOOL (Rs_pastableTabs, "pastableTabs", "ptab", Opt_pastableTabs, "tab characters are pastable"), 99 BOOL (Rs_pastableTabs, "pastableTabs", "ptab", Opt_pastableTabs, 0, "tab characters are pastable"),
98#if HAVE_SCROLLBARS
99 RSTRG (Rs_scrollstyle, "scrollstyle", "mode"), 100 RSTRG (Rs_scrollstyle, "scrollstyle", "mode"),
100 BOOL (Rs_scrollBar, "scrollBar", "sb", Opt_scrollBar, "scrollbar"), 101 BOOL (Rs_scrollBar, "scrollBar", "sb", Opt_scrollBar, 0, "scrollbar"),
101 BOOL (Rs_scrollBar_right, "scrollBar_right", "sr", Opt_scrollBar_right, "scrollbar right"), 102 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"), 103 BOOL (Rs_scrollBar_floating, "scrollBar_floating", "st", Opt_scrollBar_floating, 0, "scrollbar without a trough"),
103 RSTRG (Rs_scrollBar_align, "scrollBar_align", "mode"), 104 RSTRG (Rs_scrollBar_align, "scrollBar_align", "mode"),
104 STRG (Rs_scrollBar_thickness, "thickness", "sbt", "number", "scrollbar thickness/width in pixels"), 105 STRG (Rs_scrollBar_thickness, "thickness", "sbt", "number", "scrollbar thickness/width in pixels"),
105#endif
106 BOOL (Rs_scrollTtyOutput, "scrollTtyOutput", NULL, Opt_scrollTtyOutput, NULL), 106 BOOL (Rs_scrollTtyOutput, "scrollTtyOutput", NULL, Opt_scrollTtyOutput, 0, NULL),
107 BOOL (Rs_scrollTtyOutput, NULL, "si", Optflag_Reverse | Opt_scrollTtyOutput, "scroll-on-tty-output inhibit"), 107 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"), 108 BOOL (Rs_scrollTtyKeypress, "scrollTtyKeypress", "sk", Opt_scrollTtyKeypress, 0, "scroll-on-keypress"),
109 BOOL (Rs_scrollWithBuffer, "scrollWithBuffer", "sw", Opt_scrollWithBuffer, "scroll-with-buffer"), 109 BOOL (Rs_scrollWithBuffer, "scrollWithBuffer", "sw", Opt_scrollWithBuffer, 0, "scroll-with-buffer"),
110#if TRANSPARENT 110#if ENABLE_TRANSPARENCY
111 BOOL (Rs_transparent, "inheritPixmap", "ip", Opt_transparent, "inherit parent pixmap"), 111 BOOL (Rs_transparent, "inheritPixmap", "ip", Opt_transparent, 0, "inherit parent pixmap"),
112 SWCH ("tr", Opt_transparent, NULL), 112 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"), 113 STRG (Rs_color + Color_tint, "tintColor", "tint", "color", "tint color"),
114 STRG (Rs_shade, "shading", "sh", "number", "shade background by number %."),
115 STRG (Rs_blurradius, "blurRadius", "blr", "HxV", "gaussian blur radii to apply to the root background"),
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),
115# endif 125# 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"), 126 BOOL (Rs_visualBell, "visualBell", "vb", Opt_visualBell, 0, "visual bell"),
127# if ! defined(NO_MAPALERT) && defined(MAPALERT_OPTION) 127# if ! defined(NO_MAPALERT) && defined(MAPALERT_OPTION)
128 BOOL (Rs_mapAlert, "mapAlert", NULL, Opt_mapAlert, NULL), 128 BOOL (Rs_mapAlert, "mapAlert", NULL, Opt_mapAlert, 0, NULL),
129# endif 129# endif
130#endif 130#endif
131#ifdef META8_OPTION 131#ifdef META8_OPTION
132 BOOL (Rs_meta8, "meta8", NULL, Opt_meta8, NULL), 132 BOOL (Rs_meta8, "meta8", NULL, Opt_meta8, 0, NULL),
133#endif 133#endif
134#ifdef MOUSE_WHEEL 134#ifdef MOUSE_WHEEL
135 BOOL (Rs_mouseWheelScrollPage, "mouseWheelScrollPage", NULL, Opt_mouseWheelScrollPage, NULL), 135 BOOL (Rs_mouseWheelScrollPage, "mouseWheelScrollPage", NULL, Opt_mouseWheelScrollPage, 0, NULL),
136#endif 136#endif
137#if ENABLE_FRILLS 137#if ENABLE_FRILLS
138 BOOL (Rs_tripleclickwords, "tripleclickwords", "tcw", Opt_tripleclickwords, "triple click word selection"), 138 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"), 139 BOOL (Rs_insecure, "insecure", "insecure", Opt_insecure, 0, "enable possibly insecure escape sequences"),
140 BOOL (Rs_cursorUnderline, "cursorUnderline", "uc", Opt_cursorUnderline, "underline cursor"), 140 BOOL (Rs_cursorUnderline, "cursorUnderline", "uc", Opt_cursorUnderline, 0, "underline cursor"),
141#endif 141#endif
142#if CURSOR_BLINK 142#if CURSOR_BLINK
143 BOOL (Rs_cursorBlink, "cursorBlink", "bc", Opt_cursorBlink, "blinking cursor"), 143 BOOL (Rs_cursorBlink, "cursorBlink", "bc", Opt_cursorBlink, 0, "blinking cursor"),
144#endif 144#endif
145#ifdef POINTER_BLANK 145#ifdef POINTER_BLANK
146 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"),
147#endif 147#endif
148 STRG (Rs_color + Color_bg, "background", "bg", "color", "background color"), 148 STRG (Rs_color + Color_bg, "background", "bg", "color", "background color"),
149 STRG (Rs_color + Color_fg, "foreground", "fg", "color", "foreground color"), 149 STRG (Rs_color + Color_fg, "foreground", "fg", "color", "foreground color"),
150 RSTRG (Rs_color + minCOLOR + 0, "color0", "color"), 150 RSTRG (Rs_color + minCOLOR + 0, "color0", "color"),
151 RSTRG (Rs_color + minCOLOR + 1, "color1", "color"), 151 RSTRG (Rs_color + minCOLOR + 1, "color1", "color"),
… …
166#ifndef NO_BOLD_UNDERLINE_REVERSE 166#ifndef NO_BOLD_UNDERLINE_REVERSE
167 RSTRG (Rs_color + Color_BD, "colorBD", "color"), 167 RSTRG (Rs_color + Color_BD, "colorBD", "color"),
168 RSTRG (Rs_color + Color_IT, "colorIT", "color"), 168 RSTRG (Rs_color + Color_IT, "colorIT", "color"),
169 RSTRG (Rs_color + Color_UL, "colorUL", "color"), 169 RSTRG (Rs_color + Color_UL, "colorUL", "color"),
170 RSTRG (Rs_color + Color_RV, "colorRV", "color"), 170 RSTRG (Rs_color + Color_RV, "colorRV", "color"),
171#endif /* ! NO_BOLD_UNDERLINE_REVERSE */ 171#endif /* ! NO_BOLD_UNDERLINE_REVERSE */
172#if ENABLE_FRILLS 172#if ENABLE_FRILLS
173 RSTRG (Rs_color + Color_underline, "underlineColor", "color"), 173 RSTRG (Rs_color + Color_underline, "underlineColor", "color"),
174#endif 174#endif
175#ifdef KEEP_SCROLLCOLOR
176 RSTRG (Rs_color + Color_scroll, "scrollColor", "color"), 175 RSTRG (Rs_color + Color_scroll, "scrollColor", "color"),
176#ifdef RXVT_SCROLLBAR
177 RSTRG (Rs_color + Color_trough, "troughColor", "color"), 177 RSTRG (Rs_color + Color_trough, "troughColor", "color"),
178#endif /* KEEP_SCROLLCOLOR */ 178#endif
179#ifdef OPTION_HC 179#ifdef OPTION_HC
180 STRG (Rs_color + Color_HC, "highlightColor", "hc", "color", "highlight color"), 180 STRG (Rs_color + Color_HC, "highlightColor", "hc", "color", "highlight color"),
181 RSTRG (Rs_color + Color_HTC, "highlightTextColor", "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"),
194# if ENABLE_EWMH
195 STRG (Rs_iconfile, "iconFile", "icon", "file", "path to application icon image"),
196# endif
193#endif 197#endif
194 /* fonts: command-line option = resource name */ 198 /* fonts: command-line option = resource name */
195 STRG (Rs_font, "font", "fn", "fontname", "normal text font"), 199 STRG (Rs_font, "font", "fn", "fontname", "normal text font"),
196#if ENABLE_STYLES 200#if ENABLE_STYLES
197 STRG (Rs_boldFont, "boldFont", "fb", "fontname", "bold font"), 201 STRG (Rs_boldFont, "boldFont", "fb", "fontname", "bold font"),
198 STRG (Rs_italicFont, "italicFont", "fi", "fontname", "italic font"), 202 STRG (Rs_italicFont, "italicFont", "fi", "fontname", "italic font"),
199 STRG (Rs_boldItalicFont, "boldItalicFont", "fbi", "fontname", "bold italic font"), 203 STRG (Rs_boldItalicFont, "boldItalicFont", "fbi", "fontname", "bold italic font"),
200 BOOL (Rs_intensityStyles, "intensityStyles", "is", Opt_intensityStyles, "font styles imply intensity changes"), 204 BOOL (Rs_intensityStyles, "intensityStyles", "is", Opt_intensityStyles, 0, "font styles imply intensity changes"),
201#endif 205#endif
202#ifdef USE_XIM 206#ifdef USE_XIM
203 STRG (Rs_inputMethod, "inputMethod", "im", "name", "name of input method"), 207 STRG (Rs_inputMethod, "inputMethod", "im", "name", "name of input method"),
204 STRG (Rs_preeditType, "preeditType", "pt", "style", "input style: style = OverTheSpot|OffTheSpot|Root"), 208 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"), 209 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"), 210 STRG (Rs_imFont, "imFont", "imfont", "fontname", "fontset for styles OverTheSpot and OffTheSpot"),
207#endif /* USE_XIM */ 211#endif /* USE_XIM */
208 STRG (Rs_name, NULL, "name", "string", "client instance, icon, and title strings"), 212 STRG (Rs_name, NULL, "name", "string", "client instance, icon, and title strings"),
209 STRG (Rs_title, "title", "title", "string", "title name for window"), 213 STRG (Rs_title, "title", "title", "string", "title name for window"),
210 STRG (Rs_title, NULL, "T", NULL, NULL), /* short form */ 214 STRG (Rs_title, NULL, "T", NULL, NULL), /* short form */
211 STRG (Rs_iconName, "iconName", "n", "string", "icon name for window"), 215 STRG (Rs_iconName, "iconName", "n", "string", "icon name for window"),
212 STRG (Rs_saveLines, "saveLines", "sl", "number", "number of scrolled lines to save"), 216 STRG (Rs_saveLines, "saveLines", "sl", "number", "number of scrolled lines to save"),
213#if ENABLE_XEMBED 217#if ENABLE_XEMBED
214 STRG (Rs_embed, NULL, "embed", "windowid", "window id to embed terminal in"), 218 STRG (Rs_embed, NULL, "embed", "windowid", "window id to embed terminal in"),
215#endif 219#endif
220#if XFT
221 STRG (Rs_depth, "depth", "depth", "number", "depth of visual to request"),
222 BOOL (Rs_buffered, "buffered", NULL, Opt_buffered, 0, NULL),
223#endif
216#if ENABLE_FRILLS 224#if ENABLE_FRILLS
217 RSTRG (Rs_transient_for, "transient-for", "windowid"), 225 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"), 226 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"), 227 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"), 228 BOOL (Rs_hold, "hold", "hold", Opt_hold, 0, "retain window after shell exit"),
221 STRG (Rs_depth, "depth", "depth", "number", "depth of visual to request"),
222 STRG (Rs_ext_bwidth, "externalBorder", "w", "number", "external border in pixels"), 229 STRG (Rs_ext_bwidth, "externalBorder", "w", "number", "external border in pixels"),
223 STRG (Rs_ext_bwidth, NULL, "bw", NULL, NULL), 230 STRG (Rs_ext_bwidth, NULL, "bw", NULL, NULL),
224 STRG (Rs_ext_bwidth, NULL, "borderwidth", NULL, NULL), 231 STRG (Rs_ext_bwidth, NULL, "borderwidth", NULL, NULL),
225 STRG (Rs_int_bwidth, "internalBorder", "b", "number", "internal border in pixels"), 232 STRG (Rs_int_bwidth, "internalBorder", "b", "number", "internal border in pixels"),
226 BOOL (Rs_borderLess, "borderLess", "bl", Opt_borderLess, "borderless window"), 233 BOOL (Rs_borderLess, "borderLess", "bl", Opt_borderLess, 0, "borderless window"),
227 BOOL (Rs_skipBuiltinGlyphs, "skipBuiltinGlyphs", "sbg", Opt_skipBuiltinGlyphs, "do not use internal glyphs"),
228 STRG (Rs_lineSpace, "lineSpace", "lsp", "number", "number of extra pixels between rows"), 234 STRG (Rs_lineSpace, "lineSpace", "lsp", "number", "number of extra pixels between rows"),
235 STRG (Rs_letterSpace, "letterSpace", "letsp", "number", "letter spacing adjustment"),
236#endif
237#ifdef BUILTIN_GLYPHS
238 BOOL (Rs_skipBuiltinGlyphs, "skipBuiltinGlyphs", "sbg", Opt_skipBuiltinGlyphs, 0, "do not use internal glyphs"),
229#endif 239#endif
230#ifdef POINTER_BLANK 240#ifdef POINTER_BLANK
231 RSTRG (Rs_pointerBlankDelay, "pointerBlankDelay", "number"), 241 RSTRG (Rs_pointerBlankDelay, "pointerBlankDelay", "number"),
232#endif 242#endif
233#ifndef NO_BACKSPACE_KEY 243#ifndef NO_BACKSPACE_KEY
234 RSTRG (Rs_backspace_key, "backspacekey", "string"), 244 RSTRG (Rs_backspace_key, "backspacekey", "string"),
235#endif 245#endif
236#ifndef NO_DELETE_KEY 246#ifndef NO_DELETE_KEY
237 RSTRG (Rs_delete_key, "deletekey", "string"), 247 RSTRG (Rs_delete_key, "deletekey", "string"),
238#endif 248#endif
239 RSTRG (Rs_selectstyle, "selectstyle", "mode"),
240#ifdef PRINTPIPE 249#ifdef PRINTPIPE
241 RSTRG (Rs_print_pipe, "print-pipe", "string"), 250 RSTRG (Rs_print_pipe, "print-pipe", "string"),
242#endif 251#endif
243 STRG (Rs_modifier, "modifier", "mod", "modifier", "meta modifier = alt|meta|hyper|super|mod1|...|mod5"), 252 STRG (Rs_modifier, "modifier", "mod", "modifier", "meta modifier = alt|meta|hyper|super|mod1|...|mod5"),
244#ifdef CUTCHAR_RESOURCE
245 RSTRG (Rs_cutchars, "cutchars", "string"), 253 RSTRG (Rs_cutchars, "cutchars", "string"),
246#endif /* CUTCHAR_RESOURCE */
247 RSTRG (Rs_answerbackstring, "answerbackString", "string"), 254 RSTRG (Rs_answerbackstring, "answerbackString", "string"),
248#ifndef NO_SECONDARY_SCREEN 255#ifndef NO_SECONDARY_SCREEN
249 BOOL (Rs_secondaryScreen, "secondaryScreen", "ssc", Opt_secondaryScreen, "enable secondary screen"), 256 BOOL (Rs_secondaryScreen, "secondaryScreen", "ssc", Opt_secondaryScreen, 0, "enable secondary screen"),
250 BOOL (Rs_secondaryScroll, "secondaryScroll", "ssr", Opt_secondaryScroll, "enable secondary screen scroll"), 257 BOOL (Rs_secondaryScroll, "secondaryScroll", "ssr", Opt_secondaryScroll, 0, "enable secondary screen scroll"),
251#endif 258#endif
252#if ENABLE_PERL 259#if ENABLE_PERL
253 RSTRG (Rs_perl_lib, "perl-lib", "string"), //, "colon-separated directories with extension scripts"),TODO 260 RSTRG (Rs_perl_lib, "perl-lib", "string"), //, "colon-separated directories with extension scripts"),TODO
254 RSTRG (Rs_perl_eval, "perl-eval", "perl-eval"), // "string", "code to be evaluated after all extensions have been loaded"),TODO 261 RSTRG (Rs_perl_eval, "perl-eval", "perl-eval"), // "string", "code to be evaluated after all extensions have been loaded"),TODO
255 RSTRG (Rs_perl_ext_1, "perl-ext-common", "string"), //, "colon-separated list of perl extensions to enable"),TODO 262 RSTRG (Rs_perl_ext_1, "perl-ext-common", "string"), //, "colon-separated list of perl extensions to enable"),TODO
256 STRG (Rs_perl_ext_2, "perl-ext", "pe", "string", "colon-separated list of perl extensions to enable for this instance"), 263 STRG (Rs_perl_ext_2, "perl-ext", "pe", "string", "colon-separated list of perl extensions to enable for this instance"),
257#endif 264#endif
258#ifndef NO_RESOURCES 265#if ISO_14755
259 INFO ("xrm", "string", "X resource"), 266 BOOL (Rs_iso14755, "iso14755", NULL, Opt_iso14755, 0, NULL),
267 BOOL (Rs_iso14755_52, "iso14755_52", NULL, Opt_iso14755_52, 0, NULL),
268#endif
269#ifdef HAVE_AFTERIMAGE
270 STRG (Rs_blendtype, "blendType", "blt", "string", "background image blending type - alpha, tint, etc..."),
260#endif 271#endif
261 INFO ("e", "command arg ...", "command to execute") 272 INFO ("e", "command arg ...", "command to execute")
262 }; 273 };
263 274
264#undef INFO 275#undef INFO
265#undef STRG 276#undef STRG
266#undef RSTRG 277#undef RSTRG
267#undef SWCH 278#undef SWCH
268#undef BOOL 279#undef BOOL
269/*}}} */
270 280
271static const char releasestring[] = "rxvt-unicode (" RXVTNAME ") v" VERSION " - released: " DATE "\n"; 281static const char releasestring[] = "rxvt-unicode (" RXVTNAME ") v" VERSION " - released: " DATE "\n";
272static const char optionsstring[] = "options: " 282static const char optionsstring[] = "options: "
273#if ENABLE_PERL 283#if ENABLE_PERL
274 "perl," 284 "perl,"
… …
309#endif 319#endif
310 "," 320 ","
311#if OFF_FOCUS_FADING 321#if OFF_FOCUS_FADING
312 "fade," 322 "fade,"
313#endif 323#endif
314#if defined(XPM_BACKGROUND)
315 "XPM,"
316#endif
317#if defined(TRANSPARENT) 324#if defined(ENABLE_TRANSPARENCY)
318 "transparent," 325 "transparent,"
319#endif
320#if TINTING
321 "tint," 326 "tint,"
327#endif
328#if HAVE_AFTERIMAGE
329 "afterimage,"
330#endif
331#if HAVE_PIXBUF
332 "pixbuf,"
322#endif 333#endif
323#if defined(USE_XIM) 334#if defined(USE_XIM)
324 "XIM," 335 "XIM,"
325#endif 336#endif
326 "scrollbars="
327#if !defined(HAVE_SCROLLBARS)
328 "NONE"
329#else
330# if defined(PLAIN_SCROLLBAR)
331 "plain"
332# if defined(RXVT_SCROLLBAR) || defined(NEXT_SCROLLBAR) || defined(XTERM_SCROLLBAR)
333 "+"
334# endif
335# endif
336# if defined(RXVT_SCROLLBAR)
337 "rxvt"
338# if defined(NEXT_SCROLLBAR) || defined(XTERM_SCROLLBAR)
339 "+"
340# endif
341# endif
342# if defined(NEXT_SCROLLBAR)
343 "NeXT"
344# if defined(XTERM_SCROLLBAR)
345 "+"
346# endif
347# endif
348# if defined(XTERM_SCROLLBAR)
349 "xterm"
350# endif
351#endif
352 ","
353#if defined(NO_BACKSPACE_KEY) 337#if defined(NO_BACKSPACE_KEY)
354 "no_backspace," 338 "no_backspace,"
355#endif 339#endif
356#if defined(NO_DELETE_KEY) 340#if defined(NO_DELETE_KEY)
357 "no_delete," 341 "no_delete,"
… …
379#endif 363#endif
380#if defined(POINTER_BLANK) 364#if defined(POINTER_BLANK)
381 "pointerBlank," 365 "pointerBlank,"
382#endif 366#endif
383#if defined(NO_RESOURCES) 367#if defined(NO_RESOURCES)
384 "NoResources" 368 "NoResources,"
369#endif
370 "scrollbars=plain"
371#if defined(RXVT_SCROLLBAR)
372 "+rxvt"
373#endif
374#if defined(NEXT_SCROLLBAR)
375 "+NeXT"
376#endif
377#if defined(XTERM_SCROLLBAR)
378 "+xterm"
385#endif 379#endif
386 "\nUsage: "; /* Usage */ 380 "\nUsage: "; /* Usage */
387 381
388#define INDENT 18 382#define INDENT 18
383
384const char rxvt_term::resval_undef [] = "<undef>";
385const char rxvt_term::resval_on [] = "on";
386const char rxvt_term::resval_off [] = "off";
389 387
390/*{{{ usage: */ 388/*{{{ usage: */
391/*----------------------------------------------------------------------*/ 389/*----------------------------------------------------------------------*/
392static void 390static void
393rxvt_usage (int type) 391rxvt_usage (int type)
… …
399 switch (type) 397 switch (type)
400 { 398 {
401 case 0: /* brief listing */ 399 case 0: /* brief listing */
402 rxvt_log (" [-help] [--help]\n"); 400 rxvt_log (" [-help] [--help]\n");
403 401
404 for (col = 1, i = 0; i < optList_size; i++) 402 for (col = 1, i = 0; i < ecb_array_length (optList); i++)
405 if (optList[i].desc != NULL) 403 if (optList[i].desc != NULL)
406 { 404 {
407 int len = 0; 405 int len = 0;
408 406
409 if (!optList_isBool (i)) 407 if (optList[i].arg)
410 { 408 len = strlen (optList[i].arg) + 1;
411 len = optList_strlen (i);
412 if (len > 0)
413 len++; /* account for space */
414 }
415#ifdef DEBUG_STRICT
416 assert (optList[i].opt != NULL); 409 assert (optList[i].opt != NULL);
417#endif
418 len += 4 + strlen (optList[i].opt) + (optList_isBool (i) ? 2: 0); 410 len += 4 + strlen (optList[i].opt) + (optList_isBool (i) ? 2 : 0);
419 col += len; 411 col += len;
420 if (col > 79) 412 if (col > 79)
413 {
421 { /* assume regular width */ 414 /* assume regular width */
422 rxvt_log ("\n"); 415 rxvt_log ("\n");
423 col = 1 + len; 416 col = 1 + len;
424 } 417 }
425 418
426 rxvt_log (" [-%s%s", (optList_isBool (i) ? "/+" : ""), optList[i].opt); 419 rxvt_log (" [-%s%s", (optList_isBool (i) ? "/+" : ""), optList[i].opt);
427 if (optList_strlen (i)) 420 if (optList[i].arg)
428 rxvt_log (" %s]", optList[i].arg); 421 rxvt_log (" %s]", optList[i].arg);
429 else 422 else
430 rxvt_log ("]"); 423 rxvt_log ("]");
431 } 424 }
432 break; 425 break;
433 426
434 case 1: /* full command-line listing */ 427 case 1: /* full command-line listing */
435 rxvt_log (" [options] [-e command args]\n\nwhere options include:\n"); 428 rxvt_log (" [options] [-e command args]\n\nwhere options include:\n");
436 429
437 for (i = 0; i < optList_size; i++) 430 for (i = 0; i < ecb_array_length (optList); i++)
438 if (optList[i].desc != NULL) 431 if (optList[i].desc != NULL)
439 { 432 {
440#ifdef DEBUG_STRICT
441 assert (optList[i].opt != NULL); 433 assert (optList[i].opt != NULL);
442#endif
443 rxvt_log (" %s%s %-*s%s%s\n", 434 rxvt_log (" %s%s %-*s%s%s\n",
444 (optList_isBool (i) ? "-/+" : "-"), optList[i].opt, 435 (optList_isBool (i) ? "-/+" : "-"), optList[i].opt,
445 (INDENT - strlen (optList[i].opt) 436 (INDENT - strlen (optList[i].opt)
446 + (optList_isBool (i) ? 0 : 2)), 437 + (optList_isBool (i) ? 0 : 2)),
447 (optList[i].arg ? optList[i].arg : ""), 438 (optList[i].arg ? optList[i].arg : ""),
… …
453 444
454 case 2: /* full resource listing */ 445 case 2: /* full resource listing */
455 rxvt_log (" [options] [-e command args]\n\n" 446 rxvt_log (" [options] [-e command args]\n\n"
456 "where resources (long-options) include:\n"); 447 "where resources (long-options) include:\n");
457 448
458 for (i = 0; i < optList_size; i++) 449 for (i = 0; i < ecb_array_length (optList); i++)
459 if (optList[i].kw != NULL) 450 if (optList[i].kw != NULL)
460 rxvt_log (" %s: %*s%s\n", 451 rxvt_log (" %s: %*s%s\n",
461 optList[i].kw, 452 optList[i].kw,
462 (INDENT - strlen (optList[i].kw)), "", /* XXX */ 453 (INDENT - strlen (optList[i].kw)), "", /* XXX */
463 (optList_isBool (i) ? "boolean" : optList[i].arg)); 454 (optList_isBool (i) ? "boolean" : optList[i].arg));
… …
470 break; 461 break;
471 } 462 }
472 463
473 rxvt_log ("\n\n"); 464 rxvt_log ("\n\n");
474 rxvt_exit_failure (); 465 rxvt_exit_failure ();
475 /* NOTREACHED */
476} 466}
477 467
478/*}}} */ 468/*}}} */
479 469
480/*{{{ get command-line options before getting resources */ 470/*{{{ get command-line options before getting resources */
481void 471void
482rxvt_term::get_options (int argc, const char *const *argv) 472rxvt_term::get_options (int argc, const char *const *argv)
483{ 473{
484 int i, bad_option = 0; 474 int i, bad_option = 0;
485 static const char On[3] = "ON", Off[4] = "OFF";
486 475
487 for (i = 1; i < argc; i++) 476 for (i = 1; i < argc; i++)
488 { 477 {
489 unsigned int entry, longopt = 0; 478 unsigned int entry, longopt = 0;
490 const char *flag, *opt; 479 const char *opt;
480 int flag;
491 481
492 opt = argv[i]; 482 opt = argv[i];
493 483
494 if (*opt == '-') 484 if (*opt == '-')
495 { 485 {
496 flag = On; 486 flag = 1;
487
497 if (*++opt == '-') 488 if (*++opt == '-')
498 longopt = *opt++; /* long option */ 489 longopt = *opt++; /* long option */
499 } 490 }
500 else if (*opt == '+') 491 else if (*opt == '+')
501 { 492 {
502 flag = Off; 493 flag = 0;
494
503 if (*++opt == '+') 495 if (*++opt == '+')
504 longopt = *opt++; /* long option */ 496 longopt = *opt++; /* long option */
505 } 497 }
506 else 498 else
507 { 499 {
… …
510 continue; 502 continue;
511 } 503 }
512 504
513 if (!strcmp (opt, "help")) 505 if (!strcmp (opt, "help"))
514 rxvt_usage (longopt ? 2 : 1); 506 rxvt_usage (longopt ? 2 : 1);
507
515 if (!strcmp (opt, "h")) 508 if (!strcmp (opt, "h"))
516 rxvt_usage (0); 509 rxvt_usage (0);
517 510
518 /* feature: always try to match long-options */ 511 /* feature: always try to match long-options */
519 for (entry = 0; entry < optList_size; entry++) 512 for (entry = 0; entry < ecb_array_length (optList); entry++)
520 if ((optList[entry].kw && !strcmp (opt, optList[entry].kw)) 513 if ((optList[entry].kw && !strcmp (opt, optList[entry].kw))
521 || (!longopt 514 || (!longopt
522 && optList[entry].opt && !strcmp (opt, optList[entry].opt))) 515 && optList[entry].opt && !strcmp (opt, optList[entry].opt)))
523 break; 516 break;
524 517
525 if (entry < optList_size) 518 if (entry < ecb_array_length (optList))
526 { 519 {
527 if (optList_isReverse (entry)) 520 if (optList_isReverse (entry))
528 flag = flag == On ? Off : On; 521 flag = !flag;
529 522
530 if (optList_strlen (entry)) 523 if (optList_isString (entry))
531 { 524 {
532 /* 525 /*
533 * special cases are handled in main.c:main () to allow 526 * special cases are handled in init_resources () to allow
534 * X resources to set these values before we settle for 527 * X resources to set these values before we settle for
535 * default values 528 * default values
536 */ 529 */
537 530
538 if (optList[entry].doff != -1) 531 if (optList[entry].doff != -1)
532 {
533 if (flag && i+1 == argc)
534 rxvt_fatal ("option '%s' requires an argument, aborting.\n", argv [i]);
535
539 rs[optList[entry].doff] = flag == On && argv[i+1] 536 rs[optList[entry].doff] = flag ? argv[++i] : resval_undef;
540 ? argv[++i] : 0; 537 }
541 } 538 }
542 else 539 else
540 {
543 { /* boolean value */ 541 /* boolean value */
544 set_option (optList[entry].flag & Optflag_mask, flag == On); 542 set_option (optList[entry].index, flag);
545 543
546 if (optList[entry].doff != -1) 544 if (optList[entry].doff != -1)
547 rs[optList[entry].doff] = flag; 545 rs[optList[entry].doff] = flag ? resval_on : resval_off;
548 } 546 }
549 } 547 }
548#ifndef NO_RESOURCES
549 else if (!strcmp (opt, "xrm"))
550 {
551 if (i+1 < argc)
552 XrmPutLineResource (&option_db, argv[++i]);
553 }
554#endif
555#ifdef KEYSYM_RESOURCE
556 else if (!strncmp (opt, "keysym.", sizeof ("keysym.") - 1))
557 {
558 if (i+1 < argc)
559 {
560 char *res = rxvt_temp_buf<char> (strlen (opt) + strlen (argv[++i]) + 6);
561 sprintf (res, "*.%s: %s\n", opt, argv[i]);
562 XrmPutLineResource (&option_db, res);
563 }
564 }
565#endif
550 else 566 else
551#ifdef KEYSYM_RESOURCE
552 /* if (!strncmp (opt, "keysym.", sizeof ("keysym.") - 1)) */
553 if (rxvt_Str_match (opt, "keysym."))
554 { 567 {
555 const char *str = argv[++i];
556
557 if (str != NULL)
558 parse_keysym (opt + sizeof ("keysym.") - 1, str);
559 }
560 else
561#endif
562 {
563 bad_option = 1; 568 bad_option = 1;
564 rxvt_warn ("\"%s\": unknown or malformed option.\n", opt); 569 rxvt_warn ("\"%s\": unknown or malformed option.\n", opt);
565 } 570 }
566 } 571 }
567 572
568 if (bad_option) 573 if (bad_option)
569 rxvt_usage (0); 574 rxvt_usage (0);
570} 575}
… …
579 * Define key from XrmEnumerateDatabase. 584 * Define key from XrmEnumerateDatabase.
580 * quarks will be something like 585 * quarks will be something like
581 * "rxvt" "keysym" "0xFF01" 586 * "rxvt" "keysym" "0xFF01"
582 * value will be a string 587 * value will be a string
583 */ 588 */
584/* ARGSUSED */ 589static int
585int
586rxvt_define_key (XrmDatabase *database UNUSED, 590rxvt_define_key (XrmDatabase *database ecb_unused,
587 XrmBindingList bindings UNUSED, 591 XrmBindingList bindings ecb_unused,
588 XrmQuarkList quarks, 592 XrmQuarkList quarks,
589 XrmRepresentation *type UNUSED, 593 XrmRepresentation *type ecb_unused,
590 XrmValue *value, 594 XrmValue *value,
591 XPointer closure UNUSED) 595 XPointer closure ecb_unused)
592{ 596{
593 int last; 597 int last;
594 598
595 for (last = 0; quarks[last] != NULLQUARK; last++) /* look for last quark in list */ 599 for (last = 0; quarks[last] != NULLQUARK; last++) /* look for last quark in list */
596 ; 600 ;
… …
601} 605}
602 606
603/* 607/*
604 * look for something like this (XK_Delete) 608 * look for something like this (XK_Delete)
605 * rxvt*keysym.0xFFFF: "\177" 609 * rxvt*keysym.0xFFFF: "\177"
606 *
607 * arg will be
608 * NULL for ~/.Xdefaults and
609 * non-NULL for command-line options (need to allocate)
610 */ 610 */
611#define NEWARGLIM 500 /* `reasonable' size */
612 611
613struct keysym_vocabulary_t 612struct keysym_vocabulary_t
614{ 613{
615 const char *name; 614 const char *name;
616 unsigned short len; 615 unsigned short len;
617 unsigned short value; 616 unsigned short value;
618}; 617};
619keysym_vocabulary_t keysym_vocabulary[] = 618static const keysym_vocabulary_t keysym_vocabulary[] =
620{ 619{
621 { "ISOLevel3", 9, Level3Mask }, 620 { "ISOLevel3", 9, Level3Mask },
622 { "AppKeypad", 9, AppKeypadMask }, 621 { "AppKeypad", 9, AppKeypadMask },
623 { "Control", 7, ControlMask }, 622 { "Control", 7, ControlMask },
624 { "NumLock", 7, NumLockMask }, 623 { "NumLock", 7, NumLockMask },
… …
646}; 645};
647 646
648int 647int
649rxvt_term::parse_keysym (const char *str, const char *arg) 648rxvt_term::parse_keysym (const char *str, const char *arg)
650{ 649{
651 int n, sym; 650 int sym;
652 unsigned int state = 0; 651 unsigned int state = 0;
653 const char *pmodend = NULL; 652 const char *key = strrchr (str, '-');
654 char *newarg = NULL;
655 char newargstr[NEWARGLIM];
656 653
657 if (arg == NULL) 654 if (!key)
658 { 655 key = str;
659 if ((n = rxvt_Str_match (str, "keysym.")) == 0)
660 return 0;
661
662 str += n; /* skip `keysym.' */
663 if (!(pmodend = strchr (str, ':')))
664 return -1;
665 }
666 else 656 else
667 pmodend = str + strlen(str); 657 key++;
668 658
669 for (--pmodend; str < pmodend; --pmodend) 659 // string or key is empty
670 if (*pmodend == '-') 660 if (*arg == '\0' || *key == '\0')
671 break; 661 return -1;
672 662
663 // parse modifiers
673 while (str < pmodend) 664 while (str < key)
674 { 665 {
675 unsigned int i; 666 unsigned int i;
676 667
677 for (i=0; i < sizeof (keysym_vocabulary) / sizeof (keysym_vocabulary_t); ++i) 668 for (i = 0; i < ecb_array_length (keysym_vocabulary); ++i)
678 { 669 {
679 if (strncmp (str, keysym_vocabulary [i].name, keysym_vocabulary [i].len) == 0) 670 if (strncmp (str, keysym_vocabulary [i].name, keysym_vocabulary [i].len) == 0)
680 { 671 {
681 state |= keysym_vocabulary[i].value; 672 state |= keysym_vocabulary[i].value;
682 str += keysym_vocabulary[i].len; 673 str += keysym_vocabulary[i].len;
683 break; 674 break;
684 } 675 }
685 } 676 }
686 677
687 if (i >= sizeof (keysym_vocabulary) / sizeof (keysym_vocabulary_t)) 678 if (i >= ecb_array_length (keysym_vocabulary))
688 return -1; 679 return -1;
689 680
690 if (*str == '-') 681 if (*str == '-')
691 ++str; 682 ++str;
692 } 683 }
693 684
694 /* some scanf () have trouble with a 0x prefix */ 685 // convert keysym name to keysym number
695 if (str[0] == '0' && toupper (str[1]) == 'X') 686 if ((sym = XStringToKeysym (str)) == None)
696 { 687 {
697 str += 2; 688 // fallback on hexadecimal parsing
698 689 char *end;
690 sym = strtol (str, &end, 16);
699 if (arg) 691 if (*end)
700 {
701 if (sscanf (str, (strchr (str, ':') ? "%x:" : "%x"), &sym) != 1)
702 return -1;
703 }
704 else
705 {
706 if (sscanf (str, "%x:", &sym) != 1)
707 return -1;
708
709 /* cue to ':', it's there since sscanf () worked */
710 strncpy (newargstr, strchr (str, ':') + 1, NEWARGLIM - 1);
711 newargstr[NEWARGLIM - 1] = '\0';
712 newarg = newargstr;
713 }
714 }
715 else
716 {
717 /*
718 * convert keysym name to keysym number
719 */
720 strncpy (newargstr, str, NEWARGLIM - 1);
721 newargstr[NEWARGLIM - 1] = '\0';
722
723 if (arg == NULL)
724 {
725 if ((newarg = strchr (newargstr, ':')) == NULL)
726 return -1;
727
728 *newarg++ = '\0'; /* terminate keysym name */
729 }
730
731 if ((sym = XStringToKeysym (newargstr)) == None)
732 return -1; 692 return -1;
733 } 693 }
734 694
735 if (newarg == NULL)
736 {
737 strncpy (newargstr, arg, NEWARGLIM - 1);
738 newargstr[NEWARGLIM - 1] = '\0';
739 newarg = newargstr;
740 }
741
742 rxvt_Str_trim (newarg);
743 if (*newarg == '\0' || (n = rxvt_Str_escaped (newarg)) == 0)
744 return -1;
745
746 keyboard->register_user_translation (sym, state, newarg); 695 keyboard->register_user_translation (sym, state, arg);
747 return 1; 696 return 1;
748} 697}
749 698
750# endif /* KEYSYM_RESOURCE */ 699# endif /* KEYSYM_RESOURCE */
751#endif /* NO_RESOURCES */ 700#endif /* NO_RESOURCES */
752 701
753static char * 702static char *
754get_res (XrmDatabase database, const char *program, const char *option) 703get_res (XrmDatabase database, const char *program, const char *option)
755{ 704{
756 char resource[512]; 705 char resource[512];
… …
764} 713}
765 714
766const char * 715const char *
767rxvt_term::x_resource (const char *name) 716rxvt_term::x_resource (const char *name)
768{ 717{
769 XrmDatabase database = XrmGetDatabase (xdisp); 718 XrmDatabase database = XrmGetDatabase (dpy);
770 719
771 const char *p = get_res (database, rs[Rs_name], name); 720 const char *p = get_res (database, rs[Rs_name], name);
772 const char *p0 = get_res (database, "!INVALIDPROGRAMMENAMEDONTMATCH!", name); 721 const char *p0 = get_res (database, "!INVALIDPROGRAMMENAMEDONTMATCH!", name);
773 722
774 if (p == NULL || (p0 && strcmp (p, p0) == 0)) 723 if (p == NULL || (p0 && strcmp (p, p0) == 0))
… …
788 737
789void 738void
790rxvt_term::extract_resources () 739rxvt_term::extract_resources ()
791{ 740{
792#ifndef NO_RESOURCES 741#ifndef NO_RESOURCES
742 XrmDatabase database = XrmGetDatabase (dpy);
743 XrmMergeDatabases (option_db, &database);
744 option_db = NULL;
793 /* 745 /*
794 * Query resources for options that affect us 746 * Query resources for options that affect us
795 */ 747 */
796 for (int entry = 0; entry < optList_size; entry++) 748 for (int entry = 0; entry < ecb_array_length (optList); entry++)
797 { 749 {
798 int s; 750 int s;
799 const char *kw = optList[entry].kw; 751 const char *kw = optList[entry].kw;
800 752
801 if (kw == NULL || rs[optList[entry].doff] != NULL) 753 if (kw == NULL || rs[optList[entry].doff] != NULL)
… …
817 || strcasecmp (p, "1") == 0; 769 || strcasecmp (p, "1") == 0;
818 770
819 if (optList_isReverse (entry)) 771 if (optList_isReverse (entry))
820 s = !s; 772 s = !s;
821 773
822 set_option (optList[entry].flag & Optflag_mask, s); 774 set_option (optList[entry].index, s);
823 } 775 }
824 } 776 }
825 } 777 }
826 778
827 /* 779 /*
828 * [R5 or later]: enumerate the resource database 780 * [R5 or later]: enumerate the resource database
829 */ 781 */
830# ifdef KEYSYM_RESOURCE 782# ifdef KEYSYM_RESOURCE
831 XrmDatabase database = XrmGetDatabase (xdisp);
832 XrmName name_prefix[3]; 783 XrmName name_prefix[3];
833 XrmClass class_prefix[3]; 784 XrmClass class_prefix[3];
834 785
835 name_prefix[0] = XrmStringToName (rs[Rs_name]); 786 name_prefix[0] = XrmStringToName (rs[Rs_name]);
836 name_prefix[1] = XrmStringToName ("keysym"); 787 name_prefix[1] = XrmStringToName ("keysym");
… …
840 class_prefix[2] = NULLQUARK; 791 class_prefix[2] = NULLQUARK;
841 /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */ 792 /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */
842 XrmEnumerateDatabase (database, name_prefix, class_prefix, 793 XrmEnumerateDatabase (database, name_prefix, class_prefix,
843 XrmEnumOneLevel, rxvt_define_key, NULL); 794 XrmEnumOneLevel, rxvt_define_key, NULL);
844# ifdef RESFALLBACK 795# ifdef RESFALLBACK
845 name_prefix[0] = XrmStringToName (RESFALLBACK);
846 name_prefix[1] = XrmStringToName ("keysym");
847 class_prefix[0] = XrmStringToName (RESFALLBACK); 796 name_prefix[0] = class_prefix[0] = XrmStringToName (RESFALLBACK);
848 class_prefix[1] = XrmStringToName ("Keysym");
849 /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */ 797 /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */
850 XrmEnumerateDatabase (database, name_prefix, class_prefix, 798 XrmEnumerateDatabase (database, name_prefix, class_prefix,
851 XrmEnumOneLevel, rxvt_define_key, NULL); 799 XrmEnumOneLevel, rxvt_define_key, NULL);
852# endif 800# endif
853# endif 801# endif
854 802
855#endif /* NO_RESOURCES */ 803#endif /* NO_RESOURCES */
856} 804}
857 805
858/*----------------------- end-of-file (C source) -----------------------*/ 806/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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