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

Diff Legend

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