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.72 by root, Fri Jan 6 05:28:55 2006 UTC vs.
Revision 1.175 by sf-exg, Fri May 2 20:34:24 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-2004 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.
… …
20 * 21 *
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 * get resources from ~/.Xdefaults or ~/.Xresources with the memory-saving
27 * default or with XGetDefault() (#define USE_XGETDEFAULT)
28 *----------------------------------------------------------------------*/
29 26
30#include "../config.h" /* NECESSARY */ 27#include "../config.h"
31#include "rxvt.h" /* NECESSARY */ 28#include "rxvt.h"
32#include "version.h" 29#include "version.h"
33 30
34#include <sys/utsname.h>
35
36#ifdef KEYSYM_RESOURCE 31#ifdef KEYSYM_RESOURCE
37#include "keyboard.h" 32# include "keyboard.h"
38#endif 33#endif
39 34
40/* place holders used for parsing command-line options */ 35/* place holders used for parsing command-line options */
41#define Optflag_Reverse 0x40000000UL 36#define Optflag_Reverse 1
42#define Optflag_Boolean 0x80000000UL 37#define Optflag_Boolean 2
43#define Optflag_mask 0x3fffffffUL 38#define Optflag_Switch 4
39#define Optflag_Info 8
44 40
45/* #define DEBUG_RESOURCES */
46
47/*{{{ monolithic option/resource structure: */ 41/* monolithic option/resource structure: */
48/* 42/*
49 * `string' options MUST have a usage argument 43 * `string' options MUST have a usage argument
50 * `switch' and `boolean' options have no argument 44 * `switch' and `boolean' options have no argument
51 * 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 ()
52 */ 46 */
53 47
54/* INFO () - descriptive information only */ 48/* INFO () - descriptive information only */
55#define INFO(opt, arg, desc) \ 49#define INFO(opt, arg, desc) \
56 {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}
57 54
58/* STRG () - command-line option, with/without resource */ 55/* STRG () - command-line option, with/without resource */
59#define STRG(rsp, kw, opt, arg, desc) \ 56#define STRG(rsp, kw, opt, arg, desc) \
60 {0, (rsp), (kw), (opt), (arg), (desc)} 57 {0, 0, (rsp), (kw), (opt), (arg), (desc)}
61 58
62/* RSTRG () - resource/long-option */ 59/* RSTRG () - resource/long-option */
63#define RSTRG(rsp, kw, arg) \ 60#define RSTRG(rsp, kw, arg) \
64 {0, (rsp), (kw), NULL, (arg), NULL} 61 {0, 0, (rsp), (kw), NULL, (arg), NULL}
65 62
66/* BOOL () - regular boolean `-/+' flag */ 63/* BOOL () - regular boolean `-/+' flag */
67#define BOOL(rsp, kw, opt, flag, desc) \ 64#define BOOL(rsp, kw, opt, option, flag, desc) \
68 { (Optflag_Boolean | (flag)), (rsp), (kw), (opt), NULL, (desc)} 65 { (option), (Optflag_Boolean | (flag)), (rsp), (kw), (opt), NULL, (desc)}
69 66
70/* SWCH () - `-' flag */ 67/* SWCH () - `-' flag */
71#define SWCH(opt, flag, desc) \ 68#define SWCH(opt, option, flag, desc) \
72 { (flag), -1, NULL, (opt), NULL, (desc)} 69 { (option), (Optflag_Switch | (flag)), -1, NULL, (opt), NULL, (desc)}
73 70
74/* convenient macros */ 71/* convenient macros */
75#define optList_strlen(i) \ 72#define optList_isString(i) \
76 (optList[i].flag ? 0 : (optList[i].arg ? strlen (optList[i].arg) : 1)) 73 (optList[i].flag == 0)
77#define optList_isBool(i) \ 74#define optList_isBool(i) \
78 (optList[i].flag & Optflag_Boolean) 75 (optList[i].flag & Optflag_Boolean)
79#define optList_isReverse(i) \ 76#define optList_isReverse(i) \
80 (optList[i].flag & Optflag_Reverse) 77 (optList[i].flag & Optflag_Reverse)
81#define optList_size \ 78#define optList_isInfo(i) \
82 (sizeof (optList) / sizeof (optList[0])) 79 (optList[i].flag & Optflag_Info)
83 80
84static const struct 81static const struct
85 { 82 {
83 const uint8_t index; /* Option index */
86 const unsigned long flag; /* Option flag */ 84 const uint8_t flag; /* Option flag */
87 const int doff; /* data offset */ 85 const int16_t doff; /* resource value index or -1 */
88 const char *kw; /* keyword */ 86 const char *kw; /* keyword */
89 const char *opt; /* option */ 87 const char *opt; /* option */
90 const char *arg; /* argument */ 88 const char *arg; /* argument */
91 const char *desc; /* description */ 89 const char *desc; /* description */
92 } 90 }
… …
94 STRG (Rs_display_name, NULL, "d", NULL, NULL), /* short form */ 92 STRG (Rs_display_name, NULL, "d", NULL, NULL), /* short form */
95 STRG (Rs_display_name, NULL, "display", "string", "X server to contact"), 93 STRG (Rs_display_name, NULL, "display", "string", "X server to contact"),
96 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"),
97 STRG (Rs_geometry, NULL, "g", NULL, NULL), /* short form */ 95 STRG (Rs_geometry, NULL, "g", NULL, NULL), /* short form */
98 STRG (Rs_geometry, "geometry", "geometry", "geometry", "size (in characters) and position"), 96 STRG (Rs_geometry, "geometry", "geometry", "geometry", "size (in characters) and position"),
99 SWCH ("C", Opt_console, "intercept console messages"), 97 SWCH ("C", Opt_console, 0, "intercept console messages"),
100 SWCH ("iconic", Opt_iconic, "start iconic"), 98 SWCH ("iconic", Opt_iconic, 0, "start iconic"),
101 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"),
102 BOOL (Rs_reverseVideo, "reverseVideo", "rv", Opt_reverseVideo, "reverse video"), 101 BOOL (Rs_reverseVideo, "reverseVideo", "rv", Opt_reverseVideo, 0, "reverse video"),
103 BOOL (Rs_loginShell, "loginShell", "ls", Opt_loginShell, "login shell"), 102 BOOL (Rs_loginShell, "loginShell", "ls", Opt_loginShell, 0, "login shell"),
104 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"),
105 BOOL (Rs_pastableTabs, "pastableTabs", "ptab", Opt_pastableTabs, "tab characters are pastable"), 105 BOOL (Rs_pastableTabs, "pastableTabs", "ptab", Opt_pastableTabs, 0, "tab characters are pastable"),
106#if HAVE_SCROLLBARS
107 RSTRG (Rs_scrollstyle, "scrollstyle", "mode"), 106 RSTRG (Rs_scrollstyle, "scrollstyle", "mode"),
108 BOOL (Rs_scrollBar, "scrollBar", "sb", Opt_scrollBar, "scrollbar"), 107 BOOL (Rs_scrollBar, "scrollBar", "sb", Opt_scrollBar, 0, "scrollbar"),
109 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"),
110 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"),
111 RSTRG (Rs_scrollBar_align, "scrollBar_align", "mode"), 110 RSTRG (Rs_scrollBar_align, "scrollBar_align", "mode"),
112 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"),
113#endif
114 BOOL (Rs_scrollTtyOutput, "scrollTtyOutput", NULL, Opt_scrollTtyOutput, NULL), 112 BOOL (Rs_scrollTtyOutput, "scrollTtyOutput", NULL, Opt_scrollTtyOutput, 0, NULL),
115 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"),
116 BOOL (Rs_scrollTtyKeypress, "scrollTtyKeypress", "sk", Opt_scrollTtyKeypress, "scroll-on-keypress"), 114 BOOL (Rs_scrollTtyKeypress, "scrollTtyKeypress", "sk", Opt_scrollTtyKeypress, 0, "scroll-on-keypress"),
117 BOOL (Rs_scrollWithBuffer, "scrollWithBuffer", "sw", Opt_scrollWithBuffer, "scroll-with-buffer"), 115 BOOL (Rs_scrollWithBuffer, "scrollWithBuffer", "sw", Opt_scrollWithBuffer, 0, "scroll-with-buffer"),
118#if TRANSPARENT 116#if BG_IMAGE_FROM_ROOT
119 BOOL (Rs_transparent, "inheritPixmap", "ip", Opt_transparent, "inherit parent pixmap"), 117 BOOL (Rs_transparent, "inheritPixmap", "ip", Opt_transparent, 0, "inherit parent pixmap"),
120 SWCH ("tr", Opt_transparent, NULL), 118 BOOL (Rs_transparent, "transparent", "tr", Opt_transparent, 0, "inherit parent pixmap"),
121# if TINTING
122 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),
123# endif 131# endif
124#endif
125#if OFF_FOCUS_FADING
126 STRG (Rs_fade, "fading", "fade", "%", "fade colors x% percent when rxvt-unicode is losing focus"),
127 STRG (Rs_color + Color_fade, "fadeColor", "fadecolor", "color", "target color for off-focus fading"),
128#endif
129#if TINTING
130 STRG (Rs_shade, "shading", "sh", "%", "shade background by x% when tinting."),
131#endif
132 BOOL (Rs_utmpInhibit, "utmpInhibit", "ut", Opt_utmpInhibit, "utmp inhibit"),
133#ifndef NO_BELL
134 BOOL (Rs_visualBell, "visualBell", "vb", Opt_visualBell, "visual bell"), 132 BOOL (Rs_visualBell, "visualBell", "vb", Opt_visualBell, 0, "visual bell"),
135# if ! defined(NO_MAPALERT) && defined(MAPALERT_OPTION) 133# if ! defined(NO_MAPALERT) && defined(MAPALERT_OPTION)
136 BOOL (Rs_mapAlert, "mapAlert", NULL, Opt_mapAlert, NULL), 134 BOOL (Rs_mapAlert, "mapAlert", NULL, Opt_mapAlert, 0, NULL),
137# endif 135# endif
138#endif 136#endif
139#ifdef META8_OPTION 137#ifdef META8_OPTION
140 BOOL (Rs_meta8, "meta8", NULL, Opt_meta8, NULL), 138 BOOL (Rs_meta8, "meta8", NULL, Opt_meta8, 0, NULL),
141#endif 139#endif
142#ifdef MOUSE_WHEEL 140#ifdef MOUSE_WHEEL
143 BOOL (Rs_mouseWheelScrollPage, "mouseWheelScrollPage", NULL, Opt_mouseWheelScrollPage, NULL), 141 BOOL (Rs_mouseWheelScrollPage, "mouseWheelScrollPage", NULL, Opt_mouseWheelScrollPage, 0, NULL),
144#endif 142#endif
145#if ENABLE_FRILLS 143#if ENABLE_FRILLS
146 BOOL (Rs_tripleclickwords, "tripleclickwords", "tcw", Opt_tripleclickwords, "triple click word selection"), 144 BOOL (Rs_tripleclickwords, "tripleclickwords", "tcw", Opt_tripleclickwords, 0, "triple click word selection"),
147 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"),
148 BOOL (Rs_cursorUnderline, "cursorUnderline", "uc", Opt_cursorUnderline, "underline cursor"), 146 BOOL (Rs_cursorUnderline, "cursorUnderline", "uc", Opt_cursorUnderline, 0, "underline cursor"),
149#endif 147#endif
150#if CURSOR_BLINK 148#if CURSOR_BLINK
151 BOOL (Rs_cursorBlink, "cursorBlink", "bc", Opt_cursorBlink, "blinking cursor"), 149 BOOL (Rs_cursorBlink, "cursorBlink", "bc", Opt_cursorBlink, 0, "blinking cursor"),
152#endif 150#endif
153#ifdef POINTER_BLANK 151#ifdef POINTER_BLANK
154 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"),
155#endif 153#endif
156 STRG (Rs_color + Color_bg, "background", "bg", "color", "background color"), 154 STRG (Rs_color + Color_bg, "background", "bg", "color", "background color"),
157 STRG (Rs_color + Color_fg, "foreground", "fg", "color", "foreground color"), 155 STRG (Rs_color + Color_fg, "foreground", "fg", "color", "foreground color"),
158 RSTRG (Rs_color + minCOLOR + 0, "color0", "color"), 156 RSTRG (Rs_color + minCOLOR + 0, "color0", "color"),
159 RSTRG (Rs_color + minCOLOR + 1, "color1", "color"), 157 RSTRG (Rs_color + minCOLOR + 1, "color1", "color"),
… …
174#ifndef NO_BOLD_UNDERLINE_REVERSE 172#ifndef NO_BOLD_UNDERLINE_REVERSE
175 RSTRG (Rs_color + Color_BD, "colorBD", "color"), 173 RSTRG (Rs_color + Color_BD, "colorBD", "color"),
176 RSTRG (Rs_color + Color_IT, "colorIT", "color"), 174 RSTRG (Rs_color + Color_IT, "colorIT", "color"),
177 RSTRG (Rs_color + Color_UL, "colorUL", "color"), 175 RSTRG (Rs_color + Color_UL, "colorUL", "color"),
178 RSTRG (Rs_color + Color_RV, "colorRV", "color"), 176 RSTRG (Rs_color + Color_RV, "colorRV", "color"),
179#endif /* ! NO_BOLD_UNDERLINE_REVERSE */ 177#endif /* ! NO_BOLD_UNDERLINE_REVERSE */
180#if ENABLE_FRILLS 178#if ENABLE_FRILLS
181 RSTRG (Rs_color + Color_underline, "underlineColor", "color"), 179 RSTRG (Rs_color + Color_underline, "underlineColor", "color"),
182#endif 180#endif
183#ifdef KEEP_SCROLLCOLOR
184 RSTRG (Rs_color + Color_scroll, "scrollColor", "color"), 181 RSTRG (Rs_color + Color_scroll, "scrollColor", "color"),
182#ifdef RXVT_SCROLLBAR
185 RSTRG (Rs_color + Color_trough, "troughColor", "color"), 183 RSTRG (Rs_color + Color_trough, "troughColor", "color"),
186#endif /* KEEP_SCROLLCOLOR */ 184#endif
187#ifdef OPTION_HC 185#ifdef OPTION_HC
188 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"),
189#endif 188#endif
190#ifndef NO_CURSORCOLOR 189#ifndef NO_CURSORCOLOR
191 STRG (Rs_color + Color_cursor, "cursorColor", "cr", "color", "cursor color"), 190 STRG (Rs_color + Color_cursor, "cursorColor", "cr", "color", "cursor color"),
192 /* command-line option = resource name */ 191 /* command-line option = resource name */
193 RSTRG (Rs_color + Color_cursor2, "cursorColor2", "color"), 192 RSTRG (Rs_color + Color_cursor2, "cursorColor2", "color"),
194#endif /* NO_CURSORCOLOR */ 193#endif /* NO_CURSORCOLOR */
195 STRG (Rs_color + Color_pointer_fg, "pointerColor", "pr", "color", "pointer color"), 194 STRG (Rs_color + Color_pointer_fg, "pointerColor", "pr", "color", "pointer color"),
196 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"),
197 STRG (Rs_color + Color_border, "borderColor", "bd", "color", "border color"), 196 STRG (Rs_color + Color_border, "borderColor", "bd", "color", "border color"),
198#if defined (XPM_BACKGROUND) || (MENUBAR_MAX) 197#if BG_IMAGE_FROM_FILE
199 RSTRG (Rs_path, "path", "search path"), 198 RSTRG (Rs_path, "path", "search path"),
200#endif /* defined (XPM_BACKGROUND) || (MENUBAR_MAX) */
201#ifdef XPM_BACKGROUND
202 STRG (Rs_backgroundPixmap, "backgroundPixmap", "pixmap", "file[;geom]", "background pixmap"), 199 STRG (Rs_backgroundPixmap, "backgroundPixmap", "pixmap", "file[;geom]", "background pixmap"),
203#endif /* XPM_BACKGROUND */ 200#endif
204#if (MENUBAR_MAX) 201#if ENABLE_EWMH
205 RSTRG (Rs_menu, "menu", "name[;tag]"), 202 STRG (Rs_iconfile, "iconFile", "icon", "file", "path to application icon image"),
206#endif 203#endif
207 /* fonts: command-line option = resource name */ 204 /* fonts: command-line option = resource name */
208 STRG (Rs_font, "font", "fn", "fontname", "normal text font"), 205 STRG (Rs_font, "font", "fn", "fontname", "normal text font"),
209#if ENABLE_STYLES 206#if ENABLE_STYLES
210 STRG (Rs_boldFont, "boldFont", "fb", "fontname", "bold font"), 207 STRG (Rs_boldFont, "boldFont", "fb", "fontname", "bold font"),
211 STRG (Rs_italicFont, "italicFont", "fi", "fontname", "italic font"), 208 STRG (Rs_italicFont, "italicFont", "fi", "fontname", "italic font"),
212 STRG (Rs_boldItalicFont, "boldItalicFont", "fbi", "fontname", "bold italic font"), 209 STRG (Rs_boldItalicFont, "boldItalicFont", "fbi", "fontname", "bold italic font"),
213 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"),
214#endif 211#endif
215#ifdef USE_XIM 212#if USE_XIM
216 STRG (Rs_inputMethod, "inputMethod", "im", "name", "name of input method"), 213 STRG (Rs_inputMethod, "inputMethod", "im", "name", "name of input method"),
217 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"),
218 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"),
219 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"),
220#endif /* USE_XIM */ 217#endif /* USE_XIM */
221 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"),
222 STRG (Rs_title, "title", "title", "string", "title name for window"), 219 STRG (Rs_title, "title", "title", "string", "title name for window"),
223 STRG (Rs_title, NULL, "T", NULL, NULL), /* short form */ 220 STRG (Rs_title, NULL, "T", NULL, NULL), /* short form */
224 STRG (Rs_iconName, "iconName", "n", "string", "icon name for window"), 221 STRG (Rs_iconName, "iconName", "n", "string", "icon name for window"),
225 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"),
226#if ENABLE_XEMBED 223#if ENABLE_XEMBED
227 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"),
228#endif 225#endif
226#if XFT
227 BOOL (Rs_buffered, "buffered", NULL, Opt_buffered, 0, NULL),
228#endif
229#if ENABLE_FRILLS 229#if ENABLE_FRILLS
230 STRG (Rs_depth, "depth", "depth", "number", "depth of visual to request"),
231 STRG (Rs_visual, "visual", "visual", "number", "visual id to request"),
230 RSTRG (Rs_transient_for, "transient-for", "windowid"), 232 RSTRG (Rs_transient_for, "transient-for", "windowid"),
233 BOOL (Rs_override_redirect, "override-redirect", "override-redirect", Opt_override_redirect, 0, "set override-redirect on the terminal window"),
231 STRG (Rs_pty_fd, NULL, "pty-fd", "fileno", "file descriptor of pty to use"), 234 STRG (Rs_pty_fd, NULL, "pty-fd", "fileno", "file descriptor of pty to use"),
232 BOOL (Rs_hold, "hold", "hold", Opt_hold, "retain window after shell exit"), 235 BOOL (Rs_hold, "hold", "hold", Opt_hold, 0, "retain window after shell exit"),
233 STRG (Rs_ext_bwidth, "externalBorder", "w", "number", "external border in pixels"), 236 STRG (Rs_ext_bwidth, "externalBorder", "w", "number", "external border in pixels"),
234 STRG (Rs_ext_bwidth, NULL, "bw", NULL, NULL), 237 STRG (Rs_ext_bwidth, NULL, "bw", NULL, NULL),
235 STRG (Rs_ext_bwidth, NULL, "borderwidth", NULL, NULL), 238 STRG (Rs_ext_bwidth, NULL, "borderwidth", NULL, NULL),
236 STRG (Rs_int_bwidth, "internalBorder", "b", "number", "internal border in pixels"), 239 STRG (Rs_int_bwidth, "internalBorder", "b", "number", "internal border in pixels"),
237 BOOL (Rs_borderLess, "borderLess", "bl", Opt_borderLess, "borderless window"), 240 BOOL (Rs_borderLess, "borderLess", "bl", Opt_borderLess, 0, "borderless window"),
238 BOOL (Rs_skipBuiltinGlyphs, "skipBuiltinGlyphs", "sbg", Opt_skipBuiltinGlyphs, "do not use internal glyphs"),
239 STRG (Rs_lineSpace, "lineSpace", "lsp", "number", "number of extra pixels between rows"), 241 STRG (Rs_lineSpace, "lineSpace", "lsp", "number", "number of extra pixels between rows"),
242 STRG (Rs_letterSpace, "letterSpace", "letsp", "number", "letter spacing adjustment"),
243#endif
244#ifdef BUILTIN_GLYPHS
245 BOOL (Rs_skipBuiltinGlyphs, "skipBuiltinGlyphs", "sbg", Opt_skipBuiltinGlyphs, 0, "do not use internal glyphs"),
240#endif 246#endif
241#ifdef POINTER_BLANK 247#ifdef POINTER_BLANK
242 RSTRG (Rs_pointerBlankDelay, "pointerBlankDelay", "number"), 248 RSTRG (Rs_pointerBlankDelay, "pointerBlankDelay", "number"),
243#endif 249#endif
244#ifndef NO_BACKSPACE_KEY 250#ifndef NO_BACKSPACE_KEY
245 RSTRG (Rs_backspace_key, "backspacekey", "string"), 251 RSTRG (Rs_backspace_key, "backspacekey", "string"),
246#endif 252#endif
247#ifndef NO_DELETE_KEY 253#ifndef NO_DELETE_KEY
248 RSTRG (Rs_delete_key, "deletekey", "string"), 254 RSTRG (Rs_delete_key, "deletekey", "string"),
249#endif 255#endif
250 RSTRG (Rs_selectstyle, "selectstyle", "mode"),
251#ifdef PRINTPIPE 256#ifdef PRINTPIPE
252 RSTRG (Rs_print_pipe, "print-pipe", "string"), 257 RSTRG (Rs_print_pipe, "print-pipe", "string"),
253#endif 258#endif
254 STRG (Rs_modifier, "modifier", "mod", "modifier", "meta modifier = alt|meta|hyper|super|mod1|...|mod5"), 259 STRG (Rs_modifier, "modifier", "mod", "modifier", "meta modifier = alt|meta|hyper|super|mod1|...|mod5"),
255#ifdef CUTCHAR_RESOURCE
256 RSTRG (Rs_cutchars, "cutchars", "string"), 260 RSTRG (Rs_cutchars, "cutchars", "string"),
257#endif /* CUTCHAR_RESOURCE */
258 RSTRG (Rs_answerbackstring, "answerbackString", "string"), 261 RSTRG (Rs_answerbackstring, "answerbackString", "string"),
259#ifndef NO_SECONDARY_SCREEN 262#ifndef NO_SECONDARY_SCREEN
260 BOOL (Rs_secondaryScreen, "secondaryScreen", "ssc", Opt_secondaryScreen, "enable secondary screen"), 263 BOOL (Rs_secondaryScreen, "secondaryScreen", "ssc", Opt_secondaryScreen, 0, "enable secondary screen"),
261 BOOL (Rs_secondaryScroll, "secondaryScroll", "ssr", Opt_secondaryScroll, "enable secondary screen scroll"), 264 BOOL (Rs_secondaryScroll, "secondaryScroll", "ssr", Opt_secondaryScroll, 0, "enable secondary screen scroll"),
262#endif 265#endif
263#if ENABLE_PERL 266#if ENABLE_PERL
264 RSTRG (Rs_perl_lib, "perl-lib", "string"), //, "colon-separated directories with extension scripts"),TODO 267 RSTRG (Rs_perl_lib, "perl-lib", "string"), //, "colon-separated directories with extension scripts"),TODO
265 RSTRG (Rs_perl_eval, "perl-eval", "perl-eval"), // "string", "code to be evaluated after all extensions have been loaded"),TODO 268 RSTRG (Rs_perl_eval, "perl-eval", "perl-eval"), // "string", "code to be evaluated after all extensions have been loaded"),TODO
266 RSTRG (Rs_perl_ext_1, "perl-ext-common", "string"), //, "colon-separated list of perl extensions to enable"),TODO 269 RSTRG (Rs_perl_ext_1, "perl-ext-common", "string"), //, "colon-separated list of perl extensions to enable"),TODO
267 STRG (Rs_perl_ext_2, "perl-ext", "pe", "string", "colon-separated list of perl extensions to enable for this instance"), 270 STRG (Rs_perl_ext_2, "perl-ext", "pe", "string", "colon-separated list of perl extensions to enable for this instance"),
268#endif 271#endif
269#if 0 && TODO 272#if ISO_14755
270#if !defined(NO_RESOURCES) && defined(USE_XGETDEFAULT) 273 BOOL (Rs_iso14755, "iso14755", NULL, Opt_iso14755, 0, NULL),
274 BOOL (Rs_iso14755_52, "iso14755_52", NULL, Opt_iso14755_52, 0, NULL),
275#endif
276#ifndef NO_RESOURCES
271 INFO ("xrm", "string", "X resource"), 277 RINFO ("xrm", "string"),
272#endif 278#endif
279#ifdef KEYSYM_RESOURCE
280 RINFO ("keysym.sym", "keysym"),
273#endif 281#endif
274 INFO ("e", "command arg ...", "command to execute") 282 INFO ("e", "command arg ...", "command to execute")
275 }; 283 };
276 284
277#undef INFO 285#undef INFO
286#undef RINFO
278#undef STRG 287#undef STRG
279#undef RSTRG 288#undef RSTRG
280#undef SWCH 289#undef SWCH
281#undef BOOL 290#undef BOOL
282/*}}} */
283 291
284static const char releasestring[] = "rxvt-unicode (" RXVTNAME ") v" VERSION " - released: " DATE "\n"; 292static const char releasestring[] = "rxvt-unicode (" RXVTNAME ") v" VERSION " - released: " DATE "\n";
285static const char optionsstring[] = "options: " 293static const char optionsstring[] = "options: "
294#if ENABLE_PERL
295 "perl,"
296#endif
286#if XFT 297#if XFT
287 "xft," 298 "xft,"
288#endif 299#endif
289#if ENABLE_STYLES 300#if ENABLE_STYLES
290 "styles," 301 "styles,"
… …
319#endif 330#endif
320 "," 331 ","
321#if OFF_FOCUS_FADING 332#if OFF_FOCUS_FADING
322 "fade," 333 "fade,"
323#endif 334#endif
324#if defined(XPM_BACKGROUND)
325 "XPM,"
326#endif
327#if defined(TRANSPARENT) 335#if defined(ENABLE_TRANSPARENCY)
328 "transparent," 336 "transparent,"
329#endif
330#if TINTING
331 "tint," 337 "tint,"
332#endif 338#endif
333#if defined(UTMP_SUPPORT) 339#if HAVE_PIXBUF
334 "utmp," 340 "pixbuf,"
335#endif
336#if defined(MENUBAR)
337 "menubar,"
338#endif 341#endif
339#if defined(USE_XIM) 342#if defined(USE_XIM)
340 "XIM," 343 "XIM,"
341#endif 344#endif
342 "scrollbars="
343#if !defined(HAVE_SCROLLBARS)
344 "NONE"
345#else
346# if defined(PLAIN_SCROLLBAR)
347 "plain"
348# if defined(RXVT_SCROLLBAR) || defined(NEXT_SCROLLBAR) || defined(XTERM_SCROLLBAR)
349 "+"
350# endif
351# endif
352# if defined(RXVT_SCROLLBAR)
353 "rxvt"
354# if defined(NEXT_SCROLLBAR) || defined(XTERM_SCROLLBAR)
355 "+"
356# endif
357# endif
358# if defined(NEXT_SCROLLBAR)
359 "NeXT"
360# if defined(XTERM_SCROLLBAR)
361 "+"
362# endif
363# endif
364# if defined(XTERM_SCROLLBAR)
365 "xterm"
366# endif
367#endif
368 ","
369#if defined(NO_BACKSPACE_KEY) 345#if defined(NO_BACKSPACE_KEY)
370 "no_backspace," 346 "no_backspace,"
371#endif 347#endif
372#if defined(NO_DELETE_KEY) 348#if defined(NO_DELETE_KEY)
373 "no_delete," 349 "no_delete,"
374#endif 350#endif
375#if EIGHT_BIT_CONTROLS 351#if EIGHT_BIT_CONTROLS
376 "8bitctrls," 352 "8bitctrls,"
377#endif 353#endif
378#if !defined(NO_STRINGS)
379 "strings,"
380#endif
381#if defined(ENABLE_FRILLS) 354#if defined(ENABLE_FRILLS)
382 "frills," 355 "frills,"
383#endif 356#endif
384#if defined(PREFER_24BIT)
385 "24bit,"
386#endif
387#if defined(SELECTION_SCROLLING) 357#if defined(SELECTION_SCROLLING)
388 "selectionscrolling," 358 "selectionscrolling,"
389#endif 359#endif
390#if MOUSE_WHEEL 360#if MOUSE_WHEEL
391 "wheel," 361 "wheel,"
… …
401#endif 371#endif
402#if defined(POINTER_BLANK) 372#if defined(POINTER_BLANK)
403 "pointerBlank," 373 "pointerBlank,"
404#endif 374#endif
405#if defined(NO_RESOURCES) 375#if defined(NO_RESOURCES)
406 "NoResources" 376 "NoResources,"
407#else
408# if defined(USE_XGETDEFAULT)
409 "XGetDefaults"
410# else
411 ".Xdefaults"
412# endif 377#endif
378 "scrollbars=plain"
379#if defined(RXVT_SCROLLBAR)
380 "+rxvt"
381#endif
382#if defined(NEXT_SCROLLBAR)
383 "+NeXT"
384#endif
385#if defined(XTERM_SCROLLBAR)
386 "+xterm"
413#endif 387#endif
414 "\nUsage: "; /* Usage */ 388 "\nUsage: "; /* Usage */
415 389
416#define INDENT 18 390#define INDENT 28
391
392const char rxvt_term::resval_undef [] = "<undef>";
393const char rxvt_term::resval_on [] = "on";
394const char rxvt_term::resval_off [] = "off";
417 395
418/*{{{ usage: */ 396/*{{{ usage: */
419/*----------------------------------------------------------------------*/ 397/*----------------------------------------------------------------------*/
420static void 398void
421rxvt_usage (int type) 399rxvt_term::rxvt_usage (int type)
422{ 400{
423 unsigned int i, col; 401 unsigned int i, col;
424 402
425 rxvt_log ("%s%s%s", releasestring, optionsstring, RESNAME); 403 rxvt_log ("%s%s%s", releasestring, optionsstring, RESNAME);
426 404
427 switch (type) 405 switch (type)
428 { 406 {
429 case 0: /* brief listing */ 407 case 0: /* brief listing */
430 rxvt_log (" [-help] [--help]\n"); 408 rxvt_log (" [-help] [--help]\n");
431 409
432 for (col = 1, i = 0; i < optList_size; i++) 410 for (col = 1, i = 0; i < ecb_array_length (optList); i++)
433 if (optList[i].desc != NULL) 411 if (optList[i].desc != NULL)
434 { 412 {
435 int len = 0; 413 int len = 0;
436 414
437 if (!optList_isBool (i)) 415 if (optList[i].arg)
416 len = strlen (optList[i].arg) + 1;
417
418 assert (optList[i].opt != NULL);
419 len += 4 + strlen (optList[i].opt) + (optList_isBool (i) ? 2 : 0);
420 col += len;
421
422 if (col > 79)
438 { 423 {
439 len = optList_strlen (i);
440 if (len > 0)
441 len++; /* account for space */
442 }
443#ifdef DEBUG_STRICT
444 assert (optList[i].opt != NULL);
445#endif
446 len += 4 + strlen (optList[i].opt) + (optList_isBool (i) ? 2: 0);
447 col += len;
448 if (col > 79)
449 { /* assume regular width */ 424 /* assume regular width */
450 rxvt_log ("\n"); 425 rxvt_log ("\n");
451 col = 1 + len; 426 col = 1 + len;
452 } 427 }
453 428
454 rxvt_log (" [-%s%s", (optList_isBool (i) ? "/+" : ""), optList[i].opt); 429 rxvt_log (" [-%s%s", (optList_isBool (i) ? "/+" : ""), optList[i].opt);
430
455 if (optList_strlen (i)) 431 if (optList[i].arg)
456 rxvt_log (" %s]", optList[i].arg); 432 rxvt_log (" %s]", optList[i].arg);
457 else 433 else
458 rxvt_log ("]"); 434 rxvt_log ("]");
459 } 435 }
460 break; 436 break;
461 437
462 case 1: /* full command-line listing */ 438 case 1: /* full command-line listing */
463 rxvt_log (" [options] [-e command args]\n\nwhere options include:\n"); 439 rxvt_log (" [options] [-e command args]\n\nwhere options include:\n");
464 440
465 for (i = 0; i < optList_size; i++) 441 for (i = 0; i < ecb_array_length (optList); i++)
466 if (optList[i].desc != NULL) 442 if (optList[i].desc != NULL)
467 { 443 {
468#ifdef DEBUG_STRICT
469 assert (optList[i].opt != NULL); 444 assert (optList[i].opt != NULL);
470#endif
471 rxvt_log (" %s%s %-*s%s%s\n", 445 rxvt_log (" %s%s %-*s%s%s\n",
472 (optList_isBool (i) ? "-/+" : "-"), optList[i].opt, 446 (optList_isBool (i) ? "-/+" : "-"), optList[i].opt,
473 (INDENT - strlen (optList[i].opt) 447 (INDENT - strlen (optList[i].opt)
474 + (optList_isBool (i) ? 0 : 2)), 448 + (optList_isBool (i) ? 0 : 2)),
475 (optList[i].arg ? optList[i].arg : ""), 449 (optList[i].arg ? optList[i].arg : ""),
476 (optList_isBool (i) ? "turn on/off " : ""), 450 (optList_isBool (i) ? "turn on/off " : ""),
477 optList[i].desc); 451 optList[i].desc);
478 } 452 }
453
454#if ENABLE_PERL
455 rxvt_perl.init (this);
456 rxvt_perl.usage (this, 1);
457#endif
458
479 rxvt_log ("\n --help to list long-options"); 459 rxvt_log ("\n --help to list long-options");
480 break; 460 break;
481 461
482 case 2: /* full resource listing */ 462 case 2: /* full resource listing */
483 rxvt_log (" [options] [-e command args]\n\n" 463 rxvt_log (" [options] [-e command args]\n\n"
484 "where resources (long-options) include:\n"); 464 "where resources (long-options) include:\n");
485 465
486 for (i = 0; i < optList_size; i++) 466 for (i = 0; i < ecb_array_length (optList); i++)
487 if (optList[i].kw != NULL) 467 if (optList[i].kw != NULL)
488 rxvt_log (" %s: %*s%s\n", 468 rxvt_log (" %s: %*s%s\n",
489 optList[i].kw, 469 optList[i].kw,
490 (INDENT - strlen (optList[i].kw)), "", /* XXX */ 470 (INDENT + 2 - strlen (optList[i].kw)), "", /* XXX */
491 (optList_isBool (i) ? "boolean" : optList[i].arg)); 471 (optList_isBool (i) ? "boolean" : optList[i].arg));
492#ifdef KEYSYM_RESOURCE 472
493 rxvt_log (" " "keysym.sym" ": %*s%s\n", 473#if ENABLE_PERL
494 (INDENT - sizeof ("keysym.sym") + 1), "", /* XXX */ 474 rxvt_perl.init (this);
495 "keysym"); 475 rxvt_perl.usage (this, 2);
496#endif 476#endif
477
497 rxvt_log ("\n -help to list options"); 478 rxvt_log ("\n -help to list options");
498 break; 479 break;
499 } 480 }
500 481
501 rxvt_log ("\n\n"); 482 rxvt_log ("\n\n");
502 rxvt_exit_failure (); 483 rxvt_exit_failure ();
503 /* NOTREACHED */
504} 484}
505 485
506/*}}} */ 486/*}}} */
507 487
508/*{{{ get command-line options before getting resources */ 488/*{{{ get command-line options before getting resources */
509void 489const char **
510rxvt_term::get_options (int argc, const char *const *argv) 490rxvt_term::get_options (int argc, const char *const *argv)
511{ 491{
512 int i, bad_option = 0; 492 int i, bad_option = 0;
513 static const char On[3] = "ON", Off[4] = "OFF";
514 493
515 for (i = 1; i < argc; i++) 494 for (i = 1; i < argc; i++)
516 { 495 {
517 unsigned int entry, longopt = 0; 496 unsigned int entry, longopt = 0;
518 const char *flag, *opt; 497 const char *opt;
498 int flag;
519 499
520 opt = argv[i]; 500 opt = argv[i];
521#ifdef DEBUG_RESOURCES 501
522 fprintf (stderr, "argv[%d] = %s: ", i, opt);
523#endif
524 if (*opt == '-') 502 if (*opt == '-')
525 { 503 {
526 flag = On; 504 flag = 1;
505
527 if (*++opt == '-') 506 if (*++opt == '-')
528 longopt = *opt++; /* long option */ 507 longopt = *opt++; /* long option */
529 } 508 }
530 else if (*opt == '+') 509 else if (*opt == '+')
531 { 510 {
532 flag = Off; 511 flag = 0;
512
533 if (*++opt == '+') 513 if (*++opt == '+')
534 longopt = *opt++; /* long option */ 514 longopt = *opt++; /* long option */
535 } 515 }
536 else 516 else
537 { 517 {
… …
540 continue; 520 continue;
541 } 521 }
542 522
543 if (!strcmp (opt, "help")) 523 if (!strcmp (opt, "help"))
544 rxvt_usage (longopt ? 2 : 1); 524 rxvt_usage (longopt ? 2 : 1);
525
545 if (!strcmp (opt, "h")) 526 if (!strcmp (opt, "h"))
546 rxvt_usage (0); 527 rxvt_usage (0);
547 528
548 /* feature: always try to match long-options */ 529 /* feature: always try to match long-options */
549 for (entry = 0; entry < optList_size; entry++) 530 for (entry = 0; entry < ecb_array_length (optList); entry++)
550 if ((optList[entry].kw && !strcmp (opt, optList[entry].kw)) 531 if ((optList[entry].kw && !strcmp (opt, optList[entry].kw))
551 || (!longopt 532 || (!longopt
552 && optList[entry].opt && !strcmp (opt, optList[entry].opt))) 533 && optList[entry].opt && !strcmp (opt, optList[entry].opt)))
553 break; 534 break;
554 535
555 if (entry < optList_size) 536 if (entry < ecb_array_length (optList)
537 && !optList_isInfo (entry))
556 { 538 {
557 if (optList_isReverse (entry)) 539 if (optList_isReverse (entry))
558 flag = flag == On ? Off : On; 540 flag = !flag;
559 541
560 if (optList_strlen (entry)) 542 if (optList_isString (entry))
561 { 543 {
562 /* 544 /*
563 * special cases are handled in main.c:main () to allow 545 * special cases are handled in init_resources () to allow
564 * X resources to set these values before we settle for 546 * X resources to set these values before we settle for
565 * default values 547 * default values
566 */ 548 */
567 549
568 if (optList[entry].doff != -1) 550 if (optList[entry].doff != -1)
551 {
552 if (flag && i + 1 == argc)
553 rxvt_fatal ("option '%s' requires an argument, aborting.\n", argv [i]);
554
569 rs[optList[entry].doff] = flag == On && argv[i+1] 555 rs[optList[entry].doff] = flag ? argv[++i] : resval_undef;
570 ? argv[++i] : 0; 556 }
571 } 557 }
572 else 558 else
559 {
573 { /* boolean value */ 560 /* boolean value */
574#ifdef DEBUG_RESOURCES 561 set_option (optList[entry].index, flag);
575 fprintf (stderr, "boolean (%s,%s) = %s\n",
576 optList[entry].opt, optList[entry].kw, flag);
577#endif
578 if (flag == On)
579 SET_OPTION (optList[entry].flag & Optflag_mask);
580 else
581 CLR_OPTION (optList[entry].flag & Optflag_mask);
582 562
583 if (optList[entry].doff != -1) 563 if (optList[entry].doff != -1)
584 rs[optList[entry].doff] = flag; 564 rs[optList[entry].doff] = flag ? resval_on : resval_off;
585 } 565 }
586 } 566 }
567#ifndef NO_RESOURCES
568 else if (!strcmp (opt, "xrm"))
569 {
570 if (i + 1 < argc)
571 XrmPutLineResource (&option_db, argv[++i]);
572 }
573#endif
574#ifdef KEYSYM_RESOURCE
575 else if (!strncmp (opt, "keysym.", sizeof ("keysym.") - 1))
576 {
577 if (i + 1 < argc)
578 {
579 char *res = rxvt_temp_buf<char> (strlen (opt) + strlen (argv[++i]) + 6);
580 sprintf (res, "*.%s: %s\n", opt, argv[i]);
581 XrmPutLineResource (&option_db, res);
582 }
583 }
584#endif
585 else if (!strcmp (opt, "e"))
586 {
587 if (i + 1 < argc)
588 return (const char **)argv + i + 1;
589
590 rxvt_warn ("option '-e' requires an argument, aborting.\n");
591 bad_option = 1;
592 }
587 else 593 else
588#ifdef KEYSYM_RESOURCE 594 {
589 /* if (!strncmp (opt, "keysym.", sizeof ("keysym.") - 1)) */ 595#if ENABLE_PERL
590 if (rxvt_Str_match (opt, "keysym.")) 596 rxvt_perl.init (this);
597
598 if (int flags = rxvt_perl.parse_resource (this, opt, true, longopt, flag, argv [i + 1]))
591 { 599 {
592 const char *str = argv[++i]; 600 if (flags & rxvt_perl.RESOURCE_ARG)
593 601 {
594 if (str != NULL) 602 if (i + 1 == argc)
595 parse_keysym (opt + sizeof ("keysym.") - 1, str); 603 {
604 rxvt_warn ("option '%s' requires an argument.\n", argv [i]);
605 bad_option = 1;
606 }
607 else
608 ++i;
609 }
596 } 610 }
597 else 611 else
598#endif 612#endif
599 { 613 {
600 bad_option = 1;
601 rxvt_warn ("\"%s\": unknown or malformed option.\n", opt); 614 rxvt_warn ("\"%s\": unknown or malformed option.\n", opt);
615 bad_option = 1;
602 } 616 }
617 }
603 } 618 }
604 619
605 if (bad_option) 620 if (bad_option)
606 rxvt_usage (0); 621 rxvt_usage (0);
622
623 return 0;
607} 624}
608 625
609/*}}} */ 626/*}}} */
610 627
611#ifndef NO_RESOURCES 628#ifndef NO_RESOURCES
… …
616 * Define key from XrmEnumerateDatabase. 633 * Define key from XrmEnumerateDatabase.
617 * quarks will be something like 634 * quarks will be something like
618 * "rxvt" "keysym" "0xFF01" 635 * "rxvt" "keysym" "0xFF01"
619 * value will be a string 636 * value will be a string
620 */ 637 */
621/* ARGSUSED */ 638static int
622int
623rxvt_define_key (XrmDatabase *database __attribute__((unused)), 639rxvt_define_key (XrmDatabase *database ecb_unused,
624 XrmBindingList bindings __attribute__((unused)), 640 XrmBindingList bindings ecb_unused,
625 XrmQuarkList quarks, 641 XrmQuarkList quarks,
626 XrmRepresentation *type __attribute__((unused)), 642 XrmRepresentation *type ecb_unused,
627 XrmValue *value, 643 XrmValue *value,
628 XPointer closure __attribute__((unused))) 644 XPointer closure)
629{ 645{
646 rxvt_term *term = (rxvt_term *)closure;
630 int last; 647 int last;
631 648
632 for (last = 0; quarks[last] != NULLQUARK; last++) /* look for last quark in list */ 649 for (last = 0; quarks[last] != NULLQUARK; last++) /* look for last quark in list */
633 ; 650 ;
634 651
635 last--; 652 last--;
636 GET_R->parse_keysym (XrmQuarkToString (quarks[last]), (char *)value->addr);//D//TODO 653 term->bind_action (XrmQuarkToString (quarks[last]), (char *)value->addr);
637 return False; 654 return False;
638} 655}
639 656
640/* 657/*
641 * look for something like this (XK_Delete) 658 * look for something like this (XK_Delete)
642 * rxvt*keysym.0xFFFF: "\177" 659 * rxvt*keysym.0xFFFF: "\177"
643 *
644 * arg will be
645 * NULL for ~/.Xdefaults and
646 * non-NULL for command-line options (need to allocate)
647 */ 660 */
648#define NEWARGLIM 500 /* `reasonable' size */
649 661
650struct keysym_vocabulary_t 662struct keysym_vocabulary_t
651{ 663{
652 const char *name; 664 const char *name;
653 unsigned short len; 665 unsigned short len;
654 unsigned short value; 666 unsigned short value;
655}; 667};
656keysym_vocabulary_t keysym_vocabulary[] = 668static const keysym_vocabulary_t keysym_vocabulary[] =
657{ 669{
658 { "ISOLevel3", 9, Level3Mask }, 670 { "ISOLevel3", 9, Level3Mask },
659 { "AppKeypad", 9, AppKeypadMask }, 671 { "AppKeypad", 9, AppKeypadMask },
660 { "Control", 7, ControlMask }, 672 { "Control", 7, ControlMask },
661 { "NumLock", 7, NumLockMask }, 673 { "NumLock", 7, NumLockMask },
… …
681 { "4", 1, Mod4Mask }, 693 { "4", 1, Mod4Mask },
682 { "5", 1, Mod5Mask }, 694 { "5", 1, Mod5Mask },
683}; 695};
684 696
685int 697int
686rxvt_term::parse_keysym (const char *str, const char *arg) 698rxvt_term::bind_action (const char *str, const char *arg)
687{ 699{
688 int n, sym; 700 int sym;
689 unsigned int state = 0; 701 unsigned int state = 0;
690 const char *pmodend = NULL; 702 const char *key = strrchr (str, '-');
691 char *newarg = NULL;
692 char newargstr[NEWARGLIM];
693 703
694 if (arg == NULL) 704 if (!key)
695 { 705 key = str;
696 if ((n = rxvt_Str_match (str, "keysym.")) == 0)
697 return 0;
698
699 str += n; /* skip `keysym.' */
700 if ((pmodend = strchr (str, ':')) < str)
701 return -1;
702 }
703 else 706 else
704 pmodend = str + strlen(str); 707 key++;
705 708
706 for (--pmodend; str < pmodend; --pmodend) 709 // string or key is empty
707 if (*pmodend == '-') 710 if (*arg == '\0' || *key == '\0')
708 break; 711 return -1;
709 712
713 // parse modifiers
710 while (str < pmodend) 714 while (str < key)
711 { 715 {
712 unsigned int i; 716 unsigned int i;
713 717
714 for (i=0; i < sizeof (keysym_vocabulary) / sizeof (keysym_vocabulary_t); ++i) 718 for (i = 0; i < ecb_array_length (keysym_vocabulary); ++i)
715 { 719 {
716 if (strncmp (str, keysym_vocabulary [i].name, keysym_vocabulary [i].len) == 0) 720 if (strncmp (str, keysym_vocabulary [i].name, keysym_vocabulary [i].len) == 0)
717 { 721 {
718 state |= keysym_vocabulary[i].value; 722 state |= keysym_vocabulary[i].value;
719 str += keysym_vocabulary[i].len; 723 str += keysym_vocabulary[i].len;
720 break; 724 break;
721 } 725 }
722 } 726 }
723 727
724 if (i >= sizeof (keysym_vocabulary) / sizeof (keysym_vocabulary_t)) 728 if (i >= ecb_array_length (keysym_vocabulary))
725 return -1; 729 return -1;
726 730
727 if (*str == '-') 731 if (*str == '-')
728 ++str; 732 ++str;
729 } 733 }
730 734
731 /* some scanf () have trouble with a 0x prefix */ 735 // convert keysym name to keysym number
732 if (str[0] == '0' && toupper (str[1]) == 'X') 736 if ((sym = XStringToKeysym (str)) == None)
733 { 737 {
734 str += 2; 738 // fallback on hexadecimal parsing
735 739 char *end;
740 sym = strtol (str, &end, 16);
736 if (arg) 741 if (*end)
737 {
738 if (sscanf (str, (strchr (str, ':') ? "%x:" : "%x"), &sym) != 1)
739 return -1;
740 }
741 else
742 {
743 if (sscanf (str, "%x:", &sym) != 1)
744 return -1;
745
746 /* cue to ':', it's there since sscanf () worked */
747 strncpy (newargstr, strchr (str, ':') + 1, NEWARGLIM - 1);
748 newargstr[NEWARGLIM - 1] = '\0';
749 newarg = newargstr;
750 }
751 }
752 else
753 {
754 /*
755 * convert keysym name to keysym number
756 */
757 strncpy (newargstr, str, NEWARGLIM - 1);
758 newargstr[NEWARGLIM - 1] = '\0';
759
760 if (arg == NULL)
761 {
762 if ((newarg = strchr (newargstr, ':')) == NULL)
763 return -1;
764
765 *newarg++ = '\0'; /* terminate keysym name */
766 }
767
768 if ((sym = XStringToKeysym (newargstr)) == None)
769 return -1; 742 return -1;
770 } 743 }
771 744
772 if (newarg == NULL) 745 wchar_t *ws = rxvt_mbstowcs (arg);
773 { 746 if (!HOOK_INVOKE ((this, HOOK_REGISTER_COMMAND, DT_INT, sym, DT_INT, state, DT_WCS_LEN, ws, wcslen (ws), DT_END)))
774 strncpy (newargstr, arg, NEWARGLIM - 1);
775 newargstr[NEWARGLIM - 1] = '\0';
776 newarg = newargstr;
777 }
778
779 rxvt_Str_trim (newarg);
780 if (*newarg == '\0' || (n = rxvt_Str_escaped (newarg)) == 0)
781 return -1;
782
783 keyboard->register_user_translation (sym, state, newarg); 747 keyboard->register_user_translation (sym, state, ws);
748
749 free (ws);
784 return 1; 750 return 1;
785} 751}
786 752
787# endif /* KEYSYM_RESOURCE */ 753# endif /* KEYSYM_RESOURCE */
754#endif /* NO_RESOURCES */
788 755
789# ifndef USE_XGETDEFAULT 756static char *
790/*{{{ rxvt_get_xdefaults () */ 757get_res (XrmDatabase database, const char *program, const char *option)
791/*
792 * the matching algorithm used for memory-save fake resources
793 */
794void
795rxvt_term::get_xdefaults (FILE *stream, const char *name)
796{ 758{
797 unsigned int len; 759 char resource[512];
798 char *str, buffer[256]; 760 char *type;
761 XrmValue result;
799 762
800 if (stream == NULL) 763 snprintf (resource, sizeof (resource), "%s.%s", program, option);
801 return; 764 XrmGetResource (database, resource, resource, &type, &result);
802 765
803 len = strlen (name); 766 return result.addr;
804 while ((str = fgets (buffer, sizeof (buffer), stream)) != NULL) 767}
768
769const char *
770rxvt_term::x_resource (const char *name)
771{
772 XrmDatabase database = XrmGetDatabase (dpy);
773
774 const char *p = get_res (database, rs[Rs_name], name);
775 const char *p0 = get_res (database, "!INVALIDPROGRAMMENAMEDONTMATCH!", name);
776
777 if (p == NULL || (p0 && strcmp (p, p0) == 0))
805 { 778 {
806 unsigned int entry, n; 779 p = get_res (database, RESCLASS, name);
807 780#ifdef RESFALLBACK
808 while (*str && isspace (*str)) 781 if (p == NULL || (p0 && strcmp (p, p0) == 0))
809 str++; /* leading whitespace */ 782 p = get_res (database, RESFALLBACK, name);
810 783#endif
811 if ((str[len] != '*' && str[len] != '.')
812 || (len && strncmp (str, name, len)))
813 continue;
814 str += (len + 1); /* skip `name*' or `name.' */
815
816# ifdef KEYSYM_RESOURCE
817 if (!parse_keysym (str, NULL))
818# endif /* KEYSYM_RESOURCE */
819 for (entry = 0; entry < optList_size; entry++)
820 {
821 const char *kw = optList[entry].kw;
822
823 if (kw == NULL)
824 continue;
825
826 n = strlen (kw);
827 if (str[n] == ':' && rxvt_Str_match (str, kw))
828 {
829 /* skip `keyword:' */
830 str += n + 1;
831 rxvt_Str_trim (str);
832 n = strlen (str);
833
834 if (n && rs[optList[entry].doff] == NULL)
835 {
836 /* not already set */
837 int s;
838 char *p = 0;
839
840 for (int o = 0;;)
841 {
842 p = (char *)rxvt_realloc (p, o + n + 1);
843 memcpy (p + o, str, n);
844 o += n;
845 p[o] = 0;
846
847 if (o == 0 || p[o - 1] != '\\') // continuation line
848 break;
849
850 o--; // eat "\"
851
852 if ((str = fgets (buffer, sizeof (buffer), stream)) == NULL)
853 break;
854
855 rxvt_Str_trim (str);
856 n = strlen (str);
857 }
858
859 rs[optList[entry].doff] = p;
860 allocated.push_back (p);
861
862 if (optList_isBool (entry))
863 {
864 s = strcasecmp (str, "true") == 0
865 || strcasecmp (str, "yes") == 0
866 || strcasecmp (str, "on") == 0
867 || strcmp (str, "1") == 0;
868
869 if (optList_isReverse (entry))
870 s = !s;
871
872 if (s)
873 SET_OPTION (optList[entry].flag & Optflag_mask);
874 else
875 CLR_OPTION (optList[entry].flag & Optflag_mask);
876 }
877 }
878
879 break;
880 }
881 }
882 } 784 }
883 785
884 rewind (stream); 786 if (p == NULL && p0)
787 p = p0;
788
789 return p;
885} 790}
886 791
887/*}}} */
888# endif /* ! USE_XGETDEFAULT */
889#endif /* NO_RESOURCES */
890
891/*{{{ read the resources files */
892/*
893 * using XGetDefault () or the hand-rolled replacement
894 */
895/* ARGSUSED */
896void 792void
897rxvt_term::extract_resources () 793rxvt_term::extract_resources ()
898{ 794{
899 dDisp;
900
901#ifndef NO_RESOURCES 795#ifndef NO_RESOURCES
902 796 XrmDatabase database = XrmGetDatabase (dpy);
903 char *homedir = (char *)getenv ("HOME");
904 char fname[1024];
905
906# if defined XAPPLOADDIR
907# if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
908 /* Compute the path of the possibly available localized Rxvt file */
909 char localepath[1024];
910
911 if (locale)
912 snprintf (localepath, sizeof (localepath), XAPPLOADDIRLOCALE "/" RESCLASS, locale);
913 else
914 localepath[0] = 0;
915# endif
916# endif
917
918# ifdef USE_XGETDEFAULT
919 /*
920 * get resources using the X library function
921 */
922 int entry;
923
924# ifdef XrmEnumOneLevel
925 char *displayResource, *xe;
926 XrmName name_prefix[3];
927 XrmClass class_prefix[3];
928 XrmDatabase database, rdb1;
929
930 XrmInitialize ();
931 database = NULL;
932
933 // for ordering, see for example http://www.faqs.org/faqs/Xt-FAQ/ Subject: 20
934
935 // 6. System wide per application default file.
936 /* Add in Rxvt file */
937# if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
938 if (*localepath
939 && ((rdb1 = XrmGetFileDatabase (localepath))
940 || (rdb1 = XrmGetFileDatabase (XAPPLOADDIR "/" RESCLASS))))
941# endif
942 XrmMergeDatabases (rdb1, &database); 797 XrmMergeDatabases (option_db, &database);
943 798 option_db = NULL;
944 /* Add in $XAPPLRESDIR/Rxvt only; not bothering with XUSERFILESEARCHPATH */
945 if ((xe = (char *)getenv ("XAPPLRESDIR")))
946 {
947 snprintf (fname, sizeof (fname), "%s/%s", xe, RESCLASS);
948
949 if ((rdb1 = XrmGetFileDatabase (fname)))
950 XrmMergeDatabases (rdb1, &database);
951 }
952
953 // 5. User's per application default file.
954 // none
955
956 // 4. User's defaults file.
957 /* Get any Xserver defaults */
958 displayResource = XResourceManagerString (disp);
959 if (displayResource != NULL)
960 {
961 if ((rdb1 = XrmGetStringDatabase (displayResource)))
962 XrmMergeDatabases (rdb1, &database);
963 }
964 else if (homedir)
965 {
966 snprintf (fname, sizeof (fname), "%s/.Xdefaults", homedir);
967
968 if ((rdb1 = XrmGetFileDatabase (fname)))
969 XrmMergeDatabases (rdb1, &database);
970 }
971
972 /* Get screen specific resources */
973 displayResource = XScreenResourceString (ScreenOfDisplay (disp, display->screen));
974 if (displayResource != NULL)
975 {
976 if ((rdb1 = XrmGetStringDatabase (displayResource)))
977 /* Merge with screen-independent resources */
978 XrmMergeDatabases (rdb1, &database);
979
980 XFree (displayResource);
981 }
982
983 // 3. User's per host defaults file
984 /* Add in XENVIRONMENT file */
985 if ((xe = (char *)getenv ("XENVIRONMENT"))
986 && (rdb1 = XrmGetFileDatabase (xe)))
987 XrmMergeDatabases (rdb1, &database);
988 else if (homedir)
989 {
990 struct utsname un;
991
992 if (!uname (&un))
993 {
994 snprintf (fname, sizeof (fname), "%s/.Xdefaults-%s", homedir, un.nodename);
995
996 if ((rdb1 = XrmGetFileDatabase (fname)))
997 XrmMergeDatabases (rdb1, &database);
998 }
999 }
1000
1001 XrmSetDatabase (disp, database);
1002# endif
1003
1004 /* 799 /*
1005 * Query resources for options that affect us 800 * Query resources for options that affect us
1006 */ 801 */
1007 for (entry = 0; entry < optList_size; entry++) 802 for (int entry = 0; entry < ecb_array_length (optList); entry++)
1008 { 803 {
1009 int s; 804 int s;
1010 char *p, *p0;
1011 const char *kw = optList[entry].kw; 805 const char *kw = optList[entry].kw;
1012 806
1013 if (kw == NULL || rs[optList[entry].doff] != NULL) 807 if (kw == NULL || rs[optList[entry].doff] != NULL)
1014 continue; /* previously set */ 808 continue; // previously set
1015 809
1016 p = XGetDefault (disp, rs[Rs_name], kw); 810 const char *p = x_resource (kw);
1017 p0 = XGetDefault (disp, "!INVALIDPROGRAMMENAMEDONTMATCH!", kw);
1018 if (p == NULL || (p0 && strcmp (p, p0) == 0))
1019 {
1020 p = XGetDefault (disp, RESCLASS, kw);
1021#ifdef RESFALLBACK
1022 if (p == NULL || (p0 && strcmp (p, p0) == 0))
1023 p = XGetDefault (disp, RESFALLBACK, kw);
1024#endif
1025 }
1026
1027 if (p == NULL && p0)
1028 p = p0;
1029 811
1030 if (p) 812 if (p)
1031 { 813 {
814 p = strdup (p);
815 allocated.push_back ((void *)p);
1032 rs[optList[entry].doff] = p; 816 rs[optList[entry].doff] = p;
1033 817
1034 if (optList_isBool (entry)) 818 if (optList_isBool (entry))
1035 { 819 {
1036 s = strcasecmp (p, "TRUE") == 0 820 s = strcasecmp (p, "TRUE") == 0
… …
1039 || strcasecmp (p, "1") == 0; 823 || strcasecmp (p, "1") == 0;
1040 824
1041 if (optList_isReverse (entry)) 825 if (optList_isReverse (entry))
1042 s = !s; 826 s = !s;
1043 827
1044 if (s) 828 set_option (optList[entry].index, s);
1045 SET_OPTION (optList[entry].flag & Optflag_mask);
1046 else
1047 CLR_OPTION (optList[entry].flag & Optflag_mask);
1048 } 829 }
1049 } 830 }
1050 } 831 }
832#endif /* NO_RESOURCES */
833}
1051 834
835void
836rxvt_term::extract_keysym_resources ()
837{
838#ifndef NO_RESOURCES
1052 /* 839 /*
1053 * [R5 or later]: enumerate the resource database 840 * [R5 or later]: enumerate the resource database
1054 */ 841 */
1055# ifdef KEYSYM_RESOURCE 842# ifdef KEYSYM_RESOURCE
843 XrmDatabase database = XrmGetDatabase (dpy);
844 XrmName name_prefix[3];
845 XrmClass class_prefix[3];
846
1056 name_prefix[0] = XrmStringToName (rs[Rs_name]); 847 name_prefix[0] = XrmStringToName (rs[Rs_name]);
1057 name_prefix[1] = XrmStringToName ("keysym"); 848 name_prefix[1] = XrmStringToName ("keysym");
1058 name_prefix[2] = NULLQUARK; 849 name_prefix[2] = NULLQUARK;
1059 class_prefix[0] = XrmStringToName (RESCLASS); 850 class_prefix[0] = XrmStringToName (RESCLASS);
1060 class_prefix[1] = XrmStringToName ("Keysym"); 851 class_prefix[1] = XrmStringToName ("Keysym");
1061 class_prefix[2] = NULLQUARK; 852 class_prefix[2] = NULLQUARK;
1062 /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */ 853 /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */
1063 XrmEnumerateDatabase (XrmGetDatabase (disp), name_prefix, class_prefix, 854 XrmEnumerateDatabase (database, name_prefix, class_prefix,
1064 XrmEnumOneLevel, rxvt_define_key, NULL); 855 XrmEnumOneLevel, rxvt_define_key, (XPointer)this);
1065# ifdef RESFALLBACK 856# ifdef RESFALLBACK
1066 name_prefix[0] = XrmStringToName (RESFALLBACK);
1067 name_prefix[1] = XrmStringToName ("keysym");
1068 class_prefix[0] = XrmStringToName (RESFALLBACK); 857 name_prefix[0] = class_prefix[0] = XrmStringToName (RESFALLBACK);
1069 class_prefix[1] = XrmStringToName ("Keysym");
1070 /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */ 858 /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */
1071 XrmEnumerateDatabase (XrmGetDatabase (disp), name_prefix, class_prefix, 859 XrmEnumerateDatabase (database, name_prefix, class_prefix,
1072 XrmEnumOneLevel, rxvt_define_key, NULL); 860 XrmEnumOneLevel, rxvt_define_key, (XPointer)this);
1073# endif 861# endif
1074# endif 862# endif
1075 863
1076# else /* USE_XGETDEFAULT */
1077 /* get resources the hard way, but save lots of memory */
1078 FILE *fd = NULL;
1079
1080 if (homedir)
1081 {
1082 static const char *const xnames[2] = { ".Xdefaults", ".Xresources" };
1083
1084 for (int i = 0; i < (sizeof (xnames) / sizeof (xnames [0])); i++)
1085 {
1086 snprintf (fname, sizeof (fname), "%s/%s", homedir, xnames [i]);
1087
1088 if ((fd = fopen (fname, "r")) != NULL)
1089 break;
1090 }
1091 }
1092 /*
1093 * The normal order to match resources is the following:
1094 * @ global resources (partial match, ~/.Xdefaults)
1095 * @ application file resources (XAPPLOADDIR/Rxvt)
1096 * @ class resources (~/.Xdefaults)
1097 * @ private resources (~/.Xdefaults)
1098 *
1099 * However, for the hand-rolled resources, the matching algorithm
1100 * checks if a resource string value has already been allocated
1101 * and won't overwrite it with (in this case) a less specific
1102 * resource value.
1103 *
1104 * This avoids multiple allocation. Also, when we've called this
1105 * routine command-line string options have already been applied so we
1106 * needn't to allocate for those resources.
1107 *
1108 * So, search in resources from most to least specific.
1109 *
1110 * Also, use a special sub-class so that we can use either or both of
1111 * "XTerm" and "Rxvt" as class names.
1112 */
1113
1114 get_xdefaults (fd, rs[Rs_name]);
1115 get_xdefaults (fd, RESCLASS);
1116# ifdef RESFALLBACK
1117 get_xdefaults (fd, RESFALLBACK);
1118# endif
1119
1120# if defined(XAPPLOADDIR) && defined(USE_XAPPLOADDIR)
1121 {
1122 FILE *ad = NULL;
1123
1124# if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1125 if (!*localepath || (ad = fopen (localepath, "r")) == NULL)
1126# endif
1127 ad = fopen (XAPPLOADDIR "/" RESCLASS, "r");
1128 if (ad != NULL)
1129 {
1130 get_xdefaults (ad, RESCLASS);
1131 get_xdefaults (ad, "");
1132 fclose (ad);
1133 }
1134 }
1135# endif /* XAPPLOADDIR */
1136
1137 get_xdefaults (fd, ""); /* partial match */
1138 if (fd != NULL)
1139 fclose (fd);
1140# endif /* USE_XGETDEFAULT */
1141
1142#endif /* NO_RESOURCES */ 864#endif /* NO_RESOURCES */
1143} 865}
1144 866
1145/*}}} */
1146/*----------------------- end-of-file (C source) -----------------------*/ 867/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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