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.5 by pcg, Thu Dec 18 00:29:29 2003 UTC vs.
Revision 1.29 by root, Tue Aug 3 22:19:51 2004 UTC

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

Diff Legend

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