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

Diff Legend

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