ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/xdefaults.C
(Generate patch)

Comparing rxvt-unicode/src/xdefaults.C (file contents):
Revision 1.7 by pcg, Fri Jan 16 22:26:18 2004 UTC vs.
Revision 1.11 by pcg, Fri Feb 13 12:16:21 2004 UTC

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

Diff Legend

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