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.11 by pcg, Fri Feb 13 12:16:21 2004 UTC vs.
Revision 1.42 by root, Wed Dec 1 02:12:18 2004 UTC

1/*--------------------------------*-C-*---------------------------------* 1/*--------------------------------*-C-*---------------------------------*
2 * File: xdefaults.c 2 * File: xdefaults.C
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * $Id: xdefaults.C,v 1.11 2004/02/13 12:16:21 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 */
34 33
35/* #define DEBUG_RESOURCES */ 34/* #define DEBUG_RESOURCES */
36 35
37static const char *const xnames[2] = { ".Xdefaults", ".Xresources" }; 36static const char *const xnames[2] = { ".Xdefaults", ".Xresources" };
38 37
… …
63#define SWCH(opt, flag, desc) \ 62#define SWCH(opt, flag, desc) \
64 { (flag), -1, NULL, (opt), NULL, (desc)} 63 { (flag), -1, NULL, (opt), NULL, (desc)}
65 64
66/* convenient macros */ 65/* convenient macros */
67#define optList_strlen(i) \ 66#define optList_strlen(i) \
68 (optList[i].flag ? 0 : (optList[i].arg ? STRLEN (optList[i].arg) : 1)) 67 (optList[i].flag ? 0 : (optList[i].arg ? strlen (optList[i].arg) : 1))
69#define optList_isBool(i) \ 68#define optList_isBool(i) \
70 (optList[i].flag & Opt_Boolean) 69 (optList[i].flag & Opt_Boolean)
71#define optList_isReverse(i) \ 70#define optList_isReverse(i) \
72 (optList[i].flag & Opt_Reverse) 71 (optList[i].flag & Opt_Reverse)
73#define optList_size() \ 72#define optList_size() \
… …
83 const char *desc; /* description */ 82 const char *desc; /* description */
84 } 83 }
85optList[] = { 84optList[] = {
86 STRG (Rs_display_name, NULL, "d", NULL, NULL), /* short form */ 85 STRG (Rs_display_name, NULL, "d", NULL, NULL), /* short form */
87 STRG (Rs_display_name, NULL, "display", "string", "X server to contact"), 86 STRG (Rs_display_name, NULL, "display", "string", "X server to contact"),
88 STRG (Rs_term_name, "termName", "tn", "string", 87 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 */ 88 STRG (Rs_geometry, NULL, "g", NULL, NULL), /* short form */
91 STRG (Rs_geometry, "geometry", "geometry", "geometry", 89 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"), 90 SWCH ("C", Opt_console, "intercept console messages"),
94 SWCH ("iconic", Opt_iconic, "start iconic"), 91 SWCH ("iconic", Opt_iconic, "start iconic"),
95 SWCH ("ic", Opt_iconic, NULL), /* short form */ 92 SWCH ("ic", Opt_iconic, NULL), /* short form */
96 BOOL (Rs_reverseVideo, "reverseVideo", "rv", Opt_reverseVideo, 93 BOOL (Rs_reverseVideo, "reverseVideo", "rv", Opt_reverseVideo, "reverse video"),
97 "reverse video"),
98 BOOL (Rs_loginShell, "loginShell", "ls", Opt_loginShell, "login shell"), 94 BOOL (Rs_loginShell, "loginShell", "ls", Opt_loginShell, "login shell"),
99 BOOL (Rs_jumpScroll, "jumpScroll", "j", Opt_jumpScroll, "jump scrolling"), 95 BOOL (Rs_jumpScroll, "jumpScroll", "j", Opt_jumpScroll, "jump scrolling"),
96 BOOL (Rs_pastableTabs, "pastableTabs", "ptab", Opt_pastableTabs, "tab characters are pastable"),
100#ifdef HAVE_SCROLLBARS 97#ifdef HAVE_SCROLLBARS
101 BOOL (Rs_scrollBar, "scrollBar", "sb", Opt_scrollBar, "scrollbar"), 98 BOOL (Rs_scrollBar, "scrollBar", "sb", Opt_scrollBar, "scrollbar"),
102 BOOL (Rs_scrollBar_right, "scrollBar_right", "sr", Opt_scrollBar_right, 99 BOOL (Rs_scrollBar_right, "scrollBar_right", "sr", Opt_scrollBar_right, "scrollbar right"),
103 "scrollbar right"), 100 BOOL (Rs_scrollBar_floating, "scrollBar_floating", "st", Opt_scrollBar_floating, "scrollbar without a trough"),
104 BOOL (Rs_scrollBar_floating, "scrollBar_floating", "st",
105 Opt_scrollBar_floating, "scrollbar without a trough"),
106#endif 101#endif
107 BOOL (Rs_scrollTtyOutput, "scrollTtyOutput", NULL, Opt_scrollTtyOutput, 102 BOOL (Rs_scrollTtyOutput, "scrollTtyOutput", NULL, Opt_scrollTtyOutput, NULL),
108 NULL),
109 BOOL (Rs_scrollTtyOutput, NULL, "si", Opt_Reverse | Opt_scrollTtyOutput, 103 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, 104 BOOL (Rs_scrollTtyKeypress, "scrollTtyKeypress", "sk", Opt_scrollTtyKeypress, "scroll-on-keypress"),
112 "scroll-on-keypress"),
113 BOOL (Rs_scrollWithBuffer, "scrollWithBuffer", "sw", Opt_scrollWithBuffer, 105 BOOL (Rs_scrollWithBuffer, "scrollWithBuffer", "sw", Opt_scrollWithBuffer, "scroll-with-buffer"),
114 "scroll-with-buffer"),
115#ifdef TRANSPARENT 106#ifdef TRANSPARENT
116 BOOL (Rs_transparent, "inheritPixmap", "ip", Opt_transparent, 107 BOOL (Rs_transparent, "inheritPixmap", "ip", Opt_transparent, "inherit parent pixmap"),
117 "inherit parent pixmap"),
118 BOOL (Rs_transparent_all, "inheritPixmapforce", "ipf", Opt_transparent_all, 108 BOOL (Rs_transparent_all, "inheritPixmapforce", "ipf", Opt_transparent_all, "forcefully inherit root pixmap"),
119 "forcefully inherit root pixmap"),
120 SWCH ("tr", Opt_transparent, NULL), 109 SWCH ("tr", Opt_transparent, NULL),
110#if TINTING
111 STRG (Rs_color + Color_tint, "tintColor", "tint", "color", "tint color"),
112#endif
113#endif
114#ifdef OFF_FOCUS_FADING
115 STRG (Rs_fade, "fading", "fade", "%", "make colors x% darker when rxvt-unicode is losing focus."),
116#endif
117#ifdef TINTING
118 STRG (Rs_shade, "shading", "sh", "%", "shade background by x% when tinting."),
121#endif 119#endif
122 BOOL (Rs_utmpInhibit, "utmpInhibit", "ut", Opt_utmpInhibit, "utmp inhibit"), 120 BOOL (Rs_utmpInhibit, "utmpInhibit", "ut", Opt_utmpInhibit, "utmp inhibit"),
123#ifndef NO_BELL 121#ifndef NO_BELL
124 BOOL (Rs_visualBell, "visualBell", "vb", Opt_visualBell, "visual bell"), 122 BOOL (Rs_visualBell, "visualBell", "vb", Opt_visualBell, "visual bell"),
125# if ! defined(NO_MAPALERT) && defined(MAPALERT_OPTION) 123# if ! defined(NO_MAPALERT) && defined(MAPALERT_OPTION)
… …
128#endif 126#endif
129#ifdef META8_OPTION 127#ifdef META8_OPTION
130 BOOL (Rs_meta8, "meta8", NULL, Opt_meta8, NULL), 128 BOOL (Rs_meta8, "meta8", NULL, Opt_meta8, NULL),
131#endif 129#endif
132#ifdef MOUSE_WHEEL 130#ifdef MOUSE_WHEEL
133 BOOL (Rs_mouseWheelScrollPage, "mouseWheelScrollPage", NULL, Opt_mouseWheelScrollPage, 131 BOOL (Rs_mouseWheelScrollPage, "mouseWheelScrollPage", NULL, Opt_mouseWheelScrollPage, NULL),
134 NULL),
135#endif 132#endif
136#ifdef MULTICHAR_SET 133#if ENABLE_FRILLS
137 BOOL (Rs_mc_hack, "multibyte_cursor", "mcc", Opt_mc_hack,
138 "Multibyte character cursor movement"),
139#endif
140#ifndef NO_FRILLS
141 BOOL (Rs_tripleclickwords, "tripleclickwords", "tcw", Opt_tripleclickwords, 134 BOOL (Rs_tripleclickwords, "tripleclickwords", "tcw", Opt_tripleclickwords, "triple click word selection"),
142 "triple click word selection"), 135 BOOL (Rs_insecure, "insecure", "insecure", Opt_insecure, "enable possibly insecure escape sequences"),
143#endif 136#endif
144#ifdef CURSOR_BLINK 137#ifdef CURSOR_BLINK
145 BOOL (Rs_cursorBlink, "cursorBlink", "bc", Opt_cursorBlink, "blinking cursor"), 138 BOOL (Rs_cursorBlink, "cursorBlink", "bc", Opt_cursorBlink, "blinking cursor"),
146#endif 139#endif
147#ifdef POINTER_BLANK 140#ifdef POINTER_BLANK
… …
167 RSTRG (Rs_color + minBrightCOLOR + 6, "color14", "color"), 160 RSTRG (Rs_color + minBrightCOLOR + 6, "color14", "color"),
168 RSTRG (Rs_color + minBrightCOLOR + 7, "color15", "color"), 161 RSTRG (Rs_color + minBrightCOLOR + 7, "color15", "color"),
169#endif /* NO_BRIGHTCOLOR */ 162#endif /* NO_BRIGHTCOLOR */
170#ifndef NO_BOLD_UNDERLINE_REVERSE 163#ifndef NO_BOLD_UNDERLINE_REVERSE
171 RSTRG (Rs_color + Color_BD, "colorBD", "color"), 164 RSTRG (Rs_color + Color_BD, "colorBD", "color"),
165 RSTRG (Rs_color + Color_IT, "colorIT", "color"),
172 RSTRG (Rs_color + Color_UL, "colorUL", "color"), 166 RSTRG (Rs_color + Color_UL, "colorUL", "color"),
173 RSTRG (Rs_color + Color_RV, "colorRV", "color"), 167 RSTRG (Rs_color + Color_RV, "colorRV", "color"),
174#endif /* ! NO_BOLD_UNDERLINE_REVERSE */ 168#endif /* ! NO_BOLD_UNDERLINE_REVERSE */
175#ifdef KEEP_SCROLLCOLOR 169#ifdef KEEP_SCROLLCOLOR
176 RSTRG (Rs_color + Color_scroll, "scrollColor", "color"), 170 RSTRG (Rs_color + Color_scroll, "scrollColor", "color"),
… …
181#endif 175#endif
182#if defined (XPM_BACKGROUND) || (MENUBAR_MAX) 176#if defined (XPM_BACKGROUND) || (MENUBAR_MAX)
183 RSTRG (Rs_path, "path", "search path"), 177 RSTRG (Rs_path, "path", "search path"),
184#endif /* defined (XPM_BACKGROUND) || (MENUBAR_MAX) */ 178#endif /* defined (XPM_BACKGROUND) || (MENUBAR_MAX) */
185#ifdef XPM_BACKGROUND 179#ifdef XPM_BACKGROUND
186 STRG (Rs_backgroundPixmap, "backgroundPixmap", "pixmap", "file[;geom]", 180 STRG (Rs_backgroundPixmap, "backgroundPixmap", "pixmap", "file[;geom]", "background pixmap"),
187 "background pixmap"),
188#endif /* XPM_BACKGROUND */ 181#endif /* XPM_BACKGROUND */
189#if (MENUBAR_MAX) 182#if (MENUBAR_MAX)
190 RSTRG (Rs_menu, "menu", "name[;tag]"), 183 RSTRG (Rs_menu, "menu", "name[;tag]"),
191#endif 184#endif
185 /* fonts: command-line option = resource name */
192 STRG (Rs_font, "font", "fn", "fontname", "normal text font"), 186 STRG (Rs_font, "font", "fn", "fontname", "normal text font"),
193 /* fonts: command-line option = resource name */ 187#if ENABLE_STYLES
188 STRG (Rs_boldFont, "boldFont", "fb", "fontname", "bold font"),
189 STRG (Rs_italicFont, "italicFont", "fi", "fontname", "italic font"),
190 STRG (Rs_boldItalicFont, "boldItalicFont", "fbi", "fontname", "bold italic font"),
191#endif
194#ifdef USE_XIM 192#ifdef USE_XIM
195 STRG (Rs_inputMethod, "inputMethod", "im", "name", "name of input method"), 193 STRG (Rs_inputMethod, "inputMethod", "im", "name", "name of input method"),
196 STRG (Rs_preeditType, "preeditType", "pt", "style", 194 STRG (Rs_preeditType, "preeditType", "pt", "style", "input style: style = OverTheSpot|OffTheSpot|Root"),
197 "input style: style = OverTheSpot|OffTheSpot|Root"),
198#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE) 195#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
199 STRG (Rs_imLocale, "imLocale", "imlocale", "string", "locale to use for input method"), 196 STRG (Rs_imLocale, "imLocale", "imlocale", "string", "locale to use for input method"),
200#endif 197#endif
201#endif /* USE_XIM */ 198#endif /* USE_XIM */
202#ifdef GREEK_SUPPORT 199 STRG (Rs_name, NULL, "name", "string", "client instance, icon, and title strings"),
203 STRG (Rs_greek_keyboard, "greek_keyboard", "grk", "mode",
204 "greek keyboard mapping; mode = iso | ibm"),
205 RSTRG (Rs_greektoggle_key, "greektoggle_key", "keysym"),
206#endif
207 STRG (Rs_name, NULL, "name", "string",
208 "client instance, icon, and title strings"),
209 STRG (Rs_title, "title", "title", "string", "title name for window"), 200 STRG (Rs_title, "title", "title", "string", "title name for window"),
210 STRG (Rs_title, NULL, "T", NULL, NULL), /* short form */ 201 STRG (Rs_title, NULL, "T", NULL, NULL), /* short form */
211 STRG (Rs_iconName, "iconName", "n", "string", "icon name for window"), 202 STRG (Rs_iconName, "iconName", "n", "string", "icon name for window"),
212#ifndef NO_CURSORCOLOR 203#ifndef NO_CURSORCOLOR
213 STRG (Rs_color + Color_cursor, "cursorColor", "cr", "color", "cursor color"), 204 STRG (Rs_color + Color_cursor, "cursorColor", "cr", "color", "cursor color"),
214 /* command-line option = resource name */ 205 /* command-line option = resource name */
215 RSTRG (Rs_color + Color_cursor2, "cursorColor2", "color"), 206 RSTRG (Rs_color + Color_cursor2, "cursorColor2", "color"),
216#endif /* NO_CURSORCOLOR */ 207#endif /* NO_CURSORCOLOR */
217 STRG (Rs_color + Color_pointer, "pointerColor", "pr", "color", 208 STRG (Rs_color + Color_pointer_fg, "pointerColor", "pr", "color", "pointer color"),
218 "pointer color"), 209 STRG (Rs_color + Color_pointer_bg, "pointerColor2", "pr2", "color", "pointer bg color"),
219 STRG (Rs_color + Color_border, "borderColor", "bd", "color", 210 STRG (Rs_color + Color_border, "borderColor", "bd", "color", "border color"),
220 "border color"),
221 STRG (Rs_saveLines, "saveLines", "sl", "number", 211 STRG (Rs_saveLines, "saveLines", "sl", "number", "number of scrolled lines to save"),
222 "number of scrolled lines to save"), 212#if ENABLE_FRILLS
223#ifndef NO_FRILLS
224 STRG (Rs_ext_bwidth, "externalBorder", "w", "number", 213 STRG (Rs_ext_bwidth, "externalBorder", "w", "number", "external border in pixels"),
225 "external border in pixels"),
226 STRG (Rs_ext_bwidth, NULL, "bw", NULL, NULL), 214 STRG (Rs_ext_bwidth, NULL, "bw", NULL, NULL),
227 STRG (Rs_ext_bwidth, NULL, "borderwidth", NULL, NULL), 215 STRG (Rs_ext_bwidth, NULL, "borderwidth", NULL, NULL),
228 STRG (Rs_int_bwidth, "internalBorder", "b", "number", 216 STRG (Rs_int_bwidth, "internalBorder", "b", "number", "internal border in pixels"),
229 "internal border in pixels"), 217 BOOL (Rs_borderLess, "borderLess", "bl", Opt_borderLess, "borderless window"),
230#endif 218#endif
231#ifndef NO_LINESPACE 219#ifndef NO_LINESPACE
232 STRG (Rs_lineSpace, "lineSpace", "lsp", "number", 220 STRG (Rs_lineSpace, "lineSpace", "lsp", "number", "number of extra pixels between rows"),
233 "number of extra pixels between rows"),
234#endif 221#endif
235 STRG (Rs_scrollBar_thickness, "thickness", "sbt", "number", 222 STRG (Rs_scrollBar_thickness, "thickness", "sbt", "number", "scrollbar thickness/width in pixels"),
236 "scrollbar thickness/width in pixels"),
237#ifdef POINTER_BLANK 223#ifdef POINTER_BLANK
238 RSTRG (Rs_pointerBlankDelay, "pointerBlankDelay", "number"), 224 RSTRG (Rs_pointerBlankDelay, "pointerBlankDelay", "number"),
239#endif 225#endif
240#ifndef NO_BACKSPACE_KEY 226#ifndef NO_BACKSPACE_KEY
241 RSTRG (Rs_backspace_key, "backspacekey", "string"), 227 RSTRG (Rs_backspace_key, "backspacekey", "string"),
… …
249 RSTRG (Rs_scrollBar_align, "scrollBar_align", "mode"), 235 RSTRG (Rs_scrollBar_align, "scrollBar_align", "mode"),
250#endif 236#endif
251#ifdef PRINTPIPE 237#ifdef PRINTPIPE
252 RSTRG (Rs_print_pipe, "print-pipe", "string"), 238 RSTRG (Rs_print_pipe, "print-pipe", "string"),
253#endif 239#endif
254#if defined (HOTKEY_CTRL) || defined (HOTKEY_META) 240 STRG (Rs_modifier, "modifier", "mod", "modifier", "meta modifier = alt|meta|hyper|super|mod1|...|mod5"),
255 RSTRG (Rs_bigfont_key, "bigfont_key", "keysym"),
256 RSTRG (Rs_smallfont_key, "smallfont_key", "keysym"),
257#endif
258 STRG (Rs_modifier, "modifier", "mod", "modifier",
259 "meta modifier = alt|meta|hyper|super|mod1|...|mod5"),
260 INFO ("xrm", "string", "X resource"), 241 INFO ("xrm", "string", "X resource"),
261#ifdef CUTCHAR_RESOURCE 242#ifdef CUTCHAR_RESOURCE
262 RSTRG (Rs_cutchars, "cutchars", "string"), 243 RSTRG (Rs_cutchars, "cutchars", "string"),
263#endif /* CUTCHAR_RESOURCE */ 244#endif /* CUTCHAR_RESOURCE */
264#ifdef ACS_ASCII
265 RSTRG (Rs_acs_chars, "acsChars", "string"),
266#endif /* ACS_ASCII */
267 RSTRG (Rs_answerbackstring, "answerbackString", "string"), 245 RSTRG (Rs_answerbackstring, "answerbackString", "string"),
246#ifndef NO_SECONDARY_SCREEN
247 BOOL (Rs_secondaryScreen, "secondaryScreen", "ssc", Opt_secondaryScreen, "enable secondary screen"),
248 BOOL (Rs_secondaryScroll, "secondaryScroll", "ssr", Opt_secondaryScroll, "enable secondary screen scroll"),
249#endif
268 INFO ("e", "command arg ...", "command to execute") 250 INFO ("e", "command arg ...", "command to execute")
269 }; 251 };
270 252
271#undef INFO 253#undef INFO
272#undef STRG 254#undef STRG
273#undef RSTRG 255#undef RSTRG
274#undef SWCH 256#undef SWCH
275#undef BOOL 257#undef BOOL
276/*}}} */ 258/*}}} */
277 259
278static const char releasestring[] = "Rxvt v" VERSION " - released: " DATE "\n"; 260static const char releasestring[] = "rxvt-unicode (" RXVTNAME ") v" VERSION " - released: " DATE "\n";
279static const char optionsstring[] = "Options: " 261static const char optionsstring[] = "options: "
262#if XFT
263 "xft,"
264#endif
265#if ENABLE_STYLES
266 "styles,"
267#endif
268#if ENABLE_COMBINING
269 "combining,"
270#endif
271#if TEXT_BLINK
272 "blink,"
273#endif
274#if ISO_14755
275 "iso14755,"
276#endif
277#if UNICODE_3
278 "unicode3,"
279#endif
280 "encodings=eu+vn"
281#if ENCODING_JP
282 "+jp"
283#endif
284#if ENCODING_JP_EXT
285 "+jp-ext"
286#endif
287#if ENCODING_KR
288 "+kr"
289#endif
290#if ENCODING_ZH
291 "+zh"
292#endif
293#if ENCODING_ZH_EXT
294 "+zh-ext"
295#endif
296 ","
297#if OFF_FOCUS_FADING
298 "fade,"
299#endif
280#if defined(XPM_BACKGROUND) 300#if defined(XPM_BACKGROUND)
281 "XPM," 301 "XPM,"
282#endif 302#endif
283#if defined(TRANSPARENT) 303#if defined(TRANSPARENT)
284 "transparent," 304 "transparent,"
285#endif 305#endif
306#if TINTING
307 "tint,"
308#endif
286#if defined(UTMP_SUPPORT) 309#if defined(UTMP_SUPPORT)
287 "utmp," 310 "utmp,"
288#endif 311#endif
289#if defined(MENUBAR) 312#if defined(MENUBAR)
290 "menubar," 313 "menubar,"
291#endif 314#endif
292#if !defined(NO_FRILLS)
293 "frills,"
294#endif
295#if !defined(NO_LINESPACE)
296 "linespace,"
297#endif
298#if defined(PREFER_24BIT)
299 "24bit,"
300#endif
301#if defined(USE_XIM) 315#if defined(USE_XIM)
302 "XIM," 316 "XIM,"
303#endif
304#if defined(MULTICHAR_SET)
305 "multichar_languages,"
306#endif 317#endif
307 "scrollbars=" 318 "scrollbars="
308#if !defined(HAVE_SCROLLBARS) 319#if !defined(HAVE_SCROLLBARS)
309 "NONE" 320 "NONE"
310#else 321#else
322# if defined(PLAIN_SCROLLBAR)
323 "plain"
324# if defined(RXVT_SCROLLBAR) || defined(NEXT_SCROLLBAR) || defined(XTERM_SCROLLBAR)
325 "+"
326# endif
327# endif
311# if defined(RXVT_SCROLLBAR) 328# if defined(RXVT_SCROLLBAR)
312 "rxvt" 329 "rxvt"
313# if defined(NEXT_SCROLLBAR) || defined(XTERM_SCROLLBAR) 330# if defined(NEXT_SCROLLBAR) || defined(XTERM_SCROLLBAR)
314 "+" 331 "+"
315# endif 332# endif
… …
323# if defined(XTERM_SCROLLBAR) 340# if defined(XTERM_SCROLLBAR)
324 "xterm" 341 "xterm"
325# endif 342# endif
326#endif 343#endif
327 "," 344 ","
328#if defined(GREEK_SUPPORT)
329 "Greek,"
330#endif
331#if defined(RXVT_GRAPHICS)
332 "graphics,"
333#endif
334#if defined(NO_BACKSPACE_KEY) 345#if defined(NO_BACKSPACE_KEY)
335 "no_backspace," 346 "no_backspace,"
336#endif 347#endif
337#if defined(NO_DELETE_KEY) 348#if defined(NO_DELETE_KEY)
338 "no_delete," 349 "no_delete,"
339#endif 350#endif
351#if EIGHT_BIT_CONTROLS
352 "8bitctrls,"
353#endif
340#if !defined(NO_STRINGS) 354#if !defined(NO_STRINGS)
341 "strings," 355 "strings,"
342#endif 356#endif
343#if defined(TTY_256COLOR) 357#if defined(ENABLE_FRILLS)
358 "frills,"
359#endif
360#if !defined(NO_LINESPACE)
361 "linespace,"
362#endif
363#if defined(PREFER_24BIT)
344 "256colour," 364 "24bit,"
365#endif
366#if defined(SELECTION_SCROLLING)
367 "selectionscrolling,"
368#endif
369#if MOUSE_WHEEL
370 "wheel,"
371#endif
372#if MOUSE_SLIP_WHEELING
373 "slipwheel,"
374#endif
375#if defined(SMART_RESIZE)
376 "smart-resize,"
377#endif
378#if defined(CURSOR_BLINK)
379 "cursorBlink,"
380#endif
381#if defined(POINTER_BLANK)
382 "pointerBlank,"
345#endif 383#endif
346#if defined(NO_RESOURCES) 384#if defined(NO_RESOURCES)
347 "NoResources" 385 "NoResources"
348#else 386#else
349# if defined(USE_XGETDEFAULT) 387# if defined(USE_XGETDEFAULT)
… …
359/*{{{ usage: */ 397/*{{{ usage: */
360/*----------------------------------------------------------------------*/ 398/*----------------------------------------------------------------------*/
361static void 399static void
362rxvt_usage (int type) 400rxvt_usage (int type)
363{ 401{
364 unsigned int i, col; 402 unsigned int i, col;
365 403
366 write (STDERR_FILENO, releasestring, sizeof (releasestring) - 1); 404 rxvt_log ("%s%s%s", releasestring, optionsstring, RESNAME);
367 write (STDERR_FILENO, optionsstring, sizeof (optionsstring) - 1);
368 write (STDERR_FILENO, APL_NAME, sizeof (APL_NAME) - 1);
369 405
370 switch (type) 406 switch (type)
371 { 407 {
372 case 0: /* brief listing */ 408 case 0: /* brief listing */
373 fprintf (stderr, " [-help] [--help]\n"); 409 rxvt_log (" [-help] [--help]\n");
410
374 for (col = 1, i = 0; i < optList_size (); i++) 411 for (col = 1, i = 0; i < optList_size (); i++)
375 if (optList[i].desc != NULL) 412 if (optList[i].desc != NULL)
376 { 413 {
377 int len = 0; 414 int len = 0;
378 415
… …
383 len++; /* account for space */ 420 len++; /* account for space */
384 } 421 }
385#ifdef DEBUG_STRICT 422#ifdef DEBUG_STRICT
386 assert (optList[i].opt != NULL); 423 assert (optList[i].opt != NULL);
387#endif 424#endif
388 len += 4 + STRLEN (optList[i].opt) + (optList_isBool (i) ? 2: 0); 425 len += 4 + strlen (optList[i].opt) + (optList_isBool (i) ? 2: 0);
389 col += len; 426 col += len;
390 if (col > 79) 427 if (col > 79)
391 { /* assume regular width */ 428 { /* assume regular width */
392 putc ('\n', stderr); 429 rxvt_log ("\n");
393 col = 1 + len; 430 col = 1 + len;
394 } 431 }
432
395 fprintf (stderr, " [-%s%s", (optList_isBool (i) ? "/+" : ""), 433 rxvt_log (" [-%s%s", (optList_isBool (i) ? "/+" : ""), optList[i].opt);
396 optList[i].opt);
397 if (optList_strlen (i)) 434 if (optList_strlen (i))
398 fprintf (stderr, " %s]", optList[i].arg); 435 rxvt_log (" %s]", optList[i].arg);
399 else 436 else
400 fprintf (stderr, "]"); 437 rxvt_log ("]");
401 } 438 }
402 break; 439 break;
403 440
404 case 1: /* full command-line listing */ 441 case 1: /* full command-line listing */
405 fprintf (stderr, " [options] [-e command args]\n\n" 442 rxvt_log (" [options] [-e command args]\n\nwhere options include:\n");
406 "where options include:\n"); 443
407 for (i = 0; i < optList_size (); i++) 444 for (i = 0; i < optList_size (); i++)
408 if (optList[i].desc != NULL) 445 if (optList[i].desc != NULL)
409 { 446 {
410#ifdef DEBUG_STRICT 447#ifdef DEBUG_STRICT
411 assert (optList[i].opt != NULL); 448 assert (optList[i].opt != NULL);
412#endif 449#endif
413 fprintf (stderr, " %s%s %-*s%s%s\n", 450 rxvt_log (" %s%s %-*s%s%s\n",
414 (optList_isBool (i) ? "-/+" : "-"), optList[i].opt, 451 (optList_isBool (i) ? "-/+" : "-"), optList[i].opt,
415 (INDENT - STRLEN (optList[i].opt) 452 (INDENT - strlen (optList[i].opt)
416 + (optList_isBool (i) ? 0 : 2)), 453 + (optList_isBool (i) ? 0 : 2)),
417 (optList[i].arg ? optList[i].arg : ""), 454 (optList[i].arg ? optList[i].arg : ""),
418 (optList_isBool (i) ? "turn on/off " : ""), 455 (optList_isBool (i) ? "turn on/off " : ""),
419 optList[i].desc); 456 optList[i].desc);
420 } 457 }
421 fprintf (stderr, "\n --help to list long-options"); 458 rxvt_log ("\n --help to list long-options");
422 break; 459 break;
423 460
424 case 2: /* full resource listing */ 461 case 2: /* full resource listing */
425 fprintf (stderr,
426 " [options] [-e command args]\n\n" 462 rxvt_log (" [options] [-e command args]\n\n"
427 "where resources (long-options) include:\n"); 463 "where resources (long-options) include:\n");
428 464
429 for (i = 0; i < optList_size (); i++) 465 for (i = 0; i < optList_size (); i++)
430 if (optList[i].kw != NULL) 466 if (optList[i].kw != NULL)
431 fprintf (stderr, " %s: %*s%s\n", 467 rxvt_log (" %s: %*s%s\n",
432 optList[i].kw, 468 optList[i].kw,
433 (INDENT - STRLEN (optList[i].kw)), "", /* XXX */ 469 (INDENT - strlen (optList[i].kw)), "", /* XXX */
434 (optList_isBool (i) ? "boolean" : optList[i].arg)); 470 (optList_isBool (i) ? "boolean" : optList[i].arg));
435#ifdef KEYSYM_RESOURCE 471#ifdef KEYSYM_RESOURCE
436 fprintf (stderr, " " "keysym.sym" ": %*s%s\n", 472 rxvt_log (" " "keysym.sym" ": %*s%s\n",
437 (INDENT - sizeof ("keysym.sym") + 1), "", /* XXX */ 473 (INDENT - sizeof ("keysym.sym") + 1), "", /* XXX */
438 "keysym"); 474 "keysym");
439#endif 475#endif
440 fprintf (stderr, "\n -help to list options"); 476 rxvt_log ("\n -help to list options");
441 break; 477 break;
442 } 478 }
443 fprintf (stderr, "\n\n"); 479
444 exit (EXIT_FAILURE); 480 rxvt_log ("\n\n");
481 rxvt_exit_failure ();
445 /* NOTREACHED */ 482 /* NOTREACHED */
446} 483}
447 484
448/*}}} */ 485/*}}} */
449 486
… …
476 longopt = *opt++; /* long option */ 513 longopt = *opt++; /* long option */
477 } 514 }
478 else 515 else
479 { 516 {
480 bad_option = 1; 517 bad_option = 1;
481 rxvt_print_error ("bad option \"%s\"", opt); 518 rxvt_warn ("\"%s\": malformed option.\n", opt);
482 continue; 519 continue;
483 } 520 }
484 521
485 if (!STRCMP (opt, "help")) 522 if (!strcmp (opt, "help"))
486 rxvt_usage (longopt ? 2 : 1); 523 rxvt_usage (longopt ? 2 : 1);
487 if (!STRCMP (opt, "h")) 524 if (!strcmp (opt, "h"))
488 rxvt_usage (0); 525 rxvt_usage (0);
489 526
490 /* feature: always try to match long-options */ 527 /* feature: always try to match long-options */
491 for (entry = 0; entry < optList_size (); entry++) 528 for (entry = 0; entry < optList_size (); entry++)
492 if ((optList[entry].kw && !STRCMP (opt, optList[entry].kw)) 529 if ((optList[entry].kw && !strcmp (opt, optList[entry].kw))
493 || (!longopt 530 || (!longopt
494 && optList[entry].opt && !STRCMP (opt, optList[entry].opt))) 531 && optList[entry].opt && !strcmp (opt, optList[entry].opt)))
495 break; 532 break;
496 533
497 if (entry < optList_size ()) 534 if (entry < optList_size ())
498 { 535 {
499 if (optList_isReverse (entry)) 536 if (optList_isReverse (entry))
500 flag = flag == On ? Off : On; 537 flag = flag == On ? Off : On;
538
501 if (optList_strlen (entry)) 539 if (optList_strlen (entry))
502 { /* string value */
503 const char *str = argv[++i];
504
505#ifdef DEBUG_RESOURCES
506 fprintf (stderr, "string (%s,%s) = ",
507 optList[entry].opt ? optList[entry].opt : "nil",
508 optList[entry].kw ? optList[entry].kw : "nil");
509#endif
510 if (flag == On && str && (optList[entry].doff != -1))
511 { 540 {
512#ifdef DEBUG_RESOURCES
513 fprintf (stderr, "\"%s\"\n", str);
514#endif
515 rs[optList[entry].doff] = str;
516 /* 541 /*
517 * special cases are handled in main.c:main () to allow 542 * special cases are handled in main.c:main () to allow
518 * X resources to set these values before we settle for 543 * X resources to set these values before we settle for
519 * default values 544 * default values
520 */ 545 */
521 }
522#ifdef DEBUG_RESOURCES
523 else
524 fprintf (stderr, "???\n");
525#endif
526 546
547 if (optList[entry].doff != -1)
548 rs[optList[entry].doff] = flag == On && argv[i+1]
549 ? argv[++i] : 0;
527 } 550 }
528 else 551 else
529 { /* boolean value */ 552 { /* boolean value */
530#ifdef DEBUG_RESOURCES 553#ifdef DEBUG_RESOURCES
531 fprintf (stderr, "boolean (%s,%s) = %s\n", 554 fprintf (stderr, "boolean (%s,%s) = %s\n",
532 optList[entry].opt, optList[entry].kw, flag); 555 optList[entry].opt, optList[entry].kw, flag);
533#endif 556#endif
534 if (flag == On) 557 if (flag == On)
535 Options |= (optList[entry].flag); 558 options |= (optList[entry].flag);
536 else 559 else
537 Options &= ~ (optList[entry].flag); 560 options &= ~ (optList[entry].flag);
538 561
539 if (optList[entry].doff != -1) 562 if (optList[entry].doff != -1)
540 rs[optList[entry].doff] = flag; 563 rs[optList[entry].doff] = flag;
541 } 564 }
542 } 565 }
543 else 566 else
544#ifdef KEYSYM_RESOURCE 567#ifdef KEYSYM_RESOURCE
545 /* if (!STRNCMP (opt, "keysym.", sizeof ("keysym.") - 1)) */ 568 /* if (!strncmp (opt, "keysym.", sizeof ("keysym.") - 1)) */
546 if (rxvt_Str_match (opt, "keysym.")) 569 if (rxvt_Str_match (opt, "keysym."))
547 { 570 {
548 const char *str = argv[++i]; 571 const char *str = argv[++i];
549 572
550 if (str != NULL) 573 if (str != NULL)
551 parse_keysym (opt + sizeof ("keysym.") - 1, str); 574 parse_keysym (opt + sizeof ("keysym.") - 1, str);
552 } 575 }
553 else 576 else
554#endif 577#endif
578 {
555 bad_option = 1; 579 bad_option = 1;
580 rxvt_warn ("\"%s\": unknown or malformed option.\n", opt);
581 }
556 } 582 }
557 583
558 if (bad_option) 584 if (bad_option)
559 rxvt_usage (0); 585 rxvt_usage (0);
560} 586}
… …
570 * quarks will be something like 596 * quarks will be something like
571 * "rxvt" "keysym" "0xFF01" 597 * "rxvt" "keysym" "0xFF01"
572 * value will be a string 598 * value will be a string
573 */ 599 */
574/* ARGSUSED */ 600/* ARGSUSED */
575bool 601int
576rxvt_define_key(XrmDatabase *database __attribute__((unused)), XrmBindingList bindings __attribute__((unused)), XrmQuarkList quarks, XrmRepresentation *type __attribute__((unused)), XrmValue *value, XPointer closure __attribute__((unused))) 602rxvt_define_key (XrmDatabase *database __attribute__((unused)),
603 XrmBindingList bindings __attribute__((unused)),
604 XrmQuarkList quarks,
605 XrmRepresentation *type __attribute__((unused)),
606 XrmValue *value,
607 XPointer closure __attribute__((unused)))
577{ 608{
578 int last; 609 int last;
579 610
580 for (last = 0; quarks[last] != NULLQUARK; last++) /* look for last quark in list */ 611 for (last = 0; quarks[last] != NULLQUARK; last++) /* look for last quark in list */
581 ; 612 ;
… …
611 { 642 {
612 if (str[0] == '0' && toupper (str[1]) == 'X') 643 if (str[0] == '0' && toupper (str[1]) == 'X')
613 str += 2; 644 str += 2;
614 if (arg) 645 if (arg)
615 { 646 {
616 if (sscanf (str, (STRCHR (str, ':') ? "%x:" : "%x"), &sym) != 1) 647 if (sscanf (str, (strchr (str, ':') ? "%x:" : "%x"), &sym) != 1)
617 return -1; 648 return -1;
618 } 649 }
619 else 650 else
620 { 651 {
621 if (sscanf (str, "%x:", &sym) != 1) 652 if (sscanf (str, "%x:", &sym) != 1)
622 return -1; 653 return -1;
623 654
624 /* cue to ':', it's there since sscanf () worked */ 655 /* cue to ':', it's there since sscanf () worked */
625 STRNCPY (newargstr, STRCHR (str, ':') + 1, NEWARGLIM - 1); 656 strncpy (newargstr, strchr (str, ':') + 1, NEWARGLIM - 1);
626 newargstr[NEWARGLIM - 1] = '\0'; 657 newargstr[NEWARGLIM - 1] = '\0';
627 newarg = newargstr; 658 newarg = newargstr;
628 } 659 }
629 } 660 }
630 else 661 else
631 { 662 {
632 /* 663 /*
633 * convert keysym name to keysym number 664 * convert keysym name to keysym number
634 */ 665 */
635 STRNCPY (newargstr, str, NEWARGLIM - 1); 666 strncpy (newargstr, str, NEWARGLIM - 1);
636 newargstr[NEWARGLIM - 1] = '\0'; 667 newargstr[NEWARGLIM - 1] = '\0';
637 if (arg == NULL) 668 if (arg == NULL)
638 { 669 {
639 if ((newarg = STRCHR (newargstr, ':')) == NULL) 670 if ((newarg = strchr (newargstr, ':')) == NULL)
640 return -1; 671 return -1;
641 *newarg++ = '\0'; /* terminate keysym name */ 672 *newarg++ = '\0'; /* terminate keysym name */
642 } 673 }
643 if ((sym = XStringToKeysym (newargstr)) == None) 674 if ((sym = XStringToKeysym (newargstr)) == None)
644 return -1; 675 return -1;
… …
650 if (Keysym_map[sym] != NULL) /* already set ? */ 681 if (Keysym_map[sym] != NULL) /* already set ? */
651 return -1; 682 return -1;
652 683
653 if (newarg == NULL) 684 if (newarg == NULL)
654 { 685 {
655 STRNCPY (newargstr, arg, NEWARGLIM - 1); 686 strncpy (newargstr, arg, NEWARGLIM - 1);
656 newargstr[NEWARGLIM - 1] = '\0'; 687 newargstr[NEWARGLIM - 1] = '\0';
657 newarg = newargstr; 688 newarg = newargstr;
658 } 689 }
659 rxvt_Str_trim (newarg); 690 rxvt_Str_trim (newarg);
660 if (*newarg == '\0' || (n = rxvt_Str_escaped (newarg)) == 0) 691 if (*newarg == '\0' || (n = rxvt_Str_escaped (newarg)) == 0)
661 return -1; 692 return -1;
662 MIN_IT (n, 255); 693 MIN_IT (n, 255);
663 key_string = (char *)rxvt_malloc ((n + 1) * sizeof (char)); 694 key_string = (char *)rxvt_malloc ((n + 1) * sizeof (char));
664 695
665 key_string[0] = n; 696 key_string[0] = n;
666 STRNCPY (key_string + 1, newarg, n); 697 strncpy (key_string + 1, newarg, n);
667 Keysym_map[sym] = (unsigned char *)key_string; 698 Keysym_map[sym] = (unsigned char *)key_string;
668 699
669 return 1; 700 return 1;
670} 701}
671 702
… …
677 * the matching algorithm used for memory-save fake resources 708 * the matching algorithm used for memory-save fake resources
678 */ 709 */
679void 710void
680rxvt_term::get_xdefaults (FILE *stream, const char *name) 711rxvt_term::get_xdefaults (FILE *stream, const char *name)
681{ 712{
682 unsigned int len; 713 unsigned int len;
683 char *str, buffer[256]; 714 char *str, buffer[256];
684 715
685 if (stream == NULL) 716 if (stream == NULL)
686 return; 717 return;
687 len = STRLEN (name); 718
719 len = strlen (name);
688 while ((str = fgets (buffer, sizeof (buffer), stream)) != NULL) 720 while ((str = fgets (buffer, sizeof (buffer), stream)) != NULL)
689 { 721 {
690 unsigned int entry, n; 722 unsigned int entry, n;
691 723
692 while (*str && isspace (*str)) 724 while (*str && isspace (*str))
693 str++; /* leading whitespace */ 725 str++; /* leading whitespace */
694 726
695 if ((str[len] != '*' && str[len] != '.') 727 if ((str[len] != '*' && str[len] != '.')
696 || (len && STRNCMP (str, name, len))) 728 || (len && strncmp (str, name, len)))
697 continue; 729 continue;
698 str += (len + 1); /* skip `name*' or `name.' */ 730 str += (len + 1); /* skip `name*' or `name.' */
699 731
700# ifdef KEYSYM_RESOURCE 732# ifdef KEYSYM_RESOURCE
701 if (!parse_keysym (str, NULL)) 733 if (!parse_keysym (str, NULL))
702# endif /* KEYSYM_RESOURCE */ 734# endif /* KEYSYM_RESOURCE */
703 for (entry = 0; entry < optList_size (); entry++) 735 for (entry = 0; entry < optList_size (); entry++)
704 { 736 {
705 const char *kw = optList[entry].kw; 737 const char *kw = optList[entry].kw;
706 738
707 if (kw == NULL) 739 if (kw == NULL)
708 continue; 740 continue;
741
709 n = STRLEN (kw); 742 n = strlen (kw);
710 if (str[n] == ':' && rxvt_Str_match (str, kw)) 743 if (str[n] == ':' && rxvt_Str_match (str, kw))
711 { 744 {
712 /* skip `keyword:' */ 745 /* skip `keyword:' */
713 str += (n + 1); 746 str += n + 1;
714 rxvt_Str_trim (str); 747 rxvt_Str_trim (str);
715 n = STRLEN (str); 748 n = strlen (str);
716 if (n && rs[optList[entry].doff] == NULL) 749 if (n && rs[optList[entry].doff] == NULL)
717 { 750 {
718 /* not already set */ 751 /* not already set */
719 int s; 752 int s;
720 char *p = (char *)rxvt_malloc ((n + 1) * sizeof (char)); 753 char *p = 0;
721 754
722 STRCPY (p, str); 755 for (int o = 0;;)
756 {
757 p = (char *)rxvt_realloc (p, o + n + 1);
758 memcpy (p + o, str, n);
759 o += n;
760 p[o] = 0;
761
762 if (o == 0 || p[o - 1] != '\\') // continuation line
763 break;
764
765 o--; // eat "\"
766
767 if ((str = fgets (buffer, sizeof (buffer), stream)) == NULL)
768 break;
769
770 rxvt_Str_trim (str);
771 n = strlen (str);
772 }
773
723 rs[optList[entry].doff] = p; 774 rs[optList[entry].doff] = p;
775 allocated.push_back (p);
776
724 if (optList_isBool (entry)) 777 if (optList_isBool (entry))
725 { 778 {
726 s = STRCASECMP (str, "TRUE") == 0 779 s = strcasecmp (str, "TRUE") == 0
727 || STRCASECMP (str, "YES") == 0 780 || strcasecmp (str, "YES") == 0
728 || STRCASECMP (str, "ON") == 0 781 || strcasecmp (str, "ON") == 0
729 || STRCASECMP (str, "1") == 0; 782 || strcasecmp (str, "1") == 0;
783
730 if (optList_isReverse (entry)) 784 if (optList_isReverse (entry))
731 s = !s; 785 s = !s;
786
732 if (s) 787 if (s)
733 Options |= (optList[entry].flag); 788 options |= optList[entry].flag;
734 else 789 else
735 Options &= ~ (optList[entry].flag); 790 options &= ~optList[entry].flag;
736 } 791 }
737 } 792 }
793
738 break; 794 break;
739 } 795 }
740 } 796 }
741 } 797 }
798
742 rewind (stream); 799 rewind (stream);
743} 800}
744 801
745/*}}} */ 802/*}}} */
746# endif /* ! USE_XGETDEFAULT */ 803# endif /* ! USE_XGETDEFAULT */
… …
757#ifndef NO_RESOURCES 814#ifndef NO_RESOURCES
758 815
759# if defined XAPPLOADDIR 816# if defined XAPPLOADDIR
760# if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE) 817# if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
761 /* Compute the path of the possibly available localized Rxvt file */ 818 /* Compute the path of the possibly available localized Rxvt file */
762 char *localepath = NULL; 819 char *localepath = NULL;
763 820
764 if (locale != NULL) 821 if (locale != NULL)
765 { /* XXX: must limit length of string */ 822 { /* XXX: must limit length of string */
766 localepath = (char *)rxvt_malloc (256); 823 localepath = (char *)rxvt_malloc (256);
767 sprintf (localepath, XAPPLOADDIRLOCALE "/" APL_SUBCLASS, 824 sprintf (localepath, XAPPLOADDIRLOCALE "/" RESCLASS,
768 (int) (258 - sizeof (XAPPLOADDIRLOCALE) - sizeof (APL_SUBCLASS)), 825 (int) (258 - sizeof (XAPPLOADDIRLOCALE) - sizeof (RESCLASS)),
769 locale); /* 258 = 255 + 4 (-.*s) - 1 (/) */ 826 locale); /* 258 = 255 + 4 (-.*s) - 1 (/) */
770 } 827 }
771 828
772 { 829 {
773# endif 830# endif
… …
775 832
776# ifdef USE_XGETDEFAULT 833# ifdef USE_XGETDEFAULT
777 /* 834 /*
778 * get resources using the X library function 835 * get resources using the X library function
779 */ 836 */
780 int entry; 837 int entry;
781 838
782# ifdef XrmEnumOneLevel 839# ifdef XrmEnumOneLevel
783 int i; 840 int i;
784 char *displayResource, *xe; 841 char *displayResource, *xe;
785 XrmName name_prefix[3]; 842 XrmName name_prefix[3];
786 XrmClass class_prefix[3]; 843 XrmClass class_prefix[3];
787 XrmDatabase database, rdb1; 844 XrmDatabase database, rdb1;
788 char fname[1024]; 845 char fname[1024];
789 846
790 XrmInitialize (); 847 XrmInitialize ();
791 database = NULL; 848 database = NULL;
792 849
793 /* Get any Xserver defaults */ 850 /* Get any Xserver defaults */
… …
797 database = XrmGetStringDatabase (displayResource); 854 database = XrmGetStringDatabase (displayResource);
798 855
799# ifdef HAVE_EXTRA_XRESOURCE_FILES 856# ifdef HAVE_EXTRA_XRESOURCE_FILES
800 /* Add in ~/.Xdefaults or ~/.Xresources */ 857 /* Add in ~/.Xdefaults or ~/.Xresources */
801 { 858 {
802 char *ptr; 859 char *ptr;
803 860
804 if ((ptr = (char *)getenv ("HOME")) == NULL) 861 if ((ptr = (char *)getenv ("HOME")) == NULL)
805 ptr = "."; 862 ptr = ".";
806 863
807 for (i = 0; i < (sizeof (xnames) / sizeof (xnames[0])); i++) 864 for (i = 0; i < (sizeof (xnames) / sizeof (xnames[0])); i++)
808 { 865 {
809 sprintf (fname, "%-.*s/%s", sizeof (fname) - STRLEN (xnames[i]) - 2, 866 sprintf (fname, "%-.*s/%s", sizeof (fname) - strlen (xnames[i]) - 2,
810 ptr, xnames[i]); 867 ptr, xnames[i]);
811 if ((rdb1 = XrmGetFileDatabase (fname)) != NULL) 868 if ((rdb1 = XrmGetFileDatabase (fname)))
812 { 869 {
813 XrmMergeDatabases (rdb1, &database); 870 XrmMergeDatabases (rdb1, &database);
814# ifndef HAVE_BOTH_XRESOURCE_FILES 871# ifndef HAVE_BOTH_XRESOURCE_FILES
815 break; 872 break;
816# endif 873# endif
… …
828 885
829 /* Add in Rxvt file */ 886 /* Add in Rxvt file */
830# if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE) 887# if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
831 if (localepath == NULL || (rdb1 = XrmGetFileDatabase (localepath)) == NULL) 888 if (localepath == NULL || (rdb1 = XrmGetFileDatabase (localepath)) == NULL)
832# endif 889# endif
833 rdb1 = XrmGetFileDatabase (XAPPLOADDIR "/" APL_SUBCLASS); 890 rdb1 = XrmGetFileDatabase (XAPPLOADDIR "/" RESCLASS);
891
834 if (rdb1 != NULL) 892 if (rdb1 != NULL)
835 XrmMergeDatabases (rdb1, &database); 893 XrmMergeDatabases (rdb1, &database);
836 894
837 /* Add in $XAPPLRESDIR/Rxvt only; not bothering with XUSERFILESEARCHPATH */ 895 /* Add in $XAPPLRESDIR/Rxvt only; not bothering with XUSERFILESEARCHPATH */
838 if ((xe = (char *)getenv ("XAPPLRESDIR")) != NULL) 896 if ((xe = (char *)getenv ("XAPPLRESDIR")) != NULL)
839 { 897 {
840 sprintf (fname, "%-.*s/" APL_SUBCLASS, sizeof (fname) 898 sprintf (fname, "%-.*s/" RESCLASS, sizeof (fname)
841 - sizeof (APL_SUBCLASS) - 2, xe); 899 - sizeof (RESCLASS) - 2, xe);
842 if ((rdb1 = XrmGetFileDatabase (fname)) != NULL) 900 if ((rdb1 = XrmGetFileDatabase (fname)) != NULL)
843 XrmMergeDatabases (rdb1, &database); 901 XrmMergeDatabases (rdb1, &database);
844 } 902 }
845 903
846 XrmSetDatabase (display, database); 904 XrmSetDatabase (display, database);
… …
858 if (kw == NULL || rs[optList[entry].doff] != NULL) 916 if (kw == NULL || rs[optList[entry].doff] != NULL)
859 continue; /* previously set */ 917 continue; /* previously set */
860 918
861 p = XGetDefault (display, name, kw); 919 p = XGetDefault (display, name, kw);
862 p0 = XGetDefault (display, "!INVALIDPROGRAMMENAMEDONTMATCH!", kw); 920 p0 = XGetDefault (display, "!INVALIDPROGRAMMENAMEDONTMATCH!", kw);
863 if (p == NULL || (p0 && STRCMP (p, p0) == 0)) 921 if (p == NULL || (p0 && strcmp (p, p0) == 0))
864 { 922 {
865 p = XGetDefault (display, APL_SUBCLASS, kw); 923 p = XGetDefault (display, RESCLASS, kw);
924#ifdef RESFALLBACK
866 if (p == NULL || (p0 && STRCMP (p, p0) == 0)) 925 if (p == NULL || (p0 && strcmp (p, p0) == 0))
867 p = XGetDefault (display, APL_CLASS, kw); 926 p = XGetDefault (display, RESFALLBACK, kw);
927#endif
868 } 928 }
929
869 if (p == NULL && p0) 930 if (p == NULL && p0)
870 p = p0; 931 p = p0;
932
871 if (p) 933 if (p)
872 { 934 {
873 rs[optList[entry].doff] = p; 935 rs[optList[entry].doff] = p;
874 936
875 if (optList_isBool (entry)) 937 if (optList_isBool (entry))
876 { 938 {
877 s = STRCASECMP (p, "TRUE") == 0 939 s = strcasecmp (p, "TRUE") == 0
878 || STRCASECMP (p, "YES") == 0 940 || strcasecmp (p, "YES") == 0
879 || STRCASECMP (p, "ON") == 0 941 || strcasecmp (p, "ON") == 0
880 || STRCASECMP (p, "1") == 0; 942 || strcasecmp (p, "1") == 0;
881 if (optList_isReverse (entry)) 943 if (optList_isReverse (entry))
882 s = !s; 944 s = !s;
883 if (s) 945 if (s)
884 Options |= (optList[entry].flag); 946 options |= (optList[entry].flag);
885 else 947 else
886 Options &= ~ (optList[entry].flag); 948 options &= ~ (optList[entry].flag);
887 } 949 }
888 } 950 }
889 } 951 }
890 952
891 /* 953 /*
… …
894# ifdef XrmEnumOneLevel 956# ifdef XrmEnumOneLevel
895# ifdef KEYSYM_RESOURCE 957# ifdef KEYSYM_RESOURCE
896 name_prefix[0] = XrmStringToName (name); 958 name_prefix[0] = XrmStringToName (name);
897 name_prefix[1] = XrmStringToName ("keysym"); 959 name_prefix[1] = XrmStringToName ("keysym");
898 name_prefix[2] = NULLQUARK; 960 name_prefix[2] = NULLQUARK;
899 class_prefix[0] = XrmStringToName (APL_SUBCLASS); 961 class_prefix[0] = XrmStringToName (RESCLASS);
900 class_prefix[1] = XrmStringToName ("Keysym"); 962 class_prefix[1] = XrmStringToName ("Keysym");
901 class_prefix[2] = NULLQUARK; 963 class_prefix[2] = NULLQUARK;
902 /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */ 964 /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */
903 XrmEnumerateDatabase (XrmGetDatabase (display), name_prefix, class_prefix, 965 XrmEnumerateDatabase (XrmGetDatabase (display), name_prefix, class_prefix,
904 XrmEnumOneLevel, rxvt_define_key, NULL); 966 XrmEnumOneLevel, rxvt_define_key, NULL);
967# ifdef RESFALLBACK
905 name_prefix[0] = XrmStringToName (APL_CLASS); 968 name_prefix[0] = XrmStringToName (RESFALLBACK);
906 name_prefix[1] = XrmStringToName ("keysym"); 969 name_prefix[1] = XrmStringToName ("keysym");
907 class_prefix[0] = XrmStringToName (APL_CLASS); 970 class_prefix[0] = XrmStringToName (RESFALLBACK);
908 class_prefix[1] = XrmStringToName ("Keysym"); 971 class_prefix[1] = XrmStringToName ("Keysym");
909 /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */ 972 /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */
910 XrmEnumerateDatabase (XrmGetDatabase (display), name_prefix, class_prefix, 973 XrmEnumerateDatabase (XrmGetDatabase (display), name_prefix, class_prefix,
911 XrmEnumOneLevel, rxvt_define_key, NULL); 974 XrmEnumOneLevel, rxvt_define_key, NULL);
975# endif
912# endif 976# endif
913# endif 977# endif
914 978
915# else /* USE_XGETDEFAULT */ 979# else /* USE_XGETDEFAULT */
916 /* get resources the hard way, but save lots of memory */ 980 /* get resources the hard way, but save lots of memory */
917 FILE *fd = NULL; 981 FILE *fd = NULL;
918 char *home; 982 char *home;
919 983
920 if ((home = getenv ("HOME")) != NULL) 984 if ((home = getenv ("HOME")) != NULL)
921 { 985 {
922 unsigned int i, len = STRLEN (home) + 2; 986 unsigned int i, len = strlen (home) + 2;
923 char *f = NULL; 987 char *f = NULL;
924 988
925 for (i = 0; i < (sizeof (xnames) / sizeof (xnames[0])); i++) 989 for (i = 0; i < (sizeof (xnames) / sizeof (xnames[0])); i++)
926 { 990 {
927 f = (char *)rxvt_realloc (f, (len + STRLEN (xnames[i])) * sizeof (char)); 991 f = (char *)rxvt_realloc (f, (len + strlen (xnames[i])) * sizeof (char));
928 992
929 sprintf (f, "%s/%s", home, xnames[i]); 993 sprintf (f, "%s/%s", home, xnames[i]);
930 994
931 if ((fd = fopen (f, "r")) != NULL) 995 if ((fd = fopen (f, "r")) != NULL)
932 break; 996 break;
… …
954 * Also, use a special sub-class so that we can use either or both of 1018 * Also, use a special sub-class so that we can use either or both of
955 * "XTerm" and "Rxvt" as class names. 1019 * "XTerm" and "Rxvt" as class names.
956 */ 1020 */
957 1021
958 get_xdefaults (fd, name); 1022 get_xdefaults (fd, name);
959 get_xdefaults (fd, APL_SUBCLASS); 1023 get_xdefaults (fd, RESCLASS);
1024# ifdef RESFALLBACK
1025 get_xdefaults (fd, RESFALLBACK);
1026# endif
960 1027
961# if defined(XAPPLOADDIR) && defined(USE_XAPPLOADDIR) 1028# if defined(XAPPLOADDIR) && defined(USE_XAPPLOADDIR)
962
963 { 1029 {
964 FILE *ad = NULL; 1030 FILE *ad = NULL;
965 1031
966# if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE) 1032# if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
967 if (localepath == NULL || (ad = fopen (localepath, "r")) == NULL) 1033 if (localepath == NULL || (ad = fopen (localepath, "r")) == NULL)
968# endif 1034# endif
969 ad = fopen (XAPPLOADDIR "/" APL_SUBCLASS, "r"); 1035 ad = fopen (XAPPLOADDIR "/" RESCLASS, "r");
970 if (ad != NULL) 1036 if (ad != NULL)
971 { 1037 {
972 get_xdefaults (ad, APL_SUBCLASS); 1038 get_xdefaults (ad, RESCLASS);
973 get_xdefaults (ad, ""); 1039 get_xdefaults (ad, "");
974 fclose (ad); 1040 fclose (ad);
975 } 1041 }
976 } 1042 }
977# endif /* XAPPLOADDIR */ 1043# endif /* XAPPLOADDIR */
978 1044
979 get_xdefaults (fd, APL_CLASS);
980 get_xdefaults (fd, ""); /* partial match */ 1045 get_xdefaults (fd, ""); /* partial match */
981 if (fd != NULL) 1046 if (fd != NULL)
982 fclose (fd); 1047 fclose (fd);
983# endif /* USE_XGETDEFAULT */ 1048# endif /* USE_XGETDEFAULT */
984 1049
… …
991 free (localepath); 1056 free (localepath);
992# endif 1057# endif
993# endif 1058# endif
994 1059
995#endif /* NO_RESOURCES */ 1060#endif /* NO_RESOURCES */
996
997 /*
998 * even without resources, at least do this setup for command-line
999 * options and command-line long options
1000 */
1001#ifdef MULTICHAR_SET
1002 set_multichar_encoding (rs[Rs_multichar_encoding]);
1003#endif
1004#ifdef GREEK_SUPPORT
1005 /* this could be a function in grkelot.c */
1006 /* void set_greek_keyboard (const char * str); */
1007 if (rs[Rs_greek_keyboard])
1008 {
1009 if (!STRCMP (rs[Rs_greek_keyboard], "iso"))
1010 greek_setmode (GREEK_ELOT928); /* former -grk9 */
1011 else if (!STRCMP (rs[Rs_greek_keyboard], "ibm"))
1012 greek_setmode (GREEK_IBM437); /* former -grk4 */
1013 }
1014 {
1015 KeySym sym;
1016
1017 if (rs[Rs_greektoggle_key]
1018 && ((sym = XStringToKeysym (rs[Rs_greektoggle_key])) != 0))
1019 ks_greekmodeswith = sym;
1020 }
1021#endif /* GREEK_SUPPORT */
1022
1023#if defined (HOTKEY_CTRL) || defined (HOTKEY_META)
1024
1025 {
1026 KeySym sym;
1027
1028 if (rs[Rs_bigfont_key]
1029 && ((sym = XStringToKeysym (rs[Rs_bigfont_key])) != 0))
1030 ks_bigfont = sym;
1031 if (rs[Rs_smallfont_key]
1032 && ((sym = XStringToKeysym (rs[Rs_smallfont_key])) != 0))
1033 ks_smallfont = sym;
1034 }
1035#endif
1036} 1061}
1037 1062
1038/*}}} */ 1063/*}}} */
1039/*----------------------- end-of-file (C source) -----------------------*/ 1064/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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