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.13 by pcg, Tue Feb 24 21:41:16 2004 UTC vs.
Revision 1.75 by root, Sun Jan 8 07:55:36 2006 UTC

1/*--------------------------------*-C-*---------------------------------* 1/*--------------------------------*-C-*---------------------------------*
2 * File: xdefaults.c 2 * File: xdefaults.C
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * $Id: xdefaults.C,v 1.13 2004/02/24 21:41:16 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-2006 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)
339 "XGetDefaults" 409 "XGetDefault"
340# else 410# else
341 ".Xdefaults" 411 ".Xdefaults"
342# endif 412# endif
343#endif 413#endif
344 "\nUsage: "; /* Usage */ 414 "\nUsage: "; /* Usage */
… …
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 set_option (optList[entry].flag & Optflag_mask, flag == On);
524 Options |= (optList[entry].flag);
525 else
526 Options &= ~ (optList[entry].flag);
527 579
528 if (optList[entry].doff != -1) 580 if (optList[entry].doff != -1)
529 rs[optList[entry].doff] = flag; 581 rs[optList[entry].doff] = flag;
530 } 582 }
531 } 583 }
532 else 584 else
533#ifdef KEYSYM_RESOURCE 585#ifdef KEYSYM_RESOURCE
534 /* if (!STRNCMP (opt, "keysym.", sizeof ("keysym.") - 1)) */ 586 /* if (!strncmp (opt, "keysym.", sizeof ("keysym.") - 1)) */
535 if (rxvt_Str_match (opt, "keysym.")) 587 if (rxvt_Str_match (opt, "keysym."))
536 { 588 {
537 const char *str = argv[++i]; 589 const char *str = argv[++i];
538 590
539 if (str != NULL) 591 if (str != NULL)
540 parse_keysym (opt + sizeof ("keysym.") - 1, str); 592 parse_keysym (opt + sizeof ("keysym.") - 1, str);
541 } 593 }
542 else 594 else
543#endif 595#endif
596 {
544 bad_option = 1; 597 bad_option = 1;
598 rxvt_warn ("\"%s\": unknown or malformed option.\n", opt);
599 }
545 } 600 }
546 601
547 if (bad_option) 602 if (bad_option)
548 rxvt_usage (0); 603 rxvt_usage (0);
549} 604}
… …
567 XrmQuarkList quarks, 622 XrmQuarkList quarks,
568 XrmRepresentation *type __attribute__((unused)), 623 XrmRepresentation *type __attribute__((unused)),
569 XrmValue *value, 624 XrmValue *value,
570 XPointer closure __attribute__((unused))) 625 XPointer closure __attribute__((unused)))
571{ 626{
572 int last; 627 int last;
573 628
574 for (last = 0; quarks[last] != NULLQUARK; last++) /* look for last quark in list */ 629 for (last = 0; quarks[last] != NULLQUARK; last++) /* look for last quark in list */
575 ; 630 ;
631
576 last--; 632 last--;
577 GET_R->parse_keysym (XrmQuarkToString (quarks[last]), (char *)value->addr);//D//TODO 633 GET_R->parse_keysym (XrmQuarkToString (quarks[last]), (char *)value->addr);//D//TODO
578 return False; 634 return False;
579} 635}
580 636
… …
585 * arg will be 641 * arg will be
586 * NULL for ~/.Xdefaults and 642 * NULL for ~/.Xdefaults and
587 * non-NULL for command-line options (need to allocate) 643 * non-NULL for command-line options (need to allocate)
588 */ 644 */
589#define NEWARGLIM 500 /* `reasonable' size */ 645#define NEWARGLIM 500 /* `reasonable' size */
646
647struct keysym_vocabulary_t
648{
649 const char *name;
650 unsigned short len;
651 unsigned short value;
652};
653keysym_vocabulary_t keysym_vocabulary[] =
654{
655 { "ISOLevel3", 9, Level3Mask },
656 { "AppKeypad", 9, AppKeypadMask },
657 { "Control", 7, ControlMask },
658 { "NumLock", 7, NumLockMask },
659 { "Shift", 5, ShiftMask },
660 { "Meta", 4, MetaMask },
661 { "Lock", 4, LockMask },
662 { "Mod1", 4, Mod1Mask },
663 { "Mod2", 4, Mod2Mask },
664 { "Mod3", 4, Mod3Mask },
665 { "Mod4", 4, Mod4Mask },
666 { "Mod5", 4, Mod5Mask },
667 { "I", 1, Level3Mask },
668 { "K", 1, AppKeypadMask },
669 { "C", 1, ControlMask },
670 { "N", 1, NumLockMask },
671 { "S", 1, ShiftMask },
672 { "M", 1, MetaMask },
673 { "A", 1, MetaMask },
674 { "L", 1, LockMask },
675 { "1", 1, Mod1Mask },
676 { "2", 1, Mod2Mask },
677 { "3", 1, Mod3Mask },
678 { "4", 1, Mod4Mask },
679 { "5", 1, Mod5Mask },
680};
681
590int 682int
591rxvt_term::parse_keysym (const char *str, const char *arg) 683rxvt_term::parse_keysym (const char *str, const char *arg)
592{ 684{
593 int n, sym; 685 int n, sym;
594 char *key_string, *newarg = NULL; 686 unsigned int state = 0;
687 const char *pmodend = NULL;
688 char *newarg = NULL;
595 char newargstr[NEWARGLIM]; 689 char newargstr[NEWARGLIM];
596 690
597 if (arg == NULL) 691 if (arg == NULL)
598 { 692 {
599 if ((n = rxvt_Str_match (str, "keysym.")) == 0) 693 if ((n = rxvt_Str_match (str, "keysym.")) == 0)
600 return 0; 694 return 0;
695
601 str += n; /* skip `keysym.' */ 696 str += n; /* skip `keysym.' */
697 if ((pmodend = strchr (str, ':')) < str)
698 return -1;
699 }
700 else
701 pmodend = str + strlen(str);
702
703 for (--pmodend; str < pmodend; --pmodend)
704 if (*pmodend == '-')
705 break;
706
707 while (str < pmodend)
602 } 708 {
709 unsigned int i;
710
711 for (i=0; i < sizeof (keysym_vocabulary) / sizeof (keysym_vocabulary_t); ++i)
712 {
713 if (strncmp (str, keysym_vocabulary [i].name, keysym_vocabulary [i].len) == 0)
714 {
715 state |= keysym_vocabulary[i].value;
716 str += keysym_vocabulary[i].len;
717 break;
718 }
719 }
720
721 if (i >= sizeof (keysym_vocabulary) / sizeof (keysym_vocabulary_t))
722 return -1;
723
724 if (*str == '-')
725 ++str;
726 }
727
603 /* some scanf () have trouble with a 0x prefix */ 728 /* some scanf () have trouble with a 0x prefix */
604 if (isdigit (str[0]))
605 {
606 if (str[0] == '0' && toupper (str[1]) == 'X') 729 if (str[0] == '0' && toupper (str[1]) == 'X')
730 {
607 str += 2; 731 str += 2;
732
608 if (arg) 733 if (arg)
609 { 734 {
610 if (sscanf (str, (STRCHR (str, ':') ? "%x:" : "%x"), &sym) != 1) 735 if (sscanf (str, (strchr (str, ':') ? "%x:" : "%x"), &sym) != 1)
611 return -1; 736 return -1;
612 } 737 }
613 else 738 else
614 { 739 {
615 if (sscanf (str, "%x:", &sym) != 1) 740 if (sscanf (str, "%x:", &sym) != 1)
616 return -1; 741 return -1;
617 742
618 /* cue to ':', it's there since sscanf () worked */ 743 /* cue to ':', it's there since sscanf () worked */
619 STRNCPY (newargstr, STRCHR (str, ':') + 1, NEWARGLIM - 1); 744 strncpy (newargstr, strchr (str, ':') + 1, NEWARGLIM - 1);
620 newargstr[NEWARGLIM - 1] = '\0'; 745 newargstr[NEWARGLIM - 1] = '\0';
621 newarg = newargstr; 746 newarg = newargstr;
622 } 747 }
623 } 748 }
624 else 749 else
625 { 750 {
626 /* 751 /*
627 * convert keysym name to keysym number 752 * convert keysym name to keysym number
628 */ 753 */
629 STRNCPY (newargstr, str, NEWARGLIM - 1); 754 strncpy (newargstr, str, NEWARGLIM - 1);
630 newargstr[NEWARGLIM - 1] = '\0'; 755 newargstr[NEWARGLIM - 1] = '\0';
756
631 if (arg == NULL) 757 if (arg == NULL)
632 { 758 {
633 if ((newarg = STRCHR (newargstr, ':')) == NULL) 759 if ((newarg = strchr (newargstr, ':')) == NULL)
634 return -1; 760 return -1;
761
635 *newarg++ = '\0'; /* terminate keysym name */ 762 *newarg++ = '\0'; /* terminate keysym name */
636 } 763 }
764
637 if ((sym = XStringToKeysym (newargstr)) == None) 765 if ((sym = XStringToKeysym (newargstr)) == None)
638 return -1; 766 return -1;
639 } 767 }
640 768
641 if (sym < 0xFF00 || sym > 0xFFFF) /* we only do extended keys */
642 return -1;
643 sym &= 0xFF;
644 if (Keysym_map[sym] != NULL) /* already set ? */
645 return -1;
646
647 if (newarg == NULL) 769 if (newarg == NULL)
648 { 770 {
649 STRNCPY (newargstr, arg, NEWARGLIM - 1); 771 strncpy (newargstr, arg, NEWARGLIM - 1);
650 newargstr[NEWARGLIM - 1] = '\0'; 772 newargstr[NEWARGLIM - 1] = '\0';
651 newarg = newargstr; 773 newarg = newargstr;
652 } 774 }
775
653 rxvt_Str_trim (newarg); 776 rxvt_Str_trim (newarg);
654 if (*newarg == '\0' || (n = rxvt_Str_escaped (newarg)) == 0) 777 if (*newarg == '\0' || (n = rxvt_Str_escaped (newarg)) == 0)
655 return -1; 778 return -1;
656 MIN_IT (n, 255);
657 key_string = (char *)rxvt_malloc ((n + 1) * sizeof (char));
658 779
659 key_string[0] = n; 780 keyboard->register_user_translation (sym, state, newarg);
660 STRNCPY (key_string + 1, newarg, n);
661 Keysym_map[sym] = (unsigned char *)key_string;
662
663 return 1; 781 return 1;
664} 782}
665 783
666# endif /* KEYSYM_RESOURCE */ 784# endif /* KEYSYM_RESOURCE */
667 785
… …
671 * the matching algorithm used for memory-save fake resources 789 * the matching algorithm used for memory-save fake resources
672 */ 790 */
673void 791void
674rxvt_term::get_xdefaults (FILE *stream, const char *name) 792rxvt_term::get_xdefaults (FILE *stream, const char *name)
675{ 793{
676 unsigned int len; 794 unsigned int len;
677 char *str, buffer[256]; 795 char *str, buffer[256];
678 796
679 if (stream == NULL) 797 if (stream == NULL)
680 return; 798 return;
681 len = STRLEN (name); 799
800 len = strlen (name);
682 while ((str = fgets (buffer, sizeof (buffer), stream)) != NULL) 801 while ((str = fgets (buffer, sizeof (buffer), stream)) != NULL)
683 { 802 {
684 unsigned int entry, n; 803 unsigned int entry, n;
685 804
686 while (*str && isspace (*str)) 805 while (*str && isspace (*str))
687 str++; /* leading whitespace */ 806 str++; /* leading whitespace */
688 807
689 if ((str[len] != '*' && str[len] != '.') 808 if ((str[len] != '*' && str[len] != '.')
690 || (len && STRNCMP (str, name, len))) 809 || (len && strncmp (str, name, len)))
691 continue; 810 continue;
692 str += (len + 1); /* skip `name*' or `name.' */ 811 str += (len + 1); /* skip `name*' or `name.' */
693 812
694# ifdef KEYSYM_RESOURCE 813# ifdef KEYSYM_RESOURCE
695 if (!parse_keysym (str, NULL)) 814 if (!parse_keysym (str, NULL))
696# endif /* KEYSYM_RESOURCE */ 815# endif /* KEYSYM_RESOURCE */
697 for (entry = 0; entry < optList_size (); entry++) 816 for (entry = 0; entry < optList_size; entry++)
698 { 817 {
699 const char *kw = optList[entry].kw; 818 const char *kw = optList[entry].kw;
700 819
701 if (kw == NULL) 820 if (kw == NULL)
702 continue; 821 continue;
822
703 n = STRLEN (kw); 823 n = strlen (kw);
704 if (str[n] == ':' && rxvt_Str_match (str, kw)) 824 if (str[n] == ':' && rxvt_Str_match (str, kw))
705 { 825 {
706 /* skip `keyword:' */ 826 /* skip `keyword:' */
707 str += (n + 1); 827 str += n + 1;
708 rxvt_Str_trim (str); 828 rxvt_Str_trim (str);
709 n = STRLEN (str); 829 n = strlen (str);
830
710 if (n && rs[optList[entry].doff] == NULL) 831 if (n && rs[optList[entry].doff] == NULL)
711 { 832 {
712 /* not already set */ 833 /* not already set */
713 int s; 834 int s;
714 char *p = (char *)rxvt_malloc ((n + 1) * sizeof (char)); 835 char *p = 0;
715 836
716 STRCPY (p, str); 837 for (int o = 0;;)
838 {
839 p = (char *)rxvt_realloc (p, o + n + 1);
840 memcpy (p + o, str, n);
841 o += n;
842 p[o] = 0;
843
844 if (o == 0 || p[o - 1] != '\\') // continuation line
845 break;
846
847 o--; // eat "\"
848
849 if ((str = fgets (buffer, sizeof (buffer), stream)) == NULL)
850 break;
851
852 rxvt_Str_trim (str);
853 n = strlen (str);
854 }
855
717 rs[optList[entry].doff] = p; 856 rs[optList[entry].doff] = p;
857 allocated.push_back (p);
858
718 if (optList_isBool (entry)) 859 if (optList_isBool (entry))
719 { 860 {
720 s = STRCASECMP (str, "TRUE") == 0 861 s = strcasecmp (str, "true") == 0
721 || STRCASECMP (str, "YES") == 0 862 || strcasecmp (str, "yes") == 0
722 || STRCASECMP (str, "ON") == 0 863 || strcasecmp (str, "on") == 0
723 || STRCASECMP (str, "1") == 0; 864 || strcmp (str, "1") == 0;
865
724 if (optList_isReverse (entry)) 866 if (optList_isReverse (entry))
725 s = !s; 867 s = !s;
726 if (s) 868
727 Options |= (optList[entry].flag); 869 set_option (optList[entry].flag & Optflag_mask, s);
728 else
729 Options &= ~ (optList[entry].flag);
730 } 870 }
731 } 871 }
872
732 break; 873 break;
733 } 874 }
734 } 875 }
735 } 876 }
877
736 rewind (stream); 878 rewind (stream);
737} 879}
738 880
739/*}}} */ 881/*}}} */
740# endif /* ! USE_XGETDEFAULT */ 882# endif /* ! USE_XGETDEFAULT */
741#endif /* NO_RESOURCES */ 883#endif /* NO_RESOURCES */
884
885#ifdef USE_XGETDEFAULT
886char *get_res (XrmDatabase database, const char *program, const char *option)
887{
888 char resource[512];
889 char *type;
890 XrmValue result;
891
892 snprintf (resource, sizeof (resource), "%s.%s", program, option);
893 XrmGetResource (database, resource, resource, &type, &result);
894
895 return result.addr;
896}
897#endif
742 898
743/*{{{ read the resources files */ 899/*{{{ read the resources files */
744/* 900/*
745 * using XGetDefault () or the hand-rolled replacement 901 * using XGetDefault () or the hand-rolled replacement
746 */ 902 */
747/* ARGSUSED */ 903/* ARGSUSED */
748void 904void
749rxvt_term::extract_resources (Display *display __attribute__ ((unused)), const char *name) 905rxvt_term::extract_resources ()
750{ 906{
907 dDisp;
908
751#ifndef NO_RESOURCES 909#ifndef NO_RESOURCES
910
911 char *homedir = (char *)getenv ("HOME");
912 char fname[1024];
752 913
753# if defined XAPPLOADDIR 914# if defined XAPPLOADDIR
754# if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE) 915# if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
755 /* Compute the path of the possibly available localized Rxvt file */ 916 /* Compute the path of the possibly available localized Rxvt file */
756 char *localepath = NULL; 917 char localepath[1024];
757 918
758 if (locale != NULL) 919 if (locale)
759 { /* XXX: must limit length of string */ 920 snprintf (localepath, sizeof (localepath), XAPPLOADDIRLOCALE "/" RESCLASS, locale);
760 localepath = (char *)rxvt_malloc (256); 921 else
761 sprintf (localepath, XAPPLOADDIRLOCALE "/" APL_SUBCLASS, 922 localepath[0] = 0;
762 (int) (258 - sizeof (XAPPLOADDIRLOCALE) - sizeof (APL_SUBCLASS)),
763 locale); /* 258 = 255 + 4 (-.*s) - 1 (/) */
764 }
765
766 {
767# endif 923# endif
768# endif 924# endif
769 925
770# ifdef USE_XGETDEFAULT 926# ifdef USE_XGETDEFAULT
771 /* 927 /*
772 * get resources using the X library function 928 * get resources using the X library function
773 */ 929 */
774 int entry; 930 int entry;
775 931
776# ifdef XrmEnumOneLevel
777 int i;
778 char *displayResource, *xe; 932 char *displayResource, *xe;
779 XrmName name_prefix[3]; 933 XrmName name_prefix[3];
780 XrmClass class_prefix[3]; 934 XrmClass class_prefix[3];
781 XrmDatabase database, rdb1; 935 XrmDatabase database, rdb1;
782 char fname[1024];
783 936
784 XrmInitialize ();
785 database = NULL; 937 database = NULL;
786 938
939 // for ordering, see for example http://www.faqs.org/faqs/Xt-FAQ/ Subject: 20
940
941 // 6. System wide per application default file.
942 /* Add in Rxvt file */
943# if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
944 if (*localepath
945 && ((rdb1 = XrmGetFileDatabase (localepath))
946 || (rdb1 = XrmGetFileDatabase (XAPPLOADDIR "/" RESCLASS))))
947# endif
948 XrmMergeDatabases (rdb1, &database);
949
950 /* Add in $XAPPLRESDIR/Rxvt only; not bothering with XUSERFILESEARCHPATH */
951 if ((xe = (char *)getenv ("XAPPLRESDIR")))
952 {
953 snprintf (fname, sizeof (fname), "%s/%s", xe, RESCLASS);
954
955 if ((rdb1 = XrmGetFileDatabase (fname)))
956 XrmMergeDatabases (rdb1, &database);
957 }
958
959 // 5. User's per application default file.
960 // none
961
962 // 4. User's defaults file.
787 /* Get any Xserver defaults */ 963 /* Get any Xserver defaults */
788
789 displayResource = XResourceManagerString (display); 964 displayResource = XResourceManagerString (disp);
790 if (displayResource != NULL) 965 if (displayResource != NULL)
966 {
791 database = XrmGetStringDatabase (displayResource); 967 if ((rdb1 = XrmGetStringDatabase (displayResource)))
792 968 XrmMergeDatabases (rdb1, &database);
793# ifdef HAVE_EXTRA_XRESOURCE_FILES
794 /* Add in ~/.Xdefaults or ~/.Xresources */
795 { 969 }
796 char *ptr; 970 else if (homedir)
971 {
972 snprintf (fname, sizeof (fname), "%s/.Xdefaults", homedir);
797 973
798 if ((ptr = (char *)getenv ("HOME")) == NULL) 974 if ((rdb1 = XrmGetFileDatabase (fname)))
799 ptr = "."; 975 XrmMergeDatabases (rdb1, &database);
976 }
800 977
801 for (i = 0; i < (sizeof (xnames) / sizeof (xnames[0])); i++) 978 /* Get screen specific resources */
979 displayResource = XScreenResourceString (ScreenOfDisplay (disp, display->screen));
980 if (displayResource != NULL)
981 {
982 if ((rdb1 = XrmGetStringDatabase (displayResource)))
983 /* Merge with screen-independent resources */
984 XrmMergeDatabases (rdb1, &database);
985
986 XFree (displayResource);
987 }
988
989 // 3. User's per host defaults file
990 /* Add in XENVIRONMENT file */
991 if ((xe = (char *)getenv ("XENVIRONMENT"))
992 && (rdb1 = XrmGetFileDatabase (xe)))
993 XrmMergeDatabases (rdb1, &database);
994 else if (homedir)
995 {
996 struct utsname un;
997
998 if (!uname (&un))
802 { 999 {
803 sprintf (fname, "%-.*s/%s", sizeof (fname) - STRLEN (xnames[i]) - 2, 1000 snprintf (fname, sizeof (fname), "%s/.Xdefaults-%s", homedir, un.nodename);
804 ptr, xnames[i]); 1001
805 if ((rdb1 = XrmGetFileDatabase (fname)) != NULL) 1002 if ((rdb1 = XrmGetFileDatabase (fname)))
1003 XrmMergeDatabases (rdb1, &database);
1004 }
1005 }
1006
1007 xrmdatabase = database;
1008
1009 /*
1010 * Query resources for options that affect us
1011 */
1012 for (entry = 0; entry < optList_size; entry++)
1013 {
1014 int s;
1015 char *p, *p0;
1016 const char *kw = optList[entry].kw;
1017
1018 if (kw == NULL || rs[optList[entry].doff] != NULL)
1019 continue; /* previously set */
1020
1021 p = get_res (database, rs[Rs_name], kw);
1022 p0 = get_res (database, "!INVALIDPROGRAMMENAMEDONTMATCH!", kw);
1023 if (p == NULL || (p0 && strcmp (p, p0) == 0))
1024 {
1025 p = get_res (database, RESCLASS, kw);
1026#ifdef RESFALLBACK
1027 if (p == NULL || (p0 && strcmp (p, p0) == 0))
1028 p = get_res (database, RESFALLBACK, kw);
1029#endif
1030 }
1031
1032 if (p == NULL && p0)
1033 p = p0;
1034
1035 if (p)
1036 {
1037 rs[optList[entry].doff] = p;
1038
1039 if (optList_isBool (entry))
806 { 1040 {
807 XrmMergeDatabases (rdb1, &database); 1041 s = strcasecmp (p, "TRUE") == 0
808# ifndef HAVE_BOTH_XRESOURCE_FILES 1042 || strcasecmp (p, "YES") == 0
809 break; 1043 || strcasecmp (p, "ON") == 0
810# endif 1044 || strcasecmp (p, "1") == 0;
811 1045
1046 if (optList_isReverse (entry))
1047 s = !s;
1048
1049 set_option (optList[entry].flag & Optflag_mask, s);
812 } 1050 }
813 } 1051 }
814 } 1052 }
815# endif
816 1053
817 /* Add in XENVIRONMENT file */
818
819 if ((xe = (char *)getenv ("XENVIRONMENT")) != NULL
820 && (rdb1 = XrmGetFileDatabase (xe)) != NULL)
821 XrmMergeDatabases (rdb1, &database);
822
823 /* Add in Rxvt file */
824# if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
825 if (localepath == NULL || (rdb1 = XrmGetFileDatabase (localepath)) == NULL)
826# endif
827 rdb1 = XrmGetFileDatabase (XAPPLOADDIR "/" APL_SUBCLASS);
828 if (rdb1 != NULL)
829 XrmMergeDatabases (rdb1, &database);
830
831 /* Add in $XAPPLRESDIR/Rxvt only; not bothering with XUSERFILESEARCHPATH */
832 if ((xe = (char *)getenv ("XAPPLRESDIR")) != NULL)
833 {
834 sprintf (fname, "%-.*s/" APL_SUBCLASS, sizeof (fname)
835 - sizeof (APL_SUBCLASS) - 2, xe);
836 if ((rdb1 = XrmGetFileDatabase (fname)) != NULL)
837 XrmMergeDatabases (rdb1, &database);
838 }
839
840 XrmSetDatabase (display, database);
841# endif
842
843 /* 1054 /*
844 * Query resources for options that affect us
845 */
846 for (entry = 0; entry < optList_size (); entry++)
847 {
848 int s;
849 char *p, *p0;
850 const char *kw = optList[entry].kw;
851
852 if (kw == NULL || rs[optList[entry].doff] != NULL)
853 continue; /* previously set */
854
855 p = XGetDefault (display, name, kw);
856 p0 = XGetDefault (display, "!INVALIDPROGRAMMENAMEDONTMATCH!", kw);
857 if (p == NULL || (p0 && STRCMP (p, p0) == 0))
858 {
859 p = XGetDefault (display, APL_SUBCLASS, kw);
860 if (p == NULL || (p0 && STRCMP (p, p0) == 0))
861 p = XGetDefault (display, APL_CLASS, kw);
862 }
863 if (p == NULL && p0)
864 p = p0;
865 if (p)
866 {
867 rs[optList[entry].doff] = p;
868
869 if (optList_isBool (entry))
870 {
871 s = STRCASECMP (p, "TRUE") == 0
872 || STRCASECMP (p, "YES") == 0
873 || STRCASECMP (p, "ON") == 0
874 || STRCASECMP (p, "1") == 0;
875 if (optList_isReverse (entry))
876 s = !s;
877 if (s)
878 Options |= (optList[entry].flag);
879 else
880 Options &= ~ (optList[entry].flag);
881 }
882 }
883 }
884
885 /*
886 * [R5 or later]: enumerate the resource database 1055 * [R5 or later]: enumerate the resource database
887 */ 1056 */
888# ifdef XrmEnumOneLevel
889# ifdef KEYSYM_RESOURCE 1057# ifdef KEYSYM_RESOURCE
890 name_prefix[0] = XrmStringToName (name); 1058 name_prefix[0] = XrmStringToName (rs[Rs_name]);
891 name_prefix[1] = XrmStringToName ("keysym"); 1059 name_prefix[1] = XrmStringToName ("keysym");
892 name_prefix[2] = NULLQUARK; 1060 name_prefix[2] = NULLQUARK;
893 class_prefix[0] = XrmStringToName (APL_SUBCLASS); 1061 class_prefix[0] = XrmStringToName (RESCLASS);
894 class_prefix[1] = XrmStringToName ("Keysym"); 1062 class_prefix[1] = XrmStringToName ("Keysym");
895 class_prefix[2] = NULLQUARK; 1063 class_prefix[2] = NULLQUARK;
896 /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */ 1064 /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */
897 XrmEnumerateDatabase (XrmGetDatabase (display), name_prefix, class_prefix, 1065 XrmEnumerateDatabase (database, name_prefix, class_prefix,
898 XrmEnumOneLevel, rxvt_define_key, NULL); 1066 XrmEnumOneLevel, rxvt_define_key, NULL);
1067# ifdef RESFALLBACK
899 name_prefix[0] = XrmStringToName (APL_CLASS); 1068 name_prefix[0] = XrmStringToName (RESFALLBACK);
900 name_prefix[1] = XrmStringToName ("keysym"); 1069 name_prefix[1] = XrmStringToName ("keysym");
901 class_prefix[0] = XrmStringToName (APL_CLASS); 1070 class_prefix[0] = XrmStringToName (RESFALLBACK);
902 class_prefix[1] = XrmStringToName ("Keysym"); 1071 class_prefix[1] = XrmStringToName ("Keysym");
903 /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */ 1072 /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */
904 XrmEnumerateDatabase (XrmGetDatabase (display), name_prefix, class_prefix, 1073 XrmEnumerateDatabase (database, name_prefix, class_prefix,
905 XrmEnumOneLevel, rxvt_define_key, NULL); 1074 XrmEnumOneLevel, rxvt_define_key, NULL);
906# endif 1075# endif
907# endif 1076# endif
908 1077
909# else /* USE_XGETDEFAULT */ 1078# else /* USE_XGETDEFAULT */
910 /* get resources the hard way, but save lots of memory */ 1079 /* get resources the hard way, but save lots of memory */
1080 FILE *fd = NULL;
1081
1082 if (homedir)
1083 {
1084 static const char *const xnames[2] = { ".Xdefaults", ".Xresources" };
1085
1086 for (int i = 0; i < (sizeof (xnames) / sizeof (xnames [0])); i++)
1087 {
1088 snprintf (fname, sizeof (fname), "%s/%s", homedir, xnames [i]);
1089
1090 if ((fd = fopen (fname, "r")) != NULL)
1091 break;
1092 }
1093 }
1094 /*
1095 * The normal order to match resources is the following:
1096 * @ global resources (partial match, ~/.Xdefaults)
1097 * @ application file resources (XAPPLOADDIR/Rxvt)
1098 * @ class resources (~/.Xdefaults)
1099 * @ private resources (~/.Xdefaults)
1100 *
1101 * However, for the hand-rolled resources, the matching algorithm
1102 * checks if a resource string value has already been allocated
1103 * and won't overwrite it with (in this case) a less specific
1104 * resource value.
1105 *
1106 * This avoids multiple allocation. Also, when we've called this
1107 * routine command-line string options have already been applied so we
1108 * needn't to allocate for those resources.
1109 *
1110 * So, search in resources from most to least specific.
1111 *
1112 * Also, use a special sub-class so that we can use either or both of
1113 * "XTerm" and "Rxvt" as class names.
1114 */
1115
1116 get_xdefaults (fd, rs[Rs_name]);
1117 get_xdefaults (fd, RESCLASS);
1118# ifdef RESFALLBACK
1119 get_xdefaults (fd, RESFALLBACK);
1120# endif
1121
1122# if defined(XAPPLOADDIR) && defined(USE_XAPPLOADDIR)
1123 {
911 FILE *fd = NULL; 1124 FILE *ad = NULL;
912 char *home;
913 1125
914 if ((home = getenv ("HOME")) != NULL) 1126# if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1127 if (!*localepath || (ad = fopen (localepath, "r")) == NULL)
1128# endif
1129 ad = fopen (XAPPLOADDIR "/" RESCLASS, "r");
1130 if (ad != NULL)
915 { 1131 {
916 unsigned int i, len = STRLEN (home) + 2; 1132 get_xdefaults (ad, RESCLASS);
917 char *f = NULL; 1133 get_xdefaults (ad, "");
918
919 for (i = 0; i < (sizeof (xnames) / sizeof (xnames[0])); i++)
920 {
921 f = (char *)rxvt_realloc (f, (len + STRLEN (xnames[i])) * sizeof (char));
922
923 sprintf (f, "%s/%s", home, xnames[i]);
924
925 if ((fd = fopen (f, "r")) != NULL)
926 break;
927 }
928 free (f); 1134 fclose (ad);
929 } 1135 }
930 /*
931 * The normal order to match resources is the following:
932 * @ global resources (partial match, ~/.Xdefaults)
933 * @ application file resources (XAPPLOADDIR/Rxvt)
934 * @ class resources (~/.Xdefaults)
935 * @ private resources (~/.Xdefaults)
936 *
937 * However, for the hand-rolled resources, the matching algorithm
938 * checks if a resource string value has already been allocated
939 * and won't overwrite it with (in this case) a less specific
940 * resource value.
941 *
942 * This avoids multiple allocation. Also, when we've called this
943 * routine command-line string options have already been applied so we
944 * needn't to allocate for those resources.
945 *
946 * So, search in resources from most to least specific.
947 *
948 * Also, use a special sub-class so that we can use either or both of
949 * "XTerm" and "Rxvt" as class names.
950 */
951
952 get_xdefaults (fd, name);
953 get_xdefaults (fd, APL_SUBCLASS);
954
955# if defined(XAPPLOADDIR) && defined(USE_XAPPLOADDIR)
956
957 {
958 FILE *ad = NULL;
959
960# if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
961 if (localepath == NULL || (ad = fopen (localepath, "r")) == NULL)
962# endif
963 ad = fopen (XAPPLOADDIR "/" APL_SUBCLASS, "r");
964 if (ad != NULL)
965 {
966 get_xdefaults (ad, APL_SUBCLASS);
967 get_xdefaults (ad, "");
968 fclose (ad);
969 }
970 } 1136 }
971# endif /* XAPPLOADDIR */ 1137# endif /* XAPPLOADDIR */
972 1138
973 get_xdefaults (fd, APL_CLASS);
974 get_xdefaults (fd, ""); /* partial match */ 1139 get_xdefaults (fd, ""); /* partial match */
975 if (fd != NULL) 1140 if (fd != NULL)
976 fclose (fd); 1141 fclose (fd);
977# endif /* USE_XGETDEFAULT */ 1142# endif /* USE_XGETDEFAULT */
978 1143
979# if defined XAPPLOADDIR
980# if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
981
982 }
983
984 /* Free the path of the possibly available localized Rxvt file */
985 free (localepath);
986# endif
987# endif
988
989#endif /* NO_RESOURCES */ 1144#endif /* NO_RESOURCES */
990
991 /*
992 * even without resources, at least do this setup for command-line
993 * options and command-line long options
994 */
995
996#if defined (HOTKEY_CTRL) || defined (HOTKEY_META)
997 KeySym sym;
998
999 if (rs[Rs_bigfont_key]
1000 && ((sym = XStringToKeysym (rs[Rs_bigfont_key])) != 0))
1001 ks_bigfont = sym;
1002 if (rs[Rs_smallfont_key]
1003 && ((sym = XStringToKeysym (rs[Rs_smallfont_key])) != 0))
1004 ks_smallfont = sym;
1005#endif
1006} 1145}
1007 1146
1008/*}}} */ 1147/*}}} */
1009/*----------------------- end-of-file (C source) -----------------------*/ 1148/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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