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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines