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.370 by root, Tue Nov 4 14:25:10 2008 UTC vs.
Revision 1.414 by sf-exg, Wed Jul 28 17:56:16 2010 UTC

… …
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
116
117#if !defined (EACCESS) && defined(EAGAIN)
118# define EACCESS EAGAIN
119#endif 115#endif
120 116
121#ifndef EXIT_SUCCESS /* missing from <stdlib.h> */ 117#ifndef EXIT_SUCCESS /* missing from <stdlib.h> */
122# define EXIT_SUCCESS 0 /* exit function success */ 118# define EXIT_SUCCESS 0 /* exit function success */
123# define EXIT_FAILURE 1 /* exit function failure */ 119# define EXIT_FAILURE 1 /* exit function failure */
… …
151char * rxvt_wcstombs (const wchar_t *str, int len = -1); 147char * rxvt_wcstombs (const wchar_t *str, int len = -1);
152wchar_t * rxvt_mbstowcs (const char *str, int len = -1); 148wchar_t * rxvt_mbstowcs (const char *str, int len = -1);
153char * rxvt_wcstoutf8 (const wchar_t *str, int len = -1); 149char * rxvt_wcstoutf8 (const wchar_t *str, int len = -1);
154wchar_t * rxvt_utf8towcs (const char *str, int len = -1); 150wchar_t * rxvt_utf8towcs (const char *str, int len = -1);
155 151
156char * rxvt_basename (const char *str) NOTHROW; 152const char * rxvt_basename (const char *str) NOTHROW;
157void rxvt_vlog (const char *fmt, va_list arg_ptr) NOTHROW; 153void rxvt_vlog (const char *fmt, va_list arg_ptr) NOTHROW;
158void rxvt_log (const char *fmt,...) NOTHROW; 154void rxvt_log (const char *fmt,...) NOTHROW;
159void rxvt_warn (const char *fmt,...) NOTHROW; 155void rxvt_warn (const char *fmt,...) NOTHROW;
160void rxvt_fatal (const char *fmt, ...) THROW ((class rxvt_failure_exception)) NORETURN; 156void rxvt_fatal (const char *fmt, ...) THROW ((class rxvt_failure_exception)) NORETURN;
161void rxvt_exit_failure () THROW ((class rxvt_failure_exception)) NORETURN; 157void rxvt_exit_failure () THROW ((class rxvt_failure_exception)) NORETURN;
… …
204 200
205/* 201/*
206 * the 'essential' information for reporting Mouse Events 202 * the 'essential' information for reporting Mouse Events
207 * pared down from XButtonEvent 203 * pared down from XButtonEvent
208 */ 204 */
209struct mouse_event { 205struct mouse_event
206{
210 int clicks; 207 int clicks;
211 Time time; /* milliseconds */ 208 Time time; /* milliseconds */
212 unsigned int state; /* key or button mask */ 209 unsigned int state; /* key or button mask */
213 unsigned int button; /* detail */ 210 unsigned int button; /* detail */
214}; 211};
… …
250# define COLORTERMENVFULL COLORTERMENV "-xpm" 247# define COLORTERMENVFULL COLORTERMENV "-xpm"
251#else 248#else
252# define COLORTERMENVFULL COLORTERMENV 249# define COLORTERMENVFULL COLORTERMENV
253#endif 250#endif
254#ifndef TERMENV 251#ifndef TERMENV
252# if USE_256_COLORS
253# define TERMENV "rxvt-unicode-256color"
254# else
255# define TERMENV "rxvt-unicode" 255# define TERMENV "rxvt-unicode"
256# endif
256#endif 257#endif
257 258
258#if defined (NO_MOUSE_REPORT) && !defined (NO_MOUSE_REPORT_SCROLLBAR) 259#if defined (NO_MOUSE_REPORT) && !defined (NO_MOUSE_REPORT_SCROLLBAR)
259# define NO_MOUSE_REPORT_SCROLLBAR 1 260# define NO_MOUSE_REPORT_SCROLLBAR 1
260#endif 261#endif
… …
307enum { 308enum {
308 PRIMARY = 0, 309 PRIMARY = 0,
309 SECONDARY, 310 SECONDARY,
310}; 311};
311 312
313// define various rendition bits and masks. the rendition word
314// is 32 bits in size, and we should use it as efficiently as possible
315
312#define RS_None 0 316#define RS_None 0
313 317
314#define RS_fgMask 0x0000007fUL // 128 colors 318// GET_BGATTR depends on RS_fgShift > RS_bgShift
315#define RS_bgMask 0x00003f80UL // 128 colors 319#define RS_colorMask ((1UL << Color_Bits) - 1UL)
320#define RS_bgShift 0
321#define RS_fgShift (RS_bgShift + Color_Bits)
322#define RS_bgMask (RS_colorMask << RS_bgShift)
323#define RS_fgMask (RS_colorMask << RS_fgShift)
324
325// must have space for rxvt_fontset::fontCount * 2 + 2 values
326#define RS_fontShift (RS_fgShift + Color_Bits)
327#define RS_Careful (1UL << RS_fontShift) /* be careful when drawing these */
328#define RS_fontCount rxvt_fontset::fontCount
329#define RS_fontMask ((RS_fontCount << (RS_fontShift + 1)) | RS_Careful) // includes RS_Careful
330
331// toggle this to force redraw, must be != RS_Careful and otherwise "pretty neutral"
332#define RS_redraw (2UL << RS_fontShift)
333
334#define RS_Sel (1UL << 22)
335
336// 4 custom bits for extensions
337#define RS_customCount 16UL
338#define RS_customShift 23
339#define RS_customMask ((RS_customCount - 1UL) << RS_customShift)
316 340
317// font styles 341// font styles
318#define RS_Bold 0x00004000UL // value 1 342#define RS_Bold (1UL << RS_styleShift)
319#define RS_Italic 0x00008000UL // value 2 343#define RS_Italic (2UL << RS_styleShift)
344
345#define RS_styleCount 4
346#define RS_styleShift 27
347#define RS_styleMask (RS_Bold | RS_Italic)
320 348
321// fake styles 349// fake styles
322#define RS_Blink 0x00010000UL // blink 350#define RS_Blink (1UL << 29)
323#define RS_RVid 0x00020000UL // reverse video 351#define RS_RVid (1UL << 30) // reverse video
324#define RS_Uline 0x00040000UL // underline 352#define RS_Uline (1UL << 31) // underline
325
326// toggle this to force redraw, must be != RS_Careful
327#define RS_redraw 0x01000000UL
328
329// 5 custom bits for extensions
330#define RS_customCount 32
331#define RS_customMask 0x00f80000UL
332#define RS_customShift 19
333
334// other flags
335#define RS_Careful 0x80000000UL /* be careful when drawing these */
336
337#define RS_styleCount 4
338#define RS_styleMask (RS_Bold | RS_Italic)
339#define RS_styleShift 14
340 353
341#define RS_baseattrMask (RS_Italic | RS_Bold | RS_Blink | RS_RVid | RS_Uline) 354#define RS_baseattrMask (RS_Italic | RS_Bold | RS_Blink | RS_RVid | RS_Uline)
342#define RS_attrMask (RS_baseattrMask | RS_fontMask) 355#define RS_attrMask (RS_baseattrMask | RS_fontMask)
343 356
344#define RS_fontCount 127 // not 127 or 256, see rxvtfont.h
345#define RS_fontMask 0xff000000UL // plenty(?) of fonts, includes RS_Careful
346#define RS_fontShift 24
347
348#define DEFAULT_RSTYLE (RS_None | Color_fg | (Color_bg << Color_Bits)) 357#define DEFAULT_RSTYLE (RS_None | (Color_fg << RS_fgShift) | (Color_bg << RS_bgShift))
349#define OVERLAY_RSTYLE (RS_None | Color_Black | (Color_Yellow << Color_Bits)) 358#define OVERLAY_RSTYLE (RS_None | (Color_Black << RS_fgShift) | (Color_Yellow << RS_bgShift))
350 359
351#define Sel_none 0 /* Not waiting */ 360#define Sel_none 0 /* Not waiting */
352#define Sel_normal 0x01 /* normal selection */ 361#define Sel_normal 0x01 /* normal selection */
353#define Sel_incr 0x02 /* incremental selection */ 362#define Sel_incr 0x02 /* incremental selection */
354#define Sel_direct 0x00 363#define Sel_direct 0x00
… …
383 XTerm_Color_cursor = 12, // change actual 'Cursor' color 392 XTerm_Color_cursor = 12, // change actual 'Cursor' color
384 XTerm_Color_pointer_fg = 13, // change actual 'Pointer' fg color 393 XTerm_Color_pointer_fg = 13, // change actual 'Pointer' fg color
385 XTerm_Color_pointer_bg = 14, // change actual 'Pointer' bg color 394 XTerm_Color_pointer_bg = 14, // change actual 'Pointer' bg color
386 XTerm_Color05 = 15, // not implemented (tektronix fg) 395 XTerm_Color05 = 15, // not implemented (tektronix fg)
387 XTerm_Color06 = 16, // not implemented (tektronix bg) 396 XTerm_Color06 = 16, // not implemented (tektronix bg)
388 XTerm_Color_RV = 17, // change actual 'Highlight' color 397 XTerm_Color_HC = 17, // change actual 'Highlight' bg color
398 XTerm_Color_HTC = 19, // change actual 'Highlight' fg color
389 XTerm_logfile = 46, // not implemented 399 XTerm_logfile = 46, // not implemented
390 XTerm_font = 50, 400 XTerm_font = 50,
391 401
392 XTerm_konsole30 = 30, // reserved for konsole 402 XTerm_konsole30 = 30, // reserved for konsole
393 XTerm_konsole31 = 31, // reserved for konsole 403 XTerm_konsole31 = 31, // reserved for konsole
… …
395 /* 405 /*
396 * rxvt extensions of XTerm OSCs: ESC ] Ps;Pt (ST|BEL) 406 * rxvt extensions of XTerm OSCs: ESC ] Ps;Pt (ST|BEL)
397 */ 407 */
398 408
399 // deprecated 409 // deprecated
400 Rxvt_Color_BD = 18,
401 Rxvt_Color_UL = 19,
402 Rxvt_restoreFG = 39, 410 Rxvt_restoreFG = 39,
403 Rxvt_restoreBG = 49, 411 Rxvt_restoreBG = 49,
404 412
405 Rxvt_Pixmap = 20, // new bg pixmap 413 Rxvt_Pixmap = 20, // new bg pixmap
406 Rxvt_dumpscreen = 55, // dump scrollback and all of screen 414 Rxvt_dumpscreen = 55, // dump scrollback and all of screen
… …
410 418
411 URxvt_Color_IT = 704, // change actual 'Italic' colour 419 URxvt_Color_IT = 704, // change actual 'Italic' colour
412 URxvt_Color_tint = 705, // change actual tint colour 420 URxvt_Color_tint = 705, // change actual tint colour
413 URxvt_Color_BD = 706, // change actual 'Bold' color 421 URxvt_Color_BD = 706, // change actual 'Bold' color
414 URxvt_Color_UL = 707, // change actual 'Underline' color 422 URxvt_Color_UL = 707, // change actual 'Underline' color
423 URxvt_Color_border = 708,
415 424
416 URxvt_font = 710, 425 URxvt_font = 710,
417 URxvt_boldFont = 711, 426 URxvt_boldFont = 711,
418 URxvt_italicFont = 712, 427 URxvt_italicFont = 712,
419 URxvt_boldItalicFont = 713, 428 URxvt_boldItalicFont = 713,
… …
459 Color_White = maxBrightCOLOR, 468 Color_White = maxBrightCOLOR,
460#else 469#else
461 Color_White = maxCOLOR, 470 Color_White = maxCOLOR,
462#endif 471#endif
463 minTermCOLOR = Color_White + 1, 472 minTermCOLOR = Color_White + 1,
473#if USE_256_COLORS
474 maxTermCOLOR = Color_White + 240,
475#else
464 maxTermCOLOR = Color_White + 72, 476 maxTermCOLOR = Color_White + 72,
477#endif
465#ifndef NO_CURSORCOLOR 478#ifndef NO_CURSORCOLOR
466 Color_cursor, 479 Color_cursor,
467 Color_cursor2, 480 Color_cursor2,
468#endif 481#endif
469 Color_pointer_fg, 482 Color_pointer_fg,
… …
478#if ENABLE_FRILLS 491#if ENABLE_FRILLS
479 Color_underline, 492 Color_underline,
480#endif 493#endif
481#ifdef OPTION_HC 494#ifdef OPTION_HC
482 Color_HC, 495 Color_HC,
496 Color_HTC,
483#endif 497#endif
484 Color_scroll, 498 Color_scroll,
485#ifdef RXVT_SCROLLBAR 499#ifdef RXVT_SCROLLBAR
486 Color_trough, 500 Color_trough,
487#endif 501#endif
… …
499#else 513#else
500 TOTAL_COLORS = NRS_COLORS 514 TOTAL_COLORS = NRS_COLORS
501#endif 515#endif
502}; 516};
503 517
518#if USE_256_COLORS
519# define Color_Bits 9 // 0 .. maxTermCOLOR
520#else
504#define Color_Bits 7 // 0 .. maxTermCOLOR 521# define Color_Bits 7 // 0 .. maxTermCOLOR
522#endif
505 523
506/* 524/*
507 * Resource list 525 * Resource list
508 */ 526 */
509enum { 527enum {
… …
555#define CBUFCNT 8 // never call pty_fill/cmd_parse more than this often in a row 573#define CBUFCNT 8 // never call pty_fill/cmd_parse more than this often in a row
556#define UBUFSIZ 2048 // character buffer 574#define UBUFSIZ 2048 // character buffer
557 575
558#if ENABLE_FRILLS 576#if ENABLE_FRILLS
559# include <X11/Xmd.h> 577# include <X11/Xmd.h>
560typedef struct _mwmhints { 578typedef struct _mwmhints
579{
561 CARD32 flags; 580 CARD32 flags;
562 CARD32 functions; 581 CARD32 functions;
563 CARD32 decorations; 582 CARD32 decorations;
564 INT32 input_mode; 583 INT32 input_mode;
565 CARD32 status; 584 CARD32 status;
… …
596/* 615/*
597 ***************************************************************************** 616 *****************************************************************************
598 * MACRO DEFINES 617 * MACRO DEFINES
599 ***************************************************************************** 618 *****************************************************************************
600 */ 619 */
620
621// speed hack, copy some member variable into a local variable of the same name
601#define dLocal(type,name) type const name = this->name 622#define dLocal(type,name) type const name = this->name
602 623
603// for speed reasons, we assume that all codepoints 32 to 126 are 624// for speed reasons, we assume that all codepoints 32 to 126 are
604// single-width. 625// single-width.
605#define WCWIDTH(c) (IN_RANGE_INC (c, 0x20, 0x7e) ? 1 : wcwidth (c)) 626#define WCWIDTH(c) (IN_RANGE_INC (c, 0x20, 0x7e) ? 1 : wcwidth (c))
… …
612#define Col2Pixel(col) ((int32_t)Width2Pixel(col)) 633#define Col2Pixel(col) ((int32_t)Width2Pixel(col))
613#define Row2Pixel(row) ((int32_t)Height2Pixel(row)) 634#define Row2Pixel(row) ((int32_t)Height2Pixel(row))
614#define Width2Pixel(n) ((int32_t)(n) * (int32_t)fwidth) 635#define Width2Pixel(n) ((int32_t)(n) * (int32_t)fwidth)
615#define Height2Pixel(n) ((int32_t)(n) * (int32_t)fheight) 636#define Height2Pixel(n) ((int32_t)(n) * (int32_t)fheight)
616 637
617#define LINENO(n) MOD (term_start + int(n), total_rows) 638#define LINENO_of(t,n) MOD ((t)->term_start + int(n), (t)->total_rows)
618#define ROW(n) row_buf [LINENO (n)] 639#define ROW_of(t,n) (t)->row_buf [LINENO_of ((t), n)]
640
641#define LINENO(n) LINENO_of (this, n)
642#define ROW(n) ROW_of (this, n)
619 643
620/* how to build & extract colors and attributes */ 644/* how to build & extract colors and attributes */
621#define GET_BASEFG(x) (((x) & RS_fgMask)) 645#define GET_BASEFG(x) (((x) & RS_fgMask) >> RS_fgShift)
622#define GET_BASEBG(x) (((x) & RS_bgMask)>>Color_Bits) 646#define GET_BASEBG(x) (((x) & RS_bgMask) >> RS_bgShift)
623 647
624#define GET_FONT(x) (((x) & RS_fontMask) >> RS_fontShift) 648#define GET_FONT(x) (((x) & RS_fontMask) >> RS_fontShift)
625#define SET_FONT(x,fid) (((x) & ~RS_fontMask) | ((fid) << RS_fontShift)) 649#define SET_FONT(x,fid) (((x) & ~RS_fontMask) | ((fid) << RS_fontShift))
626 650
627#define GET_STYLE(x) (((x) & RS_styleMask) >> RS_styleShift) 651#define GET_STYLE(x) (((x) & RS_styleMask) >> RS_styleShift)
628#define SET_STYLE(x,style) (((x) & ~RS_styleMask) | ((style) << RS_styleShift)) 652#define SET_STYLE(x,style) (((x) & ~RS_styleMask) | ((style) << RS_styleShift))
629 653
630#define GET_ATTR(x) (((x) & RS_attrMask)) 654#define GET_ATTR(x) (((x) & RS_attrMask))
655// return attributes defining the background, encoding doesn't matter
656// depends on RS_fgShift > RS_bgShift
631#define GET_BGATTR(x) \ 657#define GET_BGATTR(x) \
658 (expect_false ((x) & RS_RVid) \
632 (((x) & RS_RVid) ? (((x) & (RS_attrMask & ~RS_RVid)) \ 659 ? (((x) & (RS_attrMask & ~RS_RVid)) \
633 | (((x) & RS_fgMask)<<Color_Bits)) \ 660 | (((x) & RS_fgMask) >> (RS_fgShift - RS_bgShift))) \
634 : ((x) & (RS_attrMask | RS_bgMask))) 661 : ((x) & (RS_attrMask | RS_bgMask)))
635#define SET_FGCOLOR(x,fg) (((x) & ~RS_fgMask) | (fg)) 662#define SET_FGCOLOR(x,fg) (((x) & ~RS_fgMask) | ((fg) << RS_fgShift))
636#define SET_BGCOLOR(x,bg) (((x) & ~RS_bgMask) | ((bg)<<Color_Bits)) 663#define SET_BGCOLOR(x,bg) (((x) & ~RS_bgMask) | ((bg) << RS_bgShift))
637#define SET_ATTR(x,a) (((x) & ~RS_attrMask) | (a)) 664#define SET_ATTR(x,a) (((x) & ~RS_attrMask) | (a))
638 665
639#define RS_SAME(a,b) (!(((a) ^ (b)) & ~RS_Careful)) 666#define RS_SAME(a,b) (!(((a) ^ (b)) & ~RS_Careful))
640 667
641#define PIXCOLOR_NAME(idx) rs[Rs_color + (idx)] 668#define PIXCOLOR_NAME(idx) rs[Rs_color + (idx)]
642#define ISSET_PIXCOLOR(idx) (!!rs[Rs_color + (idx)]) 669#define ISSET_PIXCOLOR(idx) (!!rs[Rs_color + (idx)])
643 670
644#if ENABLE_STYLES 671#if ENABLE_STYLES
645# define FONTSET(style) fontset[GET_STYLE (style)] 672# define FONTSET_of(t,style) (t)->fontset[GET_STYLE (style)]
646#else 673#else
647# define FONTSET(style) fontset[0] 674# define FONTSET_of(t,style) (t)->fontset[0]
648#endif 675#endif
676
677#define FONTSET(style) FONTSET_of (this, style)
649 678
650typedef callback<void (const char *)> log_callback; 679typedef callback<void (const char *)> log_callback;
651typedef callback<int (int)> getfd_callback; 680typedef callback<int (int)> getfd_callback;
652 681
653/****************************************************************************/ 682/****************************************************************************/
… …
656#define LINE_FILTERED 0x0002 // line has been filtered 685#define LINE_FILTERED 0x0002 // line has been filtered
657#define LINE_COMPRESSED 0x0004 // line has been compressed (NYI) 686#define LINE_COMPRESSED 0x0004 // line has been compressed (NYI)
658#define LINE_FILTER 0x0008 // line needs to be filtered before display (NYI) 687#define LINE_FILTER 0x0008 // line needs to be filtered before display (NYI)
659#define LINE_BIDI 0x0010 // line needs bidi (NYI) 688#define LINE_BIDI 0x0010 // line needs bidi (NYI)
660 689
661struct line_t { 690struct line_t
691{
662 text_t *t; // terminal the text 692 text_t *t; // terminal the text
663 rend_t *r; // rendition, uses RS_ flags 693 rend_t *r; // rendition, uses RS_ flags
664 tlen_t_ l; // length of each text line 694 tlen_t_ l; // length of each text line
665 uint32_t f; // flags 695 uint32_t f; // flags
666 696
… …
700}; 730};
701 731
702/****************************************************************************/ 732/****************************************************************************/
703 733
704// primitive wrapper around mbstate_t to ensure initialisation 734// primitive wrapper around mbstate_t to ensure initialisation
705struct mbstate { 735struct mbstate
736{
706 mbstate_t mbs; 737 mbstate_t mbs;
707 738
708 operator mbstate_t *() { return &mbs; } 739 operator mbstate_t *() { return &mbs; }
709 void reset () { memset (&mbs, 0, sizeof (mbs)); } 740 void reset () { memset (&mbs, 0, sizeof (mbs)); }
710 mbstate () { reset (); } 741 mbstate () { reset (); }
… …
731 762
732#if ENABLE_COMBINING 763#if ENABLE_COMBINING
733// compose chars are used to represent composite characters 764// compose chars are used to represent composite characters
734// that are not representable in unicode, as well as characters 765// that are not representable in unicode, as well as characters
735// not fitting in the BMP. 766// not fitting in the BMP.
736struct compose_char { 767struct compose_char
768{
737 unicode_t c1, c2; // any chars != NOCHAR are valid 769 unicode_t c1, c2; // any chars != NOCHAR are valid
738 compose_char (unicode_t c1, unicode_t c2) 770 compose_char (unicode_t c1, unicode_t c2)
739 : c1(c1), c2(c2) 771 : c1(c1), c2(c2)
740 { } 772 { }
741}; 773};
742 774
743class rxvt_composite_vec { 775class rxvt_composite_vec
776{
744 vector<compose_char> v; 777 vector<compose_char> v;
745public: 778public:
746 text_t compose (unicode_t c1, unicode_t c2 = NOCHAR); 779 text_t compose (unicode_t c1, unicode_t c2 = NOCHAR);
747 int expand (unicode_t c, wchar_t *r); 780 int expand (unicode_t c, wchar_t *r);
748 compose_char *operator [](text_t c) 781 compose_char *operator [](text_t c)
… …
767extern rxvt_t rxvt_current_term; 800extern rxvt_t rxvt_current_term;
768 801
769#define SET_R(r) rxvt_current_term = const_cast<rxvt_term *>(r) 802#define SET_R(r) rxvt_current_term = const_cast<rxvt_term *>(r)
770#define GET_R rxvt_current_term 803#define GET_R rxvt_current_term
771 804
805/* ------------------------------------------------------------------------- */
806struct overlay_base
807{
808 int x, y, w, h; // overlay dimensions
809 text_t **text;
810 rend_t **rend;
811
812 // while tempting to add swap() etc. here, it effectively only increases code size
813};
814
815/* ------------------------------------------------------------------------- */
816
772typedef struct { 817typedef struct
818{
773 int row; 819 int row;
774 int col; 820 int col;
775} row_col_t; 821} row_col_t;
776 822
777/* 823/*
… …
808 * | 854 * |
809 * | 855 * |
810 * END······················= total_rows 856 * END······················= total_rows
811 */ 857 */
812 858
813struct TermWin_t { 859struct TermWin_t
860{
814 int width; /* window width [pixels] */ 861 int width; /* window width [pixels] */
815 int height; /* window height [pixels] */ 862 int height; /* window height [pixels] */
816 int fwidth; /* font width [pixels] */ 863 int fwidth; /* font width [pixels] */
817 int fheight; /* font height [pixels] */ 864 int fheight; /* font height [pixels] */
818 int fbase; /* font ascent (baseline) [pixels] */ 865 int fbase; /* font ascent (baseline) [pixels] */
… …
821 int focus; /* window has focus */ 868 int focus; /* window has focus */
822 int mapped; /* window state mapped? */ 869 int mapped; /* window state mapped? */
823 int int_bwidth; /* internal border width */ 870 int int_bwidth; /* internal border width */
824 int ext_bwidth; /* external border width */ 871 int ext_bwidth; /* external border width */
825 int lineSpace; /* number of extra pixels between rows */ 872 int lineSpace; /* number of extra pixels between rows */
873 int letterSpace; /* number of extra pixels between columns */
826 int saveLines; /* number of lines that fit in scrollback */ 874 int saveLines; /* number of lines that fit in scrollback */
827 int total_rows; /* total number of rows in this terminal */ 875 int total_rows; /* total number of rows in this terminal */
828 int term_start; /* term lines start here */ 876 int term_start; /* term lines start here */
829 int view_start; /* scrollback view starts here */ 877 int view_start; /* scrollback view starts here */
830 int top_row; /* topmost row index of scrollback */ 878 int top_row; /* topmost row index of scrollback */
… …
852 * end: row/column of one character past end of selection 900 * end: row/column of one character past end of selection
853 * * Note: top_row <= beg.row <= mark.row <= end.row < nrow 901 * * Note: top_row <= beg.row <= mark.row <= end.row < nrow
854 * * Note: col == -1 ==> we're left of screen 902 * * Note: col == -1 ==> we're left of screen
855 * 903 *
856 */ 904 */
857typedef struct { 905struct screen_t
906{
858 row_col_t cur; /* cursor position on the screen */ 907 row_col_t cur; /* cursor position on the screen */
859 int tscroll; /* top of settable scroll region */ 908 int tscroll; /* top of settable scroll region */
860 int bscroll; /* bottom of settable scroll region */ 909 int bscroll; /* bottom of settable scroll region */
861 unsigned int charset; /* character set number [0..3] */ 910 unsigned int charset; /* character set number [0..3] */
862 unsigned int flags; /* see below */ 911 unsigned int flags; /* see below */
863 row_col_t s_cur; /* saved cursor position */ 912 row_col_t s_cur; /* saved cursor position */
864 unsigned int s_charset; /* saved character set number [0..3] */ 913 unsigned int s_charset; /* saved character set number [0..3] */
865 char s_charset_char; 914 char s_charset_char;
866 rend_t s_rstyle; /* saved rendition style */ 915 rend_t s_rstyle; /* saved rendition style */
867} screen_t; 916};
868 917
869enum selection_op_t { 918enum selection_op_t
919{
870 SELECTION_CLEAR = 0, /* nothing selected */ 920 SELECTION_CLEAR = 0, /* nothing selected */
871 SELECTION_INIT, /* marked a point */ 921 SELECTION_INIT, /* marked a point */
872 SELECTION_BEGIN, /* started a selection */ 922 SELECTION_BEGIN, /* started a selection */
873 SELECTION_CONT, /* continued selection */ 923 SELECTION_CONT, /* continued selection */
874 SELECTION_DONE /* selection put in CUT_BUFFER0 */ 924 SELECTION_DONE /* selection put in CUT_BUFFER0 */
875}; 925};
876 926
877typedef struct { 927struct selection_t
928{
878 wchar_t *text; /* selected text */ 929 wchar_t *text; /* selected text */
879 unsigned int len; /* length of selected text */ 930 unsigned int len; /* length of selected text */
880 unsigned int screen; /* screen being used */ 931 unsigned int screen; /* screen being used */
881 unsigned int clicks; /* number of clicks */ 932 unsigned int clicks; /* number of clicks */
882 selection_op_t op; /* current operation */ 933 selection_op_t op; /* current operation */
883 bool rect; /* rectangular selection? */ 934 bool rect; /* rectangular selection? */
884 row_col_t beg; /* beginning of selection <= mark */ 935 row_col_t beg; /* beginning of selection <= mark */
885 row_col_t mark; /* point of initial click <= end */ 936 row_col_t mark; /* point of initial click <= end */
886 row_col_t end; /* one character past end point */ 937 row_col_t end; /* one character past end point */
887} selection_t; 938 wchar_t *clip_text; /* text copied to the clipboard */
939 unsigned int clip_len; /* length of clipboard text */
940};
888 941
889/* ------------------------------------------------------------------------- */ 942/* ------------------------------------------------------------------------- */
890 943
891/* screen_t flags */ 944/* screen_t flags */
892#define Screen_Relative (1<<0) /* relative origin mode flag */ 945#define Screen_Relative (1<<0) /* relative origin mode flag */
… …
906Opt_count 959Opt_count
907}; 960};
908 961
909/* ------------------------------------------------------------------------- */ 962/* ------------------------------------------------------------------------- */
910 963
911struct rxvt_vars : TermWin_t { 964struct rxvt_vars : TermWin_t
965{
912 scrollBar_t scrollBar; 966 scrollBar_t scrollBar;
913 uint8_t options[(Opt_count + 7) >> 3]; 967 uint8_t options[(Opt_count + 7) >> 3];
914 XSizeHints szHint; 968 XSizeHints szHint;
915 rxvt_color *pix_colors; 969 rxvt_color *pix_colors;
916 Cursor TermWin_cursor; /* cursor for vt window */ 970 Cursor TermWin_cursor; /* cursor for vt window */
917 int numlock_state;
918 line_t *row_buf; // all lines, scrollback + terminal, circular, followed by temp_buf 971 line_t *row_buf; // all lines, scrollback + terminal, circular, followed by temp_buf
919 line_t *drawn_buf; // text on screen 972 line_t *drawn_buf; // text on screen
920 line_t *swap_buf; // lines for swap buffer 973 line_t *swap_buf; // lines for swap buffer
921 char *tabs; /* per location: 1 == tab-stop */ 974 char *tabs; /* per location: 1 == tab-stop */
922 screen_t screen; 975 screen_t screen;
… …
926#ifdef OFF_FOCUS_FADING 979#ifdef OFF_FOCUS_FADING
927 rxvt_color pix_colors_unfocused[TOTAL_COLORS]; 980 rxvt_color pix_colors_unfocused[TOTAL_COLORS];
928#endif 981#endif
929}; 982};
930 983
931struct rxvt_term : zero_initialized, rxvt_vars, rxvt_screen { 984struct rxvt_term : zero_initialized, rxvt_vars, rxvt_screen
985{
932 986
933 // special markers with magic addresses 987 // special markers with magic addresses
934 static const char resval_undef []; // options specifically unset 988 static const char resval_undef []; // options specifically unset
935 static const char resval_on []; // boolean options switched on 989 static const char resval_on []; // boolean options switched on
936 static const char resval_off []; // or off 990 static const char resval_off []; // or off
… …
944 998
945 unsigned char want_refresh:1, 999 unsigned char want_refresh:1,
946 current_screen:1, /* primary or secondary */ 1000 current_screen:1, /* primary or secondary */
947 num_scr_allow:1, 1001 num_scr_allow:1,
948 bypass_keystate:1, 1002 bypass_keystate:1,
949#ifdef ENABLE_FRILLS 1003#if ENABLE_FRILLS
950 urgency_hint:1, 1004 urgency_hint:1,
951#endif 1005#endif
952#ifdef CURSOR_BLINK 1006#if CURSOR_BLINK
953 hidden_cursor:1, 1007 hidden_cursor:1,
954#endif 1008#endif
955#ifdef TEXT_BLINK 1009#if TEXT_BLINK
956 hidden_text:1, 1010 hidden_text:1,
957#endif 1011#endif
958#ifdef POINTER_BLANK 1012#if POINTER_BLANK
959 hidden_pointer:1, 1013 hidden_pointer:1,
960#endif 1014#endif
961 enc_utf8:1, /* wether locale uses utf-8 */ 1015 enc_utf8:1, /* whether locale uses utf-8 */
962 seen_input:1, /* wether we have seen some program output yet */ 1016 seen_input:1, /* whether we have seen some program output yet */
963 seen_resize:1, /* wether we had a resize event */ 1017 seen_resize:1, /* whether we had a resize event */
964 parsed_geometry:1; 1018 parsed_geometry:1;
965 1019
966 unsigned char refresh_type, 1020 unsigned char refresh_type,
967#ifdef META8_OPTION 1021#ifdef META8_OPTION
968 meta_char, /* Alt-key prefix */ 1022 meta_char, /* Alt-key prefix */
… …
972/* ---------- */ 1026/* ---------- */
973 bool rvideo_state, rvideo_mode; 1027 bool rvideo_state, rvideo_mode;
974#ifndef NO_BELL 1028#ifndef NO_BELL
975 bool rvideo_bell; 1029 bool rvideo_bell;
976#endif 1030#endif
977 int num_scr; /* screen: number lines scrolled */ 1031 int num_scr; /* screen: number of lines scrolled */
978 int prev_ncol, /* screen: previous number of columns */ 1032 int prev_ncol, /* screen: previous number of columns */
979 prev_nrow; /* screen: previous number of rows */ 1033 prev_nrow; /* screen: previous number of rows */
980/* ---------- */ 1034/* ---------- */
981 rend_t rstyle; 1035 rend_t rstyle;
982/* ---------- */ 1036/* ---------- */
… …
1012 SavedModes; 1066 SavedModes;
1013/* ---------- */ 1067/* ---------- */
1014 Atom *xa; 1068 Atom *xa;
1015/* ---------- */ 1069/* ---------- */
1016 Time selection_time, 1070 Time selection_time,
1017 selection_request_time; 1071 selection_request_time,
1072 clipboard_time;
1018 pid_t cmd_pid; /* process id of child */ 1073 pid_t cmd_pid; /* process id of child */
1019 char * incr_buf; 1074 char * incr_buf;
1020 size_t incr_buf_size, incr_buf_fill; 1075 size_t incr_buf_size, incr_buf_fill;
1021/* ---------- */ 1076/* ---------- */
1022 struct mouse_event MEvent; 1077 struct mouse_event MEvent;
1023 XComposeStatus compose; 1078 XComposeStatus compose;
1024 struct termios tio; 1079 static struct termios def_tio;
1025 row_col_t oldcursor; 1080 row_col_t oldcursor;
1026#ifdef HAVE_BG_PIXMAP 1081#ifdef HAVE_BG_PIXMAP
1027 bgPixmap_t bgPixmap; 1082 bgPixmap_t bgPixmap;
1028#endif 1083#endif
1029#ifdef HAVE_AFTERIMAGE 1084#ifdef HAVE_AFTERIMAGE
… …
1036 asv = create_asvisual_for_id (dpy, display->screen, depth, XVisualIDFromVisual (visual), cmap, NULL); 1091 asv = create_asvisual_for_id (dpy, display->screen, depth, XVisualIDFromVisual (visual), cmap, NULL);
1037 } 1092 }
1038#endif 1093#endif
1039 1094
1040#if ENABLE_OVERLAY 1095#if ENABLE_OVERLAY
1041 int ov_x, ov_y, ov_w, ov_h; // overlay dimensions 1096 overlay_base ov;
1042 text_t **ov_text;
1043 rend_t **ov_rend;
1044 1097
1045 void scr_swap_overlay () NOTHROW; 1098 void scr_swap_overlay () NOTHROW;
1046 void scr_overlay_new (int x, int y, int w, int h) NOTHROW; 1099 void scr_overlay_new (int x, int y, int w, int h) NOTHROW;
1047 void scr_overlay_off () NOTHROW; 1100 void scr_overlay_off () NOTHROW;
1048 void scr_overlay_set (int x, int y, 1101 void scr_overlay_set (int x, int y,
… …
1205 void mouse_report (XButtonEvent &ev); 1258 void mouse_report (XButtonEvent &ev);
1206 void button_press (XButtonEvent &ev); 1259 void button_press (XButtonEvent &ev);
1207 void button_release (XButtonEvent &ev); 1260 void button_release (XButtonEvent &ev);
1208 void focus_in (); 1261 void focus_in ();
1209 void focus_out (); 1262 void focus_out ();
1263#if ENABLE_FRILLS
1210 void set_urgency (bool enable); 1264 void set_urgency (bool enable);
1265#else
1266 void set_urgency (bool enable) { }
1267#endif
1211 void update_fade_color (unsigned int idx); 1268 void update_fade_color (unsigned int idx);
1212#ifdef PRINTPIPE 1269#ifdef PRINTPIPE
1213 FILE *popen_printer (); 1270 FILE *popen_printer ();
1214 int pclose_printer (FILE *stream); 1271 int pclose_printer (FILE *stream);
1215#endif 1272#endif
… …
1221 void process_window_ops (const int *args, unsigned int nargs); 1278 void process_window_ops (const int *args, unsigned int nargs);
1222 char *get_to_st (unicode_t &ends_how); 1279 char *get_to_st (unicode_t &ends_how);
1223 void process_dcs_seq (); 1280 void process_dcs_seq ();
1224 void process_osc_seq (); 1281 void process_osc_seq ();
1225 void process_color_seq (int report, int color, const char *str, char resp); 1282 void process_color_seq (int report, int color, const char *str, char resp);
1226 void process_xterm_seq (int op, const char *str, char resp); 1283 void process_xterm_seq (int op, char *str, char resp);
1227 int privcases (int mode, unsigned long bit); 1284 int privcases (int mode, unsigned long bit);
1228 void process_terminal_mode (int mode, int priv, unsigned int nargs, const int *arg); 1285 void process_terminal_mode (int mode, int priv, unsigned int nargs, const int *arg);
1229 void process_sgr_mode (unsigned int nargs, const int *arg); 1286 void process_sgr_mode (unsigned int nargs, const int *arg);
1230 void process_graphics (); 1287 void process_graphics ();
1231 // init.C 1288 // init.C
… …
1251 void recolour_cursor (); 1308 void recolour_cursor ();
1252 void resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent); 1309 void resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent);
1253 void window_calc (unsigned int newwidth, unsigned int newheight); 1310 void window_calc (unsigned int newwidth, unsigned int newheight);
1254 bool set_fonts (); 1311 bool set_fonts ();
1255 void set_string_property (Atom prop, const char *str, int len = -1); 1312 void set_string_property (Atom prop, const char *str, int len = -1);
1313 void set_mbstring_property (Atom prop, const char *str, int len = -1);
1256 void set_utf8_property (Atom prop, const char *str, int len = -1); 1314 void set_utf8_property (Atom prop, const char *str, int len = -1);
1257 void set_title (const char *str); 1315 void set_title (const char *str);
1258 void set_icon_name (const char *str); 1316 void set_icon_name (const char *str);
1259 void set_window_color (int idx, const char *color); 1317 void set_window_color (int idx, const char *color);
1260 void set_colorfgbg (); 1318 void set_colorfgbg ();
… …
1350 else 1408 else
1351 priv_modes &= ~bit; 1409 priv_modes &= ~bit;
1352 } 1410 }
1353 1411
1354 // modifies first argument(!) 1412 // modifies first argument(!)
1413 void tt_paste (char *data, unsigned int len) NOTHROW;
1355 void paste (char *data, unsigned int len) NOTHROW; 1414 void paste (char *data, unsigned int len) NOTHROW;
1356 void scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) const NOTHROW; 1415 void scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) const NOTHROW;
1357 void scr_blank_screen_mem (line_t &l, rend_t efs) const NOTHROW; 1416 void scr_blank_screen_mem (line_t &l, rend_t efs) const NOTHROW;
1358 void scr_kill_char (line_t &l, int col) const NOTHROW; 1417 void scr_kill_char (line_t &l, int col) const NOTHROW;
1359 int scr_scroll_text (int row1, int row2, int count) NOTHROW; 1418 int scr_scroll_text (int row1, int row2, int count) NOTHROW;
… …
1375 void scr_remap_chars (line_t &l) NOTHROW; 1434 void scr_remap_chars (line_t &l) NOTHROW;
1376 1435
1377 enum cursor_mode { SAVE, RESTORE }; 1436 enum cursor_mode { SAVE, RESTORE };
1378 1437
1379 void scr_poweron (); 1438 void scr_poweron ();
1439 void scr_soft_reset () NOTHROW;
1380 void scr_cursor (cursor_mode mode) NOTHROW; 1440 void scr_cursor (cursor_mode mode) NOTHROW;
1381 void scr_do_wrap () NOTHROW; 1441 void scr_do_wrap () NOTHROW;
1382 void scr_swap_screen () NOTHROW; 1442 void scr_swap_screen () NOTHROW;
1383 void scr_change_screen (int scrn); 1443 void scr_change_screen (int scrn);
1384 void scr_color (unsigned int color, int fgbg) NOTHROW; 1444 void scr_color (unsigned int color, int fgbg) NOTHROW;
… …
1416 void selection_check (int check_more) NOTHROW; 1476 void selection_check (int check_more) NOTHROW;
1417 void selection_paste (Window win, Atom prop, bool delete_prop) NOTHROW; 1477 void selection_paste (Window win, Atom prop, bool delete_prop) NOTHROW;
1418 void selection_property (Window win, Atom prop) NOTHROW; 1478 void selection_property (Window win, Atom prop) NOTHROW;
1419 void selection_request (Time tm, int selnum = Sel_Primary) NOTHROW; 1479 void selection_request (Time tm, int selnum = Sel_Primary) NOTHROW;
1420 int selection_request_other (Atom target, int selnum) NOTHROW; 1480 int selection_request_other (Atom target, int selnum) NOTHROW;
1421 void selection_clear () NOTHROW; 1481 void selection_clear (bool clipboard = false) NOTHROW;
1422 void selection_make (Time tm); 1482 void selection_make (Time tm);
1423 bool selection_grab (Time tm) NOTHROW; 1483 bool selection_grab (Time tm, bool clipboard = false) NOTHROW;
1424 void selection_start_colrow (int col, int row) NOTHROW; 1484 void selection_start_colrow (int col, int row) NOTHROW;
1425 void selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) NOTHROW; 1485 void selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) NOTHROW;
1426 void selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) NOTHROW; 1486 void selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) NOTHROW;
1427 void selection_remove_trailing_spaces () NOTHROW; 1487 void selection_remove_trailing_spaces () NOTHROW;
1428 void selection_send (const XSelectionRequestEvent &rq) NOTHROW; 1488 void selection_send (const XSelectionRequestEvent &rq) NOTHROW;

Diff Legend

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