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.133 by ayin, Sat Jan 26 14:24:43 2008 UTC vs.
Revision 1.184 by sf-exg, Mon Oct 13 17:05:32 2014 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 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 */
… …
91 STRG (Rs_geometry, NULL, "g", NULL, NULL), /* short form */ 95 STRG (Rs_geometry, NULL, "g", NULL, NULL), /* short form */
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 */
100 STRG (Rs_chdir, "chdir", "cd", "string", "start shell in this directory"),
101 SWCH ("dockapp", Opt_dockapp, 0, "start as dockapp"),
96 BOOL (Rs_reverseVideo, "reverseVideo", "rv", Opt_reverseVideo, 0, "reverse video"), 102 BOOL (Rs_reverseVideo, "reverseVideo", "rv", Opt_reverseVideo, 0, "reverse video"),
97 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"),
98 BOOL (Rs_jumpScroll, "jumpScroll", "j", Opt_jumpScroll, 0, "jump scrolling"), 105 BOOL (Rs_jumpScroll, "jumpScroll", "j", Opt_jumpScroll, 0, "jump scrolling"),
99 BOOL (Rs_skipScroll, "skipScroll", "ss", Opt_skipScroll, 0, "skip scrolling"), 106 BOOL (Rs_skipScroll, "skipScroll", "ss", Opt_skipScroll, 0, "skip scrolling"),
100 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"),
101#if HAVE_SCROLLBARS
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"),
104 BOOL (Rs_scrollBar_right, "scrollBar_right", "sr", Opt_scrollBar_right, 0, "scrollbar right"), 110 BOOL (Rs_scrollBar_right, "scrollBar_right", "sr", Opt_scrollBar_right, 0, "scrollbar right"),
105 BOOL (Rs_scrollBar_floating, "scrollBar_floating", "st", Opt_scrollBar_floating, 0, "scrollbar without a trough"), 111 BOOL (Rs_scrollBar_floating, "scrollBar_floating", "st", Opt_scrollBar_floating, 0, "scrollbar without a trough"),
106 RSTRG (Rs_scrollBar_align, "scrollBar_align", "mode"), 112 RSTRG (Rs_scrollBar_align, "scrollBar_align", "mode"),
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#endif
109 BOOL (Rs_scrollTtyOutput, "scrollTtyOutput", NULL, Opt_scrollTtyOutput, 0, NULL), 114 BOOL (Rs_scrollTtyOutput, "scrollTtyOutput", NULL, Opt_scrollTtyOutput, 0, NULL),
110 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"),
111 BOOL (Rs_scrollTtyKeypress, "scrollTtyKeypress", "sk", Opt_scrollTtyKeypress, 0, "scroll-on-keypress"), 116 BOOL (Rs_scrollTtyKeypress, "scrollTtyKeypress", "sk", Opt_scrollTtyKeypress, 0, "scroll-on-keypress"),
112 BOOL (Rs_scrollWithBuffer, "scrollWithBuffer", "sw", Opt_scrollWithBuffer, 0, "scroll-with-buffer"), 117 BOOL (Rs_scrollWithBuffer, "scrollWithBuffer", "sw", Opt_scrollWithBuffer, 0, "scroll-with-buffer"),
113#if ENABLE_TRANSPARENCY 118#if BG_IMAGE_FROM_ROOT
114 BOOL (Rs_transparent, "inheritPixmap", "ip", Opt_transparent, 0, "inherit parent pixmap"), 119 BOOL (Rs_transparent, "inheritPixmap", "ip", Opt_transparent, 0, "inherit parent pixmap"),
115 BOOL (Rs_transparent, "transparent", "tr", Opt_transparent, 0, "inherit parent pixmap"), 120 BOOL (Rs_transparent, "transparent", "tr", Opt_transparent, 0, "inherit parent pixmap"),
116 STRG (Rs_color + Color_tint, "tintColor", "tint", "color", "tint color"), 121 STRG (Rs_color + Color_tint, "tintColor", "tint", "color", "tint color"),
117 STRG (Rs_shade, "shading", "sh", "number", "shade background by number %."), 122 STRG (Rs_shade, "shading", "sh", "number", "shade background by number %."),
123 STRG (Rs_blurradius, "blurRadius", "blr", "HxV", "gaussian blur radii to apply to the root background"),
118#endif 124#endif
119#if OFF_FOCUS_FADING 125#if OFF_FOCUS_FADING
120 STRG (Rs_fade, "fading", "fade", "number", "fade colors by number % when losing focus"), 126 STRG (Rs_fade, "fading", "fade", "number", "fade colors by number % when losing focus"),
121 STRG (Rs_color + Color_fade, "fadeColor", "fadecolor", "color", "target color for off-focus fading"), 127 STRG (Rs_color + Color_fade, "fadeColor", "fadecolor", "color", "target color for off-focus fading"),
122#endif 128#endif
… …
172 RSTRG (Rs_color + Color_RV, "colorRV", "color"), 178 RSTRG (Rs_color + Color_RV, "colorRV", "color"),
173#endif /* ! NO_BOLD_UNDERLINE_REVERSE */ 179#endif /* ! NO_BOLD_UNDERLINE_REVERSE */
174#if ENABLE_FRILLS 180#if ENABLE_FRILLS
175 RSTRG (Rs_color + Color_underline, "underlineColor", "color"), 181 RSTRG (Rs_color + Color_underline, "underlineColor", "color"),
176#endif 182#endif
177#ifdef KEEP_SCROLLCOLOR
178 RSTRG (Rs_color + Color_scroll, "scrollColor", "color"), 183 RSTRG (Rs_color + Color_scroll, "scrollColor", "color"),
184#ifdef RXVT_SCROLLBAR
179 RSTRG (Rs_color + Color_trough, "troughColor", "color"), 185 RSTRG (Rs_color + Color_trough, "troughColor", "color"),
180#endif /* KEEP_SCROLLCOLOR */ 186#endif
181#ifdef OPTION_HC 187#ifdef OPTION_HC
182 STRG (Rs_color + Color_HC, "highlightColor", "hc", "color", "highlight color"), 188 STRG (Rs_color + Color_HC, "highlightColor", "hc", "color", "highlight color"),
189 RSTRG (Rs_color + Color_HTC, "highlightTextColor", "color"),
183#endif 190#endif
184#ifndef NO_CURSORCOLOR 191#ifndef NO_CURSORCOLOR
185 STRG (Rs_color + Color_cursor, "cursorColor", "cr", "color", "cursor color"), 192 STRG (Rs_color + Color_cursor, "cursorColor", "cr", "color", "cursor color"),
186 /* command-line option = resource name */ 193 /* command-line option = resource name */
187 RSTRG (Rs_color + Color_cursor2, "cursorColor2", "color"), 194 RSTRG (Rs_color + Color_cursor2, "cursorColor2", "color"),
188#endif /* NO_CURSORCOLOR */ 195#endif /* NO_CURSORCOLOR */
189 STRG (Rs_color + Color_pointer_fg, "pointerColor", "pr", "color", "pointer color"), 196 STRG (Rs_color + Color_pointer_fg, "pointerColor", "pr", "color", "pointer color"),
190 STRG (Rs_color + Color_pointer_bg, "pointerColor2", "pr2", "color", "pointer bg color"), 197 STRG (Rs_color + Color_pointer_bg, "pointerColor2", "pr2", "color", "pointer bg color"),
191 STRG (Rs_color + Color_border, "borderColor", "bd", "color", "border color"), 198 STRG (Rs_color + Color_border, "borderColor", "bd", "color", "border color"),
192#ifdef BG_IMAGE_FROM_FILE 199#if BG_IMAGE_FROM_FILE
193 RSTRG (Rs_path, "path", "search path"), 200 RSTRG (Rs_path, "path", "search path"),
194 STRG (Rs_backgroundPixmap, "backgroundPixmap", "pixmap", "file[;geom]", "background pixmap"), 201 STRG (Rs_backgroundPixmap, "backgroundPixmap", "pixmap", "file[;geom]", "background pixmap"),
202#endif
203#if ENABLE_EWMH
204 STRG (Rs_iconfile, "iconFile", "icon", "file", "path to application icon image"),
195#endif 205#endif
196 /* fonts: command-line option = resource name */ 206 /* fonts: command-line option = resource name */
197 STRG (Rs_font, "font", "fn", "fontname", "normal text font"), 207 STRG (Rs_font, "font", "fn", "fontname", "normal text font"),
198#if ENABLE_STYLES 208#if ENABLE_STYLES
199 STRG (Rs_boldFont, "boldFont", "fb", "fontname", "bold font"), 209 STRG (Rs_boldFont, "boldFont", "fb", "fontname", "bold font"),
200 STRG (Rs_italicFont, "italicFont", "fi", "fontname", "italic font"), 210 STRG (Rs_italicFont, "italicFont", "fi", "fontname", "italic font"),
201 STRG (Rs_boldItalicFont, "boldItalicFont", "fbi", "fontname", "bold italic font"), 211 STRG (Rs_boldItalicFont, "boldItalicFont", "fbi", "fontname", "bold italic font"),
202 BOOL (Rs_intensityStyles, "intensityStyles", "is", Opt_intensityStyles, 0, "font styles imply intensity changes"), 212 BOOL (Rs_intensityStyles, "intensityStyles", "is", Opt_intensityStyles, 0, "font styles imply intensity changes"),
203#endif 213#endif
204#ifdef USE_XIM 214#if USE_XIM
205 STRG (Rs_inputMethod, "inputMethod", "im", "name", "name of input method"), 215 STRG (Rs_inputMethod, "inputMethod", "im", "name", "name of input method"),
206 STRG (Rs_preeditType, "preeditType", "pt", "style", "input style: style = OverTheSpot|OffTheSpot|Root"), 216 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"), 217 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"), 218 STRG (Rs_imFont, "imFont", "imfont", "fontname", "fontset for styles OverTheSpot and OffTheSpot"),
209#endif /* USE_XIM */ 219#endif /* USE_XIM */
… …
214 STRG (Rs_saveLines, "saveLines", "sl", "number", "number of scrolled lines to save"), 224 STRG (Rs_saveLines, "saveLines", "sl", "number", "number of scrolled lines to save"),
215#if ENABLE_XEMBED 225#if ENABLE_XEMBED
216 STRG (Rs_embed, NULL, "embed", "windowid", "window id to embed terminal in"), 226 STRG (Rs_embed, NULL, "embed", "windowid", "window id to embed terminal in"),
217#endif 227#endif
218#if XFT 228#if XFT
229 BOOL (Rs_buffered, "buffered", NULL, Opt_buffered, 0, NULL),
230#endif
231#if ENABLE_FRILLS
219 STRG (Rs_depth, "depth", "depth", "number", "depth of visual to request"), 232 STRG (Rs_depth, "depth", "depth", "number", "depth of visual to request"),
220 BOOL (Rs_buffered, "buffered", NULL, Opt_buffered, 0, NULL), 233 STRG (Rs_visual, "visual", "visual", "number", "visual id to request"),
221#endif
222#if ENABLE_FRILLS
223 RSTRG (Rs_transient_for, "transient-for", "windowid"), 234 RSTRG (Rs_transient_for, "transient-for", "windowid"),
224 BOOL (Rs_override_redirect, "override-redirect", "override-redirect", Opt_override_redirect, 0, "set override-redirect on the terminal window"), 235 BOOL (Rs_override_redirect, "override-redirect", "override-redirect", Opt_override_redirect, 0, "set override-redirect on the terminal window"),
225 STRG (Rs_pty_fd, NULL, "pty-fd", "fileno", "file descriptor of pty to use"), 236 STRG (Rs_pty_fd, NULL, "pty-fd", "fileno", "file descriptor of pty to use"),
226 BOOL (Rs_hold, "hold", "hold", Opt_hold, 0, "retain window after shell exit"), 237 BOOL (Rs_hold, "hold", "hold", Opt_hold, 0, "retain window after shell exit"),
227 STRG (Rs_ext_bwidth, "externalBorder", "w", "number", "external border in pixels"), 238 STRG (Rs_ext_bwidth, "externalBorder", "w", "number", "external border in pixels"),
228 STRG (Rs_ext_bwidth, NULL, "bw", NULL, NULL), 239 STRG (Rs_ext_bwidth, NULL, "bw", NULL, NULL),
229 STRG (Rs_ext_bwidth, NULL, "borderwidth", NULL, NULL), 240 STRG (Rs_ext_bwidth, NULL, "borderwidth", NULL, NULL),
230 STRG (Rs_int_bwidth, "internalBorder", "b", "number", "internal border in pixels"), 241 STRG (Rs_int_bwidth, "internalBorder", "b", "number", "internal border in pixels"),
231 BOOL (Rs_borderLess, "borderLess", "bl", Opt_borderLess, 0, "borderless window"), 242 BOOL (Rs_borderLess, "borderLess", "bl", Opt_borderLess, 0, "borderless window"),
232 STRG (Rs_lineSpace, "lineSpace", "lsp", "number", "number of extra pixels between rows"), 243 STRG (Rs_lineSpace, "lineSpace", "lsp", "number", "number of extra pixels between rows"),
244 STRG (Rs_letterSpace, "letterSpace", "letsp", "number", "letter spacing adjustment"),
233#endif 245#endif
234#ifdef BUILTIN_GLYPHS 246#ifdef BUILTIN_GLYPHS
235 BOOL (Rs_skipBuiltinGlyphs, "skipBuiltinGlyphs", "sbg", Opt_skipBuiltinGlyphs, 0, "do not use internal glyphs"), 247 BOOL (Rs_skipBuiltinGlyphs, "skipBuiltinGlyphs", "sbg", Opt_skipBuiltinGlyphs, 0, "do not use internal glyphs"),
236#endif 248#endif
237#ifdef POINTER_BLANK 249#ifdef POINTER_BLANK
… …
245#endif 257#endif
246#ifdef PRINTPIPE 258#ifdef PRINTPIPE
247 RSTRG (Rs_print_pipe, "print-pipe", "string"), 259 RSTRG (Rs_print_pipe, "print-pipe", "string"),
248#endif 260#endif
249 STRG (Rs_modifier, "modifier", "mod", "modifier", "meta modifier = alt|meta|hyper|super|mod1|...|mod5"), 261 STRG (Rs_modifier, "modifier", "mod", "modifier", "meta modifier = alt|meta|hyper|super|mod1|...|mod5"),
250#ifdef CUTCHAR_RESOURCE
251 RSTRG (Rs_cutchars, "cutchars", "string"), 262 RSTRG (Rs_cutchars, "cutchars", "string"),
252#endif /* CUTCHAR_RESOURCE */
253 RSTRG (Rs_answerbackstring, "answerbackString", "string"), 263 RSTRG (Rs_answerbackstring, "answerbackString", "string"),
254#ifndef NO_SECONDARY_SCREEN 264#ifndef NO_SECONDARY_SCREEN
255 BOOL (Rs_secondaryScreen, "secondaryScreen", "ssc", Opt_secondaryScreen, 0, "enable secondary screen"), 265 BOOL (Rs_secondaryScreen, "secondaryScreen", "ssc", Opt_secondaryScreen, 0, "enable secondary screen"),
256 BOOL (Rs_secondaryScroll, "secondaryScroll", "ssr", Opt_secondaryScroll, 0, "enable secondary screen scroll"), 266 BOOL (Rs_secondaryScroll, "secondaryScroll", "ssr", Opt_secondaryScroll, 0, "enable secondary screen scroll"),
257#endif 267#endif
… …
260 RSTRG (Rs_perl_eval, "perl-eval", "perl-eval"), // "string", "code to be evaluated after all extensions have been loaded"),TODO 270 RSTRG (Rs_perl_eval, "perl-eval", "perl-eval"), // "string", "code to be evaluated after all extensions have been loaded"),TODO
261 RSTRG (Rs_perl_ext_1, "perl-ext-common", "string"), //, "colon-separated list of perl extensions to enable"),TODO 271 RSTRG (Rs_perl_ext_1, "perl-ext-common", "string"), //, "colon-separated list of perl extensions to enable"),TODO
262 STRG (Rs_perl_ext_2, "perl-ext", "pe", "string", "colon-separated list of perl extensions to enable for this instance"), 272 STRG (Rs_perl_ext_2, "perl-ext", "pe", "string", "colon-separated list of perl extensions to enable for this instance"),
263#endif 273#endif
264#if ISO_14755 274#if ISO_14755
275 BOOL (Rs_iso14755, "iso14755", NULL, Opt_iso14755, 0, NULL),
265 BOOL (Rs_iso14755_52, "iso14755_52", NULL, Opt_iso14755_52, 0, NULL), 276 BOOL (Rs_iso14755_52, "iso14755_52", NULL, Opt_iso14755_52, 0, NULL),
266#endif 277#endif
267#ifdef HAVE_AFTERIMAGE 278#ifndef NO_RESOURCES
268 STRG (Rs_blendtype, "blendType", "blt", "string", "background image blending type - alpha, tint, etc..."), 279 RINFO ("xrm", "string"),
269 STRG (Rs_blurradius, "blurRadius", "blr", "HxV", "Gaussian Blur radii to apply to the root background"), 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
… …
322#endif 336#endif
323#if defined(ENABLE_TRANSPARENCY) 337#if defined(ENABLE_TRANSPARENCY)
324 "transparent," 338 "transparent,"
325 "tint," 339 "tint,"
326#endif 340#endif
327#if HAVE_AFTERIMAGE 341#if HAVE_PIXBUF
328 "afterimage," 342 "pixbuf,"
329#endif 343#endif
330#if defined(USE_XIM) 344#if defined(USE_XIM)
331 "XIM," 345 "XIM,"
332#endif 346#endif
333#if defined(NO_BACKSPACE_KEY) 347#if defined(NO_BACKSPACE_KEY)
… …
361 "pointerBlank," 375 "pointerBlank,"
362#endif 376#endif
363#if defined(NO_RESOURCES) 377#if defined(NO_RESOURCES)
364 "NoResources," 378 "NoResources,"
365#endif 379#endif
366 "scrollbars=" 380 "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) 381#if defined(RXVT_SCROLLBAR)
377 "rxvt" 382 "+rxvt"
378# if defined(NEXT_SCROLLBAR) || defined(XTERM_SCROLLBAR)
379 "+"
380# endif
381# endif 383#endif
382# if defined(NEXT_SCROLLBAR) 384#if defined(NEXT_SCROLLBAR)
383 "NeXT" 385 "+NeXT"
384# if defined(XTERM_SCROLLBAR)
385 "+"
386# endif
387# endif 386#endif
388# if defined(XTERM_SCROLLBAR) 387#if defined(XTERM_SCROLLBAR)
389 "xterm" 388 "+xterm"
390# endif
391#endif 389#endif
392 "\nUsage: "; /* Usage */ 390 "\nUsage: "; /* Usage */
393 391
394#define INDENT 18 392#define INDENT 28
395 393
396const char rxvt_term::resval_undef [] = "<undef>"; 394const char rxvt_term::resval_undef [] = "<undef>";
397const char rxvt_term::resval_on [] = "on"; 395const char rxvt_term::resval_on [] = "on";
398const char rxvt_term::resval_off [] = "off"; 396const char rxvt_term::resval_off [] = "off";
399 397
400/*{{{ usage: */ 398/*{{{ usage: */
401/*----------------------------------------------------------------------*/ 399/*----------------------------------------------------------------------*/
402static void 400void
403rxvt_usage (int type) 401rxvt_term::rxvt_usage (int type)
404{ 402{
405 unsigned int i, col; 403 unsigned int i, col;
406 404
407 rxvt_log ("%s%s%s", releasestring, optionsstring, RESNAME); 405 rxvt_log ("%s%s%s", releasestring, optionsstring, RESNAME);
408 406
409 switch (type) 407 switch (type)
410 { 408 {
411 case 0: /* brief listing */ 409 case 0: /* brief listing */
412 rxvt_log (" [-help] [--help]\n"); 410 rxvt_log (" [-help] [--help]\n");
413 411
414 for (col = 1, i = 0; i < optList_size; i++) 412 for (col = 1, i = 0; i < ecb_array_length (optList); i++)
415 if (optList[i].desc != NULL) 413 if (optList[i].desc != NULL)
416 { 414 {
417 int len = 0; 415 int len = 0;
418 416
419 if (optList[i].arg) 417 if (optList[i].arg)
420 len = strlen (optList[i].arg) + 1; 418 len = strlen (optList[i].arg) + 1;
421#ifdef DEBUG_STRICT 419
422 assert (optList[i].opt != NULL); 420 assert (optList[i].opt != NULL);
423#endif
424 len += 4 + strlen (optList[i].opt) + (optList_isBool (i) ? 2: 0); 421 len += 4 + strlen (optList[i].opt) + (optList_isBool (i) ? 2 : 0);
425 col += len; 422 col += len;
423
426 if (col > 79) 424 if (col > 79)
427 { 425 {
428 /* assume regular width */ 426 /* assume regular width */
429 rxvt_log ("\n"); 427 rxvt_log ("\n");
430 col = 1 + len; 428 col = 1 + len;
431 } 429 }
432 430
433 rxvt_log (" [-%s%s", (optList_isBool (i) ? "/+" : ""), optList[i].opt); 431 rxvt_log (" [-%s%s", (optList_isBool (i) ? "/+" : ""), optList[i].opt);
432
434 if (optList[i].arg) 433 if (optList[i].arg)
435 rxvt_log (" %s]", optList[i].arg); 434 rxvt_log (" %s]", optList[i].arg);
436 else 435 else
437 rxvt_log ("]"); 436 rxvt_log ("]");
438 } 437 }
439 break; 438 break;
440 439
441 case 1: /* full command-line listing */ 440 case 1: /* full command-line listing */
442 rxvt_log (" [options] [-e command args]\n\nwhere options include:\n"); 441 rxvt_log (" [options] [-e command args]\n\nwhere options include:\n");
443 442
444 for (i = 0; i < optList_size; i++) 443 for (i = 0; i < ecb_array_length (optList); i++)
445 if (optList[i].desc != NULL) 444 if (optList[i].desc != NULL)
446 { 445 {
447#ifdef DEBUG_STRICT
448 assert (optList[i].opt != NULL); 446 assert (optList[i].opt != NULL);
449#endif
450 rxvt_log (" %s%s %-*s%s%s\n", 447 rxvt_log (" %s%s %-*s%s%s\n",
451 (optList_isBool (i) ? "-/+" : "-"), optList[i].opt, 448 (optList_isBool (i) ? "-/+" : "-"), optList[i].opt,
452 (INDENT - strlen (optList[i].opt) 449 (INDENT - strlen (optList[i].opt)
453 + (optList_isBool (i) ? 0 : 2)), 450 + (optList_isBool (i) ? 0 : 2)),
454 (optList[i].arg ? optList[i].arg : ""), 451 (optList[i].arg ? optList[i].arg : ""),
455 (optList_isBool (i) ? "turn on/off " : ""), 452 (optList_isBool (i) ? "turn on/off " : ""),
456 optList[i].desc); 453 optList[i].desc);
457 } 454 }
455
456#if ENABLE_PERL
457 rxvt_perl.init (this);
458 rxvt_perl.usage (this, 1);
459#endif
460
458 rxvt_log ("\n --help to list long-options"); 461 rxvt_log ("\n --help to list long-options");
459 break; 462 break;
460 463
461 case 2: /* full resource listing */ 464 case 2: /* full resource listing */
462 rxvt_log (" [options] [-e command args]\n\n" 465 rxvt_log (" [options] [-e command args]\n\n"
463 "where resources (long-options) include:\n"); 466 "where resources (long-options) include:\n");
464 467
465 for (i = 0; i < optList_size; i++) 468 for (i = 0; i < ecb_array_length (optList); i++)
466 if (optList[i].kw != NULL) 469 if (optList[i].kw != NULL)
467 rxvt_log (" %s: %*s%s\n", 470 rxvt_log (" %s: %*s%s\n",
468 optList[i].kw, 471 optList[i].kw,
469 (INDENT - strlen (optList[i].kw)), "", /* XXX */ 472 (INDENT + 2 - strlen (optList[i].kw)), "", /* XXX */
470 (optList_isBool (i) ? "boolean" : optList[i].arg)); 473 (optList_isBool (i) ? "boolean" : optList[i].arg));
471#ifdef KEYSYM_RESOURCE 474
472 rxvt_log (" " "keysym.sym" ": %*s%s\n", 475#if ENABLE_PERL
473 (INDENT - sizeof ("keysym.sym") + 1), "", /* XXX */ 476 rxvt_perl.init (this);
474 "keysym"); 477 rxvt_perl.usage (this, 2);
475#endif 478#endif
479
476 rxvt_log ("\n -help to list options"); 480 rxvt_log ("\n -help to list options");
477 break; 481 break;
478 } 482 }
479 483
480 rxvt_log ("\n\n"); 484 rxvt_log ("\n\n");
481 rxvt_exit_failure (); 485 rxvt_exit_failure ();
482 /* NOTREACHED */
483} 486}
484 487
485/*}}} */ 488/*}}} */
486 489
487/*{{{ get command-line options before getting resources */ 490/*{{{ get command-line options before getting resources */
488void 491const char **
489rxvt_term::get_options (int argc, const char *const *argv) 492rxvt_term::get_options (int argc, const char *const *argv)
490{ 493{
491 int i, bad_option = 0; 494 int i, bad_option = 0;
492 495
493 for (i = 1; i < argc; i++) 496 for (i = 1; i < argc; i++)
… …
524 527
525 if (!strcmp (opt, "h")) 528 if (!strcmp (opt, "h"))
526 rxvt_usage (0); 529 rxvt_usage (0);
527 530
528 /* feature: always try to match long-options */ 531 /* feature: always try to match long-options */
529 for (entry = 0; entry < optList_size; entry++) 532 for (entry = 0; entry < ecb_array_length (optList); entry++)
530 if ((optList[entry].kw && !strcmp (opt, optList[entry].kw)) 533 if ((optList[entry].kw && !strcmp (opt, optList[entry].kw))
531 || (!longopt 534 || (!longopt
532 && optList[entry].opt && !strcmp (opt, optList[entry].opt))) 535 && optList[entry].opt && !strcmp (opt, optList[entry].opt)))
533 break; 536 break;
534 537
535 if (entry < optList_size) 538 if (entry < ecb_array_length (optList)
539 && !optList_isInfo (entry))
536 { 540 {
537 if (optList_isReverse (entry)) 541 if (optList_isReverse (entry))
538 flag = !flag; 542 flag = !flag;
539 543
540 if (optList_isString (entry)) 544 if (optList_isString (entry))
541 { 545 {
542 /* 546 /*
543 * special cases are handled in main.c:main () to allow 547 * special cases are handled in init_resources () to allow
544 * X resources to set these values before we settle for 548 * X resources to set these values before we settle for
545 * default values 549 * default values
546 */ 550 */
547 551
548 if (optList[entry].doff != -1) 552 if (optList[entry].doff != -1)
549 { 553 {
550 if (flag && i+1 == argc) 554 if (flag && i + 1 == argc)
551 rxvt_fatal ("option '%s' requires an argument, aborting.\n", argv [i]); 555 rxvt_fatal ("option '%s' requires an argument, aborting.\n", argv [i]);
552 556
553 rs[optList[entry].doff] = flag ? argv[++i] : resval_undef; 557 rs[optList[entry].doff] = flag ? argv[++i] : resval_undef;
554 } 558 }
555 } 559 }
… …
563 } 567 }
564 } 568 }
565#ifndef NO_RESOURCES 569#ifndef NO_RESOURCES
566 else if (!strcmp (opt, "xrm")) 570 else if (!strcmp (opt, "xrm"))
567 { 571 {
568 if (i+1 < argc) 572 if (i + 1 < argc)
569 XrmPutLineResource (&option_db, argv[++i]); 573 XrmPutLineResource (&option_db, argv[++i]);
570 } 574 }
571#endif 575#endif
572#ifdef KEYSYM_RESOURCE 576#ifdef KEYSYM_RESOURCE
573 else if (!strncmp (opt, "keysym.", sizeof ("keysym.") - 1)) 577 else if (!strncmp (opt, "keysym.", sizeof ("keysym.") - 1))
574 { 578 {
575 if (i+1 < argc) 579 if (i + 1 < argc)
576 { 580 {
577 char *res = (char *)malloc (strlen (opt) + strlen (argv[++i]) + 6); 581 char *res = rxvt_temp_buf<char> (strlen (opt) + strlen (argv[++i]) + 6);
578 sprintf (res, "*.%s: %s\n", opt, argv[i]); 582 sprintf (res, "*.%s: %s\n", opt, argv[i]);
579 XrmPutLineResource (&option_db, res); 583 XrmPutLineResource (&option_db, res);
580 free (res);
581 } 584 }
582 } 585 }
583#endif 586#endif
587 else if (!strcmp (opt, "e"))
588 {
589 if (i + 1 < argc)
590 return (const char **)argv + i + 1;
591
592 rxvt_warn ("option '-e' requires an argument, aborting.\n");
593 bad_option = 1;
594 }
584 else 595 else
585 { 596 {
597#if ENABLE_PERL
598 rxvt_perl.init (this);
599
600 if (int flags = rxvt_perl.parse_resource (this, opt, true, longopt, flag, argv [i + 1]))
601 {
602 if (flags & rxvt_perl.RESOURCE_ARG)
603 {
604 if (i + 1 == argc)
605 {
606 rxvt_warn ("option '%s' requires an argument.\n", argv [i]);
586 bad_option = 1; 607 bad_option = 1;
608 }
609 else
610 ++i;
611 }
612 }
613 else
614#endif
615 {
587 rxvt_warn ("\"%s\": unknown or malformed option.\n", opt); 616 rxvt_warn ("\"%s\": unknown or malformed option.\n", opt);
617 bad_option = 1;
618 }
588 } 619 }
589 } 620 }
590 621
591 if (bad_option) 622 if (bad_option)
592 rxvt_usage (0); 623 rxvt_usage (0);
624
625 return 0;
593} 626}
594 627
595/*}}} */ 628/*}}} */
596 629
597#ifndef NO_RESOURCES 630#ifndef NO_RESOURCES
598/*----------------------------------------------------------------------*/ 631/*----------------------------------------------------------------------*/
599 632
600# ifdef KEYSYM_RESOURCE 633# ifdef KEYSYM_RESOURCE
634static void
635rxvt_define_key (rxvt_term *term, const char *k, const char *v)
636{
637 term->bind_action (k, v);
638}
639
601/* 640/*
602 * Define key from XrmEnumerateDatabase. 641 * Define key from XrmEnumerateDatabase.
603 * quarks will be something like 642 * quarks will be something like
604 * "rxvt" "keysym" "0xFF01" 643 * "rxvt" "keysym" "0xFF01"
605 * value will be a string 644 * value will be a string
606 */ 645 */
607/* ARGSUSED */ 646static int
608int 647rxvt_keysym_enumerate_helper (
609rxvt_define_key (XrmDatabase *database UNUSED, 648 XrmDatabase *database ecb_unused,
610 XrmBindingList bindings UNUSED, 649 XrmBindingList bindings ecb_unused,
611 XrmQuarkList quarks, 650 XrmQuarkList quarks,
612 XrmRepresentation *type UNUSED, 651 XrmRepresentation *type ecb_unused,
613 XrmValue *value, 652 XrmValue *value,
614 XPointer closure UNUSED) 653 XPointer closure
654)
615{ 655{
616 int last; 656 int last;
617 657
618 for (last = 0; quarks[last] != NULLQUARK; last++) /* look for last quark in list */ 658 for (last = 0; quarks[last] != NULLQUARK; last++) /* look for last quark in list */
619 ; 659 ;
620 660
621 last--; 661 rxvt_term *term = (rxvt_term *)(((void **)closure)[0]);
622 GET_R->parse_keysym (XrmQuarkToString (quarks[last]), (char *)value->addr);//D//TODO 662 void (*cb)(rxvt_term *, const char *, const char *)
663 = (void (*)(rxvt_term *, const char *, const char *))
664 (((void **)closure)[1]);
665
666 cb (term, XrmQuarkToString (quarks[last - 1]), (char *)value->addr);
667
623 return False; 668 return False;
624} 669}
625 670
626/* 671/*
627 * look for something like this (XK_Delete) 672 * look for something like this (XK_Delete)
… …
662 { "4", 1, Mod4Mask }, 707 { "4", 1, Mod4Mask },
663 { "5", 1, Mod5Mask }, 708 { "5", 1, Mod5Mask },
664}; 709};
665 710
666int 711int
667rxvt_term::parse_keysym (const char *str, const char *arg) 712rxvt_term::parse_keysym (const char *str, unsigned int &state)
668{ 713{
669 int sym; 714 int sym;
670 unsigned int state = 0;
671 const char *key = strrchr (str, '-'); 715 const char *key = strrchr (str, '-');
716
717 state = 0;
672 718
673 if (!key) 719 if (!key)
674 key = str; 720 key = str;
675 else 721 else
676 key++; 722 key++;
677 723
678 // string or key is empty 724 // string or key is empty
679 if (*arg == '\0' || *key == '\0') 725 if (*key == '\0')
680 return -1; 726 return -1;
681 727
682 // parse modifiers 728 // parse modifiers
683 while (str < key) 729 while (str < key)
684 { 730 {
685 unsigned int i; 731 unsigned int i;
686 732
687 for (i=0; i < sizeof (keysym_vocabulary) / sizeof (keysym_vocabulary_t); ++i) 733 for (i = 0; i < ecb_array_length (keysym_vocabulary); ++i)
688 { 734 {
689 if (strncmp (str, keysym_vocabulary [i].name, keysym_vocabulary [i].len) == 0) 735 if (strncmp (str, keysym_vocabulary [i].name, keysym_vocabulary [i].len) == 0)
690 { 736 {
691 state |= keysym_vocabulary[i].value; 737 state |= keysym_vocabulary[i].value;
692 str += keysym_vocabulary[i].len; 738 str += keysym_vocabulary[i].len;
693 break; 739 break;
694 } 740 }
695 } 741 }
696 742
697 if (i >= sizeof (keysym_vocabulary) / sizeof (keysym_vocabulary_t)) 743 if (i >= ecb_array_length (keysym_vocabulary))
698 return -1; 744 return -1;
699 745
700 if (*str == '-') 746 if (*str == '-')
701 ++str; 747 ++str;
702 } 748 }
… …
707 // fallback on hexadecimal parsing 753 // fallback on hexadecimal parsing
708 char *end; 754 char *end;
709 sym = strtol (str, &end, 16); 755 sym = strtol (str, &end, 16);
710 if (*end) 756 if (*end)
711 return -1; 757 return -1;
712 } 758 }
713 759
760 return sym;
761}
762
763int
764rxvt_term::bind_action (const char *str, const char *arg)
765{
766 int sym;
767 unsigned int state;
768
769 if (*arg == '\0' || (sym = parse_keysym (str, state)) == -1)
770 return -1;
771
772 wchar_t *ws = rxvt_mbstowcs (arg);
773 if (!HOOK_INVOKE ((this, HOOK_REGISTER_COMMAND, DT_INT, sym, DT_INT, state, DT_WCS_LEN, ws, wcslen (ws), DT_END)))
714 keyboard->register_user_translation (sym, state, arg); 774 keyboard->register_action (sym, state, ws);
775
776 free (ws);
715 return 1; 777 return 1;
716} 778}
717 779
718# endif /* KEYSYM_RESOURCE */ 780# endif /* KEYSYM_RESOURCE */
719#endif /* NO_RESOURCES */ 781#endif /* NO_RESOURCES */
… …
762 XrmMergeDatabases (option_db, &database); 824 XrmMergeDatabases (option_db, &database);
763 option_db = NULL; 825 option_db = NULL;
764 /* 826 /*
765 * Query resources for options that affect us 827 * Query resources for options that affect us
766 */ 828 */
767 for (int entry = 0; entry < optList_size; entry++) 829 for (int entry = 0; entry < ecb_array_length (optList); entry++)
768 { 830 {
769 int s; 831 int s;
770 const char *kw = optList[entry].kw; 832 const char *kw = optList[entry].kw;
771 833
772 if (kw == NULL || rs[optList[entry].doff] != NULL) 834 if (kw == NULL || rs[optList[entry].doff] != NULL)
… …
792 854
793 set_option (optList[entry].index, s); 855 set_option (optList[entry].index, s);
794 } 856 }
795 } 857 }
796 } 858 }
859#endif /* NO_RESOURCES */
860}
797 861
862void
863rxvt_term::enumerate_keysym_resources (void (*cb)(rxvt_term *, const char *, const char *))
864{
865#ifndef NO_RESOURCES
798 /* 866 /*
799 * [R5 or later]: enumerate the resource database 867 * [R5 or later]: enumerate the resource database
800 */ 868 */
801# ifdef KEYSYM_RESOURCE 869# ifdef KEYSYM_RESOURCE
870 void *closure[2] = {
871 (void *)this,
872 (void *)cb,
873 };
874
875 XrmDatabase database = XrmGetDatabase (dpy);
802 XrmName name_prefix[3]; 876 XrmName name_prefix[3];
803 XrmClass class_prefix[3]; 877 XrmClass class_prefix[3];
804 878
805 name_prefix[0] = XrmStringToName (rs[Rs_name]); 879 name_prefix[0] = XrmStringToName (rs[Rs_name]);
806 name_prefix[1] = XrmStringToName ("keysym"); 880 name_prefix[1] = XrmStringToName ("keysym");
… …
808 class_prefix[0] = XrmStringToName (RESCLASS); 882 class_prefix[0] = XrmStringToName (RESCLASS);
809 class_prefix[1] = XrmStringToName ("Keysym"); 883 class_prefix[1] = XrmStringToName ("Keysym");
810 class_prefix[2] = NULLQUARK; 884 class_prefix[2] = NULLQUARK;
811 /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */ 885 /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */
812 XrmEnumerateDatabase (database, name_prefix, class_prefix, 886 XrmEnumerateDatabase (database, name_prefix, class_prefix,
813 XrmEnumOneLevel, rxvt_define_key, NULL); 887 XrmEnumOneLevel, rxvt_keysym_enumerate_helper, (XPointer)closure);
814# ifdef RESFALLBACK 888# ifdef RESFALLBACK
815 name_prefix[0] = XrmStringToName (RESFALLBACK);
816 name_prefix[1] = XrmStringToName ("keysym");
817 class_prefix[0] = XrmStringToName (RESFALLBACK); 889 name_prefix[0] = class_prefix[0] = XrmStringToName (RESFALLBACK);
818 class_prefix[1] = XrmStringToName ("Keysym");
819 /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */ 890 /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */
820 XrmEnumerateDatabase (database, name_prefix, class_prefix, 891 XrmEnumerateDatabase (database, name_prefix, class_prefix,
821 XrmEnumOneLevel, rxvt_define_key, NULL); 892 XrmEnumOneLevel, rxvt_keysym_enumerate_helper, (XPointer)closure);
822# endif 893# endif
823# endif 894# endif
824 895
825#endif /* NO_RESOURCES */ 896#endif /* NO_RESOURCES */
826} 897}
827 898
899void
900rxvt_term::extract_keysym_resources ()
901{
902 enumerate_keysym_resources (rxvt_define_key);
903}
904
828/*----------------------- end-of-file (C source) -----------------------*/ 905/*----------------------- end-of-file (C source) -----------------------*/
906

Diff Legend

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