ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/xdefaults.C
(Generate patch)

Comparing rxvt-unicode/src/xdefaults.C (file contents):
Revision 1.17 by pcg, Sun Mar 14 17:33:08 2004 UTC vs.
Revision 1.49 by root, Thu Feb 3 10:24:10 2005 UTC

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

Diff Legend

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