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.90 by root, Tue Jan 31 19:53:31 2006 UTC vs.
Revision 1.138 by root, Tue Nov 4 11:03:29 2008 UTC

1/*--------------------------------*-C-*---------------------------------* 1/*----------------------------------------------------------------------*
2 * File: xdefaults.C 2 * File: xdefaults.C
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * 4 *
5 * All portions of code are copyright by their respective author/s. 5 * All portions of code are copyright by their respective author/s.
6 * Copyright (c) 1994 Robert Nation <nation@rocket.sanders.lockheed.com> 6 * Copyright (c) 1994 Robert Nation <nation@rocket.sanders.lockheed.com>
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.
… …
26#include "../config.h" 27#include "../config.h"
27#include "rxvt.h" 28#include "rxvt.h"
28#include "version.h" 29#include "version.h"
29 30
30#ifdef KEYSYM_RESOURCE 31#ifdef KEYSYM_RESOURCE
31#include "keyboard.h" 32# include "keyboard.h"
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 0x40000000UL 36#define Optflag_Reverse 1
36#define Optflag_Boolean 0x80000000UL 37#define Optflag_Boolean 2
37#define Optflag_mask 0x3fffffffUL 38#define Optflag_Switch 4
38 39
39/*{{{ monolithic option/resource structure: */ 40/* monolithic option/resource structure: */
40/* 41/*
41 * `string' options MUST have a usage argument 42 * `string' options MUST have a usage argument
42 * `switch' and `boolean' options have no argument 43 * `switch' and `boolean' options have no argument
43 * if there's no desc (ription), it won't appear in rxvt_usage () 44 * if there's no desc (ription), it won't appear in rxvt_usage ()
44 */ 45 */
45 46
46/* INFO () - descriptive information only */ 47/* INFO () - descriptive information only */
47#define INFO(opt, arg, desc) \ 48#define INFO(opt, arg, desc) \
48 {0, -1, NULL, (opt), (arg), (desc)} 49 {0, 0, -1, NULL, (opt), (arg), (desc)}
49 50
50/* STRG () - command-line option, with/without resource */ 51/* STRG () - command-line option, with/without resource */
51#define STRG(rsp, kw, opt, arg, desc) \ 52#define STRG(rsp, kw, opt, arg, desc) \
52 {0, (rsp), (kw), (opt), (arg), (desc)} 53 {0, 0, (rsp), (kw), (opt), (arg), (desc)}
53 54
54/* RSTRG () - resource/long-option */ 55/* RSTRG () - resource/long-option */
55#define RSTRG(rsp, kw, arg) \ 56#define RSTRG(rsp, kw, arg) \
56 {0, (rsp), (kw), NULL, (arg), NULL} 57 {0, 0, (rsp), (kw), NULL, (arg), NULL}
57 58
58/* BOOL () - regular boolean `-/+' flag */ 59/* BOOL () - regular boolean `-/+' flag */
59#define BOOL(rsp, kw, opt, flag, desc) \ 60#define BOOL(rsp, kw, opt, option, flag, desc) \
60 { (Optflag_Boolean | (flag)), (rsp), (kw), (opt), NULL, (desc)} 61 { (option), (Optflag_Boolean | (flag)), (rsp), (kw), (opt), NULL, (desc)}
61 62
62/* SWCH () - `-' flag */ 63/* SWCH () - `-' flag */
63#define SWCH(opt, flag, desc) \ 64#define SWCH(opt, option, flag, desc) \
64 { (flag), -1, NULL, (opt), NULL, (desc)} 65 { (option), (Optflag_Switch | (flag)), -1, NULL, (opt), NULL, (desc)}
65 66
66/* convenient macros */ 67/* convenient macros */
67#define optList_strlen(i) \ 68#define optList_isString(i) \
68 (optList[i].flag ? 0 : (optList[i].arg ? strlen (optList[i].arg) : 1)) 69 (optList[i].flag == 0)
69#define optList_isBool(i) \ 70#define optList_isBool(i) \
70 (optList[i].flag & Optflag_Boolean) 71 (optList[i].flag & Optflag_Boolean)
71#define optList_isReverse(i) \ 72#define optList_isReverse(i) \
72 (optList[i].flag & Optflag_Reverse) 73 (optList[i].flag & Optflag_Reverse)
73#define optList_size \ 74#define optList_size \
74 (sizeof (optList) / sizeof (optList[0])) 75 (sizeof (optList) / sizeof (optList[0]))
75 76
76static const struct 77static const struct
77 { 78 {
79 const uint8_t index; /* Option index */
78 const unsigned long flag; /* Option flag */ 80 const uint8_t flag; /* Option flag */
79 const int doff; /* data offset */ 81 const int16_t doff; /* resource value index or -1 */
80 const char *kw; /* keyword */ 82 const char *kw; /* keyword */
81 const char *opt; /* option */ 83 const char *opt; /* option */
82 const char *arg; /* argument */ 84 const char *arg; /* argument */
83 const char *desc; /* description */ 85 const char *desc; /* description */
84 } 86 }
… …
86 STRG (Rs_display_name, NULL, "d", NULL, NULL), /* short form */ 88 STRG (Rs_display_name, NULL, "d", NULL, NULL), /* short form */
87 STRG (Rs_display_name, NULL, "display", "string", "X server to contact"), 89 STRG (Rs_display_name, NULL, "display", "string", "X server to contact"),
88 STRG (Rs_term_name, "termName", "tn", "string", "value of the TERM environment variable"), 90 STRG (Rs_term_name, "termName", "tn", "string", "value of the TERM environment variable"),
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, "intercept console messages"), 93 SWCH ("C", Opt_console, 0, "intercept console messages"),
92 SWCH ("iconic", Opt_iconic, "start iconic"), 94 SWCH ("iconic", Opt_iconic, 0, "start iconic"),
93 SWCH ("ic", Opt_iconic, 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, "reverse video"), 97 BOOL (Rs_reverseVideo, "reverseVideo", "rv", Opt_reverseVideo, 0, "reverse video"),
95 BOOL (Rs_loginShell, "loginShell", "ls", Opt_loginShell, "login shell"), 98 BOOL (Rs_loginShell, "loginShell", "ls", Opt_loginShell, 0, "login shell"),
96 BOOL (Rs_jumpScroll, "jumpScroll", "j", Opt_jumpScroll, "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, "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, "scrollbar"), 103 BOOL (Rs_scrollBar, "scrollBar", "sb", Opt_scrollBar, 0, "scrollbar"),
101 BOOL (Rs_scrollBar_right, "scrollBar_right", "sr", Opt_scrollBar_right, "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, "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, NULL), 108 BOOL (Rs_scrollTtyOutput, "scrollTtyOutput", NULL, Opt_scrollTtyOutput, 0, NULL),
107 BOOL (Rs_scrollTtyOutput, NULL, "si", Optflag_Reverse | Opt_scrollTtyOutput, "scroll-on-tty-output inhibit"), 109 BOOL (Rs_scrollTtyOutput, NULL, "si", Opt_scrollTtyOutput, Optflag_Reverse, "scroll-on-tty-output inhibit"),
108 BOOL (Rs_scrollTtyKeypress, "scrollTtyKeypress", "sk", Opt_scrollTtyKeypress, "scroll-on-keypress"), 110 BOOL (Rs_scrollTtyKeypress, "scrollTtyKeypress", "sk", Opt_scrollTtyKeypress, 0, "scroll-on-keypress"),
109 BOOL (Rs_scrollWithBuffer, "scrollWithBuffer", "sw", Opt_scrollWithBuffer, "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, "inherit parent pixmap"), 113 BOOL (Rs_transparent, "inheritPixmap", "ip", Opt_transparent, 0, "inherit parent pixmap"),
112 SWCH ("tr", Opt_transparent, 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"),
116 STRG (Rs_shade, "shading", "sh", "number", "shade background by number %."),
117#endif
118#if OFF_FOCUS_FADING
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"),
121#endif
122 BOOL (Rs_utmpInhibit, "utmpInhibit", "ut", Opt_utmpInhibit, 0, "utmp inhibit"),
123#ifndef NO_BELL
124# if ENABLE_FRILLS
125 BOOL (Rs_urgentOnBell, "urgentOnBell", NULL, Opt_urgentOnBell, 0, NULL),
115# endif 126# endif
116#endif
117#if OFF_FOCUS_FADING
118 STRG (Rs_fade, "fading", "fade", "%", "fade colors x% percent when rxvt-unicode is losing focus"),
119 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
124 BOOL (Rs_utmpInhibit, "utmpInhibit", "ut", Opt_utmpInhibit, "utmp inhibit"),
125#ifndef NO_BELL
126 BOOL (Rs_visualBell, "visualBell", "vb", Opt_visualBell, "visual bell"), 127 BOOL (Rs_visualBell, "visualBell", "vb", Opt_visualBell, 0, "visual bell"),
127# if ! defined(NO_MAPALERT) && defined(MAPALERT_OPTION) 128# if ! defined(NO_MAPALERT) && defined(MAPALERT_OPTION)
128 BOOL (Rs_mapAlert, "mapAlert", NULL, Opt_mapAlert, NULL), 129 BOOL (Rs_mapAlert, "mapAlert", NULL, Opt_mapAlert, 0, NULL),
129# endif 130# endif
130#endif 131#endif
131#ifdef META8_OPTION 132#ifdef META8_OPTION
132 BOOL (Rs_meta8, "meta8", NULL, Opt_meta8, NULL), 133 BOOL (Rs_meta8, "meta8", NULL, Opt_meta8, 0, NULL),
133#endif 134#endif
134#ifdef MOUSE_WHEEL 135#ifdef MOUSE_WHEEL
135 BOOL (Rs_mouseWheelScrollPage, "mouseWheelScrollPage", NULL, Opt_mouseWheelScrollPage, NULL), 136 BOOL (Rs_mouseWheelScrollPage, "mouseWheelScrollPage", NULL, Opt_mouseWheelScrollPage, 0, NULL),
136#endif 137#endif
137#if ENABLE_FRILLS 138#if ENABLE_FRILLS
138 BOOL (Rs_tripleclickwords, "tripleclickwords", "tcw", Opt_tripleclickwords, "triple click word selection"), 139 BOOL (Rs_tripleclickwords, "tripleclickwords", "tcw", Opt_tripleclickwords, 0, "triple click word selection"),
139 BOOL (Rs_insecure, "insecure", "insecure", Opt_insecure, "enable possibly insecure escape sequences"), 140 BOOL (Rs_insecure, "insecure", "insecure", Opt_insecure, 0, "enable possibly insecure escape sequences"),
140 BOOL (Rs_cursorUnderline, "cursorUnderline", "uc", Opt_cursorUnderline, "underline cursor"), 141 BOOL (Rs_cursorUnderline, "cursorUnderline", "uc", Opt_cursorUnderline, 0, "underline cursor"),
141#endif 142#endif
142#if CURSOR_BLINK 143#if CURSOR_BLINK
143 BOOL (Rs_cursorBlink, "cursorBlink", "bc", Opt_cursorBlink, "blinking cursor"), 144 BOOL (Rs_cursorBlink, "cursorBlink", "bc", Opt_cursorBlink, 0, "blinking cursor"),
144#endif 145#endif
145#ifdef POINTER_BLANK 146#ifdef POINTER_BLANK
146 BOOL (Rs_pointerBlank, "pointerBlank", "pb", Opt_pointerBlank, "switch off pointer after delay"), 147 BOOL (Rs_pointerBlank, "pointerBlank", "pb", Opt_pointerBlank, 0, "switch off pointer after delay"),
147#endif 148#endif
148 STRG (Rs_color + Color_bg, "background", "bg", "color", "background color"), 149 STRG (Rs_color + Color_bg, "background", "bg", "color", "background color"),
149 STRG (Rs_color + Color_fg, "foreground", "fg", "color", "foreground color"), 150 STRG (Rs_color + Color_fg, "foreground", "fg", "color", "foreground color"),
150 RSTRG (Rs_color + minCOLOR + 0, "color0", "color"), 151 RSTRG (Rs_color + minCOLOR + 0, "color0", "color"),
151 RSTRG (Rs_color + minCOLOR + 1, "color1", "color"), 152 RSTRG (Rs_color + minCOLOR + 1, "color1", "color"),
… …
166#ifndef NO_BOLD_UNDERLINE_REVERSE 167#ifndef NO_BOLD_UNDERLINE_REVERSE
167 RSTRG (Rs_color + Color_BD, "colorBD", "color"), 168 RSTRG (Rs_color + Color_BD, "colorBD", "color"),
168 RSTRG (Rs_color + Color_IT, "colorIT", "color"), 169 RSTRG (Rs_color + Color_IT, "colorIT", "color"),
169 RSTRG (Rs_color + Color_UL, "colorUL", "color"), 170 RSTRG (Rs_color + Color_UL, "colorUL", "color"),
170 RSTRG (Rs_color + Color_RV, "colorRV", "color"), 171 RSTRG (Rs_color + Color_RV, "colorRV", "color"),
171#endif /* ! NO_BOLD_UNDERLINE_REVERSE */ 172#endif /* ! NO_BOLD_UNDERLINE_REVERSE */
172#if ENABLE_FRILLS 173#if ENABLE_FRILLS
173 RSTRG (Rs_color + Color_underline, "underlineColor", "color"), 174 RSTRG (Rs_color + Color_underline, "underlineColor", "color"),
174#endif 175#endif
175#ifdef KEEP_SCROLLCOLOR
176 RSTRG (Rs_color + Color_scroll, "scrollColor", "color"), 176 RSTRG (Rs_color + Color_scroll, "scrollColor", "color"),
177#ifdef RXVT_SCROLLBAR
177 RSTRG (Rs_color + Color_trough, "troughColor", "color"), 178 RSTRG (Rs_color + Color_trough, "troughColor", "color"),
178#endif /* KEEP_SCROLLCOLOR */ 179#endif
179#ifdef OPTION_HC 180#ifdef OPTION_HC
180 STRG (Rs_color + Color_HC, "highlightColor", "hc", "color", "highlight color"), 181 STRG (Rs_color + Color_HC, "highlightColor", "hc", "color", "highlight color"),
181#endif 182#endif
182#ifndef NO_CURSORCOLOR 183#ifndef NO_CURSORCOLOR
183 STRG (Rs_color + Color_cursor, "cursorColor", "cr", "color", "cursor color"), 184 STRG (Rs_color + Color_cursor, "cursorColor", "cr", "color", "cursor color"),
184 /* command-line option = resource name */ 185 /* command-line option = resource name */
185 RSTRG (Rs_color + Color_cursor2, "cursorColor2", "color"), 186 RSTRG (Rs_color + Color_cursor2, "cursorColor2", "color"),
186#endif /* NO_CURSORCOLOR */ 187#endif /* NO_CURSORCOLOR */
187 STRG (Rs_color + Color_pointer_fg, "pointerColor", "pr", "color", "pointer color"), 188 STRG (Rs_color + Color_pointer_fg, "pointerColor", "pr", "color", "pointer color"),
188 STRG (Rs_color + Color_pointer_bg, "pointerColor2", "pr2", "color", "pointer bg color"), 189 STRG (Rs_color + Color_pointer_bg, "pointerColor2", "pr2", "color", "pointer bg color"),
189 STRG (Rs_color + Color_border, "borderColor", "bd", "color", "border color"), 190 STRG (Rs_color + Color_border, "borderColor", "bd", "color", "border color"),
190#ifdef XPM_BACKGROUND 191#ifdef BG_IMAGE_FROM_FILE
191 RSTRG (Rs_path, "path", "search path"), 192 RSTRG (Rs_path, "path", "search path"),
192 STRG (Rs_backgroundPixmap, "backgroundPixmap", "pixmap", "file[;geom]", "background pixmap"), 193 STRG (Rs_backgroundPixmap, "backgroundPixmap", "pixmap", "file[;geom]", "background pixmap"),
193#endif 194#endif
194 /* fonts: command-line option = resource name */ 195 /* fonts: command-line option = resource name */
195 STRG (Rs_font, "font", "fn", "fontname", "normal text font"), 196 STRG (Rs_font, "font", "fn", "fontname", "normal text font"),
196#if ENABLE_STYLES 197#if ENABLE_STYLES
197 STRG (Rs_boldFont, "boldFont", "fb", "fontname", "bold font"), 198 STRG (Rs_boldFont, "boldFont", "fb", "fontname", "bold font"),
198 STRG (Rs_italicFont, "italicFont", "fi", "fontname", "italic font"), 199 STRG (Rs_italicFont, "italicFont", "fi", "fontname", "italic font"),
199 STRG (Rs_boldItalicFont, "boldItalicFont", "fbi", "fontname", "bold italic font"), 200 STRG (Rs_boldItalicFont, "boldItalicFont", "fbi", "fontname", "bold italic font"),
200 BOOL (Rs_intensityStyles, "intensityStyles", "is", Opt_intensityStyles, "font styles imply intensity changes"), 201 BOOL (Rs_intensityStyles, "intensityStyles", "is", Opt_intensityStyles, 0, "font styles imply intensity changes"),
201#endif 202#endif
202#ifdef USE_XIM 203#ifdef USE_XIM
203 STRG (Rs_inputMethod, "inputMethod", "im", "name", "name of input method"), 204 STRG (Rs_inputMethod, "inputMethod", "im", "name", "name of input method"),
204 STRG (Rs_preeditType, "preeditType", "pt", "style", "input style: style = OverTheSpot|OffTheSpot|Root"), 205 STRG (Rs_preeditType, "preeditType", "pt", "style", "input style: style = OverTheSpot|OffTheSpot|Root"),
205 STRG (Rs_imLocale, "imLocale", "imlocale", "string", "locale to use for input method"), 206 STRG (Rs_imLocale, "imLocale", "imlocale", "string", "locale to use for input method"),
206 STRG (Rs_imFont, "imFont", "imfont", "fontname", "fontset for styles OverTheSpot and OffTheSpot"), 207 STRG (Rs_imFont, "imFont", "imfont", "fontname", "fontset for styles OverTheSpot and OffTheSpot"),
207#endif /* USE_XIM */ 208#endif /* USE_XIM */
208 STRG (Rs_name, NULL, "name", "string", "client instance, icon, and title strings"), 209 STRG (Rs_name, NULL, "name", "string", "client instance, icon, and title strings"),
209 STRG (Rs_title, "title", "title", "string", "title name for window"), 210 STRG (Rs_title, "title", "title", "string", "title name for window"),
210 STRG (Rs_title, NULL, "T", NULL, NULL), /* short form */ 211 STRG (Rs_title, NULL, "T", NULL, NULL), /* short form */
211 STRG (Rs_iconName, "iconName", "n", "string", "icon name for window"), 212 STRG (Rs_iconName, "iconName", "n", "string", "icon name for window"),
212 STRG (Rs_saveLines, "saveLines", "sl", "number", "number of scrolled lines to save"), 213 STRG (Rs_saveLines, "saveLines", "sl", "number", "number of scrolled lines to save"),
213#if ENABLE_XEMBED 214#if ENABLE_XEMBED
214 STRG (Rs_embed, NULL, "embed", "windowid", "window id to embed terminal in"), 215 STRG (Rs_embed, NULL, "embed", "windowid", "window id to embed terminal in"),
215#endif 216#endif
216#if XFT 217#if XFT
217 STRG (Rs_depth, "depth", "depth", "number", "depth of visual to request"), 218 STRG (Rs_depth, "depth", "depth", "number", "depth of visual to request"),
219 BOOL (Rs_buffered, "buffered", NULL, Opt_buffered, 0, NULL),
218#endif 220#endif
219#if ENABLE_FRILLS 221#if ENABLE_FRILLS
220 RSTRG (Rs_transient_for, "transient-for", "windowid"), 222 RSTRG (Rs_transient_for, "transient-for", "windowid"),
221 BOOL (Rs_override_redirect, "override-redirect", "override-redirect", Opt_override_redirect, "set override-redirect on the terminal window"), 223 BOOL (Rs_override_redirect, "override-redirect", "override-redirect", Opt_override_redirect, 0, "set override-redirect on the terminal window"),
222 STRG (Rs_pty_fd, NULL, "pty-fd", "fileno", "file descriptor of pty to use"), 224 STRG (Rs_pty_fd, NULL, "pty-fd", "fileno", "file descriptor of pty to use"),
223 BOOL (Rs_hold, "hold", "hold", Opt_hold, "retain window after shell exit"), 225 BOOL (Rs_hold, "hold", "hold", Opt_hold, 0, "retain window after shell exit"),
224 STRG (Rs_ext_bwidth, "externalBorder", "w", "number", "external border in pixels"), 226 STRG (Rs_ext_bwidth, "externalBorder", "w", "number", "external border in pixels"),
225 STRG (Rs_ext_bwidth, NULL, "bw", NULL, NULL), 227 STRG (Rs_ext_bwidth, NULL, "bw", NULL, NULL),
226 STRG (Rs_ext_bwidth, NULL, "borderwidth", NULL, NULL), 228 STRG (Rs_ext_bwidth, NULL, "borderwidth", NULL, NULL),
227 STRG (Rs_int_bwidth, "internalBorder", "b", "number", "internal border in pixels"), 229 STRG (Rs_int_bwidth, "internalBorder", "b", "number", "internal border in pixels"),
228 BOOL (Rs_borderLess, "borderLess", "bl", Opt_borderLess, "borderless window"), 230 BOOL (Rs_borderLess, "borderLess", "bl", Opt_borderLess, 0, "borderless window"),
229 BOOL (Rs_skipBuiltinGlyphs, "skipBuiltinGlyphs", "sbg", Opt_skipBuiltinGlyphs, "do not use internal glyphs"),
230 STRG (Rs_lineSpace, "lineSpace", "lsp", "number", "number of extra pixels between rows"), 231 STRG (Rs_lineSpace, "lineSpace", "lsp", "number", "number of extra pixels between rows"),
232#endif
233#ifdef BUILTIN_GLYPHS
234 BOOL (Rs_skipBuiltinGlyphs, "skipBuiltinGlyphs", "sbg", Opt_skipBuiltinGlyphs, 0, "do not use internal glyphs"),
231#endif 235#endif
232#ifdef POINTER_BLANK 236#ifdef POINTER_BLANK
233 RSTRG (Rs_pointerBlankDelay, "pointerBlankDelay", "number"), 237 RSTRG (Rs_pointerBlankDelay, "pointerBlankDelay", "number"),
234#endif 238#endif
235#ifndef NO_BACKSPACE_KEY 239#ifndef NO_BACKSPACE_KEY
236 RSTRG (Rs_backspace_key, "backspacekey", "string"), 240 RSTRG (Rs_backspace_key, "backspacekey", "string"),
237#endif 241#endif
238#ifndef NO_DELETE_KEY 242#ifndef NO_DELETE_KEY
239 RSTRG (Rs_delete_key, "deletekey", "string"), 243 RSTRG (Rs_delete_key, "deletekey", "string"),
240#endif 244#endif
241 RSTRG (Rs_selectstyle, "selectstyle", "mode"),
242#ifdef PRINTPIPE 245#ifdef PRINTPIPE
243 RSTRG (Rs_print_pipe, "print-pipe", "string"), 246 RSTRG (Rs_print_pipe, "print-pipe", "string"),
244#endif 247#endif
245 STRG (Rs_modifier, "modifier", "mod", "modifier", "meta modifier = alt|meta|hyper|super|mod1|...|mod5"), 248 STRG (Rs_modifier, "modifier", "mod", "modifier", "meta modifier = alt|meta|hyper|super|mod1|...|mod5"),
246#ifdef CUTCHAR_RESOURCE
247 RSTRG (Rs_cutchars, "cutchars", "string"), 249 RSTRG (Rs_cutchars, "cutchars", "string"),
248#endif /* CUTCHAR_RESOURCE */
249 RSTRG (Rs_answerbackstring, "answerbackString", "string"), 250 RSTRG (Rs_answerbackstring, "answerbackString", "string"),
250#ifndef NO_SECONDARY_SCREEN 251#ifndef NO_SECONDARY_SCREEN
251 BOOL (Rs_secondaryScreen, "secondaryScreen", "ssc", Opt_secondaryScreen, "enable secondary screen"), 252 BOOL (Rs_secondaryScreen, "secondaryScreen", "ssc", Opt_secondaryScreen, 0, "enable secondary screen"),
252 BOOL (Rs_secondaryScroll, "secondaryScroll", "ssr", Opt_secondaryScroll, "enable secondary screen scroll"), 253 BOOL (Rs_secondaryScroll, "secondaryScroll", "ssr", Opt_secondaryScroll, 0, "enable secondary screen scroll"),
253#endif 254#endif
254#if ENABLE_PERL 255#if ENABLE_PERL
255 RSTRG (Rs_perl_lib, "perl-lib", "string"), //, "colon-separated directories with extension scripts"),TODO 256 RSTRG (Rs_perl_lib, "perl-lib", "string"), //, "colon-separated directories with extension scripts"),TODO
256 RSTRG (Rs_perl_eval, "perl-eval", "perl-eval"), // "string", "code to be evaluated after all extensions have been loaded"),TODO 257 RSTRG (Rs_perl_eval, "perl-eval", "perl-eval"), // "string", "code to be evaluated after all extensions have been loaded"),TODO
257 RSTRG (Rs_perl_ext_1, "perl-ext-common", "string"), //, "colon-separated list of perl extensions to enable"),TODO 258 RSTRG (Rs_perl_ext_1, "perl-ext-common", "string"), //, "colon-separated list of perl extensions to enable"),TODO
258 STRG (Rs_perl_ext_2, "perl-ext", "pe", "string", "colon-separated list of perl extensions to enable for this instance"), 259 STRG (Rs_perl_ext_2, "perl-ext", "pe", "string", "colon-separated list of perl extensions to enable for this instance"),
259#endif 260#endif
260#ifndef NO_RESOURCES 261#if ISO_14755
261 INFO ("xrm", "string", "X resource"), 262 BOOL (Rs_iso14755_52, "iso14755_52", NULL, Opt_iso14755_52, 0, NULL),
263#endif
264#ifdef HAVE_AFTERIMAGE
265 STRG (Rs_blendtype, "blendType", "blt", "string", "background image blending type - alpha, tint, etc..."),
266 STRG (Rs_blurradius, "blurRadius", "blr", "HxV", "gaussian blur radii to apply to the root background"),
267# if ENABLE_EWMH
268 STRG (Rs_iconfile, "iconFile", "icon", "file", "path to aplication icon image"),
269# endif
262#endif 270#endif
263 INFO ("e", "command arg ...", "command to execute") 271 INFO ("e", "command arg ...", "command to execute")
264 }; 272 };
265 273
266#undef INFO 274#undef INFO
267#undef STRG 275#undef STRG
268#undef RSTRG 276#undef RSTRG
269#undef SWCH 277#undef SWCH
270#undef BOOL 278#undef BOOL
271/*}}} */
272 279
273static const char releasestring[] = "rxvt-unicode (" RXVTNAME ") v" VERSION " - released: " DATE "\n"; 280static const char releasestring[] = "rxvt-unicode (" RXVTNAME ") v" VERSION " - released: " DATE "\n";
274static const char optionsstring[] = "options: " 281static const char optionsstring[] = "options: "
275#if ENABLE_PERL 282#if ENABLE_PERL
276 "perl," 283 "perl,"
… …
311#endif 318#endif
312 "," 319 ","
313#if OFF_FOCUS_FADING 320#if OFF_FOCUS_FADING
314 "fade," 321 "fade,"
315#endif 322#endif
316#if defined(XPM_BACKGROUND)
317 "XPM,"
318#endif
319#if defined(TRANSPARENT) 323#if defined(ENABLE_TRANSPARENCY)
320 "transparent," 324 "transparent,"
321#endif
322#if TINTING
323 "tint," 325 "tint,"
326#endif
327#if HAVE_AFTERIMAGE
328 "afterimage,"
324#endif 329#endif
325#if defined(USE_XIM) 330#if defined(USE_XIM)
326 "XIM," 331 "XIM,"
327#endif 332#endif
328#if defined(NO_BACKSPACE_KEY) 333#if defined(NO_BACKSPACE_KEY)
… …
356 "pointerBlank," 361 "pointerBlank,"
357#endif 362#endif
358#if defined(NO_RESOURCES) 363#if defined(NO_RESOURCES)
359 "NoResources," 364 "NoResources,"
360#endif 365#endif
361 "scrollbars=" 366 "scrollbars=plain"
362#if !defined(HAVE_SCROLLBARS)
363 "NONE"
364#else
365# if defined(PLAIN_SCROLLBAR)
366 "plain"
367# if defined(RXVT_SCROLLBAR) || defined(NEXT_SCROLLBAR) || defined(XTERM_SCROLLBAR)
368 "+"
369# endif
370# endif
371# if defined(RXVT_SCROLLBAR) 367#if defined(RXVT_SCROLLBAR)
372 "rxvt" 368 "+rxvt"
373# if defined(NEXT_SCROLLBAR) || defined(XTERM_SCROLLBAR)
374 "+"
375# endif
376# endif 369#endif
377# if defined(NEXT_SCROLLBAR) 370#if defined(NEXT_SCROLLBAR)
378 "NeXT" 371 "+NeXT"
379# if defined(XTERM_SCROLLBAR)
380 "+"
381# endif
382# endif 372#endif
383# if defined(XTERM_SCROLLBAR) 373#if defined(XTERM_SCROLLBAR)
384 "xterm" 374 "+xterm"
385# endif
386#endif 375#endif
387 "\nUsage: "; /* Usage */ 376 "\nUsage: "; /* Usage */
388 377
389#define INDENT 18 378#define INDENT 18
390 379
… …
407 rxvt_log (" [-help] [--help]\n"); 396 rxvt_log (" [-help] [--help]\n");
408 397
409 for (col = 1, i = 0; i < optList_size; i++) 398 for (col = 1, i = 0; i < optList_size; i++)
410 if (optList[i].desc != NULL) 399 if (optList[i].desc != NULL)
411 { 400 {
412 int len = 0; 401 int len = 0;
413 402
414 if (!optList_isBool (i)) 403 if (optList[i].arg)
415 { 404 len = strlen (optList[i].arg) + 1;
416 len = optList_strlen (i);
417 if (len > 0)
418 len++; /* account for space */
419 }
420#ifdef DEBUG_STRICT 405#ifdef DEBUG_STRICT
421 assert (optList[i].opt != NULL); 406 assert (optList[i].opt != NULL);
422#endif 407#endif
423 len += 4 + strlen (optList[i].opt) + (optList_isBool (i) ? 2: 0); 408 len += 4 + strlen (optList[i].opt) + (optList_isBool (i) ? 2: 0);
424 col += len; 409 col += len;
425 if (col > 79) 410 if (col > 79)
411 {
426 { /* assume regular width */ 412 /* assume regular width */
427 rxvt_log ("\n"); 413 rxvt_log ("\n");
428 col = 1 + len; 414 col = 1 + len;
429 } 415 }
430 416
431 rxvt_log (" [-%s%s", (optList_isBool (i) ? "/+" : ""), optList[i].opt); 417 rxvt_log (" [-%s%s", (optList_isBool (i) ? "/+" : ""), optList[i].opt);
432 if (optList_strlen (i)) 418 if (optList[i].arg)
433 rxvt_log (" %s]", optList[i].arg); 419 rxvt_log (" %s]", optList[i].arg);
434 else 420 else
435 rxvt_log ("]"); 421 rxvt_log ("]");
436 } 422 }
437 break; 423 break;
… …
484 470
485/*{{{ get command-line options before getting resources */ 471/*{{{ get command-line options before getting resources */
486void 472void
487rxvt_term::get_options (int argc, const char *const *argv) 473rxvt_term::get_options (int argc, const char *const *argv)
488{ 474{
489 int i, bad_option = 0; 475 int i, bad_option = 0;
490 476
491 for (i = 1; i < argc; i++) 477 for (i = 1; i < argc; i++)
492 { 478 {
493 unsigned int entry, longopt = 0; 479 unsigned int entry, longopt = 0;
494 const char *flag, *opt; 480 const char *opt;
481 int flag;
495 482
496 opt = argv[i]; 483 opt = argv[i];
497 484
498 if (*opt == '-') 485 if (*opt == '-')
499 { 486 {
500 flag = resval_on; 487 flag = 1;
501 488
502 if (*++opt == '-') 489 if (*++opt == '-')
503 longopt = *opt++; /* long option */ 490 longopt = *opt++; /* long option */
504 } 491 }
505 else if (*opt == '+') 492 else if (*opt == '+')
506 { 493 {
507 flag = resval_off; 494 flag = 0;
508 495
509 if (*++opt == '+') 496 if (*++opt == '+')
510 longopt = *opt++; /* long option */ 497 longopt = *opt++; /* long option */
511 } 498 }
512 else 499 else
… …
530 break; 517 break;
531 518
532 if (entry < optList_size) 519 if (entry < optList_size)
533 { 520 {
534 if (optList_isReverse (entry)) 521 if (optList_isReverse (entry))
535 flag = flag == resval_on ? resval_off : resval_on; 522 flag = !flag;
536 523
537 if (optList_strlen (entry)) 524 if (optList_isString (entry))
538 { 525 {
539 /* 526 /*
540 * special cases are handled in main.c:main () to allow 527 * special cases are handled in main.c:main () to allow
541 * X resources to set these values before we settle for 528 * X resources to set these values before we settle for
542 * default values 529 * default values
543 */ 530 */
544 531
545 if (optList[entry].doff != -1) 532 if (optList[entry].doff != -1)
533 {
534 if (flag && i+1 == argc)
535 rxvt_fatal ("option '%s' requires an argument, aborting.\n", argv [i]);
536
546 rs[optList[entry].doff] = flag == resval_on && argv[i+1] 537 rs[optList[entry].doff] = flag ? argv[++i] : resval_undef;
547 ? argv[++i] : resval_undef; 538 }
548
549 if (optList[entry].doff == Rs_color + Color_tint) printf ("doff %d is %s\n",optList[entry].doff,rs[optList[entry].doff]);//D
550 } 539 }
551 else 540 else
541 {
552 { /* boolean value */ 542 /* boolean value */
553 set_option (optList[entry].flag & Optflag_mask, flag == resval_on); 543 set_option (optList[entry].index, flag);
554 544
555 if (optList[entry].doff != -1) 545 if (optList[entry].doff != -1)
556 rs[optList[entry].doff] = flag; 546 rs[optList[entry].doff] = flag ? resval_on : resval_off;
557 } 547 }
558 } 548 }
549#ifndef NO_RESOURCES
550 else if (!strcmp (opt, "xrm"))
551 {
552 if (i+1 < argc)
553 XrmPutLineResource (&option_db, argv[++i]);
554 }
555#endif
556#ifdef KEYSYM_RESOURCE
557 else if (!strncmp (opt, "keysym.", sizeof ("keysym.") - 1))
558 {
559 if (i+1 < argc)
560 {
561 char *res = (char *)malloc (strlen (opt) + strlen (argv[++i]) + 6);
562 sprintf (res, "*.%s: %s\n", opt, argv[i]);
563 XrmPutLineResource (&option_db, res);
564 free (res);
565 }
566 }
567#endif
559 else 568 else
560#ifdef KEYSYM_RESOURCE
561 /* if (!strncmp (opt, "keysym.", sizeof ("keysym.") - 1)) */
562 if (rxvt_Str_match (opt, "keysym."))
563 { 569 {
564 const char *str = argv[++i];
565
566 if (str != NULL)
567 parse_keysym (opt + sizeof ("keysym.") - 1, str);
568 }
569 else
570#endif
571 {
572 bad_option = 1; 570 bad_option = 1;
573 rxvt_warn ("\"%s\": unknown or malformed option.\n", opt); 571 rxvt_warn ("\"%s\": unknown or malformed option.\n", opt);
574 } 572 }
575 } 573 }
576 574
577 if (bad_option) 575 if (bad_option)
578 rxvt_usage (0); 576 rxvt_usage (0);
579} 577}
… …
610} 608}
611 609
612/* 610/*
613 * look for something like this (XK_Delete) 611 * look for something like this (XK_Delete)
614 * rxvt*keysym.0xFFFF: "\177" 612 * rxvt*keysym.0xFFFF: "\177"
615 *
616 * arg will be
617 * NULL for ~/.Xdefaults and
618 * non-NULL for command-line options (need to allocate)
619 */ 613 */
620#define NEWARGLIM 500 /* `reasonable' size */
621 614
622struct keysym_vocabulary_t 615struct keysym_vocabulary_t
623{ 616{
624 const char *name; 617 const char *name;
625 unsigned short len; 618 unsigned short len;
626 unsigned short value; 619 unsigned short value;
627}; 620};
628keysym_vocabulary_t keysym_vocabulary[] = 621static const keysym_vocabulary_t keysym_vocabulary[] =
629{ 622{
630 { "ISOLevel3", 9, Level3Mask }, 623 { "ISOLevel3", 9, Level3Mask },
631 { "AppKeypad", 9, AppKeypadMask }, 624 { "AppKeypad", 9, AppKeypadMask },
632 { "Control", 7, ControlMask }, 625 { "Control", 7, ControlMask },
633 { "NumLock", 7, NumLockMask }, 626 { "NumLock", 7, NumLockMask },
… …
655}; 648};
656 649
657int 650int
658rxvt_term::parse_keysym (const char *str, const char *arg) 651rxvt_term::parse_keysym (const char *str, const char *arg)
659{ 652{
660 int n, sym; 653 int sym;
661 unsigned int state = 0; 654 unsigned int state = 0;
662 const char *pmodend = NULL; 655 const char *key = strrchr (str, '-');
663 char *newarg = NULL;
664 char newargstr[NEWARGLIM];
665 656
666 if (arg == NULL) 657 if (!key)
667 { 658 key = str;
668 if ((n = rxvt_Str_match (str, "keysym.")) == 0)
669 return 0;
670
671 str += n; /* skip `keysym.' */
672 if (!(pmodend = strchr (str, ':')))
673 return -1;
674 }
675 else 659 else
676 pmodend = str + strlen(str); 660 key++;
677 661
678 for (--pmodend; str < pmodend; --pmodend) 662 // string or key is empty
679 if (*pmodend == '-') 663 if (*arg == '\0' || *key == '\0')
680 break; 664 return -1;
681 665
666 // parse modifiers
682 while (str < pmodend) 667 while (str < key)
683 { 668 {
684 unsigned int i; 669 unsigned int i;
685 670
686 for (i=0; i < sizeof (keysym_vocabulary) / sizeof (keysym_vocabulary_t); ++i) 671 for (i=0; i < sizeof (keysym_vocabulary) / sizeof (keysym_vocabulary_t); ++i)
687 { 672 {
… …
698 683
699 if (*str == '-') 684 if (*str == '-')
700 ++str; 685 ++str;
701 } 686 }
702 687
703 /* some scanf () have trouble with a 0x prefix */ 688 // convert keysym name to keysym number
704 if (str[0] == '0' && toupper (str[1]) == 'X') 689 if ((sym = XStringToKeysym (str)) == None)
705 { 690 {
706 str += 2; 691 // fallback on hexadecimal parsing
707 692 char *end;
693 sym = strtol (str, &end, 16);
708 if (arg) 694 if (*end)
709 {
710 if (sscanf (str, (strchr (str, ':') ? "%x:" : "%x"), &sym) != 1)
711 return -1;
712 }
713 else
714 {
715 if (sscanf (str, "%x:", &sym) != 1)
716 return -1;
717
718 /* cue to ':', it's there since sscanf () worked */
719 strncpy (newargstr, strchr (str, ':') + 1, NEWARGLIM - 1);
720 newargstr[NEWARGLIM - 1] = '\0';
721 newarg = newargstr;
722 }
723 }
724 else
725 {
726 /*
727 * convert keysym name to keysym number
728 */
729 strncpy (newargstr, str, NEWARGLIM - 1);
730 newargstr[NEWARGLIM - 1] = '\0';
731
732 if (arg == NULL)
733 {
734 if ((newarg = strchr (newargstr, ':')) == NULL)
735 return -1;
736
737 *newarg++ = '\0'; /* terminate keysym name */
738 }
739
740 if ((sym = XStringToKeysym (newargstr)) == None)
741 return -1; 695 return -1;
742 } 696 }
743 697
744 if (newarg == NULL)
745 {
746 strncpy (newargstr, arg, NEWARGLIM - 1);
747 newargstr[NEWARGLIM - 1] = '\0';
748 newarg = newargstr;
749 }
750
751 rxvt_Str_trim (newarg);
752 if (*newarg == '\0' || (n = rxvt_Str_escaped (newarg)) == 0)
753 return -1;
754
755 keyboard->register_user_translation (sym, state, newarg); 698 keyboard->register_user_translation (sym, state, arg);
756 return 1; 699 return 1;
757} 700}
758 701
759# endif /* KEYSYM_RESOURCE */ 702# endif /* KEYSYM_RESOURCE */
760#endif /* NO_RESOURCES */ 703#endif /* NO_RESOURCES */
761 704
762static char * 705static char *
763get_res (XrmDatabase database, const char *program, const char *option) 706get_res (XrmDatabase database, const char *program, const char *option)
764{ 707{
765 char resource[512]; 708 char resource[512];
… …
773} 716}
774 717
775const char * 718const char *
776rxvt_term::x_resource (const char *name) 719rxvt_term::x_resource (const char *name)
777{ 720{
778 XrmDatabase database = XrmGetDatabase (xdisp); 721 XrmDatabase database = XrmGetDatabase (dpy);
779 722
780 const char *p = get_res (database, rs[Rs_name], name); 723 const char *p = get_res (database, rs[Rs_name], name);
781 const char *p0 = get_res (database, "!INVALIDPROGRAMMENAMEDONTMATCH!", name); 724 const char *p0 = get_res (database, "!INVALIDPROGRAMMENAMEDONTMATCH!", name);
782 725
783 if (p == NULL || (p0 && strcmp (p, p0) == 0)) 726 if (p == NULL || (p0 && strcmp (p, p0) == 0))
… …
797 740
798void 741void
799rxvt_term::extract_resources () 742rxvt_term::extract_resources ()
800{ 743{
801#ifndef NO_RESOURCES 744#ifndef NO_RESOURCES
745 XrmDatabase database = XrmGetDatabase (dpy);
746 XrmMergeDatabases (option_db, &database);
747 option_db = NULL;
802 /* 748 /*
803 * Query resources for options that affect us 749 * Query resources for options that affect us
804 */ 750 */
805 for (int entry = 0; entry < optList_size; entry++) 751 for (int entry = 0; entry < optList_size; entry++)
806 { 752 {
… …
826 || strcasecmp (p, "1") == 0; 772 || strcasecmp (p, "1") == 0;
827 773
828 if (optList_isReverse (entry)) 774 if (optList_isReverse (entry))
829 s = !s; 775 s = !s;
830 776
831 set_option (optList[entry].flag & Optflag_mask, s); 777 set_option (optList[entry].index, s);
832 } 778 }
833 } 779 }
834 } 780 }
835 781
836 /* 782 /*
837 * [R5 or later]: enumerate the resource database 783 * [R5 or later]: enumerate the resource database
838 */ 784 */
839# ifdef KEYSYM_RESOURCE 785# ifdef KEYSYM_RESOURCE
840 XrmDatabase database = XrmGetDatabase (xdisp);
841 XrmName name_prefix[3]; 786 XrmName name_prefix[3];
842 XrmClass class_prefix[3]; 787 XrmClass class_prefix[3];
843 788
844 name_prefix[0] = XrmStringToName (rs[Rs_name]); 789 name_prefix[0] = XrmStringToName (rs[Rs_name]);
845 name_prefix[1] = XrmStringToName ("keysym"); 790 name_prefix[1] = XrmStringToName ("keysym");
… …
859 XrmEnumerateDatabase (database, name_prefix, class_prefix, 804 XrmEnumerateDatabase (database, name_prefix, class_prefix,
860 XrmEnumOneLevel, rxvt_define_key, NULL); 805 XrmEnumOneLevel, rxvt_define_key, NULL);
861# endif 806# endif
862# endif 807# endif
863 808
864#endif /* NO_RESOURCES */ 809#endif /* NO_RESOURCES */
865} 810}
866 811
867/*----------------------- end-of-file (C source) -----------------------*/ 812/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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