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.74 by root, Sun Jan 8 01:02:15 2006 UTC vs.
Revision 1.141 by root, Sat Dec 26 10:24:04 2009 UTC

1/*--------------------------------*-C-*---------------------------------* 1/*----------------------------------------------------------------------*
2 * File: xdefaults.C 2 * File: xdefaults.C
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
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-2006 Marc Lehmann <pcg@goof.com> 9 * Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com>
10 * Copyright (c) 2007 Emanuele Giaquinta <e.giaquinta@glauco.it>
10 * 11 *
11 * This program is free software; you can redistribute it and/or modify 12 * 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 13 * 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 14 * the Free Software Foundation; either version 2 of the License, or
14 * (at your option) any later version. 15 * (at your option) any later version.
… …
20 * 21 *
21 * You should have received a copy of the GNU General Public License 22 * You should have received a copy of the GNU General Public License
22 * along with this program; if not, write to the Free Software 23 * along with this program; if not, write to the Free Software
23 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 24 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
24 *----------------------------------------------------------------------*/ 25 *----------------------------------------------------------------------*/
25/*----------------------------------------------------------------------*
26 * get resources from ~/.Xdefaults or ~/.Xresources with the memory-saving
27 * default or with XGetDefault() (#define USE_XGETDEFAULT)
28 *----------------------------------------------------------------------*/
29 26
30#include "../config.h" /* NECESSARY */ 27#include "../config.h"
31#include "rxvt.h" /* NECESSARY */ 28#include "rxvt.h"
32#include "version.h" 29#include "version.h"
33 30
34#include <sys/utsname.h>
35
36#ifdef KEYSYM_RESOURCE 31#ifdef KEYSYM_RESOURCE
37#include "keyboard.h" 32# include "keyboard.h"
38#endif 33#endif
39 34
40/* place holders used for parsing command-line options */ 35/* place holders used for parsing command-line options */
41#define Optflag_Reverse 0x40000000UL 36#define Optflag_Reverse 1
42#define Optflag_Boolean 0x80000000UL 37#define Optflag_Boolean 2
43#define Optflag_mask 0x3fffffffUL 38#define Optflag_Switch 4
44 39
45/* #define DEBUG_RESOURCES */
46
47/*{{{ monolithic option/resource structure: */ 40/* monolithic option/resource structure: */
48/* 41/*
49 * `string' options MUST have a usage argument 42 * `string' options MUST have a usage argument
50 * `switch' and `boolean' options have no argument 43 * `switch' and `boolean' options have no argument
51 * if there's no desc (ription), it won't appear in rxvt_usage () 44 * if there's no desc (ription), it won't appear in rxvt_usage ()
52 */ 45 */
53 46
54/* INFO () - descriptive information only */ 47/* INFO () - descriptive information only */
55#define INFO(opt, arg, desc) \ 48#define INFO(opt, arg, desc) \
56 {0, -1, NULL, (opt), (arg), (desc)} 49 {0, 0, -1, NULL, (opt), (arg), (desc)}
57 50
58/* STRG () - command-line option, with/without resource */ 51/* STRG () - command-line option, with/without resource */
59#define STRG(rsp, kw, opt, arg, desc) \ 52#define STRG(rsp, kw, opt, arg, desc) \
60 {0, (rsp), (kw), (opt), (arg), (desc)} 53 {0, 0, (rsp), (kw), (opt), (arg), (desc)}
61 54
62/* RSTRG () - resource/long-option */ 55/* RSTRG () - resource/long-option */
63#define RSTRG(rsp, kw, arg) \ 56#define RSTRG(rsp, kw, arg) \
64 {0, (rsp), (kw), NULL, (arg), NULL} 57 {0, 0, (rsp), (kw), NULL, (arg), NULL}
65 58
66/* BOOL () - regular boolean `-/+' flag */ 59/* BOOL () - regular boolean `-/+' flag */
67#define BOOL(rsp, kw, opt, flag, desc) \ 60#define BOOL(rsp, kw, opt, option, flag, desc) \
68 { (Optflag_Boolean | (flag)), (rsp), (kw), (opt), NULL, (desc)} 61 { (option), (Optflag_Boolean | (flag)), (rsp), (kw), (opt), NULL, (desc)}
69 62
70/* SWCH () - `-' flag */ 63/* SWCH () - `-' flag */
71#define SWCH(opt, flag, desc) \ 64#define SWCH(opt, option, flag, desc) \
72 { (flag), -1, NULL, (opt), NULL, (desc)} 65 { (option), (Optflag_Switch | (flag)), -1, NULL, (opt), NULL, (desc)}
73 66
74/* convenient macros */ 67/* convenient macros */
75#define optList_strlen(i) \ 68#define optList_isString(i) \
76 (optList[i].flag ? 0 : (optList[i].arg ? strlen (optList[i].arg) : 1)) 69 (optList[i].flag == 0)
77#define optList_isBool(i) \ 70#define optList_isBool(i) \
78 (optList[i].flag & Optflag_Boolean) 71 (optList[i].flag & Optflag_Boolean)
79#define optList_isReverse(i) \ 72#define optList_isReverse(i) \
80 (optList[i].flag & Optflag_Reverse) 73 (optList[i].flag & Optflag_Reverse)
81#define optList_size \ 74#define optList_size \
82 (sizeof (optList) / sizeof (optList[0])) 75 (sizeof (optList) / sizeof (optList[0]))
83 76
84static const struct 77static const struct
85 { 78 {
79 const uint8_t index; /* Option index */
86 const unsigned long flag; /* Option flag */ 80 const uint8_t flag; /* Option flag */
87 const int doff; /* data offset */ 81 const int16_t doff; /* resource value index or -1 */
88 const char *kw; /* keyword */ 82 const char *kw; /* keyword */
89 const char *opt; /* option */ 83 const char *opt; /* option */
90 const char *arg; /* argument */ 84 const char *arg; /* argument */
91 const char *desc; /* description */ 85 const char *desc; /* description */
92 } 86 }
… …
94 STRG (Rs_display_name, NULL, "d", NULL, NULL), /* short form */ 88 STRG (Rs_display_name, NULL, "d", NULL, NULL), /* short form */
95 STRG (Rs_display_name, NULL, "display", "string", "X server to contact"), 89 STRG (Rs_display_name, NULL, "display", "string", "X server to contact"),
96 STRG (Rs_term_name, "termName", "tn", "string", "value of the TERM environment variable"), 90 STRG (Rs_term_name, "termName", "tn", "string", "value of the TERM environment variable"),
97 STRG (Rs_geometry, NULL, "g", NULL, NULL), /* short form */ 91 STRG (Rs_geometry, NULL, "g", NULL, NULL), /* short form */
98 STRG (Rs_geometry, "geometry", "geometry", "geometry", "size (in characters) and position"), 92 STRG (Rs_geometry, "geometry", "geometry", "geometry", "size (in characters) and position"),
99 SWCH ("C", Opt_console, "intercept console messages"), 93 SWCH ("C", Opt_console, 0, "intercept console messages"),
100 SWCH ("iconic", Opt_iconic, "start iconic"), 94 SWCH ("iconic", Opt_iconic, 0, "start iconic"),
101 SWCH ("ic", Opt_iconic, NULL), /* short form */ 95 SWCH ("ic", Opt_iconic, 0, NULL), /* short form */
96 STRG (Rs_chdir, "chdir", "cd", "string", "start shell in this directory"),
102 BOOL (Rs_reverseVideo, "reverseVideo", "rv", Opt_reverseVideo, "reverse video"), 97 BOOL (Rs_reverseVideo, "reverseVideo", "rv", Opt_reverseVideo, 0, "reverse video"),
103 BOOL (Rs_loginShell, "loginShell", "ls", Opt_loginShell, "login shell"), 98 BOOL (Rs_loginShell, "loginShell", "ls", Opt_loginShell, 0, "login shell"),
104 BOOL (Rs_jumpScroll, "jumpScroll", "j", Opt_jumpScroll, "jump scrolling"), 99 BOOL (Rs_jumpScroll, "jumpScroll", "j", Opt_jumpScroll, 0, "jump scrolling"),
100 BOOL (Rs_skipScroll, "skipScroll", "ss", Opt_skipScroll, 0, "skip scrolling"),
105 BOOL (Rs_pastableTabs, "pastableTabs", "ptab", Opt_pastableTabs, "tab characters are pastable"), 101 BOOL (Rs_pastableTabs, "pastableTabs", "ptab", Opt_pastableTabs, 0, "tab characters are pastable"),
106#if HAVE_SCROLLBARS
107 RSTRG (Rs_scrollstyle, "scrollstyle", "mode"), 102 RSTRG (Rs_scrollstyle, "scrollstyle", "mode"),
108 BOOL (Rs_scrollBar, "scrollBar", "sb", Opt_scrollBar, "scrollbar"), 103 BOOL (Rs_scrollBar, "scrollBar", "sb", Opt_scrollBar, 0, "scrollbar"),
109 BOOL (Rs_scrollBar_right, "scrollBar_right", "sr", Opt_scrollBar_right, "scrollbar right"), 104 BOOL (Rs_scrollBar_right, "scrollBar_right", "sr", Opt_scrollBar_right, 0, "scrollbar right"),
110 BOOL (Rs_scrollBar_floating, "scrollBar_floating", "st", Opt_scrollBar_floating, "scrollbar without a trough"), 105 BOOL (Rs_scrollBar_floating, "scrollBar_floating", "st", Opt_scrollBar_floating, 0, "scrollbar without a trough"),
111 RSTRG (Rs_scrollBar_align, "scrollBar_align", "mode"), 106 RSTRG (Rs_scrollBar_align, "scrollBar_align", "mode"),
112 STRG (Rs_scrollBar_thickness, "thickness", "sbt", "number", "scrollbar thickness/width in pixels"), 107 STRG (Rs_scrollBar_thickness, "thickness", "sbt", "number", "scrollbar thickness/width in pixels"),
113#endif
114 BOOL (Rs_scrollTtyOutput, "scrollTtyOutput", NULL, Opt_scrollTtyOutput, NULL), 108 BOOL (Rs_scrollTtyOutput, "scrollTtyOutput", NULL, Opt_scrollTtyOutput, 0, NULL),
115 BOOL (Rs_scrollTtyOutput, NULL, "si", Optflag_Reverse | Opt_scrollTtyOutput, "scroll-on-tty-output inhibit"), 109 BOOL (Rs_scrollTtyOutput, NULL, "si", Opt_scrollTtyOutput, Optflag_Reverse, "scroll-on-tty-output inhibit"),
116 BOOL (Rs_scrollTtyKeypress, "scrollTtyKeypress", "sk", Opt_scrollTtyKeypress, "scroll-on-keypress"), 110 BOOL (Rs_scrollTtyKeypress, "scrollTtyKeypress", "sk", Opt_scrollTtyKeypress, 0, "scroll-on-keypress"),
117 BOOL (Rs_scrollWithBuffer, "scrollWithBuffer", "sw", Opt_scrollWithBuffer, "scroll-with-buffer"), 111 BOOL (Rs_scrollWithBuffer, "scrollWithBuffer", "sw", Opt_scrollWithBuffer, 0, "scroll-with-buffer"),
118#if TRANSPARENT 112#if ENABLE_TRANSPARENCY
119 BOOL (Rs_transparent, "inheritPixmap", "ip", Opt_transparent, "inherit parent pixmap"), 113 BOOL (Rs_transparent, "inheritPixmap", "ip", Opt_transparent, 0, "inherit parent pixmap"),
120 SWCH ("tr", Opt_transparent, NULL), 114 BOOL (Rs_transparent, "transparent", "tr", Opt_transparent, 0, "inherit parent pixmap"),
121# if TINTING
122 STRG (Rs_color + Color_tint, "tintColor", "tint", "color", "tint color"), 115 STRG (Rs_color + Color_tint, "tintColor", "tint", "color", "tint color"),
116 STRG (Rs_shade, "shading", "sh", "number", "shade background by number %."),
117#endif
118#if OFF_FOCUS_FADING
119 STRG (Rs_fade, "fading", "fade", "number", "fade colors by number % when losing focus"),
120 STRG (Rs_color + Color_fade, "fadeColor", "fadecolor", "color", "target color for off-focus fading"),
121#endif
122 BOOL (Rs_utmpInhibit, "utmpInhibit", "ut", Opt_utmpInhibit, 0, "utmp inhibit"),
123#ifndef NO_BELL
124# if ENABLE_FRILLS
125 BOOL (Rs_urgentOnBell, "urgentOnBell", NULL, Opt_urgentOnBell, 0, NULL),
123# endif 126# endif
124#endif
125#if OFF_FOCUS_FADING
126 STRG (Rs_fade, "fading", "fade", "%", "fade colors x% percent when rxvt-unicode is losing focus"),
127 STRG (Rs_color + Color_fade, "fadeColor", "fadecolor", "color", "target color for off-focus fading"),
128#endif
129#if TINTING
130 STRG (Rs_shade, "shading", "sh", "%", "shade background by x% when tinting."),
131#endif
132 BOOL (Rs_utmpInhibit, "utmpInhibit", "ut", Opt_utmpInhibit, "utmp inhibit"),
133#ifndef NO_BELL
134 BOOL (Rs_visualBell, "visualBell", "vb", Opt_visualBell, "visual bell"), 127 BOOL (Rs_visualBell, "visualBell", "vb", Opt_visualBell, 0, "visual bell"),
135# if ! defined(NO_MAPALERT) && defined(MAPALERT_OPTION) 128# if ! defined(NO_MAPALERT) && defined(MAPALERT_OPTION)
136 BOOL (Rs_mapAlert, "mapAlert", NULL, Opt_mapAlert, NULL), 129 BOOL (Rs_mapAlert, "mapAlert", NULL, Opt_mapAlert, 0, NULL),
137# endif 130# endif
138#endif 131#endif
139#ifdef META8_OPTION 132#ifdef META8_OPTION
140 BOOL (Rs_meta8, "meta8", NULL, Opt_meta8, NULL), 133 BOOL (Rs_meta8, "meta8", NULL, Opt_meta8, 0, NULL),
141#endif 134#endif
142#ifdef MOUSE_WHEEL 135#ifdef MOUSE_WHEEL
143 BOOL (Rs_mouseWheelScrollPage, "mouseWheelScrollPage", NULL, Opt_mouseWheelScrollPage, NULL), 136 BOOL (Rs_mouseWheelScrollPage, "mouseWheelScrollPage", NULL, Opt_mouseWheelScrollPage, 0, NULL),
144#endif 137#endif
145#if ENABLE_FRILLS 138#if ENABLE_FRILLS
146 BOOL (Rs_tripleclickwords, "tripleclickwords", "tcw", Opt_tripleclickwords, "triple click word selection"), 139 BOOL (Rs_tripleclickwords, "tripleclickwords", "tcw", Opt_tripleclickwords, 0, "triple click word selection"),
147 BOOL (Rs_insecure, "insecure", "insecure", Opt_insecure, "enable possibly insecure escape sequences"), 140 BOOL (Rs_insecure, "insecure", "insecure", Opt_insecure, 0, "enable possibly insecure escape sequences"),
148 BOOL (Rs_cursorUnderline, "cursorUnderline", "uc", Opt_cursorUnderline, "underline cursor"), 141 BOOL (Rs_cursorUnderline, "cursorUnderline", "uc", Opt_cursorUnderline, 0, "underline cursor"),
149#endif 142#endif
150#if CURSOR_BLINK 143#if CURSOR_BLINK
151 BOOL (Rs_cursorBlink, "cursorBlink", "bc", Opt_cursorBlink, "blinking cursor"), 144 BOOL (Rs_cursorBlink, "cursorBlink", "bc", Opt_cursorBlink, 0, "blinking cursor"),
152#endif 145#endif
153#ifdef POINTER_BLANK 146#ifdef POINTER_BLANK
154 BOOL (Rs_pointerBlank, "pointerBlank", "pb", Opt_pointerBlank, "switch off pointer after delay"), 147 BOOL (Rs_pointerBlank, "pointerBlank", "pb", Opt_pointerBlank, 0, "switch off pointer after delay"),
155#endif 148#endif
156 STRG (Rs_color + Color_bg, "background", "bg", "color", "background color"), 149 STRG (Rs_color + Color_bg, "background", "bg", "color", "background color"),
157 STRG (Rs_color + Color_fg, "foreground", "fg", "color", "foreground color"), 150 STRG (Rs_color + Color_fg, "foreground", "fg", "color", "foreground color"),
158 RSTRG (Rs_color + minCOLOR + 0, "color0", "color"), 151 RSTRG (Rs_color + minCOLOR + 0, "color0", "color"),
159 RSTRG (Rs_color + minCOLOR + 1, "color1", "color"), 152 RSTRG (Rs_color + minCOLOR + 1, "color1", "color"),
… …
174#ifndef NO_BOLD_UNDERLINE_REVERSE 167#ifndef NO_BOLD_UNDERLINE_REVERSE
175 RSTRG (Rs_color + Color_BD, "colorBD", "color"), 168 RSTRG (Rs_color + Color_BD, "colorBD", "color"),
176 RSTRG (Rs_color + Color_IT, "colorIT", "color"), 169 RSTRG (Rs_color + Color_IT, "colorIT", "color"),
177 RSTRG (Rs_color + Color_UL, "colorUL", "color"), 170 RSTRG (Rs_color + Color_UL, "colorUL", "color"),
178 RSTRG (Rs_color + Color_RV, "colorRV", "color"), 171 RSTRG (Rs_color + Color_RV, "colorRV", "color"),
179#endif /* ! NO_BOLD_UNDERLINE_REVERSE */ 172#endif /* ! NO_BOLD_UNDERLINE_REVERSE */
180#if ENABLE_FRILLS 173#if ENABLE_FRILLS
181 RSTRG (Rs_color + Color_underline, "underlineColor", "color"), 174 RSTRG (Rs_color + Color_underline, "underlineColor", "color"),
182#endif 175#endif
183#ifdef KEEP_SCROLLCOLOR
184 RSTRG (Rs_color + Color_scroll, "scrollColor", "color"), 176 RSTRG (Rs_color + Color_scroll, "scrollColor", "color"),
177#ifdef RXVT_SCROLLBAR
185 RSTRG (Rs_color + Color_trough, "troughColor", "color"), 178 RSTRG (Rs_color + Color_trough, "troughColor", "color"),
186#endif /* KEEP_SCROLLCOLOR */ 179#endif
187#ifdef OPTION_HC 180#ifdef OPTION_HC
188 STRG (Rs_color + Color_HC, "highlightColor", "hc", "color", "highlight color"), 181 STRG (Rs_color + Color_HC, "highlightColor", "hc", "color", "highlight color"),
189#endif 182#endif
190#ifndef NO_CURSORCOLOR 183#ifndef NO_CURSORCOLOR
191 STRG (Rs_color + Color_cursor, "cursorColor", "cr", "color", "cursor color"), 184 STRG (Rs_color + Color_cursor, "cursorColor", "cr", "color", "cursor color"),
192 /* command-line option = resource name */ 185 /* command-line option = resource name */
193 RSTRG (Rs_color + Color_cursor2, "cursorColor2", "color"), 186 RSTRG (Rs_color + Color_cursor2, "cursorColor2", "color"),
194#endif /* NO_CURSORCOLOR */ 187#endif /* NO_CURSORCOLOR */
195 STRG (Rs_color + Color_pointer_fg, "pointerColor", "pr", "color", "pointer color"), 188 STRG (Rs_color + Color_pointer_fg, "pointerColor", "pr", "color", "pointer color"),
196 STRG (Rs_color + Color_pointer_bg, "pointerColor2", "pr2", "color", "pointer bg color"), 189 STRG (Rs_color + Color_pointer_bg, "pointerColor2", "pr2", "color", "pointer bg color"),
197 STRG (Rs_color + Color_border, "borderColor", "bd", "color", "border color"), 190 STRG (Rs_color + Color_border, "borderColor", "bd", "color", "border color"),
198#if defined (XPM_BACKGROUND) || (MENUBAR_MAX) 191#ifdef BG_IMAGE_FROM_FILE
199 RSTRG (Rs_path, "path", "search path"), 192 RSTRG (Rs_path, "path", "search path"),
200#endif /* defined (XPM_BACKGROUND) || (MENUBAR_MAX) */
201#ifdef XPM_BACKGROUND
202 STRG (Rs_backgroundPixmap, "backgroundPixmap", "pixmap", "file[;geom]", "background pixmap"), 193 STRG (Rs_backgroundPixmap, "backgroundPixmap", "pixmap", "file[;geom]", "background pixmap"),
203#endif /* XPM_BACKGROUND */
204#if (MENUBAR_MAX)
205 RSTRG (Rs_menu, "menu", "name[;tag]"),
206#endif 194#endif
207 /* fonts: command-line option = resource name */ 195 /* fonts: command-line option = resource name */
208 STRG (Rs_font, "font", "fn", "fontname", "normal text font"), 196 STRG (Rs_font, "font", "fn", "fontname", "normal text font"),
209#if ENABLE_STYLES 197#if ENABLE_STYLES
210 STRG (Rs_boldFont, "boldFont", "fb", "fontname", "bold font"), 198 STRG (Rs_boldFont, "boldFont", "fb", "fontname", "bold font"),
211 STRG (Rs_italicFont, "italicFont", "fi", "fontname", "italic font"), 199 STRG (Rs_italicFont, "italicFont", "fi", "fontname", "italic font"),
212 STRG (Rs_boldItalicFont, "boldItalicFont", "fbi", "fontname", "bold italic font"), 200 STRG (Rs_boldItalicFont, "boldItalicFont", "fbi", "fontname", "bold italic font"),
213 BOOL (Rs_intensityStyles, "intensityStyles", "is", Opt_intensityStyles, "font styles imply intensity changes"), 201 BOOL (Rs_intensityStyles, "intensityStyles", "is", Opt_intensityStyles, 0, "font styles imply intensity changes"),
214#endif 202#endif
215#ifdef USE_XIM 203#ifdef USE_XIM
216 STRG (Rs_inputMethod, "inputMethod", "im", "name", "name of input method"), 204 STRG (Rs_inputMethod, "inputMethod", "im", "name", "name of input method"),
217 STRG (Rs_preeditType, "preeditType", "pt", "style", "input style: style = OverTheSpot|OffTheSpot|Root"), 205 STRG (Rs_preeditType, "preeditType", "pt", "style", "input style: style = OverTheSpot|OffTheSpot|Root"),
218 STRG (Rs_imLocale, "imLocale", "imlocale", "string", "locale to use for input method"), 206 STRG (Rs_imLocale, "imLocale", "imlocale", "string", "locale to use for input method"),
219 STRG (Rs_imFont, "imFont", "imfont", "fontname", "fontset for styles OverTheSpot and OffTheSpot"), 207 STRG (Rs_imFont, "imFont", "imfont", "fontname", "fontset for styles OverTheSpot and OffTheSpot"),
220#endif /* USE_XIM */ 208#endif /* USE_XIM */
221 STRG (Rs_name, NULL, "name", "string", "client instance, icon, and title strings"), 209 STRG (Rs_name, NULL, "name", "string", "client instance, icon, and title strings"),
222 STRG (Rs_title, "title", "title", "string", "title name for window"), 210 STRG (Rs_title, "title", "title", "string", "title name for window"),
223 STRG (Rs_title, NULL, "T", NULL, NULL), /* short form */ 211 STRG (Rs_title, NULL, "T", NULL, NULL), /* short form */
224 STRG (Rs_iconName, "iconName", "n", "string", "icon name for window"), 212 STRG (Rs_iconName, "iconName", "n", "string", "icon name for window"),
225 STRG (Rs_saveLines, "saveLines", "sl", "number", "number of scrolled lines to save"), 213 STRG (Rs_saveLines, "saveLines", "sl", "number", "number of scrolled lines to save"),
226#if ENABLE_XEMBED 214#if ENABLE_XEMBED
227 STRG (Rs_embed, NULL, "embed", "windowid", "window id to embed terminal in"), 215 STRG (Rs_embed, NULL, "embed", "windowid", "window id to embed terminal in"),
228#endif 216#endif
217#if XFT
218 STRG (Rs_depth, "depth", "depth", "number", "depth of visual to request"),
219 BOOL (Rs_buffered, "buffered", NULL, Opt_buffered, 0, NULL),
220#endif
229#if ENABLE_FRILLS 221#if ENABLE_FRILLS
230 RSTRG (Rs_transient_for, "transient-for", "windowid"), 222 RSTRG (Rs_transient_for, "transient-for", "windowid"),
223 BOOL (Rs_override_redirect, "override-redirect", "override-redirect", Opt_override_redirect, 0, "set override-redirect on the terminal window"),
231 STRG (Rs_pty_fd, NULL, "pty-fd", "fileno", "file descriptor of pty to use"), 224 STRG (Rs_pty_fd, NULL, "pty-fd", "fileno", "file descriptor of pty to use"),
232 BOOL (Rs_hold, "hold", "hold", Opt_hold, "retain window after shell exit"), 225 BOOL (Rs_hold, "hold", "hold", Opt_hold, 0, "retain window after shell exit"),
233 STRG (Rs_ext_bwidth, "externalBorder", "w", "number", "external border in pixels"), 226 STRG (Rs_ext_bwidth, "externalBorder", "w", "number", "external border in pixels"),
234 STRG (Rs_ext_bwidth, NULL, "bw", NULL, NULL), 227 STRG (Rs_ext_bwidth, NULL, "bw", NULL, NULL),
235 STRG (Rs_ext_bwidth, NULL, "borderwidth", NULL, NULL), 228 STRG (Rs_ext_bwidth, NULL, "borderwidth", NULL, NULL),
236 STRG (Rs_int_bwidth, "internalBorder", "b", "number", "internal border in pixels"), 229 STRG (Rs_int_bwidth, "internalBorder", "b", "number", "internal border in pixels"),
237 BOOL (Rs_borderLess, "borderLess", "bl", Opt_borderLess, "borderless window"), 230 BOOL (Rs_borderLess, "borderLess", "bl", Opt_borderLess, 0, "borderless window"),
238 BOOL (Rs_skipBuiltinGlyphs, "skipBuiltinGlyphs", "sbg", Opt_skipBuiltinGlyphs, "do not use internal glyphs"),
239 STRG (Rs_lineSpace, "lineSpace", "lsp", "number", "number of extra pixels between rows"), 231 STRG (Rs_lineSpace, "lineSpace", "lsp", "number", "number of extra pixels between rows"),
232 STRG (Rs_letterSpace, "letterSpace", "letsp", "number", "letter spacing adjustment"),
233#endif
234#ifdef BUILTIN_GLYPHS
235 BOOL (Rs_skipBuiltinGlyphs, "skipBuiltinGlyphs", "sbg", Opt_skipBuiltinGlyphs, 0, "do not use internal glyphs"),
240#endif 236#endif
241#ifdef POINTER_BLANK 237#ifdef POINTER_BLANK
242 RSTRG (Rs_pointerBlankDelay, "pointerBlankDelay", "number"), 238 RSTRG (Rs_pointerBlankDelay, "pointerBlankDelay", "number"),
243#endif 239#endif
244#ifndef NO_BACKSPACE_KEY 240#ifndef NO_BACKSPACE_KEY
245 RSTRG (Rs_backspace_key, "backspacekey", "string"), 241 RSTRG (Rs_backspace_key, "backspacekey", "string"),
246#endif 242#endif
247#ifndef NO_DELETE_KEY 243#ifndef NO_DELETE_KEY
248 RSTRG (Rs_delete_key, "deletekey", "string"), 244 RSTRG (Rs_delete_key, "deletekey", "string"),
249#endif 245#endif
250 RSTRG (Rs_selectstyle, "selectstyle", "mode"),
251#ifdef PRINTPIPE 246#ifdef PRINTPIPE
252 RSTRG (Rs_print_pipe, "print-pipe", "string"), 247 RSTRG (Rs_print_pipe, "print-pipe", "string"),
253#endif 248#endif
254 STRG (Rs_modifier, "modifier", "mod", "modifier", "meta modifier = alt|meta|hyper|super|mod1|...|mod5"), 249 STRG (Rs_modifier, "modifier", "mod", "modifier", "meta modifier = alt|meta|hyper|super|mod1|...|mod5"),
255#ifdef CUTCHAR_RESOURCE
256 RSTRG (Rs_cutchars, "cutchars", "string"), 250 RSTRG (Rs_cutchars, "cutchars", "string"),
257#endif /* CUTCHAR_RESOURCE */
258 RSTRG (Rs_answerbackstring, "answerbackString", "string"), 251 RSTRG (Rs_answerbackstring, "answerbackString", "string"),
259#ifndef NO_SECONDARY_SCREEN 252#ifndef NO_SECONDARY_SCREEN
260 BOOL (Rs_secondaryScreen, "secondaryScreen", "ssc", Opt_secondaryScreen, "enable secondary screen"), 253 BOOL (Rs_secondaryScreen, "secondaryScreen", "ssc", Opt_secondaryScreen, 0, "enable secondary screen"),
261 BOOL (Rs_secondaryScroll, "secondaryScroll", "ssr", Opt_secondaryScroll, "enable secondary screen scroll"), 254 BOOL (Rs_secondaryScroll, "secondaryScroll", "ssr", Opt_secondaryScroll, 0, "enable secondary screen scroll"),
262#endif 255#endif
263#if ENABLE_PERL 256#if ENABLE_PERL
264 RSTRG (Rs_perl_lib, "perl-lib", "string"), //, "colon-separated directories with extension scripts"),TODO 257 RSTRG (Rs_perl_lib, "perl-lib", "string"), //, "colon-separated directories with extension scripts"),TODO
265 RSTRG (Rs_perl_eval, "perl-eval", "perl-eval"), // "string", "code to be evaluated after all extensions have been loaded"),TODO 258 RSTRG (Rs_perl_eval, "perl-eval", "perl-eval"), // "string", "code to be evaluated after all extensions have been loaded"),TODO
266 RSTRG (Rs_perl_ext_1, "perl-ext-common", "string"), //, "colon-separated list of perl extensions to enable"),TODO 259 RSTRG (Rs_perl_ext_1, "perl-ext-common", "string"), //, "colon-separated list of perl extensions to enable"),TODO
267 STRG (Rs_perl_ext_2, "perl-ext", "pe", "string", "colon-separated list of perl extensions to enable for this instance"), 260 STRG (Rs_perl_ext_2, "perl-ext", "pe", "string", "colon-separated list of perl extensions to enable for this instance"),
268#endif 261#endif
269#if 0 && TODO 262#if ISO_14755
270#if !defined(NO_RESOURCES) && defined(USE_XGETDEFAULT) 263 BOOL (Rs_iso14755_52, "iso14755_52", NULL, Opt_iso14755_52, 0, NULL),
271 INFO ("xrm", "string", "X resource"), 264#endif
265#ifdef HAVE_AFTERIMAGE
266 STRG (Rs_blendtype, "blendType", "blt", "string", "background image blending type - alpha, tint, etc..."),
267 STRG (Rs_blurradius, "blurRadius", "blr", "HxV", "gaussian blur radii to apply to the root background"),
268# if ENABLE_EWMH
269 STRG (Rs_iconfile, "iconFile", "icon", "file", "path to application icon image"),
272#endif 270# endif
273#endif 271#endif
274 INFO ("e", "command arg ...", "command to execute") 272 INFO ("e", "command arg ...", "command to execute")
275 }; 273 };
276 274
277#undef INFO 275#undef INFO
278#undef STRG 276#undef STRG
279#undef RSTRG 277#undef RSTRG
280#undef SWCH 278#undef SWCH
281#undef BOOL 279#undef BOOL
282/*}}} */
283 280
284static const char releasestring[] = "rxvt-unicode (" RXVTNAME ") v" VERSION " - released: " DATE "\n"; 281static const char releasestring[] = "rxvt-unicode (" RXVTNAME ") v" VERSION " - released: " DATE "\n";
285static const char optionsstring[] = "options: " 282static const char optionsstring[] = "options: "
283#if ENABLE_PERL
284 "perl,"
285#endif
286#if XFT 286#if XFT
287 "xft," 287 "xft,"
288#endif 288#endif
289#if ENABLE_STYLES 289#if ENABLE_STYLES
290 "styles," 290 "styles,"
… …
319#endif 319#endif
320 "," 320 ","
321#if OFF_FOCUS_FADING 321#if OFF_FOCUS_FADING
322 "fade," 322 "fade,"
323#endif 323#endif
324#if defined(XPM_BACKGROUND)
325 "XPM,"
326#endif
327#if defined(TRANSPARENT) 324#if defined(ENABLE_TRANSPARENCY)
328 "transparent," 325 "transparent,"
329#endif
330#if TINTING
331 "tint," 326 "tint,"
332#endif 327#endif
333#if defined(UTMP_SUPPORT) 328#if HAVE_AFTERIMAGE
334 "utmp," 329 "afterimage,"
335#endif
336#if defined(MENUBAR)
337 "menubar,"
338#endif 330#endif
339#if defined(USE_XIM) 331#if defined(USE_XIM)
340 "XIM," 332 "XIM,"
341#endif 333#endif
342 "scrollbars="
343#if !defined(HAVE_SCROLLBARS)
344 "NONE"
345#else
346# if defined(PLAIN_SCROLLBAR)
347 "plain"
348# if defined(RXVT_SCROLLBAR) || defined(NEXT_SCROLLBAR) || defined(XTERM_SCROLLBAR)
349 "+"
350# endif
351# endif
352# if defined(RXVT_SCROLLBAR)
353 "rxvt"
354# if defined(NEXT_SCROLLBAR) || defined(XTERM_SCROLLBAR)
355 "+"
356# endif
357# endif
358# if defined(NEXT_SCROLLBAR)
359 "NeXT"
360# if defined(XTERM_SCROLLBAR)
361 "+"
362# endif
363# endif
364# if defined(XTERM_SCROLLBAR)
365 "xterm"
366# endif
367#endif
368 ","
369#if defined(NO_BACKSPACE_KEY) 334#if defined(NO_BACKSPACE_KEY)
370 "no_backspace," 335 "no_backspace,"
371#endif 336#endif
372#if defined(NO_DELETE_KEY) 337#if defined(NO_DELETE_KEY)
373 "no_delete," 338 "no_delete,"
374#endif 339#endif
375#if EIGHT_BIT_CONTROLS 340#if EIGHT_BIT_CONTROLS
376 "8bitctrls," 341 "8bitctrls,"
377#endif 342#endif
378#if !defined(NO_STRINGS)
379 "strings,"
380#endif
381#if defined(ENABLE_FRILLS) 343#if defined(ENABLE_FRILLS)
382 "frills," 344 "frills,"
383#endif 345#endif
384#if defined(PREFER_24BIT)
385 "24bit,"
386#endif
387#if defined(SELECTION_SCROLLING) 346#if defined(SELECTION_SCROLLING)
388 "selectionscrolling," 347 "selectionscrolling,"
389#endif 348#endif
390#if MOUSE_WHEEL 349#if MOUSE_WHEEL
391 "wheel," 350 "wheel,"
… …
401#endif 360#endif
402#if defined(POINTER_BLANK) 361#if defined(POINTER_BLANK)
403 "pointerBlank," 362 "pointerBlank,"
404#endif 363#endif
405#if defined(NO_RESOURCES) 364#if defined(NO_RESOURCES)
406 "NoResources" 365 "NoResources,"
407#else
408# if defined(USE_XGETDEFAULT)
409 "XGetDefaults"
410# else
411 ".Xdefaults"
412# endif 366#endif
367 "scrollbars=plain"
368#if defined(RXVT_SCROLLBAR)
369 "+rxvt"
370#endif
371#if defined(NEXT_SCROLLBAR)
372 "+NeXT"
373#endif
374#if defined(XTERM_SCROLLBAR)
375 "+xterm"
413#endif 376#endif
414 "\nUsage: "; /* Usage */ 377 "\nUsage: "; /* Usage */
415 378
416#define INDENT 18 379#define INDENT 18
380
381const char rxvt_term::resval_undef [] = "<undef>";
382const char rxvt_term::resval_on [] = "on";
383const char rxvt_term::resval_off [] = "off";
417 384
418/*{{{ usage: */ 385/*{{{ usage: */
419/*----------------------------------------------------------------------*/ 386/*----------------------------------------------------------------------*/
420static void 387static void
421rxvt_usage (int type) 388rxvt_usage (int type)
… …
430 rxvt_log (" [-help] [--help]\n"); 397 rxvt_log (" [-help] [--help]\n");
431 398
432 for (col = 1, i = 0; i < optList_size; i++) 399 for (col = 1, i = 0; i < optList_size; i++)
433 if (optList[i].desc != NULL) 400 if (optList[i].desc != NULL)
434 { 401 {
435 int len = 0; 402 int len = 0;
436 403
437 if (!optList_isBool (i)) 404 if (optList[i].arg)
438 { 405 len = strlen (optList[i].arg) + 1;
439 len = optList_strlen (i);
440 if (len > 0)
441 len++; /* account for space */
442 }
443#ifdef DEBUG_STRICT
444 assert (optList[i].opt != NULL); 406 assert (optList[i].opt != NULL);
445#endif
446 len += 4 + strlen (optList[i].opt) + (optList_isBool (i) ? 2: 0); 407 len += 4 + strlen (optList[i].opt) + (optList_isBool (i) ? 2: 0);
447 col += len; 408 col += len;
448 if (col > 79) 409 if (col > 79)
410 {
449 { /* assume regular width */ 411 /* assume regular width */
450 rxvt_log ("\n"); 412 rxvt_log ("\n");
451 col = 1 + len; 413 col = 1 + len;
452 } 414 }
453 415
454 rxvt_log (" [-%s%s", (optList_isBool (i) ? "/+" : ""), optList[i].opt); 416 rxvt_log (" [-%s%s", (optList_isBool (i) ? "/+" : ""), optList[i].opt);
455 if (optList_strlen (i)) 417 if (optList[i].arg)
456 rxvt_log (" %s]", optList[i].arg); 418 rxvt_log (" %s]", optList[i].arg);
457 else 419 else
458 rxvt_log ("]"); 420 rxvt_log ("]");
459 } 421 }
460 break; 422 break;
… …
463 rxvt_log (" [options] [-e command args]\n\nwhere options include:\n"); 425 rxvt_log (" [options] [-e command args]\n\nwhere options include:\n");
464 426
465 for (i = 0; i < optList_size; i++) 427 for (i = 0; i < optList_size; i++)
466 if (optList[i].desc != NULL) 428 if (optList[i].desc != NULL)
467 { 429 {
468#ifdef DEBUG_STRICT
469 assert (optList[i].opt != NULL); 430 assert (optList[i].opt != NULL);
470#endif
471 rxvt_log (" %s%s %-*s%s%s\n", 431 rxvt_log (" %s%s %-*s%s%s\n",
472 (optList_isBool (i) ? "-/+" : "-"), optList[i].opt, 432 (optList_isBool (i) ? "-/+" : "-"), optList[i].opt,
473 (INDENT - strlen (optList[i].opt) 433 (INDENT - strlen (optList[i].opt)
474 + (optList_isBool (i) ? 0 : 2)), 434 + (optList_isBool (i) ? 0 : 2)),
475 (optList[i].arg ? optList[i].arg : ""), 435 (optList[i].arg ? optList[i].arg : ""),
… …
507 467
508/*{{{ get command-line options before getting resources */ 468/*{{{ get command-line options before getting resources */
509void 469void
510rxvt_term::get_options (int argc, const char *const *argv) 470rxvt_term::get_options (int argc, const char *const *argv)
511{ 471{
512 int i, bad_option = 0; 472 int i, bad_option = 0;
513 static const char On[3] = "ON", Off[4] = "OFF";
514 473
515 for (i = 1; i < argc; i++) 474 for (i = 1; i < argc; i++)
516 { 475 {
517 unsigned int entry, longopt = 0; 476 unsigned int entry, longopt = 0;
518 const char *flag, *opt; 477 const char *opt;
478 int flag;
519 479
520 opt = argv[i]; 480 opt = argv[i];
521#ifdef DEBUG_RESOURCES 481
522 fprintf (stderr, "argv[%d] = %s: ", i, opt);
523#endif
524 if (*opt == '-') 482 if (*opt == '-')
525 { 483 {
526 flag = On; 484 flag = 1;
485
527 if (*++opt == '-') 486 if (*++opt == '-')
528 longopt = *opt++; /* long option */ 487 longopt = *opt++; /* long option */
529 } 488 }
530 else if (*opt == '+') 489 else if (*opt == '+')
531 { 490 {
532 flag = Off; 491 flag = 0;
492
533 if (*++opt == '+') 493 if (*++opt == '+')
534 longopt = *opt++; /* long option */ 494 longopt = *opt++; /* long option */
535 } 495 }
536 else 496 else
537 { 497 {
… …
540 continue; 500 continue;
541 } 501 }
542 502
543 if (!strcmp (opt, "help")) 503 if (!strcmp (opt, "help"))
544 rxvt_usage (longopt ? 2 : 1); 504 rxvt_usage (longopt ? 2 : 1);
505
545 if (!strcmp (opt, "h")) 506 if (!strcmp (opt, "h"))
546 rxvt_usage (0); 507 rxvt_usage (0);
547 508
548 /* feature: always try to match long-options */ 509 /* feature: always try to match long-options */
549 for (entry = 0; entry < optList_size; entry++) 510 for (entry = 0; entry < optList_size; entry++)
… …
553 break; 514 break;
554 515
555 if (entry < optList_size) 516 if (entry < optList_size)
556 { 517 {
557 if (optList_isReverse (entry)) 518 if (optList_isReverse (entry))
558 flag = flag == On ? Off : On; 519 flag = !flag;
559 520
560 if (optList_strlen (entry)) 521 if (optList_isString (entry))
561 { 522 {
562 /* 523 /*
563 * special cases are handled in main.c:main () to allow 524 * special cases are handled in main.c:main () to allow
564 * X resources to set these values before we settle for 525 * X resources to set these values before we settle for
565 * default values 526 * default values
566 */ 527 */
567 528
568 if (optList[entry].doff != -1) 529 if (optList[entry].doff != -1)
530 {
531 if (flag && i+1 == argc)
532 rxvt_fatal ("option '%s' requires an argument, aborting.\n", argv [i]);
533
569 rs[optList[entry].doff] = flag == On && argv[i+1] 534 rs[optList[entry].doff] = flag ? argv[++i] : resval_undef;
570 ? argv[++i] : 0; 535 }
571 } 536 }
572 else 537 else
538 {
573 { /* boolean value */ 539 /* boolean value */
574#ifdef DEBUG_RESOURCES 540 set_option (optList[entry].index, flag);
575 fprintf (stderr, "boolean (%s,%s) = %s\n",
576 optList[entry].opt, optList[entry].kw, flag);
577#endif
578 set_option (optList[entry].flag & Optflag_mask, flag == On);
579 541
580 if (optList[entry].doff != -1) 542 if (optList[entry].doff != -1)
581 rs[optList[entry].doff] = flag; 543 rs[optList[entry].doff] = flag ? resval_on : resval_off;
582 } 544 }
583 } 545 }
546#ifndef NO_RESOURCES
547 else if (!strcmp (opt, "xrm"))
548 {
549 if (i+1 < argc)
550 XrmPutLineResource (&option_db, argv[++i]);
551 }
552#endif
553#ifdef KEYSYM_RESOURCE
554 else if (!strncmp (opt, "keysym.", sizeof ("keysym.") - 1))
555 {
556 if (i+1 < argc)
557 {
558 char *res = (char *)malloc (strlen (opt) + strlen (argv[++i]) + 6);
559 sprintf (res, "*.%s: %s\n", opt, argv[i]);
560 XrmPutLineResource (&option_db, res);
561 free (res);
562 }
563 }
564#endif
584 else 565 else
585#ifdef KEYSYM_RESOURCE
586 /* if (!strncmp (opt, "keysym.", sizeof ("keysym.") - 1)) */
587 if (rxvt_Str_match (opt, "keysym."))
588 { 566 {
589 const char *str = argv[++i];
590
591 if (str != NULL)
592 parse_keysym (opt + sizeof ("keysym.") - 1, str);
593 }
594 else
595#endif
596 {
597 bad_option = 1; 567 bad_option = 1;
598 rxvt_warn ("\"%s\": unknown or malformed option.\n", opt); 568 rxvt_warn ("\"%s\": unknown or malformed option.\n", opt);
599 } 569 }
600 } 570 }
601 571
602 if (bad_option) 572 if (bad_option)
603 rxvt_usage (0); 573 rxvt_usage (0);
604} 574}
… …
615 * "rxvt" "keysym" "0xFF01" 585 * "rxvt" "keysym" "0xFF01"
616 * value will be a string 586 * value will be a string
617 */ 587 */
618/* ARGSUSED */ 588/* ARGSUSED */
619int 589int
620rxvt_define_key (XrmDatabase *database __attribute__((unused)), 590rxvt_define_key (XrmDatabase *database UNUSED,
621 XrmBindingList bindings __attribute__((unused)), 591 XrmBindingList bindings UNUSED,
622 XrmQuarkList quarks, 592 XrmQuarkList quarks,
623 XrmRepresentation *type __attribute__((unused)), 593 XrmRepresentation *type UNUSED,
624 XrmValue *value, 594 XrmValue *value,
625 XPointer closure __attribute__((unused))) 595 XPointer closure UNUSED)
626{ 596{
627 int last; 597 int last;
628 598
629 for (last = 0; quarks[last] != NULLQUARK; last++) /* look for last quark in list */ 599 for (last = 0; quarks[last] != NULLQUARK; last++) /* look for last quark in list */
630 ; 600 ;
… …
635} 605}
636 606
637/* 607/*
638 * look for something like this (XK_Delete) 608 * look for something like this (XK_Delete)
639 * rxvt*keysym.0xFFFF: "\177" 609 * rxvt*keysym.0xFFFF: "\177"
640 *
641 * arg will be
642 * NULL for ~/.Xdefaults and
643 * non-NULL for command-line options (need to allocate)
644 */ 610 */
645#define NEWARGLIM 500 /* `reasonable' size */
646 611
647struct keysym_vocabulary_t 612struct keysym_vocabulary_t
648{ 613{
649 const char *name; 614 const char *name;
650 unsigned short len; 615 unsigned short len;
651 unsigned short value; 616 unsigned short value;
652}; 617};
653keysym_vocabulary_t keysym_vocabulary[] = 618static const keysym_vocabulary_t keysym_vocabulary[] =
654{ 619{
655 { "ISOLevel3", 9, Level3Mask }, 620 { "ISOLevel3", 9, Level3Mask },
656 { "AppKeypad", 9, AppKeypadMask }, 621 { "AppKeypad", 9, AppKeypadMask },
657 { "Control", 7, ControlMask }, 622 { "Control", 7, ControlMask },
658 { "NumLock", 7, NumLockMask }, 623 { "NumLock", 7, NumLockMask },
… …
680}; 645};
681 646
682int 647int
683rxvt_term::parse_keysym (const char *str, const char *arg) 648rxvt_term::parse_keysym (const char *str, const char *arg)
684{ 649{
685 int n, sym; 650 int sym;
686 unsigned int state = 0; 651 unsigned int state = 0;
687 const char *pmodend = NULL; 652 const char *key = strrchr (str, '-');
688 char *newarg = NULL;
689 char newargstr[NEWARGLIM];
690 653
691 if (arg == NULL) 654 if (!key)
692 { 655 key = str;
693 if ((n = rxvt_Str_match (str, "keysym.")) == 0)
694 return 0;
695
696 str += n; /* skip `keysym.' */
697 if ((pmodend = strchr (str, ':')) < str)
698 return -1;
699 }
700 else 656 else
701 pmodend = str + strlen(str); 657 key++;
702 658
703 for (--pmodend; str < pmodend; --pmodend) 659 // string or key is empty
704 if (*pmodend == '-') 660 if (*arg == '\0' || *key == '\0')
705 break; 661 return -1;
706 662
663 // parse modifiers
707 while (str < pmodend) 664 while (str < key)
708 { 665 {
709 unsigned int i; 666 unsigned int i;
710 667
711 for (i=0; i < sizeof (keysym_vocabulary) / sizeof (keysym_vocabulary_t); ++i) 668 for (i=0; i < sizeof (keysym_vocabulary) / sizeof (keysym_vocabulary_t); ++i)
712 { 669 {
… …
723 680
724 if (*str == '-') 681 if (*str == '-')
725 ++str; 682 ++str;
726 } 683 }
727 684
728 /* some scanf () have trouble with a 0x prefix */ 685 // convert keysym name to keysym number
729 if (str[0] == '0' && toupper (str[1]) == 'X') 686 if ((sym = XStringToKeysym (str)) == None)
730 { 687 {
731 str += 2; 688 // fallback on hexadecimal parsing
732 689 char *end;
690 sym = strtol (str, &end, 16);
733 if (arg) 691 if (*end)
734 {
735 if (sscanf (str, (strchr (str, ':') ? "%x:" : "%x"), &sym) != 1)
736 return -1;
737 }
738 else
739 {
740 if (sscanf (str, "%x:", &sym) != 1)
741 return -1;
742
743 /* cue to ':', it's there since sscanf () worked */
744 strncpy (newargstr, strchr (str, ':') + 1, NEWARGLIM - 1);
745 newargstr[NEWARGLIM - 1] = '\0';
746 newarg = newargstr;
747 }
748 }
749 else
750 {
751 /*
752 * convert keysym name to keysym number
753 */
754 strncpy (newargstr, str, NEWARGLIM - 1);
755 newargstr[NEWARGLIM - 1] = '\0';
756
757 if (arg == NULL)
758 {
759 if ((newarg = strchr (newargstr, ':')) == NULL)
760 return -1;
761
762 *newarg++ = '\0'; /* terminate keysym name */
763 }
764
765 if ((sym = XStringToKeysym (newargstr)) == None)
766 return -1; 692 return -1;
767 } 693 }
768 694
769 if (newarg == NULL)
770 {
771 strncpy (newargstr, arg, NEWARGLIM - 1);
772 newargstr[NEWARGLIM - 1] = '\0';
773 newarg = newargstr;
774 }
775
776 rxvt_Str_trim (newarg);
777 if (*newarg == '\0' || (n = rxvt_Str_escaped (newarg)) == 0)
778 return -1;
779
780 keyboard->register_user_translation (sym, state, newarg); 695 keyboard->register_user_translation (sym, state, arg);
781 return 1; 696 return 1;
782} 697}
783 698
784# endif /* KEYSYM_RESOURCE */ 699# endif /* KEYSYM_RESOURCE */
700#endif /* NO_RESOURCES */
785 701
786# ifndef USE_XGETDEFAULT 702static char *
787/*{{{ rxvt_get_xdefaults () */ 703get_res (XrmDatabase database, const char *program, const char *option)
788/*
789 * the matching algorithm used for memory-save fake resources
790 */
791void
792rxvt_term::get_xdefaults (FILE *stream, const char *name)
793{ 704{
794 unsigned int len; 705 char resource[512];
795 char *str, buffer[256]; 706 char *type;
707 XrmValue result;
796 708
797 if (stream == NULL) 709 snprintf (resource, sizeof (resource), "%s.%s", program, option);
798 return; 710 XrmGetResource (database, resource, resource, &type, &result);
799 711
800 len = strlen (name); 712 return result.addr;
801 while ((str = fgets (buffer, sizeof (buffer), stream)) != NULL) 713}
714
715const char *
716rxvt_term::x_resource (const char *name)
717{
718 XrmDatabase database = XrmGetDatabase (dpy);
719
720 const char *p = get_res (database, rs[Rs_name], name);
721 const char *p0 = get_res (database, "!INVALIDPROGRAMMENAMEDONTMATCH!", name);
722
723 if (p == NULL || (p0 && strcmp (p, p0) == 0))
802 { 724 {
803 unsigned int entry, n; 725 p = get_res (database, RESCLASS, name);
804 726#ifdef RESFALLBACK
805 while (*str && isspace (*str)) 727 if (p == NULL || (p0 && strcmp (p, p0) == 0))
806 str++; /* leading whitespace */ 728 p = get_res (database, RESFALLBACK, name);
807 729#endif
808 if ((str[len] != '*' && str[len] != '.')
809 || (len && strncmp (str, name, len)))
810 continue;
811 str += (len + 1); /* skip `name*' or `name.' */
812
813# ifdef KEYSYM_RESOURCE
814 if (!parse_keysym (str, NULL))
815# endif /* KEYSYM_RESOURCE */
816 for (entry = 0; entry < optList_size; entry++)
817 {
818 const char *kw = optList[entry].kw;
819
820 if (kw == NULL)
821 continue;
822
823 n = strlen (kw);
824 if (str[n] == ':' && rxvt_Str_match (str, kw))
825 {
826 /* skip `keyword:' */
827 str += n + 1;
828 rxvt_Str_trim (str);
829 n = strlen (str);
830
831 if (n && rs[optList[entry].doff] == NULL)
832 {
833 /* not already set */
834 int s;
835 char *p = 0;
836
837 for (int o = 0;;)
838 {
839 p = (char *)rxvt_realloc (p, o + n + 1);
840 memcpy (p + o, str, n);
841 o += n;
842 p[o] = 0;
843
844 if (o == 0 || p[o - 1] != '\\') // continuation line
845 break;
846
847 o--; // eat "\"
848
849 if ((str = fgets (buffer, sizeof (buffer), stream)) == NULL)
850 break;
851
852 rxvt_Str_trim (str);
853 n = strlen (str);
854 }
855
856 rs[optList[entry].doff] = p;
857 allocated.push_back (p);
858
859 if (optList_isBool (entry))
860 {
861 s = strcasecmp (str, "true") == 0
862 || strcasecmp (str, "yes") == 0
863 || strcasecmp (str, "on") == 0
864 || strcmp (str, "1") == 0;
865
866 if (optList_isReverse (entry))
867 s = !s;
868
869 set_option (optList[entry].flag & Optflag_mask, s);
870 }
871 }
872
873 break;
874 }
875 }
876 } 730 }
877 731
878 rewind (stream); 732 if (p == NULL && p0)
733 p = p0;
734
735 return p;
879} 736}
880 737
881/*}}} */
882# endif /* ! USE_XGETDEFAULT */
883#endif /* NO_RESOURCES */
884
885/*{{{ read the resources files */
886/*
887 * using XGetDefault () or the hand-rolled replacement
888 */
889/* ARGSUSED */
890void 738void
891rxvt_term::extract_resources () 739rxvt_term::extract_resources ()
892{ 740{
893 dDisp;
894
895#ifndef NO_RESOURCES 741#ifndef NO_RESOURCES
896 742 XrmDatabase database = XrmGetDatabase (dpy);
897 char *homedir = (char *)getenv ("HOME");
898 char fname[1024];
899
900# if defined XAPPLOADDIR
901# if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
902 /* Compute the path of the possibly available localized Rxvt file */
903 char localepath[1024];
904
905 if (locale)
906 snprintf (localepath, sizeof (localepath), XAPPLOADDIRLOCALE "/" RESCLASS, locale);
907 else
908 localepath[0] = 0;
909# endif
910# endif
911
912# ifdef USE_XGETDEFAULT
913 /*
914 * get resources using the X library function
915 */
916 int entry;
917
918# ifdef XrmEnumOneLevel
919 char *displayResource, *xe;
920 XrmName name_prefix[3];
921 XrmClass class_prefix[3];
922 XrmDatabase database, rdb1;
923
924 XrmInitialize ();
925 database = NULL;
926
927 // for ordering, see for example http://www.faqs.org/faqs/Xt-FAQ/ Subject: 20
928
929 // 6. System wide per application default file.
930 /* Add in Rxvt file */
931# if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
932 if (*localepath
933 && ((rdb1 = XrmGetFileDatabase (localepath))
934 || (rdb1 = XrmGetFileDatabase (XAPPLOADDIR "/" RESCLASS))))
935# endif
936 XrmMergeDatabases (rdb1, &database); 743 XrmMergeDatabases (option_db, &database);
937 744 option_db = NULL;
938 /* Add in $XAPPLRESDIR/Rxvt only; not bothering with XUSERFILESEARCHPATH */
939 if ((xe = (char *)getenv ("XAPPLRESDIR")))
940 {
941 snprintf (fname, sizeof (fname), "%s/%s", xe, RESCLASS);
942
943 if ((rdb1 = XrmGetFileDatabase (fname)))
944 XrmMergeDatabases (rdb1, &database);
945 }
946
947 // 5. User's per application default file.
948 // none
949
950 // 4. User's defaults file.
951 /* Get any Xserver defaults */
952 displayResource = XResourceManagerString (disp);
953 if (displayResource != NULL)
954 {
955 if ((rdb1 = XrmGetStringDatabase (displayResource)))
956 XrmMergeDatabases (rdb1, &database);
957 }
958 else if (homedir)
959 {
960 snprintf (fname, sizeof (fname), "%s/.Xdefaults", homedir);
961
962 if ((rdb1 = XrmGetFileDatabase (fname)))
963 XrmMergeDatabases (rdb1, &database);
964 }
965
966 /* Get screen specific resources */
967 displayResource = XScreenResourceString (ScreenOfDisplay (disp, display->screen));
968 if (displayResource != NULL)
969 {
970 if ((rdb1 = XrmGetStringDatabase (displayResource)))
971 /* Merge with screen-independent resources */
972 XrmMergeDatabases (rdb1, &database);
973
974 XFree (displayResource);
975 }
976
977 // 3. User's per host defaults file
978 /* Add in XENVIRONMENT file */
979 if ((xe = (char *)getenv ("XENVIRONMENT"))
980 && (rdb1 = XrmGetFileDatabase (xe)))
981 XrmMergeDatabases (rdb1, &database);
982 else if (homedir)
983 {
984 struct utsname un;
985
986 if (!uname (&un))
987 {
988 snprintf (fname, sizeof (fname), "%s/.Xdefaults-%s", homedir, un.nodename);
989
990 if ((rdb1 = XrmGetFileDatabase (fname)))
991 XrmMergeDatabases (rdb1, &database);
992 }
993 }
994
995 XrmSetDatabase (disp, database);
996# endif
997
998 /* 745 /*
999 * Query resources for options that affect us 746 * Query resources for options that affect us
1000 */ 747 */
1001 for (entry = 0; entry < optList_size; entry++) 748 for (int entry = 0; entry < optList_size; entry++)
1002 { 749 {
1003 int s; 750 int s;
1004 char *p, *p0;
1005 const char *kw = optList[entry].kw; 751 const char *kw = optList[entry].kw;
1006 752
1007 if (kw == NULL || rs[optList[entry].doff] != NULL) 753 if (kw == NULL || rs[optList[entry].doff] != NULL)
1008 continue; /* previously set */ 754 continue; // previously set
1009 755
1010 p = XGetDefault (disp, rs[Rs_name], kw); 756 const char *p = x_resource (kw);
1011 p0 = XGetDefault (disp, "!INVALIDPROGRAMMENAMEDONTMATCH!", kw);
1012 if (p == NULL || (p0 && strcmp (p, p0) == 0))
1013 {
1014 p = XGetDefault (disp, RESCLASS, kw);
1015#ifdef RESFALLBACK
1016 if (p == NULL || (p0 && strcmp (p, p0) == 0))
1017 p = XGetDefault (disp, RESFALLBACK, kw);
1018#endif
1019 }
1020
1021 if (p == NULL && p0)
1022 p = p0;
1023 757
1024 if (p) 758 if (p)
1025 { 759 {
760 p = strdup (p);
761 allocated.push_back ((void *)p);
1026 rs[optList[entry].doff] = p; 762 rs[optList[entry].doff] = p;
1027 763
1028 if (optList_isBool (entry)) 764 if (optList_isBool (entry))
1029 { 765 {
1030 s = strcasecmp (p, "TRUE") == 0 766 s = strcasecmp (p, "TRUE") == 0
… …
1033 || strcasecmp (p, "1") == 0; 769 || strcasecmp (p, "1") == 0;
1034 770
1035 if (optList_isReverse (entry)) 771 if (optList_isReverse (entry))
1036 s = !s; 772 s = !s;
1037 773
1038 set_option (optList[entry].flag & Optflag_mask, s); 774 set_option (optList[entry].index, s);
1039 } 775 }
1040 } 776 }
1041 } 777 }
1042 778
1043 /* 779 /*
1044 * [R5 or later]: enumerate the resource database 780 * [R5 or later]: enumerate the resource database
1045 */ 781 */
1046# ifdef KEYSYM_RESOURCE 782# ifdef KEYSYM_RESOURCE
783 XrmName name_prefix[3];
784 XrmClass class_prefix[3];
785
1047 name_prefix[0] = XrmStringToName (rs[Rs_name]); 786 name_prefix[0] = XrmStringToName (rs[Rs_name]);
1048 name_prefix[1] = XrmStringToName ("keysym"); 787 name_prefix[1] = XrmStringToName ("keysym");
1049 name_prefix[2] = NULLQUARK; 788 name_prefix[2] = NULLQUARK;
1050 class_prefix[0] = XrmStringToName (RESCLASS); 789 class_prefix[0] = XrmStringToName (RESCLASS);
1051 class_prefix[1] = XrmStringToName ("Keysym"); 790 class_prefix[1] = XrmStringToName ("Keysym");
1052 class_prefix[2] = NULLQUARK; 791 class_prefix[2] = NULLQUARK;
1053 /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */ 792 /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */
1054 XrmEnumerateDatabase (XrmGetDatabase (disp), name_prefix, class_prefix, 793 XrmEnumerateDatabase (database, name_prefix, class_prefix,
1055 XrmEnumOneLevel, rxvt_define_key, NULL); 794 XrmEnumOneLevel, rxvt_define_key, NULL);
1056# ifdef RESFALLBACK 795# ifdef RESFALLBACK
1057 name_prefix[0] = XrmStringToName (RESFALLBACK); 796 name_prefix[0] = XrmStringToName (RESFALLBACK);
1058 name_prefix[1] = XrmStringToName ("keysym"); 797 name_prefix[1] = XrmStringToName ("keysym");
1059 class_prefix[0] = XrmStringToName (RESFALLBACK); 798 class_prefix[0] = XrmStringToName (RESFALLBACK);
1060 class_prefix[1] = XrmStringToName ("Keysym"); 799 class_prefix[1] = XrmStringToName ("Keysym");
1061 /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */ 800 /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */
1062 XrmEnumerateDatabase (XrmGetDatabase (disp), name_prefix, class_prefix, 801 XrmEnumerateDatabase (database, name_prefix, class_prefix,
1063 XrmEnumOneLevel, rxvt_define_key, NULL); 802 XrmEnumOneLevel, rxvt_define_key, NULL);
1064# endif 803# endif
1065# endif 804# endif
1066 805
1067# else /* USE_XGETDEFAULT */
1068 /* get resources the hard way, but save lots of memory */
1069 FILE *fd = NULL;
1070
1071 if (homedir)
1072 {
1073 static const char *const xnames[2] = { ".Xdefaults", ".Xresources" };
1074
1075 for (int i = 0; i < (sizeof (xnames) / sizeof (xnames [0])); i++)
1076 {
1077 snprintf (fname, sizeof (fname), "%s/%s", homedir, xnames [i]);
1078
1079 if ((fd = fopen (fname, "r")) != NULL)
1080 break;
1081 }
1082 }
1083 /*
1084 * The normal order to match resources is the following:
1085 * @ global resources (partial match, ~/.Xdefaults)
1086 * @ application file resources (XAPPLOADDIR/Rxvt)
1087 * @ class resources (~/.Xdefaults)
1088 * @ private resources (~/.Xdefaults)
1089 *
1090 * However, for the hand-rolled resources, the matching algorithm
1091 * checks if a resource string value has already been allocated
1092 * and won't overwrite it with (in this case) a less specific
1093 * resource value.
1094 *
1095 * This avoids multiple allocation. Also, when we've called this
1096 * routine command-line string options have already been applied so we
1097 * needn't to allocate for those resources.
1098 *
1099 * So, search in resources from most to least specific.
1100 *
1101 * Also, use a special sub-class so that we can use either or both of
1102 * "XTerm" and "Rxvt" as class names.
1103 */
1104
1105 get_xdefaults (fd, rs[Rs_name]);
1106 get_xdefaults (fd, RESCLASS);
1107# ifdef RESFALLBACK
1108 get_xdefaults (fd, RESFALLBACK);
1109# endif
1110
1111# if defined(XAPPLOADDIR) && defined(USE_XAPPLOADDIR)
1112 {
1113 FILE *ad = NULL;
1114
1115# if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1116 if (!*localepath || (ad = fopen (localepath, "r")) == NULL)
1117# endif
1118 ad = fopen (XAPPLOADDIR "/" RESCLASS, "r");
1119 if (ad != NULL)
1120 {
1121 get_xdefaults (ad, RESCLASS);
1122 get_xdefaults (ad, "");
1123 fclose (ad);
1124 }
1125 }
1126# endif /* XAPPLOADDIR */
1127
1128 get_xdefaults (fd, ""); /* partial match */
1129 if (fd != NULL)
1130 fclose (fd);
1131# endif /* USE_XGETDEFAULT */
1132
1133#endif /* NO_RESOURCES */ 806#endif /* NO_RESOURCES */
1134} 807}
1135 808
1136/*}}} */
1137/*----------------------- end-of-file (C source) -----------------------*/ 809/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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