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.2 by pcg, Mon Nov 24 17:31:28 2003 UTC vs.
Revision 1.30 by root, Fri Aug 13 03:36:57 2004 UTC

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

Diff Legend

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