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.404 by sf-exg, Sun Apr 18 11:06:46 2010 UTC vs.
Revision 1.470 by sf-exg, Tue Apr 10 15:08:47 2012 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 28
31using namespace std; 29// we assume that Xlib.h defines XPointer, and it does since at least 1994...
32 30
33extern "C" { 31extern "C" {
34#include <X11/Xlib.h> 32#include <X11/Xlib.h>
35#include <X11/Xutil.h> 33#include <X11/Xutil.h>
36#include <X11/Xresource.h> 34#include <X11/Xresource.h>
… …
72#include <X11/cursorfont.h> 70#include <X11/cursorfont.h>
73#include <X11/keysym.h> 71#include <X11/keysym.h>
74#include <X11/keysymdef.h> 72#include <X11/keysymdef.h>
75#include <X11/Xatom.h> 73#include <X11/Xatom.h>
76 74
75#ifdef HAVE_PIXBUF
76# include <gdk-pixbuf/gdk-pixbuf.h>
77#endif
78
79#if defined(BG_IMAGE_FROM_FILE) || defined(ENABLE_TRANSPARENCY)
80# define HAVE_BG_PIXMAP 1
81#endif
82
77#include "encoding.h" 83#include "encoding.h"
78#include "rxvtutil.h" 84#include "rxvtutil.h"
79#include "rxvtfont.h" 85#include "rxvtfont.h"
80#include "rxvttoolkit.h" 86#include "rxvttoolkit.h"
81#include "scrollbar.h" 87#include "scrollbar.h"
… …
98 ***************************************************************************** 104 *****************************************************************************
99 * SYSTEM HACKS 105 * SYSTEM HACKS
100 ***************************************************************************** 106 *****************************************************************************
101 */ 107 */
102 108
103#ifndef HAVE_XPOINTER
104typedef char *XPointer;
105#endif
106
107#include <termios.h> 109#include <termios.h>
108
109#include "background.h"
110 110
111#ifndef STDIN_FILENO 111#ifndef STDIN_FILENO
112# define STDIN_FILENO 0 112# define STDIN_FILENO 0
113# define STDOUT_FILENO 1 113# define STDOUT_FILENO 1
114# define STDERR_FILENO 2 114# define STDERR_FILENO 2
115#endif 115#endif
116 116
117#ifndef EXIT_SUCCESS /* missing from <stdlib.h> */ 117#ifndef EXIT_SUCCESS /* missing from <stdlib.h> */
118# define EXIT_SUCCESS 0 /* exit function success */ 118# define EXIT_SUCCESS 0 /* exit function success */
119# define EXIT_FAILURE 1 /* exit function failure */ 119# define EXIT_FAILURE 1 /* exit function failure */
120#endif
121
122#ifndef PATH_MAX
123# define PATH_MAX 16384
124#endif 120#endif
125 121
126/****************************************************************************/ 122/****************************************************************************/
127 123
128// exception thrown on fatal (per-instance) errors 124// exception thrown on fatal (per-instance) errors
… …
151 147
152const char * rxvt_basename (const char *str) NOTHROW; 148const char * rxvt_basename (const char *str) NOTHROW;
153void rxvt_vlog (const char *fmt, va_list arg_ptr) NOTHROW; 149void rxvt_vlog (const char *fmt, va_list arg_ptr) NOTHROW;
154void rxvt_log (const char *fmt,...) NOTHROW; 150void rxvt_log (const char *fmt,...) NOTHROW;
155void rxvt_warn (const char *fmt,...) NOTHROW; 151void rxvt_warn (const char *fmt,...) NOTHROW;
156void rxvt_fatal (const char *fmt, ...) THROW ((class rxvt_failure_exception)) NORETURN; 152void rxvt_fatal (const char *fmt, ...) THROW ((class rxvt_failure_exception)) ecb_noreturn;
157void rxvt_exit_failure () THROW ((class rxvt_failure_exception)) NORETURN; 153void rxvt_exit_failure () THROW ((class rxvt_failure_exception)) ecb_noreturn;
158 154
159char * rxvt_strtrim (char *str) NOTHROW; 155char * rxvt_strtrim (char *str) NOTHROW;
160char ** rxvt_splitcommastring (const char *cs) NOTHROW; 156char ** rxvt_strsplit (char delim, const char *str) NOTHROW;
161void rxvt_freecommastring (char **cs) NOTHROW; 157
158static inline void
159rxvt_free_strsplit (char **ptr) NOTHROW
160{
161 free (ptr[0]);
162 free (ptr);
163}
162 164
163void * rxvt_malloc (size_t size); 165void * rxvt_malloc (size_t size);
164void * rxvt_calloc (size_t number, size_t size); 166void * rxvt_calloc (size_t number, size_t size);
165void * rxvt_realloc (void *ptr, size_t size); 167void * rxvt_realloc (void *ptr, size_t size);
166 168
… …
189#else 191#else
190 if (envv) 192 if (envv)
191#endif 193#endif
192 environ = envv; 194 environ = envv;
193} 195}
196
197struct localise_env
198{
199 char **orig_env;
200
201 localise_env (char **new_env)
202 {
203 orig_env = environ;
204 environ = new_env;
205 }
206
207 ~localise_env ()
208 {
209 environ = orig_env;
210 }
211};
194 212
195/* 213/*
196 ***************************************************************************** 214 *****************************************************************************
197 * STRUCTURES AND TYPEDEFS 215 * STRUCTURES AND TYPEDEFS
198 ***************************************************************************** 216 *****************************************************************************
… …
247# define COLORTERMENVFULL COLORTERMENV "-xpm" 265# define COLORTERMENVFULL COLORTERMENV "-xpm"
248#else 266#else
249# define COLORTERMENVFULL COLORTERMENV 267# define COLORTERMENVFULL COLORTERMENV
250#endif 268#endif
251#ifndef TERMENV 269#ifndef TERMENV
252# ifdef USE_256_COLORS 270# if USE_256_COLORS
253# define TERMENV "rxvt-unicode-256color" 271# define TERMENV "rxvt-unicode-256color"
254# else 272# else
255# define TERMENV "rxvt-unicode" 273# define TERMENV "rxvt-unicode"
256# endif 274# endif
257#endif 275#endif
… …
276# define NSCREENS 0 294# define NSCREENS 0
277#else 295#else
278# define NSCREENS 1 296# define NSCREENS 1
279#endif 297#endif
280 298
281/* special (internal) prefix for font commands */
282#define FONT_CMD '#'
283#define FONT_DN "#-"
284#define FONT_UP "#+"
285
286/* flags for rxvt_scr_gotorc () */ 299/* flags for rxvt_term::scr_gotorc () */
287enum { 300enum {
288 C_RELATIVE = 1, /* col movement is relative */ 301 C_RELATIVE = 1, /* col movement is relative */
289 R_RELATIVE = 2, /* row movement is relative */ 302 R_RELATIVE = 2, /* row movement is relative */
290 RELATIVE = C_RELATIVE | R_RELATIVE, 303 RELATIVE = C_RELATIVE | R_RELATIVE,
291}; 304};
292 305
293/* modes for rxvt_scr_insdel_chars (), rxvt_scr_insdel_lines () */ 306/* modes for rxvt_term::scr_insdel_chars (), rxvt_term::scr_insdel_lines () */
294enum { 307enum {
295 INSERT = -1, /* don't change these values */ 308 INSERT = -1, /* don't change these values */
296 DELETE = +1, 309 DELETE = +1,
297 ERASE = +2, 310 ERASE = +2,
298}; 311};
299 312
300/* modes for rxvt_scr_page () - scroll page. used by scrollbar window */ 313/* modes for rxvt_term::scr_page () - scroll page. used by scrollbar window */
301enum page_dirn { 314enum page_dirn {
302 UP, 315 UP,
303 DN, 316 DN,
304 NO_DIR, 317 NO_DIR,
305}; 318};
306 319
307/* arguments for rxvt_scr_change_screen () */ 320/* arguments for rxvt_term::scr_change_screen () */
308enum { 321enum {
309 PRIMARY = 0, 322 PRIMARY = 0,
310 SECONDARY, 323 SECONDARY,
311}; 324};
312 325
… …
323#define RS_fgMask (RS_colorMask << RS_fgShift) 336#define RS_fgMask (RS_colorMask << RS_fgShift)
324 337
325// must have space for rxvt_fontset::fontCount * 2 + 2 values 338// must have space for rxvt_fontset::fontCount * 2 + 2 values
326#define RS_fontShift (RS_fgShift + Color_Bits) 339#define RS_fontShift (RS_fgShift + Color_Bits)
327#define RS_Careful (1UL << RS_fontShift) /* be careful when drawing these */ 340#define RS_Careful (1UL << RS_fontShift) /* be careful when drawing these */
341#define RS_fontCount rxvt_fontset::fontCount
328#define RS_fontMask ((rxvt_fontset::fontCount << (RS_fontShift + 1)) | RS_Careful) // includes RS_Careful 342#define RS_fontMask ((RS_fontCount << (RS_fontShift + 1)) | RS_Careful) // includes RS_Careful
329 343
330// toggle this to force redraw, must be != RS_Careful and otherwise "pretty neutral" 344// toggle this to force redraw, must be != RS_Careful and otherwise "pretty neutral"
331#define RS_redraw (2UL << RS_fontShift) 345#define RS_redraw (2UL << RS_fontShift)
332 346
333#define RS_Sel (1UL << 22) 347#define RS_Sel (1UL << 22)
334 348
335// 5 custom bits for extensions 349// 4 custom bits for extensions
336#define RS_customCount 16UL 350#define RS_customCount 16UL
337#define RS_customShift 23 351#define RS_customShift 23
338#define RS_customMask ((RS_customCount - 1UL) << RS_customShift) 352#define RS_customMask ((RS_customCount - 1UL) << RS_customShift)
339 353
340// font styles 354// font styles
… …
353#define RS_baseattrMask (RS_Italic | RS_Bold | RS_Blink | RS_RVid | RS_Uline) 367#define RS_baseattrMask (RS_Italic | RS_Bold | RS_Blink | RS_RVid | RS_Uline)
354#define RS_attrMask (RS_baseattrMask | RS_fontMask) 368#define RS_attrMask (RS_baseattrMask | RS_fontMask)
355 369
356#define DEFAULT_RSTYLE (RS_None | (Color_fg << RS_fgShift) | (Color_bg << RS_bgShift)) 370#define DEFAULT_RSTYLE (RS_None | (Color_fg << RS_fgShift) | (Color_bg << RS_bgShift))
357#define OVERLAY_RSTYLE (RS_None | (Color_Black << RS_fgShift) | (Color_Yellow << RS_bgShift)) 371#define OVERLAY_RSTYLE (RS_None | (Color_Black << RS_fgShift) | (Color_Yellow << RS_bgShift))
358
359#define Sel_none 0 /* Not waiting */
360#define Sel_normal 0x01 /* normal selection */
361#define Sel_incr 0x02 /* incremental selection */
362#define Sel_direct 0x00
363#define Sel_Primary 0x01
364#define Sel_Secondary 0x02
365#define Sel_Clipboard 0x03
366#define Sel_whereMask 0x0f
367#define Sel_CompoundText 0x10 /* last request was COMPOUND_TEXT */
368#define Sel_UTF8String 0x20 /* last request was UTF8_STRING */
369 372
370enum { 373enum {
371 C0_NUL = 0x00, 374 C0_NUL = 0x00,
372 C0_SOH, C0_STX, C0_ETX, C0_EOT, C0_ENQ, C0_ACK, C0_BEL, 375 C0_SOH, C0_STX, C0_ETX, C0_EOT, C0_ENQ, C0_ACK, C0_BEL,
373 C0_BS , C0_HT , C0_LF , C0_VT , C0_FF , C0_CR , C0_SO , C0_SI , 376 C0_BS , C0_HT , C0_LF , C0_VT , C0_FF , C0_CR , C0_SO , C0_SI ,
… …
391 XTerm_Color_cursor = 12, // change actual 'Cursor' color 394 XTerm_Color_cursor = 12, // change actual 'Cursor' color
392 XTerm_Color_pointer_fg = 13, // change actual 'Pointer' fg color 395 XTerm_Color_pointer_fg = 13, // change actual 'Pointer' fg color
393 XTerm_Color_pointer_bg = 14, // change actual 'Pointer' bg color 396 XTerm_Color_pointer_bg = 14, // change actual 'Pointer' bg color
394 XTerm_Color05 = 15, // not implemented (tektronix fg) 397 XTerm_Color05 = 15, // not implemented (tektronix fg)
395 XTerm_Color06 = 16, // not implemented (tektronix bg) 398 XTerm_Color06 = 16, // not implemented (tektronix bg)
396 XTerm_Color_HC = 17, // change actual 'Highlight' color 399 XTerm_Color_HC = 17, // change actual 'Highlight' bg color
400 XTerm_Color_HTC = 19, // change actual 'Highlight' fg color
397 XTerm_logfile = 46, // not implemented 401 XTerm_logfile = 46, // not implemented
398 XTerm_font = 50, 402 XTerm_font = 50,
399 403
400 XTerm_konsole30 = 30, // reserved for konsole 404 XTerm_konsole30 = 30, // reserved for konsole
401 XTerm_konsole31 = 31, // reserved for konsole 405 XTerm_konsole31 = 31, // reserved for konsole
… …
466 Color_White = maxBrightCOLOR, 470 Color_White = maxBrightCOLOR,
467#else 471#else
468 Color_White = maxCOLOR, 472 Color_White = maxCOLOR,
469#endif 473#endif
470 minTermCOLOR = Color_White + 1, 474 minTermCOLOR = Color_White + 1,
471#ifndef USE_256_COLORS 475#if USE_256_COLORS
476 maxTermCOLOR = Color_White + 240,
477#else
472 maxTermCOLOR = Color_White + 72, 478 maxTermCOLOR = Color_White + 72,
473#else
474 maxTermCOLOR = Color_White + 240,
475#endif 479#endif
476#ifndef NO_CURSORCOLOR 480#ifndef NO_CURSORCOLOR
477 Color_cursor, 481 Color_cursor,
478 Color_cursor2, 482 Color_cursor2,
479#endif 483#endif
… …
511#else 515#else
512 TOTAL_COLORS = NRS_COLORS 516 TOTAL_COLORS = NRS_COLORS
513#endif 517#endif
514}; 518};
515 519
516#ifndef USE_256_COLORS 520#if USE_256_COLORS
517#define Color_Bits 7 // 0 .. maxTermCOLOR 521# define Color_Bits 9 // 0 .. maxTermCOLOR
518#else 522#else
519#define Color_Bits 9 // 0 .. maxTermCOLOR 523# define Color_Bits 7 // 0 .. maxTermCOLOR
520#endif 524#endif
521 525
522/* 526/*
523 * Resource list 527 * Resource list
524 */ 528 */
… …
553#define PrivMode_vt52 (1UL<<18) 557#define PrivMode_vt52 (1UL<<18)
554#define PrivMode_LFNL (1UL<<19) 558#define PrivMode_LFNL (1UL<<19)
555#define PrivMode_MouseBtnEvent (1UL<<20) 559#define PrivMode_MouseBtnEvent (1UL<<20)
556#define PrivMode_MouseAnyEvent (1UL<<21) 560#define PrivMode_MouseAnyEvent (1UL<<21)
557#define PrivMode_BracketPaste (1UL<<22) 561#define PrivMode_BracketPaste (1UL<<22)
562#define PrivMode_ExtModeMouse (1UL<<23) // xterm pseudo-utf-8 hack
563#define PrivMode_ExtMouseRight (1UL<<24) // xterm pseudo-utf-8, but works in non-utf-8-locales
558 564
559#define PrivMode_mouse_report (PrivMode_MouseX10|PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent) 565#define PrivMode_mouse_report (PrivMode_MouseX10|PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent)
560 566
561#ifdef ALLOW_132_MODE 567#ifdef ALLOW_132_MODE
562# define PrivMode_Default (PrivMode_Autowrap|PrivMode_ShiftKeys|PrivMode_VisibleCursor|PrivMode_132OK) 568# define PrivMode_Default (PrivMode_Autowrap|PrivMode_ShiftKeys|PrivMode_VisibleCursor|PrivMode_132OK)
… …
613/* 619/*
614 ***************************************************************************** 620 *****************************************************************************
615 * MACRO DEFINES 621 * MACRO DEFINES
616 ***************************************************************************** 622 *****************************************************************************
617 */ 623 */
624
625// speed hack, copy some member variable into a local variable of the same name
618#define dLocal(type,name) type const name = this->name 626#define dLocal(type,name) type const name = this->name
619 627
620// for speed reasons, we assume that all codepoints 32 to 126 are 628// for speed reasons, we assume that all codepoints 32 to 126 are
621// single-width. 629// single-width.
622#define WCWIDTH(c) (IN_RANGE_INC (c, 0x20, 0x7e) ? 1 : wcwidth (c)) 630#define WCWIDTH(c) (IN_RANGE_INC (c, 0x20, 0x7e) ? 1 : wcwidth (c))
… …
649 657
650#define GET_ATTR(x) (((x) & RS_attrMask)) 658#define GET_ATTR(x) (((x) & RS_attrMask))
651// return attributes defining the background, encoding doesn't matter 659// return attributes defining the background, encoding doesn't matter
652// depends on RS_fgShift > RS_bgShift 660// depends on RS_fgShift > RS_bgShift
653#define GET_BGATTR(x) \ 661#define GET_BGATTR(x) \
654 (expect_false ((x) & RS_RVid) \ 662 (ecb_unlikely ((x) & RS_RVid) \
655 ? (((x) & (RS_attrMask & ~RS_RVid)) \ 663 ? (((x) & (RS_attrMask & ~RS_RVid)) \
656 | (((x) & RS_fgMask) >> (RS_fgShift - RS_bgShift))) \ 664 | (((x) & RS_fgMask) >> (RS_fgShift - RS_bgShift))) \
657 : ((x) & (RS_attrMask | RS_bgMask))) 665 : ((x) & (RS_attrMask | RS_bgMask)))
658#define SET_FGCOLOR(x,fg) (((x) & ~RS_fgMask) | ((fg) << RS_fgShift)) 666#define SET_FGCOLOR(x,fg) (((x) & ~RS_fgMask) | ((fg) << RS_fgShift))
659#define SET_BGCOLOR(x,bg) (((x) & ~RS_bgMask) | ((bg) << RS_bgShift)) 667#define SET_BGCOLOR(x,bg) (((x) & ~RS_bgMask) | ((bg) << RS_bgShift))
… …
803{ 811{
804 int x, y, w, h; // overlay dimensions 812 int x, y, w, h; // overlay dimensions
805 text_t **text; 813 text_t **text;
806 rend_t **rend; 814 rend_t **rend;
807 815
808 // while tempting to add swap() etc. here, it effetcively only increases code size 816 // while tempting to add swap() etc. here, it effectively only increases code size
809}; 817};
810 818
811/* ------------------------------------------------------------------------- */ 819/* ------------------------------------------------------------------------- */
812 820
813typedef struct 821typedef struct
… …
852 * END······················= total_rows 860 * END······················= total_rows
853 */ 861 */
854 862
855struct TermWin_t 863struct TermWin_t
856{ 864{
865 int vt_width; /* actual window width [pixels] */
866 int vt_height; /* actual window height [pixels] */
857 int width; /* window width [pixels] */ 867 int width; /* window width [pixels] */
858 int height; /* window height [pixels] */ 868 int height; /* window height [pixels] */
859 int fwidth; /* font width [pixels] */ 869 int fwidth; /* font width [pixels] */
860 int fheight; /* font height [pixels] */ 870 int fheight; /* font height [pixels] */
861 int fbase; /* font ascent (baseline) [pixels] */ 871 int fbase; /* font ascent (baseline) [pixels] */
… …
870 int saveLines; /* number of lines that fit in scrollback */ 880 int saveLines; /* number of lines that fit in scrollback */
871 int total_rows; /* total number of rows in this terminal */ 881 int total_rows; /* total number of rows in this terminal */
872 int term_start; /* term lines start here */ 882 int term_start; /* term lines start here */
873 int view_start; /* scrollback view starts here */ 883 int view_start; /* scrollback view starts here */
874 int top_row; /* topmost row index of scrollback */ 884 int top_row; /* topmost row index of scrollback */
875 Window parent[6]; /* parent identifiers - we're parent[0] */ 885 Window parent; /* parent identifier */
876 Window vt; /* vt100 window */ 886 Window vt; /* vt100 window */
877 GC gc; /* GC for drawing */ 887 GC gc; /* GC for drawing */
878 Pixmap pixmap;
879 rxvt_drawable *drawable; 888 rxvt_drawable *drawable;
880 rxvt_fontset *fontset[4]; 889 rxvt_fontset *fontset[4];
881}; 890};
882 891
883/* 892/*
… …
945#define Screen_WrapNext (1<<4) /* need to wrap for next char? */ 954#define Screen_WrapNext (1<<4) /* need to wrap for next char? */
946#define Screen_DefaultFlags (Screen_VisibleCursor | Screen_Autowrap) 955#define Screen_DefaultFlags (Screen_VisibleCursor | Screen_Autowrap)
947 956
948/* rxvt_vars.options */ 957/* rxvt_vars.options */
949enum { 958enum {
950# define def(name,idx) Opt_ ## name = idx,
951# define nodef(name) Opt_ ## name = 0, 959# define def(name) Opt_ ## name,
960# define nodef(name) Opt_prev_ ## name, Opt_ ## name = 0, Opt_next_ ## name = Opt_prev_ ## name - 1,
961 Opt_0,
952# include "optinc.h" 962# include "optinc.h"
953# undef nodef 963# undef nodef
954# undef def 964# undef def
955Opt_count 965 Opt_count
956}; 966};
957 967
958/* ------------------------------------------------------------------------- */ 968/* ------------------------------------------------------------------------- */
959 969
960struct rxvt_vars : TermWin_t 970struct rxvt_vars : TermWin_t
… …
962 scrollBar_t scrollBar; 972 scrollBar_t scrollBar;
963 uint8_t options[(Opt_count + 7) >> 3]; 973 uint8_t options[(Opt_count + 7) >> 3];
964 XSizeHints szHint; 974 XSizeHints szHint;
965 rxvt_color *pix_colors; 975 rxvt_color *pix_colors;
966 Cursor TermWin_cursor; /* cursor for vt window */ 976 Cursor TermWin_cursor; /* cursor for vt window */
967 line_t *row_buf; // all lines, scrollback + terminal, circular, followed by temp_buf 977 line_t *row_buf; // all lines, scrollback + terminal, circular
968 line_t *drawn_buf; // text on screen 978 line_t *drawn_buf; // text on screen
969 line_t *swap_buf; // lines for swap buffer 979 line_t *swap_buf; // lines for swap buffer
970 char *tabs; /* per location: 1 == tab-stop */ 980 char *tabs; /* per location: 1 == tab-stop */
971 screen_t screen; 981 screen_t screen;
972 screen_t swap; 982 screen_t swap;
… …
1009 hidden_pointer:1, 1019 hidden_pointer:1,
1010#endif 1020#endif
1011 enc_utf8:1, /* whether locale uses utf-8 */ 1021 enc_utf8:1, /* whether locale uses utf-8 */
1012 seen_input:1, /* whether we have seen some program output yet */ 1022 seen_input:1, /* whether we have seen some program output yet */
1013 seen_resize:1, /* whether we had a resize event */ 1023 seen_resize:1, /* whether we had a resize event */
1024 init_done:1,
1014 parsed_geometry:1; 1025 parsed_geometry:1;
1015 1026
1016 unsigned char refresh_type, 1027 unsigned char refresh_type,
1017#ifdef META8_OPTION 1028#ifdef META8_OPTION
1018 meta_char, /* Alt-key prefix */ 1029 meta_char; /* Alt-key prefix */
1019#endif 1030#endif
1020 selection_wait,
1021 selection_type;
1022/* ---------- */ 1031/* ---------- */
1023 bool rvideo_state, rvideo_mode; 1032 bool rvideo_state, rvideo_mode;
1024#ifndef NO_BELL 1033#ifndef NO_BELL
1025 bool rvideo_bell; 1034 bool rvideo_bell;
1026#endif 1035#endif
… …
1054 allowedxerror; 1063 allowedxerror;
1055/* ---------- */ 1064/* ---------- */
1056 unsigned int ModLevel3Mask, 1065 unsigned int ModLevel3Mask,
1057 ModMetaMask, 1066 ModMetaMask,
1058 ModNumLockMask; 1067 ModNumLockMask;
1059 int old_width, /* last used width in screen resize */
1060 old_height; /* last used height in screen resize */
1061 unsigned long priv_modes, 1068 unsigned long priv_modes,
1062 SavedModes; 1069 SavedModes;
1063/* ---------- */ 1070/* ---------- */
1064 Atom *xa; 1071 Atom *xa;
1065/* ---------- */ 1072/* ---------- */
1066 Time selection_time, 1073 Time selection_time,
1067 selection_request_time,
1068 clipboard_time; 1074 clipboard_time;
1075 rxvt_selection *selection_req;
1069 pid_t cmd_pid; /* process id of child */ 1076 pid_t cmd_pid; /* process id of child */
1070 char * incr_buf;
1071 size_t incr_buf_size, incr_buf_fill;
1072/* ---------- */ 1077/* ---------- */
1073 struct mouse_event MEvent; 1078 struct mouse_event MEvent;
1074 XComposeStatus compose; 1079 XComposeStatus compose;
1075 struct termios tio; 1080 static struct termios def_tio;
1076 row_col_t oldcursor; 1081 row_col_t oldcursor;
1077#ifdef HAVE_BG_PIXMAP 1082#ifdef HAVE_BG_PIXMAP
1078 bgPixmap_t bgPixmap;
1079#endif
1080#ifdef HAVE_AFTERIMAGE
1081 ASVisual *asv;
1082 ASImageManager *asimman;
1083
1084 void init_asv () 1083 void bg_init ();
1084 void bg_destroy ();
1085
1086 enum {
1087 BG_IS_VALID = 1 << 0,
1088 BG_NEEDS_TINT = 1 << 1,
1089 BG_NEEDS_BLUR = 1 << 2,
1090
1091 BG_EFFECTS_FLAGS = BG_NEEDS_TINT | BG_NEEDS_BLUR,
1092
1093 BG_KEEP_ASPECT = 1 << 3,
1094 BG_ROOT_ALIGN = 1 << 4,
1095 BG_TILE = 1 << 14,
1096 BG_GEOMETRY_FLAGS = BG_KEEP_ASPECT | BG_ROOT_ALIGN | BG_TILE,
1097
1098 BG_TINT_SET = 1 << 5,
1099 BG_TINT_BITAND = 1 << 6,
1100
1101 BG_HAS_RENDER = 1 << 7,
1102 BG_HAS_RENDER_CONV = 1 << 8,
1103 BG_CLIENT_RENDER = 1 << 9,
1104
1105 BG_IS_TRANSPARENT = 1 << 10,
1106 BG_NEEDS_REFRESH = 1 << 11,
1107 BG_IS_SIZE_SENSITIVE = 1 << 12,
1108 BG_IS_FROM_FILE = 1 << 13,
1109 };
1110
1111 unsigned int bg_flags;
1112
1113# ifdef BG_IMAGE_FROM_FILE
1114 void get_image_geometry (int image_width, int image_height, int &w, int &h, int &x, int &y);
1115 bool render_image (bool transparent);
1116
1117 enum {
1118 noScale = 0,
1119 windowScale = 100,
1120 defaultScale = windowScale,
1121 centerAlign = 50,
1122 defaultAlign = centerAlign,
1123 };
1124
1125 unsigned int h_scale, v_scale; /* percents of the window size */
1126 int h_align, v_align; /* percents of the window size:
1127 0 - left align, 50 - center, 100 - right */
1128
1129 bool bg_set_geometry (const char *geom, bool update = false);
1130 void bg_set_default_geometry ()
1085 { 1131 {
1086 if (!asv) 1132 h_scale = v_scale = defaultScale;
1087 asv = create_asvisual_for_id (dpy, display->screen, depth, XVisualIDFromVisual (visual), cmap, NULL); 1133 h_align = v_align = defaultAlign;
1088 } 1134 }
1135
1136 bool bg_set_file (const char *file);
1137# endif
1138
1139# ifdef ENABLE_TRANSPARENCY
1140 Pixmap root_pixmap; /* current root pixmap set */
1141 rxvt_color tint;
1142 int shade;
1143 int h_blurRadius, v_blurRadius;
1144
1145 bool bg_set_transparent ();
1146 void bg_set_root_pixmap ();
1147 void set_tint_shade_flags ();
1148 bool bg_set_tint (rxvt_color &new_tint);
1149 bool bg_set_shade (const char *shade_str);
1150 bool bg_set_blur (const char *geom);
1151
1152 bool blur_pixmap (Pixmap pixmap, Visual *visual, int width, int height, int depth);
1153 bool tint_pixmap (Pixmap pixmap, Visual *visual, int width, int height);
1154 void tint_ximage (Visual *visual, XImage *ximage);
1155 bool make_transparency_pixmap ();
1156# endif
1157
1158 ev_tstamp bg_valid_since;
1159
1160 Pixmap bg_pixmap;
1161 unsigned int bg_pmap_width, bg_pmap_height;
1162
1163 int target_x;
1164 int target_y;
1165 bool bg_set_position (int x, int y);
1166 bool bg_window_size_sensitive ();
1167 bool bg_window_position_sensitive ();
1168
1169 bool bg_render ();
1170 void bg_invalidate ()
1171 {
1172 bg_flags &= ~BG_IS_VALID;
1173 }
1174#endif
1175#ifdef HAVE_PIXBUF
1176 GdkPixbuf *pixbuf;
1177 bool pixbuf_to_pixmap (GdkPixbuf *pixbuf, Pixmap pixmap, GC gc,
1178 int src_x, int src_y, int dst_x, int dst_y,
1179 unsigned int width, unsigned int height);
1089#endif 1180#endif
1090 1181
1091#if ENABLE_OVERLAY 1182#if ENABLE_OVERLAY
1092 overlay_base ov; 1183 overlay_base ov;
1093 1184
… …
1101 void scr_overlay_set (int x, int y, const wchar_t *s) NOTHROW; 1192 void scr_overlay_set (int x, int y, const wchar_t *s) NOTHROW;
1102#endif 1193#endif
1103 1194
1104 vector<void *> allocated; // free these memory blocks with free() 1195 vector<void *> allocated; // free these memory blocks with free()
1105 1196
1106 char env_windowid[21]; /* environmental variable WINDOWID */
1107 char env_colorfgbg[sizeof ("COLORFGBG=default;default;bg") + 1];
1108 char *env_display; /* environmental variable DISPLAY */
1109 char *env_term; /* environmental variable TERM */
1110
1111 char *locale; 1197 char *locale;
1112 char charsets[4]; 1198 char charsets[4];
1113 char *v_buffer; /* pointer to physical buffer */ 1199 char *v_buffer; /* pointer to physical buffer */
1114 unsigned int v_buflen; /* size of area to write */ 1200 unsigned int v_buflen; /* size of area to write */
1115 stringvec *argv, *envv; /* if != 0, will be freed at destroy time */ 1201 stringvec *argv, *envv; /* if != 0, will be freed at destroy time */
… …
1154 void rootwin_cb (XEvent &xev); 1240 void rootwin_cb (XEvent &xev);
1155 xevent_watcher rootwin_ev; 1241 xevent_watcher rootwin_ev;
1156#endif 1242#endif
1157#ifdef HAVE_BG_PIXMAP 1243#ifdef HAVE_BG_PIXMAP
1158 void update_background (); 1244 void update_background ();
1159#if TRACE_PIXMAPS
1160 void trace_update_background (const char *file, int line);
1161# define update_background() trace_update_background (__FILE__, __LINE__)
1162#endif
1163 void update_background_cb (ev::timer &w, int revents); 1245 void update_background_cb (ev::timer &w, int revents);
1164 ev::timer update_background_ev; 1246 ev::timer update_background_ev;
1165#endif 1247#endif
1166 1248
1167 void x_cb (XEvent &xev); 1249 void x_cb (XEvent &xev);
… …
1172 void child_cb (ev::child &w, int revents); ev::child child_ev; 1254 void child_cb (ev::child &w, int revents); ev::child child_ev;
1173 void destroy_cb (ev::idle &w, int revents); ev::idle destroy_ev; 1255 void destroy_cb (ev::idle &w, int revents); ev::idle destroy_ev;
1174 void refresh_check (); 1256 void refresh_check ();
1175 void flush (); 1257 void flush ();
1176 void flush_cb (ev::timer &w, int revents); ev::timer flush_ev; 1258 void flush_cb (ev::timer &w, int revents); ev::timer flush_ev;
1259 void cmdbuf_reify ();
1260 void cmdbuf_append (const char *str, size_t count);
1177 bool pty_fill (); 1261 bool pty_fill ();
1178 void pty_cb (ev::io &w, int revents); ev::io pty_ev; 1262 void pty_cb (ev::io &w, int revents); ev::io pty_ev;
1179 void incr_cb (ev::timer &w, int revents) NOTHROW; ev::timer incr_ev;
1180 1263
1181#ifdef CURSOR_BLINK 1264#ifdef CURSOR_BLINK
1182 void cursor_blink_cb (ev::timer &w, int revents); ev::timer cursor_blink_ev; 1265 void cursor_blink_cb (ev::timer &w, int revents); ev::timer cursor_blink_ev;
1183#endif 1266#endif
1184#ifdef TEXT_BLINK 1267#ifdef TEXT_BLINK
… …
1205 void pointer_unblank (); 1288 void pointer_unblank ();
1206 1289
1207 void tt_printf (const char *fmt,...); 1290 void tt_printf (const char *fmt,...);
1208 void tt_write (const char *data, unsigned int len); 1291 void tt_write (const char *data, unsigned int len);
1209 void pty_write (); 1292 void pty_write ();
1210
1211 void init (stringvec *argv, stringvec *envv)
1212 {
1213 this->argv = argv;
1214 init (argv->size (), argv->begin (), envv);
1215 }
1216 1293
1217 void make_current () const // make this the "currently active" urxvt instance 1294 void make_current () const // make this the "currently active" urxvt instance
1218 { 1295 {
1219 SET_R (this); 1296 SET_R (this);
1220 set_environ (envv); 1297 set_environ (envv);
… …
1232 void im_set_size (XRectangle &size); 1309 void im_set_size (XRectangle &size);
1233 void im_set_position (XPoint &pos) NOTHROW; 1310 void im_set_position (XPoint &pos) NOTHROW;
1234 void im_set_color (unsigned long &fg, unsigned long &bg); 1311 void im_set_color (unsigned long &fg, unsigned long &bg);
1235 void im_set_preedit_area (XRectangle &preedit_rect, XRectangle &status_rect, const XRectangle &needed_rect); 1312 void im_set_preedit_area (XRectangle &preedit_rect, XRectangle &status_rect, const XRectangle &needed_rect);
1236 1313
1237 bool IMisRunning (); 1314 bool im_is_running ();
1238 void IMSendSpot (); 1315 void im_send_spot ();
1239 bool IM_get_IC (const char *modifiers); 1316 bool im_get_ic (const char *modifiers);
1240 void IMSetPosition (); 1317 void im_set_position ();
1241#endif 1318#endif
1242 1319
1243 // command.C 1320 // command.C
1244 void key_press (XKeyEvent &ev); 1321 void key_press (XKeyEvent &ev);
1245 void key_release (XKeyEvent &ev); 1322 void key_release (XKeyEvent &ev);
1246 unsigned int cmd_write (const char *str, unsigned int count);
1247 1323
1248 wchar_t next_char () NOTHROW; 1324 wchar_t next_char () NOTHROW;
1249 wchar_t cmd_getc () THROW ((class out_of_input)); 1325 wchar_t cmd_getc () THROW ((class out_of_input));
1250 uint32_t next_octet () NOTHROW; 1326 uint32_t next_octet () NOTHROW;
1251 uint32_t cmd_get8 () THROW ((class out_of_input)); 1327 uint32_t cmd_get8 () THROW ((class out_of_input));
… …
1278 void process_color_seq (int report, int color, const char *str, char resp); 1354 void process_color_seq (int report, int color, const char *str, char resp);
1279 void process_xterm_seq (int op, char *str, char resp); 1355 void process_xterm_seq (int op, char *str, char resp);
1280 int privcases (int mode, unsigned long bit); 1356 int privcases (int mode, unsigned long bit);
1281 void process_terminal_mode (int mode, int priv, unsigned int nargs, const int *arg); 1357 void process_terminal_mode (int mode, int priv, unsigned int nargs, const int *arg);
1282 void process_sgr_mode (unsigned int nargs, const int *arg); 1358 void process_sgr_mode (unsigned int nargs, const int *arg);
1283 void process_graphics ();
1284 // init.C 1359 // init.C
1360 void init (stringvec *argv, stringvec *envv);
1361 void init (int argc, const char *const *argv, const char *const *envv);
1362 void init2 (int argc, const char *const *argv);
1285 void init_vars (); 1363 void init_vars ();
1286 const char **init_resources (int argc, const char *const *argv); 1364 const char **init_resources (int argc, const char *const *argv);
1287 void init (int argc, const char *const *argv, stringvec *envv);
1288 void init_env (); 1365 void init_env ();
1289 void set_locale (const char *locale); 1366 void set_locale (const char *locale);
1290 void init_xlocale (); 1367 void init_xlocale ();
1291 void init_command (const char *const *argv); 1368 void init_command (const char *const *argv);
1292 void run_command (const char *const *argv); 1369 void run_command (const char *const *argv);
1293 int run_child (const char *const *argv); 1370 int run_child (const char *const *argv);
1294 void color_aliases (int idx); 1371 void color_aliases (int idx);
1295 void create_windows (int argc, const char *const *argv); 1372 void create_windows (int argc, const char *const *argv);
1296 void get_colours (); 1373 void get_colours ();
1297 void get_ourmods (); 1374 void get_ourmods ();
1375 void set_icon (const char *file);
1298 // main.C 1376 // main.C
1299 void tt_winch (); 1377 void tt_winch ();
1300 rxvt_term (); 1378 rxvt_term ();
1301 ~rxvt_term (); 1379 ~rxvt_term ();
1302 void destroy (); 1380 void destroy ();
… …
1304 void recolour_cursor (); 1382 void recolour_cursor ();
1305 void resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent); 1383 void resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent);
1306 void window_calc (unsigned int newwidth, unsigned int newheight); 1384 void window_calc (unsigned int newwidth, unsigned int newheight);
1307 bool set_fonts (); 1385 bool set_fonts ();
1308 void set_string_property (Atom prop, const char *str, int len = -1); 1386 void set_string_property (Atom prop, const char *str, int len = -1);
1387 void set_mbstring_property (Atom prop, const char *str, int len = -1);
1309 void set_utf8_property (Atom prop, const char *str, int len = -1); 1388 void set_utf8_property (Atom prop, const char *str, int len = -1);
1310 void set_title (const char *str); 1389 void set_title (const char *str);
1311 void set_icon_name (const char *str); 1390 void set_icon_name (const char *str);
1312 void set_window_color (int idx, const char *color); 1391 void set_window_color (int idx, const char *color);
1313 void set_colorfgbg (); 1392 char *get_colorfgbg ();
1314 bool set_color (rxvt_color &color, const char *name); 1393 bool set_color (rxvt_color &color, const char *name);
1315 void alias_color (int dst, int src); 1394 void alias_color (int dst, int src);
1316 void set_widthheight (unsigned int newwidth, unsigned int newheight); 1395 void set_widthheight (unsigned int newwidth, unsigned int newheight);
1317 void get_window_origin (int &x, int &y); 1396 void get_window_origin (int &x, int &y);
1318 Pixmap get_pixmap_property (int prop_id); 1397 Pixmap get_pixmap_property (Atom property);
1319 1398
1320 // screen.C 1399 // screen.C
1321 1400
1322 void lalloc (line_t &l) const 1401 void lalloc (line_t &l) const
1323 { 1402 {
… …
1353#ifndef NO_BRIGHTCOLOR 1432#ifndef NO_BRIGHTCOLOR
1354 if (r & RS_Bold 1433 if (r & RS_Bold
1355# if ENABLE_STYLES 1434# if ENABLE_STYLES
1356 && option (Opt_intensityStyles) 1435 && option (Opt_intensityStyles)
1357# endif 1436# endif
1358 && IN_RANGE_INC (base, minCOLOR, minBrightCOLOR)) 1437 && IN_RANGE_EXC (base, minCOLOR, minBrightCOLOR))
1359 base += minBrightCOLOR - minCOLOR; 1438 base += minBrightCOLOR - minCOLOR;
1360#endif 1439#endif
1361 return base; 1440 return base;
1362 } 1441 }
1363 1442
… …
1367#ifndef NO_BRIGHTCOLOR 1446#ifndef NO_BRIGHTCOLOR
1368 if (r & RS_Blink 1447 if (r & RS_Blink
1369# if ENABLE_STYLES 1448# if ENABLE_STYLES
1370 && option (Opt_intensityStyles) 1449 && option (Opt_intensityStyles)
1371# endif 1450# endif
1372 && IN_RANGE_INC (base, minCOLOR, minBrightCOLOR)) 1451 && IN_RANGE_EXC (base, minCOLOR, minBrightCOLOR))
1373 base += minBrightCOLOR - minCOLOR; 1452 base += minBrightCOLOR - minCOLOR;
1374#endif 1453#endif
1375 return base; 1454 return base;
1376 } 1455 }
1377 1456
1378 bool option (uint8_t opt) const NOTHROW 1457 bool option (uint8_t opt) const NOTHROW
1379 { 1458 {
1380 if (!opt)
1381 return 0;
1382
1383 --opt;
1384 return options[opt >> 3] & (1 << (opt & 7)); 1459 return options[opt >> 3] & (1 << (opt & 7));
1385 } 1460 }
1386 1461
1387 void set_option (uint8_t opt, bool set = true) NOTHROW 1462 void set_option (uint8_t opt, bool set = true) NOTHROW;
1388 {
1389 if (!opt)
1390 return;
1391
1392 --opt;
1393 if (set)
1394 options[opt >> 3] |= (1 << (opt & 7));
1395 else
1396 options[opt >> 3] &= ~(1 << (opt & 7));
1397 }
1398
1399 void set_privmode (unsigned bit, int set) NOTHROW
1400 {
1401 if (set)
1402 priv_modes |= bit;
1403 else
1404 priv_modes &= ~bit;
1405 }
1406 1463
1407 // modifies first argument(!) 1464 // modifies first argument(!)
1465 void tt_paste (char *data, unsigned int len) NOTHROW;
1408 void paste (char *data, unsigned int len) NOTHROW; 1466 void paste (char *data, unsigned int len) NOTHROW;
1409 void scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) const NOTHROW; 1467 void scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) const NOTHROW;
1410 void scr_blank_screen_mem (line_t &l, rend_t efs) const NOTHROW; 1468 void scr_blank_screen_mem (line_t &l, rend_t efs) const NOTHROW;
1411 void scr_kill_char (line_t &l, int col) const NOTHROW; 1469 void scr_kill_char (line_t &l, int col) const NOTHROW;
1412 int scr_scroll_text (int row1, int row2, int count) NOTHROW; 1470 int scr_scroll_text (int row1, int row2, int count) NOTHROW;
… …
1421 void scr_backindex () NOTHROW; 1479 void scr_backindex () NOTHROW;
1422 void scr_forwardindex () NOTHROW; 1480 void scr_forwardindex () NOTHROW;
1423#endif 1481#endif
1424 void scr_touch (bool refresh) NOTHROW; 1482 void scr_touch (bool refresh) NOTHROW;
1425 void scr_expose (int x, int y, int width, int height, bool refresh) NOTHROW; 1483 void scr_expose (int x, int y, int width, int height, bool refresh) NOTHROW;
1426 void scr_recolour () NOTHROW; 1484 void scr_recolour (bool refresh = true) NOTHROW;
1427 void scr_remap_chars () NOTHROW; 1485 void scr_remap_chars () NOTHROW;
1428 void scr_remap_chars (line_t &l) NOTHROW; 1486 void scr_remap_chars (line_t &l) NOTHROW;
1429 1487
1430 enum cursor_mode { SAVE, RESTORE }; 1488 enum cursor_mode { SAVE, RESTORE };
1431 1489
… …
1466 void scr_xor_span (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle) NOTHROW; 1524 void scr_xor_span (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle) NOTHROW;
1467 void scr_reverse_selection () NOTHROW; 1525 void scr_reverse_selection () NOTHROW;
1468 void scr_dump (int fd) NOTHROW; 1526 void scr_dump (int fd) NOTHROW;
1469 1527
1470 void selection_check (int check_more) NOTHROW; 1528 void selection_check (int check_more) NOTHROW;
1471 void selection_paste (Window win, Atom prop, bool delete_prop) NOTHROW;
1472 void selection_property (Window win, Atom prop) NOTHROW;
1473 void selection_request (Time tm, int selnum = Sel_Primary) NOTHROW; 1529 void selection_request (Time tm, int selnum = Sel_Primary) NOTHROW;
1474 int selection_request_other (Atom target, int selnum) NOTHROW;
1475 void selection_clear (bool clipboard = false) NOTHROW; 1530 void selection_clear (bool clipboard = false) NOTHROW;
1476 void clipboard_copy (Time tm);
1477 void selection_make (Time tm); 1531 void selection_make (Time tm);
1478 bool selection_grab (Time tm, bool clipboard = false) NOTHROW; 1532 bool selection_grab (Time tm, bool clipboard = false) NOTHROW;
1479 void selection_start_colrow (int col, int row) NOTHROW; 1533 void selection_start_colrow (int col, int row) NOTHROW;
1480 void selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) NOTHROW; 1534 void selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) NOTHROW;
1481 void selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) NOTHROW; 1535 void selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) NOTHROW;
… …
1484 void selection_click (int clicks, int x, int y) NOTHROW; 1538 void selection_click (int clicks, int x, int y) NOTHROW;
1485 void selection_extend (int x, int y, int flag) NOTHROW; 1539 void selection_extend (int x, int y, int flag) NOTHROW;
1486 void selection_rotate (int x, int y) NOTHROW; 1540 void selection_rotate (int x, int y) NOTHROW;
1487 1541
1488 // xdefaults.C 1542 // xdefaults.C
1489 void get_options (int argc, const char *const *argv); 1543 const char **get_options (int argc, const char *const *argv);
1490 int parse_keysym (const char *str, const char *arg); 1544 int parse_keysym (const char *str, const char *arg);
1491 const char *x_resource (const char *name); 1545 const char *x_resource (const char *name);
1492 void extract_resources (); 1546 void extract_resources ();
1547 void extract_keysym_resources ();
1493}; 1548};
1494 1549
1495#endif /* _RXVT_H_ */ 1550#endif /* _RXVT_H_ */
1496 1551

Diff Legend

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