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

Diff Legend

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