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.61 by root, Mon Nov 28 19:35:04 2005 UTC vs.
Revision 1.180 by sf-exg, Sat Aug 16 10:51:23 2014 UTC

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

Diff Legend

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