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.85 by root, Wed Jan 25 21:03:04 2006 UTC vs.
Revision 1.124 by ayin, Sat Nov 24 10:32:33 2007 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>
… …
21 * You should have received a copy of the GNU General Public License 21 * You should have received a copy of the GNU General Public License
22 * along with this program; if not, write to the Free Software 22 * along with this program; if not, write to the Free Software
23 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 23 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
24 *----------------------------------------------------------------------*/ 24 *----------------------------------------------------------------------*/
25 25
26#include "../config.h" /* NECESSARY */ 26#include "../config.h"
27#include "rxvt.h" /* NECESSARY */ 27#include "rxvt.h"
28#include "version.h" 28#include "version.h"
29 29
30#ifdef KEYSYM_RESOURCE 30#ifdef KEYSYM_RESOURCE
31#include "keyboard.h" 31# include "keyboard.h"
32#endif 32#endif
33 33
34/* place holders used for parsing command-line options */ 34/* place holders used for parsing command-line options */
35#define Optflag_Reverse 0x40000000UL 35#define Optflag_Reverse 1
36#define Optflag_Boolean 0x80000000UL 36#define Optflag_Boolean 2
37#define Optflag_mask 0x3fffffffUL 37#define Optflag_Switch 4
38 38
39/*{{{ monolithic option/resource structure: */ 39/* monolithic option/resource structure: */
40/* 40/*
41 * `string' options MUST have a usage argument 41 * `string' options MUST have a usage argument
42 * `switch' and `boolean' options have no argument 42 * `switch' and `boolean' options have no argument
43 * if there's no desc (ription), it won't appear in rxvt_usage () 43 * if there's no desc (ription), it won't appear in rxvt_usage ()
44 */ 44 */
45 45
46/* INFO () - descriptive information only */ 46/* INFO () - descriptive information only */
47#define INFO(opt, arg, desc) \ 47#define INFO(opt, arg, desc) \
48 {0, -1, NULL, (opt), (arg), (desc)} 48 {0, 0, -1, NULL, (opt), (arg), (desc)}
49 49
50/* STRG () - command-line option, with/without resource */ 50/* STRG () - command-line option, with/without resource */
51#define STRG(rsp, kw, opt, arg, desc) \ 51#define STRG(rsp, kw, opt, arg, desc) \
52 {0, (rsp), (kw), (opt), (arg), (desc)} 52 {0, 0, (rsp), (kw), (opt), (arg), (desc)}
53 53
54/* RSTRG () - resource/long-option */ 54/* RSTRG () - resource/long-option */
55#define RSTRG(rsp, kw, arg) \ 55#define RSTRG(rsp, kw, arg) \
56 {0, (rsp), (kw), NULL, (arg), NULL} 56 {0, 0, (rsp), (kw), NULL, (arg), NULL}
57 57
58/* BOOL () - regular boolean `-/+' flag */ 58/* BOOL () - regular boolean `-/+' flag */
59#define BOOL(rsp, kw, opt, flag, desc) \ 59#define BOOL(rsp, kw, opt, option, flag, desc) \
60 { (Optflag_Boolean | (flag)), (rsp), (kw), (opt), NULL, (desc)} 60 { (option), (Optflag_Boolean | (flag)), (rsp), (kw), (opt), NULL, (desc)}
61 61
62/* SWCH () - `-' flag */ 62/* SWCH () - `-' flag */
63#define SWCH(opt, flag, desc) \ 63#define SWCH(opt, option, flag, desc) \
64 { (flag), -1, NULL, (opt), NULL, (desc)} 64 { (option), (Optflag_Switch | (flag)), -1, NULL, (opt), NULL, (desc)}
65 65
66/* convenient macros */ 66/* convenient macros */
67#define optList_strlen(i) \ 67#define optList_strlen(i) \
68 (optList[i].flag ? 0 : (optList[i].arg ? strlen (optList[i].arg) : 1)) 68 (optList[i].flag ? 0 : (optList[i].arg ? strlen (optList[i].arg) : 1))
69#define optList_isBool(i) \ 69#define optList_isBool(i) \
… …
73#define optList_size \ 73#define optList_size \
74 (sizeof (optList) / sizeof (optList[0])) 74 (sizeof (optList) / sizeof (optList[0]))
75 75
76static const struct 76static const struct
77 { 77 {
78 const uint8_t index; /* Option index */
78 const unsigned long flag; /* Option flag */ 79 const uint8_t flag; /* Option flag */
79 const int doff; /* data offset */ 80 const int16_t doff; /* resource value index or -1 */
80 const char *kw; /* keyword */ 81 const char *kw; /* keyword */
81 const char *opt; /* option */ 82 const char *opt; /* option */
82 const char *arg; /* argument */ 83 const char *arg; /* argument */
83 const char *desc; /* description */ 84 const char *desc; /* description */
84 } 85 }
… …
86 STRG (Rs_display_name, NULL, "d", NULL, NULL), /* short form */ 87 STRG (Rs_display_name, NULL, "d", NULL, NULL), /* short form */
87 STRG (Rs_display_name, NULL, "display", "string", "X server to contact"), 88 STRG (Rs_display_name, NULL, "display", "string", "X server to contact"),
88 STRG (Rs_term_name, "termName", "tn", "string", "value of the TERM environment variable"), 89 STRG (Rs_term_name, "termName", "tn", "string", "value of the TERM environment variable"),
89 STRG (Rs_geometry, NULL, "g", NULL, NULL), /* short form */ 90 STRG (Rs_geometry, NULL, "g", NULL, NULL), /* short form */
90 STRG (Rs_geometry, "geometry", "geometry", "geometry", "size (in characters) and position"), 91 STRG (Rs_geometry, "geometry", "geometry", "geometry", "size (in characters) and position"),
91 SWCH ("C", Opt_console, "intercept console messages"), 92 SWCH ("C", Opt_console, 0, "intercept console messages"),
92 SWCH ("iconic", Opt_iconic, "start iconic"), 93 SWCH ("iconic", Opt_iconic, 0, "start iconic"),
93 SWCH ("ic", Opt_iconic, NULL), /* short form */ 94 SWCH ("ic", Opt_iconic, 0, NULL), /* short form */
94 BOOL (Rs_reverseVideo, "reverseVideo", "rv", Opt_reverseVideo, "reverse video"), 95 BOOL (Rs_reverseVideo, "reverseVideo", "rv", Opt_reverseVideo, 0, "reverse video"),
95 BOOL (Rs_loginShell, "loginShell", "ls", Opt_loginShell, "login shell"), 96 BOOL (Rs_loginShell, "loginShell", "ls", Opt_loginShell, 0, "login shell"),
96 BOOL (Rs_jumpScroll, "jumpScroll", "j", Opt_jumpScroll, "jump scrolling"), 97 BOOL (Rs_jumpScroll, "jumpScroll", "j", Opt_jumpScroll, 0, "jump scrolling"),
98 BOOL (Rs_skipScroll, "skipScroll", "ss", Opt_skipScroll, 0, "skip scrolling"),
97 BOOL (Rs_pastableTabs, "pastableTabs", "ptab", Opt_pastableTabs, "tab characters are pastable"), 99 BOOL (Rs_pastableTabs, "pastableTabs", "ptab", Opt_pastableTabs, 0, "tab characters are pastable"),
98#if HAVE_SCROLLBARS 100#if HAVE_SCROLLBARS
99 RSTRG (Rs_scrollstyle, "scrollstyle", "mode"), 101 RSTRG (Rs_scrollstyle, "scrollstyle", "mode"),
100 BOOL (Rs_scrollBar, "scrollBar", "sb", Opt_scrollBar, "scrollbar"), 102 BOOL (Rs_scrollBar, "scrollBar", "sb", Opt_scrollBar, 0, "scrollbar"),
101 BOOL (Rs_scrollBar_right, "scrollBar_right", "sr", Opt_scrollBar_right, "scrollbar right"), 103 BOOL (Rs_scrollBar_right, "scrollBar_right", "sr", Opt_scrollBar_right, 0, "scrollbar right"),
102 BOOL (Rs_scrollBar_floating, "scrollBar_floating", "st", Opt_scrollBar_floating, "scrollbar without a trough"), 104 BOOL (Rs_scrollBar_floating, "scrollBar_floating", "st", Opt_scrollBar_floating, 0, "scrollbar without a trough"),
103 RSTRG (Rs_scrollBar_align, "scrollBar_align", "mode"), 105 RSTRG (Rs_scrollBar_align, "scrollBar_align", "mode"),
104 STRG (Rs_scrollBar_thickness, "thickness", "sbt", "number", "scrollbar thickness/width in pixels"), 106 STRG (Rs_scrollBar_thickness, "thickness", "sbt", "number", "scrollbar thickness/width in pixels"),
105#endif 107#endif
106 BOOL (Rs_scrollTtyOutput, "scrollTtyOutput", NULL, Opt_scrollTtyOutput, NULL), 108 BOOL (Rs_scrollTtyOutput, "scrollTtyOutput", NULL, Opt_scrollTtyOutput, 0, NULL),
107 BOOL (Rs_scrollTtyOutput, NULL, "si", Optflag_Reverse | Opt_scrollTtyOutput, "scroll-on-tty-output inhibit"), 109 BOOL (Rs_scrollTtyOutput, NULL, "si", Opt_scrollTtyOutput, Optflag_Reverse, "scroll-on-tty-output inhibit"),
108 BOOL (Rs_scrollTtyKeypress, "scrollTtyKeypress", "sk", Opt_scrollTtyKeypress, "scroll-on-keypress"), 110 BOOL (Rs_scrollTtyKeypress, "scrollTtyKeypress", "sk", Opt_scrollTtyKeypress, 0, "scroll-on-keypress"),
109 BOOL (Rs_scrollWithBuffer, "scrollWithBuffer", "sw", Opt_scrollWithBuffer, "scroll-with-buffer"), 111 BOOL (Rs_scrollWithBuffer, "scrollWithBuffer", "sw", Opt_scrollWithBuffer, 0, "scroll-with-buffer"),
110#if TRANSPARENT 112#if ENABLE_TRANSPARENCY
111 BOOL (Rs_transparent, "inheritPixmap", "ip", Opt_transparent, "inherit parent pixmap"), 113 BOOL (Rs_transparent, "inheritPixmap", "ip", Opt_transparent, 0, "inherit parent pixmap"),
112 SWCH ("tr", Opt_transparent, NULL), 114 BOOL (Rs_transparent, "transparent", "tr", Opt_transparent, 0, "inherit parent pixmap"),
113# if TINTING
114 STRG (Rs_color + Color_tint, "tintColor", "tint", "color", "tint color"), 115 STRG (Rs_color + Color_tint, "tintColor", "tint", "color", "tint color"),
115# endif 116 STRG (Rs_shade, "shading", "sh", "%", "shade background by x %."),
116#endif 117#endif
117#if OFF_FOCUS_FADING 118#if OFF_FOCUS_FADING
118 STRG (Rs_fade, "fading", "fade", "%", "fade colors x% percent when rxvt-unicode is losing focus"), 119 STRG (Rs_fade, "fading", "fade", "%", "fade colors x% percent when rxvt-unicode is losing focus"),
119 STRG (Rs_color + Color_fade, "fadeColor", "fadecolor", "color", "target color for off-focus fading"), 120 STRG (Rs_color + Color_fade, "fadeColor", "fadecolor", "color", "target color for off-focus fading"),
120#endif 121#endif
121#if TINTING
122 STRG (Rs_shade, "shading", "sh", "%", "shade background by x% when tinting."),
123#endif
124 BOOL (Rs_utmpInhibit, "utmpInhibit", "ut", Opt_utmpInhibit, "utmp inhibit"), 122 BOOL (Rs_utmpInhibit, "utmpInhibit", "ut", Opt_utmpInhibit, 0, "utmp inhibit"),
125#ifndef NO_BELL 123#ifndef NO_BELL
124# if ENABLE_FRILLS
125 BOOL (Rs_urgentOnBell, "urgentOnBell", NULL, Opt_urgentOnBell, 0, NULL),
126# endif
126 BOOL (Rs_visualBell, "visualBell", "vb", Opt_visualBell, "visual bell"), 127 BOOL (Rs_visualBell, "visualBell", "vb", Opt_visualBell, 0, "visual bell"),
127# if ! defined(NO_MAPALERT) && defined(MAPALERT_OPTION) 128# if ! defined(NO_MAPALERT) && defined(MAPALERT_OPTION)
128 BOOL (Rs_mapAlert, "mapAlert", NULL, Opt_mapAlert, NULL), 129 BOOL (Rs_mapAlert, "mapAlert", NULL, Opt_mapAlert, 0, NULL),
129# endif 130# endif
130#endif 131#endif
131#ifdef META8_OPTION 132#ifdef META8_OPTION
132 BOOL (Rs_meta8, "meta8", NULL, Opt_meta8, NULL), 133 BOOL (Rs_meta8, "meta8", NULL, Opt_meta8, 0, NULL),
133#endif 134#endif
134#ifdef MOUSE_WHEEL 135#ifdef MOUSE_WHEEL
135 BOOL (Rs_mouseWheelScrollPage, "mouseWheelScrollPage", NULL, Opt_mouseWheelScrollPage, NULL), 136 BOOL (Rs_mouseWheelScrollPage, "mouseWheelScrollPage", NULL, Opt_mouseWheelScrollPage, 0, NULL),
136#endif 137#endif
137#if ENABLE_FRILLS 138#if ENABLE_FRILLS
138 BOOL (Rs_tripleclickwords, "tripleclickwords", "tcw", Opt_tripleclickwords, "triple click word selection"), 139 BOOL (Rs_tripleclickwords, "tripleclickwords", "tcw", Opt_tripleclickwords, 0, "triple click word selection"),
139 BOOL (Rs_insecure, "insecure", "insecure", Opt_insecure, "enable possibly insecure escape sequences"), 140 BOOL (Rs_insecure, "insecure", "insecure", Opt_insecure, 0, "enable possibly insecure escape sequences"),
140 BOOL (Rs_cursorUnderline, "cursorUnderline", "uc", Opt_cursorUnderline, "underline cursor"), 141 BOOL (Rs_cursorUnderline, "cursorUnderline", "uc", Opt_cursorUnderline, 0, "underline cursor"),
141#endif 142#endif
142#if CURSOR_BLINK 143#if CURSOR_BLINK
143 BOOL (Rs_cursorBlink, "cursorBlink", "bc", Opt_cursorBlink, "blinking cursor"), 144 BOOL (Rs_cursorBlink, "cursorBlink", "bc", Opt_cursorBlink, 0, "blinking cursor"),
144#endif 145#endif
145#ifdef POINTER_BLANK 146#ifdef POINTER_BLANK
146 BOOL (Rs_pointerBlank, "pointerBlank", "pb", Opt_pointerBlank, "switch off pointer after delay"), 147 BOOL (Rs_pointerBlank, "pointerBlank", "pb", Opt_pointerBlank, 0, "switch off pointer after delay"),
147#endif 148#endif
148 STRG (Rs_color + Color_bg, "background", "bg", "color", "background color"), 149 STRG (Rs_color + Color_bg, "background", "bg", "color", "background color"),
149 STRG (Rs_color + Color_fg, "foreground", "fg", "color", "foreground color"), 150 STRG (Rs_color + Color_fg, "foreground", "fg", "color", "foreground color"),
150 RSTRG (Rs_color + minCOLOR + 0, "color0", "color"), 151 RSTRG (Rs_color + minCOLOR + 0, "color0", "color"),
151 RSTRG (Rs_color + minCOLOR + 1, "color1", "color"), 152 RSTRG (Rs_color + minCOLOR + 1, "color1", "color"),
… …
166#ifndef NO_BOLD_UNDERLINE_REVERSE 167#ifndef NO_BOLD_UNDERLINE_REVERSE
167 RSTRG (Rs_color + Color_BD, "colorBD", "color"), 168 RSTRG (Rs_color + Color_BD, "colorBD", "color"),
168 RSTRG (Rs_color + Color_IT, "colorIT", "color"), 169 RSTRG (Rs_color + Color_IT, "colorIT", "color"),
169 RSTRG (Rs_color + Color_UL, "colorUL", "color"), 170 RSTRG (Rs_color + Color_UL, "colorUL", "color"),
170 RSTRG (Rs_color + Color_RV, "colorRV", "color"), 171 RSTRG (Rs_color + Color_RV, "colorRV", "color"),
171#endif /* ! NO_BOLD_UNDERLINE_REVERSE */ 172#endif /* ! NO_BOLD_UNDERLINE_REVERSE */
172#if ENABLE_FRILLS 173#if ENABLE_FRILLS
173 RSTRG (Rs_color + Color_underline, "underlineColor", "color"), 174 RSTRG (Rs_color + Color_underline, "underlineColor", "color"),
174#endif 175#endif
175#ifdef KEEP_SCROLLCOLOR 176#ifdef KEEP_SCROLLCOLOR
176 RSTRG (Rs_color + Color_scroll, "scrollColor", "color"), 177 RSTRG (Rs_color + Color_scroll, "scrollColor", "color"),
177 RSTRG (Rs_color + Color_trough, "troughColor", "color"), 178 RSTRG (Rs_color + Color_trough, "troughColor", "color"),
178#endif /* KEEP_SCROLLCOLOR */ 179#endif /* KEEP_SCROLLCOLOR */
179#ifdef OPTION_HC 180#ifdef OPTION_HC
180 STRG (Rs_color + Color_HC, "highlightColor", "hc", "color", "highlight color"), 181 STRG (Rs_color + Color_HC, "highlightColor", "hc", "color", "highlight color"),
181#endif 182#endif
182#ifndef NO_CURSORCOLOR 183#ifndef NO_CURSORCOLOR
183 STRG (Rs_color + Color_cursor, "cursorColor", "cr", "color", "cursor color"), 184 STRG (Rs_color + Color_cursor, "cursorColor", "cr", "color", "cursor color"),
184 /* command-line option = resource name */ 185 /* command-line option = resource name */
185 RSTRG (Rs_color + Color_cursor2, "cursorColor2", "color"), 186 RSTRG (Rs_color + Color_cursor2, "cursorColor2", "color"),
186#endif /* NO_CURSORCOLOR */ 187#endif /* NO_CURSORCOLOR */
187 STRG (Rs_color + Color_pointer_fg, "pointerColor", "pr", "color", "pointer color"), 188 STRG (Rs_color + Color_pointer_fg, "pointerColor", "pr", "color", "pointer color"),
188 STRG (Rs_color + Color_pointer_bg, "pointerColor2", "pr2", "color", "pointer bg color"), 189 STRG (Rs_color + Color_pointer_bg, "pointerColor2", "pr2", "color", "pointer bg color"),
189 STRG (Rs_color + Color_border, "borderColor", "bd", "color", "border color"), 190 STRG (Rs_color + Color_border, "borderColor", "bd", "color", "border color"),
190#ifdef XPM_BACKGROUND 191#ifdef BG_IMAGE_FROM_FILE
191 RSTRG (Rs_path, "path", "search path"), 192 RSTRG (Rs_path, "path", "search path"),
192 STRG (Rs_backgroundPixmap, "backgroundPixmap", "pixmap", "file[;geom]", "background pixmap"), 193 STRG (Rs_backgroundPixmap, "backgroundPixmap", "pixmap", "file[;geom]", "background pixmap"),
193#endif 194#endif
194 /* fonts: command-line option = resource name */ 195 /* fonts: command-line option = resource name */
195 STRG (Rs_font, "font", "fn", "fontname", "normal text font"), 196 STRG (Rs_font, "font", "fn", "fontname", "normal text font"),
196#if ENABLE_STYLES 197#if ENABLE_STYLES
197 STRG (Rs_boldFont, "boldFont", "fb", "fontname", "bold font"), 198 STRG (Rs_boldFont, "boldFont", "fb", "fontname", "bold font"),
198 STRG (Rs_italicFont, "italicFont", "fi", "fontname", "italic font"), 199 STRG (Rs_italicFont, "italicFont", "fi", "fontname", "italic font"),
199 STRG (Rs_boldItalicFont, "boldItalicFont", "fbi", "fontname", "bold italic font"), 200 STRG (Rs_boldItalicFont, "boldItalicFont", "fbi", "fontname", "bold italic font"),
200 BOOL (Rs_intensityStyles, "intensityStyles", "is", Opt_intensityStyles, "font styles imply intensity changes"), 201 BOOL (Rs_intensityStyles, "intensityStyles", "is", Opt_intensityStyles, 0, "font styles imply intensity changes"),
201#endif 202#endif
202#ifdef USE_XIM 203#ifdef USE_XIM
203 STRG (Rs_inputMethod, "inputMethod", "im", "name", "name of input method"), 204 STRG (Rs_inputMethod, "inputMethod", "im", "name", "name of input method"),
204 STRG (Rs_preeditType, "preeditType", "pt", "style", "input style: style = OverTheSpot|OffTheSpot|Root"), 205 STRG (Rs_preeditType, "preeditType", "pt", "style", "input style: style = OverTheSpot|OffTheSpot|Root"),
205 STRG (Rs_imLocale, "imLocale", "imlocale", "string", "locale to use for input method"), 206 STRG (Rs_imLocale, "imLocale", "imlocale", "string", "locale to use for input method"),
206 STRG (Rs_imFont, "imFont", "imfont", "fontname", "fontset for styles OverTheSpot and OffTheSpot"), 207 STRG (Rs_imFont, "imFont", "imfont", "fontname", "fontset for styles OverTheSpot and OffTheSpot"),
207#endif /* USE_XIM */ 208#endif /* USE_XIM */
208 STRG (Rs_name, NULL, "name", "string", "client instance, icon, and title strings"), 209 STRG (Rs_name, NULL, "name", "string", "client instance, icon, and title strings"),
209 STRG (Rs_title, "title", "title", "string", "title name for window"), 210 STRG (Rs_title, "title", "title", "string", "title name for window"),
210 STRG (Rs_title, NULL, "T", NULL, NULL), /* short form */ 211 STRG (Rs_title, NULL, "T", NULL, NULL), /* short form */
211 STRG (Rs_iconName, "iconName", "n", "string", "icon name for window"), 212 STRG (Rs_iconName, "iconName", "n", "string", "icon name for window"),
212 STRG (Rs_saveLines, "saveLines", "sl", "number", "number of scrolled lines to save"), 213 STRG (Rs_saveLines, "saveLines", "sl", "number", "number of scrolled lines to save"),
213#if ENABLE_XEMBED 214#if ENABLE_XEMBED
214 STRG (Rs_embed, NULL, "embed", "windowid", "window id to embed terminal in"), 215 STRG (Rs_embed, NULL, "embed", "windowid", "window id to embed terminal in"),
215#endif 216#endif
217#if XFT
218 STRG (Rs_depth, "depth", "depth", "number", "depth of visual to request"),
219#endif
216#if ENABLE_FRILLS 220#if ENABLE_FRILLS
217 RSTRG (Rs_transient_for, "transient-for", "windowid"), 221 RSTRG (Rs_transient_for, "transient-for", "windowid"),
218 BOOL (Rs_override_redirect, "override-redirect", "override-redirect", Opt_override_redirect, "set override-redirect on the terminal window"), 222 BOOL (Rs_override_redirect, "override-redirect", "override-redirect", Opt_override_redirect, 0, "set override-redirect on the terminal window"),
219 STRG (Rs_pty_fd, NULL, "pty-fd", "fileno", "file descriptor of pty to use"), 223 STRG (Rs_pty_fd, NULL, "pty-fd", "fileno", "file descriptor of pty to use"),
220 BOOL (Rs_hold, "hold", "hold", Opt_hold, "retain window after shell exit"), 224 BOOL (Rs_hold, "hold", "hold", Opt_hold, 0, "retain window after shell exit"),
221 STRG (Rs_depth, "depth", "depth", "number", "depth of visual to request"),
222 STRG (Rs_ext_bwidth, "externalBorder", "w", "number", "external border in pixels"), 225 STRG (Rs_ext_bwidth, "externalBorder", "w", "number", "external border in pixels"),
223 STRG (Rs_ext_bwidth, NULL, "bw", NULL, NULL), 226 STRG (Rs_ext_bwidth, NULL, "bw", NULL, NULL),
224 STRG (Rs_ext_bwidth, NULL, "borderwidth", NULL, NULL), 227 STRG (Rs_ext_bwidth, NULL, "borderwidth", NULL, NULL),
225 STRG (Rs_int_bwidth, "internalBorder", "b", "number", "internal border in pixels"), 228 STRG (Rs_int_bwidth, "internalBorder", "b", "number", "internal border in pixels"),
226 BOOL (Rs_borderLess, "borderLess", "bl", Opt_borderLess, "borderless window"), 229 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"), 230 STRG (Rs_lineSpace, "lineSpace", "lsp", "number", "number of extra pixels between rows"),
231#endif
232#ifdef BUILTIN_GLYPHS
233 BOOL (Rs_skipBuiltinGlyphs, "skipBuiltinGlyphs", "sbg", Opt_skipBuiltinGlyphs, 0, "do not use internal glyphs"),
229#endif 234#endif
230#ifdef POINTER_BLANK 235#ifdef POINTER_BLANK
231 RSTRG (Rs_pointerBlankDelay, "pointerBlankDelay", "number"), 236 RSTRG (Rs_pointerBlankDelay, "pointerBlankDelay", "number"),
232#endif 237#endif
233#ifndef NO_BACKSPACE_KEY 238#ifndef NO_BACKSPACE_KEY
… …
241 RSTRG (Rs_print_pipe, "print-pipe", "string"), 246 RSTRG (Rs_print_pipe, "print-pipe", "string"),
242#endif 247#endif
243 STRG (Rs_modifier, "modifier", "mod", "modifier", "meta modifier = alt|meta|hyper|super|mod1|...|mod5"), 248 STRG (Rs_modifier, "modifier", "mod", "modifier", "meta modifier = alt|meta|hyper|super|mod1|...|mod5"),
244#ifdef CUTCHAR_RESOURCE 249#ifdef CUTCHAR_RESOURCE
245 RSTRG (Rs_cutchars, "cutchars", "string"), 250 RSTRG (Rs_cutchars, "cutchars", "string"),
246#endif /* CUTCHAR_RESOURCE */ 251#endif /* CUTCHAR_RESOURCE */
247 RSTRG (Rs_answerbackstring, "answerbackString", "string"), 252 RSTRG (Rs_answerbackstring, "answerbackString", "string"),
248#ifndef NO_SECONDARY_SCREEN 253#ifndef NO_SECONDARY_SCREEN
249 BOOL (Rs_secondaryScreen, "secondaryScreen", "ssc", Opt_secondaryScreen, "enable secondary screen"), 254 BOOL (Rs_secondaryScreen, "secondaryScreen", "ssc", Opt_secondaryScreen, 0, "enable secondary screen"),
250 BOOL (Rs_secondaryScroll, "secondaryScroll", "ssr", Opt_secondaryScroll, "enable secondary screen scroll"), 255 BOOL (Rs_secondaryScroll, "secondaryScroll", "ssr", Opt_secondaryScroll, 0, "enable secondary screen scroll"),
251#endif 256#endif
252#if ENABLE_PERL 257#if ENABLE_PERL
253 RSTRG (Rs_perl_lib, "perl-lib", "string"), //, "colon-separated directories with extension scripts"),TODO 258 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 259 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 260 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"), 261 STRG (Rs_perl_ext_2, "perl-ext", "pe", "string", "colon-separated list of perl extensions to enable for this instance"),
257#endif 262#endif
258#ifndef NO_RESOURCES 263#if ISO_14755
259 INFO ("xrm", "string", "X resource"), 264 BOOL (Rs_iso14755_52, "iso14755_52", NULL, Opt_iso14755_52, 0, NULL),
265#endif
266#ifdef HAVE_AFTERIMAGE
267 STRG (Rs_blendtype, "blendType", "blt", "string", "background image blending type - alpha, tint, etc..."),
268 STRG (Rs_blurradius, "blurRadius", "blr", "HxV", "Gaussian Blur radii to apply to the root background"),
260#endif 269#endif
261 INFO ("e", "command arg ...", "command to execute") 270 INFO ("e", "command arg ...", "command to execute")
262 }; 271 };
263 272
264#undef INFO 273#undef INFO
265#undef STRG 274#undef STRG
266#undef RSTRG 275#undef RSTRG
267#undef SWCH 276#undef SWCH
268#undef BOOL 277#undef BOOL
269/*}}} */
270 278
271static const char releasestring[] = "rxvt-unicode (" RXVTNAME ") v" VERSION " - released: " DATE "\n"; 279static const char releasestring[] = "rxvt-unicode (" RXVTNAME ") v" VERSION " - released: " DATE "\n";
272static const char optionsstring[] = "options: " 280static const char optionsstring[] = "options: "
273#if ENABLE_PERL 281#if ENABLE_PERL
274 "perl," 282 "perl,"
… …
309#endif 317#endif
310 "," 318 ","
311#if OFF_FOCUS_FADING 319#if OFF_FOCUS_FADING
312 "fade," 320 "fade,"
313#endif 321#endif
314#if defined(XPM_BACKGROUND)
315 "XPM,"
316#endif
317#if defined(TRANSPARENT) 322#if defined(ENABLE_TRANSPARENCY)
318 "transparent," 323 "transparent,"
319#endif
320#if TINTING
321 "tint," 324 "tint,"
325#endif
326#if HAVE_AFTERIMAGE
327 "afterimage,"
322#endif 328#endif
323#if defined(USE_XIM) 329#if defined(USE_XIM)
324 "XIM," 330 "XIM,"
331#endif
332#if defined(NO_BACKSPACE_KEY)
333 "no_backspace,"
334#endif
335#if defined(NO_DELETE_KEY)
336 "no_delete,"
337#endif
338#if EIGHT_BIT_CONTROLS
339 "8bitctrls,"
340#endif
341#if defined(ENABLE_FRILLS)
342 "frills,"
343#endif
344#if defined(SELECTION_SCROLLING)
345 "selectionscrolling,"
346#endif
347#if MOUSE_WHEEL
348 "wheel,"
349#endif
350#if MOUSE_SLIP_WHEELING
351 "slipwheel,"
352#endif
353#if defined(SMART_RESIZE)
354 "smart-resize,"
355#endif
356#if defined(CURSOR_BLINK)
357 "cursorBlink,"
358#endif
359#if defined(POINTER_BLANK)
360 "pointerBlank,"
361#endif
362#if defined(NO_RESOURCES)
363 "NoResources,"
325#endif 364#endif
326 "scrollbars=" 365 "scrollbars="
327#if !defined(HAVE_SCROLLBARS) 366#if !defined(HAVE_SCROLLBARS)
328 "NONE" 367 "NONE"
329#else 368#else
… …
347# endif 386# endif
348# if defined(XTERM_SCROLLBAR) 387# if defined(XTERM_SCROLLBAR)
349 "xterm" 388 "xterm"
350# endif 389# endif
351#endif 390#endif
352 ","
353#if defined(NO_BACKSPACE_KEY)
354 "no_backspace,"
355#endif
356#if defined(NO_DELETE_KEY)
357 "no_delete,"
358#endif
359#if EIGHT_BIT_CONTROLS
360 "8bitctrls,"
361#endif
362#if defined(ENABLE_FRILLS)
363 "frills,"
364#endif
365#if defined(SELECTION_SCROLLING)
366 "selectionscrolling,"
367#endif
368#if MOUSE_WHEEL
369 "wheel,"
370#endif
371#if MOUSE_SLIP_WHEELING
372 "slipwheel,"
373#endif
374#if defined(SMART_RESIZE)
375 "smart-resize,"
376#endif
377#if defined(CURSOR_BLINK)
378 "cursorBlink,"
379#endif
380#if defined(POINTER_BLANK)
381 "pointerBlank,"
382#endif
383#if defined(NO_RESOURCES)
384 "NoResources"
385#endif
386 "\nUsage: "; /* Usage */ 391 "\nUsage: "; /* Usage */
387 392
388#define INDENT 18 393#define INDENT 18
394
395const char rxvt_term::resval_undef [] = "<undef>";
396const char rxvt_term::resval_on [] = "on";
397const char rxvt_term::resval_off [] = "off";
389 398
390/*{{{ usage: */ 399/*{{{ usage: */
391/*----------------------------------------------------------------------*/ 400/*----------------------------------------------------------------------*/
392static void 401static void
393rxvt_usage (int type) 402rxvt_usage (int type)
… …
402 rxvt_log (" [-help] [--help]\n"); 411 rxvt_log (" [-help] [--help]\n");
403 412
404 for (col = 1, i = 0; i < optList_size; i++) 413 for (col = 1, i = 0; i < optList_size; i++)
405 if (optList[i].desc != NULL) 414 if (optList[i].desc != NULL)
406 { 415 {
407 int len = 0; 416 int len = 0;
408 417
409 if (!optList_isBool (i)) 418 if (!optList_isBool (i))
410 { 419 {
411 len = optList_strlen (i); 420 len = optList_strlen (i);
412 if (len > 0) 421 if (len > 0)
… …
479 488
480/*{{{ get command-line options before getting resources */ 489/*{{{ get command-line options before getting resources */
481void 490void
482rxvt_term::get_options (int argc, const char *const *argv) 491rxvt_term::get_options (int argc, const char *const *argv)
483{ 492{
484 int i, bad_option = 0; 493 int i, bad_option = 0;
485 static const char On[3] = "ON", Off[4] = "OFF";
486 494
487 for (i = 1; i < argc; i++) 495 for (i = 1; i < argc; i++)
488 { 496 {
489 unsigned int entry, longopt = 0; 497 unsigned int entry, longopt = 0;
490 const char *flag, *opt; 498 const char *flag, *opt;
491 499
492 opt = argv[i]; 500 opt = argv[i];
493 501
494 if (*opt == '-') 502 if (*opt == '-')
495 { 503 {
496 flag = On; 504 flag = resval_on;
505
497 if (*++opt == '-') 506 if (*++opt == '-')
498 longopt = *opt++; /* long option */ 507 longopt = *opt++; /* long option */
499 } 508 }
500 else if (*opt == '+') 509 else if (*opt == '+')
501 { 510 {
502 flag = Off; 511 flag = resval_off;
512
503 if (*++opt == '+') 513 if (*++opt == '+')
504 longopt = *opt++; /* long option */ 514 longopt = *opt++; /* long option */
505 } 515 }
506 else 516 else
507 { 517 {
… …
510 continue; 520 continue;
511 } 521 }
512 522
513 if (!strcmp (opt, "help")) 523 if (!strcmp (opt, "help"))
514 rxvt_usage (longopt ? 2 : 1); 524 rxvt_usage (longopt ? 2 : 1);
525
515 if (!strcmp (opt, "h")) 526 if (!strcmp (opt, "h"))
516 rxvt_usage (0); 527 rxvt_usage (0);
517 528
518 /* feature: always try to match long-options */ 529 /* feature: always try to match long-options */
519 for (entry = 0; entry < optList_size; entry++) 530 for (entry = 0; entry < optList_size; entry++)
… …
523 break; 534 break;
524 535
525 if (entry < optList_size) 536 if (entry < optList_size)
526 { 537 {
527 if (optList_isReverse (entry)) 538 if (optList_isReverse (entry))
528 flag = flag == On ? Off : On; 539 flag = flag == resval_on ? resval_off : resval_on;
529 540
530 if (optList_strlen (entry)) 541 if (optList_strlen (entry))
531 { 542 {
532 /* 543 /*
533 * special cases are handled in main.c:main () to allow 544 * special cases are handled in main.c:main () to allow
534 * X resources to set these values before we settle for 545 * X resources to set these values before we settle for
535 * default values 546 * default values
536 */ 547 */
537 548
538 if (optList[entry].doff != -1) 549 if (optList[entry].doff != -1)
550 {
551 if (flag == resval_on && i+1 == argc)
552 rxvt_fatal ("option '%s' requires an argument, aborting.\n", argv [i]);
553
539 rs[optList[entry].doff] = flag == On && argv[i+1] 554 rs[optList[entry].doff] = flag == resval_on ? argv[++i] : resval_undef;
540 ? argv[++i] : 0; 555 }
541 } 556 }
542 else 557 else
543 { /* boolean value */ 558 { /* boolean value */
544 set_option (optList[entry].flag & Optflag_mask, flag == On); 559 set_option (optList[entry].index, flag == resval_on);
545 560
546 if (optList[entry].doff != -1) 561 if (optList[entry].doff != -1)
547 rs[optList[entry].doff] = flag; 562 rs[optList[entry].doff] = flag;
548 } 563 }
549 } 564 }
565#ifndef NO_RESOURCES
566 else if (!strcmp (opt, "xrm"))
567 {
568 if (i+1 < argc)
569 XrmPutLineResource (&option_db, argv[++i]);
570 }
571#endif
572#ifdef KEYSYM_RESOURCE
573 else if (!strncmp (opt, "keysym.", sizeof ("keysym.") - 1))
574 {
575 if (i+1 < argc)
576 {
577 char *res = (char *)malloc (strlen (opt) + strlen (argv[++i]) + 6);
578 sprintf (res, "*.%s: %s\n", opt, argv[i]);
579 XrmPutLineResource (&option_db, res);
580 free (res);
581 }
582 }
583#endif
550 else 584 else
551#ifdef KEYSYM_RESOURCE
552 /* if (!strncmp (opt, "keysym.", sizeof ("keysym.") - 1)) */
553 if (rxvt_Str_match (opt, "keysym."))
554 { 585 {
555 const char *str = argv[++i];
556
557 if (str != NULL)
558 parse_keysym (opt + sizeof ("keysym.") - 1, str);
559 }
560 else
561#endif
562 {
563 bad_option = 1; 586 bad_option = 1;
564 rxvt_warn ("\"%s\": unknown or malformed option.\n", opt); 587 rxvt_warn ("\"%s\": unknown or malformed option.\n", opt);
565 } 588 }
566 } 589 }
567 590
568 if (bad_option) 591 if (bad_option)
569 rxvt_usage (0); 592 rxvt_usage (0);
570} 593}
… …
654 char *newarg = NULL; 677 char *newarg = NULL;
655 char newargstr[NEWARGLIM]; 678 char newargstr[NEWARGLIM];
656 679
657 if (arg == NULL) 680 if (arg == NULL)
658 { 681 {
659 if ((n = rxvt_Str_match (str, "keysym.")) == 0) 682 n = sizeof ("keysym.") - 1;
683 if (strncmp (str, "keysym.", n))
660 return 0; 684 return 0;
661 685
662 str += n; /* skip `keysym.' */ 686 str += n; /* skip `keysym.' */
663 if (!(pmodend = strchr (str, ':'))) 687 if (!(pmodend = strchr (str, ':')))
664 return -1; 688 return -1;
… …
737 strncpy (newargstr, arg, NEWARGLIM - 1); 761 strncpy (newargstr, arg, NEWARGLIM - 1);
738 newargstr[NEWARGLIM - 1] = '\0'; 762 newargstr[NEWARGLIM - 1] = '\0';
739 newarg = newargstr; 763 newarg = newargstr;
740 } 764 }
741 765
742 rxvt_Str_trim (newarg); 766 if (*newarg == '\0')
743 if (*newarg == '\0' || (n = rxvt_Str_escaped (newarg)) == 0)
744 return -1; 767 return -1;
745 768
746 keyboard->register_user_translation (sym, state, newarg); 769 keyboard->register_user_translation (sym, state, newarg);
747 return 1; 770 return 1;
748} 771}
749 772
750# endif /* KEYSYM_RESOURCE */ 773# endif /* KEYSYM_RESOURCE */
751#endif /* NO_RESOURCES */ 774#endif /* NO_RESOURCES */
752 775
753static char * 776static char *
754get_res (XrmDatabase database, const char *program, const char *option) 777get_res (XrmDatabase database, const char *program, const char *option)
755{ 778{
756 char resource[512]; 779 char resource[512];
… …
764} 787}
765 788
766const char * 789const char *
767rxvt_term::x_resource (const char *name) 790rxvt_term::x_resource (const char *name)
768{ 791{
769 XrmDatabase database = XrmGetDatabase (display->display); 792 XrmDatabase database = XrmGetDatabase (dpy);
770 793
771 const char *p = get_res (database, rs[Rs_name], name); 794 const char *p = get_res (database, rs[Rs_name], name);
772 const char *p0 = get_res (database, "!INVALIDPROGRAMMENAMEDONTMATCH!", name); 795 const char *p0 = get_res (database, "!INVALIDPROGRAMMENAMEDONTMATCH!", name);
773 796
774 if (p == NULL || (p0 && strcmp (p, p0) == 0)) 797 if (p == NULL || (p0 && strcmp (p, p0) == 0))
… …
788 811
789void 812void
790rxvt_term::extract_resources () 813rxvt_term::extract_resources ()
791{ 814{
792#ifndef NO_RESOURCES 815#ifndef NO_RESOURCES
816 XrmDatabase database = XrmGetDatabase (dpy);
817 XrmMergeDatabases (option_db, &database);
818 option_db = NULL;
793 /* 819 /*
794 * Query resources for options that affect us 820 * Query resources for options that affect us
795 */ 821 */
796 for (int entry = 0; entry < optList_size; entry++) 822 for (int entry = 0; entry < optList_size; entry++)
797 { 823 {
… …
817 || strcasecmp (p, "1") == 0; 843 || strcasecmp (p, "1") == 0;
818 844
819 if (optList_isReverse (entry)) 845 if (optList_isReverse (entry))
820 s = !s; 846 s = !s;
821 847
822 set_option (optList[entry].flag & Optflag_mask, s); 848 set_option (optList[entry].index, s);
823 } 849 }
824 } 850 }
825 } 851 }
826 852
827 /* 853 /*
828 * [R5 or later]: enumerate the resource database 854 * [R5 or later]: enumerate the resource database
829 */ 855 */
830# ifdef KEYSYM_RESOURCE 856# ifdef KEYSYM_RESOURCE
831 XrmDatabase database = XrmGetDatabase (display->display);
832 XrmName name_prefix[3]; 857 XrmName name_prefix[3];
833 XrmClass class_prefix[3]; 858 XrmClass class_prefix[3];
834 859
835 name_prefix[0] = XrmStringToName (rs[Rs_name]); 860 name_prefix[0] = XrmStringToName (rs[Rs_name]);
836 name_prefix[1] = XrmStringToName ("keysym"); 861 name_prefix[1] = XrmStringToName ("keysym");
… …
850 XrmEnumerateDatabase (database, name_prefix, class_prefix, 875 XrmEnumerateDatabase (database, name_prefix, class_prefix,
851 XrmEnumOneLevel, rxvt_define_key, NULL); 876 XrmEnumOneLevel, rxvt_define_key, NULL);
852# endif 877# endif
853# endif 878# endif
854 879
855#endif /* NO_RESOURCES */ 880#endif /* NO_RESOURCES */
856} 881}
857 882
858/*----------------------- end-of-file (C source) -----------------------*/ 883/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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