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.64 by root, Sat Dec 31 17:16:17 2005 UTC vs.
Revision 1.172 by root, Sun Jul 1 21:32:10 2012 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 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
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"),
102 BOOL (Rs_reverseVideo, "reverseVideo", "rv", Opt_reverseVideo, "reverse video"), 101 BOOL (Rs_reverseVideo, "reverseVideo", "rv", Opt_reverseVideo, 0, "reverse video"),
103 BOOL (Rs_loginShell, "loginShell", "ls", Opt_loginShell, "login shell"), 102 BOOL (Rs_loginShell, "loginShell", "ls", Opt_loginShell, 0, "login shell"),
104 BOOL (Rs_jumpScroll, "jumpScroll", "j", Opt_jumpScroll, "jump scrolling"), 103 BOOL (Rs_jumpScroll, "jumpScroll", "j", Opt_jumpScroll, 0, "jump scrolling"),
104 BOOL (Rs_skipScroll, "skipScroll", "ss", Opt_skipScroll, 0, "skip scrolling"),
105 BOOL (Rs_pastableTabs, "pastableTabs", "ptab", Opt_pastableTabs, "tab characters are pastable"), 105 BOOL (Rs_pastableTabs, "pastableTabs", "ptab", Opt_pastableTabs, 0, "tab characters are pastable"),
106#if HAVE_SCROLLBARS
107 RSTRG (Rs_scrollstyle, "scrollstyle", "mode"), 106 RSTRG (Rs_scrollstyle, "scrollstyle", "mode"),
108 BOOL (Rs_scrollBar, "scrollBar", "sb", Opt_scrollBar, "scrollbar"), 107 BOOL (Rs_scrollBar, "scrollBar", "sb", Opt_scrollBar, 0, "scrollbar"),
109 BOOL (Rs_scrollBar_right, "scrollBar_right", "sr", Opt_scrollBar_right, "scrollbar right"), 108 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"), 109 BOOL (Rs_scrollBar_floating, "scrollBar_floating", "st", Opt_scrollBar_floating, 0, "scrollbar without a trough"),
111 RSTRG (Rs_scrollBar_align, "scrollBar_align", "mode"), 110 RSTRG (Rs_scrollBar_align, "scrollBar_align", "mode"),
112 STRG (Rs_scrollBar_thickness, "thickness", "sbt", "number", "scrollbar thickness/width in pixels"), 111 STRG (Rs_scrollBar_thickness, "thickness", "sbt", "number", "scrollbar thickness/width in pixels"),
113#endif
114 BOOL (Rs_scrollTtyOutput, "scrollTtyOutput", NULL, Opt_scrollTtyOutput, NULL), 112 BOOL (Rs_scrollTtyOutput, "scrollTtyOutput", NULL, Opt_scrollTtyOutput, 0, NULL),
115 BOOL (Rs_scrollTtyOutput, NULL, "si", Optflag_Reverse | Opt_scrollTtyOutput, "scroll-on-tty-output inhibit"), 113 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"), 114 BOOL (Rs_scrollTtyKeypress, "scrollTtyKeypress", "sk", Opt_scrollTtyKeypress, 0, "scroll-on-keypress"),
117 BOOL (Rs_scrollWithBuffer, "scrollWithBuffer", "sw", Opt_scrollWithBuffer, "scroll-with-buffer"), 115 BOOL (Rs_scrollWithBuffer, "scrollWithBuffer", "sw", Opt_scrollWithBuffer, 0, "scroll-with-buffer"),
118#if TRANSPARENT 116#if ENABLE_TRANSPARENCY
119 BOOL (Rs_transparent, "inheritPixmap", "ip", Opt_transparent, "inherit parent pixmap"), 117 BOOL (Rs_transparent, "inheritPixmap", "ip", Opt_transparent, 0, "inherit parent pixmap"),
120 SWCH ("tr", Opt_transparent, NULL), 118 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"), 119 STRG (Rs_color + Color_tint, "tintColor", "tint", "color", "tint color"),
120 STRG (Rs_shade, "shading", "sh", "number", "shade background by number %."),
121 STRG (Rs_blurradius, "blurRadius", "blr", "HxV", "gaussian blur radii to apply to the root background"),
122#endif
123#if OFF_FOCUS_FADING
124 STRG (Rs_fade, "fading", "fade", "number", "fade colors by number % when losing focus"),
125 STRG (Rs_color + Color_fade, "fadeColor", "fadecolor", "color", "target color for off-focus fading"),
126#endif
127 BOOL (Rs_utmpInhibit, "utmpInhibit", "ut", Opt_utmpInhibit, 0, "utmp inhibit"),
128#ifndef NO_BELL
129# if ENABLE_FRILLS
130 BOOL (Rs_urgentOnBell, "urgentOnBell", NULL, Opt_urgentOnBell, 0, NULL),
123# endif 131# 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"), 132 BOOL (Rs_visualBell, "visualBell", "vb", Opt_visualBell, 0, "visual bell"),
135# if ! defined(NO_MAPALERT) && defined(MAPALERT_OPTION) 133# if ! defined(NO_MAPALERT) && defined(MAPALERT_OPTION)
136 BOOL (Rs_mapAlert, "mapAlert", NULL, Opt_mapAlert, NULL), 134 BOOL (Rs_mapAlert, "mapAlert", NULL, Opt_mapAlert, 0, NULL),
137# endif 135# endif
138#endif 136#endif
139#ifdef META8_OPTION 137#ifdef META8_OPTION
140 BOOL (Rs_meta8, "meta8", NULL, Opt_meta8, NULL), 138 BOOL (Rs_meta8, "meta8", NULL, Opt_meta8, 0, NULL),
141#endif 139#endif
142#ifdef MOUSE_WHEEL 140#ifdef MOUSE_WHEEL
143 BOOL (Rs_mouseWheelScrollPage, "mouseWheelScrollPage", NULL, Opt_mouseWheelScrollPage, NULL), 141 BOOL (Rs_mouseWheelScrollPage, "mouseWheelScrollPage", NULL, Opt_mouseWheelScrollPage, 0, NULL),
144#endif 142#endif
145#if ENABLE_FRILLS 143#if ENABLE_FRILLS
146 BOOL (Rs_tripleclickwords, "tripleclickwords", "tcw", Opt_tripleclickwords, "triple click word selection"), 144 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"), 145 BOOL (Rs_insecure, "insecure", "insecure", Opt_insecure, 0, "enable possibly insecure escape sequences"),
148 BOOL (Rs_cursorUnderline, "cursorUnderline", "uc", Opt_cursorUnderline, "underline cursor"), 146 BOOL (Rs_cursorUnderline, "cursorUnderline", "uc", Opt_cursorUnderline, 0, "underline cursor"),
149#endif 147#endif
150#if CURSOR_BLINK 148#if CURSOR_BLINK
151 BOOL (Rs_cursorBlink, "cursorBlink", "bc", Opt_cursorBlink, "blinking cursor"), 149 BOOL (Rs_cursorBlink, "cursorBlink", "bc", Opt_cursorBlink, 0, "blinking cursor"),
152#endif 150#endif
153#ifdef POINTER_BLANK 151#ifdef POINTER_BLANK
154 BOOL (Rs_pointerBlank, "pointerBlank", "pb", Opt_pointerBlank, "switch off pointer after delay"), 152 BOOL (Rs_pointerBlank, "pointerBlank", "pb", Opt_pointerBlank, 0, "switch off pointer after delay"),
155#endif 153#endif
156 STRG (Rs_color + Color_bg, "background", "bg", "color", "background color"), 154 STRG (Rs_color + Color_bg, "background", "bg", "color", "background color"),
157 STRG (Rs_color + Color_fg, "foreground", "fg", "color", "foreground color"), 155 STRG (Rs_color + Color_fg, "foreground", "fg", "color", "foreground color"),
158 RSTRG (Rs_color + minCOLOR + 0, "color0", "color"), 156 RSTRG (Rs_color + minCOLOR + 0, "color0", "color"),
159 RSTRG (Rs_color + minCOLOR + 1, "color1", "color"), 157 RSTRG (Rs_color + minCOLOR + 1, "color1", "color"),
… …
161 RSTRG (Rs_color + minCOLOR + 3, "color3", "color"), 159 RSTRG (Rs_color + minCOLOR + 3, "color3", "color"),
162 RSTRG (Rs_color + minCOLOR + 4, "color4", "color"), 160 RSTRG (Rs_color + minCOLOR + 4, "color4", "color"),
163 RSTRG (Rs_color + minCOLOR + 5, "color5", "color"), 161 RSTRG (Rs_color + minCOLOR + 5, "color5", "color"),
164 RSTRG (Rs_color + minCOLOR + 6, "color6", "color"), 162 RSTRG (Rs_color + minCOLOR + 6, "color6", "color"),
165 RSTRG (Rs_color + minCOLOR + 7, "color7", "color"), 163 RSTRG (Rs_color + minCOLOR + 7, "color7", "color"),
166#ifndef NO_BRIGHTCOLOR
167 RSTRG (Rs_color + minBrightCOLOR + 0, "color8", "color"), 164 RSTRG (Rs_color + minBrightCOLOR + 0, "color8", "color"),
168 RSTRG (Rs_color + minBrightCOLOR + 1, "color9", "color"), 165 RSTRG (Rs_color + minBrightCOLOR + 1, "color9", "color"),
169 RSTRG (Rs_color + minBrightCOLOR + 2, "color10", "color"), 166 RSTRG (Rs_color + minBrightCOLOR + 2, "color10", "color"),
170 RSTRG (Rs_color + minBrightCOLOR + 3, "color11", "color"), 167 RSTRG (Rs_color + minBrightCOLOR + 3, "color11", "color"),
171 RSTRG (Rs_color + minBrightCOLOR + 4, "color12", "color"), 168 RSTRG (Rs_color + minBrightCOLOR + 4, "color12", "color"),
172 RSTRG (Rs_color + minBrightCOLOR + 5, "color13", "color"), 169 RSTRG (Rs_color + minBrightCOLOR + 5, "color13", "color"),
173 RSTRG (Rs_color + minBrightCOLOR + 6, "color14", "color"), 170 RSTRG (Rs_color + minBrightCOLOR + 6, "color14", "color"),
174 RSTRG (Rs_color + minBrightCOLOR + 7, "color15", "color"), 171 RSTRG (Rs_color + minBrightCOLOR + 7, "color15", "color"),
175#endif /* NO_BRIGHTCOLOR */
176#ifndef NO_BOLD_UNDERLINE_REVERSE 172#ifndef NO_BOLD_UNDERLINE_REVERSE
177 RSTRG (Rs_color + Color_BD, "colorBD", "color"), 173 RSTRG (Rs_color + Color_BD, "colorBD", "color"),
178 RSTRG (Rs_color + Color_IT, "colorIT", "color"), 174 RSTRG (Rs_color + Color_IT, "colorIT", "color"),
179 RSTRG (Rs_color + Color_UL, "colorUL", "color"), 175 RSTRG (Rs_color + Color_UL, "colorUL", "color"),
180 RSTRG (Rs_color + Color_RV, "colorRV", "color"), 176 RSTRG (Rs_color + Color_RV, "colorRV", "color"),
181#endif /* ! NO_BOLD_UNDERLINE_REVERSE */ 177#endif /* ! NO_BOLD_UNDERLINE_REVERSE */
182#if ENABLE_FRILLS 178#if ENABLE_FRILLS
183 RSTRG (Rs_color + Color_underline, "underlineColor", "color"), 179 RSTRG (Rs_color + Color_underline, "underlineColor", "color"),
184#endif 180#endif
185#ifdef KEEP_SCROLLCOLOR
186 RSTRG (Rs_color + Color_scroll, "scrollColor", "color"), 181 RSTRG (Rs_color + Color_scroll, "scrollColor", "color"),
182#ifdef RXVT_SCROLLBAR
187 RSTRG (Rs_color + Color_trough, "troughColor", "color"), 183 RSTRG (Rs_color + Color_trough, "troughColor", "color"),
188#endif /* KEEP_SCROLLCOLOR */ 184#endif
189#ifdef OPTION_HC 185#ifdef OPTION_HC
190 STRG (Rs_color + Color_HC, "highlightColor", "hc", "color", "highlight color"), 186 STRG (Rs_color + Color_HC, "highlightColor", "hc", "color", "highlight color"),
187 RSTRG (Rs_color + Color_HTC, "highlightTextColor", "color"),
191#endif 188#endif
192#ifndef NO_CURSORCOLOR 189#ifndef NO_CURSORCOLOR
193 STRG (Rs_color + Color_cursor, "cursorColor", "cr", "color", "cursor color"), 190 STRG (Rs_color + Color_cursor, "cursorColor", "cr", "color", "cursor color"),
194 /* command-line option = resource name */ 191 /* command-line option = resource name */
195 RSTRG (Rs_color + Color_cursor2, "cursorColor2", "color"), 192 RSTRG (Rs_color + Color_cursor2, "cursorColor2", "color"),
196#endif /* NO_CURSORCOLOR */ 193#endif /* NO_CURSORCOLOR */
197 STRG (Rs_color + Color_pointer_fg, "pointerColor", "pr", "color", "pointer color"), 194 STRG (Rs_color + Color_pointer_fg, "pointerColor", "pr", "color", "pointer color"),
198 STRG (Rs_color + Color_pointer_bg, "pointerColor2", "pr2", "color", "pointer bg color"), 195 STRG (Rs_color + Color_pointer_bg, "pointerColor2", "pr2", "color", "pointer bg color"),
199 STRG (Rs_color + Color_border, "borderColor", "bd", "color", "border color"), 196 STRG (Rs_color + Color_border, "borderColor", "bd", "color", "border color"),
200#if defined (XPM_BACKGROUND) || (MENUBAR_MAX) 197#if BG_IMAGE_FROM_FILE
201 RSTRG (Rs_path, "path", "search path"), 198 RSTRG (Rs_path, "path", "search path"),
202#endif /* defined (XPM_BACKGROUND) || (MENUBAR_MAX) */
203#ifdef XPM_BACKGROUND
204 STRG (Rs_backgroundPixmap, "backgroundPixmap", "pixmap", "file[;geom]", "background pixmap"), 199 STRG (Rs_backgroundPixmap, "backgroundPixmap", "pixmap", "file[;geom]", "background pixmap"),
205#endif /* XPM_BACKGROUND */ 200# if ENABLE_EWMH
206#if (MENUBAR_MAX) 201 STRG (Rs_iconfile, "iconFile", "icon", "file", "path to application icon image"),
207 RSTRG (Rs_menu, "menu", "name[;tag]"), 202# endif
208#endif 203#endif
209 /* fonts: command-line option = resource name */ 204 /* fonts: command-line option = resource name */
210 STRG (Rs_font, "font", "fn", "fontname", "normal text font"), 205 STRG (Rs_font, "font", "fn", "fontname", "normal text font"),
211#if ENABLE_STYLES 206#if ENABLE_STYLES
212 STRG (Rs_boldFont, "boldFont", "fb", "fontname", "bold font"), 207 STRG (Rs_boldFont, "boldFont", "fb", "fontname", "bold font"),
213 STRG (Rs_italicFont, "italicFont", "fi", "fontname", "italic font"), 208 STRG (Rs_italicFont, "italicFont", "fi", "fontname", "italic font"),
214 STRG (Rs_boldItalicFont, "boldItalicFont", "fbi", "fontname", "bold italic font"), 209 STRG (Rs_boldItalicFont, "boldItalicFont", "fbi", "fontname", "bold italic font"),
215 BOOL (Rs_intensityStyles, "intensityStyles", "is", Opt_intensityStyles, "font styles imply intensity changes"), 210 BOOL (Rs_intensityStyles, "intensityStyles", "is", Opt_intensityStyles, 0, "font styles imply intensity changes"),
216#endif 211#endif
217#ifdef USE_XIM 212#if USE_XIM
218 STRG (Rs_inputMethod, "inputMethod", "im", "name", "name of input method"), 213 STRG (Rs_inputMethod, "inputMethod", "im", "name", "name of input method"),
219 STRG (Rs_preeditType, "preeditType", "pt", "style", "input style: style = OverTheSpot|OffTheSpot|Root"), 214 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"), 215 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"), 216 STRG (Rs_imFont, "imFont", "imfont", "fontname", "fontset for styles OverTheSpot and OffTheSpot"),
222#endif /* USE_XIM */ 217#endif /* USE_XIM */
223 STRG (Rs_name, NULL, "name", "string", "client instance, icon, and title strings"), 218 STRG (Rs_name, NULL, "name", "string", "client instance, icon, and title strings"),
224 STRG (Rs_title, "title", "title", "string", "title name for window"), 219 STRG (Rs_title, "title", "title", "string", "title name for window"),
225 STRG (Rs_title, NULL, "T", NULL, NULL), /* short form */ 220 STRG (Rs_title, NULL, "T", NULL, NULL), /* short form */
226 STRG (Rs_iconName, "iconName", "n", "string", "icon name for window"), 221 STRG (Rs_iconName, "iconName", "n", "string", "icon name for window"),
227 STRG (Rs_saveLines, "saveLines", "sl", "number", "number of scrolled lines to save"), 222 STRG (Rs_saveLines, "saveLines", "sl", "number", "number of scrolled lines to save"),
228#if ENABLE_XEMBED 223#if ENABLE_XEMBED
229 STRG (Rs_embed, NULL, "embed", "windowid", "window id to embed terminal in"), 224 STRG (Rs_embed, NULL, "embed", "windowid", "window id to embed terminal in"),
230#endif 225#endif
226#if XFT
227 BOOL (Rs_buffered, "buffered", NULL, Opt_buffered, 0, NULL),
228#endif
231#if ENABLE_FRILLS 229#if ENABLE_FRILLS
230 STRG (Rs_depth, "depth", "depth", "number", "depth of visual to request"),
231 STRG (Rs_visual, "visual", "visual", "number", "visual id to request"),
232 RSTRG (Rs_transient_for, "transient-for", "windowid"),
233 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"), 234 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"), 235 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"), 236 STRG (Rs_ext_bwidth, "externalBorder", "w", "number", "external border in pixels"),
235 STRG (Rs_ext_bwidth, NULL, "bw", NULL, NULL), 237 STRG (Rs_ext_bwidth, NULL, "bw", NULL, NULL),
236 STRG (Rs_ext_bwidth, NULL, "borderwidth", NULL, NULL), 238 STRG (Rs_ext_bwidth, NULL, "borderwidth", NULL, NULL),
237 STRG (Rs_int_bwidth, "internalBorder", "b", "number", "internal border in pixels"), 239 STRG (Rs_int_bwidth, "internalBorder", "b", "number", "internal border in pixels"),
238 BOOL (Rs_borderLess, "borderLess", "bl", Opt_borderLess, "borderless window"), 240 BOOL (Rs_borderLess, "borderLess", "bl", Opt_borderLess, 0, "borderless window"),
239 STRG (Rs_lineSpace, "lineSpace", "lsp", "number", "number of extra pixels between rows"), 241 STRG (Rs_lineSpace, "lineSpace", "lsp", "number", "number of extra pixels between rows"),
242 STRG (Rs_letterSpace, "letterSpace", "letsp", "number", "letter spacing adjustment"),
243#endif
244#ifdef BUILTIN_GLYPHS
245 BOOL (Rs_skipBuiltinGlyphs, "skipBuiltinGlyphs", "sbg", Opt_skipBuiltinGlyphs, 0, "do not use internal glyphs"),
240#endif 246#endif
241#ifdef POINTER_BLANK 247#ifdef POINTER_BLANK
242 RSTRG (Rs_pointerBlankDelay, "pointerBlankDelay", "number"), 248 RSTRG (Rs_pointerBlankDelay, "pointerBlankDelay", "number"),
243#endif 249#endif
244#ifndef NO_BACKSPACE_KEY 250#ifndef NO_BACKSPACE_KEY
245 RSTRG (Rs_backspace_key, "backspacekey", "string"), 251 RSTRG (Rs_backspace_key, "backspacekey", "string"),
246#endif 252#endif
247#ifndef NO_DELETE_KEY 253#ifndef NO_DELETE_KEY
248 RSTRG (Rs_delete_key, "deletekey", "string"), 254 RSTRG (Rs_delete_key, "deletekey", "string"),
249#endif 255#endif
250 RSTRG (Rs_selectstyle, "selectstyle", "mode"),
251#ifdef PRINTPIPE 256#ifdef PRINTPIPE
252 RSTRG (Rs_print_pipe, "print-pipe", "string"), 257 RSTRG (Rs_print_pipe, "print-pipe", "string"),
253#endif 258#endif
254 STRG (Rs_modifier, "modifier", "mod", "modifier", "meta modifier = alt|meta|hyper|super|mod1|...|mod5"), 259 STRG (Rs_modifier, "modifier", "mod", "modifier", "meta modifier = alt|meta|hyper|super|mod1|...|mod5"),
255#ifdef CUTCHAR_RESOURCE
256 RSTRG (Rs_cutchars, "cutchars", "string"), 260 RSTRG (Rs_cutchars, "cutchars", "string"),
257#endif /* CUTCHAR_RESOURCE */
258 RSTRG (Rs_answerbackstring, "answerbackString", "string"), 261 RSTRG (Rs_answerbackstring, "answerbackString", "string"),
259#ifndef NO_SECONDARY_SCREEN 262#ifndef NO_SECONDARY_SCREEN
260 BOOL (Rs_secondaryScreen, "secondaryScreen", "ssc", Opt_secondaryScreen, "enable secondary screen"), 263 BOOL (Rs_secondaryScreen, "secondaryScreen", "ssc", Opt_secondaryScreen, 0, "enable secondary screen"),
261 BOOL (Rs_secondaryScroll, "secondaryScroll", "ssr", Opt_secondaryScroll, "enable secondary screen scroll"), 264 BOOL (Rs_secondaryScroll, "secondaryScroll", "ssr", Opt_secondaryScroll, 0, "enable secondary screen scroll"),
262#endif 265#endif
263#if 0 && TODO 266#if ENABLE_PERL
264#if !defined(NO_RESOURCES) && defined(USE_XGETDEFAULT) 267 RSTRG (Rs_perl_lib, "perl-lib", "string"), //, "colon-separated directories with extension scripts"),TODO
268 RSTRG (Rs_perl_eval, "perl-eval", "perl-eval"), // "string", "code to be evaluated after all extensions have been loaded"),TODO
269 RSTRG (Rs_perl_ext_1, "perl-ext-common", "string"), //, "colon-separated list of perl extensions to enable"),TODO
270 STRG (Rs_perl_ext_2, "perl-ext", "pe", "string", "colon-separated list of perl extensions to enable for this instance"),
271#endif
272#if ISO_14755
273 BOOL (Rs_iso14755, "iso14755", NULL, Opt_iso14755, 0, NULL),
274 BOOL (Rs_iso14755_52, "iso14755_52", NULL, Opt_iso14755_52, 0, NULL),
275#endif
276#ifndef NO_RESOURCES
265 INFO ("xrm", "string", "X resource"), 277 RINFO ("xrm", "string"),
266#endif 278#endif
279#ifdef KEYSYM_RESOURCE
280 RINFO ("keysym.sym", "keysym"),
267#endif 281#endif
268 INFO ("e", "command arg ...", "command to execute") 282 INFO ("e", "command arg ...", "command to execute")
269 }; 283 };
270 284
271#undef INFO 285#undef INFO
286#undef RINFO
272#undef STRG 287#undef STRG
273#undef RSTRG 288#undef RSTRG
274#undef SWCH 289#undef SWCH
275#undef BOOL 290#undef BOOL
276/*}}} */
277 291
278static const char releasestring[] = "rxvt-unicode (" RXVTNAME ") v" VERSION " - released: " DATE "\n"; 292static const char releasestring[] = "rxvt-unicode (" RXVTNAME ") v" VERSION " - released: " DATE "\n";
279static const char optionsstring[] = "options: " 293static const char optionsstring[] = "options: "
294#if ENABLE_PERL
295 "perl,"
296#endif
280#if XFT 297#if XFT
281 "xft," 298 "xft,"
282#endif 299#endif
283#if ENABLE_STYLES 300#if ENABLE_STYLES
284 "styles," 301 "styles,"
… …
313#endif 330#endif
314 "," 331 ","
315#if OFF_FOCUS_FADING 332#if OFF_FOCUS_FADING
316 "fade," 333 "fade,"
317#endif 334#endif
318#if defined(XPM_BACKGROUND)
319 "XPM,"
320#endif
321#if defined(TRANSPARENT) 335#if defined(ENABLE_TRANSPARENCY)
322 "transparent," 336 "transparent,"
323#endif
324#if TINTING
325 "tint," 337 "tint,"
326#endif 338#endif
327#if defined(UTMP_SUPPORT) 339#if HAVE_PIXBUF
328 "utmp," 340 "pixbuf,"
329#endif
330#if defined(MENUBAR)
331 "menubar,"
332#endif 341#endif
333#if defined(USE_XIM) 342#if defined(USE_XIM)
334 "XIM," 343 "XIM,"
335#endif 344#endif
336 "scrollbars="
337#if !defined(HAVE_SCROLLBARS)
338 "NONE"
339#else
340# if defined(PLAIN_SCROLLBAR)
341 "plain"
342# if defined(RXVT_SCROLLBAR) || defined(NEXT_SCROLLBAR) || defined(XTERM_SCROLLBAR)
343 "+"
344# endif
345# endif
346# if defined(RXVT_SCROLLBAR)
347 "rxvt"
348# if defined(NEXT_SCROLLBAR) || defined(XTERM_SCROLLBAR)
349 "+"
350# endif
351# endif
352# if defined(NEXT_SCROLLBAR)
353 "NeXT"
354# if defined(XTERM_SCROLLBAR)
355 "+"
356# endif
357# endif
358# if defined(XTERM_SCROLLBAR)
359 "xterm"
360# endif
361#endif
362 ","
363#if defined(NO_BACKSPACE_KEY) 345#if defined(NO_BACKSPACE_KEY)
364 "no_backspace," 346 "no_backspace,"
365#endif 347#endif
366#if defined(NO_DELETE_KEY) 348#if defined(NO_DELETE_KEY)
367 "no_delete," 349 "no_delete,"
368#endif 350#endif
369#if EIGHT_BIT_CONTROLS 351#if EIGHT_BIT_CONTROLS
370 "8bitctrls," 352 "8bitctrls,"
371#endif 353#endif
372#if !defined(NO_STRINGS)
373 "strings,"
374#endif
375#if defined(ENABLE_FRILLS) 354#if defined(ENABLE_FRILLS)
376 "frills," 355 "frills,"
377#endif 356#endif
378#if defined(PREFER_24BIT)
379 "24bit,"
380#endif
381#if defined(SELECTION_SCROLLING) 357#if defined(SELECTION_SCROLLING)
382 "selectionscrolling," 358 "selectionscrolling,"
383#endif 359#endif
384#if MOUSE_WHEEL 360#if MOUSE_WHEEL
385 "wheel," 361 "wheel,"
… …
395#endif 371#endif
396#if defined(POINTER_BLANK) 372#if defined(POINTER_BLANK)
397 "pointerBlank," 373 "pointerBlank,"
398#endif 374#endif
399#if defined(NO_RESOURCES) 375#if defined(NO_RESOURCES)
400 "NoResources" 376 "NoResources,"
401#else
402# if defined(USE_XGETDEFAULT)
403 "XGetDefaults"
404# else
405 ".Xdefaults"
406# endif 377#endif
378 "scrollbars=plain"
379#if defined(RXVT_SCROLLBAR)
380 "+rxvt"
381#endif
382#if defined(NEXT_SCROLLBAR)
383 "+NeXT"
384#endif
385#if defined(XTERM_SCROLLBAR)
386 "+xterm"
407#endif 387#endif
408 "\nUsage: "; /* Usage */ 388 "\nUsage: "; /* Usage */
409 389
410#define INDENT 18 390#define INDENT 28
391
392const char rxvt_term::resval_undef [] = "<undef>";
393const char rxvt_term::resval_on [] = "on";
394const char rxvt_term::resval_off [] = "off";
411 395
412/*{{{ usage: */ 396/*{{{ usage: */
413/*----------------------------------------------------------------------*/ 397/*----------------------------------------------------------------------*/
414static void 398void
415rxvt_usage (int type) 399rxvt_term::rxvt_usage (int type)
416{ 400{
417 unsigned int i, col; 401 unsigned int i, col;
418 402
419 rxvt_log ("%s%s%s", releasestring, optionsstring, RESNAME); 403 rxvt_log ("%s%s%s", releasestring, optionsstring, RESNAME);
420 404
421 switch (type) 405 switch (type)
422 { 406 {
423 case 0: /* brief listing */ 407 case 0: /* brief listing */
424 rxvt_log (" [-help] [--help]\n"); 408 rxvt_log (" [-help] [--help]\n");
425 409
426 for (col = 1, i = 0; i < optList_size; i++) 410 for (col = 1, i = 0; i < ecb_array_length (optList); i++)
427 if (optList[i].desc != NULL) 411 if (optList[i].desc != NULL)
428 { 412 {
429 int len = 0; 413 int len = 0;
430 414
431 if (!optList_isBool (i)) 415 if (optList[i].arg)
416 len = strlen (optList[i].arg) + 1;
417
418 assert (optList[i].opt != NULL);
419 len += 4 + strlen (optList[i].opt) + (optList_isBool (i) ? 2 : 0);
420 col += len;
421
422 if (col > 79)
432 { 423 {
433 len = optList_strlen (i);
434 if (len > 0)
435 len++; /* account for space */
436 }
437#ifdef DEBUG_STRICT
438 assert (optList[i].opt != NULL);
439#endif
440 len += 4 + strlen (optList[i].opt) + (optList_isBool (i) ? 2: 0);
441 col += len;
442 if (col > 79)
443 { /* assume regular width */ 424 /* assume regular width */
444 rxvt_log ("\n"); 425 rxvt_log ("\n");
445 col = 1 + len; 426 col = 1 + len;
446 } 427 }
447 428
448 rxvt_log (" [-%s%s", (optList_isBool (i) ? "/+" : ""), optList[i].opt); 429 rxvt_log (" [-%s%s", (optList_isBool (i) ? "/+" : ""), optList[i].opt);
430
449 if (optList_strlen (i)) 431 if (optList[i].arg)
450 rxvt_log (" %s]", optList[i].arg); 432 rxvt_log (" %s]", optList[i].arg);
451 else 433 else
452 rxvt_log ("]"); 434 rxvt_log ("]");
453 } 435 }
454 break; 436 break;
455 437
456 case 1: /* full command-line listing */ 438 case 1: /* full command-line listing */
457 rxvt_log (" [options] [-e command args]\n\nwhere options include:\n"); 439 rxvt_log (" [options] [-e command args]\n\nwhere options include:\n");
458 440
459 for (i = 0; i < optList_size; i++) 441 for (i = 0; i < ecb_array_length (optList); i++)
460 if (optList[i].desc != NULL) 442 if (optList[i].desc != NULL)
461 { 443 {
462#ifdef DEBUG_STRICT
463 assert (optList[i].opt != NULL); 444 assert (optList[i].opt != NULL);
464#endif
465 rxvt_log (" %s%s %-*s%s%s\n", 445 rxvt_log (" %s%s %-*s%s%s\n",
466 (optList_isBool (i) ? "-/+" : "-"), optList[i].opt, 446 (optList_isBool (i) ? "-/+" : "-"), optList[i].opt,
467 (INDENT - strlen (optList[i].opt) 447 (INDENT - strlen (optList[i].opt)
468 + (optList_isBool (i) ? 0 : 2)), 448 + (optList_isBool (i) ? 0 : 2)),
469 (optList[i].arg ? optList[i].arg : ""), 449 (optList[i].arg ? optList[i].arg : ""),
470 (optList_isBool (i) ? "turn on/off " : ""), 450 (optList_isBool (i) ? "turn on/off " : ""),
471 optList[i].desc); 451 optList[i].desc);
472 } 452 }
453
454#if ENABLE_PERL
455 rxvt_perl.init (this);
456 rxvt_perl.usage (this, 1);
457#endif
458
473 rxvt_log ("\n --help to list long-options"); 459 rxvt_log ("\n --help to list long-options");
474 break; 460 break;
475 461
476 case 2: /* full resource listing */ 462 case 2: /* full resource listing */
477 rxvt_log (" [options] [-e command args]\n\n" 463 rxvt_log (" [options] [-e command args]\n\n"
478 "where resources (long-options) include:\n"); 464 "where resources (long-options) include:\n");
479 465
480 for (i = 0; i < optList_size; i++) 466 for (i = 0; i < ecb_array_length (optList); i++)
481 if (optList[i].kw != NULL) 467 if (optList[i].kw != NULL)
482 rxvt_log (" %s: %*s%s\n", 468 rxvt_log (" %s: %*s%s\n",
483 optList[i].kw, 469 optList[i].kw,
484 (INDENT - strlen (optList[i].kw)), "", /* XXX */ 470 (INDENT + 2 - strlen (optList[i].kw)), "", /* XXX */
485 (optList_isBool (i) ? "boolean" : optList[i].arg)); 471 (optList_isBool (i) ? "boolean" : optList[i].arg));
486#ifdef KEYSYM_RESOURCE 472
487 rxvt_log (" " "keysym.sym" ": %*s%s\n", 473#if ENABLE_PERL
488 (INDENT - sizeof ("keysym.sym") + 1), "", /* XXX */ 474 rxvt_perl.init (this);
489 "keysym"); 475 rxvt_perl.usage (this, 2);
490#endif 476#endif
477
491 rxvt_log ("\n -help to list options"); 478 rxvt_log ("\n -help to list options");
492 break; 479 break;
493 } 480 }
494 481
495 rxvt_log ("\n\n"); 482 rxvt_log ("\n\n");
496 rxvt_exit_failure (); 483 rxvt_exit_failure ();
497 /* NOTREACHED */
498} 484}
499 485
500/*}}} */ 486/*}}} */
501 487
502/*{{{ get command-line options before getting resources */ 488/*{{{ get command-line options before getting resources */
503void 489const char **
504rxvt_term::get_options (int argc, const char *const *argv) 490rxvt_term::get_options (int argc, const char *const *argv)
505{ 491{
506 int i, bad_option = 0; 492 int i, bad_option = 0;
507 static const char On[3] = "ON", Off[4] = "OFF";
508 493
509 for (i = 1; i < argc; i++) 494 for (i = 1; i < argc; i++)
510 { 495 {
511 unsigned int entry, longopt = 0; 496 unsigned int entry, longopt = 0;
512 const char *flag, *opt; 497 const char *opt;
498 int flag;
513 499
514 opt = argv[i]; 500 opt = argv[i];
515#ifdef DEBUG_RESOURCES 501
516 fprintf (stderr, "argv[%d] = %s: ", i, opt);
517#endif
518 if (*opt == '-') 502 if (*opt == '-')
519 { 503 {
520 flag = On; 504 flag = 1;
505
521 if (*++opt == '-') 506 if (*++opt == '-')
522 longopt = *opt++; /* long option */ 507 longopt = *opt++; /* long option */
523 } 508 }
524 else if (*opt == '+') 509 else if (*opt == '+')
525 { 510 {
526 flag = Off; 511 flag = 0;
512
527 if (*++opt == '+') 513 if (*++opt == '+')
528 longopt = *opt++; /* long option */ 514 longopt = *opt++; /* long option */
529 } 515 }
530 else 516 else
531 { 517 {
… …
534 continue; 520 continue;
535 } 521 }
536 522
537 if (!strcmp (opt, "help")) 523 if (!strcmp (opt, "help"))
538 rxvt_usage (longopt ? 2 : 1); 524 rxvt_usage (longopt ? 2 : 1);
525
539 if (!strcmp (opt, "h")) 526 if (!strcmp (opt, "h"))
540 rxvt_usage (0); 527 rxvt_usage (0);
541 528
542 /* feature: always try to match long-options */ 529 /* feature: always try to match long-options */
543 for (entry = 0; entry < optList_size; entry++) 530 for (entry = 0; entry < ecb_array_length (optList); entry++)
544 if ((optList[entry].kw && !strcmp (opt, optList[entry].kw)) 531 if ((optList[entry].kw && !strcmp (opt, optList[entry].kw))
545 || (!longopt 532 || (!longopt
546 && optList[entry].opt && !strcmp (opt, optList[entry].opt))) 533 && optList[entry].opt && !strcmp (opt, optList[entry].opt)))
547 break; 534 break;
548 535
549 if (entry < optList_size) 536 if (entry < ecb_array_length (optList)
537 && !optList_isInfo (entry))
550 { 538 {
551 if (optList_isReverse (entry)) 539 if (optList_isReverse (entry))
552 flag = flag == On ? Off : On; 540 flag = !flag;
553 541
554 if (optList_strlen (entry)) 542 if (optList_isString (entry))
555 { 543 {
556 /* 544 /*
557 * special cases are handled in main.c:main () to allow 545 * special cases are handled in init_resources () to allow
558 * X resources to set these values before we settle for 546 * X resources to set these values before we settle for
559 * default values 547 * default values
560 */ 548 */
561 549
562 if (optList[entry].doff != -1) 550 if (optList[entry].doff != -1)
551 {
552 if (flag && i + 1 == argc)
553 rxvt_fatal ("option '%s' requires an argument, aborting.\n", argv [i]);
554
563 rs[optList[entry].doff] = flag == On && argv[i+1] 555 rs[optList[entry].doff] = flag ? argv[++i] : resval_undef;
564 ? argv[++i] : 0; 556 }
565 } 557 }
566 else 558 else
559 {
567 { /* boolean value */ 560 /* boolean value */
568#ifdef DEBUG_RESOURCES 561 set_option (optList[entry].index, flag);
569 fprintf (stderr, "boolean (%s,%s) = %s\n",
570 optList[entry].opt, optList[entry].kw, flag);
571#endif
572 if (flag == On)
573 SET_OPTION (optList[entry].flag & Optflag_mask);
574 else
575 CLR_OPTION (optList[entry].flag & Optflag_mask);
576 562
577 if (optList[entry].doff != -1) 563 if (optList[entry].doff != -1)
578 rs[optList[entry].doff] = flag; 564 rs[optList[entry].doff] = flag ? resval_on : resval_off;
579 } 565 }
580 } 566 }
567#ifndef NO_RESOURCES
568 else if (!strcmp (opt, "xrm"))
569 {
570 if (i + 1 < argc)
571 XrmPutLineResource (&option_db, argv[++i]);
572 }
573#endif
574#ifdef KEYSYM_RESOURCE
575 else if (!strncmp (opt, "keysym.", sizeof ("keysym.") - 1))
576 {
577 if (i + 1 < argc)
578 {
579 char *res = rxvt_temp_buf<char> (strlen (opt) + strlen (argv[++i]) + 6);
580 sprintf (res, "*.%s: %s\n", opt, argv[i]);
581 XrmPutLineResource (&option_db, res);
582 }
583 }
584#endif
585 else if (!strcmp (opt, "e"))
586 {
587 if (i + 1 < argc)
588 return (const char **)argv + i + 1;
589
590 rxvt_warn ("option '-e' requires an argument, aborting.\n");
591 bad_option = 1;
592 }
581 else 593 else
582#ifdef KEYSYM_RESOURCE 594 {
583 /* if (!strncmp (opt, "keysym.", sizeof ("keysym.") - 1)) */ 595#if ENABLE_PERL
584 if (rxvt_Str_match (opt, "keysym.")) 596 rxvt_perl.init (this);
597
598 if (int flags = rxvt_perl.parse_resource (this, opt, true, longopt, flag, argv [i + 1]))
585 { 599 {
586 const char *str = argv[++i]; 600 if (flags & rxvt_perl.RESOURCE_ARG)
587 601 {
588 if (str != NULL) 602 if (i + 1 == argc)
589 parse_keysym (opt + sizeof ("keysym.") - 1, str); 603 {
604 rxvt_warn ("option '%s' requires an argument.\n", argv [i]);
605 bad_option = 1;
606 }
607 else
608 ++i;
609 }
590 } 610 }
591 else 611 else
592#endif 612#endif
593 { 613 {
594 bad_option = 1;
595 rxvt_warn ("\"%s\": unknown or malformed option.\n", opt); 614 rxvt_warn ("\"%s\": unknown or malformed option.\n", opt);
615 bad_option = 1;
596 } 616 }
617 }
597 } 618 }
598 619
599 if (bad_option) 620 if (bad_option)
600 rxvt_usage (0); 621 rxvt_usage (0);
622
623 return 0;
601} 624}
602 625
603/*}}} */ 626/*}}} */
604 627
605#ifndef NO_RESOURCES 628#ifndef NO_RESOURCES
… …
610 * Define key from XrmEnumerateDatabase. 633 * Define key from XrmEnumerateDatabase.
611 * quarks will be something like 634 * quarks will be something like
612 * "rxvt" "keysym" "0xFF01" 635 * "rxvt" "keysym" "0xFF01"
613 * value will be a string 636 * value will be a string
614 */ 637 */
615/* ARGSUSED */ 638static int
616int
617rxvt_define_key (XrmDatabase *database __attribute__((unused)), 639rxvt_define_key (XrmDatabase *database ecb_unused,
618 XrmBindingList bindings __attribute__((unused)), 640 XrmBindingList bindings ecb_unused,
619 XrmQuarkList quarks, 641 XrmQuarkList quarks,
620 XrmRepresentation *type __attribute__((unused)), 642 XrmRepresentation *type ecb_unused,
621 XrmValue *value, 643 XrmValue *value,
622 XPointer closure __attribute__((unused))) 644 XPointer closure)
623{ 645{
646 rxvt_term *term = (rxvt_term *)closure;
624 int last; 647 int last;
625 648
626 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 */
627 ; 650 ;
628 651
629 last--; 652 last--;
630 GET_R->parse_keysym (XrmQuarkToString (quarks[last]), (char *)value->addr);//D//TODO 653 term->parse_keysym (XrmQuarkToString (quarks[last]), (char *)value->addr);
631 return False; 654 return False;
632} 655}
633 656
634/* 657/*
635 * look for something like this (XK_Delete) 658 * look for something like this (XK_Delete)
636 * rxvt*keysym.0xFFFF: "\177" 659 * rxvt*keysym.0xFFFF: "\177"
637 *
638 * arg will be
639 * NULL for ~/.Xdefaults and
640 * non-NULL for command-line options (need to allocate)
641 */ 660 */
642#define NEWARGLIM 500 /* `reasonable' size */
643 661
644struct keysym_vocabulary_t 662struct keysym_vocabulary_t
645{ 663{
646 const char *name; 664 const char *name;
647 unsigned short len; 665 unsigned short len;
648 unsigned short value; 666 unsigned short value;
649}; 667};
650keysym_vocabulary_t keysym_vocabulary[] = 668static const keysym_vocabulary_t keysym_vocabulary[] =
651{ 669{
652 { "ISOLevel3", 9, Level3Mask }, 670 { "ISOLevel3", 9, Level3Mask },
653 { "AppKeypad", 9, AppKeypadMask }, 671 { "AppKeypad", 9, AppKeypadMask },
654 { "Control", 7, ControlMask }, 672 { "Control", 7, ControlMask },
655 { "NumLock", 7, NumLockMask }, 673 { "NumLock", 7, NumLockMask },
… …
677}; 695};
678 696
679int 697int
680rxvt_term::parse_keysym (const char *str, const char *arg) 698rxvt_term::parse_keysym (const char *str, const char *arg)
681{ 699{
682 int n, sym; 700 int sym;
683 unsigned int state = 0; 701 unsigned int state = 0;
684 const char *pmodend = NULL; 702 const char *key = strrchr (str, '-');
685 char *newarg = NULL;
686 char newargstr[NEWARGLIM];
687 703
688 if (arg == NULL) 704 if (!key)
689 { 705 key = str;
690 if ((n = rxvt_Str_match (str, "keysym.")) == 0)
691 return 0;
692
693 str += n; /* skip `keysym.' */
694 if ((pmodend = strchr (str, ':')) < str)
695 return -1;
696 }
697 else 706 else
698 pmodend = str + strlen(str); 707 key++;
699 708
700 for (--pmodend; str < pmodend; --pmodend) 709 // string or key is empty
701 if (*pmodend == '-') 710 if (*arg == '\0' || *key == '\0')
702 break; 711 return -1;
703 712
713 // parse modifiers
704 while (str < pmodend) 714 while (str < key)
705 { 715 {
706 unsigned int i; 716 unsigned int i;
707 717
708 for (i=0; i < sizeof (keysym_vocabulary) / sizeof (keysym_vocabulary_t); ++i) 718 for (i = 0; i < ecb_array_length (keysym_vocabulary); ++i)
709 { 719 {
710 if (strncmp (str, keysym_vocabulary [i].name, keysym_vocabulary [i].len) == 0) 720 if (strncmp (str, keysym_vocabulary [i].name, keysym_vocabulary [i].len) == 0)
711 { 721 {
712 state |= keysym_vocabulary[i].value; 722 state |= keysym_vocabulary[i].value;
713 str += keysym_vocabulary[i].len; 723 str += keysym_vocabulary[i].len;
714 break; 724 break;
715 } 725 }
716 } 726 }
717 727
718 if (i >= sizeof (keysym_vocabulary) / sizeof (keysym_vocabulary_t)) 728 if (i >= ecb_array_length (keysym_vocabulary))
719 return -1; 729 return -1;
720 730
721 if (*str == '-') 731 if (*str == '-')
722 ++str; 732 ++str;
723 } 733 }
724 734
725 /* some scanf () have trouble with a 0x prefix */ 735 // convert keysym name to keysym number
726 if (str[0] == '0' && toupper (str[1]) == 'X') 736 if ((sym = XStringToKeysym (str)) == None)
727 { 737 {
728 str += 2; 738 // fallback on hexadecimal parsing
729 739 char *end;
740 sym = strtol (str, &end, 16);
730 if (arg) 741 if (*end)
731 {
732 if (sscanf (str, (strchr (str, ':') ? "%x:" : "%x"), &sym) != 1)
733 return -1;
734 }
735 else
736 {
737 if (sscanf (str, "%x:", &sym) != 1)
738 return -1;
739
740 /* cue to ':', it's there since sscanf () worked */
741 strncpy (newargstr, strchr (str, ':') + 1, NEWARGLIM - 1);
742 newargstr[NEWARGLIM - 1] = '\0';
743 newarg = newargstr;
744 }
745 }
746 else
747 {
748 /*
749 * convert keysym name to keysym number
750 */
751 strncpy (newargstr, str, NEWARGLIM - 1);
752 newargstr[NEWARGLIM - 1] = '\0';
753
754 if (arg == NULL)
755 {
756 if ((newarg = strchr (newargstr, ':')) == NULL)
757 return -1;
758
759 *newarg++ = '\0'; /* terminate keysym name */
760 }
761
762 if ((sym = XStringToKeysym (newargstr)) == None)
763 return -1; 742 return -1;
764 } 743 }
765 744
766 if (newarg == NULL) 745 wchar_t *ws = rxvt_mbstowcs (arg);
767 { 746 if (!HOOK_INVOKE ((this, HOOK_REGISTER_COMMAND, DT_INT, sym, DT_INT, state, DT_WCS_LEN, ws, wcslen (ws), DT_END)))
768 strncpy (newargstr, arg, NEWARGLIM - 1);
769 newargstr[NEWARGLIM - 1] = '\0';
770 newarg = newargstr;
771 }
772
773 rxvt_Str_trim (newarg);
774 if (*newarg == '\0' || (n = rxvt_Str_escaped (newarg)) == 0)
775 return -1;
776
777 keyboard->register_user_translation (sym, state, newarg); 747 keyboard->register_user_translation (sym, state, ws);
748
749 free (ws);
778 return 1; 750 return 1;
779} 751}
780 752
781# endif /* KEYSYM_RESOURCE */ 753# endif /* KEYSYM_RESOURCE */
754#endif /* NO_RESOURCES */
782 755
783# ifndef USE_XGETDEFAULT 756static char *
784/*{{{ rxvt_get_xdefaults () */ 757get_res (XrmDatabase database, const char *program, const char *option)
785/*
786 * the matching algorithm used for memory-save fake resources
787 */
788void
789rxvt_term::get_xdefaults (FILE *stream, const char *name)
790{ 758{
791 unsigned int len; 759 char resource[512];
792 char *str, buffer[256]; 760 char *type;
761 XrmValue result;
793 762
794 if (stream == NULL) 763 snprintf (resource, sizeof (resource), "%s.%s", program, option);
795 return; 764 XrmGetResource (database, resource, resource, &type, &result);
796 765
797 len = strlen (name); 766 return result.addr;
798 while ((str = fgets (buffer, sizeof (buffer), stream)) != NULL) 767}
768
769const char *
770rxvt_term::x_resource (const char *name)
771{
772 XrmDatabase database = XrmGetDatabase (dpy);
773
774 const char *p = get_res (database, rs[Rs_name], name);
775 const char *p0 = get_res (database, "!INVALIDPROGRAMMENAMEDONTMATCH!", name);
776
777 if (p == NULL || (p0 && strcmp (p, p0) == 0))
799 { 778 {
800 unsigned int entry, n; 779 p = get_res (database, RESCLASS, name);
801 780#ifdef RESFALLBACK
802 while (*str && isspace (*str)) 781 if (p == NULL || (p0 && strcmp (p, p0) == 0))
803 str++; /* leading whitespace */ 782 p = get_res (database, RESFALLBACK, name);
804 783#endif
805 if ((str[len] != '*' && str[len] != '.')
806 || (len && strncmp (str, name, len)))
807 continue;
808 str += (len + 1); /* skip `name*' or `name.' */
809
810# ifdef KEYSYM_RESOURCE
811 if (!parse_keysym (str, NULL))
812# endif /* KEYSYM_RESOURCE */
813 for (entry = 0; entry < optList_size; entry++)
814 {
815 const char *kw = optList[entry].kw;
816
817 if (kw == NULL)
818 continue;
819
820 n = strlen (kw);
821 if (str[n] == ':' && rxvt_Str_match (str, kw))
822 {
823 /* skip `keyword:' */
824 str += n + 1;
825 rxvt_Str_trim (str);
826 n = strlen (str);
827
828 if (n && rs[optList[entry].doff] == NULL)
829 {
830 /* not already set */
831 int s;
832 char *p = 0;
833
834 for (int o = 0;;)
835 {
836 p = (char *)rxvt_realloc (p, o + n + 1);
837 memcpy (p + o, str, n);
838 o += n;
839 p[o] = 0;
840
841 if (o == 0 || p[o - 1] != '\\') // continuation line
842 break;
843
844 o--; // eat "\"
845
846 if ((str = fgets (buffer, sizeof (buffer), stream)) == NULL)
847 break;
848
849 rxvt_Str_trim (str);
850 n = strlen (str);
851 }
852
853 rs[optList[entry].doff] = p;
854 allocated.push_back (p);
855
856 if (optList_isBool (entry))
857 {
858 s = strcasecmp (str, "true") == 0
859 || strcasecmp (str, "yes") == 0
860 || strcasecmp (str, "on") == 0
861 || strcmp (str, "1") == 0;
862
863 if (optList_isReverse (entry))
864 s = !s;
865
866 if (s)
867 SET_OPTION (optList[entry].flag & Optflag_mask);
868 else
869 CLR_OPTION (optList[entry].flag & Optflag_mask);
870 }
871 }
872
873 break;
874 }
875 }
876 } 784 }
877 785
878 rewind (stream); 786 if (p == NULL && p0)
787 p = p0;
788
789 return p;
879} 790}
880 791
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 792void
891rxvt_term::extract_resources () 793rxvt_term::extract_resources ()
892{ 794{
893 dDisp;
894
895#ifndef NO_RESOURCES 795#ifndef NO_RESOURCES
896 796 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); 797 XrmMergeDatabases (option_db, &database);
937 798 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 /* 799 /*
999 * Query resources for options that affect us 800 * Query resources for options that affect us
1000 */ 801 */
1001 for (entry = 0; entry < optList_size; entry++) 802 for (int entry = 0; entry < ecb_array_length (optList); entry++)
1002 { 803 {
1003 int s; 804 int s;
1004 char *p, *p0;
1005 const char *kw = optList[entry].kw; 805 const char *kw = optList[entry].kw;
1006 806
1007 if (kw == NULL || rs[optList[entry].doff] != NULL) 807 if (kw == NULL || rs[optList[entry].doff] != NULL)
1008 continue; /* previously set */ 808 continue; // previously set
1009 809
1010 p = XGetDefault (disp, rs[Rs_name], kw); 810 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 811
1024 if (p) 812 if (p)
1025 { 813 {
814 p = strdup (p);
815 allocated.push_back ((void *)p);
1026 rs[optList[entry].doff] = p; 816 rs[optList[entry].doff] = p;
1027 817
1028 if (optList_isBool (entry)) 818 if (optList_isBool (entry))
1029 { 819 {
1030 s = strcasecmp (p, "TRUE") == 0 820 s = strcasecmp (p, "TRUE") == 0
… …
1033 || strcasecmp (p, "1") == 0; 823 || strcasecmp (p, "1") == 0;
1034 824
1035 if (optList_isReverse (entry)) 825 if (optList_isReverse (entry))
1036 s = !s; 826 s = !s;
1037 827
1038 if (s) 828 set_option (optList[entry].index, s);
1039 SET_OPTION (optList[entry].flag & Optflag_mask);
1040 else
1041 CLR_OPTION (optList[entry].flag & Optflag_mask);
1042 } 829 }
1043 } 830 }
1044 } 831 }
832#endif /* NO_RESOURCES */
833}
1045 834
835void
836rxvt_term::extract_keysym_resources ()
837{
838#ifndef NO_RESOURCES
1046 /* 839 /*
1047 * [R5 or later]: enumerate the resource database 840 * [R5 or later]: enumerate the resource database
1048 */ 841 */
1049# ifdef KEYSYM_RESOURCE 842# ifdef KEYSYM_RESOURCE
843 XrmDatabase database = XrmGetDatabase (dpy);
844 XrmName name_prefix[3];
845 XrmClass class_prefix[3];
846
1050 name_prefix[0] = XrmStringToName (rs[Rs_name]); 847 name_prefix[0] = XrmStringToName (rs[Rs_name]);
1051 name_prefix[1] = XrmStringToName ("keysym"); 848 name_prefix[1] = XrmStringToName ("keysym");
1052 name_prefix[2] = NULLQUARK; 849 name_prefix[2] = NULLQUARK;
1053 class_prefix[0] = XrmStringToName (RESCLASS); 850 class_prefix[0] = XrmStringToName (RESCLASS);
1054 class_prefix[1] = XrmStringToName ("Keysym"); 851 class_prefix[1] = XrmStringToName ("Keysym");
1055 class_prefix[2] = NULLQUARK; 852 class_prefix[2] = NULLQUARK;
1056 /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */ 853 /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */
1057 XrmEnumerateDatabase (XrmGetDatabase (disp), name_prefix, class_prefix, 854 XrmEnumerateDatabase (database, name_prefix, class_prefix,
1058 XrmEnumOneLevel, rxvt_define_key, NULL); 855 XrmEnumOneLevel, rxvt_define_key, (XPointer)this);
1059# ifdef RESFALLBACK 856# ifdef RESFALLBACK
1060 name_prefix[0] = XrmStringToName (RESFALLBACK);
1061 name_prefix[1] = XrmStringToName ("keysym");
1062 class_prefix[0] = XrmStringToName (RESFALLBACK); 857 name_prefix[0] = class_prefix[0] = XrmStringToName (RESFALLBACK);
1063 class_prefix[1] = XrmStringToName ("Keysym");
1064 /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */ 858 /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */
1065 XrmEnumerateDatabase (XrmGetDatabase (disp), name_prefix, class_prefix, 859 XrmEnumerateDatabase (database, name_prefix, class_prefix,
1066 XrmEnumOneLevel, rxvt_define_key, NULL); 860 XrmEnumOneLevel, rxvt_define_key, (XPointer)this);
1067# endif 861# endif
1068# endif 862# endif
1069 863
1070# else /* USE_XGETDEFAULT */
1071 /* get resources the hard way, but save lots of memory */
1072 FILE *fd = NULL;
1073
1074 if (homedir)
1075 {
1076 static const char *const xnames[2] = { ".Xdefaults", ".Xresources" };
1077
1078 for (int i = 0; i < (sizeof (xnames) / sizeof (xnames [0])); i++)
1079 {
1080 snprintf (fname, sizeof (fname), "%s/%s", homedir, xnames [i]);
1081
1082 if ((fd = fopen (fname, "r")) != NULL)
1083 break;
1084 }
1085 }
1086 /*
1087 * The normal order to match resources is the following:
1088 * @ global resources (partial match, ~/.Xdefaults)
1089 * @ application file resources (XAPPLOADDIR/Rxvt)
1090 * @ class resources (~/.Xdefaults)
1091 * @ private resources (~/.Xdefaults)
1092 *
1093 * However, for the hand-rolled resources, the matching algorithm
1094 * checks if a resource string value has already been allocated
1095 * and won't overwrite it with (in this case) a less specific
1096 * resource value.
1097 *
1098 * This avoids multiple allocation. Also, when we've called this
1099 * routine command-line string options have already been applied so we
1100 * needn't to allocate for those resources.
1101 *
1102 * So, search in resources from most to least specific.
1103 *
1104 * Also, use a special sub-class so that we can use either or both of
1105 * "XTerm" and "Rxvt" as class names.
1106 */
1107
1108 get_xdefaults (fd, rs[Rs_name]);
1109 get_xdefaults (fd, RESCLASS);
1110# ifdef RESFALLBACK
1111 get_xdefaults (fd, RESFALLBACK);
1112# endif
1113
1114# if defined(XAPPLOADDIR) && defined(USE_XAPPLOADDIR)
1115 {
1116 FILE *ad = NULL;
1117
1118# if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1119 if (!*localepath || (ad = fopen (localepath, "r")) == NULL)
1120# endif
1121 ad = fopen (XAPPLOADDIR "/" RESCLASS, "r");
1122 if (ad != NULL)
1123 {
1124 get_xdefaults (ad, RESCLASS);
1125 get_xdefaults (ad, "");
1126 fclose (ad);
1127 }
1128 }
1129# endif /* XAPPLOADDIR */
1130
1131 get_xdefaults (fd, ""); /* partial match */
1132 if (fd != NULL)
1133 fclose (fd);
1134# endif /* USE_XGETDEFAULT */
1135
1136#endif /* NO_RESOURCES */ 864#endif /* NO_RESOURCES */
1137} 865}
1138 866
1139/*}}} */
1140/*----------------------- end-of-file (C source) -----------------------*/ 867/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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