--- rxvt-unicode/src/rxvtlib.h.in 2005/12/18 00:59:42 1.49 +++ rxvt-unicode/src/rxvtlib.h.in 2006/01/08 08:49:20 1.63 @@ -79,38 +79,44 @@ typedef uint16_t text_t; // saves lots of memory #endif typedef uint32_t rend_t; -typedef int16_t tlen_t; +typedef int32_t tlen_t; // was int16_t, but this results in smaller code and memory use +typedef int32_t tlen_t_; // specifically for use in the line_t structure -#define LINE_CONT -1 - -struct line_t { - text_t *t; // terminal the text - rend_t *r; // rendition, uses RS_ flags - tlen_t l; // length of each text line, LINE_CONT == continued on next line - - bool is_cont () - { - return l < 0; - } - - void clear () - { - t = 0; - r = 0; - l = 0; - } -}; +struct line_t; /* - * TermWin elements limits - * width : 1 <= width - * height : 1 <= height - * ncol : 1 <= ncol <= MAX(int16_t) - * nrow : 1 <= nrow <= MAX(int16_t) - * saveLines : 0 <= saveLines <= MAX(int16_t) - * nsaved : 0 <= nscrolled <= saveLines - * term_start: 0 <= term_start < saveLines - * view_start: 0 <= view_start < saveLines + * terminal limits: + * + * width : 1 <= width + * height : 1 <= height + * ncol : 1 <= ncol <= MAX(tlen_t) + * nrow : 1 <= nrow <= MAX(int) + * saveLines : 0 <= saveLines <= MAX(int) + * total_rows : nrow + saveLines + * nsaved : 0 <= nsaved <= saveLines + * term_start : 0 <= term_start < saveLines + * view_start : 0 <= view_start < saveLines + * + * | most coordinates are stored relative to term_start, + * ROW_BUF | which is the first line of the terminal screen + * |························= row_buf[0] + * |························= row_buf[1] + * |························= row_buf[2] etc. + * | + * +------------+···········= term_start - nsaved + * | scrollback | + * | scrollback +---------+·= term_start - view_start + * | scrollback | display | + * | scrollback | display | + * +------------+·display·+·= term_start + * | terminal | display | + * | terminal +---------+ + * | terminal | + * | terminal | + * +------------+···········= term_stat + nrow - 1 + * | + * | + * END······················= total_rows */ struct TermWin_t { @@ -118,7 +124,6 @@ int height; /* window height [pixels] */ int fwidth; /* font width [pixels] */ int fheight; /* font height [pixels] */ - int fweight, fslant; int fbase; /* font ascent (baseline) [pixels] */ int ncol; /* window columns [characters] */ int nrow; /* window rows [characters] */ @@ -128,8 +133,8 @@ int ext_bwidth; /* external border width */ int lineSpace; /* number of extra pixels between rows */ int saveLines; /* number of lines that fit in scrollback */ - int nsaved; /* number of line actually scrolled */ - int nscrolled; /*D*///TODO remove + int total_rows; /* total number of rows in this terminal */ + int nsaved; /* number of rows saved to scrollback */ int term_start; /* term lines start here */ int view_start; /* scrollback view starts here */ Window parent[6]; /* parent identifiers - we're parent[0] */ @@ -143,12 +148,6 @@ /* * screen accounting: * screen_t elements - * text: Contains all text information including the scrollback buffer. - * Each line is length ncol - * tlen: The length of the line or -1 for wrapped lines. - * rend: Contains rendition information: font, bold, colour, etc. - * * Note: Each line for both text and rend are only allocated on demand, and - * text[x] is allocated <=> rend[x] is allocated for all x. * row: Cursor row position : 0 <= row < nrow * col: Cursor column position : 0 <= col < ncol * tscroll: Scrolling region top row inclusive : 0 <= row < nrow @@ -160,21 +159,14 @@ * beg: row/column of beginning of selection : never past mark * mark: row/column of initial click : never past end * end: row/column of one character past end of selection - * * Note: -nscrolled <= beg.row <= mark.row <= end.row < nrow + * * Note: -nsaved <= beg.row <= mark.row <= end.row < nrow * * Note: col == -1 ==> we're left of screen * - * Layout of text/rend information in the screen_t text/rend structures: - * Rows [0] ... [saveLines - 1] - * scrollback region : we're only here if view_start != 0 - * Rows [saveLines] ... [saveLines + nrow - 1] - * normal `unscrolled' screen region */ typedef struct { - line_t **line; - - row_col_t cur; /* cursor position on the screen */ - unsigned int tscroll; /* top of settable scroll region */ - unsigned int bscroll; /* bottom of settable scroll region */ + row_col_t cur; /* cursor position on the screen */ + int tscroll; /* top of settable scroll region */ + int bscroll; /* bottom of settable scroll region */ unsigned int charset; /* character set number [0..3] */ unsigned int flags; /* see below */ row_col_t s_cur; /* saved cursor position */ @@ -214,44 +206,13 @@ #define Screen_DefaultFlags (Screen_VisibleCursor | Screen_Autowrap) /* rxvt_vars.options */ -#define Opt_console (1UL<<0) -#define Opt_loginShell (1UL<<1) -#define Opt_iconic (1UL<<2) -#define Opt_visualBell (1UL<<3) -#define Opt_mapAlert (1UL<<4) -#define Opt_reverseVideo (1UL<<5) -#define Opt_utmpInhibit (1UL<<6) -#define Opt_scrollBar (1UL<<7) -#define Opt_scrollBar_right (1UL<<8) -#define Opt_scrollBar_floating (1UL<<9) -#define Opt_meta8 (1UL<<10) -#define Opt_scrollTtyOutput (1UL<<11) -#define Opt_scrollTtyKeypress (1UL<<12) -#define Opt_transparent (1UL<<13) -#define Opt_tripleclickwords (1UL<<14) -#define Opt_scrollWithBuffer (1UL<<15) -#define Opt_jumpScroll (1UL<<16) -#define Opt_mouseWheelScrollPage (1UL<<17) -#define Opt_pointerBlank (1UL<<18) -#define Opt_cursorBlink (1UL<<19) -#define Opt_secondaryScreen (1UL<<20) -#define Opt_secondaryScroll (1UL<<21) -#define Opt_pastableTabs (1UL<<22) -#define Opt_cursorUnderline (1UL<<23) -#if ENABLE_FRILLS -# define Opt_insecure (1UL<<24) // insecure esc sequences -# define Opt_borderLess (1UL<<25) // mem borderless hints -#else -# define Opt_insecure 0 -# define Opt_borderLess 0 -#endif -/* place holder used for parsing command-line options */ -#define Opt_Reverse (1UL<<30) -#define Opt_Boolean (1UL<<31) - -#define DEFAULT_OPTIONS (Opt_scrollBar | Opt_scrollTtyOutput \ - | Opt_jumpScroll | Opt_secondaryScreen \ - | Opt_pastableTabs) +enum { +# define def(name,idx) Opt_ ## name = 1UL << (idx), +# define nodef(name) Opt_ ## name = 0, +# include "optinc.h" +# undef nodef +# undef def +}; /* ------------------------------------------------------------------------- */ @@ -282,7 +243,7 @@ struct rxvt_vars : TermWin_t { scrollBar_t scrollBar; menuBar_t menuBar; - unsigned long options; + uint32_t options; XSizeHints szHint; rxvt_display *display; rxvt_color *pix_colors; @@ -295,10 +256,10 @@ int sb_shadow; /* scrollbar shadow width */ rxvt_ptytty pty; int numlock_state; - line_t *save; // all lines, scorllback + terminal, circular - line_t *drawn; // text on screen - line_t *buf; // temporary buffer - line_t *swap_save; // lines for swap buffer + line_t *row_buf; // all lines, scrollback + terminal, circular + line_t *drawn_buf; // text on screen + line_t *temp_buf; // temporary buffer + line_t *swap_buf; // lines for swap buffer char *tabs; /* per location: 1 == tab-stop */ screen_t screen; screen_t swap; @@ -306,6 +267,7 @@ }; void rxvt_init (); +bool rxvt_tainted (); #endif /* _RXVTLIB_H_ */