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.19 by pcg, Mon Mar 22 15:15:04 2004 UTC vs.
Revision 1.59 by root, Thu Aug 11 02:05:07 2005 UTC

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

Diff Legend

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