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

Diff Legend

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