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

Diff Legend

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