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.103 by sasha, Fri Jun 8 20:40:07 2007 UTC vs.
Revision 1.146 by sf-exg, Thu Sep 2 15:48:11 2010 UTC

… …
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 <pcg@goof.com>
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.
… …
32#endif 33#endif
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
38#define Optflag_Switch 4
37 39
38/* monolithic option/resource structure: */ 40/* monolithic option/resource structure: */
39/* 41/*
40 * `string' options MUST have a usage argument 42 * `string' options MUST have a usage argument
41 * `switch' and `boolean' options have no argument 43 * `switch' and `boolean' options have no argument
… …
58#define BOOL(rsp, kw, opt, option, flag, desc) \ 60#define BOOL(rsp, kw, opt, option, flag, desc) \
59 { (option), (Optflag_Boolean | (flag)), (rsp), (kw), (opt), NULL, (desc)} 61 { (option), (Optflag_Boolean | (flag)), (rsp), (kw), (opt), NULL, (desc)}
60 62
61/* SWCH () - `-' flag */ 63/* SWCH () - `-' flag */
62#define SWCH(opt, option, flag, desc) \ 64#define SWCH(opt, option, flag, desc) \
63 { (option), (Optflag_Boolean | (flag)), -1, NULL, (opt), NULL, (desc)} 65 { (option), (Optflag_Switch | (flag)), -1, NULL, (opt), NULL, (desc)}
64 66
65/* convenient macros */ 67/* convenient macros */
66#define optList_strlen(i) \ 68#define optList_isString(i) \
67 (optList[i].flag ? 0 : (optList[i].arg ? strlen (optList[i].arg) : 1)) 69 (optList[i].flag == 0)
68#define optList_isBool(i) \ 70#define optList_isBool(i) \
69 (optList[i].flag & Optflag_Boolean) 71 (optList[i].flag & Optflag_Boolean)
70#define optList_isReverse(i) \ 72#define optList_isReverse(i) \
71 (optList[i].flag & Optflag_Reverse) 73 (optList[i].flag & Optflag_Reverse)
72#define optList_size \ 74#define optList_size \
… …
89 STRG (Rs_geometry, NULL, "g", NULL, NULL), /* short form */ 91 STRG (Rs_geometry, NULL, "g", NULL, NULL), /* short form */
90 STRG (Rs_geometry, "geometry", "geometry", "geometry", "size (in characters) and position"), 92 STRG (Rs_geometry, "geometry", "geometry", "geometry", "size (in characters) and position"),
91 SWCH ("C", Opt_console, 0, "intercept console messages"), 93 SWCH ("C", Opt_console, 0, "intercept console messages"),
92 SWCH ("iconic", Opt_iconic, 0, "start iconic"), 94 SWCH ("iconic", Opt_iconic, 0, "start iconic"),
93 SWCH ("ic", Opt_iconic, 0, NULL), /* short form */ 95 SWCH ("ic", Opt_iconic, 0, NULL), /* short form */
96 STRG (Rs_chdir, "chdir", "cd", "string", "start shell in this directory"),
94 BOOL (Rs_reverseVideo, "reverseVideo", "rv", Opt_reverseVideo, 0, "reverse video"), 97 BOOL (Rs_reverseVideo, "reverseVideo", "rv", Opt_reverseVideo, 0, "reverse video"),
95 BOOL (Rs_loginShell, "loginShell", "ls", Opt_loginShell, 0, "login shell"), 98 BOOL (Rs_loginShell, "loginShell", "ls", Opt_loginShell, 0, "login shell"),
96 BOOL (Rs_jumpScroll, "jumpScroll", "j", Opt_jumpScroll, 0, "jump scrolling"), 99 BOOL (Rs_jumpScroll, "jumpScroll", "j", Opt_jumpScroll, 0, "jump scrolling"),
100 BOOL (Rs_skipScroll, "skipScroll", "ss", Opt_skipScroll, 0, "skip scrolling"),
97 BOOL (Rs_pastableTabs, "pastableTabs", "ptab", Opt_pastableTabs, 0, "tab characters are pastable"), 101 BOOL (Rs_pastableTabs, "pastableTabs", "ptab", Opt_pastableTabs, 0, "tab characters are pastable"),
98#if HAVE_SCROLLBARS
99 RSTRG (Rs_scrollstyle, "scrollstyle", "mode"), 102 RSTRG (Rs_scrollstyle, "scrollstyle", "mode"),
100 BOOL (Rs_scrollBar, "scrollBar", "sb", Opt_scrollBar, 0, "scrollbar"), 103 BOOL (Rs_scrollBar, "scrollBar", "sb", Opt_scrollBar, 0, "scrollbar"),
101 BOOL (Rs_scrollBar_right, "scrollBar_right", "sr", Opt_scrollBar_right, 0, "scrollbar right"), 104 BOOL (Rs_scrollBar_right, "scrollBar_right", "sr", Opt_scrollBar_right, 0, "scrollbar right"),
102 BOOL (Rs_scrollBar_floating, "scrollBar_floating", "st", Opt_scrollBar_floating, 0, "scrollbar without a trough"), 105 BOOL (Rs_scrollBar_floating, "scrollBar_floating", "st", Opt_scrollBar_floating, 0, "scrollbar without a trough"),
103 RSTRG (Rs_scrollBar_align, "scrollBar_align", "mode"), 106 RSTRG (Rs_scrollBar_align, "scrollBar_align", "mode"),
104 STRG (Rs_scrollBar_thickness, "thickness", "sbt", "number", "scrollbar thickness/width in pixels"), 107 STRG (Rs_scrollBar_thickness, "thickness", "sbt", "number", "scrollbar thickness/width in pixels"),
105#endif
106 BOOL (Rs_scrollTtyOutput, "scrollTtyOutput", NULL, Opt_scrollTtyOutput, 0, NULL), 108 BOOL (Rs_scrollTtyOutput, "scrollTtyOutput", NULL, Opt_scrollTtyOutput, 0, NULL),
107 BOOL (Rs_scrollTtyOutput, NULL, "si", Opt_scrollTtyOutput, Optflag_Reverse, "scroll-on-tty-output inhibit"), 109 BOOL (Rs_scrollTtyOutput, NULL, "si", Opt_scrollTtyOutput, Optflag_Reverse, "scroll-on-tty-output inhibit"),
108 BOOL (Rs_scrollTtyKeypress, "scrollTtyKeypress", "sk", Opt_scrollTtyKeypress, 0, "scroll-on-keypress"), 110 BOOL (Rs_scrollTtyKeypress, "scrollTtyKeypress", "sk", Opt_scrollTtyKeypress, 0, "scroll-on-keypress"),
109 BOOL (Rs_scrollWithBuffer, "scrollWithBuffer", "sw", Opt_scrollWithBuffer, 0, "scroll-with-buffer"), 111 BOOL (Rs_scrollWithBuffer, "scrollWithBuffer", "sw", Opt_scrollWithBuffer, 0, "scroll-with-buffer"),
110#if TRANSPARENT 112#if ENABLE_TRANSPARENCY
111 BOOL (Rs_transparent, "inheritPixmap", "ip", Opt_transparent, 0, "inherit parent pixmap"), 113 BOOL (Rs_transparent, "inheritPixmap", "ip", Opt_transparent, 0, "inherit parent pixmap"),
112 SWCH ("tr", Opt_transparent, 0, NULL), 114 BOOL (Rs_transparent, "transparent", "tr", Opt_transparent, 0, "inherit parent pixmap"),
113# if TINTING
114 STRG (Rs_color + Color_tint, "tintColor", "tint", "color", "tint color"), 115 STRG (Rs_color + Color_tint, "tintColor", "tint", "color", "tint color"),
115# endif 116 STRG (Rs_shade, "shading", "sh", "number", "shade background by number %."),
116#endif 117#endif
117#if OFF_FOCUS_FADING 118#if OFF_FOCUS_FADING
118 STRG (Rs_fade, "fading", "fade", "%", "fade colors x% percent when rxvt-unicode is losing focus"), 119 STRG (Rs_fade, "fading", "fade", "number", "fade colors by number % when losing focus"),
119 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"),
120#endif
121#if TINTING
122 STRG (Rs_shade, "shading", "sh", "%", "shade background by x % when tinting."),
123#endif 121#endif
124 BOOL (Rs_utmpInhibit, "utmpInhibit", "ut", Opt_utmpInhibit, 0, "utmp inhibit"), 122 BOOL (Rs_utmpInhibit, "utmpInhibit", "ut", Opt_utmpInhibit, 0, "utmp inhibit"),
125#ifndef NO_BELL 123#ifndef NO_BELL
126# if ENABLE_FRILLS 124# if ENABLE_FRILLS
127 BOOL (Rs_urgentOnBell, "urgentOnBell", NULL, Opt_urgentOnBell, 0, NULL), 125 BOOL (Rs_urgentOnBell, "urgentOnBell", NULL, Opt_urgentOnBell, 0, NULL),
… …
169#ifndef NO_BOLD_UNDERLINE_REVERSE 167#ifndef NO_BOLD_UNDERLINE_REVERSE
170 RSTRG (Rs_color + Color_BD, "colorBD", "color"), 168 RSTRG (Rs_color + Color_BD, "colorBD", "color"),
171 RSTRG (Rs_color + Color_IT, "colorIT", "color"), 169 RSTRG (Rs_color + Color_IT, "colorIT", "color"),
172 RSTRG (Rs_color + Color_UL, "colorUL", "color"), 170 RSTRG (Rs_color + Color_UL, "colorUL", "color"),
173 RSTRG (Rs_color + Color_RV, "colorRV", "color"), 171 RSTRG (Rs_color + Color_RV, "colorRV", "color"),
174#endif /* ! NO_BOLD_UNDERLINE_REVERSE */ 172#endif /* ! NO_BOLD_UNDERLINE_REVERSE */
175#if ENABLE_FRILLS 173#if ENABLE_FRILLS
176 RSTRG (Rs_color + Color_underline, "underlineColor", "color"), 174 RSTRG (Rs_color + Color_underline, "underlineColor", "color"),
177#endif 175#endif
178#ifdef KEEP_SCROLLCOLOR
179 RSTRG (Rs_color + Color_scroll, "scrollColor", "color"), 176 RSTRG (Rs_color + Color_scroll, "scrollColor", "color"),
177#ifdef RXVT_SCROLLBAR
180 RSTRG (Rs_color + Color_trough, "troughColor", "color"), 178 RSTRG (Rs_color + Color_trough, "troughColor", "color"),
181#endif /* KEEP_SCROLLCOLOR */ 179#endif
182#ifdef OPTION_HC 180#ifdef OPTION_HC
183 STRG (Rs_color + Color_HC, "highlightColor", "hc", "color", "highlight color"), 181 STRG (Rs_color + Color_HC, "highlightColor", "hc", "color", "highlight color"),
182 RSTRG (Rs_color + Color_HTC, "highlightTextColor", "color"),
184#endif 183#endif
185#ifndef NO_CURSORCOLOR 184#ifndef NO_CURSORCOLOR
186 STRG (Rs_color + Color_cursor, "cursorColor", "cr", "color", "cursor color"), 185 STRG (Rs_color + Color_cursor, "cursorColor", "cr", "color", "cursor color"),
187 /* command-line option = resource name */ 186 /* command-line option = resource name */
188 RSTRG (Rs_color + Color_cursor2, "cursorColor2", "color"), 187 RSTRG (Rs_color + Color_cursor2, "cursorColor2", "color"),
189#endif /* NO_CURSORCOLOR */ 188#endif /* NO_CURSORCOLOR */
190 STRG (Rs_color + Color_pointer_fg, "pointerColor", "pr", "color", "pointer color"), 189 STRG (Rs_color + Color_pointer_fg, "pointerColor", "pr", "color", "pointer color"),
191 STRG (Rs_color + Color_pointer_bg, "pointerColor2", "pr2", "color", "pointer bg color"), 190 STRG (Rs_color + Color_pointer_bg, "pointerColor2", "pr2", "color", "pointer bg color"),
192 STRG (Rs_color + Color_border, "borderColor", "bd", "color", "border color"), 191 STRG (Rs_color + Color_border, "borderColor", "bd", "color", "border color"),
193#ifdef XPM_BACKGROUND 192#ifdef BG_IMAGE_FROM_FILE
194 RSTRG (Rs_path, "path", "search path"), 193 RSTRG (Rs_path, "path", "search path"),
195 STRG (Rs_backgroundPixmap, "backgroundPixmap", "pixmap", "file[;geom]", "background pixmap"), 194 STRG (Rs_backgroundPixmap, "backgroundPixmap", "pixmap", "file[;geom]", "background pixmap"),
195# if ENABLE_EWMH
196 STRG (Rs_iconfile, "iconFile", "icon", "file", "path to application icon image"),
197# endif
196#endif 198#endif
197 /* fonts: command-line option = resource name */ 199 /* fonts: command-line option = resource name */
198 STRG (Rs_font, "font", "fn", "fontname", "normal text font"), 200 STRG (Rs_font, "font", "fn", "fontname", "normal text font"),
199#if ENABLE_STYLES 201#if ENABLE_STYLES
200 STRG (Rs_boldFont, "boldFont", "fb", "fontname", "bold font"), 202 STRG (Rs_boldFont, "boldFont", "fb", "fontname", "bold font"),
… …
205#ifdef USE_XIM 207#ifdef USE_XIM
206 STRG (Rs_inputMethod, "inputMethod", "im", "name", "name of input method"), 208 STRG (Rs_inputMethod, "inputMethod", "im", "name", "name of input method"),
207 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"),
208 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"),
209 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"),
210#endif /* USE_XIM */ 212#endif /* USE_XIM */
211 STRG (Rs_name, NULL, "name", "string", "client instance, icon, and title strings"), 213 STRG (Rs_name, NULL, "name", "string", "client instance, icon, and title strings"),
212 STRG (Rs_title, "title", "title", "string", "title name for window"), 214 STRG (Rs_title, "title", "title", "string", "title name for window"),
213 STRG (Rs_title, NULL, "T", NULL, NULL), /* short form */ 215 STRG (Rs_title, NULL, "T", NULL, NULL), /* short form */
214 STRG (Rs_iconName, "iconName", "n", "string", "icon name for window"), 216 STRG (Rs_iconName, "iconName", "n", "string", "icon name for window"),
215 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"),
216#if ENABLE_XEMBED 218#if ENABLE_XEMBED
217 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"),
218#endif 220#endif
219#if XFT 221#if XFT
220 STRG (Rs_depth, "depth", "depth", "number", "depth of visual to request"), 222 STRG (Rs_depth, "depth", "depth", "number", "depth of visual to request"),
223 BOOL (Rs_buffered, "buffered", NULL, Opt_buffered, 0, NULL),
221#endif 224#endif
222#if ENABLE_FRILLS 225#if ENABLE_FRILLS
223 RSTRG (Rs_transient_for, "transient-for", "windowid"), 226 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"), 227 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"), 228 STRG (Rs_pty_fd, NULL, "pty-fd", "fileno", "file descriptor of pty to use"),
… …
227 STRG (Rs_ext_bwidth, "externalBorder", "w", "number", "external border in pixels"), 230 STRG (Rs_ext_bwidth, "externalBorder", "w", "number", "external border in pixels"),
228 STRG (Rs_ext_bwidth, NULL, "bw", NULL, NULL), 231 STRG (Rs_ext_bwidth, NULL, "bw", NULL, NULL),
229 STRG (Rs_ext_bwidth, NULL, "borderwidth", NULL, NULL), 232 STRG (Rs_ext_bwidth, NULL, "borderwidth", NULL, NULL),
230 STRG (Rs_int_bwidth, "internalBorder", "b", "number", "internal border in pixels"), 233 STRG (Rs_int_bwidth, "internalBorder", "b", "number", "internal border in pixels"),
231 BOOL (Rs_borderLess, "borderLess", "bl", Opt_borderLess, 0, "borderless window"), 234 BOOL (Rs_borderLess, "borderLess", "bl", Opt_borderLess, 0, "borderless window"),
235 STRG (Rs_lineSpace, "lineSpace", "lsp", "number", "number of extra pixels between rows"),
236 STRG (Rs_letterSpace, "letterSpace", "letsp", "number", "letter spacing adjustment"),
237#endif
238#ifdef BUILTIN_GLYPHS
232 BOOL (Rs_skipBuiltinGlyphs, "skipBuiltinGlyphs", "sbg", Opt_skipBuiltinGlyphs, 0, "do not use internal glyphs"), 239 BOOL (Rs_skipBuiltinGlyphs, "skipBuiltinGlyphs", "sbg", Opt_skipBuiltinGlyphs, 0, "do not use internal glyphs"),
233 STRG (Rs_lineSpace, "lineSpace", "lsp", "number", "number of extra pixels between rows"),
234#endif 240#endif
235#ifdef POINTER_BLANK 241#ifdef POINTER_BLANK
236 RSTRG (Rs_pointerBlankDelay, "pointerBlankDelay", "number"), 242 RSTRG (Rs_pointerBlankDelay, "pointerBlankDelay", "number"),
237#endif 243#endif
238#ifndef NO_BACKSPACE_KEY 244#ifndef NO_BACKSPACE_KEY
239 RSTRG (Rs_backspace_key, "backspacekey", "string"), 245 RSTRG (Rs_backspace_key, "backspacekey", "string"),
240#endif 246#endif
241#ifndef NO_DELETE_KEY 247#ifndef NO_DELETE_KEY
242 RSTRG (Rs_delete_key, "deletekey", "string"), 248 RSTRG (Rs_delete_key, "deletekey", "string"),
243#endif 249#endif
244 RSTRG (Rs_selectstyle, "selectstyle", "mode"),
245#ifdef PRINTPIPE 250#ifdef PRINTPIPE
246 RSTRG (Rs_print_pipe, "print-pipe", "string"), 251 RSTRG (Rs_print_pipe, "print-pipe", "string"),
247#endif 252#endif
248 STRG (Rs_modifier, "modifier", "mod", "modifier", "meta modifier = alt|meta|hyper|super|mod1|...|mod5"), 253 STRG (Rs_modifier, "modifier", "mod", "modifier", "meta modifier = alt|meta|hyper|super|mod1|...|mod5"),
249#ifdef CUTCHAR_RESOURCE
250 RSTRG (Rs_cutchars, "cutchars", "string"), 254 RSTRG (Rs_cutchars, "cutchars", "string"),
251#endif /* CUTCHAR_RESOURCE */
252 RSTRG (Rs_answerbackstring, "answerbackString", "string"), 255 RSTRG (Rs_answerbackstring, "answerbackString", "string"),
253#ifndef NO_SECONDARY_SCREEN 256#ifndef NO_SECONDARY_SCREEN
254 BOOL (Rs_secondaryScreen, "secondaryScreen", "ssc", Opt_secondaryScreen, 0, "enable secondary screen"), 257 BOOL (Rs_secondaryScreen, "secondaryScreen", "ssc", Opt_secondaryScreen, 0, "enable secondary screen"),
255 BOOL (Rs_secondaryScroll, "secondaryScroll", "ssr", Opt_secondaryScroll, 0, "enable secondary screen scroll"), 258 BOOL (Rs_secondaryScroll, "secondaryScroll", "ssr", Opt_secondaryScroll, 0, "enable secondary screen scroll"),
256#endif 259#endif
… …
258 RSTRG (Rs_perl_lib, "perl-lib", "string"), //, "colon-separated directories with extension scripts"),TODO 261 RSTRG (Rs_perl_lib, "perl-lib", "string"), //, "colon-separated directories with extension scripts"),TODO
259 RSTRG (Rs_perl_eval, "perl-eval", "perl-eval"), // "string", "code to be evaluated after all extensions have been loaded"),TODO 262 RSTRG (Rs_perl_eval, "perl-eval", "perl-eval"), // "string", "code to be evaluated after all extensions have been loaded"),TODO
260 RSTRG (Rs_perl_ext_1, "perl-ext-common", "string"), //, "colon-separated list of perl extensions to enable"),TODO 263 RSTRG (Rs_perl_ext_1, "perl-ext-common", "string"), //, "colon-separated list of perl extensions to enable"),TODO
261 STRG (Rs_perl_ext_2, "perl-ext", "pe", "string", "colon-separated list of perl extensions to enable for this instance"), 264 STRG (Rs_perl_ext_2, "perl-ext", "pe", "string", "colon-separated list of perl extensions to enable for this instance"),
262#endif 265#endif
263 266#if ISO_14755
267 BOOL (Rs_iso14755, "iso14755", NULL, Opt_iso14755, 0, NULL),
268 BOOL (Rs_iso14755_52, "iso14755_52", NULL, Opt_iso14755_52, 0, NULL),
269#endif
264#ifdef HAVE_AFTERIMAGE 270#ifdef HAVE_AFTERIMAGE
265 STRG (Rs_blendtype, "blendType", "blt", "string", "background image blending type - alpha, tint, etc..."), 271 STRG (Rs_blendtype, "blendType", "blt", "string", "background image blending type - alpha, tint, etc..."),
266 STRG (Rs_blurradius, "blurRadius", "blr", "number", "Gaussian Blur radius to apply to the root background"), 272 STRG (Rs_blurradius, "blurRadius", "blr", "HxV", "gaussian blur radii to apply to the root background"),
267#endif
268#ifndef NO_RESOURCES
269 INFO ("xrm", "string", "X resource"),
270#endif 273#endif
271 INFO ("e", "command arg ...", "command to execute") 274 INFO ("e", "command arg ...", "command to execute")
272 }; 275 };
273 276
274#undef INFO 277#undef INFO
… …
318#endif 321#endif
319 "," 322 ","
320#if OFF_FOCUS_FADING 323#if OFF_FOCUS_FADING
321 "fade," 324 "fade,"
322#endif 325#endif
323#if defined(XPM_BACKGROUND)
324 "XPM,"
325#endif
326#if defined(TRANSPARENT) 326#if defined(ENABLE_TRANSPARENCY)
327 "transparent," 327 "transparent,"
328#endif
329#if TINTING
330 "tint," 328 "tint,"
329#endif
330#if HAVE_AFTERIMAGE
331 "afterimage,"
331#endif 332#endif
332#if defined(USE_XIM) 333#if defined(USE_XIM)
333 "XIM," 334 "XIM,"
334#endif 335#endif
335#if defined(NO_BACKSPACE_KEY) 336#if defined(NO_BACKSPACE_KEY)
… …
363 "pointerBlank," 364 "pointerBlank,"
364#endif 365#endif
365#if defined(NO_RESOURCES) 366#if defined(NO_RESOURCES)
366 "NoResources," 367 "NoResources,"
367#endif 368#endif
368 "scrollbars=" 369 "scrollbars=plain"
369#if !defined(HAVE_SCROLLBARS)
370 "NONE"
371#else
372# if defined(PLAIN_SCROLLBAR)
373 "plain"
374# if defined(RXVT_SCROLLBAR) || defined(NEXT_SCROLLBAR) || defined(XTERM_SCROLLBAR)
375 "+"
376# endif
377# endif
378# if defined(RXVT_SCROLLBAR) 370#if defined(RXVT_SCROLLBAR)
379 "rxvt" 371 "+rxvt"
380# if defined(NEXT_SCROLLBAR) || defined(XTERM_SCROLLBAR)
381 "+"
382# endif
383# endif 372#endif
384# if defined(NEXT_SCROLLBAR) 373#if defined(NEXT_SCROLLBAR)
385 "NeXT" 374 "+NeXT"
386# if defined(XTERM_SCROLLBAR)
387 "+"
388# endif
389# endif 375#endif
390# if defined(XTERM_SCROLLBAR) 376#if defined(XTERM_SCROLLBAR)
391 "xterm" 377 "+xterm"
392# endif
393#endif 378#endif
394 "\nUsage: "; /* Usage */ 379 "\nUsage: "; /* Usage */
395 380
396#define INDENT 18 381#define INDENT 18
397 382
… …
416 for (col = 1, i = 0; i < optList_size; i++) 401 for (col = 1, i = 0; i < optList_size; i++)
417 if (optList[i].desc != NULL) 402 if (optList[i].desc != NULL)
418 { 403 {
419 int len = 0; 404 int len = 0;
420 405
421 if (!optList_isBool (i)) 406 if (optList[i].arg)
422 { 407 len = strlen (optList[i].arg) + 1;
423 len = optList_strlen (i);
424 if (len > 0)
425 len++; /* account for space */
426 }
427#ifdef DEBUG_STRICT
428 assert (optList[i].opt != NULL); 408 assert (optList[i].opt != NULL);
429#endif
430 len += 4 + strlen (optList[i].opt) + (optList_isBool (i) ? 2: 0); 409 len += 4 + strlen (optList[i].opt) + (optList_isBool (i) ? 2: 0);
431 col += len; 410 col += len;
432 if (col > 79) 411 if (col > 79)
412 {
433 { /* assume regular width */ 413 /* assume regular width */
434 rxvt_log ("\n"); 414 rxvt_log ("\n");
435 col = 1 + len; 415 col = 1 + len;
436 } 416 }
437 417
438 rxvt_log (" [-%s%s", (optList_isBool (i) ? "/+" : ""), optList[i].opt); 418 rxvt_log (" [-%s%s", (optList_isBool (i) ? "/+" : ""), optList[i].opt);
439 if (optList_strlen (i)) 419 if (optList[i].arg)
440 rxvt_log (" %s]", optList[i].arg); 420 rxvt_log (" %s]", optList[i].arg);
441 else 421 else
442 rxvt_log ("]"); 422 rxvt_log ("]");
443 } 423 }
444 break; 424 break;
… …
447 rxvt_log (" [options] [-e command args]\n\nwhere options include:\n"); 427 rxvt_log (" [options] [-e command args]\n\nwhere options include:\n");
448 428
449 for (i = 0; i < optList_size; i++) 429 for (i = 0; i < optList_size; i++)
450 if (optList[i].desc != NULL) 430 if (optList[i].desc != NULL)
451 { 431 {
452#ifdef DEBUG_STRICT
453 assert (optList[i].opt != NULL); 432 assert (optList[i].opt != NULL);
454#endif
455 rxvt_log (" %s%s %-*s%s%s\n", 433 rxvt_log (" %s%s %-*s%s%s\n",
456 (optList_isBool (i) ? "-/+" : "-"), optList[i].opt, 434 (optList_isBool (i) ? "-/+" : "-"), optList[i].opt,
457 (INDENT - strlen (optList[i].opt) 435 (INDENT - strlen (optList[i].opt)
458 + (optList_isBool (i) ? 0 : 2)), 436 + (optList_isBool (i) ? 0 : 2)),
459 (optList[i].arg ? optList[i].arg : ""), 437 (optList[i].arg ? optList[i].arg : ""),
… …
496 int i, bad_option = 0; 474 int i, bad_option = 0;
497 475
498 for (i = 1; i < argc; i++) 476 for (i = 1; i < argc; i++)
499 { 477 {
500 unsigned int entry, longopt = 0; 478 unsigned int entry, longopt = 0;
501 const char *flag, *opt; 479 const char *opt;
480 int flag;
502 481
503 opt = argv[i]; 482 opt = argv[i];
504 483
505 if (*opt == '-') 484 if (*opt == '-')
506 { 485 {
507 flag = resval_on; 486 flag = 1;
508 487
509 if (*++opt == '-') 488 if (*++opt == '-')
510 longopt = *opt++; /* long option */ 489 longopt = *opt++; /* long option */
511 } 490 }
512 else if (*opt == '+') 491 else if (*opt == '+')
513 { 492 {
514 flag = resval_off; 493 flag = 0;
515 494
516 if (*++opt == '+') 495 if (*++opt == '+')
517 longopt = *opt++; /* long option */ 496 longopt = *opt++; /* long option */
518 } 497 }
519 else 498 else
… …
537 break; 516 break;
538 517
539 if (entry < optList_size) 518 if (entry < optList_size)
540 { 519 {
541 if (optList_isReverse (entry)) 520 if (optList_isReverse (entry))
542 flag = flag == resval_on ? resval_off : resval_on; 521 flag = !flag;
543fprintf( stderr, "entry = %d, opt = [%s], flag = 0x%X, resval_on = %d\n", entry, opt, *flag, *resval_on );
544 522
545 if (optList_strlen (entry)) 523 if (optList_isString (entry))
546 { 524 {
547 /* 525 /*
548 * special cases are handled in main.c:main () to allow 526 * special cases are handled in main.c:main () to allow
549 * X resources to set these values before we settle for 527 * X resources to set these values before we settle for
550 * default values 528 * default values
551 */ 529 */
552fprintf( stderr, "string\n"); 530
553 if (optList[entry].doff != -1) 531 if (optList[entry].doff != -1)
554 { 532 {
555 if (flag == resval_on && !argv [i+1]) 533 if (flag && i+1 == argc)
556 rxvt_fatal ("option '%s' needs an argument, aborting.\n", argv [i]); 534 rxvt_fatal ("option '%s' requires an argument, aborting.\n", argv [i]);
557 535
558 rs[optList[entry].doff] = flag == resval_on ? argv[++i] : resval_undef; 536 rs[optList[entry].doff] = flag ? argv[++i] : resval_undef;
559 } 537 }
560 } 538 }
561 else 539 else
540 {
562 { /* boolean value */ 541 /* boolean value */
563 set_option (optList[entry].index, flag == resval_on); 542 set_option (optList[entry].index, flag);
564 543
565 if (optList[entry].doff != -1) 544 if (optList[entry].doff != -1)
566 rs[optList[entry].doff] = flag; 545 rs[optList[entry].doff] = flag ? resval_on : resval_off;
567 } 546 }
568 } 547 }
548#ifndef NO_RESOURCES
549 else if (!strcmp (opt, "xrm"))
550 {
551 if (i+1 < argc)
552 XrmPutLineResource (&option_db, argv[++i]);
553 }
554#endif
555#ifdef KEYSYM_RESOURCE
556 else if (!strncmp (opt, "keysym.", sizeof ("keysym.") - 1))
557 {
558 if (i+1 < argc)
559 {
560 char *res = rxvt_temp_buf<char> (strlen (opt) + strlen (argv[++i]) + 6);
561 sprintf (res, "*.%s: %s\n", opt, argv[i]);
562 XrmPutLineResource (&option_db, res);
563 }
564 }
565#endif
569 else 566 else
570#ifdef KEYSYM_RESOURCE
571 /* if (!strncmp (opt, "keysym.", sizeof ("keysym.") - 1)) */
572 if (rxvt_Str_match (opt, "keysym."))
573 { 567 {
574 const char *str = argv[++i];
575
576 if (str != NULL)
577 parse_keysym (opt + sizeof ("keysym.") - 1, str);
578 }
579 else
580#endif
581 {
582 bad_option = 1; 568 bad_option = 1;
583 rxvt_warn ("\"%s\": unknown or malformed option.\n", opt); 569 rxvt_warn ("\"%s\": unknown or malformed option.\n", opt);
584 } 570 }
585 } 571 }
586 572
587 if (bad_option) 573 if (bad_option)
588 rxvt_usage (0); 574 rxvt_usage (0);
589} 575}
… …
620} 606}
621 607
622/* 608/*
623 * look for something like this (XK_Delete) 609 * look for something like this (XK_Delete)
624 * rxvt*keysym.0xFFFF: "\177" 610 * rxvt*keysym.0xFFFF: "\177"
625 *
626 * arg will be
627 * NULL for ~/.Xdefaults and
628 * non-NULL for command-line options (need to allocate)
629 */ 611 */
630#define NEWARGLIM 500 /* `reasonable' size */
631 612
632struct keysym_vocabulary_t 613struct keysym_vocabulary_t
633{ 614{
634 const char *name; 615 const char *name;
635 unsigned short len; 616 unsigned short len;
636 unsigned short value; 617 unsigned short value;
637}; 618};
638keysym_vocabulary_t keysym_vocabulary[] = 619static const keysym_vocabulary_t keysym_vocabulary[] =
639{ 620{
640 { "ISOLevel3", 9, Level3Mask }, 621 { "ISOLevel3", 9, Level3Mask },
641 { "AppKeypad", 9, AppKeypadMask }, 622 { "AppKeypad", 9, AppKeypadMask },
642 { "Control", 7, ControlMask }, 623 { "Control", 7, ControlMask },
643 { "NumLock", 7, NumLockMask }, 624 { "NumLock", 7, NumLockMask },
… …
665}; 646};
666 647
667int 648int
668rxvt_term::parse_keysym (const char *str, const char *arg) 649rxvt_term::parse_keysym (const char *str, const char *arg)
669{ 650{
670 int n, sym; 651 int sym;
671 unsigned int state = 0; 652 unsigned int state = 0;
672 const char *pmodend = NULL; 653 const char *key = strrchr (str, '-');
673 char *newarg = NULL;
674 char newargstr[NEWARGLIM];
675 654
676 if (arg == NULL) 655 if (!key)
677 { 656 key = str;
678 if ((n = rxvt_Str_match (str, "keysym.")) == 0)
679 return 0;
680
681 str += n; /* skip `keysym.' */
682 if (!(pmodend = strchr (str, ':')))
683 return -1;
684 }
685 else 657 else
686 pmodend = str + strlen(str); 658 key++;
687 659
688 for (--pmodend; str < pmodend; --pmodend) 660 // string or key is empty
689 if (*pmodend == '-') 661 if (*arg == '\0' || *key == '\0')
690 break; 662 return -1;
691 663
664 // parse modifiers
692 while (str < pmodend) 665 while (str < key)
693 { 666 {
694 unsigned int i; 667 unsigned int i;
695 668
696 for (i=0; i < sizeof (keysym_vocabulary) / sizeof (keysym_vocabulary_t); ++i) 669 for (i=0; i < sizeof (keysym_vocabulary) / sizeof (keysym_vocabulary_t); ++i)
697 { 670 {
… …
708 681
709 if (*str == '-') 682 if (*str == '-')
710 ++str; 683 ++str;
711 } 684 }
712 685
713 /* some scanf () have trouble with a 0x prefix */ 686 // convert keysym name to keysym number
714 if (str[0] == '0' && toupper (str[1]) == 'X') 687 if ((sym = XStringToKeysym (str)) == None)
715 { 688 {
716 str += 2; 689 // fallback on hexadecimal parsing
717 690 char *end;
691 sym = strtol (str, &end, 16);
718 if (arg) 692 if (*end)
719 {
720 if (sscanf (str, (strchr (str, ':') ? "%x:" : "%x"), &sym) != 1)
721 return -1;
722 }
723 else
724 {
725 if (sscanf (str, "%x:", &sym) != 1)
726 return -1;
727
728 /* cue to ':', it's there since sscanf () worked */
729 strncpy (newargstr, strchr (str, ':') + 1, NEWARGLIM - 1);
730 newargstr[NEWARGLIM - 1] = '\0';
731 newarg = newargstr;
732 }
733 }
734 else
735 {
736 /*
737 * convert keysym name to keysym number
738 */
739 strncpy (newargstr, str, NEWARGLIM - 1);
740 newargstr[NEWARGLIM - 1] = '\0';
741
742 if (arg == NULL)
743 {
744 if ((newarg = strchr (newargstr, ':')) == NULL)
745 return -1;
746
747 *newarg++ = '\0'; /* terminate keysym name */
748 }
749
750 if ((sym = XStringToKeysym (newargstr)) == None)
751 return -1; 693 return -1;
752 } 694 }
753 695
754 if (newarg == NULL)
755 {
756 strncpy (newargstr, arg, NEWARGLIM - 1);
757 newargstr[NEWARGLIM - 1] = '\0';
758 newarg = newargstr;
759 }
760
761 rxvt_Str_trim (newarg);
762 if (*newarg == '\0' || (n = rxvt_Str_escaped (newarg)) == 0)
763 return -1;
764
765 keyboard->register_user_translation (sym, state, newarg); 696 keyboard->register_user_translation (sym, state, arg);
766 return 1; 697 return 1;
767} 698}
768 699
769# endif /* KEYSYM_RESOURCE */ 700# endif /* KEYSYM_RESOURCE */
770#endif /* NO_RESOURCES */ 701#endif /* NO_RESOURCES */
771 702
772static char * 703static char *
773get_res (XrmDatabase database, const char *program, const char *option) 704get_res (XrmDatabase database, const char *program, const char *option)
774{ 705{
775 char resource[512]; 706 char resource[512];
… …
807 738
808void 739void
809rxvt_term::extract_resources () 740rxvt_term::extract_resources ()
810{ 741{
811#ifndef NO_RESOURCES 742#ifndef NO_RESOURCES
743 XrmDatabase database = XrmGetDatabase (dpy);
744 XrmMergeDatabases (option_db, &database);
745 option_db = NULL;
812 /* 746 /*
813 * Query resources for options that affect us 747 * Query resources for options that affect us
814 */ 748 */
815 for (int entry = 0; entry < optList_size; entry++) 749 for (int entry = 0; entry < optList_size; entry++)
816 { 750 {
… …
845 779
846 /* 780 /*
847 * [R5 or later]: enumerate the resource database 781 * [R5 or later]: enumerate the resource database
848 */ 782 */
849# ifdef KEYSYM_RESOURCE 783# ifdef KEYSYM_RESOURCE
850 XrmDatabase database = XrmGetDatabase (dpy);
851 XrmName name_prefix[3]; 784 XrmName name_prefix[3];
852 XrmClass class_prefix[3]; 785 XrmClass class_prefix[3];
853 786
854 name_prefix[0] = XrmStringToName (rs[Rs_name]); 787 name_prefix[0] = XrmStringToName (rs[Rs_name]);
855 name_prefix[1] = XrmStringToName ("keysym"); 788 name_prefix[1] = XrmStringToName ("keysym");
… …
869 XrmEnumerateDatabase (database, name_prefix, class_prefix, 802 XrmEnumerateDatabase (database, name_prefix, class_prefix,
870 XrmEnumOneLevel, rxvt_define_key, NULL); 803 XrmEnumOneLevel, rxvt_define_key, NULL);
871# endif 804# endif
872# endif 805# endif
873 806
874#endif /* NO_RESOURCES */ 807#endif /* NO_RESOURCES */
875} 808}
876 809
877/*----------------------- end-of-file (C source) -----------------------*/ 810/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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