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.25 by pcg, Thu Jan 29 23:26:01 2004 UTC vs.
Revision 1.45 by pcg, Wed Mar 3 04:07:52 2004 UTC

… …
49 int line; 49 int line;
50 int local; 50 int local;
51} ttymode_t; 51} ttymode_t;
52#endif 52#endif
53 53
54#ifdef GREEK_SUPPORT
55# include "grkelot.h"
56#endif
57#ifdef XPM_BACKGROUND 54#ifdef XPM_BACKGROUND
58# ifdef XPM_INC_X11 55# ifdef XPM_INC_X11
59# include <X11/xpm.h> 56# include <X11/xpm.h>
60# else 57# else
61# include <xpm.h> 58# include <xpm.h>
… …
130 do { \ 127 do { \
131 typeof swapittmp; \ 128 typeof swapittmp; \
132 (swapittmp) = (one); (one) = (two); (two) = (swapittmp); \ 129 (swapittmp) = (one); (one) = (two); (two) = (swapittmp); \
133 } while (/* CONSTCOND */ 0) 130 } while (/* CONSTCOND */ 0)
134#define BOUND_POSITIVE_INT16(val) \ 131#define BOUND_POSITIVE_INT16(val) \
135 (int16_t)((val) <= 0 \ 132 (int16_t) ((val) <= 0 \
136 ? 0 \ 133 ? 0 \
137 : min((val), (((uint16_t)-1)>>1))) 134 : min ((val), (((uint16_t)-1)>>1)))
138 135
139/* 136/*
140 ***************************************************************************** 137 *****************************************************************************
141 * NORMAL DEFINES 138 * NORMAL DEFINES
142 ***************************************************************************** 139 *****************************************************************************
… …
144 141
145#if defined (NO_OLD_SELECTION) && defined(NO_NEW_SELECTION) 142#if defined (NO_OLD_SELECTION) && defined(NO_NEW_SELECTION)
146# error if you disable both selection styles, how can you select, silly? 143# error if you disable both selection styles, how can you select, silly?
147#endif 144#endif
148 145
149#define APL_CLASS "XTerm" /* class name */
150#define APL_SUBCLASS "Rxvt" /* also check resources under this name */
151#define APL_NAME "rxvt" /* normal name */
152
153/* COLORTERM, TERM environment variables */ 146/* COLORTERM, TERM environment variables */
154#define COLORTERMENV "rxvt" 147#define COLORTERMENV "rxvt"
155#ifdef XPM_BACKGROUND 148#ifdef XPM_BACKGROUND
156# define COLORTERMENVFULL COLORTERMENV "-xpm" 149# define COLORTERMENVFULL COLORTERMENV "-xpm"
157#else 150#else
158# define COLORTERMENVFULL COLORTERMENV 151# define COLORTERMENVFULL COLORTERMENV
159#endif 152#endif
160#ifndef TERMENV 153#ifndef TERMENV
161# define TERMENV "xterm" 154# define TERMENV "rxvt"
162#endif 155#endif
163 156
164#if defined (NO_MOUSE_REPORT) && !defined (NO_MOUSE_REPORT_SCROLLBAR) 157#if defined (NO_MOUSE_REPORT) && !defined (NO_MOUSE_REPORT_SCROLLBAR)
165# define NO_MOUSE_REPORT_SCROLLBAR 158# define NO_MOUSE_REPORT_SCROLLBAR
166#endif 159#endif
… …
182 175
183#define menuBar_esc 10 176#define menuBar_esc 10
184#define scrollBar_esc 30 177#define scrollBar_esc 30
185#define menuBar_margin 2 /* margin below text */ 178#define menuBar_margin 2 /* margin below text */
186 179
187#if defined(RXVT_SCROLLBAR) || defined(NEXT_SCROLLBAR) || defined(XTERM_SCROLLBAR) 180#if defined(RXVT_SCROLLBAR) || defined(NEXT_SCROLLBAR) || defined(XTERM_SCROLLBAR) || defined(PLAIN_SCROLLBAR)
188# define HAVE_SCROLLBARS 181# define HAVE_SCROLLBARS
189#endif 182#endif
190 183
191/* width of scrollBar, menuBar shadow, must be 1 or 2 */ 184/* width of scrollBar, menuBar shadow, must be 1 or 2 */
192#ifdef HALFSHADOW 185#ifdef HALFSHADOW
… …
200#define R_SB_ALIGN_BOTTOM 2 193#define R_SB_ALIGN_BOTTOM 2
201 194
202#define R_SB_RXVT 0 195#define R_SB_RXVT 0
203#define R_SB_NEXT 1 196#define R_SB_NEXT 1
204#define R_SB_XTERM 2 197#define R_SB_XTERM 2
198#define R_SB_PLAIN 4
205 199
206#define SB_WIDTH_NEXT 19 200#define SB_WIDTH_NEXT 19
207#define SB_WIDTH_XTERM 7 201#define SB_WIDTH_XTERM 15
202#define SB_WIDTH_PLAIN 7
208#ifndef SB_WIDTH_RXVT 203#ifndef SB_WIDTH_RXVT
209# define SB_WIDTH_RXVT 10 204# define SB_WIDTH_RXVT 10
210#endif 205#endif
211 206
212/* 207/*
… …
239 * | | :::::::: | 234 * | | :::::::: |
240 * | V :::: vv-------< SB_BEVEL_WIDTH_LOWER_RIGHT 235 * | V :::: vv-------< SB_BEVEL_WIDTH_LOWER_RIGHT
241 * | +---------+ | 236 * | +---------+ |
242 * | | ......%%| | 237 * | | ......%%| |
243 * | | ......%%| | 238 * | | ......%%| |
244 * | | ..()..%%| | 239 * | | .. ()..%%| |
245 * | | ......%%| | 240 * | | ......%%| |
246 * | | %%%%%%%%| | 241 * | | %%%%%%%%| |
247 * | +---------+ | <......................... 242 * | +---------+ | <.........................
248 * | | <---< SB_PADDING : 243 * | | <---< SB_PADDING :
249 * | +---------+ | <-+.......... :---< SB_BUTTON_TOTAL_HEIGHT 244 * | +---------+ | <-+.......... :---< SB_BUTTON_TOTAL_HEIGHT
… …
270 * :............: 265 * :............:
271 * | 266 * |
272 * +---< SB_WIDTH_NEXT 267 * +---< SB_WIDTH_NEXT
273 */ 268 */
274 269
270enum {
275#define NO_REFRESH 0 /* Window not visible at all! */ 271 NO_REFRESH = 0 , /* Window not visible at all! */
276#define FAST_REFRESH (1<<0) /* Fully exposed window */ 272 FAST_REFRESH = 1<<0, /* Fully exposed window */
277#define SLOW_REFRESH (1<<1) /* Partially exposed window */ 273 SLOW_REFRESH = 1<<1, /* Partially exposed window */
278#define SMOOTH_REFRESH (1<<2) /* Do sync'ing to make it smooth */ 274 SMOOTH_REFRESH = 1<<2, /* Do sync'ing to make it smooth */
279#define REFRESH_BOUNDS (1<<3) 275 REFRESH_BOUNDS = 1<<3
276};
280 277
281#ifdef NO_SECONDARY_SCREEN 278#ifdef NO_SECONDARY_SCREEN
282# define NSCREENS 0 279# define NSCREENS 0
283#else 280#else
284# define NSCREENS 1 281# define NSCREENS 1
… …
291/* special (internal) prefix for font commands */ 288/* special (internal) prefix for font commands */
292#define FONT_CMD '#' 289#define FONT_CMD '#'
293#define FONT_DN "#-" 290#define FONT_DN "#-"
294#define FONT_UP "#+" 291#define FONT_UP "#+"
295 292
296/* flags for rxvt_scr_gotorc() */ 293/* flags for rxvt_scr_gotorc () */
294enum {
297#define C_RELATIVE 1 /* col movement is relative */ 295 C_RELATIVE = 1 , /* col movement is relative */
298#define R_RELATIVE 2 /* row movement is relative */ 296 R_RELATIVE = 2, /* row movement is relative */
299#define RELATIVE (R_RELATIVE|C_RELATIVE) 297 RELATIVE = 1 | 2,
298};
300 299
301/* modes for rxvt_scr_insdel_chars(), rxvt_scr_insdel_lines() */ 300/* modes for rxvt_scr_insdel_chars (), rxvt_scr_insdel_lines () */
302#define INSERT -1 /* don't change these values */ 301enum {
303#define DELETE +1 302 INSERT = -1, /* don't change these values */
304#define ERASE +2 303 DELETE = +1,
304 ERASE = +2,
305};
305 306
306/* modes for rxvt_scr_page() - scroll page. used by scrollbar window */ 307/* modes for rxvt_scr_page () - scroll page. used by scrollbar window */
307enum page_dirn { 308enum page_dirn {
308 UP, 309 UP,
309 DN, 310 DN,
310 NO_DIR 311 NO_DIR,
311}; 312};
312 313
313/* arguments for rxvt_scr_change_screen() */ 314/* arguments for rxvt_scr_change_screen () */
314enum { 315enum {
315 PRIMARY = 0, 316 PRIMARY = 0,
316 SECONDARY 317 SECONDARY,
317}; 318};
318 319
319#define RS_None 0 /* Normal */ 320#define RS_None 0 /* Normal */
320 321
321#define RS_fgMask 0x000001FFu /* 512 colors */ 322#define RS_fgMask 0x000001FFu /* 512 colors */
… …
345enum { 346enum {
346 C0_NUL = 0x00, 347 C0_NUL = 0x00,
347 C0_SOH, C0_STX, C0_ETX, C0_EOT, C0_ENQ, C0_ACK, C0_BEL, 348 C0_SOH, C0_STX, C0_ETX, C0_EOT, C0_ENQ, C0_ACK, C0_BEL,
348 C0_BS , C0_HT , C0_LF , C0_VT , C0_FF , C0_CR , C0_SO , C0_SI , 349 C0_BS , C0_HT , C0_LF , C0_VT , C0_FF , C0_CR , C0_SO , C0_SI ,
349 C0_DLE, C0_DC1, C0_DC2, D0_DC3, C0_DC4, C0_NAK, C0_SYN, C0_ETB, 350 C0_DLE, C0_DC1, C0_DC2, D0_DC3, C0_DC4, C0_NAK, C0_SYN, C0_ETB,
350 C0_CAN, C0_EM , C0_SUB, C0_ESC, C0_IS4, C0_IS3, C0_IS2, C0_IS1 351 C0_CAN, C0_EM , C0_SUB, C0_ESC, C0_IS4, C0_IS3, C0_IS2, C0_IS1,
351}; 352};
352#define CHAR_ST 0x9c /* 0234 */ 353#define CHAR_ST 0x9c /* 0234 */
353 354
354/* 355/*
355 * XTerm Operating System Commands: ESC ] Ps;Pt (ST|BEL) 356 * XTerm Operating System Commands: ESC ] Ps;Pt (ST|BEL)
356 * colour extensions by Christian W. Zuckschwerdt <zany@triq.net> 357 * colour extensions by Christian W. Zuckschwerdt <zany@triq.net>
357 */ 358 */
359enum {
358#define XTerm_name 0 360 XTerm_name = 0,
359#define XTerm_iconName 1 361 XTerm_iconName = 1,
360#define XTerm_title 2 362 XTerm_title = 2,
363 XTerm_property = 3, /* change X property, not yet implemented */
361#define XTerm_Color 4 /* change colors */ 364 XTerm_Color = 4, /* change colors */
365 XTerm_Color00 = 10, /* not implemented, CLASH! */
366 XTerm_Color01 = 11, /* not implemented */
362#define XTerm_Color_cursor 12 /* change actual 'Cursor' color */ 367 XTerm_Color_cursor = 12, /* change actual 'Cursor' color */
363#define XTerm_Color_pointer 13 /* change actual 'Pointer' color */ 368 XTerm_Color_pointer = 13, /* change actual 'Pointer' color */
369 XTerm_Color04 = 14, /* not implemented */
370 XTerm_Color05 = 15, /* not implemented */
371 XTerm_Color06 = 16, /* not implemented */
364#define XTerm_Color_RV 17 /* change actual 'Highlight' color */ 372 XTerm_Color_RV = 17, /* change actual 'Highlight' color */
365#define XTerm_Color_BD 18 /* change actual 'Bold' color */
366#define XTerm_Color_UL 19 /* change actual 'Underline' color */
367#define XTerm_logfile 46 /* not implemented */ 373 XTerm_logfile = 46, /* not implemented */
368#define XTerm_font 50 374 XTerm_font = 50,
369 375
370/* 376 XTerm_konsole30 = 30, /* reserved for konsole */
377 XTerm_konsole31 = 31, /* reserved for konsole */
378 XTerm_emacs51 = 51, /* reserved for emacs shell */
379 /*
371 * rxvt extensions of XTerm OSCs: ESC ] Ps;Pt (ST|BEL) 380 * rxvt extensions of XTerm OSCs: ESC ] Ps;Pt (ST|BEL)
372 */ 381 */
382 XTerm_locale = 9, /* change locale */
373#define XTerm_Menu 10 /* set menu item */ 383 XTerm_Menu = 10, /* set menu item */
384 XTerm_Color_BD = 18, /* change actual 'Bold' color */
385 XTerm_Color_UL = 19, /* change actual 'Underline' color */
374#define XTerm_Pixmap 20 /* new bg pixmap */ 386 XTerm_Pixmap = 20, /* new bg pixmap */
375#define XTerm_restoreFG 39 /* change default fg color */ 387 XTerm_restoreFG = 39, /* change default fg color */
376#define XTerm_restoreBG 49 /* change default bg color */ 388 XTerm_restoreBG = 49, /* change default bg color */
377#define XTerm_dumpscreen 55 /* dump scrollback and all of screen */ 389 XTerm_dumpscreen = 55, /* dump scrollback and all of screen */
390};
378 391
379/* Words starting with `Color_' are colours. Others are counts */ 392/* Words starting with `Color_' are colours. Others are counts */
380/* 393/*
381 * The following comment is mostly obsolete since pixcolor_set was expanded: 394 * The following comment is mostly obsolete since pixcolor_set was expanded:
382 * We're currently upto 29 colours. Only 3 more available. The 395 * We're currently upto 29 colours. Only 3 more available. The
… …
471 Rs_backgroundPixmap, 484 Rs_backgroundPixmap,
472#endif 485#endif
473#if (MENUBAR_MAX) 486#if (MENUBAR_MAX)
474 Rs_menu, 487 Rs_menu,
475#endif 488#endif
476#ifdef GREEK_SUPPORT
477 Rs_greek_keyboard,
478 Rs_greektoggle_key,
479#endif
480 Rs_loginShell, 489 Rs_loginShell,
481 Rs_jumpScroll, 490 Rs_jumpScroll,
482#ifdef HAVE_SCROLLBARS 491#ifdef HAVE_SCROLLBARS
483 Rs_scrollBar, 492 Rs_scrollBar,
484 Rs_scrollBar_right, 493 Rs_scrollBar_right,
… …
543 Rs_pointerBlankDelay, 552 Rs_pointerBlankDelay,
544 Rs_imLocale, 553 Rs_imLocale,
545 NUM_RESOURCES 554 NUM_RESOURCES
546}; 555};
547 556
548// see init.C:xa_named, which must be kept in sync 557// see init.C:xa_names, which must be kept in sync
549enum { 558enum {
550 XA_TEXT = 0, 559 XA_TEXT = 0,
551 XA_COMPOUND_TEXT, 560 XA_COMPOUND_TEXT,
552 XA_UTF8_STRING, 561 XA_UTF8_STRING,
553 XA_MULTIPLE, 562 XA_MULTIPLE,
… …
592/* #define PrivMode_MouseX11Track (1LU<<18) */ 601/* #define PrivMode_MouseX11Track (1LU<<18) */
593 602
594#define PrivMode_mouse_report (PrivMode_MouseX10|PrivMode_MouseX11) 603#define PrivMode_mouse_report (PrivMode_MouseX10|PrivMode_MouseX11)
595#define PrivMode(test,bit) \ 604#define PrivMode(test,bit) \
596 if (test) \ 605 if (test) \
597 R->PrivateModes |= (bit); \ 606 PrivateModes |= (bit); \
598 else \ 607 else \
599 R->PrivateModes &= ~(bit) 608 PrivateModes &= ~ (bit)
600 609
601#ifdef ALLOW_132_MODE 610#ifdef ALLOW_132_MODE
602# define PrivMode_Default \ 611# define PrivMode_Default \
603(PrivMode_Autowrap|PrivMode_aplKP|PrivMode_ShiftKeys|PrivMode_VisibleCursor|PrivMode_132OK) 612(PrivMode_Autowrap|PrivMode_aplKP|PrivMode_ShiftKeys|PrivMode_VisibleCursor|PrivMode_132OK)
604#else 613#else
605# define PrivMode_Default \ 614# define PrivMode_Default \
606(PrivMode_Autowrap|PrivMode_aplKP|PrivMode_ShiftKeys|PrivMode_VisibleCursor) 615(PrivMode_Autowrap|PrivMode_aplKP|PrivMode_ShiftKeys|PrivMode_VisibleCursor)
607#endif 616#endif
608 617
609#define XDEPTH R->Xdepth 618#define XDEPTH display->depth
610#define XCMAP R->Xcmap 619#define XCMAP display->cmap
611#define XVISUAL R->Xvisual 620#define XVISUAL display->visual
612 621
613#define IMBUFSIZ 128 /* input modifier buffer sizes */ 622#define IMBUFSIZ 128 /* input modifier buffer sizes */
614#ifndef BUFSIZ 623#ifndef BUFSIZ
615# define BUFSIZ 4096 624# define BUFSIZ 4096
616#endif 625#endif
… …
648#define Height2Pixel(n) ((int32_t)(n) * (int32_t)TermWin.fheight) 657#define Height2Pixel(n) ((int32_t)(n) * (int32_t)TermWin.fheight)
649 658
650#define TermWin_TotalWidth() ((int32_t)TermWin.width + 2 * (int32_t)TermWin.int_bwidth) 659#define TermWin_TotalWidth() ((int32_t)TermWin.width + 2 * (int32_t)TermWin.int_bwidth)
651#define TermWin_TotalHeight() ((int32_t)TermWin.height + 2 * (int32_t)TermWin.int_bwidth) 660#define TermWin_TotalHeight() ((int32_t)TermWin.height + 2 * (int32_t)TermWin.int_bwidth)
652 661
653#define Xroot DefaultRootWindow(R->Xdisplay)
654
655/* how to build & extract colors and attributes */ 662/* how to build & extract colors and attributes */
656#define GET_BASEFG(x) (((x) & RS_fgMask)) 663#define GET_BASEFG(x) (((x) & RS_fgMask))
657#define GET_BASEBG(x) (((x) & RS_bgMask)>>Color_Bits) 664#define GET_BASEBG(x) (((x) & RS_bgMask)>>Color_Bits)
658#ifndef NO_BRIGHTCOLOR 665#ifndef NO_BRIGHTCOLOR
659# define GET_FGCOLOR(x) \ 666# define GET_FGCOLOR(x) \
660 ((((x) & RS_Bold) == 0 \ 667 ((((x) & RS_Bold) == 0 \
661 || GET_BASEFG(x) < minCOLOR \ 668 || GET_BASEFG (x) < minCOLOR \
662 || GET_BASEFG(x) >= minBrightCOLOR) \ 669 || GET_BASEFG (x) >= minBrightCOLOR) \
663 ? GET_BASEFG(x) \ 670 ? GET_BASEFG (x) \
664 : (GET_BASEFG(x) + (minBrightCOLOR - minCOLOR))) 671 : (GET_BASEFG (x) + (minBrightCOLOR - minCOLOR)))
665# define GET_BGCOLOR(x) \ 672# define GET_BGCOLOR(x) \
666 ((((x) & RS_Blink) == 0 \ 673 ((((x) & RS_Blink) == 0 \
667 || GET_BASEBG(x) < minCOLOR \ 674 || GET_BASEBG (x) < minCOLOR \
668 || GET_BASEBG(x) >= minBrightCOLOR) \ 675 || GET_BASEBG (x) >= minBrightCOLOR) \
669 ? GET_BASEBG(x) \ 676 ? GET_BASEBG (x) \
670 : (GET_BASEBG(x) + (minBrightCOLOR - minCOLOR))) 677 : (GET_BASEBG (x) + (minBrightCOLOR - minCOLOR)))
671#else 678#else
672# define GET_FGCOLOR(x) GET_BASEFG(x) 679# define GET_FGCOLOR(x) GET_BASEFG(x)
673# define GET_BGCOLOR(x) GET_BASEBG(x) 680# define GET_BGCOLOR(x) GET_BASEBG(x)
674#endif 681#endif
675 682
… …
683 : ((x) & (RS_attrMask | RS_bgMask))) 690 : ((x) & (RS_attrMask | RS_bgMask)))
684#define SET_FGCOLOR(x,fg) (((x) & ~RS_fgMask) | (fg)) 691#define SET_FGCOLOR(x,fg) (((x) & ~RS_fgMask) | (fg))
685#define SET_BGCOLOR(x,bg) (((x) & ~RS_bgMask) | ((bg)<<Color_Bits)) 692#define SET_BGCOLOR(x,bg) (((x) & ~RS_bgMask) | ((bg)<<Color_Bits))
686#define SET_ATTR(x,a) (((x) & ~RS_attrMask)| (a)) 693#define SET_ATTR(x,a) (((x) & ~RS_attrMask)| (a))
687 694
688#define SET_PIXCOLOR(h, x) ((h)->pixcolor_set[(x) / NPIXCLR_BITS] |= (1 << ((x) % NPIXCLR_BITS))) 695#define SET_PIXCOLOR(x) (pixcolor_set[(x) / NPIXCLR_BITS] |= (1 << ((x) % NPIXCLR_BITS)))
689#define ISSET_PIXCOLOR(h, x) ((h)->pixcolor_set[(x) / NPIXCLR_BITS] & (1 << ((x) % NPIXCLR_BITS))) 696#define ISSET_PIXCOLOR(x) (pixcolor_set[(x) / NPIXCLR_BITS] & (1 << ((x) % NPIXCLR_BITS)))
690 697
691#ifdef HAVE_SCROLLBARS 698#ifdef HAVE_SCROLLBARS
692# define scrollbar_TotalWidth() (scrollBar.width + sb_shadow * 2) 699# define scrollbar_TotalWidth() (scrollBar.width + sb_shadow * 2)
693#else 700#else
694# define scrollbar_TotalWidth() (0) 701# define scrollbar_TotalWidth() (0)
695#endif 702#endif
696#define scrollbar_isMotion() (R->scrollBar.state == 'm') 703#define scrollbar_isMotion() (scrollBar.state == 'm')
697#define scrollbar_isUp() (R->scrollBar.state == 'U') 704#define scrollbar_isUp() (scrollBar.state == 'U')
698#define scrollbar_isDn() (R->scrollBar.state == 'D') 705#define scrollbar_isDn() (scrollBar.state == 'D')
699#define scrollbar_isUpDn() isupper (R->scrollBar.state) 706#define scrollbar_isUpDn() isupper (scrollBar.state)
700#define isScrollbarWindow(w) (R->scrollBar.state && (w) == R->scrollBar.win) 707#define isScrollbarWindow(w) (scrollBar.state && (w) == scrollBar.win)
701 708
702#define scrollbarnext_dnval() (R->scrollBar.end + (R->scrollBar.width + 1)) 709#define scrollbarnext_dnval() (scrollBar.end + (scrollBar.width + 1))
703#define scrollbarnext_upButton(y) ((y) > R->scrollBar.end \ 710#define scrollbarnext_upButton(y) ((y) > scrollBar.end \
704 && (y) <= scrollbarnext_dnval()) 711 && (y) <= scrollbarnext_dnval ())
705#define scrollbarnext_dnButton(y) ((y) > scrollbarnext_dnval()) 712#define scrollbarnext_dnButton(y) ((y) > scrollbarnext_dnval())
706#define SCROLLNEXT_MINHEIGHT SB_THUMB_MIN_HEIGHT 713#define SCROLLNEXT_MINHEIGHT SB_THUMB_MIN_HEIGHT
707#define scrollbarrxvt_upButton(y) ((y) < R->scrollBar.beg) 714#define scrollbarrxvt_upButton(y) ((y) < scrollBar.beg)
708#define scrollbarrxvt_dnButton(y) ((y) > R->scrollBar.end) 715#define scrollbarrxvt_dnButton(y) ((y) > scrollBar.end)
709#define SCROLLRXVT_MINHEIGHT 10 716#define SCROLLRXVT_MINHEIGHT 10
710#define SCROLLXTERM_MINHEIGHT 10 717#define SCROLLXTERM_MINHEIGHT 10
711 718
712#define scrollbar_minheight() (R->scrollBar.style == R_SB_NEXT \ 719#define scrollbar_minheight() (scrollBar.style == R_SB_NEXT \
713 ? SCROLLNEXT_MINHEIGHT \ 720 ? SCROLLNEXT_MINHEIGHT \
714 : SCROLLRXVT_MINHEIGHT) 721 : SCROLLRXVT_MINHEIGHT)
715#define scrollbar_above_slider(y) ((y) < R->scrollBar.top) 722#define scrollbar_above_slider(y) ((y) < scrollBar.top)
716#define scrollbar_below_slider(y) ((y) > R->scrollBar.bot) 723#define scrollbar_below_slider(y) ((y) > scrollBar.bot)
717#define scrollbar_position(y) ((y) - R->scrollBar.beg) 724#define scrollbar_position(y) ((y) - scrollBar.beg)
718#define scrollbar_size() (R->scrollBar.end - R->scrollBar.beg \ 725#define scrollbar_size() (scrollBar.end - scrollBar.beg \
719 - scrollbar_minheight()) 726 - scrollbar_minheight ())
720 727
721#if (MENUBAR_MAX > 1) 728#if (MENUBAR_MAX > 1)
722/* rendition style flags */ 729/* rendition style flags */
723# define menuBar_height() (TermWin.fheight + SHADOW) 730# define menuBar_height() (TermWin.fheight + SHADOW)
724# define menuBar_TotalHeight() (menuBar_height() + SHADOW + menuBar_margin) 731# define menuBar_TotalHeight() (menuBar_height() + SHADOW + menuBar_margin)
725# define isMenuBarWindow(w) ((w) == R->menuBar.win) 732# define isMenuBarWindow(w) ((w) == menuBar.win)
726#else 733#else
727# define menuBar_height() (0) 734# define menuBar_height() (0)
728# define menuBar_TotalHeight() (0) 735# define menuBar_TotalHeight() (0)
729# define isMenuBarWindow(w) (0) 736# define isMenuBarWindow(w) (0)
730#endif 737#endif
… …
806#endif 813#endif
807 814
808#define BLINK_INTERVAL 0.5 815#define BLINK_INTERVAL 0.5
809#define TEXT_BLINK_INTERVAL 0.5 816#define TEXT_BLINK_INTERVAL 0.5
810 817
818#ifndef __attribute__
819# ifdef __GNUC__
820# if (__GNUC__ == 2 && __GNUC_MINOR__ < 5) || (__GNUC__ < 2)
821# define __attribute__(x)
822# endif
823# endif
824# define __attribute__(x)
825#endif
826
827// primivite wrapper around mbstate_t to ensure initialisation
811struct mbstate { 828struct mbstate {
812 mbstate_t mbs; 829 mbstate_t mbs;
813 830
814 mbstate () 831 operator mbstate_t *() { return &mbs; }
815 {
816 MEMSET (&mbs, 0, sizeof (mbs)); 832 void reset () { MEMSET (&mbs, 0, sizeof (mbs)); }
817 } 833 mbstate () { reset (); }
818}; 834};
819 835
820struct rxvt_term : rxvt_vars { 836struct rxvt_term : rxvt_vars {
821 struct mbstate mbstate; 837 struct mbstate mbstate;
822 838
… …
857#endif 873#endif
858 scrollbar_align, 874 scrollbar_align,
859 selection_wait, 875 selection_wait,
860 selection_type; 876 selection_type;
861/* ---------- */ 877/* ---------- */
862#ifdef GREEK_SUPPORT
863 short greek_mode; /* greek keyboard mode */
864#endif
865 short rvideo; 878 short rvideo;
866 int16_t num_scr; /* screen: number lines scrolled */ 879 int16_t num_scr; /* screen: number lines scrolled */
867 unsigned int prev_ncol, /* screen: previous number of columns */ 880 unsigned int prev_ncol, /* screen: previous number of columns */
868 prev_nrow; /* screen: previous number of rows */ 881 prev_nrow; /* screen: previous number of rows */
869#ifdef RXVT_GRAPHICS
870 uint16_t gr_prev_start;
871#endif
872/* ---------- */ 882/* ---------- */
873 rend_t rstyle; 883 rend_t rstyle;
874/* ---------- */ 884/* ---------- */
875 uint32_t pixcolor_set[NPIXCLR_SETS]; 885 uint32_t pixcolor_set[NPIXCLR_SETS];
876/* ---------- */ 886/* ---------- */
… …
898 fnum, /* logical font number */ 908 fnum, /* logical font number */
899 last_bot, /* scrollbar last bottom position */ 909 last_bot, /* scrollbar last bottom position */
900 last_top, /* scrollbar last top position */ 910 last_top, /* scrollbar last top position */
901 last_state, /* scrollbar last state */ 911 last_state, /* scrollbar last state */
902 scrollbar_len, 912 scrollbar_len,
903 currmaxcol,
904#ifdef MENUBAR 913#ifdef MENUBAR
905 menu_readonly, /* okay to alter menu? */ 914 menu_readonly, /* okay to alter menu? */
906 Arrows_x, 915 Arrows_x,
907#endif 916#endif
908#if MENUBAR_MAX > 1 917#if MENUBAR_MAX > 1
… …
939#endif 948#endif
940#ifdef XTERM_SCROLLBAR 949#ifdef XTERM_SCROLLBAR
941 GC xscrollbarGC, 950 GC xscrollbarGC,
942 ShadowGC; 951 ShadowGC;
943#endif 952#endif
953#ifdef PLAIN_SCROLLBAR
954 GC pscrollbarGC;
955#endif
944#ifdef NEXT_SCROLLBAR 956#ifdef NEXT_SCROLLBAR
945 GC blackGC, 957 GC blackGC,
946 whiteGC, 958 whiteGC,
947 grayGC, 959 grayGC,
948 darkGC, 960 darkGC,
… …
976 const char *key_delete; 988 const char *key_delete;
977#endif 989#endif
978#if defined (HOTKEY_CTRL) || defined (HOTKEY_META) 990#if defined (HOTKEY_CTRL) || defined (HOTKEY_META)
979 KeySym ks_bigfont, ks_smallfont; 991 KeySym ks_bigfont, ks_smallfont;
980#endif 992#endif
981#ifdef GREEK_SUPPORT
982 KeySym ks_greekmodeswith;
983#endif
984#ifdef USE_XIM 993#ifdef USE_XIM
994 rxvt_xim *input_method;
985 XIC Input_Context; 995 XIC Input_Context;
986 XIMStyle input_style; 996 XIMStyle input_style;
987 int event_type; 997 int event_type;
988#endif 998#endif
989 struct mouse_event MEvent; 999 struct mouse_event MEvent;
990 XComposeStatus compose; 1000 XComposeStatus compose;
991#ifdef RXVT_GRAPHICS
992 int graphics_up;
993 struct grwin_t *gr_root;
994#endif
995 ttymode_t tio; 1001 ttymode_t tio;
996#ifdef UTMP_SUPPORT 1002#ifdef UTMP_SUPPORT
997# ifdef HAVE_STRUCT_UTMP 1003# ifdef HAVE_STRUCT_UTMP
998 struct utmp ut; 1004 struct utmp ut;
999# endif 1005# endif
… …
1008 row_col_t oldcursor; 1014 row_col_t oldcursor;
1009#ifdef XPM_BACKGROUND 1015#ifdef XPM_BACKGROUND
1010 bgPixmap_t bgPixmap; 1016 bgPixmap_t bgPixmap;
1011 XpmAttributes xpmAttr; /* originally loaded pixmap and its scaling */ 1017 XpmAttributes xpmAttr; /* originally loaded pixmap and its scaling */
1012#endif 1018#endif
1013#ifdef MULTICHAR_SET
1014 int oldcursormulti;
1015 void (*multichar_decode)(unsigned char *str, int len);
1016#endif
1017#ifndef RESET_TTY_TO_COMMON_DEFAULTS 1019#ifndef RESET_TTY_TO_COMMON_DEFAULTS
1018 struct stat ttyfd_stat; /* original status of our tty */ 1020 struct stat ttyfd_stat; /* original status of our tty */
1019#endif 1021#endif
1020#ifdef MENUBAR 1022#ifdef MENUBAR
1021 menu_t *ActiveMenu, /* currently active menu */ 1023 menu_t *ActiveMenu, /* currently active menu */
1022 *BuildMenu; /* the menu currently being built */ 1024 *BuildMenu; /* the menu currently being built */
1023 bar_t *CurrentBar; 1025 bar_t *CurrentBar;
1024# if !(MENUBAR_MAX > 1) 1026# if ! (MENUBAR_MAX > 1)
1025 bar_t BarList; 1027 bar_t BarList;
1026# endif /* (MENUBAR_MAX > 1) */ 1028# endif /* (MENUBAR_MAX > 1) */
1027#endif
1028#ifdef RXVT_GRAPHICS
1029 Window gr_last_id;
1030#endif 1029#endif
1031#ifdef CURSOR_BLINK 1030#ifdef CURSOR_BLINK
1032 struct timeval lastcursorchange; 1031 struct timeval lastcursorchange;
1033#endif 1032#endif
1034#ifdef POINTER_BLANK 1033#ifdef POINTER_BLANK
… …
1038/* these three don't need to be kept but do so to placate some mem checkers */ 1037/* these three don't need to be kept but do so to placate some mem checkers */
1039 char *env_windowid; /* environmental variable WINDOWID */ 1038 char *env_windowid; /* environmental variable WINDOWID */
1040 char *env_display; /* environmental variable DISPLAY */ 1039 char *env_display; /* environmental variable DISPLAY */
1041 char *env_term; /* environmental variable TERM */ 1040 char *env_term; /* environmental variable TERM */
1042 char *env_colorfgbg; 1041 char *env_colorfgbg;
1043 char *buffer;
1044 char *locale; 1042 char *locale;
1045 char *codeset; 1043 char *codeset;
1046 char charsets[4]; 1044 char charsets[4];
1047 unsigned char *v_buffer; /* pointer to physical buffer */ 1045 unsigned char *v_buffer; /* pointer to physical buffer */
1048 unsigned int v_buflen; /* size of area to write */ 1046 unsigned int v_buflen; /* size of area to write */
1049 char *newfont[MAX_NFONTS]; 1047 char *newfont[MAX_NFONTS];
1048 stringvec *argv, *envv; /* if != 0, will be freed on destroy time */
1050#ifdef KEYSYM_RESOURCE 1049#ifdef KEYSYM_RESOURCE
1051 const unsigned char *Keysym_map[256]; 1050 const unsigned char *Keysym_map[256];
1052#endif 1051#endif
1053 const char *rs[NUM_RESOURCES]; 1052 const char *rs[NUM_RESOURCES];
1054/* command input buffering */ 1053/* command input buffering */
… …
1060 1059
1061 void paste (const unsigned char *data, unsigned int len); 1060 void paste (const unsigned char *data, unsigned int len);
1062 1061
1063 void flush (); 1062 void flush ();
1064 1063
1064 void rootwin_cb (XEvent &xev);
1065 xevent_watcher rootwin_ev;
1066
1067 void x_cb (XEvent &xev);
1068 xevent_watcher termwin_ev;
1069 xevent_watcher vt_ev;
1070#ifdef HAVE_SCROLLBARS
1071 xevent_watcher scrollbar_ev;
1072#endif
1073#ifdef MENUBAR
1074 xevent_watcher menubar_ev;
1075#endif
1076
1065 void check_cb (check_watcher &w); check_watcher check_ev; 1077 void check_cb (check_watcher &w); check_watcher check_ev;
1066 void destroy_cb (time_watcher &w); time_watcher destroy_ev; 1078 void destroy_cb (time_watcher &w); time_watcher destroy_ev;
1067 1079
1068 void pty_cb (io_watcher &w, short revents); io_watcher pty_ev; 1080 void pty_cb (io_watcher &w, short revents); io_watcher pty_ev;
1069 void x_cb (io_watcher &w, short revents); io_watcher x_ev;
1070 1081
1071 void incr_cb (time_watcher &w); time_watcher incr_ev; 1082 void incr_cb (time_watcher &w); time_watcher incr_ev;
1072 1083
1073#ifdef CURSOR_BLINK 1084#ifdef CURSOR_BLINK
1074 void cursor_blink_cb (time_watcher &w); time_watcher cursor_blink_ev; 1085 void cursor_blink_cb (time_watcher &w); time_watcher cursor_blink_ev;
… …
1096 bool init_vars (); 1107 bool init_vars ();
1097 1108
1098 uint32_t next_char (); 1109 uint32_t next_char ();
1099 1110
1100 bool pty_fill (); 1111 bool pty_fill ();
1101 void process_x_events ();
1102 1112
1103 void *operator new (size_t s); 1113 void *operator new (size_t s);
1104 void operator delete (void *p, size_t s); 1114 void operator delete (void *p, size_t s);
1105 1115
1106 void init_secondary (); 1116 void init_secondary ();
… …
1110 void init_xlocale (); 1120 void init_xlocale ();
1111 void init_command (const char *const *argv); 1121 void init_command (const char *const *argv);
1112 int run_command (const char *const *argv); 1122 int run_command (const char *const *argv);
1113 int run_child (const char *const *argv); 1123 int run_child (const char *const *argv);
1114 1124
1115 void color_aliases(int idx); 1125 void color_aliases (int idx);
1116 void recolour_cursor (); 1126 void recolour_cursor ();
1117 void create_windows (int argc, const char *const *argv); 1127 void create_windows (int argc, const char *const *argv);
1118 void resize_all_windows (unsigned int width, unsigned int height, int ignoreparent); 1128 void resize_all_windows (unsigned int width, unsigned int height, int ignoreparent);
1119 void window_calc (unsigned int width, unsigned int height); 1129 void window_calc (unsigned int width, unsigned int height);
1120 void set_preedit_area (XRectangle * preedit_rect, XRectangle * status_rect, XRectangle * needed_rect);
1121 1130
1122#if USE_XIM 1131#if USE_XIM
1132 void im_destroy ();
1133 void im_cb (); im_watcher im_ev;
1123 void set_size (XRectangle *size); 1134 void im_set_size (XRectangle *size);
1124 void set_position (XPoint *pos); 1135 void im_set_position (XPoint *pos);
1125 void set_color (unsigned long *fg, unsigned long *bg); 1136 void im_set_color (unsigned long *fg, unsigned long *bg);
1137 void im_set_preedit_area (XRectangle * preedit_rect, XRectangle * status_rect, XRectangle * needed_rect);
1138
1139 bool IMisRunning ();
1140 void IMSendSpot ();
1141 bool IM_get_IC (const char *modifiers);
1142 void IMSetStatusPosition ();
1126#endif 1143#endif
1127 1144
1128 void resize_scrollbar (); 1145 void resize_scrollbar ();
1129 1146
1130 void pixel_position (int *x, int *y); 1147 void pixel_position (int *x, int *y);
1131 1148
1132 void selection_click (int clicks, int x, int y); 1149 void selection_click (int clicks, int x, int y);
1133 void selection_extend (int x, int y, int flag); 1150 void selection_extend (int x, int y, int flag);
1134 void selection_rotate (int x, int y); 1151 void selection_rotate (int x, int y);
1135 1152
1136 /* screen(!) */ 1153 /* screen (!) */
1137 void scr_blank_line (text_t *et, rend_t *er, unsigned int width, rend_t efs); 1154 void scr_blank_line (text_t *et, rend_t *er, unsigned int width, rend_t efs);
1138 void scr_blank_screen_mem (text_t **tp, rend_t **rp, unsigned int row, rend_t efs); 1155 void scr_blank_screen_mem (text_t **tp, rend_t **rp, unsigned int row, rend_t efs);
1139 int scr_scroll_text (int row1, int row2, int count, int spec); 1156 int scr_scroll_text (int row1, int row2, int count, int spec);
1140 void scr_reset (); 1157 void scr_reset ();
1141 void scr_reset_realloc (); 1158 void scr_reset_realloc ();
1142 void scr_release (); 1159 void scr_release ();
1143 void scr_clear (); 1160 void scr_clear (bool really = true);
1144 void scr_refresh (unsigned char refresh_type); 1161 void scr_refresh (unsigned char refresh_type);
1145 bool scr_refresh_rend (rend_t mask, rend_t value); 1162 bool scr_refresh_rend (rend_t mask, rend_t value);
1146 void scr_erase_screen (int mode); 1163 void scr_erase_screen (int mode);
1147 void scr_touch (bool refresh); 1164 void scr_touch (bool refresh);
1148 void scr_expose (int x, int y, int width, int height, bool refresh); 1165 void scr_expose (int x, int y, int width, int height, bool refresh);
1166 void scr_remap_chars ();
1167 void scr_remap_chars (text_t *tp, rend_t *rp);
1168
1169 /* autoconvert */
1170
1171 // command.C
1172 void lookup_key (XKeyEvent &ev);
1173 unsigned int cmd_write (const unsigned char *str, unsigned int count);
1174 uint32_t cmd_getc ();
1175 bool cmd_parse ();
1176 void mouse_report (XButtonEvent &ev);
1177 void button_press (XButtonEvent &ev);
1178 void button_release (XButtonEvent &ev);
1179 int check_our_parents ();
1180#ifdef PRINTPIPE
1181 FILE *popen_printer ();
1182 int pclose_printer (FILE *stream);
1183#endif
1184 void process_print_pipe ();
1185 void process_nonprinting (unsigned char ch);
1186 void process_escape_vt52 (unsigned char ch);
1187 void process_escape_seq ();
1188 void process_csi_seq ();
1189 void process_window_ops (const int *args, unsigned int nargs);
1190 unsigned char * get_to_st (unsigned char *ends_how);
1191 void process_dcs_seq ();
1192 void process_osc_seq ();
1193 void xterm_seq (int op, const char *str, unsigned char resp __attribute__ ((unused)));
1194 int privcases (int mode, unsigned long bit);
1195 void process_terminal_mode (int mode, int priv, unsigned int nargs, const int *arg);
1196 void process_sgr_mode (unsigned int nargs, const int *arg);
1197 void process_graphics ();
1198 // init.C
1199 void Get_Colours ();
1200 void get_ourmods ();
1201 // logging.C
1202 void makeutent (const char *pty, const char *hostname);
1203 void cleanutent ();
1204 // main.C;
1205 void privileges (int mode);
1206 void privileged_utmp (char action);
1207 void privileged_ttydev (char action);
1208 bool change_font (const char *fontname);
1209 bool font_up_down (int n, int direction);
1210 void set_title (const char *str);
1211 void set_iconName (const char *str);
1212 void set_window_color (int idx, const char *color);
1213 void set_colorfgbg ();
1214 int rXParseAllocColor (rxvt_color * screen_in_out, const char *colour);
1215 void set_widthheight (unsigned int width, unsigned int height);
1216
1217#ifdef MENUBAR
1218 // menubar.C
1219 void menuitem_free (menu_t *menu, menuitem_t *item);
1220 int action_dispatch (action_t *action);
1221 void menuarrow_free (char name);
1222 void menuarrow_add (char *string);
1223 char *menu_find_base (menu_t **menu, char *path);
1224 menu_t *menu_delete (menu_t *menu);
1225 menu_t *menu_add (menu_t *parent, char *path);
1226 void drawbox_menubar (int x, int len, int state);
1227 void drawtriangle (int x, int y, int state);
1228 void drawbox_menuitem (int y, int state);
1229 void menu_show ();
1230 void menu_display (void (rxvt_term::*update) ());
1231 void menu_hide_all ();
1232 void menu_hide ();
1233 void menu_clear (menu_t *menu);
1234 void menubar_clear ();
1235 bar_t *menubar_find (const char *name);
1236 int menubar_push (const char *name);
1237 void menubar_remove (const char *name);
1238 void menubar_dump (FILE *fp);
1239 void menubar_read (const char *filename);
1240 void menubar_dispatch (char *str);
1241 void draw_Arrows (int name, int state);
1242 void menubar_expose ();
1243 int menubar_mapping (int map);
1244 int menu_select (XButtonEvent &ev);
1245 void menubar_select (XButtonEvent &ev);
1246 void menubar_control (XButtonEvent &ev);
1247 void map_menuBar (int map);
1248#endif
1249
1250 // screen.C
1251 void scr_poweron ();
1252 void scr_cursor (int mode);
1253 int scr_change_screen (int scrn);
1254 void scr_color (unsigned int color, int fgbg);
1255 void scr_rendition (int set, int style);
1256 void scr_add_lines (const uint32_t *str, int nlines, int len);
1257 void scr_backspace ();
1258 void scr_tab (int count);
1259 void scr_backindex ();
1260 void scr_forwardindex ();
1261 void scr_gotorc (int row, int col, int relative);
1262 void scr_index (enum page_dirn direction);
1263 void scr_erase_line (int mode);
1264 void scr_E ();
1265 void scr_insdel_lines (int count, int insdel);
1266 void scr_insdel_chars (int count, int insdel);
1267 void scr_scroll_region (int top, int bot);
1268 void scr_cursor_visible (int mode);
1269 void scr_autowrap (int mode);
1270 void scr_relative_origin (int mode);
1271 void scr_insert_mode (int mode);
1272 void scr_set_tab (int mode);
1273 void scr_rvideo_mode (int mode);
1274 void scr_report_position ();
1275 void set_font_style ();
1276 void scr_charset_choose (int set);
1277 void scr_charset_set (int set, unsigned int ch);
1278 int scr_move_to (int y, int len);
1279 int scr_page (enum page_dirn direction, int nlines);
1280 int scr_changeview (uint16_t oldviewstart);
1281 void scr_bell ();
1282 void scr_printscreen (int fullhist);
1283 void scr_reverse_selection ();
1284 void scr_dump (int fd);
1285 void selection_check (int check_more);
1286 int selection_paste (Window win, Atom prop, bool delete_prop);
1287 void selection_property (Window win, Atom prop);
1288 void selection_request (Time tm, int x, int y);
1289 int selection_request_other (Atom target, int selnum);
1290 void selection_clear ();
1291 void selection_make (Time tm);
1292 void selection_start_colrow (int col, int row);
1293 void selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret);
1294 void selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange);
1295 void selection_remove_trailing_spaces ();
1296 void selection_send (const XSelectionRequestEvent &rq);
1297
1298#if defined(NEXT_SCROLLBAR)
1299 // scrollbar-next.C
1300 Pixmap renderPixmap (const char *const *data, int width, int height);
1301 void init_scrollbar_stuff ();
1302 void drawBevel (Drawable d, int x1, int y1, int w, int h);
1303 int scrollbar_show_next (int update, int last_top, int last_bot, int scrollbar_len);
1304#endif
1305
1306#if defined(RXVT_SCROLLBAR)
1307 // scrollbar-rxvt.C
1308 void Draw_button (int x, int y, int state, int dirn);
1309 int scrollbar_show_rxvt (int update, int last_top, int last_bot, int scrollbar_len);
1310#endif
1311
1312#if defined(XTERM_SCROLLBAR)
1313 // scrollbar-xterm.C
1314 int scrollbar_show_xterm (int update, int last_top, int last_bot, int scrollbar_len);
1315#endif
1316
1317#if defined(PLAIN_SCROLLBAR)
1318 // scrollbar-plain.C
1319 int scrollbar_show_plain (int update, int last_top, int last_bot, int scrollbar_len);
1320#endif
1321
1322 // scrollbar.C
1323 int scrollbar_mapping (int map);
1324 int scrollbar_show (int update);
1325 void setup_scrollbar (const char *scrollalign, const char *scrollstyle, const char *thickness);
1326
1327 // xdefaults.C
1328 void get_options (int argc, const char *const *argv);
1329 int parse_keysym (const char *str, const char *arg);
1330 void get_xdefaults (FILE *stream, const char *name);
1331 void extract_resources (Display *display, const char *name);
1332 // xpm.C
1333 int scale_pixmap (const char *geom);
1334 void resize_pixmap ();
1335 Pixmap set_bgPixmap (const char *file);
1149}; 1336};
1150 1337
1151#define SET_LOCALE(locale) rxvt_set_locale (locale) 1338#define SET_LOCALE(locale) rxvt_set_locale (locale)
1152extern void rxvt_set_locale (const char *locale); 1339extern void rxvt_set_locale (const char *locale);
1153
1154#ifndef __attribute__
1155# ifdef __GNUC__
1156# if (__GNUC__ == 2 && __GNUC_MINOR__ < 5) || (__GNUC__ < 2)
1157# define __attribute__(x)
1158# endif
1159# endif
1160# define __attribute__(x)
1161#endif
1162 1340
1163/* 1341/*
1164 ***************************************************************************** 1342 *****************************************************************************
1165 * PROTOTYPES 1343 * PROTOTYPES
1166 ***************************************************************************** 1344 *****************************************************************************

Diff Legend

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