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.42 by root, Wed Dec 1 02:12:18 2004 UTC vs.
Revision 1.184 by sf-exg, Mon Oct 13 17:05:32 2014 UTC

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

Diff Legend

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