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

Diff Legend

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