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.81 by root, Wed Jan 18 19:43:51 2006 UTC vs.
Revision 1.127 by ayin, Mon Dec 17 23:52:45 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/* #define DEBUG_RESOURCES */
40
41/*{{{ monolithic option/resource structure: */ 39/* monolithic option/resource structure: */
42/* 40/*
43 * `string' options MUST have a usage argument 41 * `string' options MUST have a usage argument
44 * `switch' and `boolean' options have no argument 42 * `switch' and `boolean' options have no argument
45 * 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 ()
46 */ 44 */
47 45
48/* INFO () - descriptive information only */ 46/* INFO () - descriptive information only */
49#define INFO(opt, arg, desc) \ 47#define INFO(opt, arg, desc) \
50 {0, -1, NULL, (opt), (arg), (desc)} 48 {0, 0, -1, NULL, (opt), (arg), (desc)}
51 49
52/* STRG () - command-line option, with/without resource */ 50/* STRG () - command-line option, with/without resource */
53#define STRG(rsp, kw, opt, arg, desc) \ 51#define STRG(rsp, kw, opt, arg, desc) \
54 {0, (rsp), (kw), (opt), (arg), (desc)} 52 {0, 0, (rsp), (kw), (opt), (arg), (desc)}
55 53
56/* RSTRG () - resource/long-option */ 54/* RSTRG () - resource/long-option */
57#define RSTRG(rsp, kw, arg) \ 55#define RSTRG(rsp, kw, arg) \
58 {0, (rsp), (kw), NULL, (arg), NULL} 56 {0, 0, (rsp), (kw), NULL, (arg), NULL}
59 57
60/* BOOL () - regular boolean `-/+' flag */ 58/* BOOL () - regular boolean `-/+' flag */
61#define BOOL(rsp, kw, opt, flag, desc) \ 59#define BOOL(rsp, kw, opt, option, flag, desc) \
62 { (Optflag_Boolean | (flag)), (rsp), (kw), (opt), NULL, (desc)} 60 { (option), (Optflag_Boolean | (flag)), (rsp), (kw), (opt), NULL, (desc)}
63 61
64/* SWCH () - `-' flag */ 62/* SWCH () - `-' flag */
65#define SWCH(opt, flag, desc) \ 63#define SWCH(opt, option, flag, desc) \
66 { (flag), -1, NULL, (opt), NULL, (desc)} 64 { (option), (Optflag_Switch | (flag)), -1, NULL, (opt), NULL, (desc)}
67 65
68/* convenient macros */ 66/* convenient macros */
69#define optList_strlen(i) \ 67#define optList_strlen(i) \
70 (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))
71#define optList_isBool(i) \ 69#define optList_isBool(i) \
… …
75#define optList_size \ 73#define optList_size \
76 (sizeof (optList) / sizeof (optList[0])) 74 (sizeof (optList) / sizeof (optList[0]))
77 75
78static const struct 76static const struct
79 { 77 {
78 const uint8_t index; /* Option index */
80 const unsigned long flag; /* Option flag */ 79 const uint8_t flag; /* Option flag */
81 const int doff; /* data offset */ 80 const int16_t doff; /* resource value index or -1 */
82 const char *kw; /* keyword */ 81 const char *kw; /* keyword */
83 const char *opt; /* option */ 82 const char *opt; /* option */
84 const char *arg; /* argument */ 83 const char *arg; /* argument */
85 const char *desc; /* description */ 84 const char *desc; /* description */
86 } 85 }
… …
88 STRG (Rs_display_name, NULL, "d", NULL, NULL), /* short form */ 87 STRG (Rs_display_name, NULL, "d", NULL, NULL), /* short form */
89 STRG (Rs_display_name, NULL, "display", "string", "X server to contact"), 88 STRG (Rs_display_name, NULL, "display", "string", "X server to contact"),
90 STRG (Rs_term_name, "termName", "tn", "string", "value of the TERM environment variable"), 89 STRG (Rs_term_name, "termName", "tn", "string", "value of the TERM environment variable"),
91 STRG (Rs_geometry, NULL, "g", NULL, NULL), /* short form */ 90 STRG (Rs_geometry, NULL, "g", NULL, NULL), /* short form */
92 STRG (Rs_geometry, "geometry", "geometry", "geometry", "size (in characters) and position"), 91 STRG (Rs_geometry, "geometry", "geometry", "geometry", "size (in characters) and position"),
93 SWCH ("C", Opt_console, "intercept console messages"), 92 SWCH ("C", Opt_console, 0, "intercept console messages"),
94 SWCH ("iconic", Opt_iconic, "start iconic"), 93 SWCH ("iconic", Opt_iconic, 0, "start iconic"),
95 SWCH ("ic", Opt_iconic, NULL), /* short form */ 94 SWCH ("ic", Opt_iconic, 0, NULL), /* short form */
96 BOOL (Rs_reverseVideo, "reverseVideo", "rv", Opt_reverseVideo, "reverse video"), 95 BOOL (Rs_reverseVideo, "reverseVideo", "rv", Opt_reverseVideo, 0, "reverse video"),
97 BOOL (Rs_loginShell, "loginShell", "ls", Opt_loginShell, "login shell"), 96 BOOL (Rs_loginShell, "loginShell", "ls", Opt_loginShell, 0, "login shell"),
98 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"),
99 BOOL (Rs_pastableTabs, "pastableTabs", "ptab", Opt_pastableTabs, "tab characters are pastable"), 99 BOOL (Rs_pastableTabs, "pastableTabs", "ptab", Opt_pastableTabs, 0, "tab characters are pastable"),
100#if HAVE_SCROLLBARS 100#if HAVE_SCROLLBARS
101 RSTRG (Rs_scrollstyle, "scrollstyle", "mode"), 101 RSTRG (Rs_scrollstyle, "scrollstyle", "mode"),
102 BOOL (Rs_scrollBar, "scrollBar", "sb", Opt_scrollBar, "scrollbar"), 102 BOOL (Rs_scrollBar, "scrollBar", "sb", Opt_scrollBar, 0, "scrollbar"),
103 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"),
104 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"),
105 RSTRG (Rs_scrollBar_align, "scrollBar_align", "mode"), 105 RSTRG (Rs_scrollBar_align, "scrollBar_align", "mode"),
106 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"),
107#endif 107#endif
108 BOOL (Rs_scrollTtyOutput, "scrollTtyOutput", NULL, Opt_scrollTtyOutput, NULL), 108 BOOL (Rs_scrollTtyOutput, "scrollTtyOutput", NULL, Opt_scrollTtyOutput, 0, NULL),
109 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"),
110 BOOL (Rs_scrollTtyKeypress, "scrollTtyKeypress", "sk", Opt_scrollTtyKeypress, "scroll-on-keypress"), 110 BOOL (Rs_scrollTtyKeypress, "scrollTtyKeypress", "sk", Opt_scrollTtyKeypress, 0, "scroll-on-keypress"),
111 BOOL (Rs_scrollWithBuffer, "scrollWithBuffer", "sw", Opt_scrollWithBuffer, "scroll-with-buffer"), 111 BOOL (Rs_scrollWithBuffer, "scrollWithBuffer", "sw", Opt_scrollWithBuffer, 0, "scroll-with-buffer"),
112#if TRANSPARENT 112#if ENABLE_TRANSPARENCY
113 BOOL (Rs_transparent, "inheritPixmap", "ip", Opt_transparent, "inherit parent pixmap"), 113 BOOL (Rs_transparent, "inheritPixmap", "ip", Opt_transparent, 0, "inherit parent pixmap"),
114 SWCH ("tr", Opt_transparent, NULL), 114 BOOL (Rs_transparent, "transparent", "tr", Opt_transparent, 0, "inherit parent pixmap"),
115# if TINTING
116 STRG (Rs_color + Color_tint, "tintColor", "tint", "color", "tint color"), 115 STRG (Rs_color + Color_tint, "tintColor", "tint", "color", "tint color"),
116 STRG (Rs_shade, "shading", "sh", "number", "shade background by number %."),
117#endif
118#if OFF_FOCUS_FADING
119 STRG (Rs_fade, "fading", "fade", "number", "fade colors by number % when losing focus"),
120 STRG (Rs_color + Color_fade, "fadeColor", "fadecolor", "color", "target color for off-focus fading"),
121#endif
122 BOOL (Rs_utmpInhibit, "utmpInhibit", "ut", Opt_utmpInhibit, 0, "utmp inhibit"),
123#ifndef NO_BELL
124# if ENABLE_FRILLS
125 BOOL (Rs_urgentOnBell, "urgentOnBell", NULL, Opt_urgentOnBell, 0, NULL),
117# endif 126# endif
118#endif
119#if OFF_FOCUS_FADING
120 STRG (Rs_fade, "fading", "fade", "%", "fade colors x% percent when rxvt-unicode is losing focus"),
121 STRG (Rs_color + Color_fade, "fadeColor", "fadecolor", "color", "target color for off-focus fading"),
122#endif
123#if TINTING
124 STRG (Rs_shade, "shading", "sh", "%", "shade background by x% when tinting."),
125#endif
126 BOOL (Rs_utmpInhibit, "utmpInhibit", "ut", Opt_utmpInhibit, "utmp inhibit"),
127#ifndef NO_BELL
128 BOOL (Rs_visualBell, "visualBell", "vb", Opt_visualBell, "visual bell"), 127 BOOL (Rs_visualBell, "visualBell", "vb", Opt_visualBell, 0, "visual bell"),
129# if ! defined(NO_MAPALERT) && defined(MAPALERT_OPTION) 128# if ! defined(NO_MAPALERT) && defined(MAPALERT_OPTION)
130 BOOL (Rs_mapAlert, "mapAlert", NULL, Opt_mapAlert, NULL), 129 BOOL (Rs_mapAlert, "mapAlert", NULL, Opt_mapAlert, 0, NULL),
131# endif 130# endif
132#endif 131#endif
133#ifdef META8_OPTION 132#ifdef META8_OPTION
134 BOOL (Rs_meta8, "meta8", NULL, Opt_meta8, NULL), 133 BOOL (Rs_meta8, "meta8", NULL, Opt_meta8, 0, NULL),
135#endif 134#endif
136#ifdef MOUSE_WHEEL 135#ifdef MOUSE_WHEEL
137 BOOL (Rs_mouseWheelScrollPage, "mouseWheelScrollPage", NULL, Opt_mouseWheelScrollPage, NULL), 136 BOOL (Rs_mouseWheelScrollPage, "mouseWheelScrollPage", NULL, Opt_mouseWheelScrollPage, 0, NULL),
138#endif 137#endif
139#if ENABLE_FRILLS 138#if ENABLE_FRILLS
140 BOOL (Rs_tripleclickwords, "tripleclickwords", "tcw", Opt_tripleclickwords, "triple click word selection"), 139 BOOL (Rs_tripleclickwords, "tripleclickwords", "tcw", Opt_tripleclickwords, 0, "triple click word selection"),
141 BOOL (Rs_insecure, "insecure", "insecure", Opt_insecure, "enable possibly insecure escape sequences"), 140 BOOL (Rs_insecure, "insecure", "insecure", Opt_insecure, 0, "enable possibly insecure escape sequences"),
142 BOOL (Rs_cursorUnderline, "cursorUnderline", "uc", Opt_cursorUnderline, "underline cursor"), 141 BOOL (Rs_cursorUnderline, "cursorUnderline", "uc", Opt_cursorUnderline, 0, "underline cursor"),
143#endif 142#endif
144#if CURSOR_BLINK 143#if CURSOR_BLINK
145 BOOL (Rs_cursorBlink, "cursorBlink", "bc", Opt_cursorBlink, "blinking cursor"), 144 BOOL (Rs_cursorBlink, "cursorBlink", "bc", Opt_cursorBlink, 0, "blinking cursor"),
146#endif 145#endif
147#ifdef POINTER_BLANK 146#ifdef POINTER_BLANK
148 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"),
149#endif 148#endif
150 STRG (Rs_color + Color_bg, "background", "bg", "color", "background color"), 149 STRG (Rs_color + Color_bg, "background", "bg", "color", "background color"),
151 STRG (Rs_color + Color_fg, "foreground", "fg", "color", "foreground color"), 150 STRG (Rs_color + Color_fg, "foreground", "fg", "color", "foreground color"),
152 RSTRG (Rs_color + minCOLOR + 0, "color0", "color"), 151 RSTRG (Rs_color + minCOLOR + 0, "color0", "color"),
153 RSTRG (Rs_color + minCOLOR + 1, "color1", "color"), 152 RSTRG (Rs_color + minCOLOR + 1, "color1", "color"),
… …
168#ifndef NO_BOLD_UNDERLINE_REVERSE 167#ifndef NO_BOLD_UNDERLINE_REVERSE
169 RSTRG (Rs_color + Color_BD, "colorBD", "color"), 168 RSTRG (Rs_color + Color_BD, "colorBD", "color"),
170 RSTRG (Rs_color + Color_IT, "colorIT", "color"), 169 RSTRG (Rs_color + Color_IT, "colorIT", "color"),
171 RSTRG (Rs_color + Color_UL, "colorUL", "color"), 170 RSTRG (Rs_color + Color_UL, "colorUL", "color"),
172 RSTRG (Rs_color + Color_RV, "colorRV", "color"), 171 RSTRG (Rs_color + Color_RV, "colorRV", "color"),
173#endif /* ! NO_BOLD_UNDERLINE_REVERSE */ 172#endif /* ! NO_BOLD_UNDERLINE_REVERSE */
174#if ENABLE_FRILLS 173#if ENABLE_FRILLS
175 RSTRG (Rs_color + Color_underline, "underlineColor", "color"), 174 RSTRG (Rs_color + Color_underline, "underlineColor", "color"),
176#endif 175#endif
177#ifdef KEEP_SCROLLCOLOR 176#ifdef KEEP_SCROLLCOLOR
178 RSTRG (Rs_color + Color_scroll, "scrollColor", "color"), 177 RSTRG (Rs_color + Color_scroll, "scrollColor", "color"),
179 RSTRG (Rs_color + Color_trough, "troughColor", "color"), 178 RSTRG (Rs_color + Color_trough, "troughColor", "color"),
180#endif /* KEEP_SCROLLCOLOR */ 179#endif /* KEEP_SCROLLCOLOR */
181#ifdef OPTION_HC 180#ifdef OPTION_HC
182 STRG (Rs_color + Color_HC, "highlightColor", "hc", "color", "highlight color"), 181 STRG (Rs_color + Color_HC, "highlightColor", "hc", "color", "highlight color"),
183#endif 182#endif
184#ifndef NO_CURSORCOLOR 183#ifndef NO_CURSORCOLOR
185 STRG (Rs_color + Color_cursor, "cursorColor", "cr", "color", "cursor color"), 184 STRG (Rs_color + Color_cursor, "cursorColor", "cr", "color", "cursor color"),
186 /* command-line option = resource name */ 185 /* command-line option = resource name */
187 RSTRG (Rs_color + Color_cursor2, "cursorColor2", "color"), 186 RSTRG (Rs_color + Color_cursor2, "cursorColor2", "color"),
188#endif /* NO_CURSORCOLOR */ 187#endif /* NO_CURSORCOLOR */
189 STRG (Rs_color + Color_pointer_fg, "pointerColor", "pr", "color", "pointer color"), 188 STRG (Rs_color + Color_pointer_fg, "pointerColor", "pr", "color", "pointer color"),
190 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"),
191 STRG (Rs_color + Color_border, "borderColor", "bd", "color", "border color"), 190 STRG (Rs_color + Color_border, "borderColor", "bd", "color", "border color"),
192#ifdef XPM_BACKGROUND 191#ifdef BG_IMAGE_FROM_FILE
193 RSTRG (Rs_path, "path", "search path"), 192 RSTRG (Rs_path, "path", "search path"),
194 STRG (Rs_backgroundPixmap, "backgroundPixmap", "pixmap", "file[;geom]", "background pixmap"), 193 STRG (Rs_backgroundPixmap, "backgroundPixmap", "pixmap", "file[;geom]", "background pixmap"),
195#endif 194#endif
196 /* fonts: command-line option = resource name */ 195 /* fonts: command-line option = resource name */
197 STRG (Rs_font, "font", "fn", "fontname", "normal text font"), 196 STRG (Rs_font, "font", "fn", "fontname", "normal text font"),
198#if ENABLE_STYLES 197#if ENABLE_STYLES
199 STRG (Rs_boldFont, "boldFont", "fb", "fontname", "bold font"), 198 STRG (Rs_boldFont, "boldFont", "fb", "fontname", "bold font"),
200 STRG (Rs_italicFont, "italicFont", "fi", "fontname", "italic font"), 199 STRG (Rs_italicFont, "italicFont", "fi", "fontname", "italic font"),
201 STRG (Rs_boldItalicFont, "boldItalicFont", "fbi", "fontname", "bold italic font"), 200 STRG (Rs_boldItalicFont, "boldItalicFont", "fbi", "fontname", "bold italic font"),
202 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"),
203#endif 202#endif
204#ifdef USE_XIM 203#ifdef USE_XIM
205 STRG (Rs_inputMethod, "inputMethod", "im", "name", "name of input method"), 204 STRG (Rs_inputMethod, "inputMethod", "im", "name", "name of input method"),
206 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"),
207 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"),
208 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"),
209#endif /* USE_XIM */ 208#endif /* USE_XIM */
210 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"),
211 STRG (Rs_title, "title", "title", "string", "title name for window"), 210 STRG (Rs_title, "title", "title", "string", "title name for window"),
212 STRG (Rs_title, NULL, "T", NULL, NULL), /* short form */ 211 STRG (Rs_title, NULL, "T", NULL, NULL), /* short form */
213 STRG (Rs_iconName, "iconName", "n", "string", "icon name for window"), 212 STRG (Rs_iconName, "iconName", "n", "string", "icon name for window"),
214 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"),
215#if ENABLE_XEMBED 214#if ENABLE_XEMBED
216 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"),
217#endif 216#endif
217#if XFT
218 STRG (Rs_depth, "depth", "depth", "number", "depth of visual to request"),
219#endif
218#if ENABLE_FRILLS 220#if ENABLE_FRILLS
219 RSTRG (Rs_transient_for, "transient-for", "windowid"), 221 RSTRG (Rs_transient_for, "transient-for", "windowid"),
220 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"),
221 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"),
222 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"),
223 STRG (Rs_ext_bwidth, "externalBorder", "w", "number", "external border in pixels"), 225 STRG (Rs_ext_bwidth, "externalBorder", "w", "number", "external border in pixels"),
224 STRG (Rs_ext_bwidth, NULL, "bw", NULL, NULL), 226 STRG (Rs_ext_bwidth, NULL, "bw", NULL, NULL),
225 STRG (Rs_ext_bwidth, NULL, "borderwidth", NULL, NULL), 227 STRG (Rs_ext_bwidth, NULL, "borderwidth", NULL, NULL),
226 STRG (Rs_int_bwidth, "internalBorder", "b", "number", "internal border in pixels"), 228 STRG (Rs_int_bwidth, "internalBorder", "b", "number", "internal border in pixels"),
227 BOOL (Rs_borderLess, "borderLess", "bl", Opt_borderLess, "borderless window"), 229 BOOL (Rs_borderLess, "borderLess", "bl", Opt_borderLess, 0, "borderless window"),
228 BOOL (Rs_skipBuiltinGlyphs, "skipBuiltinGlyphs", "sbg", Opt_skipBuiltinGlyphs, "do not use internal glyphs"),
229 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"),
230#endif 234#endif
231#ifdef POINTER_BLANK 235#ifdef POINTER_BLANK
232 RSTRG (Rs_pointerBlankDelay, "pointerBlankDelay", "number"), 236 RSTRG (Rs_pointerBlankDelay, "pointerBlankDelay", "number"),
233#endif 237#endif
234#ifndef NO_BACKSPACE_KEY 238#ifndef NO_BACKSPACE_KEY
235 RSTRG (Rs_backspace_key, "backspacekey", "string"), 239 RSTRG (Rs_backspace_key, "backspacekey", "string"),
236#endif 240#endif
237#ifndef NO_DELETE_KEY 241#ifndef NO_DELETE_KEY
238 RSTRG (Rs_delete_key, "deletekey", "string"), 242 RSTRG (Rs_delete_key, "deletekey", "string"),
239#endif 243#endif
240 RSTRG (Rs_selectstyle, "selectstyle", "mode"),
241#ifdef PRINTPIPE 244#ifdef PRINTPIPE
242 RSTRG (Rs_print_pipe, "print-pipe", "string"), 245 RSTRG (Rs_print_pipe, "print-pipe", "string"),
243#endif 246#endif
244 STRG (Rs_modifier, "modifier", "mod", "modifier", "meta modifier = alt|meta|hyper|super|mod1|...|mod5"), 247 STRG (Rs_modifier, "modifier", "mod", "modifier", "meta modifier = alt|meta|hyper|super|mod1|...|mod5"),
245#ifdef CUTCHAR_RESOURCE 248#ifdef CUTCHAR_RESOURCE
246 RSTRG (Rs_cutchars, "cutchars", "string"), 249 RSTRG (Rs_cutchars, "cutchars", "string"),
247#endif /* CUTCHAR_RESOURCE */ 250#endif /* CUTCHAR_RESOURCE */
248 RSTRG (Rs_answerbackstring, "answerbackString", "string"), 251 RSTRG (Rs_answerbackstring, "answerbackString", "string"),
249#ifndef NO_SECONDARY_SCREEN 252#ifndef NO_SECONDARY_SCREEN
250 BOOL (Rs_secondaryScreen, "secondaryScreen", "ssc", Opt_secondaryScreen, "enable secondary screen"), 253 BOOL (Rs_secondaryScreen, "secondaryScreen", "ssc", Opt_secondaryScreen, 0, "enable secondary screen"),
251 BOOL (Rs_secondaryScroll, "secondaryScroll", "ssr", Opt_secondaryScroll, "enable secondary screen scroll"), 254 BOOL (Rs_secondaryScroll, "secondaryScroll", "ssr", Opt_secondaryScroll, 0, "enable secondary screen scroll"),
252#endif 255#endif
253#if ENABLE_PERL 256#if ENABLE_PERL
254 RSTRG (Rs_perl_lib, "perl-lib", "string"), //, "colon-separated directories with extension scripts"),TODO 257 RSTRG (Rs_perl_lib, "perl-lib", "string"), //, "colon-separated directories with extension scripts"),TODO
255 RSTRG (Rs_perl_eval, "perl-eval", "perl-eval"), // "string", "code to be evaluated after all extensions have been loaded"),TODO 258 RSTRG (Rs_perl_eval, "perl-eval", "perl-eval"), // "string", "code to be evaluated after all extensions have been loaded"),TODO
256 RSTRG (Rs_perl_ext_1, "perl-ext-common", "string"), //, "colon-separated list of perl extensions to enable"),TODO 259 RSTRG (Rs_perl_ext_1, "perl-ext-common", "string"), //, "colon-separated list of perl extensions to enable"),TODO
257 STRG (Rs_perl_ext_2, "perl-ext", "pe", "string", "colon-separated list of perl extensions to enable for this instance"), 260 STRG (Rs_perl_ext_2, "perl-ext", "pe", "string", "colon-separated list of perl extensions to enable for this instance"),
258#endif 261#endif
259#ifndef NO_RESOURCES 262#if ISO_14755
260 INFO ("xrm", "string", "X resource"), 263 BOOL (Rs_iso14755_52, "iso14755_52", NULL, Opt_iso14755_52, 0, NULL),
264#endif
265#ifdef HAVE_AFTERIMAGE
266 STRG (Rs_blendtype, "blendType", "blt", "string", "background image blending type - alpha, tint, etc..."),
267 STRG (Rs_blurradius, "blurRadius", "blr", "HxV", "Gaussian Blur radii to apply to the root background"),
261#endif 268#endif
262 INFO ("e", "command arg ...", "command to execute") 269 INFO ("e", "command arg ...", "command to execute")
263 }; 270 };
264 271
265#undef INFO 272#undef INFO
266#undef STRG 273#undef STRG
267#undef RSTRG 274#undef RSTRG
268#undef SWCH 275#undef SWCH
269#undef BOOL 276#undef BOOL
270/*}}} */
271 277
272static const char releasestring[] = "rxvt-unicode (" RXVTNAME ") v" VERSION " - released: " DATE "\n"; 278static const char releasestring[] = "rxvt-unicode (" RXVTNAME ") v" VERSION " - released: " DATE "\n";
273static const char optionsstring[] = "options: " 279static const char optionsstring[] = "options: "
274#if ENABLE_PERL 280#if ENABLE_PERL
275 "perl," 281 "perl,"
… …
310#endif 316#endif
311 "," 317 ","
312#if OFF_FOCUS_FADING 318#if OFF_FOCUS_FADING
313 "fade," 319 "fade,"
314#endif 320#endif
315#if defined(XPM_BACKGROUND)
316 "XPM,"
317#endif
318#if defined(TRANSPARENT) 321#if defined(ENABLE_TRANSPARENCY)
319 "transparent," 322 "transparent,"
320#endif
321#if TINTING
322 "tint," 323 "tint,"
323#endif 324#endif
324#if defined(UTMP_SUPPORT) 325#if HAVE_AFTERIMAGE
325 "utmp," 326 "afterimage,"
326#endif 327#endif
327#if defined(USE_XIM) 328#if defined(USE_XIM)
328 "XIM," 329 "XIM,"
330#endif
331#if defined(NO_BACKSPACE_KEY)
332 "no_backspace,"
333#endif
334#if defined(NO_DELETE_KEY)
335 "no_delete,"
336#endif
337#if EIGHT_BIT_CONTROLS
338 "8bitctrls,"
339#endif
340#if defined(ENABLE_FRILLS)
341 "frills,"
342#endif
343#if defined(SELECTION_SCROLLING)
344 "selectionscrolling,"
345#endif
346#if MOUSE_WHEEL
347 "wheel,"
348#endif
349#if MOUSE_SLIP_WHEELING
350 "slipwheel,"
351#endif
352#if defined(SMART_RESIZE)
353 "smart-resize,"
354#endif
355#if defined(CURSOR_BLINK)
356 "cursorBlink,"
357#endif
358#if defined(POINTER_BLANK)
359 "pointerBlank,"
360#endif
361#if defined(NO_RESOURCES)
362 "NoResources,"
329#endif 363#endif
330 "scrollbars=" 364 "scrollbars="
331#if !defined(HAVE_SCROLLBARS) 365#if !defined(HAVE_SCROLLBARS)
332 "NONE" 366 "NONE"
333#else 367#else
… …
351# endif 385# endif
352# if defined(XTERM_SCROLLBAR) 386# if defined(XTERM_SCROLLBAR)
353 "xterm" 387 "xterm"
354# endif 388# endif
355#endif 389#endif
356 ","
357#if defined(NO_BACKSPACE_KEY)
358 "no_backspace,"
359#endif
360#if defined(NO_DELETE_KEY)
361 "no_delete,"
362#endif
363#if EIGHT_BIT_CONTROLS
364 "8bitctrls,"
365#endif
366#if defined(ENABLE_FRILLS)
367 "frills,"
368#endif
369#if defined(PREFER_24BIT)
370 "24bit,"
371#endif
372#if defined(SELECTION_SCROLLING)
373 "selectionscrolling,"
374#endif
375#if MOUSE_WHEEL
376 "wheel,"
377#endif
378#if MOUSE_SLIP_WHEELING
379 "slipwheel,"
380#endif
381#if defined(SMART_RESIZE)
382 "smart-resize,"
383#endif
384#if defined(CURSOR_BLINK)
385 "cursorBlink,"
386#endif
387#if defined(POINTER_BLANK)
388 "pointerBlank,"
389#endif
390#if defined(NO_RESOURCES)
391 "NoResources"
392#endif
393 "\nUsage: "; /* Usage */ 390 "\nUsage: "; /* Usage */
394 391
395#define INDENT 18 392#define INDENT 18
393
394const char rxvt_term::resval_undef [] = "<undef>";
395const char rxvt_term::resval_on [] = "on";
396const char rxvt_term::resval_off [] = "off";
396 397
397/*{{{ usage: */ 398/*{{{ usage: */
398/*----------------------------------------------------------------------*/ 399/*----------------------------------------------------------------------*/
399static void 400static void
400rxvt_usage (int type) 401rxvt_usage (int type)
… …
409 rxvt_log (" [-help] [--help]\n"); 410 rxvt_log (" [-help] [--help]\n");
410 411
411 for (col = 1, i = 0; i < optList_size; i++) 412 for (col = 1, i = 0; i < optList_size; i++)
412 if (optList[i].desc != NULL) 413 if (optList[i].desc != NULL)
413 { 414 {
414 int len = 0; 415 int len = 0;
415 416
416 if (!optList_isBool (i)) 417 if (!optList_isBool (i))
417 { 418 {
418 len = optList_strlen (i); 419 len = optList_strlen (i);
419 if (len > 0) 420 if (len > 0)
… …
423 assert (optList[i].opt != NULL); 424 assert (optList[i].opt != NULL);
424#endif 425#endif
425 len += 4 + strlen (optList[i].opt) + (optList_isBool (i) ? 2: 0); 426 len += 4 + strlen (optList[i].opt) + (optList_isBool (i) ? 2: 0);
426 col += len; 427 col += len;
427 if (col > 79) 428 if (col > 79)
429 {
428 { /* assume regular width */ 430 /* assume regular width */
429 rxvt_log ("\n"); 431 rxvt_log ("\n");
430 col = 1 + len; 432 col = 1 + len;
431 } 433 }
432 434
433 rxvt_log (" [-%s%s", (optList_isBool (i) ? "/+" : ""), optList[i].opt); 435 rxvt_log (" [-%s%s", (optList_isBool (i) ? "/+" : ""), optList[i].opt);
… …
486 488
487/*{{{ get command-line options before getting resources */ 489/*{{{ get command-line options before getting resources */
488void 490void
489rxvt_term::get_options (int argc, const char *const *argv) 491rxvt_term::get_options (int argc, const char *const *argv)
490{ 492{
491 int i, bad_option = 0; 493 int i, bad_option = 0;
492 static const char On[3] = "ON", Off[4] = "OFF";
493 494
494 for (i = 1; i < argc; i++) 495 for (i = 1; i < argc; i++)
495 { 496 {
496 unsigned int entry, longopt = 0; 497 unsigned int entry, longopt = 0;
497 const char *flag, *opt; 498 const char *flag, *opt;
498 499
499 opt = argv[i]; 500 opt = argv[i];
500#ifdef DEBUG_RESOURCES 501
501 fprintf (stderr, "argv[%d] = %s: ", i, opt);
502#endif
503 if (*opt == '-') 502 if (*opt == '-')
504 { 503 {
505 flag = On; 504 flag = resval_on;
505
506 if (*++opt == '-') 506 if (*++opt == '-')
507 longopt = *opt++; /* long option */ 507 longopt = *opt++; /* long option */
508 } 508 }
509 else if (*opt == '+') 509 else if (*opt == '+')
510 { 510 {
511 flag = Off; 511 flag = resval_off;
512
512 if (*++opt == '+') 513 if (*++opt == '+')
513 longopt = *opt++; /* long option */ 514 longopt = *opt++; /* long option */
514 } 515 }
515 else 516 else
516 { 517 {
… …
519 continue; 520 continue;
520 } 521 }
521 522
522 if (!strcmp (opt, "help")) 523 if (!strcmp (opt, "help"))
523 rxvt_usage (longopt ? 2 : 1); 524 rxvt_usage (longopt ? 2 : 1);
525
524 if (!strcmp (opt, "h")) 526 if (!strcmp (opt, "h"))
525 rxvt_usage (0); 527 rxvt_usage (0);
526 528
527 /* feature: always try to match long-options */ 529 /* feature: always try to match long-options */
528 for (entry = 0; entry < optList_size; entry++) 530 for (entry = 0; entry < optList_size; entry++)
… …
532 break; 534 break;
533 535
534 if (entry < optList_size) 536 if (entry < optList_size)
535 { 537 {
536 if (optList_isReverse (entry)) 538 if (optList_isReverse (entry))
537 flag = flag == On ? Off : On; 539 flag = flag == resval_on ? resval_off : resval_on;
538 540
539 if (optList_strlen (entry)) 541 if (optList_strlen (entry))
540 { 542 {
541 /* 543 /*
542 * special cases are handled in main.c:main () to allow 544 * special cases are handled in main.c:main () to allow
543 * X resources to set these values before we settle for 545 * X resources to set these values before we settle for
544 * default values 546 * default values
545 */ 547 */
546 548
547 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
548 rs[optList[entry].doff] = flag == On && argv[i+1] 554 rs[optList[entry].doff] = flag == resval_on ? argv[++i] : resval_undef;
549 ? argv[++i] : 0; 555 }
550 } 556 }
551 else 557 else
558 {
552 { /* boolean value */ 559 /* boolean value */
553#ifdef DEBUG_RESOURCES 560 set_option (optList[entry].index, flag == resval_on);
554 fprintf (stderr, "boolean (%s,%s) = %s\n",
555 optList[entry].opt, optList[entry].kw, flag);
556#endif
557 set_option (optList[entry].flag & Optflag_mask, flag == On);
558 561
559 if (optList[entry].doff != -1) 562 if (optList[entry].doff != -1)
560 rs[optList[entry].doff] = flag; 563 rs[optList[entry].doff] = flag;
561 } 564 }
562 } 565 }
566#ifndef NO_RESOURCES
567 else if (!strcmp (opt, "xrm"))
568 {
569 if (i+1 < argc)
570 XrmPutLineResource (&option_db, argv[++i]);
571 }
572#endif
573#ifdef KEYSYM_RESOURCE
574 else if (!strncmp (opt, "keysym.", sizeof ("keysym.") - 1))
575 {
576 if (i+1 < argc)
577 {
578 char *res = (char *)malloc (strlen (opt) + strlen (argv[++i]) + 6);
579 sprintf (res, "*.%s: %s\n", opt, argv[i]);
580 XrmPutLineResource (&option_db, res);
581 free (res);
582 }
583 }
584#endif
563 else 585 else
564#ifdef KEYSYM_RESOURCE
565 /* if (!strncmp (opt, "keysym.", sizeof ("keysym.") - 1)) */
566 if (rxvt_Str_match (opt, "keysym."))
567 { 586 {
568 const char *str = argv[++i];
569
570 if (str != NULL)
571 parse_keysym (opt + sizeof ("keysym.") - 1, str);
572 }
573 else
574#endif
575 {
576 bad_option = 1; 587 bad_option = 1;
577 rxvt_warn ("\"%s\": unknown or malformed option.\n", opt); 588 rxvt_warn ("\"%s\": unknown or malformed option.\n", opt);
578 } 589 }
579 } 590 }
580 591
581 if (bad_option) 592 if (bad_option)
582 rxvt_usage (0); 593 rxvt_usage (0);
583} 594}
… …
594 * "rxvt" "keysym" "0xFF01" 605 * "rxvt" "keysym" "0xFF01"
595 * value will be a string 606 * value will be a string
596 */ 607 */
597/* ARGSUSED */ 608/* ARGSUSED */
598int 609int
599rxvt_define_key (XrmDatabase *database __attribute__((unused)), 610rxvt_define_key (XrmDatabase *database UNUSED,
600 XrmBindingList bindings __attribute__((unused)), 611 XrmBindingList bindings UNUSED,
601 XrmQuarkList quarks, 612 XrmQuarkList quarks,
602 XrmRepresentation *type __attribute__((unused)), 613 XrmRepresentation *type UNUSED,
603 XrmValue *value, 614 XrmValue *value,
604 XPointer closure __attribute__((unused))) 615 XPointer closure UNUSED)
605{ 616{
606 int last; 617 int last;
607 618
608 for (last = 0; quarks[last] != NULLQUARK; last++) /* look for last quark in list */ 619 for (last = 0; quarks[last] != NULLQUARK; last++) /* look for last quark in list */
609 ; 620 ;
… …
667 char *newarg = NULL; 678 char *newarg = NULL;
668 char newargstr[NEWARGLIM]; 679 char newargstr[NEWARGLIM];
669 680
670 if (arg == NULL) 681 if (arg == NULL)
671 { 682 {
672 if ((n = rxvt_Str_match (str, "keysym.")) == 0) 683 n = sizeof ("keysym.") - 1;
684 if (strncmp (str, "keysym.", n))
673 return 0; 685 return 0;
674 686
675 str += n; /* skip `keysym.' */ 687 str += n; /* skip `keysym.' */
676 if (!(pmodend = strchr (str, ':'))) 688 if (!(pmodend = strchr (str, ':')))
677 return -1; 689 return -1;
… …
750 strncpy (newargstr, arg, NEWARGLIM - 1); 762 strncpy (newargstr, arg, NEWARGLIM - 1);
751 newargstr[NEWARGLIM - 1] = '\0'; 763 newargstr[NEWARGLIM - 1] = '\0';
752 newarg = newargstr; 764 newarg = newargstr;
753 } 765 }
754 766
755 rxvt_Str_trim (newarg); 767 if (*newarg == '\0')
756 if (*newarg == '\0' || (n = rxvt_Str_escaped (newarg)) == 0)
757 return -1; 768 return -1;
758 769
759 keyboard->register_user_translation (sym, state, newarg); 770 keyboard->register_user_translation (sym, state, newarg);
760 return 1; 771 return 1;
761} 772}
762 773
763# endif /* KEYSYM_RESOURCE */ 774# endif /* KEYSYM_RESOURCE */
764#endif /* NO_RESOURCES */ 775#endif /* NO_RESOURCES */
765 776
766static char * 777static char *
767get_res (XrmDatabase database, const char *program, const char *option) 778get_res (XrmDatabase database, const char *program, const char *option)
768{ 779{
769 char resource[512]; 780 char resource[512];
… …
777} 788}
778 789
779const char * 790const char *
780rxvt_term::x_resource (const char *name) 791rxvt_term::x_resource (const char *name)
781{ 792{
782 XrmDatabase database = XrmGetDatabase (display->display); 793 XrmDatabase database = XrmGetDatabase (dpy);
783 794
784 const char *p = get_res (database, rs[Rs_name], name); 795 const char *p = get_res (database, rs[Rs_name], name);
785 const char *p0 = get_res (database, "!INVALIDPROGRAMMENAMEDONTMATCH!", name); 796 const char *p0 = get_res (database, "!INVALIDPROGRAMMENAMEDONTMATCH!", name);
786 797
787 if (p == NULL || (p0 && strcmp (p, p0) == 0)) 798 if (p == NULL || (p0 && strcmp (p, p0) == 0))
… …
801 812
802void 813void
803rxvt_term::extract_resources () 814rxvt_term::extract_resources ()
804{ 815{
805#ifndef NO_RESOURCES 816#ifndef NO_RESOURCES
817 XrmDatabase database = XrmGetDatabase (dpy);
818 XrmMergeDatabases (option_db, &database);
819 option_db = NULL;
806 /* 820 /*
807 * Query resources for options that affect us 821 * Query resources for options that affect us
808 */ 822 */
809 for (int entry = 0; entry < optList_size; entry++) 823 for (int entry = 0; entry < optList_size; entry++)
810 { 824 {
… …
830 || strcasecmp (p, "1") == 0; 844 || strcasecmp (p, "1") == 0;
831 845
832 if (optList_isReverse (entry)) 846 if (optList_isReverse (entry))
833 s = !s; 847 s = !s;
834 848
835 set_option (optList[entry].flag & Optflag_mask, s); 849 set_option (optList[entry].index, s);
836 } 850 }
837 } 851 }
838 } 852 }
839 853
840 /* 854 /*
841 * [R5 or later]: enumerate the resource database 855 * [R5 or later]: enumerate the resource database
842 */ 856 */
843# ifdef KEYSYM_RESOURCE 857# ifdef KEYSYM_RESOURCE
844 XrmDatabase database = XrmGetDatabase (display->display);
845 XrmName name_prefix[3]; 858 XrmName name_prefix[3];
846 XrmClass class_prefix[3]; 859 XrmClass class_prefix[3];
847 860
848 name_prefix[0] = XrmStringToName (rs[Rs_name]); 861 name_prefix[0] = XrmStringToName (rs[Rs_name]);
849 name_prefix[1] = XrmStringToName ("keysym"); 862 name_prefix[1] = XrmStringToName ("keysym");
… …
863 XrmEnumerateDatabase (database, name_prefix, class_prefix, 876 XrmEnumerateDatabase (database, name_prefix, class_prefix,
864 XrmEnumOneLevel, rxvt_define_key, NULL); 877 XrmEnumOneLevel, rxvt_define_key, NULL);
865# endif 878# endif
866# endif 879# endif
867 880
868#endif /* NO_RESOURCES */ 881#endif /* NO_RESOURCES */
869} 882}
870 883
871/*----------------------- end-of-file (C source) -----------------------*/ 884/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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