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

Diff Legend

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