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.250 by root, Tue Jan 31 01:21:21 2006 UTC vs.
Revision 1.278 by root, Tue Jul 24 14:38:59 2007 UTC

… …
8#if defined (ISO_14755) || defined (ENABLE_PERL) 8#if defined (ISO_14755) || defined (ENABLE_PERL)
9# define ENABLE_OVERLAY 1 9# define ENABLE_OVERLAY 1
10#endif 10#endif
11 11
12#if ENABLE_PERL 12#if ENABLE_PERL
13# define ENABLE_FRILLS 1 13# define ENABLE_FRILLS 1
14# define ENABLE_COMBINING 1 14# define ENABLE_COMBINING 1
15#endif 15#endif
16 16
17#if ENABLE_FRILLS 17#if ENABLE_FRILLS
18# define ENABLE_XEMBED 1 18# define ENABLE_XEMBED 1
19# define ENABLE_EWMH 1 19# define ENABLE_EWMH 1
20# define ENABLE_XIM_ONTHESPOT 1 20# define ENABLE_XIM_ONTHESPOT 1
21# define CURSOR_BLINK 1 21# define CURSOR_BLINK 1
22# define OPTION_HC 1
22#else 23#else
23# define ENABLE_MINIMAL 1 24# define ENABLE_MINIMAL 1
24#endif 25#endif
25 26
26#include <limits.h> 27#include <limits.h>
… …
69 70
70#ifndef HAVE_XPOINTER 71#ifndef HAVE_XPOINTER
71typedef char *XPointer; 72typedef char *XPointer;
72#endif 73#endif
73 74
74#ifdef HAVE_TERMIOS_H
75# include <termios.h> 75#include <termios.h>
76typedef struct termios ttymode_t; 76typedef struct termios ttymode_t;
77#else
78# include <sgtty.h>
79typedef struct {
80 struct sgttyb sg;
81 struct tchars tc;
82 struct ltchars lc;
83 int line;
84 int local;
85} ttymode_t;
86#endif
87 77
78#ifdef HAVE_AFTERIMAGE
79# include <afterimage.h>
80#undef min
81#undef max
88#ifdef XPM_BACKGROUND 82#elif defined(XPM_BACKGROUND)
89# ifdef XPM_INC_X11 83# ifdef XPM_INC_X11
90# include <X11/xpm.h> 84# include <X11/xpm.h>
91# else 85# else
92# include <xpm.h> 86# include <xpm.h>
93# endif 87# endif
… …
140const char * rxvt_Str_skip_space (const char *str) NOTHROW; 134const char * rxvt_Str_skip_space (const char *str) NOTHROW;
141char * rxvt_Str_trim (char *str) NOTHROW; 135char * rxvt_Str_trim (char *str) NOTHROW;
142int rxvt_Str_escaped (char *str) NOTHROW; 136int rxvt_Str_escaped (char *str) NOTHROW;
143char ** rxvt_splitcommastring (const char *cs) NOTHROW; 137char ** rxvt_splitcommastring (const char *cs) NOTHROW;
144void rxvt_freecommastring (char **cs) NOTHROW; 138void rxvt_freecommastring (char **cs) NOTHROW;
145char * rxvt_File_find (const char *file, const char *ext, const char *path) NOTHROW;
146 139
147///////////////////////////////////////////////////////////////////////////// 140/////////////////////////////////////////////////////////////////////////////
148 141
149// temporarily replace the process environment 142// temporarily replace the process environment
150extern char **environ; 143extern char **environ;
… …
187#endif 180#endif
188 181
189#ifdef XPM_BACKGROUND 182#ifdef XPM_BACKGROUND
190typedef struct { 183typedef struct {
191 short w, h, x, y; 184 short w, h, x, y;
185 bool auto_resize ;
192 Pixmap pixmap; 186 Pixmap pixmap;
193} bgPixmap_t; 187} bgPixmap_t;
194#endif 188#endif
195 189
196/* 190/*
… …
519 * on the unnecessary items, e.g. Color_pointer, but won't bother 513 * on the unnecessary items, e.g. Color_pointer, but won't bother
520 * until we need to. Also, be aware of usage in pixcolor_set 514 * until we need to. Also, be aware of usage in pixcolor_set
521 */ 515 */
522 516
523enum colour_list { 517enum colour_list {
518 Color_none = -2,
519 Color_transparent = -1,
524 Color_fg = 0, 520 Color_fg = 0,
525 Color_bg, 521 Color_bg,
526 minCOLOR, /* 2 */ 522 minCOLOR, /* 2 */
527 Color_Black = minCOLOR, 523 Color_Black = minCOLOR,
528 Color_Red3, 524 Color_Red3,
… …
587 TOTAL_COLORS = NRS_COLORS 583 TOTAL_COLORS = NRS_COLORS
588#endif 584#endif
589}; 585};
590 586
591#define Color_Bits 7 // 0 .. maxTermCOLOR 587#define Color_Bits 7 // 0 .. maxTermCOLOR
592
593#define NPIXCLR_SETS ((TOTAL_COLORS + 31) / 32)
594#define NPIXCLR_BITS 32
595 588
596/* 589/*
597 * Resource list 590 * Resource list
598 */ 591 */
599enum { 592enum {
… …
684 * MACRO DEFINES 677 * MACRO DEFINES
685 ***************************************************************************** 678 *****************************************************************************
686 */ 679 */
687#define dLocal(type,name) type const name = this->name 680#define dLocal(type,name) type const name = this->name
688 681
689// for speed reasons, we assume that all latin1 characters 682// for speed reasons, we assume that all codepoints 32 to 126 are
690// are single-width (the first unicode combining character 683// single-width.
691// is actually 0x300, but ascii is what matters most). 684#define WCWIDTH(c) (IN_RANGE_INC (c, 0x20, 0x7e) ? 1 : wcwidth (c))
692#define WCWIDTH(c) ((c) & ~0xff ? wcwidth (c) : 1)
693 685
694/* convert pixel dimensions to row/column values. Everything as int32_t */ 686/* convert pixel dimensions to row/column values. Everything as int32_t */
695#define Pixel2Col(x) Pixel2Width((int32_t)(x)) 687#define Pixel2Col(x) Pixel2Width((int32_t)(x))
696#define Pixel2Row(y) Pixel2Height((int32_t)(y)) 688#define Pixel2Row(y) Pixel2Height((int32_t)(y))
697#define Pixel2Width(x) ((int32_t)(x) / (int32_t)fwidth) 689#define Pixel2Width(x) ((int32_t)(x) / (int32_t)fwidth)
… …
699#define Col2Pixel(col) ((int32_t)Width2Pixel(col)) 691#define Col2Pixel(col) ((int32_t)Width2Pixel(col))
700#define Row2Pixel(row) ((int32_t)Height2Pixel(row)) 692#define Row2Pixel(row) ((int32_t)Height2Pixel(row))
701#define Width2Pixel(n) ((int32_t)(n) * (int32_t)fwidth) 693#define Width2Pixel(n) ((int32_t)(n) * (int32_t)fwidth)
702#define Height2Pixel(n) ((int32_t)(n) * (int32_t)fheight) 694#define Height2Pixel(n) ((int32_t)(n) * (int32_t)fheight)
703 695
704#define OPTION(opt) (options & (opt))
705#define DEFAULT_OPTIONS (Opt_scrollBar | Opt_scrollTtyOutput \
706 | Opt_jumpScroll | Opt_secondaryScreen \
707 | Opt_pastableTabs | Opt_intensityStyles)
708
709// for m >= -n, ensure remainder lies between 0..n-1 696// for m >= -n, ensure remainder lies between 0..n-1
710#define MOD(m,n) (((m) + (n)) % (n)) 697#define MOD(m,n) (((m) + (n)) % (n))
711 698
712#define LINENO(n) MOD (term_start + int(n), total_rows) 699#define LINENO(n) MOD (term_start + int(n), total_rows)
713#define ROW(n) row_buf [LINENO (n)] 700#define ROW(n) row_buf [LINENO (n)]
… …
731#define SET_BGCOLOR(x,bg) (((x) & ~RS_bgMask) | ((bg)<<Color_Bits)) 718#define SET_BGCOLOR(x,bg) (((x) & ~RS_bgMask) | ((bg)<<Color_Bits))
732#define SET_ATTR(x,a) (((x) & ~RS_attrMask) | (a)) 719#define SET_ATTR(x,a) (((x) & ~RS_attrMask) | (a))
733 720
734#define RS_SAME(a,b) (!(((a) ^ (b)) & ~RS_Careful)) 721#define RS_SAME(a,b) (!(((a) ^ (b)) & ~RS_Careful))
735 722
736#define SET_PIXCOLOR(x) (pixcolor_set[(x) / NPIXCLR_BITS] |= (1 << ((x) % NPIXCLR_BITS))) 723#define PIXCOLOR_NAME(idx) rs[Rs_color + (idx)]
737#define ISSET_PIXCOLOR(x) (pixcolor_set[(x) / NPIXCLR_BITS] & (1 << ((x) % NPIXCLR_BITS))) 724#define ISSET_PIXCOLOR(idx) (!!rs[Rs_color + (idx)])
738 725
739#if ENABLE_STYLES 726#if ENABLE_STYLES
740# define FONTSET(style) fontset[GET_STYLE (style)] 727# define FONTSET(style) fontset[GET_STYLE (style)]
741#else 728#else
742# define FONTSET(style) fontset[0] 729# define FONTSET(style) fontset[0]
… …
776# define XPMClearArea(a, b, c, d, e, f, g) XClearArea((a), (b), (c), (d), (e), (f), (g)) 763# define XPMClearArea(a, b, c, d, e, f, g) XClearArea((a), (b), (c), (d), (e), (f), (g))
777#else 764#else
778# define XPMClearArea(a, b, c, d, e, f, g) 765# define XPMClearArea(a, b, c, d, e, f, g)
779#endif 766#endif
780 767
781typedef callback1<void, const char *> log_callback; 768typedef callback<void (const char *)> log_callback;
782typedef callback1<int, int> getfd_callback; 769typedef callback<int (int)> getfd_callback;
783 770
784#define SET_LOCALE(locale) rxvt_set_locale (locale) 771#define SET_LOCALE(locale) rxvt_set_locale (locale)
785extern bool rxvt_set_locale (const char *locale) NOTHROW; 772extern bool rxvt_set_locale (const char *locale) NOTHROW;
786extern void rxvt_push_locale (const char *locale) NOTHROW; 773extern void rxvt_push_locale (const char *locale) NOTHROW;
787extern void rxvt_pop_locale () NOTHROW; 774extern void rxvt_pop_locale () NOTHROW;
… …
789/****************************************************************************/ 776/****************************************************************************/
790 777
791#define LINE_LONGER 0x0001 // line is continued on the next row 778#define LINE_LONGER 0x0001 // line is continued on the next row
792#define LINE_FILTERED 0x0002 // line has been filtered 779#define LINE_FILTERED 0x0002 // line has been filtered
793#define LINE_COMPRESSED 0x0004 // line has been compressed (NYI) 780#define LINE_COMPRESSED 0x0004 // line has been compressed (NYI)
781#define LINE_FILTER 0x0008 // line needs to be filtered before display (NYI)
782#define LINE_BIDI 0x0010 // line needs bidi (NYI)
794 783
795struct line_t { 784struct line_t {
796 text_t *t; // terminal the text 785 text_t *t; // terminal the text
797 rend_t *r; // rendition, uses RS_ flags 786 rend_t *r; // rendition, uses RS_ flags
798 tlen_t_ l; // length of each text line, LINE_CONT == continued on next line 787 tlen_t_ l; // length of each text line, LINE_CONT == continued on next line
… …
891#endif 880#endif
892 881
893/****************************************************************************/ 882/****************************************************************************/
894 883
895#ifdef KEYSYM_RESOURCE 884#ifdef KEYSYM_RESOURCE
896 class keyboard_manager; 885class keyboard_manager;
897#endif 886#endif
887
888/* to get libAfterImage to work with multiple displays we use that hack : */
889/* should not need that with libAfterImage version >= 1.15 */
890#define AFTERIMAGE_DPY_OP(op) ((::dpy = dpy), (op))
898 891
899struct rxvt_term : zero_initialized, rxvt_vars, rxvt_screen { 892struct rxvt_term : zero_initialized, rxvt_vars, rxvt_screen {
893
894 // special markers with magic addresses
895 static const char resval_undef []; // options specifically unset
896 static const char resval_on []; // boolean options switched on
897 static const char resval_off []; // or off
898
900 log_callback *log_hook; // log error messages through this hook, if != 0 899 log_callback *log_hook; // log error messages through this hook, if != 0
901 getfd_callback *getfd_hook; // convert remote to local fd, if != 0 900 getfd_callback *getfd_hook; // convert remote to local fd, if != 0
902#if ENABLE_PERL 901#if ENABLE_PERL
903 rxvt_perl_term perl; 902 rxvt_perl_term perl;
904#endif 903#endif
905 struct mbstate mbstate; // current input multibyte state 904 struct mbstate mbstate; // current input multibyte state
906 905
907 unsigned char want_refresh:1, 906 unsigned char want_refresh:1,
908#ifdef TRANSPARENT 907#ifdef ENABLE_TRANSPARENCY
909 want_full_refresh:1, /* awaiting full screen refresh */ 908 want_full_refresh:1, /* awaiting full screen refresh */
910#endif
911#if defined(XPM_BACKGROUND) || defined(TRANSPARENT)
912 am_transparent:1, /* is a transparent term */ 909 am_transparent:1, /* is a transparent term */
913 am_pixmap_trans:1, /* transparency w/known root pixmap */ 910 am_pixmap_trans:1, /* transparency w/known root pixmap */
914#endif 911#endif
915 current_screen:1, /* primary or secondary */ 912 current_screen:1, /* primary or secondary */
916 num_scr_allow:1, 913 num_scr_allow:1,
… …
945 int prev_ncol, /* screen: previous number of columns */ 942 int prev_ncol, /* screen: previous number of columns */
946 prev_nrow; /* screen: previous number of rows */ 943 prev_nrow; /* screen: previous number of rows */
947/* ---------- */ 944/* ---------- */
948 rend_t rstyle; 945 rend_t rstyle;
949/* ---------- */ 946/* ---------- */
950 uint32_t pixcolor_set[NPIXCLR_SETS];
951/* ---------- */
952#ifdef SELECTION_SCROLLING 947#ifdef SELECTION_SCROLLING
953 int scroll_selection_lines; 948 int scroll_selection_lines;
954 enum page_dirn scroll_selection_dir; 949 enum page_dirn scroll_selection_dir;
955 int selection_save_x, 950 int selection_save_x,
956 selection_save_y, 951 selection_save_y,
… …
961 /* give proper Scroll behaviour */ 956 /* give proper Scroll behaviour */
962#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 957#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
963 mouse_slip_wheel_speed, 958 mouse_slip_wheel_speed,
964#endif 959#endif
965 refresh_count, 960 refresh_count,
966 refresh_limit,
967 last_bot, /* scrollbar last bottom position */ 961 last_bot, /* scrollbar last bottom position */
968 last_top, /* scrollbar last top position */ 962 last_top, /* scrollbar last top position */
969 last_state, /* scrollbar last state */ 963 last_state, /* scrollbar last state */
970 scrollbar_len, 964 scrollbar_len,
971 window_vt_x, 965 window_vt_x,
… …
1029 XComposeStatus compose; 1023 XComposeStatus compose;
1030 ttymode_t tio; 1024 ttymode_t tio;
1031 row_col_t oldcursor; 1025 row_col_t oldcursor;
1032#ifdef XPM_BACKGROUND 1026#ifdef XPM_BACKGROUND
1033 bgPixmap_t bgPixmap; 1027 bgPixmap_t bgPixmap;
1028#ifdef HAVE_AFTERIMAGE
1029 struct ASVisual *asv;
1030 ASImageManager *asimman;
1031 ASImage *original_asim;
1032 struct { unsigned int width, height; } xpmAttr; /* all we need is width/height */
1033#else
1034 XpmAttributes xpmAttr; /* originally loaded pixmap and its scaling */ 1034 XpmAttributes xpmAttr; /* originally loaded pixmap and its scaling */
1035#endif
1035#endif 1036#endif
1036 1037
1037#if ENABLE_OVERLAY 1038#if ENABLE_OVERLAY
1038 int ov_x, ov_y, ov_w, ov_h; // overlay dimensions 1039 int ov_x, ov_y, ov_w, ov_h; // overlay dimensions
1039 text_t **ov_text; 1040 text_t **ov_text;
… …
1094 1095
1095 long vt_emask, vt_emask_perl, vt_emask_xim; 1096 long vt_emask, vt_emask_perl, vt_emask_xim;
1096 1097
1097 void vt_select_input () const NOTHROW 1098 void vt_select_input () const NOTHROW
1098 { 1099 {
1099 XSelectInput (xdisp, vt, vt_emask | vt_emask_perl | vt_emask_xim); 1100 XSelectInput (dpy, vt, vt_emask | vt_emask_perl | vt_emask_xim);
1100 } 1101 }
1101 1102
1102#if TRANSPARENT 1103#if ENABLE_TRANSPARENCY || ENABLE_PERL
1103 void rootwin_cb (XEvent &xev); 1104 void rootwin_cb (XEvent &xev);
1104 xevent_watcher rootwin_ev; 1105 xevent_watcher rootwin_ev;
1106#endif
1107#if ENABLE_TRANSPARENCY
1108 int check_our_parents ();
1109 void check_our_parents_cb (time_watcher &w);
1110 time_watcher check_our_parents_ev;
1105#endif 1111#endif
1106 1112
1107 void x_cb (XEvent &xev); 1113 void x_cb (XEvent &xev);
1108 void flush (); 1114 void flush ();
1109 xevent_watcher termwin_ev; 1115 xevent_watcher termwin_ev;
… …
1169 bool pty_fill (); 1175 bool pty_fill ();
1170 1176
1171 void make_current () const // make this the "currently active" urxvt instance 1177 void make_current () const // make this the "currently active" urxvt instance
1172 { 1178 {
1173 SET_R (this); 1179 SET_R (this);
1180 set_environ (envv);
1174 rxvt_set_locale (locale); 1181 rxvt_set_locale (locale);
1175 set_environ (envv);
1176 } 1182 }
1177 1183
1178 void init_secondary (); 1184 void init_secondary ();
1179 const char **init_resources (int argc, const char *const *argv); 1185 const char **init_resources (int argc, const char *const *argv);
1180 const char *x_resource (const char *name); 1186 const char *x_resource (const char *name);
… …
1205 void im_set_preedit_area (XRectangle &preedit_rect, XRectangle &status_rect, const XRectangle &needed_rect); 1211 void im_set_preedit_area (XRectangle &preedit_rect, XRectangle &status_rect, const XRectangle &needed_rect);
1206 1212
1207 bool IMisRunning (); 1213 bool IMisRunning ();
1208 void IMSendSpot (); 1214 void IMSendSpot ();
1209 bool IM_get_IC (const char *modifiers); 1215 bool IM_get_IC (const char *modifiers);
1210 void IMSetStatusPosition (); 1216 void IMSetPosition ();
1211#endif 1217#endif
1212 1218
1213 void resize_scrollbar (); 1219 void resize_scrollbar ();
1214 1220
1215 // command.C 1221 // command.C
1216 void lookup_key (XKeyEvent &ev); 1222 void key_press (XKeyEvent &ev);
1223 void key_release (XKeyEvent &ev);
1217 unsigned int cmd_write (const char *str, unsigned int count); 1224 unsigned int cmd_write (const char *str, unsigned int count);
1218 1225
1219 wchar_t next_char () NOTHROW; 1226 wchar_t next_char () NOTHROW;
1220 wchar_t cmd_getc () THROW ((class out_of_input)); 1227 wchar_t cmd_getc () THROW ((class out_of_input));
1221 uint32_t next_octet () NOTHROW; 1228 uint32_t next_octet () NOTHROW;
… …
1225 void mouse_report (XButtonEvent &ev); 1232 void mouse_report (XButtonEvent &ev);
1226 void button_press (XButtonEvent &ev); 1233 void button_press (XButtonEvent &ev);
1227 void button_release (XButtonEvent &ev); 1234 void button_release (XButtonEvent &ev);
1228 void focus_in (); 1235 void focus_in ();
1229 void focus_out (); 1236 void focus_out ();
1230 int check_our_parents (); 1237 void update_fade_color (unsigned int idx);
1231#ifdef PRINTPIPE 1238#ifdef PRINTPIPE
1232 FILE *popen_printer (); 1239 FILE *popen_printer ();
1233 int pclose_printer (FILE *stream); 1240 int pclose_printer (FILE *stream);
1234#endif 1241#endif
1235 void process_print_pipe (); 1242 void process_print_pipe ();
… …
1257 void set_title (const char *str); 1264 void set_title (const char *str);
1258 void set_icon_name (const char *str); 1265 void set_icon_name (const char *str);
1259 void set_window_color (int idx, const char *color); 1266 void set_window_color (int idx, const char *color);
1260 void set_colorfgbg (); 1267 void set_colorfgbg ();
1261 bool set_color (rxvt_color &color, const char *name); 1268 bool set_color (rxvt_color &color, const char *name);
1269 void alias_color (int dst, int src);
1262 void set_widthheight (unsigned int newwidth, unsigned int newheight); 1270 void set_widthheight (unsigned int newwidth, unsigned int newheight);
1263 1271
1264 // screen.C 1272 // screen.C
1265 1273
1266 void lalloc (line_t &l) const 1274 void lalloc (line_t &l) const
… …
1295 { 1303 {
1296 int base = GET_BASEFG (r); 1304 int base = GET_BASEFG (r);
1297#ifndef NO_BRIGHTCOLOR 1305#ifndef NO_BRIGHTCOLOR
1298 if (r & RS_Bold 1306 if (r & RS_Bold
1299# if ENABLE_STYLES 1307# if ENABLE_STYLES
1300 && OPTION (Opt_intensityStyles) 1308 && option (Opt_intensityStyles)
1301# endif 1309# endif
1302 && IN_RANGE_INC (base, minCOLOR, minBrightCOLOR)) 1310 && IN_RANGE_INC (base, minCOLOR, minBrightCOLOR))
1303 base += minBrightCOLOR - minCOLOR; 1311 base += minBrightCOLOR - minCOLOR;
1304#endif 1312#endif
1305 return base; 1313 return base;
… …
1309 { 1317 {
1310 int base = GET_BASEBG (r); 1318 int base = GET_BASEBG (r);
1311#ifndef NO_BRIGHTCOLOR 1319#ifndef NO_BRIGHTCOLOR
1312 if (r & RS_Blink 1320 if (r & RS_Blink
1313# if ENABLE_STYLES 1321# if ENABLE_STYLES
1314 && OPTION (Opt_intensityStyles) 1322 && option (Opt_intensityStyles)
1315# endif 1323# endif
1316 && IN_RANGE_INC (base, minCOLOR, minBrightCOLOR)) 1324 && IN_RANGE_INC (base, minCOLOR, minBrightCOLOR))
1317 base += minBrightCOLOR - minCOLOR; 1325 base += minBrightCOLOR - minCOLOR;
1318#endif 1326#endif
1319 return base; 1327 return base;
1320 } 1328 }
1321 1329
1322 bool option (uint32_t opt) const NOTHROW 1330 bool option (uint8_t opt) const NOTHROW
1323 { 1331 {
1324 return OPTION (opt); 1332 return options[opt >> 3] & (1 << (opt & 7));
1325 } 1333 }
1326 1334
1327 void set_option (uint32_t opt, bool set) NOTHROW 1335 void set_option (uint8_t opt, bool set = true) NOTHROW
1328 { 1336 {
1329 if (set) 1337 if (set)
1330 options |= opt; 1338 options[opt >> 3] |= (1 << (opt & 7));
1331 else 1339 else
1332 options &= ~opt; 1340 options[opt >> 3] &= ~(1 << (opt & 7));
1333 } 1341 }
1334 1342
1335 void scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) const NOTHROW; 1343 void scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) const NOTHROW;
1336 void scr_blank_screen_mem (line_t &l, rend_t efs) const NOTHROW; 1344 void scr_blank_screen_mem (line_t &l, rend_t efs) const NOTHROW;
1337 int scr_scroll_text (int row1, int row2, int count) NOTHROW; 1345 int scr_scroll_text (int row1, int row2, int count) NOTHROW;

Diff Legend

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