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.88 by root, Wed Jan 25 22:14:45 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" /* NECESSARY */
31#include "rxvt.h" /* NECESSARY */ 27#include "rxvt.h" /* NECESSARY */
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
… …
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 ENABLE_FRILLS
217 RSTRG (Rs_transient_for, "transient-for", "windowid"),
218 BOOL (Rs_override_redirect, "override-redirect", "override-redirect", Opt_override_redirect, "set override-redirect on the terminal window"),
219 STRG (Rs_pty_fd, NULL, "pty-fd", "fileno", "file descriptor of pty to use"),
220 BOOL (Rs_hold, "hold", "hold", Opt_hold, "retain window after shell exit"),
221 STRG (Rs_depth, "depth", "depth", "number", "depth of visual to request"),
208 STRG (Rs_ext_bwidth, "externalBorder", "w", "number", "external border in pixels"), 222 STRG (Rs_ext_bwidth, "externalBorder", "w", "number", "external border in pixels"),
209 STRG (Rs_ext_bwidth, NULL, "bw", NULL, NULL), 223 STRG (Rs_ext_bwidth, NULL, "bw", NULL, NULL),
210 STRG (Rs_ext_bwidth, NULL, "borderwidth", NULL, NULL), 224 STRG (Rs_ext_bwidth, NULL, "borderwidth", NULL, NULL),
211 STRG (Rs_int_bwidth, "internalBorder", "b", "number", "internal border in pixels"), 225 STRG (Rs_int_bwidth, "internalBorder", "b", "number", "internal border in pixels"),
212 BOOL (Rs_borderLess, "borderLess", "bl", Opt_borderLess, "borderless window"), 226 BOOL (Rs_borderLess, "borderLess", "bl", Opt_borderLess, "borderless window"),
213#endif 227 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"), 228 STRG (Rs_lineSpace, "lineSpace", "lsp", "number", "number of extra pixels between rows"),
216#endif 229#endif
217 STRG (Rs_scrollBar_thickness, "thickness", "sbt", "number", "scrollbar thickness/width in pixels"),
218#ifdef POINTER_BLANK 230#ifdef POINTER_BLANK
219 RSTRG (Rs_pointerBlankDelay, "pointerBlankDelay", "number"), 231 RSTRG (Rs_pointerBlankDelay, "pointerBlankDelay", "number"),
220#endif 232#endif
221#ifndef NO_BACKSPACE_KEY 233#ifndef NO_BACKSPACE_KEY
222 RSTRG (Rs_backspace_key, "backspacekey", "string"), 234 RSTRG (Rs_backspace_key, "backspacekey", "string"),
223#endif 235#endif
224#ifndef NO_DELETE_KEY 236#ifndef NO_DELETE_KEY
225 RSTRG (Rs_delete_key, "deletekey", "string"), 237 RSTRG (Rs_delete_key, "deletekey", "string"),
226#endif 238#endif
227 RSTRG (Rs_selectstyle, "selectstyle", "mode"), 239 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 240#ifdef PRINTPIPE
233 RSTRG (Rs_print_pipe, "print-pipe", "string"), 241 RSTRG (Rs_print_pipe, "print-pipe", "string"),
234#endif 242#endif
235 STRG (Rs_modifier, "modifier", "mod", "modifier", "meta modifier = alt|meta|hyper|super|mod1|...|mod5"), 243 STRG (Rs_modifier, "modifier", "mod", "modifier", "meta modifier = alt|meta|hyper|super|mod1|...|mod5"),
236 INFO ("xrm", "string", "X resource"),
237#ifdef CUTCHAR_RESOURCE 244#ifdef CUTCHAR_RESOURCE
238 RSTRG (Rs_cutchars, "cutchars", "string"), 245 RSTRG (Rs_cutchars, "cutchars", "string"),
239#endif /* CUTCHAR_RESOURCE */ 246#endif /* CUTCHAR_RESOURCE */
240 RSTRG (Rs_answerbackstring, "answerbackString", "string"), 247 RSTRG (Rs_answerbackstring, "answerbackString", "string"),
241#ifndef NO_SECONDARY_SCREEN 248#ifndef NO_SECONDARY_SCREEN
242 BOOL (Rs_secondaryScreen, "secondaryScreen", "ssc", Opt_secondaryScreen, "enable secondary screen"), 249 BOOL (Rs_secondaryScreen, "secondaryScreen", "ssc", Opt_secondaryScreen, "enable secondary screen"),
243 BOOL (Rs_secondaryScroll, "secondaryScroll", "ssr", Opt_secondaryScroll, "enable secondary screen scroll"), 250 BOOL (Rs_secondaryScroll, "secondaryScroll", "ssr", Opt_secondaryScroll, "enable secondary screen scroll"),
244#endif 251#endif
252#if ENABLE_PERL
253 RSTRG (Rs_perl_lib, "perl-lib", "string"), //, "colon-separated directories with extension scripts"),TODO
254 RSTRG (Rs_perl_eval, "perl-eval", "perl-eval"), // "string", "code to be evaluated after all extensions have been loaded"),TODO
255 RSTRG (Rs_perl_ext_1, "perl-ext-common", "string"), //, "colon-separated list of perl extensions to enable"),TODO
256 STRG (Rs_perl_ext_2, "perl-ext", "pe", "string", "colon-separated list of perl extensions to enable for this instance"),
257#endif
258#ifndef NO_RESOURCES
259 INFO ("xrm", "string", "X resource"),
260#endif
245 INFO ("e", "command arg ...", "command to execute") 261 INFO ("e", "command arg ...", "command to execute")
246 }; 262 };
247 263
248#undef INFO 264#undef INFO
249#undef STRG 265#undef STRG
250#undef RSTRG 266#undef RSTRG
251#undef SWCH 267#undef SWCH
252#undef BOOL 268#undef BOOL
253/*}}} */ 269/*}}} */
254 270
255static const char releasestring[] = "Rxvt v" VERSION " - released: " DATE "\n"; 271static const char releasestring[] = "rxvt-unicode (" RXVTNAME ") v" VERSION " - released: " DATE "\n";
256static const char optionsstring[] = "Options: " 272static const char optionsstring[] = "options: "
273#if ENABLE_PERL
274 "perl,"
275#endif
257#if XFT 276#if XFT
258 "xft," 277 "xft,"
278#endif
279#if ENABLE_STYLES
280 "styles,"
281#endif
282#if ENABLE_COMBINING
283 "combining,"
284#endif
285#if TEXT_BLINK
286 "blink,"
287#endif
288#if ISO_14755
289 "iso14755,"
259#endif 290#endif
260#if UNICODE_3 291#if UNICODE_3
261 "unicode3," 292 "unicode3,"
262#endif 293#endif
263 "encodings=eu+vn" 294 "encodings=eu+vn"
… …
268 "+jp-ext" 299 "+jp-ext"
269#endif 300#endif
270#if ENCODING_KR 301#if ENCODING_KR
271 "+kr" 302 "+kr"
272#endif 303#endif
273#if ENCODING_CN 304#if ENCODING_ZH
274 "+cn" 305 "+zh"
275#endif 306#endif
276#if ENCODING_CN_EXT 307#if ENCODING_ZH_EXT
277 "+cn-ext" 308 "+zh-ext"
278#endif 309#endif
279 "," 310 ","
280#if ENABLE_COMBINING
281 "combining,"
282#endif
283#if TEXT_BLINK
284 "blink,"
285#endif
286#if OFF_FOCUS_FADING 311#if OFF_FOCUS_FADING
287 "fade," 312 "fade,"
288#endif 313#endif
289#if defined(XPM_BACKGROUND) 314#if defined(XPM_BACKGROUND)
290 "XPM," 315 "XPM,"
… …
293 "transparent," 318 "transparent,"
294#endif 319#endif
295#if TINTING 320#if TINTING
296 "tint," 321 "tint,"
297#endif 322#endif
298#if defined(UTMP_SUPPORT)
299 "utmp,"
300#endif
301#if defined(MENUBAR)
302 "menubar,"
303#endif
304#if defined(USE_XIM) 323#if defined(USE_XIM)
305 "XIM," 324 "XIM,"
325#endif
326#if defined(NO_BACKSPACE_KEY)
327 "no_backspace,"
328#endif
329#if defined(NO_DELETE_KEY)
330 "no_delete,"
331#endif
332#if EIGHT_BIT_CONTROLS
333 "8bitctrls,"
334#endif
335#if defined(ENABLE_FRILLS)
336 "frills,"
337#endif
338#if defined(SELECTION_SCROLLING)
339 "selectionscrolling,"
340#endif
341#if MOUSE_WHEEL
342 "wheel,"
343#endif
344#if MOUSE_SLIP_WHEELING
345 "slipwheel,"
346#endif
347#if defined(SMART_RESIZE)
348 "smart-resize,"
349#endif
350#if defined(CURSOR_BLINK)
351 "cursorBlink,"
352#endif
353#if defined(POINTER_BLANK)
354 "pointerBlank,"
355#endif
356#if defined(NO_RESOURCES)
357 "NoResources,"
306#endif 358#endif
307 "scrollbars=" 359 "scrollbars="
308#if !defined(HAVE_SCROLLBARS) 360#if !defined(HAVE_SCROLLBARS)
309 "NONE" 361 "NONE"
310#else 362#else
… …
328# endif 380# endif
329# if defined(XTERM_SCROLLBAR) 381# if defined(XTERM_SCROLLBAR)
330 "xterm" 382 "xterm"
331# endif 383# endif
332#endif 384#endif
333 ","
334#if defined(NO_BACKSPACE_KEY)
335 "no_backspace,"
336#endif
337#if defined(NO_DELETE_KEY)
338 "no_delete,"
339#endif
340#if EIGHT_BIT_CONTROLS
341 "8bitctrls,"
342#endif
343#if !defined(NO_STRINGS)
344 "strings,"
345#endif
346#if !defined(NO_FRILLS)
347 "frills,"
348#endif
349#if !defined(NO_LINESPACE)
350 "linespace,"
351#endif
352#if defined(PREFER_24BIT)
353 "24bit,"
354#endif
355#if defined(SELECTION_SCROLLING)
356 "selectionscrolling,"
357#endif
358#if MOUSE_WHEEL
359 "wheel,"
360#endif
361#if MOUSE_SLIP_WHEELING
362 "slipwheel,"
363#endif
364#if defined(SMART_RESIZE)
365 "smart-resize,"
366#endif
367#if defined(TTY_256COLOR)
368 "256colour,"
369#endif
370#if defined(CURSOR_BLINK)
371 "cursorBlink,"
372#endif
373#if defined(POINTER_BLANK)
374 "pointerBlank,"
375#endif
376#if defined(NO_RESOURCES)
377 "NoResources"
378#else
379# if defined(USE_XGETDEFAULT)
380 "XGetDefaults"
381# else
382 ".Xdefaults"
383# endif
384#endif
385 "\nUsage: "; /* Usage */ 385 "\nUsage: "; /* Usage */
386 386
387#define INDENT 18 387#define INDENT 18
388 388
389/*{{{ usage: */ 389/*{{{ usage: */
… …
398 switch (type) 398 switch (type)
399 { 399 {
400 case 0: /* brief listing */ 400 case 0: /* brief listing */
401 rxvt_log (" [-help] [--help]\n"); 401 rxvt_log (" [-help] [--help]\n");
402 402
403 for (col = 1, i = 0; i < optList_size (); i++) 403 for (col = 1, i = 0; i < optList_size; i++)
404 if (optList[i].desc != NULL) 404 if (optList[i].desc != NULL)
405 { 405 {
406 int len = 0; 406 int len = 0;
407 407
408 if (!optList_isBool (i)) 408 if (!optList_isBool (i))
… …
412 len++; /* account for space */ 412 len++; /* account for space */
413 } 413 }
414#ifdef DEBUG_STRICT 414#ifdef DEBUG_STRICT
415 assert (optList[i].opt != NULL); 415 assert (optList[i].opt != NULL);
416#endif 416#endif
417 len += 4 + STRLEN (optList[i].opt) + (optList_isBool (i) ? 2: 0); 417 len += 4 + strlen (optList[i].opt) + (optList_isBool (i) ? 2: 0);
418 col += len; 418 col += len;
419 if (col > 79) 419 if (col > 79)
420 { /* assume regular width */ 420 { /* assume regular width */
421 rxvt_log ("\n"); 421 rxvt_log ("\n");
422 col = 1 + len; 422 col = 1 + len;
… …
431 break; 431 break;
432 432
433 case 1: /* full command-line listing */ 433 case 1: /* full command-line listing */
434 rxvt_log (" [options] [-e command args]\n\nwhere options include:\n"); 434 rxvt_log (" [options] [-e command args]\n\nwhere options include:\n");
435 435
436 for (i = 0; i < optList_size (); i++) 436 for (i = 0; i < optList_size; i++)
437 if (optList[i].desc != NULL) 437 if (optList[i].desc != NULL)
438 { 438 {
439#ifdef DEBUG_STRICT 439#ifdef DEBUG_STRICT
440 assert (optList[i].opt != NULL); 440 assert (optList[i].opt != NULL);
441#endif 441#endif
442 rxvt_log (" %s%s %-*s%s%s\n", 442 rxvt_log (" %s%s %-*s%s%s\n",
443 (optList_isBool (i) ? "-/+" : "-"), optList[i].opt, 443 (optList_isBool (i) ? "-/+" : "-"), optList[i].opt,
444 (INDENT - STRLEN (optList[i].opt) 444 (INDENT - strlen (optList[i].opt)
445 + (optList_isBool (i) ? 0 : 2)), 445 + (optList_isBool (i) ? 0 : 2)),
446 (optList[i].arg ? optList[i].arg : ""), 446 (optList[i].arg ? optList[i].arg : ""),
447 (optList_isBool (i) ? "turn on/off " : ""), 447 (optList_isBool (i) ? "turn on/off " : ""),
448 optList[i].desc); 448 optList[i].desc);
449 } 449 }
… …
452 452
453 case 2: /* full resource listing */ 453 case 2: /* full resource listing */
454 rxvt_log (" [options] [-e command args]\n\n" 454 rxvt_log (" [options] [-e command args]\n\n"
455 "where resources (long-options) include:\n"); 455 "where resources (long-options) include:\n");
456 456
457 for (i = 0; i < optList_size (); i++) 457 for (i = 0; i < optList_size; i++)
458 if (optList[i].kw != NULL) 458 if (optList[i].kw != NULL)
459 rxvt_log (" %s: %*s%s\n", 459 rxvt_log (" %s: %*s%s\n",
460 optList[i].kw, 460 optList[i].kw,
461 (INDENT - STRLEN (optList[i].kw)), "", /* XXX */ 461 (INDENT - strlen (optList[i].kw)), "", /* XXX */
462 (optList_isBool (i) ? "boolean" : optList[i].arg)); 462 (optList_isBool (i) ? "boolean" : optList[i].arg));
463#ifdef KEYSYM_RESOURCE 463#ifdef KEYSYM_RESOURCE
464 rxvt_log (" " "keysym.sym" ": %*s%s\n", 464 rxvt_log (" " "keysym.sym" ": %*s%s\n",
465 (INDENT - sizeof ("keysym.sym") + 1), "", /* XXX */ 465 (INDENT - sizeof ("keysym.sym") + 1), "", /* XXX */
466 "keysym"); 466 "keysym");
… …
483 int i, bad_option = 0; 483 int i, bad_option = 0;
484 static const char On[3] = "ON", Off[4] = "OFF"; 484 static const char On[3] = "ON", Off[4] = "OFF";
485 485
486 for (i = 1; i < argc; i++) 486 for (i = 1; i < argc; i++)
487 { 487 {
488 unsigned int entry, longopt = 0; 488 unsigned int entry, longopt = 0;
489 const char *flag, *opt; 489 const char *flag, *opt;
490 490
491 opt = argv[i]; 491 opt = argv[i];
492#ifdef DEBUG_RESOURCES 492
493 fprintf (stderr, "argv[%d] = %s: ", i, opt);
494#endif
495 if (*opt == '-') 493 if (*opt == '-')
496 { 494 {
497 flag = On; 495 flag = On;
498 if (*++opt == '-') 496 if (*++opt == '-')
499 longopt = *opt++; /* long option */ 497 longopt = *opt++; /* long option */
… …
509 bad_option = 1; 507 bad_option = 1;
510 rxvt_warn ("\"%s\": malformed option.\n", opt); 508 rxvt_warn ("\"%s\": malformed option.\n", opt);
511 continue; 509 continue;
512 } 510 }
513 511
514 if (!STRCMP (opt, "help")) 512 if (!strcmp (opt, "help"))
515 rxvt_usage (longopt ? 2 : 1); 513 rxvt_usage (longopt ? 2 : 1);
516 if (!STRCMP (opt, "h")) 514 if (!strcmp (opt, "h"))
517 rxvt_usage (0); 515 rxvt_usage (0);
518 516
519 /* feature: always try to match long-options */ 517 /* feature: always try to match long-options */
520 for (entry = 0; entry < optList_size (); entry++) 518 for (entry = 0; entry < optList_size; entry++)
521 if ((optList[entry].kw && !STRCMP (opt, optList[entry].kw)) 519 if ((optList[entry].kw && !strcmp (opt, optList[entry].kw))
522 || (!longopt 520 || (!longopt
523 && optList[entry].opt && !STRCMP (opt, optList[entry].opt))) 521 && optList[entry].opt && !strcmp (opt, optList[entry].opt)))
524 break; 522 break;
525 523
526 if (entry < optList_size ()) 524 if (entry < optList_size)
527 { 525 {
528 if (optList_isReverse (entry)) 526 if (optList_isReverse (entry))
529 flag = flag == On ? Off : On; 527 flag = flag == On ? Off : On;
530 528
531 if (optList_strlen (entry)) 529 if (optList_strlen (entry))
… …
540 rs[optList[entry].doff] = flag == On && argv[i+1] 538 rs[optList[entry].doff] = flag == On && argv[i+1]
541 ? argv[++i] : 0; 539 ? argv[++i] : 0;
542 } 540 }
543 else 541 else
544 { /* boolean value */ 542 { /* boolean value */
545#ifdef DEBUG_RESOURCES 543 set_option (optList[entry].flag & Optflag_mask, flag == On);
546 fprintf (stderr, "boolean (%s,%s) = %s\n",
547 optList[entry].opt, optList[entry].kw, flag);
548#endif
549 if (flag == On)
550 Options |= (optList[entry].flag);
551 else
552 Options &= ~ (optList[entry].flag);
553 544
554 if (optList[entry].doff != -1) 545 if (optList[entry].doff != -1)
555 rs[optList[entry].doff] = flag; 546 rs[optList[entry].doff] = flag;
556 } 547 }
557 } 548 }
558 else 549 else
559#ifdef KEYSYM_RESOURCE 550#ifdef KEYSYM_RESOURCE
560 /* if (!STRNCMP (opt, "keysym.", sizeof ("keysym.") - 1)) */ 551 /* if (!strncmp (opt, "keysym.", sizeof ("keysym.") - 1)) */
561 if (rxvt_Str_match (opt, "keysym.")) 552 if (rxvt_Str_match (opt, "keysym."))
562 { 553 {
563 const char *str = argv[++i]; 554 const char *str = argv[++i];
564 555
565 if (str != NULL) 556 if (str != NULL)
… …
589 * "rxvt" "keysym" "0xFF01" 580 * "rxvt" "keysym" "0xFF01"
590 * value will be a string 581 * value will be a string
591 */ 582 */
592/* ARGSUSED */ 583/* ARGSUSED */
593int 584int
594rxvt_define_key (XrmDatabase *database __attribute__((unused)), 585rxvt_define_key (XrmDatabase *database UNUSED,
595 XrmBindingList bindings __attribute__((unused)), 586 XrmBindingList bindings UNUSED,
596 XrmQuarkList quarks, 587 XrmQuarkList quarks,
597 XrmRepresentation *type __attribute__((unused)), 588 XrmRepresentation *type UNUSED,
598 XrmValue *value, 589 XrmValue *value,
599 XPointer closure __attribute__((unused))) 590 XPointer closure UNUSED)
600{ 591{
601 int last; 592 int last;
602 593
603 for (last = 0; quarks[last] != NULLQUARK; last++) /* look for last quark in list */ 594 for (last = 0; quarks[last] != NULLQUARK; last++) /* look for last quark in list */
604 ; 595 ;
596
605 last--; 597 last--;
606 GET_R->parse_keysym (XrmQuarkToString (quarks[last]), (char *)value->addr);//D//TODO 598 GET_R->parse_keysym (XrmQuarkToString (quarks[last]), (char *)value->addr);//D//TODO
607 return False; 599 return False;
608} 600}
609 601
… …
614 * arg will be 606 * arg will be
615 * NULL for ~/.Xdefaults and 607 * NULL for ~/.Xdefaults and
616 * non-NULL for command-line options (need to allocate) 608 * non-NULL for command-line options (need to allocate)
617 */ 609 */
618#define NEWARGLIM 500 /* `reasonable' size */ 610#define NEWARGLIM 500 /* `reasonable' size */
611
612struct keysym_vocabulary_t
613{
614 const char *name;
615 unsigned short len;
616 unsigned short value;
617};
618keysym_vocabulary_t keysym_vocabulary[] =
619{
620 { "ISOLevel3", 9, Level3Mask },
621 { "AppKeypad", 9, AppKeypadMask },
622 { "Control", 7, ControlMask },
623 { "NumLock", 7, NumLockMask },
624 { "Shift", 5, ShiftMask },
625 { "Meta", 4, MetaMask },
626 { "Lock", 4, LockMask },
627 { "Mod1", 4, Mod1Mask },
628 { "Mod2", 4, Mod2Mask },
629 { "Mod3", 4, Mod3Mask },
630 { "Mod4", 4, Mod4Mask },
631 { "Mod5", 4, Mod5Mask },
632 { "I", 1, Level3Mask },
633 { "K", 1, AppKeypadMask },
634 { "C", 1, ControlMask },
635 { "N", 1, NumLockMask },
636 { "S", 1, ShiftMask },
637 { "M", 1, MetaMask },
638 { "A", 1, MetaMask },
639 { "L", 1, LockMask },
640 { "1", 1, Mod1Mask },
641 { "2", 1, Mod2Mask },
642 { "3", 1, Mod3Mask },
643 { "4", 1, Mod4Mask },
644 { "5", 1, Mod5Mask },
645};
646
619int 647int
620rxvt_term::parse_keysym (const char *str, const char *arg) 648rxvt_term::parse_keysym (const char *str, const char *arg)
621{ 649{
622 int n, sym; 650 int n, sym;
623 char *key_string, *newarg = NULL; 651 unsigned int state = 0;
652 const char *pmodend = NULL;
653 char *newarg = NULL;
624 char newargstr[NEWARGLIM]; 654 char newargstr[NEWARGLIM];
625 655
626 if (arg == NULL) 656 if (arg == NULL)
627 { 657 {
628 if ((n = rxvt_Str_match (str, "keysym.")) == 0) 658 if ((n = rxvt_Str_match (str, "keysym.")) == 0)
629 return 0; 659 return 0;
660
630 str += n; /* skip `keysym.' */ 661 str += n; /* skip `keysym.' */
662 if (!(pmodend = strchr (str, ':')))
663 return -1;
631 } 664 }
665 else
666 pmodend = str + strlen(str);
667
668 for (--pmodend; str < pmodend; --pmodend)
669 if (*pmodend == '-')
670 break;
671
672 while (str < pmodend)
673 {
674 unsigned int i;
675
676 for (i=0; i < sizeof (keysym_vocabulary) / sizeof (keysym_vocabulary_t); ++i)
677 {
678 if (strncmp (str, keysym_vocabulary [i].name, keysym_vocabulary [i].len) == 0)
679 {
680 state |= keysym_vocabulary[i].value;
681 str += keysym_vocabulary[i].len;
682 break;
683 }
684 }
685
686 if (i >= sizeof (keysym_vocabulary) / sizeof (keysym_vocabulary_t))
687 return -1;
688
689 if (*str == '-')
690 ++str;
691 }
692
632 /* some scanf () have trouble with a 0x prefix */ 693 /* some scanf () have trouble with a 0x prefix */
633 if (isdigit (str[0])) 694 if (str[0] == '0' && toupper (str[1]) == 'X')
634 { 695 {
635 if (str[0] == '0' && toupper (str[1]) == 'X')
636 str += 2; 696 str += 2;
697
637 if (arg) 698 if (arg)
638 { 699 {
639 if (sscanf (str, (STRCHR (str, ':') ? "%x:" : "%x"), &sym) != 1) 700 if (sscanf (str, (strchr (str, ':') ? "%x:" : "%x"), &sym) != 1)
640 return -1; 701 return -1;
641 } 702 }
642 else 703 else
643 { 704 {
644 if (sscanf (str, "%x:", &sym) != 1) 705 if (sscanf (str, "%x:", &sym) != 1)
645 return -1; 706 return -1;
646 707
647 /* cue to ':', it's there since sscanf () worked */ 708 /* cue to ':', it's there since sscanf () worked */
648 STRNCPY (newargstr, STRCHR (str, ':') + 1, NEWARGLIM - 1); 709 strncpy (newargstr, strchr (str, ':') + 1, NEWARGLIM - 1);
649 newargstr[NEWARGLIM - 1] = '\0'; 710 newargstr[NEWARGLIM - 1] = '\0';
650 newarg = newargstr; 711 newarg = newargstr;
651 } 712 }
652 } 713 }
653 else 714 else
654 { 715 {
655 /* 716 /*
656 * convert keysym name to keysym number 717 * convert keysym name to keysym number
657 */ 718 */
658 STRNCPY (newargstr, str, NEWARGLIM - 1); 719 strncpy (newargstr, str, NEWARGLIM - 1);
659 newargstr[NEWARGLIM - 1] = '\0'; 720 newargstr[NEWARGLIM - 1] = '\0';
721
660 if (arg == NULL) 722 if (arg == NULL)
661 { 723 {
662 if ((newarg = STRCHR (newargstr, ':')) == NULL) 724 if ((newarg = strchr (newargstr, ':')) == NULL)
663 return -1; 725 return -1;
726
664 *newarg++ = '\0'; /* terminate keysym name */ 727 *newarg++ = '\0'; /* terminate keysym name */
665 } 728 }
729
666 if ((sym = XStringToKeysym (newargstr)) == None) 730 if ((sym = XStringToKeysym (newargstr)) == None)
667 return -1; 731 return -1;
668 } 732 }
669 733
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) 734 if (newarg == NULL)
677 { 735 {
678 STRNCPY (newargstr, arg, NEWARGLIM - 1); 736 strncpy (newargstr, arg, NEWARGLIM - 1);
679 newargstr[NEWARGLIM - 1] = '\0'; 737 newargstr[NEWARGLIM - 1] = '\0';
680 newarg = newargstr; 738 newarg = newargstr;
681 } 739 }
740
682 rxvt_Str_trim (newarg); 741 rxvt_Str_trim (newarg);
683 if (*newarg == '\0' || (n = rxvt_Str_escaped (newarg)) == 0) 742 if (*newarg == '\0' || (n = rxvt_Str_escaped (newarg)) == 0)
684 return -1; 743 return -1;
685 MIN_IT (n, 255);
686 key_string = (char *)rxvt_malloc ((n + 1) * sizeof (char));
687 744
688 key_string[0] = n; 745 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; 746 return 1;
693} 747}
694 748
695# endif /* KEYSYM_RESOURCE */ 749# endif /* KEYSYM_RESOURCE */
750#endif /* NO_RESOURCES */
696 751
697# ifndef USE_XGETDEFAULT 752static char *
698/*{{{ rxvt_get_xdefaults () */ 753get_res (XrmDatabase database, const char *program, const char *option)
699/* 754{
700 * the matching algorithm used for memory-save fake resources 755 char resource[512];
701 */ 756 char *type;
757 XrmValue result;
758
759 snprintf (resource, sizeof (resource), "%s.%s", program, option);
760 XrmGetResource (database, resource, resource, &type, &result);
761
762 return result.addr;
763}
764
765const char *
766rxvt_term::x_resource (const char *name)
767{
768 XrmDatabase database = XrmGetDatabase (xdisp);
769
770 const char *p = get_res (database, rs[Rs_name], name);
771 const char *p0 = get_res (database, "!INVALIDPROGRAMMENAMEDONTMATCH!", name);
772
773 if (p == NULL || (p0 && strcmp (p, p0) == 0))
774 {
775 p = get_res (database, RESCLASS, name);
776#ifdef RESFALLBACK
777 if (p == NULL || (p0 && strcmp (p, p0) == 0))
778 p = get_res (database, RESFALLBACK, name);
779#endif
780 }
781
782 if (p == NULL && p0)
783 p = p0;
784
785 return p;
786}
787
702void 788void
703rxvt_term::get_xdefaults (FILE *stream, const char *name) 789rxvt_term::extract_resources ()
704{
705 unsigned int len;
706 char *str, buffer[256];
707
708 if (stream == NULL)
709 return;
710
711 len = STRLEN (name);
712 while ((str = fgets (buffer, sizeof (buffer), stream)) != NULL)
713 {
714 unsigned int entry, n;
715
716 while (*str && isspace (*str))
717 str++; /* leading whitespace */
718
719 if ((str[len] != '*' && str[len] != '.')
720 || (len && STRNCMP (str, name, len)))
721 continue;
722 str += (len + 1); /* skip `name*' or `name.' */
723
724# ifdef KEYSYM_RESOURCE
725 if (!parse_keysym (str, NULL))
726# endif /* KEYSYM_RESOURCE */
727 for (entry = 0; entry < optList_size (); entry++)
728 {
729 const char *kw = optList[entry].kw;
730
731 if (kw == NULL)
732 continue;
733
734 n = STRLEN (kw);
735 if (str[n] == ':' && rxvt_Str_match (str, kw))
736 {
737 /* skip `keyword:' */
738 str += n + 1;
739 rxvt_Str_trim (str);
740 n = STRLEN (str);
741 if (n && rs[optList[entry].doff] == NULL)
742 {
743 /* not already set */
744 int s;
745 char *p = 0;
746
747 for (int o = 0;;)
748 {
749 p = (char *)rxvt_realloc (p, o + n + 1);
750 MEMCPY (p + o, str, n);
751 o += n;
752 p[o] = 0;
753
754 if (o == 0 || p[o - 1] != '\\') // continuation line
755 break;
756
757 o--; // eat "\"
758
759 if ((str = fgets (buffer, sizeof (buffer), stream)) == NULL)
760 break;
761
762 rxvt_Str_trim (str);
763 n = STRLEN (str);
764 }
765
766 rs[optList[entry].doff] = p;
767 allocated.push_back (p);
768
769 if (optList_isBool (entry))
770 {
771 s = STRCASECMP (str, "TRUE") == 0
772 || STRCASECMP (str, "YES") == 0
773 || STRCASECMP (str, "ON") == 0
774 || STRCASECMP (str, "1") == 0;
775
776 if (optList_isReverse (entry))
777 s = !s;
778
779 if (s)
780 Options |= optList[entry].flag;
781 else
782 Options &= ~optList[entry].flag;
783 }
784 }
785
786 break;
787 }
788 }
789 }
790
791 rewind (stream);
792}
793
794/*}}} */
795# endif /* ! USE_XGETDEFAULT */
796#endif /* NO_RESOURCES */
797
798/*{{{ read the resources files */
799/*
800 * using XGetDefault () or the hand-rolled replacement
801 */
802/* ARGSUSED */
803void
804rxvt_term::extract_resources (Display *display __attribute__ ((unused)), const char *name)
805{ 790{
806#ifndef NO_RESOURCES 791#ifndef NO_RESOURCES
807
808# if defined XAPPLOADDIR
809# if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
810 /* Compute the path of the possibly available localized Rxvt file */
811 char *localepath = NULL;
812
813 if (locale != NULL)
814 { /* XXX: must limit length of string */
815 localepath = (char *)rxvt_malloc (256);
816 sprintf (localepath, XAPPLOADDIRLOCALE "/" RESCLASS,
817 (int) (258 - sizeof (XAPPLOADDIRLOCALE) - sizeof (RESCLASS)),
818 locale); /* 258 = 255 + 4 (-.*s) - 1 (/) */
819 }
820
821 {
822# endif
823# endif
824
825# ifdef USE_XGETDEFAULT
826 /* 792 /*
827 * get resources using the X library function 793 * Query resources for options that affect us
828 */ 794 */
829 int entry; 795 for (int entry = 0; entry < optList_size; entry++)
830
831# ifdef XrmEnumOneLevel
832 int i;
833 char *displayResource, *xe;
834 XrmName name_prefix[3];
835 XrmClass class_prefix[3];
836 XrmDatabase database, rdb1;
837 char fname[1024];
838
839 XrmInitialize ();
840 database = NULL;
841
842 /* Get any Xserver defaults */
843
844 displayResource = XResourceManagerString (display);
845 if (displayResource != NULL)
846 database = XrmGetStringDatabase (displayResource);
847
848# ifdef HAVE_EXTRA_XRESOURCE_FILES
849 /* Add in ~/.Xdefaults or ~/.Xresources */
850 { 796 {
851 char *ptr; 797 int s;
798 const char *kw = optList[entry].kw;
852 799
853 if ((ptr = (char *)getenv ("HOME")) == NULL) 800 if (kw == NULL || rs[optList[entry].doff] != NULL)
854 ptr = "."; 801 continue; // previously set
855 802
856 for (i = 0; i < (sizeof (xnames) / sizeof (xnames[0])); i++) 803 const char *p = x_resource (kw);
804
805 if (p)
857 { 806 {
858 sprintf (fname, "%-.*s/%s", sizeof (fname) - STRLEN (xnames[i]) - 2, 807 p = strdup (p);
859 ptr, xnames[i]); 808 allocated.push_back ((void *)p);
860 if ((rdb1 = XrmGetFileDatabase (fname))) 809 rs[optList[entry].doff] = p;
810
811 if (optList_isBool (entry))
861 { 812 {
862 XrmMergeDatabases (rdb1, &database); 813 s = strcasecmp (p, "TRUE") == 0
863# ifndef HAVE_BOTH_XRESOURCE_FILES 814 || strcasecmp (p, "YES") == 0
864 break; 815 || strcasecmp (p, "ON") == 0
865# endif 816 || strcasecmp (p, "1") == 0;
866 817
818 if (optList_isReverse (entry))
819 s = !s;
820
821 set_option (optList[entry].flag & Optflag_mask, s);
867 } 822 }
868 } 823 }
869 } 824 }
870# endif
871 825
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 /* 826 /*
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 827 * [R5 or later]: enumerate the resource database
947 */ 828 */
948# ifdef XrmEnumOneLevel
949# ifdef KEYSYM_RESOURCE 829# ifdef KEYSYM_RESOURCE
830 XrmDatabase database = XrmGetDatabase (xdisp);
831 XrmName name_prefix[3];
832 XrmClass class_prefix[3];
833
950 name_prefix[0] = XrmStringToName (name); 834 name_prefix[0] = XrmStringToName (rs[Rs_name]);
951 name_prefix[1] = XrmStringToName ("keysym"); 835 name_prefix[1] = XrmStringToName ("keysym");
952 name_prefix[2] = NULLQUARK; 836 name_prefix[2] = NULLQUARK;
953 class_prefix[0] = XrmStringToName (RESCLASS); 837 class_prefix[0] = XrmStringToName (RESCLASS);
954 class_prefix[1] = XrmStringToName ("Keysym"); 838 class_prefix[1] = XrmStringToName ("Keysym");
955 class_prefix[2] = NULLQUARK; 839 class_prefix[2] = NULLQUARK;
956 /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */ 840 /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */
957 XrmEnumerateDatabase (XrmGetDatabase (display), name_prefix, class_prefix, 841 XrmEnumerateDatabase (database, name_prefix, class_prefix,
958 XrmEnumOneLevel, rxvt_define_key, NULL); 842 XrmEnumOneLevel, rxvt_define_key, NULL);
959# ifdef RESFALLBACK 843# ifdef RESFALLBACK
960 name_prefix[0] = XrmStringToName (RESFALLBACK); 844 name_prefix[0] = XrmStringToName (RESFALLBACK);
961 name_prefix[1] = XrmStringToName ("keysym"); 845 name_prefix[1] = XrmStringToName ("keysym");
962 class_prefix[0] = XrmStringToName (RESFALLBACK); 846 class_prefix[0] = XrmStringToName (RESFALLBACK);
963 class_prefix[1] = XrmStringToName ("Keysym"); 847 class_prefix[1] = XrmStringToName ("Keysym");
964 /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */ 848 /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */
965 XrmEnumerateDatabase (XrmGetDatabase (display), name_prefix, class_prefix, 849 XrmEnumerateDatabase (database, name_prefix, class_prefix,
966 XrmEnumOneLevel, rxvt_define_key, NULL); 850 XrmEnumOneLevel, rxvt_define_key, NULL);
967# endif
968# endif 851# endif
969# endif 852# endif
970 853
971# else /* USE_XGETDEFAULT */
972 /* get resources the hard way, but save lots of memory */
973 FILE *fd = NULL;
974 char *home;
975
976 if ((home = getenv ("HOME")) != NULL)
977 {
978 unsigned int i, len = STRLEN (home) + 2;
979 char *f = NULL;
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);
991 }
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 }
1035# endif /* XAPPLOADDIR */
1036
1037 get_xdefaults (fd, ""); /* partial match */
1038 if (fd != NULL)
1039 fclose (fd);
1040# 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
1052#endif /* NO_RESOURCES */ 854#endif /* NO_RESOURCES */
1053} 855}
1054 856
1055/*}}} */
1056/*----------------------- end-of-file (C source) -----------------------*/ 857/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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