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.206 by root, Mon Jan 16 08:29:57 2006 UTC vs.
Revision 1.230 by root, Fri Jan 20 22:49:34 2006 UTC

… …
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 CURSOR_BLINK 1 20# define CURSOR_BLINK 1
21#else
22# define ENABLE_MINIMAL 1
21#endif 23#endif
22 24
23#include <limits.h> 25#include <limits.h>
24 26
25#include <X11/cursorfont.h> 27#include <X11/cursorfont.h>
… …
35#include "rxvttoolkit.h" 37#include "rxvttoolkit.h"
36#include "iom.h" 38#include "iom.h"
37#include "salloc.h" 39#include "salloc.h"
38 40
39#include "rxvtperl.h" 41#include "rxvtperl.h"
42
43// try to avoid some macros to decrease code size, on some systems
44#if ENABLE_MINIMAL
45# define strcmp(a,b) (strcmp)(a,b)
46# define strlen(a) (strlen)(a)
47# define strcpy(a,b) (strcpy)(a,b)
48# define memset(a,c,l) (memset)(a,c,l)
49# define memcpy(a,b,l) (memcpy)(a,b,l)
50#endif
40 51
41/* 52/*
42 ***************************************************************************** 53 *****************************************************************************
43 * SYSTEM HACKS 54 * SYSTEM HACKS
44 ***************************************************************************** 55 *****************************************************************************
… …
83# define STDIN_FILENO 0 94# define STDIN_FILENO 0
84# define STDOUT_FILENO 1 95# define STDOUT_FILENO 1
85# define STDERR_FILENO 2 96# define STDERR_FILENO 2
86#endif 97#endif
87 98
99/****************************************************************************/
100
101#ifndef __attribute__
102# if __GNUC__
103# if (__GNUC__ == 2 && __GNUC_MINOR__ < 5) || (__GNUC__ < 2)
104# define __attribute__(x)
105# endif
106# endif
107# define __attribute__(x)
108#endif
109
110#define NORETURN __attribute__ ((noreturn))
111#define UNUSED __attribute__ ((unused))
112
113// increases code size unless -fno-enforce-eh-specs
114#if __GNUC__
115# define NOTHROW
116# define THROW(x)
117#else
118# define NOTHROW throw()
119# define THROW(x) throw x
120#endif
121
122// exception thrown on fatal (per-instance) errors
123class rxvt_failure_exception { };
124
125// exception thrown when the command parser runs out of input data
126class out_of_input { };
127
88/* 128/*
89 ***************************************************************************** 129 *****************************************************************************
90 * PROTOTYPES 130 * PROTOTYPES
91 ***************************************************************************** 131 *****************************************************************************
92 */ 132 */
93// main.C 133// main.C
94RETSIGTYPE rxvt_Child_signal (int sig); 134RETSIGTYPE rxvt_Child_signal (int sig) NOTHROW;
95RETSIGTYPE rxvt_Exit_signal (int sig); 135RETSIGTYPE rxvt_Exit_signal (int sig) NOTHROW;
96void rxvt_clean_exit (); 136void rxvt_clean_exit () NOTHROW;
97void * rxvt_malloc (size_t size); 137void * rxvt_malloc (size_t size);
98void * rxvt_calloc (size_t number, size_t size); 138void * rxvt_calloc (size_t number, size_t size);
99void * rxvt_realloc (void *ptr, size_t size); 139void * rxvt_realloc (void *ptr, size_t size);
100void rxvt_privileges (rxvt_privaction action);
101 140
102// util.C 141// misc.C
103char * rxvt_wcstombs (const wchar_t *str, int len = -1); 142char * rxvt_wcstombs (const wchar_t *str, int len = -1);
104wchar_t * rxvt_mbstowcs (const char *str, int len = -1); 143wchar_t * rxvt_mbstowcs (const char *str, int len = -1);
105char * rxvt_wcstoutf8 (const wchar_t *str, int len = -1); 144char * rxvt_wcstoutf8 (const wchar_t *str, int len = -1);
106wchar_t * rxvt_utf8towcs (const char *str, int len = -1); 145wchar_t * rxvt_utf8towcs (const char *str, int len = -1);
107char * rxvt_strdup (const char *str);
108 146
109// misc.C 147#define rxvt_strdup(s) ((s) ? strdup(s) : 0)
148
110char * rxvt_r_basename (const char *str); 149char * rxvt_r_basename (const char *str) NOTHROW;
111void rxvt_vlog (const char *fmt, va_list arg_ptr); 150void rxvt_vlog (const char *fmt, va_list arg_ptr) NOTHROW;
112void rxvt_log (const char *fmt,...); 151void rxvt_log (const char *fmt,...) NOTHROW;
113void rxvt_warn (const char *fmt,...); 152void rxvt_warn (const char *fmt,...) NOTHROW;
114void rxvt_fatal (const char *fmt,...); 153void rxvt_fatal (const char *fmt, ...) THROW ((class rxvt_failure_exception)) NORETURN;
115void rxvt_exit_failure (); 154void rxvt_exit_failure () THROW ((class rxvt_failure_exception)) NORETURN;
155
116int rxvt_Str_match (const char *s1, const char *s2); 156int rxvt_Str_match (const char *s1, const char *s2) NOTHROW;
117const char * rxvt_Str_skip_space (const char *str); 157const char * rxvt_Str_skip_space (const char *str) NOTHROW;
118char * rxvt_Str_trim (char *str); 158char * rxvt_Str_trim (char *str) NOTHROW;
119int rxvt_Str_escaped (char *str); 159int rxvt_Str_escaped (char *str) NOTHROW;
120char ** rxvt_splitcommastring (const char *cs); 160char ** rxvt_splitcommastring (const char *cs) NOTHROW;
121void rxvt_freecommastring (char **cs); 161void rxvt_freecommastring (char **cs) NOTHROW;
122char * rxvt_File_find (const char *file, const char *ext, const char *path); 162char * rxvt_File_find (const char *file, const char *ext, const char *path) NOTHROW;
123void rxvt_Draw_Shadow (Display *display, Window win, GC topShadow, GC botShadow, int x, int y, int w, int h);
124void rxvt_Draw_Triangle (Display *display, Window win, GC topShadow, GC botShadow, int x, int y, int w, int type);
125void rxvt_usleep (int usecs); 163void rxvt_usleep (int usecs) NOTHROW;
126 164
127///////////////////////////////////////////////////////////////////////////// 165/////////////////////////////////////////////////////////////////////////////
128 166
129// temporarily replace the process environment 167// temporarily replace the process environment
130extern char **environ; 168extern char **environ;
… …
147 * STRUCTURES AND TYPEDEFS 185 * STRUCTURES AND TYPEDEFS
148 ***************************************************************************** 186 *****************************************************************************
149 */ 187 */
150struct grwin_t; 188struct grwin_t;
151 189
152/* Sanitize menubar info */
153#ifndef MENUBAR
154# undef MENUBAR_MAX
155#endif
156#ifndef MENUBAR_MAX
157# define MENUBAR_MAX 0
158#endif
159
160/* If we're using either the rxvt scrollbar or menu bars, keep the 190/* If we're using either the rxvt scrollbar, keep the
161 * scrollColor resource. 191 * scrollColor resource.
162 */ 192 */
163#if defined(RXVT_SCROLLBAR) || defined(NEXT_SCROLLBAR) || defined(MENUBAR) || defined(PLAIN_SCROLLBAR) 193#if defined(RXVT_SCROLLBAR) || defined(NEXT_SCROLLBAR) || defined(PLAIN_SCROLLBAR)
164# define KEEP_SCROLLCOLOR 1 194# define KEEP_SCROLLCOLOR 1
165#else 195#else
166# undef KEEP_SCROLLCOLOR 196# undef KEEP_SCROLLCOLOR
167#endif 197#endif
168 198
… …
170typedef struct { 200typedef struct {
171 short w, h, x, y; 201 short w, h, x, y;
172 Pixmap pixmap; 202 Pixmap pixmap;
173} bgPixmap_t; 203} bgPixmap_t;
174#endif 204#endif
205
206struct rxvt_ptytty {
207 int pty; // pty file descriptor; connected to rxvt
208 int tty; // tty file descriptor; connected to child
209
210 rxvt_ptytty ()
211 : pty(-1), tty(-1)
212 {
213 }
214
215 virtual ~rxvt_ptytty ()
216 {
217 }
218
219 virtual bool get () = 0;
220#if UTMP_SUPPORT
221 virtual void login (int cmd_pid, bool login_shell, const char *hostname) = 0;
222#endif
223
224 void close_tty ();
225 bool make_controlling_tty ();
226 void set_utf8_mode (bool on);
227};
228
229rxvt_ptytty *rxvt_new_ptytty (); // create a new pty object
230void rxvt_ptytty_server (); // start the ptytty server process
175 231
176/* 232/*
177 * the 'essential' information for reporting Mouse Events 233 * the 'essential' information for reporting Mouse Events
178 * pared down from XButtonEvent 234 * pared down from XButtonEvent
179 */ 235 */
… …
249#ifndef EXIT_SUCCESS /* missing from <stdlib.h> */ 305#ifndef EXIT_SUCCESS /* missing from <stdlib.h> */
250# define EXIT_SUCCESS 0 /* exit function success */ 306# define EXIT_SUCCESS 0 /* exit function success */
251# define EXIT_FAILURE 1 /* exit function failure */ 307# define EXIT_FAILURE 1 /* exit function failure */
252#endif 308#endif
253 309
254#define menuBar_esc 10
255#define scrollBar_esc 30 310#define scrollBar_esc 30
256#define menuBar_margin 2 /* margin below text */
257 311
258#if defined(RXVT_SCROLLBAR) || defined(NEXT_SCROLLBAR) || defined(XTERM_SCROLLBAR) || defined(PLAIN_SCROLLBAR) 312#if defined(RXVT_SCROLLBAR) || defined(NEXT_SCROLLBAR) || defined(XTERM_SCROLLBAR) || defined(PLAIN_SCROLLBAR)
259# define HAVE_SCROLLBARS 1 313# define HAVE_SCROLLBARS 1
260#endif
261
262/* width of scrollBar, menuBar shadow, must be 1 or 2 */
263#ifdef HALFSHADOW
264# define MENU_SHADOW 1
265#else
266# define MENU_SHADOW 2
267#endif 314#endif
268 315
269#define R_SB_ALIGN_CENTRE 0 316#define R_SB_ALIGN_CENTRE 0
270#define R_SB_ALIGN_TOP 1 317#define R_SB_ALIGN_TOP 1
271#define R_SB_ALIGN_BOTTOM 2 318#define R_SB_ALIGN_BOTTOM 2
… …
344 * | 391 * |
345 * +---< SB_WIDTH_NEXT 392 * +---< SB_WIDTH_NEXT
346 */ 393 */
347 394
348enum { 395enum {
349 NO_REFRESH = 0 , /* Window not visible at all! */ 396 NO_REFRESH = 0, /* Window not visible at all! */
350 FAST_REFRESH = 1<<0, /* Fully exposed window */ 397 FAST_REFRESH = 1, /* Fully exposed window */
351 SLOW_REFRESH = 1<<1, /* Partially exposed window */ 398 SLOW_REFRESH = 2, /* Partially exposed window */
352 SMOOTH_REFRESH = 1<<2, /* Do sync'ing to make it smooth */
353}; 399};
354 400
355#ifdef NO_SECONDARY_SCREEN 401#ifdef NO_SECONDARY_SCREEN
356# define NSCREENS 0 402# define NSCREENS 0
357#else 403#else
… …
480 Rxvt_restoreFG = 39, // change default fg color 526 Rxvt_restoreFG = 39, // change default fg color
481 Rxvt_restoreBG = 49, // change default bg color 527 Rxvt_restoreBG = 49, // change default bg color
482 Rxvt_dumpscreen = 55, // dump scrollback and all of screen 528 Rxvt_dumpscreen = 55, // dump scrollback and all of screen
483 529
484 URxvt_locale = 701, // change locale 530 URxvt_locale = 701, // change locale
485 URxvt_Menu = 703, // set menu item 531
486 URxvt_Color_IT = 704, // change actual 'Italic' colour 532 URxvt_Color_IT = 704, // change actual 'Italic' colour
487 URxvt_Color_tint = 705, // change actual tint colour 533 URxvt_Color_tint = 705, // change actual tint colour
488 URxvt_Color_BD = 706, 534 URxvt_Color_BD = 706,
489 URxvt_Color_UL = 707, 535 URxvt_Color_UL = 707,
490 536
… …
618#endif 664#endif
619#if TRANSPARENT 665#if TRANSPARENT
620 XA_XROOTPMAP_ID, 666 XA_XROOTPMAP_ID,
621 XA_ESETROOT_PMAP_ID, 667 XA_ESETROOT_PMAP_ID,
622#endif 668#endif
623#if OFFIX_DND /* OffiX Dnd (drag 'n' drop) support */
624 XA_DNDPROTOCOL,
625 XA_DNDSELECTION,
626#endif
627#if ENABLE_XEMBED 669#if ENABLE_XEMBED
628 XA_XEMBED, 670 XA_XEMBED,
629 XA_XEMBED_INFO, 671 XA_XEMBED_INFO,
630#endif 672#endif
631 NUM_XA 673 NUM_XA
… …
645#define PrivMode_ShiftKeys (1UL<<10) 687#define PrivMode_ShiftKeys (1UL<<10)
646#define PrivMode_VisibleCursor (1UL<<11) 688#define PrivMode_VisibleCursor (1UL<<11)
647#define PrivMode_MouseX10 (1UL<<12) 689#define PrivMode_MouseX10 (1UL<<12)
648#define PrivMode_MouseX11 (1UL<<13) 690#define PrivMode_MouseX11 (1UL<<13)
649#define PrivMode_scrollBar (1UL<<14) 691#define PrivMode_scrollBar (1UL<<14)
650#define PrivMode_menuBar (1UL<<15)
651#define PrivMode_TtyOutputInh (1UL<<16) 692#define PrivMode_TtyOutputInh (1UL<<15)
652#define PrivMode_Keypress (1UL<<17) 693#define PrivMode_Keypress (1UL<<16)
653#define PrivMode_smoothScroll (1UL<<18) 694#define PrivMode_smoothScroll (1UL<<17)
654#define PrivMode_vt52 (1UL<<19) 695#define PrivMode_vt52 (1UL<<18)
655#define PrivMode_LFNL (1UL<<20) 696#define PrivMode_LFNL (1UL<<19)
656/* too annoying to implement X11 highlight tracking */ 697/* too annoying to implement X11 highlight tracking */
657/* #define PrivMode_MouseX11Track (1LU<<21) */ 698/* #define PrivMode_MouseX11Track (1LU<<20) */
658 699
659#define PrivMode_mouse_report (PrivMode_MouseX10|PrivMode_MouseX11) 700#define PrivMode_mouse_report (PrivMode_MouseX10|PrivMode_MouseX11)
660#define PrivMode(test,bit) \ 701#define PrivMode(test,bit) \
661 if (test) \ 702 if (test) \
662 priv_modes |= (bit); \ 703 priv_modes |= (bit); \
… …
709/* 750/*
710 ***************************************************************************** 751 *****************************************************************************
711 * MACRO DEFINES 752 * MACRO DEFINES
712 ***************************************************************************** 753 *****************************************************************************
713 */ 754 */
755#define dLocal(type,name) type const name = this->name
714#define dDisp Display *disp = display->display 756#define dDisp Display *disp = this->display->display
715 757
716/* convert pixel dimensions to row/column values. Everything as int32_t */ 758/* convert pixel dimensions to row/column values. Everything as int32_t */
717#define Pixel2Col(x) Pixel2Width((int32_t)(x)) 759#define Pixel2Col(x) Pixel2Width((int32_t)(x))
718#define Pixel2Row(y) Pixel2Height((int32_t)(y)) 760#define Pixel2Row(y) Pixel2Height((int32_t)(y))
719#define Pixel2Width(x) ((int32_t)(x) / (int32_t)fwidth) 761#define Pixel2Width(x) ((int32_t)(x) / (int32_t)fwidth)
… …
792#define scrollbar_below_slider(y) ((y) > scrollBar.bot) 834#define scrollbar_below_slider(y) ((y) > scrollBar.bot)
793#define scrollbar_position(y) ((y) - scrollBar.beg) 835#define scrollbar_position(y) ((y) - scrollBar.beg)
794#define scrollbar_size() (scrollBar.end - scrollBar.beg \ 836#define scrollbar_size() (scrollBar.end - scrollBar.beg \
795 - scrollbar_minheight ()) 837 - scrollbar_minheight ())
796 838
797#if (MENUBAR_MAX > 1)
798/* rendition style flags */
799# define menuBar_height() (fheight + MENU_SHADOW)
800# define menuBar_TotalHeight() (menuBar_height() + MENU_SHADOW + menuBar_margin)
801# define isMenuBarWindow(w) ((w) == menuBar.win)
802#else
803# define menuBar_height() (0)
804# define menuBar_TotalHeight() (0)
805# define isMenuBarWindow(w) (0)
806#endif
807
808#ifdef XPM_BACKGROUND 839#ifdef XPM_BACKGROUND
809# define XPMClearArea(a, b, c, d, e, f, g) XClearArea((a), (b), (c), (d), (e), (f), (g)) 840# define XPMClearArea(a, b, c, d, e, f, g) XClearArea((a), (b), (c), (d), (e), (f), (g))
810#else 841#else
811# define XPMClearArea(a, b, c, d, e, f, g) 842# define XPMClearArea(a, b, c, d, e, f, g)
812#endif 843#endif
813 844
814#ifdef UTMP_SUPPORT
815# if !defined(RXVT_UTMPX_FILE) || !defined(HAVE_STRUCT_UTMPX)
816# undef HAVE_UTMPX_H
817# undef HAVE_STRUCT_UTMPX
818# endif
819# if !defined(RXVT_UTMP_FILE) || !defined(HAVE_STRUCT_UTMP)
820# undef HAVE_UTMP_H
821# undef HAVE_STRUCT_UTMP
822# endif
823
824# ifdef HAVE_UTMPX_H
825# include <utmpx.h>
826# endif
827# ifdef HAVE_UTMP_H
828# include <utmp.h>
829# endif
830#endif
831
832#ifdef DEBUG_CMD 845#ifdef DEBUG_CMD
833# define D_CMD(x) fprintf x ; fputc('\n', stderr) 846# define D_CMD(x) fprintf x ; fputc('\n', stderr)
834#else 847#else
835# define D_CMD(x) 848# define D_CMD(x)
836#endif 849#endif
… …
848# define D_SIZE(x) fprintf x ; fputc('\n', stderr) 861# define D_SIZE(x) fprintf x ; fputc('\n', stderr)
849#else 862#else
850# define D_SIZE(x) 863# define D_SIZE(x)
851#endif 864#endif
852 865
853extern class rxvt_failure_exception { } rxvt_failure_exception;
854
855typedef callback1<void, const char *> log_callback; 866typedef callback1<void, const char *> log_callback;
856typedef callback1<int, int> getfd_callback; 867typedef callback1<int, int> getfd_callback;
857 868
858extern void rxvt_vlog (const char *fmt, va_list arg_ptr);
859extern void rxvt_log (const char *fmt, ...);
860extern void rxvt_warn (const char *fmt, ...);
861extern void rxvt_fatal (const char *fmt, ...) __attribute__ ((noreturn));
862extern void rxvt_exit_failure () __attribute__ ((noreturn));
863
864#define SET_LOCALE(locale) rxvt_set_locale (locale) 869#define SET_LOCALE(locale) rxvt_set_locale (locale)
865extern bool rxvt_set_locale (const char *locale); 870extern bool rxvt_set_locale (const char *locale) NOTHROW;
866extern void rxvt_push_locale (const char *locale); 871extern void rxvt_push_locale (const char *locale) NOTHROW;
867extern void rxvt_pop_locale (); 872extern void rxvt_pop_locale () NOTHROW;
868
869/****************************************************************************/
870
871#ifdef MENUBAR
872# include "menubar.h"
873#endif
874
875#define BLINK_INTERVAL 0.5
876#define TEXT_BLINK_INTERVAL 0.5
877
878#ifndef __attribute__
879# ifdef __GNUC__
880# if (__GNUC__ == 2 && __GNUC_MINOR__ < 5) || (__GNUC__ < 2)
881# define __attribute__(x)
882# endif
883# endif
884# define __attribute__(x)
885#endif
886 873
887/****************************************************************************/ 874/****************************************************************************/
888 875
889#define LINE_LONGER 0x0001 // line is continued on the next row 876#define LINE_LONGER 0x0001 // line is continued on the next row
890#define LINE_FILTERED 0x0002 // line has been filtered 877#define LINE_FILTERED 0x0002 // line has been filtered
… …
1009#if defined(XPM_BACKGROUND) || defined(TRANSPARENT) 996#if defined(XPM_BACKGROUND) || defined(TRANSPARENT)
1010 am_transparent:1, /* is a transparent term */ 997 am_transparent:1, /* is a transparent term */
1011 am_pixmap_trans:1, /* transparency w/known root pixmap */ 998 am_pixmap_trans:1, /* transparency w/known root pixmap */
1012#endif 999#endif
1013 current_screen:1, /* primary or secondary */ 1000 current_screen:1, /* primary or secondary */
1014 hate_those_clicks:1, /* a.k.a. keep mark position */
1015 num_scr_allow:1, 1001 num_scr_allow:1,
1016 bypass_keystate:1, 1002 bypass_keystate:1,
1017#ifdef CURSOR_BLINK 1003#ifdef CURSOR_BLINK
1018 hidden_cursor:1, 1004 hidden_cursor:1,
1019#endif 1005#endif
… …
1062 refresh_limit, 1048 refresh_limit,
1063 last_bot, /* scrollbar last bottom position */ 1049 last_bot, /* scrollbar last bottom position */
1064 last_top, /* scrollbar last top position */ 1050 last_top, /* scrollbar last top position */
1065 last_state, /* scrollbar last state */ 1051 last_state, /* scrollbar last state */
1066 scrollbar_len, 1052 scrollbar_len,
1067#ifdef MENUBAR
1068 menu_readonly, /* okay to alter menu? */
1069 Arrows_x,
1070#endif
1071#if MENUBAR_MAX > 1
1072 Nbars,
1073#endif
1074 window_vt_x, 1053 window_vt_x,
1075 window_vt_y, 1054 window_vt_y,
1076 window_sb_x, 1055 window_sb_x,
1077# ifdef POINTER_BLANK 1056# ifdef POINTER_BLANK
1078 pointerBlankDelay, 1057 pointerBlankDelay,
… …
1087 unsigned long priv_modes, 1066 unsigned long priv_modes,
1088 SavedModes; 1067 SavedModes;
1089/* ---------- */ 1068/* ---------- */
1090 Atom xa[NUM_XA]; 1069 Atom xa[NUM_XA];
1091/* ---------- */ 1070/* ---------- */
1092#ifdef MENUBAR 1071#ifdef RXVT_SCROLLBAR
1093 GC menubarGC;
1094#endif
1095#if defined(MENUBAR) || defined(RXVT_SCROLLBAR)
1096 GC scrollbarGC, 1072 GC scrollbarGC,
1097 topShadowGC, 1073 topShadowGC,
1098 botShadowGC; 1074 botShadowGC;
1099#endif 1075#endif
1100#ifdef XTERM_SCROLLBAR 1076#ifdef XTERM_SCROLLBAR
… …
1132 const char *key_delete; 1108 const char *key_delete;
1133#endif 1109#endif
1134 struct mouse_event MEvent; 1110 struct mouse_event MEvent;
1135 XComposeStatus compose; 1111 XComposeStatus compose;
1136 ttymode_t tio; 1112 ttymode_t tio;
1137#ifdef UTMP_SUPPORT
1138# ifdef HAVE_STRUCT_UTMP
1139 struct utmp ut;
1140# endif
1141# ifdef HAVE_STRUCT_UTMPX
1142 struct utmpx utx;
1143# endif
1144# if (defined(HAVE_STRUCT_UTMP) && defined(HAVE_UTMP_PID)) || defined(HAVE_STRUCT_UTMPX)
1145 char ut_id[5];
1146# endif
1147 int utmp_pos;
1148#endif
1149 row_col_t oldcursor; 1113 row_col_t oldcursor;
1150#ifdef XPM_BACKGROUND 1114#ifdef XPM_BACKGROUND
1151 bgPixmap_t bgPixmap; 1115 bgPixmap_t bgPixmap;
1152 XpmAttributes xpmAttr; /* originally loaded pixmap and its scaling */ 1116 XpmAttributes xpmAttr; /* originally loaded pixmap and its scaling */
1153#endif 1117#endif
1154#ifdef MENUBAR
1155 menu_t *ActiveMenu, /* currently active menu */
1156 *BuildMenu; /* the menu currently being built */
1157 bar_t *CurrentBar;
1158# if ! (MENUBAR_MAX > 1)
1159 bar_t BarList;
1160# endif /* (MENUBAR_MAX > 1) */
1161#endif
1162 1118
1163#if ENABLE_OVERLAY 1119#if ENABLE_OVERLAY
1164 int ov_x, ov_y, ov_w, ov_h; // overlay dimensions 1120 int ov_x, ov_y, ov_w, ov_h; // overlay dimensions
1165 text_t **ov_text; 1121 text_t **ov_text;
1166 rend_t **ov_rend; 1122 rend_t **ov_rend;
1167 1123
1168 void scr_swap_overlay (); 1124 void scr_swap_overlay () NOTHROW;
1169 void scr_overlay_new (int x, int y, int w, int h); 1125 void scr_overlay_new (int x, int y, int w, int h) NOTHROW;
1170 void scr_overlay_off (); 1126 void scr_overlay_off () NOTHROW;
1171 void scr_overlay_set (int x, int y, 1127 void scr_overlay_set (int x, int y,
1172 text_t text, 1128 text_t text,
1173 rend_t rend = OVERLAY_RSTYLE); 1129 rend_t rend = OVERLAY_RSTYLE) NOTHROW;
1174 void scr_overlay_set (int x, int y, const char *s); 1130 void scr_overlay_set (int x, int y, const char *s) NOTHROW;
1175 void scr_overlay_set (int x, int y, const wchar_t *s); 1131 void scr_overlay_set (int x, int y, const wchar_t *s) NOTHROW;
1176#endif 1132#endif
1177 1133
1178 vector<void *> allocated; // free these memory blocks with free() 1134 vector<void *> allocated; // free these memory blocks with free()
1179 1135
1180 char *env_windowid; /* environmental variable WINDOWID */ 1136 char *env_windowid; /* environmental variable WINDOWID */
… …
1194 const char *rs[NUM_RESOURCES]; 1150 const char *rs[NUM_RESOURCES];
1195 /* command input buffering */ 1151 /* command input buffering */
1196 char *cmdbuf_ptr, *cmdbuf_endp; 1152 char *cmdbuf_ptr, *cmdbuf_endp;
1197 char cmdbuf_base[CBUFSIZ]; 1153 char cmdbuf_base[CBUFSIZ];
1198 1154
1155 rxvt_ptytty *pty;
1156
1199 rxvt_salloc *talloc; // text line allocator 1157 rxvt_salloc *talloc; // text line allocator
1200 rxvt_salloc *ralloc; // rend line allocator 1158 rxvt_salloc *ralloc; // rend line allocator
1201 1159
1202 static vector<rxvt_term *> termlist; // a vector of all running rxvt_term's 1160 static vector<rxvt_term *> termlist; // a vector of all running rxvt_term's
1203 1161
… …
1211 void iso14755_54 (int x, int y); 1169 void iso14755_54 (int x, int y);
1212# endif 1170# endif
1213#endif 1171#endif
1214 1172
1215 // modifies first argument(!) 1173 // modifies first argument(!)
1216 void paste (char *data, unsigned int len); 1174 void paste (char *data, unsigned int len) NOTHROW;
1217 1175
1218 long vt_emask, vt_emask_perl; 1176 long vt_emask, vt_emask_perl;
1219 1177
1220 void vt_select_input () const 1178 void vt_select_input () const NOTHROW
1221 { 1179 {
1222 XSelectInput (display->display, vt, vt_emask | vt_emask_perl); 1180 XSelectInput (display->display, vt, vt_emask | vt_emask_perl);
1223 } 1181 }
1224 1182
1225#if TRANSPARENT 1183#if TRANSPARENT
… …
1232 xevent_watcher termwin_ev; 1190 xevent_watcher termwin_ev;
1233 xevent_watcher vt_ev; 1191 xevent_watcher vt_ev;
1234#ifdef HAVE_SCROLLBARS 1192#ifdef HAVE_SCROLLBARS
1235 xevent_watcher scrollbar_ev; 1193 xevent_watcher scrollbar_ev;
1236#endif 1194#endif
1237#ifdef MENUBAR
1238 xevent_watcher menubar_ev;
1239#endif
1240 1195
1196 void child_cb (child_watcher &w, int status); child_watcher child_ev;
1241 void check_cb (check_watcher &w); check_watcher check_ev; 1197 void check_cb (check_watcher &w); check_watcher check_ev;
1242 void destroy_cb (time_watcher &w); time_watcher destroy_ev; 1198 void destroy_cb (time_watcher &w); time_watcher destroy_ev;
1243 void flush_cb (time_watcher &w); time_watcher flush_ev; 1199 void flush_cb (time_watcher &w); time_watcher flush_ev;
1244 1200
1245 void pty_cb (io_watcher &w, short revents); io_watcher pty_ev; 1201 void pty_cb (io_watcher &w, short revents); io_watcher pty_ev;
1246 1202
1247 void incr_cb (time_watcher &w); time_watcher incr_ev; 1203 void incr_cb (time_watcher &w) NOTHROW; time_watcher incr_ev;
1248 1204
1249#ifdef CURSOR_BLINK 1205#ifdef CURSOR_BLINK
1250 void cursor_blink_cb (time_watcher &w); time_watcher cursor_blink_ev; 1206 void cursor_blink_cb (time_watcher &w); time_watcher cursor_blink_ev;
1251#endif 1207#endif
1252#ifdef TEXT_BLINK 1208#ifdef TEXT_BLINK
… …
1275 1231
1276 void tt_winch (); 1232 void tt_winch ();
1277 1233
1278 rxvt_term (); 1234 rxvt_term ();
1279 ~rxvt_term (); 1235 ~rxvt_term ();
1280 void child_exit (); // child has exited, usually destroys
1281 void destroy (); 1236 void destroy ();
1282 void emergency_cleanup (); 1237 void emergency_cleanup ();
1283 1238
1284 bool init (int argc, const char *const *argv); 1239 bool init (int argc, const char *const *argv);
1285 bool init_vars (); 1240 bool init_vars ();
… …
1316 XPoint spot; // most recently sent spot position 1271 XPoint spot; // most recently sent spot position
1317 1272
1318 void im_destroy (); 1273 void im_destroy ();
1319 void im_cb (); im_watcher im_ev; 1274 void im_cb (); im_watcher im_ev;
1320 void im_set_size (XRectangle &size); 1275 void im_set_size (XRectangle &size);
1321 void im_set_position (XPoint &pos); 1276 void im_set_position (XPoint &pos) NOTHROW;
1322 void im_set_color (unsigned long &fg, unsigned long &bg); 1277 void im_set_color (unsigned long &fg, unsigned long &bg);
1323 void im_set_preedit_area (XRectangle &preedit_rect, XRectangle &status_rect, const XRectangle &needed_rect); 1278 void im_set_preedit_area (XRectangle &preedit_rect, XRectangle &status_rect, const XRectangle &needed_rect);
1324 1279
1325 bool IMisRunning (); 1280 bool IMisRunning ();
1326 void IMSendSpot (); 1281 void IMSendSpot ();
… …
1328 void IMSetStatusPosition (); 1283 void IMSetStatusPosition ();
1329#endif 1284#endif
1330 1285
1331 void resize_scrollbar (); 1286 void resize_scrollbar ();
1332 1287
1333 void pixel_position (int *x, int *y);
1334
1335 void selection_click (int clicks, int x, int y);
1336 void selection_extend (int x, int y, int flag);
1337 void selection_rotate (int x, int y);
1338
1339 /* autoconvert */
1340
1341 // command.C 1288 // command.C
1342 void lookup_key (XKeyEvent &ev); 1289 void lookup_key (XKeyEvent &ev);
1343 unsigned int cmd_write (const char *str, unsigned int count); 1290 unsigned int cmd_write (const char *str, unsigned int count);
1344 1291
1345 wchar_t next_char (); 1292 wchar_t next_char () NOTHROW;
1346 wchar_t cmd_getc (); 1293 wchar_t cmd_getc () THROW ((class out_of_input));
1347 uint32_t next_octet (); 1294 uint32_t next_octet () NOTHROW;
1348 uint32_t cmd_get8 (); 1295 uint32_t cmd_get8 () THROW ((class out_of_input));
1349 1296
1350 bool cmd_parse (); 1297 bool cmd_parse ();
1351 void mouse_report (XButtonEvent &ev); 1298 void mouse_report (XButtonEvent &ev);
1352 void button_press (XButtonEvent &ev); 1299 void button_press (XButtonEvent &ev);
1353 void button_release (XButtonEvent &ev); 1300 void button_release (XButtonEvent &ev);
… …
1374 void process_sgr_mode (unsigned int nargs, const int *arg); 1321 void process_sgr_mode (unsigned int nargs, const int *arg);
1375 void process_graphics (); 1322 void process_graphics ();
1376 // init.C 1323 // init.C
1377 void Get_Colours (); 1324 void Get_Colours ();
1378 void get_ourmods (); 1325 void get_ourmods ();
1379 // logging.C
1380 void makeutent (const char *pty, const char *hostname);
1381 void cleanutent ();
1382 // main.C 1326 // main.C
1383 void privileged_utmp (rxvt_privaction action);
1384 bool set_fonts (); 1327 bool set_fonts ();
1385 void set_string_property (Atom prop, const char *str, int len = -1); 1328 void set_string_property (Atom prop, const char *str, int len = -1);
1386 void set_utf8_property (Atom prop, const char *str, int len = -1); 1329 void set_utf8_property (Atom prop, const char *str, int len = -1);
1387 void set_title (const char *str); 1330 void set_title (const char *str);
1388 void set_icon_name (const char *str); 1331 void set_icon_name (const char *str);
1389 void set_window_color (int idx, const char *color); 1332 void set_window_color (int idx, const char *color);
1390 void set_colorfgbg (); 1333 void set_colorfgbg ();
1391 int rXParseAllocColor (rxvt_color * screen_in_out, const char *colour); 1334 int rXParseAllocColor (rxvt_color * screen_in_out, const char *colour);
1392 void set_widthheight (unsigned int newwidth, unsigned int newheight); 1335 void set_widthheight (unsigned int newwidth, unsigned int newheight);
1393 1336
1394#ifdef MENUBAR
1395 // menubar.C
1396 void menuitem_free (menu_t *menu, menuitem_t *item);
1397 int action_dispatch (action_t *action);
1398 void menuarrow_free (char name);
1399 void menuarrow_add (char *string);
1400 char *menu_find_base (menu_t **menu, char *path);
1401 menu_t *menu_delete (menu_t *menu);
1402 menu_t *menu_add (menu_t *parent, char *path);
1403 void drawbox_menubar (int x, int len, int state);
1404 void drawtriangle (int x, int y, int state);
1405 void drawbox_menuitem (int y, int state);
1406 void menu_show ();
1407 void menu_display (void (rxvt_term::*update) ());
1408 void menu_hide_all ();
1409 void menu_hide ();
1410 void menu_clear (menu_t *menu);
1411 void menubar_clear ();
1412 bar_t *menubar_find (const char *name);
1413 int menubar_push (const char *name);
1414 void menubar_remove (const char *name);
1415 void menubar_dump (FILE *fp);
1416 void menubar_read (const char *filename);
1417 void menubar_dispatch (char *str);
1418 void draw_Arrows (int name, int state);
1419 void menubar_expose ();
1420 int menubar_mapping (int map);
1421 int menu_select (XButtonEvent &ev);
1422 void menubar_select (XButtonEvent &ev);
1423 void menubar_control (XButtonEvent &ev);
1424 void map_menuBar (int map);
1425#endif
1426
1427 // screen.C 1337 // screen.C
1428 1338
1429 void lalloc (line_t &l) const 1339 void lalloc (line_t &l) const NOTHROW
1430 { 1340 {
1431 l.t = (text_t *)talloc->alloc (); 1341 l.t = (text_t *)talloc->alloc ();
1432 l.r = (rend_t *)ralloc->alloc (); 1342 l.r = (rend_t *)ralloc->alloc ();
1433 } 1343 }
1434 1344
… …
1438 talloc->free (l.t); 1348 talloc->free (l.t);
1439 ralloc->free (l.r); 1349 ralloc->free (l.r);
1440 } 1350 }
1441#endif 1351#endif
1442 1352
1443 void lresize (line_t &l) const 1353 void lresize (line_t &l) const NOTHROW
1444 { 1354 {
1445 if (!l.t) 1355 if (!l.t)
1446 return; 1356 return;
1447 1357
1448 l.t = (text_t *)talloc->alloc (l.t, prev_ncol * sizeof (text_t)); 1358 l.t = (text_t *)talloc->alloc (l.t, prev_ncol * sizeof (text_t));
… …
1452 1362
1453 if (ncol > prev_ncol) 1363 if (ncol > prev_ncol)
1454 scr_blank_line (l, prev_ncol, ncol - prev_ncol, DEFAULT_RSTYLE); 1364 scr_blank_line (l, prev_ncol, ncol - prev_ncol, DEFAULT_RSTYLE);
1455 } 1365 }
1456 1366
1457 int fgcolor_of (rend_t r) const 1367 int fgcolor_of (rend_t r) const NOTHROW
1458 { 1368 {
1459 int base = GET_BASEFG (r); 1369 int base = GET_BASEFG (r);
1460#ifndef NO_BRIGHTCOLOR 1370#ifndef NO_BRIGHTCOLOR
1461 if (r & RS_Bold 1371 if (r & RS_Bold
1462# if ENABLE_STYLES 1372# if ENABLE_STYLES
… …
1466 base += minBrightCOLOR - minCOLOR; 1376 base += minBrightCOLOR - minCOLOR;
1467#endif 1377#endif
1468 return base; 1378 return base;
1469 } 1379 }
1470 1380
1471 int bgcolor_of (rend_t r) const 1381 int bgcolor_of (rend_t r) const NOTHROW
1472 { 1382 {
1473 int base = GET_BASEBG (r); 1383 int base = GET_BASEBG (r);
1474#ifndef NO_BRIGHTCOLOR 1384#ifndef NO_BRIGHTCOLOR
1475 if (r & RS_Blink 1385 if (r & RS_Blink
1476# if ENABLE_STYLES 1386# if ENABLE_STYLES
… …
1480 base += minBrightCOLOR - minCOLOR; 1390 base += minBrightCOLOR - minCOLOR;
1481#endif 1391#endif
1482 return base; 1392 return base;
1483 } 1393 }
1484 1394
1485 bool option (uint32_t opt) const 1395 bool option (uint32_t opt) const NOTHROW
1486 { 1396 {
1487 return OPTION (opt); 1397 return OPTION (opt);
1488 } 1398 }
1489 1399
1490 void set_option (uint32_t opt, bool set) 1400 void set_option (uint32_t opt, bool set) NOTHROW
1491 { 1401 {
1492 if (set) 1402 if (set)
1493 options |= opt; 1403 options |= opt;
1494 else 1404 else
1495 options &= ~opt; 1405 options &= ~opt;
1496 } 1406 }
1497 1407
1498 void scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) const; 1408 void scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) const NOTHROW;
1499 void scr_blank_screen_mem (line_t &l, rend_t efs) const; 1409 void scr_blank_screen_mem (line_t &l, rend_t efs) const NOTHROW;
1500 int scr_scroll_text (int row1, int row2, int count); 1410 int scr_scroll_text (int row1, int row2, int count) NOTHROW;
1501 void scr_reset (); 1411 void scr_reset ();
1502 void scr_release (); 1412 void scr_release () NOTHROW;
1503 void scr_clear (bool really = false); 1413 void scr_clear (bool really = false) NOTHROW;
1504 void scr_refresh (unsigned char refresh_type); 1414 void scr_refresh () NOTHROW;
1505 bool scr_refresh_rend (rend_t mask, rend_t value); 1415 bool scr_refresh_rend (rend_t mask, rend_t value) NOTHROW;
1506 void scr_erase_screen (int mode); 1416 void scr_erase_screen (int mode) NOTHROW;
1507#if ENABLE_FRILLS 1417#if ENABLE_FRILLS
1508 void scr_erase_savelines (); 1418 void scr_erase_savelines () NOTHROW;
1509 void scr_backindex (); 1419 void scr_backindex () NOTHROW;
1510 void scr_forwardindex (); 1420 void scr_forwardindex () NOTHROW;
1511#endif 1421#endif
1512 void scr_touch (bool refresh); 1422 void scr_touch (bool refresh) NOTHROW;
1513 void scr_expose (int x, int y, int width, int height, bool refresh); 1423 void scr_expose (int x, int y, int width, int height, bool refresh) NOTHROW;
1514 rxvt_fontset *scr_find_fontset (rend_t r = DEFAULT_RSTYLE); 1424 rxvt_fontset *scr_find_fontset (rend_t r = DEFAULT_RSTYLE);
1515 void scr_recolour (); 1425 void scr_recolour () NOTHROW;
1516 void scr_remap_chars (); 1426 void scr_remap_chars () NOTHROW;
1517 void scr_remap_chars (line_t &l); 1427 void scr_remap_chars (line_t &l) NOTHROW;
1518 1428
1429 enum cursor_mode { SAVE, RESTORE };
1430
1519 void scr_poweron (); 1431 void scr_poweron () NOTHROW;
1520 void scr_cursor (int mode); 1432 void scr_cursor (cursor_mode mode) NOTHROW;
1521 void scr_do_wrap (); 1433 void scr_do_wrap () NOTHROW;
1522 int scr_change_screen (int scrn); 1434 int scr_change_screen (int scrn) NOTHROW;
1523 void scr_color (unsigned int color, int fgbg); 1435 void scr_color (unsigned int color, int fgbg) NOTHROW;
1524 void scr_rendition (int set, int style); 1436 void scr_rendition (int set, int style) NOTHROW;
1525 void scr_add_lines (const wchar_t *str, int len, int minlines = 0); 1437 void scr_add_lines (const wchar_t *str, int len, int minlines = 0) NOTHROW;
1526 void scr_backspace (); 1438 void scr_backspace () NOTHROW;
1527 void scr_tab (int count, bool ht = false); 1439 void scr_tab (int count, bool ht = false) NOTHROW;
1528 void scr_gotorc (int row, int col, int relative); 1440 void scr_gotorc (int row, int col, int relative) NOTHROW;
1529 void scr_index (enum page_dirn direction); 1441 void scr_index (enum page_dirn direction) NOTHROW;
1530 void scr_erase_line (int mode); 1442 void scr_erase_line (int mode) NOTHROW;
1531 void scr_E (); 1443 void scr_E () NOTHROW;
1532 void scr_insdel_lines (int count, int insdel); 1444 void scr_insdel_lines (int count, int insdel) NOTHROW;
1533 void scr_insdel_chars (int count, int insdel); 1445 void scr_insdel_chars (int count, int insdel) NOTHROW;
1534 void scr_scroll_region (int top, int bot); 1446 void scr_scroll_region (int top, int bot) NOTHROW;
1535 void scr_cursor_visible (int mode); 1447 void scr_cursor_visible (int mode) NOTHROW;
1536 void scr_autowrap (int mode); 1448 void scr_autowrap (int mode) NOTHROW;
1537 void scr_relative_origin (int mode); 1449 void scr_relative_origin (int mode) NOTHROW;
1538 void scr_insert_mode (int mode); 1450 void scr_insert_mode (int mode) NOTHROW;
1539 void scr_set_tab (int mode); 1451 void scr_set_tab (int mode) NOTHROW;
1540 void scr_rvideo_mode (int mode); 1452 void scr_rvideo_mode (int mode) NOTHROW;
1541 void scr_report_position (); 1453 void scr_report_position () NOTHROW;
1542 void set_font_style (); 1454 void set_font_style () NOTHROW;
1543 void scr_charset_choose (int set); 1455 void scr_charset_choose (int set) NOTHROW;
1544 void scr_charset_set (int set, unsigned int ch); 1456 void scr_charset_set (int set, unsigned int ch) NOTHROW;
1545 void scr_move_to (int y, int len); 1457 void scr_move_to (int y, int len) NOTHROW;
1546 bool scr_page (enum page_dirn direction, int nlines); 1458 bool scr_page (enum page_dirn direction, int nlines) NOTHROW;
1547 bool scr_changeview (int new_view_start); 1459 bool scr_changeview (int new_view_start) NOTHROW;
1548 void scr_bell (); 1460 void scr_bell () NOTHROW;
1549 void scr_printscreen (int fullhist); 1461 void scr_printscreen (int fullhist) NOTHROW;
1550 void scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle1, rend_t rstyle2); 1462 void scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle1, rend_t rstyle2) NOTHROW;
1551 void scr_xor_span (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle); 1463 void scr_xor_span (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle) NOTHROW;
1552 void scr_reverse_selection (); 1464 void scr_reverse_selection () NOTHROW;
1553 void scr_dump (int fd); 1465 void scr_dump (int fd) NOTHROW;
1466
1554 void selection_check (int check_more); 1467 void selection_check (int check_more) NOTHROW;
1555 void selection_paste (Window win, Atom prop, bool delete_prop); 1468 void selection_paste (Window win, Atom prop, bool delete_prop) NOTHROW;
1556 void selection_property (Window win, Atom prop); 1469 void selection_property (Window win, Atom prop) NOTHROW;
1557 void selection_request (Time tm, int x, int y); 1470 void selection_request (Time tm, int selnum = Sel_Primary) NOTHROW;
1558 int selection_request_other (Atom target, int selnum); 1471 int selection_request_other (Atom target, int selnum) NOTHROW;
1559 void selection_clear (); 1472 void selection_clear () NOTHROW;
1560 void selection_make (Time tm); 1473 void selection_make (Time tm);
1561 bool selection_grab (Time tm); 1474 bool selection_grab (Time tm) NOTHROW;
1562 void selection_start_colrow (int col, int row); 1475 void selection_start_colrow (int col, int row) NOTHROW;
1563 void selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret); 1476 void selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) NOTHROW;
1564 void selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange); 1477 void selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) NOTHROW;
1565 void selection_remove_trailing_spaces (); 1478 void selection_remove_trailing_spaces () NOTHROW;
1566 void selection_send (const XSelectionRequestEvent &rq); 1479 void selection_send (const XSelectionRequestEvent &rq) NOTHROW;
1480 void selection_click (int clicks, int x, int y) NOTHROW;
1481 void selection_extend (int x, int y, int flag) NOTHROW;
1482 void selection_rotate (int x, int y) NOTHROW;
1483
1484 void pixel_position (int *x, int *y) NOTHROW;
1567 1485
1568#if defined(NEXT_SCROLLBAR) 1486#if defined(NEXT_SCROLLBAR)
1569 // scrollbar-next.C 1487 // scrollbar-next.C
1570 Pixmap renderPixmap (const char *const *data, int width, int height); 1488 Pixmap renderPixmap (const char *const *data, int width, int height);
1571 void init_scrollbar_stuff (); 1489 void init_scrollbar_stuff ();
… …
1573 int scrollbar_show_next (int update, int last_top, int last_bot, int scrollbar_len); 1491 int scrollbar_show_next (int update, int last_top, int last_bot, int scrollbar_len);
1574#endif 1492#endif
1575 1493
1576#if defined(RXVT_SCROLLBAR) 1494#if defined(RXVT_SCROLLBAR)
1577 // scrollbar-rxvt.C 1495 // scrollbar-rxvt.C
1578 void Draw_button (int x, int y, int state, int dirn);
1579 int scrollbar_show_rxvt (int update, int last_top, int last_bot, int scrollbar_len); 1496 int scrollbar_show_rxvt (int update, int last_top, int last_bot, int scrollbar_len);
1580#endif 1497#endif
1581 1498
1582#if defined(XTERM_SCROLLBAR) 1499#if defined(XTERM_SCROLLBAR)
1583 // scrollbar-xterm.C 1500 // scrollbar-xterm.C

Diff Legend

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