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.16 by pcg, Thu Mar 4 00:59:10 2004 UTC vs.
Revision 1.60 by root, Tue Oct 25 19:04:46 2005 UTC

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

Diff Legend

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