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.8 by pcg, Sat Jan 31 00:20:21 2004 UTC vs.
Revision 1.25 by root, Mon Jul 26 14:57:12 2004 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines