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.9 by pcg, Sun Feb 1 01:34:41 2004 UTC vs.
Revision 1.40 by root, Sun Aug 22 01:45:12 2004 UTC

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

Diff Legend

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