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.54 by root, Fri Feb 11 17:19:30 2005 UTC vs.
Revision 1.192 by sf-exg, Thu Jul 14 05:33:26 2016 UTC

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

Diff Legend

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