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.25 by root, Mon Jul 26 14:57:12 2004 UTC vs.
Revision 1.179 by mikachu, Tue Jul 29 13:50:05 2014 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines