ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/rxvt.h
(Generate patch)

Comparing rxvt-unicode/src/rxvt.h (file contents):
Revision 1.485 by sf-exg, Fri May 25 09:27:35 2012 UTC vs.
Revision 1.513 by sf-exg, Sat Dec 29 18:12:53 2012 UTC

… …
45 45
46#include "feature.h" 46#include "feature.h"
47 47
48#if defined (ISO_14755) || defined (ENABLE_PERL) 48#if defined (ISO_14755) || defined (ENABLE_PERL)
49# define ENABLE_OVERLAY 1 49# define ENABLE_OVERLAY 1
50# undef NO_RESOURCES
50#endif 51#endif
51 52
52#if ENABLE_PERL 53#if ENABLE_PERL
53# define ENABLE_FRILLS 1 54# define ENABLE_FRILLS 1
54# define ENABLE_COMBINING 1 55# define ENABLE_COMBINING 1
… …
70#include <X11/cursorfont.h> 71#include <X11/cursorfont.h>
71#include <X11/keysym.h> 72#include <X11/keysym.h>
72#include <X11/keysymdef.h> 73#include <X11/keysymdef.h>
73#include <X11/Xatom.h> 74#include <X11/Xatom.h>
74 75
75#ifdef HAVE_PIXBUF 76#if HAVE_PIXBUF
76# include <gdk-pixbuf/gdk-pixbuf.h> 77# include <gdk-pixbuf/gdk-pixbuf.h>
77#endif 78#endif
78 79
79#if defined(BG_IMAGE_FROM_FILE) || defined(ENABLE_TRANSPARENCY) 80#if XRENDER && (HAVE_PIXBUF || ENABLE_TRANSPARENCY)
80# define HAVE_BG_PIXMAP 1 81# define HAVE_BG_PIXMAP 1
82#endif
83
84#if HAVE_BG_PIXMAP
85# if HAVE_PIXBUF
86# define BG_IMAGE_FROM_FILE 1
87# endif
88# if ENABLE_TRANSPARENCY
89# define BG_IMAGE_FROM_ROOT 1
90# endif
81#endif 91#endif
82 92
83#include <ecb.h> 93#include <ecb.h>
84#include "encoding.h" 94#include "encoding.h"
85#include "rxvtutil.h" 95#include "rxvtutil.h"
86#include "rxvtfont.h" 96#include "rxvtfont.h"
87#include "rxvttoolkit.h" 97#include "rxvttoolkit.h"
98#include "rxvtimg.h"
88#include "scrollbar.h" 99#include "scrollbar.h"
89#include "ev_cpp.h" 100#include "ev_cpp.h"
90#include "salloc.h"
91#include "libptytty.h" 101#include "libptytty.h"
92 102
93#include "rxvtperl.h" 103#include "rxvtperl.h"
94 104
95// try to avoid some macros to decrease code size, on some systems 105// try to avoid some macros to decrease code size, on some systems
… …
148 158
149const char * rxvt_basename (const char *str) NOTHROW; 159const char * rxvt_basename (const char *str) NOTHROW;
150void rxvt_vlog (const char *fmt, va_list arg_ptr) NOTHROW; 160void rxvt_vlog (const char *fmt, va_list arg_ptr) NOTHROW;
151void rxvt_log (const char *fmt,...) NOTHROW; 161void rxvt_log (const char *fmt,...) NOTHROW;
152void rxvt_warn (const char *fmt,...) NOTHROW; 162void rxvt_warn (const char *fmt,...) NOTHROW;
153void rxvt_fatal (const char *fmt, ...) THROW ((class rxvt_failure_exception)) ecb_noreturn; 163void rxvt_fatal (const char *fmt, ...) THROW ((class rxvt_failure_exception)) ecb_noreturn ecb_cold;
154void rxvt_exit_failure () THROW ((class rxvt_failure_exception)) ecb_noreturn; 164void rxvt_exit_failure () THROW ((class rxvt_failure_exception)) ecb_noreturn ecb_cold;
155 165
156char * rxvt_strtrim (char *str) NOTHROW; 166char * rxvt_strtrim (char *str) NOTHROW;
157char ** rxvt_strsplit (char delim, const char *str) NOTHROW; 167char ** rxvt_strsplit (char delim, const char *str) NOTHROW;
158 168
159static inline void 169static inline void
… …
210 environ = orig_env; 220 environ = orig_env;
211 } 221 }
212}; 222};
213 223
214#ifdef HAVE_BG_PIXMAP 224#ifdef HAVE_BG_PIXMAP
225struct image_effects
226{
227 bool tint_set;
228 rxvt_color tint;
229 int shade;
230 int h_blurRadius, v_blurRadius;
231
232 image_effects ()
233 {
234 tint_set =
235 h_blurRadius =
236 v_blurRadius = 0;
237 shade = 100;
238 }
239
240 bool need_tint ()
241 {
242 return shade != 100 || tint_set;
243 }
244
245 bool need_blur ()
246 {
247 return h_blurRadius && v_blurRadius;
248 }
249
250 bool set_tint (const rxvt_color &new_tint);
251 bool set_shade (const char *shade_str);
252 bool set_blur (const char *geom);
253};
254
215# ifdef BG_IMAGE_FROM_FILE 255# if BG_IMAGE_FROM_FILE
216enum { 256enum {
217 IM_IS_SET = 1 << 0,
218 IM_IS_SIZE_SENSITIVE = 1 << 1, 257 IM_IS_SIZE_SENSITIVE = 1 << 1,
219 IM_KEEP_ASPECT = 1 << 2, 258 IM_KEEP_ASPECT = 1 << 2,
220 IM_ROOT_ALIGN = 1 << 3, 259 IM_ROOT_ALIGN = 1 << 3,
221 IM_TILE = 1 << 4, 260 IM_TILE = 1 << 4,
222 IM_GEOMETRY_FLAGS = IM_KEEP_ASPECT | IM_ROOT_ALIGN | IM_TILE, 261 IM_GEOMETRY_FLAGS = IM_KEEP_ASPECT | IM_ROOT_ALIGN | IM_TILE,
… …
228 defaultScale = windowScale, 267 defaultScale = windowScale,
229 centerAlign = 50, 268 centerAlign = 50,
230 defaultAlign = centerAlign, 269 defaultAlign = centerAlign,
231}; 270};
232 271
233struct rxvt_image 272struct rxvt_image : image_effects
234{ 273{
235 int id;
236 unsigned short alpha; 274 unsigned short alpha;
237 uint8_t flags; 275 uint8_t flags;
238 unsigned int h_scale, v_scale; /* percents of the window size */ 276 unsigned int h_scale, v_scale; /* percents of the window size */
239 int h_align, v_align; /* percents of the window size: 277 int h_align, v_align; /* percents of the window size:
240 0 - left align, 50 - center, 100 - right */ 278 0 - left align, 50 - center, 100 - right */
241 279
242# ifdef HAVE_PIXBUF 280 bool is_size_sensitive ()
243 GdkPixbuf *pixbuf; 281 {
282 return (!(flags & IM_TILE)
283 || h_scale || v_scale
284 || (!(flags & IM_ROOT_ALIGN) && (h_align || v_align)));
285 }
286
287 rxvt_img *img;
244 288
245 void destroy () 289 void destroy ()
246 { 290 {
247 if (pixbuf) 291 delete img;
248 g_object_unref (pixbuf); 292 img = 0;
249 } 293 }
250 294
251 int width ()
252 {
253 return gdk_pixbuf_get_width (pixbuf);
254 }
255 int height ()
256 {
257 return gdk_pixbuf_get_height (pixbuf);
258 }
259# endif
260
261 rxvt_image (); 295 rxvt_image ();
262 bool set_file_geometry (const char *file); 296 void set_file_geometry (rxvt_screen *s, const char *file);
263 bool set_file (const char *file); 297 void set_file (rxvt_screen *s, const char *file);
264 bool set_geometry (const char *geom, bool update = false); 298 bool set_geometry (const char *geom, bool update = false);
265}; 299};
266# endif 300# endif
267#endif 301#endif
268 302
… …
315 ***************************************************************************** 349 *****************************************************************************
316 */ 350 */
317 351
318/* COLORTERM, TERM environment variables */ 352/* COLORTERM, TERM environment variables */
319#define COLORTERMENV "rxvt" 353#define COLORTERMENV "rxvt"
320#ifdef BG_IMAGE_FROM_FILE 354#if BG_IMAGE_FROM_FILE
321# define COLORTERMENVFULL COLORTERMENV "-xpm" 355# define COLORTERMENVFULL COLORTERMENV "-xpm"
322#else 356#else
323# define COLORTERMENVFULL COLORTERMENV 357# define COLORTERMENVFULL COLORTERMENV
324#endif 358#endif
325#ifndef TERMENV 359#ifndef TERMENV
… …
555#endif 589#endif
556 Color_scroll, 590 Color_scroll,
557#ifdef RXVT_SCROLLBAR 591#ifdef RXVT_SCROLLBAR
558 Color_trough, 592 Color_trough,
559#endif 593#endif
560#if ENABLE_TRANSPARENCY 594#if BG_IMAGE_FROM_ROOT
561 Color_tint, 595 Color_tint,
562#endif 596#endif
563#if OFF_FOCUS_FADING 597#if OFF_FOCUS_FADING
564 Color_fade, 598 Color_fade,
565#endif 599#endif
… …
751{ 785{
752 text_t *t; // terminal the text 786 text_t *t; // terminal the text
753 rend_t *r; // rendition, uses RS_ flags 787 rend_t *r; // rendition, uses RS_ flags
754 tlen_t_ l; // length of each text line 788 tlen_t_ l; // length of each text line
755 uint32_t f; // flags 789 uint32_t f; // flags
790
791 bool valid ()
792 {
793 return l >= 0;
794 }
795
796 void alloc ()
797 {
798 l = 0;
799 }
756 800
757 bool is_longer () 801 bool is_longer ()
758 { 802 {
759 return f & LINE_LONGER; 803 return f & LINE_LONGER;
760 } 804 }
… …
1031 scrollBar_t scrollBar; 1075 scrollBar_t scrollBar;
1032 uint8_t options[(Opt_count + 7) >> 3]; 1076 uint8_t options[(Opt_count + 7) >> 3];
1033 XSizeHints szHint; 1077 XSizeHints szHint;
1034 rxvt_color *pix_colors; 1078 rxvt_color *pix_colors;
1035 Cursor TermWin_cursor; /* cursor for vt window */ 1079 Cursor TermWin_cursor; /* cursor for vt window */
1080
1036 line_t *row_buf; // all lines, scrollback + terminal, circular 1081 line_t *row_buf; // all lines, scrollback + terminal, circular
1037 line_t *drawn_buf; // text on screen 1082 line_t *drawn_buf; // text on screen
1038 line_t *swap_buf; // lines for swap buffer 1083 line_t *swap_buf; // lines for swap buffer
1039 char *tabs; /* per location: 1 == tab-stop */ 1084 char *tabs; /* per location: 1 == tab-stop */
1040 screen_t screen; 1085 screen_t screen;
… …
1136/* ---------- */ 1181/* ---------- */
1137 struct mouse_event MEvent; 1182 struct mouse_event MEvent;
1138 XComposeStatus compose; 1183 XComposeStatus compose;
1139 static struct termios def_tio; 1184 static struct termios def_tio;
1140 row_col_t oldcursor; 1185 row_col_t oldcursor;
1186
1141#ifdef HAVE_BG_PIXMAP 1187#ifdef HAVE_BG_PIXMAP
1142 void bg_init (); 1188 void bg_init ();
1143 void bg_destroy (); 1189 void bg_destroy ();
1144 1190
1191# if BG_IMAGE_FROM_FILE
1192 rxvt_image fimage;
1193 void get_image_geometry (rxvt_image &image, int &w, int &h, int &x, int &y);
1194 bool render_image (rxvt_image &image);
1195# endif
1196
1197# if BG_IMAGE_FROM_ROOT
1198 rxvt_img *root_img;
1199 image_effects root_effects;
1200
1201 void bg_set_root_pixmap ();
1202 bool render_root_image ();
1203# endif
1204
1205 void tint_image (rxvt_img *img, rxvt_color &tint, bool tint_set, int shade);
1206
1207 ev_tstamp bg_valid_since;
1208
1209 bool bg_window_size_sensitive ();
1210 bool bg_window_position_sensitive ();
1211
1212 void bg_render ();
1213 void bg_invalidate ()
1214 {
1215 bg_flags &= ~(BG_IS_VALID | BG_IS_TRANSPARENT);
1216 }
1217#endif
1218
1219#ifdef HAVE_IMG
1145 enum { 1220 enum {
1146 BG_IS_VALID = 1 << 0, 1221 BG_IS_VALID = 1 << 0,
1147 1222
1148 BG_IS_TRANSPARENT = 1 << 1, 1223 BG_IS_TRANSPARENT = 1 << 1,
1149 BG_NEEDS_REFRESH = 1 << 2, 1224 BG_NEEDS_REFRESH = 1 << 2,
1150
1151 BG_HAS_RENDER = 1 << 3,
1152 BG_HAS_RENDER_CONV = 1 << 4,
1153 BG_CLIENT_RENDER = 1 << 5, 1225 BG_INHIBIT_RENDER = 1 << 3,
1154
1155 BG_TINT_SET = 1 << 6,
1156 BG_TINT_BITAND = 1 << 7,
1157 }; 1226 };
1158 1227
1159 uint8_t bg_flags; 1228 uint8_t bg_flags;
1160 1229
1161# ifdef BG_IMAGE_FROM_FILE 1230 rxvt_img *bg_img;
1162 vector<rxvt_image> image_vec;
1163 rxvt_image *new_image ()
1164 {
1165 image_vec.resize (image_vec.size () + 1);
1166 return &image_vec.back ();
1167 }
1168 void get_image_geometry (rxvt_image &image, int &w, int &h, int &x, int &y);
1169 bool render_image (rxvt_image &image);
1170 void parse_image (int id, const char *type, const char *arg);
1171# endif
1172
1173# ifdef ENABLE_TRANSPARENCY
1174 Pixmap root_pixmap; /* current root pixmap set */
1175 rxvt_color tint;
1176 int shade;
1177 int h_blurRadius, v_blurRadius;
1178
1179 void bg_set_transparent ()
1180 {
1181 bg_flags |= BG_IS_TRANSPARENT;
1182 }
1183 void bg_set_root_pixmap ();
1184 bool bg_set_tint (rxvt_color &new_tint);
1185 bool bg_set_shade (const char *shade_str);
1186 bool bg_set_blur (const char *geom);
1187
1188 bool blur_pixmap (Pixmap pixmap, int width, int height);
1189 bool tint_pixmap (Pixmap pixmap, int width, int height);
1190 void tint_ximage (XImage *ximage);
1191 bool make_transparency_pixmap ();
1192# endif
1193
1194 ev_tstamp bg_valid_since;
1195
1196 Pixmap bg_pixmap;
1197 unsigned int bg_pmap_width, bg_pmap_height;
1198
1199 int target_x;
1200 int target_y;
1201 bool bg_set_position (int x, int y);
1202 bool bg_window_size_sensitive ();
1203 bool bg_window_position_sensitive ();
1204
1205 bool bg_render ();
1206 void bg_invalidate ()
1207 {
1208 bg_flags &= ~BG_IS_VALID;
1209 }
1210#endif
1211#ifdef HAVE_PIXBUF
1212 bool pixbuf_to_pixmap (GdkPixbuf *pixbuf, Pixmap pixmap, GC gc,
1213 int src_x, int src_y, int dst_x, int dst_y,
1214 unsigned int width, unsigned int height, bool argb);
1215#endif 1231#endif
1216 1232
1217#if ENABLE_OVERLAY 1233#if ENABLE_OVERLAY
1218 overlay_base ov; 1234 overlay_base ov;
1219 1235
… …
1227 void scr_overlay_set (int x, int y, const wchar_t *s) NOTHROW; 1243 void scr_overlay_set (int x, int y, const wchar_t *s) NOTHROW;
1228#endif 1244#endif
1229 1245
1230 vector<void *> allocated; // free these memory blocks with free() 1246 vector<void *> allocated; // free these memory blocks with free()
1231 1247
1248 int parent_x, parent_y; // parent window position relative to root, only updated on demand
1249
1232 char *locale; 1250 char *locale;
1233 char charsets[4]; 1251 char charsets[4];
1234 char *v_buffer; /* pointer to physical buffer */ 1252 char *v_buffer; /* pointer to physical buffer */
1235 unsigned int v_buflen; /* size of area to write */ 1253 unsigned int v_buflen; /* size of area to write */
1236 stringvec *argv, *envv; /* if != 0, will be freed at destroy time */ 1254 stringvec *argv, *envv; /* if != 0, will be freed at destroy time */
… …
1247 char *cmdbuf_ptr, *cmdbuf_endp; 1265 char *cmdbuf_ptr, *cmdbuf_endp;
1248 char cmdbuf_base[CBUFSIZ]; 1266 char cmdbuf_base[CBUFSIZ];
1249 1267
1250 ptytty *pty; 1268 ptytty *pty;
1251 1269
1252 rxvt_salloc *talloc; // text line allocator 1270 // chunk contains all line_t's as well as rend_t and text_t buffers
1253 rxvt_salloc *ralloc; // rend line allocator 1271 // for drawn_buf, swap_buf and row_buf, in this order
1272 void *chunk;
1273 size_t chunk_size;
1254 1274
1255 static vector<rxvt_term *> termlist; // a vector of all running rxvt_term's 1275 static vector<rxvt_term *> termlist; // a vector of all running rxvt_term's
1256 1276
1257#if ENABLE_FRILLS || ISO_14755 1277#if ENABLE_FRILLS || ISO_14755
1258 // ISO 14755 entry support 1278 // ISO 14755 entry support
1259 unicode_t iso14755buf; 1279 unicode_t iso14755buf;
1260 void commit_iso14755 (); 1280 void commit_iso14755 ();
1261# if ISO_14755 1281# if ISO_14755
1262 void iso14755_51 (unicode_t ch, rend_t r = DEFAULT_RSTYLE, int x = 0, int y = -1); 1282 void iso14755_51 (unicode_t ch, rend_t r = DEFAULT_RSTYLE, int x = 0, int y = -1, int y2 = -1);
1263 void iso14755_54 (int x, int y); 1283 void iso14755_54 (int x, int y);
1264# endif 1284# endif
1265#endif 1285#endif
1266 1286
1267 long vt_emask, vt_emask_perl, vt_emask_xim, vt_emask_mouse; 1287 long vt_emask, vt_emask_perl, vt_emask_xim, vt_emask_mouse;
… …
1269 void vt_select_input () const NOTHROW 1289 void vt_select_input () const NOTHROW
1270 { 1290 {
1271 XSelectInput (dpy, vt, vt_emask | vt_emask_perl | vt_emask_xim | vt_emask_mouse); 1291 XSelectInput (dpy, vt, vt_emask | vt_emask_perl | vt_emask_xim | vt_emask_mouse);
1272 } 1292 }
1273 1293
1274#if ENABLE_TRANSPARENCY || ENABLE_PERL 1294#if BG_IMAGE_FROM_ROOT || ENABLE_PERL
1275 void rootwin_cb (XEvent &xev); 1295 void rootwin_cb (XEvent &xev);
1276 xevent_watcher rootwin_ev; 1296 xevent_watcher rootwin_ev;
1277#endif 1297#endif
1278#ifdef HAVE_BG_PIXMAP 1298#ifdef HAVE_BG_PIXMAP
1279 void update_background (); 1299 void update_background ();
… …
1428 char *get_colorfgbg (); 1448 char *get_colorfgbg ();
1429 bool set_color (rxvt_color &color, const char *name); 1449 bool set_color (rxvt_color &color, const char *name);
1430 void alias_color (int dst, int src); 1450 void alias_color (int dst, int src);
1431 void set_widthheight (unsigned int newwidth, unsigned int newheight); 1451 void set_widthheight (unsigned int newwidth, unsigned int newheight);
1432 void get_window_origin (int &x, int &y); 1452 void get_window_origin (int &x, int &y);
1433 Pixmap get_pixmap_property (Atom property);
1434 1453
1435 // screen.C 1454 // screen.C
1436 1455
1437 void lalloc (line_t &l) const 1456 bool option (uint8_t opt) const NOTHROW
1438 { 1457 {
1439 l.t = (text_t *)talloc->alloc (); 1458 return options[opt >> 3] & (1 << (opt & 7));
1440 l.r = (rend_t *)ralloc->alloc ();
1441 } 1459 }
1442 1460
1443#if 0 1461 void set_option (uint8_t opt, bool set = true) NOTHROW;
1444 void lfree (line_t &l)
1445 {
1446 talloc->free (l.t);
1447 ralloc->free (l.r);
1448 }
1449#endif
1450
1451 void lresize (line_t &l) const
1452 {
1453 if (!l.t)
1454 return;
1455
1456 l.t = (text_t *)talloc->alloc (l.t, prev_ncol * sizeof (text_t));
1457 l.r = (rend_t *)ralloc->alloc (l.r, prev_ncol * sizeof (rend_t));
1458
1459 l.l = min (l.l, ncol);
1460
1461 if (ncol > prev_ncol)
1462 scr_blank_line (l, prev_ncol, ncol - prev_ncol, DEFAULT_RSTYLE);
1463 }
1464 1462
1465 int fgcolor_of (rend_t r) const NOTHROW 1463 int fgcolor_of (rend_t r) const NOTHROW
1466 { 1464 {
1467 int base = GET_BASEFG (r); 1465 int base = GET_BASEFG (r);
1468#ifndef NO_BRIGHTCOLOR 1466#ifndef NO_BRIGHTCOLOR
… …
1488 base += minBrightCOLOR - minCOLOR; 1486 base += minBrightCOLOR - minCOLOR;
1489#endif 1487#endif
1490 return base; 1488 return base;
1491 } 1489 }
1492 1490
1493 bool option (uint8_t opt) const NOTHROW
1494 {
1495 return options[opt >> 3] & (1 << (opt & 7));
1496 }
1497
1498 void set_option (uint8_t opt, bool set = true) NOTHROW;
1499
1500 // modifies first argument(!) 1491 // modifies first argument(!)
1501 void tt_paste (char *data, unsigned int len) NOTHROW; 1492 void tt_paste (char *data, unsigned int len) NOTHROW;
1502 void paste (char *data, unsigned int len) NOTHROW; 1493 void paste (char *data, unsigned int len) NOTHROW;
1494 void scr_alloc () NOTHROW;
1503 void scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) const NOTHROW; 1495 void scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) const NOTHROW;
1504 void scr_blank_screen_mem (line_t &l, rend_t efs) const NOTHROW; 1496 void scr_blank_screen_mem (line_t &l, rend_t efs) const NOTHROW;
1505 void scr_kill_char (line_t &l, int col) const NOTHROW; 1497 void scr_kill_char (line_t &l, int col) const NOTHROW;
1506 int scr_scroll_text (int row1, int row2, int count) NOTHROW; 1498 int scr_scroll_text (int row1, int row2, int count) NOTHROW;
1507 void scr_reset (); 1499 void scr_reset ();
… …
1574 void selection_click (int clicks, int x, int y) NOTHROW; 1566 void selection_click (int clicks, int x, int y) NOTHROW;
1575 void selection_extend (int x, int y, int flag) NOTHROW; 1567 void selection_extend (int x, int y, int flag) NOTHROW;
1576 void selection_rotate (int x, int y) NOTHROW; 1568 void selection_rotate (int x, int y) NOTHROW;
1577 1569
1578 // xdefaults.C 1570 // xdefaults.C
1571 void rxvt_usage (int type);
1579 const char **get_options (int argc, const char *const *argv); 1572 const char **get_options (int argc, const char *const *argv);
1580 int parse_keysym (const char *str, const char *arg); 1573 int parse_keysym (const char *str, const char *arg);
1581 const char *x_resource (const char *name); 1574 const char *x_resource (const char *name);
1582 void extract_resources (); 1575 void extract_resources ();
1583 void extract_keysym_resources (); 1576 void extract_keysym_resources ();
1584 void find_resources (const char *n_prefix, const char *c_prefix, int mode,
1585 Bool (*proc)(XrmDatabase *, XrmBindingList, XrmQuarkList, XrmRepresentation *, XrmValue *, XPointer));
1586 bool parse_bool_resource (const char *str)
1587 {
1588 return (!strcasecmp (str, "TRUE")
1589 || !strcasecmp (str, "YES")
1590 || !strcasecmp (str, "ON")
1591 || !strcasecmp (str, "1"));
1592 }
1593}; 1577};
1594 1578
1595#endif /* _RXVT_H_ */ 1579#endif /* _RXVT_H_ */
1596 1580

Diff Legend

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