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.12 by pcg, Sun Feb 22 08:09:38 2004 UTC vs.
Revision 1.77 by root, Wed Jan 11 00:59:58 2006 UTC

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

Diff Legend

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