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

Diff Legend

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