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.10 by pcg, Fri Feb 13 12:11:05 2004 UTC vs.
Revision 1.12 by pcg, Sun Feb 22 08:09:38 2004 UTC

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

Diff Legend

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