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

Diff Legend

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