ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/xdefaults.C
(Generate patch)

Comparing rxvt-unicode/src/xdefaults.C (file contents):
Revision 1.84 by root, Tue Jan 24 19:40:12 2006 UTC vs.
Revision 1.171 by sf-exg, Fri Jun 15 14:34:34 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#if 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#if 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 BOOL (Rs_buffered, "buffered", NULL, Opt_buffered, 0, NULL),
228#endif
216#if ENABLE_FRILLS 229#if ENABLE_FRILLS
230 STRG (Rs_depth, "depth", "depth", "number", "depth of visual to request"),
231 STRG (Rs_visual, "visual", "visual", "number", "visual id to request"),
217 RSTRG (Rs_transient_for, "transient-for", "windowid"), 232 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"), 233 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"), 234 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"), 235 BOOL (Rs_hold, "hold", "hold", Opt_hold, 0, "retain window after shell exit"),
221 STRG (Rs_ext_bwidth, "externalBorder", "w", "number", "external border in pixels"), 236 STRG (Rs_ext_bwidth, "externalBorder", "w", "number", "external border in pixels"),
222 STRG (Rs_ext_bwidth, NULL, "bw", NULL, NULL), 237 STRG (Rs_ext_bwidth, NULL, "bw", NULL, NULL),
223 STRG (Rs_ext_bwidth, NULL, "borderwidth", NULL, NULL), 238 STRG (Rs_ext_bwidth, NULL, "borderwidth", NULL, NULL),
224 STRG (Rs_int_bwidth, "internalBorder", "b", "number", "internal border in pixels"), 239 STRG (Rs_int_bwidth, "internalBorder", "b", "number", "internal border in pixels"),
225 BOOL (Rs_borderLess, "borderLess", "bl", Opt_borderLess, "borderless window"), 240 BOOL (Rs_borderLess, "borderLess", "bl", Opt_borderLess, 0, "borderless window"),
226 BOOL (Rs_skipBuiltinGlyphs, "skipBuiltinGlyphs", "sbg", Opt_skipBuiltinGlyphs, "do not use internal glyphs"),
227 STRG (Rs_lineSpace, "lineSpace", "lsp", "number", "number of extra pixels between rows"), 241 STRG (Rs_lineSpace, "lineSpace", "lsp", "number", "number of extra pixels between rows"),
242 STRG (Rs_letterSpace, "letterSpace", "letsp", "number", "letter spacing adjustment"),
243#endif
244#ifdef BUILTIN_GLYPHS
245 BOOL (Rs_skipBuiltinGlyphs, "skipBuiltinGlyphs", "sbg", Opt_skipBuiltinGlyphs, 0, "do not use internal glyphs"),
228#endif 246#endif
229#ifdef POINTER_BLANK 247#ifdef POINTER_BLANK
230 RSTRG (Rs_pointerBlankDelay, "pointerBlankDelay", "number"), 248 RSTRG (Rs_pointerBlankDelay, "pointerBlankDelay", "number"),
231#endif 249#endif
232#ifndef NO_BACKSPACE_KEY 250#ifndef NO_BACKSPACE_KEY
233 RSTRG (Rs_backspace_key, "backspacekey", "string"), 251 RSTRG (Rs_backspace_key, "backspacekey", "string"),
234#endif 252#endif
235#ifndef NO_DELETE_KEY 253#ifndef NO_DELETE_KEY
236 RSTRG (Rs_delete_key, "deletekey", "string"), 254 RSTRG (Rs_delete_key, "deletekey", "string"),
237#endif 255#endif
238 RSTRG (Rs_selectstyle, "selectstyle", "mode"),
239#ifdef PRINTPIPE 256#ifdef PRINTPIPE
240 RSTRG (Rs_print_pipe, "print-pipe", "string"), 257 RSTRG (Rs_print_pipe, "print-pipe", "string"),
241#endif 258#endif
242 STRG (Rs_modifier, "modifier", "mod", "modifier", "meta modifier = alt|meta|hyper|super|mod1|...|mod5"), 259 STRG (Rs_modifier, "modifier", "mod", "modifier", "meta modifier = alt|meta|hyper|super|mod1|...|mod5"),
243#ifdef CUTCHAR_RESOURCE
244 RSTRG (Rs_cutchars, "cutchars", "string"), 260 RSTRG (Rs_cutchars, "cutchars", "string"),
245#endif /* CUTCHAR_RESOURCE */
246 RSTRG (Rs_answerbackstring, "answerbackString", "string"), 261 RSTRG (Rs_answerbackstring, "answerbackString", "string"),
247#ifndef NO_SECONDARY_SCREEN 262#ifndef NO_SECONDARY_SCREEN
248 BOOL (Rs_secondaryScreen, "secondaryScreen", "ssc", Opt_secondaryScreen, "enable secondary screen"), 263 BOOL (Rs_secondaryScreen, "secondaryScreen", "ssc", Opt_secondaryScreen, 0, "enable secondary screen"),
249 BOOL (Rs_secondaryScroll, "secondaryScroll", "ssr", Opt_secondaryScroll, "enable secondary screen scroll"), 264 BOOL (Rs_secondaryScroll, "secondaryScroll", "ssr", Opt_secondaryScroll, 0, "enable secondary screen scroll"),
250#endif 265#endif
251#if ENABLE_PERL 266#if ENABLE_PERL
252 RSTRG (Rs_perl_lib, "perl-lib", "string"), //, "colon-separated directories with extension scripts"),TODO 267 RSTRG (Rs_perl_lib, "perl-lib", "string"), //, "colon-separated directories with extension scripts"),TODO
253 RSTRG (Rs_perl_eval, "perl-eval", "perl-eval"), // "string", "code to be evaluated after all extensions have been loaded"),TODO 268 RSTRG (Rs_perl_eval, "perl-eval", "perl-eval"), // "string", "code to be evaluated after all extensions have been loaded"),TODO
254 RSTRG (Rs_perl_ext_1, "perl-ext-common", "string"), //, "colon-separated list of perl extensions to enable"),TODO 269 RSTRG (Rs_perl_ext_1, "perl-ext-common", "string"), //, "colon-separated list of perl extensions to enable"),TODO
255 STRG (Rs_perl_ext_2, "perl-ext", "pe", "string", "colon-separated list of perl extensions to enable for this instance"), 270 STRG (Rs_perl_ext_2, "perl-ext", "pe", "string", "colon-separated list of perl extensions to enable for this instance"),
256#endif 271#endif
272#if ISO_14755
273 BOOL (Rs_iso14755, "iso14755", NULL, Opt_iso14755, 0, NULL),
274 BOOL (Rs_iso14755_52, "iso14755_52", NULL, Opt_iso14755_52, 0, NULL),
275#endif
257#ifndef NO_RESOURCES 276#ifndef NO_RESOURCES
258 INFO ("xrm", "string", "X resource"), 277 RINFO ("xrm", "string"),
278#endif
279#ifdef KEYSYM_RESOURCE
280 RINFO ("keysym.sym", "keysym"),
259#endif 281#endif
260 INFO ("e", "command arg ...", "command to execute") 282 INFO ("e", "command arg ...", "command to execute")
261 }; 283 };
262 284
263#undef INFO 285#undef INFO
286#undef RINFO
264#undef STRG 287#undef STRG
265#undef RSTRG 288#undef RSTRG
266#undef SWCH 289#undef SWCH
267#undef BOOL 290#undef BOOL
268/*}}} */
269 291
270static const char releasestring[] = "rxvt-unicode (" RXVTNAME ") v" VERSION " - released: " DATE "\n"; 292static const char releasestring[] = "rxvt-unicode (" RXVTNAME ") v" VERSION " - released: " DATE "\n";
271static const char optionsstring[] = "options: " 293static const char optionsstring[] = "options: "
272#if ENABLE_PERL 294#if ENABLE_PERL
273 "perl," 295 "perl,"
… …
308#endif 330#endif
309 "," 331 ","
310#if OFF_FOCUS_FADING 332#if OFF_FOCUS_FADING
311 "fade," 333 "fade,"
312#endif 334#endif
313#if defined(XPM_BACKGROUND)
314 "XPM,"
315#endif
316#if defined(TRANSPARENT) 335#if defined(ENABLE_TRANSPARENCY)
317 "transparent," 336 "transparent,"
318#endif
319#if TINTING
320 "tint," 337 "tint,"
338#endif
339#if HAVE_PIXBUF
340 "pixbuf,"
321#endif 341#endif
322#if defined(USE_XIM) 342#if defined(USE_XIM)
323 "XIM," 343 "XIM,"
324#endif 344#endif
325 "scrollbars="
326#if !defined(HAVE_SCROLLBARS)
327 "NONE"
328#else
329# if defined(PLAIN_SCROLLBAR)
330 "plain"
331# if defined(RXVT_SCROLLBAR) || defined(NEXT_SCROLLBAR) || defined(XTERM_SCROLLBAR)
332 "+"
333# endif
334# endif
335# if defined(RXVT_SCROLLBAR)
336 "rxvt"
337# if defined(NEXT_SCROLLBAR) || defined(XTERM_SCROLLBAR)
338 "+"
339# endif
340# endif
341# if defined(NEXT_SCROLLBAR)
342 "NeXT"
343# if defined(XTERM_SCROLLBAR)
344 "+"
345# endif
346# endif
347# if defined(XTERM_SCROLLBAR)
348 "xterm"
349# endif
350#endif
351 ","
352#if defined(NO_BACKSPACE_KEY) 345#if defined(NO_BACKSPACE_KEY)
353 "no_backspace," 346 "no_backspace,"
354#endif 347#endif
355#if defined(NO_DELETE_KEY) 348#if defined(NO_DELETE_KEY)
356 "no_delete," 349 "no_delete,"
… …
359 "8bitctrls," 352 "8bitctrls,"
360#endif 353#endif
361#if defined(ENABLE_FRILLS) 354#if defined(ENABLE_FRILLS)
362 "frills," 355 "frills,"
363#endif 356#endif
364#if defined(PREFER_24BIT)
365 "24bit,"
366#endif
367#if defined(SELECTION_SCROLLING) 357#if defined(SELECTION_SCROLLING)
368 "selectionscrolling," 358 "selectionscrolling,"
369#endif 359#endif
370#if MOUSE_WHEEL 360#if MOUSE_WHEEL
371 "wheel," 361 "wheel,"
… …
381#endif 371#endif
382#if defined(POINTER_BLANK) 372#if defined(POINTER_BLANK)
383 "pointerBlank," 373 "pointerBlank,"
384#endif 374#endif
385#if defined(NO_RESOURCES) 375#if defined(NO_RESOURCES)
386 "NoResources" 376 "NoResources,"
377#endif
378 "scrollbars=plain"
379#if defined(RXVT_SCROLLBAR)
380 "+rxvt"
381#endif
382#if defined(NEXT_SCROLLBAR)
383 "+NeXT"
384#endif
385#if defined(XTERM_SCROLLBAR)
386 "+xterm"
387#endif 387#endif
388 "\nUsage: "; /* Usage */ 388 "\nUsage: "; /* Usage */
389 389
390#define INDENT 18 390#define INDENT 28
391
392const char rxvt_term::resval_undef [] = "<undef>";
393const char rxvt_term::resval_on [] = "on";
394const char rxvt_term::resval_off [] = "off";
391 395
392/*{{{ usage: */ 396/*{{{ usage: */
393/*----------------------------------------------------------------------*/ 397/*----------------------------------------------------------------------*/
394static void 398void
395rxvt_usage (int type) 399rxvt_term::rxvt_usage (int type)
396{ 400{
397 unsigned int i, col; 401 unsigned int i, col;
398 402
399 rxvt_log ("%s%s%s", releasestring, optionsstring, RESNAME); 403 rxvt_log ("%s%s%s", releasestring, optionsstring, RESNAME);
400 404
401 switch (type) 405 switch (type)
402 { 406 {
403 case 0: /* brief listing */ 407 case 0: /* brief listing */
404 rxvt_log (" [-help] [--help]\n"); 408 rxvt_log (" [-help] [--help]\n");
405 409
406 for (col = 1, i = 0; i < optList_size; i++) 410 for (col = 1, i = 0; i < ecb_array_length (optList); i++)
407 if (optList[i].desc != NULL) 411 if (optList[i].desc != NULL)
408 { 412 {
409 int len = 0; 413 int len = 0;
410 414
411 if (!optList_isBool (i)) 415 if (optList[i].arg)
416 len = strlen (optList[i].arg) + 1;
417
418 assert (optList[i].opt != NULL);
419 len += 4 + strlen (optList[i].opt) + (optList_isBool (i) ? 2 : 0);
420 col += len;
421
422 if (col > 79)
412 { 423 {
413 len = optList_strlen (i);
414 if (len > 0)
415 len++; /* account for space */
416 }
417#ifdef DEBUG_STRICT
418 assert (optList[i].opt != NULL);
419#endif
420 len += 4 + strlen (optList[i].opt) + (optList_isBool (i) ? 2: 0);
421 col += len;
422 if (col > 79)
423 { /* assume regular width */ 424 /* assume regular width */
424 rxvt_log ("\n"); 425 rxvt_log ("\n");
425 col = 1 + len; 426 col = 1 + len;
426 } 427 }
427 428
428 rxvt_log (" [-%s%s", (optList_isBool (i) ? "/+" : ""), optList[i].opt); 429 rxvt_log (" [-%s%s", (optList_isBool (i) ? "/+" : ""), optList[i].opt);
430
429 if (optList_strlen (i)) 431 if (optList[i].arg)
430 rxvt_log (" %s]", optList[i].arg); 432 rxvt_log (" %s]", optList[i].arg);
431 else 433 else
432 rxvt_log ("]"); 434 rxvt_log ("]");
433 } 435 }
434 break; 436 break;
435 437
436 case 1: /* full command-line listing */ 438 case 1: /* full command-line listing */
437 rxvt_log (" [options] [-e command args]\n\nwhere options include:\n"); 439 rxvt_log (" [options] [-e command args]\n\nwhere options include:\n");
438 440
439 for (i = 0; i < optList_size; i++) 441 for (i = 0; i < ecb_array_length (optList); i++)
440 if (optList[i].desc != NULL) 442 if (optList[i].desc != NULL)
441 { 443 {
442#ifdef DEBUG_STRICT
443 assert (optList[i].opt != NULL); 444 assert (optList[i].opt != NULL);
444#endif
445 rxvt_log (" %s%s %-*s%s%s\n", 445 rxvt_log (" %s%s %-*s%s%s\n",
446 (optList_isBool (i) ? "-/+" : "-"), optList[i].opt, 446 (optList_isBool (i) ? "-/+" : "-"), optList[i].opt,
447 (INDENT - strlen (optList[i].opt) 447 (INDENT - strlen (optList[i].opt)
448 + (optList_isBool (i) ? 0 : 2)), 448 + (optList_isBool (i) ? 0 : 2)),
449 (optList[i].arg ? optList[i].arg : ""), 449 (optList[i].arg ? optList[i].arg : ""),
450 (optList_isBool (i) ? "turn on/off " : ""), 450 (optList_isBool (i) ? "turn on/off " : ""),
451 optList[i].desc); 451 optList[i].desc);
452 } 452 }
453
454#if ENABLE_PERL
455 rxvt_perl.init (this);
456 rxvt_perl.usage (this, 1);
457#endif
458
453 rxvt_log ("\n --help to list long-options"); 459 rxvt_log ("\n --help to list long-options");
454 break; 460 break;
455 461
456 case 2: /* full resource listing */ 462 case 2: /* full resource listing */
457 rxvt_log (" [options] [-e command args]\n\n" 463 rxvt_log (" [options] [-e command args]\n\n"
458 "where resources (long-options) include:\n"); 464 "where resources (long-options) include:\n");
459 465
460 for (i = 0; i < optList_size; i++) 466 for (i = 0; i < ecb_array_length (optList); i++)
461 if (optList[i].kw != NULL) 467 if (optList[i].kw != NULL)
462 rxvt_log (" %s: %*s%s\n", 468 rxvt_log (" %s: %*s%s\n",
463 optList[i].kw, 469 optList[i].kw,
464 (INDENT - strlen (optList[i].kw)), "", /* XXX */ 470 (INDENT + 2 - strlen (optList[i].kw)), "", /* XXX */
465 (optList_isBool (i) ? "boolean" : optList[i].arg)); 471 (optList_isBool (i) ? "boolean" : optList[i].arg));
466#ifdef KEYSYM_RESOURCE 472
467 rxvt_log (" " "keysym.sym" ": %*s%s\n", 473#if ENABLE_PERL
468 (INDENT - sizeof ("keysym.sym") + 1), "", /* XXX */ 474 rxvt_perl.init (this);
469 "keysym"); 475 rxvt_perl.usage (this, 2);
470#endif 476#endif
477
471 rxvt_log ("\n -help to list options"); 478 rxvt_log ("\n -help to list options");
472 break; 479 break;
473 } 480 }
474 481
475 rxvt_log ("\n\n"); 482 rxvt_log ("\n\n");
476 rxvt_exit_failure (); 483 rxvt_exit_failure ();
477 /* NOTREACHED */
478} 484}
479 485
480/*}}} */ 486/*}}} */
481 487
482/*{{{ get command-line options before getting resources */ 488/*{{{ get command-line options before getting resources */
483void 489const char **
484rxvt_term::get_options (int argc, const char *const *argv) 490rxvt_term::get_options (int argc, const char *const *argv)
485{ 491{
486 int i, bad_option = 0; 492 int i, bad_option = 0;
487 static const char On[3] = "ON", Off[4] = "OFF";
488 493
489 for (i = 1; i < argc; i++) 494 for (i = 1; i < argc; i++)
490 { 495 {
491 unsigned int entry, longopt = 0; 496 unsigned int entry, longopt = 0;
492 const char *flag, *opt; 497 const char *opt;
498 int flag;
493 499
494 opt = argv[i]; 500 opt = argv[i];
495 501
496 if (*opt == '-') 502 if (*opt == '-')
497 { 503 {
498 flag = On; 504 flag = 1;
505
499 if (*++opt == '-') 506 if (*++opt == '-')
500 longopt = *opt++; /* long option */ 507 longopt = *opt++; /* long option */
501 } 508 }
502 else if (*opt == '+') 509 else if (*opt == '+')
503 { 510 {
504 flag = Off; 511 flag = 0;
512
505 if (*++opt == '+') 513 if (*++opt == '+')
506 longopt = *opt++; /* long option */ 514 longopt = *opt++; /* long option */
507 } 515 }
508 else 516 else
509 { 517 {
… …
512 continue; 520 continue;
513 } 521 }
514 522
515 if (!strcmp (opt, "help")) 523 if (!strcmp (opt, "help"))
516 rxvt_usage (longopt ? 2 : 1); 524 rxvt_usage (longopt ? 2 : 1);
525
517 if (!strcmp (opt, "h")) 526 if (!strcmp (opt, "h"))
518 rxvt_usage (0); 527 rxvt_usage (0);
519 528
520 /* feature: always try to match long-options */ 529 /* feature: always try to match long-options */
521 for (entry = 0; entry < optList_size; entry++) 530 for (entry = 0; entry < ecb_array_length (optList); entry++)
522 if ((optList[entry].kw && !strcmp (opt, optList[entry].kw)) 531 if ((optList[entry].kw && !strcmp (opt, optList[entry].kw))
523 || (!longopt 532 || (!longopt
524 && optList[entry].opt && !strcmp (opt, optList[entry].opt))) 533 && optList[entry].opt && !strcmp (opt, optList[entry].opt)))
525 break; 534 break;
526 535
527 if (entry < optList_size) 536 if (entry < ecb_array_length (optList)
537 && !optList_isInfo (entry))
528 { 538 {
529 if (optList_isReverse (entry)) 539 if (optList_isReverse (entry))
530 flag = flag == On ? Off : On; 540 flag = !flag;
531 541
532 if (optList_strlen (entry)) 542 if (optList_isString (entry))
533 { 543 {
534 /* 544 /*
535 * special cases are handled in main.c:main () to allow 545 * special cases are handled in init_resources () to allow
536 * X resources to set these values before we settle for 546 * X resources to set these values before we settle for
537 * default values 547 * default values
538 */ 548 */
539 549
540 if (optList[entry].doff != -1) 550 if (optList[entry].doff != -1)
551 {
552 if (flag && i + 1 == argc)
553 rxvt_fatal ("option '%s' requires an argument, aborting.\n", argv [i]);
554
541 rs[optList[entry].doff] = flag == On && argv[i+1] 555 rs[optList[entry].doff] = flag ? argv[++i] : resval_undef;
542 ? argv[++i] : 0; 556 }
543 } 557 }
544 else 558 else
559 {
545 { /* boolean value */ 560 /* boolean value */
546 set_option (optList[entry].flag & Optflag_mask, flag == On); 561 set_option (optList[entry].index, flag);
547 562
548 if (optList[entry].doff != -1) 563 if (optList[entry].doff != -1)
549 rs[optList[entry].doff] = flag; 564 rs[optList[entry].doff] = flag ? resval_on : resval_off;
550 } 565 }
551 } 566 }
567#ifndef NO_RESOURCES
568 else if (!strcmp (opt, "xrm"))
569 {
570 if (i + 1 < argc)
571 XrmPutLineResource (&option_db, argv[++i]);
572 }
573#endif
574#ifdef KEYSYM_RESOURCE
575 else if (!strncmp (opt, "keysym.", sizeof ("keysym.") - 1))
576 {
577 if (i + 1 < argc)
578 {
579 char *res = rxvt_temp_buf<char> (strlen (opt) + strlen (argv[++i]) + 6);
580 sprintf (res, "*.%s: %s\n", opt, argv[i]);
581 XrmPutLineResource (&option_db, res);
582 }
583 }
584#endif
585 else if (!strcmp (opt, "e"))
586 {
587 if (i + 1 < argc)
588 return (const char **)argv + i + 1;
589
590 rxvt_warn ("option '-e' requires an argument, aborting.\n");
591 bad_option = 1;
592 }
552 else 593 else
553#ifdef KEYSYM_RESOURCE 594 {
554 /* if (!strncmp (opt, "keysym.", sizeof ("keysym.") - 1)) */ 595#if ENABLE_PERL
555 if (rxvt_Str_match (opt, "keysym.")) 596 rxvt_perl.init (this);
597
598 if (int flags = rxvt_perl.parse_resource (this, opt, true, longopt, flag, argv [i + 1]))
556 { 599 {
557 const char *str = argv[++i]; 600 if (flags & rxvt_perl.RESOURCE_ARG)
558 601 {
559 if (str != NULL) 602 if (i + 1 == argc)
560 parse_keysym (opt + sizeof ("keysym.") - 1, str); 603 {
604 rxvt_warn ("option '%s' requires an argument.\n", argv [i]);
605 bad_option = 1;
606 }
607 else
608 ++i;
609 }
561 } 610 }
562 else 611 else
563#endif 612#endif
564 { 613 {
565 bad_option = 1;
566 rxvt_warn ("\"%s\": unknown or malformed option.\n", opt); 614 rxvt_warn ("\"%s\": unknown or malformed option.\n", opt);
615 bad_option = 1;
567 } 616 }
617 }
568 } 618 }
569 619
570 if (bad_option) 620 if (bad_option)
571 rxvt_usage (0); 621 rxvt_usage (0);
622
623 return 0;
572} 624}
573 625
574/*}}} */ 626/*}}} */
575 627
576#ifndef NO_RESOURCES 628#ifndef NO_RESOURCES
… …
581 * Define key from XrmEnumerateDatabase. 633 * Define key from XrmEnumerateDatabase.
582 * quarks will be something like 634 * quarks will be something like
583 * "rxvt" "keysym" "0xFF01" 635 * "rxvt" "keysym" "0xFF01"
584 * value will be a string 636 * value will be a string
585 */ 637 */
586/* ARGSUSED */ 638static int
587int
588rxvt_define_key (XrmDatabase *database UNUSED, 639rxvt_define_key (XrmDatabase *database ecb_unused,
589 XrmBindingList bindings UNUSED, 640 XrmBindingList bindings ecb_unused,
590 XrmQuarkList quarks, 641 XrmQuarkList quarks,
591 XrmRepresentation *type UNUSED, 642 XrmRepresentation *type ecb_unused,
592 XrmValue *value, 643 XrmValue *value,
593 XPointer closure UNUSED) 644 XPointer closure ecb_unused)
594{ 645{
595 int last; 646 int last;
596 647
597 for (last = 0; quarks[last] != NULLQUARK; last++) /* look for last quark in list */ 648 for (last = 0; quarks[last] != NULLQUARK; last++) /* look for last quark in list */
598 ; 649 ;
… …
603} 654}
604 655
605/* 656/*
606 * look for something like this (XK_Delete) 657 * look for something like this (XK_Delete)
607 * rxvt*keysym.0xFFFF: "\177" 658 * rxvt*keysym.0xFFFF: "\177"
608 *
609 * arg will be
610 * NULL for ~/.Xdefaults and
611 * non-NULL for command-line options (need to allocate)
612 */ 659 */
613#define NEWARGLIM 500 /* `reasonable' size */
614 660
615struct keysym_vocabulary_t 661struct keysym_vocabulary_t
616{ 662{
617 const char *name; 663 const char *name;
618 unsigned short len; 664 unsigned short len;
619 unsigned short value; 665 unsigned short value;
620}; 666};
621keysym_vocabulary_t keysym_vocabulary[] = 667static const keysym_vocabulary_t keysym_vocabulary[] =
622{ 668{
623 { "ISOLevel3", 9, Level3Mask }, 669 { "ISOLevel3", 9, Level3Mask },
624 { "AppKeypad", 9, AppKeypadMask }, 670 { "AppKeypad", 9, AppKeypadMask },
625 { "Control", 7, ControlMask }, 671 { "Control", 7, ControlMask },
626 { "NumLock", 7, NumLockMask }, 672 { "NumLock", 7, NumLockMask },
… …
648}; 694};
649 695
650int 696int
651rxvt_term::parse_keysym (const char *str, const char *arg) 697rxvt_term::parse_keysym (const char *str, const char *arg)
652{ 698{
653 int n, sym; 699 int sym;
654 unsigned int state = 0; 700 unsigned int state = 0;
655 const char *pmodend = NULL; 701 const char *key = strrchr (str, '-');
656 char *newarg = NULL;
657 char newargstr[NEWARGLIM];
658 702
659 if (arg == NULL) 703 if (!key)
660 { 704 key = str;
661 if ((n = rxvt_Str_match (str, "keysym.")) == 0)
662 return 0;
663
664 str += n; /* skip `keysym.' */
665 if (!(pmodend = strchr (str, ':')))
666 return -1;
667 }
668 else 705 else
669 pmodend = str + strlen(str); 706 key++;
670 707
671 for (--pmodend; str < pmodend; --pmodend) 708 // string or key is empty
672 if (*pmodend == '-') 709 if (*arg == '\0' || *key == '\0')
673 break; 710 return -1;
674 711
712 // parse modifiers
675 while (str < pmodend) 713 while (str < key)
676 { 714 {
677 unsigned int i; 715 unsigned int i;
678 716
679 for (i=0; i < sizeof (keysym_vocabulary) / sizeof (keysym_vocabulary_t); ++i) 717 for (i = 0; i < ecb_array_length (keysym_vocabulary); ++i)
680 { 718 {
681 if (strncmp (str, keysym_vocabulary [i].name, keysym_vocabulary [i].len) == 0) 719 if (strncmp (str, keysym_vocabulary [i].name, keysym_vocabulary [i].len) == 0)
682 { 720 {
683 state |= keysym_vocabulary[i].value; 721 state |= keysym_vocabulary[i].value;
684 str += keysym_vocabulary[i].len; 722 str += keysym_vocabulary[i].len;
685 break; 723 break;
686 } 724 }
687 } 725 }
688 726
689 if (i >= sizeof (keysym_vocabulary) / sizeof (keysym_vocabulary_t)) 727 if (i >= ecb_array_length (keysym_vocabulary))
690 return -1; 728 return -1;
691 729
692 if (*str == '-') 730 if (*str == '-')
693 ++str; 731 ++str;
694 } 732 }
695 733
696 /* some scanf () have trouble with a 0x prefix */ 734 // convert keysym name to keysym number
697 if (str[0] == '0' && toupper (str[1]) == 'X') 735 if ((sym = XStringToKeysym (str)) == None)
698 { 736 {
699 str += 2; 737 // fallback on hexadecimal parsing
700 738 char *end;
739 sym = strtol (str, &end, 16);
701 if (arg) 740 if (*end)
702 {
703 if (sscanf (str, (strchr (str, ':') ? "%x:" : "%x"), &sym) != 1)
704 return -1;
705 }
706 else
707 {
708 if (sscanf (str, "%x:", &sym) != 1)
709 return -1;
710
711 /* cue to ':', it's there since sscanf () worked */
712 strncpy (newargstr, strchr (str, ':') + 1, NEWARGLIM - 1);
713 newargstr[NEWARGLIM - 1] = '\0';
714 newarg = newargstr;
715 }
716 }
717 else
718 {
719 /*
720 * convert keysym name to keysym number
721 */
722 strncpy (newargstr, str, NEWARGLIM - 1);
723 newargstr[NEWARGLIM - 1] = '\0';
724
725 if (arg == NULL)
726 {
727 if ((newarg = strchr (newargstr, ':')) == NULL)
728 return -1;
729
730 *newarg++ = '\0'; /* terminate keysym name */
731 }
732
733 if ((sym = XStringToKeysym (newargstr)) == None)
734 return -1; 741 return -1;
735 } 742 }
736 743
737 if (newarg == NULL) 744 wchar_t *ws = rxvt_mbstowcs (arg);
738 { 745 if (!HOOK_INVOKE ((this, HOOK_REGISTER_COMMAND, DT_INT, sym, DT_INT, state, DT_WCS_LEN, ws, wcslen (ws), DT_END)))
739 strncpy (newargstr, arg, NEWARGLIM - 1);
740 newargstr[NEWARGLIM - 1] = '\0';
741 newarg = newargstr;
742 }
743
744 rxvt_Str_trim (newarg);
745 if (*newarg == '\0' || (n = rxvt_Str_escaped (newarg)) == 0)
746 return -1;
747
748 keyboard->register_user_translation (sym, state, newarg); 746 keyboard->register_user_translation (sym, state, ws);
747 free (ws);
749 return 1; 748 return 1;
750} 749}
751 750
752# endif /* KEYSYM_RESOURCE */ 751# endif /* KEYSYM_RESOURCE */
753#endif /* NO_RESOURCES */ 752#endif /* NO_RESOURCES */
754 753
755static char * 754static char *
756get_res (XrmDatabase database, const char *program, const char *option) 755get_res (XrmDatabase database, const char *program, const char *option)
757{ 756{
758 char resource[512]; 757 char resource[512];
… …
766} 765}
767 766
768const char * 767const char *
769rxvt_term::x_resource (const char *name) 768rxvt_term::x_resource (const char *name)
770{ 769{
771 XrmDatabase database = XrmGetDatabase (display->display); 770 XrmDatabase database = XrmGetDatabase (dpy);
772 771
773 const char *p = get_res (database, rs[Rs_name], name); 772 const char *p = get_res (database, rs[Rs_name], name);
774 const char *p0 = get_res (database, "!INVALIDPROGRAMMENAMEDONTMATCH!", name); 773 const char *p0 = get_res (database, "!INVALIDPROGRAMMENAMEDONTMATCH!", name);
775 774
776 if (p == NULL || (p0 && strcmp (p, p0) == 0)) 775 if (p == NULL || (p0 && strcmp (p, p0) == 0))
… …
790 789
791void 790void
792rxvt_term::extract_resources () 791rxvt_term::extract_resources ()
793{ 792{
794#ifndef NO_RESOURCES 793#ifndef NO_RESOURCES
794 XrmDatabase database = XrmGetDatabase (dpy);
795 XrmMergeDatabases (option_db, &database);
796 option_db = NULL;
795 /* 797 /*
796 * Query resources for options that affect us 798 * Query resources for options that affect us
797 */ 799 */
798 for (int entry = 0; entry < optList_size; entry++) 800 for (int entry = 0; entry < ecb_array_length (optList); entry++)
799 { 801 {
800 int s; 802 int s;
801 const char *kw = optList[entry].kw; 803 const char *kw = optList[entry].kw;
802 804
803 if (kw == NULL || rs[optList[entry].doff] != NULL) 805 if (kw == NULL || rs[optList[entry].doff] != NULL)
… …
819 || strcasecmp (p, "1") == 0; 821 || strcasecmp (p, "1") == 0;
820 822
821 if (optList_isReverse (entry)) 823 if (optList_isReverse (entry))
822 s = !s; 824 s = !s;
823 825
824 set_option (optList[entry].flag & Optflag_mask, s); 826 set_option (optList[entry].index, s);
825 } 827 }
826 } 828 }
827 } 829 }
830#endif /* NO_RESOURCES */
831}
828 832
833void
834rxvt_term::extract_keysym_resources ()
835{
836#ifndef NO_RESOURCES
829 /* 837 /*
830 * [R5 or later]: enumerate the resource database 838 * [R5 or later]: enumerate the resource database
831 */ 839 */
832# ifdef KEYSYM_RESOURCE 840# ifdef KEYSYM_RESOURCE
833 XrmDatabase database = XrmGetDatabase (display->display); 841 XrmDatabase database = XrmGetDatabase (dpy);
834 XrmName name_prefix[3]; 842 XrmName name_prefix[3];
835 XrmClass class_prefix[3]; 843 XrmClass class_prefix[3];
836 844
837 name_prefix[0] = XrmStringToName (rs[Rs_name]); 845 name_prefix[0] = XrmStringToName (rs[Rs_name]);
838 name_prefix[1] = XrmStringToName ("keysym"); 846 name_prefix[1] = XrmStringToName ("keysym");
… …
842 class_prefix[2] = NULLQUARK; 850 class_prefix[2] = NULLQUARK;
843 /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */ 851 /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */
844 XrmEnumerateDatabase (database, name_prefix, class_prefix, 852 XrmEnumerateDatabase (database, name_prefix, class_prefix,
845 XrmEnumOneLevel, rxvt_define_key, NULL); 853 XrmEnumOneLevel, rxvt_define_key, NULL);
846# ifdef RESFALLBACK 854# ifdef RESFALLBACK
847 name_prefix[0] = XrmStringToName (RESFALLBACK);
848 name_prefix[1] = XrmStringToName ("keysym");
849 class_prefix[0] = XrmStringToName (RESFALLBACK); 855 name_prefix[0] = class_prefix[0] = XrmStringToName (RESFALLBACK);
850 class_prefix[1] = XrmStringToName ("Keysym");
851 /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */ 856 /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */
852 XrmEnumerateDatabase (database, name_prefix, class_prefix, 857 XrmEnumerateDatabase (database, name_prefix, class_prefix,
853 XrmEnumOneLevel, rxvt_define_key, NULL); 858 XrmEnumOneLevel, rxvt_define_key, NULL);
854# endif 859# endif
855# endif 860# endif
856 861
857#endif /* NO_RESOURCES */ 862#endif /* NO_RESOURCES */
858} 863}
859 864
860/*----------------------- end-of-file (C source) -----------------------*/ 865/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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