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.49 by root, Thu Feb 3 10:24:10 2005 UTC vs.
Revision 1.83 by root, Sat Jan 21 22:38:06 2006 UTC

… …
4 * 4 *
5 * All portions of code are copyright by their respective author/s. 5 * All portions of code are copyright by their respective author/s.
6 * Copyright (c) 1994 Robert Nation <nation@rocket.sanders.lockheed.com> 6 * Copyright (c) 1994 Robert Nation <nation@rocket.sanders.lockheed.com>
7 * - original version 7 * - original version
8 * Copyright (c) 1997,1998 mj olesen <olesen@me.queensu.ca> 8 * Copyright (c) 1997,1998 mj olesen <olesen@me.queensu.ca>
9 * Copyright (c) 2003-2004 Marc Lehmann <pcg@goof.com> 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.
… …
20 * 20 *
21 * You should have received a copy of the GNU General Public License 21 * You should have received a copy of the GNU General Public License
22 * along with this program; if not, write to the Free Software 22 * along with this program; if not, write to the Free Software
23 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 23 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
24 *----------------------------------------------------------------------*/ 24 *----------------------------------------------------------------------*/
25/*----------------------------------------------------------------------*
26 * get resources from ~/.Xdefaults or ~/.Xresources with the memory-saving
27 * default or with XGetDefault() (#define USE_XGETDEFAULT)
28 *----------------------------------------------------------------------*/
29 25
30#include "../config.h" /* NECESSARY */ 26#include "../config.h" /* NECESSARY */
31#include "rxvt.h" /* NECESSARY */ 27#include "rxvt.h" /* NECESSARY */
32#include "version.h" 28#include "version.h"
33 29
34#ifdef KEYSYM_RESOURCE 30#ifdef KEYSYM_RESOURCE
35#include "keyboard.h" 31#include "keyboard.h"
36#endif 32#endif
37 33
34/* place holders used for parsing command-line options */
35#define Optflag_Reverse 0x40000000UL
36#define Optflag_Boolean 0x80000000UL
37#define Optflag_mask 0x3fffffffUL
38
38/* #define DEBUG_RESOURCES */ 39/* #define DEBUG_RESOURCES */
39
40static const char *const xnames[2] = { ".Xdefaults", ".Xresources" };
41 40
42/*{{{ monolithic option/resource structure: */ 41/*{{{ monolithic option/resource structure: */
43/* 42/*
44 * `string' options MUST have a usage argument 43 * `string' options MUST have a usage argument
45 * `switch' and `boolean' options have no argument 44 * `switch' and `boolean' options have no argument
… …
58#define RSTRG(rsp, kw, arg) \ 57#define RSTRG(rsp, kw, arg) \
59 {0, (rsp), (kw), NULL, (arg), NULL} 58 {0, (rsp), (kw), NULL, (arg), NULL}
60 59
61/* BOOL () - regular boolean `-/+' flag */ 60/* BOOL () - regular boolean `-/+' flag */
62#define BOOL(rsp, kw, opt, flag, desc) \ 61#define BOOL(rsp, kw, opt, flag, desc) \
63 { (Opt_Boolean| (flag)), (rsp), (kw), (opt), NULL, (desc)} 62 { (Optflag_Boolean | (flag)), (rsp), (kw), (opt), NULL, (desc)}
64 63
65/* SWCH () - `-' flag */ 64/* SWCH () - `-' flag */
66#define SWCH(opt, flag, desc) \ 65#define SWCH(opt, flag, desc) \
67 { (flag), -1, NULL, (opt), NULL, (desc)} 66 { (flag), -1, NULL, (opt), NULL, (desc)}
68 67
69/* convenient macros */ 68/* convenient macros */
70#define optList_strlen(i) \ 69#define optList_strlen(i) \
71 (optList[i].flag ? 0 : (optList[i].arg ? strlen (optList[i].arg) : 1)) 70 (optList[i].flag ? 0 : (optList[i].arg ? strlen (optList[i].arg) : 1))
72#define optList_isBool(i) \ 71#define optList_isBool(i) \
73 (optList[i].flag & Opt_Boolean) 72 (optList[i].flag & Optflag_Boolean)
74#define optList_isReverse(i) \ 73#define optList_isReverse(i) \
75 (optList[i].flag & Opt_Reverse) 74 (optList[i].flag & Optflag_Reverse)
76#define optList_size() \ 75#define optList_size \
77 (sizeof (optList) / sizeof (optList[0])) 76 (sizeof (optList) / sizeof (optList[0]))
78 77
79static const struct 78static const struct
80 { 79 {
81 const unsigned long flag; /* Option flag */ 80 const unsigned long flag; /* Option flag */
… …
96 SWCH ("ic", Opt_iconic, NULL), /* short form */ 95 SWCH ("ic", Opt_iconic, NULL), /* short form */
97 BOOL (Rs_reverseVideo, "reverseVideo", "rv", Opt_reverseVideo, "reverse video"), 96 BOOL (Rs_reverseVideo, "reverseVideo", "rv", Opt_reverseVideo, "reverse video"),
98 BOOL (Rs_loginShell, "loginShell", "ls", Opt_loginShell, "login shell"), 97 BOOL (Rs_loginShell, "loginShell", "ls", Opt_loginShell, "login shell"),
99 BOOL (Rs_jumpScroll, "jumpScroll", "j", Opt_jumpScroll, "jump scrolling"), 98 BOOL (Rs_jumpScroll, "jumpScroll", "j", Opt_jumpScroll, "jump scrolling"),
100 BOOL (Rs_pastableTabs, "pastableTabs", "ptab", Opt_pastableTabs, "tab characters are pastable"), 99 BOOL (Rs_pastableTabs, "pastableTabs", "ptab", Opt_pastableTabs, "tab characters are pastable"),
101#ifdef HAVE_SCROLLBARS 100#if HAVE_SCROLLBARS
102 RSTRG (Rs_scrollstyle, "scrollstyle", "mode"), 101 RSTRG (Rs_scrollstyle, "scrollstyle", "mode"),
103 BOOL (Rs_scrollBar, "scrollBar", "sb", Opt_scrollBar, "scrollbar"), 102 BOOL (Rs_scrollBar, "scrollBar", "sb", Opt_scrollBar, "scrollbar"),
104 BOOL (Rs_scrollBar_right, "scrollBar_right", "sr", Opt_scrollBar_right, "scrollbar right"), 103 BOOL (Rs_scrollBar_right, "scrollBar_right", "sr", Opt_scrollBar_right, "scrollbar right"),
105 BOOL (Rs_scrollBar_floating, "scrollBar_floating", "st", Opt_scrollBar_floating, "scrollbar without a trough"), 104 BOOL (Rs_scrollBar_floating, "scrollBar_floating", "st", Opt_scrollBar_floating, "scrollbar without a trough"),
106 RSTRG (Rs_scrollBar_align, "scrollBar_align", "mode"), 105 RSTRG (Rs_scrollBar_align, "scrollBar_align", "mode"),
107 STRG (Rs_scrollBar_thickness, "thickness", "sbt", "number", "scrollbar thickness/width in pixels"), 106 STRG (Rs_scrollBar_thickness, "thickness", "sbt", "number", "scrollbar thickness/width in pixels"),
108#endif 107#endif
109 BOOL (Rs_scrollTtyOutput, "scrollTtyOutput", NULL, Opt_scrollTtyOutput, NULL), 108 BOOL (Rs_scrollTtyOutput, "scrollTtyOutput", NULL, Opt_scrollTtyOutput, NULL),
110 BOOL (Rs_scrollTtyOutput, NULL, "si", Opt_Reverse | Opt_scrollTtyOutput, "scroll-on-tty-output inhibit"), 109 BOOL (Rs_scrollTtyOutput, NULL, "si", Optflag_Reverse | Opt_scrollTtyOutput, "scroll-on-tty-output inhibit"),
111 BOOL (Rs_scrollTtyKeypress, "scrollTtyKeypress", "sk", Opt_scrollTtyKeypress, "scroll-on-keypress"), 110 BOOL (Rs_scrollTtyKeypress, "scrollTtyKeypress", "sk", Opt_scrollTtyKeypress, "scroll-on-keypress"),
112 BOOL (Rs_scrollWithBuffer, "scrollWithBuffer", "sw", Opt_scrollWithBuffer, "scroll-with-buffer"), 111 BOOL (Rs_scrollWithBuffer, "scrollWithBuffer", "sw", Opt_scrollWithBuffer, "scroll-with-buffer"),
113#ifdef TRANSPARENT 112#if TRANSPARENT
114 BOOL (Rs_transparent, "inheritPixmap", "ip", Opt_transparent, "inherit parent pixmap"), 113 BOOL (Rs_transparent, "inheritPixmap", "ip", Opt_transparent, "inherit parent pixmap"),
115 BOOL (Rs_transparent_all, "inheritPixmapforce", "ipf", Opt_transparent_all, "forcefully inherit root pixmap"),
116 SWCH ("tr", Opt_transparent, NULL), 114 SWCH ("tr", Opt_transparent, NULL),
115# if TINTING
116 STRG (Rs_color + Color_tint, "tintColor", "tint", "color", "tint color"),
117# endif
118#endif
119#if OFF_FOCUS_FADING
120 STRG (Rs_fade, "fading", "fade", "%", "fade colors x% percent when rxvt-unicode is losing focus"),
121 STRG (Rs_color + Color_fade, "fadeColor", "fadecolor", "color", "target color for off-focus fading"),
122#endif
117#if TINTING 123#if TINTING
118 STRG (Rs_color + Color_tint, "tintColor", "tint", "color", "tint color"),
119#endif
120#endif
121#ifdef OFF_FOCUS_FADING
122 STRG (Rs_fade, "fading", "fade", "%", "make colors x% darker when rxvt-unicode is losing focus."),
123#endif
124#ifdef TINTING
125 STRG (Rs_shade, "shading", "sh", "%", "shade background by x% when tinting."), 124 STRG (Rs_shade, "shading", "sh", "%", "shade background by x% when tinting."),
126#endif 125#endif
127 BOOL (Rs_utmpInhibit, "utmpInhibit", "ut", Opt_utmpInhibit, "utmp inhibit"), 126 BOOL (Rs_utmpInhibit, "utmpInhibit", "ut", Opt_utmpInhibit, "utmp inhibit"),
128#ifndef NO_BELL 127#ifndef NO_BELL
129 BOOL (Rs_visualBell, "visualBell", "vb", Opt_visualBell, "visual bell"), 128 BOOL (Rs_visualBell, "visualBell", "vb", Opt_visualBell, "visual bell"),
… …
138 BOOL (Rs_mouseWheelScrollPage, "mouseWheelScrollPage", NULL, Opt_mouseWheelScrollPage, NULL), 137 BOOL (Rs_mouseWheelScrollPage, "mouseWheelScrollPage", NULL, Opt_mouseWheelScrollPage, NULL),
139#endif 138#endif
140#if ENABLE_FRILLS 139#if ENABLE_FRILLS
141 BOOL (Rs_tripleclickwords, "tripleclickwords", "tcw", Opt_tripleclickwords, "triple click word selection"), 140 BOOL (Rs_tripleclickwords, "tripleclickwords", "tcw", Opt_tripleclickwords, "triple click word selection"),
142 BOOL (Rs_insecure, "insecure", "insecure", Opt_insecure, "enable possibly insecure escape sequences"), 141 BOOL (Rs_insecure, "insecure", "insecure", Opt_insecure, "enable possibly insecure escape sequences"),
142 BOOL (Rs_cursorUnderline, "cursorUnderline", "uc", Opt_cursorUnderline, "underline cursor"),
143#endif 143#endif
144#ifdef CURSOR_BLINK 144#if CURSOR_BLINK
145 BOOL (Rs_cursorBlink, "cursorBlink", "bc", Opt_cursorBlink, "blinking cursor"), 145 BOOL (Rs_cursorBlink, "cursorBlink", "bc", Opt_cursorBlink, "blinking cursor"),
146#endif 146#endif
147#ifdef POINTER_BLANK 147#ifdef POINTER_BLANK
148 BOOL (Rs_pointerBlank, "pointerBlank", "pb", Opt_pointerBlank, "switch off pointer after delay"), 148 BOOL (Rs_pointerBlank, "pointerBlank", "pb", Opt_pointerBlank, "switch off pointer after delay"),
149#endif 149#endif
… …
155 RSTRG (Rs_color + minCOLOR + 3, "color3", "color"), 155 RSTRG (Rs_color + minCOLOR + 3, "color3", "color"),
156 RSTRG (Rs_color + minCOLOR + 4, "color4", "color"), 156 RSTRG (Rs_color + minCOLOR + 4, "color4", "color"),
157 RSTRG (Rs_color + minCOLOR + 5, "color5", "color"), 157 RSTRG (Rs_color + minCOLOR + 5, "color5", "color"),
158 RSTRG (Rs_color + minCOLOR + 6, "color6", "color"), 158 RSTRG (Rs_color + minCOLOR + 6, "color6", "color"),
159 RSTRG (Rs_color + minCOLOR + 7, "color7", "color"), 159 RSTRG (Rs_color + minCOLOR + 7, "color7", "color"),
160#ifndef NO_BRIGHTCOLOR
161 RSTRG (Rs_color + minBrightCOLOR + 0, "color8", "color"), 160 RSTRG (Rs_color + minBrightCOLOR + 0, "color8", "color"),
162 RSTRG (Rs_color + minBrightCOLOR + 1, "color9", "color"), 161 RSTRG (Rs_color + minBrightCOLOR + 1, "color9", "color"),
163 RSTRG (Rs_color + minBrightCOLOR + 2, "color10", "color"), 162 RSTRG (Rs_color + minBrightCOLOR + 2, "color10", "color"),
164 RSTRG (Rs_color + minBrightCOLOR + 3, "color11", "color"), 163 RSTRG (Rs_color + minBrightCOLOR + 3, "color11", "color"),
165 RSTRG (Rs_color + minBrightCOLOR + 4, "color12", "color"), 164 RSTRG (Rs_color + minBrightCOLOR + 4, "color12", "color"),
166 RSTRG (Rs_color + minBrightCOLOR + 5, "color13", "color"), 165 RSTRG (Rs_color + minBrightCOLOR + 5, "color13", "color"),
167 RSTRG (Rs_color + minBrightCOLOR + 6, "color14", "color"), 166 RSTRG (Rs_color + minBrightCOLOR + 6, "color14", "color"),
168 RSTRG (Rs_color + minBrightCOLOR + 7, "color15", "color"), 167 RSTRG (Rs_color + minBrightCOLOR + 7, "color15", "color"),
169#endif /* NO_BRIGHTCOLOR */
170#ifndef NO_BOLD_UNDERLINE_REVERSE 168#ifndef NO_BOLD_UNDERLINE_REVERSE
171 RSTRG (Rs_color + Color_BD, "colorBD", "color"), 169 RSTRG (Rs_color + Color_BD, "colorBD", "color"),
172 RSTRG (Rs_color + Color_IT, "colorIT", "color"), 170 RSTRG (Rs_color + Color_IT, "colorIT", "color"),
173 RSTRG (Rs_color + Color_UL, "colorUL", "color"), 171 RSTRG (Rs_color + Color_UL, "colorUL", "color"),
174 RSTRG (Rs_color + Color_RV, "colorRV", "color"), 172 RSTRG (Rs_color + Color_RV, "colorRV", "color"),
… …
189 RSTRG (Rs_color + Color_cursor2, "cursorColor2", "color"), 187 RSTRG (Rs_color + Color_cursor2, "cursorColor2", "color"),
190#endif /* NO_CURSORCOLOR */ 188#endif /* NO_CURSORCOLOR */
191 STRG (Rs_color + Color_pointer_fg, "pointerColor", "pr", "color", "pointer color"), 189 STRG (Rs_color + Color_pointer_fg, "pointerColor", "pr", "color", "pointer color"),
192 STRG (Rs_color + Color_pointer_bg, "pointerColor2", "pr2", "color", "pointer bg color"), 190 STRG (Rs_color + Color_pointer_bg, "pointerColor2", "pr2", "color", "pointer bg color"),
193 STRG (Rs_color + Color_border, "borderColor", "bd", "color", "border color"), 191 STRG (Rs_color + Color_border, "borderColor", "bd", "color", "border color"),
194#if defined (XPM_BACKGROUND) || (MENUBAR_MAX) 192#ifdef XPM_BACKGROUND
195 RSTRG (Rs_path, "path", "search path"), 193 RSTRG (Rs_path, "path", "search path"),
196#endif /* defined (XPM_BACKGROUND) || (MENUBAR_MAX) */
197#ifdef XPM_BACKGROUND
198 STRG (Rs_backgroundPixmap, "backgroundPixmap", "pixmap", "file[;geom]", "background pixmap"), 194 STRG (Rs_backgroundPixmap, "backgroundPixmap", "pixmap", "file[;geom]", "background pixmap"),
199#endif /* XPM_BACKGROUND */
200#if (MENUBAR_MAX)
201 RSTRG (Rs_menu, "menu", "name[;tag]"),
202#endif 195#endif
203 /* fonts: command-line option = resource name */ 196 /* fonts: command-line option = resource name */
204 STRG (Rs_font, "font", "fn", "fontname", "normal text font"), 197 STRG (Rs_font, "font", "fn", "fontname", "normal text font"),
205#if ENABLE_STYLES 198#if ENABLE_STYLES
206 STRG (Rs_boldFont, "boldFont", "fb", "fontname", "bold font"), 199 STRG (Rs_boldFont, "boldFont", "fb", "fontname", "bold font"),
207 STRG (Rs_italicFont, "italicFont", "fi", "fontname", "italic font"), 200 STRG (Rs_italicFont, "italicFont", "fi", "fontname", "italic font"),
208 STRG (Rs_boldItalicFont, "boldItalicFont", "fbi", "fontname", "bold italic font"), 201 STRG (Rs_boldItalicFont, "boldItalicFont", "fbi", "fontname", "bold italic font"),
202 BOOL (Rs_intensityStyles, "intensityStyles", "is", Opt_intensityStyles, "font styles imply intensity changes"),
209#endif 203#endif
210#ifdef USE_XIM 204#ifdef USE_XIM
211 STRG (Rs_inputMethod, "inputMethod", "im", "name", "name of input method"), 205 STRG (Rs_inputMethod, "inputMethod", "im", "name", "name of input method"),
212 STRG (Rs_preeditType, "preeditType", "pt", "style", "input style: style = OverTheSpot|OffTheSpot|Root"), 206 STRG (Rs_preeditType, "preeditType", "pt", "style", "input style: style = OverTheSpot|OffTheSpot|Root"),
213 STRG (Rs_imLocale, "imLocale", "imlocale", "string", "locale to use for input method"), 207 STRG (Rs_imLocale, "imLocale", "imlocale", "string", "locale to use for input method"),
… …
216 STRG (Rs_name, NULL, "name", "string", "client instance, icon, and title strings"), 210 STRG (Rs_name, NULL, "name", "string", "client instance, icon, and title strings"),
217 STRG (Rs_title, "title", "title", "string", "title name for window"), 211 STRG (Rs_title, "title", "title", "string", "title name for window"),
218 STRG (Rs_title, NULL, "T", NULL, NULL), /* short form */ 212 STRG (Rs_title, NULL, "T", NULL, NULL), /* short form */
219 STRG (Rs_iconName, "iconName", "n", "string", "icon name for window"), 213 STRG (Rs_iconName, "iconName", "n", "string", "icon name for window"),
220 STRG (Rs_saveLines, "saveLines", "sl", "number", "number of scrolled lines to save"), 214 STRG (Rs_saveLines, "saveLines", "sl", "number", "number of scrolled lines to save"),
215#if ENABLE_XEMBED
216 STRG (Rs_embed, NULL, "embed", "windowid", "window id to embed terminal in"),
217#endif
221#if ENABLE_FRILLS 218#if ENABLE_FRILLS
219 RSTRG (Rs_transient_for, "transient-for", "windowid"),
220 BOOL (Rs_override_redirect, "override-redirect", "override-redirect", Opt_override_redirect, "set override-redirect on the terminal window"),
221 STRG (Rs_pty_fd, NULL, "pty-fd", "fileno", "file descriptor of pty to use"),
222 BOOL (Rs_hold, "hold", "hold", Opt_hold, "retain window after shell exit"),
222 STRG (Rs_ext_bwidth, "externalBorder", "w", "number", "external border in pixels"), 223 STRG (Rs_ext_bwidth, "externalBorder", "w", "number", "external border in pixels"),
223 STRG (Rs_ext_bwidth, NULL, "bw", NULL, NULL), 224 STRG (Rs_ext_bwidth, NULL, "bw", NULL, NULL),
224 STRG (Rs_ext_bwidth, NULL, "borderwidth", NULL, NULL), 225 STRG (Rs_ext_bwidth, NULL, "borderwidth", NULL, NULL),
225 STRG (Rs_int_bwidth, "internalBorder", "b", "number", "internal border in pixels"), 226 STRG (Rs_int_bwidth, "internalBorder", "b", "number", "internal border in pixels"),
226 BOOL (Rs_borderLess, "borderLess", "bl", Opt_borderLess, "borderless window"), 227 BOOL (Rs_borderLess, "borderLess", "bl", Opt_borderLess, "borderless window"),
228 BOOL (Rs_skipBuiltinGlyphs, "skipBuiltinGlyphs", "sbg", Opt_skipBuiltinGlyphs, "do not use internal glyphs"),
227 STRG (Rs_lineSpace, "lineSpace", "lsp", "number", "number of extra pixels between rows"), 229 STRG (Rs_lineSpace, "lineSpace", "lsp", "number", "number of extra pixels between rows"),
228#endif 230#endif
229#ifdef POINTER_BLANK 231#ifdef POINTER_BLANK
230 RSTRG (Rs_pointerBlankDelay, "pointerBlankDelay", "number"), 232 RSTRG (Rs_pointerBlankDelay, "pointerBlankDelay", "number"),
231#endif 233#endif
… …
246 RSTRG (Rs_answerbackstring, "answerbackString", "string"), 248 RSTRG (Rs_answerbackstring, "answerbackString", "string"),
247#ifndef NO_SECONDARY_SCREEN 249#ifndef NO_SECONDARY_SCREEN
248 BOOL (Rs_secondaryScreen, "secondaryScreen", "ssc", Opt_secondaryScreen, "enable secondary screen"), 250 BOOL (Rs_secondaryScreen, "secondaryScreen", "ssc", Opt_secondaryScreen, "enable secondary screen"),
249 BOOL (Rs_secondaryScroll, "secondaryScroll", "ssr", Opt_secondaryScroll, "enable secondary screen scroll"), 251 BOOL (Rs_secondaryScroll, "secondaryScroll", "ssr", Opt_secondaryScroll, "enable secondary screen scroll"),
250#endif 252#endif
251#if !defined(NO_RESOURCES) && defined(USE_XGETDEFAULT) 253#if ENABLE_PERL
254 RSTRG (Rs_perl_lib, "perl-lib", "string"), //, "colon-separated directories with extension scripts"),TODO
255 RSTRG (Rs_perl_eval, "perl-eval", "perl-eval"), // "string", "code to be evaluated after all extensions have been loaded"),TODO
256 RSTRG (Rs_perl_ext_1, "perl-ext-common", "string"), //, "colon-separated list of perl extensions to enable"),TODO
257 STRG (Rs_perl_ext_2, "perl-ext", "pe", "string", "colon-separated list of perl extensions to enable for this instance"),
258#endif
259#ifndef NO_RESOURCES
252 INFO ("xrm", "string", "X resource"), 260 INFO ("xrm", "string", "X resource"),
253#endif 261#endif
254 INFO ("e", "command arg ...", "command to execute") 262 INFO ("e", "command arg ...", "command to execute")
255 }; 263 };
256 264
… …
261#undef BOOL 269#undef BOOL
262/*}}} */ 270/*}}} */
263 271
264static const char releasestring[] = "rxvt-unicode (" RXVTNAME ") v" VERSION " - released: " DATE "\n"; 272static const char releasestring[] = "rxvt-unicode (" RXVTNAME ") v" VERSION " - released: " DATE "\n";
265static const char optionsstring[] = "options: " 273static const char optionsstring[] = "options: "
274#if ENABLE_PERL
275 "perl,"
276#endif
266#if XFT 277#if XFT
267 "xft," 278 "xft,"
268#endif 279#endif
269#if ENABLE_STYLES 280#if ENABLE_STYLES
270 "styles," 281 "styles,"
… …
307#if defined(TRANSPARENT) 318#if defined(TRANSPARENT)
308 "transparent," 319 "transparent,"
309#endif 320#endif
310#if TINTING 321#if TINTING
311 "tint," 322 "tint,"
312#endif
313#if defined(UTMP_SUPPORT)
314 "utmp,"
315#endif
316#if defined(MENUBAR)
317 "menubar,"
318#endif 323#endif
319#if defined(USE_XIM) 324#if defined(USE_XIM)
320 "XIM," 325 "XIM,"
321#endif 326#endif
322 "scrollbars=" 327 "scrollbars="
… …
353 "no_delete," 358 "no_delete,"
354#endif 359#endif
355#if EIGHT_BIT_CONTROLS 360#if EIGHT_BIT_CONTROLS
356 "8bitctrls," 361 "8bitctrls,"
357#endif 362#endif
358#if !defined(NO_STRINGS)
359 "strings,"
360#endif
361#if defined(ENABLE_FRILLS) 363#if defined(ENABLE_FRILLS)
362 "frills," 364 "frills,"
363#endif 365#endif
364#if defined(PREFER_24BIT) 366#if defined(PREFER_24BIT)
365 "24bit," 367 "24bit,"
… …
382#if defined(POINTER_BLANK) 384#if defined(POINTER_BLANK)
383 "pointerBlank," 385 "pointerBlank,"
384#endif 386#endif
385#if defined(NO_RESOURCES) 387#if defined(NO_RESOURCES)
386 "NoResources" 388 "NoResources"
387#else
388# if defined(USE_XGETDEFAULT)
389 "XGetDefaults"
390# else
391 ".Xdefaults"
392# endif
393#endif 389#endif
394 "\nUsage: "; /* Usage */ 390 "\nUsage: "; /* Usage */
395 391
396#define INDENT 18 392#define INDENT 18
397 393
… …
407 switch (type) 403 switch (type)
408 { 404 {
409 case 0: /* brief listing */ 405 case 0: /* brief listing */
410 rxvt_log (" [-help] [--help]\n"); 406 rxvt_log (" [-help] [--help]\n");
411 407
412 for (col = 1, i = 0; i < optList_size (); i++) 408 for (col = 1, i = 0; i < optList_size; i++)
413 if (optList[i].desc != NULL) 409 if (optList[i].desc != NULL)
414 { 410 {
415 int len = 0; 411 int len = 0;
416 412
417 if (!optList_isBool (i)) 413 if (!optList_isBool (i))
… …
440 break; 436 break;
441 437
442 case 1: /* full command-line listing */ 438 case 1: /* full command-line listing */
443 rxvt_log (" [options] [-e command args]\n\nwhere options include:\n"); 439 rxvt_log (" [options] [-e command args]\n\nwhere options include:\n");
444 440
445 for (i = 0; i < optList_size (); i++) 441 for (i = 0; i < optList_size; i++)
446 if (optList[i].desc != NULL) 442 if (optList[i].desc != NULL)
447 { 443 {
448#ifdef DEBUG_STRICT 444#ifdef DEBUG_STRICT
449 assert (optList[i].opt != NULL); 445 assert (optList[i].opt != NULL);
450#endif 446#endif
… …
461 457
462 case 2: /* full resource listing */ 458 case 2: /* full resource listing */
463 rxvt_log (" [options] [-e command args]\n\n" 459 rxvt_log (" [options] [-e command args]\n\n"
464 "where resources (long-options) include:\n"); 460 "where resources (long-options) include:\n");
465 461
466 for (i = 0; i < optList_size (); i++) 462 for (i = 0; i < optList_size; i++)
467 if (optList[i].kw != NULL) 463 if (optList[i].kw != NULL)
468 rxvt_log (" %s: %*s%s\n", 464 rxvt_log (" %s: %*s%s\n",
469 optList[i].kw, 465 optList[i].kw,
470 (INDENT - strlen (optList[i].kw)), "", /* XXX */ 466 (INDENT - strlen (optList[i].kw)), "", /* XXX */
471 (optList_isBool (i) ? "boolean" : optList[i].arg)); 467 (optList_isBool (i) ? "boolean" : optList[i].arg));
… …
492 int i, bad_option = 0; 488 int i, bad_option = 0;
493 static const char On[3] = "ON", Off[4] = "OFF"; 489 static const char On[3] = "ON", Off[4] = "OFF";
494 490
495 for (i = 1; i < argc; i++) 491 for (i = 1; i < argc; i++)
496 { 492 {
497 unsigned int entry, longopt = 0; 493 unsigned int entry, longopt = 0;
498 const char *flag, *opt; 494 const char *flag, *opt;
499 495
500 opt = argv[i]; 496 opt = argv[i];
501#ifdef DEBUG_RESOURCES 497#ifdef DEBUG_RESOURCES
502 fprintf (stderr, "argv[%d] = %s: ", i, opt); 498 fprintf (stderr, "argv[%d] = %s: ", i, opt);
503#endif 499#endif
… …
524 rxvt_usage (longopt ? 2 : 1); 520 rxvt_usage (longopt ? 2 : 1);
525 if (!strcmp (opt, "h")) 521 if (!strcmp (opt, "h"))
526 rxvt_usage (0); 522 rxvt_usage (0);
527 523
528 /* feature: always try to match long-options */ 524 /* feature: always try to match long-options */
529 for (entry = 0; entry < optList_size (); entry++) 525 for (entry = 0; entry < optList_size; entry++)
530 if ((optList[entry].kw && !strcmp (opt, optList[entry].kw)) 526 if ((optList[entry].kw && !strcmp (opt, optList[entry].kw))
531 || (!longopt 527 || (!longopt
532 && optList[entry].opt && !strcmp (opt, optList[entry].opt))) 528 && optList[entry].opt && !strcmp (opt, optList[entry].opt)))
533 break; 529 break;
534 530
535 if (entry < optList_size ()) 531 if (entry < optList_size)
536 { 532 {
537 if (optList_isReverse (entry)) 533 if (optList_isReverse (entry))
538 flag = flag == On ? Off : On; 534 flag = flag == On ? Off : On;
539 535
540 if (optList_strlen (entry)) 536 if (optList_strlen (entry))
… …
553 { /* boolean value */ 549 { /* boolean value */
554#ifdef DEBUG_RESOURCES 550#ifdef DEBUG_RESOURCES
555 fprintf (stderr, "boolean (%s,%s) = %s\n", 551 fprintf (stderr, "boolean (%s,%s) = %s\n",
556 optList[entry].opt, optList[entry].kw, flag); 552 optList[entry].opt, optList[entry].kw, flag);
557#endif 553#endif
558 if (flag == On) 554 set_option (optList[entry].flag & Optflag_mask, flag == On);
559 options |= (optList[entry].flag);
560 else
561 options &= ~ (optList[entry].flag);
562 555
563 if (optList[entry].doff != -1) 556 if (optList[entry].doff != -1)
564 rs[optList[entry].doff] = flag; 557 rs[optList[entry].doff] = flag;
565 } 558 }
566 } 559 }
… …
598 * "rxvt" "keysym" "0xFF01" 591 * "rxvt" "keysym" "0xFF01"
599 * value will be a string 592 * value will be a string
600 */ 593 */
601/* ARGSUSED */ 594/* ARGSUSED */
602int 595int
603rxvt_define_key (XrmDatabase *database __attribute__((unused)), 596rxvt_define_key (XrmDatabase *database UNUSED,
604 XrmBindingList bindings __attribute__((unused)), 597 XrmBindingList bindings UNUSED,
605 XrmQuarkList quarks, 598 XrmQuarkList quarks,
606 XrmRepresentation *type __attribute__((unused)), 599 XrmRepresentation *type UNUSED,
607 XrmValue *value, 600 XrmValue *value,
608 XPointer closure __attribute__((unused))) 601 XPointer closure UNUSED)
609{ 602{
610 int last; 603 int last;
611 604
612 for (last = 0; quarks[last] != NULLQUARK; last++) /* look for last quark in list */ 605 for (last = 0; quarks[last] != NULLQUARK; last++) /* look for last quark in list */
613 ; 606 ;
… …
675 { 668 {
676 if ((n = rxvt_Str_match (str, "keysym.")) == 0) 669 if ((n = rxvt_Str_match (str, "keysym.")) == 0)
677 return 0; 670 return 0;
678 671
679 str += n; /* skip `keysym.' */ 672 str += n; /* skip `keysym.' */
680 if ((pmodend = strchr (str, ':')) < str) 673 if (!(pmodend = strchr (str, ':')))
681 return -1; 674 return -1;
682 } 675 }
683 else 676 else
684 pmodend = str + strlen(str); 677 pmodend = str + strlen(str);
685 678
… …
763 keyboard->register_user_translation (sym, state, newarg); 756 keyboard->register_user_translation (sym, state, newarg);
764 return 1; 757 return 1;
765} 758}
766 759
767# endif /* KEYSYM_RESOURCE */ 760# endif /* KEYSYM_RESOURCE */
761#endif /* NO_RESOURCES */
768 762
769# ifndef USE_XGETDEFAULT 763static char *
770/*{{{ rxvt_get_xdefaults () */ 764get_res (XrmDatabase database, const char *program, const char *option)
771/* 765{
772 * the matching algorithm used for memory-save fake resources 766 char resource[512];
773 */ 767 char *type;
768 XrmValue result;
769
770 snprintf (resource, sizeof (resource), "%s.%s", program, option);
771 XrmGetResource (database, resource, resource, &type, &result);
772
773 return result.addr;
774}
775
776const char *
777rxvt_term::x_resource (const char *name)
778{
779 XrmDatabase database = XrmGetDatabase (display->display);
780
781 const char *p = get_res (database, rs[Rs_name], name);
782 const char *p0 = get_res (database, "!INVALIDPROGRAMMENAMEDONTMATCH!", name);
783
784 if (p == NULL || (p0 && strcmp (p, p0) == 0))
785 {
786 p = get_res (database, RESCLASS, name);
787#ifdef RESFALLBACK
788 if (p == NULL || (p0 && strcmp (p, p0) == 0))
789 p = get_res (database, RESFALLBACK, name);
790#endif
791 }
792
793 if (p == NULL && p0)
794 p = p0;
795
796 return p;
797}
798
774void 799void
775rxvt_term::get_xdefaults (FILE *stream, const char *name) 800rxvt_term::extract_resources ()
776{
777 unsigned int len;
778 char *str, buffer[256];
779
780 if (stream == NULL)
781 return;
782
783 len = strlen (name);
784 while ((str = fgets (buffer, sizeof (buffer), stream)) != NULL)
785 {
786 unsigned int entry, n;
787
788 while (*str && isspace (*str))
789 str++; /* leading whitespace */
790
791 if ((str[len] != '*' && str[len] != '.')
792 || (len && strncmp (str, name, len)))
793 continue;
794 str += (len + 1); /* skip `name*' or `name.' */
795
796# ifdef KEYSYM_RESOURCE
797 if (!parse_keysym (str, NULL))
798# endif /* KEYSYM_RESOURCE */
799 for (entry = 0; entry < optList_size (); entry++)
800 {
801 const char *kw = optList[entry].kw;
802
803 if (kw == NULL)
804 continue;
805
806 n = strlen (kw);
807 if (str[n] == ':' && rxvt_Str_match (str, kw))
808 {
809 /* skip `keyword:' */
810 str += n + 1;
811 rxvt_Str_trim (str);
812 n = strlen (str);
813 if (n && rs[optList[entry].doff] == NULL)
814 {
815 /* not already set */
816 int s;
817 char *p = 0;
818
819 for (int o = 0;;)
820 {
821 p = (char *)rxvt_realloc (p, o + n + 1);
822 memcpy (p + o, str, n);
823 o += n;
824 p[o] = 0;
825
826 if (o == 0 || p[o - 1] != '\\') // continuation line
827 break;
828
829 o--; // eat "\"
830
831 if ((str = fgets (buffer, sizeof (buffer), stream)) == NULL)
832 break;
833
834 rxvt_Str_trim (str);
835 n = strlen (str);
836 }
837
838 rs[optList[entry].doff] = p;
839 allocated.push_back (p);
840
841 if (optList_isBool (entry))
842 {
843 s = strcasecmp (str, "TRUE") == 0
844 || strcasecmp (str, "YES") == 0
845 || strcasecmp (str, "ON") == 0
846 || strcasecmp (str, "1") == 0;
847
848 if (optList_isReverse (entry))
849 s = !s;
850
851 if (s)
852 options |= optList[entry].flag;
853 else
854 options &= ~optList[entry].flag;
855 }
856 }
857
858 break;
859 }
860 }
861 }
862
863 rewind (stream);
864}
865
866/*}}} */
867# endif /* ! USE_XGETDEFAULT */
868#endif /* NO_RESOURCES */
869
870/*{{{ read the resources files */
871/*
872 * using XGetDefault () or the hand-rolled replacement
873 */
874/* ARGSUSED */
875void
876rxvt_term::extract_resources (Display *display __attribute__ ((unused)), const char *name)
877{ 801{
878#ifndef NO_RESOURCES 802#ifndef NO_RESOURCES
879
880# if defined XAPPLOADDIR
881# if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
882 /* Compute the path of the possibly available localized Rxvt file */
883 char *localepath = NULL;
884
885 if (locale != NULL)
886 { /* XXX: must limit length of string */
887 localepath = (char *)rxvt_malloc (256);
888 sprintf (localepath, XAPPLOADDIRLOCALE "/" RESCLASS,
889 (int) (258 - sizeof (XAPPLOADDIRLOCALE) - sizeof (RESCLASS)),
890 locale); /* 258 = 255 + 4 (-.*s) - 1 (/) */
891 }
892
893 {
894# endif
895# endif
896
897# ifdef USE_XGETDEFAULT
898 /* 803 /*
899 * get resources using the X library function 804 * Query resources for options that affect us
900 */ 805 */
901 int entry; 806 for (int entry = 0; entry < optList_size; entry++)
902
903# ifdef XrmEnumOneLevel
904 int i;
905 char *displayResource, *xe;
906 XrmName name_prefix[3];
907 XrmClass class_prefix[3];
908 XrmDatabase database, rdb1;
909 char fname[1024];
910
911 XrmInitialize ();
912 database = NULL;
913
914 /* Get any Xserver defaults */
915
916 displayResource = XResourceManagerString (display);
917 if (displayResource != NULL)
918 database = XrmGetStringDatabase (displayResource);
919
920# ifdef HAVE_EXTRA_XRESOURCE_FILES
921 /* Add in ~/.Xdefaults or ~/.Xresources */
922 { 807 {
923 char *ptr; 808 int s;
809 const char *kw = optList[entry].kw;
924 810
925 if ((ptr = (char *)getenv ("HOME")) == NULL) 811 if (kw == NULL || rs[optList[entry].doff] != NULL)
926 ptr = "."; 812 continue; // previously set
927 813
928 for (i = 0; i < (sizeof (xnames) / sizeof (xnames[0])); i++) 814 const char *p = x_resource (kw);
815
816 if (p)
929 { 817 {
930 sprintf (fname, "%-.*s/%s", sizeof (fname) - strlen (xnames[i]) - 2, 818 p = strdup (p);
931 ptr, xnames[i]); 819 allocated.push_back ((void *)p);
932 if ((rdb1 = XrmGetFileDatabase (fname))) 820 rs[optList[entry].doff] = p;
821
822 if (optList_isBool (entry))
933 { 823 {
934 XrmMergeDatabases (rdb1, &database); 824 s = strcasecmp (p, "TRUE") == 0
935# ifndef HAVE_BOTH_XRESOURCE_FILES 825 || strcasecmp (p, "YES") == 0
936 break; 826 || strcasecmp (p, "ON") == 0
937# endif 827 || strcasecmp (p, "1") == 0;
828
829 if (optList_isReverse (entry))
830 s = !s;
831
832 set_option (optList[entry].flag & Optflag_mask, s);
938 } 833 }
939 } 834 }
940 } 835 }
941# endif
942 836
943 /* Add in XENVIRONMENT file */
944
945 if ((xe = (char *)getenv ("XENVIRONMENT")) != NULL
946 && (rdb1 = XrmGetFileDatabase (xe)) != NULL)
947 XrmMergeDatabases (rdb1, &database);
948
949 /* Add in Rxvt file */
950# if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
951 if (localepath == NULL || (rdb1 = XrmGetFileDatabase (localepath)) == NULL)
952# endif
953 rdb1 = XrmGetFileDatabase (XAPPLOADDIR "/" RESCLASS);
954
955 if (rdb1 != NULL)
956 XrmMergeDatabases (rdb1, &database);
957
958 /* Add in $XAPPLRESDIR/Rxvt only; not bothering with XUSERFILESEARCHPATH */
959 if ((xe = (char *)getenv ("XAPPLRESDIR")) != NULL)
960 {
961 sprintf (fname, "%-.*s/" RESCLASS, sizeof (fname)
962 - sizeof (RESCLASS) - 2, xe);
963 if ((rdb1 = XrmGetFileDatabase (fname)) != NULL)
964 XrmMergeDatabases (rdb1, &database);
965 }
966
967 XrmSetDatabase (display, database);
968# endif
969
970 /* 837 /*
971 * Query resources for options that affect us
972 */
973 for (entry = 0; entry < optList_size (); entry++)
974 {
975 int s;
976 char *p, *p0;
977 const char *kw = optList[entry].kw;
978
979 if (kw == NULL || rs[optList[entry].doff] != NULL)
980 continue; /* previously set */
981
982 p = XGetDefault (display, name, kw);
983 p0 = XGetDefault (display, "!INVALIDPROGRAMMENAMEDONTMATCH!", kw);
984 if (p == NULL || (p0 && strcmp (p, p0) == 0))
985 {
986 p = XGetDefault (display, RESCLASS, kw);
987#ifdef RESFALLBACK
988 if (p == NULL || (p0 && strcmp (p, p0) == 0))
989 p = XGetDefault (display, RESFALLBACK, kw);
990#endif
991 }
992
993 if (p == NULL && p0)
994 p = p0;
995
996 if (p)
997 {
998 rs[optList[entry].doff] = p;
999
1000 if (optList_isBool (entry))
1001 {
1002 s = strcasecmp (p, "TRUE") == 0
1003 || strcasecmp (p, "YES") == 0
1004 || strcasecmp (p, "ON") == 0
1005 || strcasecmp (p, "1") == 0;
1006 if (optList_isReverse (entry))
1007 s = !s;
1008 if (s)
1009 options |= (optList[entry].flag);
1010 else
1011 options &= ~ (optList[entry].flag);
1012 }
1013 }
1014 }
1015
1016 /*
1017 * [R5 or later]: enumerate the resource database 838 * [R5 or later]: enumerate the resource database
1018 */ 839 */
1019# ifdef XrmEnumOneLevel
1020# ifdef KEYSYM_RESOURCE 840# ifdef KEYSYM_RESOURCE
841 XrmDatabase database = XrmGetDatabase (display->display);
842 XrmName name_prefix[3];
843 XrmClass class_prefix[3];
844
1021 name_prefix[0] = XrmStringToName (name); 845 name_prefix[0] = XrmStringToName (rs[Rs_name]);
1022 name_prefix[1] = XrmStringToName ("keysym"); 846 name_prefix[1] = XrmStringToName ("keysym");
1023 name_prefix[2] = NULLQUARK; 847 name_prefix[2] = NULLQUARK;
1024 class_prefix[0] = XrmStringToName (RESCLASS); 848 class_prefix[0] = XrmStringToName (RESCLASS);
1025 class_prefix[1] = XrmStringToName ("Keysym"); 849 class_prefix[1] = XrmStringToName ("Keysym");
1026 class_prefix[2] = NULLQUARK; 850 class_prefix[2] = NULLQUARK;
1027 /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */ 851 /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */
1028 XrmEnumerateDatabase (XrmGetDatabase (display), name_prefix, class_prefix, 852 XrmEnumerateDatabase (database, name_prefix, class_prefix,
1029 XrmEnumOneLevel, rxvt_define_key, NULL); 853 XrmEnumOneLevel, rxvt_define_key, NULL);
1030# ifdef RESFALLBACK 854# ifdef RESFALLBACK
1031 name_prefix[0] = XrmStringToName (RESFALLBACK); 855 name_prefix[0] = XrmStringToName (RESFALLBACK);
1032 name_prefix[1] = XrmStringToName ("keysym"); 856 name_prefix[1] = XrmStringToName ("keysym");
1033 class_prefix[0] = XrmStringToName (RESFALLBACK); 857 class_prefix[0] = XrmStringToName (RESFALLBACK);
1034 class_prefix[1] = XrmStringToName ("Keysym"); 858 class_prefix[1] = XrmStringToName ("Keysym");
1035 /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */ 859 /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */
1036 XrmEnumerateDatabase (XrmGetDatabase (display), name_prefix, class_prefix, 860 XrmEnumerateDatabase (database, name_prefix, class_prefix,
1037 XrmEnumOneLevel, rxvt_define_key, NULL); 861 XrmEnumOneLevel, rxvt_define_key, NULL);
1038# endif
1039# endif 862# endif
1040# endif 863# endif
1041 864
1042# else /* USE_XGETDEFAULT */
1043 /* get resources the hard way, but save lots of memory */
1044 FILE *fd = NULL;
1045 char *home;
1046
1047 if ((home = getenv ("HOME")) != NULL)
1048 {
1049 unsigned int i, len = strlen (home) + 2;
1050 char *f = NULL;
1051
1052 for (i = 0; i < (sizeof (xnames) / sizeof (xnames[0])); i++)
1053 {
1054 f = (char *)rxvt_realloc (f, len + strlen (xnames[i]));
1055
1056 sprintf (f, "%s/%s", home, xnames[i]);
1057
1058 if ((fd = fopen (f, "r")) != NULL)
1059 break;
1060 }
1061
1062 free (f);
1063 }
1064 /*
1065 * The normal order to match resources is the following:
1066 * @ global resources (partial match, ~/.Xdefaults)
1067 * @ application file resources (XAPPLOADDIR/Rxvt)
1068 * @ class resources (~/.Xdefaults)
1069 * @ private resources (~/.Xdefaults)
1070 *
1071 * However, for the hand-rolled resources, the matching algorithm
1072 * checks if a resource string value has already been allocated
1073 * and won't overwrite it with (in this case) a less specific
1074 * resource value.
1075 *
1076 * This avoids multiple allocation. Also, when we've called this
1077 * routine command-line string options have already been applied so we
1078 * needn't to allocate for those resources.
1079 *
1080 * So, search in resources from most to least specific.
1081 *
1082 * Also, use a special sub-class so that we can use either or both of
1083 * "XTerm" and "Rxvt" as class names.
1084 */
1085
1086 get_xdefaults (fd, name);
1087 get_xdefaults (fd, RESCLASS);
1088# ifdef RESFALLBACK
1089 get_xdefaults (fd, RESFALLBACK);
1090# endif
1091
1092# if defined(XAPPLOADDIR) && defined(USE_XAPPLOADDIR)
1093 {
1094 FILE *ad = NULL;
1095
1096# if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1097 if (localepath == NULL || (ad = fopen (localepath, "r")) == NULL)
1098# endif
1099 ad = fopen (XAPPLOADDIR "/" RESCLASS, "r");
1100 if (ad != NULL)
1101 {
1102 get_xdefaults (ad, RESCLASS);
1103 get_xdefaults (ad, "");
1104 fclose (ad);
1105 }
1106 }
1107# endif /* XAPPLOADDIR */
1108
1109 get_xdefaults (fd, ""); /* partial match */
1110 if (fd != NULL)
1111 fclose (fd);
1112# endif /* USE_XGETDEFAULT */
1113
1114# if defined XAPPLOADDIR
1115# if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1116
1117 }
1118
1119 /* Free the path of the possibly available localized Rxvt file */
1120 free (localepath);
1121# endif
1122# endif
1123
1124#endif /* NO_RESOURCES */ 865#endif /* NO_RESOURCES */
1125} 866}
1126 867
1127/*}}} */
1128/*----------------------- end-of-file (C source) -----------------------*/ 868/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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