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.7 by pcg, Fri Jan 16 22:26:18 2004 UTC vs.
Revision 1.15 by pcg, Wed Mar 3 04:07:52 2004 UTC

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

Diff Legend

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