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.8 by pcg, Sat Jan 31 00:20:21 2004 UTC vs.
Revision 1.34 by root, Sun Aug 15 22:09:24 2004 UTC

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

Diff Legend

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