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.114 by sasha, Wed Sep 12 21:06:08 2007 UTC vs.
Revision 1.161 by sf-exg, Sun Dec 18 02:25:12 2011 UTC

… …
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 <schmorp@schmorp.de>
10 * Copyright (c) 2007 Emanuele Giaquinta <e.giaquinta@glauco.it>
10 * 11 *
11 * This program is free software; you can redistribute it and/or modify 12 * This program is free software; you can redistribute it and/or modify
12 * it under the terms of the GNU General Public License as published by 13 * it under the terms of the GNU General Public License as published by
13 * the Free Software Foundation; either version 2 of the License, or 14 * the Free Software Foundation; either version 2 of the License, or
14 * (at your option) any later version. 15 * (at your option) any later version.
… …
33 34
34/* place holders used for parsing command-line options */ 35/* place holders used for parsing command-line options */
35#define Optflag_Reverse 1 36#define Optflag_Reverse 1
36#define Optflag_Boolean 2 37#define Optflag_Boolean 2
37#define Optflag_Switch 4 38#define Optflag_Switch 4
39#define Optflag_Info 8
38 40
39/* monolithic option/resource structure: */ 41/* monolithic option/resource structure: */
40/* 42/*
41 * `string' options MUST have a usage argument 43 * `string' options MUST have a usage argument
42 * `switch' and `boolean' options have no argument 44 * `switch' and `boolean' options have no argument
43 * if there's no desc (ription), it won't appear in rxvt_usage () 45 * if there's no desc (ription), it won't appear in rxvt_usage ()
44 */ 46 */
45 47
46/* INFO () - descriptive information only */ 48/* INFO () - descriptive information only */
47#define INFO(opt, arg, desc) \ 49#define INFO(opt, arg, desc) \
48 {0, 0, -1, NULL, (opt), (arg), (desc)} 50 {0, Optflag_Info, -1, NULL, (opt), (arg), (desc)}
51
52#define RINFO(kw, arg) \
53 {0, Optflag_Info, -1, (kw), NULL, (arg), NULL}
49 54
50/* STRG () - command-line option, with/without resource */ 55/* STRG () - command-line option, with/without resource */
51#define STRG(rsp, kw, opt, arg, desc) \ 56#define STRG(rsp, kw, opt, arg, desc) \
52 {0, 0, (rsp), (kw), (opt), (arg), (desc)} 57 {0, 0, (rsp), (kw), (opt), (arg), (desc)}
53 58
… …
62/* SWCH () - `-' flag */ 67/* SWCH () - `-' flag */
63#define SWCH(opt, option, flag, desc) \ 68#define SWCH(opt, option, flag, desc) \
64 { (option), (Optflag_Switch | (flag)), -1, NULL, (opt), NULL, (desc)} 69 { (option), (Optflag_Switch | (flag)), -1, NULL, (opt), NULL, (desc)}
65 70
66/* convenient macros */ 71/* convenient macros */
67#define optList_strlen(i) \ 72#define optList_isString(i) \
68 (optList[i].flag ? 0 : (optList[i].arg ? strlen (optList[i].arg) : 1)) 73 (optList[i].flag == 0)
69#define optList_isBool(i) \ 74#define optList_isBool(i) \
70 (optList[i].flag & Optflag_Boolean) 75 (optList[i].flag & Optflag_Boolean)
71#define optList_isReverse(i) \ 76#define optList_isReverse(i) \
72 (optList[i].flag & Optflag_Reverse) 77 (optList[i].flag & Optflag_Reverse)
73#define optList_size \ 78#define optList_isInfo(i) \
74 (sizeof (optList) / sizeof (optList[0])) 79 (optList[i].flag & Optflag_Info)
75 80
76static const struct 81static const struct
77 { 82 {
78 const uint8_t index; /* Option index */ 83 const uint8_t index; /* Option index */
79 const uint8_t flag; /* Option flag */ 84 const uint8_t flag; /* Option flag */
… …
90 STRG (Rs_geometry, NULL, "g", NULL, NULL), /* short form */ 95 STRG (Rs_geometry, NULL, "g", NULL, NULL), /* short form */
91 STRG (Rs_geometry, "geometry", "geometry", "geometry", "size (in characters) and position"), 96 STRG (Rs_geometry, "geometry", "geometry", "geometry", "size (in characters) and position"),
92 SWCH ("C", Opt_console, 0, "intercept console messages"), 97 SWCH ("C", Opt_console, 0, "intercept console messages"),
93 SWCH ("iconic", Opt_iconic, 0, "start iconic"), 98 SWCH ("iconic", Opt_iconic, 0, "start iconic"),
94 SWCH ("ic", Opt_iconic, 0, NULL), /* short form */ 99 SWCH ("ic", Opt_iconic, 0, NULL), /* short form */
100 STRG (Rs_chdir, "chdir", "cd", "string", "start shell in this directory"),
95 BOOL (Rs_reverseVideo, "reverseVideo", "rv", Opt_reverseVideo, 0, "reverse video"), 101 BOOL (Rs_reverseVideo, "reverseVideo", "rv", Opt_reverseVideo, 0, "reverse video"),
96 BOOL (Rs_loginShell, "loginShell", "ls", Opt_loginShell, 0, "login shell"), 102 BOOL (Rs_loginShell, "loginShell", "ls", Opt_loginShell, 0, "login shell"),
97 BOOL (Rs_jumpScroll, "jumpScroll", "j", Opt_jumpScroll, 0, "jump scrolling"), 103 BOOL (Rs_jumpScroll, "jumpScroll", "j", Opt_jumpScroll, 0, "jump scrolling"),
98 BOOL (Rs_skipScroll, "skipScroll", "ss", Opt_skipScroll, 0, "skip scrolling"), 104 BOOL (Rs_skipScroll, "skipScroll", "ss", Opt_skipScroll, 0, "skip scrolling"),
99 BOOL (Rs_pastableTabs, "pastableTabs", "ptab", Opt_pastableTabs, 0, "tab characters are pastable"), 105 BOOL (Rs_pastableTabs, "pastableTabs", "ptab", Opt_pastableTabs, 0, "tab characters are pastable"),
100#if HAVE_SCROLLBARS
101 RSTRG (Rs_scrollstyle, "scrollstyle", "mode"), 106 RSTRG (Rs_scrollstyle, "scrollstyle", "mode"),
102 BOOL (Rs_scrollBar, "scrollBar", "sb", Opt_scrollBar, 0, "scrollbar"), 107 BOOL (Rs_scrollBar, "scrollBar", "sb", Opt_scrollBar, 0, "scrollbar"),
103 BOOL (Rs_scrollBar_right, "scrollBar_right", "sr", Opt_scrollBar_right, 0, "scrollbar right"), 108 BOOL (Rs_scrollBar_right, "scrollBar_right", "sr", Opt_scrollBar_right, 0, "scrollbar right"),
104 BOOL (Rs_scrollBar_floating, "scrollBar_floating", "st", Opt_scrollBar_floating, 0, "scrollbar without a trough"), 109 BOOL (Rs_scrollBar_floating, "scrollBar_floating", "st", Opt_scrollBar_floating, 0, "scrollbar without a trough"),
105 RSTRG (Rs_scrollBar_align, "scrollBar_align", "mode"), 110 RSTRG (Rs_scrollBar_align, "scrollBar_align", "mode"),
106 STRG (Rs_scrollBar_thickness, "thickness", "sbt", "number", "scrollbar thickness/width in pixels"), 111 STRG (Rs_scrollBar_thickness, "thickness", "sbt", "number", "scrollbar thickness/width in pixels"),
107#endif
108 BOOL (Rs_scrollTtyOutput, "scrollTtyOutput", NULL, Opt_scrollTtyOutput, 0, NULL), 112 BOOL (Rs_scrollTtyOutput, "scrollTtyOutput", NULL, Opt_scrollTtyOutput, 0, NULL),
109 BOOL (Rs_scrollTtyOutput, NULL, "si", Opt_scrollTtyOutput, Optflag_Reverse, "scroll-on-tty-output inhibit"), 113 BOOL (Rs_scrollTtyOutput, NULL, "si", Opt_scrollTtyOutput, Optflag_Reverse, "scroll-on-tty-output inhibit"),
110 BOOL (Rs_scrollTtyKeypress, "scrollTtyKeypress", "sk", Opt_scrollTtyKeypress, 0, "scroll-on-keypress"), 114 BOOL (Rs_scrollTtyKeypress, "scrollTtyKeypress", "sk", Opt_scrollTtyKeypress, 0, "scroll-on-keypress"),
111 BOOL (Rs_scrollWithBuffer, "scrollWithBuffer", "sw", Opt_scrollWithBuffer, 0, "scroll-with-buffer"), 115 BOOL (Rs_scrollWithBuffer, "scrollWithBuffer", "sw", Opt_scrollWithBuffer, 0, "scroll-with-buffer"),
112#if ENABLE_TRANSPARENCY 116#if ENABLE_TRANSPARENCY
113 BOOL (Rs_transparent, "inheritPixmap", "ip", Opt_transparent, 0, "inherit parent pixmap"), 117 BOOL (Rs_transparent, "inheritPixmap", "ip", Opt_transparent, 0, "inherit parent pixmap"),
114 SWCH ("tr", Opt_transparent, 0, NULL), 118 BOOL (Rs_transparent, "transparent", "tr", Opt_transparent, 0, "inherit parent pixmap"),
115 STRG (Rs_color + Color_tint, "tintColor", "tint", "color", "tint color"), 119 STRG (Rs_color + Color_tint, "tintColor", "tint", "color", "tint color"),
116 STRG (Rs_shade, "shading", "sh", "%", "shade background by x %."), 120 STRG (Rs_shade, "shading", "sh", "number", "shade background by number %."),
121 STRG (Rs_blurradius, "blurRadius", "blr", "HxV", "gaussian blur radii to apply to the root background"),
117#endif 122#endif
118#if OFF_FOCUS_FADING 123#if OFF_FOCUS_FADING
119 STRG (Rs_fade, "fading", "fade", "%", "fade colors x% percent when rxvt-unicode is losing focus"), 124 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"), 125 STRG (Rs_color + Color_fade, "fadeColor", "fadecolor", "color", "target color for off-focus fading"),
121#endif 126#endif
122 BOOL (Rs_utmpInhibit, "utmpInhibit", "ut", Opt_utmpInhibit, 0, "utmp inhibit"), 127 BOOL (Rs_utmpInhibit, "utmpInhibit", "ut", Opt_utmpInhibit, 0, "utmp inhibit"),
123#ifndef NO_BELL 128#ifndef NO_BELL
124# if ENABLE_FRILLS 129# if ENABLE_FRILLS
… …
167#ifndef NO_BOLD_UNDERLINE_REVERSE 172#ifndef NO_BOLD_UNDERLINE_REVERSE
168 RSTRG (Rs_color + Color_BD, "colorBD", "color"), 173 RSTRG (Rs_color + Color_BD, "colorBD", "color"),
169 RSTRG (Rs_color + Color_IT, "colorIT", "color"), 174 RSTRG (Rs_color + Color_IT, "colorIT", "color"),
170 RSTRG (Rs_color + Color_UL, "colorUL", "color"), 175 RSTRG (Rs_color + Color_UL, "colorUL", "color"),
171 RSTRG (Rs_color + Color_RV, "colorRV", "color"), 176 RSTRG (Rs_color + Color_RV, "colorRV", "color"),
172#endif /* ! NO_BOLD_UNDERLINE_REVERSE */ 177#endif /* ! NO_BOLD_UNDERLINE_REVERSE */
173#if ENABLE_FRILLS 178#if ENABLE_FRILLS
174 RSTRG (Rs_color + Color_underline, "underlineColor", "color"), 179 RSTRG (Rs_color + Color_underline, "underlineColor", "color"),
175#endif 180#endif
176#ifdef KEEP_SCROLLCOLOR
177 RSTRG (Rs_color + Color_scroll, "scrollColor", "color"), 181 RSTRG (Rs_color + Color_scroll, "scrollColor", "color"),
182#ifdef RXVT_SCROLLBAR
178 RSTRG (Rs_color + Color_trough, "troughColor", "color"), 183 RSTRG (Rs_color + Color_trough, "troughColor", "color"),
179#endif /* KEEP_SCROLLCOLOR */ 184#endif
180#ifdef OPTION_HC 185#ifdef OPTION_HC
181 STRG (Rs_color + Color_HC, "highlightColor", "hc", "color", "highlight color"), 186 STRG (Rs_color + Color_HC, "highlightColor", "hc", "color", "highlight color"),
187 RSTRG (Rs_color + Color_HTC, "highlightTextColor", "color"),
182#endif 188#endif
183#ifndef NO_CURSORCOLOR 189#ifndef NO_CURSORCOLOR
184 STRG (Rs_color + Color_cursor, "cursorColor", "cr", "color", "cursor color"), 190 STRG (Rs_color + Color_cursor, "cursorColor", "cr", "color", "cursor color"),
185 /* command-line option = resource name */ 191 /* command-line option = resource name */
186 RSTRG (Rs_color + Color_cursor2, "cursorColor2", "color"), 192 RSTRG (Rs_color + Color_cursor2, "cursorColor2", "color"),
187#endif /* NO_CURSORCOLOR */ 193#endif /* NO_CURSORCOLOR */
188 STRG (Rs_color + Color_pointer_fg, "pointerColor", "pr", "color", "pointer color"), 194 STRG (Rs_color + Color_pointer_fg, "pointerColor", "pr", "color", "pointer color"),
189 STRG (Rs_color + Color_pointer_bg, "pointerColor2", "pr2", "color", "pointer bg color"), 195 STRG (Rs_color + Color_pointer_bg, "pointerColor2", "pr2", "color", "pointer bg color"),
190 STRG (Rs_color + Color_border, "borderColor", "bd", "color", "border color"), 196 STRG (Rs_color + Color_border, "borderColor", "bd", "color", "border color"),
191#ifdef BG_IMAGE_FROM_FILE 197#ifdef BG_IMAGE_FROM_FILE
192 RSTRG (Rs_path, "path", "search path"), 198 RSTRG (Rs_path, "path", "search path"),
193 STRG (Rs_backgroundPixmap, "backgroundPixmap", "pixmap", "file[;geom]", "background pixmap"), 199 STRG (Rs_backgroundPixmap, "backgroundPixmap", "pixmap", "file[;geom]", "background pixmap"),
200# if ENABLE_EWMH
201 STRG (Rs_iconfile, "iconFile", "icon", "file", "path to application icon image"),
202# endif
194#endif 203#endif
195 /* fonts: command-line option = resource name */ 204 /* fonts: command-line option = resource name */
196 STRG (Rs_font, "font", "fn", "fontname", "normal text font"), 205 STRG (Rs_font, "font", "fn", "fontname", "normal text font"),
197#if ENABLE_STYLES 206#if ENABLE_STYLES
198 STRG (Rs_boldFont, "boldFont", "fb", "fontname", "bold font"), 207 STRG (Rs_boldFont, "boldFont", "fb", "fontname", "bold font"),
… …
203#ifdef USE_XIM 212#ifdef USE_XIM
204 STRG (Rs_inputMethod, "inputMethod", "im", "name", "name of input method"), 213 STRG (Rs_inputMethod, "inputMethod", "im", "name", "name of input method"),
205 STRG (Rs_preeditType, "preeditType", "pt", "style", "input style: style = OverTheSpot|OffTheSpot|Root"), 214 STRG (Rs_preeditType, "preeditType", "pt", "style", "input style: style = OverTheSpot|OffTheSpot|Root"),
206 STRG (Rs_imLocale, "imLocale", "imlocale", "string", "locale to use for input method"), 215 STRG (Rs_imLocale, "imLocale", "imlocale", "string", "locale to use for input method"),
207 STRG (Rs_imFont, "imFont", "imfont", "fontname", "fontset for styles OverTheSpot and OffTheSpot"), 216 STRG (Rs_imFont, "imFont", "imfont", "fontname", "fontset for styles OverTheSpot and OffTheSpot"),
208#endif /* USE_XIM */ 217#endif /* USE_XIM */
209 STRG (Rs_name, NULL, "name", "string", "client instance, icon, and title strings"), 218 STRG (Rs_name, NULL, "name", "string", "client instance, icon, and title strings"),
210 STRG (Rs_title, "title", "title", "string", "title name for window"), 219 STRG (Rs_title, "title", "title", "string", "title name for window"),
211 STRG (Rs_title, NULL, "T", NULL, NULL), /* short form */ 220 STRG (Rs_title, NULL, "T", NULL, NULL), /* short form */
212 STRG (Rs_iconName, "iconName", "n", "string", "icon name for window"), 221 STRG (Rs_iconName, "iconName", "n", "string", "icon name for window"),
213 STRG (Rs_saveLines, "saveLines", "sl", "number", "number of scrolled lines to save"), 222 STRG (Rs_saveLines, "saveLines", "sl", "number", "number of scrolled lines to save"),
214#if ENABLE_XEMBED 223#if ENABLE_XEMBED
215 STRG (Rs_embed, NULL, "embed", "windowid", "window id to embed terminal in"), 224 STRG (Rs_embed, NULL, "embed", "windowid", "window id to embed terminal in"),
216#endif 225#endif
217#if XFT 226#if XFT
218 STRG (Rs_depth, "depth", "depth", "number", "depth of visual to request"), 227 STRG (Rs_depth, "depth", "depth", "number", "depth of visual to request"),
228 BOOL (Rs_buffered, "buffered", NULL, Opt_buffered, 0, NULL),
219#endif 229#endif
220#if ENABLE_FRILLS 230#if ENABLE_FRILLS
221 RSTRG (Rs_transient_for, "transient-for", "windowid"), 231 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"), 232 BOOL (Rs_override_redirect, "override-redirect", "override-redirect", Opt_override_redirect, 0, "set override-redirect on the terminal window"),
223 STRG (Rs_pty_fd, NULL, "pty-fd", "fileno", "file descriptor of pty to use"), 233 STRG (Rs_pty_fd, NULL, "pty-fd", "fileno", "file descriptor of pty to use"),
… …
225 STRG (Rs_ext_bwidth, "externalBorder", "w", "number", "external border in pixels"), 235 STRG (Rs_ext_bwidth, "externalBorder", "w", "number", "external border in pixels"),
226 STRG (Rs_ext_bwidth, NULL, "bw", NULL, NULL), 236 STRG (Rs_ext_bwidth, NULL, "bw", NULL, NULL),
227 STRG (Rs_ext_bwidth, NULL, "borderwidth", NULL, NULL), 237 STRG (Rs_ext_bwidth, NULL, "borderwidth", NULL, NULL),
228 STRG (Rs_int_bwidth, "internalBorder", "b", "number", "internal border in pixels"), 238 STRG (Rs_int_bwidth, "internalBorder", "b", "number", "internal border in pixels"),
229 BOOL (Rs_borderLess, "borderLess", "bl", Opt_borderLess, 0, "borderless window"), 239 BOOL (Rs_borderLess, "borderLess", "bl", Opt_borderLess, 0, "borderless window"),
240 STRG (Rs_lineSpace, "lineSpace", "lsp", "number", "number of extra pixels between rows"),
241 STRG (Rs_letterSpace, "letterSpace", "letsp", "number", "letter spacing adjustment"),
242#endif
243#ifdef BUILTIN_GLYPHS
230 BOOL (Rs_skipBuiltinGlyphs, "skipBuiltinGlyphs", "sbg", Opt_skipBuiltinGlyphs, 0, "do not use internal glyphs"), 244 BOOL (Rs_skipBuiltinGlyphs, "skipBuiltinGlyphs", "sbg", Opt_skipBuiltinGlyphs, 0, "do not use internal glyphs"),
231 STRG (Rs_lineSpace, "lineSpace", "lsp", "number", "number of extra pixels between rows"),
232#endif 245#endif
233#ifdef POINTER_BLANK 246#ifdef POINTER_BLANK
234 RSTRG (Rs_pointerBlankDelay, "pointerBlankDelay", "number"), 247 RSTRG (Rs_pointerBlankDelay, "pointerBlankDelay", "number"),
235#endif 248#endif
236#ifndef NO_BACKSPACE_KEY 249#ifndef NO_BACKSPACE_KEY
237 RSTRG (Rs_backspace_key, "backspacekey", "string"), 250 RSTRG (Rs_backspace_key, "backspacekey", "string"),
238#endif 251#endif
239#ifndef NO_DELETE_KEY 252#ifndef NO_DELETE_KEY
240 RSTRG (Rs_delete_key, "deletekey", "string"), 253 RSTRG (Rs_delete_key, "deletekey", "string"),
241#endif 254#endif
242 RSTRG (Rs_selectstyle, "selectstyle", "mode"),
243#ifdef PRINTPIPE 255#ifdef PRINTPIPE
244 RSTRG (Rs_print_pipe, "print-pipe", "string"), 256 RSTRG (Rs_print_pipe, "print-pipe", "string"),
245#endif 257#endif
246 STRG (Rs_modifier, "modifier", "mod", "modifier", "meta modifier = alt|meta|hyper|super|mod1|...|mod5"), 258 STRG (Rs_modifier, "modifier", "mod", "modifier", "meta modifier = alt|meta|hyper|super|mod1|...|mod5"),
247#ifdef CUTCHAR_RESOURCE
248 RSTRG (Rs_cutchars, "cutchars", "string"), 259 RSTRG (Rs_cutchars, "cutchars", "string"),
249#endif /* CUTCHAR_RESOURCE */
250 RSTRG (Rs_answerbackstring, "answerbackString", "string"), 260 RSTRG (Rs_answerbackstring, "answerbackString", "string"),
251#ifndef NO_SECONDARY_SCREEN 261#ifndef NO_SECONDARY_SCREEN
252 BOOL (Rs_secondaryScreen, "secondaryScreen", "ssc", Opt_secondaryScreen, 0, "enable secondary screen"), 262 BOOL (Rs_secondaryScreen, "secondaryScreen", "ssc", Opt_secondaryScreen, 0, "enable secondary screen"),
253 BOOL (Rs_secondaryScroll, "secondaryScroll", "ssr", Opt_secondaryScroll, 0, "enable secondary screen scroll"), 263 BOOL (Rs_secondaryScroll, "secondaryScroll", "ssr", Opt_secondaryScroll, 0, "enable secondary screen scroll"),
254#endif 264#endif
… …
257 RSTRG (Rs_perl_eval, "perl-eval", "perl-eval"), // "string", "code to be evaluated after all extensions have been loaded"),TODO 267 RSTRG (Rs_perl_eval, "perl-eval", "perl-eval"), // "string", "code to be evaluated after all extensions have been loaded"),TODO
258 RSTRG (Rs_perl_ext_1, "perl-ext-common", "string"), //, "colon-separated list of perl extensions to enable"),TODO 268 RSTRG (Rs_perl_ext_1, "perl-ext-common", "string"), //, "colon-separated list of perl extensions to enable"),TODO
259 STRG (Rs_perl_ext_2, "perl-ext", "pe", "string", "colon-separated list of perl extensions to enable for this instance"), 269 STRG (Rs_perl_ext_2, "perl-ext", "pe", "string", "colon-separated list of perl extensions to enable for this instance"),
260#endif 270#endif
261#if ISO_14755 271#if ISO_14755
272 BOOL (Rs_iso14755, "iso14755", NULL, Opt_iso14755, 0, NULL),
262 BOOL (Rs_iso14755_52, "iso14755_52", NULL, Opt_iso14755_52, 0, NULL), 273 BOOL (Rs_iso14755_52, "iso14755_52", NULL, Opt_iso14755_52, 0, NULL),
263#endif 274#endif
264#ifdef HAVE_AFTERIMAGE 275#ifdef HAVE_AFTERIMAGE
265 STRG (Rs_blendtype, "blendType", "blt", "string", "background image blending type - alpha, tint, etc..."), 276 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 277#endif
268#ifndef NO_RESOURCES 278#ifndef NO_RESOURCES
269 INFO ("xrm", "string", "X resource"), 279 RINFO ("xrm", "string"),
280#endif
281#ifdef KEYSYM_RESOURCE
282 RINFO ("keysym.sym", "keysym"),
270#endif 283#endif
271 INFO ("e", "command arg ...", "command to execute") 284 INFO ("e", "command arg ...", "command to execute")
272 }; 285 };
273 286
274#undef INFO 287#undef INFO
288#undef RINFO
275#undef STRG 289#undef STRG
276#undef RSTRG 290#undef RSTRG
277#undef SWCH 291#undef SWCH
278#undef BOOL 292#undef BOOL
279 293
… …
325 "tint," 339 "tint,"
326#endif 340#endif
327#if HAVE_AFTERIMAGE 341#if HAVE_AFTERIMAGE
328 "afterimage," 342 "afterimage,"
329#endif 343#endif
344#if HAVE_PIXBUF
345 "pixbuf,"
346#endif
330#if defined(USE_XIM) 347#if defined(USE_XIM)
331 "XIM," 348 "XIM,"
332#endif 349#endif
333#if defined(NO_BACKSPACE_KEY) 350#if defined(NO_BACKSPACE_KEY)
334 "no_backspace," 351 "no_backspace,"
… …
361 "pointerBlank," 378 "pointerBlank,"
362#endif 379#endif
363#if defined(NO_RESOURCES) 380#if defined(NO_RESOURCES)
364 "NoResources," 381 "NoResources,"
365#endif 382#endif
366 "scrollbars=" 383 "scrollbars=plain"
367#if !defined(HAVE_SCROLLBARS)
368 "NONE"
369#else
370# if defined(PLAIN_SCROLLBAR)
371 "plain"
372# if defined(RXVT_SCROLLBAR) || defined(NEXT_SCROLLBAR) || defined(XTERM_SCROLLBAR)
373 "+"
374# endif
375# endif
376# if defined(RXVT_SCROLLBAR) 384#if defined(RXVT_SCROLLBAR)
377 "rxvt" 385 "+rxvt"
378# if defined(NEXT_SCROLLBAR) || defined(XTERM_SCROLLBAR)
379 "+"
380# endif
381# endif 386#endif
382# if defined(NEXT_SCROLLBAR) 387#if defined(NEXT_SCROLLBAR)
383 "NeXT" 388 "+NeXT"
384# if defined(XTERM_SCROLLBAR)
385 "+"
386# endif
387# endif 389#endif
388# if defined(XTERM_SCROLLBAR) 390#if defined(XTERM_SCROLLBAR)
389 "xterm" 391 "+xterm"
390# endif
391#endif 392#endif
392 "\nUsage: "; /* Usage */ 393 "\nUsage: "; /* Usage */
393 394
394#define INDENT 18 395#define INDENT 18
395 396
… …
409 switch (type) 410 switch (type)
410 { 411 {
411 case 0: /* brief listing */ 412 case 0: /* brief listing */
412 rxvt_log (" [-help] [--help]\n"); 413 rxvt_log (" [-help] [--help]\n");
413 414
414 for (col = 1, i = 0; i < optList_size; i++) 415 for (col = 1, i = 0; i < ecb_array_length (optList); i++)
415 if (optList[i].desc != NULL) 416 if (optList[i].desc != NULL)
416 { 417 {
417 int len = 0; 418 int len = 0;
418 419
419 if (!optList_isBool (i)) 420 if (optList[i].arg)
420 { 421 len = strlen (optList[i].arg) + 1;
421 len = optList_strlen (i);
422 if (len > 0)
423 len++; /* account for space */
424 }
425#ifdef DEBUG_STRICT
426 assert (optList[i].opt != NULL); 422 assert (optList[i].opt != NULL);
427#endif
428 len += 4 + strlen (optList[i].opt) + (optList_isBool (i) ? 2: 0); 423 len += 4 + strlen (optList[i].opt) + (optList_isBool (i) ? 2 : 0);
429 col += len; 424 col += len;
430 if (col > 79) 425 if (col > 79)
426 {
431 { /* assume regular width */ 427 /* assume regular width */
432 rxvt_log ("\n"); 428 rxvt_log ("\n");
433 col = 1 + len; 429 col = 1 + len;
434 } 430 }
435 431
436 rxvt_log (" [-%s%s", (optList_isBool (i) ? "/+" : ""), optList[i].opt); 432 rxvt_log (" [-%s%s", (optList_isBool (i) ? "/+" : ""), optList[i].opt);
437 if (optList_strlen (i)) 433 if (optList[i].arg)
438 rxvt_log (" %s]", optList[i].arg); 434 rxvt_log (" %s]", optList[i].arg);
439 else 435 else
440 rxvt_log ("]"); 436 rxvt_log ("]");
441 } 437 }
442 break; 438 break;
443 439
444 case 1: /* full command-line listing */ 440 case 1: /* full command-line listing */
445 rxvt_log (" [options] [-e command args]\n\nwhere options include:\n"); 441 rxvt_log (" [options] [-e command args]\n\nwhere options include:\n");
446 442
447 for (i = 0; i < optList_size; i++) 443 for (i = 0; i < ecb_array_length (optList); i++)
448 if (optList[i].desc != NULL) 444 if (optList[i].desc != NULL)
449 { 445 {
450#ifdef DEBUG_STRICT
451 assert (optList[i].opt != NULL); 446 assert (optList[i].opt != NULL);
452#endif
453 rxvt_log (" %s%s %-*s%s%s\n", 447 rxvt_log (" %s%s %-*s%s%s\n",
454 (optList_isBool (i) ? "-/+" : "-"), optList[i].opt, 448 (optList_isBool (i) ? "-/+" : "-"), optList[i].opt,
455 (INDENT - strlen (optList[i].opt) 449 (INDENT - strlen (optList[i].opt)
456 + (optList_isBool (i) ? 0 : 2)), 450 + (optList_isBool (i) ? 0 : 2)),
457 (optList[i].arg ? optList[i].arg : ""), 451 (optList[i].arg ? optList[i].arg : ""),
… …
463 457
464 case 2: /* full resource listing */ 458 case 2: /* full resource listing */
465 rxvt_log (" [options] [-e command args]\n\n" 459 rxvt_log (" [options] [-e command args]\n\n"
466 "where resources (long-options) include:\n"); 460 "where resources (long-options) include:\n");
467 461
468 for (i = 0; i < optList_size; i++) 462 for (i = 0; i < ecb_array_length (optList); i++)
469 if (optList[i].kw != NULL) 463 if (optList[i].kw != NULL)
470 rxvt_log (" %s: %*s%s\n", 464 rxvt_log (" %s: %*s%s\n",
471 optList[i].kw, 465 optList[i].kw,
472 (INDENT - strlen (optList[i].kw)), "", /* XXX */ 466 (INDENT - strlen (optList[i].kw)), "", /* XXX */
473 (optList_isBool (i) ? "boolean" : optList[i].arg)); 467 (optList_isBool (i) ? "boolean" : optList[i].arg));
474#ifdef KEYSYM_RESOURCE
475 rxvt_log (" " "keysym.sym" ": %*s%s\n",
476 (INDENT - sizeof ("keysym.sym") + 1), "", /* XXX */
477 "keysym");
478#endif
479 rxvt_log ("\n -help to list options"); 468 rxvt_log ("\n -help to list options");
480 break; 469 break;
481 } 470 }
482 471
483 rxvt_log ("\n\n"); 472 rxvt_log ("\n\n");
484 rxvt_exit_failure (); 473 rxvt_exit_failure ();
485 /* NOTREACHED */
486} 474}
487 475
488/*}}} */ 476/*}}} */
489 477
490/*{{{ get command-line options before getting resources */ 478/*{{{ get command-line options before getting resources */
491void 479const char **
492rxvt_term::get_options (int argc, const char *const *argv) 480rxvt_term::get_options (int argc, const char *const *argv)
493{ 481{
494 int i, bad_option = 0; 482 int i, bad_option = 0;
495 483
496 for (i = 1; i < argc; i++) 484 for (i = 1; i < argc; i++)
497 { 485 {
498 unsigned int entry, longopt = 0; 486 unsigned int entry, longopt = 0;
499 const char *flag, *opt; 487 const char *opt;
488 int flag;
500 489
501 opt = argv[i]; 490 opt = argv[i];
502 491
503 if (*opt == '-') 492 if (*opt == '-')
504 { 493 {
505 flag = resval_on; 494 flag = 1;
506 495
507 if (*++opt == '-') 496 if (*++opt == '-')
508 longopt = *opt++; /* long option */ 497 longopt = *opt++; /* long option */
509 } 498 }
510 else if (*opt == '+') 499 else if (*opt == '+')
511 { 500 {
512 flag = resval_off; 501 flag = 0;
513 502
514 if (*++opt == '+') 503 if (*++opt == '+')
515 longopt = *opt++; /* long option */ 504 longopt = *opt++; /* long option */
516 } 505 }
517 else 506 else
… …
526 515
527 if (!strcmp (opt, "h")) 516 if (!strcmp (opt, "h"))
528 rxvt_usage (0); 517 rxvt_usage (0);
529 518
530 /* feature: always try to match long-options */ 519 /* feature: always try to match long-options */
531 for (entry = 0; entry < optList_size; entry++) 520 for (entry = 0; entry < ecb_array_length (optList); entry++)
532 if ((optList[entry].kw && !strcmp (opt, optList[entry].kw)) 521 if ((optList[entry].kw && !strcmp (opt, optList[entry].kw))
533 || (!longopt 522 || (!longopt
534 && optList[entry].opt && !strcmp (opt, optList[entry].opt))) 523 && optList[entry].opt && !strcmp (opt, optList[entry].opt)))
535 break; 524 break;
536 525
537 if (entry < optList_size) 526 if (entry < ecb_array_length (optList)
527 && !optList_isInfo (entry))
538 { 528 {
539 if (optList_isReverse (entry)) 529 if (optList_isReverse (entry))
540 flag = flag == resval_on ? resval_off : resval_on; 530 flag = !flag;
541 531
542 if (optList_strlen (entry)) 532 if (optList_isString (entry))
543 { 533 {
544 /* 534 /*
545 * special cases are handled in main.c:main () to allow 535 * special cases are handled in init_resources () to allow
546 * X resources to set these values before we settle for 536 * X resources to set these values before we settle for
547 * default values 537 * default values
548 */ 538 */
549 539
550 if (optList[entry].doff != -1) 540 if (optList[entry].doff != -1)
551 { 541 {
552 if (flag == resval_on && !argv [i+1]) 542 if (flag && i+1 == argc)
553 rxvt_fatal ("option '%s' needs an argument, aborting.\n", argv [i]); 543 rxvt_fatal ("option '%s' requires an argument, aborting.\n", argv [i]);
554 544
555 rs[optList[entry].doff] = flag == resval_on ? argv[++i] : resval_undef; 545 rs[optList[entry].doff] = flag ? argv[++i] : resval_undef;
556 } 546 }
557 } 547 }
558 else 548 else
549 {
559 { /* boolean value */ 550 /* boolean value */
560 set_option (optList[entry].index, flag == resval_on); 551 set_option (optList[entry].index, flag);
561 552
562 if (optList[entry].doff != -1) 553 if (optList[entry].doff != -1)
563 rs[optList[entry].doff] = flag; 554 rs[optList[entry].doff] = flag ? resval_on : resval_off;
564 } 555 }
565 } 556 }
557#ifndef NO_RESOURCES
558 else if (!strcmp (opt, "xrm"))
559 {
560 if (i+1 < argc)
561 XrmPutLineResource (&option_db, argv[++i]);
562 }
563#endif
564#ifdef KEYSYM_RESOURCE
565 else if (!strncmp (opt, "keysym.", sizeof ("keysym.") - 1))
566 {
567 if (i+1 < argc)
568 {
569 char *res = rxvt_temp_buf<char> (strlen (opt) + strlen (argv[++i]) + 6);
570 sprintf (res, "*.%s: %s\n", opt, argv[i]);
571 XrmPutLineResource (&option_db, res);
572 }
573 }
574#endif
575 else if (!strcmp (opt, "e"))
576 {
577 if (i+1 == argc)
578 rxvt_fatal ("option '-e' requires an argument, aborting.\n");
579
580 return (const char **)argv + i + 1;
581 }
566 else 582 else
567#ifdef KEYSYM_RESOURCE
568 if (!strncmp (opt, "keysym.", sizeof ("keysym.") - 1))
569 { 583 {
570 const char *str = argv[++i];
571
572 if (str != NULL)
573 parse_keysym (opt + sizeof ("keysym.") - 1, str);
574 }
575 else
576#endif
577 {
578 bad_option = 1; 584 bad_option = 1;
579 rxvt_warn ("\"%s\": unknown or malformed option.\n", opt); 585 rxvt_warn ("\"%s\": unknown or malformed option.\n", opt);
580 } 586 }
581 } 587 }
582 588
583 if (bad_option) 589 if (bad_option)
584 rxvt_usage (0); 590 rxvt_usage (0);
591
592 return 0;
585} 593}
586 594
587/*}}} */ 595/*}}} */
588 596
589#ifndef NO_RESOURCES 597#ifndef NO_RESOURCES
… …
594 * Define key from XrmEnumerateDatabase. 602 * Define key from XrmEnumerateDatabase.
595 * quarks will be something like 603 * quarks will be something like
596 * "rxvt" "keysym" "0xFF01" 604 * "rxvt" "keysym" "0xFF01"
597 * value will be a string 605 * value will be a string
598 */ 606 */
599/* ARGSUSED */ 607static int
600int
601rxvt_define_key (XrmDatabase *database UNUSED, 608rxvt_define_key (XrmDatabase *database ecb_unused,
602 XrmBindingList bindings UNUSED, 609 XrmBindingList bindings ecb_unused,
603 XrmQuarkList quarks, 610 XrmQuarkList quarks,
604 XrmRepresentation *type UNUSED, 611 XrmRepresentation *type ecb_unused,
605 XrmValue *value, 612 XrmValue *value,
606 XPointer closure UNUSED) 613 XPointer closure ecb_unused)
607{ 614{
608 int last; 615 int last;
609 616
610 for (last = 0; quarks[last] != NULLQUARK; last++) /* look for last quark in list */ 617 for (last = 0; quarks[last] != NULLQUARK; last++) /* look for last quark in list */
611 ; 618 ;
… …
616} 623}
617 624
618/* 625/*
619 * look for something like this (XK_Delete) 626 * look for something like this (XK_Delete)
620 * rxvt*keysym.0xFFFF: "\177" 627 * rxvt*keysym.0xFFFF: "\177"
621 *
622 * arg will be
623 * NULL for ~/.Xdefaults and
624 * non-NULL for command-line options (need to allocate)
625 */ 628 */
626#define NEWARGLIM 500 /* `reasonable' size */
627 629
628struct keysym_vocabulary_t 630struct keysym_vocabulary_t
629{ 631{
630 const char *name; 632 const char *name;
631 unsigned short len; 633 unsigned short len;
632 unsigned short value; 634 unsigned short value;
633}; 635};
634keysym_vocabulary_t keysym_vocabulary[] = 636static const keysym_vocabulary_t keysym_vocabulary[] =
635{ 637{
636 { "ISOLevel3", 9, Level3Mask }, 638 { "ISOLevel3", 9, Level3Mask },
637 { "AppKeypad", 9, AppKeypadMask }, 639 { "AppKeypad", 9, AppKeypadMask },
638 { "Control", 7, ControlMask }, 640 { "Control", 7, ControlMask },
639 { "NumLock", 7, NumLockMask }, 641 { "NumLock", 7, NumLockMask },
… …
661}; 663};
662 664
663int 665int
664rxvt_term::parse_keysym (const char *str, const char *arg) 666rxvt_term::parse_keysym (const char *str, const char *arg)
665{ 667{
666 int n, sym; 668 int sym;
667 unsigned int state = 0; 669 unsigned int state = 0;
668 const char *pmodend = NULL; 670 const char *key = strrchr (str, '-');
669 char *newarg = NULL;
670 char newargstr[NEWARGLIM];
671 671
672 if (arg == NULL) 672 if (!key)
673 { 673 key = str;
674 n = sizeof ("keysym.") - 1;
675 if (strncmp (str, "keysym.", n))
676 return 0;
677
678 str += n; /* skip `keysym.' */
679 if (!(pmodend = strchr (str, ':')))
680 return -1;
681 }
682 else 674 else
683 pmodend = str + strlen(str); 675 key++;
684 676
685 for (--pmodend; str < pmodend; --pmodend) 677 // string or key is empty
686 if (*pmodend == '-') 678 if (*arg == '\0' || *key == '\0')
687 break; 679 return -1;
688 680
681 // parse modifiers
689 while (str < pmodend) 682 while (str < key)
690 { 683 {
691 unsigned int i; 684 unsigned int i;
692 685
693 for (i=0; i < sizeof (keysym_vocabulary) / sizeof (keysym_vocabulary_t); ++i) 686 for (i = 0; i < ecb_array_length (keysym_vocabulary); ++i)
694 { 687 {
695 if (strncmp (str, keysym_vocabulary [i].name, keysym_vocabulary [i].len) == 0) 688 if (strncmp (str, keysym_vocabulary [i].name, keysym_vocabulary [i].len) == 0)
696 { 689 {
697 state |= keysym_vocabulary[i].value; 690 state |= keysym_vocabulary[i].value;
698 str += keysym_vocabulary[i].len; 691 str += keysym_vocabulary[i].len;
699 break; 692 break;
700 } 693 }
701 } 694 }
702 695
703 if (i >= sizeof (keysym_vocabulary) / sizeof (keysym_vocabulary_t)) 696 if (i >= ecb_array_length (keysym_vocabulary))
704 return -1; 697 return -1;
705 698
706 if (*str == '-') 699 if (*str == '-')
707 ++str; 700 ++str;
708 } 701 }
709 702
710 /* some scanf () have trouble with a 0x prefix */ 703 // convert keysym name to keysym number
711 if (str[0] == '0' && toupper (str[1]) == 'X') 704 if ((sym = XStringToKeysym (str)) == None)
712 { 705 {
713 str += 2; 706 // fallback on hexadecimal parsing
714 707 char *end;
708 sym = strtol (str, &end, 16);
715 if (arg) 709 if (*end)
716 {
717 if (sscanf (str, (strchr (str, ':') ? "%x:" : "%x"), &sym) != 1)
718 return -1;
719 }
720 else
721 {
722 if (sscanf (str, "%x:", &sym) != 1)
723 return -1;
724
725 /* cue to ':', it's there since sscanf () worked */
726 strncpy (newargstr, strchr (str, ':') + 1, NEWARGLIM - 1);
727 newargstr[NEWARGLIM - 1] = '\0';
728 newarg = newargstr;
729 }
730 }
731 else
732 {
733 /*
734 * convert keysym name to keysym number
735 */
736 strncpy (newargstr, str, NEWARGLIM - 1);
737 newargstr[NEWARGLIM - 1] = '\0';
738
739 if (arg == NULL)
740 {
741 if ((newarg = strchr (newargstr, ':')) == NULL)
742 return -1;
743
744 *newarg++ = '\0'; /* terminate keysym name */
745 }
746
747 if ((sym = XStringToKeysym (newargstr)) == None)
748 return -1; 710 return -1;
749 } 711 }
750 712
751 if (newarg == NULL) 713 wchar_t *ws = rxvt_mbstowcs (arg);
752 { 714 if (!HOOK_INVOKE ((this, HOOK_REGISTER_COMMAND, DT_INT, sym, DT_INT, state, DT_WCS_LEN, ws, wcslen (ws), DT_END)))
753 strncpy (newargstr, arg, NEWARGLIM - 1);
754 newargstr[NEWARGLIM - 1] = '\0';
755 newarg = newargstr;
756 }
757
758 if (*newarg == '\0')
759 return -1;
760
761 keyboard->register_user_translation (sym, state, newarg); 715 keyboard->register_user_translation (sym, state, ws);
716 free (ws);
762 return 1; 717 return 1;
763} 718}
764 719
765# endif /* KEYSYM_RESOURCE */ 720# endif /* KEYSYM_RESOURCE */
766#endif /* NO_RESOURCES */ 721#endif /* NO_RESOURCES */
767 722
768static char * 723static char *
769get_res (XrmDatabase database, const char *program, const char *option) 724get_res (XrmDatabase database, const char *program, const char *option)
770{ 725{
771 char resource[512]; 726 char resource[512];
… …
803 758
804void 759void
805rxvt_term::extract_resources () 760rxvt_term::extract_resources ()
806{ 761{
807#ifndef NO_RESOURCES 762#ifndef NO_RESOURCES
763 XrmDatabase database = XrmGetDatabase (dpy);
764 XrmMergeDatabases (option_db, &database);
765 option_db = NULL;
808 /* 766 /*
809 * Query resources for options that affect us 767 * Query resources for options that affect us
810 */ 768 */
811 for (int entry = 0; entry < optList_size; entry++) 769 for (int entry = 0; entry < ecb_array_length (optList); entry++)
812 { 770 {
813 int s; 771 int s;
814 const char *kw = optList[entry].kw; 772 const char *kw = optList[entry].kw;
815 773
816 if (kw == NULL || rs[optList[entry].doff] != NULL) 774 if (kw == NULL || rs[optList[entry].doff] != NULL)
… …
836 794
837 set_option (optList[entry].index, s); 795 set_option (optList[entry].index, s);
838 } 796 }
839 } 797 }
840 } 798 }
799#endif /* NO_RESOURCES */
800}
841 801
802void
803rxvt_term::extract_keysym_resources ()
804{
805#ifndef NO_RESOURCES
842 /* 806 /*
843 * [R5 or later]: enumerate the resource database 807 * [R5 or later]: enumerate the resource database
844 */ 808 */
845# ifdef KEYSYM_RESOURCE 809# ifdef KEYSYM_RESOURCE
846 XrmDatabase database = XrmGetDatabase (dpy); 810 XrmDatabase database = XrmGetDatabase (dpy);
… …
855 class_prefix[2] = NULLQUARK; 819 class_prefix[2] = NULLQUARK;
856 /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */ 820 /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */
857 XrmEnumerateDatabase (database, name_prefix, class_prefix, 821 XrmEnumerateDatabase (database, name_prefix, class_prefix,
858 XrmEnumOneLevel, rxvt_define_key, NULL); 822 XrmEnumOneLevel, rxvt_define_key, NULL);
859# ifdef RESFALLBACK 823# ifdef RESFALLBACK
860 name_prefix[0] = XrmStringToName (RESFALLBACK);
861 name_prefix[1] = XrmStringToName ("keysym");
862 class_prefix[0] = XrmStringToName (RESFALLBACK); 824 name_prefix[0] = class_prefix[0] = XrmStringToName (RESFALLBACK);
863 class_prefix[1] = XrmStringToName ("Keysym");
864 /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */ 825 /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */
865 XrmEnumerateDatabase (database, name_prefix, class_prefix, 826 XrmEnumerateDatabase (database, name_prefix, class_prefix,
866 XrmEnumOneLevel, rxvt_define_key, NULL); 827 XrmEnumOneLevel, rxvt_define_key, NULL);
867# endif 828# endif
868# endif 829# endif
869 830
870#endif /* NO_RESOURCES */ 831#endif /* NO_RESOURCES */
871} 832}
872 833
873/*----------------------- end-of-file (C source) -----------------------*/ 834/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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