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

Diff Legend

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