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.12 by pcg, Sun Feb 22 08:09:38 2004 UTC vs.
Revision 1.167 by root, Tue Jun 5 22:23:07 2012 UTC

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

Diff Legend

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