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

Diff Legend

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