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

Diff Legend

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