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

Diff Legend

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