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

Diff Legend

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