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.363 by ayin, Tue Feb 19 18:15:26 2008 UTC vs.
Revision 1.406 by root, Sun May 23 00:02:52 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_fontMask ((rxvt_fontset::fontCount << (RS_fontShift + 1)) | RS_Careful) // includes RS_Careful
329
330// toggle this to force redraw, must be != RS_Careful and otherwise "pretty neutral"
331#define RS_redraw (2UL << RS_fontShift)
332
333#define RS_Sel (1UL << 22)
334
335// 5 custom bits for extensions
336#define RS_customCount 16UL
337#define RS_customShift 23
338#define RS_customMask ((RS_customCount - 1UL) << RS_customShift)
316 339
317// font styles 340// font styles
318#define RS_Bold 0x00004000UL // value 1 341#define RS_Bold (1UL << RS_styleShift)
319#define RS_Italic 0x00008000UL // value 2 342#define RS_Italic (2UL << RS_styleShift)
343
344#define RS_styleCount 4
345#define RS_styleShift 27
346#define RS_styleMask (RS_Bold | RS_Italic)
320 347
321// fake styles 348// fake styles
322#define RS_Blink 0x00010000UL // blink 349#define RS_Blink (1UL << 29)
323#define RS_RVid 0x00020000UL // reverse video 350#define RS_RVid (1UL << 30) // reverse video
324#define RS_Uline 0x00040000UL // underline 351#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 352
341#define RS_baseattrMask (RS_Italic | RS_Bold | RS_Blink | RS_RVid | RS_Uline) 353#define RS_baseattrMask (RS_Italic | RS_Bold | RS_Blink | RS_RVid | RS_Uline)
342#define RS_attrMask (RS_baseattrMask | RS_fontMask) 354#define RS_attrMask (RS_baseattrMask | RS_fontMask)
343 355
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)) 356#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)) 357#define OVERLAY_RSTYLE (RS_None | (Color_Black << RS_fgShift) | (Color_Yellow << RS_bgShift))
350 358
351#define Sel_none 0 /* Not waiting */ 359#define Sel_none 0 /* Not waiting */
352#define Sel_normal 0x01 /* normal selection */ 360#define Sel_normal 0x01 /* normal selection */
353#define Sel_incr 0x02 /* incremental selection */ 361#define Sel_incr 0x02 /* incremental selection */
354#define Sel_direct 0x00 362#define Sel_direct 0x00
… …
383 XTerm_Color_cursor = 12, // change actual 'Cursor' color 391 XTerm_Color_cursor = 12, // change actual 'Cursor' color
384 XTerm_Color_pointer_fg = 13, // change actual 'Pointer' fg color 392 XTerm_Color_pointer_fg = 13, // change actual 'Pointer' fg color
385 XTerm_Color_pointer_bg = 14, // change actual 'Pointer' bg color 393 XTerm_Color_pointer_bg = 14, // change actual 'Pointer' bg color
386 XTerm_Color05 = 15, // not implemented (tektronix fg) 394 XTerm_Color05 = 15, // not implemented (tektronix fg)
387 XTerm_Color06 = 16, // not implemented (tektronix bg) 395 XTerm_Color06 = 16, // not implemented (tektronix bg)
388 XTerm_Color_RV = 17, // change actual 'Highlight' color 396 XTerm_Color_HC = 17, // change actual 'Highlight' bg color
397 XTerm_Color_HTC = 19, // change actual 'Highlight' fg color
389 XTerm_logfile = 46, // not implemented 398 XTerm_logfile = 46, // not implemented
390 XTerm_font = 50, 399 XTerm_font = 50,
391 400
392 XTerm_konsole30 = 30, // reserved for konsole 401 XTerm_konsole30 = 30, // reserved for konsole
393 XTerm_konsole31 = 31, // reserved for konsole 402 XTerm_konsole31 = 31, // reserved for konsole
… …
395 /* 404 /*
396 * rxvt extensions of XTerm OSCs: ESC ] Ps;Pt (ST|BEL) 405 * rxvt extensions of XTerm OSCs: ESC ] Ps;Pt (ST|BEL)
397 */ 406 */
398 407
399 // deprecated 408 // deprecated
400 Rxvt_Color_BD = 18,
401 Rxvt_Color_UL = 19,
402 Rxvt_restoreFG = 39, 409 Rxvt_restoreFG = 39,
403 Rxvt_restoreBG = 49, 410 Rxvt_restoreBG = 49,
404 411
405 Rxvt_Pixmap = 20, // new bg pixmap 412 Rxvt_Pixmap = 20, // new bg pixmap
406 Rxvt_dumpscreen = 55, // dump scrollback and all of screen 413 Rxvt_dumpscreen = 55, // dump scrollback and all of screen
… …
410 417
411 URxvt_Color_IT = 704, // change actual 'Italic' colour 418 URxvt_Color_IT = 704, // change actual 'Italic' colour
412 URxvt_Color_tint = 705, // change actual tint colour 419 URxvt_Color_tint = 705, // change actual tint colour
413 URxvt_Color_BD = 706, // change actual 'Bold' color 420 URxvt_Color_BD = 706, // change actual 'Bold' color
414 URxvt_Color_UL = 707, // change actual 'Underline' color 421 URxvt_Color_UL = 707, // change actual 'Underline' color
422 URxvt_Color_border = 708,
415 423
416 URxvt_font = 710, 424 URxvt_font = 710,
417 URxvt_boldFont = 711, 425 URxvt_boldFont = 711,
418 URxvt_italicFont = 712, 426 URxvt_italicFont = 712,
419 URxvt_boldItalicFont = 713, 427 URxvt_boldItalicFont = 713,
420 428
421 URxvt_view_up = 720, 429 URxvt_view_up = 720,
422 URxvt_view_down = 721, 430 URxvt_view_down = 721,
423 431
424 URxvt_perl = 777, 432 URxvt_perl = 777, // for use by perl extensions, starts with "extension-name;"
425}; 433};
426 434
427/* Words starting with `Color_' are colours. Others are counts */ 435/* Words starting with `Color_' are colours. Others are counts */
428/* 436/*
429 * The PixColor and rendition colour usage should probably be decoupled 437 * The PixColor and rendition colour usage should probably be decoupled
… …
459 Color_White = maxBrightCOLOR, 467 Color_White = maxBrightCOLOR,
460#else 468#else
461 Color_White = maxCOLOR, 469 Color_White = maxCOLOR,
462#endif 470#endif
463 minTermCOLOR = Color_White + 1, 471 minTermCOLOR = Color_White + 1,
472#if USE_256_COLORS
473 maxTermCOLOR = Color_White + 240,
474#else
464 maxTermCOLOR = Color_White + 72, 475 maxTermCOLOR = Color_White + 72,
476#endif
465#ifndef NO_CURSORCOLOR 477#ifndef NO_CURSORCOLOR
466 Color_cursor, 478 Color_cursor,
467 Color_cursor2, 479 Color_cursor2,
468#endif 480#endif
469 Color_pointer_fg, 481 Color_pointer_fg,
… …
478#if ENABLE_FRILLS 490#if ENABLE_FRILLS
479 Color_underline, 491 Color_underline,
480#endif 492#endif
481#ifdef OPTION_HC 493#ifdef OPTION_HC
482 Color_HC, 494 Color_HC,
495 Color_HTC,
483#endif 496#endif
484 Color_scroll, 497 Color_scroll,
485#ifdef RXVT_SCROLLBAR 498#ifdef RXVT_SCROLLBAR
486 Color_trough, 499 Color_trough,
487#endif 500#endif
… …
499#else 512#else
500 TOTAL_COLORS = NRS_COLORS 513 TOTAL_COLORS = NRS_COLORS
501#endif 514#endif
502}; 515};
503 516
517#if USE_256_COLORS
518# define Color_Bits 9 // 0 .. maxTermCOLOR
519#else
504#define Color_Bits 7 // 0 .. maxTermCOLOR 520# define Color_Bits 7 // 0 .. maxTermCOLOR
521#endif
505 522
506/* 523/*
507 * Resource list 524 * Resource list
508 */ 525 */
509enum { 526enum {
… …
550 567
551// do not change these constants lightly, there are many interdependencies 568// do not change these constants lightly, there are many interdependencies
552#define IMBUFSIZ 128 // input modifier buffer sizes 569#define IMBUFSIZ 128 // input modifier buffer sizes
553#define KBUFSZ 512 // size of keyboard mapping buffer 570#define KBUFSZ 512 // size of keyboard mapping buffer
554#define CBUFSIZ 2048 // size of command buffer 571#define CBUFSIZ 2048 // size of command buffer
572#define CBUFCNT 8 // never call pty_fill/cmd_parse more than this often in a row
555#define UBUFSIZ 2048 // character buffer 573#define UBUFSIZ 2048 // character buffer
556 574
557#if ENABLE_FRILLS 575#if ENABLE_FRILLS
558# include <X11/Xmd.h> 576# include <X11/Xmd.h>
559typedef struct _mwmhints { 577typedef struct _mwmhints
578{
560 CARD32 flags; 579 CARD32 flags;
561 CARD32 functions; 580 CARD32 functions;
562 CARD32 decorations; 581 CARD32 decorations;
563 INT32 input_mode; 582 INT32 input_mode;
564 CARD32 status; 583 CARD32 status;
… …
611#define Col2Pixel(col) ((int32_t)Width2Pixel(col)) 630#define Col2Pixel(col) ((int32_t)Width2Pixel(col))
612#define Row2Pixel(row) ((int32_t)Height2Pixel(row)) 631#define Row2Pixel(row) ((int32_t)Height2Pixel(row))
613#define Width2Pixel(n) ((int32_t)(n) * (int32_t)fwidth) 632#define Width2Pixel(n) ((int32_t)(n) * (int32_t)fwidth)
614#define Height2Pixel(n) ((int32_t)(n) * (int32_t)fheight) 633#define Height2Pixel(n) ((int32_t)(n) * (int32_t)fheight)
615 634
616#define LINENO(n) MOD (term_start + int(n), total_rows) 635#define LINENO_of(t,n) MOD ((t)->term_start + int(n), (t)->total_rows)
617#define ROW(n) row_buf [LINENO (n)] 636#define ROW_of(t,n) (t)->row_buf [LINENO_of ((t), n)]
637
638#define LINENO(n) LINENO_of (this, n)
639#define ROW(n) ROW_of (this, n)
618 640
619/* how to build & extract colors and attributes */ 641/* how to build & extract colors and attributes */
620#define GET_BASEFG(x) (((x) & RS_fgMask)) 642#define GET_BASEFG(x) (((x) & RS_fgMask) >> RS_fgShift)
621#define GET_BASEBG(x) (((x) & RS_bgMask)>>Color_Bits) 643#define GET_BASEBG(x) (((x) & RS_bgMask) >> RS_bgShift)
622 644
623#define GET_FONT(x) (((x) & RS_fontMask) >> RS_fontShift) 645#define GET_FONT(x) (((x) & RS_fontMask) >> RS_fontShift)
624#define SET_FONT(x,fid) (((x) & ~RS_fontMask) | ((fid) << RS_fontShift)) 646#define SET_FONT(x,fid) (((x) & ~RS_fontMask) | ((fid) << RS_fontShift))
625 647
626#define GET_STYLE(x) (((x) & RS_styleMask) >> RS_styleShift) 648#define GET_STYLE(x) (((x) & RS_styleMask) >> RS_styleShift)
627#define SET_STYLE(x,style) (((x) & ~RS_styleMask) | ((style) << RS_styleShift)) 649#define SET_STYLE(x,style) (((x) & ~RS_styleMask) | ((style) << RS_styleShift))
628 650
629#define GET_ATTR(x) (((x) & RS_attrMask)) 651#define GET_ATTR(x) (((x) & RS_attrMask))
652// return attributes defining the background, encoding doesn't matter
653// depends on RS_fgShift > RS_bgShift
630#define GET_BGATTR(x) \ 654#define GET_BGATTR(x) \
655 (expect_false ((x) & RS_RVid) \
631 (((x) & RS_RVid) ? (((x) & (RS_attrMask & ~RS_RVid)) \ 656 ? (((x) & (RS_attrMask & ~RS_RVid)) \
632 | (((x) & RS_fgMask)<<Color_Bits)) \ 657 | (((x) & RS_fgMask) >> (RS_fgShift - RS_bgShift))) \
633 : ((x) & (RS_attrMask | RS_bgMask))) 658 : ((x) & (RS_attrMask | RS_bgMask)))
634#define SET_FGCOLOR(x,fg) (((x) & ~RS_fgMask) | (fg)) 659#define SET_FGCOLOR(x,fg) (((x) & ~RS_fgMask) | ((fg) << RS_fgShift))
635#define SET_BGCOLOR(x,bg) (((x) & ~RS_bgMask) | ((bg)<<Color_Bits)) 660#define SET_BGCOLOR(x,bg) (((x) & ~RS_bgMask) | ((bg) << RS_bgShift))
636#define SET_ATTR(x,a) (((x) & ~RS_attrMask) | (a)) 661#define SET_ATTR(x,a) (((x) & ~RS_attrMask) | (a))
637 662
638#define RS_SAME(a,b) (!(((a) ^ (b)) & ~RS_Careful)) 663#define RS_SAME(a,b) (!(((a) ^ (b)) & ~RS_Careful))
639 664
640#define PIXCOLOR_NAME(idx) rs[Rs_color + (idx)] 665#define PIXCOLOR_NAME(idx) rs[Rs_color + (idx)]
641#define ISSET_PIXCOLOR(idx) (!!rs[Rs_color + (idx)]) 666#define ISSET_PIXCOLOR(idx) (!!rs[Rs_color + (idx)])
642 667
643#if ENABLE_STYLES 668#if ENABLE_STYLES
644# define FONTSET(style) fontset[GET_STYLE (style)] 669# define FONTSET_of(t,style) (t)->fontset[GET_STYLE (style)]
645#else 670#else
646# define FONTSET(style) fontset[0] 671# define FONTSET_of(t,style) (t)->fontset[0]
647#endif 672#endif
673
674#define FONTSET(style) FONTSET_of (this, style)
648 675
649typedef callback<void (const char *)> log_callback; 676typedef callback<void (const char *)> log_callback;
650typedef callback<int (int)> getfd_callback; 677typedef callback<int (int)> getfd_callback;
651 678
652/****************************************************************************/ 679/****************************************************************************/
… …
655#define LINE_FILTERED 0x0002 // line has been filtered 682#define LINE_FILTERED 0x0002 // line has been filtered
656#define LINE_COMPRESSED 0x0004 // line has been compressed (NYI) 683#define LINE_COMPRESSED 0x0004 // line has been compressed (NYI)
657#define LINE_FILTER 0x0008 // line needs to be filtered before display (NYI) 684#define LINE_FILTER 0x0008 // line needs to be filtered before display (NYI)
658#define LINE_BIDI 0x0010 // line needs bidi (NYI) 685#define LINE_BIDI 0x0010 // line needs bidi (NYI)
659 686
660struct line_t { 687struct line_t
688{
661 text_t *t; // terminal the text 689 text_t *t; // terminal the text
662 rend_t *r; // rendition, uses RS_ flags 690 rend_t *r; // rendition, uses RS_ flags
663 tlen_t_ l; // length of each text line 691 tlen_t_ l; // length of each text line
664 uint32_t f; // flags 692 uint32_t f; // flags
665 693
… …
699}; 727};
700 728
701/****************************************************************************/ 729/****************************************************************************/
702 730
703// primitive wrapper around mbstate_t to ensure initialisation 731// primitive wrapper around mbstate_t to ensure initialisation
704struct mbstate { 732struct mbstate
733{
705 mbstate_t mbs; 734 mbstate_t mbs;
706 735
707 operator mbstate_t *() { return &mbs; } 736 operator mbstate_t *() { return &mbs; }
708 void reset () { memset (&mbs, 0, sizeof (mbs)); } 737 void reset () { memset (&mbs, 0, sizeof (mbs)); }
709 mbstate () { reset (); } 738 mbstate () { reset (); }
… …
730 759
731#if ENABLE_COMBINING 760#if ENABLE_COMBINING
732// compose chars are used to represent composite characters 761// compose chars are used to represent composite characters
733// that are not representable in unicode, as well as characters 762// that are not representable in unicode, as well as characters
734// not fitting in the BMP. 763// not fitting in the BMP.
735struct compose_char { 764struct compose_char
765{
736 unicode_t c1, c2; // any chars != NOCHAR are valid 766 unicode_t c1, c2; // any chars != NOCHAR are valid
737 compose_char (unicode_t c1, unicode_t c2) 767 compose_char (unicode_t c1, unicode_t c2)
738 : c1(c1), c2(c2) 768 : c1(c1), c2(c2)
739 { } 769 { }
740}; 770};
741 771
742class rxvt_composite_vec { 772class rxvt_composite_vec
773{
743 vector<compose_char> v; 774 vector<compose_char> v;
744public: 775public:
745 text_t compose (unicode_t c1, unicode_t c2 = NOCHAR); 776 text_t compose (unicode_t c1, unicode_t c2 = NOCHAR);
746 int expand (unicode_t c, wchar_t *r); 777 int expand (unicode_t c, wchar_t *r);
747 compose_char *operator [](text_t c) 778 compose_char *operator [](text_t c)
… …
766extern rxvt_t rxvt_current_term; 797extern rxvt_t rxvt_current_term;
767 798
768#define SET_R(r) rxvt_current_term = const_cast<rxvt_term *>(r) 799#define SET_R(r) rxvt_current_term = const_cast<rxvt_term *>(r)
769#define GET_R rxvt_current_term 800#define GET_R rxvt_current_term
770 801
802/* ------------------------------------------------------------------------- */
803struct overlay_base
804{
805 int x, y, w, h; // overlay dimensions
806 text_t **text;
807 rend_t **rend;
808
809 // while tempting to add swap() etc. here, it effetcively only increases code size
810};
811
812/* ------------------------------------------------------------------------- */
813
771typedef struct { 814typedef struct
815{
772 int row; 816 int row;
773 int col; 817 int col;
774} row_col_t; 818} row_col_t;
775 819
776/* 820/*
… …
801 * +------------+·display·+·= term_start 845 * +------------+·display·+·= term_start
802 * | terminal | display | 846 * | terminal | display |
803 * | terminal +---------+ 847 * | terminal +---------+
804 * | terminal | 848 * | terminal |
805 * | terminal | 849 * | terminal |
806 * +------------+···········= term_stat + nrow - 1 850 * +------------+···········= term_start + nrow - 1
807 * | 851 * |
808 * | 852 * |
809 * END······················= total_rows 853 * END······················= total_rows
810 */ 854 */
811 855
812struct TermWin_t { 856struct TermWin_t
857{
813 int width; /* window width [pixels] */ 858 int width; /* window width [pixels] */
814 int height; /* window height [pixels] */ 859 int height; /* window height [pixels] */
815 int fwidth; /* font width [pixels] */ 860 int fwidth; /* font width [pixels] */
816 int fheight; /* font height [pixels] */ 861 int fheight; /* font height [pixels] */
817 int fbase; /* font ascent (baseline) [pixels] */ 862 int fbase; /* font ascent (baseline) [pixels] */
… …
820 int focus; /* window has focus */ 865 int focus; /* window has focus */
821 int mapped; /* window state mapped? */ 866 int mapped; /* window state mapped? */
822 int int_bwidth; /* internal border width */ 867 int int_bwidth; /* internal border width */
823 int ext_bwidth; /* external border width */ 868 int ext_bwidth; /* external border width */
824 int lineSpace; /* number of extra pixels between rows */ 869 int lineSpace; /* number of extra pixels between rows */
870 int letterSpace; /* number of extra pixels between columns */
825 int saveLines; /* number of lines that fit in scrollback */ 871 int saveLines; /* number of lines that fit in scrollback */
826 int total_rows; /* total number of rows in this terminal */ 872 int total_rows; /* total number of rows in this terminal */
827 int term_start; /* term lines start here */ 873 int term_start; /* term lines start here */
828 int view_start; /* scrollback view starts here */ 874 int view_start; /* scrollback view starts here */
829 int top_row; /* topmost row index of scrollback */ 875 int top_row; /* topmost row index of scrollback */
… …
847 * clicks: 1, 2 or 3 clicks - 4 indicates a special condition of 1 where 893 * clicks: 1, 2 or 3 clicks - 4 indicates a special condition of 1 where
848 * nothing is selected 894 * nothing is selected
849 * beg: row/column of beginning of selection : never past mark 895 * beg: row/column of beginning of selection : never past mark
850 * mark: row/column of initial click : never past end 896 * mark: row/column of initial click : never past end
851 * end: row/column of one character past end of selection 897 * end: row/column of one character past end of selection
852 * * Note: -nsaved <= beg.row <= mark.row <= end.row < nrow 898 * * Note: top_row <= beg.row <= mark.row <= end.row < nrow
853 * * Note: col == -1 ==> we're left of screen 899 * * Note: col == -1 ==> we're left of screen
854 * 900 *
855 */ 901 */
856typedef struct { 902struct screen_t
903{
857 row_col_t cur; /* cursor position on the screen */ 904 row_col_t cur; /* cursor position on the screen */
858 int tscroll; /* top of settable scroll region */ 905 int tscroll; /* top of settable scroll region */
859 int bscroll; /* bottom of settable scroll region */ 906 int bscroll; /* bottom of settable scroll region */
860 unsigned int charset; /* character set number [0..3] */ 907 unsigned int charset; /* character set number [0..3] */
861 unsigned int flags; /* see below */ 908 unsigned int flags; /* see below */
862 row_col_t s_cur; /* saved cursor position */ 909 row_col_t s_cur; /* saved cursor position */
863 unsigned int s_charset; /* saved character set number [0..3] */ 910 unsigned int s_charset; /* saved character set number [0..3] */
864 char s_charset_char; 911 char s_charset_char;
865 rend_t s_rstyle; /* saved rendition style */ 912 rend_t s_rstyle; /* saved rendition style */
866} screen_t; 913};
867 914
868enum selection_op_t { 915enum selection_op_t
916{
869 SELECTION_CLEAR = 0, /* nothing selected */ 917 SELECTION_CLEAR = 0, /* nothing selected */
870 SELECTION_INIT, /* marked a point */ 918 SELECTION_INIT, /* marked a point */
871 SELECTION_BEGIN, /* started a selection */ 919 SELECTION_BEGIN, /* started a selection */
872 SELECTION_CONT, /* continued selection */ 920 SELECTION_CONT, /* continued selection */
873 SELECTION_DONE /* selection put in CUT_BUFFER0 */ 921 SELECTION_DONE /* selection put in CUT_BUFFER0 */
874}; 922};
875 923
876typedef struct { 924struct selection_t
925{
877 wchar_t *text; /* selected text */ 926 wchar_t *text; /* selected text */
878 unsigned int len; /* length of selected text */ 927 unsigned int len; /* length of selected text */
879 unsigned int screen; /* screen being used */ 928 unsigned int screen; /* screen being used */
880 unsigned int clicks; /* number of clicks */ 929 unsigned int clicks; /* number of clicks */
881 selection_op_t op; /* current operation */ 930 selection_op_t op; /* current operation */
882 bool rect; /* rectangular selection? */ 931 bool rect; /* rectangular selection? */
883 row_col_t beg; /* beginning of selection <= mark */ 932 row_col_t beg; /* beginning of selection <= mark */
884 row_col_t mark; /* point of initial click <= end */ 933 row_col_t mark; /* point of initial click <= end */
885 row_col_t end; /* one character past end point */ 934 row_col_t end; /* one character past end point */
886} selection_t; 935 wchar_t *clip_text; /* text copied to the clipboard */
936 unsigned int clip_len; /* length of clipboard text */
937};
887 938
888/* ------------------------------------------------------------------------- */ 939/* ------------------------------------------------------------------------- */
889 940
890/* screen_t flags */ 941/* screen_t flags */
891#define Screen_Relative (1<<0) /* relative origin mode flag */ 942#define Screen_Relative (1<<0) /* relative origin mode flag */
… …
905Opt_count 956Opt_count
906}; 957};
907 958
908/* ------------------------------------------------------------------------- */ 959/* ------------------------------------------------------------------------- */
909 960
910struct rxvt_vars : TermWin_t { 961struct rxvt_vars : TermWin_t
962{
911 scrollBar_t scrollBar; 963 scrollBar_t scrollBar;
912 uint8_t options[(Opt_count + 7) >> 3]; 964 uint8_t options[(Opt_count + 7) >> 3];
913 XSizeHints szHint; 965 XSizeHints szHint;
914 rxvt_color *pix_colors; 966 rxvt_color *pix_colors;
915 Cursor TermWin_cursor; /* cursor for vt window */ 967 Cursor TermWin_cursor; /* cursor for vt window */
916 int numlock_state;
917 line_t *row_buf; // all lines, scrollback + terminal, circular, followed by temp_buf 968 line_t *row_buf; // all lines, scrollback + terminal, circular, followed by temp_buf
918 line_t *drawn_buf; // text on screen 969 line_t *drawn_buf; // text on screen
919 line_t *swap_buf; // lines for swap buffer 970 line_t *swap_buf; // lines for swap buffer
920 char *tabs; /* per location: 1 == tab-stop */ 971 char *tabs; /* per location: 1 == tab-stop */
921 screen_t screen; 972 screen_t screen;
… …
925#ifdef OFF_FOCUS_FADING 976#ifdef OFF_FOCUS_FADING
926 rxvt_color pix_colors_unfocused[TOTAL_COLORS]; 977 rxvt_color pix_colors_unfocused[TOTAL_COLORS];
927#endif 978#endif
928}; 979};
929 980
930struct rxvt_term : zero_initialized, rxvt_vars, rxvt_screen { 981struct rxvt_term : zero_initialized, rxvt_vars, rxvt_screen
982{
931 983
932 // special markers with magic addresses 984 // special markers with magic addresses
933 static const char resval_undef []; // options specifically unset 985 static const char resval_undef []; // options specifically unset
934 static const char resval_on []; // boolean options switched on 986 static const char resval_on []; // boolean options switched on
935 static const char resval_off []; // or off 987 static const char resval_off []; // or off
… …
943 995
944 unsigned char want_refresh:1, 996 unsigned char want_refresh:1,
945 current_screen:1, /* primary or secondary */ 997 current_screen:1, /* primary or secondary */
946 num_scr_allow:1, 998 num_scr_allow:1,
947 bypass_keystate:1, 999 bypass_keystate:1,
1000#if ENABLE_FRILLS
1001 urgency_hint:1,
1002#endif
948#ifdef CURSOR_BLINK 1003#if CURSOR_BLINK
949 hidden_cursor:1, 1004 hidden_cursor:1,
950#endif 1005#endif
951#ifdef TEXT_BLINK 1006#if TEXT_BLINK
952 hidden_text:1, 1007 hidden_text:1,
953#endif 1008#endif
954#ifdef POINTER_BLANK 1009#if POINTER_BLANK
955 hidden_pointer:1, 1010 hidden_pointer:1,
956#endif 1011#endif
957 enc_utf8:1, /* wether locale uses utf-8 */ 1012 enc_utf8:1, /* whether locale uses utf-8 */
958 seen_input:1, /* wether we have seen some program output yet */ 1013 seen_input:1, /* whether we have seen some program output yet */
959 seen_resize:1, /* wether we had a resize event */ 1014 seen_resize:1, /* whether we had a resize event */
960 parsed_geometry:1; 1015 parsed_geometry:1;
961 1016
962 unsigned char refresh_type, 1017 unsigned char refresh_type,
963#ifdef META8_OPTION 1018#ifdef META8_OPTION
964 meta_char, /* Alt-key prefix */ 1019 meta_char, /* Alt-key prefix */
… …
968/* ---------- */ 1023/* ---------- */
969 bool rvideo_state, rvideo_mode; 1024 bool rvideo_state, rvideo_mode;
970#ifndef NO_BELL 1025#ifndef NO_BELL
971 bool rvideo_bell; 1026 bool rvideo_bell;
972#endif 1027#endif
973 int num_scr; /* screen: number lines scrolled */ 1028 int num_scr; /* screen: number of lines scrolled */
974 int prev_ncol, /* screen: previous number of columns */ 1029 int prev_ncol, /* screen: previous number of columns */
975 prev_nrow; /* screen: previous number of rows */ 1030 prev_nrow; /* screen: previous number of rows */
976/* ---------- */ 1031/* ---------- */
977 rend_t rstyle; 1032 rend_t rstyle;
978/* ---------- */ 1033/* ---------- */
… …
1008 SavedModes; 1063 SavedModes;
1009/* ---------- */ 1064/* ---------- */
1010 Atom *xa; 1065 Atom *xa;
1011/* ---------- */ 1066/* ---------- */
1012 Time selection_time, 1067 Time selection_time,
1013 selection_request_time; 1068 selection_request_time,
1069 clipboard_time;
1014 pid_t cmd_pid; /* process id of child */ 1070 pid_t cmd_pid; /* process id of child */
1015 char * incr_buf; 1071 char * incr_buf;
1016 size_t incr_buf_size, incr_buf_fill; 1072 size_t incr_buf_size, incr_buf_fill;
1017/* ---------- */ 1073/* ---------- */
1018 struct mouse_event MEvent; 1074 struct mouse_event MEvent;
… …
1023 bgPixmap_t bgPixmap; 1079 bgPixmap_t bgPixmap;
1024#endif 1080#endif
1025#ifdef HAVE_AFTERIMAGE 1081#ifdef HAVE_AFTERIMAGE
1026 ASVisual *asv; 1082 ASVisual *asv;
1027 ASImageManager *asimman; 1083 ASImageManager *asimman;
1084
1085 void init_asv ()
1086 {
1087 if (!asv)
1088 asv = create_asvisual_for_id (dpy, display->screen, depth, XVisualIDFromVisual (visual), cmap, NULL);
1089 }
1028#endif 1090#endif
1029 1091
1030#if ENABLE_OVERLAY 1092#if ENABLE_OVERLAY
1031 int ov_x, ov_y, ov_w, ov_h; // overlay dimensions 1093 overlay_base ov;
1032 text_t **ov_text;
1033 rend_t **ov_rend;
1034 1094
1035 void scr_swap_overlay () NOTHROW; 1095 void scr_swap_overlay () NOTHROW;
1036 void scr_overlay_new (int x, int y, int w, int h) NOTHROW; 1096 void scr_overlay_new (int x, int y, int w, int h) NOTHROW;
1037 void scr_overlay_off () NOTHROW; 1097 void scr_overlay_off () NOTHROW;
1038 void scr_overlay_set (int x, int y, 1098 void scr_overlay_set (int x, int y,
… …
1189 wchar_t next_char () NOTHROW; 1249 wchar_t next_char () NOTHROW;
1190 wchar_t cmd_getc () THROW ((class out_of_input)); 1250 wchar_t cmd_getc () THROW ((class out_of_input));
1191 uint32_t next_octet () NOTHROW; 1251 uint32_t next_octet () NOTHROW;
1192 uint32_t cmd_get8 () THROW ((class out_of_input)); 1252 uint32_t cmd_get8 () THROW ((class out_of_input));
1193 1253
1194 bool cmd_parse (); 1254 void cmd_parse ();
1195 void mouse_report (XButtonEvent &ev); 1255 void mouse_report (XButtonEvent &ev);
1196 void button_press (XButtonEvent &ev); 1256 void button_press (XButtonEvent &ev);
1197 void button_release (XButtonEvent &ev); 1257 void button_release (XButtonEvent &ev);
1198 void focus_in (); 1258 void focus_in ();
1199 void focus_out (); 1259 void focus_out ();
1260#if ENABLE_FRILLS
1261 void set_urgency (bool enable);
1262#else
1263 void set_urgency (bool enable) { }
1264#endif
1200 void update_fade_color (unsigned int idx); 1265 void update_fade_color (unsigned int idx);
1201#ifdef PRINTPIPE 1266#ifdef PRINTPIPE
1202 FILE *popen_printer (); 1267 FILE *popen_printer ();
1203 int pclose_printer (FILE *stream); 1268 int pclose_printer (FILE *stream);
1204#endif 1269#endif
… …
1210 void process_window_ops (const int *args, unsigned int nargs); 1275 void process_window_ops (const int *args, unsigned int nargs);
1211 char *get_to_st (unicode_t &ends_how); 1276 char *get_to_st (unicode_t &ends_how);
1212 void process_dcs_seq (); 1277 void process_dcs_seq ();
1213 void process_osc_seq (); 1278 void process_osc_seq ();
1214 void process_color_seq (int report, int color, const char *str, char resp); 1279 void process_color_seq (int report, int color, const char *str, char resp);
1215 void process_xterm_seq (int op, const char *str, char resp); 1280 void process_xterm_seq (int op, char *str, char resp);
1216 int privcases (int mode, unsigned long bit); 1281 int privcases (int mode, unsigned long bit);
1217 void process_terminal_mode (int mode, int priv, unsigned int nargs, const int *arg); 1282 void process_terminal_mode (int mode, int priv, unsigned int nargs, const int *arg);
1218 void process_sgr_mode (unsigned int nargs, const int *arg); 1283 void process_sgr_mode (unsigned int nargs, const int *arg);
1219 void process_graphics (); 1284 void process_graphics ();
1220 // init.C 1285 // init.C
… …
1342 1407
1343 // modifies first argument(!) 1408 // modifies first argument(!)
1344 void paste (char *data, unsigned int len) NOTHROW; 1409 void paste (char *data, unsigned int len) NOTHROW;
1345 void scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) const NOTHROW; 1410 void scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) const NOTHROW;
1346 void scr_blank_screen_mem (line_t &l, rend_t efs) const NOTHROW; 1411 void scr_blank_screen_mem (line_t &l, rend_t efs) const NOTHROW;
1412 void scr_kill_char (line_t &l, int col) const NOTHROW;
1347 int scr_scroll_text (int row1, int row2, int count) NOTHROW; 1413 int scr_scroll_text (int row1, int row2, int count) NOTHROW;
1348 void scr_reset (); 1414 void scr_reset ();
1349 void scr_release () NOTHROW; 1415 void scr_release () NOTHROW;
1350 void scr_clear (bool really = false) NOTHROW; 1416 void scr_clear (bool really = false) NOTHROW;
1351 void scr_refresh () NOTHROW; 1417 void scr_refresh () NOTHROW;
… …
1363 void scr_remap_chars (line_t &l) NOTHROW; 1429 void scr_remap_chars (line_t &l) NOTHROW;
1364 1430
1365 enum cursor_mode { SAVE, RESTORE }; 1431 enum cursor_mode { SAVE, RESTORE };
1366 1432
1367 void scr_poweron (); 1433 void scr_poweron ();
1434 void scr_soft_reset () NOTHROW;
1368 void scr_cursor (cursor_mode mode) NOTHROW; 1435 void scr_cursor (cursor_mode mode) NOTHROW;
1369 void scr_do_wrap () NOTHROW; 1436 void scr_do_wrap () NOTHROW;
1370 void scr_swap_screen () NOTHROW; 1437 void scr_swap_screen () NOTHROW;
1371 void scr_change_screen (int scrn); 1438 void scr_change_screen (int scrn);
1372 void scr_color (unsigned int color, int fgbg) NOTHROW; 1439 void scr_color (unsigned int color, int fgbg) NOTHROW;
… …
1404 void selection_check (int check_more) NOTHROW; 1471 void selection_check (int check_more) NOTHROW;
1405 void selection_paste (Window win, Atom prop, bool delete_prop) NOTHROW; 1472 void selection_paste (Window win, Atom prop, bool delete_prop) NOTHROW;
1406 void selection_property (Window win, Atom prop) NOTHROW; 1473 void selection_property (Window win, Atom prop) NOTHROW;
1407 void selection_request (Time tm, int selnum = Sel_Primary) NOTHROW; 1474 void selection_request (Time tm, int selnum = Sel_Primary) NOTHROW;
1408 int selection_request_other (Atom target, int selnum) NOTHROW; 1475 int selection_request_other (Atom target, int selnum) NOTHROW;
1409 void selection_clear () NOTHROW; 1476 void selection_clear (bool clipboard = false) NOTHROW;
1477 void clipboard_copy (Time tm);
1410 void selection_make (Time tm); 1478 void selection_make (Time tm);
1411 bool selection_grab (Time tm) NOTHROW; 1479 bool selection_grab (Time tm, bool clipboard = false) NOTHROW;
1412 void selection_start_colrow (int col, int row) NOTHROW; 1480 void selection_start_colrow (int col, int row) NOTHROW;
1413 void selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) NOTHROW; 1481 void selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) NOTHROW;
1414 void selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) NOTHROW; 1482 void selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) NOTHROW;
1415 void selection_remove_trailing_spaces () NOTHROW; 1483 void selection_remove_trailing_spaces () NOTHROW;
1416 void selection_send (const XSelectionRequestEvent &rq) NOTHROW; 1484 void selection_send (const XSelectionRequestEvent &rq) NOTHROW;

Diff Legend

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