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.12 by pcg, Sun Feb 22 08:09:38 2004 UTC vs.
Revision 1.72 by root, Fri Jan 6 05:28:55 2006 UTC

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

Diff Legend

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