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.24 by pcg, Thu Apr 8 20:31:45 2004 UTC vs.
Revision 1.76 by root, Mon Jan 9 22:41:41 2006 UTC

4 * 4 *
5 * All portions of code are copyright by their respective author/s. 5 * All portions of code are copyright by their respective author/s.
6 * Copyright (c) 1994 Robert Nation <nation@rocket.sanders.lockheed.com> 6 * Copyright (c) 1994 Robert Nation <nation@rocket.sanders.lockheed.com>
7 * - original version 7 * - original version
8 * Copyright (c) 1997,1998 mj olesen <olesen@me.queensu.ca> 8 * Copyright (c) 1997,1998 mj olesen <olesen@me.queensu.ca>
9 * Copyright (c) 2003-2004 Marc Lehmann <pcg@goof.com> 9 * Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com>
10 * 10 *
11 * This program is free software; you can redistribute it and/or modify 11 * 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 12 * 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 13 * the Free Software Foundation; either version 2 of the License, or
14 * (at your option) any later version. 14 * (at your option) any later version.
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"), 130 STRG (Rs_shade, "shading", "sh", "%", "shade background by x% when tinting."),
112#endif
113#endif 131#endif
114 BOOL (Rs_utmpInhibit, "utmpInhibit", "ut", Opt_utmpInhibit, "utmp inhibit"), 132 BOOL (Rs_utmpInhibit, "utmpInhibit", "ut", Opt_utmpInhibit, "utmp inhibit"),
115#ifndef NO_BELL 133#ifndef NO_BELL
116 BOOL (Rs_visualBell, "visualBell", "vb", Opt_visualBell, "visual bell"), 134 BOOL (Rs_visualBell, "visualBell", "vb", Opt_visualBell, "visual bell"),
117# if ! defined(NO_MAPALERT) && defined(MAPALERT_OPTION) 135# if ! defined(NO_MAPALERT) && defined(MAPALERT_OPTION)
122 BOOL (Rs_meta8, "meta8", NULL, Opt_meta8, NULL), 140 BOOL (Rs_meta8, "meta8", NULL, Opt_meta8, NULL),
123#endif 141#endif
124#ifdef MOUSE_WHEEL 142#ifdef MOUSE_WHEEL
125 BOOL (Rs_mouseWheelScrollPage, "mouseWheelScrollPage", NULL, Opt_mouseWheelScrollPage, NULL), 143 BOOL (Rs_mouseWheelScrollPage, "mouseWheelScrollPage", NULL, Opt_mouseWheelScrollPage, NULL),
126#endif 144#endif
127#ifndef NO_FRILLS 145#if ENABLE_FRILLS
128 BOOL (Rs_tripleclickwords, "tripleclickwords", "tcw", Opt_tripleclickwords, "triple click word selection"), 146 BOOL (Rs_tripleclickwords, "tripleclickwords", "tcw", Opt_tripleclickwords, "triple click word selection"),
129 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"),
130#endif 149#endif
131#ifdef CURSOR_BLINK 150#if CURSOR_BLINK
132 BOOL (Rs_cursorBlink, "cursorBlink", "bc", Opt_cursorBlink, "blinking cursor"), 151 BOOL (Rs_cursorBlink, "cursorBlink", "bc", Opt_cursorBlink, "blinking cursor"),
133#endif 152#endif
134#ifdef POINTER_BLANK 153#ifdef POINTER_BLANK
135 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"),
136#endif 155#endif
142 RSTRG (Rs_color + minCOLOR + 3, "color3", "color"), 161 RSTRG (Rs_color + minCOLOR + 3, "color3", "color"),
143 RSTRG (Rs_color + minCOLOR + 4, "color4", "color"), 162 RSTRG (Rs_color + minCOLOR + 4, "color4", "color"),
144 RSTRG (Rs_color + minCOLOR + 5, "color5", "color"), 163 RSTRG (Rs_color + minCOLOR + 5, "color5", "color"),
145 RSTRG (Rs_color + minCOLOR + 6, "color6", "color"), 164 RSTRG (Rs_color + minCOLOR + 6, "color6", "color"),
146 RSTRG (Rs_color + minCOLOR + 7, "color7", "color"), 165 RSTRG (Rs_color + minCOLOR + 7, "color7", "color"),
147#ifndef NO_BRIGHTCOLOR
148 RSTRG (Rs_color + minBrightCOLOR + 0, "color8", "color"), 166 RSTRG (Rs_color + minBrightCOLOR + 0, "color8", "color"),
149 RSTRG (Rs_color + minBrightCOLOR + 1, "color9", "color"), 167 RSTRG (Rs_color + minBrightCOLOR + 1, "color9", "color"),
150 RSTRG (Rs_color + minBrightCOLOR + 2, "color10", "color"), 168 RSTRG (Rs_color + minBrightCOLOR + 2, "color10", "color"),
151 RSTRG (Rs_color + minBrightCOLOR + 3, "color11", "color"), 169 RSTRG (Rs_color + minBrightCOLOR + 3, "color11", "color"),
152 RSTRG (Rs_color + minBrightCOLOR + 4, "color12", "color"), 170 RSTRG (Rs_color + minBrightCOLOR + 4, "color12", "color"),
153 RSTRG (Rs_color + minBrightCOLOR + 5, "color13", "color"), 171 RSTRG (Rs_color + minBrightCOLOR + 5, "color13", "color"),
154 RSTRG (Rs_color + minBrightCOLOR + 6, "color14", "color"), 172 RSTRG (Rs_color + minBrightCOLOR + 6, "color14", "color"),
155 RSTRG (Rs_color + minBrightCOLOR + 7, "color15", "color"), 173 RSTRG (Rs_color + minBrightCOLOR + 7, "color15", "color"),
156#endif /* NO_BRIGHTCOLOR */
157#ifndef NO_BOLD_UNDERLINE_REVERSE 174#ifndef NO_BOLD_UNDERLINE_REVERSE
158 RSTRG (Rs_color + Color_BD, "colorBD", "color"), 175 RSTRG (Rs_color + Color_BD, "colorBD", "color"),
176 RSTRG (Rs_color + Color_IT, "colorIT", "color"),
159 RSTRG (Rs_color + Color_UL, "colorUL", "color"), 177 RSTRG (Rs_color + Color_UL, "colorUL", "color"),
160 RSTRG (Rs_color + Color_RV, "colorRV", "color"), 178 RSTRG (Rs_color + Color_RV, "colorRV", "color"),
161#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
162#ifdef KEEP_SCROLLCOLOR 183#ifdef KEEP_SCROLLCOLOR
163 RSTRG (Rs_color + Color_scroll, "scrollColor", "color"), 184 RSTRG (Rs_color + Color_scroll, "scrollColor", "color"),
164 RSTRG (Rs_color + Color_trough, "troughColor", "color"), 185 RSTRG (Rs_color + Color_trough, "troughColor", "color"),
165#endif /* KEEP_SCROLLCOLOR */ 186#endif /* KEEP_SCROLLCOLOR */
166#ifdef OPTION_HC 187#ifdef OPTION_HC
167 STRG (Rs_color + Color_HC, "highlightColor", "hc", "color", "highlight color"), 188 STRG (Rs_color + Color_HC, "highlightColor", "hc", "color", "highlight color"),
168#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"),
169#if defined (XPM_BACKGROUND) || (MENUBAR_MAX) 198#if defined (XPM_BACKGROUND) || (MENUBAR_MAX)
170 RSTRG (Rs_path, "path", "search path"), 199 RSTRG (Rs_path, "path", "search path"),
171#endif /* defined (XPM_BACKGROUND) || (MENUBAR_MAX) */ 200#endif /* defined (XPM_BACKGROUND) || (MENUBAR_MAX) */
172#ifdef XPM_BACKGROUND 201#ifdef XPM_BACKGROUND
173 STRG (Rs_backgroundPixmap, "backgroundPixmap", "pixmap", "file[;geom]", "background pixmap"), 202 STRG (Rs_backgroundPixmap, "backgroundPixmap", "pixmap", "file[;geom]", "background pixmap"),
174#endif /* XPM_BACKGROUND */ 203#endif /* XPM_BACKGROUND */
175#if (MENUBAR_MAX) 204#if (MENUBAR_MAX)
176 RSTRG (Rs_menu, "menu", "name[;tag]"), 205 RSTRG (Rs_menu, "menu", "name[;tag]"),
177#endif 206#endif
207 /* fonts: command-line option = resource name */
178 STRG (Rs_font, "font", "fn", "fontname", "normal text font"), 208 STRG (Rs_font, "font", "fn", "fontname", "normal text font"),
179 /* 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
180#ifdef USE_XIM 215#ifdef USE_XIM
181 STRG (Rs_inputMethod, "inputMethod", "im", "name", "name of input method"), 216 STRG (Rs_inputMethod, "inputMethod", "im", "name", "name of input method"),
182 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"),
183#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
184 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"),
185#endif 219 STRG (Rs_imFont, "imFont", "imfont", "fontname", "fontset for styles OverTheSpot and OffTheSpot"),
186#endif /* USE_XIM */ 220#endif /* USE_XIM */
187 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"),
188 STRG (Rs_title, "title", "title", "string", "title name for window"), 222 STRG (Rs_title, "title", "title", "string", "title name for window"),
189 STRG (Rs_title, NULL, "T", NULL, NULL), /* short form */ 223 STRG (Rs_title, NULL, "T", NULL, NULL), /* short form */
190 STRG (Rs_iconName, "iconName", "n", "string", "icon name for window"), 224 STRG (Rs_iconName, "iconName", "n", "string", "icon name for window"),
191#ifndef NO_CURSORCOLOR
192 STRG (Rs_color + Color_cursor, "cursorColor", "cr", "color", "cursor color"),
193 /* command-line option = resource name */
194 RSTRG (Rs_color + Color_cursor2, "cursorColor2", "color"),
195#endif /* NO_CURSORCOLOR */
196 STRG (Rs_color + Color_pointer_fg, "pointerColor", "pr", "color", "pointer color"),
197 STRG (Rs_color + Color_pointer_bg, "pointerColor2", "pr2", "color", "pointer bg color"),
198 STRG (Rs_color + Color_border, "borderColor", "bd", "color", "border color"),
199 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"),
200#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"),
201 STRG (Rs_ext_bwidth, "externalBorder", "w", "number", "external border in pixels"), 233 STRG (Rs_ext_bwidth, "externalBorder", "w", "number", "external border in pixels"),
202 STRG (Rs_ext_bwidth, NULL, "bw", NULL, NULL), 234 STRG (Rs_ext_bwidth, NULL, "bw", NULL, NULL),
203 STRG (Rs_ext_bwidth, NULL, "borderwidth", NULL, NULL), 235 STRG (Rs_ext_bwidth, NULL, "borderwidth", NULL, NULL),
204 STRG (Rs_int_bwidth, "internalBorder", "b", "number", "internal border in pixels"), 236 STRG (Rs_int_bwidth, "internalBorder", "b", "number", "internal border in pixels"),
205#endif 237 BOOL (Rs_borderLess, "borderLess", "bl", Opt_borderLess, "borderless window"),
206#ifndef NO_LINESPACE 238 BOOL (Rs_skipBuiltinGlyphs, "skipBuiltinGlyphs", "sbg", Opt_skipBuiltinGlyphs, "do not use internal glyphs"),
207 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"),
208#endif 240#endif
209 STRG (Rs_scrollBar_thickness, "thickness", "sbt", "number", "scrollbar thickness/width in pixels"),
210#ifdef POINTER_BLANK 241#ifdef POINTER_BLANK
211 RSTRG (Rs_pointerBlankDelay, "pointerBlankDelay", "number"), 242 RSTRG (Rs_pointerBlankDelay, "pointerBlankDelay", "number"),
212#endif 243#endif
213#ifndef NO_BACKSPACE_KEY 244#ifndef NO_BACKSPACE_KEY
214 RSTRG (Rs_backspace_key, "backspacekey", "string"), 245 RSTRG (Rs_backspace_key, "backspacekey", "string"),
215#endif 246#endif
216#ifndef NO_DELETE_KEY 247#ifndef NO_DELETE_KEY
217 RSTRG (Rs_delete_key, "deletekey", "string"), 248 RSTRG (Rs_delete_key, "deletekey", "string"),
218#endif 249#endif
219 RSTRG (Rs_selectstyle, "selectstyle", "mode"), 250 RSTRG (Rs_selectstyle, "selectstyle", "mode"),
220 RSTRG (Rs_scrollstyle, "scrollstyle", "mode"),
221#ifdef HAVE_SCROLLBARS
222 RSTRG (Rs_scrollBar_align, "scrollBar_align", "mode"),
223#endif
224#ifdef PRINTPIPE 251#ifdef PRINTPIPE
225 RSTRG (Rs_print_pipe, "print-pipe", "string"), 252 RSTRG (Rs_print_pipe, "print-pipe", "string"),
226#endif 253#endif
227 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"),
228 INFO ("xrm", "string", "X resource"),
229#ifdef CUTCHAR_RESOURCE 255#ifdef CUTCHAR_RESOURCE
230 RSTRG (Rs_cutchars, "cutchars", "string"), 256 RSTRG (Rs_cutchars, "cutchars", "string"),
231#endif /* CUTCHAR_RESOURCE */ 257#endif /* CUTCHAR_RESOURCE */
232 RSTRG (Rs_answerbackstring, "answerbackString", "string"), 258 RSTRG (Rs_answerbackstring, "answerbackString", "string"),
233#ifndef NO_SECONDARY_SCREEN 259#ifndef NO_SECONDARY_SCREEN
234 BOOL (Rs_secondaryScreen, "secondaryScreen", "ssc", Opt_secondaryScreen, "enable secondary screen"), 260 BOOL (Rs_secondaryScreen, "secondaryScreen", "ssc", Opt_secondaryScreen, "enable secondary screen"),
235 BOOL (Rs_secondaryScroll, "secondaryScroll", "ssr", Opt_secondaryScroll, "enable secondary screen scroll"), 261 BOOL (Rs_secondaryScroll, "secondaryScroll", "ssr", Opt_secondaryScroll, "enable secondary screen scroll"),
236#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
237 INFO ("e", "command arg ...", "command to execute") 274 INFO ("e", "command arg ...", "command to execute")
238 }; 275 };
239 276
240#undef INFO 277#undef INFO
241#undef STRG 278#undef STRG
242#undef RSTRG 279#undef RSTRG
243#undef SWCH 280#undef SWCH
244#undef BOOL 281#undef BOOL
245/*}}} */ 282/*}}} */
246 283
247static const char releasestring[] = "Rxvt v" VERSION " - released: " DATE "\n"; 284static const char releasestring[] = "rxvt-unicode (" RXVTNAME ") v" VERSION " - released: " DATE "\n";
248static 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
249#if defined(XPM_BACKGROUND) 324#if defined(XPM_BACKGROUND)
250 "XPM," 325 "XPM,"
251#endif 326#endif
252#if defined(TRANSPARENT) 327#if defined(TRANSPARENT)
253 "transparent," 328 "transparent,"
254#endif 329#endif
330#if TINTING
331 "tint,"
332#endif
255#if defined(UTMP_SUPPORT) 333#if defined(UTMP_SUPPORT)
256 "utmp," 334 "utmp,"
257#endif 335#endif
258#if defined(MENUBAR) 336#if defined(MENUBAR)
259 "menubar," 337 "menubar,"
260#endif
261#if !defined(NO_FRILLS)
262 "frills,"
263#endif
264#if !defined(NO_LINESPACE)
265 "linespace,"
266#endif
267#if defined(PREFER_24BIT)
268 "24bit,"
269#endif 338#endif
270#if defined(USE_XIM) 339#if defined(USE_XIM)
271 "XIM," 340 "XIM,"
272#endif 341#endif
273 "scrollbars=" 342 "scrollbars="
301 "no_backspace," 370 "no_backspace,"
302#endif 371#endif
303#if defined(NO_DELETE_KEY) 372#if defined(NO_DELETE_KEY)
304 "no_delete," 373 "no_delete,"
305#endif 374#endif
375#if EIGHT_BIT_CONTROLS
376 "8bitctrls,"
377#endif
306#if !defined(NO_STRINGS) 378#if !defined(NO_STRINGS)
307 "strings," 379 "strings,"
308#endif 380#endif
309#if defined(TTY_256COLOR) 381#if defined(ENABLE_FRILLS)
382 "frills,"
383#endif
384#if defined(PREFER_24BIT)
310 "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,"
311#endif 404#endif
312#if defined(NO_RESOURCES) 405#if defined(NO_RESOURCES)
313 "NoResources" 406 "NoResources"
314#else 407#else
315# if defined(USE_XGETDEFAULT) 408# if defined(USE_XGETDEFAULT)
316 "XGetDefaults" 409 "XGetDefault"
317# else 410# else
318 ".Xdefaults" 411 ".Xdefaults"
319# endif 412# endif
320#endif 413#endif
321 "\nUsage: "; /* Usage */ 414 "\nUsage: "; /* Usage */
334 switch (type) 427 switch (type)
335 { 428 {
336 case 0: /* brief listing */ 429 case 0: /* brief listing */
337 rxvt_log (" [-help] [--help]\n"); 430 rxvt_log (" [-help] [--help]\n");
338 431
339 for (col = 1, i = 0; i < optList_size (); i++) 432 for (col = 1, i = 0; i < optList_size; i++)
340 if (optList[i].desc != NULL) 433 if (optList[i].desc != NULL)
341 { 434 {
342 int len = 0; 435 int len = 0;
343 436
344 if (!optList_isBool (i)) 437 if (!optList_isBool (i))
348 len++; /* account for space */ 441 len++; /* account for space */
349 } 442 }
350#ifdef DEBUG_STRICT 443#ifdef DEBUG_STRICT
351 assert (optList[i].opt != NULL); 444 assert (optList[i].opt != NULL);
352#endif 445#endif
353 len += 4 + STRLEN (optList[i].opt) + (optList_isBool (i) ? 2: 0); 446 len += 4 + strlen (optList[i].opt) + (optList_isBool (i) ? 2: 0);
354 col += len; 447 col += len;
355 if (col > 79) 448 if (col > 79)
356 { /* assume regular width */ 449 { /* assume regular width */
357 rxvt_log ("\n"); 450 rxvt_log ("\n");
358 col = 1 + len; 451 col = 1 + len;
367 break; 460 break;
368 461
369 case 1: /* full command-line listing */ 462 case 1: /* full command-line listing */
370 rxvt_log (" [options] [-e command args]\n\nwhere options include:\n"); 463 rxvt_log (" [options] [-e command args]\n\nwhere options include:\n");
371 464
372 for (i = 0; i < optList_size (); i++) 465 for (i = 0; i < optList_size; i++)
373 if (optList[i].desc != NULL) 466 if (optList[i].desc != NULL)
374 { 467 {
375#ifdef DEBUG_STRICT 468#ifdef DEBUG_STRICT
376 assert (optList[i].opt != NULL); 469 assert (optList[i].opt != NULL);
377#endif 470#endif
378 rxvt_log (" %s%s %-*s%s%s\n", 471 rxvt_log (" %s%s %-*s%s%s\n",
379 (optList_isBool (i) ? "-/+" : "-"), optList[i].opt, 472 (optList_isBool (i) ? "-/+" : "-"), optList[i].opt,
380 (INDENT - STRLEN (optList[i].opt) 473 (INDENT - strlen (optList[i].opt)
381 + (optList_isBool (i) ? 0 : 2)), 474 + (optList_isBool (i) ? 0 : 2)),
382 (optList[i].arg ? optList[i].arg : ""), 475 (optList[i].arg ? optList[i].arg : ""),
383 (optList_isBool (i) ? "turn on/off " : ""), 476 (optList_isBool (i) ? "turn on/off " : ""),
384 optList[i].desc); 477 optList[i].desc);
385 } 478 }
388 481
389 case 2: /* full resource listing */ 482 case 2: /* full resource listing */
390 rxvt_log (" [options] [-e command args]\n\n" 483 rxvt_log (" [options] [-e command args]\n\n"
391 "where resources (long-options) include:\n"); 484 "where resources (long-options) include:\n");
392 485
393 for (i = 0; i < optList_size (); i++) 486 for (i = 0; i < optList_size; i++)
394 if (optList[i].kw != NULL) 487 if (optList[i].kw != NULL)
395 rxvt_log (" %s: %*s%s\n", 488 rxvt_log (" %s: %*s%s\n",
396 optList[i].kw, 489 optList[i].kw,
397 (INDENT - STRLEN (optList[i].kw)), "", /* XXX */ 490 (INDENT - strlen (optList[i].kw)), "", /* XXX */
398 (optList_isBool (i) ? "boolean" : optList[i].arg)); 491 (optList_isBool (i) ? "boolean" : optList[i].arg));
399#ifdef KEYSYM_RESOURCE 492#ifdef KEYSYM_RESOURCE
400 rxvt_log (" " "keysym.sym" ": %*s%s\n", 493 rxvt_log (" " "keysym.sym" ": %*s%s\n",
401 (INDENT - sizeof ("keysym.sym") + 1), "", /* XXX */ 494 (INDENT - sizeof ("keysym.sym") + 1), "", /* XXX */
402 "keysym"); 495 "keysym");
419 int i, bad_option = 0; 512 int i, bad_option = 0;
420 static const char On[3] = "ON", Off[4] = "OFF"; 513 static const char On[3] = "ON", Off[4] = "OFF";
421 514
422 for (i = 1; i < argc; i++) 515 for (i = 1; i < argc; i++)
423 { 516 {
424 unsigned int entry, longopt = 0; 517 unsigned int entry, longopt = 0;
425 const char *flag, *opt; 518 const char *flag, *opt;
426 519
427 opt = argv[i]; 520 opt = argv[i];
428#ifdef DEBUG_RESOURCES 521#ifdef DEBUG_RESOURCES
429 fprintf (stderr, "argv[%d] = %s: ", i, opt); 522 fprintf (stderr, "argv[%d] = %s: ", i, opt);
430#endif 523#endif
445 bad_option = 1; 538 bad_option = 1;
446 rxvt_warn ("\"%s\": malformed option.\n", opt); 539 rxvt_warn ("\"%s\": malformed option.\n", opt);
447 continue; 540 continue;
448 } 541 }
449 542
450 if (!STRCMP (opt, "help")) 543 if (!strcmp (opt, "help"))
451 rxvt_usage (longopt ? 2 : 1); 544 rxvt_usage (longopt ? 2 : 1);
452 if (!STRCMP (opt, "h")) 545 if (!strcmp (opt, "h"))
453 rxvt_usage (0); 546 rxvt_usage (0);
454 547
455 /* feature: always try to match long-options */ 548 /* feature: always try to match long-options */
456 for (entry = 0; entry < optList_size (); entry++) 549 for (entry = 0; entry < optList_size; entry++)
457 if ((optList[entry].kw && !STRCMP (opt, optList[entry].kw)) 550 if ((optList[entry].kw && !strcmp (opt, optList[entry].kw))
458 || (!longopt 551 || (!longopt
459 && optList[entry].opt && !STRCMP (opt, optList[entry].opt))) 552 && optList[entry].opt && !strcmp (opt, optList[entry].opt)))
460 break; 553 break;
461 554
462 if (entry < optList_size ()) 555 if (entry < optList_size)
463 { 556 {
464 if (optList_isReverse (entry)) 557 if (optList_isReverse (entry))
465 flag = flag == On ? Off : On; 558 flag = flag == On ? Off : On;
559
466 if (optList_strlen (entry)) 560 if (optList_strlen (entry))
467 { /* string value */
468 const char *str = argv[++i];
469
470#ifdef DEBUG_RESOURCES
471 fprintf (stderr, "string (%s,%s) = ",
472 optList[entry].opt ? optList[entry].opt : "nil",
473 optList[entry].kw ? optList[entry].kw : "nil");
474#endif
475 if (flag == On && str && (optList[entry].doff != -1))
476 { 561 {
477#ifdef DEBUG_RESOURCES
478 fprintf (stderr, "\"%s\"\n", str);
479#endif
480 rs[optList[entry].doff] = str;
481 /* 562 /*
482 * special cases are handled in main.c:main () to allow 563 * special cases are handled in main.c:main () to allow
483 * X resources to set these values before we settle for 564 * X resources to set these values before we settle for
484 * default values 565 * default values
485 */ 566 */
486 }
487#ifdef DEBUG_RESOURCES
488 else
489 fprintf (stderr, "???\n");
490#endif
491 567
568 if (optList[entry].doff != -1)
569 rs[optList[entry].doff] = flag == On && argv[i+1]
570 ? argv[++i] : 0;
492 } 571 }
493 else 572 else
494 { /* boolean value */ 573 { /* boolean value */
495#ifdef DEBUG_RESOURCES 574#ifdef DEBUG_RESOURCES
496 fprintf (stderr, "boolean (%s,%s) = %s\n", 575 fprintf (stderr, "boolean (%s,%s) = %s\n",
497 optList[entry].opt, optList[entry].kw, flag); 576 optList[entry].opt, optList[entry].kw, flag);
498#endif 577#endif
499 if (flag == On) 578 set_option (optList[entry].flag & Optflag_mask, flag == On);
500 Options |= (optList[entry].flag);
501 else
502 Options &= ~ (optList[entry].flag);
503 579
504 if (optList[entry].doff != -1) 580 if (optList[entry].doff != -1)
505 rs[optList[entry].doff] = flag; 581 rs[optList[entry].doff] = flag;
506 } 582 }
507 } 583 }
508 else 584 else
509#ifdef KEYSYM_RESOURCE 585#ifdef KEYSYM_RESOURCE
510 /* if (!STRNCMP (opt, "keysym.", sizeof ("keysym.") - 1)) */ 586 /* if (!strncmp (opt, "keysym.", sizeof ("keysym.") - 1)) */
511 if (rxvt_Str_match (opt, "keysym.")) 587 if (rxvt_Str_match (opt, "keysym."))
512 { 588 {
513 const char *str = argv[++i]; 589 const char *str = argv[++i];
514 590
515 if (str != NULL) 591 if (str != NULL)
546 XrmQuarkList quarks, 622 XrmQuarkList quarks,
547 XrmRepresentation *type __attribute__((unused)), 623 XrmRepresentation *type __attribute__((unused)),
548 XrmValue *value, 624 XrmValue *value,
549 XPointer closure __attribute__((unused))) 625 XPointer closure __attribute__((unused)))
550{ 626{
551 int last; 627 int last;
552 628
553 for (last = 0; quarks[last] != NULLQUARK; last++) /* look for last quark in list */ 629 for (last = 0; quarks[last] != NULLQUARK; last++) /* look for last quark in list */
554 ; 630 ;
631
555 last--; 632 last--;
556 GET_R->parse_keysym (XrmQuarkToString (quarks[last]), (char *)value->addr);//D//TODO 633 GET_R->parse_keysym (XrmQuarkToString (quarks[last]), (char *)value->addr);//D//TODO
557 return False; 634 return False;
558} 635}
559 636
564 * arg will be 641 * arg will be
565 * NULL for ~/.Xdefaults and 642 * NULL for ~/.Xdefaults and
566 * non-NULL for command-line options (need to allocate) 643 * non-NULL for command-line options (need to allocate)
567 */ 644 */
568#define NEWARGLIM 500 /* `reasonable' size */ 645#define NEWARGLIM 500 /* `reasonable' size */
646
647struct keysym_vocabulary_t
648{
649 const char *name;
650 unsigned short len;
651 unsigned short value;
652};
653keysym_vocabulary_t keysym_vocabulary[] =
654{
655 { "ISOLevel3", 9, Level3Mask },
656 { "AppKeypad", 9, AppKeypadMask },
657 { "Control", 7, ControlMask },
658 { "NumLock", 7, NumLockMask },
659 { "Shift", 5, ShiftMask },
660 { "Meta", 4, MetaMask },
661 { "Lock", 4, LockMask },
662 { "Mod1", 4, Mod1Mask },
663 { "Mod2", 4, Mod2Mask },
664 { "Mod3", 4, Mod3Mask },
665 { "Mod4", 4, Mod4Mask },
666 { "Mod5", 4, Mod5Mask },
667 { "I", 1, Level3Mask },
668 { "K", 1, AppKeypadMask },
669 { "C", 1, ControlMask },
670 { "N", 1, NumLockMask },
671 { "S", 1, ShiftMask },
672 { "M", 1, MetaMask },
673 { "A", 1, MetaMask },
674 { "L", 1, LockMask },
675 { "1", 1, Mod1Mask },
676 { "2", 1, Mod2Mask },
677 { "3", 1, Mod3Mask },
678 { "4", 1, Mod4Mask },
679 { "5", 1, Mod5Mask },
680};
681
569int 682int
570rxvt_term::parse_keysym (const char *str, const char *arg) 683rxvt_term::parse_keysym (const char *str, const char *arg)
571{ 684{
572 int n, sym; 685 int n, sym;
573 char *key_string, *newarg = NULL; 686 unsigned int state = 0;
687 const char *pmodend = NULL;
688 char *newarg = NULL;
574 char newargstr[NEWARGLIM]; 689 char newargstr[NEWARGLIM];
575 690
576 if (arg == NULL) 691 if (arg == NULL)
577 { 692 {
578 if ((n = rxvt_Str_match (str, "keysym.")) == 0) 693 if ((n = rxvt_Str_match (str, "keysym.")) == 0)
579 return 0; 694 return 0;
695
580 str += n; /* skip `keysym.' */ 696 str += n; /* skip `keysym.' */
697 if (!(pmodend = strchr (str, ':')))
698 return -1;
699 }
700 else
701 pmodend = str + strlen(str);
702
703 for (--pmodend; str < pmodend; --pmodend)
704 if (*pmodend == '-')
705 break;
706
707 while (str < pmodend)
581 } 708 {
709 unsigned int i;
710
711 for (i=0; i < sizeof (keysym_vocabulary) / sizeof (keysym_vocabulary_t); ++i)
712 {
713 if (strncmp (str, keysym_vocabulary [i].name, keysym_vocabulary [i].len) == 0)
714 {
715 state |= keysym_vocabulary[i].value;
716 str += keysym_vocabulary[i].len;
717 break;
718 }
719 }
720
721 if (i >= sizeof (keysym_vocabulary) / sizeof (keysym_vocabulary_t))
722 return -1;
723
724 if (*str == '-')
725 ++str;
726 }
727
582 /* some scanf () have trouble with a 0x prefix */ 728 /* some scanf () have trouble with a 0x prefix */
583 if (isdigit (str[0]))
584 {
585 if (str[0] == '0' && toupper (str[1]) == 'X') 729 if (str[0] == '0' && toupper (str[1]) == 'X')
730 {
586 str += 2; 731 str += 2;
732
587 if (arg) 733 if (arg)
588 { 734 {
589 if (sscanf (str, (STRCHR (str, ':') ? "%x:" : "%x"), &sym) != 1) 735 if (sscanf (str, (strchr (str, ':') ? "%x:" : "%x"), &sym) != 1)
590 return -1; 736 return -1;
591 } 737 }
592 else 738 else
593 { 739 {
594 if (sscanf (str, "%x:", &sym) != 1) 740 if (sscanf (str, "%x:", &sym) != 1)
595 return -1; 741 return -1;
596 742
597 /* cue to ':', it's there since sscanf () worked */ 743 /* cue to ':', it's there since sscanf () worked */
598 STRNCPY (newargstr, STRCHR (str, ':') + 1, NEWARGLIM - 1); 744 strncpy (newargstr, strchr (str, ':') + 1, NEWARGLIM - 1);
599 newargstr[NEWARGLIM - 1] = '\0'; 745 newargstr[NEWARGLIM - 1] = '\0';
600 newarg = newargstr; 746 newarg = newargstr;
601 } 747 }
602 } 748 }
603 else 749 else
604 { 750 {
605 /* 751 /*
606 * convert keysym name to keysym number 752 * convert keysym name to keysym number
607 */ 753 */
608 STRNCPY (newargstr, str, NEWARGLIM - 1); 754 strncpy (newargstr, str, NEWARGLIM - 1);
609 newargstr[NEWARGLIM - 1] = '\0'; 755 newargstr[NEWARGLIM - 1] = '\0';
756
610 if (arg == NULL) 757 if (arg == NULL)
611 { 758 {
612 if ((newarg = STRCHR (newargstr, ':')) == NULL) 759 if ((newarg = strchr (newargstr, ':')) == NULL)
613 return -1; 760 return -1;
761
614 *newarg++ = '\0'; /* terminate keysym name */ 762 *newarg++ = '\0'; /* terminate keysym name */
615 } 763 }
764
616 if ((sym = XStringToKeysym (newargstr)) == None) 765 if ((sym = XStringToKeysym (newargstr)) == None)
617 return -1; 766 return -1;
618 } 767 }
619 768
620 if (sym < 0xFF00 || sym > 0xFFFF) /* we only do extended keys */
621 return -1;
622 sym &= 0xFF;
623 if (Keysym_map[sym] != NULL) /* already set ? */
624 return -1;
625
626 if (newarg == NULL) 769 if (newarg == NULL)
627 { 770 {
628 STRNCPY (newargstr, arg, NEWARGLIM - 1); 771 strncpy (newargstr, arg, NEWARGLIM - 1);
629 newargstr[NEWARGLIM - 1] = '\0'; 772 newargstr[NEWARGLIM - 1] = '\0';
630 newarg = newargstr; 773 newarg = newargstr;
631 } 774 }
775
632 rxvt_Str_trim (newarg); 776 rxvt_Str_trim (newarg);
633 if (*newarg == '\0' || (n = rxvt_Str_escaped (newarg)) == 0) 777 if (*newarg == '\0' || (n = rxvt_Str_escaped (newarg)) == 0)
634 return -1; 778 return -1;
635 MIN_IT (n, 255);
636 key_string = (char *)rxvt_malloc ((n + 1) * sizeof (char));
637 779
638 key_string[0] = n; 780 keyboard->register_user_translation (sym, state, newarg);
639 STRNCPY (key_string + 1, newarg, n);
640 Keysym_map[sym] = (unsigned char *)key_string;
641
642 return 1; 781 return 1;
643} 782}
644 783
645# endif /* KEYSYM_RESOURCE */ 784# endif /* KEYSYM_RESOURCE */
646 785
656 char *str, buffer[256]; 795 char *str, buffer[256];
657 796
658 if (stream == NULL) 797 if (stream == NULL)
659 return; 798 return;
660 799
661 len = STRLEN (name); 800 len = strlen (name);
662 while ((str = fgets (buffer, sizeof (buffer), stream)) != NULL) 801 while ((str = fgets (buffer, sizeof (buffer), stream)) != NULL)
663 { 802 {
664 unsigned int entry, n; 803 unsigned int entry, n;
665 804
666 while (*str && isspace (*str)) 805 while (*str && isspace (*str))
667 str++; /* leading whitespace */ 806 str++; /* leading whitespace */
668 807
669 if ((str[len] != '*' && str[len] != '.') 808 if ((str[len] != '*' && str[len] != '.')
670 || (len && STRNCMP (str, name, len))) 809 || (len && strncmp (str, name, len)))
671 continue; 810 continue;
672 str += (len + 1); /* skip `name*' or `name.' */ 811 str += (len + 1); /* skip `name*' or `name.' */
673 812
674# ifdef KEYSYM_RESOURCE 813# ifdef KEYSYM_RESOURCE
675 if (!parse_keysym (str, NULL)) 814 if (!parse_keysym (str, NULL))
676# endif /* KEYSYM_RESOURCE */ 815# endif /* KEYSYM_RESOURCE */
677 for (entry = 0; entry < optList_size (); entry++) 816 for (entry = 0; entry < optList_size; entry++)
678 { 817 {
679 const char *kw = optList[entry].kw; 818 const char *kw = optList[entry].kw;
680 819
681 if (kw == NULL) 820 if (kw == NULL)
682 continue; 821 continue;
683 822
684 n = STRLEN (kw); 823 n = strlen (kw);
685 if (str[n] == ':' && rxvt_Str_match (str, kw)) 824 if (str[n] == ':' && rxvt_Str_match (str, kw))
686 { 825 {
687 /* skip `keyword:' */ 826 /* skip `keyword:' */
688 str += n + 1; 827 str += n + 1;
689 rxvt_Str_trim (str); 828 rxvt_Str_trim (str);
690 n = STRLEN (str); 829 n = strlen (str);
830
691 if (n && rs[optList[entry].doff] == NULL) 831 if (n && rs[optList[entry].doff] == NULL)
692 { 832 {
693 /* not already set */ 833 /* not already set */
694 int s; 834 int s;
695 char *p = 0; 835 char *p = 0;
696 836
697 for (int o = 0;;) 837 for (int o = 0;;)
698 { 838 {
699 p = (char *)rxvt_realloc (p, o + n + 1); 839 p = (char *)rxvt_realloc (p, o + n + 1);
700 MEMCPY (p + o, str, n); 840 memcpy (p + o, str, n);
701 o += n; 841 o += n;
702 p[o] = 0; 842 p[o] = 0;
703 843
704 if (o == 0 || p[o - 1] != '\\') // continuation line 844 if (o == 0 || p[o - 1] != '\\') // continuation line
705 break; 845 break;
708 848
709 if ((str = fgets (buffer, sizeof (buffer), stream)) == NULL) 849 if ((str = fgets (buffer, sizeof (buffer), stream)) == NULL)
710 break; 850 break;
711 851
712 rxvt_Str_trim (str); 852 rxvt_Str_trim (str);
713 n = STRLEN (str); 853 n = strlen (str);
714 } 854 }
715 855
716 rs[optList[entry].doff] = p; 856 rs[optList[entry].doff] = p;
717 allocated.push_back (p); 857 allocated.push_back (p);
718 858
719 if (optList_isBool (entry)) 859 if (optList_isBool (entry))
720 { 860 {
721 s = STRCASECMP (str, "TRUE") == 0 861 s = strcasecmp (str, "true") == 0
722 || STRCASECMP (str, "YES") == 0 862 || strcasecmp (str, "yes") == 0
723 || STRCASECMP (str, "ON") == 0 863 || strcasecmp (str, "on") == 0
724 || STRCASECMP (str, "1") == 0; 864 || strcmp (str, "1") == 0;
725 865
726 if (optList_isReverse (entry)) 866 if (optList_isReverse (entry))
727 s = !s; 867 s = !s;
728 868
729 if (s) 869 set_option (optList[entry].flag & Optflag_mask, s);
730 Options |= optList[entry].flag;
731 else
732 Options &= ~optList[entry].flag;
733 } 870 }
734 } 871 }
735 872
736 break; 873 break;
737 } 874 }
742} 879}
743 880
744/*}}} */ 881/*}}} */
745# endif /* ! USE_XGETDEFAULT */ 882# endif /* ! USE_XGETDEFAULT */
746#endif /* NO_RESOURCES */ 883#endif /* NO_RESOURCES */
884
885#ifdef USE_XGETDEFAULT
886char *get_res (XrmDatabase database, const char *program, const char *option)
887{
888 char resource[512];
889 char *type;
890 XrmValue result;
891
892 snprintf (resource, sizeof (resource), "%s.%s", program, option);
893 XrmGetResource (database, resource, resource, &type, &result);
894
895 return result.addr;
896}
897#endif
747 898
748/*{{{ read the resources files */ 899/*{{{ read the resources files */
749/* 900/*
750 * using XGetDefault () or the hand-rolled replacement 901 * using XGetDefault () or the hand-rolled replacement
751 */ 902 */
752/* ARGSUSED */ 903/* ARGSUSED */
753void 904void
754rxvt_term::extract_resources (Display *display __attribute__ ((unused)), const char *name) 905rxvt_term::extract_resources ()
755{ 906{
907 dDisp;
908
756#ifndef NO_RESOURCES 909#ifndef NO_RESOURCES
910
911 char *homedir = (char *)getenv ("HOME");
912 char fname[1024];
757 913
758# if defined XAPPLOADDIR 914# if defined XAPPLOADDIR
759# if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE) 915# if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
760 /* Compute the path of the possibly available localized Rxvt file */ 916 /* Compute the path of the possibly available localized Rxvt file */
761 char *localepath = NULL; 917 char localepath[1024];
762 918
763 if (locale != NULL) 919 if (locale)
764 { /* XXX: must limit length of string */
765 localepath = (char *)rxvt_malloc (256);
766 sprintf (localepath, XAPPLOADDIRLOCALE "/" RESCLASS, 920 snprintf (localepath, sizeof (localepath), XAPPLOADDIRLOCALE "/" RESCLASS, locale);
767 (int) (258 - sizeof (XAPPLOADDIRLOCALE) - sizeof (RESCLASS)), 921 else
768 locale); /* 258 = 255 + 4 (-.*s) - 1 (/) */ 922 localepath[0] = 0;
769 }
770
771 {
772# endif 923# endif
773# endif 924# endif
774 925
775# ifdef USE_XGETDEFAULT 926# ifdef USE_XGETDEFAULT
776 /* 927 /*
777 * get resources using the X library function 928 * get resources using the X library function
778 */ 929 */
779 int entry; 930 int entry;
780 931
781# ifdef XrmEnumOneLevel
782 int i;
783 char *displayResource, *xe; 932 char *displayResource, *xe;
784 XrmName name_prefix[3]; 933 XrmName name_prefix[3];
785 XrmClass class_prefix[3]; 934 XrmClass class_prefix[3];
786 XrmDatabase database, rdb1; 935 XrmDatabase database, rdb1;
787 char fname[1024];
788 936
789 XrmInitialize ();
790 database = NULL; 937 database = NULL;
791 938
939 // for ordering, see for example http://www.faqs.org/faqs/Xt-FAQ/ Subject: 20
940
941 // 6. System wide per application default file.
942 /* Add in Rxvt file */
943# if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
944 if (*localepath
945 && ((rdb1 = XrmGetFileDatabase (localepath))
946 || (rdb1 = XrmGetFileDatabase (XAPPLOADDIR "/" RESCLASS))))
947# endif
948 XrmMergeDatabases (rdb1, &database);
949
950 /* Add in $XAPPLRESDIR/Rxvt only; not bothering with XUSERFILESEARCHPATH */
951 if ((xe = (char *)getenv ("XAPPLRESDIR")))
952 {
953 snprintf (fname, sizeof (fname), "%s/%s", xe, RESCLASS);
954
955 if ((rdb1 = XrmGetFileDatabase (fname)))
956 XrmMergeDatabases (rdb1, &database);
957 }
958
959 // 5. User's per application default file.
960 // none
961
962 // 4. User's defaults file.
792 /* Get any Xserver defaults */ 963 /* Get any Xserver defaults */
793
794 displayResource = XResourceManagerString (display); 964 displayResource = XResourceManagerString (disp);
795 if (displayResource != NULL) 965 if (displayResource != NULL)
966 {
796 database = XrmGetStringDatabase (displayResource); 967 if ((rdb1 = XrmGetStringDatabase (displayResource)))
797 968 XrmMergeDatabases (rdb1, &database);
798# ifdef HAVE_EXTRA_XRESOURCE_FILES
799 /* Add in ~/.Xdefaults or ~/.Xresources */
800 { 969 }
801 char *ptr; 970 else if (homedir)
971 {
972 snprintf (fname, sizeof (fname), "%s/.Xdefaults", homedir);
802 973
803 if ((ptr = (char *)getenv ("HOME")) == NULL) 974 if ((rdb1 = XrmGetFileDatabase (fname)))
804 ptr = "."; 975 XrmMergeDatabases (rdb1, &database);
976 }
805 977
806 for (i = 0; i < (sizeof (xnames) / sizeof (xnames[0])); i++) 978 /* Get screen specific resources */
979 displayResource = XScreenResourceString (ScreenOfDisplay (disp, display->screen));
980 if (displayResource != NULL)
981 {
982 if ((rdb1 = XrmGetStringDatabase (displayResource)))
983 /* Merge with screen-independent resources */
984 XrmMergeDatabases (rdb1, &database);
985
986 XFree (displayResource);
987 }
988
989 // 3. User's per host defaults file
990 /* Add in XENVIRONMENT file */
991 if ((xe = (char *)getenv ("XENVIRONMENT"))
992 && (rdb1 = XrmGetFileDatabase (xe)))
993 XrmMergeDatabases (rdb1, &database);
994 else if (homedir)
995 {
996 struct utsname un;
997
998 if (!uname (&un))
807 { 999 {
808 sprintf (fname, "%-.*s/%s", sizeof (fname) - STRLEN (xnames[i]) - 2, 1000 snprintf (fname, sizeof (fname), "%s/.Xdefaults-%s", homedir, un.nodename);
809 ptr, xnames[i]); 1001
810 if ((rdb1 = XrmGetFileDatabase (fname))) 1002 if ((rdb1 = XrmGetFileDatabase (fname)))
1003 XrmMergeDatabases (rdb1, &database);
1004 }
1005 }
1006
1007 xrmdatabase = database;
1008
1009 /*
1010 * Query resources for options that affect us
1011 */
1012 for (entry = 0; entry < optList_size; entry++)
1013 {
1014 int s;
1015 char *p, *p0;
1016 const char *kw = optList[entry].kw;
1017
1018 if (kw == NULL || rs[optList[entry].doff] != NULL)
1019 continue; /* previously set */
1020
1021 p = get_res (database, rs[Rs_name], kw);
1022 p0 = get_res (database, "!INVALIDPROGRAMMENAMEDONTMATCH!", kw);
1023 if (p == NULL || (p0 && strcmp (p, p0) == 0))
1024 {
1025 p = get_res (database, RESCLASS, kw);
1026#ifdef RESFALLBACK
1027 if (p == NULL || (p0 && strcmp (p, p0) == 0))
1028 p = get_res (database, RESFALLBACK, kw);
1029#endif
1030 }
1031
1032 if (p == NULL && p0)
1033 p = p0;
1034
1035 if (p)
1036 {
1037 rs[optList[entry].doff] = p;
1038
1039 if (optList_isBool (entry))
811 { 1040 {
812 XrmMergeDatabases (rdb1, &database); 1041 s = strcasecmp (p, "TRUE") == 0
813# ifndef HAVE_BOTH_XRESOURCE_FILES 1042 || strcasecmp (p, "YES") == 0
814 break; 1043 || strcasecmp (p, "ON") == 0
815# endif 1044 || strcasecmp (p, "1") == 0;
816 1045
1046 if (optList_isReverse (entry))
1047 s = !s;
1048
1049 set_option (optList[entry].flag & Optflag_mask, s);
817 } 1050 }
818 } 1051 }
819 } 1052 }
820# endif
821 1053
822 /* Add in XENVIRONMENT file */
823
824 if ((xe = (char *)getenv ("XENVIRONMENT")) != NULL
825 && (rdb1 = XrmGetFileDatabase (xe)) != NULL)
826 XrmMergeDatabases (rdb1, &database);
827
828 /* Add in Rxvt file */
829# if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
830 if (localepath == NULL || (rdb1 = XrmGetFileDatabase (localepath)) == NULL)
831# endif
832 rdb1 = XrmGetFileDatabase (XAPPLOADDIR "/" RESCLASS);
833
834 if (rdb1 != NULL)
835 XrmMergeDatabases (rdb1, &database);
836
837 /* Add in $XAPPLRESDIR/Rxvt only; not bothering with XUSERFILESEARCHPATH */
838 if ((xe = (char *)getenv ("XAPPLRESDIR")) != NULL)
839 {
840 sprintf (fname, "%-.*s/" RESCLASS, sizeof (fname)
841 - sizeof (RESCLASS) - 2, xe);
842 if ((rdb1 = XrmGetFileDatabase (fname)) != NULL)
843 XrmMergeDatabases (rdb1, &database);
844 }
845
846 XrmSetDatabase (display, database);
847# endif
848
849 /* 1054 /*
850 * Query resources for options that affect us
851 */
852 for (entry = 0; entry < optList_size (); entry++)
853 {
854 int s;
855 char *p, *p0;
856 const char *kw = optList[entry].kw;
857
858 if (kw == NULL || rs[optList[entry].doff] != NULL)
859 continue; /* previously set */
860
861 p = XGetDefault (display, name, kw);
862 p0 = XGetDefault (display, "!INVALIDPROGRAMMENAMEDONTMATCH!", kw);
863 if (p == NULL || (p0 && STRCMP (p, p0) == 0))
864 {
865 p = XGetDefault (display, RESCLASS, kw);
866#ifdef RESFALLBACK
867 if (p == NULL || (p0 && STRCMP (p, p0) == 0))
868 p = XGetDefault (display, RESFALLBACK, kw);
869#endif
870 }
871
872 if (p == NULL && p0)
873 p = p0;
874
875 if (p)
876 {
877 rs[optList[entry].doff] = p;
878
879 if (optList_isBool (entry))
880 {
881 s = STRCASECMP (p, "TRUE") == 0
882 || STRCASECMP (p, "YES") == 0
883 || STRCASECMP (p, "ON") == 0
884 || STRCASECMP (p, "1") == 0;
885 if (optList_isReverse (entry))
886 s = !s;
887 if (s)
888 Options |= (optList[entry].flag);
889 else
890 Options &= ~ (optList[entry].flag);
891 }
892 }
893 }
894
895 /*
896 * [R5 or later]: enumerate the resource database 1055 * [R5 or later]: enumerate the resource database
897 */ 1056 */
898# ifdef XrmEnumOneLevel
899# ifdef KEYSYM_RESOURCE 1057# ifdef KEYSYM_RESOURCE
900 name_prefix[0] = XrmStringToName (name); 1058 name_prefix[0] = XrmStringToName (rs[Rs_name]);
901 name_prefix[1] = XrmStringToName ("keysym"); 1059 name_prefix[1] = XrmStringToName ("keysym");
902 name_prefix[2] = NULLQUARK; 1060 name_prefix[2] = NULLQUARK;
903 class_prefix[0] = XrmStringToName (RESCLASS); 1061 class_prefix[0] = XrmStringToName (RESCLASS);
904 class_prefix[1] = XrmStringToName ("Keysym"); 1062 class_prefix[1] = XrmStringToName ("Keysym");
905 class_prefix[2] = NULLQUARK; 1063 class_prefix[2] = NULLQUARK;
906 /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */ 1064 /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */
907 XrmEnumerateDatabase (XrmGetDatabase (display), name_prefix, class_prefix, 1065 XrmEnumerateDatabase (database, name_prefix, class_prefix,
908 XrmEnumOneLevel, rxvt_define_key, NULL); 1066 XrmEnumOneLevel, rxvt_define_key, NULL);
909# ifdef RESFALLBACK 1067# ifdef RESFALLBACK
910 name_prefix[0] = XrmStringToName (RESFALLBACK); 1068 name_prefix[0] = XrmStringToName (RESFALLBACK);
911 name_prefix[1] = XrmStringToName ("keysym"); 1069 name_prefix[1] = XrmStringToName ("keysym");
912 class_prefix[0] = XrmStringToName (RESFALLBACK); 1070 class_prefix[0] = XrmStringToName (RESFALLBACK);
913 class_prefix[1] = XrmStringToName ("Keysym"); 1071 class_prefix[1] = XrmStringToName ("Keysym");
914 /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */ 1072 /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */
915 XrmEnumerateDatabase (XrmGetDatabase (display), name_prefix, class_prefix, 1073 XrmEnumerateDatabase (database, name_prefix, class_prefix,
916 XrmEnumOneLevel, rxvt_define_key, NULL); 1074 XrmEnumOneLevel, rxvt_define_key, NULL);
917# endif
918# endif 1075# endif
919# endif 1076# endif
920 1077
921# else /* USE_XGETDEFAULT */ 1078# else /* USE_XGETDEFAULT */
922 /* get resources the hard way, but save lots of memory */ 1079 /* get resources the hard way, but save lots of memory */
1080 FILE *fd = NULL;
1081
1082 if (homedir)
1083 {
1084 static const char *const xnames[2] = { ".Xdefaults", ".Xresources" };
1085
1086 for (int i = 0; i < (sizeof (xnames) / sizeof (xnames [0])); i++)
1087 {
1088 snprintf (fname, sizeof (fname), "%s/%s", homedir, xnames [i]);
1089
1090 if ((fd = fopen (fname, "r")) != NULL)
1091 break;
1092 }
1093 }
1094 /*
1095 * The normal order to match resources is the following:
1096 * @ global resources (partial match, ~/.Xdefaults)
1097 * @ application file resources (XAPPLOADDIR/Rxvt)
1098 * @ class resources (~/.Xdefaults)
1099 * @ private resources (~/.Xdefaults)
1100 *
1101 * However, for the hand-rolled resources, the matching algorithm
1102 * checks if a resource string value has already been allocated
1103 * and won't overwrite it with (in this case) a less specific
1104 * resource value.
1105 *
1106 * This avoids multiple allocation. Also, when we've called this
1107 * routine command-line string options have already been applied so we
1108 * needn't to allocate for those resources.
1109 *
1110 * So, search in resources from most to least specific.
1111 *
1112 * Also, use a special sub-class so that we can use either or both of
1113 * "XTerm" and "Rxvt" as class names.
1114 */
1115
1116 get_xdefaults (fd, rs[Rs_name]);
1117 get_xdefaults (fd, RESCLASS);
1118# ifdef RESFALLBACK
1119 get_xdefaults (fd, RESFALLBACK);
1120# endif
1121
1122# if defined(XAPPLOADDIR) && defined(USE_XAPPLOADDIR)
1123 {
923 FILE *fd = NULL; 1124 FILE *ad = NULL;
924 char *home;
925 1125
926 if ((home = getenv ("HOME")) != NULL) 1126# if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1127 if (!*localepath || (ad = fopen (localepath, "r")) == NULL)
1128# endif
1129 ad = fopen (XAPPLOADDIR "/" RESCLASS, "r");
1130 if (ad != NULL)
927 { 1131 {
928 unsigned int i, len = STRLEN (home) + 2; 1132 get_xdefaults (ad, RESCLASS);
929 char *f = NULL; 1133 get_xdefaults (ad, "");
930
931 for (i = 0; i < (sizeof (xnames) / sizeof (xnames[0])); i++)
932 {
933 f = (char *)rxvt_realloc (f, (len + STRLEN (xnames[i])) * sizeof (char));
934
935 sprintf (f, "%s/%s", home, xnames[i]);
936
937 if ((fd = fopen (f, "r")) != NULL)
938 break;
939 }
940 free (f); 1134 fclose (ad);
941 } 1135 }
942 /*
943 * The normal order to match resources is the following:
944 * @ global resources (partial match, ~/.Xdefaults)
945 * @ application file resources (XAPPLOADDIR/Rxvt)
946 * @ class resources (~/.Xdefaults)
947 * @ private resources (~/.Xdefaults)
948 *
949 * However, for the hand-rolled resources, the matching algorithm
950 * checks if a resource string value has already been allocated
951 * and won't overwrite it with (in this case) a less specific
952 * resource value.
953 *
954 * This avoids multiple allocation. Also, when we've called this
955 * routine command-line string options have already been applied so we
956 * needn't to allocate for those resources.
957 *
958 * So, search in resources from most to least specific.
959 *
960 * Also, use a special sub-class so that we can use either or both of
961 * "XTerm" and "Rxvt" as class names.
962 */
963
964 get_xdefaults (fd, name);
965 get_xdefaults (fd, RESCLASS);
966# ifdef RESFALLBACK
967 get_xdefaults (fd, RESFALLBACK);
968# endif
969
970# if defined(XAPPLOADDIR) && defined(USE_XAPPLOADDIR)
971 {
972 FILE *ad = NULL;
973
974# if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
975 if (localepath == NULL || (ad = fopen (localepath, "r")) == NULL)
976# endif
977 ad = fopen (XAPPLOADDIR "/" RESCLASS, "r");
978 if (ad != NULL)
979 {
980 get_xdefaults (ad, RESCLASS);
981 get_xdefaults (ad, "");
982 fclose (ad);
983 }
984 } 1136 }
985# endif /* XAPPLOADDIR */ 1137# endif /* XAPPLOADDIR */
986 1138
987 get_xdefaults (fd, ""); /* partial match */ 1139 get_xdefaults (fd, ""); /* partial match */
988 if (fd != NULL) 1140 if (fd != NULL)
989 fclose (fd); 1141 fclose (fd);
990# endif /* USE_XGETDEFAULT */ 1142# endif /* USE_XGETDEFAULT */
991
992# if defined XAPPLOADDIR
993# if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
994
995 }
996
997 /* Free the path of the possibly available localized Rxvt file */
998 free (localepath);
999# endif
1000# endif
1001 1143
1002#endif /* NO_RESOURCES */ 1144#endif /* NO_RESOURCES */
1003} 1145}
1004 1146
1005/*}}} */ 1147/*}}} */

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines