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

Diff Legend

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