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.17 by pcg, Sun Mar 14 17:33:08 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.17 2004/03/14 17:33:08 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#ifndef NO_FRILLS 145#if ENABLE_FRILLS
137 BOOL (Rs_tripleclickwords, "tripleclickwords", "tcw", Opt_tripleclickwords, 146 BOOL (Rs_tripleclickwords, "tripleclickwords", "tcw", Opt_tripleclickwords, "triple click word selection"),
138 "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"),
139#endif 149#endif
140#ifdef CURSOR_BLINK 150#if CURSOR_BLINK
141 BOOL (Rs_cursorBlink, "cursorBlink", "bc", Opt_cursorBlink, "blinking cursor"), 151 BOOL (Rs_cursorBlink, "cursorBlink", "bc", Opt_cursorBlink, "blinking cursor"),
142#endif 152#endif
143#ifdef POINTER_BLANK 153#ifdef POINTER_BLANK
144 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"),
145#endif 155#endif
… …
151 RSTRG (Rs_color + minCOLOR + 3, "color3", "color"), 161 RSTRG (Rs_color + minCOLOR + 3, "color3", "color"),
152 RSTRG (Rs_color + minCOLOR + 4, "color4", "color"), 162 RSTRG (Rs_color + minCOLOR + 4, "color4", "color"),
153 RSTRG (Rs_color + minCOLOR + 5, "color5", "color"), 163 RSTRG (Rs_color + minCOLOR + 5, "color5", "color"),
154 RSTRG (Rs_color + minCOLOR + 6, "color6", "color"), 164 RSTRG (Rs_color + minCOLOR + 6, "color6", "color"),
155 RSTRG (Rs_color + minCOLOR + 7, "color7", "color"), 165 RSTRG (Rs_color + minCOLOR + 7, "color7", "color"),
156#ifndef NO_BRIGHTCOLOR
157 RSTRG (Rs_color + minBrightCOLOR + 0, "color8", "color"), 166 RSTRG (Rs_color + minBrightCOLOR + 0, "color8", "color"),
158 RSTRG (Rs_color + minBrightCOLOR + 1, "color9", "color"), 167 RSTRG (Rs_color + minBrightCOLOR + 1, "color9", "color"),
159 RSTRG (Rs_color + minBrightCOLOR + 2, "color10", "color"), 168 RSTRG (Rs_color + minBrightCOLOR + 2, "color10", "color"),
160 RSTRG (Rs_color + minBrightCOLOR + 3, "color11", "color"), 169 RSTRG (Rs_color + minBrightCOLOR + 3, "color11", "color"),
161 RSTRG (Rs_color + minBrightCOLOR + 4, "color12", "color"), 170 RSTRG (Rs_color + minBrightCOLOR + 4, "color12", "color"),
162 RSTRG (Rs_color + minBrightCOLOR + 5, "color13", "color"), 171 RSTRG (Rs_color + minBrightCOLOR + 5, "color13", "color"),
163 RSTRG (Rs_color + minBrightCOLOR + 6, "color14", "color"), 172 RSTRG (Rs_color + minBrightCOLOR + 6, "color14", "color"),
164 RSTRG (Rs_color + minBrightCOLOR + 7, "color15", "color"), 173 RSTRG (Rs_color + minBrightCOLOR + 7, "color15", "color"),
165#endif /* NO_BRIGHTCOLOR */
166#ifndef NO_BOLD_UNDERLINE_REVERSE 174#ifndef NO_BOLD_UNDERLINE_REVERSE
167 RSTRG (Rs_color + Color_BD, "colorBD", "color"), 175 RSTRG (Rs_color + Color_BD, "colorBD", "color"),
176 RSTRG (Rs_color + Color_IT, "colorIT", "color"),
168 RSTRG (Rs_color + Color_UL, "colorUL", "color"), 177 RSTRG (Rs_color + Color_UL, "colorUL", "color"),
169 RSTRG (Rs_color + Color_RV, "colorRV", "color"), 178 RSTRG (Rs_color + Color_RV, "colorRV", "color"),
170#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
171#ifdef KEEP_SCROLLCOLOR 183#ifdef KEEP_SCROLLCOLOR
172 RSTRG (Rs_color + Color_scroll, "scrollColor", "color"), 184 RSTRG (Rs_color + Color_scroll, "scrollColor", "color"),
173 RSTRG (Rs_color + Color_trough, "troughColor", "color"), 185 RSTRG (Rs_color + Color_trough, "troughColor", "color"),
174#endif /* KEEP_SCROLLCOLOR */ 186#endif /* KEEP_SCROLLCOLOR */
175#ifdef OPTION_HC 187#ifdef OPTION_HC
176 STRG (Rs_color + Color_HC, "highlightColor", "hc", "color", "highlight color"), 188 STRG (Rs_color + Color_HC, "highlightColor", "hc", "color", "highlight color"),
177#endif 189#endif
178#if defined (XPM_BACKGROUND) || (MENUBAR_MAX)
179 RSTRG (Rs_path, "path", "search path"),
180#endif /* defined (XPM_BACKGROUND) || (MENUBAR_MAX) */
181#ifdef XPM_BACKGROUND
182 STRG (Rs_backgroundPixmap, "backgroundPixmap", "pixmap", "file[;geom]",
183 "background pixmap"),
184#endif /* XPM_BACKGROUND */
185#if (MENUBAR_MAX)
186 RSTRG (Rs_menu, "menu", "name[;tag]"),
187#endif
188 STRG (Rs_font, "font", "fn", "fontname", "normal text font"),
189 /* fonts: command-line option = resource name */
190#ifdef USE_XIM
191 STRG (Rs_inputMethod, "inputMethod", "im", "name", "name of input method"),
192 STRG (Rs_preeditType, "preeditType", "pt", "style",
193 "input style: style = OverTheSpot|OffTheSpot|Root"),
194#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
195 STRG (Rs_imLocale, "imLocale", "imlocale", "string", "locale to use for input method"),
196#endif
197#endif /* USE_XIM */
198 STRG (Rs_name, NULL, "name", "string",
199 "client instance, icon, and title strings"),
200 STRG (Rs_title, "title", "title", "string", "title name for window"),
201 STRG (Rs_title, NULL, "T", NULL, NULL), /* short form */
202 STRG (Rs_iconName, "iconName", "n", "string", "icon name for window"),
203#ifndef NO_CURSORCOLOR 190#ifndef NO_CURSORCOLOR
204 STRG (Rs_color + Color_cursor, "cursorColor", "cr", "color", "cursor color"), 191 STRG (Rs_color + Color_cursor, "cursorColor", "cr", "color", "cursor color"),
205 /* command-line option = resource name */ 192 /* command-line option = resource name */
206 RSTRG (Rs_color + Color_cursor2, "cursorColor2", "color"), 193 RSTRG (Rs_color + Color_cursor2, "cursorColor2", "color"),
207#endif /* NO_CURSORCOLOR */ 194#endif /* NO_CURSORCOLOR */
208 STRG (Rs_color + Color_pointer, "pointerColor", "pr", "color", 195 STRG (Rs_color + Color_pointer_fg, "pointerColor", "pr", "color", "pointer color"),
209 "pointer color"), 196 STRG (Rs_color + Color_pointer_bg, "pointerColor2", "pr2", "color", "pointer bg color"),
210 STRG (Rs_color + Color_border, "borderColor", "bd", "color", 197 STRG (Rs_color + Color_border, "borderColor", "bd", "color", "border color"),
211 "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"),
212 STRG (Rs_saveLines, "saveLines", "sl", "number", 225 STRG (Rs_saveLines, "saveLines", "sl", "number", "number of scrolled lines to save"),
213 "number of scrolled lines to save"), 226#if ENABLE_XEMBED
214#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"),
215 STRG (Rs_ext_bwidth, "externalBorder", "w", "number", 233 STRG (Rs_ext_bwidth, "externalBorder", "w", "number", "external border in pixels"),
216 "external border in pixels"),
217 STRG (Rs_ext_bwidth, NULL, "bw", NULL, NULL), 234 STRG (Rs_ext_bwidth, NULL, "bw", NULL, NULL),
218 STRG (Rs_ext_bwidth, NULL, "borderwidth", NULL, NULL), 235 STRG (Rs_ext_bwidth, NULL, "borderwidth", NULL, NULL),
219 STRG (Rs_int_bwidth, "internalBorder", "b", "number", 236 STRG (Rs_int_bwidth, "internalBorder", "b", "number", "internal border in pixels"),
220 "internal border in pixels"), 237 BOOL (Rs_borderLess, "borderLess", "bl", Opt_borderLess, "borderless window"),
221#endif 238 BOOL (Rs_skipBuiltinGlyphs, "skipBuiltinGlyphs", "sbg", Opt_skipBuiltinGlyphs, "do not use internal glyphs"),
222#ifndef NO_LINESPACE
223 STRG (Rs_lineSpace, "lineSpace", "lsp", "number", 239 STRG (Rs_lineSpace, "lineSpace", "lsp", "number", "number of extra pixels between rows"),
224 "number of extra pixels between rows"),
225#endif 240#endif
226 STRG (Rs_scrollBar_thickness, "thickness", "sbt", "number",
227 "scrollbar thickness/width in pixels"),
228#ifdef POINTER_BLANK 241#ifdef POINTER_BLANK
229 RSTRG (Rs_pointerBlankDelay, "pointerBlankDelay", "number"), 242 RSTRG (Rs_pointerBlankDelay, "pointerBlankDelay", "number"),
230#endif 243#endif
231#ifndef NO_BACKSPACE_KEY 244#ifndef NO_BACKSPACE_KEY
232 RSTRG (Rs_backspace_key, "backspacekey", "string"), 245 RSTRG (Rs_backspace_key, "backspacekey", "string"),
233#endif 246#endif
234#ifndef NO_DELETE_KEY 247#ifndef NO_DELETE_KEY
235 RSTRG (Rs_delete_key, "deletekey", "string"), 248 RSTRG (Rs_delete_key, "deletekey", "string"),
236#endif 249#endif
237 RSTRG (Rs_selectstyle, "selectstyle", "mode"), 250 RSTRG (Rs_selectstyle, "selectstyle", "mode"),
238 RSTRG (Rs_scrollstyle, "scrollstyle", "mode"),
239#ifdef HAVE_SCROLLBARS
240 RSTRG (Rs_scrollBar_align, "scrollBar_align", "mode"),
241#endif
242#ifdef PRINTPIPE 251#ifdef PRINTPIPE
243 RSTRG (Rs_print_pipe, "print-pipe", "string"), 252 RSTRG (Rs_print_pipe, "print-pipe", "string"),
244#endif 253#endif
245 STRG (Rs_modifier, "modifier", "mod", "modifier", 254 STRG (Rs_modifier, "modifier", "mod", "modifier", "meta modifier = alt|meta|hyper|super|mod1|...|mod5"),
246 "meta modifier = alt|meta|hyper|super|mod1|...|mod5"),
247 INFO ("xrm", "string", "X resource"),
248#ifdef CUTCHAR_RESOURCE 255#ifdef CUTCHAR_RESOURCE
249 RSTRG (Rs_cutchars, "cutchars", "string"), 256 RSTRG (Rs_cutchars, "cutchars", "string"),
250#endif /* CUTCHAR_RESOURCE */ 257#endif /* CUTCHAR_RESOURCE */
251 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
252 INFO ("e", "command arg ...", "command to execute") 274 INFO ("e", "command arg ...", "command to execute")
253 }; 275 };
254 276
255#undef INFO 277#undef INFO
256#undef STRG 278#undef STRG
257#undef RSTRG 279#undef RSTRG
258#undef SWCH 280#undef SWCH
259#undef BOOL 281#undef BOOL
260/*}}} */ 282/*}}} */
261 283
262static const char releasestring[] = "Rxvt v" VERSION " - released: " DATE "\n"; 284static const char releasestring[] = "rxvt-unicode (" RXVTNAME ") v" VERSION " - released: " DATE "\n";
263static 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
264#if defined(XPM_BACKGROUND) 324#if defined(XPM_BACKGROUND)
265 "XPM," 325 "XPM,"
266#endif 326#endif
267#if defined(TRANSPARENT) 327#if defined(TRANSPARENT)
268 "transparent," 328 "transparent,"
269#endif 329#endif
330#if TINTING
331 "tint,"
332#endif
270#if defined(UTMP_SUPPORT) 333#if defined(UTMP_SUPPORT)
271 "utmp," 334 "utmp,"
272#endif 335#endif
273#if defined(MENUBAR) 336#if defined(MENUBAR)
274 "menubar," 337 "menubar,"
275#endif
276#if !defined(NO_FRILLS)
277 "frills,"
278#endif
279#if !defined(NO_LINESPACE)
280 "linespace,"
281#endif
282#if defined(PREFER_24BIT)
283 "24bit,"
284#endif 338#endif
285#if defined(USE_XIM) 339#if defined(USE_XIM)
286 "XIM," 340 "XIM,"
287#endif 341#endif
288 "scrollbars=" 342 "scrollbars="
… …
316 "no_backspace," 370 "no_backspace,"
317#endif 371#endif
318#if defined(NO_DELETE_KEY) 372#if defined(NO_DELETE_KEY)
319 "no_delete," 373 "no_delete,"
320#endif 374#endif
375#if EIGHT_BIT_CONTROLS
376 "8bitctrls,"
377#endif
321#if !defined(NO_STRINGS) 378#if !defined(NO_STRINGS)
322 "strings," 379 "strings,"
323#endif 380#endif
324#if defined(TTY_256COLOR) 381#if defined(ENABLE_FRILLS)
382 "frills,"
383#endif
384#if defined(PREFER_24BIT)
325 "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,"
326#endif 404#endif
327#if defined(NO_RESOURCES) 405#if defined(NO_RESOURCES)
328 "NoResources" 406 "NoResources"
329#else 407#else
330# if defined(USE_XGETDEFAULT) 408# if defined(USE_XGETDEFAULT)
331 "XGetDefaults" 409 "XGetDefault"
332# else 410# else
333 ".Xdefaults" 411 ".Xdefaults"
334# endif 412# endif
335#endif 413#endif
336 "\nUsage: "; /* Usage */ 414 "\nUsage: "; /* Usage */
… …
340/*{{{ usage: */ 418/*{{{ usage: */
341/*----------------------------------------------------------------------*/ 419/*----------------------------------------------------------------------*/
342static void 420static void
343rxvt_usage (int type) 421rxvt_usage (int type)
344{ 422{
345 unsigned int i, col; 423 unsigned int i, col;
346 424
347 write (STDERR_FILENO, releasestring, sizeof (releasestring) - 1); 425 rxvt_log ("%s%s%s", releasestring, optionsstring, RESNAME);
348 write (STDERR_FILENO, optionsstring, sizeof (optionsstring) - 1);
349 write (STDERR_FILENO, RESNAME, sizeof (RESNAME) - 1);
350 426
351 switch (type) 427 switch (type)
352 { 428 {
353 case 0: /* brief listing */ 429 case 0: /* brief listing */
354 fprintf (stderr, " [-help] [--help]\n"); 430 rxvt_log (" [-help] [--help]\n");
431
355 for (col = 1, i = 0; i < optList_size (); i++) 432 for (col = 1, i = 0; i < optList_size; i++)
356 if (optList[i].desc != NULL) 433 if (optList[i].desc != NULL)
357 { 434 {
358 int len = 0; 435 int len = 0;
359 436
360 if (!optList_isBool (i)) 437 if (!optList_isBool (i))
… …
364 len++; /* account for space */ 441 len++; /* account for space */
365 } 442 }
366#ifdef DEBUG_STRICT 443#ifdef DEBUG_STRICT
367 assert (optList[i].opt != NULL); 444 assert (optList[i].opt != NULL);
368#endif 445#endif
369 len += 4 + STRLEN (optList[i].opt) + (optList_isBool (i) ? 2: 0); 446 len += 4 + strlen (optList[i].opt) + (optList_isBool (i) ? 2: 0);
370 col += len; 447 col += len;
371 if (col > 79) 448 if (col > 79)
372 { /* assume regular width */ 449 { /* assume regular width */
373 putc ('\n', stderr); 450 rxvt_log ("\n");
374 col = 1 + len; 451 col = 1 + len;
375 } 452 }
453
376 fprintf (stderr, " [-%s%s", (optList_isBool (i) ? "/+" : ""), 454 rxvt_log (" [-%s%s", (optList_isBool (i) ? "/+" : ""), optList[i].opt);
377 optList[i].opt);
378 if (optList_strlen (i)) 455 if (optList_strlen (i))
379 fprintf (stderr, " %s]", optList[i].arg); 456 rxvt_log (" %s]", optList[i].arg);
380 else 457 else
381 fprintf (stderr, "]"); 458 rxvt_log ("]");
382 } 459 }
383 break; 460 break;
384 461
385 case 1: /* full command-line listing */ 462 case 1: /* full command-line listing */
386 fprintf (stderr, " [options] [-e command args]\n\n" 463 rxvt_log (" [options] [-e command args]\n\nwhere options include:\n");
387 "where options include:\n"); 464
388 for (i = 0; i < optList_size (); i++) 465 for (i = 0; i < optList_size; i++)
389 if (optList[i].desc != NULL) 466 if (optList[i].desc != NULL)
390 { 467 {
391#ifdef DEBUG_STRICT 468#ifdef DEBUG_STRICT
392 assert (optList[i].opt != NULL); 469 assert (optList[i].opt != NULL);
393#endif 470#endif
394 fprintf (stderr, " %s%s %-*s%s%s\n", 471 rxvt_log (" %s%s %-*s%s%s\n",
395 (optList_isBool (i) ? "-/+" : "-"), optList[i].opt, 472 (optList_isBool (i) ? "-/+" : "-"), optList[i].opt,
396 (INDENT - STRLEN (optList[i].opt) 473 (INDENT - strlen (optList[i].opt)
397 + (optList_isBool (i) ? 0 : 2)), 474 + (optList_isBool (i) ? 0 : 2)),
398 (optList[i].arg ? optList[i].arg : ""), 475 (optList[i].arg ? optList[i].arg : ""),
399 (optList_isBool (i) ? "turn on/off " : ""), 476 (optList_isBool (i) ? "turn on/off " : ""),
400 optList[i].desc); 477 optList[i].desc);
401 } 478 }
402 fprintf (stderr, "\n --help to list long-options"); 479 rxvt_log ("\n --help to list long-options");
403 break; 480 break;
404 481
405 case 2: /* full resource listing */ 482 case 2: /* full resource listing */
406 fprintf (stderr,
407 " [options] [-e command args]\n\n" 483 rxvt_log (" [options] [-e command args]\n\n"
408 "where resources (long-options) include:\n"); 484 "where resources (long-options) include:\n");
409 485
410 for (i = 0; i < optList_size (); i++) 486 for (i = 0; i < optList_size; i++)
411 if (optList[i].kw != NULL) 487 if (optList[i].kw != NULL)
412 fprintf (stderr, " %s: %*s%s\n", 488 rxvt_log (" %s: %*s%s\n",
413 optList[i].kw, 489 optList[i].kw,
414 (INDENT - STRLEN (optList[i].kw)), "", /* XXX */ 490 (INDENT - strlen (optList[i].kw)), "", /* XXX */
415 (optList_isBool (i) ? "boolean" : optList[i].arg)); 491 (optList_isBool (i) ? "boolean" : optList[i].arg));
416#ifdef KEYSYM_RESOURCE 492#ifdef KEYSYM_RESOURCE
417 fprintf (stderr, " " "keysym.sym" ": %*s%s\n", 493 rxvt_log (" " "keysym.sym" ": %*s%s\n",
418 (INDENT - sizeof ("keysym.sym") + 1), "", /* XXX */ 494 (INDENT - sizeof ("keysym.sym") + 1), "", /* XXX */
419 "keysym"); 495 "keysym");
420#endif 496#endif
421 fprintf (stderr, "\n -help to list options"); 497 rxvt_log ("\n -help to list options");
422 break; 498 break;
423 } 499 }
424 fprintf (stderr, "\n\n"); 500
425 exit (EXIT_FAILURE); 501 rxvt_log ("\n\n");
502 rxvt_exit_failure ();
426 /* NOTREACHED */ 503 /* NOTREACHED */
427} 504}
428 505
429/*}}} */ 506/*}}} */
430 507
… …
435 int i, bad_option = 0; 512 int i, bad_option = 0;
436 static const char On[3] = "ON", Off[4] = "OFF"; 513 static const char On[3] = "ON", Off[4] = "OFF";
437 514
438 for (i = 1; i < argc; i++) 515 for (i = 1; i < argc; i++)
439 { 516 {
440 unsigned int entry, longopt = 0; 517 unsigned int entry, longopt = 0;
441 const char *flag, *opt; 518 const char *flag, *opt;
442 519
443 opt = argv[i]; 520 opt = argv[i];
444#ifdef DEBUG_RESOURCES 521#ifdef DEBUG_RESOURCES
445 fprintf (stderr, "argv[%d] = %s: ", i, opt); 522 fprintf (stderr, "argv[%d] = %s: ", i, opt);
446#endif 523#endif
… …
457 longopt = *opt++; /* long option */ 534 longopt = *opt++; /* long option */
458 } 535 }
459 else 536 else
460 { 537 {
461 bad_option = 1; 538 bad_option = 1;
462 rxvt_print_error ("bad option \"%s\"", opt); 539 rxvt_warn ("\"%s\": malformed option.\n", opt);
463 continue; 540 continue;
464 } 541 }
465 542
466 if (!STRCMP (opt, "help")) 543 if (!strcmp (opt, "help"))
467 rxvt_usage (longopt ? 2 : 1); 544 rxvt_usage (longopt ? 2 : 1);
468 if (!STRCMP (opt, "h")) 545 if (!strcmp (opt, "h"))
469 rxvt_usage (0); 546 rxvt_usage (0);
470 547
471 /* feature: always try to match long-options */ 548 /* feature: always try to match long-options */
472 for (entry = 0; entry < optList_size (); entry++) 549 for (entry = 0; entry < optList_size; entry++)
473 if ((optList[entry].kw && !STRCMP (opt, optList[entry].kw)) 550 if ((optList[entry].kw && !strcmp (opt, optList[entry].kw))
474 || (!longopt 551 || (!longopt
475 && optList[entry].opt && !STRCMP (opt, optList[entry].opt))) 552 && optList[entry].opt && !strcmp (opt, optList[entry].opt)))
476 break; 553 break;
477 554
478 if (entry < optList_size ()) 555 if (entry < optList_size)
479 { 556 {
480 if (optList_isReverse (entry)) 557 if (optList_isReverse (entry))
481 flag = flag == On ? Off : On; 558 flag = flag == On ? Off : On;
559
482 if (optList_strlen (entry)) 560 if (optList_strlen (entry))
483 { /* string value */
484 const char *str = argv[++i];
485
486#ifdef DEBUG_RESOURCES
487 fprintf (stderr, "string (%s,%s) = ",
488 optList[entry].opt ? optList[entry].opt : "nil",
489 optList[entry].kw ? optList[entry].kw : "nil");
490#endif
491 if (flag == On && str && (optList[entry].doff != -1))
492 { 561 {
493#ifdef DEBUG_RESOURCES
494 fprintf (stderr, "\"%s\"\n", str);
495#endif
496 rs[optList[entry].doff] = str;
497 /* 562 /*
498 * special cases are handled in main.c:main () to allow 563 * special cases are handled in main.c:main () to allow
499 * X resources to set these values before we settle for 564 * X resources to set these values before we settle for
500 * default values 565 * default values
501 */ 566 */
502 }
503#ifdef DEBUG_RESOURCES
504 else
505 fprintf (stderr, "???\n");
506#endif
507 567
568 if (optList[entry].doff != -1)
569 rs[optList[entry].doff] = flag == On && argv[i+1]
570 ? argv[++i] : 0;
508 } 571 }
509 else 572 else
510 { /* boolean value */ 573 { /* boolean value */
511#ifdef DEBUG_RESOURCES 574#ifdef DEBUG_RESOURCES
512 fprintf (stderr, "boolean (%s,%s) = %s\n", 575 fprintf (stderr, "boolean (%s,%s) = %s\n",
513 optList[entry].opt, optList[entry].kw, flag); 576 optList[entry].opt, optList[entry].kw, flag);
514#endif 577#endif
515 if (flag == On) 578 set_option (optList[entry].flag & Optflag_mask, flag == On);
516 Options |= (optList[entry].flag);
517 else
518 Options &= ~ (optList[entry].flag);
519 579
520 if (optList[entry].doff != -1) 580 if (optList[entry].doff != -1)
521 rs[optList[entry].doff] = flag; 581 rs[optList[entry].doff] = flag;
522 } 582 }
523 } 583 }
524 else 584 else
525#ifdef KEYSYM_RESOURCE 585#ifdef KEYSYM_RESOURCE
526 /* if (!STRNCMP (opt, "keysym.", sizeof ("keysym.") - 1)) */ 586 /* if (!strncmp (opt, "keysym.", sizeof ("keysym.") - 1)) */
527 if (rxvt_Str_match (opt, "keysym.")) 587 if (rxvt_Str_match (opt, "keysym."))
528 { 588 {
529 const char *str = argv[++i]; 589 const char *str = argv[++i];
530 590
531 if (str != NULL) 591 if (str != NULL)
532 parse_keysym (opt + sizeof ("keysym.") - 1, str); 592 parse_keysym (opt + sizeof ("keysym.") - 1, str);
533 } 593 }
534 else 594 else
535#endif 595#endif
596 {
536 bad_option = 1; 597 bad_option = 1;
598 rxvt_warn ("\"%s\": unknown or malformed option.\n", opt);
599 }
537 } 600 }
538 601
539 if (bad_option) 602 if (bad_option)
540 rxvt_usage (0); 603 rxvt_usage (0);
541} 604}
… …
559 XrmQuarkList quarks, 622 XrmQuarkList quarks,
560 XrmRepresentation *type __attribute__((unused)), 623 XrmRepresentation *type __attribute__((unused)),
561 XrmValue *value, 624 XrmValue *value,
562 XPointer closure __attribute__((unused))) 625 XPointer closure __attribute__((unused)))
563{ 626{
564 int last; 627 int last;
565 628
566 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 */
567 ; 630 ;
631
568 last--; 632 last--;
569 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
570 return False; 634 return False;
571} 635}
572 636
… …
577 * arg will be 641 * arg will be
578 * NULL for ~/.Xdefaults and 642 * NULL for ~/.Xdefaults and
579 * non-NULL for command-line options (need to allocate) 643 * non-NULL for command-line options (need to allocate)
580 */ 644 */
581#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
582int 682int
583rxvt_term::parse_keysym (const char *str, const char *arg) 683rxvt_term::parse_keysym (const char *str, const char *arg)
584{ 684{
585 int n, sym; 685 int n, sym;
586 char *key_string, *newarg = NULL; 686 unsigned int state = 0;
687 const char *pmodend = NULL;
688 char *newarg = NULL;
587 char newargstr[NEWARGLIM]; 689 char newargstr[NEWARGLIM];
588 690
589 if (arg == NULL) 691 if (arg == NULL)
590 { 692 {
591 if ((n = rxvt_Str_match (str, "keysym.")) == 0) 693 if ((n = rxvt_Str_match (str, "keysym.")) == 0)
592 return 0; 694 return 0;
695
593 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)
594 } 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
595 /* some scanf () have trouble with a 0x prefix */ 728 /* some scanf () have trouble with a 0x prefix */
596 if (isdigit (str[0]))
597 {
598 if (str[0] == '0' && toupper (str[1]) == 'X') 729 if (str[0] == '0' && toupper (str[1]) == 'X')
730 {
599 str += 2; 731 str += 2;
732
600 if (arg) 733 if (arg)
601 { 734 {
602 if (sscanf (str, (STRCHR (str, ':') ? "%x:" : "%x"), &sym) != 1) 735 if (sscanf (str, (strchr (str, ':') ? "%x:" : "%x"), &sym) != 1)
603 return -1; 736 return -1;
604 } 737 }
605 else 738 else
606 { 739 {
607 if (sscanf (str, "%x:", &sym) != 1) 740 if (sscanf (str, "%x:", &sym) != 1)
608 return -1; 741 return -1;
609 742
610 /* cue to ':', it's there since sscanf () worked */ 743 /* cue to ':', it's there since sscanf () worked */
611 STRNCPY (newargstr, STRCHR (str, ':') + 1, NEWARGLIM - 1); 744 strncpy (newargstr, strchr (str, ':') + 1, NEWARGLIM - 1);
612 newargstr[NEWARGLIM - 1] = '\0'; 745 newargstr[NEWARGLIM - 1] = '\0';
613 newarg = newargstr; 746 newarg = newargstr;
614 } 747 }
615 } 748 }
616 else 749 else
617 { 750 {
618 /* 751 /*
619 * convert keysym name to keysym number 752 * convert keysym name to keysym number
620 */ 753 */
621 STRNCPY (newargstr, str, NEWARGLIM - 1); 754 strncpy (newargstr, str, NEWARGLIM - 1);
622 newargstr[NEWARGLIM - 1] = '\0'; 755 newargstr[NEWARGLIM - 1] = '\0';
756
623 if (arg == NULL) 757 if (arg == NULL)
624 { 758 {
625 if ((newarg = STRCHR (newargstr, ':')) == NULL) 759 if ((newarg = strchr (newargstr, ':')) == NULL)
626 return -1; 760 return -1;
761
627 *newarg++ = '\0'; /* terminate keysym name */ 762 *newarg++ = '\0'; /* terminate keysym name */
628 } 763 }
764
629 if ((sym = XStringToKeysym (newargstr)) == None) 765 if ((sym = XStringToKeysym (newargstr)) == None)
630 return -1; 766 return -1;
631 } 767 }
632 768
633 if (sym < 0xFF00 || sym > 0xFFFF) /* we only do extended keys */
634 return -1;
635 sym &= 0xFF;
636 if (Keysym_map[sym] != NULL) /* already set ? */
637 return -1;
638
639 if (newarg == NULL) 769 if (newarg == NULL)
640 { 770 {
641 STRNCPY (newargstr, arg, NEWARGLIM - 1); 771 strncpy (newargstr, arg, NEWARGLIM - 1);
642 newargstr[NEWARGLIM - 1] = '\0'; 772 newargstr[NEWARGLIM - 1] = '\0';
643 newarg = newargstr; 773 newarg = newargstr;
644 } 774 }
775
645 rxvt_Str_trim (newarg); 776 rxvt_Str_trim (newarg);
646 if (*newarg == '\0' || (n = rxvt_Str_escaped (newarg)) == 0) 777 if (*newarg == '\0' || (n = rxvt_Str_escaped (newarg)) == 0)
647 return -1; 778 return -1;
648 MIN_IT (n, 255);
649 key_string = (char *)rxvt_malloc ((n + 1) * sizeof (char));
650 779
651 key_string[0] = n; 780 keyboard->register_user_translation (sym, state, newarg);
652 STRNCPY (key_string + 1, newarg, n);
653 Keysym_map[sym] = (unsigned char *)key_string;
654
655 return 1; 781 return 1;
656} 782}
657 783
658# endif /* KEYSYM_RESOURCE */ 784# endif /* KEYSYM_RESOURCE */
659 785
… …
668 unsigned int len; 794 unsigned int len;
669 char *str, buffer[256]; 795 char *str, buffer[256];
670 796
671 if (stream == NULL) 797 if (stream == NULL)
672 return; 798 return;
673 len = STRLEN (name); 799
800 len = strlen (name);
674 while ((str = fgets (buffer, sizeof (buffer), stream)) != NULL) 801 while ((str = fgets (buffer, sizeof (buffer), stream)) != NULL)
675 { 802 {
676 unsigned int entry, n; 803 unsigned int entry, n;
677 804
678 while (*str && isspace (*str)) 805 while (*str && isspace (*str))
679 str++; /* leading whitespace */ 806 str++; /* leading whitespace */
680 807
681 if ((str[len] != '*' && str[len] != '.') 808 if ((str[len] != '*' && str[len] != '.')
682 || (len && STRNCMP (str, name, len))) 809 || (len && strncmp (str, name, len)))
683 continue; 810 continue;
684 str += (len + 1); /* skip `name*' or `name.' */ 811 str += (len + 1); /* skip `name*' or `name.' */
685 812
686# ifdef KEYSYM_RESOURCE 813# ifdef KEYSYM_RESOURCE
687 if (!parse_keysym (str, NULL)) 814 if (!parse_keysym (str, NULL))
688# endif /* KEYSYM_RESOURCE */ 815# endif /* KEYSYM_RESOURCE */
689 for (entry = 0; entry < optList_size (); entry++) 816 for (entry = 0; entry < optList_size; entry++)
690 { 817 {
691 const char *kw = optList[entry].kw; 818 const char *kw = optList[entry].kw;
692 819
693 if (kw == NULL) 820 if (kw == NULL)
694 continue; 821 continue;
822
695 n = STRLEN (kw); 823 n = strlen (kw);
696 if (str[n] == ':' && rxvt_Str_match (str, kw)) 824 if (str[n] == ':' && rxvt_Str_match (str, kw))
697 { 825 {
698 /* skip `keyword:' */ 826 /* skip `keyword:' */
699 str += n + 1; 827 str += n + 1;
700 rxvt_Str_trim (str); 828 rxvt_Str_trim (str);
701 n = STRLEN (str); 829 n = strlen (str);
830
702 if (n && rs[optList[entry].doff] == NULL) 831 if (n && rs[optList[entry].doff] == NULL)
703 { 832 {
704 /* not already set */ 833 /* not already set */
705 int s; 834 int s;
706 char *p = 0; 835 char *p = 0;
707 836
708 for (int o = 0;;) 837 for (int o = 0;;)
709 { 838 {
710 p = (char *)rxvt_realloc (p, o + n + 1); 839 p = (char *)rxvt_realloc (p, o + n + 1);
711 MEMCPY (p + o, str, n); 840 memcpy (p + o, str, n);
712 o += n; 841 o += n;
713 p[o] = 0; 842 p[o] = 0;
714 843
715 if (o == 0 || p[o - 1] != '\\') // continuation line 844 if (o == 0 || p[o - 1] != '\\') // continuation line
716 break; 845 break;
… …
719 848
720 if ((str = fgets (buffer, sizeof (buffer), stream)) == NULL) 849 if ((str = fgets (buffer, sizeof (buffer), stream)) == NULL)
721 break; 850 break;
722 851
723 rxvt_Str_trim (str); 852 rxvt_Str_trim (str);
724 n = STRLEN (str); 853 n = strlen (str);
725 } 854 }
726 855
727 rs[optList[entry].doff] = p; 856 rs[optList[entry].doff] = p;
857 allocated.push_back (p);
858
728 if (optList_isBool (entry)) 859 if (optList_isBool (entry))
729 { 860 {
730 s = STRCASECMP (str, "TRUE") == 0 861 s = strcasecmp (str, "true") == 0
731 || STRCASECMP (str, "YES") == 0 862 || strcasecmp (str, "yes") == 0
732 || STRCASECMP (str, "ON") == 0 863 || strcasecmp (str, "on") == 0
733 || STRCASECMP (str, "1") == 0; 864 || strcmp (str, "1") == 0;
865
734 if (optList_isReverse (entry)) 866 if (optList_isReverse (entry))
735 s = !s; 867 s = !s;
736 if (s) 868
737 Options |= (optList[entry].flag); 869 set_option (optList[entry].flag & Optflag_mask, s);
738 else
739 Options &= ~ (optList[entry].flag);
740 } 870 }
741 } 871 }
872
742 break; 873 break;
743 } 874 }
744 } 875 }
745 } 876 }
877
746 rewind (stream); 878 rewind (stream);
747} 879}
748 880
749/*}}} */ 881/*}}} */
750# endif /* ! USE_XGETDEFAULT */ 882# endif /* ! USE_XGETDEFAULT */
751#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
752 898
753/*{{{ read the resources files */ 899/*{{{ read the resources files */
754/* 900/*
755 * using XGetDefault () or the hand-rolled replacement 901 * using XGetDefault () or the hand-rolled replacement
756 */ 902 */
757/* ARGSUSED */ 903/* ARGSUSED */
758void 904void
759rxvt_term::extract_resources (Display *display __attribute__ ((unused)), const char *name) 905rxvt_term::extract_resources ()
760{ 906{
907 dDisp;
908
761#ifndef NO_RESOURCES 909#ifndef NO_RESOURCES
910
911 char *homedir = (char *)getenv ("HOME");
912 char fname[1024];
762 913
763# if defined XAPPLOADDIR 914# if defined XAPPLOADDIR
764# if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE) 915# if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
765 /* Compute the path of the possibly available localized Rxvt file */ 916 /* Compute the path of the possibly available localized Rxvt file */
766 char *localepath = NULL; 917 char localepath[1024];
767 918
768 if (locale != NULL) 919 if (locale)
769 { /* XXX: must limit length of string */
770 localepath = (char *)rxvt_malloc (256);
771 sprintf (localepath, XAPPLOADDIRLOCALE "/" RESCLASS, 920 snprintf (localepath, sizeof (localepath), XAPPLOADDIRLOCALE "/" RESCLASS, locale);
772 (int) (258 - sizeof (XAPPLOADDIRLOCALE) - sizeof (RESCLASS)), 921 else
773 locale); /* 258 = 255 + 4 (-.*s) - 1 (/) */ 922 localepath[0] = 0;
774 }
775
776 {
777# endif 923# endif
778# endif 924# endif
779 925
780# ifdef USE_XGETDEFAULT 926# ifdef USE_XGETDEFAULT
781 /* 927 /*
782 * get resources using the X library function 928 * get resources using the X library function
783 */ 929 */
784 int entry; 930 int entry;
785 931
786# ifdef XrmEnumOneLevel
787 int i;
788 char *displayResource, *xe; 932 char *displayResource, *xe;
789 XrmName name_prefix[3]; 933 XrmName name_prefix[3];
790 XrmClass class_prefix[3]; 934 XrmClass class_prefix[3];
791 XrmDatabase database, rdb1; 935 XrmDatabase database, rdb1;
792 char fname[1024];
793 936
794 XrmInitialize ();
795 database = NULL; 937 database = NULL;
796 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.
797 /* Get any Xserver defaults */ 963 /* Get any Xserver defaults */
798
799 displayResource = XResourceManagerString (display); 964 displayResource = XResourceManagerString (disp);
800 if (displayResource != NULL) 965 if (displayResource != NULL)
966 {
801 database = XrmGetStringDatabase (displayResource); 967 if ((rdb1 = XrmGetStringDatabase (displayResource)))
802 968 XrmMergeDatabases (rdb1, &database);
803# ifdef HAVE_EXTRA_XRESOURCE_FILES
804 /* Add in ~/.Xdefaults or ~/.Xresources */
805 { 969 }
806 char *ptr; 970 else if (homedir)
971 {
972 snprintf (fname, sizeof (fname), "%s/.Xdefaults", homedir);
807 973
808 if ((ptr = (char *)getenv ("HOME")) == NULL) 974 if ((rdb1 = XrmGetFileDatabase (fname)))
809 ptr = "."; 975 XrmMergeDatabases (rdb1, &database);
976 }
810 977
811 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))
812 { 999 {
813 sprintf (fname, "%-.*s/%s", sizeof (fname) - STRLEN (xnames[i]) - 2, 1000 snprintf (fname, sizeof (fname), "%s/.Xdefaults-%s", homedir, un.nodename);
814 ptr, xnames[i]); 1001
815 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))
816 { 1040 {
817 XrmMergeDatabases (rdb1, &database); 1041 s = strcasecmp (p, "TRUE") == 0
818# ifndef HAVE_BOTH_XRESOURCE_FILES 1042 || strcasecmp (p, "YES") == 0
819 break; 1043 || strcasecmp (p, "ON") == 0
820# endif 1044 || strcasecmp (p, "1") == 0;
821 1045
1046 if (optList_isReverse (entry))
1047 s = !s;
1048
1049 set_option (optList[entry].flag & Optflag_mask, s);
822 } 1050 }
823 } 1051 }
824 } 1052 }
825# endif
826 1053
827 /* Add in XENVIRONMENT file */
828
829 if ((xe = (char *)getenv ("XENVIRONMENT")) != NULL
830 && (rdb1 = XrmGetFileDatabase (xe)) != NULL)
831 XrmMergeDatabases (rdb1, &database);
832
833 /* Add in Rxvt file */
834# if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
835 if (localepath == NULL || (rdb1 = XrmGetFileDatabase (localepath)) == NULL)
836# endif
837 rdb1 = XrmGetFileDatabase (XAPPLOADDIR "/" RESCLASS);
838
839 if (rdb1 != NULL)
840 XrmMergeDatabases (rdb1, &database);
841
842 /* Add in $XAPPLRESDIR/Rxvt only; not bothering with XUSERFILESEARCHPATH */
843 if ((xe = (char *)getenv ("XAPPLRESDIR")) != NULL)
844 {
845 sprintf (fname, "%-.*s/" RESCLASS, sizeof (fname)
846 - sizeof (RESCLASS) - 2, xe);
847 if ((rdb1 = XrmGetFileDatabase (fname)) != NULL)
848 XrmMergeDatabases (rdb1, &database);
849 }
850
851 XrmSetDatabase (display, database);
852# endif
853
854 /* 1054 /*
855 * Query resources for options that affect us
856 */
857 for (entry = 0; entry < optList_size (); entry++)
858 {
859 int s;
860 char *p, *p0;
861 const char *kw = optList[entry].kw;
862
863 if (kw == NULL || rs[optList[entry].doff] != NULL)
864 continue; /* previously set */
865
866 p = XGetDefault (display, name, kw);
867 p0 = XGetDefault (display, "!INVALIDPROGRAMMENAMEDONTMATCH!", kw);
868 if (p == NULL || (p0 && STRCMP (p, p0) == 0))
869 {
870 p = XGetDefault (display, RESCLASS, kw);
871#ifdef RESFALLBACK
872 if (p == NULL || (p0 && STRCMP (p, p0) == 0))
873 p = XGetDefault (display, RESFALLBACK, kw);
874#endif
875 }
876
877 if (p == NULL && p0)
878 p = p0;
879
880 if (p)
881 {
882 rs[optList[entry].doff] = p;
883
884 if (optList_isBool (entry))
885 {
886 s = STRCASECMP (p, "TRUE") == 0
887 || STRCASECMP (p, "YES") == 0
888 || STRCASECMP (p, "ON") == 0
889 || STRCASECMP (p, "1") == 0;
890 if (optList_isReverse (entry))
891 s = !s;
892 if (s)
893 Options |= (optList[entry].flag);
894 else
895 Options &= ~ (optList[entry].flag);
896 }
897 }
898 }
899
900 /*
901 * [R5 or later]: enumerate the resource database 1055 * [R5 or later]: enumerate the resource database
902 */ 1056 */
903# ifdef XrmEnumOneLevel
904# ifdef KEYSYM_RESOURCE 1057# ifdef KEYSYM_RESOURCE
905 name_prefix[0] = XrmStringToName (name); 1058 name_prefix[0] = XrmStringToName (rs[Rs_name]);
906 name_prefix[1] = XrmStringToName ("keysym"); 1059 name_prefix[1] = XrmStringToName ("keysym");
907 name_prefix[2] = NULLQUARK; 1060 name_prefix[2] = NULLQUARK;
908 class_prefix[0] = XrmStringToName (RESCLASS); 1061 class_prefix[0] = XrmStringToName (RESCLASS);
909 class_prefix[1] = XrmStringToName ("Keysym"); 1062 class_prefix[1] = XrmStringToName ("Keysym");
910 class_prefix[2] = NULLQUARK; 1063 class_prefix[2] = NULLQUARK;
911 /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */ 1064 /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */
912 XrmEnumerateDatabase (XrmGetDatabase (display), name_prefix, class_prefix, 1065 XrmEnumerateDatabase (database, name_prefix, class_prefix,
913 XrmEnumOneLevel, rxvt_define_key, NULL); 1066 XrmEnumOneLevel, rxvt_define_key, NULL);
914# ifdef RESFALLBACK 1067# ifdef RESFALLBACK
915 name_prefix[0] = XrmStringToName (RESFALLBACK); 1068 name_prefix[0] = XrmStringToName (RESFALLBACK);
916 name_prefix[1] = XrmStringToName ("keysym"); 1069 name_prefix[1] = XrmStringToName ("keysym");
917 class_prefix[0] = XrmStringToName (RESFALLBACK); 1070 class_prefix[0] = XrmStringToName (RESFALLBACK);
918 class_prefix[1] = XrmStringToName ("Keysym"); 1071 class_prefix[1] = XrmStringToName ("Keysym");
919 /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */ 1072 /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */
920 XrmEnumerateDatabase (XrmGetDatabase (display), name_prefix, class_prefix, 1073 XrmEnumerateDatabase (database, name_prefix, class_prefix,
921 XrmEnumOneLevel, rxvt_define_key, NULL); 1074 XrmEnumOneLevel, rxvt_define_key, NULL);
922# endif
923# endif 1075# endif
924# endif 1076# endif
925 1077
926# else /* USE_XGETDEFAULT */ 1078# else /* USE_XGETDEFAULT */
927 /* 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 {
928 FILE *fd = NULL; 1124 FILE *ad = NULL;
929 char *home;
930 1125
931 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)
932 { 1131 {
933 unsigned int i, len = STRLEN (home) + 2; 1132 get_xdefaults (ad, RESCLASS);
934 char *f = NULL; 1133 get_xdefaults (ad, "");
935
936 for (i = 0; i < (sizeof (xnames) / sizeof (xnames[0])); i++)
937 {
938 f = (char *)rxvt_realloc (f, (len + STRLEN (xnames[i])) * sizeof (char));
939
940 sprintf (f, "%s/%s", home, xnames[i]);
941
942 if ((fd = fopen (f, "r")) != NULL)
943 break;
944 }
945 free (f); 1134 fclose (ad);
946 } 1135 }
947 /*
948 * The normal order to match resources is the following:
949 * @ global resources (partial match, ~/.Xdefaults)
950 * @ application file resources (XAPPLOADDIR/Rxvt)
951 * @ class resources (~/.Xdefaults)
952 * @ private resources (~/.Xdefaults)
953 *
954 * However, for the hand-rolled resources, the matching algorithm
955 * checks if a resource string value has already been allocated
956 * and won't overwrite it with (in this case) a less specific
957 * resource value.
958 *
959 * This avoids multiple allocation. Also, when we've called this
960 * routine command-line string options have already been applied so we
961 * needn't to allocate for those resources.
962 *
963 * So, search in resources from most to least specific.
964 *
965 * Also, use a special sub-class so that we can use either or both of
966 * "XTerm" and "Rxvt" as class names.
967 */
968
969 get_xdefaults (fd, name);
970 get_xdefaults (fd, RESCLASS);
971# ifdef RESFALLBACK
972 get_xdefaults (fd, RESFALLBACK);
973# endif
974
975# if defined(XAPPLOADDIR) && defined(USE_XAPPLOADDIR)
976 {
977 FILE *ad = NULL;
978
979# if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
980 if (localepath == NULL || (ad = fopen (localepath, "r")) == NULL)
981# endif
982 ad = fopen (XAPPLOADDIR "/" RESCLASS, "r");
983 if (ad != NULL)
984 {
985 get_xdefaults (ad, RESCLASS);
986 get_xdefaults (ad, "");
987 fclose (ad);
988 }
989 } 1136 }
990# endif /* XAPPLOADDIR */ 1137# endif /* XAPPLOADDIR */
991 1138
992 get_xdefaults (fd, ""); /* partial match */ 1139 get_xdefaults (fd, ""); /* partial match */
993 if (fd != NULL) 1140 if (fd != NULL)
994 fclose (fd); 1141 fclose (fd);
995# endif /* USE_XGETDEFAULT */ 1142# endif /* USE_XGETDEFAULT */
996
997# if defined XAPPLOADDIR
998# if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
999
1000 }
1001
1002 /* Free the path of the possibly available localized Rxvt file */
1003 free (localepath);
1004# endif
1005# endif
1006 1143
1007#endif /* NO_RESOURCES */ 1144#endif /* NO_RESOURCES */
1008} 1145}
1009 1146
1010/*}}} */ 1147/*}}} */

Diff Legend

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