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

Diff Legend

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