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.55 by root, Mon Feb 14 18:47:54 2005 UTC vs.
Revision 1.195 by sf-exg, Tue May 25 05:11:51 2021 UTC

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

Diff Legend

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