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.138 by root, Tue Nov 4 11:03:29 2008 UTC vs.
Revision 1.198 by root, Sat Jul 3 15:34:35 2021 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 * Copyright (c) 2007,2015 Emanuele Giaquinta <e.giaquinta@glauco.it>
11 * 11 *
12 * 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
13 * 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
14 * the Free Software Foundation; either version 2 of the License, or 14 * the Free Software Foundation; either version 3 of the License, or
15 * (at your option) any later version. 15 * (at your option) any later version.
16 * 16 *
17 * This program is distributed in the hope that it will be useful, 17 * This program is distributed in the hope that it will be useful,
18 * but WITHOUT ANY WARRANTY; without even the implied warranty of 18 * but WITHOUT ANY WARRANTY; without even the implied warranty of
19 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 19 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
… …
34 34
35/* place holders used for parsing command-line options */ 35/* place holders used for parsing command-line options */
36#define Optflag_Reverse 1 36#define Optflag_Reverse 1
37#define Optflag_Boolean 2 37#define Optflag_Boolean 2
38#define Optflag_Switch 4 38#define Optflag_Switch 4
39#define Optflag_Info 8
39 40
40/* monolithic option/resource structure: */ 41/* monolithic option/resource structure: */
41/* 42/*
42 * `string' options MUST have a usage argument 43 * `string' options MUST have a usage argument
43 * `switch' and `boolean' options have no argument 44 * `switch' and `boolean' options have no argument
44 * 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 ()
45 */ 46 */
46 47
47/* INFO () - descriptive information only */ 48/* INFO () - descriptive information only */
48#define INFO(opt, arg, desc) \ 49#define INFO(opt, arg, desc) \
49 {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}
50 54
51/* STRG () - command-line option, with/without resource */ 55/* STRG () - command-line option, with/without resource */
52#define STRG(rsp, kw, opt, arg, desc) \ 56#define STRG(rsp, kw, opt, arg, desc) \
53 {0, 0, (rsp), (kw), (opt), (arg), (desc)} 57 {0, 0, (rsp), (kw), (opt), (arg), (desc)}
54 58
… …
69 (optList[i].flag == 0) 73 (optList[i].flag == 0)
70#define optList_isBool(i) \ 74#define optList_isBool(i) \
71 (optList[i].flag & Optflag_Boolean) 75 (optList[i].flag & Optflag_Boolean)
72#define optList_isReverse(i) \ 76#define optList_isReverse(i) \
73 (optList[i].flag & Optflag_Reverse) 77 (optList[i].flag & Optflag_Reverse)
74#define optList_size \ 78#define optList_isInfo(i) \
75 (sizeof (optList) / sizeof (optList[0])) 79 (optList[i].flag & Optflag_Info)
76 80
77static const struct 81static const struct
78 { 82 {
79 const uint8_t index; /* Option index */ 83 const uint8_t index; /* Option index */
80 const uint8_t flag; /* Option flag */ 84 const uint8_t flag; /* Option flag */
… …
92 STRG (Rs_geometry, "geometry", "geometry", "geometry", "size (in characters) and position"), 96 STRG (Rs_geometry, "geometry", "geometry", "geometry", "size (in characters) and position"),
93 SWCH ("C", Opt_console, 0, "intercept console messages"), 97 SWCH ("C", Opt_console, 0, "intercept console messages"),
94 SWCH ("iconic", Opt_iconic, 0, "start iconic"), 98 SWCH ("iconic", Opt_iconic, 0, "start iconic"),
95 SWCH ("ic", Opt_iconic, 0, NULL), /* short form */ 99 SWCH ("ic", Opt_iconic, 0, NULL), /* short form */
96 STRG (Rs_chdir, "chdir", "cd", "string", "start shell in this directory"), 100 STRG (Rs_chdir, "chdir", "cd", "string", "start shell in this directory"),
101 SWCH ("dockapp", Opt_dockapp, 0, "start as dockapp"),
97 BOOL (Rs_reverseVideo, "reverseVideo", "rv", Opt_reverseVideo, 0, "reverse video"), 102 BOOL (Rs_reverseVideo, "reverseVideo", "rv", Opt_reverseVideo, 0, "reverse video"),
98 BOOL (Rs_loginShell, "loginShell", "ls", Opt_loginShell, 0, "login shell"), 103 BOOL (Rs_loginShell, "loginShell", "ls", Opt_loginShell, 0, "login shell"),
104 STRG (Rs_multiClickTime, "multiClickTime", "mc", "number", "maximum time (in ms) between multi-click selections"),
99 BOOL (Rs_jumpScroll, "jumpScroll", "j", Opt_jumpScroll, 0, "jump scrolling"), 105 BOOL (Rs_jumpScroll, "jumpScroll", "j", Opt_jumpScroll, 0, "jump scrolling"),
100 BOOL (Rs_skipScroll, "skipScroll", "ss", Opt_skipScroll, 0, "skip scrolling"), 106 BOOL (Rs_skipScroll, "skipScroll", "ss", Opt_skipScroll, 0, "skip scrolling"),
101 BOOL (Rs_pastableTabs, "pastableTabs", "ptab", Opt_pastableTabs, 0, "tab characters are pastable"), 107 BOOL (Rs_pastableTabs, "pastableTabs", "ptab", Opt_pastableTabs, 0, "tab characters are pastable"),
102 RSTRG (Rs_scrollstyle, "scrollstyle", "mode"), 108 RSTRG (Rs_scrollstyle, "scrollstyle", "mode"),
103 BOOL (Rs_scrollBar, "scrollBar", "sb", Opt_scrollBar, 0, "scrollbar"), 109 BOOL (Rs_scrollBar, "scrollBar", "sb", Opt_scrollBar, 0, "scrollbar"),
… …
107 STRG (Rs_scrollBar_thickness, "thickness", "sbt", "number", "scrollbar thickness/width in pixels"), 113 STRG (Rs_scrollBar_thickness, "thickness", "sbt", "number", "scrollbar thickness/width in pixels"),
108 BOOL (Rs_scrollTtyOutput, "scrollTtyOutput", NULL, Opt_scrollTtyOutput, 0, NULL), 114 BOOL (Rs_scrollTtyOutput, "scrollTtyOutput", NULL, Opt_scrollTtyOutput, 0, NULL),
109 BOOL (Rs_scrollTtyOutput, NULL, "si", Opt_scrollTtyOutput, Optflag_Reverse, "scroll-on-tty-output inhibit"), 115 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"), 116 BOOL (Rs_scrollTtyKeypress, "scrollTtyKeypress", "sk", Opt_scrollTtyKeypress, 0, "scroll-on-keypress"),
111 BOOL (Rs_scrollWithBuffer, "scrollWithBuffer", "sw", Opt_scrollWithBuffer, 0, "scroll-with-buffer"), 117 BOOL (Rs_scrollWithBuffer, "scrollWithBuffer", "sw", Opt_scrollWithBuffer, 0, "scroll-with-buffer"),
112#if ENABLE_TRANSPARENCY
113 BOOL (Rs_transparent, "inheritPixmap", "ip", Opt_transparent, 0, "inherit parent pixmap"),
114 BOOL (Rs_transparent, "transparent", "tr", Opt_transparent, 0, "inherit parent pixmap"),
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 118#if OFF_FOCUS_FADING
119 STRG (Rs_fade, "fading", "fade", "number", "fade colors by number % when losing focus"), 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"), 120 STRG (Rs_color + Color_fade, "fadeColor", "fadecolor", "color", "target color for off-focus fading"),
121#endif 121#endif
122 BOOL (Rs_utmpInhibit, "utmpInhibit", "ut", Opt_utmpInhibit, 0, "utmp inhibit"), 122 BOOL (Rs_utmpInhibit, "utmpInhibit", "ut", Opt_utmpInhibit, 0, "utmp inhibit"),
… …
134#endif 134#endif
135#ifdef MOUSE_WHEEL 135#ifdef MOUSE_WHEEL
136 BOOL (Rs_mouseWheelScrollPage, "mouseWheelScrollPage", NULL, Opt_mouseWheelScrollPage, 0, NULL), 136 BOOL (Rs_mouseWheelScrollPage, "mouseWheelScrollPage", NULL, Opt_mouseWheelScrollPage, 0, NULL),
137#endif 137#endif
138#if ENABLE_FRILLS 138#if ENABLE_FRILLS
139 BOOL (Rs_disablePasteBrackets, "disablePasteBrackets", "dpb", Opt_disablePasteBrackets, 0, "paste bracket suppression"),
139 BOOL (Rs_tripleclickwords, "tripleclickwords", "tcw", Opt_tripleclickwords, 0, "triple click word selection"), 140 BOOL (Rs_tripleclickwords, "tripleclickwords", "tcw", Opt_tripleclickwords, 0, "triple click word selection"),
140 BOOL (Rs_insecure, "insecure", "insecure", Opt_insecure, 0, "enable possibly insecure escape sequences"), 141 BOOL (Rs_insecure, "insecure", "insecure", Opt_insecure, 0, "enable possibly insecure escape sequences"),
141 BOOL (Rs_cursorUnderline, "cursorUnderline", "uc", Opt_cursorUnderline, 0, "underline cursor"), 142 BOOL (Rs_cursorUnderline, "cursorUnderline", "uc", Opt_cursorUnderline, 0, "underline cursor"),
142#endif 143#endif
143#if CURSOR_BLINK 144#if CURSOR_BLINK
… …
177#ifdef RXVT_SCROLLBAR 178#ifdef RXVT_SCROLLBAR
178 RSTRG (Rs_color + Color_trough, "troughColor", "color"), 179 RSTRG (Rs_color + Color_trough, "troughColor", "color"),
179#endif 180#endif
180#ifdef OPTION_HC 181#ifdef OPTION_HC
181 STRG (Rs_color + Color_HC, "highlightColor", "hc", "color", "highlight color"), 182 STRG (Rs_color + Color_HC, "highlightColor", "hc", "color", "highlight color"),
183 RSTRG (Rs_color + Color_HTC, "highlightTextColor", "color"),
182#endif 184#endif
183#ifndef NO_CURSORCOLOR 185#ifndef NO_CURSORCOLOR
184 STRG (Rs_color + Color_cursor, "cursorColor", "cr", "color", "cursor color"), 186 STRG (Rs_color + Color_cursor, "cursorColor", "cr", "color", "cursor color"),
185 /* command-line option = resource name */ 187 /* command-line option = resource name */
186 RSTRG (Rs_color + Color_cursor2, "cursorColor2", "color"), 188 RSTRG (Rs_color + Color_cursor2, "cursorColor2", "color"),
187#endif /* NO_CURSORCOLOR */ 189#endif /* NO_CURSORCOLOR */
188 STRG (Rs_color + Color_pointer_fg, "pointerColor", "pr", "color", "pointer color"), 190 STRG (Rs_color + Color_pointer_fg, "pointerColor", "pr", "color", "pointer color"),
189 STRG (Rs_color + Color_pointer_bg, "pointerColor2", "pr2", "color", "pointer bg color"), 191 STRG (Rs_color + Color_pointer_bg, "pointerColor2", "pr2", "color", "pointer bg color"),
190 STRG (Rs_color + Color_border, "borderColor", "bd", "color", "border color"), 192 STRG (Rs_color + Color_border, "borderColor", "bd", "color", "border color"),
191#ifdef BG_IMAGE_FROM_FILE 193#if ENABLE_EWMH
192 RSTRG (Rs_path, "path", "search path"), 194 STRG (Rs_iconfile, "iconFile", "icon", "file", "path to application icon image"),
193 STRG (Rs_backgroundPixmap, "backgroundPixmap", "pixmap", "file[;geom]", "background pixmap"), 195#endif
196#ifdef HAVE_XMU
197 RSTRG (Rs_pointerShape, "pointerShape", "string"),
194#endif 198#endif
195 /* fonts: command-line option = resource name */ 199 /* fonts: command-line option = resource name */
196 STRG (Rs_font, "font", "fn", "fontname", "normal text font"), 200 STRG (Rs_font, "font", "fn", "fontname", "normal text font"),
197#if ENABLE_STYLES 201#if ENABLE_STYLES
198 STRG (Rs_boldFont, "boldFont", "fb", "fontname", "bold font"), 202 STRG (Rs_boldFont, "boldFont", "fb", "fontname", "bold font"),
199 STRG (Rs_italicFont, "italicFont", "fi", "fontname", "italic font"), 203 STRG (Rs_italicFont, "italicFont", "fi", "fontname", "italic font"),
200 STRG (Rs_boldItalicFont, "boldItalicFont", "fbi", "fontname", "bold italic font"), 204 STRG (Rs_boldItalicFont, "boldItalicFont", "fbi", "fontname", "bold italic font"),
201 BOOL (Rs_intensityStyles, "intensityStyles", "is", Opt_intensityStyles, 0, "font styles imply intensity changes"), 205 BOOL (Rs_intensityStyles, "intensityStyles", "is", Opt_intensityStyles, 0, "font styles imply intensity changes"),
202#endif 206#endif
203#ifdef USE_XIM 207#if USE_XIM
204 STRG (Rs_inputMethod, "inputMethod", "im", "name", "name of input method"), 208 STRG (Rs_inputMethod, "inputMethod", "im", "name", "name of input method"),
205 STRG (Rs_preeditType, "preeditType", "pt", "style", "input style: style = OverTheSpot|OffTheSpot|Root"), 209 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"), 210 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"), 211 STRG (Rs_imFont, "imFont", "imfont", "fontname", "fontset for styles OverTheSpot and OffTheSpot"),
208#endif /* USE_XIM */ 212#endif /* USE_XIM */
… …
213 STRG (Rs_saveLines, "saveLines", "sl", "number", "number of scrolled lines to save"), 217 STRG (Rs_saveLines, "saveLines", "sl", "number", "number of scrolled lines to save"),
214#if ENABLE_XEMBED 218#if ENABLE_XEMBED
215 STRG (Rs_embed, NULL, "embed", "windowid", "window id to embed terminal in"), 219 STRG (Rs_embed, NULL, "embed", "windowid", "window id to embed terminal in"),
216#endif 220#endif
217#if XFT 221#if XFT
222 BOOL (Rs_buffered, "buffered", NULL, Opt_buffered, 0, NULL),
223#endif
224#if ENABLE_FRILLS
218 STRG (Rs_depth, "depth", "depth", "number", "depth of visual to request"), 225 STRG (Rs_depth, "depth", "depth", "number", "depth of visual to request"),
219 BOOL (Rs_buffered, "buffered", NULL, Opt_buffered, 0, NULL), 226 STRG (Rs_visual, "visual", "visual", "number", "visual id to request"),
220#endif
221#if ENABLE_FRILLS
222 RSTRG (Rs_transient_for, "transient-for", "windowid"), 227 RSTRG (Rs_transient_for, "transient-for", "windowid"),
223 BOOL (Rs_override_redirect, "override-redirect", "override-redirect", Opt_override_redirect, 0, "set override-redirect on the terminal window"), 228 BOOL (Rs_override_redirect, "override-redirect", "override-redirect", Opt_override_redirect, 0, "override-redirect on the terminal window"),
224 STRG (Rs_pty_fd, NULL, "pty-fd", "fileno", "file descriptor of pty to use"), 229 STRG (Rs_pty_fd, NULL, "pty-fd", "fileno", "file descriptor of pty to use"),
225 BOOL (Rs_hold, "hold", "hold", Opt_hold, 0, "retain window after shell exit"), 230 BOOL (Rs_hold, "hold", "hold", Opt_hold, 0, "retain window after shell exit"),
226 STRG (Rs_ext_bwidth, "externalBorder", "w", "number", "external border in pixels"), 231 STRG (Rs_ext_bwidth, "externalBorder", "w", "number", "external border in pixels"),
227 STRG (Rs_ext_bwidth, NULL, "bw", NULL, NULL), 232 STRG (Rs_ext_bwidth, NULL, "bw", NULL, NULL),
228 STRG (Rs_ext_bwidth, NULL, "borderwidth", NULL, NULL), 233 STRG (Rs_ext_bwidth, NULL, "borderwidth", NULL, NULL),
229 STRG (Rs_int_bwidth, "internalBorder", "b", "number", "internal border in pixels"), 234 STRG (Rs_int_bwidth, "internalBorder", "b", "number", "internal border in pixels"),
230 BOOL (Rs_borderLess, "borderLess", "bl", Opt_borderLess, 0, "borderless window"), 235 BOOL (Rs_borderLess, "borderLess", "bl", Opt_borderLess, 0, "borderless window"),
231 STRG (Rs_lineSpace, "lineSpace", "lsp", "number", "number of extra pixels between rows"), 236 STRG (Rs_lineSpace, "lineSpace", "lsp", "number", "number of extra pixels between rows"),
237 STRG (Rs_letterSpace, "letterSpace", "letsp", "number", "letter spacing adjustment"),
232#endif 238#endif
233#ifdef BUILTIN_GLYPHS 239#ifdef BUILTIN_GLYPHS
234 BOOL (Rs_skipBuiltinGlyphs, "skipBuiltinGlyphs", "sbg", Opt_skipBuiltinGlyphs, 0, "do not use internal glyphs"), 240 BOOL (Rs_skipBuiltinGlyphs, "skipBuiltinGlyphs", "sbg", Opt_skipBuiltinGlyphs, 0, "using font glyphs instead of internal glyphs"),
235#endif 241#endif
236#ifdef POINTER_BLANK 242#ifdef POINTER_BLANK
237 RSTRG (Rs_pointerBlankDelay, "pointerBlankDelay", "number"), 243 RSTRG (Rs_pointerBlankDelay, "pointerBlankDelay", "number"),
238#endif 244#endif
239#ifndef NO_BACKSPACE_KEY 245#ifndef NO_BACKSPACE_KEY
… …
247#endif 253#endif
248 STRG (Rs_modifier, "modifier", "mod", "modifier", "meta modifier = alt|meta|hyper|super|mod1|...|mod5"), 254 STRG (Rs_modifier, "modifier", "mod", "modifier", "meta modifier = alt|meta|hyper|super|mod1|...|mod5"),
249 RSTRG (Rs_cutchars, "cutchars", "string"), 255 RSTRG (Rs_cutchars, "cutchars", "string"),
250 RSTRG (Rs_answerbackstring, "answerbackString", "string"), 256 RSTRG (Rs_answerbackstring, "answerbackString", "string"),
251#ifndef NO_SECONDARY_SCREEN 257#ifndef NO_SECONDARY_SCREEN
252 BOOL (Rs_secondaryScreen, "secondaryScreen", "ssc", Opt_secondaryScreen, 0, "enable secondary screen"), 258 BOOL (Rs_secondaryScreen, "secondaryScreen", "ssc", Opt_secondaryScreen, 0, "secondary screen"),
253 BOOL (Rs_secondaryScroll, "secondaryScroll", "ssr", Opt_secondaryScroll, 0, "enable secondary screen scroll"), 259 BOOL (Rs_secondaryScroll, "secondaryScroll", "ssr", Opt_secondaryScroll, 0, "secondary screen scroll"),
260#endif
261#if ENABLE_FRILLS
262 STRG (Rs_rewrapMode, "rewrapMode", "rm", "string", "rewrap mode (auto, always, never)"),
254#endif 263#endif
255#if ENABLE_PERL 264#if ENABLE_PERL
256 RSTRG (Rs_perl_lib, "perl-lib", "string"), //, "colon-separated directories with extension scripts"),TODO 265 RSTRG (Rs_perl_lib, "perl-lib", "string"), //, "colon-separated directories with extension scripts"),TODO
257 RSTRG (Rs_perl_eval, "perl-eval", "perl-eval"), // "string", "code to be evaluated after all extensions have been loaded"),TODO 266 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 267 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"), 268 STRG (Rs_perl_ext_2, "perl-ext", "pe", "string", "colon-separated list of perl extensions to enable for this instance"),
260#endif 269#endif
261#if ISO_14755 270#if ISO_14755
271 BOOL (Rs_iso14755, "iso14755", NULL, Opt_iso14755, 0, NULL),
262 BOOL (Rs_iso14755_52, "iso14755_52", NULL, Opt_iso14755_52, 0, NULL), 272 BOOL (Rs_iso14755_52, "iso14755_52", NULL, Opt_iso14755_52, 0, NULL),
263#endif 273#endif
264#ifdef HAVE_AFTERIMAGE 274#ifndef NO_RESOURCES
265 STRG (Rs_blendtype, "blendType", "blt", "string", "background image blending type - alpha, tint, etc..."), 275 RINFO ("xrm", "string"),
266 STRG (Rs_blurradius, "blurRadius", "blr", "HxV", "gaussian blur radii to apply to the root background"),
267# if ENABLE_EWMH
268 STRG (Rs_iconfile, "iconFile", "icon", "file", "path to aplication icon image"),
269# endif 276#endif
277#ifdef KEYSYM_RESOURCE
278 RINFO ("keysym.sym", "keysym"),
270#endif 279#endif
271 INFO ("e", "command arg ...", "command to execute") 280 INFO ("e", "command arg ...", "command to execute")
272 }; 281 };
273 282
274#undef INFO 283#undef INFO
284#undef RINFO
275#undef STRG 285#undef STRG
276#undef RSTRG 286#undef RSTRG
277#undef SWCH 287#undef SWCH
278#undef BOOL 288#undef BOOL
279 289
… …
322#endif 332#endif
323#if defined(ENABLE_TRANSPARENCY) 333#if defined(ENABLE_TRANSPARENCY)
324 "transparent," 334 "transparent,"
325 "tint," 335 "tint,"
326#endif 336#endif
327#if HAVE_AFTERIMAGE 337#if HAVE_PIXBUF
328 "afterimage," 338 "pixbuf,"
329#endif 339#endif
330#if defined(USE_XIM) 340#if defined(USE_XIM)
331 "XIM," 341 "XIM,"
332#endif 342#endif
333#if defined(NO_BACKSPACE_KEY) 343#if defined(NO_BACKSPACE_KEY)
… …
373#if defined(XTERM_SCROLLBAR) 383#if defined(XTERM_SCROLLBAR)
374 "+xterm" 384 "+xterm"
375#endif 385#endif
376 "\nUsage: "; /* Usage */ 386 "\nUsage: "; /* Usage */
377 387
378#define INDENT 18 388#define INDENT 28
379 389
380const char rxvt_term::resval_undef [] = "<undef>"; 390const char rxvt_term::resval_undef [] = "<undef>";
381const char rxvt_term::resval_on [] = "on"; 391const char rxvt_term::resval_on [] = "on";
382const char rxvt_term::resval_off [] = "off"; 392const char rxvt_term::resval_off [] = "off";
383 393
384/*{{{ usage: */ 394/*{{{ usage: */
385/*----------------------------------------------------------------------*/ 395/*----------------------------------------------------------------------*/
386static void 396void
387rxvt_usage (int type) 397rxvt_term::rxvt_usage (int type)
388{ 398{
389 unsigned int i, col; 399 unsigned int i, col;
390 400
391 rxvt_log ("%s%s%s", releasestring, optionsstring, RESNAME); 401 rxvt_log ("%s%s%s", releasestring, optionsstring, RESNAME);
392 402
393 switch (type) 403 switch (type)
394 { 404 {
395 case 0: /* brief listing */ 405 case 0: /* brief listing */
396 rxvt_log (" [-help] [--help]\n"); 406 rxvt_log (" [-help] [--help]\n");
397 407
398 for (col = 1, i = 0; i < optList_size; i++) 408 for (col = 1, i = 0; i < ecb_array_length (optList); i++)
399 if (optList[i].desc != NULL) 409 if (optList[i].desc != NULL)
400 { 410 {
401 int len = 0; 411 int len = 0;
402 412
403 if (optList[i].arg) 413 if (optList[i].arg)
404 len = strlen (optList[i].arg) + 1; 414 len = strlen (optList[i].arg) + 1;
405#ifdef DEBUG_STRICT 415
406 assert (optList[i].opt != NULL); 416 assert (optList[i].opt != NULL);
407#endif
408 len += 4 + strlen (optList[i].opt) + (optList_isBool (i) ? 2: 0); 417 len += 4 + strlen (optList[i].opt) + (optList_isBool (i) ? 2 : 0);
409 col += len; 418 col += len;
419
410 if (col > 79) 420 if (col > 79)
411 { 421 {
412 /* assume regular width */ 422 /* assume regular width */
413 rxvt_log ("\n"); 423 rxvt_log ("\n");
414 col = 1 + len; 424 col = 1 + len;
415 } 425 }
416 426
417 rxvt_log (" [-%s%s", (optList_isBool (i) ? "/+" : ""), optList[i].opt); 427 rxvt_log (" [-%s%s", (optList_isBool (i) ? "/+" : ""), optList[i].opt);
428
418 if (optList[i].arg) 429 if (optList[i].arg)
419 rxvt_log (" %s]", optList[i].arg); 430 rxvt_log (" %s]", optList[i].arg);
420 else 431 else
421 rxvt_log ("]"); 432 rxvt_log ("]");
422 } 433 }
423 break; 434 break;
424 435
425 case 1: /* full command-line listing */ 436 case 1: /* full command-line listing */
426 rxvt_log (" [options] [-e command args]\n\nwhere options include:\n"); 437 rxvt_log (" [options] [-e command args]\n\nwhere options include:\n");
427 438
428 for (i = 0; i < optList_size; i++) 439 for (i = 0; i < ecb_array_length (optList); i++)
429 if (optList[i].desc != NULL) 440 if (optList[i].desc != NULL)
430 { 441 {
431#ifdef DEBUG_STRICT
432 assert (optList[i].opt != NULL); 442 assert (optList[i].opt != NULL);
433#endif
434 rxvt_log (" %s%s %-*s%s%s\n", 443 rxvt_log (" %s%s %-*s%s%s\n",
435 (optList_isBool (i) ? "-/+" : "-"), optList[i].opt, 444 (optList_isBool (i) ? "-/+" : "-"), optList[i].opt,
436 (INDENT - strlen (optList[i].opt) 445 (INDENT - strlen (optList[i].opt)
437 + (optList_isBool (i) ? 0 : 2)), 446 + (optList_isBool (i) ? 0 : 2)),
438 (optList[i].arg ? optList[i].arg : ""), 447 (optList[i].arg ? optList[i].arg : ""),
439 (optList_isBool (i) ? "turn on/off " : ""), 448 (optList_isBool (i) ? "turn on/off " : ""),
440 optList[i].desc); 449 optList[i].desc);
441 } 450 }
451
452#if ENABLE_PERL
453 rxvt_perl.init (this);
454 rxvt_perl.usage (this, 1);
455#endif
456
442 rxvt_log ("\n --help to list long-options"); 457 rxvt_log ("\n --help to list long-options");
443 break; 458 break;
444 459
445 case 2: /* full resource listing */ 460 case 2: /* full resource listing */
446 rxvt_log (" [options] [-e command args]\n\n" 461 rxvt_log (" [options] [-e command args]\n\n"
447 "where resources (long-options) include:\n"); 462 "where resources (long-options) include:\n");
448 463
449 for (i = 0; i < optList_size; i++) 464 for (i = 0; i < ecb_array_length (optList); i++)
450 if (optList[i].kw != NULL) 465 if (optList[i].kw != NULL)
451 rxvt_log (" %s: %*s%s\n", 466 rxvt_log (" %s: %*s%s\n",
452 optList[i].kw, 467 optList[i].kw,
453 (INDENT - strlen (optList[i].kw)), "", /* XXX */ 468 (INDENT + 2 - strlen (optList[i].kw)), "", /* XXX */
454 (optList_isBool (i) ? "boolean" : optList[i].arg)); 469 (optList_isBool (i) ? "boolean" : optList[i].arg));
455#ifdef KEYSYM_RESOURCE 470
456 rxvt_log (" " "keysym.sym" ": %*s%s\n", 471#if ENABLE_PERL
457 (INDENT - sizeof ("keysym.sym") + 1), "", /* XXX */ 472 rxvt_perl.init (this);
458 "keysym"); 473 rxvt_perl.usage (this, 2);
459#endif 474#endif
475
460 rxvt_log ("\n -help to list options"); 476 rxvt_log ("\n -help to list options");
461 break; 477 break;
462 } 478 }
463 479
464 rxvt_log ("\n\n"); 480 rxvt_log ("\n\n");
465 rxvt_exit_failure (); 481 rxvt_exit_failure ();
466 /* NOTREACHED */
467} 482}
468 483
469/*}}} */ 484/*}}} */
470 485
471/*{{{ get command-line options before getting resources */ 486/*{{{ get command-line options before getting resources */
472void 487const char **
473rxvt_term::get_options (int argc, const char *const *argv) 488rxvt_term::get_options (int argc, const char *const *argv)
474{ 489{
475 int i, bad_option = 0; 490 int i, bad_option = 0;
476 491
477 for (i = 1; i < argc; i++) 492 for (i = 1; i < argc; i++)
… …
508 523
509 if (!strcmp (opt, "h")) 524 if (!strcmp (opt, "h"))
510 rxvt_usage (0); 525 rxvt_usage (0);
511 526
512 /* feature: always try to match long-options */ 527 /* feature: always try to match long-options */
513 for (entry = 0; entry < optList_size; entry++) 528 for (entry = 0; entry < ecb_array_length (optList); entry++)
514 if ((optList[entry].kw && !strcmp (opt, optList[entry].kw)) 529 if ((optList[entry].kw && !strcmp (opt, optList[entry].kw))
515 || (!longopt 530 || (!longopt
516 && optList[entry].opt && !strcmp (opt, optList[entry].opt))) 531 && optList[entry].opt && !strcmp (opt, optList[entry].opt)))
517 break; 532 break;
518 533
519 if (entry < optList_size) 534 if (entry < ecb_array_length (optList)
535 && !optList_isInfo (entry))
520 { 536 {
521 if (optList_isReverse (entry)) 537 if (optList_isReverse (entry))
522 flag = !flag; 538 flag = !flag;
523 539
524 if (optList_isString (entry)) 540 if (optList_isString (entry))
525 { 541 {
526 /* 542 /*
527 * special cases are handled in main.c:main () to allow 543 * special cases are handled in init_resources () to allow
528 * X resources to set these values before we settle for 544 * X resources to set these values before we settle for
529 * default values 545 * default values
530 */ 546 */
531 547
532 if (optList[entry].doff != -1) 548 if (optList[entry].doff != -1)
533 { 549 {
534 if (flag && i+1 == argc) 550 if (flag && i + 1 == argc)
535 rxvt_fatal ("option '%s' requires an argument, aborting.\n", argv [i]); 551 rxvt_fatal ("option '%s' requires an argument, aborting.\n", argv [i]);
536 552
537 rs[optList[entry].doff] = flag ? argv[++i] : resval_undef; 553 rs[optList[entry].doff] = flag ? argv[++i] : resval_undef;
538 } 554 }
539 } 555 }
… …
547 } 563 }
548 } 564 }
549#ifndef NO_RESOURCES 565#ifndef NO_RESOURCES
550 else if (!strcmp (opt, "xrm")) 566 else if (!strcmp (opt, "xrm"))
551 { 567 {
552 if (i+1 < argc) 568 if (i + 1 < argc)
553 XrmPutLineResource (&option_db, argv[++i]); 569 XrmPutLineResource (&option_db, argv[++i]);
554 } 570 }
555#endif 571#endif
556#ifdef KEYSYM_RESOURCE 572#ifdef KEYSYM_RESOURCE
557 else if (!strncmp (opt, "keysym.", sizeof ("keysym.") - 1)) 573 else if (!strncmp (opt, "keysym.", sizeof ("keysym.") - 1))
558 { 574 {
559 if (i+1 < argc) 575 if (i + 1 < argc)
560 { 576 {
561 char *res = (char *)malloc (strlen (opt) + strlen (argv[++i]) + 6); 577 char *res = rxvt_temp_buf<char> (strlen (opt) + strlen (argv[++i]) + 6);
562 sprintf (res, "*.%s: %s\n", opt, argv[i]); 578 sprintf (res, "*.%s: %s\n", opt, argv[i]);
563 XrmPutLineResource (&option_db, res); 579 XrmPutLineResource (&option_db, res);
564 free (res);
565 } 580 }
566 } 581 }
567#endif 582#endif
583 else if (!strcmp (opt, "e"))
584 {
585 if (i + 1 < argc)
586 return (const char **)argv + i + 1;
587
588 rxvt_warn ("option '-e' requires an argument, aborting.\n");
589 bad_option = 1;
590 }
568 else 591 else
569 { 592 {
593#if ENABLE_PERL
594 rxvt_perl.init (this);
595
596 if (int flags = rxvt_perl.parse_resource (this, opt, true, longopt, flag, argv [i + 1]))
597 {
598 if (flags & rxvt_perl.RESOURCE_ARG)
599 {
600 if (i + 1 == argc)
601 {
602 rxvt_warn ("option '%s' requires an argument.\n", argv [i]);
570 bad_option = 1; 603 bad_option = 1;
604 }
605 else
606 ++i;
607 }
608 }
609 else
610#endif
611 {
571 rxvt_warn ("\"%s\": unknown or malformed option.\n", opt); 612 rxvt_warn ("\"%s\": unknown or malformed option.\n", opt);
613 bad_option = 1;
614 }
572 } 615 }
573 } 616 }
574 617
575 if (bad_option) 618 if (bad_option)
576 rxvt_usage (0); 619 rxvt_usage (0);
620
621 return 0;
577} 622}
578 623
579/*}}} */ 624/*}}} */
580 625
581#ifndef NO_RESOURCES
582/*----------------------------------------------------------------------*/ 626/*----------------------------------------------------------------------*/
583 627
584# ifdef KEYSYM_RESOURCE 628#ifdef KEYSYM_RESOURCE
585/* 629static void
586 * Define key from XrmEnumerateDatabase. 630rxvt_define_key (rxvt_term *term, const char *k, const char *v)
587 * quarks will be something like
588 * "rxvt" "keysym" "0xFF01"
589 * value will be a string
590 */
591/* ARGSUSED */
592int
593rxvt_define_key (XrmDatabase *database UNUSED,
594 XrmBindingList bindings UNUSED,
595 XrmQuarkList quarks,
596 XrmRepresentation *type UNUSED,
597 XrmValue *value,
598 XPointer closure UNUSED)
599{ 631{
600 int last; 632 term->bind_action (k, v);
601
602 for (last = 0; quarks[last] != NULLQUARK; last++) /* look for last quark in list */
603 ;
604
605 last--;
606 GET_R->parse_keysym (XrmQuarkToString (quarks[last]), (char *)value->addr);//D//TODO
607 return False;
608} 633}
609 634
610/* 635/*
611 * look for something like this (XK_Delete) 636 * look for something like this (XK_Delete)
612 * rxvt*keysym.0xFFFF: "\177" 637 * rxvt*keysym.0xFFFF: "\177"
… …
646 { "4", 1, Mod4Mask }, 671 { "4", 1, Mod4Mask },
647 { "5", 1, Mod5Mask }, 672 { "5", 1, Mod5Mask },
648}; 673};
649 674
650int 675int
651rxvt_term::parse_keysym (const char *str, const char *arg) 676rxvt_term::parse_keysym (const char *str, unsigned int &state)
652{ 677{
653 int sym; 678 int sym;
654 unsigned int state = 0;
655 const char *key = strrchr (str, '-'); 679 const char *key = strrchr (str, '-');
680
681 state = 0;
656 682
657 if (!key) 683 if (!key)
658 key = str; 684 key = str;
659 else 685 else
660 key++; 686 key++;
661 687
662 // string or key is empty 688 // string or key is empty
663 if (*arg == '\0' || *key == '\0') 689 if (*key == '\0')
664 return -1; 690 return -1;
665 691
666 // parse modifiers 692 // parse modifiers
667 while (str < key) 693 while (str < key)
668 { 694 {
669 unsigned int i; 695 unsigned int i;
670 696
671 for (i=0; i < sizeof (keysym_vocabulary) / sizeof (keysym_vocabulary_t); ++i) 697 for (i = 0; i < ecb_array_length (keysym_vocabulary); ++i)
672 { 698 {
673 if (strncmp (str, keysym_vocabulary [i].name, keysym_vocabulary [i].len) == 0) 699 if (strncmp (str, keysym_vocabulary [i].name, keysym_vocabulary [i].len) == 0)
674 { 700 {
675 state |= keysym_vocabulary[i].value; 701 state |= keysym_vocabulary[i].value;
676 str += keysym_vocabulary[i].len; 702 str += keysym_vocabulary[i].len;
677 break; 703 break;
678 } 704 }
679 } 705 }
680 706
681 if (i >= sizeof (keysym_vocabulary) / sizeof (keysym_vocabulary_t)) 707 if (i >= ecb_array_length (keysym_vocabulary))
682 return -1; 708 return -1;
683 709
684 if (*str == '-') 710 if (*str == '-')
685 ++str; 711 ++str;
686 } 712 }
… …
691 // fallback on hexadecimal parsing 717 // fallback on hexadecimal parsing
692 char *end; 718 char *end;
693 sym = strtol (str, &end, 16); 719 sym = strtol (str, &end, 16);
694 if (*end) 720 if (*end)
695 return -1; 721 return -1;
696 } 722 }
697 723
724 return sym;
725}
726
727int
728rxvt_term::bind_action (const char *str, const char *arg)
729{
730 int sym;
731 unsigned int state;
732
733 if (*arg == '\0' || (sym = parse_keysym (str, state)) == -1)
734 return -1;
735
736 wchar_t *ws = rxvt_mbstowcs (arg);
737 if (!HOOK_INVOKE ((this, HOOK_REGISTER_COMMAND, DT_INT, sym, DT_INT, state, DT_WCS_LEN, ws, wcslen (ws), DT_END)))
698 keyboard->register_user_translation (sym, state, arg); 738 keyboard->register_action (sym, state, ws);
739
740 free (ws);
699 return 1; 741 return 1;
700} 742}
701 743
702# endif /* KEYSYM_RESOURCE */ 744#endif /* KEYSYM_RESOURCE */
703#endif /* NO_RESOURCES */
704 745
705static char * 746static char *
706get_res (XrmDatabase database, const char *program, const char *option) 747get_res (XrmDatabase database, const char *program, const char *option)
707{ 748{
708 char resource[512]; 749 char resource[512];
… …
746 XrmMergeDatabases (option_db, &database); 787 XrmMergeDatabases (option_db, &database);
747 option_db = NULL; 788 option_db = NULL;
748 /* 789 /*
749 * Query resources for options that affect us 790 * Query resources for options that affect us
750 */ 791 */
751 for (int entry = 0; entry < optList_size; entry++) 792 for (int entry = 0; entry < ecb_array_length (optList); entry++)
752 { 793 {
753 int s; 794 int s;
754 const char *kw = optList[entry].kw; 795 const char *kw = optList[entry].kw;
755 796
756 if (kw == NULL || rs[optList[entry].doff] != NULL) 797 if (kw == NULL || rs[optList[entry].doff] != NULL)
… …
776 817
777 set_option (optList[entry].index, s); 818 set_option (optList[entry].index, s);
778 } 819 }
779 } 820 }
780 } 821 }
822#endif /* NO_RESOURCES */
823}
781 824
825struct rxvt_enumerate_closure
826{
827 rxvt_term *term;
828 void (*cb)(rxvt_term *, const char *, const char *);
829 int specific; // iterate over only a specific subhierarchy
830};
831
832/*
833 * Define key from XrmEnumerateDatabase.
834 * quarks will be something like
835 * "rxvt" "keysym" "0xFF01"
836 * value will be a string
837 */
838static int
839rxvt_enumerate_helper (
840 XrmDatabase *database ecb_unused,
841 XrmBindingList bindings ecb_unused,
842 XrmQuarkList quarks,
843 XrmRepresentation *type ecb_unused,
844 XrmValue *value,
845 XPointer closure
846)
847{
848 const rxvt_enumerate_closure *data = (const rxvt_enumerate_closure *)closure;
849
850 if (*quarks == NULLQUARK) return False;
851
852 // if the quark list starts with a tightly bound quark, we skip it,
853 // as it exactly matched the prefix. Otherwise, it matched because
854 // it started with "*", in which case we assume the prefix is part
855 // of the "*".
856 if (*bindings == XrmBindTightly)
857 {
858 ++quarks, ++bindings; // skip if this is a fixed prefix, rather than a *-match
859 if (*quarks == NULLQUARK) return False;
860 }
861
862 // specific, a bit misleadingly named, is used when a specific "subclass"
863 // is iterated over, e.g. "keysym", and is used to skip one more
864 // component, as well as all generic prefixes
865 // this is a bit of a hack, ideally, keysym (the only user) should use its
866 // own iteration function, but this ought to be less bloated
867 if (data->specific)
868 {
869 ++quarks, ++bindings;
870 if (*quarks == NULLQUARK) return False;
871 }
872
873 char *pattern;
874 if (quarks[1] == NULLQUARK)
875 pattern = XrmQuarkToString (quarks[0]); // single component, fast path
876 else
877 {
878 // multiple components, slow path - should be rare, don't optimize for speed
879 int size = 0;
880
881 for (int i = 0; quarks[i] != NULLQUARK; ++i)
882 size += strlen (XrmQuarkToString (quarks[i])) + 1;
883
884 pattern = rxvt_temp_buf<char> (size + 1);
885
886 // now print all components
887 {
888 char *cur = pattern;
889
890 for (int i = 0; quarks[i] != NULLQUARK; ++i)
891 cur += sprintf (cur, ".%s", XrmQuarkToString (quarks[i]));
892 }
893
894 ++pattern; // skip initial dot
895 }
896
897 data->cb (data->term, pattern, (char *)value->addr);
898
899 return False;
900}
901
902void
903rxvt_term::enumerate_resources (void (*cb)(rxvt_term *, const char *, const char *), const char *name_p, const char *class_p)
904{
782 /* 905 /*
783 * [R5 or later]: enumerate the resource database 906 * [R5 or later]: enumerate the resource database
784 */ 907 */
908 assert (!name_p == !class_p); // both must be specified, or missing
909
785# ifdef KEYSYM_RESOURCE 910#ifdef KEYSYM_RESOURCE
911 rxvt_enumerate_closure closure = { this, cb, name_p ? 1 : 0 };
912
913 XrmDatabase database = XrmGetDatabase (dpy);
786 XrmName name_prefix[3]; 914 XrmName name_prefix[3];
787 XrmClass class_prefix[3]; 915 XrmClass class_prefix[3];
788 916
789 name_prefix[0] = XrmStringToName (rs[Rs_name]); 917 name_prefix[1] = name_p ? XrmStringToName (name_p) : NULLQUARK;
790 name_prefix[1] = XrmStringToName ("keysym");
791 name_prefix[2] = NULLQUARK; 918 name_prefix[2] = NULLQUARK;
792 class_prefix[0] = XrmStringToName (RESCLASS); 919 class_prefix[1] = class_p ? XrmStringToName (class_p) : NULLQUARK;
793 class_prefix[1] = XrmStringToName ("Keysym");
794 class_prefix[2] = NULLQUARK; 920 class_prefix[2] = NULLQUARK;
795 /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */ 921
922# ifdef RESFALLBACK
923 name_prefix[0] = class_prefix[0] = XrmStringToName (RESFALLBACK);
796 XrmEnumerateDatabase (database, name_prefix, class_prefix, 924 XrmEnumerateDatabase (database, name_prefix, class_prefix,
797 XrmEnumOneLevel, rxvt_define_key, NULL); 925 XrmEnumAllLevels, rxvt_enumerate_helper, (XPointer)&closure);
798# ifdef RESFALLBACK 926# endif
799 name_prefix[0] = XrmStringToName (RESFALLBACK); 927
800 name_prefix[1] = XrmStringToName ("keysym");
801 class_prefix[0] = XrmStringToName (RESFALLBACK); 928 name_prefix[0] = class_prefix[0] = XrmStringToName (RESCLASS);
802 class_prefix[1] = XrmStringToName ("Keysym");
803 /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */
804 XrmEnumerateDatabase (database, name_prefix, class_prefix, 929 XrmEnumerateDatabase (database, name_prefix, class_prefix,
805 XrmEnumOneLevel, rxvt_define_key, NULL); 930 XrmEnumAllLevels, rxvt_enumerate_helper, (XPointer)&closure);
806# endif 931
932 name_prefix[0] = class_prefix[0] = XrmStringToName (rs[Rs_name]);
933 XrmEnumerateDatabase (database, name_prefix, class_prefix,
934 XrmEnumAllLevels, rxvt_enumerate_helper, (XPointer)&closure);
807# endif 935#endif
936}
808 937
809#endif /* NO_RESOURCES */ 938void
939rxvt_term::extract_keysym_resources ()
940{
941#ifdef KEYSYM_RESOURCE
942 enumerate_keysym_resources (rxvt_define_key);
943#endif
810} 944}
811 945
812/*----------------------- end-of-file (C source) -----------------------*/ 946/*----------------------- end-of-file (C source) -----------------------*/
947

Diff Legend

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