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.89 by root, Sun Jan 29 22:27:04 2006 UTC vs.
Revision 1.133 by ayin, Sat Jan 26 14:24:43 2008 UTC

1/*--------------------------------*-C-*---------------------------------* 1/*----------------------------------------------------------------------*
2 * File: xdefaults.C 2 * File: xdefaults.C
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * 4 *
5 * All portions of code are copyright by their respective author/s. 5 * All portions of code are copyright by their respective author/s.
6 * Copyright (c) 1994 Robert Nation <nation@rocket.sanders.lockheed.com> 6 * Copyright (c) 1994 Robert Nation <nation@rocket.sanders.lockheed.com>
7 * - original version 7 * - original version
8 * Copyright (c) 1997,1998 mj olesen <olesen@me.queensu.ca> 8 * Copyright (c) 1997,1998 mj olesen <olesen@me.queensu.ca>
9 * Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com> 9 * Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com>
10 * Copyright (c) 2007 Emanuele Giaquinta <e.giaquinta@glauco.it>
10 * 11 *
11 * This program is free software; you can redistribute it and/or modify 12 * This program is free software; you can redistribute it and/or modify
12 * it under the terms of the GNU General Public License as published by 13 * it under the terms of the GNU General Public License as published by
13 * the Free Software Foundation; either version 2 of the License, or 14 * the Free Software Foundation; either version 2 of the License, or
14 * (at your option) any later version. 15 * (at your option) any later version.
… …
21 * You should have received a copy of the GNU General Public License 22 * You should have received a copy of the GNU General Public License
22 * along with this program; if not, write to the Free Software 23 * along with this program; if not, write to the Free Software
23 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 24 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
24 *----------------------------------------------------------------------*/ 25 *----------------------------------------------------------------------*/
25 26
26#include "../config.h" /* NECESSARY */ 27#include "../config.h"
27#include "rxvt.h" /* NECESSARY */ 28#include "rxvt.h"
28#include "version.h" 29#include "version.h"
29 30
30#ifdef KEYSYM_RESOURCE 31#ifdef KEYSYM_RESOURCE
31#include "keyboard.h" 32# include "keyboard.h"
32#endif 33#endif
33 34
34/* place holders used for parsing command-line options */ 35/* place holders used for parsing command-line options */
35#define Optflag_Reverse 0x40000000UL 36#define Optflag_Reverse 1
36#define Optflag_Boolean 0x80000000UL 37#define Optflag_Boolean 2
37#define Optflag_mask 0x3fffffffUL 38#define Optflag_Switch 4
38 39
39/*{{{ monolithic option/resource structure: */ 40/* monolithic option/resource structure: */
40/* 41/*
41 * `string' options MUST have a usage argument 42 * `string' options MUST have a usage argument
42 * `switch' and `boolean' options have no argument 43 * `switch' and `boolean' options have no argument
43 * if there's no desc (ription), it won't appear in rxvt_usage () 44 * if there's no desc (ription), it won't appear in rxvt_usage ()
44 */ 45 */
45 46
46/* INFO () - descriptive information only */ 47/* INFO () - descriptive information only */
47#define INFO(opt, arg, desc) \ 48#define INFO(opt, arg, desc) \
48 {0, -1, NULL, (opt), (arg), (desc)} 49 {0, 0, -1, NULL, (opt), (arg), (desc)}
49 50
50/* STRG () - command-line option, with/without resource */ 51/* STRG () - command-line option, with/without resource */
51#define STRG(rsp, kw, opt, arg, desc) \ 52#define STRG(rsp, kw, opt, arg, desc) \
52 {0, (rsp), (kw), (opt), (arg), (desc)} 53 {0, 0, (rsp), (kw), (opt), (arg), (desc)}
53 54
54/* RSTRG () - resource/long-option */ 55/* RSTRG () - resource/long-option */
55#define RSTRG(rsp, kw, arg) \ 56#define RSTRG(rsp, kw, arg) \
56 {0, (rsp), (kw), NULL, (arg), NULL} 57 {0, 0, (rsp), (kw), NULL, (arg), NULL}
57 58
58/* BOOL () - regular boolean `-/+' flag */ 59/* BOOL () - regular boolean `-/+' flag */
59#define BOOL(rsp, kw, opt, flag, desc) \ 60#define BOOL(rsp, kw, opt, option, flag, desc) \
60 { (Optflag_Boolean | (flag)), (rsp), (kw), (opt), NULL, (desc)} 61 { (option), (Optflag_Boolean | (flag)), (rsp), (kw), (opt), NULL, (desc)}
61 62
62/* SWCH () - `-' flag */ 63/* SWCH () - `-' flag */
63#define SWCH(opt, flag, desc) \ 64#define SWCH(opt, option, flag, desc) \
64 { (flag), -1, NULL, (opt), NULL, (desc)} 65 { (option), (Optflag_Switch | (flag)), -1, NULL, (opt), NULL, (desc)}
65 66
66/* convenient macros */ 67/* convenient macros */
67#define optList_strlen(i) \ 68#define optList_isString(i) \
68 (optList[i].flag ? 0 : (optList[i].arg ? strlen (optList[i].arg) : 1)) 69 (optList[i].flag == 0)
69#define optList_isBool(i) \ 70#define optList_isBool(i) \
70 (optList[i].flag & Optflag_Boolean) 71 (optList[i].flag & Optflag_Boolean)
71#define optList_isReverse(i) \ 72#define optList_isReverse(i) \
72 (optList[i].flag & Optflag_Reverse) 73 (optList[i].flag & Optflag_Reverse)
73#define optList_size \ 74#define optList_size \
74 (sizeof (optList) / sizeof (optList[0])) 75 (sizeof (optList) / sizeof (optList[0]))
75 76
76static const struct 77static const struct
77 { 78 {
79 const uint8_t index; /* Option index */
78 const unsigned long flag; /* Option flag */ 80 const uint8_t flag; /* Option flag */
79 const int doff; /* data offset */ 81 const int16_t doff; /* resource value index or -1 */
80 const char *kw; /* keyword */ 82 const char *kw; /* keyword */
81 const char *opt; /* option */ 83 const char *opt; /* option */
82 const char *arg; /* argument */ 84 const char *arg; /* argument */
83 const char *desc; /* description */ 85 const char *desc; /* description */
84 } 86 }
… …
86 STRG (Rs_display_name, NULL, "d", NULL, NULL), /* short form */ 88 STRG (Rs_display_name, NULL, "d", NULL, NULL), /* short form */
87 STRG (Rs_display_name, NULL, "display", "string", "X server to contact"), 89 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"), 90 STRG (Rs_term_name, "termName", "tn", "string", "value of the TERM environment variable"),
89 STRG (Rs_geometry, NULL, "g", NULL, NULL), /* short form */ 91 STRG (Rs_geometry, NULL, "g", NULL, NULL), /* short form */
90 STRG (Rs_geometry, "geometry", "geometry", "geometry", "size (in characters) and position"), 92 STRG (Rs_geometry, "geometry", "geometry", "geometry", "size (in characters) and position"),
91 SWCH ("C", Opt_console, "intercept console messages"), 93 SWCH ("C", Opt_console, 0, "intercept console messages"),
92 SWCH ("iconic", Opt_iconic, "start iconic"), 94 SWCH ("iconic", Opt_iconic, 0, "start iconic"),
93 SWCH ("ic", Opt_iconic, NULL), /* short form */ 95 SWCH ("ic", Opt_iconic, 0, NULL), /* short form */
94 BOOL (Rs_reverseVideo, "reverseVideo", "rv", Opt_reverseVideo, "reverse video"), 96 BOOL (Rs_reverseVideo, "reverseVideo", "rv", Opt_reverseVideo, 0, "reverse video"),
95 BOOL (Rs_loginShell, "loginShell", "ls", Opt_loginShell, "login shell"), 97 BOOL (Rs_loginShell, "loginShell", "ls", Opt_loginShell, 0, "login shell"),
96 BOOL (Rs_jumpScroll, "jumpScroll", "j", Opt_jumpScroll, "jump scrolling"), 98 BOOL (Rs_jumpScroll, "jumpScroll", "j", Opt_jumpScroll, 0, "jump scrolling"),
99 BOOL (Rs_skipScroll, "skipScroll", "ss", Opt_skipScroll, 0, "skip scrolling"),
97 BOOL (Rs_pastableTabs, "pastableTabs", "ptab", Opt_pastableTabs, "tab characters are pastable"), 100 BOOL (Rs_pastableTabs, "pastableTabs", "ptab", Opt_pastableTabs, 0, "tab characters are pastable"),
98#if HAVE_SCROLLBARS 101#if HAVE_SCROLLBARS
99 RSTRG (Rs_scrollstyle, "scrollstyle", "mode"), 102 RSTRG (Rs_scrollstyle, "scrollstyle", "mode"),
100 BOOL (Rs_scrollBar, "scrollBar", "sb", Opt_scrollBar, "scrollbar"), 103 BOOL (Rs_scrollBar, "scrollBar", "sb", Opt_scrollBar, 0, "scrollbar"),
101 BOOL (Rs_scrollBar_right, "scrollBar_right", "sr", Opt_scrollBar_right, "scrollbar right"), 104 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"), 105 BOOL (Rs_scrollBar_floating, "scrollBar_floating", "st", Opt_scrollBar_floating, 0, "scrollbar without a trough"),
103 RSTRG (Rs_scrollBar_align, "scrollBar_align", "mode"), 106 RSTRG (Rs_scrollBar_align, "scrollBar_align", "mode"),
104 STRG (Rs_scrollBar_thickness, "thickness", "sbt", "number", "scrollbar thickness/width in pixels"), 107 STRG (Rs_scrollBar_thickness, "thickness", "sbt", "number", "scrollbar thickness/width in pixels"),
105#endif 108#endif
106 BOOL (Rs_scrollTtyOutput, "scrollTtyOutput", NULL, Opt_scrollTtyOutput, NULL), 109 BOOL (Rs_scrollTtyOutput, "scrollTtyOutput", NULL, Opt_scrollTtyOutput, 0, NULL),
107 BOOL (Rs_scrollTtyOutput, NULL, "si", Optflag_Reverse | Opt_scrollTtyOutput, "scroll-on-tty-output inhibit"), 110 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"), 111 BOOL (Rs_scrollTtyKeypress, "scrollTtyKeypress", "sk", Opt_scrollTtyKeypress, 0, "scroll-on-keypress"),
109 BOOL (Rs_scrollWithBuffer, "scrollWithBuffer", "sw", Opt_scrollWithBuffer, "scroll-with-buffer"), 112 BOOL (Rs_scrollWithBuffer, "scrollWithBuffer", "sw", Opt_scrollWithBuffer, 0, "scroll-with-buffer"),
110#if TRANSPARENT 113#if ENABLE_TRANSPARENCY
111 BOOL (Rs_transparent, "inheritPixmap", "ip", Opt_transparent, "inherit parent pixmap"), 114 BOOL (Rs_transparent, "inheritPixmap", "ip", Opt_transparent, 0, "inherit parent pixmap"),
112 SWCH ("tr", Opt_transparent, NULL), 115 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"), 116 STRG (Rs_color + Color_tint, "tintColor", "tint", "color", "tint color"),
117 STRG (Rs_shade, "shading", "sh", "number", "shade background by number %."),
118#endif
119#if OFF_FOCUS_FADING
120 STRG (Rs_fade, "fading", "fade", "number", "fade colors by number % when losing focus"),
121 STRG (Rs_color + Color_fade, "fadeColor", "fadecolor", "color", "target color for off-focus fading"),
122#endif
123 BOOL (Rs_utmpInhibit, "utmpInhibit", "ut", Opt_utmpInhibit, 0, "utmp inhibit"),
124#ifndef NO_BELL
125# if ENABLE_FRILLS
126 BOOL (Rs_urgentOnBell, "urgentOnBell", NULL, Opt_urgentOnBell, 0, NULL),
115# endif 127# endif
116#endif
117#if OFF_FOCUS_FADING
118 STRG (Rs_fade, "fading", "fade", "%", "fade colors x% percent when rxvt-unicode is losing focus"),
119 STRG (Rs_color + Color_fade, "fadeColor", "fadecolor", "color", "target color for off-focus fading"),
120#endif
121#if TINTING
122 STRG (Rs_shade, "shading", "sh", "%", "shade background by x% when tinting."),
123#endif
124 BOOL (Rs_utmpInhibit, "utmpInhibit", "ut", Opt_utmpInhibit, "utmp inhibit"),
125#ifndef NO_BELL
126 BOOL (Rs_visualBell, "visualBell", "vb", Opt_visualBell, "visual bell"), 128 BOOL (Rs_visualBell, "visualBell", "vb", Opt_visualBell, 0, "visual bell"),
127# if ! defined(NO_MAPALERT) && defined(MAPALERT_OPTION) 129# if ! defined(NO_MAPALERT) && defined(MAPALERT_OPTION)
128 BOOL (Rs_mapAlert, "mapAlert", NULL, Opt_mapAlert, NULL), 130 BOOL (Rs_mapAlert, "mapAlert", NULL, Opt_mapAlert, 0, NULL),
129# endif 131# endif
130#endif 132#endif
131#ifdef META8_OPTION 133#ifdef META8_OPTION
132 BOOL (Rs_meta8, "meta8", NULL, Opt_meta8, NULL), 134 BOOL (Rs_meta8, "meta8", NULL, Opt_meta8, 0, NULL),
133#endif 135#endif
134#ifdef MOUSE_WHEEL 136#ifdef MOUSE_WHEEL
135 BOOL (Rs_mouseWheelScrollPage, "mouseWheelScrollPage", NULL, Opt_mouseWheelScrollPage, NULL), 137 BOOL (Rs_mouseWheelScrollPage, "mouseWheelScrollPage", NULL, Opt_mouseWheelScrollPage, 0, NULL),
136#endif 138#endif
137#if ENABLE_FRILLS 139#if ENABLE_FRILLS
138 BOOL (Rs_tripleclickwords, "tripleclickwords", "tcw", Opt_tripleclickwords, "triple click word selection"), 140 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"), 141 BOOL (Rs_insecure, "insecure", "insecure", Opt_insecure, 0, "enable possibly insecure escape sequences"),
140 BOOL (Rs_cursorUnderline, "cursorUnderline", "uc", Opt_cursorUnderline, "underline cursor"), 142 BOOL (Rs_cursorUnderline, "cursorUnderline", "uc", Opt_cursorUnderline, 0, "underline cursor"),
141#endif 143#endif
142#if CURSOR_BLINK 144#if CURSOR_BLINK
143 BOOL (Rs_cursorBlink, "cursorBlink", "bc", Opt_cursorBlink, "blinking cursor"), 145 BOOL (Rs_cursorBlink, "cursorBlink", "bc", Opt_cursorBlink, 0, "blinking cursor"),
144#endif 146#endif
145#ifdef POINTER_BLANK 147#ifdef POINTER_BLANK
146 BOOL (Rs_pointerBlank, "pointerBlank", "pb", Opt_pointerBlank, "switch off pointer after delay"), 148 BOOL (Rs_pointerBlank, "pointerBlank", "pb", Opt_pointerBlank, 0, "switch off pointer after delay"),
147#endif 149#endif
148 STRG (Rs_color + Color_bg, "background", "bg", "color", "background color"), 150 STRG (Rs_color + Color_bg, "background", "bg", "color", "background color"),
149 STRG (Rs_color + Color_fg, "foreground", "fg", "color", "foreground color"), 151 STRG (Rs_color + Color_fg, "foreground", "fg", "color", "foreground color"),
150 RSTRG (Rs_color + minCOLOR + 0, "color0", "color"), 152 RSTRG (Rs_color + minCOLOR + 0, "color0", "color"),
151 RSTRG (Rs_color + minCOLOR + 1, "color1", "color"), 153 RSTRG (Rs_color + minCOLOR + 1, "color1", "color"),
… …
166#ifndef NO_BOLD_UNDERLINE_REVERSE 168#ifndef NO_BOLD_UNDERLINE_REVERSE
167 RSTRG (Rs_color + Color_BD, "colorBD", "color"), 169 RSTRG (Rs_color + Color_BD, "colorBD", "color"),
168 RSTRG (Rs_color + Color_IT, "colorIT", "color"), 170 RSTRG (Rs_color + Color_IT, "colorIT", "color"),
169 RSTRG (Rs_color + Color_UL, "colorUL", "color"), 171 RSTRG (Rs_color + Color_UL, "colorUL", "color"),
170 RSTRG (Rs_color + Color_RV, "colorRV", "color"), 172 RSTRG (Rs_color + Color_RV, "colorRV", "color"),
171#endif /* ! NO_BOLD_UNDERLINE_REVERSE */ 173#endif /* ! NO_BOLD_UNDERLINE_REVERSE */
172#if ENABLE_FRILLS 174#if ENABLE_FRILLS
173 RSTRG (Rs_color + Color_underline, "underlineColor", "color"), 175 RSTRG (Rs_color + Color_underline, "underlineColor", "color"),
174#endif 176#endif
175#ifdef KEEP_SCROLLCOLOR 177#ifdef KEEP_SCROLLCOLOR
176 RSTRG (Rs_color + Color_scroll, "scrollColor", "color"), 178 RSTRG (Rs_color + Color_scroll, "scrollColor", "color"),
177 RSTRG (Rs_color + Color_trough, "troughColor", "color"), 179 RSTRG (Rs_color + Color_trough, "troughColor", "color"),
178#endif /* KEEP_SCROLLCOLOR */ 180#endif /* KEEP_SCROLLCOLOR */
179#ifdef OPTION_HC 181#ifdef OPTION_HC
180 STRG (Rs_color + Color_HC, "highlightColor", "hc", "color", "highlight color"), 182 STRG (Rs_color + Color_HC, "highlightColor", "hc", "color", "highlight color"),
181#endif 183#endif
182#ifndef NO_CURSORCOLOR 184#ifndef NO_CURSORCOLOR
183 STRG (Rs_color + Color_cursor, "cursorColor", "cr", "color", "cursor color"), 185 STRG (Rs_color + Color_cursor, "cursorColor", "cr", "color", "cursor color"),
184 /* command-line option = resource name */ 186 /* command-line option = resource name */
185 RSTRG (Rs_color + Color_cursor2, "cursorColor2", "color"), 187 RSTRG (Rs_color + Color_cursor2, "cursorColor2", "color"),
186#endif /* NO_CURSORCOLOR */ 188#endif /* NO_CURSORCOLOR */
187 STRG (Rs_color + Color_pointer_fg, "pointerColor", "pr", "color", "pointer color"), 189 STRG (Rs_color + Color_pointer_fg, "pointerColor", "pr", "color", "pointer color"),
188 STRG (Rs_color + Color_pointer_bg, "pointerColor2", "pr2", "color", "pointer bg color"), 190 STRG (Rs_color + Color_pointer_bg, "pointerColor2", "pr2", "color", "pointer bg color"),
189 STRG (Rs_color + Color_border, "borderColor", "bd", "color", "border color"), 191 STRG (Rs_color + Color_border, "borderColor", "bd", "color", "border color"),
190#ifdef XPM_BACKGROUND 192#ifdef BG_IMAGE_FROM_FILE
191 RSTRG (Rs_path, "path", "search path"), 193 RSTRG (Rs_path, "path", "search path"),
192 STRG (Rs_backgroundPixmap, "backgroundPixmap", "pixmap", "file[;geom]", "background pixmap"), 194 STRG (Rs_backgroundPixmap, "backgroundPixmap", "pixmap", "file[;geom]", "background pixmap"),
193#endif 195#endif
194 /* fonts: command-line option = resource name */ 196 /* fonts: command-line option = resource name */
195 STRG (Rs_font, "font", "fn", "fontname", "normal text font"), 197 STRG (Rs_font, "font", "fn", "fontname", "normal text font"),
196#if ENABLE_STYLES 198#if ENABLE_STYLES
197 STRG (Rs_boldFont, "boldFont", "fb", "fontname", "bold font"), 199 STRG (Rs_boldFont, "boldFont", "fb", "fontname", "bold font"),
198 STRG (Rs_italicFont, "italicFont", "fi", "fontname", "italic font"), 200 STRG (Rs_italicFont, "italicFont", "fi", "fontname", "italic font"),
199 STRG (Rs_boldItalicFont, "boldItalicFont", "fbi", "fontname", "bold italic font"), 201 STRG (Rs_boldItalicFont, "boldItalicFont", "fbi", "fontname", "bold italic font"),
200 BOOL (Rs_intensityStyles, "intensityStyles", "is", Opt_intensityStyles, "font styles imply intensity changes"), 202 BOOL (Rs_intensityStyles, "intensityStyles", "is", Opt_intensityStyles, 0, "font styles imply intensity changes"),
201#endif 203#endif
202#ifdef USE_XIM 204#ifdef USE_XIM
203 STRG (Rs_inputMethod, "inputMethod", "im", "name", "name of input method"), 205 STRG (Rs_inputMethod, "inputMethod", "im", "name", "name of input method"),
204 STRG (Rs_preeditType, "preeditType", "pt", "style", "input style: style = OverTheSpot|OffTheSpot|Root"), 206 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"), 207 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"), 208 STRG (Rs_imFont, "imFont", "imfont", "fontname", "fontset for styles OverTheSpot and OffTheSpot"),
207#endif /* USE_XIM */ 209#endif /* USE_XIM */
208 STRG (Rs_name, NULL, "name", "string", "client instance, icon, and title strings"), 210 STRG (Rs_name, NULL, "name", "string", "client instance, icon, and title strings"),
209 STRG (Rs_title, "title", "title", "string", "title name for window"), 211 STRG (Rs_title, "title", "title", "string", "title name for window"),
210 STRG (Rs_title, NULL, "T", NULL, NULL), /* short form */ 212 STRG (Rs_title, NULL, "T", NULL, NULL), /* short form */
211 STRG (Rs_iconName, "iconName", "n", "string", "icon name for window"), 213 STRG (Rs_iconName, "iconName", "n", "string", "icon name for window"),
212 STRG (Rs_saveLines, "saveLines", "sl", "number", "number of scrolled lines to save"), 214 STRG (Rs_saveLines, "saveLines", "sl", "number", "number of scrolled lines to save"),
213#if ENABLE_XEMBED 215#if ENABLE_XEMBED
214 STRG (Rs_embed, NULL, "embed", "windowid", "window id to embed terminal in"), 216 STRG (Rs_embed, NULL, "embed", "windowid", "window id to embed terminal in"),
215#endif 217#endif
216#if XFT 218#if XFT
217 STRG (Rs_depth, "depth", "depth", "number", "depth of visual to request"), 219 STRG (Rs_depth, "depth", "depth", "number", "depth of visual to request"),
220 BOOL (Rs_buffered, "buffered", NULL, Opt_buffered, 0, NULL),
218#endif 221#endif
219#if ENABLE_FRILLS 222#if ENABLE_FRILLS
220 RSTRG (Rs_transient_for, "transient-for", "windowid"), 223 RSTRG (Rs_transient_for, "transient-for", "windowid"),
221 BOOL (Rs_override_redirect, "override-redirect", "override-redirect", Opt_override_redirect, "set override-redirect on the terminal window"), 224 BOOL (Rs_override_redirect, "override-redirect", "override-redirect", Opt_override_redirect, 0, "set override-redirect on the terminal window"),
222 STRG (Rs_pty_fd, NULL, "pty-fd", "fileno", "file descriptor of pty to use"), 225 STRG (Rs_pty_fd, NULL, "pty-fd", "fileno", "file descriptor of pty to use"),
223 BOOL (Rs_hold, "hold", "hold", Opt_hold, "retain window after shell exit"), 226 BOOL (Rs_hold, "hold", "hold", Opt_hold, 0, "retain window after shell exit"),
224 STRG (Rs_ext_bwidth, "externalBorder", "w", "number", "external border in pixels"), 227 STRG (Rs_ext_bwidth, "externalBorder", "w", "number", "external border in pixels"),
225 STRG (Rs_ext_bwidth, NULL, "bw", NULL, NULL), 228 STRG (Rs_ext_bwidth, NULL, "bw", NULL, NULL),
226 STRG (Rs_ext_bwidth, NULL, "borderwidth", NULL, NULL), 229 STRG (Rs_ext_bwidth, NULL, "borderwidth", NULL, NULL),
227 STRG (Rs_int_bwidth, "internalBorder", "b", "number", "internal border in pixels"), 230 STRG (Rs_int_bwidth, "internalBorder", "b", "number", "internal border in pixels"),
228 BOOL (Rs_borderLess, "borderLess", "bl", Opt_borderLess, "borderless window"), 231 BOOL (Rs_borderLess, "borderLess", "bl", Opt_borderLess, 0, "borderless window"),
229 BOOL (Rs_skipBuiltinGlyphs, "skipBuiltinGlyphs", "sbg", Opt_skipBuiltinGlyphs, "do not use internal glyphs"),
230 STRG (Rs_lineSpace, "lineSpace", "lsp", "number", "number of extra pixels between rows"), 232 STRG (Rs_lineSpace, "lineSpace", "lsp", "number", "number of extra pixels between rows"),
233#endif
234#ifdef BUILTIN_GLYPHS
235 BOOL (Rs_skipBuiltinGlyphs, "skipBuiltinGlyphs", "sbg", Opt_skipBuiltinGlyphs, 0, "do not use internal glyphs"),
231#endif 236#endif
232#ifdef POINTER_BLANK 237#ifdef POINTER_BLANK
233 RSTRG (Rs_pointerBlankDelay, "pointerBlankDelay", "number"), 238 RSTRG (Rs_pointerBlankDelay, "pointerBlankDelay", "number"),
234#endif 239#endif
235#ifndef NO_BACKSPACE_KEY 240#ifndef NO_BACKSPACE_KEY
236 RSTRG (Rs_backspace_key, "backspacekey", "string"), 241 RSTRG (Rs_backspace_key, "backspacekey", "string"),
237#endif 242#endif
238#ifndef NO_DELETE_KEY 243#ifndef NO_DELETE_KEY
239 RSTRG (Rs_delete_key, "deletekey", "string"), 244 RSTRG (Rs_delete_key, "deletekey", "string"),
240#endif 245#endif
241 RSTRG (Rs_selectstyle, "selectstyle", "mode"),
242#ifdef PRINTPIPE 246#ifdef PRINTPIPE
243 RSTRG (Rs_print_pipe, "print-pipe", "string"), 247 RSTRG (Rs_print_pipe, "print-pipe", "string"),
244#endif 248#endif
245 STRG (Rs_modifier, "modifier", "mod", "modifier", "meta modifier = alt|meta|hyper|super|mod1|...|mod5"), 249 STRG (Rs_modifier, "modifier", "mod", "modifier", "meta modifier = alt|meta|hyper|super|mod1|...|mod5"),
246#ifdef CUTCHAR_RESOURCE 250#ifdef CUTCHAR_RESOURCE
247 RSTRG (Rs_cutchars, "cutchars", "string"), 251 RSTRG (Rs_cutchars, "cutchars", "string"),
248#endif /* CUTCHAR_RESOURCE */ 252#endif /* CUTCHAR_RESOURCE */
249 RSTRG (Rs_answerbackstring, "answerbackString", "string"), 253 RSTRG (Rs_answerbackstring, "answerbackString", "string"),
250#ifndef NO_SECONDARY_SCREEN 254#ifndef NO_SECONDARY_SCREEN
251 BOOL (Rs_secondaryScreen, "secondaryScreen", "ssc", Opt_secondaryScreen, "enable secondary screen"), 255 BOOL (Rs_secondaryScreen, "secondaryScreen", "ssc", Opt_secondaryScreen, 0, "enable secondary screen"),
252 BOOL (Rs_secondaryScroll, "secondaryScroll", "ssr", Opt_secondaryScroll, "enable secondary screen scroll"), 256 BOOL (Rs_secondaryScroll, "secondaryScroll", "ssr", Opt_secondaryScroll, 0, "enable secondary screen scroll"),
253#endif 257#endif
254#if ENABLE_PERL 258#if ENABLE_PERL
255 RSTRG (Rs_perl_lib, "perl-lib", "string"), //, "colon-separated directories with extension scripts"),TODO 259 RSTRG (Rs_perl_lib, "perl-lib", "string"), //, "colon-separated directories with extension scripts"),TODO
256 RSTRG (Rs_perl_eval, "perl-eval", "perl-eval"), // "string", "code to be evaluated after all extensions have been loaded"),TODO 260 RSTRG (Rs_perl_eval, "perl-eval", "perl-eval"), // "string", "code to be evaluated after all extensions have been loaded"),TODO
257 RSTRG (Rs_perl_ext_1, "perl-ext-common", "string"), //, "colon-separated list of perl extensions to enable"),TODO 261 RSTRG (Rs_perl_ext_1, "perl-ext-common", "string"), //, "colon-separated list of perl extensions to enable"),TODO
258 STRG (Rs_perl_ext_2, "perl-ext", "pe", "string", "colon-separated list of perl extensions to enable for this instance"), 262 STRG (Rs_perl_ext_2, "perl-ext", "pe", "string", "colon-separated list of perl extensions to enable for this instance"),
259#endif 263#endif
260#ifndef NO_RESOURCES 264#if ISO_14755
261 INFO ("xrm", "string", "X resource"), 265 BOOL (Rs_iso14755_52, "iso14755_52", NULL, Opt_iso14755_52, 0, NULL),
266#endif
267#ifdef HAVE_AFTERIMAGE
268 STRG (Rs_blendtype, "blendType", "blt", "string", "background image blending type - alpha, tint, etc..."),
269 STRG (Rs_blurradius, "blurRadius", "blr", "HxV", "Gaussian Blur radii to apply to the root background"),
262#endif 270#endif
263 INFO ("e", "command arg ...", "command to execute") 271 INFO ("e", "command arg ...", "command to execute")
264 }; 272 };
265 273
266#undef INFO 274#undef INFO
267#undef STRG 275#undef STRG
268#undef RSTRG 276#undef RSTRG
269#undef SWCH 277#undef SWCH
270#undef BOOL 278#undef BOOL
271/*}}} */
272 279
273static const char releasestring[] = "rxvt-unicode (" RXVTNAME ") v" VERSION " - released: " DATE "\n"; 280static const char releasestring[] = "rxvt-unicode (" RXVTNAME ") v" VERSION " - released: " DATE "\n";
274static const char optionsstring[] = "options: " 281static const char optionsstring[] = "options: "
275#if ENABLE_PERL 282#if ENABLE_PERL
276 "perl," 283 "perl,"
… …
311#endif 318#endif
312 "," 319 ","
313#if OFF_FOCUS_FADING 320#if OFF_FOCUS_FADING
314 "fade," 321 "fade,"
315#endif 322#endif
316#if defined(XPM_BACKGROUND)
317 "XPM,"
318#endif
319#if defined(TRANSPARENT) 323#if defined(ENABLE_TRANSPARENCY)
320 "transparent," 324 "transparent,"
321#endif
322#if TINTING
323 "tint," 325 "tint,"
326#endif
327#if HAVE_AFTERIMAGE
328 "afterimage,"
324#endif 329#endif
325#if defined(USE_XIM) 330#if defined(USE_XIM)
326 "XIM," 331 "XIM,"
327#endif 332#endif
328#if defined(NO_BACKSPACE_KEY) 333#if defined(NO_BACKSPACE_KEY)
… …
386#endif 391#endif
387 "\nUsage: "; /* Usage */ 392 "\nUsage: "; /* Usage */
388 393
389#define INDENT 18 394#define INDENT 18
390 395
396const char rxvt_term::resval_undef [] = "<undef>";
397const char rxvt_term::resval_on [] = "on";
398const char rxvt_term::resval_off [] = "off";
399
391/*{{{ usage: */ 400/*{{{ usage: */
392/*----------------------------------------------------------------------*/ 401/*----------------------------------------------------------------------*/
393static void 402static void
394rxvt_usage (int type) 403rxvt_usage (int type)
395{ 404{
… …
403 rxvt_log (" [-help] [--help]\n"); 412 rxvt_log (" [-help] [--help]\n");
404 413
405 for (col = 1, i = 0; i < optList_size; i++) 414 for (col = 1, i = 0; i < optList_size; i++)
406 if (optList[i].desc != NULL) 415 if (optList[i].desc != NULL)
407 { 416 {
408 int len = 0; 417 int len = 0;
409 418
410 if (!optList_isBool (i)) 419 if (optList[i].arg)
411 { 420 len = strlen (optList[i].arg) + 1;
412 len = optList_strlen (i);
413 if (len > 0)
414 len++; /* account for space */
415 }
416#ifdef DEBUG_STRICT 421#ifdef DEBUG_STRICT
417 assert (optList[i].opt != NULL); 422 assert (optList[i].opt != NULL);
418#endif 423#endif
419 len += 4 + strlen (optList[i].opt) + (optList_isBool (i) ? 2: 0); 424 len += 4 + strlen (optList[i].opt) + (optList_isBool (i) ? 2: 0);
420 col += len; 425 col += len;
421 if (col > 79) 426 if (col > 79)
427 {
422 { /* assume regular width */ 428 /* assume regular width */
423 rxvt_log ("\n"); 429 rxvt_log ("\n");
424 col = 1 + len; 430 col = 1 + len;
425 } 431 }
426 432
427 rxvt_log (" [-%s%s", (optList_isBool (i) ? "/+" : ""), optList[i].opt); 433 rxvt_log (" [-%s%s", (optList_isBool (i) ? "/+" : ""), optList[i].opt);
428 if (optList_strlen (i)) 434 if (optList[i].arg)
429 rxvt_log (" %s]", optList[i].arg); 435 rxvt_log (" %s]", optList[i].arg);
430 else 436 else
431 rxvt_log ("]"); 437 rxvt_log ("]");
432 } 438 }
433 break; 439 break;
… …
480 486
481/*{{{ get command-line options before getting resources */ 487/*{{{ get command-line options before getting resources */
482void 488void
483rxvt_term::get_options (int argc, const char *const *argv) 489rxvt_term::get_options (int argc, const char *const *argv)
484{ 490{
485 int i, bad_option = 0; 491 int i, bad_option = 0;
486 static const char On[3] = "ON", Off[4] = "OFF";
487 492
488 for (i = 1; i < argc; i++) 493 for (i = 1; i < argc; i++)
489 { 494 {
490 unsigned int entry, longopt = 0; 495 unsigned int entry, longopt = 0;
491 const char *flag, *opt; 496 const char *opt;
497 int flag;
492 498
493 opt = argv[i]; 499 opt = argv[i];
494 500
495 if (*opt == '-') 501 if (*opt == '-')
496 { 502 {
497 flag = On; 503 flag = 1;
504
498 if (*++opt == '-') 505 if (*++opt == '-')
499 longopt = *opt++; /* long option */ 506 longopt = *opt++; /* long option */
500 } 507 }
501 else if (*opt == '+') 508 else if (*opt == '+')
502 { 509 {
503 flag = Off; 510 flag = 0;
511
504 if (*++opt == '+') 512 if (*++opt == '+')
505 longopt = *opt++; /* long option */ 513 longopt = *opt++; /* long option */
506 } 514 }
507 else 515 else
508 { 516 {
… …
511 continue; 519 continue;
512 } 520 }
513 521
514 if (!strcmp (opt, "help")) 522 if (!strcmp (opt, "help"))
515 rxvt_usage (longopt ? 2 : 1); 523 rxvt_usage (longopt ? 2 : 1);
524
516 if (!strcmp (opt, "h")) 525 if (!strcmp (opt, "h"))
517 rxvt_usage (0); 526 rxvt_usage (0);
518 527
519 /* feature: always try to match long-options */ 528 /* feature: always try to match long-options */
520 for (entry = 0; entry < optList_size; entry++) 529 for (entry = 0; entry < optList_size; entry++)
… …
524 break; 533 break;
525 534
526 if (entry < optList_size) 535 if (entry < optList_size)
527 { 536 {
528 if (optList_isReverse (entry)) 537 if (optList_isReverse (entry))
529 flag = flag == On ? Off : On; 538 flag = !flag;
530 539
531 if (optList_strlen (entry)) 540 if (optList_isString (entry))
532 { 541 {
533 /* 542 /*
534 * special cases are handled in main.c:main () to allow 543 * special cases are handled in main.c:main () to allow
535 * X resources to set these values before we settle for 544 * X resources to set these values before we settle for
536 * default values 545 * default values
537 */ 546 */
538 547
539 if (optList[entry].doff != -1) 548 if (optList[entry].doff != -1)
549 {
550 if (flag && i+1 == argc)
551 rxvt_fatal ("option '%s' requires an argument, aborting.\n", argv [i]);
552
540 rs[optList[entry].doff] = flag == On && argv[i+1] 553 rs[optList[entry].doff] = flag ? argv[++i] : resval_undef;
541 ? argv[++i] : 0; 554 }
542 } 555 }
543 else 556 else
557 {
544 { /* boolean value */ 558 /* boolean value */
545 set_option (optList[entry].flag & Optflag_mask, flag == On); 559 set_option (optList[entry].index, flag);
546 560
547 if (optList[entry].doff != -1) 561 if (optList[entry].doff != -1)
548 rs[optList[entry].doff] = flag; 562 rs[optList[entry].doff] = flag ? resval_on : resval_off;
549 } 563 }
550 } 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
551 else 584 else
552#ifdef KEYSYM_RESOURCE
553 /* if (!strncmp (opt, "keysym.", sizeof ("keysym.") - 1)) */
554 if (rxvt_Str_match (opt, "keysym."))
555 { 585 {
556 const char *str = argv[++i];
557
558 if (str != NULL)
559 parse_keysym (opt + sizeof ("keysym.") - 1, str);
560 }
561 else
562#endif
563 {
564 bad_option = 1; 586 bad_option = 1;
565 rxvt_warn ("\"%s\": unknown or malformed option.\n", opt); 587 rxvt_warn ("\"%s\": unknown or malformed option.\n", opt);
566 } 588 }
567 } 589 }
568 590
569 if (bad_option) 591 if (bad_option)
570 rxvt_usage (0); 592 rxvt_usage (0);
571} 593}
… …
602} 624}
603 625
604/* 626/*
605 * look for something like this (XK_Delete) 627 * look for something like this (XK_Delete)
606 * rxvt*keysym.0xFFFF: "\177" 628 * rxvt*keysym.0xFFFF: "\177"
607 *
608 * arg will be
609 * NULL for ~/.Xdefaults and
610 * non-NULL for command-line options (need to allocate)
611 */ 629 */
612#define NEWARGLIM 500 /* `reasonable' size */
613 630
614struct keysym_vocabulary_t 631struct keysym_vocabulary_t
615{ 632{
616 const char *name; 633 const char *name;
617 unsigned short len; 634 unsigned short len;
618 unsigned short value; 635 unsigned short value;
619}; 636};
620keysym_vocabulary_t keysym_vocabulary[] = 637static const keysym_vocabulary_t keysym_vocabulary[] =
621{ 638{
622 { "ISOLevel3", 9, Level3Mask }, 639 { "ISOLevel3", 9, Level3Mask },
623 { "AppKeypad", 9, AppKeypadMask }, 640 { "AppKeypad", 9, AppKeypadMask },
624 { "Control", 7, ControlMask }, 641 { "Control", 7, ControlMask },
625 { "NumLock", 7, NumLockMask }, 642 { "NumLock", 7, NumLockMask },
… …
647}; 664};
648 665
649int 666int
650rxvt_term::parse_keysym (const char *str, const char *arg) 667rxvt_term::parse_keysym (const char *str, const char *arg)
651{ 668{
652 int n, sym; 669 int sym;
653 unsigned int state = 0; 670 unsigned int state = 0;
654 const char *pmodend = NULL; 671 const char *key = strrchr (str, '-');
655 char *newarg = NULL;
656 char newargstr[NEWARGLIM];
657 672
658 if (arg == NULL) 673 if (!key)
659 { 674 key = str;
660 if ((n = rxvt_Str_match (str, "keysym.")) == 0)
661 return 0;
662
663 str += n; /* skip `keysym.' */
664 if (!(pmodend = strchr (str, ':')))
665 return -1;
666 }
667 else 675 else
668 pmodend = str + strlen(str); 676 key++;
669 677
670 for (--pmodend; str < pmodend; --pmodend) 678 // string or key is empty
671 if (*pmodend == '-') 679 if (*arg == '\0' || *key == '\0')
672 break; 680 return -1;
673 681
682 // parse modifiers
674 while (str < pmodend) 683 while (str < key)
675 { 684 {
676 unsigned int i; 685 unsigned int i;
677 686
678 for (i=0; i < sizeof (keysym_vocabulary) / sizeof (keysym_vocabulary_t); ++i) 687 for (i=0; i < sizeof (keysym_vocabulary) / sizeof (keysym_vocabulary_t); ++i)
679 { 688 {
… …
690 699
691 if (*str == '-') 700 if (*str == '-')
692 ++str; 701 ++str;
693 } 702 }
694 703
695 /* some scanf () have trouble with a 0x prefix */ 704 // convert keysym name to keysym number
696 if (str[0] == '0' && toupper (str[1]) == 'X') 705 if ((sym = XStringToKeysym (str)) == None)
697 { 706 {
698 str += 2; 707 // fallback on hexadecimal parsing
699 708 char *end;
709 sym = strtol (str, &end, 16);
700 if (arg) 710 if (*end)
701 {
702 if (sscanf (str, (strchr (str, ':') ? "%x:" : "%x"), &sym) != 1)
703 return -1;
704 }
705 else
706 {
707 if (sscanf (str, "%x:", &sym) != 1)
708 return -1;
709
710 /* cue to ':', it's there since sscanf () worked */
711 strncpy (newargstr, strchr (str, ':') + 1, NEWARGLIM - 1);
712 newargstr[NEWARGLIM - 1] = '\0';
713 newarg = newargstr;
714 }
715 }
716 else
717 {
718 /*
719 * convert keysym name to keysym number
720 */
721 strncpy (newargstr, str, NEWARGLIM - 1);
722 newargstr[NEWARGLIM - 1] = '\0';
723
724 if (arg == NULL)
725 {
726 if ((newarg = strchr (newargstr, ':')) == NULL)
727 return -1;
728
729 *newarg++ = '\0'; /* terminate keysym name */
730 }
731
732 if ((sym = XStringToKeysym (newargstr)) == None)
733 return -1; 711 return -1;
734 } 712 }
735 713
736 if (newarg == NULL)
737 {
738 strncpy (newargstr, arg, NEWARGLIM - 1);
739 newargstr[NEWARGLIM - 1] = '\0';
740 newarg = newargstr;
741 }
742
743 rxvt_Str_trim (newarg);
744 if (*newarg == '\0' || (n = rxvt_Str_escaped (newarg)) == 0)
745 return -1;
746
747 keyboard->register_user_translation (sym, state, newarg); 714 keyboard->register_user_translation (sym, state, arg);
748 return 1; 715 return 1;
749} 716}
750 717
751# endif /* KEYSYM_RESOURCE */ 718# endif /* KEYSYM_RESOURCE */
752#endif /* NO_RESOURCES */ 719#endif /* NO_RESOURCES */
753 720
754static char * 721static char *
755get_res (XrmDatabase database, const char *program, const char *option) 722get_res (XrmDatabase database, const char *program, const char *option)
756{ 723{
757 char resource[512]; 724 char resource[512];
… …
765} 732}
766 733
767const char * 734const char *
768rxvt_term::x_resource (const char *name) 735rxvt_term::x_resource (const char *name)
769{ 736{
770 XrmDatabase database = XrmGetDatabase (xdisp); 737 XrmDatabase database = XrmGetDatabase (dpy);
771 738
772 const char *p = get_res (database, rs[Rs_name], name); 739 const char *p = get_res (database, rs[Rs_name], name);
773 const char *p0 = get_res (database, "!INVALIDPROGRAMMENAMEDONTMATCH!", name); 740 const char *p0 = get_res (database, "!INVALIDPROGRAMMENAMEDONTMATCH!", name);
774 741
775 if (p == NULL || (p0 && strcmp (p, p0) == 0)) 742 if (p == NULL || (p0 && strcmp (p, p0) == 0))
… …
789 756
790void 757void
791rxvt_term::extract_resources () 758rxvt_term::extract_resources ()
792{ 759{
793#ifndef NO_RESOURCES 760#ifndef NO_RESOURCES
761 XrmDatabase database = XrmGetDatabase (dpy);
762 XrmMergeDatabases (option_db, &database);
763 option_db = NULL;
794 /* 764 /*
795 * Query resources for options that affect us 765 * Query resources for options that affect us
796 */ 766 */
797 for (int entry = 0; entry < optList_size; entry++) 767 for (int entry = 0; entry < optList_size; entry++)
798 { 768 {
… …
818 || strcasecmp (p, "1") == 0; 788 || strcasecmp (p, "1") == 0;
819 789
820 if (optList_isReverse (entry)) 790 if (optList_isReverse (entry))
821 s = !s; 791 s = !s;
822 792
823 set_option (optList[entry].flag & Optflag_mask, s); 793 set_option (optList[entry].index, s);
824 } 794 }
825 } 795 }
826 } 796 }
827 797
828 /* 798 /*
829 * [R5 or later]: enumerate the resource database 799 * [R5 or later]: enumerate the resource database
830 */ 800 */
831# ifdef KEYSYM_RESOURCE 801# ifdef KEYSYM_RESOURCE
832 XrmDatabase database = XrmGetDatabase (xdisp);
833 XrmName name_prefix[3]; 802 XrmName name_prefix[3];
834 XrmClass class_prefix[3]; 803 XrmClass class_prefix[3];
835 804
836 name_prefix[0] = XrmStringToName (rs[Rs_name]); 805 name_prefix[0] = XrmStringToName (rs[Rs_name]);
837 name_prefix[1] = XrmStringToName ("keysym"); 806 name_prefix[1] = XrmStringToName ("keysym");
… …
851 XrmEnumerateDatabase (database, name_prefix, class_prefix, 820 XrmEnumerateDatabase (database, name_prefix, class_prefix,
852 XrmEnumOneLevel, rxvt_define_key, NULL); 821 XrmEnumOneLevel, rxvt_define_key, NULL);
853# endif 822# endif
854# endif 823# endif
855 824
856#endif /* NO_RESOURCES */ 825#endif /* NO_RESOURCES */
857} 826}
858 827
859/*----------------------- end-of-file (C source) -----------------------*/ 828/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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