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.29 by root, Tue Aug 3 22:19:51 2004 UTC vs.
Revision 1.72 by root, Fri Jan 6 05:28:55 2006 UTC

… …
28 *----------------------------------------------------------------------*/ 28 *----------------------------------------------------------------------*/
29 29
30#include "../config.h" /* NECESSARY */ 30#include "../config.h" /* NECESSARY */
31#include "rxvt.h" /* NECESSARY */ 31#include "rxvt.h" /* NECESSARY */
32#include "version.h" 32#include "version.h"
33#include "xdefaults.intpro" /* PROTOS for internal routines */ 33
34#include <sys/utsname.h>
35
36#ifdef KEYSYM_RESOURCE
37#include "keyboard.h"
38#endif
39
40/* place holders used for parsing command-line options */
41#define Optflag_Reverse 0x40000000UL
42#define Optflag_Boolean 0x80000000UL
43#define Optflag_mask 0x3fffffffUL
34 44
35/* #define DEBUG_RESOURCES */ 45/* #define DEBUG_RESOURCES */
36
37static const char *const xnames[2] = { ".Xdefaults", ".Xresources" };
38 46
39/*{{{ monolithic option/resource structure: */ 47/*{{{ monolithic option/resource structure: */
40/* 48/*
41 * `string' options MUST have a usage argument 49 * `string' options MUST have a usage argument
42 * `switch' and `boolean' options have no argument 50 * `switch' and `boolean' options have no argument
… …
55#define RSTRG(rsp, kw, arg) \ 63#define RSTRG(rsp, kw, arg) \
56 {0, (rsp), (kw), NULL, (arg), NULL} 64 {0, (rsp), (kw), NULL, (arg), NULL}
57 65
58/* BOOL () - regular boolean `-/+' flag */ 66/* BOOL () - regular boolean `-/+' flag */
59#define BOOL(rsp, kw, opt, flag, desc) \ 67#define BOOL(rsp, kw, opt, flag, desc) \
60 { (Opt_Boolean| (flag)), (rsp), (kw), (opt), NULL, (desc)} 68 { (Optflag_Boolean | (flag)), (rsp), (kw), (opt), NULL, (desc)}
61 69
62/* SWCH () - `-' flag */ 70/* SWCH () - `-' flag */
63#define SWCH(opt, flag, desc) \ 71#define SWCH(opt, flag, desc) \
64 { (flag), -1, NULL, (opt), NULL, (desc)} 72 { (flag), -1, NULL, (opt), NULL, (desc)}
65 73
66/* convenient macros */ 74/* convenient macros */
67#define optList_strlen(i) \ 75#define optList_strlen(i) \
68 (optList[i].flag ? 0 : (optList[i].arg ? STRLEN (optList[i].arg) : 1)) 76 (optList[i].flag ? 0 : (optList[i].arg ? strlen (optList[i].arg) : 1))
69#define optList_isBool(i) \ 77#define optList_isBool(i) \
70 (optList[i].flag & Opt_Boolean) 78 (optList[i].flag & Optflag_Boolean)
71#define optList_isReverse(i) \ 79#define optList_isReverse(i) \
72 (optList[i].flag & Opt_Reverse) 80 (optList[i].flag & Optflag_Reverse)
73#define optList_size() \ 81#define optList_size \
74 (sizeof (optList) / sizeof (optList[0])) 82 (sizeof (optList) / sizeof (optList[0]))
75 83
76static const struct 84static const struct
77 { 85 {
78 const unsigned long flag; /* Option flag */ 86 const unsigned long flag; /* Option flag */
… …
92 SWCH ("iconic", Opt_iconic, "start iconic"), 100 SWCH ("iconic", Opt_iconic, "start iconic"),
93 SWCH ("ic", Opt_iconic, NULL), /* short form */ 101 SWCH ("ic", Opt_iconic, NULL), /* short form */
94 BOOL (Rs_reverseVideo, "reverseVideo", "rv", Opt_reverseVideo, "reverse video"), 102 BOOL (Rs_reverseVideo, "reverseVideo", "rv", Opt_reverseVideo, "reverse video"),
95 BOOL (Rs_loginShell, "loginShell", "ls", Opt_loginShell, "login shell"), 103 BOOL (Rs_loginShell, "loginShell", "ls", Opt_loginShell, "login shell"),
96 BOOL (Rs_jumpScroll, "jumpScroll", "j", Opt_jumpScroll, "jump scrolling"), 104 BOOL (Rs_jumpScroll, "jumpScroll", "j", Opt_jumpScroll, "jump scrolling"),
105 BOOL (Rs_pastableTabs, "pastableTabs", "ptab", Opt_pastableTabs, "tab characters are pastable"),
97#ifdef HAVE_SCROLLBARS 106#if HAVE_SCROLLBARS
107 RSTRG (Rs_scrollstyle, "scrollstyle", "mode"),
98 BOOL (Rs_scrollBar, "scrollBar", "sb", Opt_scrollBar, "scrollbar"), 108 BOOL (Rs_scrollBar, "scrollBar", "sb", Opt_scrollBar, "scrollbar"),
99 BOOL (Rs_scrollBar_right, "scrollBar_right", "sr", Opt_scrollBar_right, "scrollbar right"), 109 BOOL (Rs_scrollBar_right, "scrollBar_right", "sr", Opt_scrollBar_right, "scrollbar right"),
100 BOOL (Rs_scrollBar_floating, "scrollBar_floating", "st", Opt_scrollBar_floating, "scrollbar without a trough"), 110 BOOL (Rs_scrollBar_floating, "scrollBar_floating", "st", Opt_scrollBar_floating, "scrollbar without a trough"),
111 RSTRG (Rs_scrollBar_align, "scrollBar_align", "mode"),
112 STRG (Rs_scrollBar_thickness, "thickness", "sbt", "number", "scrollbar thickness/width in pixels"),
101#endif 113#endif
102 BOOL (Rs_scrollTtyOutput, "scrollTtyOutput", NULL, Opt_scrollTtyOutput, NULL), 114 BOOL (Rs_scrollTtyOutput, "scrollTtyOutput", NULL, Opt_scrollTtyOutput, NULL),
103 BOOL (Rs_scrollTtyOutput, NULL, "si", Opt_Reverse | Opt_scrollTtyOutput, "scroll-on-tty-output inhibit"), 115 BOOL (Rs_scrollTtyOutput, NULL, "si", Optflag_Reverse | Opt_scrollTtyOutput, "scroll-on-tty-output inhibit"),
104 BOOL (Rs_scrollTtyKeypress, "scrollTtyKeypress", "sk", Opt_scrollTtyKeypress, "scroll-on-keypress"), 116 BOOL (Rs_scrollTtyKeypress, "scrollTtyKeypress", "sk", Opt_scrollTtyKeypress, "scroll-on-keypress"),
105 BOOL (Rs_scrollWithBuffer, "scrollWithBuffer", "sw", Opt_scrollWithBuffer, "scroll-with-buffer"), 117 BOOL (Rs_scrollWithBuffer, "scrollWithBuffer", "sw", Opt_scrollWithBuffer, "scroll-with-buffer"),
106#ifdef TRANSPARENT 118#if TRANSPARENT
107 BOOL (Rs_transparent, "inheritPixmap", "ip", Opt_transparent, "inherit parent pixmap"), 119 BOOL (Rs_transparent, "inheritPixmap", "ip", Opt_transparent, "inherit parent pixmap"),
108 BOOL (Rs_transparent_all, "inheritPixmapforce", "ipf", Opt_transparent_all, "forcefully inherit root pixmap"),
109 SWCH ("tr", Opt_transparent, NULL), 120 SWCH ("tr", Opt_transparent, NULL),
121# if TINTING
122 STRG (Rs_color + Color_tint, "tintColor", "tint", "color", "tint color"),
123# endif
124#endif
125#if OFF_FOCUS_FADING
126 STRG (Rs_fade, "fading", "fade", "%", "fade colors x% percent when rxvt-unicode is losing focus"),
127 STRG (Rs_color + Color_fade, "fadeColor", "fadecolor", "color", "target color for off-focus fading"),
128#endif
110#if TINTING 129#if TINTING
111 STRG (Rs_color + Color_tint, "tintColor", "tint", "color", "tint color"),
112#endif
113#endif
114#ifdef OFF_FOCUS_FADING
115 STRG (Rs_fade, "fading", "fade", "%", "make colors x% darker when urxvt is losing focus."),
116#endif
117#ifdef TINTING
118 STRG (Rs_shade, "shading", "sh", "%", "shade background by x% when tinting."), 130 STRG (Rs_shade, "shading", "sh", "%", "shade background by x% when tinting."),
119#endif 131#endif
120 BOOL (Rs_utmpInhibit, "utmpInhibit", "ut", Opt_utmpInhibit, "utmp inhibit"), 132 BOOL (Rs_utmpInhibit, "utmpInhibit", "ut", Opt_utmpInhibit, "utmp inhibit"),
121#ifndef NO_BELL 133#ifndef NO_BELL
122 BOOL (Rs_visualBell, "visualBell", "vb", Opt_visualBell, "visual bell"), 134 BOOL (Rs_visualBell, "visualBell", "vb", Opt_visualBell, "visual bell"),
… …
128 BOOL (Rs_meta8, "meta8", NULL, Opt_meta8, NULL), 140 BOOL (Rs_meta8, "meta8", NULL, Opt_meta8, NULL),
129#endif 141#endif
130#ifdef MOUSE_WHEEL 142#ifdef MOUSE_WHEEL
131 BOOL (Rs_mouseWheelScrollPage, "mouseWheelScrollPage", NULL, Opt_mouseWheelScrollPage, NULL), 143 BOOL (Rs_mouseWheelScrollPage, "mouseWheelScrollPage", NULL, Opt_mouseWheelScrollPage, NULL),
132#endif 144#endif
133#ifndef NO_FRILLS 145#if ENABLE_FRILLS
134 BOOL (Rs_tripleclickwords, "tripleclickwords", "tcw", Opt_tripleclickwords, "triple click word selection"), 146 BOOL (Rs_tripleclickwords, "tripleclickwords", "tcw", Opt_tripleclickwords, "triple click word selection"),
135 BOOL (Rs_insecure, "insecure", "insecure", Opt_insecure, "enable possibly insecure escape sequences"), 147 BOOL (Rs_insecure, "insecure", "insecure", Opt_insecure, "enable possibly insecure escape sequences"),
148 BOOL (Rs_cursorUnderline, "cursorUnderline", "uc", Opt_cursorUnderline, "underline cursor"),
136#endif 149#endif
137#ifdef CURSOR_BLINK 150#if CURSOR_BLINK
138 BOOL (Rs_cursorBlink, "cursorBlink", "bc", Opt_cursorBlink, "blinking cursor"), 151 BOOL (Rs_cursorBlink, "cursorBlink", "bc", Opt_cursorBlink, "blinking cursor"),
139#endif 152#endif
140#ifdef POINTER_BLANK 153#ifdef POINTER_BLANK
141 BOOL (Rs_pointerBlank, "pointerBlank", "pb", Opt_pointerBlank, "switch off pointer after delay"), 154 BOOL (Rs_pointerBlank, "pointerBlank", "pb", Opt_pointerBlank, "switch off pointer after delay"),
142#endif 155#endif
… …
148 RSTRG (Rs_color + minCOLOR + 3, "color3", "color"), 161 RSTRG (Rs_color + minCOLOR + 3, "color3", "color"),
149 RSTRG (Rs_color + minCOLOR + 4, "color4", "color"), 162 RSTRG (Rs_color + minCOLOR + 4, "color4", "color"),
150 RSTRG (Rs_color + minCOLOR + 5, "color5", "color"), 163 RSTRG (Rs_color + minCOLOR + 5, "color5", "color"),
151 RSTRG (Rs_color + minCOLOR + 6, "color6", "color"), 164 RSTRG (Rs_color + minCOLOR + 6, "color6", "color"),
152 RSTRG (Rs_color + minCOLOR + 7, "color7", "color"), 165 RSTRG (Rs_color + minCOLOR + 7, "color7", "color"),
153#ifndef NO_BRIGHTCOLOR
154 RSTRG (Rs_color + minBrightCOLOR + 0, "color8", "color"), 166 RSTRG (Rs_color + minBrightCOLOR + 0, "color8", "color"),
155 RSTRG (Rs_color + minBrightCOLOR + 1, "color9", "color"), 167 RSTRG (Rs_color + minBrightCOLOR + 1, "color9", "color"),
156 RSTRG (Rs_color + minBrightCOLOR + 2, "color10", "color"), 168 RSTRG (Rs_color + minBrightCOLOR + 2, "color10", "color"),
157 RSTRG (Rs_color + minBrightCOLOR + 3, "color11", "color"), 169 RSTRG (Rs_color + minBrightCOLOR + 3, "color11", "color"),
158 RSTRG (Rs_color + minBrightCOLOR + 4, "color12", "color"), 170 RSTRG (Rs_color + minBrightCOLOR + 4, "color12", "color"),
159 RSTRG (Rs_color + minBrightCOLOR + 5, "color13", "color"), 171 RSTRG (Rs_color + minBrightCOLOR + 5, "color13", "color"),
160 RSTRG (Rs_color + minBrightCOLOR + 6, "color14", "color"), 172 RSTRG (Rs_color + minBrightCOLOR + 6, "color14", "color"),
161 RSTRG (Rs_color + minBrightCOLOR + 7, "color15", "color"), 173 RSTRG (Rs_color + minBrightCOLOR + 7, "color15", "color"),
162#endif /* NO_BRIGHTCOLOR */
163#ifndef NO_BOLD_UNDERLINE_REVERSE 174#ifndef NO_BOLD_UNDERLINE_REVERSE
164 BOOL (Rs_realBold, "realBold", "rb", Opt_realBold, "use bold fonts for bold text"),
165 RSTRG (Rs_color + Color_BD, "colorBD", "color"), 175 RSTRG (Rs_color + Color_BD, "colorBD", "color"),
176 RSTRG (Rs_color + Color_IT, "colorIT", "color"),
166 RSTRG (Rs_color + Color_UL, "colorUL", "color"), 177 RSTRG (Rs_color + Color_UL, "colorUL", "color"),
167 RSTRG (Rs_color + Color_RV, "colorRV", "color"), 178 RSTRG (Rs_color + Color_RV, "colorRV", "color"),
168#endif /* ! NO_BOLD_UNDERLINE_REVERSE */ 179#endif /* ! NO_BOLD_UNDERLINE_REVERSE */
180#if ENABLE_FRILLS
181 RSTRG (Rs_color + Color_underline, "underlineColor", "color"),
182#endif
169#ifdef KEEP_SCROLLCOLOR 183#ifdef KEEP_SCROLLCOLOR
170 RSTRG (Rs_color + Color_scroll, "scrollColor", "color"), 184 RSTRG (Rs_color + Color_scroll, "scrollColor", "color"),
171 RSTRG (Rs_color + Color_trough, "troughColor", "color"), 185 RSTRG (Rs_color + Color_trough, "troughColor", "color"),
172#endif /* KEEP_SCROLLCOLOR */ 186#endif /* KEEP_SCROLLCOLOR */
173#ifdef OPTION_HC 187#ifdef OPTION_HC
174 STRG (Rs_color + Color_HC, "highlightColor", "hc", "color", "highlight color"), 188 STRG (Rs_color + Color_HC, "highlightColor", "hc", "color", "highlight color"),
175#endif 189#endif
190#ifndef NO_CURSORCOLOR
191 STRG (Rs_color + Color_cursor, "cursorColor", "cr", "color", "cursor color"),
192 /* command-line option = resource name */
193 RSTRG (Rs_color + Color_cursor2, "cursorColor2", "color"),
194#endif /* NO_CURSORCOLOR */
195 STRG (Rs_color + Color_pointer_fg, "pointerColor", "pr", "color", "pointer color"),
196 STRG (Rs_color + Color_pointer_bg, "pointerColor2", "pr2", "color", "pointer bg color"),
197 STRG (Rs_color + Color_border, "borderColor", "bd", "color", "border color"),
176#if defined (XPM_BACKGROUND) || (MENUBAR_MAX) 198#if defined (XPM_BACKGROUND) || (MENUBAR_MAX)
177 RSTRG (Rs_path, "path", "search path"), 199 RSTRG (Rs_path, "path", "search path"),
178#endif /* defined (XPM_BACKGROUND) || (MENUBAR_MAX) */ 200#endif /* defined (XPM_BACKGROUND) || (MENUBAR_MAX) */
179#ifdef XPM_BACKGROUND 201#ifdef XPM_BACKGROUND
180 STRG (Rs_backgroundPixmap, "backgroundPixmap", "pixmap", "file[;geom]", "background pixmap"), 202 STRG (Rs_backgroundPixmap, "backgroundPixmap", "pixmap", "file[;geom]", "background pixmap"),
181#endif /* XPM_BACKGROUND */ 203#endif /* XPM_BACKGROUND */
182#if (MENUBAR_MAX) 204#if (MENUBAR_MAX)
183 RSTRG (Rs_menu, "menu", "name[;tag]"), 205 RSTRG (Rs_menu, "menu", "name[;tag]"),
184#endif 206#endif
207 /* fonts: command-line option = resource name */
185 STRG (Rs_font, "font", "fn", "fontname", "normal text font"), 208 STRG (Rs_font, "font", "fn", "fontname", "normal text font"),
186 /* fonts: command-line option = resource name */ 209#if ENABLE_STYLES
210 STRG (Rs_boldFont, "boldFont", "fb", "fontname", "bold font"),
211 STRG (Rs_italicFont, "italicFont", "fi", "fontname", "italic font"),
212 STRG (Rs_boldItalicFont, "boldItalicFont", "fbi", "fontname", "bold italic font"),
213 BOOL (Rs_intensityStyles, "intensityStyles", "is", Opt_intensityStyles, "font styles imply intensity changes"),
214#endif
187#ifdef USE_XIM 215#ifdef USE_XIM
188 STRG (Rs_inputMethod, "inputMethod", "im", "name", "name of input method"), 216 STRG (Rs_inputMethod, "inputMethod", "im", "name", "name of input method"),
189 STRG (Rs_preeditType, "preeditType", "pt", "style", "input style: style = OverTheSpot|OffTheSpot|Root"), 217 STRG (Rs_preeditType, "preeditType", "pt", "style", "input style: style = OverTheSpot|OffTheSpot|Root"),
190#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
191 STRG (Rs_imLocale, "imLocale", "imlocale", "string", "locale to use for input method"), 218 STRG (Rs_imLocale, "imLocale", "imlocale", "string", "locale to use for input method"),
192#endif 219 STRG (Rs_imFont, "imFont", "imfont", "fontname", "fontset for styles OverTheSpot and OffTheSpot"),
193#endif /* USE_XIM */ 220#endif /* USE_XIM */
194 STRG (Rs_name, NULL, "name", "string", "client instance, icon, and title strings"), 221 STRG (Rs_name, NULL, "name", "string", "client instance, icon, and title strings"),
195 STRG (Rs_title, "title", "title", "string", "title name for window"), 222 STRG (Rs_title, "title", "title", "string", "title name for window"),
196 STRG (Rs_title, NULL, "T", NULL, NULL), /* short form */ 223 STRG (Rs_title, NULL, "T", NULL, NULL), /* short form */
197 STRG (Rs_iconName, "iconName", "n", "string", "icon name for window"), 224 STRG (Rs_iconName, "iconName", "n", "string", "icon name for window"),
198#ifndef NO_CURSORCOLOR
199 STRG (Rs_color + Color_cursor, "cursorColor", "cr", "color", "cursor color"),
200 /* command-line option = resource name */
201 RSTRG (Rs_color + Color_cursor2, "cursorColor2", "color"),
202#endif /* NO_CURSORCOLOR */
203 STRG (Rs_color + Color_pointer_fg, "pointerColor", "pr", "color", "pointer color"),
204 STRG (Rs_color + Color_pointer_bg, "pointerColor2", "pr2", "color", "pointer bg color"),
205 STRG (Rs_color + Color_border, "borderColor", "bd", "color", "border color"),
206 STRG (Rs_saveLines, "saveLines", "sl", "number", "number of scrolled lines to save"), 225 STRG (Rs_saveLines, "saveLines", "sl", "number", "number of scrolled lines to save"),
207#ifndef NO_FRILLS 226#if ENABLE_XEMBED
227 STRG (Rs_embed, NULL, "embed", "windowid", "window id to embed terminal in"),
228#endif
229#if ENABLE_FRILLS
230 RSTRG (Rs_transient_for, "transient-for", "windowid"),
231 STRG (Rs_pty_fd, NULL, "pty-fd", "fileno", "file descriptor of pty to use"),
232 BOOL (Rs_hold, "hold", "hold", Opt_hold, "retain window after shell exit"),
208 STRG (Rs_ext_bwidth, "externalBorder", "w", "number", "external border in pixels"), 233 STRG (Rs_ext_bwidth, "externalBorder", "w", "number", "external border in pixels"),
209 STRG (Rs_ext_bwidth, NULL, "bw", NULL, NULL), 234 STRG (Rs_ext_bwidth, NULL, "bw", NULL, NULL),
210 STRG (Rs_ext_bwidth, NULL, "borderwidth", NULL, NULL), 235 STRG (Rs_ext_bwidth, NULL, "borderwidth", NULL, NULL),
211 STRG (Rs_int_bwidth, "internalBorder", "b", "number", "internal border in pixels"), 236 STRG (Rs_int_bwidth, "internalBorder", "b", "number", "internal border in pixels"),
212 BOOL (Rs_borderLess, "borderLess", "bl", Opt_borderLess, "borderless window"), 237 BOOL (Rs_borderLess, "borderLess", "bl", Opt_borderLess, "borderless window"),
213#endif 238 BOOL (Rs_skipBuiltinGlyphs, "skipBuiltinGlyphs", "sbg", Opt_skipBuiltinGlyphs, "do not use internal glyphs"),
214#ifndef NO_LINESPACE
215 STRG (Rs_lineSpace, "lineSpace", "lsp", "number", "number of extra pixels between rows"), 239 STRG (Rs_lineSpace, "lineSpace", "lsp", "number", "number of extra pixels between rows"),
216#endif 240#endif
217 STRG (Rs_scrollBar_thickness, "thickness", "sbt", "number", "scrollbar thickness/width in pixels"),
218#ifdef POINTER_BLANK 241#ifdef POINTER_BLANK
219 RSTRG (Rs_pointerBlankDelay, "pointerBlankDelay", "number"), 242 RSTRG (Rs_pointerBlankDelay, "pointerBlankDelay", "number"),
220#endif 243#endif
221#ifndef NO_BACKSPACE_KEY 244#ifndef NO_BACKSPACE_KEY
222 RSTRG (Rs_backspace_key, "backspacekey", "string"), 245 RSTRG (Rs_backspace_key, "backspacekey", "string"),
223#endif 246#endif
224#ifndef NO_DELETE_KEY 247#ifndef NO_DELETE_KEY
225 RSTRG (Rs_delete_key, "deletekey", "string"), 248 RSTRG (Rs_delete_key, "deletekey", "string"),
226#endif 249#endif
227 RSTRG (Rs_selectstyle, "selectstyle", "mode"), 250 RSTRG (Rs_selectstyle, "selectstyle", "mode"),
228 RSTRG (Rs_scrollstyle, "scrollstyle", "mode"),
229#ifdef HAVE_SCROLLBARS
230 RSTRG (Rs_scrollBar_align, "scrollBar_align", "mode"),
231#endif
232#ifdef PRINTPIPE 251#ifdef PRINTPIPE
233 RSTRG (Rs_print_pipe, "print-pipe", "string"), 252 RSTRG (Rs_print_pipe, "print-pipe", "string"),
234#endif 253#endif
235 STRG (Rs_modifier, "modifier", "mod", "modifier", "meta modifier = alt|meta|hyper|super|mod1|...|mod5"), 254 STRG (Rs_modifier, "modifier", "mod", "modifier", "meta modifier = alt|meta|hyper|super|mod1|...|mod5"),
236 INFO ("xrm", "string", "X resource"),
237#ifdef CUTCHAR_RESOURCE 255#ifdef CUTCHAR_RESOURCE
238 RSTRG (Rs_cutchars, "cutchars", "string"), 256 RSTRG (Rs_cutchars, "cutchars", "string"),
239#endif /* CUTCHAR_RESOURCE */ 257#endif /* CUTCHAR_RESOURCE */
240 RSTRG (Rs_answerbackstring, "answerbackString", "string"), 258 RSTRG (Rs_answerbackstring, "answerbackString", "string"),
241#ifndef NO_SECONDARY_SCREEN 259#ifndef NO_SECONDARY_SCREEN
242 BOOL (Rs_secondaryScreen, "secondaryScreen", "ssc", Opt_secondaryScreen, "enable secondary screen"), 260 BOOL (Rs_secondaryScreen, "secondaryScreen", "ssc", Opt_secondaryScreen, "enable secondary screen"),
243 BOOL (Rs_secondaryScroll, "secondaryScroll", "ssr", Opt_secondaryScroll, "enable secondary screen scroll"), 261 BOOL (Rs_secondaryScroll, "secondaryScroll", "ssr", Opt_secondaryScroll, "enable secondary screen scroll"),
244#endif 262#endif
263#if ENABLE_PERL
264 RSTRG (Rs_perl_lib, "perl-lib", "string"), //, "colon-separated directories with extension scripts"),TODO
265 RSTRG (Rs_perl_eval, "perl-eval", "perl-eval"), // "string", "code to be evaluated after all extensions have been loaded"),TODO
266 RSTRG (Rs_perl_ext_1, "perl-ext-common", "string"), //, "colon-separated list of perl extensions to enable"),TODO
267 STRG (Rs_perl_ext_2, "perl-ext", "pe", "string", "colon-separated list of perl extensions to enable for this instance"),
268#endif
269#if 0 && TODO
270#if !defined(NO_RESOURCES) && defined(USE_XGETDEFAULT)
271 INFO ("xrm", "string", "X resource"),
272#endif
273#endif
245 INFO ("e", "command arg ...", "command to execute") 274 INFO ("e", "command arg ...", "command to execute")
246 }; 275 };
247 276
248#undef INFO 277#undef INFO
249#undef STRG 278#undef STRG
250#undef RSTRG 279#undef RSTRG
251#undef SWCH 280#undef SWCH
252#undef BOOL 281#undef BOOL
253/*}}} */ 282/*}}} */
254 283
255static const char releasestring[] = "Rxvt v" VERSION " - released: " DATE "\n"; 284static const char releasestring[] = "rxvt-unicode (" RXVTNAME ") v" VERSION " - released: " DATE "\n";
256static const char optionsstring[] = "Options: " 285static const char optionsstring[] = "options: "
286#if XFT
287 "xft,"
288#endif
289#if ENABLE_STYLES
290 "styles,"
291#endif
292#if ENABLE_COMBINING
293 "combining,"
294#endif
295#if TEXT_BLINK
296 "blink,"
297#endif
298#if ISO_14755
299 "iso14755,"
300#endif
301#if UNICODE_3
302 "unicode3,"
303#endif
304 "encodings=eu+vn"
305#if ENCODING_JP
306 "+jp"
307#endif
308#if ENCODING_JP_EXT
309 "+jp-ext"
310#endif
311#if ENCODING_KR
312 "+kr"
313#endif
314#if ENCODING_ZH
315 "+zh"
316#endif
317#if ENCODING_ZH_EXT
318 "+zh-ext"
319#endif
320 ","
321#if OFF_FOCUS_FADING
322 "fade,"
323#endif
257#if defined(XPM_BACKGROUND) 324#if defined(XPM_BACKGROUND)
258 "XPM," 325 "XPM,"
259#endif 326#endif
260#if defined(TRANSPARENT) 327#if defined(TRANSPARENT)
261 "transparent," 328 "transparent,"
262#endif 329#endif
330#if TINTING
331 "tint,"
332#endif
263#if defined(UTMP_SUPPORT) 333#if defined(UTMP_SUPPORT)
264 "utmp," 334 "utmp,"
265#endif 335#endif
266#if defined(MENUBAR) 336#if defined(MENUBAR)
267 "menubar," 337 "menubar,"
268#endif
269#if !defined(NO_FRILLS)
270 "frills,"
271#endif
272#if !defined(NO_LINESPACE)
273 "linespace,"
274#endif
275#if defined(PREFER_24BIT)
276 "24bit,"
277#endif 338#endif
278#if defined(USE_XIM) 339#if defined(USE_XIM)
279 "XIM," 340 "XIM,"
280#endif 341#endif
281 "scrollbars=" 342 "scrollbars="
… …
309 "no_backspace," 370 "no_backspace,"
310#endif 371#endif
311#if defined(NO_DELETE_KEY) 372#if defined(NO_DELETE_KEY)
312 "no_delete," 373 "no_delete,"
313#endif 374#endif
375#if EIGHT_BIT_CONTROLS
376 "8bitctrls,"
377#endif
314#if !defined(NO_STRINGS) 378#if !defined(NO_STRINGS)
315 "strings," 379 "strings,"
316#endif 380#endif
317#if defined(TTY_256COLOR) 381#if defined(ENABLE_FRILLS)
382 "frills,"
383#endif
384#if defined(PREFER_24BIT)
318 "256colour," 385 "24bit,"
386#endif
387#if defined(SELECTION_SCROLLING)
388 "selectionscrolling,"
389#endif
390#if MOUSE_WHEEL
391 "wheel,"
392#endif
393#if MOUSE_SLIP_WHEELING
394 "slipwheel,"
395#endif
396#if defined(SMART_RESIZE)
397 "smart-resize,"
398#endif
399#if defined(CURSOR_BLINK)
400 "cursorBlink,"
401#endif
402#if defined(POINTER_BLANK)
403 "pointerBlank,"
319#endif 404#endif
320#if defined(NO_RESOURCES) 405#if defined(NO_RESOURCES)
321 "NoResources" 406 "NoResources"
322#else 407#else
323# if defined(USE_XGETDEFAULT) 408# if defined(USE_XGETDEFAULT)
… …
342 switch (type) 427 switch (type)
343 { 428 {
344 case 0: /* brief listing */ 429 case 0: /* brief listing */
345 rxvt_log (" [-help] [--help]\n"); 430 rxvt_log (" [-help] [--help]\n");
346 431
347 for (col = 1, i = 0; i < optList_size (); i++) 432 for (col = 1, i = 0; i < optList_size; i++)
348 if (optList[i].desc != NULL) 433 if (optList[i].desc != NULL)
349 { 434 {
350 int len = 0; 435 int len = 0;
351 436
352 if (!optList_isBool (i)) 437 if (!optList_isBool (i))
… …
356 len++; /* account for space */ 441 len++; /* account for space */
357 } 442 }
358#ifdef DEBUG_STRICT 443#ifdef DEBUG_STRICT
359 assert (optList[i].opt != NULL); 444 assert (optList[i].opt != NULL);
360#endif 445#endif
361 len += 4 + STRLEN (optList[i].opt) + (optList_isBool (i) ? 2: 0); 446 len += 4 + strlen (optList[i].opt) + (optList_isBool (i) ? 2: 0);
362 col += len; 447 col += len;
363 if (col > 79) 448 if (col > 79)
364 { /* assume regular width */ 449 { /* assume regular width */
365 rxvt_log ("\n"); 450 rxvt_log ("\n");
366 col = 1 + len; 451 col = 1 + len;
… …
375 break; 460 break;
376 461
377 case 1: /* full command-line listing */ 462 case 1: /* full command-line listing */
378 rxvt_log (" [options] [-e command args]\n\nwhere options include:\n"); 463 rxvt_log (" [options] [-e command args]\n\nwhere options include:\n");
379 464
380 for (i = 0; i < optList_size (); i++) 465 for (i = 0; i < optList_size; i++)
381 if (optList[i].desc != NULL) 466 if (optList[i].desc != NULL)
382 { 467 {
383#ifdef DEBUG_STRICT 468#ifdef DEBUG_STRICT
384 assert (optList[i].opt != NULL); 469 assert (optList[i].opt != NULL);
385#endif 470#endif
386 rxvt_log (" %s%s %-*s%s%s\n", 471 rxvt_log (" %s%s %-*s%s%s\n",
387 (optList_isBool (i) ? "-/+" : "-"), optList[i].opt, 472 (optList_isBool (i) ? "-/+" : "-"), optList[i].opt,
388 (INDENT - STRLEN (optList[i].opt) 473 (INDENT - strlen (optList[i].opt)
389 + (optList_isBool (i) ? 0 : 2)), 474 + (optList_isBool (i) ? 0 : 2)),
390 (optList[i].arg ? optList[i].arg : ""), 475 (optList[i].arg ? optList[i].arg : ""),
391 (optList_isBool (i) ? "turn on/off " : ""), 476 (optList_isBool (i) ? "turn on/off " : ""),
392 optList[i].desc); 477 optList[i].desc);
393 } 478 }
… …
396 481
397 case 2: /* full resource listing */ 482 case 2: /* full resource listing */
398 rxvt_log (" [options] [-e command args]\n\n" 483 rxvt_log (" [options] [-e command args]\n\n"
399 "where resources (long-options) include:\n"); 484 "where resources (long-options) include:\n");
400 485
401 for (i = 0; i < optList_size (); i++) 486 for (i = 0; i < optList_size; i++)
402 if (optList[i].kw != NULL) 487 if (optList[i].kw != NULL)
403 rxvt_log (" %s: %*s%s\n", 488 rxvt_log (" %s: %*s%s\n",
404 optList[i].kw, 489 optList[i].kw,
405 (INDENT - STRLEN (optList[i].kw)), "", /* XXX */ 490 (INDENT - strlen (optList[i].kw)), "", /* XXX */
406 (optList_isBool (i) ? "boolean" : optList[i].arg)); 491 (optList_isBool (i) ? "boolean" : optList[i].arg));
407#ifdef KEYSYM_RESOURCE 492#ifdef KEYSYM_RESOURCE
408 rxvt_log (" " "keysym.sym" ": %*s%s\n", 493 rxvt_log (" " "keysym.sym" ": %*s%s\n",
409 (INDENT - sizeof ("keysym.sym") + 1), "", /* XXX */ 494 (INDENT - sizeof ("keysym.sym") + 1), "", /* XXX */
410 "keysym"); 495 "keysym");
… …
427 int i, bad_option = 0; 512 int i, bad_option = 0;
428 static const char On[3] = "ON", Off[4] = "OFF"; 513 static const char On[3] = "ON", Off[4] = "OFF";
429 514
430 for (i = 1; i < argc; i++) 515 for (i = 1; i < argc; i++)
431 { 516 {
432 unsigned int entry, longopt = 0; 517 unsigned int entry, longopt = 0;
433 const char *flag, *opt; 518 const char *flag, *opt;
434 519
435 opt = argv[i]; 520 opt = argv[i];
436#ifdef DEBUG_RESOURCES 521#ifdef DEBUG_RESOURCES
437 fprintf (stderr, "argv[%d] = %s: ", i, opt); 522 fprintf (stderr, "argv[%d] = %s: ", i, opt);
438#endif 523#endif
… …
453 bad_option = 1; 538 bad_option = 1;
454 rxvt_warn ("\"%s\": malformed option.\n", opt); 539 rxvt_warn ("\"%s\": malformed option.\n", opt);
455 continue; 540 continue;
456 } 541 }
457 542
458 if (!STRCMP (opt, "help")) 543 if (!strcmp (opt, "help"))
459 rxvt_usage (longopt ? 2 : 1); 544 rxvt_usage (longopt ? 2 : 1);
460 if (!STRCMP (opt, "h")) 545 if (!strcmp (opt, "h"))
461 rxvt_usage (0); 546 rxvt_usage (0);
462 547
463 /* feature: always try to match long-options */ 548 /* feature: always try to match long-options */
464 for (entry = 0; entry < optList_size (); entry++) 549 for (entry = 0; entry < optList_size; entry++)
465 if ((optList[entry].kw && !STRCMP (opt, optList[entry].kw)) 550 if ((optList[entry].kw && !strcmp (opt, optList[entry].kw))
466 || (!longopt 551 || (!longopt
467 && optList[entry].opt && !STRCMP (opt, optList[entry].opt))) 552 && optList[entry].opt && !strcmp (opt, optList[entry].opt)))
468 break; 553 break;
469 554
470 if (entry < optList_size ()) 555 if (entry < optList_size)
471 { 556 {
472 if (optList_isReverse (entry)) 557 if (optList_isReverse (entry))
473 flag = flag == On ? Off : On; 558 flag = flag == On ? Off : On;
474 559
475 if (optList_strlen (entry)) 560 if (optList_strlen (entry))
… …
489#ifdef DEBUG_RESOURCES 574#ifdef DEBUG_RESOURCES
490 fprintf (stderr, "boolean (%s,%s) = %s\n", 575 fprintf (stderr, "boolean (%s,%s) = %s\n",
491 optList[entry].opt, optList[entry].kw, flag); 576 optList[entry].opt, optList[entry].kw, flag);
492#endif 577#endif
493 if (flag == On) 578 if (flag == On)
494 Options |= (optList[entry].flag); 579 SET_OPTION (optList[entry].flag & Optflag_mask);
495 else 580 else
496 Options &= ~ (optList[entry].flag); 581 CLR_OPTION (optList[entry].flag & Optflag_mask);
497 582
498 if (optList[entry].doff != -1) 583 if (optList[entry].doff != -1)
499 rs[optList[entry].doff] = flag; 584 rs[optList[entry].doff] = flag;
500 } 585 }
501 } 586 }
502 else 587 else
503#ifdef KEYSYM_RESOURCE 588#ifdef KEYSYM_RESOURCE
504 /* if (!STRNCMP (opt, "keysym.", sizeof ("keysym.") - 1)) */ 589 /* if (!strncmp (opt, "keysym.", sizeof ("keysym.") - 1)) */
505 if (rxvt_Str_match (opt, "keysym.")) 590 if (rxvt_Str_match (opt, "keysym."))
506 { 591 {
507 const char *str = argv[++i]; 592 const char *str = argv[++i];
508 593
509 if (str != NULL) 594 if (str != NULL)
… …
540 XrmQuarkList quarks, 625 XrmQuarkList quarks,
541 XrmRepresentation *type __attribute__((unused)), 626 XrmRepresentation *type __attribute__((unused)),
542 XrmValue *value, 627 XrmValue *value,
543 XPointer closure __attribute__((unused))) 628 XPointer closure __attribute__((unused)))
544{ 629{
545 int last; 630 int last;
546 631
547 for (last = 0; quarks[last] != NULLQUARK; last++) /* look for last quark in list */ 632 for (last = 0; quarks[last] != NULLQUARK; last++) /* look for last quark in list */
548 ; 633 ;
634
549 last--; 635 last--;
550 GET_R->parse_keysym (XrmQuarkToString (quarks[last]), (char *)value->addr);//D//TODO 636 GET_R->parse_keysym (XrmQuarkToString (quarks[last]), (char *)value->addr);//D//TODO
551 return False; 637 return False;
552} 638}
553 639
… …
558 * arg will be 644 * arg will be
559 * NULL for ~/.Xdefaults and 645 * NULL for ~/.Xdefaults and
560 * non-NULL for command-line options (need to allocate) 646 * non-NULL for command-line options (need to allocate)
561 */ 647 */
562#define NEWARGLIM 500 /* `reasonable' size */ 648#define NEWARGLIM 500 /* `reasonable' size */
649
650struct keysym_vocabulary_t
651{
652 const char *name;
653 unsigned short len;
654 unsigned short value;
655};
656keysym_vocabulary_t keysym_vocabulary[] =
657{
658 { "ISOLevel3", 9, Level3Mask },
659 { "AppKeypad", 9, AppKeypadMask },
660 { "Control", 7, ControlMask },
661 { "NumLock", 7, NumLockMask },
662 { "Shift", 5, ShiftMask },
663 { "Meta", 4, MetaMask },
664 { "Lock", 4, LockMask },
665 { "Mod1", 4, Mod1Mask },
666 { "Mod2", 4, Mod2Mask },
667 { "Mod3", 4, Mod3Mask },
668 { "Mod4", 4, Mod4Mask },
669 { "Mod5", 4, Mod5Mask },
670 { "I", 1, Level3Mask },
671 { "K", 1, AppKeypadMask },
672 { "C", 1, ControlMask },
673 { "N", 1, NumLockMask },
674 { "S", 1, ShiftMask },
675 { "M", 1, MetaMask },
676 { "A", 1, MetaMask },
677 { "L", 1, LockMask },
678 { "1", 1, Mod1Mask },
679 { "2", 1, Mod2Mask },
680 { "3", 1, Mod3Mask },
681 { "4", 1, Mod4Mask },
682 { "5", 1, Mod5Mask },
683};
684
563int 685int
564rxvt_term::parse_keysym (const char *str, const char *arg) 686rxvt_term::parse_keysym (const char *str, const char *arg)
565{ 687{
566 int n, sym; 688 int n, sym;
567 char *key_string, *newarg = NULL; 689 unsigned int state = 0;
690 const char *pmodend = NULL;
691 char *newarg = NULL;
568 char newargstr[NEWARGLIM]; 692 char newargstr[NEWARGLIM];
569 693
570 if (arg == NULL) 694 if (arg == NULL)
571 { 695 {
572 if ((n = rxvt_Str_match (str, "keysym.")) == 0) 696 if ((n = rxvt_Str_match (str, "keysym.")) == 0)
573 return 0; 697 return 0;
698
574 str += n; /* skip `keysym.' */ 699 str += n; /* skip `keysym.' */
700 if ((pmodend = strchr (str, ':')) < str)
701 return -1;
702 }
703 else
704 pmodend = str + strlen(str);
705
706 for (--pmodend; str < pmodend; --pmodend)
707 if (*pmodend == '-')
708 break;
709
710 while (str < pmodend)
575 } 711 {
712 unsigned int i;
713
714 for (i=0; i < sizeof (keysym_vocabulary) / sizeof (keysym_vocabulary_t); ++i)
715 {
716 if (strncmp (str, keysym_vocabulary [i].name, keysym_vocabulary [i].len) == 0)
717 {
718 state |= keysym_vocabulary[i].value;
719 str += keysym_vocabulary[i].len;
720 break;
721 }
722 }
723
724 if (i >= sizeof (keysym_vocabulary) / sizeof (keysym_vocabulary_t))
725 return -1;
726
727 if (*str == '-')
728 ++str;
729 }
730
576 /* some scanf () have trouble with a 0x prefix */ 731 /* some scanf () have trouble with a 0x prefix */
577 if (isdigit (str[0]))
578 {
579 if (str[0] == '0' && toupper (str[1]) == 'X') 732 if (str[0] == '0' && toupper (str[1]) == 'X')
733 {
580 str += 2; 734 str += 2;
735
581 if (arg) 736 if (arg)
582 { 737 {
583 if (sscanf (str, (STRCHR (str, ':') ? "%x:" : "%x"), &sym) != 1) 738 if (sscanf (str, (strchr (str, ':') ? "%x:" : "%x"), &sym) != 1)
584 return -1; 739 return -1;
585 } 740 }
586 else 741 else
587 { 742 {
588 if (sscanf (str, "%x:", &sym) != 1) 743 if (sscanf (str, "%x:", &sym) != 1)
589 return -1; 744 return -1;
590 745
591 /* cue to ':', it's there since sscanf () worked */ 746 /* cue to ':', it's there since sscanf () worked */
592 STRNCPY (newargstr, STRCHR (str, ':') + 1, NEWARGLIM - 1); 747 strncpy (newargstr, strchr (str, ':') + 1, NEWARGLIM - 1);
593 newargstr[NEWARGLIM - 1] = '\0'; 748 newargstr[NEWARGLIM - 1] = '\0';
594 newarg = newargstr; 749 newarg = newargstr;
595 } 750 }
596 } 751 }
597 else 752 else
598 { 753 {
599 /* 754 /*
600 * convert keysym name to keysym number 755 * convert keysym name to keysym number
601 */ 756 */
602 STRNCPY (newargstr, str, NEWARGLIM - 1); 757 strncpy (newargstr, str, NEWARGLIM - 1);
603 newargstr[NEWARGLIM - 1] = '\0'; 758 newargstr[NEWARGLIM - 1] = '\0';
759
604 if (arg == NULL) 760 if (arg == NULL)
605 { 761 {
606 if ((newarg = STRCHR (newargstr, ':')) == NULL) 762 if ((newarg = strchr (newargstr, ':')) == NULL)
607 return -1; 763 return -1;
764
608 *newarg++ = '\0'; /* terminate keysym name */ 765 *newarg++ = '\0'; /* terminate keysym name */
609 } 766 }
767
610 if ((sym = XStringToKeysym (newargstr)) == None) 768 if ((sym = XStringToKeysym (newargstr)) == None)
611 return -1; 769 return -1;
612 } 770 }
613 771
614 if (sym < 0xFF00 || sym > 0xFFFF) /* we only do extended keys */
615 return -1;
616 sym &= 0xFF;
617 if (Keysym_map[sym] != NULL) /* already set ? */
618 return -1;
619
620 if (newarg == NULL) 772 if (newarg == NULL)
621 { 773 {
622 STRNCPY (newargstr, arg, NEWARGLIM - 1); 774 strncpy (newargstr, arg, NEWARGLIM - 1);
623 newargstr[NEWARGLIM - 1] = '\0'; 775 newargstr[NEWARGLIM - 1] = '\0';
624 newarg = newargstr; 776 newarg = newargstr;
625 } 777 }
778
626 rxvt_Str_trim (newarg); 779 rxvt_Str_trim (newarg);
627 if (*newarg == '\0' || (n = rxvt_Str_escaped (newarg)) == 0) 780 if (*newarg == '\0' || (n = rxvt_Str_escaped (newarg)) == 0)
628 return -1; 781 return -1;
629 MIN_IT (n, 255);
630 key_string = (char *)rxvt_malloc ((n + 1) * sizeof (char));
631 782
632 key_string[0] = n; 783 keyboard->register_user_translation (sym, state, newarg);
633 STRNCPY (key_string + 1, newarg, n);
634 Keysym_map[sym] = (unsigned char *)key_string;
635
636 return 1; 784 return 1;
637} 785}
638 786
639# endif /* KEYSYM_RESOURCE */ 787# endif /* KEYSYM_RESOURCE */
640 788
… …
650 char *str, buffer[256]; 798 char *str, buffer[256];
651 799
652 if (stream == NULL) 800 if (stream == NULL)
653 return; 801 return;
654 802
655 len = STRLEN (name); 803 len = strlen (name);
656 while ((str = fgets (buffer, sizeof (buffer), stream)) != NULL) 804 while ((str = fgets (buffer, sizeof (buffer), stream)) != NULL)
657 { 805 {
658 unsigned int entry, n; 806 unsigned int entry, n;
659 807
660 while (*str && isspace (*str)) 808 while (*str && isspace (*str))
661 str++; /* leading whitespace */ 809 str++; /* leading whitespace */
662 810
663 if ((str[len] != '*' && str[len] != '.') 811 if ((str[len] != '*' && str[len] != '.')
664 || (len && STRNCMP (str, name, len))) 812 || (len && strncmp (str, name, len)))
665 continue; 813 continue;
666 str += (len + 1); /* skip `name*' or `name.' */ 814 str += (len + 1); /* skip `name*' or `name.' */
667 815
668# ifdef KEYSYM_RESOURCE 816# ifdef KEYSYM_RESOURCE
669 if (!parse_keysym (str, NULL)) 817 if (!parse_keysym (str, NULL))
670# endif /* KEYSYM_RESOURCE */ 818# endif /* KEYSYM_RESOURCE */
671 for (entry = 0; entry < optList_size (); entry++) 819 for (entry = 0; entry < optList_size; entry++)
672 { 820 {
673 const char *kw = optList[entry].kw; 821 const char *kw = optList[entry].kw;
674 822
675 if (kw == NULL) 823 if (kw == NULL)
676 continue; 824 continue;
677 825
678 n = STRLEN (kw); 826 n = strlen (kw);
679 if (str[n] == ':' && rxvt_Str_match (str, kw)) 827 if (str[n] == ':' && rxvt_Str_match (str, kw))
680 { 828 {
681 /* skip `keyword:' */ 829 /* skip `keyword:' */
682 str += n + 1; 830 str += n + 1;
683 rxvt_Str_trim (str); 831 rxvt_Str_trim (str);
684 n = STRLEN (str); 832 n = strlen (str);
833
685 if (n && rs[optList[entry].doff] == NULL) 834 if (n && rs[optList[entry].doff] == NULL)
686 { 835 {
687 /* not already set */ 836 /* not already set */
688 int s; 837 int s;
689 char *p = 0; 838 char *p = 0;
690 839
691 for (int o = 0;;) 840 for (int o = 0;;)
692 { 841 {
693 p = (char *)rxvt_realloc (p, o + n + 1); 842 p = (char *)rxvt_realloc (p, o + n + 1);
694 MEMCPY (p + o, str, n); 843 memcpy (p + o, str, n);
695 o += n; 844 o += n;
696 p[o] = 0; 845 p[o] = 0;
697 846
698 if (o == 0 || p[o - 1] != '\\') // continuation line 847 if (o == 0 || p[o - 1] != '\\') // continuation line
699 break; 848 break;
… …
702 851
703 if ((str = fgets (buffer, sizeof (buffer), stream)) == NULL) 852 if ((str = fgets (buffer, sizeof (buffer), stream)) == NULL)
704 break; 853 break;
705 854
706 rxvt_Str_trim (str); 855 rxvt_Str_trim (str);
707 n = STRLEN (str); 856 n = strlen (str);
708 } 857 }
709 858
710 rs[optList[entry].doff] = p; 859 rs[optList[entry].doff] = p;
711 allocated.push_back (p); 860 allocated.push_back (p);
712 861
713 if (optList_isBool (entry)) 862 if (optList_isBool (entry))
714 { 863 {
715 s = STRCASECMP (str, "TRUE") == 0 864 s = strcasecmp (str, "true") == 0
716 || STRCASECMP (str, "YES") == 0 865 || strcasecmp (str, "yes") == 0
717 || STRCASECMP (str, "ON") == 0 866 || strcasecmp (str, "on") == 0
718 || STRCASECMP (str, "1") == 0; 867 || strcmp (str, "1") == 0;
719 868
720 if (optList_isReverse (entry)) 869 if (optList_isReverse (entry))
721 s = !s; 870 s = !s;
722 871
723 if (s) 872 if (s)
724 Options |= optList[entry].flag; 873 SET_OPTION (optList[entry].flag & Optflag_mask);
725 else 874 else
726 Options &= ~optList[entry].flag; 875 CLR_OPTION (optList[entry].flag & Optflag_mask);
727 } 876 }
728 } 877 }
729 878
730 break; 879 break;
731 } 880 }
… …
743/* 892/*
744 * using XGetDefault () or the hand-rolled replacement 893 * using XGetDefault () or the hand-rolled replacement
745 */ 894 */
746/* ARGSUSED */ 895/* ARGSUSED */
747void 896void
748rxvt_term::extract_resources (Display *display __attribute__ ((unused)), const char *name) 897rxvt_term::extract_resources ()
749{ 898{
899 dDisp;
900
750#ifndef NO_RESOURCES 901#ifndef NO_RESOURCES
902
903 char *homedir = (char *)getenv ("HOME");
904 char fname[1024];
751 905
752# if defined XAPPLOADDIR 906# if defined XAPPLOADDIR
753# if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE) 907# if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
754 /* Compute the path of the possibly available localized Rxvt file */ 908 /* Compute the path of the possibly available localized Rxvt file */
755 char *localepath = NULL; 909 char localepath[1024];
756 910
757 if (locale != NULL) 911 if (locale)
758 { /* XXX: must limit length of string */
759 localepath = (char *)rxvt_malloc (256);
760 sprintf (localepath, XAPPLOADDIRLOCALE "/" RESCLASS, 912 snprintf (localepath, sizeof (localepath), XAPPLOADDIRLOCALE "/" RESCLASS, locale);
761 (int) (258 - sizeof (XAPPLOADDIRLOCALE) - sizeof (RESCLASS)), 913 else
762 locale); /* 258 = 255 + 4 (-.*s) - 1 (/) */ 914 localepath[0] = 0;
763 }
764
765 {
766# endif 915# endif
767# endif 916# endif
768 917
769# ifdef USE_XGETDEFAULT 918# ifdef USE_XGETDEFAULT
770 /* 919 /*
771 * get resources using the X library function 920 * get resources using the X library function
772 */ 921 */
773 int entry; 922 int entry;
774 923
775# ifdef XrmEnumOneLevel 924# ifdef XrmEnumOneLevel
776 int i;
777 char *displayResource, *xe; 925 char *displayResource, *xe;
778 XrmName name_prefix[3]; 926 XrmName name_prefix[3];
779 XrmClass class_prefix[3]; 927 XrmClass class_prefix[3];
780 XrmDatabase database, rdb1; 928 XrmDatabase database, rdb1;
781 char fname[1024];
782 929
783 XrmInitialize (); 930 XrmInitialize ();
784 database = NULL; 931 database = NULL;
785 932
933 // for ordering, see for example http://www.faqs.org/faqs/Xt-FAQ/ Subject: 20
934
935 // 6. System wide per application default file.
936 /* Add in Rxvt file */
937# if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
938 if (*localepath
939 && ((rdb1 = XrmGetFileDatabase (localepath))
940 || (rdb1 = XrmGetFileDatabase (XAPPLOADDIR "/" RESCLASS))))
941# endif
942 XrmMergeDatabases (rdb1, &database);
943
944 /* Add in $XAPPLRESDIR/Rxvt only; not bothering with XUSERFILESEARCHPATH */
945 if ((xe = (char *)getenv ("XAPPLRESDIR")))
946 {
947 snprintf (fname, sizeof (fname), "%s/%s", xe, RESCLASS);
948
949 if ((rdb1 = XrmGetFileDatabase (fname)))
950 XrmMergeDatabases (rdb1, &database);
951 }
952
953 // 5. User's per application default file.
954 // none
955
956 // 4. User's defaults file.
786 /* Get any Xserver defaults */ 957 /* Get any Xserver defaults */
787
788 displayResource = XResourceManagerString (display); 958 displayResource = XResourceManagerString (disp);
789 if (displayResource != NULL) 959 if (displayResource != NULL)
960 {
790 database = XrmGetStringDatabase (displayResource); 961 if ((rdb1 = XrmGetStringDatabase (displayResource)))
791 962 XrmMergeDatabases (rdb1, &database);
792# ifdef HAVE_EXTRA_XRESOURCE_FILES
793 /* Add in ~/.Xdefaults or ~/.Xresources */
794 { 963 }
795 char *ptr; 964 else if (homedir)
965 {
966 snprintf (fname, sizeof (fname), "%s/.Xdefaults", homedir);
796 967
797 if ((ptr = (char *)getenv ("HOME")) == NULL) 968 if ((rdb1 = XrmGetFileDatabase (fname)))
798 ptr = "."; 969 XrmMergeDatabases (rdb1, &database);
970 }
799 971
800 for (i = 0; i < (sizeof (xnames) / sizeof (xnames[0])); i++) 972 /* Get screen specific resources */
973 displayResource = XScreenResourceString (ScreenOfDisplay (disp, display->screen));
974 if (displayResource != NULL)
975 {
976 if ((rdb1 = XrmGetStringDatabase (displayResource)))
977 /* Merge with screen-independent resources */
978 XrmMergeDatabases (rdb1, &database);
979
980 XFree (displayResource);
981 }
982
983 // 3. User's per host defaults file
984 /* Add in XENVIRONMENT file */
985 if ((xe = (char *)getenv ("XENVIRONMENT"))
986 && (rdb1 = XrmGetFileDatabase (xe)))
987 XrmMergeDatabases (rdb1, &database);
988 else if (homedir)
989 {
990 struct utsname un;
991
992 if (!uname (&un))
801 { 993 {
802 sprintf (fname, "%-.*s/%s", sizeof (fname) - STRLEN (xnames[i]) - 2, 994 snprintf (fname, sizeof (fname), "%s/.Xdefaults-%s", homedir, un.nodename);
803 ptr, xnames[i]); 995
804 if ((rdb1 = XrmGetFileDatabase (fname))) 996 if ((rdb1 = XrmGetFileDatabase (fname)))
997 XrmMergeDatabases (rdb1, &database);
998 }
999 }
1000
1001 XrmSetDatabase (disp, database);
1002# endif
1003
1004 /*
1005 * Query resources for options that affect us
1006 */
1007 for (entry = 0; entry < optList_size; entry++)
1008 {
1009 int s;
1010 char *p, *p0;
1011 const char *kw = optList[entry].kw;
1012
1013 if (kw == NULL || rs[optList[entry].doff] != NULL)
1014 continue; /* previously set */
1015
1016 p = XGetDefault (disp, rs[Rs_name], kw);
1017 p0 = XGetDefault (disp, "!INVALIDPROGRAMMENAMEDONTMATCH!", kw);
1018 if (p == NULL || (p0 && strcmp (p, p0) == 0))
1019 {
1020 p = XGetDefault (disp, RESCLASS, kw);
1021#ifdef RESFALLBACK
1022 if (p == NULL || (p0 && strcmp (p, p0) == 0))
1023 p = XGetDefault (disp, RESFALLBACK, kw);
1024#endif
1025 }
1026
1027 if (p == NULL && p0)
1028 p = p0;
1029
1030 if (p)
1031 {
1032 rs[optList[entry].doff] = p;
1033
1034 if (optList_isBool (entry))
805 { 1035 {
806 XrmMergeDatabases (rdb1, &database); 1036 s = strcasecmp (p, "TRUE") == 0
807# ifndef HAVE_BOTH_XRESOURCE_FILES 1037 || strcasecmp (p, "YES") == 0
1038 || strcasecmp (p, "ON") == 0
1039 || strcasecmp (p, "1") == 0;
1040
1041 if (optList_isReverse (entry))
1042 s = !s;
1043
1044 if (s)
1045 SET_OPTION (optList[entry].flag & Optflag_mask);
808 break; 1046 else
809# endif 1047 CLR_OPTION (optList[entry].flag & Optflag_mask);
810
811 } 1048 }
812 } 1049 }
813 } 1050 }
814# endif
815 1051
816 /* Add in XENVIRONMENT file */
817
818 if ((xe = (char *)getenv ("XENVIRONMENT")) != NULL
819 && (rdb1 = XrmGetFileDatabase (xe)) != NULL)
820 XrmMergeDatabases (rdb1, &database);
821
822 /* Add in Rxvt file */
823# if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
824 if (localepath == NULL || (rdb1 = XrmGetFileDatabase (localepath)) == NULL)
825# endif
826 rdb1 = XrmGetFileDatabase (XAPPLOADDIR "/" RESCLASS);
827
828 if (rdb1 != NULL)
829 XrmMergeDatabases (rdb1, &database);
830
831 /* Add in $XAPPLRESDIR/Rxvt only; not bothering with XUSERFILESEARCHPATH */
832 if ((xe = (char *)getenv ("XAPPLRESDIR")) != NULL)
833 {
834 sprintf (fname, "%-.*s/" RESCLASS, sizeof (fname)
835 - sizeof (RESCLASS) - 2, xe);
836 if ((rdb1 = XrmGetFileDatabase (fname)) != NULL)
837 XrmMergeDatabases (rdb1, &database);
838 }
839
840 XrmSetDatabase (display, database);
841# endif
842
843 /* 1052 /*
844 * Query resources for options that affect us
845 */
846 for (entry = 0; entry < optList_size (); entry++)
847 {
848 int s;
849 char *p, *p0;
850 const char *kw = optList[entry].kw;
851
852 if (kw == NULL || rs[optList[entry].doff] != NULL)
853 continue; /* previously set */
854
855 p = XGetDefault (display, name, kw);
856 p0 = XGetDefault (display, "!INVALIDPROGRAMMENAMEDONTMATCH!", kw);
857 if (p == NULL || (p0 && STRCMP (p, p0) == 0))
858 {
859 p = XGetDefault (display, RESCLASS, kw);
860#ifdef RESFALLBACK
861 if (p == NULL || (p0 && STRCMP (p, p0) == 0))
862 p = XGetDefault (display, RESFALLBACK, kw);
863#endif
864 }
865
866 if (p == NULL && p0)
867 p = p0;
868
869 if (p)
870 {
871 rs[optList[entry].doff] = p;
872
873 if (optList_isBool (entry))
874 {
875 s = STRCASECMP (p, "TRUE") == 0
876 || STRCASECMP (p, "YES") == 0
877 || STRCASECMP (p, "ON") == 0
878 || STRCASECMP (p, "1") == 0;
879 if (optList_isReverse (entry))
880 s = !s;
881 if (s)
882 Options |= (optList[entry].flag);
883 else
884 Options &= ~ (optList[entry].flag);
885 }
886 }
887 }
888
889 /*
890 * [R5 or later]: enumerate the resource database 1053 * [R5 or later]: enumerate the resource database
891 */ 1054 */
892# ifdef XrmEnumOneLevel
893# ifdef KEYSYM_RESOURCE 1055# ifdef KEYSYM_RESOURCE
894 name_prefix[0] = XrmStringToName (name); 1056 name_prefix[0] = XrmStringToName (rs[Rs_name]);
895 name_prefix[1] = XrmStringToName ("keysym"); 1057 name_prefix[1] = XrmStringToName ("keysym");
896 name_prefix[2] = NULLQUARK; 1058 name_prefix[2] = NULLQUARK;
897 class_prefix[0] = XrmStringToName (RESCLASS); 1059 class_prefix[0] = XrmStringToName (RESCLASS);
898 class_prefix[1] = XrmStringToName ("Keysym"); 1060 class_prefix[1] = XrmStringToName ("Keysym");
899 class_prefix[2] = NULLQUARK; 1061 class_prefix[2] = NULLQUARK;
900 /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */ 1062 /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */
901 XrmEnumerateDatabase (XrmGetDatabase (display), name_prefix, class_prefix, 1063 XrmEnumerateDatabase (XrmGetDatabase (disp), name_prefix, class_prefix,
902 XrmEnumOneLevel, rxvt_define_key, NULL); 1064 XrmEnumOneLevel, rxvt_define_key, NULL);
903# ifdef RESFALLBACK 1065# ifdef RESFALLBACK
904 name_prefix[0] = XrmStringToName (RESFALLBACK); 1066 name_prefix[0] = XrmStringToName (RESFALLBACK);
905 name_prefix[1] = XrmStringToName ("keysym"); 1067 name_prefix[1] = XrmStringToName ("keysym");
906 class_prefix[0] = XrmStringToName (RESFALLBACK); 1068 class_prefix[0] = XrmStringToName (RESFALLBACK);
907 class_prefix[1] = XrmStringToName ("Keysym"); 1069 class_prefix[1] = XrmStringToName ("Keysym");
908 /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */ 1070 /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */
909 XrmEnumerateDatabase (XrmGetDatabase (display), name_prefix, class_prefix, 1071 XrmEnumerateDatabase (XrmGetDatabase (disp), name_prefix, class_prefix,
910 XrmEnumOneLevel, rxvt_define_key, NULL); 1072 XrmEnumOneLevel, rxvt_define_key, NULL);
911# endif
912# endif 1073# endif
913# endif 1074# endif
914 1075
915# else /* USE_XGETDEFAULT */ 1076# else /* USE_XGETDEFAULT */
916 /* get resources the hard way, but save lots of memory */ 1077 /* get resources the hard way, but save lots of memory */
1078 FILE *fd = NULL;
1079
1080 if (homedir)
1081 {
1082 static const char *const xnames[2] = { ".Xdefaults", ".Xresources" };
1083
1084 for (int i = 0; i < (sizeof (xnames) / sizeof (xnames [0])); i++)
1085 {
1086 snprintf (fname, sizeof (fname), "%s/%s", homedir, xnames [i]);
1087
1088 if ((fd = fopen (fname, "r")) != NULL)
1089 break;
1090 }
1091 }
1092 /*
1093 * The normal order to match resources is the following:
1094 * @ global resources (partial match, ~/.Xdefaults)
1095 * @ application file resources (XAPPLOADDIR/Rxvt)
1096 * @ class resources (~/.Xdefaults)
1097 * @ private resources (~/.Xdefaults)
1098 *
1099 * However, for the hand-rolled resources, the matching algorithm
1100 * checks if a resource string value has already been allocated
1101 * and won't overwrite it with (in this case) a less specific
1102 * resource value.
1103 *
1104 * This avoids multiple allocation. Also, when we've called this
1105 * routine command-line string options have already been applied so we
1106 * needn't to allocate for those resources.
1107 *
1108 * So, search in resources from most to least specific.
1109 *
1110 * Also, use a special sub-class so that we can use either or both of
1111 * "XTerm" and "Rxvt" as class names.
1112 */
1113
1114 get_xdefaults (fd, rs[Rs_name]);
1115 get_xdefaults (fd, RESCLASS);
1116# ifdef RESFALLBACK
1117 get_xdefaults (fd, RESFALLBACK);
1118# endif
1119
1120# if defined(XAPPLOADDIR) && defined(USE_XAPPLOADDIR)
1121 {
917 FILE *fd = NULL; 1122 FILE *ad = NULL;
918 char *home;
919 1123
920 if ((home = getenv ("HOME")) != NULL) 1124# if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1125 if (!*localepath || (ad = fopen (localepath, "r")) == NULL)
1126# endif
1127 ad = fopen (XAPPLOADDIR "/" RESCLASS, "r");
1128 if (ad != NULL)
921 { 1129 {
922 unsigned int i, len = STRLEN (home) + 2; 1130 get_xdefaults (ad, RESCLASS);
923 char *f = NULL; 1131 get_xdefaults (ad, "");
924
925 for (i = 0; i < (sizeof (xnames) / sizeof (xnames[0])); i++)
926 {
927 f = (char *)rxvt_realloc (f, (len + STRLEN (xnames[i])) * sizeof (char));
928
929 sprintf (f, "%s/%s", home, xnames[i]);
930
931 if ((fd = fopen (f, "r")) != NULL)
932 break;
933 }
934 free (f); 1132 fclose (ad);
935 } 1133 }
936 /*
937 * The normal order to match resources is the following:
938 * @ global resources (partial match, ~/.Xdefaults)
939 * @ application file resources (XAPPLOADDIR/Rxvt)
940 * @ class resources (~/.Xdefaults)
941 * @ private resources (~/.Xdefaults)
942 *
943 * However, for the hand-rolled resources, the matching algorithm
944 * checks if a resource string value has already been allocated
945 * and won't overwrite it with (in this case) a less specific
946 * resource value.
947 *
948 * This avoids multiple allocation. Also, when we've called this
949 * routine command-line string options have already been applied so we
950 * needn't to allocate for those resources.
951 *
952 * So, search in resources from most to least specific.
953 *
954 * Also, use a special sub-class so that we can use either or both of
955 * "XTerm" and "Rxvt" as class names.
956 */
957
958 get_xdefaults (fd, name);
959 get_xdefaults (fd, RESCLASS);
960# ifdef RESFALLBACK
961 get_xdefaults (fd, RESFALLBACK);
962# endif
963
964# if defined(XAPPLOADDIR) && defined(USE_XAPPLOADDIR)
965 {
966 FILE *ad = NULL;
967
968# if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
969 if (localepath == NULL || (ad = fopen (localepath, "r")) == NULL)
970# endif
971 ad = fopen (XAPPLOADDIR "/" RESCLASS, "r");
972 if (ad != NULL)
973 {
974 get_xdefaults (ad, RESCLASS);
975 get_xdefaults (ad, "");
976 fclose (ad);
977 }
978 } 1134 }
979# endif /* XAPPLOADDIR */ 1135# endif /* XAPPLOADDIR */
980 1136
981 get_xdefaults (fd, ""); /* partial match */ 1137 get_xdefaults (fd, ""); /* partial match */
982 if (fd != NULL) 1138 if (fd != NULL)
983 fclose (fd); 1139 fclose (fd);
984# endif /* USE_XGETDEFAULT */ 1140# endif /* USE_XGETDEFAULT */
985
986# if defined XAPPLOADDIR
987# if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
988
989 }
990
991 /* Free the path of the possibly available localized Rxvt file */
992 free (localepath);
993# endif
994# endif
995 1141
996#endif /* NO_RESOURCES */ 1142#endif /* NO_RESOURCES */
997} 1143}
998 1144
999/*}}} */ 1145/*}}} */

Diff Legend

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