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

Diff Legend

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