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.34 by root, Sun Aug 15 22:09:24 2004 UTC vs.
Revision 1.73 by root, Fri Jan 6 05:37:59 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.
… …
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 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
44
34/* #define DEBUG_RESOURCES */ 45/* #define DEBUG_RESOURCES */
35
36static const char *const xnames[2] = { ".Xdefaults", ".Xresources" };
37 46
38/*{{{ monolithic option/resource structure: */ 47/*{{{ monolithic option/resource structure: */
39/* 48/*
40 * `string' options MUST have a usage argument 49 * `string' options MUST have a usage argument
41 * `switch' and `boolean' options have no argument 50 * `switch' and `boolean' options have no argument
… …
54#define RSTRG(rsp, kw, arg) \ 63#define RSTRG(rsp, kw, arg) \
55 {0, (rsp), (kw), NULL, (arg), NULL} 64 {0, (rsp), (kw), NULL, (arg), NULL}
56 65
57/* BOOL () - regular boolean `-/+' flag */ 66/* BOOL () - regular boolean `-/+' flag */
58#define BOOL(rsp, kw, opt, flag, desc) \ 67#define BOOL(rsp, kw, opt, flag, desc) \
59 { (Opt_Boolean| (flag)), (rsp), (kw), (opt), NULL, (desc)} 68 { (Optflag_Boolean | (flag)), (rsp), (kw), (opt), NULL, (desc)}
60 69
61/* SWCH () - `-' flag */ 70/* SWCH () - `-' flag */
62#define SWCH(opt, flag, desc) \ 71#define SWCH(opt, flag, desc) \
63 { (flag), -1, NULL, (opt), NULL, (desc)} 72 { (flag), -1, NULL, (opt), NULL, (desc)}
64 73
65/* convenient macros */ 74/* convenient macros */
66#define optList_strlen(i) \ 75#define optList_strlen(i) \
67 (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))
68#define optList_isBool(i) \ 77#define optList_isBool(i) \
69 (optList[i].flag & Opt_Boolean) 78 (optList[i].flag & Optflag_Boolean)
70#define optList_isReverse(i) \ 79#define optList_isReverse(i) \
71 (optList[i].flag & Opt_Reverse) 80 (optList[i].flag & Optflag_Reverse)
72#define optList_size() \ 81#define optList_size \
73 (sizeof (optList) / sizeof (optList[0])) 82 (sizeof (optList) / sizeof (optList[0]))
74 83
75static const struct 84static const struct
76 { 85 {
77 const unsigned long flag; /* Option flag */ 86 const unsigned long flag; /* Option flag */
… …
91 SWCH ("iconic", Opt_iconic, "start iconic"), 100 SWCH ("iconic", Opt_iconic, "start iconic"),
92 SWCH ("ic", Opt_iconic, NULL), /* short form */ 101 SWCH ("ic", Opt_iconic, NULL), /* short form */
93 BOOL (Rs_reverseVideo, "reverseVideo", "rv", Opt_reverseVideo, "reverse video"), 102 BOOL (Rs_reverseVideo, "reverseVideo", "rv", Opt_reverseVideo, "reverse video"),
94 BOOL (Rs_loginShell, "loginShell", "ls", Opt_loginShell, "login shell"), 103 BOOL (Rs_loginShell, "loginShell", "ls", Opt_loginShell, "login shell"),
95 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"),
96#ifdef HAVE_SCROLLBARS 106#if HAVE_SCROLLBARS
107 RSTRG (Rs_scrollstyle, "scrollstyle", "mode"),
97 BOOL (Rs_scrollBar, "scrollBar", "sb", Opt_scrollBar, "scrollbar"), 108 BOOL (Rs_scrollBar, "scrollBar", "sb", Opt_scrollBar, "scrollbar"),
98 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"),
99 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"),
100#endif 113#endif
101 BOOL (Rs_scrollTtyOutput, "scrollTtyOutput", NULL, Opt_scrollTtyOutput, NULL), 114 BOOL (Rs_scrollTtyOutput, "scrollTtyOutput", NULL, Opt_scrollTtyOutput, NULL),
102 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"),
103 BOOL (Rs_scrollTtyKeypress, "scrollTtyKeypress", "sk", Opt_scrollTtyKeypress, "scroll-on-keypress"), 116 BOOL (Rs_scrollTtyKeypress, "scrollTtyKeypress", "sk", Opt_scrollTtyKeypress, "scroll-on-keypress"),
104 BOOL (Rs_scrollWithBuffer, "scrollWithBuffer", "sw", Opt_scrollWithBuffer, "scroll-with-buffer"), 117 BOOL (Rs_scrollWithBuffer, "scrollWithBuffer", "sw", Opt_scrollWithBuffer, "scroll-with-buffer"),
105#ifdef TRANSPARENT 118#if TRANSPARENT
106 BOOL (Rs_transparent, "inheritPixmap", "ip", Opt_transparent, "inherit parent pixmap"), 119 BOOL (Rs_transparent, "inheritPixmap", "ip", Opt_transparent, "inherit parent pixmap"),
107 BOOL (Rs_transparent_all, "inheritPixmapforce", "ipf", Opt_transparent_all, "forcefully inherit root pixmap"),
108 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
109#if TINTING 129#if TINTING
110 STRG (Rs_color + Color_tint, "tintColor", "tint", "color", "tint color"),
111#endif
112#endif
113#ifdef OFF_FOCUS_FADING
114 STRG (Rs_fade, "fading", "fade", "%", "make colors x% darker when urxvt is losing focus."),
115#endif
116#ifdef TINTING
117 STRG (Rs_shade, "shading", "sh", "%", "shade background by x% when tinting."), 130 STRG (Rs_shade, "shading", "sh", "%", "shade background by x% when tinting."),
118#endif 131#endif
119 BOOL (Rs_utmpInhibit, "utmpInhibit", "ut", Opt_utmpInhibit, "utmp inhibit"), 132 BOOL (Rs_utmpInhibit, "utmpInhibit", "ut", Opt_utmpInhibit, "utmp inhibit"),
120#ifndef NO_BELL 133#ifndef NO_BELL
121 BOOL (Rs_visualBell, "visualBell", "vb", Opt_visualBell, "visual bell"), 134 BOOL (Rs_visualBell, "visualBell", "vb", Opt_visualBell, "visual bell"),
… …
130 BOOL (Rs_mouseWheelScrollPage, "mouseWheelScrollPage", NULL, Opt_mouseWheelScrollPage, NULL), 143 BOOL (Rs_mouseWheelScrollPage, "mouseWheelScrollPage", NULL, Opt_mouseWheelScrollPage, NULL),
131#endif 144#endif
132#if ENABLE_FRILLS 145#if ENABLE_FRILLS
133 BOOL (Rs_tripleclickwords, "tripleclickwords", "tcw", Opt_tripleclickwords, "triple click word selection"), 146 BOOL (Rs_tripleclickwords, "tripleclickwords", "tcw", Opt_tripleclickwords, "triple click word selection"),
134 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"),
135#endif 149#endif
136#ifdef CURSOR_BLINK 150#if CURSOR_BLINK
137 BOOL (Rs_cursorBlink, "cursorBlink", "bc", Opt_cursorBlink, "blinking cursor"), 151 BOOL (Rs_cursorBlink, "cursorBlink", "bc", Opt_cursorBlink, "blinking cursor"),
138#endif 152#endif
139#ifdef POINTER_BLANK 153#ifdef POINTER_BLANK
140 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"),
141#endif 155#endif
… …
147 RSTRG (Rs_color + minCOLOR + 3, "color3", "color"), 161 RSTRG (Rs_color + minCOLOR + 3, "color3", "color"),
148 RSTRG (Rs_color + minCOLOR + 4, "color4", "color"), 162 RSTRG (Rs_color + minCOLOR + 4, "color4", "color"),
149 RSTRG (Rs_color + minCOLOR + 5, "color5", "color"), 163 RSTRG (Rs_color + minCOLOR + 5, "color5", "color"),
150 RSTRG (Rs_color + minCOLOR + 6, "color6", "color"), 164 RSTRG (Rs_color + minCOLOR + 6, "color6", "color"),
151 RSTRG (Rs_color + minCOLOR + 7, "color7", "color"), 165 RSTRG (Rs_color + minCOLOR + 7, "color7", "color"),
152#ifndef NO_BRIGHTCOLOR
153 RSTRG (Rs_color + minBrightCOLOR + 0, "color8", "color"), 166 RSTRG (Rs_color + minBrightCOLOR + 0, "color8", "color"),
154 RSTRG (Rs_color + minBrightCOLOR + 1, "color9", "color"), 167 RSTRG (Rs_color + minBrightCOLOR + 1, "color9", "color"),
155 RSTRG (Rs_color + minBrightCOLOR + 2, "color10", "color"), 168 RSTRG (Rs_color + minBrightCOLOR + 2, "color10", "color"),
156 RSTRG (Rs_color + minBrightCOLOR + 3, "color11", "color"), 169 RSTRG (Rs_color + minBrightCOLOR + 3, "color11", "color"),
157 RSTRG (Rs_color + minBrightCOLOR + 4, "color12", "color"), 170 RSTRG (Rs_color + minBrightCOLOR + 4, "color12", "color"),
158 RSTRG (Rs_color + minBrightCOLOR + 5, "color13", "color"), 171 RSTRG (Rs_color + minBrightCOLOR + 5, "color13", "color"),
159 RSTRG (Rs_color + minBrightCOLOR + 6, "color14", "color"), 172 RSTRG (Rs_color + minBrightCOLOR + 6, "color14", "color"),
160 RSTRG (Rs_color + minBrightCOLOR + 7, "color15", "color"), 173 RSTRG (Rs_color + minBrightCOLOR + 7, "color15", "color"),
161#endif /* NO_BRIGHTCOLOR */
162#ifndef NO_BOLD_UNDERLINE_REVERSE 174#ifndef NO_BOLD_UNDERLINE_REVERSE
163 BOOL (Rs_realBold, "realBold", "rb", Opt_realBold, "use bold fonts for bold text"),
164 RSTRG (Rs_color + Color_BD, "colorBD", "color"), 175 RSTRG (Rs_color + Color_BD, "colorBD", "color"),
176 RSTRG (Rs_color + Color_IT, "colorIT", "color"),
165 RSTRG (Rs_color + Color_UL, "colorUL", "color"), 177 RSTRG (Rs_color + Color_UL, "colorUL", "color"),
166 RSTRG (Rs_color + Color_RV, "colorRV", "color"), 178 RSTRG (Rs_color + Color_RV, "colorRV", "color"),
167#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
168#ifdef KEEP_SCROLLCOLOR 183#ifdef KEEP_SCROLLCOLOR
169 RSTRG (Rs_color + Color_scroll, "scrollColor", "color"), 184 RSTRG (Rs_color + Color_scroll, "scrollColor", "color"),
170 RSTRG (Rs_color + Color_trough, "troughColor", "color"), 185 RSTRG (Rs_color + Color_trough, "troughColor", "color"),
171#endif /* KEEP_SCROLLCOLOR */ 186#endif /* KEEP_SCROLLCOLOR */
172#ifdef OPTION_HC 187#ifdef OPTION_HC
173 STRG (Rs_color + Color_HC, "highlightColor", "hc", "color", "highlight color"), 188 STRG (Rs_color + Color_HC, "highlightColor", "hc", "color", "highlight color"),
174#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"),
175#if defined (XPM_BACKGROUND) || (MENUBAR_MAX) 198#if defined (XPM_BACKGROUND) || (MENUBAR_MAX)
176 RSTRG (Rs_path, "path", "search path"), 199 RSTRG (Rs_path, "path", "search path"),
177#endif /* defined (XPM_BACKGROUND) || (MENUBAR_MAX) */ 200#endif /* defined (XPM_BACKGROUND) || (MENUBAR_MAX) */
178#ifdef XPM_BACKGROUND 201#ifdef XPM_BACKGROUND
179 STRG (Rs_backgroundPixmap, "backgroundPixmap", "pixmap", "file[;geom]", "background pixmap"), 202 STRG (Rs_backgroundPixmap, "backgroundPixmap", "pixmap", "file[;geom]", "background pixmap"),
180#endif /* XPM_BACKGROUND */ 203#endif /* XPM_BACKGROUND */
181#if (MENUBAR_MAX) 204#if (MENUBAR_MAX)
182 RSTRG (Rs_menu, "menu", "name[;tag]"), 205 RSTRG (Rs_menu, "menu", "name[;tag]"),
183#endif 206#endif
207 /* fonts: command-line option = resource name */
184 STRG (Rs_font, "font", "fn", "fontname", "normal text font"), 208 STRG (Rs_font, "font", "fn", "fontname", "normal text font"),
185 /* 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
186#ifdef USE_XIM 215#ifdef USE_XIM
187 STRG (Rs_inputMethod, "inputMethod", "im", "name", "name of input method"), 216 STRG (Rs_inputMethod, "inputMethod", "im", "name", "name of input method"),
188 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"),
189#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
190 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"),
191#endif 219 STRG (Rs_imFont, "imFont", "imfont", "fontname", "fontset for styles OverTheSpot and OffTheSpot"),
192#endif /* USE_XIM */ 220#endif /* USE_XIM */
193 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"),
194 STRG (Rs_title, "title", "title", "string", "title name for window"), 222 STRG (Rs_title, "title", "title", "string", "title name for window"),
195 STRG (Rs_title, NULL, "T", NULL, NULL), /* short form */ 223 STRG (Rs_title, NULL, "T", NULL, NULL), /* short form */
196 STRG (Rs_iconName, "iconName", "n", "string", "icon name for window"), 224 STRG (Rs_iconName, "iconName", "n", "string", "icon name for window"),
197#ifndef NO_CURSORCOLOR
198 STRG (Rs_color + Color_cursor, "cursorColor", "cr", "color", "cursor color"),
199 /* command-line option = resource name */
200 RSTRG (Rs_color + Color_cursor2, "cursorColor2", "color"),
201#endif /* NO_CURSORCOLOR */
202 STRG (Rs_color + Color_pointer_fg, "pointerColor", "pr", "color", "pointer color"),
203 STRG (Rs_color + Color_pointer_bg, "pointerColor2", "pr2", "color", "pointer bg color"),
204 STRG (Rs_color + Color_border, "borderColor", "bd", "color", "border color"),
205 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"),
226#if ENABLE_XEMBED
227 STRG (Rs_embed, NULL, "embed", "windowid", "window id to embed terminal in"),
228#endif
206#if ENABLE_FRILLS 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"),
207 STRG (Rs_ext_bwidth, "externalBorder", "w", "number", "external border in pixels"), 233 STRG (Rs_ext_bwidth, "externalBorder", "w", "number", "external border in pixels"),
208 STRG (Rs_ext_bwidth, NULL, "bw", NULL, NULL), 234 STRG (Rs_ext_bwidth, NULL, "bw", NULL, NULL),
209 STRG (Rs_ext_bwidth, NULL, "borderwidth", NULL, NULL), 235 STRG (Rs_ext_bwidth, NULL, "borderwidth", NULL, NULL),
210 STRG (Rs_int_bwidth, "internalBorder", "b", "number", "internal border in pixels"), 236 STRG (Rs_int_bwidth, "internalBorder", "b", "number", "internal border in pixels"),
211 BOOL (Rs_borderLess, "borderLess", "bl", Opt_borderLess, "borderless window"), 237 BOOL (Rs_borderLess, "borderLess", "bl", Opt_borderLess, "borderless window"),
212#endif 238 BOOL (Rs_skipBuiltinGlyphs, "skipBuiltinGlyphs", "sbg", Opt_skipBuiltinGlyphs, "do not use internal glyphs"),
213#ifndef NO_LINESPACE
214 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"),
215#endif 240#endif
216 STRG (Rs_scrollBar_thickness, "thickness", "sbt", "number", "scrollbar thickness/width in pixels"),
217#ifdef POINTER_BLANK 241#ifdef POINTER_BLANK
218 RSTRG (Rs_pointerBlankDelay, "pointerBlankDelay", "number"), 242 RSTRG (Rs_pointerBlankDelay, "pointerBlankDelay", "number"),
219#endif 243#endif
220#ifndef NO_BACKSPACE_KEY 244#ifndef NO_BACKSPACE_KEY
221 RSTRG (Rs_backspace_key, "backspacekey", "string"), 245 RSTRG (Rs_backspace_key, "backspacekey", "string"),
222#endif 246#endif
223#ifndef NO_DELETE_KEY 247#ifndef NO_DELETE_KEY
224 RSTRG (Rs_delete_key, "deletekey", "string"), 248 RSTRG (Rs_delete_key, "deletekey", "string"),
225#endif 249#endif
226 RSTRG (Rs_selectstyle, "selectstyle", "mode"), 250 RSTRG (Rs_selectstyle, "selectstyle", "mode"),
227 RSTRG (Rs_scrollstyle, "scrollstyle", "mode"),
228#ifdef HAVE_SCROLLBARS
229 RSTRG (Rs_scrollBar_align, "scrollBar_align", "mode"),
230#endif
231#ifdef PRINTPIPE 251#ifdef PRINTPIPE
232 RSTRG (Rs_print_pipe, "print-pipe", "string"), 252 RSTRG (Rs_print_pipe, "print-pipe", "string"),
233#endif 253#endif
234 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"),
235 INFO ("xrm", "string", "X resource"),
236#ifdef CUTCHAR_RESOURCE 255#ifdef CUTCHAR_RESOURCE
237 RSTRG (Rs_cutchars, "cutchars", "string"), 256 RSTRG (Rs_cutchars, "cutchars", "string"),
238#endif /* CUTCHAR_RESOURCE */ 257#endif /* CUTCHAR_RESOURCE */
239 RSTRG (Rs_answerbackstring, "answerbackString", "string"), 258 RSTRG (Rs_answerbackstring, "answerbackString", "string"),
240#ifndef NO_SECONDARY_SCREEN 259#ifndef NO_SECONDARY_SCREEN
241 BOOL (Rs_secondaryScreen, "secondaryScreen", "ssc", Opt_secondaryScreen, "enable secondary screen"), 260 BOOL (Rs_secondaryScreen, "secondaryScreen", "ssc", Opt_secondaryScreen, "enable secondary screen"),
242 BOOL (Rs_secondaryScroll, "secondaryScroll", "ssr", Opt_secondaryScroll, "enable secondary screen scroll"), 261 BOOL (Rs_secondaryScroll, "secondaryScroll", "ssr", Opt_secondaryScroll, "enable secondary screen scroll"),
243#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
244 INFO ("e", "command arg ...", "command to execute") 274 INFO ("e", "command arg ...", "command to execute")
245 }; 275 };
246 276
247#undef INFO 277#undef INFO
248#undef STRG 278#undef STRG
249#undef RSTRG 279#undef RSTRG
250#undef SWCH 280#undef SWCH
251#undef BOOL 281#undef BOOL
252/*}}} */ 282/*}}} */
253 283
254static const char releasestring[] = "Rxvt v" VERSION " - released: " DATE "\n"; 284static const char releasestring[] = "rxvt-unicode (" RXVTNAME ") v" VERSION " - released: " DATE "\n";
255static const char optionsstring[] = "options: " 285static const char optionsstring[] = "options: "
256#if XFT 286#if XFT
257 "xft," 287 "xft,"
258#endif 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
259#if UNICODE_3 301#if UNICODE_3
260 "unicode3," 302 "unicode3,"
261#endif 303#endif
262 "encodings=eu+vn" 304 "encodings=eu+vn"
263#if ENCODING_JP 305#if ENCODING_JP
… …
267 "+jp-ext" 309 "+jp-ext"
268#endif 310#endif
269#if ENCODING_KR 311#if ENCODING_KR
270 "+kr" 312 "+kr"
271#endif 313#endif
272#if ENCODING_CN 314#if ENCODING_ZH
273 "+cn" 315 "+zh"
274#endif 316#endif
275#if ENCODING_CN_EXT 317#if ENCODING_ZH_EXT
276 "+cn-ext" 318 "+zh-ext"
277#endif 319#endif
278 "," 320 ","
279#if ENABLE_COMBINING
280 "combining,"
281#endif
282#if TEXT_BLINK
283 "blink,"
284#endif
285#if OFF_FOCUS_FADING 321#if OFF_FOCUS_FADING
286 "fade," 322 "fade,"
287#endif 323#endif
288#if defined(XPM_BACKGROUND) 324#if defined(XPM_BACKGROUND)
289 "XPM," 325 "XPM,"
… …
343 "strings," 379 "strings,"
344#endif 380#endif
345#if defined(ENABLE_FRILLS) 381#if defined(ENABLE_FRILLS)
346 "frills," 382 "frills,"
347#endif 383#endif
348#if !defined(NO_LINESPACE)
349 "linespace,"
350#endif
351#if defined(PREFER_24BIT) 384#if defined(PREFER_24BIT)
352 "24bit," 385 "24bit,"
353#endif 386#endif
354#if defined(SELECTION_SCROLLING) 387#if defined(SELECTION_SCROLLING)
355 "selectionscrolling," 388 "selectionscrolling,"
… …
360#if MOUSE_SLIP_WHEELING 393#if MOUSE_SLIP_WHEELING
361 "slipwheel," 394 "slipwheel,"
362#endif 395#endif
363#if defined(SMART_RESIZE) 396#if defined(SMART_RESIZE)
364 "smart-resize," 397 "smart-resize,"
365#endif
366#if defined(TTY_256COLOR)
367 "256colour,"
368#endif 398#endif
369#if defined(CURSOR_BLINK) 399#if defined(CURSOR_BLINK)
370 "cursorBlink," 400 "cursorBlink,"
371#endif 401#endif
372#if defined(POINTER_BLANK) 402#if defined(POINTER_BLANK)
… …
397 switch (type) 427 switch (type)
398 { 428 {
399 case 0: /* brief listing */ 429 case 0: /* brief listing */
400 rxvt_log (" [-help] [--help]\n"); 430 rxvt_log (" [-help] [--help]\n");
401 431
402 for (col = 1, i = 0; i < optList_size (); i++) 432 for (col = 1, i = 0; i < optList_size; i++)
403 if (optList[i].desc != NULL) 433 if (optList[i].desc != NULL)
404 { 434 {
405 int len = 0; 435 int len = 0;
406 436
407 if (!optList_isBool (i)) 437 if (!optList_isBool (i))
… …
430 break; 460 break;
431 461
432 case 1: /* full command-line listing */ 462 case 1: /* full command-line listing */
433 rxvt_log (" [options] [-e command args]\n\nwhere options include:\n"); 463 rxvt_log (" [options] [-e command args]\n\nwhere options include:\n");
434 464
435 for (i = 0; i < optList_size (); i++) 465 for (i = 0; i < optList_size; i++)
436 if (optList[i].desc != NULL) 466 if (optList[i].desc != NULL)
437 { 467 {
438#ifdef DEBUG_STRICT 468#ifdef DEBUG_STRICT
439 assert (optList[i].opt != NULL); 469 assert (optList[i].opt != NULL);
440#endif 470#endif
… …
451 481
452 case 2: /* full resource listing */ 482 case 2: /* full resource listing */
453 rxvt_log (" [options] [-e command args]\n\n" 483 rxvt_log (" [options] [-e command args]\n\n"
454 "where resources (long-options) include:\n"); 484 "where resources (long-options) include:\n");
455 485
456 for (i = 0; i < optList_size (); i++) 486 for (i = 0; i < optList_size; i++)
457 if (optList[i].kw != NULL) 487 if (optList[i].kw != NULL)
458 rxvt_log (" %s: %*s%s\n", 488 rxvt_log (" %s: %*s%s\n",
459 optList[i].kw, 489 optList[i].kw,
460 (INDENT - strlen (optList[i].kw)), "", /* XXX */ 490 (INDENT - strlen (optList[i].kw)), "", /* XXX */
461 (optList_isBool (i) ? "boolean" : optList[i].arg)); 491 (optList_isBool (i) ? "boolean" : optList[i].arg));
… …
482 int i, bad_option = 0; 512 int i, bad_option = 0;
483 static const char On[3] = "ON", Off[4] = "OFF"; 513 static const char On[3] = "ON", Off[4] = "OFF";
484 514
485 for (i = 1; i < argc; i++) 515 for (i = 1; i < argc; i++)
486 { 516 {
487 unsigned int entry, longopt = 0; 517 unsigned int entry, longopt = 0;
488 const char *flag, *opt; 518 const char *flag, *opt;
489 519
490 opt = argv[i]; 520 opt = argv[i];
491#ifdef DEBUG_RESOURCES 521#ifdef DEBUG_RESOURCES
492 fprintf (stderr, "argv[%d] = %s: ", i, opt); 522 fprintf (stderr, "argv[%d] = %s: ", i, opt);
493#endif 523#endif
… …
514 rxvt_usage (longopt ? 2 : 1); 544 rxvt_usage (longopt ? 2 : 1);
515 if (!strcmp (opt, "h")) 545 if (!strcmp (opt, "h"))
516 rxvt_usage (0); 546 rxvt_usage (0);
517 547
518 /* feature: always try to match long-options */ 548 /* feature: always try to match long-options */
519 for (entry = 0; entry < optList_size (); entry++) 549 for (entry = 0; entry < optList_size; entry++)
520 if ((optList[entry].kw && !strcmp (opt, optList[entry].kw)) 550 if ((optList[entry].kw && !strcmp (opt, optList[entry].kw))
521 || (!longopt 551 || (!longopt
522 && optList[entry].opt && !strcmp (opt, optList[entry].opt))) 552 && optList[entry].opt && !strcmp (opt, optList[entry].opt)))
523 break; 553 break;
524 554
525 if (entry < optList_size ()) 555 if (entry < optList_size)
526 { 556 {
527 if (optList_isReverse (entry)) 557 if (optList_isReverse (entry))
528 flag = flag == On ? Off : On; 558 flag = flag == On ? Off : On;
529 559
530 if (optList_strlen (entry)) 560 if (optList_strlen (entry))
… …
544#ifdef DEBUG_RESOURCES 574#ifdef DEBUG_RESOURCES
545 fprintf (stderr, "boolean (%s,%s) = %s\n", 575 fprintf (stderr, "boolean (%s,%s) = %s\n",
546 optList[entry].opt, optList[entry].kw, flag); 576 optList[entry].opt, optList[entry].kw, flag);
547#endif 577#endif
548 if (flag == On) 578 if (flag == On)
549 options |= (optList[entry].flag); 579 SET_OPTION (optList[entry].flag & Optflag_mask);
550 else 580 else
551 options &= ~ (optList[entry].flag); 581 CLR_OPTION (optList[entry].flag & Optflag_mask);
552 582
553 if (optList[entry].doff != -1) 583 if (optList[entry].doff != -1)
554 rs[optList[entry].doff] = flag; 584 rs[optList[entry].doff] = flag;
555 } 585 }
556 } 586 }
… …
595 XrmQuarkList quarks, 625 XrmQuarkList quarks,
596 XrmRepresentation *type __attribute__((unused)), 626 XrmRepresentation *type __attribute__((unused)),
597 XrmValue *value, 627 XrmValue *value,
598 XPointer closure __attribute__((unused))) 628 XPointer closure __attribute__((unused)))
599{ 629{
600 int last; 630 int last;
601 631
602 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 */
603 ; 633 ;
634
604 last--; 635 last--;
605 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
606 return False; 637 return False;
607} 638}
608 639
… …
613 * arg will be 644 * arg will be
614 * NULL for ~/.Xdefaults and 645 * NULL for ~/.Xdefaults and
615 * non-NULL for command-line options (need to allocate) 646 * non-NULL for command-line options (need to allocate)
616 */ 647 */
617#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
618int 685int
619rxvt_term::parse_keysym (const char *str, const char *arg) 686rxvt_term::parse_keysym (const char *str, const char *arg)
620{ 687{
621 int n, sym; 688 int n, sym;
622 char *key_string, *newarg = NULL; 689 unsigned int state = 0;
690 const char *pmodend = NULL;
691 char *newarg = NULL;
623 char newargstr[NEWARGLIM]; 692 char newargstr[NEWARGLIM];
624 693
625 if (arg == NULL) 694 if (arg == NULL)
626 { 695 {
627 if ((n = rxvt_Str_match (str, "keysym.")) == 0) 696 if ((n = rxvt_Str_match (str, "keysym.")) == 0)
628 return 0; 697 return 0;
698
629 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)
630 } 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
631 /* some scanf () have trouble with a 0x prefix */ 731 /* some scanf () have trouble with a 0x prefix */
632 if (isdigit (str[0]))
633 {
634 if (str[0] == '0' && toupper (str[1]) == 'X') 732 if (str[0] == '0' && toupper (str[1]) == 'X')
733 {
635 str += 2; 734 str += 2;
735
636 if (arg) 736 if (arg)
637 { 737 {
638 if (sscanf (str, (strchr (str, ':') ? "%x:" : "%x"), &sym) != 1) 738 if (sscanf (str, (strchr (str, ':') ? "%x:" : "%x"), &sym) != 1)
639 return -1; 739 return -1;
640 } 740 }
… …
654 /* 754 /*
655 * convert keysym name to keysym number 755 * convert keysym name to keysym number
656 */ 756 */
657 strncpy (newargstr, str, NEWARGLIM - 1); 757 strncpy (newargstr, str, NEWARGLIM - 1);
658 newargstr[NEWARGLIM - 1] = '\0'; 758 newargstr[NEWARGLIM - 1] = '\0';
759
659 if (arg == NULL) 760 if (arg == NULL)
660 { 761 {
661 if ((newarg = strchr (newargstr, ':')) == NULL) 762 if ((newarg = strchr (newargstr, ':')) == NULL)
662 return -1; 763 return -1;
764
663 *newarg++ = '\0'; /* terminate keysym name */ 765 *newarg++ = '\0'; /* terminate keysym name */
664 } 766 }
767
665 if ((sym = XStringToKeysym (newargstr)) == None) 768 if ((sym = XStringToKeysym (newargstr)) == None)
666 return -1; 769 return -1;
667 } 770 }
668
669 if (sym < 0xFF00 || sym > 0xFFFF) /* we only do extended keys */
670 return -1;
671 sym &= 0xFF;
672 if (Keysym_map[sym] != NULL) /* already set ? */
673 return -1;
674 771
675 if (newarg == NULL) 772 if (newarg == NULL)
676 { 773 {
677 strncpy (newargstr, arg, NEWARGLIM - 1); 774 strncpy (newargstr, arg, NEWARGLIM - 1);
678 newargstr[NEWARGLIM - 1] = '\0'; 775 newargstr[NEWARGLIM - 1] = '\0';
679 newarg = newargstr; 776 newarg = newargstr;
680 } 777 }
778
681 rxvt_Str_trim (newarg); 779 rxvt_Str_trim (newarg);
682 if (*newarg == '\0' || (n = rxvt_Str_escaped (newarg)) == 0) 780 if (*newarg == '\0' || (n = rxvt_Str_escaped (newarg)) == 0)
683 return -1; 781 return -1;
684 MIN_IT (n, 255);
685 key_string = (char *)rxvt_malloc ((n + 1) * sizeof (char));
686 782
687 key_string[0] = n; 783 keyboard->register_user_translation (sym, state, newarg);
688 strncpy (key_string + 1, newarg, n);
689 Keysym_map[sym] = (unsigned char *)key_string;
690
691 return 1; 784 return 1;
692} 785}
693 786
694# endif /* KEYSYM_RESOURCE */ 787# endif /* KEYSYM_RESOURCE */
695 788
… …
708 return; 801 return;
709 802
710 len = strlen (name); 803 len = strlen (name);
711 while ((str = fgets (buffer, sizeof (buffer), stream)) != NULL) 804 while ((str = fgets (buffer, sizeof (buffer), stream)) != NULL)
712 { 805 {
713 unsigned int entry, n; 806 unsigned int entry, n;
714 807
715 while (*str && isspace (*str)) 808 while (*str && isspace (*str))
716 str++; /* leading whitespace */ 809 str++; /* leading whitespace */
717 810
718 if ((str[len] != '*' && str[len] != '.') 811 if ((str[len] != '*' && str[len] != '.')
… …
721 str += (len + 1); /* skip `name*' or `name.' */ 814 str += (len + 1); /* skip `name*' or `name.' */
722 815
723# ifdef KEYSYM_RESOURCE 816# ifdef KEYSYM_RESOURCE
724 if (!parse_keysym (str, NULL)) 817 if (!parse_keysym (str, NULL))
725# endif /* KEYSYM_RESOURCE */ 818# endif /* KEYSYM_RESOURCE */
726 for (entry = 0; entry < optList_size (); entry++) 819 for (entry = 0; entry < optList_size; entry++)
727 { 820 {
728 const char *kw = optList[entry].kw; 821 const char *kw = optList[entry].kw;
729 822
730 if (kw == NULL) 823 if (kw == NULL)
731 continue; 824 continue;
… …
735 { 828 {
736 /* skip `keyword:' */ 829 /* skip `keyword:' */
737 str += n + 1; 830 str += n + 1;
738 rxvt_Str_trim (str); 831 rxvt_Str_trim (str);
739 n = strlen (str); 832 n = strlen (str);
833
740 if (n && rs[optList[entry].doff] == NULL) 834 if (n && rs[optList[entry].doff] == NULL)
741 { 835 {
742 /* not already set */ 836 /* not already set */
743 int s; 837 int s;
744 char *p = 0; 838 char *p = 0;
… …
765 rs[optList[entry].doff] = p; 859 rs[optList[entry].doff] = p;
766 allocated.push_back (p); 860 allocated.push_back (p);
767 861
768 if (optList_isBool (entry)) 862 if (optList_isBool (entry))
769 { 863 {
770 s = strcasecmp (str, "TRUE") == 0 864 s = strcasecmp (str, "true") == 0
771 || strcasecmp (str, "YES") == 0 865 || strcasecmp (str, "yes") == 0
772 || strcasecmp (str, "ON") == 0 866 || strcasecmp (str, "on") == 0
773 || strcasecmp (str, "1") == 0; 867 || strcmp (str, "1") == 0;
774 868
775 if (optList_isReverse (entry)) 869 if (optList_isReverse (entry))
776 s = !s; 870 s = !s;
777 871
778 if (s) 872 if (s)
779 options |= optList[entry].flag; 873 SET_OPTION (optList[entry].flag & Optflag_mask);
780 else 874 else
781 options &= ~optList[entry].flag; 875 CLR_OPTION (optList[entry].flag & Optflag_mask);
782 } 876 }
783 } 877 }
784 878
785 break; 879 break;
786 } 880 }
… …
798/* 892/*
799 * using XGetDefault () or the hand-rolled replacement 893 * using XGetDefault () or the hand-rolled replacement
800 */ 894 */
801/* ARGSUSED */ 895/* ARGSUSED */
802void 896void
803rxvt_term::extract_resources (Display *display __attribute__ ((unused)), const char *name) 897rxvt_term::extract_resources ()
804{ 898{
899 dDisp;
900
805#ifndef NO_RESOURCES 901#ifndef NO_RESOURCES
902
903 char *homedir = (char *)getenv ("HOME");
904 char fname[1024];
806 905
807# if defined XAPPLOADDIR 906# if defined XAPPLOADDIR
808# if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE) 907# if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
809 /* Compute the path of the possibly available localized Rxvt file */ 908 /* Compute the path of the possibly available localized Rxvt file */
810 char *localepath = NULL; 909 char localepath[1024];
811 910
812 if (locale != NULL) 911 if (locale)
813 { /* XXX: must limit length of string */
814 localepath = (char *)rxvt_malloc (256);
815 sprintf (localepath, XAPPLOADDIRLOCALE "/" RESCLASS, 912 snprintf (localepath, sizeof (localepath), XAPPLOADDIRLOCALE "/" RESCLASS, locale);
816 (int) (258 - sizeof (XAPPLOADDIRLOCALE) - sizeof (RESCLASS)), 913 else
817 locale); /* 258 = 255 + 4 (-.*s) - 1 (/) */ 914 localepath[0] = 0;
818 }
819
820 {
821# endif 915# endif
822# endif 916# endif
823 917
824# ifdef USE_XGETDEFAULT 918# ifdef USE_XGETDEFAULT
825 /* 919 /*
826 * get resources using the X library function 920 * get resources using the X library function
827 */ 921 */
828 int entry; 922 int entry;
829 923
830# ifdef XrmEnumOneLevel 924# ifdef XrmEnumOneLevel
831 int i;
832 char *displayResource, *xe; 925 char *displayResource, *xe;
833 XrmName name_prefix[3]; 926 XrmName name_prefix[3];
834 XrmClass class_prefix[3]; 927 XrmClass class_prefix[3];
835 XrmDatabase database, rdb1; 928 XrmDatabase database, rdb1;
836 char fname[1024];
837 929
838 XrmInitialize (); 930 XrmInitialize ();
839 database = NULL; 931 database = NULL;
840 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.
841 /* Get any Xserver defaults */ 957 /* Get any Xserver defaults */
842
843 displayResource = XResourceManagerString (display); 958 displayResource = XResourceManagerString (disp);
844 if (displayResource != NULL) 959 if (displayResource != NULL)
960 {
845 database = XrmGetStringDatabase (displayResource); 961 if ((rdb1 = XrmGetStringDatabase (displayResource)))
846 962 XrmMergeDatabases (rdb1, &database);
847# ifdef HAVE_EXTRA_XRESOURCE_FILES
848 /* Add in ~/.Xdefaults or ~/.Xresources */
849 { 963 }
850 char *ptr; 964 else if (homedir)
965 {
966 snprintf (fname, sizeof (fname), "%s/.Xdefaults", homedir);
851 967
852 if ((ptr = (char *)getenv ("HOME")) == NULL) 968 if ((rdb1 = XrmGetFileDatabase (fname)))
853 ptr = "."; 969 XrmMergeDatabases (rdb1, &database);
970 }
854 971
855 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))
856 { 993 {
857 sprintf (fname, "%-.*s/%s", sizeof (fname) - strlen (xnames[i]) - 2, 994 snprintf (fname, sizeof (fname), "%s/.Xdefaults-%s", homedir, un.nodename);
858 ptr, xnames[i]); 995
859 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))
860 { 1035 {
861 XrmMergeDatabases (rdb1, &database); 1036 s = strcasecmp (p, "TRUE") == 0
862# 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);
863 break; 1046 else
864# endif 1047 CLR_OPTION (optList[entry].flag & Optflag_mask);
865
866 } 1048 }
867 } 1049 }
868 } 1050 }
869# endif
870 1051
871 /* Add in XENVIRONMENT file */
872
873 if ((xe = (char *)getenv ("XENVIRONMENT")) != NULL
874 && (rdb1 = XrmGetFileDatabase (xe)) != NULL)
875 XrmMergeDatabases (rdb1, &database);
876
877 /* Add in Rxvt file */
878# if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
879 if (localepath == NULL || (rdb1 = XrmGetFileDatabase (localepath)) == NULL)
880# endif
881 rdb1 = XrmGetFileDatabase (XAPPLOADDIR "/" RESCLASS);
882
883 if (rdb1 != NULL)
884 XrmMergeDatabases (rdb1, &database);
885
886 /* Add in $XAPPLRESDIR/Rxvt only; not bothering with XUSERFILESEARCHPATH */
887 if ((xe = (char *)getenv ("XAPPLRESDIR")) != NULL)
888 {
889 sprintf (fname, "%-.*s/" RESCLASS, sizeof (fname)
890 - sizeof (RESCLASS) - 2, xe);
891 if ((rdb1 = XrmGetFileDatabase (fname)) != NULL)
892 XrmMergeDatabases (rdb1, &database);
893 }
894
895 XrmSetDatabase (display, database);
896# endif
897
898 /* 1052 /*
899 * Query resources for options that affect us
900 */
901 for (entry = 0; entry < optList_size (); entry++)
902 {
903 int s;
904 char *p, *p0;
905 const char *kw = optList[entry].kw;
906
907 if (kw == NULL || rs[optList[entry].doff] != NULL)
908 continue; /* previously set */
909
910 p = XGetDefault (display, name, kw);
911 p0 = XGetDefault (display, "!INVALIDPROGRAMMENAMEDONTMATCH!", kw);
912 if (p == NULL || (p0 && strcmp (p, p0) == 0))
913 {
914 p = XGetDefault (display, RESCLASS, kw);
915#ifdef RESFALLBACK
916 if (p == NULL || (p0 && strcmp (p, p0) == 0))
917 p = XGetDefault (display, RESFALLBACK, kw);
918#endif
919 }
920
921 if (p == NULL && p0)
922 p = p0;
923
924 if (p)
925 {
926 rs[optList[entry].doff] = p;
927
928 if (optList_isBool (entry))
929 {
930 s = strcasecmp (p, "TRUE") == 0
931 || strcasecmp (p, "YES") == 0
932 || strcasecmp (p, "ON") == 0
933 || strcasecmp (p, "1") == 0;
934 if (optList_isReverse (entry))
935 s = !s;
936 if (s)
937 options |= (optList[entry].flag);
938 else
939 options &= ~ (optList[entry].flag);
940 }
941 }
942 }
943
944 /*
945 * [R5 or later]: enumerate the resource database 1053 * [R5 or later]: enumerate the resource database
946 */ 1054 */
947# ifdef XrmEnumOneLevel
948# ifdef KEYSYM_RESOURCE 1055# ifdef KEYSYM_RESOURCE
949 name_prefix[0] = XrmStringToName (name); 1056 name_prefix[0] = XrmStringToName (rs[Rs_name]);
950 name_prefix[1] = XrmStringToName ("keysym"); 1057 name_prefix[1] = XrmStringToName ("keysym");
951 name_prefix[2] = NULLQUARK; 1058 name_prefix[2] = NULLQUARK;
952 class_prefix[0] = XrmStringToName (RESCLASS); 1059 class_prefix[0] = XrmStringToName (RESCLASS);
953 class_prefix[1] = XrmStringToName ("Keysym"); 1060 class_prefix[1] = XrmStringToName ("Keysym");
954 class_prefix[2] = NULLQUARK; 1061 class_prefix[2] = NULLQUARK;
955 /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */ 1062 /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */
956 XrmEnumerateDatabase (XrmGetDatabase (display), name_prefix, class_prefix, 1063 XrmEnumerateDatabase (XrmGetDatabase (disp), name_prefix, class_prefix,
957 XrmEnumOneLevel, rxvt_define_key, NULL); 1064 XrmEnumOneLevel, rxvt_define_key, NULL);
958# ifdef RESFALLBACK 1065# ifdef RESFALLBACK
959 name_prefix[0] = XrmStringToName (RESFALLBACK); 1066 name_prefix[0] = XrmStringToName (RESFALLBACK);
960 name_prefix[1] = XrmStringToName ("keysym"); 1067 name_prefix[1] = XrmStringToName ("keysym");
961 class_prefix[0] = XrmStringToName (RESFALLBACK); 1068 class_prefix[0] = XrmStringToName (RESFALLBACK);
962 class_prefix[1] = XrmStringToName ("Keysym"); 1069 class_prefix[1] = XrmStringToName ("Keysym");
963 /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */ 1070 /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */
964 XrmEnumerateDatabase (XrmGetDatabase (display), name_prefix, class_prefix, 1071 XrmEnumerateDatabase (XrmGetDatabase (disp), name_prefix, class_prefix,
965 XrmEnumOneLevel, rxvt_define_key, NULL); 1072 XrmEnumOneLevel, rxvt_define_key, NULL);
966# endif
967# endif 1073# endif
968# endif 1074# endif
969 1075
970# else /* USE_XGETDEFAULT */ 1076# else /* USE_XGETDEFAULT */
971 /* 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 {
972 FILE *fd = NULL; 1122 FILE *ad = NULL;
973 char *home;
974 1123
975 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)
976 { 1129 {
977 unsigned int i, len = strlen (home) + 2; 1130 get_xdefaults (ad, RESCLASS);
978 char *f = NULL; 1131 get_xdefaults (ad, "");
979
980 for (i = 0; i < (sizeof (xnames) / sizeof (xnames[0])); i++)
981 {
982 f = (char *)rxvt_realloc (f, (len + strlen (xnames[i])) * sizeof (char));
983
984 sprintf (f, "%s/%s", home, xnames[i]);
985
986 if ((fd = fopen (f, "r")) != NULL)
987 break;
988 }
989 free (f); 1132 fclose (ad);
990 } 1133 }
991 /*
992 * The normal order to match resources is the following:
993 * @ global resources (partial match, ~/.Xdefaults)
994 * @ application file resources (XAPPLOADDIR/Rxvt)
995 * @ class resources (~/.Xdefaults)
996 * @ private resources (~/.Xdefaults)
997 *
998 * However, for the hand-rolled resources, the matching algorithm
999 * checks if a resource string value has already been allocated
1000 * and won't overwrite it with (in this case) a less specific
1001 * resource value.
1002 *
1003 * This avoids multiple allocation. Also, when we've called this
1004 * routine command-line string options have already been applied so we
1005 * needn't to allocate for those resources.
1006 *
1007 * So, search in resources from most to least specific.
1008 *
1009 * Also, use a special sub-class so that we can use either or both of
1010 * "XTerm" and "Rxvt" as class names.
1011 */
1012
1013 get_xdefaults (fd, name);
1014 get_xdefaults (fd, RESCLASS);
1015# ifdef RESFALLBACK
1016 get_xdefaults (fd, RESFALLBACK);
1017# endif
1018
1019# if defined(XAPPLOADDIR) && defined(USE_XAPPLOADDIR)
1020 {
1021 FILE *ad = NULL;
1022
1023# if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1024 if (localepath == NULL || (ad = fopen (localepath, "r")) == NULL)
1025# endif
1026 ad = fopen (XAPPLOADDIR "/" RESCLASS, "r");
1027 if (ad != NULL)
1028 {
1029 get_xdefaults (ad, RESCLASS);
1030 get_xdefaults (ad, "");
1031 fclose (ad);
1032 }
1033 } 1134 }
1034# endif /* XAPPLOADDIR */ 1135# endif /* XAPPLOADDIR */
1035 1136
1036 get_xdefaults (fd, ""); /* partial match */ 1137 get_xdefaults (fd, ""); /* partial match */
1037 if (fd != NULL) 1138 if (fd != NULL)
1038 fclose (fd); 1139 fclose (fd);
1039# endif /* USE_XGETDEFAULT */ 1140# endif /* USE_XGETDEFAULT */
1040
1041# if defined XAPPLOADDIR
1042# if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1043
1044 }
1045
1046 /* Free the path of the possibly available localized Rxvt file */
1047 free (localepath);
1048# endif
1049# endif
1050 1141
1051#endif /* NO_RESOURCES */ 1142#endif /* NO_RESOURCES */
1052} 1143}
1053 1144
1054/*}}} */ 1145/*}}} */

Diff Legend

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