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.13 by pcg, Tue Feb 24 21:41:16 2004 UTC vs.
Revision 1.88 by root, Wed Jan 25 22:14:45 2006 UTC

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

Diff Legend

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