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.5 by pcg, Thu Dec 18 00:29:29 2003 UTC vs.
Revision 1.43 by root, Wed Dec 15 00:53:23 2004 UTC

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

Diff Legend

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