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.61 by root, Mon Nov 28 19:35:04 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,
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 STRG (Rs_modifier, "modifier", "mod", "modifier", 247 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 248#ifdef CUTCHAR_RESOURCE
249 RSTRG (Rs_cutchars, "cutchars", "string"), 249 RSTRG (Rs_cutchars, "cutchars", "string"),
250#endif /* CUTCHAR_RESOURCE */ 250#endif /* CUTCHAR_RESOURCE */
251 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
252 INFO ("e", "command arg ...", "command to execute") 261 INFO ("e", "command arg ...", "command to execute")
253 }; 262 };
254 263
255#undef INFO 264#undef INFO
256#undef STRG 265#undef STRG
257#undef RSTRG 266#undef RSTRG
258#undef SWCH 267#undef SWCH
259#undef BOOL 268#undef BOOL
260/*}}} */ 269/*}}} */
261 270
262static const char releasestring[] = "Rxvt v" VERSION " - released: " DATE "\n"; 271static const char releasestring[] = "rxvt-unicode (" RXVTNAME ") v" VERSION " - released: " DATE "\n";
263static 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
264#if defined(XPM_BACKGROUND) 311#if defined(XPM_BACKGROUND)
265 "XPM," 312 "XPM,"
266#endif 313#endif
267#if defined(TRANSPARENT) 314#if defined(TRANSPARENT)
268 "transparent," 315 "transparent,"
269#endif 316#endif
317#if TINTING
318 "tint,"
319#endif
270#if defined(UTMP_SUPPORT) 320#if defined(UTMP_SUPPORT)
271 "utmp," 321 "utmp,"
272#endif 322#endif
273#if defined(MENUBAR) 323#if defined(MENUBAR)
274 "menubar," 324 "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 325#endif
285#if defined(USE_XIM) 326#if defined(USE_XIM)
286 "XIM," 327 "XIM,"
287#endif 328#endif
288 "scrollbars=" 329 "scrollbars="
… …
316 "no_backspace," 357 "no_backspace,"
317#endif 358#endif
318#if defined(NO_DELETE_KEY) 359#if defined(NO_DELETE_KEY)
319 "no_delete," 360 "no_delete,"
320#endif 361#endif
362#if EIGHT_BIT_CONTROLS
363 "8bitctrls,"
364#endif
321#if !defined(NO_STRINGS) 365#if !defined(NO_STRINGS)
322 "strings," 366 "strings,"
323#endif 367#endif
324#if defined(TTY_256COLOR) 368#if defined(ENABLE_FRILLS)
369 "frills,"
370#endif
371#if defined(PREFER_24BIT)
325 "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,"
326#endif 391#endif
327#if defined(NO_RESOURCES) 392#if defined(NO_RESOURCES)
328 "NoResources" 393 "NoResources"
329#else 394#else
330# if defined(USE_XGETDEFAULT) 395# if defined(USE_XGETDEFAULT)
… …
349 switch (type) 414 switch (type)
350 { 415 {
351 case 0: /* brief listing */ 416 case 0: /* brief listing */
352 rxvt_log (" [-help] [--help]\n"); 417 rxvt_log (" [-help] [--help]\n");
353 418
354 for (col = 1, i = 0; i < optList_size (); i++) 419 for (col = 1, i = 0; i < optList_size; i++)
355 if (optList[i].desc != NULL) 420 if (optList[i].desc != NULL)
356 { 421 {
357 int len = 0; 422 int len = 0;
358 423
359 if (!optList_isBool (i)) 424 if (!optList_isBool (i))
… …
363 len++; /* account for space */ 428 len++; /* account for space */
364 } 429 }
365#ifdef DEBUG_STRICT 430#ifdef DEBUG_STRICT
366 assert (optList[i].opt != NULL); 431 assert (optList[i].opt != NULL);
367#endif 432#endif
368 len += 4 + STRLEN (optList[i].opt) + (optList_isBool (i) ? 2: 0); 433 len += 4 + strlen (optList[i].opt) + (optList_isBool (i) ? 2: 0);
369 col += len; 434 col += len;
370 if (col > 79) 435 if (col > 79)
371 { /* assume regular width */ 436 { /* assume regular width */
372 rxvt_log ("\n"); 437 rxvt_log ("\n");
373 col = 1 + len; 438 col = 1 + len;
… …
382 break; 447 break;
383 448
384 case 1: /* full command-line listing */ 449 case 1: /* full command-line listing */
385 rxvt_log (" [options] [-e command args]\n\nwhere options include:\n"); 450 rxvt_log (" [options] [-e command args]\n\nwhere options include:\n");
386 451
387 for (i = 0; i < optList_size (); i++) 452 for (i = 0; i < optList_size; i++)
388 if (optList[i].desc != NULL) 453 if (optList[i].desc != NULL)
389 { 454 {
390#ifdef DEBUG_STRICT 455#ifdef DEBUG_STRICT
391 assert (optList[i].opt != NULL); 456 assert (optList[i].opt != NULL);
392#endif 457#endif
393 rxvt_log (" %s%s %-*s%s%s\n", 458 rxvt_log (" %s%s %-*s%s%s\n",
394 (optList_isBool (i) ? "-/+" : "-"), optList[i].opt, 459 (optList_isBool (i) ? "-/+" : "-"), optList[i].opt,
395 (INDENT - STRLEN (optList[i].opt) 460 (INDENT - strlen (optList[i].opt)
396 + (optList_isBool (i) ? 0 : 2)), 461 + (optList_isBool (i) ? 0 : 2)),
397 (optList[i].arg ? optList[i].arg : ""), 462 (optList[i].arg ? optList[i].arg : ""),
398 (optList_isBool (i) ? "turn on/off " : ""), 463 (optList_isBool (i) ? "turn on/off " : ""),
399 optList[i].desc); 464 optList[i].desc);
400 } 465 }
… …
403 468
404 case 2: /* full resource listing */ 469 case 2: /* full resource listing */
405 rxvt_log (" [options] [-e command args]\n\n" 470 rxvt_log (" [options] [-e command args]\n\n"
406 "where resources (long-options) include:\n"); 471 "where resources (long-options) include:\n");
407 472
408 for (i = 0; i < optList_size (); i++) 473 for (i = 0; i < optList_size; i++)
409 if (optList[i].kw != NULL) 474 if (optList[i].kw != NULL)
410 rxvt_log (" %s: %*s%s\n", 475 rxvt_log (" %s: %*s%s\n",
411 optList[i].kw, 476 optList[i].kw,
412 (INDENT - STRLEN (optList[i].kw)), "", /* XXX */ 477 (INDENT - strlen (optList[i].kw)), "", /* XXX */
413 (optList_isBool (i) ? "boolean" : optList[i].arg)); 478 (optList_isBool (i) ? "boolean" : optList[i].arg));
414#ifdef KEYSYM_RESOURCE 479#ifdef KEYSYM_RESOURCE
415 rxvt_log (" " "keysym.sym" ": %*s%s\n", 480 rxvt_log (" " "keysym.sym" ": %*s%s\n",
416 (INDENT - sizeof ("keysym.sym") + 1), "", /* XXX */ 481 (INDENT - sizeof ("keysym.sym") + 1), "", /* XXX */
417 "keysym"); 482 "keysym");
… …
434 int i, bad_option = 0; 499 int i, bad_option = 0;
435 static const char On[3] = "ON", Off[4] = "OFF"; 500 static const char On[3] = "ON", Off[4] = "OFF";
436 501
437 for (i = 1; i < argc; i++) 502 for (i = 1; i < argc; i++)
438 { 503 {
439 unsigned int entry, longopt = 0; 504 unsigned int entry, longopt = 0;
440 const char *flag, *opt; 505 const char *flag, *opt;
441 506
442 opt = argv[i]; 507 opt = argv[i];
443#ifdef DEBUG_RESOURCES 508#ifdef DEBUG_RESOURCES
444 fprintf (stderr, "argv[%d] = %s: ", i, opt); 509 fprintf (stderr, "argv[%d] = %s: ", i, opt);
445#endif 510#endif
… …
460 bad_option = 1; 525 bad_option = 1;
461 rxvt_warn ("\"%s\": malformed option.\n", opt); 526 rxvt_warn ("\"%s\": malformed option.\n", opt);
462 continue; 527 continue;
463 } 528 }
464 529
465 if (!STRCMP (opt, "help")) 530 if (!strcmp (opt, "help"))
466 rxvt_usage (longopt ? 2 : 1); 531 rxvt_usage (longopt ? 2 : 1);
467 if (!STRCMP (opt, "h")) 532 if (!strcmp (opt, "h"))
468 rxvt_usage (0); 533 rxvt_usage (0);
469 534
470 /* feature: always try to match long-options */ 535 /* feature: always try to match long-options */
471 for (entry = 0; entry < optList_size (); entry++) 536 for (entry = 0; entry < optList_size; entry++)
472 if ((optList[entry].kw && !STRCMP (opt, optList[entry].kw)) 537 if ((optList[entry].kw && !strcmp (opt, optList[entry].kw))
473 || (!longopt 538 || (!longopt
474 && optList[entry].opt && !STRCMP (opt, optList[entry].opt))) 539 && optList[entry].opt && !strcmp (opt, optList[entry].opt)))
475 break; 540 break;
476 541
477 if (entry < optList_size ()) 542 if (entry < optList_size)
478 { 543 {
479 if (optList_isReverse (entry)) 544 if (optList_isReverse (entry))
480 flag = flag == On ? Off : On; 545 flag = flag == On ? Off : On;
546
481 if (optList_strlen (entry)) 547 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 { 548 {
492#ifdef DEBUG_RESOURCES
493 fprintf (stderr, "\"%s\"\n", str);
494#endif
495 rs[optList[entry].doff] = str;
496 /* 549 /*
497 * special cases are handled in main.c:main () to allow 550 * special cases are handled in main.c:main () to allow
498 * X resources to set these values before we settle for 551 * X resources to set these values before we settle for
499 * default values 552 * default values
500 */ 553 */
501 }
502#ifdef DEBUG_RESOURCES
503 else
504 fprintf (stderr, "???\n");
505#endif
506 554
555 if (optList[entry].doff != -1)
556 rs[optList[entry].doff] = flag == On && argv[i+1]
557 ? argv[++i] : 0;
507 } 558 }
508 else 559 else
509 { /* boolean value */ 560 { /* boolean value */
510#ifdef DEBUG_RESOURCES 561#ifdef DEBUG_RESOURCES
511 fprintf (stderr, "boolean (%s,%s) = %s\n", 562 fprintf (stderr, "boolean (%s,%s) = %s\n",
512 optList[entry].opt, optList[entry].kw, flag); 563 optList[entry].opt, optList[entry].kw, flag);
513#endif 564#endif
514 if (flag == On) 565 if (flag == On)
515 Options |= (optList[entry].flag); 566 options |= optList[entry].flag;
516 else 567 else
517 Options &= ~ (optList[entry].flag); 568 options &= ~optList[entry].flag;
518 569
519 if (optList[entry].doff != -1) 570 if (optList[entry].doff != -1)
520 rs[optList[entry].doff] = flag; 571 rs[optList[entry].doff] = flag;
521 } 572 }
522 } 573 }
523 else 574 else
524#ifdef KEYSYM_RESOURCE 575#ifdef KEYSYM_RESOURCE
525 /* if (!STRNCMP (opt, "keysym.", sizeof ("keysym.") - 1)) */ 576 /* if (!strncmp (opt, "keysym.", sizeof ("keysym.") - 1)) */
526 if (rxvt_Str_match (opt, "keysym.")) 577 if (rxvt_Str_match (opt, "keysym."))
527 { 578 {
528 const char *str = argv[++i]; 579 const char *str = argv[++i];
529 580
530 if (str != NULL) 581 if (str != NULL)
… …
561 XrmQuarkList quarks, 612 XrmQuarkList quarks,
562 XrmRepresentation *type __attribute__((unused)), 613 XrmRepresentation *type __attribute__((unused)),
563 XrmValue *value, 614 XrmValue *value,
564 XPointer closure __attribute__((unused))) 615 XPointer closure __attribute__((unused)))
565{ 616{
566 int last; 617 int last;
567 618
568 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 */
569 ; 620 ;
621
570 last--; 622 last--;
571 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
572 return False; 624 return False;
573} 625}
574 626
… …
579 * arg will be 631 * arg will be
580 * NULL for ~/.Xdefaults and 632 * NULL for ~/.Xdefaults and
581 * non-NULL for command-line options (need to allocate) 633 * non-NULL for command-line options (need to allocate)
582 */ 634 */
583#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
584int 672int
585rxvt_term::parse_keysym (const char *str, const char *arg) 673rxvt_term::parse_keysym (const char *str, const char *arg)
586{ 674{
587 int n, sym; 675 int n, sym;
588 char *key_string, *newarg = NULL; 676 unsigned int state = 0;
677 const char *pmodend = NULL;
678 char *newarg = NULL;
589 char newargstr[NEWARGLIM]; 679 char newargstr[NEWARGLIM];
590 680
591 if (arg == NULL) 681 if (arg == NULL)
592 { 682 {
593 if ((n = rxvt_Str_match (str, "keysym.")) == 0) 683 if ((n = rxvt_Str_match (str, "keysym.")) == 0)
594 return 0; 684 return 0;
685
595 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)
596 } 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
597 /* some scanf () have trouble with a 0x prefix */ 718 /* some scanf () have trouble with a 0x prefix */
598 if (isdigit (str[0]))
599 {
600 if (str[0] == '0' && toupper (str[1]) == 'X') 719 if (str[0] == '0' && toupper (str[1]) == 'X')
720 {
601 str += 2; 721 str += 2;
722
602 if (arg) 723 if (arg)
603 { 724 {
604 if (sscanf (str, (STRCHR (str, ':') ? "%x:" : "%x"), &sym) != 1) 725 if (sscanf (str, (strchr (str, ':') ? "%x:" : "%x"), &sym) != 1)
605 return -1; 726 return -1;
606 } 727 }
607 else 728 else
608 { 729 {
609 if (sscanf (str, "%x:", &sym) != 1) 730 if (sscanf (str, "%x:", &sym) != 1)
610 return -1; 731 return -1;
611 732
612 /* cue to ':', it's there since sscanf () worked */ 733 /* cue to ':', it's there since sscanf () worked */
613 STRNCPY (newargstr, STRCHR (str, ':') + 1, NEWARGLIM - 1); 734 strncpy (newargstr, strchr (str, ':') + 1, NEWARGLIM - 1);
614 newargstr[NEWARGLIM - 1] = '\0'; 735 newargstr[NEWARGLIM - 1] = '\0';
615 newarg = newargstr; 736 newarg = newargstr;
616 } 737 }
617 } 738 }
618 else 739 else
619 { 740 {
620 /* 741 /*
621 * convert keysym name to keysym number 742 * convert keysym name to keysym number
622 */ 743 */
623 STRNCPY (newargstr, str, NEWARGLIM - 1); 744 strncpy (newargstr, str, NEWARGLIM - 1);
624 newargstr[NEWARGLIM - 1] = '\0'; 745 newargstr[NEWARGLIM - 1] = '\0';
746
625 if (arg == NULL) 747 if (arg == NULL)
626 { 748 {
627 if ((newarg = STRCHR (newargstr, ':')) == NULL) 749 if ((newarg = strchr (newargstr, ':')) == NULL)
628 return -1; 750 return -1;
751
629 *newarg++ = '\0'; /* terminate keysym name */ 752 *newarg++ = '\0'; /* terminate keysym name */
630 } 753 }
754
631 if ((sym = XStringToKeysym (newargstr)) == None) 755 if ((sym = XStringToKeysym (newargstr)) == None)
632 return -1; 756 return -1;
633 } 757 }
634 758
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) 759 if (newarg == NULL)
642 { 760 {
643 STRNCPY (newargstr, arg, NEWARGLIM - 1); 761 strncpy (newargstr, arg, NEWARGLIM - 1);
644 newargstr[NEWARGLIM - 1] = '\0'; 762 newargstr[NEWARGLIM - 1] = '\0';
645 newarg = newargstr; 763 newarg = newargstr;
646 } 764 }
765
647 rxvt_Str_trim (newarg); 766 rxvt_Str_trim (newarg);
648 if (*newarg == '\0' || (n = rxvt_Str_escaped (newarg)) == 0) 767 if (*newarg == '\0' || (n = rxvt_Str_escaped (newarg)) == 0)
649 return -1; 768 return -1;
650 MIN_IT (n, 255);
651 key_string = (char *)rxvt_malloc ((n + 1) * sizeof (char));
652 769
653 key_string[0] = n; 770 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; 771 return 1;
658} 772}
659 773
660# endif /* KEYSYM_RESOURCE */ 774# endif /* KEYSYM_RESOURCE */
661 775
… …
671 char *str, buffer[256]; 785 char *str, buffer[256];
672 786
673 if (stream == NULL) 787 if (stream == NULL)
674 return; 788 return;
675 789
676 len = STRLEN (name); 790 len = strlen (name);
677 while ((str = fgets (buffer, sizeof (buffer), stream)) != NULL) 791 while ((str = fgets (buffer, sizeof (buffer), stream)) != NULL)
678 { 792 {
679 unsigned int entry, n; 793 unsigned int entry, n;
680 794
681 while (*str && isspace (*str)) 795 while (*str && isspace (*str))
682 str++; /* leading whitespace */ 796 str++; /* leading whitespace */
683 797
684 if ((str[len] != '*' && str[len] != '.') 798 if ((str[len] != '*' && str[len] != '.')
685 || (len && STRNCMP (str, name, len))) 799 || (len && strncmp (str, name, len)))
686 continue; 800 continue;
687 str += (len + 1); /* skip `name*' or `name.' */ 801 str += (len + 1); /* skip `name*' or `name.' */
688 802
689# ifdef KEYSYM_RESOURCE 803# ifdef KEYSYM_RESOURCE
690 if (!parse_keysym (str, NULL)) 804 if (!parse_keysym (str, NULL))
691# endif /* KEYSYM_RESOURCE */ 805# endif /* KEYSYM_RESOURCE */
692 for (entry = 0; entry < optList_size (); entry++) 806 for (entry = 0; entry < optList_size; entry++)
693 { 807 {
694 const char *kw = optList[entry].kw; 808 const char *kw = optList[entry].kw;
695 809
696 if (kw == NULL) 810 if (kw == NULL)
697 continue; 811 continue;
698 812
699 n = STRLEN (kw); 813 n = strlen (kw);
700 if (str[n] == ':' && rxvt_Str_match (str, kw)) 814 if (str[n] == ':' && rxvt_Str_match (str, kw))
701 { 815 {
702 /* skip `keyword:' */ 816 /* skip `keyword:' */
703 str += n + 1; 817 str += n + 1;
704 rxvt_Str_trim (str); 818 rxvt_Str_trim (str);
705 n = STRLEN (str); 819 n = strlen (str);
820
706 if (n && rs[optList[entry].doff] == NULL) 821 if (n && rs[optList[entry].doff] == NULL)
707 { 822 {
708 /* not already set */ 823 /* not already set */
709 int s; 824 int s;
710 char *p = 0; 825 char *p = 0;
711 826
712 for (int o = 0;;) 827 for (int o = 0;;)
713 { 828 {
714 p = (char *)rxvt_realloc (p, o + n + 1); 829 p = (char *)rxvt_realloc (p, o + n + 1);
715 MEMCPY (p + o, str, n); 830 memcpy (p + o, str, n);
716 o += n; 831 o += n;
717 p[o] = 0; 832 p[o] = 0;
718 833
719 if (o == 0 || p[o - 1] != '\\') // continuation line 834 if (o == 0 || p[o - 1] != '\\') // continuation line
720 break; 835 break;
… …
723 838
724 if ((str = fgets (buffer, sizeof (buffer), stream)) == NULL) 839 if ((str = fgets (buffer, sizeof (buffer), stream)) == NULL)
725 break; 840 break;
726 841
727 rxvt_Str_trim (str); 842 rxvt_Str_trim (str);
728 n = STRLEN (str); 843 n = strlen (str);
729 } 844 }
730 845
731 rs[optList[entry].doff] = p; 846 rs[optList[entry].doff] = p;
732 allocated.push_back (p); 847 allocated.push_back (p);
733 848
734 if (optList_isBool (entry)) 849 if (optList_isBool (entry))
735 { 850 {
736 s = STRCASECMP (str, "TRUE") == 0 851 s = strcasecmp (str, "true") == 0
737 || STRCASECMP (str, "YES") == 0 852 || strcasecmp (str, "yes") == 0
738 || STRCASECMP (str, "ON") == 0 853 || strcasecmp (str, "on") == 0
739 || STRCASECMP (str, "1") == 0; 854 || strcmp (str, "1") == 0;
740 855
741 if (optList_isReverse (entry)) 856 if (optList_isReverse (entry))
742 s = !s; 857 s = !s;
743 858
744 if (s) 859 if (s)
745 Options |= optList[entry].flag; 860 options |= optList[entry].flag;
746 else 861 else
747 Options &= ~optList[entry].flag; 862 options &= ~optList[entry].flag;
748 } 863 }
749 } 864 }
750 865
751 break; 866 break;
752 } 867 }
… …
764/* 879/*
765 * using XGetDefault () or the hand-rolled replacement 880 * using XGetDefault () or the hand-rolled replacement
766 */ 881 */
767/* ARGSUSED */ 882/* ARGSUSED */
768void 883void
769rxvt_term::extract_resources (Display *display __attribute__ ((unused)), const char *name) 884rxvt_term::extract_resources ()
770{ 885{
886 dDisp;
887
771#ifndef NO_RESOURCES 888#ifndef NO_RESOURCES
889
890 char *homedir = (char *)getenv ("HOME");
891 char fname[1024];
772 892
773# if defined XAPPLOADDIR 893# if defined XAPPLOADDIR
774# if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE) 894# if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
775 /* Compute the path of the possibly available localized Rxvt file */ 895 /* Compute the path of the possibly available localized Rxvt file */
776 char *localepath = NULL; 896 char localepath[1024];
777 897
778 if (locale != NULL) 898 if (locale)
779 { /* XXX: must limit length of string */
780 localepath = (char *)rxvt_malloc (256);
781 sprintf (localepath, XAPPLOADDIRLOCALE "/" RESCLASS, 899 snprintf (localepath, sizeof (localepath), XAPPLOADDIRLOCALE "/" RESCLASS, locale);
782 (int) (258 - sizeof (XAPPLOADDIRLOCALE) - sizeof (RESCLASS)), 900 else
783 locale); /* 258 = 255 + 4 (-.*s) - 1 (/) */ 901 localepath[0] = 0;
784 }
785
786 {
787# endif 902# endif
788# endif 903# endif
789 904
790# ifdef USE_XGETDEFAULT 905# ifdef USE_XGETDEFAULT
791 /* 906 /*
792 * get resources using the X library function 907 * get resources using the X library function
793 */ 908 */
794 int entry; 909 int entry;
795 910
796# ifdef XrmEnumOneLevel 911# ifdef XrmEnumOneLevel
797 int i;
798 char *displayResource, *xe; 912 char *displayResource, *xe;
799 XrmName name_prefix[3]; 913 XrmName name_prefix[3];
800 XrmClass class_prefix[3]; 914 XrmClass class_prefix[3];
801 XrmDatabase database, rdb1; 915 XrmDatabase database, rdb1;
802 char fname[1024];
803 916
804 XrmInitialize (); 917 XrmInitialize ();
805 database = NULL; 918 database = NULL;
806 919
920 // for ordering, see for example http://www.faqs.org/faqs/Xt-FAQ/ Subject: 20
921
922 // 6. System wide per application default file.
923 /* Add in Rxvt file */
924# if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
925 if (*localepath
926 && ((rdb1 = XrmGetFileDatabase (localepath))
927 || (rdb1 = XrmGetFileDatabase (XAPPLOADDIR "/" RESCLASS))))
928# endif
929 XrmMergeDatabases (rdb1, &database);
930
931 /* Add in $XAPPLRESDIR/Rxvt only; not bothering with XUSERFILESEARCHPATH */
932 if ((xe = (char *)getenv ("XAPPLRESDIR")))
933 {
934 snprintf (fname, sizeof (fname), "%s/%s", xe, RESCLASS);
935
936 if ((rdb1 = XrmGetFileDatabase (fname)))
937 XrmMergeDatabases (rdb1, &database);
938 }
939
940 // 5. User's per application default file.
941 // none
942
943 // 4. User's defaults file.
807 /* Get any Xserver defaults */ 944 /* Get any Xserver defaults */
808
809 displayResource = XResourceManagerString (display); 945 displayResource = XResourceManagerString (disp);
810 if (displayResource != NULL) 946 if (displayResource != NULL)
947 {
811 database = XrmGetStringDatabase (displayResource); 948 if ((rdb1 = XrmGetStringDatabase (displayResource)))
812 949 XrmMergeDatabases (rdb1, &database);
813# ifdef HAVE_EXTRA_XRESOURCE_FILES
814 /* Add in ~/.Xdefaults or ~/.Xresources */
815 { 950 }
816 char *ptr; 951 else if (homedir)
952 {
953 snprintf (fname, sizeof (fname), "%s/.Xdefaults", homedir);
817 954
818 if ((ptr = (char *)getenv ("HOME")) == NULL) 955 if ((rdb1 = XrmGetFileDatabase (fname)))
819 ptr = "."; 956 XrmMergeDatabases (rdb1, &database);
957 }
820 958
821 for (i = 0; i < (sizeof (xnames) / sizeof (xnames[0])); i++) 959 /* Get screen specific resources */
960 displayResource = XScreenResourceString (ScreenOfDisplay (disp, display->screen));
961 if (displayResource != NULL)
962 {
963 if ((rdb1 = XrmGetStringDatabase (displayResource)))
964 /* Merge with screen-independent resources */
965 XrmMergeDatabases (rdb1, &database);
966
967 XFree (displayResource);
968 }
969
970 // 3. User's per host defaults file
971 /* Add in XENVIRONMENT file */
972 if ((xe = (char *)getenv ("XENVIRONMENT"))
973 && (rdb1 = XrmGetFileDatabase (xe)))
974 XrmMergeDatabases (rdb1, &database);
975 else if (homedir)
976 {
977 struct utsname un;
978
979 if (!uname (&un))
822 { 980 {
823 sprintf (fname, "%-.*s/%s", sizeof (fname) - STRLEN (xnames[i]) - 2, 981 snprintf (fname, sizeof (fname), "%s/.Xdefaults-%s", homedir, un.nodename);
824 ptr, xnames[i]); 982
825 if ((rdb1 = XrmGetFileDatabase (fname))) 983 if ((rdb1 = XrmGetFileDatabase (fname)))
984 XrmMergeDatabases (rdb1, &database);
985 }
986 }
987
988 XrmSetDatabase (disp, database);
989# endif
990
991 /*
992 * Query resources for options that affect us
993 */
994 for (entry = 0; entry < optList_size; entry++)
995 {
996 int s;
997 char *p, *p0;
998 const char *kw = optList[entry].kw;
999
1000 if (kw == NULL || rs[optList[entry].doff] != NULL)
1001 continue; /* previously set */
1002
1003 p = XGetDefault (disp, rs[Rs_name], kw);
1004 p0 = XGetDefault (disp, "!INVALIDPROGRAMMENAMEDONTMATCH!", kw);
1005 if (p == NULL || (p0 && strcmp (p, p0) == 0))
1006 {
1007 p = XGetDefault (disp, RESCLASS, kw);
1008#ifdef RESFALLBACK
1009 if (p == NULL || (p0 && strcmp (p, p0) == 0))
1010 p = XGetDefault (disp, RESFALLBACK, kw);
1011#endif
1012 }
1013
1014 if (p == NULL && p0)
1015 p = p0;
1016
1017 if (p)
1018 {
1019 rs[optList[entry].doff] = p;
1020
1021 if (optList_isBool (entry))
826 { 1022 {
827 XrmMergeDatabases (rdb1, &database); 1023 s = strcasecmp (p, "TRUE") == 0
828# ifndef HAVE_BOTH_XRESOURCE_FILES 1024 || strcasecmp (p, "YES") == 0
1025 || strcasecmp (p, "ON") == 0
1026 || strcasecmp (p, "1") == 0;
1027
1028 if (optList_isReverse (entry))
1029 s = !s;
1030
1031 if (s)
1032 options |= optList[entry].flag;
829 break; 1033 else
830# endif 1034 options &= ~optList[entry].flag;
831
832 } 1035 }
833 } 1036 }
834 } 1037 }
835# endif
836 1038
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 /* 1039 /*
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 1040 * [R5 or later]: enumerate the resource database
912 */ 1041 */
913# ifdef XrmEnumOneLevel
914# ifdef KEYSYM_RESOURCE 1042# ifdef KEYSYM_RESOURCE
915 name_prefix[0] = XrmStringToName (name); 1043 name_prefix[0] = XrmStringToName (rs[Rs_name]);
916 name_prefix[1] = XrmStringToName ("keysym"); 1044 name_prefix[1] = XrmStringToName ("keysym");
917 name_prefix[2] = NULLQUARK; 1045 name_prefix[2] = NULLQUARK;
918 class_prefix[0] = XrmStringToName (RESCLASS); 1046 class_prefix[0] = XrmStringToName (RESCLASS);
919 class_prefix[1] = XrmStringToName ("Keysym"); 1047 class_prefix[1] = XrmStringToName ("Keysym");
920 class_prefix[2] = NULLQUARK; 1048 class_prefix[2] = NULLQUARK;
921 /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */ 1049 /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */
922 XrmEnumerateDatabase (XrmGetDatabase (display), name_prefix, class_prefix, 1050 XrmEnumerateDatabase (XrmGetDatabase (disp), name_prefix, class_prefix,
923 XrmEnumOneLevel, rxvt_define_key, NULL); 1051 XrmEnumOneLevel, rxvt_define_key, NULL);
924# ifdef RESFALLBACK 1052# ifdef RESFALLBACK
925 name_prefix[0] = XrmStringToName (RESFALLBACK); 1053 name_prefix[0] = XrmStringToName (RESFALLBACK);
926 name_prefix[1] = XrmStringToName ("keysym"); 1054 name_prefix[1] = XrmStringToName ("keysym");
927 class_prefix[0] = XrmStringToName (RESFALLBACK); 1055 class_prefix[0] = XrmStringToName (RESFALLBACK);
928 class_prefix[1] = XrmStringToName ("Keysym"); 1056 class_prefix[1] = XrmStringToName ("Keysym");
929 /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */ 1057 /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */
930 XrmEnumerateDatabase (XrmGetDatabase (display), name_prefix, class_prefix, 1058 XrmEnumerateDatabase (XrmGetDatabase (disp), name_prefix, class_prefix,
931 XrmEnumOneLevel, rxvt_define_key, NULL); 1059 XrmEnumOneLevel, rxvt_define_key, NULL);
932# endif
933# endif 1060# endif
934# endif 1061# endif
935 1062
936# else /* USE_XGETDEFAULT */ 1063# else /* USE_XGETDEFAULT */
937 /* get resources the hard way, but save lots of memory */ 1064 /* get resources the hard way, but save lots of memory */
1065 FILE *fd = NULL;
1066
1067 if (homedir)
1068 {
1069 static const char *const xnames[2] = { ".Xdefaults", ".Xresources" };
1070
1071 for (int i = 0; i < (sizeof (xnames) / sizeof (xnames [0])); i++)
1072 {
1073 snprintf (fname, sizeof (fname), "%s/%s", homedir, xnames [i]);
1074
1075 if ((fd = fopen (fname, "r")) != NULL)
1076 break;
1077 }
1078 }
1079 /*
1080 * The normal order to match resources is the following:
1081 * @ global resources (partial match, ~/.Xdefaults)
1082 * @ application file resources (XAPPLOADDIR/Rxvt)
1083 * @ class resources (~/.Xdefaults)
1084 * @ private resources (~/.Xdefaults)
1085 *
1086 * However, for the hand-rolled resources, the matching algorithm
1087 * checks if a resource string value has already been allocated
1088 * and won't overwrite it with (in this case) a less specific
1089 * resource value.
1090 *
1091 * This avoids multiple allocation. Also, when we've called this
1092 * routine command-line string options have already been applied so we
1093 * needn't to allocate for those resources.
1094 *
1095 * So, search in resources from most to least specific.
1096 *
1097 * Also, use a special sub-class so that we can use either or both of
1098 * "XTerm" and "Rxvt" as class names.
1099 */
1100
1101 get_xdefaults (fd, rs[Rs_name]);
1102 get_xdefaults (fd, RESCLASS);
1103# ifdef RESFALLBACK
1104 get_xdefaults (fd, RESFALLBACK);
1105# endif
1106
1107# if defined(XAPPLOADDIR) && defined(USE_XAPPLOADDIR)
1108 {
938 FILE *fd = NULL; 1109 FILE *ad = NULL;
939 char *home;
940 1110
941 if ((home = getenv ("HOME")) != NULL) 1111# if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1112 if (!*localepath || (ad = fopen (localepath, "r")) == NULL)
1113# endif
1114 ad = fopen (XAPPLOADDIR "/" RESCLASS, "r");
1115 if (ad != NULL)
942 { 1116 {
943 unsigned int i, len = STRLEN (home) + 2; 1117 get_xdefaults (ad, RESCLASS);
944 char *f = NULL; 1118 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); 1119 fclose (ad);
956 } 1120 }
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 } 1121 }
1000# endif /* XAPPLOADDIR */ 1122# endif /* XAPPLOADDIR */
1001 1123
1002 get_xdefaults (fd, ""); /* partial match */ 1124 get_xdefaults (fd, ""); /* partial match */
1003 if (fd != NULL) 1125 if (fd != NULL)
1004 fclose (fd); 1126 fclose (fd);
1005# endif /* USE_XGETDEFAULT */ 1127# 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 1128
1017#endif /* NO_RESOURCES */ 1129#endif /* NO_RESOURCES */
1018} 1130}
1019 1131
1020/*}}} */ 1132/*}}} */

Diff Legend

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