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.15 by pcg, Wed Mar 3 04:07:52 2004 UTC vs.
Revision 1.171 by sf-exg, Fri Jun 15 14:34:34 2012 UTC

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

Diff Legend

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