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

Diff Legend

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