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.373 by root, Wed Nov 5 15:44:04 2008 UTC

… …
204 204
205/* 205/*
206 * the 'essential' information for reporting Mouse Events 206 * the 'essential' information for reporting Mouse Events
207 * pared down from XButtonEvent 207 * pared down from XButtonEvent
208 */ 208 */
209struct mouse_event { 209struct mouse_event
210{
210 int clicks; 211 int clicks;
211 Time time; /* milliseconds */ 212 Time time; /* milliseconds */
212 unsigned int state; /* key or button mask */ 213 unsigned int state; /* key or button mask */
213 unsigned int button; /* detail */ 214 unsigned int button; /* detail */
214}; 215};
… …
410 411
411 URxvt_Color_IT = 704, // change actual 'Italic' colour 412 URxvt_Color_IT = 704, // change actual 'Italic' colour
412 URxvt_Color_tint = 705, // change actual tint colour 413 URxvt_Color_tint = 705, // change actual tint colour
413 URxvt_Color_BD = 706, // change actual 'Bold' color 414 URxvt_Color_BD = 706, // change actual 'Bold' color
414 URxvt_Color_UL = 707, // change actual 'Underline' color 415 URxvt_Color_UL = 707, // change actual 'Underline' color
416 URxvt_Color_border = 708,
415 417
416 URxvt_font = 710, 418 URxvt_font = 710,
417 URxvt_boldFont = 711, 419 URxvt_boldFont = 711,
418 URxvt_italicFont = 712, 420 URxvt_italicFont = 712,
419 URxvt_boldItalicFont = 713, 421 URxvt_boldItalicFont = 713,
… …
555#define CBUFCNT 8 // never call pty_fill/cmd_parse more than this often in a row 557#define CBUFCNT 8 // never call pty_fill/cmd_parse more than this often in a row
556#define UBUFSIZ 2048 // character buffer 558#define UBUFSIZ 2048 // character buffer
557 559
558#if ENABLE_FRILLS 560#if ENABLE_FRILLS
559# include <X11/Xmd.h> 561# include <X11/Xmd.h>
560typedef struct _mwmhints { 562typedef struct _mwmhints
563{
561 CARD32 flags; 564 CARD32 flags;
562 CARD32 functions; 565 CARD32 functions;
563 CARD32 decorations; 566 CARD32 decorations;
564 INT32 input_mode; 567 INT32 input_mode;
565 CARD32 status; 568 CARD32 status;
… …
612#define Col2Pixel(col) ((int32_t)Width2Pixel(col)) 615#define Col2Pixel(col) ((int32_t)Width2Pixel(col))
613#define Row2Pixel(row) ((int32_t)Height2Pixel(row)) 616#define Row2Pixel(row) ((int32_t)Height2Pixel(row))
614#define Width2Pixel(n) ((int32_t)(n) * (int32_t)fwidth) 617#define Width2Pixel(n) ((int32_t)(n) * (int32_t)fwidth)
615#define Height2Pixel(n) ((int32_t)(n) * (int32_t)fheight) 618#define Height2Pixel(n) ((int32_t)(n) * (int32_t)fheight)
616 619
617#define LINENO(n) MOD (term_start + int(n), total_rows) 620#define LINENO_of(t,n) MOD ((t)->term_start + int(n), (t)->total_rows)
618#define ROW(n) row_buf [LINENO (n)] 621#define ROW_of(t,n) (t)->row_buf [LINENO_of ((t), n)]
622
623#define LINENO(n) LINENO_of (this, n)
624#define ROW(n) ROW_of (this, n)
619 625
620/* how to build & extract colors and attributes */ 626/* how to build & extract colors and attributes */
621#define GET_BASEFG(x) (((x) & RS_fgMask)) 627#define GET_BASEFG(x) (((x) & RS_fgMask))
622#define GET_BASEBG(x) (((x) & RS_bgMask)>>Color_Bits) 628#define GET_BASEBG(x) (((x) & RS_bgMask)>>Color_Bits)
623 629
… …
640 646
641#define PIXCOLOR_NAME(idx) rs[Rs_color + (idx)] 647#define PIXCOLOR_NAME(idx) rs[Rs_color + (idx)]
642#define ISSET_PIXCOLOR(idx) (!!rs[Rs_color + (idx)]) 648#define ISSET_PIXCOLOR(idx) (!!rs[Rs_color + (idx)])
643 649
644#if ENABLE_STYLES 650#if ENABLE_STYLES
645# define FONTSET(style) fontset[GET_STYLE (style)] 651# define FONTSET_of(t,style) (t)->fontset[GET_STYLE (style)]
646#else 652#else
647# define FONTSET(style) fontset[0] 653# define FONTSET_of(t,style) (t)->fontset[0]
648#endif 654#endif
655
656#define FONTSET(style) FONTSET_of (this, style)
649 657
650typedef callback<void (const char *)> log_callback; 658typedef callback<void (const char *)> log_callback;
651typedef callback<int (int)> getfd_callback; 659typedef callback<int (int)> getfd_callback;
652 660
653/****************************************************************************/ 661/****************************************************************************/
… …
656#define LINE_FILTERED 0x0002 // line has been filtered 664#define LINE_FILTERED 0x0002 // line has been filtered
657#define LINE_COMPRESSED 0x0004 // line has been compressed (NYI) 665#define LINE_COMPRESSED 0x0004 // line has been compressed (NYI)
658#define LINE_FILTER 0x0008 // line needs to be filtered before display (NYI) 666#define LINE_FILTER 0x0008 // line needs to be filtered before display (NYI)
659#define LINE_BIDI 0x0010 // line needs bidi (NYI) 667#define LINE_BIDI 0x0010 // line needs bidi (NYI)
660 668
661struct line_t { 669struct line_t
670{
662 text_t *t; // terminal the text 671 text_t *t; // terminal the text
663 rend_t *r; // rendition, uses RS_ flags 672 rend_t *r; // rendition, uses RS_ flags
664 tlen_t_ l; // length of each text line 673 tlen_t_ l; // length of each text line
665 uint32_t f; // flags 674 uint32_t f; // flags
666 675
… …
700}; 709};
701 710
702/****************************************************************************/ 711/****************************************************************************/
703 712
704// primitive wrapper around mbstate_t to ensure initialisation 713// primitive wrapper around mbstate_t to ensure initialisation
705struct mbstate { 714struct mbstate
715{
706 mbstate_t mbs; 716 mbstate_t mbs;
707 717
708 operator mbstate_t *() { return &mbs; } 718 operator mbstate_t *() { return &mbs; }
709 void reset () { memset (&mbs, 0, sizeof (mbs)); } 719 void reset () { memset (&mbs, 0, sizeof (mbs)); }
710 mbstate () { reset (); } 720 mbstate () { reset (); }
… …
731 741
732#if ENABLE_COMBINING 742#if ENABLE_COMBINING
733// compose chars are used to represent composite characters 743// compose chars are used to represent composite characters
734// that are not representable in unicode, as well as characters 744// that are not representable in unicode, as well as characters
735// not fitting in the BMP. 745// not fitting in the BMP.
736struct compose_char { 746struct compose_char
747{
737 unicode_t c1, c2; // any chars != NOCHAR are valid 748 unicode_t c1, c2; // any chars != NOCHAR are valid
738 compose_char (unicode_t c1, unicode_t c2) 749 compose_char (unicode_t c1, unicode_t c2)
739 : c1(c1), c2(c2) 750 : c1(c1), c2(c2)
740 { } 751 { }
741}; 752};
742 753
743class rxvt_composite_vec { 754class rxvt_composite_vec
755{
744 vector<compose_char> v; 756 vector<compose_char> v;
745public: 757public:
746 text_t compose (unicode_t c1, unicode_t c2 = NOCHAR); 758 text_t compose (unicode_t c1, unicode_t c2 = NOCHAR);
747 int expand (unicode_t c, wchar_t *r); 759 int expand (unicode_t c, wchar_t *r);
748 compose_char *operator [](text_t c) 760 compose_char *operator [](text_t c)
… …
767extern rxvt_t rxvt_current_term; 779extern rxvt_t rxvt_current_term;
768 780
769#define SET_R(r) rxvt_current_term = const_cast<rxvt_term *>(r) 781#define SET_R(r) rxvt_current_term = const_cast<rxvt_term *>(r)
770#define GET_R rxvt_current_term 782#define GET_R rxvt_current_term
771 783
784/* ------------------------------------------------------------------------- */
785struct overlay_base
786{
787 int x, y, w, h; // overlay dimensions
788 text_t **text;
789 rend_t **rend;
790
791 // while tempting to add swap() etc. here, it effetcively only increases code size
792};
793
794/* ------------------------------------------------------------------------- */
795
772typedef struct { 796typedef struct
797{
773 int row; 798 int row;
774 int col; 799 int col;
775} row_col_t; 800} row_col_t;
776 801
777/* 802/*
… …
808 * | 833 * |
809 * | 834 * |
810 * END······················= total_rows 835 * END······················= total_rows
811 */ 836 */
812 837
813struct TermWin_t { 838struct TermWin_t
839{
814 int width; /* window width [pixels] */ 840 int width; /* window width [pixels] */
815 int height; /* window height [pixels] */ 841 int height; /* window height [pixels] */
816 int fwidth; /* font width [pixels] */ 842 int fwidth; /* font width [pixels] */
817 int fheight; /* font height [pixels] */ 843 int fheight; /* font height [pixels] */
818 int fbase; /* font ascent (baseline) [pixels] */ 844 int fbase; /* font ascent (baseline) [pixels] */
… …
852 * end: row/column of one character past end of selection 878 * end: row/column of one character past end of selection
853 * * Note: top_row <= beg.row <= mark.row <= end.row < nrow 879 * * Note: top_row <= beg.row <= mark.row <= end.row < nrow
854 * * Note: col == -1 ==> we're left of screen 880 * * Note: col == -1 ==> we're left of screen
855 * 881 *
856 */ 882 */
857typedef struct { 883struct screen_t
884{
858 row_col_t cur; /* cursor position on the screen */ 885 row_col_t cur; /* cursor position on the screen */
859 int tscroll; /* top of settable scroll region */ 886 int tscroll; /* top of settable scroll region */
860 int bscroll; /* bottom of settable scroll region */ 887 int bscroll; /* bottom of settable scroll region */
861 unsigned int charset; /* character set number [0..3] */ 888 unsigned int charset; /* character set number [0..3] */
862 unsigned int flags; /* see below */ 889 unsigned int flags; /* see below */
863 row_col_t s_cur; /* saved cursor position */ 890 row_col_t s_cur; /* saved cursor position */
864 unsigned int s_charset; /* saved character set number [0..3] */ 891 unsigned int s_charset; /* saved character set number [0..3] */
865 char s_charset_char; 892 char s_charset_char;
866 rend_t s_rstyle; /* saved rendition style */ 893 rend_t s_rstyle; /* saved rendition style */
867} screen_t; 894};
868 895
869enum selection_op_t { 896enum selection_op_t
897{
870 SELECTION_CLEAR = 0, /* nothing selected */ 898 SELECTION_CLEAR = 0, /* nothing selected */
871 SELECTION_INIT, /* marked a point */ 899 SELECTION_INIT, /* marked a point */
872 SELECTION_BEGIN, /* started a selection */ 900 SELECTION_BEGIN, /* started a selection */
873 SELECTION_CONT, /* continued selection */ 901 SELECTION_CONT, /* continued selection */
874 SELECTION_DONE /* selection put in CUT_BUFFER0 */ 902 SELECTION_DONE /* selection put in CUT_BUFFER0 */
875}; 903};
876 904
877typedef struct { 905struct selection_t
906{
878 wchar_t *text; /* selected text */ 907 wchar_t *text; /* selected text */
879 unsigned int len; /* length of selected text */ 908 unsigned int len; /* length of selected text */
880 unsigned int screen; /* screen being used */ 909 unsigned int screen; /* screen being used */
881 unsigned int clicks; /* number of clicks */ 910 unsigned int clicks; /* number of clicks */
882 selection_op_t op; /* current operation */ 911 selection_op_t op; /* current operation */
883 bool rect; /* rectangular selection? */ 912 bool rect; /* rectangular selection? */
884 row_col_t beg; /* beginning of selection <= mark */ 913 row_col_t beg; /* beginning of selection <= mark */
885 row_col_t mark; /* point of initial click <= end */ 914 row_col_t mark; /* point of initial click <= end */
886 row_col_t end; /* one character past end point */ 915 row_col_t end; /* one character past end point */
887} selection_t; 916};
888 917
889/* ------------------------------------------------------------------------- */ 918/* ------------------------------------------------------------------------- */
890 919
891/* screen_t flags */ 920/* screen_t flags */
892#define Screen_Relative (1<<0) /* relative origin mode flag */ 921#define Screen_Relative (1<<0) /* relative origin mode flag */
… …
906Opt_count 935Opt_count
907}; 936};
908 937
909/* ------------------------------------------------------------------------- */ 938/* ------------------------------------------------------------------------- */
910 939
911struct rxvt_vars : TermWin_t { 940struct rxvt_vars : TermWin_t
941{
912 scrollBar_t scrollBar; 942 scrollBar_t scrollBar;
913 uint8_t options[(Opt_count + 7) >> 3]; 943 uint8_t options[(Opt_count + 7) >> 3];
914 XSizeHints szHint; 944 XSizeHints szHint;
915 rxvt_color *pix_colors; 945 rxvt_color *pix_colors;
916 Cursor TermWin_cursor; /* cursor for vt window */ 946 Cursor TermWin_cursor; /* cursor for vt window */
… …
926#ifdef OFF_FOCUS_FADING 956#ifdef OFF_FOCUS_FADING
927 rxvt_color pix_colors_unfocused[TOTAL_COLORS]; 957 rxvt_color pix_colors_unfocused[TOTAL_COLORS];
928#endif 958#endif
929}; 959};
930 960
931struct rxvt_term : zero_initialized, rxvt_vars, rxvt_screen { 961struct rxvt_term : zero_initialized, rxvt_vars, rxvt_screen
962{
932 963
933 // special markers with magic addresses 964 // special markers with magic addresses
934 static const char resval_undef []; // options specifically unset 965 static const char resval_undef []; // options specifically unset
935 static const char resval_on []; // boolean options switched on 966 static const char resval_on []; // boolean options switched on
936 static const char resval_off []; // or off 967 static const char resval_off []; // or off
… …
1036 asv = create_asvisual_for_id (dpy, display->screen, depth, XVisualIDFromVisual (visual), cmap, NULL); 1067 asv = create_asvisual_for_id (dpy, display->screen, depth, XVisualIDFromVisual (visual), cmap, NULL);
1037 } 1068 }
1038#endif 1069#endif
1039 1070
1040#if ENABLE_OVERLAY 1071#if ENABLE_OVERLAY
1041 int ov_x, ov_y, ov_w, ov_h; // overlay dimensions 1072 overlay_base ov;
1042 text_t **ov_text;
1043 rend_t **ov_rend;
1044 1073
1045 void scr_swap_overlay () NOTHROW; 1074 void scr_swap_overlay () NOTHROW;
1046 void scr_overlay_new (int x, int y, int w, int h) NOTHROW; 1075 void scr_overlay_new (int x, int y, int w, int h) NOTHROW;
1047 void scr_overlay_off () NOTHROW; 1076 void scr_overlay_off () NOTHROW;
1048 void scr_overlay_set (int x, int y, 1077 void scr_overlay_set (int x, int y,
… …
1375 void scr_remap_chars (line_t &l) NOTHROW; 1404 void scr_remap_chars (line_t &l) NOTHROW;
1376 1405
1377 enum cursor_mode { SAVE, RESTORE }; 1406 enum cursor_mode { SAVE, RESTORE };
1378 1407
1379 void scr_poweron (); 1408 void scr_poweron ();
1409 void scr_soft_reset () NOTHROW;
1380 void scr_cursor (cursor_mode mode) NOTHROW; 1410 void scr_cursor (cursor_mode mode) NOTHROW;
1381 void scr_do_wrap () NOTHROW; 1411 void scr_do_wrap () NOTHROW;
1382 void scr_swap_screen () NOTHROW; 1412 void scr_swap_screen () NOTHROW;
1383 void scr_change_screen (int scrn); 1413 void scr_change_screen (int scrn);
1384 void scr_color (unsigned int color, int fgbg) NOTHROW; 1414 void scr_color (unsigned int color, int fgbg) NOTHROW;

Diff Legend

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