ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/xdefaults.C
(Generate patch)

Comparing rxvt-unicode/src/xdefaults.C (file contents):
Revision 1.80 by root, Mon Jan 16 15:00:20 2006 UTC vs.
Revision 1.122 by ayin, Thu Nov 22 15:07:10 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"),
117# endif 116 STRG (Rs_shade, "shading", "sh", "%", "shade background by x %."),
118#endif 117#endif
119#if OFF_FOCUS_FADING 118#if OFF_FOCUS_FADING
120 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"),
121 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"),
122#endif 121#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"), 122 BOOL (Rs_utmpInhibit, "utmpInhibit", "ut", Opt_utmpInhibit, 0, "utmp inhibit"),
127#ifndef NO_BELL 123#ifndef NO_BELL
124# if ENABLE_FRILLS
125 BOOL (Rs_urgentOnBell, "urgentOnBell", NULL, Opt_urgentOnBell, 0, NULL),
126# endif
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"),
222 BOOL (Rs_override_redirect, "override-redirect", "override-redirect", Opt_override_redirect, 0, "set override-redirect on the terminal window"),
220 STRG (Rs_pty_fd, NULL, "pty-fd", "fileno", "file descriptor of pty to use"), 223 STRG (Rs_pty_fd, NULL, "pty-fd", "fileno", "file descriptor of pty to use"),
221 BOOL (Rs_hold, "hold", "hold", Opt_hold, "retain window after shell exit"), 224 BOOL (Rs_hold, "hold", "hold", Opt_hold, 0, "retain window after shell exit"),
222 STRG (Rs_ext_bwidth, "externalBorder", "w", "number", "external border in pixels"), 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"), 230 BOOL (Rs_skipBuiltinGlyphs, "skipBuiltinGlyphs", "sbg", Opt_skipBuiltinGlyphs, 0, "do not use internal glyphs"),
228 STRG (Rs_lineSpace, "lineSpace", "lsp", "number", "number of extra pixels between rows"), 231 STRG (Rs_lineSpace, "lineSpace", "lsp", "number", "number of extra pixels between rows"),
229#endif 232#endif
230#ifdef POINTER_BLANK 233#ifdef POINTER_BLANK
231 RSTRG (Rs_pointerBlankDelay, "pointerBlankDelay", "number"), 234 RSTRG (Rs_pointerBlankDelay, "pointerBlankDelay", "number"),
232#endif 235#endif
… …
241 RSTRG (Rs_print_pipe, "print-pipe", "string"), 244 RSTRG (Rs_print_pipe, "print-pipe", "string"),
242#endif 245#endif
243 STRG (Rs_modifier, "modifier", "mod", "modifier", "meta modifier = alt|meta|hyper|super|mod1|...|mod5"), 246 STRG (Rs_modifier, "modifier", "mod", "modifier", "meta modifier = alt|meta|hyper|super|mod1|...|mod5"),
244#ifdef CUTCHAR_RESOURCE 247#ifdef CUTCHAR_RESOURCE
245 RSTRG (Rs_cutchars, "cutchars", "string"), 248 RSTRG (Rs_cutchars, "cutchars", "string"),
246#endif /* CUTCHAR_RESOURCE */ 249#endif /* CUTCHAR_RESOURCE */
247 RSTRG (Rs_answerbackstring, "answerbackString", "string"), 250 RSTRG (Rs_answerbackstring, "answerbackString", "string"),
248#ifndef NO_SECONDARY_SCREEN 251#ifndef NO_SECONDARY_SCREEN
249 BOOL (Rs_secondaryScreen, "secondaryScreen", "ssc", Opt_secondaryScreen, "enable secondary screen"), 252 BOOL (Rs_secondaryScreen, "secondaryScreen", "ssc", Opt_secondaryScreen, 0, "enable secondary screen"),
250 BOOL (Rs_secondaryScroll, "secondaryScroll", "ssr", Opt_secondaryScroll, "enable secondary screen scroll"), 253 BOOL (Rs_secondaryScroll, "secondaryScroll", "ssr", Opt_secondaryScroll, 0, "enable secondary screen scroll"),
251#endif 254#endif
252#if ENABLE_PERL 255#if ENABLE_PERL
253 RSTRG (Rs_perl_lib, "perl-lib", "string"), //, "colon-separated directories with extension scripts"),TODO 256 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 257 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 258 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"), 259 STRG (Rs_perl_ext_2, "perl-ext", "pe", "string", "colon-separated list of perl extensions to enable for this instance"),
257#endif 260#endif
261#if ISO_14755
262 BOOL (Rs_iso14755_52, "iso14755_52", NULL, Opt_iso14755_52, 0, NULL),
263#endif
264#ifdef HAVE_AFTERIMAGE
265 STRG (Rs_blendtype, "blendType", "blt", "string", "background image blending type - alpha, tint, etc..."),
266 STRG (Rs_blurradius, "blurRadius", "blr", "HxV", "Gaussian Blur radii to apply to the root background"),
267#endif
258#ifndef NO_RESOURCES 268#ifndef NO_RESOURCES
259 INFO ("xrm", "string", "X resource"), 269 INFO ("xrm", "string", "X resource"),
260#endif 270#endif
261 INFO ("e", "command arg ...", "command to execute") 271 INFO ("e", "command arg ...", "command to execute")
262 }; 272 };
… …
264#undef INFO 274#undef INFO
265#undef STRG 275#undef STRG
266#undef RSTRG 276#undef RSTRG
267#undef SWCH 277#undef SWCH
268#undef BOOL 278#undef BOOL
269/*}}} */
270 279
271static const char releasestring[] = "rxvt-unicode (" RXVTNAME ") v" VERSION " - released: " DATE "\n"; 280static const char releasestring[] = "rxvt-unicode (" RXVTNAME ") v" VERSION " - released: " DATE "\n";
272static const char optionsstring[] = "options: " 281static const char optionsstring[] = "options: "
273#if ENABLE_PERL 282#if ENABLE_PERL
274 "perl," 283 "perl,"
… …
309#endif 318#endif
310 "," 319 ","
311#if OFF_FOCUS_FADING 320#if OFF_FOCUS_FADING
312 "fade," 321 "fade,"
313#endif 322#endif
314#if defined(XPM_BACKGROUND)
315 "XPM,"
316#endif
317#if defined(TRANSPARENT) 323#if defined(ENABLE_TRANSPARENCY)
318 "transparent," 324 "transparent,"
319#endif
320#if TINTING
321 "tint," 325 "tint,"
322#endif 326#endif
323#if defined(UTMP_SUPPORT) 327#if HAVE_AFTERIMAGE
324 "utmp," 328 "afterimage,"
325#endif 329#endif
326#if defined(USE_XIM) 330#if defined(USE_XIM)
327 "XIM," 331 "XIM,"
332#endif
333#if defined(NO_BACKSPACE_KEY)
334 "no_backspace,"
335#endif
336#if defined(NO_DELETE_KEY)
337 "no_delete,"
338#endif
339#if EIGHT_BIT_CONTROLS
340 "8bitctrls,"
341#endif
342#if defined(ENABLE_FRILLS)
343 "frills,"
344#endif
345#if defined(SELECTION_SCROLLING)
346 "selectionscrolling,"
347#endif
348#if MOUSE_WHEEL
349 "wheel,"
350#endif
351#if MOUSE_SLIP_WHEELING
352 "slipwheel,"
353#endif
354#if defined(SMART_RESIZE)
355 "smart-resize,"
356#endif
357#if defined(CURSOR_BLINK)
358 "cursorBlink,"
359#endif
360#if defined(POINTER_BLANK)
361 "pointerBlank,"
362#endif
363#if defined(NO_RESOURCES)
364 "NoResources,"
328#endif 365#endif
329 "scrollbars=" 366 "scrollbars="
330#if !defined(HAVE_SCROLLBARS) 367#if !defined(HAVE_SCROLLBARS)
331 "NONE" 368 "NONE"
332#else 369#else
… …
350# endif 387# endif
351# if defined(XTERM_SCROLLBAR) 388# if defined(XTERM_SCROLLBAR)
352 "xterm" 389 "xterm"
353# endif 390# endif
354#endif 391#endif
355 ","
356#if defined(NO_BACKSPACE_KEY)
357 "no_backspace,"
358#endif
359#if defined(NO_DELETE_KEY)
360 "no_delete,"
361#endif
362#if EIGHT_BIT_CONTROLS
363 "8bitctrls,"
364#endif
365#if defined(ENABLE_FRILLS)
366 "frills,"
367#endif
368#if defined(PREFER_24BIT)
369 "24bit,"
370#endif
371#if defined(SELECTION_SCROLLING)
372 "selectionscrolling,"
373#endif
374#if MOUSE_WHEEL
375 "wheel,"
376#endif
377#if MOUSE_SLIP_WHEELING
378 "slipwheel,"
379#endif
380#if defined(SMART_RESIZE)
381 "smart-resize,"
382#endif
383#if defined(CURSOR_BLINK)
384 "cursorBlink,"
385#endif
386#if defined(POINTER_BLANK)
387 "pointerBlank,"
388#endif
389#if defined(NO_RESOURCES)
390 "NoResources"
391#endif
392 "\nUsage: "; /* Usage */ 392 "\nUsage: "; /* Usage */
393 393
394#define INDENT 18 394#define INDENT 18
395
396const char rxvt_term::resval_undef [] = "<undef>";
397const char rxvt_term::resval_on [] = "on";
398const char rxvt_term::resval_off [] = "off";
395 399
396/*{{{ usage: */ 400/*{{{ usage: */
397/*----------------------------------------------------------------------*/ 401/*----------------------------------------------------------------------*/
398static void 402static void
399rxvt_usage (int type) 403rxvt_usage (int type)
… …
408 rxvt_log (" [-help] [--help]\n"); 412 rxvt_log (" [-help] [--help]\n");
409 413
410 for (col = 1, i = 0; i < optList_size; i++) 414 for (col = 1, i = 0; i < optList_size; i++)
411 if (optList[i].desc != NULL) 415 if (optList[i].desc != NULL)
412 { 416 {
413 int len = 0; 417 int len = 0;
414 418
415 if (!optList_isBool (i)) 419 if (!optList_isBool (i))
416 { 420 {
417 len = optList_strlen (i); 421 len = optList_strlen (i);
418 if (len > 0) 422 if (len > 0)
… …
485 489
486/*{{{ get command-line options before getting resources */ 490/*{{{ get command-line options before getting resources */
487void 491void
488rxvt_term::get_options (int argc, const char *const *argv) 492rxvt_term::get_options (int argc, const char *const *argv)
489{ 493{
490 int i, bad_option = 0; 494 int i, bad_option = 0;
491 static const char On[3] = "ON", Off[4] = "OFF";
492 495
493 for (i = 1; i < argc; i++) 496 for (i = 1; i < argc; i++)
494 { 497 {
495 unsigned int entry, longopt = 0; 498 unsigned int entry, longopt = 0;
496 const char *flag, *opt; 499 const char *flag, *opt;
497 500
498 opt = argv[i]; 501 opt = argv[i];
499#ifdef DEBUG_RESOURCES 502
500 fprintf (stderr, "argv[%d] = %s: ", i, opt);
501#endif
502 if (*opt == '-') 503 if (*opt == '-')
503 { 504 {
504 flag = On; 505 flag = resval_on;
506
505 if (*++opt == '-') 507 if (*++opt == '-')
506 longopt = *opt++; /* long option */ 508 longopt = *opt++; /* long option */
507 } 509 }
508 else if (*opt == '+') 510 else if (*opt == '+')
509 { 511 {
510 flag = Off; 512 flag = resval_off;
513
511 if (*++opt == '+') 514 if (*++opt == '+')
512 longopt = *opt++; /* long option */ 515 longopt = *opt++; /* long option */
513 } 516 }
514 else 517 else
515 { 518 {
… …
518 continue; 521 continue;
519 } 522 }
520 523
521 if (!strcmp (opt, "help")) 524 if (!strcmp (opt, "help"))
522 rxvt_usage (longopt ? 2 : 1); 525 rxvt_usage (longopt ? 2 : 1);
526
523 if (!strcmp (opt, "h")) 527 if (!strcmp (opt, "h"))
524 rxvt_usage (0); 528 rxvt_usage (0);
525 529
526 /* feature: always try to match long-options */ 530 /* feature: always try to match long-options */
527 for (entry = 0; entry < optList_size; entry++) 531 for (entry = 0; entry < optList_size; entry++)
… …
531 break; 535 break;
532 536
533 if (entry < optList_size) 537 if (entry < optList_size)
534 { 538 {
535 if (optList_isReverse (entry)) 539 if (optList_isReverse (entry))
536 flag = flag == On ? Off : On; 540 flag = flag == resval_on ? resval_off : resval_on;
537 541
538 if (optList_strlen (entry)) 542 if (optList_strlen (entry))
539 { 543 {
540 /* 544 /*
541 * special cases are handled in main.c:main () to allow 545 * special cases are handled in main.c:main () to allow
542 * X resources to set these values before we settle for 546 * X resources to set these values before we settle for
543 * default values 547 * default values
544 */ 548 */
545 549
546 if (optList[entry].doff != -1) 550 if (optList[entry].doff != -1)
551 {
552 if (flag == resval_on && i+1 == argc)
553 rxvt_fatal ("option '%s' requires an argument, aborting.\n", argv [i]);
554
547 rs[optList[entry].doff] = flag == On && argv[i+1] 555 rs[optList[entry].doff] = flag == resval_on ? argv[++i] : resval_undef;
548 ? argv[++i] : 0; 556 }
549 } 557 }
550 else 558 else
551 { /* boolean value */ 559 { /* boolean value */
552#ifdef DEBUG_RESOURCES 560 set_option (optList[entry].index, flag == resval_on);
553 fprintf (stderr, "boolean (%s,%s) = %s\n",
554 optList[entry].opt, optList[entry].kw, flag);
555#endif
556 set_option (optList[entry].flag & Optflag_mask, flag == On);
557 561
558 if (optList[entry].doff != -1) 562 if (optList[entry].doff != -1)
559 rs[optList[entry].doff] = flag; 563 rs[optList[entry].doff] = flag;
560 } 564 }
561 } 565 }
566#ifdef KEYSYM_RESOURCE
567 else if (!strncmp (opt, "keysym.", sizeof ("keysym.") - 1))
568 {
569 if (i+1 < argc)
570 {
571 char *res = (char *)malloc (strlen (opt) + strlen (argv[++i]) + 6);
572 sprintf (res, "*.%s: %s\n", opt, argv[i]);
573 XrmPutLineResource (&option_db, res);
574 free (res);
575 }
576 }
577#endif
562 else 578 else
563#ifdef KEYSYM_RESOURCE
564 /* if (!strncmp (opt, "keysym.", sizeof ("keysym.") - 1)) */
565 if (rxvt_Str_match (opt, "keysym."))
566 { 579 {
567 const char *str = argv[++i];
568
569 if (str != NULL)
570 parse_keysym (opt + sizeof ("keysym.") - 1, str);
571 }
572 else
573#endif
574 {
575 bad_option = 1; 580 bad_option = 1;
576 rxvt_warn ("\"%s\": unknown or malformed option.\n", opt); 581 rxvt_warn ("\"%s\": unknown or malformed option.\n", opt);
577 } 582 }
578 } 583 }
579 584
580 if (bad_option) 585 if (bad_option)
581 rxvt_usage (0); 586 rxvt_usage (0);
582} 587}
… …
593 * "rxvt" "keysym" "0xFF01" 598 * "rxvt" "keysym" "0xFF01"
594 * value will be a string 599 * value will be a string
595 */ 600 */
596/* ARGSUSED */ 601/* ARGSUSED */
597int 602int
598rxvt_define_key (XrmDatabase *database __attribute__((unused)), 603rxvt_define_key (XrmDatabase *database UNUSED,
599 XrmBindingList bindings __attribute__((unused)), 604 XrmBindingList bindings UNUSED,
600 XrmQuarkList quarks, 605 XrmQuarkList quarks,
601 XrmRepresentation *type __attribute__((unused)), 606 XrmRepresentation *type UNUSED,
602 XrmValue *value, 607 XrmValue *value,
603 XPointer closure __attribute__((unused))) 608 XPointer closure UNUSED)
604{ 609{
605 int last; 610 int last;
606 611
607 for (last = 0; quarks[last] != NULLQUARK; last++) /* look for last quark in list */ 612 for (last = 0; quarks[last] != NULLQUARK; last++) /* look for last quark in list */
608 ; 613 ;
… …
666 char *newarg = NULL; 671 char *newarg = NULL;
667 char newargstr[NEWARGLIM]; 672 char newargstr[NEWARGLIM];
668 673
669 if (arg == NULL) 674 if (arg == NULL)
670 { 675 {
671 if ((n = rxvt_Str_match (str, "keysym.")) == 0) 676 n = sizeof ("keysym.") - 1;
677 if (strncmp (str, "keysym.", n))
672 return 0; 678 return 0;
673 679
674 str += n; /* skip `keysym.' */ 680 str += n; /* skip `keysym.' */
675 if (!(pmodend = strchr (str, ':'))) 681 if (!(pmodend = strchr (str, ':')))
676 return -1; 682 return -1;
… …
749 strncpy (newargstr, arg, NEWARGLIM - 1); 755 strncpy (newargstr, arg, NEWARGLIM - 1);
750 newargstr[NEWARGLIM - 1] = '\0'; 756 newargstr[NEWARGLIM - 1] = '\0';
751 newarg = newargstr; 757 newarg = newargstr;
752 } 758 }
753 759
754 rxvt_Str_trim (newarg); 760 if (*newarg == '\0')
755 if (*newarg == '\0' || (n = rxvt_Str_escaped (newarg)) == 0)
756 return -1; 761 return -1;
757 762
758 keyboard->register_user_translation (sym, state, newarg); 763 keyboard->register_user_translation (sym, state, newarg);
759 return 1; 764 return 1;
760} 765}
761 766
762# endif /* KEYSYM_RESOURCE */ 767# endif /* KEYSYM_RESOURCE */
763#endif /* NO_RESOURCES */ 768#endif /* NO_RESOURCES */
764 769
765static char * 770static char *
766get_res (XrmDatabase database, const char *program, const char *option) 771get_res (XrmDatabase database, const char *program, const char *option)
767{ 772{
768 char resource[512]; 773 char resource[512];
… …
776} 781}
777 782
778const char * 783const char *
779rxvt_term::x_resource (const char *name) 784rxvt_term::x_resource (const char *name)
780{ 785{
781 XrmDatabase database = XrmGetDatabase (display->display); 786 XrmDatabase database = XrmGetDatabase (dpy);
782 787
783 const char *p = get_res (database, rs[Rs_name], name); 788 const char *p = get_res (database, rs[Rs_name], name);
784 const char *p0 = get_res (database, "!INVALIDPROGRAMMENAMEDONTMATCH!", name); 789 const char *p0 = get_res (database, "!INVALIDPROGRAMMENAMEDONTMATCH!", name);
785 790
786 if (p == NULL || (p0 && strcmp (p, p0) == 0)) 791 if (p == NULL || (p0 && strcmp (p, p0) == 0))
… …
800 805
801void 806void
802rxvt_term::extract_resources () 807rxvt_term::extract_resources ()
803{ 808{
804#ifndef NO_RESOURCES 809#ifndef NO_RESOURCES
810 XrmDatabase database = XrmGetDatabase (dpy);
811 XrmMergeDatabases (option_db, &database);
812 option_db = NULL;
805 /* 813 /*
806 * Query resources for options that affect us 814 * Query resources for options that affect us
807 */ 815 */
808 for (int entry = 0; entry < optList_size; entry++) 816 for (int entry = 0; entry < optList_size; entry++)
809 { 817 {
… …
829 || strcasecmp (p, "1") == 0; 837 || strcasecmp (p, "1") == 0;
830 838
831 if (optList_isReverse (entry)) 839 if (optList_isReverse (entry))
832 s = !s; 840 s = !s;
833 841
834 set_option (optList[entry].flag & Optflag_mask, s); 842 set_option (optList[entry].index, s);
835 } 843 }
836 } 844 }
837 } 845 }
838 846
839 /* 847 /*
840 * [R5 or later]: enumerate the resource database 848 * [R5 or later]: enumerate the resource database
841 */ 849 */
842# ifdef KEYSYM_RESOURCE 850# ifdef KEYSYM_RESOURCE
843 XrmDatabase database = XrmGetDatabase (display->display);
844 XrmName name_prefix[3]; 851 XrmName name_prefix[3];
845 XrmClass class_prefix[3]; 852 XrmClass class_prefix[3];
846 853
847 name_prefix[0] = XrmStringToName (rs[Rs_name]); 854 name_prefix[0] = XrmStringToName (rs[Rs_name]);
848 name_prefix[1] = XrmStringToName ("keysym"); 855 name_prefix[1] = XrmStringToName ("keysym");
… …
862 XrmEnumerateDatabase (database, name_prefix, class_prefix, 869 XrmEnumerateDatabase (database, name_prefix, class_prefix,
863 XrmEnumOneLevel, rxvt_define_key, NULL); 870 XrmEnumOneLevel, rxvt_define_key, NULL);
864# endif 871# endif
865# endif 872# endif
866 873
867#endif /* NO_RESOURCES */ 874#endif /* NO_RESOURCES */
868} 875}
869 876
870/*----------------------- end-of-file (C source) -----------------------*/ 877/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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