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

Diff Legend

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