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.15 by pcg, Wed Mar 3 04:07:52 2004 UTC vs.
Revision 1.56 by root, Thu Feb 17 15:07:48 2005 UTC

1/*--------------------------------*-C-*---------------------------------* 1/*--------------------------------*-C-*---------------------------------*
2 * File: xdefaults.c 2 * File: xdefaults.C
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * $Id: xdefaults.C,v 1.15 2004/03/03 04:07:52 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"),
223 STRG (Rs_pty_fd, NULL, "pty-fd", "fileno", "file descriptor of pty to use"),
215 STRG (Rs_ext_bwidth, "externalBorder", "w", "number", 224 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), 225 STRG (Rs_ext_bwidth, NULL, "bw", NULL, NULL),
218 STRG (Rs_ext_bwidth, NULL, "borderwidth", NULL, NULL), 226 STRG (Rs_ext_bwidth, NULL, "borderwidth", NULL, NULL),
219 STRG (Rs_int_bwidth, "internalBorder", "b", "number", 227 STRG (Rs_int_bwidth, "internalBorder", "b", "number", "internal border in pixels"),
220 "internal border in pixels"), 228 BOOL (Rs_borderLess, "borderLess", "bl", Opt_borderLess, "borderless window"),
221#endif
222#ifndef NO_LINESPACE
223 STRG (Rs_lineSpace, "lineSpace", "lsp", "number", 229 STRG (Rs_lineSpace, "lineSpace", "lsp", "number", "number of extra pixels between rows"),
224 "number of extra pixels between rows"),
225#endif 230#endif
226 STRG (Rs_scrollBar_thickness, "thickness", "sbt", "number",
227 "scrollbar thickness/width in pixels"),
228#ifdef POINTER_BLANK 231#ifdef POINTER_BLANK
229 RSTRG (Rs_pointerBlankDelay, "pointerBlankDelay", "number"), 232 RSTRG (Rs_pointerBlankDelay, "pointerBlankDelay", "number"),
230#endif 233#endif
231#ifndef NO_BACKSPACE_KEY 234#ifndef NO_BACKSPACE_KEY
232 RSTRG (Rs_backspace_key, "backspacekey", "string"), 235 RSTRG (Rs_backspace_key, "backspacekey", "string"),
233#endif 236#endif
234#ifndef NO_DELETE_KEY 237#ifndef NO_DELETE_KEY
235 RSTRG (Rs_delete_key, "deletekey", "string"), 238 RSTRG (Rs_delete_key, "deletekey", "string"),
236#endif 239#endif
237 RSTRG (Rs_selectstyle, "selectstyle", "mode"), 240 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 241#ifdef PRINTPIPE
243 RSTRG (Rs_print_pipe, "print-pipe", "string"), 242 RSTRG (Rs_print_pipe, "print-pipe", "string"),
244#endif 243#endif
245#if defined (HOTKEY_CTRL) || defined (HOTKEY_META) 244 STRG (Rs_modifier, "modifier", "mod", "modifier", "meta modifier = alt|meta|hyper|super|mod1|...|mod5"),
246 RSTRG (Rs_bigfont_key, "bigfont_key", "keysym"),
247 RSTRG (Rs_smallfont_key, "smallfont_key", "keysym"),
248#endif
249 STRG (Rs_modifier, "modifier", "mod", "modifier",
250 "meta modifier = alt|meta|hyper|super|mod1|...|mod5"),
251 INFO ("xrm", "string", "X resource"),
252#ifdef CUTCHAR_RESOURCE 245#ifdef CUTCHAR_RESOURCE
253 RSTRG (Rs_cutchars, "cutchars", "string"), 246 RSTRG (Rs_cutchars, "cutchars", "string"),
254#endif /* CUTCHAR_RESOURCE */ 247#endif /* CUTCHAR_RESOURCE */
255#ifdef ACS_ASCII
256 RSTRG (Rs_acs_chars, "acsChars", "string"),
257#endif /* ACS_ASCII */
258 RSTRG (Rs_answerbackstring, "answerbackString", "string"), 248 RSTRG (Rs_answerbackstring, "answerbackString", "string"),
249#ifndef NO_SECONDARY_SCREEN
250 BOOL (Rs_secondaryScreen, "secondaryScreen", "ssc", Opt_secondaryScreen, "enable secondary screen"),
251 BOOL (Rs_secondaryScroll, "secondaryScroll", "ssr", Opt_secondaryScroll, "enable secondary screen scroll"),
252#endif
253#if 0 && TODO
254#if !defined(NO_RESOURCES) && defined(USE_XGETDEFAULT)
255 INFO ("xrm", "string", "X resource"),
256#endif
257#endif
259 INFO ("e", "command arg ...", "command to execute") 258 INFO ("e", "command arg ...", "command to execute")
260 }; 259 };
261 260
262#undef INFO 261#undef INFO
263#undef STRG 262#undef STRG
264#undef RSTRG 263#undef RSTRG
265#undef SWCH 264#undef SWCH
266#undef BOOL 265#undef BOOL
267/*}}} */ 266/*}}} */
268 267
269static const char releasestring[] = "Rxvt v" VERSION " - released: " DATE "\n"; 268static const char releasestring[] = "rxvt-unicode (" RXVTNAME ") v" VERSION " - released: " DATE "\n";
270static const char optionsstring[] = "Options: " 269static const char optionsstring[] = "options: "
270#if XFT
271 "xft,"
272#endif
273#if ENABLE_STYLES
274 "styles,"
275#endif
276#if ENABLE_COMBINING
277 "combining,"
278#endif
279#if TEXT_BLINK
280 "blink,"
281#endif
282#if ISO_14755
283 "iso14755,"
284#endif
285#if UNICODE_3
286 "unicode3,"
287#endif
288 "encodings=eu+vn"
289#if ENCODING_JP
290 "+jp"
291#endif
292#if ENCODING_JP_EXT
293 "+jp-ext"
294#endif
295#if ENCODING_KR
296 "+kr"
297#endif
298#if ENCODING_ZH
299 "+zh"
300#endif
301#if ENCODING_ZH_EXT
302 "+zh-ext"
303#endif
304 ","
305#if OFF_FOCUS_FADING
306 "fade,"
307#endif
271#if defined(XPM_BACKGROUND) 308#if defined(XPM_BACKGROUND)
272 "XPM," 309 "XPM,"
273#endif 310#endif
274#if defined(TRANSPARENT) 311#if defined(TRANSPARENT)
275 "transparent," 312 "transparent,"
276#endif 313#endif
314#if TINTING
315 "tint,"
316#endif
277#if defined(UTMP_SUPPORT) 317#if defined(UTMP_SUPPORT)
278 "utmp," 318 "utmp,"
279#endif 319#endif
280#if defined(MENUBAR) 320#if defined(MENUBAR)
281 "menubar," 321 "menubar,"
282#endif
283#if !defined(NO_FRILLS)
284 "frills,"
285#endif
286#if !defined(NO_LINESPACE)
287 "linespace,"
288#endif
289#if defined(PREFER_24BIT)
290 "24bit,"
291#endif 322#endif
292#if defined(USE_XIM) 323#if defined(USE_XIM)
293 "XIM," 324 "XIM,"
294#endif 325#endif
295 "scrollbars=" 326 "scrollbars="
… …
323 "no_backspace," 354 "no_backspace,"
324#endif 355#endif
325#if defined(NO_DELETE_KEY) 356#if defined(NO_DELETE_KEY)
326 "no_delete," 357 "no_delete,"
327#endif 358#endif
359#if EIGHT_BIT_CONTROLS
360 "8bitctrls,"
361#endif
328#if !defined(NO_STRINGS) 362#if !defined(NO_STRINGS)
329 "strings," 363 "strings,"
330#endif 364#endif
331#if defined(TTY_256COLOR) 365#if defined(ENABLE_FRILLS)
366 "frills,"
367#endif
368#if defined(PREFER_24BIT)
332 "256colour," 369 "24bit,"
370#endif
371#if defined(SELECTION_SCROLLING)
372 "selectionscrolling,"
373#endif
374#if MOUSE_WHEEL
375 "wheel,"
376#endif
377#if MOUSE_SLIP_WHEELING
378 "slipwheel,"
379#endif
380#if defined(SMART_RESIZE)
381 "smart-resize,"
382#endif
383#if defined(CURSOR_BLINK)
384 "cursorBlink,"
385#endif
386#if defined(POINTER_BLANK)
387 "pointerBlank,"
333#endif 388#endif
334#if defined(NO_RESOURCES) 389#if defined(NO_RESOURCES)
335 "NoResources" 390 "NoResources"
336#else 391#else
337# if defined(USE_XGETDEFAULT) 392# if defined(USE_XGETDEFAULT)
… …
347/*{{{ usage: */ 402/*{{{ usage: */
348/*----------------------------------------------------------------------*/ 403/*----------------------------------------------------------------------*/
349static void 404static void
350rxvt_usage (int type) 405rxvt_usage (int type)
351{ 406{
352 unsigned int i, col; 407 unsigned int i, col;
353 408
354 write (STDERR_FILENO, releasestring, sizeof (releasestring) - 1); 409 rxvt_log ("%s%s%s", releasestring, optionsstring, RESNAME);
355 write (STDERR_FILENO, optionsstring, sizeof (optionsstring) - 1);
356 write (STDERR_FILENO, RESNAME, sizeof (RESNAME) - 1);
357 410
358 switch (type) 411 switch (type)
359 { 412 {
360 case 0: /* brief listing */ 413 case 0: /* brief listing */
361 fprintf (stderr, " [-help] [--help]\n"); 414 rxvt_log (" [-help] [--help]\n");
415
362 for (col = 1, i = 0; i < optList_size (); i++) 416 for (col = 1, i = 0; i < optList_size; i++)
363 if (optList[i].desc != NULL) 417 if (optList[i].desc != NULL)
364 { 418 {
365 int len = 0; 419 int len = 0;
366 420
367 if (!optList_isBool (i)) 421 if (!optList_isBool (i))
… …
371 len++; /* account for space */ 425 len++; /* account for space */
372 } 426 }
373#ifdef DEBUG_STRICT 427#ifdef DEBUG_STRICT
374 assert (optList[i].opt != NULL); 428 assert (optList[i].opt != NULL);
375#endif 429#endif
376 len += 4 + STRLEN (optList[i].opt) + (optList_isBool (i) ? 2: 0); 430 len += 4 + strlen (optList[i].opt) + (optList_isBool (i) ? 2: 0);
377 col += len; 431 col += len;
378 if (col > 79) 432 if (col > 79)
379 { /* assume regular width */ 433 { /* assume regular width */
380 putc ('\n', stderr); 434 rxvt_log ("\n");
381 col = 1 + len; 435 col = 1 + len;
382 } 436 }
437
383 fprintf (stderr, " [-%s%s", (optList_isBool (i) ? "/+" : ""), 438 rxvt_log (" [-%s%s", (optList_isBool (i) ? "/+" : ""), optList[i].opt);
384 optList[i].opt);
385 if (optList_strlen (i)) 439 if (optList_strlen (i))
386 fprintf (stderr, " %s]", optList[i].arg); 440 rxvt_log (" %s]", optList[i].arg);
387 else 441 else
388 fprintf (stderr, "]"); 442 rxvt_log ("]");
389 } 443 }
390 break; 444 break;
391 445
392 case 1: /* full command-line listing */ 446 case 1: /* full command-line listing */
393 fprintf (stderr, " [options] [-e command args]\n\n" 447 rxvt_log (" [options] [-e command args]\n\nwhere options include:\n");
394 "where options include:\n"); 448
395 for (i = 0; i < optList_size (); i++) 449 for (i = 0; i < optList_size; i++)
396 if (optList[i].desc != NULL) 450 if (optList[i].desc != NULL)
397 { 451 {
398#ifdef DEBUG_STRICT 452#ifdef DEBUG_STRICT
399 assert (optList[i].opt != NULL); 453 assert (optList[i].opt != NULL);
400#endif 454#endif
401 fprintf (stderr, " %s%s %-*s%s%s\n", 455 rxvt_log (" %s%s %-*s%s%s\n",
402 (optList_isBool (i) ? "-/+" : "-"), optList[i].opt, 456 (optList_isBool (i) ? "-/+" : "-"), optList[i].opt,
403 (INDENT - STRLEN (optList[i].opt) 457 (INDENT - strlen (optList[i].opt)
404 + (optList_isBool (i) ? 0 : 2)), 458 + (optList_isBool (i) ? 0 : 2)),
405 (optList[i].arg ? optList[i].arg : ""), 459 (optList[i].arg ? optList[i].arg : ""),
406 (optList_isBool (i) ? "turn on/off " : ""), 460 (optList_isBool (i) ? "turn on/off " : ""),
407 optList[i].desc); 461 optList[i].desc);
408 } 462 }
409 fprintf (stderr, "\n --help to list long-options"); 463 rxvt_log ("\n --help to list long-options");
410 break; 464 break;
411 465
412 case 2: /* full resource listing */ 466 case 2: /* full resource listing */
413 fprintf (stderr,
414 " [options] [-e command args]\n\n" 467 rxvt_log (" [options] [-e command args]\n\n"
415 "where resources (long-options) include:\n"); 468 "where resources (long-options) include:\n");
416 469
417 for (i = 0; i < optList_size (); i++) 470 for (i = 0; i < optList_size; i++)
418 if (optList[i].kw != NULL) 471 if (optList[i].kw != NULL)
419 fprintf (stderr, " %s: %*s%s\n", 472 rxvt_log (" %s: %*s%s\n",
420 optList[i].kw, 473 optList[i].kw,
421 (INDENT - STRLEN (optList[i].kw)), "", /* XXX */ 474 (INDENT - strlen (optList[i].kw)), "", /* XXX */
422 (optList_isBool (i) ? "boolean" : optList[i].arg)); 475 (optList_isBool (i) ? "boolean" : optList[i].arg));
423#ifdef KEYSYM_RESOURCE 476#ifdef KEYSYM_RESOURCE
424 fprintf (stderr, " " "keysym.sym" ": %*s%s\n", 477 rxvt_log (" " "keysym.sym" ": %*s%s\n",
425 (INDENT - sizeof ("keysym.sym") + 1), "", /* XXX */ 478 (INDENT - sizeof ("keysym.sym") + 1), "", /* XXX */
426 "keysym"); 479 "keysym");
427#endif 480#endif
428 fprintf (stderr, "\n -help to list options"); 481 rxvt_log ("\n -help to list options");
429 break; 482 break;
430 } 483 }
431 fprintf (stderr, "\n\n"); 484
432 exit (EXIT_FAILURE); 485 rxvt_log ("\n\n");
486 rxvt_exit_failure ();
433 /* NOTREACHED */ 487 /* NOTREACHED */
434} 488}
435 489
436/*}}} */ 490/*}}} */
437 491
… …
442 int i, bad_option = 0; 496 int i, bad_option = 0;
443 static const char On[3] = "ON", Off[4] = "OFF"; 497 static const char On[3] = "ON", Off[4] = "OFF";
444 498
445 for (i = 1; i < argc; i++) 499 for (i = 1; i < argc; i++)
446 { 500 {
447 unsigned int entry, longopt = 0; 501 unsigned int entry, longopt = 0;
448 const char *flag, *opt; 502 const char *flag, *opt;
449 503
450 opt = argv[i]; 504 opt = argv[i];
451#ifdef DEBUG_RESOURCES 505#ifdef DEBUG_RESOURCES
452 fprintf (stderr, "argv[%d] = %s: ", i, opt); 506 fprintf (stderr, "argv[%d] = %s: ", i, opt);
453#endif 507#endif
… …
464 longopt = *opt++; /* long option */ 518 longopt = *opt++; /* long option */
465 } 519 }
466 else 520 else
467 { 521 {
468 bad_option = 1; 522 bad_option = 1;
469 rxvt_print_error ("bad option \"%s\"", opt); 523 rxvt_warn ("\"%s\": malformed option.\n", opt);
470 continue; 524 continue;
471 } 525 }
472 526
473 if (!STRCMP (opt, "help")) 527 if (!strcmp (opt, "help"))
474 rxvt_usage (longopt ? 2 : 1); 528 rxvt_usage (longopt ? 2 : 1);
475 if (!STRCMP (opt, "h")) 529 if (!strcmp (opt, "h"))
476 rxvt_usage (0); 530 rxvt_usage (0);
477 531
478 /* feature: always try to match long-options */ 532 /* feature: always try to match long-options */
479 for (entry = 0; entry < optList_size (); entry++) 533 for (entry = 0; entry < optList_size; entry++)
480 if ((optList[entry].kw && !STRCMP (opt, optList[entry].kw)) 534 if ((optList[entry].kw && !strcmp (opt, optList[entry].kw))
481 || (!longopt 535 || (!longopt
482 && optList[entry].opt && !STRCMP (opt, optList[entry].opt))) 536 && optList[entry].opt && !strcmp (opt, optList[entry].opt)))
483 break; 537 break;
484 538
485 if (entry < optList_size ()) 539 if (entry < optList_size)
486 { 540 {
487 if (optList_isReverse (entry)) 541 if (optList_isReverse (entry))
488 flag = flag == On ? Off : On; 542 flag = flag == On ? Off : On;
543
489 if (optList_strlen (entry)) 544 if (optList_strlen (entry))
490 { /* string value */
491 const char *str = argv[++i];
492
493#ifdef DEBUG_RESOURCES
494 fprintf (stderr, "string (%s,%s) = ",
495 optList[entry].opt ? optList[entry].opt : "nil",
496 optList[entry].kw ? optList[entry].kw : "nil");
497#endif
498 if (flag == On && str && (optList[entry].doff != -1))
499 { 545 {
500#ifdef DEBUG_RESOURCES
501 fprintf (stderr, "\"%s\"\n", str);
502#endif
503 rs[optList[entry].doff] = str;
504 /* 546 /*
505 * special cases are handled in main.c:main () to allow 547 * special cases are handled in main.c:main () to allow
506 * X resources to set these values before we settle for 548 * X resources to set these values before we settle for
507 * default values 549 * default values
508 */ 550 */
509 }
510#ifdef DEBUG_RESOURCES
511 else
512 fprintf (stderr, "???\n");
513#endif
514 551
552 if (optList[entry].doff != -1)
553 rs[optList[entry].doff] = flag == On && argv[i+1]
554 ? argv[++i] : 0;
515 } 555 }
516 else 556 else
517 { /* boolean value */ 557 { /* boolean value */
518#ifdef DEBUG_RESOURCES 558#ifdef DEBUG_RESOURCES
519 fprintf (stderr, "boolean (%s,%s) = %s\n", 559 fprintf (stderr, "boolean (%s,%s) = %s\n",
520 optList[entry].opt, optList[entry].kw, flag); 560 optList[entry].opt, optList[entry].kw, flag);
521#endif 561#endif
522 if (flag == On) 562 if (flag == On)
523 Options |= (optList[entry].flag); 563 options |= optList[entry].flag;
524 else 564 else
525 Options &= ~ (optList[entry].flag); 565 options &= ~optList[entry].flag;
526 566
527 if (optList[entry].doff != -1) 567 if (optList[entry].doff != -1)
528 rs[optList[entry].doff] = flag; 568 rs[optList[entry].doff] = flag;
529 } 569 }
530 } 570 }
531 else 571 else
532#ifdef KEYSYM_RESOURCE 572#ifdef KEYSYM_RESOURCE
533 /* if (!STRNCMP (opt, "keysym.", sizeof ("keysym.") - 1)) */ 573 /* if (!strncmp (opt, "keysym.", sizeof ("keysym.") - 1)) */
534 if (rxvt_Str_match (opt, "keysym.")) 574 if (rxvt_Str_match (opt, "keysym."))
535 { 575 {
536 const char *str = argv[++i]; 576 const char *str = argv[++i];
537 577
538 if (str != NULL) 578 if (str != NULL)
539 parse_keysym (opt + sizeof ("keysym.") - 1, str); 579 parse_keysym (opt + sizeof ("keysym.") - 1, str);
540 } 580 }
541 else 581 else
542#endif 582#endif
583 {
543 bad_option = 1; 584 bad_option = 1;
585 rxvt_warn ("\"%s\": unknown or malformed option.\n", opt);
586 }
544 } 587 }
545 588
546 if (bad_option) 589 if (bad_option)
547 rxvt_usage (0); 590 rxvt_usage (0);
548} 591}
… …
566 XrmQuarkList quarks, 609 XrmQuarkList quarks,
567 XrmRepresentation *type __attribute__((unused)), 610 XrmRepresentation *type __attribute__((unused)),
568 XrmValue *value, 611 XrmValue *value,
569 XPointer closure __attribute__((unused))) 612 XPointer closure __attribute__((unused)))
570{ 613{
571 int last; 614 int last;
572 615
573 for (last = 0; quarks[last] != NULLQUARK; last++) /* look for last quark in list */ 616 for (last = 0; quarks[last] != NULLQUARK; last++) /* look for last quark in list */
574 ; 617 ;
618
575 last--; 619 last--;
576 GET_R->parse_keysym (XrmQuarkToString (quarks[last]), (char *)value->addr);//D//TODO 620 GET_R->parse_keysym (XrmQuarkToString (quarks[last]), (char *)value->addr);//D//TODO
577 return False; 621 return False;
578} 622}
579 623
… …
584 * arg will be 628 * arg will be
585 * NULL for ~/.Xdefaults and 629 * NULL for ~/.Xdefaults and
586 * non-NULL for command-line options (need to allocate) 630 * non-NULL for command-line options (need to allocate)
587 */ 631 */
588#define NEWARGLIM 500 /* `reasonable' size */ 632#define NEWARGLIM 500 /* `reasonable' size */
633
634struct keysym_vocabulary_t
635{
636 const char *name;
637 unsigned short len;
638 unsigned short value;
639};
640keysym_vocabulary_t keysym_vocabulary[] =
641{
642 { "ISOLevel3", 9, Level3Mask },
643 { "AppKeypad", 9, AppKeypadMask },
644 { "Control", 7, ControlMask },
645 { "NumLock", 7, NumLockMask },
646 { "Shift", 5, ShiftMask },
647 { "Meta", 4, MetaMask },
648 { "Lock", 4, LockMask },
649 { "Mod1", 4, Mod1Mask },
650 { "Mod2", 4, Mod2Mask },
651 { "Mod3", 4, Mod3Mask },
652 { "Mod4", 4, Mod4Mask },
653 { "Mod5", 4, Mod5Mask },
654 { "I", 1, Level3Mask },
655 { "K", 1, AppKeypadMask },
656 { "C", 1, ControlMask },
657 { "N", 1, NumLockMask },
658 { "S", 1, ShiftMask },
659 { "M", 1, MetaMask },
660 { "A", 1, MetaMask },
661 { "L", 1, LockMask },
662 { "1", 1, Mod1Mask },
663 { "2", 1, Mod2Mask },
664 { "3", 1, Mod3Mask },
665 { "4", 1, Mod4Mask },
666 { "5", 1, Mod5Mask },
667};
668
589int 669int
590rxvt_term::parse_keysym (const char *str, const char *arg) 670rxvt_term::parse_keysym (const char *str, const char *arg)
591{ 671{
592 int n, sym; 672 int n, sym;
593 char *key_string, *newarg = NULL; 673 unsigned int state = 0;
674 const char *pmodend = NULL;
675 char *newarg = NULL;
594 char newargstr[NEWARGLIM]; 676 char newargstr[NEWARGLIM];
595 677
596 if (arg == NULL) 678 if (arg == NULL)
597 { 679 {
598 if ((n = rxvt_Str_match (str, "keysym.")) == 0) 680 if ((n = rxvt_Str_match (str, "keysym.")) == 0)
599 return 0; 681 return 0;
682
600 str += n; /* skip `keysym.' */ 683 str += n; /* skip `keysym.' */
684 if ((pmodend = strchr (str, ':')) < str)
685 return -1;
686 }
687 else
688 pmodend = str + strlen(str);
689
690 for (--pmodend; str < pmodend; --pmodend)
691 if (*pmodend == '-')
692 break;
693
694 while (str < pmodend)
601 } 695 {
696 unsigned int i;
697
698 for (i=0; i < sizeof (keysym_vocabulary) / sizeof (keysym_vocabulary_t); ++i)
699 {
700 if (strncmp (str, keysym_vocabulary [i].name, keysym_vocabulary [i].len) == 0)
701 {
702 state |= keysym_vocabulary[i].value;
703 str += keysym_vocabulary[i].len;
704 break;
705 }
706 }
707
708 if (i >= sizeof (keysym_vocabulary) / sizeof (keysym_vocabulary_t))
709 return -1;
710
711 if (*str == '-')
712 ++str;
713 }
714
602 /* some scanf () have trouble with a 0x prefix */ 715 /* some scanf () have trouble with a 0x prefix */
603 if (isdigit (str[0]))
604 {
605 if (str[0] == '0' && toupper (str[1]) == 'X') 716 if (str[0] == '0' && toupper (str[1]) == 'X')
717 {
606 str += 2; 718 str += 2;
719
607 if (arg) 720 if (arg)
608 { 721 {
609 if (sscanf (str, (STRCHR (str, ':') ? "%x:" : "%x"), &sym) != 1) 722 if (sscanf (str, (strchr (str, ':') ? "%x:" : "%x"), &sym) != 1)
610 return -1; 723 return -1;
611 } 724 }
612 else 725 else
613 { 726 {
614 if (sscanf (str, "%x:", &sym) != 1) 727 if (sscanf (str, "%x:", &sym) != 1)
615 return -1; 728 return -1;
616 729
617 /* cue to ':', it's there since sscanf () worked */ 730 /* cue to ':', it's there since sscanf () worked */
618 STRNCPY (newargstr, STRCHR (str, ':') + 1, NEWARGLIM - 1); 731 strncpy (newargstr, strchr (str, ':') + 1, NEWARGLIM - 1);
619 newargstr[NEWARGLIM - 1] = '\0'; 732 newargstr[NEWARGLIM - 1] = '\0';
620 newarg = newargstr; 733 newarg = newargstr;
621 } 734 }
622 } 735 }
623 else 736 else
624 { 737 {
625 /* 738 /*
626 * convert keysym name to keysym number 739 * convert keysym name to keysym number
627 */ 740 */
628 STRNCPY (newargstr, str, NEWARGLIM - 1); 741 strncpy (newargstr, str, NEWARGLIM - 1);
629 newargstr[NEWARGLIM - 1] = '\0'; 742 newargstr[NEWARGLIM - 1] = '\0';
743
630 if (arg == NULL) 744 if (arg == NULL)
631 { 745 {
632 if ((newarg = STRCHR (newargstr, ':')) == NULL) 746 if ((newarg = strchr (newargstr, ':')) == NULL)
633 return -1; 747 return -1;
748
634 *newarg++ = '\0'; /* terminate keysym name */ 749 *newarg++ = '\0'; /* terminate keysym name */
635 } 750 }
751
636 if ((sym = XStringToKeysym (newargstr)) == None) 752 if ((sym = XStringToKeysym (newargstr)) == None)
637 return -1; 753 return -1;
638 } 754 }
639 755
640 if (sym < 0xFF00 || sym > 0xFFFF) /* we only do extended keys */
641 return -1;
642 sym &= 0xFF;
643 if (Keysym_map[sym] != NULL) /* already set ? */
644 return -1;
645
646 if (newarg == NULL) 756 if (newarg == NULL)
647 { 757 {
648 STRNCPY (newargstr, arg, NEWARGLIM - 1); 758 strncpy (newargstr, arg, NEWARGLIM - 1);
649 newargstr[NEWARGLIM - 1] = '\0'; 759 newargstr[NEWARGLIM - 1] = '\0';
650 newarg = newargstr; 760 newarg = newargstr;
651 } 761 }
762
652 rxvt_Str_trim (newarg); 763 rxvt_Str_trim (newarg);
653 if (*newarg == '\0' || (n = rxvt_Str_escaped (newarg)) == 0) 764 if (*newarg == '\0' || (n = rxvt_Str_escaped (newarg)) == 0)
654 return -1; 765 return -1;
655 MIN_IT (n, 255);
656 key_string = (char *)rxvt_malloc ((n + 1) * sizeof (char));
657 766
658 key_string[0] = n; 767 keyboard->register_user_translation (sym, state, newarg);
659 STRNCPY (key_string + 1, newarg, n);
660 Keysym_map[sym] = (unsigned char *)key_string;
661
662 return 1; 768 return 1;
663} 769}
664 770
665# endif /* KEYSYM_RESOURCE */ 771# endif /* KEYSYM_RESOURCE */
666 772
… …
670 * the matching algorithm used for memory-save fake resources 776 * the matching algorithm used for memory-save fake resources
671 */ 777 */
672void 778void
673rxvt_term::get_xdefaults (FILE *stream, const char *name) 779rxvt_term::get_xdefaults (FILE *stream, const char *name)
674{ 780{
675 unsigned int len; 781 unsigned int len;
676 char *str, buffer[256]; 782 char *str, buffer[256];
677 783
678 if (stream == NULL) 784 if (stream == NULL)
679 return; 785 return;
680 len = STRLEN (name); 786
787 len = strlen (name);
681 while ((str = fgets (buffer, sizeof (buffer), stream)) != NULL) 788 while ((str = fgets (buffer, sizeof (buffer), stream)) != NULL)
682 { 789 {
683 unsigned int entry, n; 790 unsigned int entry, n;
684 791
685 while (*str && isspace (*str)) 792 while (*str && isspace (*str))
686 str++; /* leading whitespace */ 793 str++; /* leading whitespace */
687 794
688 if ((str[len] != '*' && str[len] != '.') 795 if ((str[len] != '*' && str[len] != '.')
689 || (len && STRNCMP (str, name, len))) 796 || (len && strncmp (str, name, len)))
690 continue; 797 continue;
691 str += (len + 1); /* skip `name*' or `name.' */ 798 str += (len + 1); /* skip `name*' or `name.' */
692 799
693# ifdef KEYSYM_RESOURCE 800# ifdef KEYSYM_RESOURCE
694 if (!parse_keysym (str, NULL)) 801 if (!parse_keysym (str, NULL))
695# endif /* KEYSYM_RESOURCE */ 802# endif /* KEYSYM_RESOURCE */
696 for (entry = 0; entry < optList_size (); entry++) 803 for (entry = 0; entry < optList_size; entry++)
697 { 804 {
698 const char *kw = optList[entry].kw; 805 const char *kw = optList[entry].kw;
699 806
700 if (kw == NULL) 807 if (kw == NULL)
701 continue; 808 continue;
809
702 n = STRLEN (kw); 810 n = strlen (kw);
703 if (str[n] == ':' && rxvt_Str_match (str, kw)) 811 if (str[n] == ':' && rxvt_Str_match (str, kw))
704 { 812 {
705 /* skip `keyword:' */ 813 /* skip `keyword:' */
706 str += (n + 1); 814 str += n + 1;
707 rxvt_Str_trim (str); 815 rxvt_Str_trim (str);
708 n = STRLEN (str); 816 n = strlen (str);
817
709 if (n && rs[optList[entry].doff] == NULL) 818 if (n && rs[optList[entry].doff] == NULL)
710 { 819 {
711 /* not already set */ 820 /* not already set */
712 int s; 821 int s;
713 char *p = (char *)rxvt_malloc ((n + 1) * sizeof (char)); 822 char *p = 0;
714 823
715 STRCPY (p, str); 824 for (int o = 0;;)
825 {
826 p = (char *)rxvt_realloc (p, o + n + 1);
827 memcpy (p + o, str, n);
828 o += n;
829 p[o] = 0;
830
831 if (o == 0 || p[o - 1] != '\\') // continuation line
832 break;
833
834 o--; // eat "\"
835
836 if ((str = fgets (buffer, sizeof (buffer), stream)) == NULL)
837 break;
838
839 rxvt_Str_trim (str);
840 n = strlen (str);
841 }
842
716 rs[optList[entry].doff] = p; 843 rs[optList[entry].doff] = p;
844 allocated.push_back (p);
845
717 if (optList_isBool (entry)) 846 if (optList_isBool (entry))
718 { 847 {
719 s = STRCASECMP (str, "TRUE") == 0 848 s = strcasecmp (str, "true") == 0
720 || STRCASECMP (str, "YES") == 0 849 || strcasecmp (str, "yes") == 0
721 || STRCASECMP (str, "ON") == 0 850 || strcasecmp (str, "on") == 0
722 || STRCASECMP (str, "1") == 0; 851 || strcmp (str, "1") == 0;
852
723 if (optList_isReverse (entry)) 853 if (optList_isReverse (entry))
724 s = !s; 854 s = !s;
855
725 if (s) 856 if (s)
726 Options |= (optList[entry].flag); 857 options |= optList[entry].flag;
727 else 858 else
728 Options &= ~ (optList[entry].flag); 859 options &= ~optList[entry].flag;
729 } 860 }
730 } 861 }
862
731 break; 863 break;
732 } 864 }
733 } 865 }
734 } 866 }
867
735 rewind (stream); 868 rewind (stream);
736} 869}
737 870
738/*}}} */ 871/*}}} */
739# endif /* ! USE_XGETDEFAULT */ 872# endif /* ! USE_XGETDEFAULT */
… …
743/* 876/*
744 * using XGetDefault () or the hand-rolled replacement 877 * using XGetDefault () or the hand-rolled replacement
745 */ 878 */
746/* ARGSUSED */ 879/* ARGSUSED */
747void 880void
748rxvt_term::extract_resources (Display *display __attribute__ ((unused)), const char *name) 881rxvt_term::extract_resources ()
749{ 882{
883 dDisp;
884
750#ifndef NO_RESOURCES 885#ifndef NO_RESOURCES
886
887 char *homedir = (char *)getenv ("HOME");
888 char fname[1024];
751 889
752# if defined XAPPLOADDIR 890# if defined XAPPLOADDIR
753# if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE) 891# if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
754 /* Compute the path of the possibly available localized Rxvt file */ 892 /* Compute the path of the possibly available localized Rxvt file */
755 char *localepath = NULL; 893 char localepath[1024];
756 894
757 if (locale != NULL) 895 if (locale)
758 { /* XXX: must limit length of string */
759 localepath = (char *)rxvt_malloc (256);
760 sprintf (localepath, XAPPLOADDIRLOCALE "/" RESCLASS, 896 snprintf (localepath, sizeof (localepath), XAPPLOADDIRLOCALE "/" RESCLASS, locale);
761 (int) (258 - sizeof (XAPPLOADDIRLOCALE) - sizeof (RESCLASS)), 897 else
762 locale); /* 258 = 255 + 4 (-.*s) - 1 (/) */ 898 localepath[0] = 0;
763 }
764
765 {
766# endif 899# endif
767# endif 900# endif
768 901
769# ifdef USE_XGETDEFAULT 902# ifdef USE_XGETDEFAULT
770 /* 903 /*
771 * get resources using the X library function 904 * get resources using the X library function
772 */ 905 */
773 int entry; 906 int entry;
774 907
775# ifdef XrmEnumOneLevel 908# ifdef XrmEnumOneLevel
776 int i; 909 int i;
777 char *displayResource, *xe; 910 char *displayResource, *xe;
778 XrmName name_prefix[3]; 911 XrmName name_prefix[3];
779 XrmClass class_prefix[3]; 912 XrmClass class_prefix[3];
780 XrmDatabase database, rdb1; 913 XrmDatabase database, rdb1;
781 char fname[1024];
782 914
783 XrmInitialize (); 915 XrmInitialize ();
784 database = NULL; 916 database = NULL;
785 917
918 // for ordering, see for example http://www.faqs.org/faqs/Xt-FAQ/ Subject: 20
919
920 // 6. System wide per application default file.
921 /* Add in Rxvt file */
922# if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
923 if (*localepath
924 && ((rdb1 = XrmGetFileDatabase (localepath))
925 || (rdb1 = XrmGetFileDatabase (XAPPLOADDIR "/" RESCLASS))))
926# endif
927 XrmMergeDatabases (rdb1, &database);
928
929 /* Add in $XAPPLRESDIR/Rxvt only; not bothering with XUSERFILESEARCHPATH */
930 if ((xe = (char *)getenv ("XAPPLRESDIR")))
931 {
932 snprintf (fname, sizeof (fname), "%s/%s", xe, RESCLASS);
933
934 if ((rdb1 = XrmGetFileDatabase (fname)))
935 XrmMergeDatabases (rdb1, &database);
936 }
937
938 // 5. User's per application default file.
939 // none
940
941 // 4. User's defaults file.
786 /* Get any Xserver defaults */ 942 /* Get any Xserver defaults */
787
788 displayResource = XResourceManagerString (display); 943 displayResource = XResourceManagerString (disp);
789 if (displayResource != NULL) 944 if (displayResource != NULL)
945 {
790 database = XrmGetStringDatabase (displayResource); 946 if ((rdb1 = XrmGetStringDatabase (displayResource)))
791 947 XrmMergeDatabases (rdb1, &database);
792# ifdef HAVE_EXTRA_XRESOURCE_FILES
793 /* Add in ~/.Xdefaults or ~/.Xresources */
794 { 948 }
795 char *ptr; 949 else if (homedir)
950 {
951 snprintf (fname, sizeof (fname), "%s/.Xdefaults", homedir);
796 952
797 if ((ptr = (char *)getenv ("HOME")) == NULL) 953 if ((rdb1 = XrmGetFileDatabase (fname)))
798 ptr = "."; 954 XrmMergeDatabases (rdb1, &database);
955 }
799 956
800 for (i = 0; i < (sizeof (xnames) / sizeof (xnames[0])); i++) 957 /* Get screen specific resources */
958 displayResource = XScreenResourceString (ScreenOfDisplay (disp, display->screen));
959 if (displayResource != NULL)
960 {
961 if ((rdb1 = XrmGetStringDatabase (displayResource)))
962 /* Merge with screen-independent resources */
963 XrmMergeDatabases (rdb1, &database);
964
965 XFree (displayResource);
966 }
967
968 // 3. User's per host defaults file
969 /* Add in XENVIRONMENT file */
970 if ((xe = (char *)getenv ("XENVIRONMENT"))
971 && (rdb1 = XrmGetFileDatabase (xe)))
972 XrmMergeDatabases (rdb1, &database);
973 else if (homedir)
974 {
975 struct utsname un;
976
977 if (!uname (&un))
801 { 978 {
802 sprintf (fname, "%-.*s/%s", sizeof (fname) - STRLEN (xnames[i]) - 2, 979 snprintf (fname, sizeof (fname), "%s/.Xdefaults-%s", homedir, un.nodename);
803 ptr, xnames[i]); 980
804 if ((rdb1 = XrmGetFileDatabase (fname)) != NULL) 981 if ((rdb1 = XrmGetFileDatabase (fname)))
982 XrmMergeDatabases (rdb1, &database);
983 }
984 }
985
986 XrmSetDatabase (disp, database);
987# endif
988
989 /*
990 * Query resources for options that affect us
991 */
992 for (entry = 0; entry < optList_size; entry++)
993 {
994 int s;
995 char *p, *p0;
996 const char *kw = optList[entry].kw;
997
998 if (kw == NULL || rs[optList[entry].doff] != NULL)
999 continue; /* previously set */
1000
1001 p = XGetDefault (disp, rs[Rs_name], kw);
1002 p0 = XGetDefault (disp, "!INVALIDPROGRAMMENAMEDONTMATCH!", kw);
1003 if (p == NULL || (p0 && strcmp (p, p0) == 0))
1004 {
1005 p = XGetDefault (disp, RESCLASS, kw);
1006#ifdef RESFALLBACK
1007 if (p == NULL || (p0 && strcmp (p, p0) == 0))
1008 p = XGetDefault (disp, RESFALLBACK, kw);
1009#endif
1010 }
1011
1012 if (p == NULL && p0)
1013 p = p0;
1014
1015 if (p)
1016 {
1017 rs[optList[entry].doff] = p;
1018
1019 if (optList_isBool (entry))
805 { 1020 {
806 XrmMergeDatabases (rdb1, &database); 1021 s = strcasecmp (p, "TRUE") == 0
807# ifndef HAVE_BOTH_XRESOURCE_FILES 1022 || strcasecmp (p, "YES") == 0
1023 || strcasecmp (p, "ON") == 0
1024 || strcasecmp (p, "1") == 0;
1025
1026 if (optList_isReverse (entry))
1027 s = !s;
1028
1029 if (s)
1030 options |= optList[entry].flag;
808 break; 1031 else
809# endif 1032 options &= ~optList[entry].flag;
810
811 } 1033 }
812 } 1034 }
813 } 1035 }
814# endif
815 1036
816 /* Add in XENVIRONMENT file */
817
818 if ((xe = (char *)getenv ("XENVIRONMENT")) != NULL
819 && (rdb1 = XrmGetFileDatabase (xe)) != NULL)
820 XrmMergeDatabases (rdb1, &database);
821
822 /* Add in Rxvt file */
823# if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
824 if (localepath == NULL || (rdb1 = XrmGetFileDatabase (localepath)) == NULL)
825# endif
826 rdb1 = XrmGetFileDatabase (XAPPLOADDIR "/" RESCLASS);
827
828 if (rdb1 != NULL)
829 XrmMergeDatabases (rdb1, &database);
830
831 /* Add in $XAPPLRESDIR/Rxvt only; not bothering with XUSERFILESEARCHPATH */
832 if ((xe = (char *)getenv ("XAPPLRESDIR")) != NULL)
833 {
834 sprintf (fname, "%-.*s/" RESCLASS, sizeof (fname)
835 - sizeof (RESCLASS) - 2, xe);
836 if ((rdb1 = XrmGetFileDatabase (fname)) != NULL)
837 XrmMergeDatabases (rdb1, &database);
838 }
839
840 XrmSetDatabase (display, database);
841# endif
842
843 /* 1037 /*
844 * Query resources for options that affect us
845 */
846 for (entry = 0; entry < optList_size (); entry++)
847 {
848 int s;
849 char *p, *p0;
850 const char *kw = optList[entry].kw;
851
852 if (kw == NULL || rs[optList[entry].doff] != NULL)
853 continue; /* previously set */
854
855 p = XGetDefault (display, name, kw);
856 p0 = XGetDefault (display, "!INVALIDPROGRAMMENAMEDONTMATCH!", kw);
857 if (p == NULL || (p0 && STRCMP (p, p0) == 0))
858 {
859 p = XGetDefault (display, RESCLASS, kw);
860#ifdef RESFALLBACK
861 if (p == NULL || (p0 && STRCMP (p, p0) == 0))
862 p = XGetDefault (display, RESFALLBACK, kw);
863#endif
864 }
865
866 if (p == NULL && p0)
867 p = p0;
868
869 if (p)
870 {
871 rs[optList[entry].doff] = p;
872
873 if (optList_isBool (entry))
874 {
875 s = STRCASECMP (p, "TRUE") == 0
876 || STRCASECMP (p, "YES") == 0
877 || STRCASECMP (p, "ON") == 0
878 || STRCASECMP (p, "1") == 0;
879 if (optList_isReverse (entry))
880 s = !s;
881 if (s)
882 Options |= (optList[entry].flag);
883 else
884 Options &= ~ (optList[entry].flag);
885 }
886 }
887 }
888
889 /*
890 * [R5 or later]: enumerate the resource database 1038 * [R5 or later]: enumerate the resource database
891 */ 1039 */
892# ifdef XrmEnumOneLevel
893# ifdef KEYSYM_RESOURCE 1040# ifdef KEYSYM_RESOURCE
894 name_prefix[0] = XrmStringToName (name); 1041 name_prefix[0] = XrmStringToName (rs[Rs_name]);
895 name_prefix[1] = XrmStringToName ("keysym"); 1042 name_prefix[1] = XrmStringToName ("keysym");
896 name_prefix[2] = NULLQUARK; 1043 name_prefix[2] = NULLQUARK;
897 class_prefix[0] = XrmStringToName (RESCLASS); 1044 class_prefix[0] = XrmStringToName (RESCLASS);
898 class_prefix[1] = XrmStringToName ("Keysym"); 1045 class_prefix[1] = XrmStringToName ("Keysym");
899 class_prefix[2] = NULLQUARK; 1046 class_prefix[2] = NULLQUARK;
900 /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */ 1047 /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */
901 XrmEnumerateDatabase (XrmGetDatabase (display), name_prefix, class_prefix, 1048 XrmEnumerateDatabase (XrmGetDatabase (disp), name_prefix, class_prefix,
902 XrmEnumOneLevel, rxvt_define_key, NULL); 1049 XrmEnumOneLevel, rxvt_define_key, NULL);
903# ifdef RESFALLBACK 1050# ifdef RESFALLBACK
904 name_prefix[0] = XrmStringToName (RESFALLBACK); 1051 name_prefix[0] = XrmStringToName (RESFALLBACK);
905 name_prefix[1] = XrmStringToName ("keysym"); 1052 name_prefix[1] = XrmStringToName ("keysym");
906 class_prefix[0] = XrmStringToName (RESFALLBACK); 1053 class_prefix[0] = XrmStringToName (RESFALLBACK);
907 class_prefix[1] = XrmStringToName ("Keysym"); 1054 class_prefix[1] = XrmStringToName ("Keysym");
908 /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */ 1055 /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */
909 XrmEnumerateDatabase (XrmGetDatabase (display), name_prefix, class_prefix, 1056 XrmEnumerateDatabase (XrmGetDatabase (disp), name_prefix, class_prefix,
910 XrmEnumOneLevel, rxvt_define_key, NULL); 1057 XrmEnumOneLevel, rxvt_define_key, NULL);
911# endif
912# endif 1058# endif
913# endif 1059# endif
914 1060
915# else /* USE_XGETDEFAULT */ 1061# else /* USE_XGETDEFAULT */
916 /* get resources the hard way, but save lots of memory */ 1062 /* get resources the hard way, but save lots of memory */
1063 FILE *fd = NULL;
1064
1065 if (homedir)
1066 {
1067 static const char *const xnames[2] = { ".Xdefaults", ".Xresources" };
1068
1069 for (int i = 0; i < (sizeof (xnames) / sizeof (xnames [0])); i++)
1070 {
1071 snprintf (fname, sizeof (fname), "%s/%s", homedir, xnames [i]);
1072
1073 if ((fd = fopen (fname, "r")) != NULL)
1074 break;
1075 }
1076 }
1077 /*
1078 * The normal order to match resources is the following:
1079 * @ global resources (partial match, ~/.Xdefaults)
1080 * @ application file resources (XAPPLOADDIR/Rxvt)
1081 * @ class resources (~/.Xdefaults)
1082 * @ private resources (~/.Xdefaults)
1083 *
1084 * However, for the hand-rolled resources, the matching algorithm
1085 * checks if a resource string value has already been allocated
1086 * and won't overwrite it with (in this case) a less specific
1087 * resource value.
1088 *
1089 * This avoids multiple allocation. Also, when we've called this
1090 * routine command-line string options have already been applied so we
1091 * needn't to allocate for those resources.
1092 *
1093 * So, search in resources from most to least specific.
1094 *
1095 * Also, use a special sub-class so that we can use either or both of
1096 * "XTerm" and "Rxvt" as class names.
1097 */
1098
1099 get_xdefaults (fd, rs[Rs_name]);
1100 get_xdefaults (fd, RESCLASS);
1101# ifdef RESFALLBACK
1102 get_xdefaults (fd, RESFALLBACK);
1103# endif
1104
1105# if defined(XAPPLOADDIR) && defined(USE_XAPPLOADDIR)
1106 {
917 FILE *fd = NULL; 1107 FILE *ad = NULL;
918 char *home;
919 1108
920 if ((home = getenv ("HOME")) != NULL) 1109# if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1110 if (!*localepath || (ad = fopen (localepath, "r")) == NULL)
1111# endif
1112 ad = fopen (XAPPLOADDIR "/" RESCLASS, "r");
1113 if (ad != NULL)
921 { 1114 {
922 unsigned int i, len = STRLEN (home) + 2; 1115 get_xdefaults (ad, RESCLASS);
923 char *f = NULL; 1116 get_xdefaults (ad, "");
924
925 for (i = 0; i < (sizeof (xnames) / sizeof (xnames[0])); i++)
926 {
927 f = (char *)rxvt_realloc (f, (len + STRLEN (xnames[i])) * sizeof (char));
928
929 sprintf (f, "%s/%s", home, xnames[i]);
930
931 if ((fd = fopen (f, "r")) != NULL)
932 break;
933 }
934 free (f); 1117 fclose (ad);
935 } 1118 }
936 /*
937 * The normal order to match resources is the following:
938 * @ global resources (partial match, ~/.Xdefaults)
939 * @ application file resources (XAPPLOADDIR/Rxvt)
940 * @ class resources (~/.Xdefaults)
941 * @ private resources (~/.Xdefaults)
942 *
943 * However, for the hand-rolled resources, the matching algorithm
944 * checks if a resource string value has already been allocated
945 * and won't overwrite it with (in this case) a less specific
946 * resource value.
947 *
948 * This avoids multiple allocation. Also, when we've called this
949 * routine command-line string options have already been applied so we
950 * needn't to allocate for those resources.
951 *
952 * So, search in resources from most to least specific.
953 *
954 * Also, use a special sub-class so that we can use either or both of
955 * "XTerm" and "Rxvt" as class names.
956 */
957
958 get_xdefaults (fd, name);
959 get_xdefaults (fd, RESCLASS);
960# ifdef RESFALLBACK
961 get_xdefaults (fd, RESFALLBACK);
962# endif
963
964# if defined(XAPPLOADDIR) && defined(USE_XAPPLOADDIR)
965
966 {
967 FILE *ad = NULL;
968
969# if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
970 if (localepath == NULL || (ad = fopen (localepath, "r")) == NULL)
971# endif
972 ad = fopen (XAPPLOADDIR "/" RESCLASS, "r");
973 if (ad != NULL)
974 {
975 get_xdefaults (ad, RESCLASS);
976 get_xdefaults (ad, "");
977 fclose (ad);
978 }
979 } 1119 }
980# endif /* XAPPLOADDIR */ 1120# endif /* XAPPLOADDIR */
981 1121
982 get_xdefaults (fd, ""); /* partial match */ 1122 get_xdefaults (fd, ""); /* partial match */
983 if (fd != NULL) 1123 if (fd != NULL)
984 fclose (fd); 1124 fclose (fd);
985# endif /* USE_XGETDEFAULT */ 1125# endif /* USE_XGETDEFAULT */
986 1126
987# if defined XAPPLOADDIR
988# if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
989
990 }
991
992 /* Free the path of the possibly available localized Rxvt file */
993 free (localepath);
994# endif
995# endif
996
997#endif /* NO_RESOURCES */ 1127#endif /* NO_RESOURCES */
998
999 /*
1000 * even without resources, at least do this setup for command-line
1001 * options and command-line long options
1002 */
1003
1004#if defined (HOTKEY_CTRL) || defined (HOTKEY_META)
1005 KeySym sym;
1006
1007 if (rs[Rs_bigfont_key]
1008 && ((sym = XStringToKeysym (rs[Rs_bigfont_key])) != 0))
1009 ks_bigfont = sym;
1010 if (rs[Rs_smallfont_key]
1011 && ((sym = XStringToKeysym (rs[Rs_smallfont_key])) != 0))
1012 ks_smallfont = sym;
1013#endif
1014} 1128}
1015 1129
1016/*}}} */ 1130/*}}} */
1017/*----------------------- end-of-file (C source) -----------------------*/ 1131/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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