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.433 by sf-exg, Sun Jan 30 18:38:01 2011 UTC vs.
Revision 1.526 by sf-exg, Thu Dec 12 09:15:23 2013 UTC

1#ifndef RXVT_H_ /* include once only */ 1#ifndef RXVT_H_ /* include once only */
2#define RXVT_H_ 2#define RXVT_H_
3 3
4#include <cstdio> 4#include <stdio.h>
5#include <cctype> 5#include <ctype.h>
6#include <cerrno> 6#include <errno.h>
7#include <cstdarg> 7#include <stdarg.h>
8#include <cstdlib> 8#include <stdlib.h>
9#ifdef HAVE_STDINT_H 9#ifdef HAVE_STDINT_H
10#include <stdint.h> 10#include <stdint.h>
11#endif 11#endif
12#include <sys/types.h> 12#include <sys/types.h>
13#include <unistd.h> 13#include <unistd.h>
14#include <cstring> 14#include <string.h>
15#include <assert.h> 15#include <assert.h>
16#ifdef HAVE_SYS_IOCTL_H 16#ifdef HAVE_SYS_IOCTL_H
17#include <sys/ioctl.h> 17#include <sys/ioctl.h>
18#endif 18#endif
19#ifdef HAVE_SYS_STRREDIR_H 19#ifdef HAVE_SYS_STRREDIR_H
20#include <sys/strredir.h> 20#include <sys/strredir.h>
21#endif 21#endif
22 22
23#if HAVE_CWCHAR
24# include <cwchar>
25#elif HAVE_WCHAR_H 23#if HAVE_WCHAR_H
26# include <wchar.h> 24# include <wchar.h>
27#else 25#else
28// stdlib.h might provide it 26// stdlib.h might provide it
29#endif 27#endif
30
31using namespace std;
32 28
33// we assume that Xlib.h defines XPointer, and it does since at least 1994... 29// we assume that Xlib.h defines XPointer, and it does since at least 1994...
34 30
35extern "C" { 31extern "C" {
36#include <X11/Xlib.h> 32#include <X11/Xlib.h>
… …
49 45
50#include "feature.h" 46#include "feature.h"
51 47
52#if defined (ISO_14755) || defined (ENABLE_PERL) 48#if defined (ISO_14755) || defined (ENABLE_PERL)
53# define ENABLE_OVERLAY 1 49# define ENABLE_OVERLAY 1
50# undef NO_RESOURCES
54#endif 51#endif
55 52
56#if ENABLE_PERL 53#if ENABLE_PERL
57# define ENABLE_FRILLS 1 54# define ENABLE_FRILLS 1
58# define ENABLE_COMBINING 1 55# define ENABLE_COMBINING 1
… …
74#include <X11/cursorfont.h> 71#include <X11/cursorfont.h>
75#include <X11/keysym.h> 72#include <X11/keysym.h>
76#include <X11/keysymdef.h> 73#include <X11/keysymdef.h>
77#include <X11/Xatom.h> 74#include <X11/Xatom.h>
78 75
79#ifdef HAVE_AFTERIMAGE
80# include <afterimage.h>
81# undef min
82# undef max
83#endif
84
85#ifdef HAVE_PIXBUF 76#if HAVE_PIXBUF
86# include <gdk-pixbuf/gdk-pixbuf.h> 77# include <gdk-pixbuf/gdk-pixbuf.h>
87#endif 78#endif
88 79
89#if defined(BG_IMAGE_FROM_FILE) || defined(ENABLE_TRANSPARENCY) 80#if XRENDER && (HAVE_PIXBUF || ENABLE_TRANSPARENCY)
90# define HAVE_BG_PIXMAP 1 81# define HAVE_BG_PIXMAP 1
82# define HAVE_IMG 1
83#endif
84
85#if HAVE_BG_PIXMAP
86# if HAVE_PIXBUF
87# define BG_IMAGE_FROM_FILE 1
91#endif 88# endif
89# if ENABLE_TRANSPARENCY
90# define BG_IMAGE_FROM_ROOT 1
91# endif
92#endif
92 93
94#include <ecb.h>
93#include "encoding.h" 95#include "encoding.h"
94#include "rxvtutil.h" 96#include "rxvtutil.h"
95#include "rxvtfont.h" 97#include "rxvtfont.h"
96#include "rxvttoolkit.h" 98#include "rxvttoolkit.h"
99#include "rxvtimg.h"
97#include "scrollbar.h" 100#include "scrollbar.h"
98#include "ev_cpp.h" 101#include "ev_cpp.h"
99#include "salloc.h"
100#include "libptytty.h" 102#include "libptytty.h"
101 103
102#include "rxvtperl.h" 104#include "rxvtperl.h"
103 105
104// try to avoid some macros to decrease code size, on some systems 106// try to avoid some macros to decrease code size, on some systems
… …
125#endif 127#endif
126 128
127#ifndef EXIT_SUCCESS /* missing from <stdlib.h> */ 129#ifndef EXIT_SUCCESS /* missing from <stdlib.h> */
128# define EXIT_SUCCESS 0 /* exit function success */ 130# define EXIT_SUCCESS 0 /* exit function success */
129# define EXIT_FAILURE 1 /* exit function failure */ 131# define EXIT_FAILURE 1 /* exit function failure */
130#endif
131
132#ifndef PATH_MAX
133# define PATH_MAX 16384
134#endif 132#endif
135 133
136/****************************************************************************/ 134/****************************************************************************/
137 135
138// exception thrown on fatal (per-instance) errors 136// exception thrown on fatal (per-instance) errors
… …
161 159
162const char * rxvt_basename (const char *str) NOTHROW; 160const char * rxvt_basename (const char *str) NOTHROW;
163void rxvt_vlog (const char *fmt, va_list arg_ptr) NOTHROW; 161void rxvt_vlog (const char *fmt, va_list arg_ptr) NOTHROW;
164void rxvt_log (const char *fmt,...) NOTHROW; 162void rxvt_log (const char *fmt,...) NOTHROW;
165void rxvt_warn (const char *fmt,...) NOTHROW; 163void rxvt_warn (const char *fmt,...) NOTHROW;
166void rxvt_fatal (const char *fmt, ...) THROW ((class rxvt_failure_exception)) NORETURN; 164void rxvt_fatal (const char *fmt, ...) THROW ((class rxvt_failure_exception)) ecb_noreturn ecb_cold;
167void rxvt_exit_failure () THROW ((class rxvt_failure_exception)) NORETURN; 165void rxvt_exit_failure () THROW ((class rxvt_failure_exception)) ecb_noreturn ecb_cold;
168 166
169char * rxvt_strtrim (char *str) NOTHROW; 167char * rxvt_strtrim (char *str) NOTHROW;
170char ** rxvt_strsplit (char delim, const char *str) NOTHROW; 168char ** rxvt_strsplit (char delim, const char *str) NOTHROW;
171 169
172static inline void 170static inline void
… …
221 ~localise_env () 219 ~localise_env ()
222 { 220 {
223 environ = orig_env; 221 environ = orig_env;
224 } 222 }
225}; 223};
224
225#ifdef HAVE_BG_PIXMAP
226struct image_effects
227{
228 bool tint_set;
229 rxvt_color tint;
230 int shade;
231 int h_blurRadius, v_blurRadius;
232
233 image_effects ()
234 {
235 tint_set =
236 h_blurRadius =
237 v_blurRadius = 0;
238 shade = 100;
239 }
240
241 bool need_tint ()
242 {
243 return shade != 100 || tint_set;
244 }
245
246 bool need_blur ()
247 {
248 return h_blurRadius && v_blurRadius;
249 }
250
251 bool set_tint (const rxvt_color &new_tint);
252 bool set_shade (const char *shade_str);
253 bool set_blur (const char *geom);
254};
255
256# if BG_IMAGE_FROM_FILE
257enum {
258 IM_IS_SIZE_SENSITIVE = 1 << 1,
259 IM_KEEP_ASPECT = 1 << 2,
260 IM_ROOT_ALIGN = 1 << 3,
261 IM_TILE = 1 << 4,
262 IM_GEOMETRY_FLAGS = IM_KEEP_ASPECT | IM_ROOT_ALIGN | IM_TILE,
263};
264
265enum {
266 noScale = 0,
267 windowScale = 100,
268 defaultScale = windowScale,
269 centerAlign = 50,
270 defaultAlign = centerAlign,
271};
272
273struct rxvt_image : image_effects
274{
275 unsigned short alpha;
276 uint8_t flags;
277 unsigned int h_scale, v_scale; /* percents of the window size */
278 int h_align, v_align; /* percents of the window size:
279 0 - left align, 50 - center, 100 - right */
280
281 bool is_size_sensitive ()
282 {
283 return (!(flags & IM_TILE)
284 || h_scale || v_scale
285 || (!(flags & IM_ROOT_ALIGN) && (h_align || v_align)));
286 }
287
288 rxvt_img *img;
289
290 void destroy ()
291 {
292 delete img;
293 img = 0;
294 }
295
296 rxvt_image ();
297 void set_file_geometry (rxvt_screen *s, const char *file);
298 void set_file (rxvt_screen *s, const char *file);
299 bool set_geometry (const char *geom, bool update = false);
300};
301# endif
302#endif
226 303
227/* 304/*
228 ***************************************************************************** 305 *****************************************************************************
229 * STRUCTURES AND TYPEDEFS 306 * STRUCTURES AND TYPEDEFS
230 ***************************************************************************** 307 *****************************************************************************
… …
273 ***************************************************************************** 350 *****************************************************************************
274 */ 351 */
275 352
276/* COLORTERM, TERM environment variables */ 353/* COLORTERM, TERM environment variables */
277#define COLORTERMENV "rxvt" 354#define COLORTERMENV "rxvt"
278#ifdef BG_IMAGE_FROM_FILE 355#if BG_IMAGE_FROM_FILE
279# define COLORTERMENVFULL COLORTERMENV "-xpm" 356# define COLORTERMENVFULL COLORTERMENV "-xpm"
280#else 357#else
281# define COLORTERMENVFULL COLORTERMENV 358# define COLORTERMENVFULL COLORTERMENV
282#endif 359#endif
283#ifndef TERMENV 360#ifndef TERMENV
… …
308# define NSCREENS 0 385# define NSCREENS 0
309#else 386#else
310# define NSCREENS 1 387# define NSCREENS 1
311#endif 388#endif
312 389
313/* special (internal) prefix for font commands */
314#define FONT_CMD '#'
315#define FONT_DN "#-"
316#define FONT_UP "#+"
317
318/* flags for rxvt_scr_gotorc () */ 390/* flags for rxvt_term::scr_gotorc () */
319enum { 391enum {
320 C_RELATIVE = 1, /* col movement is relative */ 392 C_RELATIVE = 1, /* col movement is relative */
321 R_RELATIVE = 2, /* row movement is relative */ 393 R_RELATIVE = 2, /* row movement is relative */
322 RELATIVE = C_RELATIVE | R_RELATIVE, 394 RELATIVE = C_RELATIVE | R_RELATIVE,
323}; 395};
324 396
325/* modes for rxvt_scr_insdel_chars (), rxvt_scr_insdel_lines () */ 397/* modes for rxvt_term::scr_insdel_chars (), rxvt_term::scr_insdel_lines () */
326enum { 398enum {
327 INSERT = -1, /* don't change these values */ 399 INSERT = -1, /* don't change these values */
328 DELETE = +1, 400 DELETE = +1,
329 ERASE = +2, 401 ERASE = +2,
330}; 402};
331 403
332/* modes for rxvt_scr_page () - scroll page. used by scrollbar window */ 404/* modes for rxvt_term::scr_page () - scroll page. used by scrollbar window */
333enum page_dirn { 405enum page_dirn {
334 UP, 406 DN = -1,
335 DN,
336 NO_DIR, 407 NO_DIR = 0,
408 UP = 1,
337}; 409};
338 410
339/* arguments for rxvt_scr_change_screen () */ 411/* arguments for rxvt_term::scr_change_screen () */
340enum { 412enum {
341 PRIMARY = 0, 413 PRIMARY = 0,
342 SECONDARY, 414 SECONDARY,
343}; 415};
344 416
… …
386#define RS_baseattrMask (RS_Italic | RS_Bold | RS_Blink | RS_RVid | RS_Uline) 458#define RS_baseattrMask (RS_Italic | RS_Bold | RS_Blink | RS_RVid | RS_Uline)
387#define RS_attrMask (RS_baseattrMask | RS_fontMask) 459#define RS_attrMask (RS_baseattrMask | RS_fontMask)
388 460
389#define DEFAULT_RSTYLE (RS_None | (Color_fg << RS_fgShift) | (Color_bg << RS_bgShift)) 461#define DEFAULT_RSTYLE (RS_None | (Color_fg << RS_fgShift) | (Color_bg << RS_bgShift))
390#define OVERLAY_RSTYLE (RS_None | (Color_Black << RS_fgShift) | (Color_Yellow << RS_bgShift)) 462#define OVERLAY_RSTYLE (RS_None | (Color_Black << RS_fgShift) | (Color_Yellow << RS_bgShift))
391
392#define Sel_none 0 /* Not waiting */
393#define Sel_normal 0x01 /* normal selection */
394#define Sel_incr 0x02 /* incremental selection */
395#define Sel_direct 0x00
396#define Sel_Primary 0x01
397#define Sel_Secondary 0x02
398#define Sel_Clipboard 0x03
399#define Sel_whereMask 0x0f
400#define Sel_CompoundText 0x10 /* last request was COMPOUND_TEXT */
401#define Sel_UTF8String 0x20 /* last request was UTF8_STRING */
402 463
403enum { 464enum {
404 C0_NUL = 0x00, 465 C0_NUL = 0x00,
405 C0_SOH, C0_STX, C0_ETX, C0_EOT, C0_ENQ, C0_ACK, C0_BEL, 466 C0_SOH, C0_STX, C0_ETX, C0_EOT, C0_ENQ, C0_ACK, C0_BEL,
406 C0_BS , C0_HT , C0_LF , C0_VT , C0_FF , C0_CR , C0_SO , C0_SI , 467 C0_BS , C0_HT , C0_LF , C0_VT , C0_FF , C0_CR , C0_SO , C0_SI ,
… …
529#endif 590#endif
530 Color_scroll, 591 Color_scroll,
531#ifdef RXVT_SCROLLBAR 592#ifdef RXVT_SCROLLBAR
532 Color_trough, 593 Color_trough,
533#endif 594#endif
534#if ENABLE_TRANSPARENCY 595#if BG_IMAGE_FROM_ROOT
535 Color_tint, 596 Color_tint,
536#endif 597#endif
537#if OFF_FOCUS_FADING 598#if OFF_FOCUS_FADING
538 Color_fade, 599 Color_fade,
539#endif 600#endif
… …
687 748
688#define GET_ATTR(x) (((x) & RS_attrMask)) 749#define GET_ATTR(x) (((x) & RS_attrMask))
689// return attributes defining the background, encoding doesn't matter 750// return attributes defining the background, encoding doesn't matter
690// depends on RS_fgShift > RS_bgShift 751// depends on RS_fgShift > RS_bgShift
691#define GET_BGATTR(x) \ 752#define GET_BGATTR(x) \
692 (expect_false ((x) & RS_RVid) \ 753 (ecb_unlikely ((x) & RS_RVid) \
693 ? (((x) & (RS_attrMask & ~RS_RVid)) \ 754 ? (((x) & (RS_attrMask & ~RS_RVid)) \
694 | (((x) & RS_fgMask) >> (RS_fgShift - RS_bgShift))) \ 755 | (((x) & RS_fgMask) >> (RS_fgShift - RS_bgShift))) \
695 : ((x) & (RS_attrMask | RS_bgMask))) 756 : ((x) & (RS_attrMask | RS_bgMask)))
696#define SET_FGCOLOR(x,fg) (((x) & ~RS_fgMask) | ((fg) << RS_fgShift)) 757#define SET_FGCOLOR(x,fg) (((x) & ~RS_fgMask) | ((fg) << RS_fgShift))
697#define SET_BGCOLOR(x,bg) (((x) & ~RS_bgMask) | ((bg) << RS_bgShift)) 758#define SET_BGCOLOR(x,bg) (((x) & ~RS_bgMask) | ((bg) << RS_bgShift))
… …
725{ 786{
726 text_t *t; // terminal the text 787 text_t *t; // terminal the text
727 rend_t *r; // rendition, uses RS_ flags 788 rend_t *r; // rendition, uses RS_ flags
728 tlen_t_ l; // length of each text line 789 tlen_t_ l; // length of each text line
729 uint32_t f; // flags 790 uint32_t f; // flags
791
792 bool valid ()
793 {
794 return l >= 0;
795 }
796
797 void alloc ()
798 {
799 l = 0;
800 }
730 801
731 bool is_longer () 802 bool is_longer ()
732 { 803 {
733 return f & LINE_LONGER; 804 return f & LINE_LONGER;
734 } 805 }
… …
799// that are not representable in unicode, as well as characters 870// that are not representable in unicode, as well as characters
800// not fitting in the BMP. 871// not fitting in the BMP.
801struct compose_char 872struct compose_char
802{ 873{
803 unicode_t c1, c2; // any chars != NOCHAR are valid 874 unicode_t c1, c2; // any chars != NOCHAR are valid
875 #if __cplusplus >= 201103L || ECB_GCC_VERSION(4,4)
876 compose_char () = default;
877 #endif
804 compose_char (unicode_t c1, unicode_t c2) 878 compose_char (unicode_t c1, unicode_t c2)
805 : c1(c1), c2(c2) 879 : c1(c1), c2(c2)
806 { } 880 { }
807}; 881};
808 882
… …
890 * END······················= total_rows 964 * END······················= total_rows
891 */ 965 */
892 966
893struct TermWin_t 967struct TermWin_t
894{ 968{
969 int vt_width; /* actual window width [pixels] */
970 int vt_height; /* actual window height [pixels] */
895 int width; /* window width [pixels] */ 971 int width; /* window width [pixels] */
896 int height; /* window height [pixels] */ 972 int height; /* window height [pixels] */
897 int fwidth; /* font width [pixels] */ 973 int fwidth; /* font width [pixels] */
898 int fheight; /* font height [pixels] */ 974 int fheight; /* font height [pixels] */
899 int fbase; /* font ascent (baseline) [pixels] */ 975 int fbase; /* font ascent (baseline) [pixels] */
… …
908 int saveLines; /* number of lines that fit in scrollback */ 984 int saveLines; /* number of lines that fit in scrollback */
909 int total_rows; /* total number of rows in this terminal */ 985 int total_rows; /* total number of rows in this terminal */
910 int term_start; /* term lines start here */ 986 int term_start; /* term lines start here */
911 int view_start; /* scrollback view starts here */ 987 int view_start; /* scrollback view starts here */
912 int top_row; /* topmost row index of scrollback */ 988 int top_row; /* topmost row index of scrollback */
913 Window parent[6]; /* parent identifiers - we're parent[0] */ 989 Window parent; /* parent identifier */
914 Window vt; /* vt100 window */ 990 Window vt; /* vt100 window */
915 GC gc; /* GC for drawing */ 991 GC gc; /* GC for drawing */
916 Pixmap pixmap;
917 rxvt_drawable *drawable; 992 rxvt_drawable *drawable;
918 rxvt_fontset *fontset[4]; 993 rxvt_fontset *fontset[4];
919}; 994};
920 995
921/* 996/*
… …
1001 scrollBar_t scrollBar; 1076 scrollBar_t scrollBar;
1002 uint8_t options[(Opt_count + 7) >> 3]; 1077 uint8_t options[(Opt_count + 7) >> 3];
1003 XSizeHints szHint; 1078 XSizeHints szHint;
1004 rxvt_color *pix_colors; 1079 rxvt_color *pix_colors;
1005 Cursor TermWin_cursor; /* cursor for vt window */ 1080 Cursor TermWin_cursor; /* cursor for vt window */
1081
1006 line_t *row_buf; // all lines, scrollback + terminal, circular, followed by temp_buf 1082 line_t *row_buf; // all lines, scrollback + terminal, circular
1007 line_t *drawn_buf; // text on screen 1083 line_t *drawn_buf; // text on screen
1008 line_t *swap_buf; // lines for swap buffer 1084 line_t *swap_buf; // lines for swap buffer
1009 char *tabs; /* per location: 1 == tab-stop */ 1085 char *tabs; /* per location: 1 == tab-stop */
1010 screen_t screen; 1086 screen_t screen;
1011 screen_t swap; 1087 screen_t swap;
… …
1048 hidden_pointer:1, 1124 hidden_pointer:1,
1049#endif 1125#endif
1050 enc_utf8:1, /* whether locale uses utf-8 */ 1126 enc_utf8:1, /* whether locale uses utf-8 */
1051 seen_input:1, /* whether we have seen some program output yet */ 1127 seen_input:1, /* whether we have seen some program output yet */
1052 seen_resize:1, /* whether we had a resize event */ 1128 seen_resize:1, /* whether we had a resize event */
1129 init_done:1,
1053 parsed_geometry:1; 1130 parsed_geometry:1;
1054 1131
1055 unsigned char refresh_type, 1132 unsigned char refresh_type,
1056#ifdef META8_OPTION 1133#ifdef META8_OPTION
1057 meta_char, /* Alt-key prefix */ 1134 meta_char; /* Alt-key prefix */
1058#endif 1135#endif
1059 selection_wait,
1060 selection_type;
1061/* ---------- */ 1136/* ---------- */
1062 bool rvideo_state, rvideo_mode; 1137 bool rvideo_state, rvideo_mode;
1063#ifndef NO_BELL 1138#ifndef NO_BELL
1064 bool rvideo_bell; 1139 bool rvideo_bell;
1065#endif 1140#endif
… …
1069/* ---------- */ 1144/* ---------- */
1070 rend_t rstyle; 1145 rend_t rstyle;
1071/* ---------- */ 1146/* ---------- */
1072#ifdef SELECTION_SCROLLING 1147#ifdef SELECTION_SCROLLING
1073 int scroll_selection_lines; 1148 int scroll_selection_lines;
1074 enum page_dirn scroll_selection_dir;
1075 int selection_save_x, 1149 int selection_save_x,
1076 selection_save_y, 1150 selection_save_y,
1077 selection_save_state; 1151 selection_save_state;
1078#endif 1152#endif
1079/* ---------- */ 1153/* ---------- */
… …
1093 allowedxerror; 1167 allowedxerror;
1094/* ---------- */ 1168/* ---------- */
1095 unsigned int ModLevel3Mask, 1169 unsigned int ModLevel3Mask,
1096 ModMetaMask, 1170 ModMetaMask,
1097 ModNumLockMask; 1171 ModNumLockMask;
1098 int old_width, /* last used width in screen resize */
1099 old_height; /* last used height in screen resize */
1100 unsigned long priv_modes, 1172 unsigned long priv_modes,
1101 SavedModes; 1173 SavedModes;
1102/* ---------- */ 1174/* ---------- */
1103 Atom *xa; 1175 Atom *xa;
1104/* ---------- */ 1176/* ---------- */
1105 Time selection_time, 1177 Time selection_time,
1106 selection_request_time,
1107 clipboard_time; 1178 clipboard_time;
1179 rxvt_selection *selection_req;
1108 pid_t cmd_pid; /* process id of child */ 1180 pid_t cmd_pid; /* process id of child */
1109 char * incr_buf;
1110 size_t incr_buf_size, incr_buf_fill;
1111/* ---------- */ 1181/* ---------- */
1112 struct mouse_event MEvent; 1182 struct mouse_event MEvent;
1113 XComposeStatus compose; 1183 XComposeStatus compose;
1114 static struct termios def_tio; 1184 static struct termios def_tio;
1115 row_col_t oldcursor; 1185 row_col_t oldcursor;
1186
1116#ifdef HAVE_BG_PIXMAP 1187#ifdef HAVE_BG_PIXMAP
1117 void bg_init (); 1188 void bg_init ();
1118 void bg_destroy (); 1189 void bg_destroy ();
1119 1190
1120 enum {
1121 //subset returned by make_transparency_pixmap
1122 BG_IS_VALID = 1 << 0,
1123 BG_NEEDS_TINT = 1 << 1,
1124 BG_NEEDS_BLUR = 1 << 2,
1125
1126 BG_EFFECTS_FLAGS = BG_NEEDS_TINT | BG_NEEDS_BLUR,
1127
1128 BG_PROP_SCALE = 1 << 3,
1129 BG_ROOT_ALIGN = 1 << 4,
1130 BG_GEOMETRY_FLAGS = BG_PROP_SCALE | BG_ROOT_ALIGN,
1131
1132 BG_TINT_SET = 1 << 5,
1133 BG_TINT_BITAND = 1 << 6,
1134 BG_TINT_FLAGS = BG_NEEDS_TINT | BG_TINT_BITAND,
1135
1136 BG_HAS_RENDER = 1 << 7,
1137 BG_HAS_RENDER_CONV = 1 << 8,
1138 BG_CLIENT_RENDER = 1 << 9,
1139
1140 BG_IS_TRANSPARENT = 1 << 10,
1141 BG_NEEDS_REFRESH = 1 << 11,
1142 BG_IS_SIZE_SENSITIVE = 1 << 12,
1143 BG_IS_FROM_FILE = 1 << 13,
1144 };
1145
1146 unsigned int bg_flags;
1147
1148# ifdef BG_IMAGE_FROM_FILE 1191# if BG_IMAGE_FROM_FILE
1149 void get_image_geometry (int image_width, int image_height, int &w, int &h, int &x, int &y); 1192 rxvt_image fimage;
1150 bool render_image (unsigned long tr_flags); 1193 void render_image (rxvt_image &image);
1151
1152 enum {
1153 noScale = 0,
1154 windowScale = 100,
1155 defaultScale = windowScale,
1156 centerAlign = 50,
1157 defaultAlign = centerAlign,
1158 };
1159
1160 unsigned int h_scale, v_scale; /* percents of the window size */
1161 int h_align, v_align; /* percents of the window size:
1162 0 - left align, 50 - center, 100 - right */
1163
1164 bool bg_set_geometry (const char *geom, bool update = false);
1165 void bg_set_default_geometry ()
1166 {
1167 h_scale = v_scale = defaultScale;
1168 h_align = v_align = defaultAlign;
1169 }
1170
1171 bool bg_set_file (const char *file);
1172# endif 1194# endif
1173 1195
1174# ifdef ENABLE_TRANSPARENCY 1196# if BG_IMAGE_FROM_ROOT
1175 Pixmap root_pixmap; /* current root pixmap set */ 1197 rxvt_img *root_img;
1176 rxvt_color tint; 1198 image_effects root_effects;
1177 int shade;
1178 int h_blurRadius, v_blurRadius;
1179 1199
1180 bool bg_set_transparent (); 1200 void render_root_image ();
1181 void bg_set_root_pixmap ();
1182 void set_tint_shade_flags ();
1183 bool bg_set_tint (rxvt_color &new_tint);
1184 bool bg_set_shade (const char *shade_str);
1185 bool bg_set_blur (const char *geom);
1186
1187 bool blur_pixmap (Pixmap pixmap, Visual *visual, int width, int height);
1188 bool tint_pixmap (Pixmap pixmap, Visual *visual, int width, int height);
1189 unsigned long make_transparency_pixmap ();
1190# endif 1201# endif
1191 1202
1192 ev_tstamp bg_valid_since; 1203 ev_tstamp bg_valid_since;
1193 1204
1194 Pixmap bg_pixmap;
1195 unsigned int bg_pmap_width, bg_pmap_height;
1196
1197 int target_x;
1198 int target_y;
1199 bool bg_set_position (int x, int y);
1200 bool bg_window_size_sensitive (); 1205 bool bg_window_size_sensitive ();
1201 bool bg_window_position_sensitive (); 1206 bool bg_window_position_sensitive ();
1202 1207
1203 bool bg_render (); 1208 void bg_render ();
1204 void bg_invalidate () 1209#endif
1205 { 1210
1206 bg_flags &= ~BG_IS_VALID; 1211#ifdef HAVE_IMG
1212 enum {
1213 BG_IS_TRANSPARENT = 1 << 1,
1214 BG_NEEDS_REFRESH = 1 << 2,
1215 BG_INHIBIT_RENDER = 1 << 3,
1207 } 1216 };
1208#endif
1209#ifdef HAVE_AFTERIMAGE
1210 ASImage *original_asim;
1211 ASVisual *asv;
1212 ASImageManager *asimman;
1213 1217
1214 void init_asv () 1218 uint8_t bg_flags;
1215 { 1219
1216 if (!asv) 1220 rxvt_img *bg_img;
1217 asv = create_asvisual_for_id (dpy, display->screen, depth, XVisualIDFromVisual (visual), cmap, NULL);
1218 }
1219#endif
1220#ifdef HAVE_PIXBUF
1221 GdkPixbuf *pixbuf;
1222 bool pixbuf_to_pixmap (GdkPixbuf *pixbuf, Pixmap pixmap, GC gc,
1223 int src_x, int src_y, int dst_x, int dst_y,
1224 unsigned int width, unsigned int height);
1225#endif 1221#endif
1226 1222
1227#if ENABLE_OVERLAY 1223#if ENABLE_OVERLAY
1228 overlay_base ov; 1224 overlay_base ov;
1229 1225
… …
1237 void scr_overlay_set (int x, int y, const wchar_t *s) NOTHROW; 1233 void scr_overlay_set (int x, int y, const wchar_t *s) NOTHROW;
1238#endif 1234#endif
1239 1235
1240 vector<void *> allocated; // free these memory blocks with free() 1236 vector<void *> allocated; // free these memory blocks with free()
1241 1237
1242 char env_windowid[21]; /* environmental variable WINDOWID */ 1238 int parent_x, parent_y; // parent window position relative to root, only updated on demand
1243 char env_colorfgbg[sizeof ("COLORFGBG=default;default;bg") + 1];
1244 char *env_display; /* environmental variable DISPLAY */
1245 char *env_term; /* environmental variable TERM */
1246 1239
1247 char *locale; 1240 char *locale;
1248 char charsets[4]; 1241 char charsets[4];
1249 char *v_buffer; /* pointer to physical buffer */ 1242 char *v_buffer; /* pointer to physical buffer */
1250 unsigned int v_buflen; /* size of area to write */ 1243 unsigned int v_buflen; /* size of area to write */
… …
1262 char *cmdbuf_ptr, *cmdbuf_endp; 1255 char *cmdbuf_ptr, *cmdbuf_endp;
1263 char cmdbuf_base[CBUFSIZ]; 1256 char cmdbuf_base[CBUFSIZ];
1264 1257
1265 ptytty *pty; 1258 ptytty *pty;
1266 1259
1267 rxvt_salloc *talloc; // text line allocator 1260 // chunk contains all line_t's as well as rend_t and text_t buffers
1268 rxvt_salloc *ralloc; // rend line allocator 1261 // for drawn_buf, swap_buf and row_buf, in this order
1262 void *chunk;
1263 size_t chunk_size;
1269 1264
1270 static vector<rxvt_term *> termlist; // a vector of all running rxvt_term's 1265 static vector<rxvt_term *> termlist; // a vector of all running rxvt_term's
1271 1266
1272#if ENABLE_FRILLS || ISO_14755 1267#if ENABLE_FRILLS || ISO_14755
1273 // ISO 14755 entry support 1268 // ISO 14755 entry support
1274 unicode_t iso14755buf; 1269 unicode_t iso14755buf;
1275 void commit_iso14755 (); 1270 void commit_iso14755 ();
1276# if ISO_14755 1271# if ISO_14755
1277 void iso14755_51 (unicode_t ch, rend_t r = DEFAULT_RSTYLE, int x = 0, int y = -1); 1272 void iso14755_51 (unicode_t ch, rend_t r = DEFAULT_RSTYLE, int x = 0, int y = -1, int y2 = -1);
1278 void iso14755_54 (int x, int y); 1273 void iso14755_54 (int x, int y);
1279# endif 1274# endif
1280#endif 1275#endif
1281 1276
1282 long vt_emask, vt_emask_perl, vt_emask_xim, vt_emask_mouse; 1277 long vt_emask, vt_emask_perl, vt_emask_xim, vt_emask_mouse;
… …
1284 void vt_select_input () const NOTHROW 1279 void vt_select_input () const NOTHROW
1285 { 1280 {
1286 XSelectInput (dpy, vt, vt_emask | vt_emask_perl | vt_emask_xim | vt_emask_mouse); 1281 XSelectInput (dpy, vt, vt_emask | vt_emask_perl | vt_emask_xim | vt_emask_mouse);
1287 } 1282 }
1288 1283
1289#if ENABLE_TRANSPARENCY || ENABLE_PERL 1284#if BG_IMAGE_FROM_ROOT || ENABLE_PERL
1290 void rootwin_cb (XEvent &xev); 1285 void rootwin_cb (XEvent &xev);
1291 xevent_watcher rootwin_ev; 1286 xevent_watcher rootwin_ev;
1292#endif 1287#endif
1293#ifdef HAVE_BG_PIXMAP 1288#ifdef HAVE_BG_PIXMAP
1294 void update_background (); 1289 void update_background ();
… …
1304 void child_cb (ev::child &w, int revents); ev::child child_ev; 1299 void child_cb (ev::child &w, int revents); ev::child child_ev;
1305 void destroy_cb (ev::idle &w, int revents); ev::idle destroy_ev; 1300 void destroy_cb (ev::idle &w, int revents); ev::idle destroy_ev;
1306 void refresh_check (); 1301 void refresh_check ();
1307 void flush (); 1302 void flush ();
1308 void flush_cb (ev::timer &w, int revents); ev::timer flush_ev; 1303 void flush_cb (ev::timer &w, int revents); ev::timer flush_ev;
1304 void cmdbuf_reify ();
1305 void cmdbuf_append (const char *str, size_t count);
1309 bool pty_fill (); 1306 bool pty_fill ();
1310 void pty_cb (ev::io &w, int revents); ev::io pty_ev; 1307 void pty_cb (ev::io &w, int revents); ev::io pty_ev;
1311 void incr_cb (ev::timer &w, int revents) NOTHROW; ev::timer incr_ev;
1312 1308
1313#ifdef CURSOR_BLINK 1309#ifdef CURSOR_BLINK
1310 void cursor_blink_reset ();
1314 void cursor_blink_cb (ev::timer &w, int revents); ev::timer cursor_blink_ev; 1311 void cursor_blink_cb (ev::timer &w, int revents); ev::timer cursor_blink_ev;
1315#endif 1312#endif
1316#ifdef TEXT_BLINK 1313#ifdef TEXT_BLINK
1317 void text_blink_cb (ev::timer &w, int revents); ev::timer text_blink_ev; 1314 void text_blink_cb (ev::timer &w, int revents); ev::timer text_blink_ev;
1318#endif 1315#endif
… …
1337 void pointer_unblank (); 1334 void pointer_unblank ();
1338 1335
1339 void tt_printf (const char *fmt,...); 1336 void tt_printf (const char *fmt,...);
1340 void tt_write (const char *data, unsigned int len); 1337 void tt_write (const char *data, unsigned int len);
1341 void pty_write (); 1338 void pty_write ();
1342
1343 void init (stringvec *argv, stringvec *envv)
1344 {
1345 this->argv = argv;
1346 init (argv->size (), argv->begin (), envv);
1347 }
1348 1339
1349 void make_current () const // make this the "currently active" urxvt instance 1340 void make_current () const // make this the "currently active" urxvt instance
1350 { 1341 {
1351 SET_R (this); 1342 SET_R (this);
1352 set_environ (envv); 1343 set_environ (envv);
… …
1364 void im_set_size (XRectangle &size); 1355 void im_set_size (XRectangle &size);
1365 void im_set_position (XPoint &pos) NOTHROW; 1356 void im_set_position (XPoint &pos) NOTHROW;
1366 void im_set_color (unsigned long &fg, unsigned long &bg); 1357 void im_set_color (unsigned long &fg, unsigned long &bg);
1367 void im_set_preedit_area (XRectangle &preedit_rect, XRectangle &status_rect, const XRectangle &needed_rect); 1358 void im_set_preedit_area (XRectangle &preedit_rect, XRectangle &status_rect, const XRectangle &needed_rect);
1368 1359
1369 bool IMisRunning (); 1360 bool im_is_running ();
1370 void IMSendSpot (); 1361 void im_send_spot ();
1371 bool IM_get_IC (const char *modifiers); 1362 bool im_get_ic (const char *modifiers);
1372 void IMSetPosition (); 1363 void im_set_position ();
1373#endif 1364#endif
1374 1365
1375 // command.C 1366 // command.C
1376 void key_press (XKeyEvent &ev); 1367 void key_press (XKeyEvent &ev);
1377 void key_release (XKeyEvent &ev); 1368 void key_release (XKeyEvent &ev);
1378 unsigned int cmd_write (const char *str, unsigned int count);
1379 1369
1380 wchar_t next_char () NOTHROW; 1370 wchar_t next_char () NOTHROW;
1381 wchar_t cmd_getc () THROW ((class out_of_input)); 1371 wchar_t cmd_getc () THROW ((class out_of_input));
1382 uint32_t next_octet () NOTHROW; 1372 uint32_t next_octet () NOTHROW;
1383 uint32_t cmd_get8 () THROW ((class out_of_input)); 1373 uint32_t cmd_get8 () THROW ((class out_of_input));
… …
1410 void process_color_seq (int report, int color, const char *str, char resp); 1400 void process_color_seq (int report, int color, const char *str, char resp);
1411 void process_xterm_seq (int op, char *str, char resp); 1401 void process_xterm_seq (int op, char *str, char resp);
1412 int privcases (int mode, unsigned long bit); 1402 int privcases (int mode, unsigned long bit);
1413 void process_terminal_mode (int mode, int priv, unsigned int nargs, const int *arg); 1403 void process_terminal_mode (int mode, int priv, unsigned int nargs, const int *arg);
1414 void process_sgr_mode (unsigned int nargs, const int *arg); 1404 void process_sgr_mode (unsigned int nargs, const int *arg);
1415 void process_graphics (); 1405 void set_cursor_style (int style);
1416 // init.C 1406 // init.C
1407 void init (stringvec *argv, stringvec *envv);
1408 void init (int argc, const char *const *argv, const char *const *envv);
1409 void init2 (int argc, const char *const *argv);
1417 void init_vars (); 1410 void init_vars ();
1418 const char **init_resources (int argc, const char *const *argv); 1411 const char **init_resources (int argc, const char *const *argv);
1419 void init (int argc, const char *const *argv, stringvec *envv);
1420 void init_env (); 1412 void init_env ();
1421 void set_locale (const char *locale); 1413 void set_locale (const char *locale);
1422 void init_xlocale (); 1414 void init_xlocale ();
1423 void init_command (const char *const *argv); 1415 void init_command (const char *const *argv);
1424 void run_command (const char *const *argv); 1416 void run_command (const char *const *argv);
… …
1442 void set_mbstring_property (Atom prop, const char *str, int len = -1); 1434 void set_mbstring_property (Atom prop, const char *str, int len = -1);
1443 void set_utf8_property (Atom prop, const char *str, int len = -1); 1435 void set_utf8_property (Atom prop, const char *str, int len = -1);
1444 void set_title (const char *str); 1436 void set_title (const char *str);
1445 void set_icon_name (const char *str); 1437 void set_icon_name (const char *str);
1446 void set_window_color (int idx, const char *color); 1438 void set_window_color (int idx, const char *color);
1447 void set_colorfgbg (); 1439 char *get_colorfgbg ();
1448 bool set_color (rxvt_color &color, const char *name); 1440 bool set_color (rxvt_color &color, const char *name);
1449 void alias_color (int dst, int src); 1441 void alias_color (int dst, int src);
1450 void set_widthheight (unsigned int newwidth, unsigned int newheight); 1442 void set_widthheight (unsigned int newwidth, unsigned int newheight);
1451 void get_window_origin (int &x, int &y); 1443 void get_window_origin (int &x, int &y);
1452 Pixmap get_pixmap_property (Atom property);
1453 1444
1454 // screen.C 1445 // screen.C
1455 1446
1456 void lalloc (line_t &l) const 1447 bool option (uint8_t opt) const NOTHROW
1457 { 1448 {
1458 l.t = (text_t *)talloc->alloc (); 1449 return options[opt >> 3] & (1 << (opt & 7));
1459 l.r = (rend_t *)ralloc->alloc ();
1460 } 1450 }
1461 1451
1462#if 0 1452 void set_option (uint8_t opt, bool set = true) NOTHROW;
1463 void lfree (line_t &l)
1464 {
1465 talloc->free (l.t);
1466 ralloc->free (l.r);
1467 }
1468#endif
1469
1470 void lresize (line_t &l) const
1471 {
1472 if (!l.t)
1473 return;
1474
1475 l.t = (text_t *)talloc->alloc (l.t, prev_ncol * sizeof (text_t));
1476 l.r = (rend_t *)ralloc->alloc (l.r, prev_ncol * sizeof (rend_t));
1477
1478 l.l = min (l.l, ncol);
1479
1480 if (ncol > prev_ncol)
1481 scr_blank_line (l, prev_ncol, ncol - prev_ncol, DEFAULT_RSTYLE);
1482 }
1483 1453
1484 int fgcolor_of (rend_t r) const NOTHROW 1454 int fgcolor_of (rend_t r) const NOTHROW
1485 { 1455 {
1486 int base = GET_BASEFG (r); 1456 int base = GET_BASEFG (r);
1487#ifndef NO_BRIGHTCOLOR 1457#ifndef NO_BRIGHTCOLOR
1488 if (r & RS_Bold 1458 if (r & RS_Bold
1489# if ENABLE_STYLES 1459# if ENABLE_STYLES
1490 && option (Opt_intensityStyles) 1460 && option (Opt_intensityStyles)
1491# endif 1461# endif
1492 && IN_RANGE_INC (base, minCOLOR, minBrightCOLOR)) 1462 && IN_RANGE_EXC (base, minCOLOR, minBrightCOLOR))
1493 base += minBrightCOLOR - minCOLOR; 1463 base += minBrightCOLOR - minCOLOR;
1494#endif 1464#endif
1495 return base; 1465 return base;
1496 } 1466 }
1497 1467
… …
1501#ifndef NO_BRIGHTCOLOR 1471#ifndef NO_BRIGHTCOLOR
1502 if (r & RS_Blink 1472 if (r & RS_Blink
1503# if ENABLE_STYLES 1473# if ENABLE_STYLES
1504 && option (Opt_intensityStyles) 1474 && option (Opt_intensityStyles)
1505# endif 1475# endif
1506 && IN_RANGE_INC (base, minCOLOR, minBrightCOLOR)) 1476 && IN_RANGE_EXC (base, minCOLOR, minBrightCOLOR))
1507 base += minBrightCOLOR - minCOLOR; 1477 base += minBrightCOLOR - minCOLOR;
1508#endif 1478#endif
1509 return base; 1479 return base;
1510 }
1511
1512 bool option (uint8_t opt) const NOTHROW
1513 {
1514 return options[opt >> 3] & (1 << (opt & 7));
1515 }
1516
1517 void set_option (uint8_t opt, bool set = true) NOTHROW;
1518
1519 void set_privmode (unsigned bit, int set) NOTHROW
1520 {
1521 if (set)
1522 priv_modes |= bit;
1523 else
1524 priv_modes &= ~bit;
1525 } 1480 }
1526 1481
1527 // modifies first argument(!) 1482 // modifies first argument(!)
1528 void tt_paste (char *data, unsigned int len) NOTHROW; 1483 void tt_paste (char *data, unsigned int len) NOTHROW;
1529 void paste (char *data, unsigned int len) NOTHROW; 1484 void paste (char *data, unsigned int len) NOTHROW;
1485 void scr_alloc () NOTHROW;
1530 void scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) const NOTHROW; 1486 void scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) const NOTHROW;
1531 void scr_blank_screen_mem (line_t &l, rend_t efs) const NOTHROW; 1487 void scr_blank_screen_mem (line_t &l, rend_t efs) const NOTHROW;
1532 void scr_kill_char (line_t &l, int col) const NOTHROW; 1488 void scr_kill_char (line_t &l, int col) const NOTHROW;
1489 void scr_set_char_rend (line_t &l, int col, rend_t rend);
1533 int scr_scroll_text (int row1, int row2, int count) NOTHROW; 1490 int scr_scroll_text (int row1, int row2, int count) NOTHROW;
1491 void copy_line (line_t &dst, line_t &src);
1534 void scr_reset (); 1492 void scr_reset ();
1535 void scr_release () NOTHROW; 1493 void scr_release () NOTHROW;
1536 void scr_clear (bool really = false) NOTHROW; 1494 void scr_clear (bool really = false) NOTHROW;
1537 void scr_refresh () NOTHROW; 1495 void scr_refresh () NOTHROW;
1538 bool scr_refresh_rend (rend_t mask, rend_t value) NOTHROW; 1496 bool scr_refresh_rend (rend_t mask, rend_t value) NOTHROW;
… …
1577 void scr_report_position () NOTHROW; 1535 void scr_report_position () NOTHROW;
1578 void set_font_style () NOTHROW; 1536 void set_font_style () NOTHROW;
1579 void scr_charset_choose (int set) NOTHROW; 1537 void scr_charset_choose (int set) NOTHROW;
1580 void scr_charset_set (int set, unsigned int ch) NOTHROW; 1538 void scr_charset_set (int set, unsigned int ch) NOTHROW;
1581 void scr_move_to (int y, int len) NOTHROW; 1539 void scr_move_to (int y, int len) NOTHROW;
1540 bool scr_page (int nlines) NOTHROW;
1582 bool scr_page (enum page_dirn direction, int nlines) NOTHROW; 1541 bool scr_page (enum page_dirn direction, int nlines) NOTHROW
1542 {
1543 return scr_page (direction * nlines);
1544 }
1583 bool scr_changeview (int new_view_start) NOTHROW; 1545 bool scr_changeview (int new_view_start) NOTHROW;
1584 void scr_bell () NOTHROW; 1546 void scr_bell () NOTHROW;
1585 void scr_printscreen (int fullhist) NOTHROW; 1547 void scr_printscreen (int fullhist) NOTHROW;
1586 void scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle1, rend_t rstyle2) NOTHROW; 1548 void scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle1, rend_t rstyle2) NOTHROW;
1587 void scr_xor_span (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle) NOTHROW; 1549 void scr_xor_span (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle) NOTHROW;
1588 void scr_reverse_selection () NOTHROW; 1550 void scr_reverse_selection () NOTHROW;
1589 void scr_dump (int fd) NOTHROW; 1551 void scr_dump (int fd) NOTHROW;
1590 1552
1591 void selection_check (int check_more) NOTHROW; 1553 void selection_check (int check_more) NOTHROW;
1592 void selection_paste (Window win, Atom prop, bool delete_prop) NOTHROW; 1554 void selection_changed () NOTHROW; /* sets want_refresh, corrects coordinates */
1593 void selection_property (Window win, Atom prop) NOTHROW;
1594 void selection_request (Time tm, int selnum = Sel_Primary) NOTHROW; 1555 void selection_request (Time tm, int selnum = Sel_Primary) NOTHROW;
1595 int selection_request_other (Atom target, int selnum) NOTHROW;
1596 void selection_clear (bool clipboard = false) NOTHROW; 1556 void selection_clear (bool clipboard = false) NOTHROW;
1597 void selection_make (Time tm); 1557 void selection_make (Time tm);
1598 bool selection_grab (Time tm, bool clipboard = false) NOTHROW; 1558 bool selection_grab (Time tm, bool clipboard = false) NOTHROW;
1599 void selection_start_colrow (int col, int row) NOTHROW; 1559 void selection_start_colrow (int col, int row) NOTHROW;
1600 void selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) NOTHROW; 1560 void selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) NOTHROW;
… …
1604 void selection_click (int clicks, int x, int y) NOTHROW; 1564 void selection_click (int clicks, int x, int y) NOTHROW;
1605 void selection_extend (int x, int y, int flag) NOTHROW; 1565 void selection_extend (int x, int y, int flag) NOTHROW;
1606 void selection_rotate (int x, int y) NOTHROW; 1566 void selection_rotate (int x, int y) NOTHROW;
1607 1567
1608 // xdefaults.C 1568 // xdefaults.C
1569 void rxvt_usage (int type);
1609 void get_options (int argc, const char *const *argv); 1570 const char **get_options (int argc, const char *const *argv);
1610 int parse_keysym (const char *str, const char *arg); 1571 int parse_keysym (const char *str, const char *arg);
1611 const char *x_resource (const char *name); 1572 const char *x_resource (const char *name);
1612 void extract_resources (); 1573 void extract_resources ();
1574 void extract_keysym_resources ();
1613}; 1575};
1614 1576
1615#endif /* _RXVT_H_ */ 1577#endif /* _RXVT_H_ */
1616 1578

Diff Legend

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