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.80 by root, Mon Jan 16 15:00:20 2006 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-2006 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.
… …
20 * 20 *
21 * You should have received a copy of the GNU General Public License 21 * You should have received a copy of the GNU General Public License
22 * along with this program; if not, write to the Free Software 22 * along with this program; if not, write to the Free Software
23 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 23 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
24 *----------------------------------------------------------------------*/ 24 *----------------------------------------------------------------------*/
25/*----------------------------------------------------------------------*
26 * get resources from ~/.Xdefaults or ~/.Xresources with the memory-saving
27 * default or with XGetDefault() (#define USE_XGETDEFAULT)
28 *----------------------------------------------------------------------*/
29 25
30#include "../config.h" /* NECESSARY */ 26#include "../config.h" /* NECESSARY */
31#include "rxvt.h" /* NECESSARY */ 27#include "rxvt.h" /* NECESSARY */
32#include "version.h" 28#include "version.h"
33#include "xdefaults.intpro" /* PROTOS for internal routines */ 29
30#ifdef KEYSYM_RESOURCE
31#include "keyboard.h"
32#endif
33
34/* place holders used for parsing command-line options */
35#define Optflag_Reverse 0x40000000UL
36#define Optflag_Boolean 0x80000000UL
37#define Optflag_mask 0x3fffffffUL
34 38
35/* #define DEBUG_RESOURCES */ 39/* #define DEBUG_RESOURCES */
36
37static const char *const xnames[2] = { ".Xdefaults", ".Xresources" };
38 40
39/*{{{ monolithic option/resource structure: */ 41/*{{{ monolithic option/resource structure: */
40/* 42/*
41 * `string' options MUST have a usage argument 43 * `string' options MUST have a usage argument
42 * `switch' and `boolean' options have no argument 44 * `switch' and `boolean' options have no argument
… …
55#define RSTRG(rsp, kw, arg) \ 57#define RSTRG(rsp, kw, arg) \
56 {0, (rsp), (kw), NULL, (arg), NULL} 58 {0, (rsp), (kw), NULL, (arg), NULL}
57 59
58/* BOOL () - regular boolean `-/+' flag */ 60/* BOOL () - regular boolean `-/+' flag */
59#define BOOL(rsp, kw, opt, flag, desc) \ 61#define BOOL(rsp, kw, opt, flag, desc) \
60 { (Opt_Boolean| (flag)), (rsp), (kw), (opt), NULL, (desc)} 62 { (Optflag_Boolean | (flag)), (rsp), (kw), (opt), NULL, (desc)}
61 63
62/* SWCH () - `-' flag */ 64/* SWCH () - `-' flag */
63#define SWCH(opt, flag, desc) \ 65#define SWCH(opt, flag, desc) \
64 { (flag), -1, NULL, (opt), NULL, (desc)} 66 { (flag), -1, NULL, (opt), NULL, (desc)}
65 67
66/* convenient macros */ 68/* convenient macros */
67#define optList_strlen(i) \ 69#define optList_strlen(i) \
68 (optList[i].flag ? 0 : (optList[i].arg ? STRLEN (optList[i].arg) : 1)) 70 (optList[i].flag ? 0 : (optList[i].arg ? strlen (optList[i].arg) : 1))
69#define optList_isBool(i) \ 71#define optList_isBool(i) \
70 (optList[i].flag & Opt_Boolean) 72 (optList[i].flag & Optflag_Boolean)
71#define optList_isReverse(i) \ 73#define optList_isReverse(i) \
72 (optList[i].flag & Opt_Reverse) 74 (optList[i].flag & Optflag_Reverse)
73#define optList_size() \ 75#define optList_size \
74 (sizeof (optList) / sizeof (optList[0])) 76 (sizeof (optList) / sizeof (optList[0]))
75 77
76static const struct 78static const struct
77 { 79 {
78 const unsigned long flag; /* Option flag */ 80 const unsigned long flag; /* Option flag */
… …
83 const char *desc; /* description */ 85 const char *desc; /* description */
84 } 86 }
85optList[] = { 87optList[] = {
86 STRG (Rs_display_name, NULL, "d", NULL, NULL), /* short form */ 88 STRG (Rs_display_name, NULL, "d", NULL, NULL), /* short form */
87 STRG (Rs_display_name, NULL, "display", "string", "X server to contact"), 89 STRG (Rs_display_name, NULL, "display", "string", "X server to contact"),
88 STRG (Rs_term_name, "termName", "tn", "string", 90 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 */ 91 STRG (Rs_geometry, NULL, "g", NULL, NULL), /* short form */
91 STRG (Rs_geometry, "geometry", "geometry", "geometry", 92 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"), 93 SWCH ("C", Opt_console, "intercept console messages"),
94 SWCH ("iconic", Opt_iconic, "start iconic"), 94 SWCH ("iconic", Opt_iconic, "start iconic"),
95 SWCH ("ic", Opt_iconic, NULL), /* short form */ 95 SWCH ("ic", Opt_iconic, NULL), /* short form */
96 BOOL (Rs_reverseVideo, "reverseVideo", "rv", Opt_reverseVideo, 96 BOOL (Rs_reverseVideo, "reverseVideo", "rv", Opt_reverseVideo, "reverse video"),
97 "reverse video"),
98 BOOL (Rs_loginShell, "loginShell", "ls", Opt_loginShell, "login shell"), 97 BOOL (Rs_loginShell, "loginShell", "ls", Opt_loginShell, "login shell"),
99 BOOL (Rs_jumpScroll, "jumpScroll", "j", Opt_jumpScroll, "jump scrolling"), 98 BOOL (Rs_jumpScroll, "jumpScroll", "j", Opt_jumpScroll, "jump scrolling"),
99 BOOL (Rs_pastableTabs, "pastableTabs", "ptab", Opt_pastableTabs, "tab characters are pastable"),
100#ifdef HAVE_SCROLLBARS 100#if HAVE_SCROLLBARS
101 RSTRG (Rs_scrollstyle, "scrollstyle", "mode"),
101 BOOL (Rs_scrollBar, "scrollBar", "sb", Opt_scrollBar, "scrollbar"), 102 BOOL (Rs_scrollBar, "scrollBar", "sb", Opt_scrollBar, "scrollbar"),
102 BOOL (Rs_scrollBar_right, "scrollBar_right", "sr", Opt_scrollBar_right, 103 BOOL (Rs_scrollBar_right, "scrollBar_right", "sr", Opt_scrollBar_right, "scrollbar right"),
103 "scrollbar right"), 104 BOOL (Rs_scrollBar_floating, "scrollBar_floating", "st", Opt_scrollBar_floating, "scrollbar without a trough"),
104 BOOL (Rs_scrollBar_floating, "scrollBar_floating", "st", 105 RSTRG (Rs_scrollBar_align, "scrollBar_align", "mode"),
105 Opt_scrollBar_floating, "scrollbar without a trough"), 106 STRG (Rs_scrollBar_thickness, "thickness", "sbt", "number", "scrollbar thickness/width in pixels"),
106#endif 107#endif
107 BOOL (Rs_scrollTtyOutput, "scrollTtyOutput", NULL, Opt_scrollTtyOutput, 108 BOOL (Rs_scrollTtyOutput, "scrollTtyOutput", NULL, Opt_scrollTtyOutput, NULL),
108 NULL),
109 BOOL (Rs_scrollTtyOutput, NULL, "si", Opt_Reverse | Opt_scrollTtyOutput, 109 BOOL (Rs_scrollTtyOutput, NULL, "si", Optflag_Reverse | Opt_scrollTtyOutput, "scroll-on-tty-output inhibit"),
110 "scroll-on-tty-output inhibit"),
111 BOOL (Rs_scrollTtyKeypress, "scrollTtyKeypress", "sk", Opt_scrollTtyKeypress, 110 BOOL (Rs_scrollTtyKeypress, "scrollTtyKeypress", "sk", Opt_scrollTtyKeypress, "scroll-on-keypress"),
112 "scroll-on-keypress"),
113 BOOL (Rs_scrollWithBuffer, "scrollWithBuffer", "sw", Opt_scrollWithBuffer, 111 BOOL (Rs_scrollWithBuffer, "scrollWithBuffer", "sw", Opt_scrollWithBuffer, "scroll-with-buffer"),
114 "scroll-with-buffer"),
115#ifdef TRANSPARENT 112#if TRANSPARENT
116 BOOL (Rs_transparent, "inheritPixmap", "ip", Opt_transparent, 113 BOOL (Rs_transparent, "inheritPixmap", "ip", Opt_transparent, "inherit parent pixmap"),
117 "inherit parent pixmap"),
118 BOOL (Rs_transparent_all, "inheritPixmapforce", "ipf", Opt_transparent_all,
119 "forcefully inherit root pixmap"),
120 SWCH ("tr", Opt_transparent, NULL), 114 SWCH ("tr", Opt_transparent, NULL),
115# if TINTING
116 STRG (Rs_color + Color_tint, "tintColor", "tint", "color", "tint color"),
117# endif
118#endif
119#if OFF_FOCUS_FADING
120 STRG (Rs_fade, "fading", "fade", "%", "fade colors x% percent when rxvt-unicode is losing focus"),
121 STRG (Rs_color + Color_fade, "fadeColor", "fadecolor", "color", "target color for off-focus fading"),
122#endif
123#if TINTING
124 STRG (Rs_shade, "shading", "sh", "%", "shade background by x% when tinting."),
121#endif 125#endif
122 BOOL (Rs_utmpInhibit, "utmpInhibit", "ut", Opt_utmpInhibit, "utmp inhibit"), 126 BOOL (Rs_utmpInhibit, "utmpInhibit", "ut", Opt_utmpInhibit, "utmp inhibit"),
123#ifndef NO_BELL 127#ifndef NO_BELL
124 BOOL (Rs_visualBell, "visualBell", "vb", Opt_visualBell, "visual bell"), 128 BOOL (Rs_visualBell, "visualBell", "vb", Opt_visualBell, "visual bell"),
125# if ! defined(NO_MAPALERT) && defined(MAPALERT_OPTION) 129# if ! defined(NO_MAPALERT) && defined(MAPALERT_OPTION)
… …
128#endif 132#endif
129#ifdef META8_OPTION 133#ifdef META8_OPTION
130 BOOL (Rs_meta8, "meta8", NULL, Opt_meta8, NULL), 134 BOOL (Rs_meta8, "meta8", NULL, Opt_meta8, NULL),
131#endif 135#endif
132#ifdef MOUSE_WHEEL 136#ifdef MOUSE_WHEEL
133 BOOL (Rs_mouseWheelScrollPage, "mouseWheelScrollPage", NULL, Opt_mouseWheelScrollPage, 137 BOOL (Rs_mouseWheelScrollPage, "mouseWheelScrollPage", NULL, Opt_mouseWheelScrollPage, NULL),
134 NULL),
135#endif 138#endif
136#ifndef NO_FRILLS 139#if ENABLE_FRILLS
137 BOOL (Rs_tripleclickwords, "tripleclickwords", "tcw", Opt_tripleclickwords, 140 BOOL (Rs_tripleclickwords, "tripleclickwords", "tcw", Opt_tripleclickwords, "triple click word selection"),
138 "triple click word selection"), 141 BOOL (Rs_insecure, "insecure", "insecure", Opt_insecure, "enable possibly insecure escape sequences"),
142 BOOL (Rs_cursorUnderline, "cursorUnderline", "uc", Opt_cursorUnderline, "underline cursor"),
139#endif 143#endif
140#ifdef CURSOR_BLINK 144#if 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
144 BOOL (Rs_pointerBlank, "pointerBlank", "pb", Opt_pointerBlank, "switch off pointer after delay"), 148 BOOL (Rs_pointerBlank, "pointerBlank", "pb", Opt_pointerBlank, "switch off pointer after delay"),
145#endif 149#endif
… …
151 RSTRG (Rs_color + minCOLOR + 3, "color3", "color"), 155 RSTRG (Rs_color + minCOLOR + 3, "color3", "color"),
152 RSTRG (Rs_color + minCOLOR + 4, "color4", "color"), 156 RSTRG (Rs_color + minCOLOR + 4, "color4", "color"),
153 RSTRG (Rs_color + minCOLOR + 5, "color5", "color"), 157 RSTRG (Rs_color + minCOLOR + 5, "color5", "color"),
154 RSTRG (Rs_color + minCOLOR + 6, "color6", "color"), 158 RSTRG (Rs_color + minCOLOR + 6, "color6", "color"),
155 RSTRG (Rs_color + minCOLOR + 7, "color7", "color"), 159 RSTRG (Rs_color + minCOLOR + 7, "color7", "color"),
156#ifndef NO_BRIGHTCOLOR
157 RSTRG (Rs_color + minBrightCOLOR + 0, "color8", "color"), 160 RSTRG (Rs_color + minBrightCOLOR + 0, "color8", "color"),
158 RSTRG (Rs_color + minBrightCOLOR + 1, "color9", "color"), 161 RSTRG (Rs_color + minBrightCOLOR + 1, "color9", "color"),
159 RSTRG (Rs_color + minBrightCOLOR + 2, "color10", "color"), 162 RSTRG (Rs_color + minBrightCOLOR + 2, "color10", "color"),
160 RSTRG (Rs_color + minBrightCOLOR + 3, "color11", "color"), 163 RSTRG (Rs_color + minBrightCOLOR + 3, "color11", "color"),
161 RSTRG (Rs_color + minBrightCOLOR + 4, "color12", "color"), 164 RSTRG (Rs_color + minBrightCOLOR + 4, "color12", "color"),
162 RSTRG (Rs_color + minBrightCOLOR + 5, "color13", "color"), 165 RSTRG (Rs_color + minBrightCOLOR + 5, "color13", "color"),
163 RSTRG (Rs_color + minBrightCOLOR + 6, "color14", "color"), 166 RSTRG (Rs_color + minBrightCOLOR + 6, "color14", "color"),
164 RSTRG (Rs_color + minBrightCOLOR + 7, "color15", "color"), 167 RSTRG (Rs_color + minBrightCOLOR + 7, "color15", "color"),
165#endif /* NO_BRIGHTCOLOR */
166#ifndef NO_BOLD_UNDERLINE_REVERSE 168#ifndef NO_BOLD_UNDERLINE_REVERSE
167 RSTRG (Rs_color + Color_BD, "colorBD", "color"), 169 RSTRG (Rs_color + Color_BD, "colorBD", "color"),
170 RSTRG (Rs_color + Color_IT, "colorIT", "color"),
168 RSTRG (Rs_color + Color_UL, "colorUL", "color"), 171 RSTRG (Rs_color + Color_UL, "colorUL", "color"),
169 RSTRG (Rs_color + Color_RV, "colorRV", "color"), 172 RSTRG (Rs_color + Color_RV, "colorRV", "color"),
170#endif /* ! NO_BOLD_UNDERLINE_REVERSE */ 173#endif /* ! NO_BOLD_UNDERLINE_REVERSE */
174#if ENABLE_FRILLS
175 RSTRG (Rs_color + Color_underline, "underlineColor", "color"),
176#endif
171#ifdef KEEP_SCROLLCOLOR 177#ifdef KEEP_SCROLLCOLOR
172 RSTRG (Rs_color + Color_scroll, "scrollColor", "color"), 178 RSTRG (Rs_color + Color_scroll, "scrollColor", "color"),
173 RSTRG (Rs_color + Color_trough, "troughColor", "color"), 179 RSTRG (Rs_color + Color_trough, "troughColor", "color"),
174#endif /* KEEP_SCROLLCOLOR */ 180#endif /* KEEP_SCROLLCOLOR */
175#ifdef OPTION_HC 181#ifdef OPTION_HC
176 STRG (Rs_color + Color_HC, "highlightColor", "hc", "color", "highlight color"), 182 STRG (Rs_color + Color_HC, "highlightColor", "hc", "color", "highlight color"),
177#endif 183#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 184#ifndef NO_CURSORCOLOR
204 STRG (Rs_color + Color_cursor, "cursorColor", "cr", "color", "cursor color"), 185 STRG (Rs_color + Color_cursor, "cursorColor", "cr", "color", "cursor color"),
205 /* command-line option = resource name */ 186 /* command-line option = resource name */
206 RSTRG (Rs_color + Color_cursor2, "cursorColor2", "color"), 187 RSTRG (Rs_color + Color_cursor2, "cursorColor2", "color"),
207#endif /* NO_CURSORCOLOR */ 188#endif /* NO_CURSORCOLOR */
208 STRG (Rs_color + Color_pointer, "pointerColor", "pr", "color", 189 STRG (Rs_color + Color_pointer_fg, "pointerColor", "pr", "color", "pointer color"),
209 "pointer color"), 190 STRG (Rs_color + Color_pointer_bg, "pointerColor2", "pr2", "color", "pointer bg color"),
210 STRG (Rs_color + Color_border, "borderColor", "bd", "color", 191 STRG (Rs_color + Color_border, "borderColor", "bd", "color", "border color"),
211 "border color"), 192#ifdef XPM_BACKGROUND
193 RSTRG (Rs_path, "path", "search path"),
194 STRG (Rs_backgroundPixmap, "backgroundPixmap", "pixmap", "file[;geom]", "background pixmap"),
195#endif
196 /* fonts: command-line option = resource name */
197 STRG (Rs_font, "font", "fn", "fontname", "normal text font"),
198#if ENABLE_STYLES
199 STRG (Rs_boldFont, "boldFont", "fb", "fontname", "bold font"),
200 STRG (Rs_italicFont, "italicFont", "fi", "fontname", "italic font"),
201 STRG (Rs_boldItalicFont, "boldItalicFont", "fbi", "fontname", "bold italic font"),
202 BOOL (Rs_intensityStyles, "intensityStyles", "is", Opt_intensityStyles, "font styles imply intensity changes"),
203#endif
204#ifdef USE_XIM
205 STRG (Rs_inputMethod, "inputMethod", "im", "name", "name of input method"),
206 STRG (Rs_preeditType, "preeditType", "pt", "style", "input style: style = OverTheSpot|OffTheSpot|Root"),
207 STRG (Rs_imLocale, "imLocale", "imlocale", "string", "locale to use for input method"),
208 STRG (Rs_imFont, "imFont", "imfont", "fontname", "fontset for styles OverTheSpot and OffTheSpot"),
209#endif /* USE_XIM */
210 STRG (Rs_name, NULL, "name", "string", "client instance, icon, and title strings"),
211 STRG (Rs_title, "title", "title", "string", "title name for window"),
212 STRG (Rs_title, NULL, "T", NULL, NULL), /* short form */
213 STRG (Rs_iconName, "iconName", "n", "string", "icon name for window"),
212 STRG (Rs_saveLines, "saveLines", "sl", "number", 214 STRG (Rs_saveLines, "saveLines", "sl", "number", "number of scrolled lines to save"),
213 "number of scrolled lines to save"), 215#if ENABLE_XEMBED
214#ifndef NO_FRILLS 216 STRG (Rs_embed, NULL, "embed", "windowid", "window id to embed terminal in"),
217#endif
218#if ENABLE_FRILLS
219 RSTRG (Rs_transient_for, "transient-for", "windowid"),
220 STRG (Rs_pty_fd, NULL, "pty-fd", "fileno", "file descriptor of pty to use"),
221 BOOL (Rs_hold, "hold", "hold", Opt_hold, "retain window after shell exit"),
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 227 BOOL (Rs_skipBuiltinGlyphs, "skipBuiltinGlyphs", "sbg", Opt_skipBuiltinGlyphs, "do not use internal glyphs"),
222#ifndef NO_LINESPACE
223 STRG (Rs_lineSpace, "lineSpace", "lsp", "number", 228 STRG (Rs_lineSpace, "lineSpace", "lsp", "number", "number of extra pixels between rows"),
224 "number of extra pixels between rows"),
225#endif 229#endif
226 STRG (Rs_scrollBar_thickness, "thickness", "sbt", "number",
227 "scrollbar thickness/width in pixels"),
228#ifdef POINTER_BLANK 230#ifdef POINTER_BLANK
229 RSTRG (Rs_pointerBlankDelay, "pointerBlankDelay", "number"), 231 RSTRG (Rs_pointerBlankDelay, "pointerBlankDelay", "number"),
230#endif 232#endif
231#ifndef NO_BACKSPACE_KEY 233#ifndef NO_BACKSPACE_KEY
232 RSTRG (Rs_backspace_key, "backspacekey", "string"), 234 RSTRG (Rs_backspace_key, "backspacekey", "string"),
233#endif 235#endif
234#ifndef NO_DELETE_KEY 236#ifndef NO_DELETE_KEY
235 RSTRG (Rs_delete_key, "deletekey", "string"), 237 RSTRG (Rs_delete_key, "deletekey", "string"),
236#endif 238#endif
237 RSTRG (Rs_selectstyle, "selectstyle", "mode"), 239 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 240#ifdef PRINTPIPE
243 RSTRG (Rs_print_pipe, "print-pipe", "string"), 241 RSTRG (Rs_print_pipe, "print-pipe", "string"),
244#endif 242#endif
245 STRG (Rs_modifier, "modifier", "mod", "modifier", 243 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 244#ifdef CUTCHAR_RESOURCE
249 RSTRG (Rs_cutchars, "cutchars", "string"), 245 RSTRG (Rs_cutchars, "cutchars", "string"),
250#endif /* CUTCHAR_RESOURCE */ 246#endif /* CUTCHAR_RESOURCE */
251 RSTRG (Rs_answerbackstring, "answerbackString", "string"), 247 RSTRG (Rs_answerbackstring, "answerbackString", "string"),
248#ifndef NO_SECONDARY_SCREEN
249 BOOL (Rs_secondaryScreen, "secondaryScreen", "ssc", Opt_secondaryScreen, "enable secondary screen"),
250 BOOL (Rs_secondaryScroll, "secondaryScroll", "ssr", Opt_secondaryScroll, "enable secondary screen scroll"),
251#endif
252#if ENABLE_PERL
253 RSTRG (Rs_perl_lib, "perl-lib", "string"), //, "colon-separated directories with extension scripts"),TODO
254 RSTRG (Rs_perl_eval, "perl-eval", "perl-eval"), // "string", "code to be evaluated after all extensions have been loaded"),TODO
255 RSTRG (Rs_perl_ext_1, "perl-ext-common", "string"), //, "colon-separated list of perl extensions to enable"),TODO
256 STRG (Rs_perl_ext_2, "perl-ext", "pe", "string", "colon-separated list of perl extensions to enable for this instance"),
257#endif
258#ifndef NO_RESOURCES
259 INFO ("xrm", "string", "X resource"),
260#endif
252 INFO ("e", "command arg ...", "command to execute") 261 INFO ("e", "command arg ...", "command to execute")
253 }; 262 };
254 263
255#undef INFO 264#undef INFO
256#undef STRG 265#undef STRG
257#undef RSTRG 266#undef RSTRG
258#undef SWCH 267#undef SWCH
259#undef BOOL 268#undef BOOL
260/*}}} */ 269/*}}} */
261 270
262static const char releasestring[] = "Rxvt v" VERSION " - released: " DATE "\n"; 271static const char releasestring[] = "rxvt-unicode (" RXVTNAME ") v" VERSION " - released: " DATE "\n";
263static const char optionsstring[] = "Options: " 272static const char optionsstring[] = "options: "
273#if ENABLE_PERL
274 "perl,"
275#endif
276#if XFT
277 "xft,"
278#endif
279#if ENABLE_STYLES
280 "styles,"
281#endif
282#if ENABLE_COMBINING
283 "combining,"
284#endif
285#if TEXT_BLINK
286 "blink,"
287#endif
288#if ISO_14755
289 "iso14755,"
290#endif
291#if UNICODE_3
292 "unicode3,"
293#endif
294 "encodings=eu+vn"
295#if ENCODING_JP
296 "+jp"
297#endif
298#if ENCODING_JP_EXT
299 "+jp-ext"
300#endif
301#if ENCODING_KR
302 "+kr"
303#endif
304#if ENCODING_ZH
305 "+zh"
306#endif
307#if ENCODING_ZH_EXT
308 "+zh-ext"
309#endif
310 ","
311#if OFF_FOCUS_FADING
312 "fade,"
313#endif
264#if defined(XPM_BACKGROUND) 314#if defined(XPM_BACKGROUND)
265 "XPM," 315 "XPM,"
266#endif 316#endif
267#if defined(TRANSPARENT) 317#if defined(TRANSPARENT)
268 "transparent," 318 "transparent,"
269#endif 319#endif
320#if TINTING
321 "tint,"
322#endif
270#if defined(UTMP_SUPPORT) 323#if defined(UTMP_SUPPORT)
271 "utmp," 324 "utmp,"
272#endif
273#if defined(MENUBAR)
274 "menubar,"
275#endif
276#if !defined(NO_FRILLS)
277 "frills,"
278#endif
279#if !defined(NO_LINESPACE)
280 "linespace,"
281#endif
282#if defined(PREFER_24BIT)
283 "24bit,"
284#endif 325#endif
285#if defined(USE_XIM) 326#if defined(USE_XIM)
286 "XIM," 327 "XIM,"
287#endif 328#endif
288 "scrollbars=" 329 "scrollbars="
… …
316 "no_backspace," 357 "no_backspace,"
317#endif 358#endif
318#if defined(NO_DELETE_KEY) 359#if defined(NO_DELETE_KEY)
319 "no_delete," 360 "no_delete,"
320#endif 361#endif
321#if !defined(NO_STRINGS) 362#if EIGHT_BIT_CONTROLS
363 "8bitctrls,"
364#endif
365#if defined(ENABLE_FRILLS)
322 "strings," 366 "frills,"
323#endif 367#endif
324#if defined(TTY_256COLOR) 368#if defined(PREFER_24BIT)
325 "256colour," 369 "24bit,"
370#endif
371#if defined(SELECTION_SCROLLING)
372 "selectionscrolling,"
373#endif
374#if MOUSE_WHEEL
375 "wheel,"
376#endif
377#if MOUSE_SLIP_WHEELING
378 "slipwheel,"
379#endif
380#if defined(SMART_RESIZE)
381 "smart-resize,"
382#endif
383#if defined(CURSOR_BLINK)
384 "cursorBlink,"
385#endif
386#if defined(POINTER_BLANK)
387 "pointerBlank,"
326#endif 388#endif
327#if defined(NO_RESOURCES) 389#if defined(NO_RESOURCES)
328 "NoResources" 390 "NoResources"
329#else
330# if defined(USE_XGETDEFAULT)
331 "XGetDefaults"
332# else
333 ".Xdefaults"
334# endif
335#endif 391#endif
336 "\nUsage: "; /* Usage */ 392 "\nUsage: "; /* Usage */
337 393
338#define INDENT 18 394#define INDENT 18
339 395
340/*{{{ usage: */ 396/*{{{ usage: */
341/*----------------------------------------------------------------------*/ 397/*----------------------------------------------------------------------*/
342static void 398static void
343rxvt_usage (int type) 399rxvt_usage (int type)
344{ 400{
345 unsigned int i, col; 401 unsigned int i, col;
346 402
347 write (STDERR_FILENO, releasestring, sizeof (releasestring) - 1); 403 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 404
351 switch (type) 405 switch (type)
352 { 406 {
353 case 0: /* brief listing */ 407 case 0: /* brief listing */
354 fprintf (stderr, " [-help] [--help]\n"); 408 rxvt_log (" [-help] [--help]\n");
409
355 for (col = 1, i = 0; i < optList_size (); i++) 410 for (col = 1, i = 0; i < optList_size; i++)
356 if (optList[i].desc != NULL) 411 if (optList[i].desc != NULL)
357 { 412 {
358 int len = 0; 413 int len = 0;
359 414
360 if (!optList_isBool (i)) 415 if (!optList_isBool (i))
… …
364 len++; /* account for space */ 419 len++; /* account for space */
365 } 420 }
366#ifdef DEBUG_STRICT 421#ifdef DEBUG_STRICT
367 assert (optList[i].opt != NULL); 422 assert (optList[i].opt != NULL);
368#endif 423#endif
369 len += 4 + STRLEN (optList[i].opt) + (optList_isBool (i) ? 2: 0); 424 len += 4 + strlen (optList[i].opt) + (optList_isBool (i) ? 2: 0);
370 col += len; 425 col += len;
371 if (col > 79) 426 if (col > 79)
372 { /* assume regular width */ 427 { /* assume regular width */
373 putc ('\n', stderr); 428 rxvt_log ("\n");
374 col = 1 + len; 429 col = 1 + len;
375 } 430 }
431
376 fprintf (stderr, " [-%s%s", (optList_isBool (i) ? "/+" : ""), 432 rxvt_log (" [-%s%s", (optList_isBool (i) ? "/+" : ""), optList[i].opt);
377 optList[i].opt);
378 if (optList_strlen (i)) 433 if (optList_strlen (i))
379 fprintf (stderr, " %s]", optList[i].arg); 434 rxvt_log (" %s]", optList[i].arg);
380 else 435 else
381 fprintf (stderr, "]"); 436 rxvt_log ("]");
382 } 437 }
383 break; 438 break;
384 439
385 case 1: /* full command-line listing */ 440 case 1: /* full command-line listing */
386 fprintf (stderr, " [options] [-e command args]\n\n" 441 rxvt_log (" [options] [-e command args]\n\nwhere options include:\n");
387 "where options include:\n"); 442
388 for (i = 0; i < optList_size (); i++) 443 for (i = 0; i < optList_size; i++)
389 if (optList[i].desc != NULL) 444 if (optList[i].desc != NULL)
390 { 445 {
391#ifdef DEBUG_STRICT 446#ifdef DEBUG_STRICT
392 assert (optList[i].opt != NULL); 447 assert (optList[i].opt != NULL);
393#endif 448#endif
394 fprintf (stderr, " %s%s %-*s%s%s\n", 449 rxvt_log (" %s%s %-*s%s%s\n",
395 (optList_isBool (i) ? "-/+" : "-"), optList[i].opt, 450 (optList_isBool (i) ? "-/+" : "-"), optList[i].opt,
396 (INDENT - STRLEN (optList[i].opt) 451 (INDENT - strlen (optList[i].opt)
397 + (optList_isBool (i) ? 0 : 2)), 452 + (optList_isBool (i) ? 0 : 2)),
398 (optList[i].arg ? optList[i].arg : ""), 453 (optList[i].arg ? optList[i].arg : ""),
399 (optList_isBool (i) ? "turn on/off " : ""), 454 (optList_isBool (i) ? "turn on/off " : ""),
400 optList[i].desc); 455 optList[i].desc);
401 } 456 }
402 fprintf (stderr, "\n --help to list long-options"); 457 rxvt_log ("\n --help to list long-options");
403 break; 458 break;
404 459
405 case 2: /* full resource listing */ 460 case 2: /* full resource listing */
406 fprintf (stderr,
407 " [options] [-e command args]\n\n" 461 rxvt_log (" [options] [-e command args]\n\n"
408 "where resources (long-options) include:\n"); 462 "where resources (long-options) include:\n");
409 463
410 for (i = 0; i < optList_size (); i++) 464 for (i = 0; i < optList_size; i++)
411 if (optList[i].kw != NULL) 465 if (optList[i].kw != NULL)
412 fprintf (stderr, " %s: %*s%s\n", 466 rxvt_log (" %s: %*s%s\n",
413 optList[i].kw, 467 optList[i].kw,
414 (INDENT - STRLEN (optList[i].kw)), "", /* XXX */ 468 (INDENT - strlen (optList[i].kw)), "", /* XXX */
415 (optList_isBool (i) ? "boolean" : optList[i].arg)); 469 (optList_isBool (i) ? "boolean" : optList[i].arg));
416#ifdef KEYSYM_RESOURCE 470#ifdef KEYSYM_RESOURCE
417 fprintf (stderr, " " "keysym.sym" ": %*s%s\n", 471 rxvt_log (" " "keysym.sym" ": %*s%s\n",
418 (INDENT - sizeof ("keysym.sym") + 1), "", /* XXX */ 472 (INDENT - sizeof ("keysym.sym") + 1), "", /* XXX */
419 "keysym"); 473 "keysym");
420#endif 474#endif
421 fprintf (stderr, "\n -help to list options"); 475 rxvt_log ("\n -help to list options");
422 break; 476 break;
423 } 477 }
424 fprintf (stderr, "\n\n"); 478
425 exit (EXIT_FAILURE); 479 rxvt_log ("\n\n");
480 rxvt_exit_failure ();
426 /* NOTREACHED */ 481 /* NOTREACHED */
427} 482}
428 483
429/*}}} */ 484/*}}} */
430 485
… …
435 int i, bad_option = 0; 490 int i, bad_option = 0;
436 static const char On[3] = "ON", Off[4] = "OFF"; 491 static const char On[3] = "ON", Off[4] = "OFF";
437 492
438 for (i = 1; i < argc; i++) 493 for (i = 1; i < argc; i++)
439 { 494 {
440 unsigned int entry, longopt = 0; 495 unsigned int entry, longopt = 0;
441 const char *flag, *opt; 496 const char *flag, *opt;
442 497
443 opt = argv[i]; 498 opt = argv[i];
444#ifdef DEBUG_RESOURCES 499#ifdef DEBUG_RESOURCES
445 fprintf (stderr, "argv[%d] = %s: ", i, opt); 500 fprintf (stderr, "argv[%d] = %s: ", i, opt);
446#endif 501#endif
… …
457 longopt = *opt++; /* long option */ 512 longopt = *opt++; /* long option */
458 } 513 }
459 else 514 else
460 { 515 {
461 bad_option = 1; 516 bad_option = 1;
462 rxvt_print_error ("bad option \"%s\"", opt); 517 rxvt_warn ("\"%s\": malformed option.\n", opt);
463 continue; 518 continue;
464 } 519 }
465 520
466 if (!STRCMP (opt, "help")) 521 if (!strcmp (opt, "help"))
467 rxvt_usage (longopt ? 2 : 1); 522 rxvt_usage (longopt ? 2 : 1);
468 if (!STRCMP (opt, "h")) 523 if (!strcmp (opt, "h"))
469 rxvt_usage (0); 524 rxvt_usage (0);
470 525
471 /* feature: always try to match long-options */ 526 /* feature: always try to match long-options */
472 for (entry = 0; entry < optList_size (); entry++) 527 for (entry = 0; entry < optList_size; entry++)
473 if ((optList[entry].kw && !STRCMP (opt, optList[entry].kw)) 528 if ((optList[entry].kw && !strcmp (opt, optList[entry].kw))
474 || (!longopt 529 || (!longopt
475 && optList[entry].opt && !STRCMP (opt, optList[entry].opt))) 530 && optList[entry].opt && !strcmp (opt, optList[entry].opt)))
476 break; 531 break;
477 532
478 if (entry < optList_size ()) 533 if (entry < optList_size)
479 { 534 {
480 if (optList_isReverse (entry)) 535 if (optList_isReverse (entry))
481 flag = flag == On ? Off : On; 536 flag = flag == On ? Off : On;
537
482 if (optList_strlen (entry)) 538 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 { 539 {
493#ifdef DEBUG_RESOURCES
494 fprintf (stderr, "\"%s\"\n", str);
495#endif
496 rs[optList[entry].doff] = str;
497 /* 540 /*
498 * special cases are handled in main.c:main () to allow 541 * special cases are handled in main.c:main () to allow
499 * X resources to set these values before we settle for 542 * X resources to set these values before we settle for
500 * default values 543 * default values
501 */ 544 */
502 }
503#ifdef DEBUG_RESOURCES
504 else
505 fprintf (stderr, "???\n");
506#endif
507 545
546 if (optList[entry].doff != -1)
547 rs[optList[entry].doff] = flag == On && argv[i+1]
548 ? argv[++i] : 0;
508 } 549 }
509 else 550 else
510 { /* boolean value */ 551 { /* boolean value */
511#ifdef DEBUG_RESOURCES 552#ifdef DEBUG_RESOURCES
512 fprintf (stderr, "boolean (%s,%s) = %s\n", 553 fprintf (stderr, "boolean (%s,%s) = %s\n",
513 optList[entry].opt, optList[entry].kw, flag); 554 optList[entry].opt, optList[entry].kw, flag);
514#endif 555#endif
515 if (flag == On) 556 set_option (optList[entry].flag & Optflag_mask, flag == On);
516 Options |= (optList[entry].flag);
517 else
518 Options &= ~ (optList[entry].flag);
519 557
520 if (optList[entry].doff != -1) 558 if (optList[entry].doff != -1)
521 rs[optList[entry].doff] = flag; 559 rs[optList[entry].doff] = flag;
522 } 560 }
523 } 561 }
524 else 562 else
525#ifdef KEYSYM_RESOURCE 563#ifdef KEYSYM_RESOURCE
526 /* if (!STRNCMP (opt, "keysym.", sizeof ("keysym.") - 1)) */ 564 /* if (!strncmp (opt, "keysym.", sizeof ("keysym.") - 1)) */
527 if (rxvt_Str_match (opt, "keysym.")) 565 if (rxvt_Str_match (opt, "keysym."))
528 { 566 {
529 const char *str = argv[++i]; 567 const char *str = argv[++i];
530 568
531 if (str != NULL) 569 if (str != NULL)
532 parse_keysym (opt + sizeof ("keysym.") - 1, str); 570 parse_keysym (opt + sizeof ("keysym.") - 1, str);
533 } 571 }
534 else 572 else
535#endif 573#endif
574 {
536 bad_option = 1; 575 bad_option = 1;
576 rxvt_warn ("\"%s\": unknown or malformed option.\n", opt);
577 }
537 } 578 }
538 579
539 if (bad_option) 580 if (bad_option)
540 rxvt_usage (0); 581 rxvt_usage (0);
541} 582}
… …
559 XrmQuarkList quarks, 600 XrmQuarkList quarks,
560 XrmRepresentation *type __attribute__((unused)), 601 XrmRepresentation *type __attribute__((unused)),
561 XrmValue *value, 602 XrmValue *value,
562 XPointer closure __attribute__((unused))) 603 XPointer closure __attribute__((unused)))
563{ 604{
564 int last; 605 int last;
565 606
566 for (last = 0; quarks[last] != NULLQUARK; last++) /* look for last quark in list */ 607 for (last = 0; quarks[last] != NULLQUARK; last++) /* look for last quark in list */
567 ; 608 ;
609
568 last--; 610 last--;
569 GET_R->parse_keysym (XrmQuarkToString (quarks[last]), (char *)value->addr);//D//TODO 611 GET_R->parse_keysym (XrmQuarkToString (quarks[last]), (char *)value->addr);//D//TODO
570 return False; 612 return False;
571} 613}
572 614
… …
577 * arg will be 619 * arg will be
578 * NULL for ~/.Xdefaults and 620 * NULL for ~/.Xdefaults and
579 * non-NULL for command-line options (need to allocate) 621 * non-NULL for command-line options (need to allocate)
580 */ 622 */
581#define NEWARGLIM 500 /* `reasonable' size */ 623#define NEWARGLIM 500 /* `reasonable' size */
624
625struct keysym_vocabulary_t
626{
627 const char *name;
628 unsigned short len;
629 unsigned short value;
630};
631keysym_vocabulary_t keysym_vocabulary[] =
632{
633 { "ISOLevel3", 9, Level3Mask },
634 { "AppKeypad", 9, AppKeypadMask },
635 { "Control", 7, ControlMask },
636 { "NumLock", 7, NumLockMask },
637 { "Shift", 5, ShiftMask },
638 { "Meta", 4, MetaMask },
639 { "Lock", 4, LockMask },
640 { "Mod1", 4, Mod1Mask },
641 { "Mod2", 4, Mod2Mask },
642 { "Mod3", 4, Mod3Mask },
643 { "Mod4", 4, Mod4Mask },
644 { "Mod5", 4, Mod5Mask },
645 { "I", 1, Level3Mask },
646 { "K", 1, AppKeypadMask },
647 { "C", 1, ControlMask },
648 { "N", 1, NumLockMask },
649 { "S", 1, ShiftMask },
650 { "M", 1, MetaMask },
651 { "A", 1, MetaMask },
652 { "L", 1, LockMask },
653 { "1", 1, Mod1Mask },
654 { "2", 1, Mod2Mask },
655 { "3", 1, Mod3Mask },
656 { "4", 1, Mod4Mask },
657 { "5", 1, Mod5Mask },
658};
659
582int 660int
583rxvt_term::parse_keysym (const char *str, const char *arg) 661rxvt_term::parse_keysym (const char *str, const char *arg)
584{ 662{
585 int n, sym; 663 int n, sym;
586 char *key_string, *newarg = NULL; 664 unsigned int state = 0;
665 const char *pmodend = NULL;
666 char *newarg = NULL;
587 char newargstr[NEWARGLIM]; 667 char newargstr[NEWARGLIM];
588 668
589 if (arg == NULL) 669 if (arg == NULL)
590 { 670 {
591 if ((n = rxvt_Str_match (str, "keysym.")) == 0) 671 if ((n = rxvt_Str_match (str, "keysym.")) == 0)
592 return 0; 672 return 0;
673
593 str += n; /* skip `keysym.' */ 674 str += n; /* skip `keysym.' */
675 if (!(pmodend = strchr (str, ':')))
676 return -1;
594 } 677 }
678 else
679 pmodend = str + strlen(str);
680
681 for (--pmodend; str < pmodend; --pmodend)
682 if (*pmodend == '-')
683 break;
684
685 while (str < pmodend)
686 {
687 unsigned int i;
688
689 for (i=0; i < sizeof (keysym_vocabulary) / sizeof (keysym_vocabulary_t); ++i)
690 {
691 if (strncmp (str, keysym_vocabulary [i].name, keysym_vocabulary [i].len) == 0)
692 {
693 state |= keysym_vocabulary[i].value;
694 str += keysym_vocabulary[i].len;
695 break;
696 }
697 }
698
699 if (i >= sizeof (keysym_vocabulary) / sizeof (keysym_vocabulary_t))
700 return -1;
701
702 if (*str == '-')
703 ++str;
704 }
705
595 /* some scanf () have trouble with a 0x prefix */ 706 /* some scanf () have trouble with a 0x prefix */
596 if (isdigit (str[0])) 707 if (str[0] == '0' && toupper (str[1]) == 'X')
597 { 708 {
598 if (str[0] == '0' && toupper (str[1]) == 'X')
599 str += 2; 709 str += 2;
710
600 if (arg) 711 if (arg)
601 { 712 {
602 if (sscanf (str, (STRCHR (str, ':') ? "%x:" : "%x"), &sym) != 1) 713 if (sscanf (str, (strchr (str, ':') ? "%x:" : "%x"), &sym) != 1)
603 return -1; 714 return -1;
604 } 715 }
605 else 716 else
606 { 717 {
607 if (sscanf (str, "%x:", &sym) != 1) 718 if (sscanf (str, "%x:", &sym) != 1)
608 return -1; 719 return -1;
609 720
610 /* cue to ':', it's there since sscanf () worked */ 721 /* cue to ':', it's there since sscanf () worked */
611 STRNCPY (newargstr, STRCHR (str, ':') + 1, NEWARGLIM - 1); 722 strncpy (newargstr, strchr (str, ':') + 1, NEWARGLIM - 1);
612 newargstr[NEWARGLIM - 1] = '\0'; 723 newargstr[NEWARGLIM - 1] = '\0';
613 newarg = newargstr; 724 newarg = newargstr;
614 } 725 }
615 } 726 }
616 else 727 else
617 { 728 {
618 /* 729 /*
619 * convert keysym name to keysym number 730 * convert keysym name to keysym number
620 */ 731 */
621 STRNCPY (newargstr, str, NEWARGLIM - 1); 732 strncpy (newargstr, str, NEWARGLIM - 1);
622 newargstr[NEWARGLIM - 1] = '\0'; 733 newargstr[NEWARGLIM - 1] = '\0';
734
623 if (arg == NULL) 735 if (arg == NULL)
624 { 736 {
625 if ((newarg = STRCHR (newargstr, ':')) == NULL) 737 if ((newarg = strchr (newargstr, ':')) == NULL)
626 return -1; 738 return -1;
739
627 *newarg++ = '\0'; /* terminate keysym name */ 740 *newarg++ = '\0'; /* terminate keysym name */
628 } 741 }
742
629 if ((sym = XStringToKeysym (newargstr)) == None) 743 if ((sym = XStringToKeysym (newargstr)) == None)
630 return -1; 744 return -1;
631 } 745 }
632 746
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) 747 if (newarg == NULL)
640 { 748 {
641 STRNCPY (newargstr, arg, NEWARGLIM - 1); 749 strncpy (newargstr, arg, NEWARGLIM - 1);
642 newargstr[NEWARGLIM - 1] = '\0'; 750 newargstr[NEWARGLIM - 1] = '\0';
643 newarg = newargstr; 751 newarg = newargstr;
644 } 752 }
753
645 rxvt_Str_trim (newarg); 754 rxvt_Str_trim (newarg);
646 if (*newarg == '\0' || (n = rxvt_Str_escaped (newarg)) == 0) 755 if (*newarg == '\0' || (n = rxvt_Str_escaped (newarg)) == 0)
647 return -1; 756 return -1;
648 MIN_IT (n, 255);
649 key_string = (char *)rxvt_malloc ((n + 1) * sizeof (char));
650 757
651 key_string[0] = n; 758 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; 759 return 1;
656} 760}
657 761
658# endif /* KEYSYM_RESOURCE */ 762# endif /* KEYSYM_RESOURCE */
763#endif /* NO_RESOURCES */
659 764
660# ifndef USE_XGETDEFAULT 765static char *
661/*{{{ rxvt_get_xdefaults () */ 766get_res (XrmDatabase database, const char *program, const char *option)
662/* 767{
663 * the matching algorithm used for memory-save fake resources 768 char resource[512];
664 */ 769 char *type;
770 XrmValue result;
771
772 snprintf (resource, sizeof (resource), "%s.%s", program, option);
773 XrmGetResource (database, resource, resource, &type, &result);
774
775 return result.addr;
776}
777
778const char *
779rxvt_term::x_resource (const char *name)
780{
781 XrmDatabase database = XrmGetDatabase (display->display);
782
783 const char *p = get_res (database, rs[Rs_name], name);
784 const char *p0 = get_res (database, "!INVALIDPROGRAMMENAMEDONTMATCH!", name);
785
786 if (p == NULL || (p0 && strcmp (p, p0) == 0))
787 {
788 p = get_res (database, RESCLASS, name);
789#ifdef RESFALLBACK
790 if (p == NULL || (p0 && strcmp (p, p0) == 0))
791 p = get_res (database, RESFALLBACK, name);
792#endif
793 }
794
795 if (p == NULL && p0)
796 p = p0;
797
798 return p;
799}
800
665void 801void
666rxvt_term::get_xdefaults (FILE *stream, const char *name) 802rxvt_term::extract_resources ()
667{
668 unsigned int len;
669 char *str, buffer[256];
670
671 if (stream == NULL)
672 return;
673 len = STRLEN (name);
674 while ((str = fgets (buffer, sizeof (buffer), stream)) != NULL)
675 {
676 unsigned int entry, n;
677
678 while (*str && isspace (*str))
679 str++; /* leading whitespace */
680
681 if ((str[len] != '*' && str[len] != '.')
682 || (len && STRNCMP (str, name, len)))
683 continue;
684 str += (len + 1); /* skip `name*' or `name.' */
685
686# ifdef KEYSYM_RESOURCE
687 if (!parse_keysym (str, NULL))
688# endif /* KEYSYM_RESOURCE */
689 for (entry = 0; entry < optList_size (); entry++)
690 {
691 const char *kw = optList[entry].kw;
692
693 if (kw == NULL)
694 continue;
695 n = STRLEN (kw);
696 if (str[n] == ':' && rxvt_Str_match (str, kw))
697 {
698 /* skip `keyword:' */
699 str += n + 1;
700 rxvt_Str_trim (str);
701 n = STRLEN (str);
702 if (n && rs[optList[entry].doff] == NULL)
703 {
704 /* not already set */
705 int s;
706 char *p = 0;
707
708 for (int o = 0;;)
709 {
710 p = (char *)rxvt_realloc (p, o + n + 1);
711 MEMCPY (p + o, str, n);
712 o += n;
713 p[o] = 0;
714
715 if (o == 0 || p[o - 1] != '\\') // continuation line
716 break;
717
718 o--; // eat "\"
719
720 if ((str = fgets (buffer, sizeof (buffer), stream)) == NULL)
721 break;
722
723 rxvt_Str_trim (str);
724 n = STRLEN (str);
725 }
726
727 rs[optList[entry].doff] = p;
728 if (optList_isBool (entry))
729 {
730 s = STRCASECMP (str, "TRUE") == 0
731 || STRCASECMP (str, "YES") == 0
732 || STRCASECMP (str, "ON") == 0
733 || STRCASECMP (str, "1") == 0;
734 if (optList_isReverse (entry))
735 s = !s;
736 if (s)
737 Options |= (optList[entry].flag);
738 else
739 Options &= ~ (optList[entry].flag);
740 }
741 }
742 break;
743 }
744 }
745 }
746 rewind (stream);
747}
748
749/*}}} */
750# endif /* ! USE_XGETDEFAULT */
751#endif /* NO_RESOURCES */
752
753/*{{{ read the resources files */
754/*
755 * using XGetDefault () or the hand-rolled replacement
756 */
757/* ARGSUSED */
758void
759rxvt_term::extract_resources (Display *display __attribute__ ((unused)), const char *name)
760{ 803{
761#ifndef NO_RESOURCES 804#ifndef NO_RESOURCES
762
763# if defined XAPPLOADDIR
764# if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
765 /* Compute the path of the possibly available localized Rxvt file */
766 char *localepath = NULL;
767
768 if (locale != NULL)
769 { /* XXX: must limit length of string */
770 localepath = (char *)rxvt_malloc (256);
771 sprintf (localepath, XAPPLOADDIRLOCALE "/" RESCLASS,
772 (int) (258 - sizeof (XAPPLOADDIRLOCALE) - sizeof (RESCLASS)),
773 locale); /* 258 = 255 + 4 (-.*s) - 1 (/) */
774 }
775
776 {
777# endif
778# endif
779
780# ifdef USE_XGETDEFAULT
781 /* 805 /*
782 * get resources using the X library function 806 * Query resources for options that affect us
783 */ 807 */
784 int entry; 808 for (int entry = 0; entry < optList_size; entry++)
785
786# ifdef XrmEnumOneLevel
787 int i;
788 char *displayResource, *xe;
789 XrmName name_prefix[3];
790 XrmClass class_prefix[3];
791 XrmDatabase database, rdb1;
792 char fname[1024];
793
794 XrmInitialize ();
795 database = NULL;
796
797 /* Get any Xserver defaults */
798
799 displayResource = XResourceManagerString (display);
800 if (displayResource != NULL)
801 database = XrmGetStringDatabase (displayResource);
802
803# ifdef HAVE_EXTRA_XRESOURCE_FILES
804 /* Add in ~/.Xdefaults or ~/.Xresources */
805 { 809 {
806 char *ptr; 810 int s;
811 const char *kw = optList[entry].kw;
807 812
808 if ((ptr = (char *)getenv ("HOME")) == NULL) 813 if (kw == NULL || rs[optList[entry].doff] != NULL)
809 ptr = "."; 814 continue; // previously set
810 815
811 for (i = 0; i < (sizeof (xnames) / sizeof (xnames[0])); i++) 816 const char *p = x_resource (kw);
817
818 if (p)
812 { 819 {
813 sprintf (fname, "%-.*s/%s", sizeof (fname) - STRLEN (xnames[i]) - 2, 820 p = strdup (p);
814 ptr, xnames[i]); 821 allocated.push_back ((void *)p);
815 if ((rdb1 = XrmGetFileDatabase (fname)) != NULL) 822 rs[optList[entry].doff] = p;
823
824 if (optList_isBool (entry))
816 { 825 {
817 XrmMergeDatabases (rdb1, &database); 826 s = strcasecmp (p, "TRUE") == 0
818# ifndef HAVE_BOTH_XRESOURCE_FILES 827 || strcasecmp (p, "YES") == 0
819 break; 828 || strcasecmp (p, "ON") == 0
820# endif 829 || strcasecmp (p, "1") == 0;
821 830
831 if (optList_isReverse (entry))
832 s = !s;
833
834 set_option (optList[entry].flag & Optflag_mask, s);
822 } 835 }
823 } 836 }
824 } 837 }
825# endif
826 838
827 /* Add in XENVIRONMENT file */
828
829 if ((xe = (char *)getenv ("XENVIRONMENT")) != NULL
830 && (rdb1 = XrmGetFileDatabase (xe)) != NULL)
831 XrmMergeDatabases (rdb1, &database);
832
833 /* Add in Rxvt file */
834# if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
835 if (localepath == NULL || (rdb1 = XrmGetFileDatabase (localepath)) == NULL)
836# endif
837 rdb1 = XrmGetFileDatabase (XAPPLOADDIR "/" RESCLASS);
838
839 if (rdb1 != NULL)
840 XrmMergeDatabases (rdb1, &database);
841
842 /* Add in $XAPPLRESDIR/Rxvt only; not bothering with XUSERFILESEARCHPATH */
843 if ((xe = (char *)getenv ("XAPPLRESDIR")) != NULL)
844 {
845 sprintf (fname, "%-.*s/" RESCLASS, sizeof (fname)
846 - sizeof (RESCLASS) - 2, xe);
847 if ((rdb1 = XrmGetFileDatabase (fname)) != NULL)
848 XrmMergeDatabases (rdb1, &database);
849 }
850
851 XrmSetDatabase (display, database);
852# endif
853
854 /* 839 /*
855 * Query resources for options that affect us
856 */
857 for (entry = 0; entry < optList_size (); entry++)
858 {
859 int s;
860 char *p, *p0;
861 const char *kw = optList[entry].kw;
862
863 if (kw == NULL || rs[optList[entry].doff] != NULL)
864 continue; /* previously set */
865
866 p = XGetDefault (display, name, kw);
867 p0 = XGetDefault (display, "!INVALIDPROGRAMMENAMEDONTMATCH!", kw);
868 if (p == NULL || (p0 && STRCMP (p, p0) == 0))
869 {
870 p = XGetDefault (display, RESCLASS, kw);
871#ifdef RESFALLBACK
872 if (p == NULL || (p0 && STRCMP (p, p0) == 0))
873 p = XGetDefault (display, RESFALLBACK, kw);
874#endif
875 }
876
877 if (p == NULL && p0)
878 p = p0;
879
880 if (p)
881 {
882 rs[optList[entry].doff] = p;
883
884 if (optList_isBool (entry))
885 {
886 s = STRCASECMP (p, "TRUE") == 0
887 || STRCASECMP (p, "YES") == 0
888 || STRCASECMP (p, "ON") == 0
889 || STRCASECMP (p, "1") == 0;
890 if (optList_isReverse (entry))
891 s = !s;
892 if (s)
893 Options |= (optList[entry].flag);
894 else
895 Options &= ~ (optList[entry].flag);
896 }
897 }
898 }
899
900 /*
901 * [R5 or later]: enumerate the resource database 840 * [R5 or later]: enumerate the resource database
902 */ 841 */
903# ifdef XrmEnumOneLevel
904# ifdef KEYSYM_RESOURCE 842# ifdef KEYSYM_RESOURCE
843 XrmDatabase database = XrmGetDatabase (display->display);
844 XrmName name_prefix[3];
845 XrmClass class_prefix[3];
846
905 name_prefix[0] = XrmStringToName (name); 847 name_prefix[0] = XrmStringToName (rs[Rs_name]);
906 name_prefix[1] = XrmStringToName ("keysym"); 848 name_prefix[1] = XrmStringToName ("keysym");
907 name_prefix[2] = NULLQUARK; 849 name_prefix[2] = NULLQUARK;
908 class_prefix[0] = XrmStringToName (RESCLASS); 850 class_prefix[0] = XrmStringToName (RESCLASS);
909 class_prefix[1] = XrmStringToName ("Keysym"); 851 class_prefix[1] = XrmStringToName ("Keysym");
910 class_prefix[2] = NULLQUARK; 852 class_prefix[2] = NULLQUARK;
911 /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */ 853 /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */
912 XrmEnumerateDatabase (XrmGetDatabase (display), name_prefix, class_prefix, 854 XrmEnumerateDatabase (database, name_prefix, class_prefix,
913 XrmEnumOneLevel, rxvt_define_key, NULL); 855 XrmEnumOneLevel, rxvt_define_key, NULL);
914# ifdef RESFALLBACK 856# ifdef RESFALLBACK
915 name_prefix[0] = XrmStringToName (RESFALLBACK); 857 name_prefix[0] = XrmStringToName (RESFALLBACK);
916 name_prefix[1] = XrmStringToName ("keysym"); 858 name_prefix[1] = XrmStringToName ("keysym");
917 class_prefix[0] = XrmStringToName (RESFALLBACK); 859 class_prefix[0] = XrmStringToName (RESFALLBACK);
918 class_prefix[1] = XrmStringToName ("Keysym"); 860 class_prefix[1] = XrmStringToName ("Keysym");
919 /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */ 861 /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */
920 XrmEnumerateDatabase (XrmGetDatabase (display), name_prefix, class_prefix, 862 XrmEnumerateDatabase (database, name_prefix, class_prefix,
921 XrmEnumOneLevel, rxvt_define_key, NULL); 863 XrmEnumOneLevel, rxvt_define_key, NULL);
922# endif
923# endif 864# endif
924# endif 865# endif
925 866
926# else /* USE_XGETDEFAULT */
927 /* get resources the hard way, but save lots of memory */
928 FILE *fd = NULL;
929 char *home;
930
931 if ((home = getenv ("HOME")) != NULL)
932 {
933 unsigned int i, len = STRLEN (home) + 2;
934 char *f = NULL;
935
936 for (i = 0; i < (sizeof (xnames) / sizeof (xnames[0])); i++)
937 {
938 f = (char *)rxvt_realloc (f, (len + STRLEN (xnames[i])) * sizeof (char));
939
940 sprintf (f, "%s/%s", home, xnames[i]);
941
942 if ((fd = fopen (f, "r")) != NULL)
943 break;
944 }
945 free (f);
946 }
947 /*
948 * The normal order to match resources is the following:
949 * @ global resources (partial match, ~/.Xdefaults)
950 * @ application file resources (XAPPLOADDIR/Rxvt)
951 * @ class resources (~/.Xdefaults)
952 * @ private resources (~/.Xdefaults)
953 *
954 * However, for the hand-rolled resources, the matching algorithm
955 * checks if a resource string value has already been allocated
956 * and won't overwrite it with (in this case) a less specific
957 * resource value.
958 *
959 * This avoids multiple allocation. Also, when we've called this
960 * routine command-line string options have already been applied so we
961 * needn't to allocate for those resources.
962 *
963 * So, search in resources from most to least specific.
964 *
965 * Also, use a special sub-class so that we can use either or both of
966 * "XTerm" and "Rxvt" as class names.
967 */
968
969 get_xdefaults (fd, name);
970 get_xdefaults (fd, RESCLASS);
971# ifdef RESFALLBACK
972 get_xdefaults (fd, RESFALLBACK);
973# endif
974
975# if defined(XAPPLOADDIR) && defined(USE_XAPPLOADDIR)
976 {
977 FILE *ad = NULL;
978
979# if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
980 if (localepath == NULL || (ad = fopen (localepath, "r")) == NULL)
981# endif
982 ad = fopen (XAPPLOADDIR "/" RESCLASS, "r");
983 if (ad != NULL)
984 {
985 get_xdefaults (ad, RESCLASS);
986 get_xdefaults (ad, "");
987 fclose (ad);
988 }
989 }
990# endif /* XAPPLOADDIR */
991
992 get_xdefaults (fd, ""); /* partial match */
993 if (fd != NULL)
994 fclose (fd);
995# endif /* USE_XGETDEFAULT */
996
997# if defined XAPPLOADDIR
998# if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
999
1000 }
1001
1002 /* Free the path of the possibly available localized Rxvt file */
1003 free (localepath);
1004# endif
1005# endif
1006
1007#endif /* NO_RESOURCES */ 867#endif /* NO_RESOURCES */
1008} 868}
1009 869
1010/*}}} */
1011/*----------------------- end-of-file (C source) -----------------------*/ 870/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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