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.24 by pcg, Thu Apr 8 20:31:45 2004 UTC vs.
Revision 1.190 by sf-exg, Tue Oct 13 08:10:43 2015 UTC

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

Diff Legend

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