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.57 by root, Sat Feb 19 01:07:58 2005 UTC

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

Diff Legend

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