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.13 by pcg, Tue Feb 24 21:41:16 2004 UTC vs.
Revision 1.192 by sf-exg, Thu Jul 14 05:33:26 2016 UTC

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

Diff Legend

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