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.59 by root, Thu Aug 11 02:05:07 2005 UTC vs.
Revision 1.163 by sf-exg, Thu May 24 16:19:26 2012 UTC

1/*--------------------------------*-C-*---------------------------------* 1/*----------------------------------------------------------------------*
2 * File: xdefaults.C 2 * File: xdefaults.C
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * 4 *
5 * All portions of code are copyright by their respective author/s. 5 * All portions of code are copyright by their respective author/s.
6 * Copyright (c) 1994 Robert Nation <nation@rocket.sanders.lockheed.com> 6 * Copyright (c) 1994 Robert Nation <nation@rocket.sanders.lockheed.com>
7 * - original version 7 * - original version
8 * Copyright (c) 1997,1998 mj olesen <olesen@me.queensu.ca> 8 * Copyright (c) 1997,1998 mj olesen <olesen@me.queensu.ca>
9 * Copyright (c) 2003-2004 Marc Lehmann <pcg@goof.com> 9 * Copyright (c) 2003-2006 Marc Lehmann <schmorp@schmorp.de>
10 * Copyright (c) 2007 Emanuele Giaquinta <e.giaquinta@glauco.it>
10 * 11 *
11 * This program is free software; you can redistribute it and/or modify 12 * 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 13 * 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 14 * the Free Software Foundation; either version 2 of the License, or
14 * (at your option) any later version. 15 * (at your option) any later version.
… …
20 * 21 *
21 * You should have received a copy of the GNU General Public License 22 * You should have received a copy of the GNU General Public License
22 * along with this program; if not, write to the Free Software 23 * along with this program; if not, write to the Free Software
23 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 24 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
24 *----------------------------------------------------------------------*/ 25 *----------------------------------------------------------------------*/
25/*----------------------------------------------------------------------*
26 * get resources from ~/.Xdefaults or ~/.Xresources with the memory-saving
27 * default or with XGetDefault() (#define USE_XGETDEFAULT)
28 *----------------------------------------------------------------------*/
29 26
30#include "../config.h" /* NECESSARY */ 27#include "../config.h"
31#include "rxvt.h" /* NECESSARY */ 28#include "rxvt.h"
32#include "version.h" 29#include "version.h"
33 30
34#include <sys/utsname.h>
35
36#ifdef KEYSYM_RESOURCE 31#ifdef KEYSYM_RESOURCE
37#include "keyboard.h" 32# include "keyboard.h"
38#endif 33#endif
39 34
40/* #define DEBUG_RESOURCES */ 35/* place holders used for parsing command-line options */
36#define Optflag_Reverse 1
37#define Optflag_Boolean 2
38#define Optflag_Switch 4
39#define Optflag_Info 8
41 40
42/*{{{ monolithic option/resource structure: */ 41/* monolithic option/resource structure: */
43/* 42/*
44 * `string' options MUST have a usage argument 43 * `string' options MUST have a usage argument
45 * `switch' and `boolean' options have no argument 44 * `switch' and `boolean' options have no argument
46 * if there's no desc (ription), it won't appear in rxvt_usage () 45 * if there's no desc (ription), it won't appear in rxvt_usage ()
47 */ 46 */
48 47
49/* INFO () - descriptive information only */ 48/* INFO () - descriptive information only */
50#define INFO(opt, arg, desc) \ 49#define INFO(opt, arg, desc) \
51 {0, -1, NULL, (opt), (arg), (desc)} 50 {0, Optflag_Info, -1, NULL, (opt), (arg), (desc)}
51
52#define RINFO(kw, arg) \
53 {0, Optflag_Info, -1, (kw), NULL, (arg), NULL}
52 54
53/* STRG () - command-line option, with/without resource */ 55/* STRG () - command-line option, with/without resource */
54#define STRG(rsp, kw, opt, arg, desc) \ 56#define STRG(rsp, kw, opt, arg, desc) \
55 {0, (rsp), (kw), (opt), (arg), (desc)} 57 {0, 0, (rsp), (kw), (opt), (arg), (desc)}
56 58
57/* RSTRG () - resource/long-option */ 59/* RSTRG () - resource/long-option */
58#define RSTRG(rsp, kw, arg) \ 60#define RSTRG(rsp, kw, arg) \
59 {0, (rsp), (kw), NULL, (arg), NULL} 61 {0, 0, (rsp), (kw), NULL, (arg), NULL}
60 62
61/* BOOL () - regular boolean `-/+' flag */ 63/* BOOL () - regular boolean `-/+' flag */
62#define BOOL(rsp, kw, opt, flag, desc) \ 64#define BOOL(rsp, kw, opt, option, flag, desc) \
63 { (Opt_Boolean| (flag)), (rsp), (kw), (opt), NULL, (desc)} 65 { (option), (Optflag_Boolean | (flag)), (rsp), (kw), (opt), NULL, (desc)}
64 66
65/* SWCH () - `-' flag */ 67/* SWCH () - `-' flag */
66#define SWCH(opt, flag, desc) \ 68#define SWCH(opt, option, flag, desc) \
67 { (flag), -1, NULL, (opt), NULL, (desc)} 69 { (option), (Optflag_Switch | (flag)), -1, NULL, (opt), NULL, (desc)}
68 70
69/* convenient macros */ 71/* convenient macros */
70#define optList_strlen(i) \ 72#define optList_isString(i) \
71 (optList[i].flag ? 0 : (optList[i].arg ? strlen (optList[i].arg) : 1)) 73 (optList[i].flag == 0)
72#define optList_isBool(i) \ 74#define optList_isBool(i) \
73 (optList[i].flag & Opt_Boolean) 75 (optList[i].flag & Optflag_Boolean)
74#define optList_isReverse(i) \ 76#define optList_isReverse(i) \
75 (optList[i].flag & Opt_Reverse) 77 (optList[i].flag & Optflag_Reverse)
76#define optList_size \ 78#define optList_isInfo(i) \
77 (sizeof (optList) / sizeof (optList[0])) 79 (optList[i].flag & Optflag_Info)
78 80
79static const struct 81static const struct
80 { 82 {
83 const uint8_t index; /* Option index */
81 const unsigned long flag; /* Option flag */ 84 const uint8_t flag; /* Option flag */
82 const int doff; /* data offset */ 85 const int16_t doff; /* resource value index or -1 */
83 const char *kw; /* keyword */ 86 const char *kw; /* keyword */
84 const char *opt; /* option */ 87 const char *opt; /* option */
85 const char *arg; /* argument */ 88 const char *arg; /* argument */
86 const char *desc; /* description */ 89 const char *desc; /* description */
87 } 90 }
… …
89 STRG (Rs_display_name, NULL, "d", NULL, NULL), /* short form */ 92 STRG (Rs_display_name, NULL, "d", NULL, NULL), /* short form */
90 STRG (Rs_display_name, NULL, "display", "string", "X server to contact"), 93 STRG (Rs_display_name, NULL, "display", "string", "X server to contact"),
91 STRG (Rs_term_name, "termName", "tn", "string", "value of the TERM environment variable"), 94 STRG (Rs_term_name, "termName", "tn", "string", "value of the TERM environment variable"),
92 STRG (Rs_geometry, NULL, "g", NULL, NULL), /* short form */ 95 STRG (Rs_geometry, NULL, "g", NULL, NULL), /* short form */
93 STRG (Rs_geometry, "geometry", "geometry", "geometry", "size (in characters) and position"), 96 STRG (Rs_geometry, "geometry", "geometry", "geometry", "size (in characters) and position"),
94 SWCH ("C", Opt_console, "intercept console messages"), 97 SWCH ("C", Opt_console, 0, "intercept console messages"),
95 SWCH ("iconic", Opt_iconic, "start iconic"), 98 SWCH ("iconic", Opt_iconic, 0, "start iconic"),
96 SWCH ("ic", Opt_iconic, NULL), /* short form */ 99 SWCH ("ic", Opt_iconic, 0, NULL), /* short form */
100 STRG (Rs_chdir, "chdir", "cd", "string", "start shell in this directory"),
97 BOOL (Rs_reverseVideo, "reverseVideo", "rv", Opt_reverseVideo, "reverse video"), 101 BOOL (Rs_reverseVideo, "reverseVideo", "rv", Opt_reverseVideo, 0, "reverse video"),
98 BOOL (Rs_loginShell, "loginShell", "ls", Opt_loginShell, "login shell"), 102 BOOL (Rs_loginShell, "loginShell", "ls", Opt_loginShell, 0, "login shell"),
99 BOOL (Rs_jumpScroll, "jumpScroll", "j", Opt_jumpScroll, "jump scrolling"), 103 BOOL (Rs_jumpScroll, "jumpScroll", "j", Opt_jumpScroll, 0, "jump scrolling"),
104 BOOL (Rs_skipScroll, "skipScroll", "ss", Opt_skipScroll, 0, "skip scrolling"),
100 BOOL (Rs_pastableTabs, "pastableTabs", "ptab", Opt_pastableTabs, "tab characters are pastable"), 105 BOOL (Rs_pastableTabs, "pastableTabs", "ptab", Opt_pastableTabs, 0, "tab characters are pastable"),
101#if HAVE_SCROLLBARS
102 RSTRG (Rs_scrollstyle, "scrollstyle", "mode"), 106 RSTRG (Rs_scrollstyle, "scrollstyle", "mode"),
103 BOOL (Rs_scrollBar, "scrollBar", "sb", Opt_scrollBar, "scrollbar"), 107 BOOL (Rs_scrollBar, "scrollBar", "sb", Opt_scrollBar, 0, "scrollbar"),
104 BOOL (Rs_scrollBar_right, "scrollBar_right", "sr", Opt_scrollBar_right, "scrollbar right"), 108 BOOL (Rs_scrollBar_right, "scrollBar_right", "sr", Opt_scrollBar_right, 0, "scrollbar right"),
105 BOOL (Rs_scrollBar_floating, "scrollBar_floating", "st", Opt_scrollBar_floating, "scrollbar without a trough"), 109 BOOL (Rs_scrollBar_floating, "scrollBar_floating", "st", Opt_scrollBar_floating, 0, "scrollbar without a trough"),
106 RSTRG (Rs_scrollBar_align, "scrollBar_align", "mode"), 110 RSTRG (Rs_scrollBar_align, "scrollBar_align", "mode"),
107 STRG (Rs_scrollBar_thickness, "thickness", "sbt", "number", "scrollbar thickness/width in pixels"), 111 STRG (Rs_scrollBar_thickness, "thickness", "sbt", "number", "scrollbar thickness/width in pixels"),
108#endif
109 BOOL (Rs_scrollTtyOutput, "scrollTtyOutput", NULL, Opt_scrollTtyOutput, NULL), 112 BOOL (Rs_scrollTtyOutput, "scrollTtyOutput", NULL, Opt_scrollTtyOutput, 0, NULL),
110 BOOL (Rs_scrollTtyOutput, NULL, "si", Opt_Reverse | Opt_scrollTtyOutput, "scroll-on-tty-output inhibit"), 113 BOOL (Rs_scrollTtyOutput, NULL, "si", Opt_scrollTtyOutput, Optflag_Reverse, "scroll-on-tty-output inhibit"),
111 BOOL (Rs_scrollTtyKeypress, "scrollTtyKeypress", "sk", Opt_scrollTtyKeypress, "scroll-on-keypress"), 114 BOOL (Rs_scrollTtyKeypress, "scrollTtyKeypress", "sk", Opt_scrollTtyKeypress, 0, "scroll-on-keypress"),
112 BOOL (Rs_scrollWithBuffer, "scrollWithBuffer", "sw", Opt_scrollWithBuffer, "scroll-with-buffer"), 115 BOOL (Rs_scrollWithBuffer, "scrollWithBuffer", "sw", Opt_scrollWithBuffer, 0, "scroll-with-buffer"),
113#if TRANSPARENT 116#if ENABLE_TRANSPARENCY
114 BOOL (Rs_transparent, "inheritPixmap", "ip", Opt_transparent, "inherit parent pixmap"), 117 BOOL (Rs_transparent, "inheritPixmap", "ip", Opt_transparent, 0, "inherit parent pixmap"),
115 BOOL (Rs_transparent_all, "inheritPixmapforce", "ipf", Opt_transparent_all, "forcefully inherit root pixmap"), 118 BOOL (Rs_transparent, "transparent", "tr", Opt_transparent, 0, "inherit parent pixmap"),
116 SWCH ("tr", Opt_transparent, NULL),
117# if TINTING
118 STRG (Rs_color + Color_tint, "tintColor", "tint", "color", "tint color"), 119 STRG (Rs_color + Color_tint, "tintColor", "tint", "color", "tint color"),
120 STRG (Rs_shade, "shading", "sh", "number", "shade background by number %."),
121 STRG (Rs_blurradius, "blurRadius", "blr", "HxV", "gaussian blur radii to apply to the root background"),
122#endif
123#if OFF_FOCUS_FADING
124 STRG (Rs_fade, "fading", "fade", "number", "fade colors by number % when losing focus"),
125 STRG (Rs_color + Color_fade, "fadeColor", "fadecolor", "color", "target color for off-focus fading"),
126#endif
127 BOOL (Rs_utmpInhibit, "utmpInhibit", "ut", Opt_utmpInhibit, 0, "utmp inhibit"),
128#ifndef NO_BELL
129# if ENABLE_FRILLS
130 BOOL (Rs_urgentOnBell, "urgentOnBell", NULL, Opt_urgentOnBell, 0, NULL),
119# endif 131# endif
120#endif
121#if OFF_FOCUS_FADING
122 STRG (Rs_fade, "fading", "fade", "%", "fade colors x% percent when rxvt-unicode is losing focus"),
123 STRG (Rs_color + Color_fade, "fadeColor", "fadecolor", "color", "target color for off-focus fading"),
124#endif
125#if TINTING
126 STRG (Rs_shade, "shading", "sh", "%", "shade background by x% when tinting."),
127#endif
128 BOOL (Rs_utmpInhibit, "utmpInhibit", "ut", Opt_utmpInhibit, "utmp inhibit"),
129#ifndef NO_BELL
130 BOOL (Rs_visualBell, "visualBell", "vb", Opt_visualBell, "visual bell"), 132 BOOL (Rs_visualBell, "visualBell", "vb", Opt_visualBell, 0, "visual bell"),
131# if ! defined(NO_MAPALERT) && defined(MAPALERT_OPTION) 133# if ! defined(NO_MAPALERT) && defined(MAPALERT_OPTION)
132 BOOL (Rs_mapAlert, "mapAlert", NULL, Opt_mapAlert, NULL), 134 BOOL (Rs_mapAlert, "mapAlert", NULL, Opt_mapAlert, 0, NULL),
133# endif 135# endif
134#endif 136#endif
135#ifdef META8_OPTION 137#ifdef META8_OPTION
136 BOOL (Rs_meta8, "meta8", NULL, Opt_meta8, NULL), 138 BOOL (Rs_meta8, "meta8", NULL, Opt_meta8, 0, NULL),
137#endif 139#endif
138#ifdef MOUSE_WHEEL 140#ifdef MOUSE_WHEEL
139 BOOL (Rs_mouseWheelScrollPage, "mouseWheelScrollPage", NULL, Opt_mouseWheelScrollPage, NULL), 141 BOOL (Rs_mouseWheelScrollPage, "mouseWheelScrollPage", NULL, Opt_mouseWheelScrollPage, 0, NULL),
140#endif 142#endif
141#if ENABLE_FRILLS 143#if ENABLE_FRILLS
142 BOOL (Rs_tripleclickwords, "tripleclickwords", "tcw", Opt_tripleclickwords, "triple click word selection"), 144 BOOL (Rs_tripleclickwords, "tripleclickwords", "tcw", Opt_tripleclickwords, 0, "triple click word selection"),
143 BOOL (Rs_insecure, "insecure", "insecure", Opt_insecure, "enable possibly insecure escape sequences"), 145 BOOL (Rs_insecure, "insecure", "insecure", Opt_insecure, 0, "enable possibly insecure escape sequences"),
144 BOOL (Rs_cursorUnderline, "cursorUnderline", "uc", Opt_cursorUnderline, "underline cursor"), 146 BOOL (Rs_cursorUnderline, "cursorUnderline", "uc", Opt_cursorUnderline, 0, "underline cursor"),
145#endif 147#endif
146#if CURSOR_BLINK 148#if CURSOR_BLINK
147 BOOL (Rs_cursorBlink, "cursorBlink", "bc", Opt_cursorBlink, "blinking cursor"), 149 BOOL (Rs_cursorBlink, "cursorBlink", "bc", Opt_cursorBlink, 0, "blinking cursor"),
148#endif 150#endif
149#ifdef POINTER_BLANK 151#ifdef POINTER_BLANK
150 BOOL (Rs_pointerBlank, "pointerBlank", "pb", Opt_pointerBlank, "switch off pointer after delay"), 152 BOOL (Rs_pointerBlank, "pointerBlank", "pb", Opt_pointerBlank, 0, "switch off pointer after delay"),
151#endif 153#endif
152 STRG (Rs_color + Color_bg, "background", "bg", "color", "background color"), 154 STRG (Rs_color + Color_bg, "background", "bg", "color", "background color"),
153 STRG (Rs_color + Color_fg, "foreground", "fg", "color", "foreground color"), 155 STRG (Rs_color + Color_fg, "foreground", "fg", "color", "foreground color"),
154 RSTRG (Rs_color + minCOLOR + 0, "color0", "color"), 156 RSTRG (Rs_color + minCOLOR + 0, "color0", "color"),
155 RSTRG (Rs_color + minCOLOR + 1, "color1", "color"), 157 RSTRG (Rs_color + minCOLOR + 1, "color1", "color"),
… …
157 RSTRG (Rs_color + minCOLOR + 3, "color3", "color"), 159 RSTRG (Rs_color + minCOLOR + 3, "color3", "color"),
158 RSTRG (Rs_color + minCOLOR + 4, "color4", "color"), 160 RSTRG (Rs_color + minCOLOR + 4, "color4", "color"),
159 RSTRG (Rs_color + minCOLOR + 5, "color5", "color"), 161 RSTRG (Rs_color + minCOLOR + 5, "color5", "color"),
160 RSTRG (Rs_color + minCOLOR + 6, "color6", "color"), 162 RSTRG (Rs_color + minCOLOR + 6, "color6", "color"),
161 RSTRG (Rs_color + minCOLOR + 7, "color7", "color"), 163 RSTRG (Rs_color + minCOLOR + 7, "color7", "color"),
162#ifndef NO_BRIGHTCOLOR
163 RSTRG (Rs_color + minBrightCOLOR + 0, "color8", "color"), 164 RSTRG (Rs_color + minBrightCOLOR + 0, "color8", "color"),
164 RSTRG (Rs_color + minBrightCOLOR + 1, "color9", "color"), 165 RSTRG (Rs_color + minBrightCOLOR + 1, "color9", "color"),
165 RSTRG (Rs_color + minBrightCOLOR + 2, "color10", "color"), 166 RSTRG (Rs_color + minBrightCOLOR + 2, "color10", "color"),
166 RSTRG (Rs_color + minBrightCOLOR + 3, "color11", "color"), 167 RSTRG (Rs_color + minBrightCOLOR + 3, "color11", "color"),
167 RSTRG (Rs_color + minBrightCOLOR + 4, "color12", "color"), 168 RSTRG (Rs_color + minBrightCOLOR + 4, "color12", "color"),
168 RSTRG (Rs_color + minBrightCOLOR + 5, "color13", "color"), 169 RSTRG (Rs_color + minBrightCOLOR + 5, "color13", "color"),
169 RSTRG (Rs_color + minBrightCOLOR + 6, "color14", "color"), 170 RSTRG (Rs_color + minBrightCOLOR + 6, "color14", "color"),
170 RSTRG (Rs_color + minBrightCOLOR + 7, "color15", "color"), 171 RSTRG (Rs_color + minBrightCOLOR + 7, "color15", "color"),
171#endif /* NO_BRIGHTCOLOR */
172#ifndef NO_BOLD_UNDERLINE_REVERSE 172#ifndef NO_BOLD_UNDERLINE_REVERSE
173 RSTRG (Rs_color + Color_BD, "colorBD", "color"), 173 RSTRG (Rs_color + Color_BD, "colorBD", "color"),
174 RSTRG (Rs_color + Color_IT, "colorIT", "color"), 174 RSTRG (Rs_color + Color_IT, "colorIT", "color"),
175 RSTRG (Rs_color + Color_UL, "colorUL", "color"), 175 RSTRG (Rs_color + Color_UL, "colorUL", "color"),
176 RSTRG (Rs_color + Color_RV, "colorRV", "color"), 176 RSTRG (Rs_color + Color_RV, "colorRV", "color"),
177#endif /* ! NO_BOLD_UNDERLINE_REVERSE */ 177#endif /* ! NO_BOLD_UNDERLINE_REVERSE */
178#if ENABLE_FRILLS 178#if ENABLE_FRILLS
179 RSTRG (Rs_color + Color_underline, "underlineColor", "color"), 179 RSTRG (Rs_color + Color_underline, "underlineColor", "color"),
180#endif 180#endif
181#ifdef KEEP_SCROLLCOLOR
182 RSTRG (Rs_color + Color_scroll, "scrollColor", "color"), 181 RSTRG (Rs_color + Color_scroll, "scrollColor", "color"),
182#ifdef RXVT_SCROLLBAR
183 RSTRG (Rs_color + Color_trough, "troughColor", "color"), 183 RSTRG (Rs_color + Color_trough, "troughColor", "color"),
184#endif /* KEEP_SCROLLCOLOR */ 184#endif
185#ifdef OPTION_HC 185#ifdef OPTION_HC
186 STRG (Rs_color + Color_HC, "highlightColor", "hc", "color", "highlight color"), 186 STRG (Rs_color + Color_HC, "highlightColor", "hc", "color", "highlight color"),
187 RSTRG (Rs_color + Color_HTC, "highlightTextColor", "color"),
187#endif 188#endif
188#ifndef NO_CURSORCOLOR 189#ifndef NO_CURSORCOLOR
189 STRG (Rs_color + Color_cursor, "cursorColor", "cr", "color", "cursor color"), 190 STRG (Rs_color + Color_cursor, "cursorColor", "cr", "color", "cursor color"),
190 /* command-line option = resource name */ 191 /* command-line option = resource name */
191 RSTRG (Rs_color + Color_cursor2, "cursorColor2", "color"), 192 RSTRG (Rs_color + Color_cursor2, "cursorColor2", "color"),
192#endif /* NO_CURSORCOLOR */ 193#endif /* NO_CURSORCOLOR */
193 STRG (Rs_color + Color_pointer_fg, "pointerColor", "pr", "color", "pointer color"), 194 STRG (Rs_color + Color_pointer_fg, "pointerColor", "pr", "color", "pointer color"),
194 STRG (Rs_color + Color_pointer_bg, "pointerColor2", "pr2", "color", "pointer bg color"), 195 STRG (Rs_color + Color_pointer_bg, "pointerColor2", "pr2", "color", "pointer bg color"),
195 STRG (Rs_color + Color_border, "borderColor", "bd", "color", "border color"), 196 STRG (Rs_color + Color_border, "borderColor", "bd", "color", "border color"),
196#if defined (XPM_BACKGROUND) || (MENUBAR_MAX) 197#ifdef BG_IMAGE_FROM_FILE
197 RSTRG (Rs_path, "path", "search path"), 198 RSTRG (Rs_path, "path", "search path"),
198#endif /* defined (XPM_BACKGROUND) || (MENUBAR_MAX) */
199#ifdef XPM_BACKGROUND
200 STRG (Rs_backgroundPixmap, "backgroundPixmap", "pixmap", "file[;geom]", "background pixmap"), 199 STRG (Rs_backgroundPixmap, "backgroundPixmap", "pixmap", "file[;geom]", "background pixmap"),
201#endif /* XPM_BACKGROUND */ 200# if ENABLE_EWMH
202#if (MENUBAR_MAX) 201 STRG (Rs_iconfile, "iconFile", "icon", "file", "path to application icon image"),
203 RSTRG (Rs_menu, "menu", "name[;tag]"), 202# endif
204#endif 203#endif
205 /* fonts: command-line option = resource name */ 204 /* fonts: command-line option = resource name */
206 STRG (Rs_font, "font", "fn", "fontname", "normal text font"), 205 STRG (Rs_font, "font", "fn", "fontname", "normal text font"),
207#if ENABLE_STYLES 206#if ENABLE_STYLES
208 STRG (Rs_boldFont, "boldFont", "fb", "fontname", "bold font"), 207 STRG (Rs_boldFont, "boldFont", "fb", "fontname", "bold font"),
209 STRG (Rs_italicFont, "italicFont", "fi", "fontname", "italic font"), 208 STRG (Rs_italicFont, "italicFont", "fi", "fontname", "italic font"),
210 STRG (Rs_boldItalicFont, "boldItalicFont", "fbi", "fontname", "bold italic font"), 209 STRG (Rs_boldItalicFont, "boldItalicFont", "fbi", "fontname", "bold italic font"),
210 BOOL (Rs_intensityStyles, "intensityStyles", "is", Opt_intensityStyles, 0, "font styles imply intensity changes"),
211#endif 211#endif
212#ifdef USE_XIM 212#ifdef USE_XIM
213 STRG (Rs_inputMethod, "inputMethod", "im", "name", "name of input method"), 213 STRG (Rs_inputMethod, "inputMethod", "im", "name", "name of input method"),
214 STRG (Rs_preeditType, "preeditType", "pt", "style", "input style: style = OverTheSpot|OffTheSpot|Root"), 214 STRG (Rs_preeditType, "preeditType", "pt", "style", "input style: style = OverTheSpot|OffTheSpot|Root"),
215 STRG (Rs_imLocale, "imLocale", "imlocale", "string", "locale to use for input method"), 215 STRG (Rs_imLocale, "imLocale", "imlocale", "string", "locale to use for input method"),
216 STRG (Rs_imFont, "imFont", "imfont", "fontname", "fontset for styles OverTheSpot and OffTheSpot"), 216 STRG (Rs_imFont, "imFont", "imfont", "fontname", "fontset for styles OverTheSpot and OffTheSpot"),
217#endif /* USE_XIM */ 217#endif /* USE_XIM */
218 STRG (Rs_name, NULL, "name", "string", "client instance, icon, and title strings"), 218 STRG (Rs_name, NULL, "name", "string", "client instance, icon, and title strings"),
219 STRG (Rs_title, "title", "title", "string", "title name for window"), 219 STRG (Rs_title, "title", "title", "string", "title name for window"),
220 STRG (Rs_title, NULL, "T", NULL, NULL), /* short form */ 220 STRG (Rs_title, NULL, "T", NULL, NULL), /* short form */
221 STRG (Rs_iconName, "iconName", "n", "string", "icon name for window"), 221 STRG (Rs_iconName, "iconName", "n", "string", "icon name for window"),
222 STRG (Rs_saveLines, "saveLines", "sl", "number", "number of scrolled lines to save"), 222 STRG (Rs_saveLines, "saveLines", "sl", "number", "number of scrolled lines to save"),
223#if ENABLE_XEMBED 223#if ENABLE_XEMBED
224 STRG (Rs_embed, NULL, "embed", "windowid", "window id to embed terminal in"), 224 STRG (Rs_embed, NULL, "embed", "windowid", "window id to embed terminal in"),
225#endif 225#endif
226#if XFT
227 STRG (Rs_depth, "depth", "depth", "number", "depth of visual to request"),
228 BOOL (Rs_buffered, "buffered", NULL, Opt_buffered, 0, NULL),
229#endif
226#if ENABLE_FRILLS 230#if ENABLE_FRILLS
231 RSTRG (Rs_transient_for, "transient-for", "windowid"),
232 BOOL (Rs_override_redirect, "override-redirect", "override-redirect", Opt_override_redirect, 0, "set override-redirect on the terminal window"),
227 STRG (Rs_pty_fd, NULL, "pty-fd", "fileno", "file descriptor of pty to use"), 233 STRG (Rs_pty_fd, NULL, "pty-fd", "fileno", "file descriptor of pty to use"),
234 BOOL (Rs_hold, "hold", "hold", Opt_hold, 0, "retain window after shell exit"),
228 STRG (Rs_ext_bwidth, "externalBorder", "w", "number", "external border in pixels"), 235 STRG (Rs_ext_bwidth, "externalBorder", "w", "number", "external border in pixels"),
229 STRG (Rs_ext_bwidth, NULL, "bw", NULL, NULL), 236 STRG (Rs_ext_bwidth, NULL, "bw", NULL, NULL),
230 STRG (Rs_ext_bwidth, NULL, "borderwidth", NULL, NULL), 237 STRG (Rs_ext_bwidth, NULL, "borderwidth", NULL, NULL),
231 STRG (Rs_int_bwidth, "internalBorder", "b", "number", "internal border in pixels"), 238 STRG (Rs_int_bwidth, "internalBorder", "b", "number", "internal border in pixels"),
232 BOOL (Rs_borderLess, "borderLess", "bl", Opt_borderLess, "borderless window"), 239 BOOL (Rs_borderLess, "borderLess", "bl", Opt_borderLess, 0, "borderless window"),
233 STRG (Rs_lineSpace, "lineSpace", "lsp", "number", "number of extra pixels between rows"), 240 STRG (Rs_lineSpace, "lineSpace", "lsp", "number", "number of extra pixels between rows"),
241 STRG (Rs_letterSpace, "letterSpace", "letsp", "number", "letter spacing adjustment"),
242#endif
243#ifdef BUILTIN_GLYPHS
244 BOOL (Rs_skipBuiltinGlyphs, "skipBuiltinGlyphs", "sbg", Opt_skipBuiltinGlyphs, 0, "do not use internal glyphs"),
234#endif 245#endif
235#ifdef POINTER_BLANK 246#ifdef POINTER_BLANK
236 RSTRG (Rs_pointerBlankDelay, "pointerBlankDelay", "number"), 247 RSTRG (Rs_pointerBlankDelay, "pointerBlankDelay", "number"),
237#endif 248#endif
238#ifndef NO_BACKSPACE_KEY 249#ifndef NO_BACKSPACE_KEY
239 RSTRG (Rs_backspace_key, "backspacekey", "string"), 250 RSTRG (Rs_backspace_key, "backspacekey", "string"),
240#endif 251#endif
241#ifndef NO_DELETE_KEY 252#ifndef NO_DELETE_KEY
242 RSTRG (Rs_delete_key, "deletekey", "string"), 253 RSTRG (Rs_delete_key, "deletekey", "string"),
243#endif 254#endif
244 RSTRG (Rs_selectstyle, "selectstyle", "mode"),
245#ifdef PRINTPIPE 255#ifdef PRINTPIPE
246 RSTRG (Rs_print_pipe, "print-pipe", "string"), 256 RSTRG (Rs_print_pipe, "print-pipe", "string"),
247#endif 257#endif
248 STRG (Rs_modifier, "modifier", "mod", "modifier", "meta modifier = alt|meta|hyper|super|mod1|...|mod5"), 258 STRG (Rs_modifier, "modifier", "mod", "modifier", "meta modifier = alt|meta|hyper|super|mod1|...|mod5"),
249#ifdef CUTCHAR_RESOURCE
250 RSTRG (Rs_cutchars, "cutchars", "string"), 259 RSTRG (Rs_cutchars, "cutchars", "string"),
251#endif /* CUTCHAR_RESOURCE */
252 RSTRG (Rs_answerbackstring, "answerbackString", "string"), 260 RSTRG (Rs_answerbackstring, "answerbackString", "string"),
253#ifndef NO_SECONDARY_SCREEN 261#ifndef NO_SECONDARY_SCREEN
254 BOOL (Rs_secondaryScreen, "secondaryScreen", "ssc", Opt_secondaryScreen, "enable secondary screen"), 262 BOOL (Rs_secondaryScreen, "secondaryScreen", "ssc", Opt_secondaryScreen, 0, "enable secondary screen"),
255 BOOL (Rs_secondaryScroll, "secondaryScroll", "ssr", Opt_secondaryScroll, "enable secondary screen scroll"), 263 BOOL (Rs_secondaryScroll, "secondaryScroll", "ssr", Opt_secondaryScroll, 0, "enable secondary screen scroll"),
256#endif 264#endif
257#if 0 && TODO 265#if ENABLE_PERL
258#if !defined(NO_RESOURCES) && defined(USE_XGETDEFAULT) 266 RSTRG (Rs_perl_lib, "perl-lib", "string"), //, "colon-separated directories with extension scripts"),TODO
267 RSTRG (Rs_perl_eval, "perl-eval", "perl-eval"), // "string", "code to be evaluated after all extensions have been loaded"),TODO
268 RSTRG (Rs_perl_ext_1, "perl-ext-common", "string"), //, "colon-separated list of perl extensions to enable"),TODO
269 STRG (Rs_perl_ext_2, "perl-ext", "pe", "string", "colon-separated list of perl extensions to enable for this instance"),
270#endif
271#if ISO_14755
272 BOOL (Rs_iso14755, "iso14755", NULL, Opt_iso14755, 0, NULL),
273 BOOL (Rs_iso14755_52, "iso14755_52", NULL, Opt_iso14755_52, 0, NULL),
274#endif
275#ifndef NO_RESOURCES
259 INFO ("xrm", "string", "X resource"), 276 RINFO ("xrm", "string"),
260#endif 277#endif
278#ifdef KEYSYM_RESOURCE
279 RINFO ("keysym.sym", "keysym"),
261#endif 280#endif
262 INFO ("e", "command arg ...", "command to execute") 281 INFO ("e", "command arg ...", "command to execute")
263 }; 282 };
264 283
265#undef INFO 284#undef INFO
285#undef RINFO
266#undef STRG 286#undef STRG
267#undef RSTRG 287#undef RSTRG
268#undef SWCH 288#undef SWCH
269#undef BOOL 289#undef BOOL
270/*}}} */
271 290
272static const char releasestring[] = "rxvt-unicode (" RXVTNAME ") v" VERSION " - released: " DATE "\n"; 291static const char releasestring[] = "rxvt-unicode (" RXVTNAME ") v" VERSION " - released: " DATE "\n";
273static const char optionsstring[] = "options: " 292static const char optionsstring[] = "options: "
293#if ENABLE_PERL
294 "perl,"
295#endif
274#if XFT 296#if XFT
275 "xft," 297 "xft,"
276#endif 298#endif
277#if ENABLE_STYLES 299#if ENABLE_STYLES
278 "styles," 300 "styles,"
… …
307#endif 329#endif
308 "," 330 ","
309#if OFF_FOCUS_FADING 331#if OFF_FOCUS_FADING
310 "fade," 332 "fade,"
311#endif 333#endif
312#if defined(XPM_BACKGROUND)
313 "XPM,"
314#endif
315#if defined(TRANSPARENT) 334#if defined(ENABLE_TRANSPARENCY)
316 "transparent," 335 "transparent,"
317#endif
318#if TINTING
319 "tint," 336 "tint,"
320#endif 337#endif
321#if defined(UTMP_SUPPORT) 338#if HAVE_PIXBUF
322 "utmp," 339 "pixbuf,"
323#endif
324#if defined(MENUBAR)
325 "menubar,"
326#endif 340#endif
327#if defined(USE_XIM) 341#if defined(USE_XIM)
328 "XIM," 342 "XIM,"
329#endif 343#endif
330 "scrollbars="
331#if !defined(HAVE_SCROLLBARS)
332 "NONE"
333#else
334# if defined(PLAIN_SCROLLBAR)
335 "plain"
336# if defined(RXVT_SCROLLBAR) || defined(NEXT_SCROLLBAR) || defined(XTERM_SCROLLBAR)
337 "+"
338# endif
339# endif
340# if defined(RXVT_SCROLLBAR)
341 "rxvt"
342# if defined(NEXT_SCROLLBAR) || defined(XTERM_SCROLLBAR)
343 "+"
344# endif
345# endif
346# if defined(NEXT_SCROLLBAR)
347 "NeXT"
348# if defined(XTERM_SCROLLBAR)
349 "+"
350# endif
351# endif
352# if defined(XTERM_SCROLLBAR)
353 "xterm"
354# endif
355#endif
356 ","
357#if defined(NO_BACKSPACE_KEY) 344#if defined(NO_BACKSPACE_KEY)
358 "no_backspace," 345 "no_backspace,"
359#endif 346#endif
360#if defined(NO_DELETE_KEY) 347#if defined(NO_DELETE_KEY)
361 "no_delete," 348 "no_delete,"
362#endif 349#endif
363#if EIGHT_BIT_CONTROLS 350#if EIGHT_BIT_CONTROLS
364 "8bitctrls," 351 "8bitctrls,"
365#endif 352#endif
366#if !defined(NO_STRINGS)
367 "strings,"
368#endif
369#if defined(ENABLE_FRILLS) 353#if defined(ENABLE_FRILLS)
370 "frills," 354 "frills,"
371#endif 355#endif
372#if defined(PREFER_24BIT)
373 "24bit,"
374#endif
375#if defined(SELECTION_SCROLLING) 356#if defined(SELECTION_SCROLLING)
376 "selectionscrolling," 357 "selectionscrolling,"
377#endif 358#endif
378#if MOUSE_WHEEL 359#if MOUSE_WHEEL
379 "wheel," 360 "wheel,"
… …
389#endif 370#endif
390#if defined(POINTER_BLANK) 371#if defined(POINTER_BLANK)
391 "pointerBlank," 372 "pointerBlank,"
392#endif 373#endif
393#if defined(NO_RESOURCES) 374#if defined(NO_RESOURCES)
394 "NoResources" 375 "NoResources,"
395#else
396# if defined(USE_XGETDEFAULT)
397 "XGetDefaults"
398# else
399 ".Xdefaults"
400# endif 376#endif
377 "scrollbars=plain"
378#if defined(RXVT_SCROLLBAR)
379 "+rxvt"
380#endif
381#if defined(NEXT_SCROLLBAR)
382 "+NeXT"
383#endif
384#if defined(XTERM_SCROLLBAR)
385 "+xterm"
401#endif 386#endif
402 "\nUsage: "; /* Usage */ 387 "\nUsage: "; /* Usage */
403 388
404#define INDENT 18 389#define INDENT 18
390
391const char rxvt_term::resval_undef [] = "<undef>";
392const char rxvt_term::resval_on [] = "on";
393const char rxvt_term::resval_off [] = "off";
405 394
406/*{{{ usage: */ 395/*{{{ usage: */
407/*----------------------------------------------------------------------*/ 396/*----------------------------------------------------------------------*/
408static void 397static void
409rxvt_usage (int type) 398rxvt_usage (int type)
… …
415 switch (type) 404 switch (type)
416 { 405 {
417 case 0: /* brief listing */ 406 case 0: /* brief listing */
418 rxvt_log (" [-help] [--help]\n"); 407 rxvt_log (" [-help] [--help]\n");
419 408
420 for (col = 1, i = 0; i < optList_size; i++) 409 for (col = 1, i = 0; i < ecb_array_length (optList); i++)
421 if (optList[i].desc != NULL) 410 if (optList[i].desc != NULL)
422 { 411 {
423 int len = 0; 412 int len = 0;
424 413
425 if (!optList_isBool (i)) 414 if (optList[i].arg)
426 { 415 len = strlen (optList[i].arg) + 1;
427 len = optList_strlen (i);
428 if (len > 0)
429 len++; /* account for space */
430 }
431#ifdef DEBUG_STRICT
432 assert (optList[i].opt != NULL); 416 assert (optList[i].opt != NULL);
433#endif
434 len += 4 + strlen (optList[i].opt) + (optList_isBool (i) ? 2: 0); 417 len += 4 + strlen (optList[i].opt) + (optList_isBool (i) ? 2 : 0);
435 col += len; 418 col += len;
436 if (col > 79) 419 if (col > 79)
420 {
437 { /* assume regular width */ 421 /* assume regular width */
438 rxvt_log ("\n"); 422 rxvt_log ("\n");
439 col = 1 + len; 423 col = 1 + len;
440 } 424 }
441 425
442 rxvt_log (" [-%s%s", (optList_isBool (i) ? "/+" : ""), optList[i].opt); 426 rxvt_log (" [-%s%s", (optList_isBool (i) ? "/+" : ""), optList[i].opt);
443 if (optList_strlen (i)) 427 if (optList[i].arg)
444 rxvt_log (" %s]", optList[i].arg); 428 rxvt_log (" %s]", optList[i].arg);
445 else 429 else
446 rxvt_log ("]"); 430 rxvt_log ("]");
447 } 431 }
448 break; 432 break;
449 433
450 case 1: /* full command-line listing */ 434 case 1: /* full command-line listing */
451 rxvt_log (" [options] [-e command args]\n\nwhere options include:\n"); 435 rxvt_log (" [options] [-e command args]\n\nwhere options include:\n");
452 436
453 for (i = 0; i < optList_size; i++) 437 for (i = 0; i < ecb_array_length (optList); i++)
454 if (optList[i].desc != NULL) 438 if (optList[i].desc != NULL)
455 { 439 {
456#ifdef DEBUG_STRICT
457 assert (optList[i].opt != NULL); 440 assert (optList[i].opt != NULL);
458#endif
459 rxvt_log (" %s%s %-*s%s%s\n", 441 rxvt_log (" %s%s %-*s%s%s\n",
460 (optList_isBool (i) ? "-/+" : "-"), optList[i].opt, 442 (optList_isBool (i) ? "-/+" : "-"), optList[i].opt,
461 (INDENT - strlen (optList[i].opt) 443 (INDENT - strlen (optList[i].opt)
462 + (optList_isBool (i) ? 0 : 2)), 444 + (optList_isBool (i) ? 0 : 2)),
463 (optList[i].arg ? optList[i].arg : ""), 445 (optList[i].arg ? optList[i].arg : ""),
… …
469 451
470 case 2: /* full resource listing */ 452 case 2: /* full resource listing */
471 rxvt_log (" [options] [-e command args]\n\n" 453 rxvt_log (" [options] [-e command args]\n\n"
472 "where resources (long-options) include:\n"); 454 "where resources (long-options) include:\n");
473 455
474 for (i = 0; i < optList_size; i++) 456 for (i = 0; i < ecb_array_length (optList); i++)
475 if (optList[i].kw != NULL) 457 if (optList[i].kw != NULL)
476 rxvt_log (" %s: %*s%s\n", 458 rxvt_log (" %s: %*s%s\n",
477 optList[i].kw, 459 optList[i].kw,
478 (INDENT - strlen (optList[i].kw)), "", /* XXX */ 460 (INDENT - strlen (optList[i].kw)), "", /* XXX */
479 (optList_isBool (i) ? "boolean" : optList[i].arg)); 461 (optList_isBool (i) ? "boolean" : optList[i].arg));
480#ifdef KEYSYM_RESOURCE
481 rxvt_log (" " "keysym.sym" ": %*s%s\n",
482 (INDENT - sizeof ("keysym.sym") + 1), "", /* XXX */
483 "keysym");
484#endif
485 rxvt_log ("\n -help to list options"); 462 rxvt_log ("\n -help to list options");
486 break; 463 break;
487 } 464 }
488 465
489 rxvt_log ("\n\n"); 466 rxvt_log ("\n\n");
490 rxvt_exit_failure (); 467 rxvt_exit_failure ();
491 /* NOTREACHED */
492} 468}
493 469
494/*}}} */ 470/*}}} */
495 471
496/*{{{ get command-line options before getting resources */ 472/*{{{ get command-line options before getting resources */
497void 473const char **
498rxvt_term::get_options (int argc, const char *const *argv) 474rxvt_term::get_options (int argc, const char *const *argv)
499{ 475{
500 int i, bad_option = 0; 476 int i, bad_option = 0;
501 static const char On[3] = "ON", Off[4] = "OFF";
502 477
503 for (i = 1; i < argc; i++) 478 for (i = 1; i < argc; i++)
504 { 479 {
505 unsigned int entry, longopt = 0; 480 unsigned int entry, longopt = 0;
506 const char *flag, *opt; 481 const char *opt;
482 int flag;
507 483
508 opt = argv[i]; 484 opt = argv[i];
509#ifdef DEBUG_RESOURCES 485
510 fprintf (stderr, "argv[%d] = %s: ", i, opt);
511#endif
512 if (*opt == '-') 486 if (*opt == '-')
513 { 487 {
514 flag = On; 488 flag = 1;
489
515 if (*++opt == '-') 490 if (*++opt == '-')
516 longopt = *opt++; /* long option */ 491 longopt = *opt++; /* long option */
517 } 492 }
518 else if (*opt == '+') 493 else if (*opt == '+')
519 { 494 {
520 flag = Off; 495 flag = 0;
496
521 if (*++opt == '+') 497 if (*++opt == '+')
522 longopt = *opt++; /* long option */ 498 longopt = *opt++; /* long option */
523 } 499 }
524 else 500 else
525 { 501 {
… …
528 continue; 504 continue;
529 } 505 }
530 506
531 if (!strcmp (opt, "help")) 507 if (!strcmp (opt, "help"))
532 rxvt_usage (longopt ? 2 : 1); 508 rxvt_usage (longopt ? 2 : 1);
509
533 if (!strcmp (opt, "h")) 510 if (!strcmp (opt, "h"))
534 rxvt_usage (0); 511 rxvt_usage (0);
535 512
536 /* feature: always try to match long-options */ 513 /* feature: always try to match long-options */
537 for (entry = 0; entry < optList_size; entry++) 514 for (entry = 0; entry < ecb_array_length (optList); entry++)
538 if ((optList[entry].kw && !strcmp (opt, optList[entry].kw)) 515 if ((optList[entry].kw && !strcmp (opt, optList[entry].kw))
539 || (!longopt 516 || (!longopt
540 && optList[entry].opt && !strcmp (opt, optList[entry].opt))) 517 && optList[entry].opt && !strcmp (opt, optList[entry].opt)))
541 break; 518 break;
542 519
543 if (entry < optList_size) 520 if (entry < ecb_array_length (optList)
521 && !optList_isInfo (entry))
544 { 522 {
545 if (optList_isReverse (entry)) 523 if (optList_isReverse (entry))
546 flag = flag == On ? Off : On; 524 flag = !flag;
547 525
548 if (optList_strlen (entry)) 526 if (optList_isString (entry))
549 { 527 {
550 /* 528 /*
551 * special cases are handled in main.c:main () to allow 529 * special cases are handled in init_resources () to allow
552 * X resources to set these values before we settle for 530 * X resources to set these values before we settle for
553 * default values 531 * default values
554 */ 532 */
555 533
556 if (optList[entry].doff != -1) 534 if (optList[entry].doff != -1)
535 {
536 if (flag && i+1 == argc)
537 rxvt_fatal ("option '%s' requires an argument, aborting.\n", argv [i]);
538
557 rs[optList[entry].doff] = flag == On && argv[i+1] 539 rs[optList[entry].doff] = flag ? argv[++i] : resval_undef;
558 ? argv[++i] : 0; 540 }
559 } 541 }
560 else 542 else
543 {
561 { /* boolean value */ 544 /* boolean value */
562#ifdef DEBUG_RESOURCES
563 fprintf (stderr, "boolean (%s,%s) = %s\n",
564 optList[entry].opt, optList[entry].kw, flag);
565#endif
566 if (flag == On)
567 options |= optList[entry].flag; 545 set_option (optList[entry].index, flag);
568 else
569 options &= ~optList[entry].flag;
570 546
571 if (optList[entry].doff != -1) 547 if (optList[entry].doff != -1)
572 rs[optList[entry].doff] = flag; 548 rs[optList[entry].doff] = flag ? resval_on : resval_off;
573 } 549 }
574 } 550 }
551#ifndef NO_RESOURCES
552 else if (!strcmp (opt, "xrm"))
553 {
554 if (i+1 < argc)
555 XrmPutLineResource (&option_db, argv[++i]);
556 }
557#endif
558#ifdef KEYSYM_RESOURCE
559 else if (!strncmp (opt, "keysym.", sizeof ("keysym.") - 1))
560 {
561 if (i+1 < argc)
562 {
563 char *res = rxvt_temp_buf<char> (strlen (opt) + strlen (argv[++i]) + 6);
564 sprintf (res, "*.%s: %s\n", opt, argv[i]);
565 XrmPutLineResource (&option_db, res);
566 }
567 }
568#endif
569 else if (!strcmp (opt, "e"))
570 {
571 if (i+1 == argc)
572 rxvt_fatal ("option '-e' requires an argument, aborting.\n");
573
574 return (const char **)argv + i + 1;
575 }
575 else 576 else
576#ifdef KEYSYM_RESOURCE
577 /* if (!strncmp (opt, "keysym.", sizeof ("keysym.") - 1)) */
578 if (rxvt_Str_match (opt, "keysym."))
579 { 577 {
580 const char *str = argv[++i];
581
582 if (str != NULL)
583 parse_keysym (opt + sizeof ("keysym.") - 1, str);
584 }
585 else
586#endif
587 {
588 bad_option = 1; 578 bad_option = 1;
589 rxvt_warn ("\"%s\": unknown or malformed option.\n", opt); 579 rxvt_warn ("\"%s\": unknown or malformed option.\n", opt);
590 } 580 }
591 } 581 }
592 582
593 if (bad_option) 583 if (bad_option)
594 rxvt_usage (0); 584 rxvt_usage (0);
585
586 return 0;
595} 587}
596 588
597/*}}} */ 589/*}}} */
598 590
599#ifndef NO_RESOURCES 591#ifndef NO_RESOURCES
… …
604 * Define key from XrmEnumerateDatabase. 596 * Define key from XrmEnumerateDatabase.
605 * quarks will be something like 597 * quarks will be something like
606 * "rxvt" "keysym" "0xFF01" 598 * "rxvt" "keysym" "0xFF01"
607 * value will be a string 599 * value will be a string
608 */ 600 */
609/* ARGSUSED */ 601static int
610int
611rxvt_define_key (XrmDatabase *database __attribute__((unused)), 602rxvt_define_key (XrmDatabase *database ecb_unused,
612 XrmBindingList bindings __attribute__((unused)), 603 XrmBindingList bindings ecb_unused,
613 XrmQuarkList quarks, 604 XrmQuarkList quarks,
614 XrmRepresentation *type __attribute__((unused)), 605 XrmRepresentation *type ecb_unused,
615 XrmValue *value, 606 XrmValue *value,
616 XPointer closure __attribute__((unused))) 607 XPointer closure ecb_unused)
617{ 608{
618 int last; 609 int last;
619 610
620 for (last = 0; quarks[last] != NULLQUARK; last++) /* look for last quark in list */ 611 for (last = 0; quarks[last] != NULLQUARK; last++) /* look for last quark in list */
621 ; 612 ;
… …
626} 617}
627 618
628/* 619/*
629 * look for something like this (XK_Delete) 620 * look for something like this (XK_Delete)
630 * rxvt*keysym.0xFFFF: "\177" 621 * rxvt*keysym.0xFFFF: "\177"
631 *
632 * arg will be
633 * NULL for ~/.Xdefaults and
634 * non-NULL for command-line options (need to allocate)
635 */ 622 */
636#define NEWARGLIM 500 /* `reasonable' size */
637 623
638struct keysym_vocabulary_t 624struct keysym_vocabulary_t
639{ 625{
640 const char *name; 626 const char *name;
641 unsigned short len; 627 unsigned short len;
642 unsigned short value; 628 unsigned short value;
643}; 629};
644keysym_vocabulary_t keysym_vocabulary[] = 630static const keysym_vocabulary_t keysym_vocabulary[] =
645{ 631{
646 { "ISOLevel3", 9, Level3Mask }, 632 { "ISOLevel3", 9, Level3Mask },
647 { "AppKeypad", 9, AppKeypadMask }, 633 { "AppKeypad", 9, AppKeypadMask },
648 { "Control", 7, ControlMask }, 634 { "Control", 7, ControlMask },
649 { "NumLock", 7, NumLockMask }, 635 { "NumLock", 7, NumLockMask },
… …
671}; 657};
672 658
673int 659int
674rxvt_term::parse_keysym (const char *str, const char *arg) 660rxvt_term::parse_keysym (const char *str, const char *arg)
675{ 661{
676 int n, sym; 662 int sym;
677 unsigned int state = 0; 663 unsigned int state = 0;
678 const char *pmodend = NULL; 664 const char *key = strrchr (str, '-');
679 char *newarg = NULL;
680 char newargstr[NEWARGLIM];
681 665
682 if (arg == NULL) 666 if (!key)
683 { 667 key = str;
684 if ((n = rxvt_Str_match (str, "keysym.")) == 0)
685 return 0;
686
687 str += n; /* skip `keysym.' */
688 if ((pmodend = strchr (str, ':')) < str)
689 return -1;
690 }
691 else 668 else
692 pmodend = str + strlen(str); 669 key++;
693 670
694 for (--pmodend; str < pmodend; --pmodend) 671 // string or key is empty
695 if (*pmodend == '-') 672 if (*arg == '\0' || *key == '\0')
696 break; 673 return -1;
697 674
675 // parse modifiers
698 while (str < pmodend) 676 while (str < key)
699 { 677 {
700 unsigned int i; 678 unsigned int i;
701 679
702 for (i=0; i < sizeof (keysym_vocabulary) / sizeof (keysym_vocabulary_t); ++i) 680 for (i = 0; i < ecb_array_length (keysym_vocabulary); ++i)
703 { 681 {
704 if (strncmp (str, keysym_vocabulary [i].name, keysym_vocabulary [i].len) == 0) 682 if (strncmp (str, keysym_vocabulary [i].name, keysym_vocabulary [i].len) == 0)
705 { 683 {
706 state |= keysym_vocabulary[i].value; 684 state |= keysym_vocabulary[i].value;
707 str += keysym_vocabulary[i].len; 685 str += keysym_vocabulary[i].len;
708 break; 686 break;
709 } 687 }
710 } 688 }
711 689
712 if (i >= sizeof (keysym_vocabulary) / sizeof (keysym_vocabulary_t)) 690 if (i >= ecb_array_length (keysym_vocabulary))
713 return -1; 691 return -1;
714 692
715 if (*str == '-') 693 if (*str == '-')
716 ++str; 694 ++str;
717 } 695 }
718 696
719 /* some scanf () have trouble with a 0x prefix */ 697 // convert keysym name to keysym number
720 if (str[0] == '0' && toupper (str[1]) == 'X') 698 if ((sym = XStringToKeysym (str)) == None)
721 { 699 {
722 str += 2; 700 // fallback on hexadecimal parsing
723 701 char *end;
702 sym = strtol (str, &end, 16);
724 if (arg) 703 if (*end)
725 {
726 if (sscanf (str, (strchr (str, ':') ? "%x:" : "%x"), &sym) != 1)
727 return -1;
728 }
729 else
730 {
731 if (sscanf (str, "%x:", &sym) != 1)
732 return -1;
733
734 /* cue to ':', it's there since sscanf () worked */
735 strncpy (newargstr, strchr (str, ':') + 1, NEWARGLIM - 1);
736 newargstr[NEWARGLIM - 1] = '\0';
737 newarg = newargstr;
738 }
739 }
740 else
741 {
742 /*
743 * convert keysym name to keysym number
744 */
745 strncpy (newargstr, str, NEWARGLIM - 1);
746 newargstr[NEWARGLIM - 1] = '\0';
747
748 if (arg == NULL)
749 {
750 if ((newarg = strchr (newargstr, ':')) == NULL)
751 return -1;
752
753 *newarg++ = '\0'; /* terminate keysym name */
754 }
755
756 if ((sym = XStringToKeysym (newargstr)) == None)
757 return -1; 704 return -1;
758 } 705 }
759 706
760 if (newarg == NULL) 707 wchar_t *ws = rxvt_mbstowcs (arg);
761 { 708 if (!HOOK_INVOKE ((this, HOOK_REGISTER_COMMAND, DT_INT, sym, DT_INT, state, DT_WCS_LEN, ws, wcslen (ws), DT_END)))
762 strncpy (newargstr, arg, NEWARGLIM - 1);
763 newargstr[NEWARGLIM - 1] = '\0';
764 newarg = newargstr;
765 }
766
767 rxvt_Str_trim (newarg);
768 if (*newarg == '\0' || (n = rxvt_Str_escaped (newarg)) == 0)
769 return -1;
770
771 keyboard->register_user_translation (sym, state, newarg); 709 keyboard->register_user_translation (sym, state, ws);
710 free (ws);
772 return 1; 711 return 1;
773} 712}
774 713
775# endif /* KEYSYM_RESOURCE */ 714# endif /* KEYSYM_RESOURCE */
715#endif /* NO_RESOURCES */
776 716
777# ifndef USE_XGETDEFAULT 717static char *
778/*{{{ rxvt_get_xdefaults () */ 718get_res (XrmDatabase database, const char *program, const char *option)
779/*
780 * the matching algorithm used for memory-save fake resources
781 */
782void
783rxvt_term::get_xdefaults (FILE *stream, const char *name)
784{ 719{
785 unsigned int len; 720 char resource[512];
786 char *str, buffer[256]; 721 char *type;
722 XrmValue result;
787 723
788 if (stream == NULL) 724 snprintf (resource, sizeof (resource), "%s.%s", program, option);
789 return; 725 XrmGetResource (database, resource, resource, &type, &result);
790 726
791 len = strlen (name); 727 return result.addr;
792 while ((str = fgets (buffer, sizeof (buffer), stream)) != NULL) 728}
729
730const char *
731rxvt_term::x_resource (const char *name)
732{
733 XrmDatabase database = XrmGetDatabase (dpy);
734
735 const char *p = get_res (database, rs[Rs_name], name);
736 const char *p0 = get_res (database, "!INVALIDPROGRAMMENAMEDONTMATCH!", name);
737
738 if (p == NULL || (p0 && strcmp (p, p0) == 0))
793 { 739 {
794 unsigned int entry, n; 740 p = get_res (database, RESCLASS, name);
795 741#ifdef RESFALLBACK
796 while (*str && isspace (*str)) 742 if (p == NULL || (p0 && strcmp (p, p0) == 0))
797 str++; /* leading whitespace */ 743 p = get_res (database, RESFALLBACK, name);
798 744#endif
799 if ((str[len] != '*' && str[len] != '.')
800 || (len && strncmp (str, name, len)))
801 continue;
802 str += (len + 1); /* skip `name*' or `name.' */
803
804# ifdef KEYSYM_RESOURCE
805 if (!parse_keysym (str, NULL))
806# endif /* KEYSYM_RESOURCE */
807 for (entry = 0; entry < optList_size; entry++)
808 {
809 const char *kw = optList[entry].kw;
810
811 if (kw == NULL)
812 continue;
813
814 n = strlen (kw);
815 if (str[n] == ':' && rxvt_Str_match (str, kw))
816 {
817 /* skip `keyword:' */
818 str += n + 1;
819 rxvt_Str_trim (str);
820 n = strlen (str);
821
822 if (n && rs[optList[entry].doff] == NULL)
823 {
824 /* not already set */
825 int s;
826 char *p = 0;
827
828 for (int o = 0;;)
829 {
830 p = (char *)rxvt_realloc (p, o + n + 1);
831 memcpy (p + o, str, n);
832 o += n;
833 p[o] = 0;
834
835 if (o == 0 || p[o - 1] != '\\') // continuation line
836 break;
837
838 o--; // eat "\"
839
840 if ((str = fgets (buffer, sizeof (buffer), stream)) == NULL)
841 break;
842
843 rxvt_Str_trim (str);
844 n = strlen (str);
845 }
846
847 rs[optList[entry].doff] = p;
848 allocated.push_back (p);
849
850 if (optList_isBool (entry))
851 {
852 s = strcasecmp (str, "true") == 0
853 || strcasecmp (str, "yes") == 0
854 || strcasecmp (str, "on") == 0
855 || strcmp (str, "1") == 0;
856
857 if (optList_isReverse (entry))
858 s = !s;
859
860 if (s)
861 options |= optList[entry].flag;
862 else
863 options &= ~optList[entry].flag;
864 }
865 }
866
867 break;
868 }
869 }
870 } 745 }
871 746
872 rewind (stream); 747 if (p == NULL && p0)
748 p = p0;
749
750 return p;
873} 751}
874 752
875/*}}} */
876# endif /* ! USE_XGETDEFAULT */
877#endif /* NO_RESOURCES */
878
879/*{{{ read the resources files */
880/*
881 * using XGetDefault () or the hand-rolled replacement
882 */
883/* ARGSUSED */
884void 753void
885rxvt_term::extract_resources () 754rxvt_term::extract_resources ()
886{ 755{
887 dDisp;
888
889#ifndef NO_RESOURCES 756#ifndef NO_RESOURCES
890 757 XrmDatabase database = XrmGetDatabase (dpy);
891 char *homedir = (char *)getenv ("HOME");
892 char fname[1024];
893
894# if defined XAPPLOADDIR
895# if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
896 /* Compute the path of the possibly available localized Rxvt file */
897 char localepath[1024];
898
899 if (locale)
900 snprintf (localepath, sizeof (localepath), XAPPLOADDIRLOCALE "/" RESCLASS, locale);
901 else
902 localepath[0] = 0;
903# endif
904# endif
905
906# ifdef USE_XGETDEFAULT
907 /*
908 * get resources using the X library function
909 */
910 int entry;
911
912# ifdef XrmEnumOneLevel
913 int i;
914 char *displayResource, *xe;
915 XrmName name_prefix[3];
916 XrmClass class_prefix[3];
917 XrmDatabase database, rdb1;
918
919 XrmInitialize ();
920 database = NULL;
921
922 // for ordering, see for example http://www.faqs.org/faqs/Xt-FAQ/ Subject: 20
923
924 // 6. System wide per application default file.
925 /* Add in Rxvt file */
926# if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
927 if (*localepath
928 && ((rdb1 = XrmGetFileDatabase (localepath))
929 || (rdb1 = XrmGetFileDatabase (XAPPLOADDIR "/" RESCLASS))))
930# endif
931 XrmMergeDatabases (rdb1, &database); 758 XrmMergeDatabases (option_db, &database);
932 759 option_db = NULL;
933 /* Add in $XAPPLRESDIR/Rxvt only; not bothering with XUSERFILESEARCHPATH */
934 if ((xe = (char *)getenv ("XAPPLRESDIR")))
935 {
936 snprintf (fname, sizeof (fname), "%s/%s", xe, RESCLASS);
937
938 if ((rdb1 = XrmGetFileDatabase (fname)))
939 XrmMergeDatabases (rdb1, &database);
940 }
941
942 // 5. User's per application default file.
943 // none
944
945 // 4. User's defaults file.
946 /* Get any Xserver defaults */
947 displayResource = XResourceManagerString (disp);
948 if (displayResource != NULL)
949 {
950 if ((rdb1 = XrmGetStringDatabase (displayResource)))
951 XrmMergeDatabases (rdb1, &database);
952 }
953 else if (homedir)
954 {
955 snprintf (fname, sizeof (fname), "%s/.Xdefaults", homedir);
956
957 if ((rdb1 = XrmGetFileDatabase (fname)))
958 XrmMergeDatabases (rdb1, &database);
959 }
960
961 /* Get screen specific resources */
962 displayResource = XScreenResourceString (ScreenOfDisplay (disp, display->screen));
963 if (displayResource != NULL)
964 {
965 if ((rdb1 = XrmGetStringDatabase (displayResource)))
966 /* Merge with screen-independent resources */
967 XrmMergeDatabases (rdb1, &database);
968
969 XFree (displayResource);
970 }
971
972 // 3. User's per host defaults file
973 /* Add in XENVIRONMENT file */
974 if ((xe = (char *)getenv ("XENVIRONMENT"))
975 && (rdb1 = XrmGetFileDatabase (xe)))
976 XrmMergeDatabases (rdb1, &database);
977 else if (homedir)
978 {
979 struct utsname un;
980
981 if (!uname (&un))
982 {
983 snprintf (fname, sizeof (fname), "%s/.Xdefaults-%s", homedir, un.nodename);
984
985 if ((rdb1 = XrmGetFileDatabase (fname)))
986 XrmMergeDatabases (rdb1, &database);
987 }
988 }
989
990 XrmSetDatabase (disp, database);
991# endif
992
993 /* 760 /*
994 * Query resources for options that affect us 761 * Query resources for options that affect us
995 */ 762 */
996 for (entry = 0; entry < optList_size; entry++) 763 for (int entry = 0; entry < ecb_array_length (optList); entry++)
997 { 764 {
998 int s;
999 char *p, *p0;
1000 const char *kw = optList[entry].kw; 765 const char *kw = optList[entry].kw;
1001 766
1002 if (kw == NULL || rs[optList[entry].doff] != NULL) 767 if (kw == NULL || rs[optList[entry].doff] != NULL)
1003 continue; /* previously set */ 768 continue; // previously set
1004 769
1005 p = XGetDefault (disp, rs[Rs_name], kw); 770 const char *p = x_resource (kw);
1006 p0 = XGetDefault (disp, "!INVALIDPROGRAMMENAMEDONTMATCH!", kw);
1007 if (p == NULL || (p0 && strcmp (p, p0) == 0))
1008 {
1009 p = XGetDefault (disp, RESCLASS, kw);
1010#ifdef RESFALLBACK
1011 if (p == NULL || (p0 && strcmp (p, p0) == 0))
1012 p = XGetDefault (disp, RESFALLBACK, kw);
1013#endif
1014 }
1015
1016 if (p == NULL && p0)
1017 p = p0;
1018 771
1019 if (p) 772 if (p)
1020 { 773 {
774 p = strdup (p);
775 allocated.push_back ((void *)p);
1021 rs[optList[entry].doff] = p; 776 rs[optList[entry].doff] = p;
1022 777
1023 if (optList_isBool (entry)) 778 if (optList_isBool (entry))
1024 { 779 {
1025 s = strcasecmp (p, "TRUE") == 0 780 bool s = parse_bool_resource (p);
1026 || strcasecmp (p, "YES") == 0
1027 || strcasecmp (p, "ON") == 0
1028 || strcasecmp (p, "1") == 0;
1029 781
1030 if (optList_isReverse (entry)) 782 if (optList_isReverse (entry))
1031 s = !s; 783 s = !s;
1032 784
1033 if (s) 785 set_option (optList[entry].index, s);
1034 options |= optList[entry].flag;
1035 else
1036 options &= ~optList[entry].flag;
1037 } 786 }
1038 } 787 }
1039 } 788 }
789#endif /* NO_RESOURCES */
790}
1040 791
792void
793rxvt_term::extract_keysym_resources ()
794{
795#if !defined NO_RESOURCES && defined KEYSYM_RESOURCE
796 find_resources ("keysym", "Keysym", XrmEnumOneLevel, rxvt_define_key);
797#endif
798}
799
800#if !defined NO_RESOURCES && defined KEYSYM_RESOURCE
801void
802rxvt_term::find_resources (const char *n_prefix, const char *c_prefix, int mode,
803 Bool (*proc)(XrmDatabase *, XrmBindingList, XrmQuarkList, XrmRepresentation *, XrmValue *, XPointer))
804{
1041 /* 805 /*
1042 * [R5 or later]: enumerate the resource database 806 * [R5 or later]: enumerate the resource database
1043 */ 807 */
1044# ifdef KEYSYM_RESOURCE 808 XrmDatabase database = XrmGetDatabase (dpy);
809 XrmName name_prefix[3];
810 XrmClass class_prefix[3];
811
1045 name_prefix[0] = XrmStringToName (rs[Rs_name]); 812 name_prefix[0] = XrmStringToName (rs[Rs_name]);
1046 name_prefix[1] = XrmStringToName ("keysym"); 813 name_prefix[1] = XrmStringToName (n_prefix);
1047 name_prefix[2] = NULLQUARK; 814 name_prefix[2] = NULLQUARK;
1048 class_prefix[0] = XrmStringToName (RESCLASS); 815 class_prefix[0] = XrmStringToName (RESCLASS);
1049 class_prefix[1] = XrmStringToName ("Keysym"); 816 class_prefix[1] = XrmStringToName (c_prefix);
1050 class_prefix[2] = NULLQUARK; 817 class_prefix[2] = NULLQUARK;
1051 /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */ 818 /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */
1052 XrmEnumerateDatabase (XrmGetDatabase (disp), name_prefix, class_prefix, 819 XrmEnumerateDatabase (database, name_prefix, class_prefix,
1053 XrmEnumOneLevel, rxvt_define_key, NULL); 820 mode, proc, NULL);
1054# ifdef RESFALLBACK 821# ifdef RESFALLBACK
1055 name_prefix[0] = XrmStringToName (RESFALLBACK);
1056 name_prefix[1] = XrmStringToName ("keysym");
1057 class_prefix[0] = XrmStringToName (RESFALLBACK); 822 name_prefix[0] = class_prefix[0] = XrmStringToName (RESFALLBACK);
1058 class_prefix[1] = XrmStringToName ("Keysym");
1059 /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */ 823 /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */
1060 XrmEnumerateDatabase (XrmGetDatabase (disp), name_prefix, class_prefix, 824 XrmEnumerateDatabase (database, name_prefix, class_prefix,
1061 XrmEnumOneLevel, rxvt_define_key, NULL); 825 mode, proc, NULL);
1062# endif 826# endif
1063# endif
1064
1065# else /* USE_XGETDEFAULT */
1066 /* get resources the hard way, but save lots of memory */
1067 FILE *fd = NULL;
1068
1069 if (homedir)
1070 {
1071 static const char *const xnames[2] = { ".Xdefaults", ".Xresources" };
1072
1073 for (int i = 0; i < (sizeof (xnames) / sizeof (xnames [0])); i++)
1074 {
1075 snprintf (fname, sizeof (fname), "%s/%s", homedir, xnames [i]);
1076
1077 if ((fd = fopen (fname, "r")) != NULL)
1078 break;
1079 }
1080 }
1081 /*
1082 * The normal order to match resources is the following:
1083 * @ global resources (partial match, ~/.Xdefaults)
1084 * @ application file resources (XAPPLOADDIR/Rxvt)
1085 * @ class resources (~/.Xdefaults)
1086 * @ private resources (~/.Xdefaults)
1087 *
1088 * However, for the hand-rolled resources, the matching algorithm
1089 * checks if a resource string value has already been allocated
1090 * and won't overwrite it with (in this case) a less specific
1091 * resource value.
1092 *
1093 * This avoids multiple allocation. Also, when we've called this
1094 * routine command-line string options have already been applied so we
1095 * needn't to allocate for those resources.
1096 *
1097 * So, search in resources from most to least specific.
1098 *
1099 * Also, use a special sub-class so that we can use either or both of
1100 * "XTerm" and "Rxvt" as class names.
1101 */
1102
1103 get_xdefaults (fd, rs[Rs_name]);
1104 get_xdefaults (fd, RESCLASS);
1105# ifdef RESFALLBACK
1106 get_xdefaults (fd, RESFALLBACK);
1107# endif
1108
1109# if defined(XAPPLOADDIR) && defined(USE_XAPPLOADDIR)
1110 {
1111 FILE *ad = NULL;
1112
1113# if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1114 if (!*localepath || (ad = fopen (localepath, "r")) == NULL)
1115# endif
1116 ad = fopen (XAPPLOADDIR "/" RESCLASS, "r");
1117 if (ad != NULL)
1118 {
1119 get_xdefaults (ad, RESCLASS);
1120 get_xdefaults (ad, "");
1121 fclose (ad);
1122 }
1123 }
1124# endif /* XAPPLOADDIR */
1125
1126 get_xdefaults (fd, ""); /* partial match */
1127 if (fd != NULL)
1128 fclose (fd);
1129# endif /* USE_XGETDEFAULT */
1130
1131#endif /* NO_RESOURCES */
1132} 827}
828#endif
1133 829
1134/*}}} */
1135/*----------------------- end-of-file (C source) -----------------------*/ 830/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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