--- rxvt-unicode/src/rxvt.h 2008/02/18 09:58:05 1.360 +++ rxvt-unicode/src/rxvt.h 2021/05/13 19:40:19 1.556 @@ -1,17 +1,17 @@ #ifndef RXVT_H_ /* include once only */ #define RXVT_H_ -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #ifdef HAVE_STDINT_H #include #endif #include #include -#include +#include #include #ifdef HAVE_SYS_IOCTL_H #include @@ -20,15 +20,13 @@ #include #endif -#if HAVE_CWCHAR -# include -#elif HAVE_WCHAR_H +#if HAVE_WCHAR_H # include #else // stdlib.h might provide it #endif -using namespace std; +// we assume that Xlib.h defines XPointer, and it does since at least 1994... extern "C" { #include @@ -74,13 +72,24 @@ #include #include +#if HAVE_PIXBUF +# include +#endif + +#if XRENDER && (HAVE_PIXBUF || ENABLE_TRANSPARENCY) +# define HAVE_IMG 1 +#endif + +#define ECB_NO_THREADS 1 +#include "ecb.h" + #include "encoding.h" #include "rxvtutil.h" #include "rxvtfont.h" #include "rxvttoolkit.h" +#include "rxvtimg.h" #include "scrollbar.h" #include "ev_cpp.h" -#include "salloc.h" #include "libptytty.h" #include "rxvtperl.h" @@ -100,33 +109,19 @@ ***************************************************************************** */ -#ifndef HAVE_XPOINTER -typedef char *XPointer; -#endif - #include -#include "background.h" - #ifndef STDIN_FILENO # define STDIN_FILENO 0 # define STDOUT_FILENO 1 # define STDERR_FILENO 2 #endif -#if !defined (EACCESS) && defined(EAGAIN) -# define EACCESS EAGAIN -#endif - #ifndef EXIT_SUCCESS /* missing from */ # define EXIT_SUCCESS 0 /* exit function success */ # define EXIT_FAILURE 1 /* exit function failure */ #endif -#ifndef PATH_MAX -# define PATH_MAX 16384 -#endif - /****************************************************************************/ // exception thrown on fatal (per-instance) errors @@ -142,9 +137,9 @@ */ // main.C #define SET_LOCALE(locale) rxvt_set_locale (locale) -extern bool rxvt_set_locale (const char *locale) NOTHROW; -extern void rxvt_push_locale (const char *locale) NOTHROW; -extern void rxvt_pop_locale () NOTHROW; +extern bool rxvt_set_locale (const char *locale) noexcept; +extern void rxvt_push_locale (const char *locale) noexcept; +extern void rxvt_pop_locale () noexcept; void rxvt_init (); // misc.C @@ -153,20 +148,30 @@ char * rxvt_wcstoutf8 (const wchar_t *str, int len = -1); wchar_t * rxvt_utf8towcs (const char *str, int len = -1); -char * rxvt_basename (const char *str) NOTHROW; -void rxvt_vlog (const char *fmt, va_list arg_ptr) NOTHROW; -void rxvt_log (const char *fmt,...) NOTHROW; -void rxvt_warn (const char *fmt,...) NOTHROW; -void rxvt_fatal (const char *fmt, ...) THROW ((class rxvt_failure_exception)) NORETURN; -void rxvt_exit_failure () THROW ((class rxvt_failure_exception)) NORETURN; - -char * rxvt_strtrim (char *str) NOTHROW; -char ** rxvt_splitcommastring (const char *cs) NOTHROW; -void rxvt_freecommastring (char **cs) NOTHROW; - -void * rxvt_malloc (size_t size); -void * rxvt_calloc (size_t number, size_t size); -void * rxvt_realloc (void *ptr, size_t size); +const char * rxvt_basename (const char *str) noexcept; +void rxvt_vlog (const char *fmt, va_list arg_ptr) noexcept; +void rxvt_log (const char *fmt,...) noexcept; +void rxvt_warn (const char *fmt,...) noexcept; +ecb_noreturn ecb_cold +void rxvt_fatal (const char *fmt, ...); +ecb_noreturn ecb_cold +void rxvt_exit_failure (); + +void * rxvt_malloc (size_t size); +void * rxvt_calloc (size_t number, size_t size); +void * rxvt_realloc (void *ptr, size_t size); + +char * rxvt_strtrim (char *str) noexcept; +char ** rxvt_strsplit (char delim, const char *str) noexcept; + +static inline void +rxvt_free_strsplit (char **ptr) noexcept +{ + free (ptr[0]); + free (ptr); +} + +KeySym rxvt_XKeycodeToKeysym (Display *dpy, KeyCode keycode, int index); ///////////////////////////////////////////////////////////////////////////// @@ -175,17 +180,6 @@ extern char **rxvt_environ; // the original environ pointer static inline void -set_environ (stringvec *envv) -{ -#if ENABLE_PERL - assert (envv); -#else - if (envv) -#endif - environ = (char **)envv->begin (); -} - -static inline void set_environ (char **envv) { #if ENABLE_PERL @@ -196,6 +190,22 @@ environ = envv; } +struct localise_env +{ + char **orig_env; + + localise_env (char **new_env) + { + orig_env = environ; + environ = new_env; + } + + ~localise_env () + { + environ = orig_env; + } +}; + /* ***************************************************************************** * STRUCTURES AND TYPEDEFS @@ -206,7 +216,8 @@ * the 'essential' information for reporting Mouse Events * pared down from XButtonEvent */ -struct mouse_event { +struct mouse_event +{ int clicks; Time time; /* milliseconds */ unsigned int state; /* key or button mask */ @@ -246,15 +257,36 @@ /* COLORTERM, TERM environment variables */ #define COLORTERMENV "rxvt" -#ifdef BG_IMAGE_FROM_FILE +#if HAVE_IMG # define COLORTERMENVFULL COLORTERMENV "-xpm" #else # define COLORTERMENVFULL COLORTERMENV #endif #ifndef TERMENV -# define TERMENV "rxvt-unicode" +# if USE_256_COLORS +# define TERMENV "rxvt-unicode-256color" +# else +# define TERMENV "rxvt-unicode" +# endif #endif +// Hidden color cube for indexed 24-bit colors. There are fewer blue levels +// because normal human eye is less sensitive to the blue component than to +// the red or green. (https://en.m.wikipedia.org/wiki/Color_depth#8-bit_color) +#if USE_256_COLORS +// 7x7x5=245 < 254 unused color indices +# define Red_levels 7 +# define Green_levels 7 +# define Blue_levels 5 +#else +// 6x6x4=144 < 166 unused color indices +# define Red_levels 6 +# define Green_levels 6 +# define Blue_levels 4 +#endif + +#define RGB24_CUBE_SIZE (Red_levels * Green_levels * Blue_levels) + #if defined (NO_MOUSE_REPORT) && !defined (NO_MOUSE_REPORT_SCROLLBAR) # define NO_MOUSE_REPORT_SCROLLBAR 1 #endif @@ -277,87 +309,79 @@ # define NSCREENS 1 #endif -/* special (internal) prefix for font commands */ -#define FONT_CMD '#' -#define FONT_DN "#-" -#define FONT_UP "#+" - -/* flags for rxvt_scr_gotorc () */ +/* flags for rxvt_term::scr_gotorc () */ enum { C_RELATIVE = 1, /* col movement is relative */ R_RELATIVE = 2, /* row movement is relative */ RELATIVE = C_RELATIVE | R_RELATIVE, }; -/* modes for rxvt_scr_insdel_chars (), rxvt_scr_insdel_lines () */ +/* modes for rxvt_term::scr_insdel_chars (), rxvt_term::scr_insdel_lines () */ enum { INSERT = -1, /* don't change these values */ DELETE = +1, ERASE = +2, }; -/* modes for rxvt_scr_page () - scroll page. used by scrollbar window */ +/* modes for rxvt_term::scr_page () - scroll page. used by scrollbar window */ enum page_dirn { - UP, - DN, - NO_DIR, + DN = -1, + NO_DIR = 0, + UP = 1, }; -/* arguments for rxvt_scr_change_screen () */ +/* arguments for rxvt_term::scr_change_screen () */ enum { PRIMARY = 0, SECONDARY, }; +// define various rendition bits and masks. the rendition word +// is 32 bits in size, and we should use it as efficiently as possible + #define RS_None 0 -#define RS_fgMask 0x0000007fUL // 128 colors -#define RS_bgMask 0x00003f80UL // 128 colors +// GET_BGATTR depends on RS_fgShift > RS_bgShift +#define RS_colorMask ((1UL << Color_Bits) - 1UL) +#define RS_bgShift 0 +#define RS_fgShift (RS_bgShift + Color_Bits) +#define RS_bgMask (RS_colorMask << RS_bgShift) +#define RS_fgMask (RS_colorMask << RS_fgShift) + +// must have space for rxvt_fontset::fontCount * 2 + 2 values +#define RS_fontShift (RS_fgShift + Color_Bits) +#define RS_Careful (1UL << RS_fontShift) /* be careful when drawing these */ +#define RS_fontCount rxvt_fontset::fontCount +#define RS_fontMask ((RS_fontCount << (RS_fontShift + 1)) | RS_Careful) // includes RS_Careful + +// toggle this to force redraw, must be != RS_Careful and otherwise "pretty neutral" +#define RS_redraw (2UL << RS_fontShift) + +#define RS_Sel (1UL << 22) + +// 4 custom bits for extensions +#define RS_customCount 16UL +#define RS_customShift 23 +#define RS_customMask ((RS_customCount - 1UL) << RS_customShift) // font styles -#define RS_Bold 0x00004000UL // value 1 -#define RS_Italic 0x00008000UL // value 2 - -// fake styles -#define RS_Blink 0x00010000UL // blink -#define RS_RVid 0x00020000UL // reverse video -#define RS_Uline 0x00040000UL // underline - -// toggle this to force redraw, must be != RS_Careful -#define RS_redraw 0x01000000UL - -// 5 custom bits for extensions -#define RS_customCount 32 -#define RS_customMask 0x00f80000UL -#define RS_customShift 19 - -// other flags -#define RS_Careful 0x80000000UL /* be careful when drawing these */ +#define RS_Bold (1UL << RS_styleShift) +#define RS_Italic (2UL << RS_styleShift) #define RS_styleCount 4 +#define RS_styleShift 27 #define RS_styleMask (RS_Bold | RS_Italic) -#define RS_styleShift 14 + +// fake styles +#define RS_Blink (1UL << 29) +#define RS_RVid (1UL << 30) // reverse video +#define RS_Uline (1UL << 31) // underline #define RS_baseattrMask (RS_Italic | RS_Bold | RS_Blink | RS_RVid | RS_Uline) #define RS_attrMask (RS_baseattrMask | RS_fontMask) -#define RS_fontCount 127 // not 127 or 256, see rxvtfont.h -#define RS_fontMask 0xff000000UL // plenty(?) of fonts, includes RS_Careful -#define RS_fontShift 24 - -#define DEFAULT_RSTYLE (RS_None | Color_fg | (Color_bg << Color_Bits)) -#define OVERLAY_RSTYLE (RS_None | Color_Black | (Color_Yellow << Color_Bits)) - -#define Sel_none 0 /* Not waiting */ -#define Sel_normal 0x01 /* normal selection */ -#define Sel_incr 0x02 /* incremental selection */ -#define Sel_direct 0x00 -#define Sel_Primary 0x01 -#define Sel_Secondary 0x02 -#define Sel_Clipboard 0x03 -#define Sel_whereMask 0x0f -#define Sel_CompoundText 0x10 /* last request was COMPOUND_TEXT */ -#define Sel_UTF8String 0x20 /* last request was UTF8_STRING */ +#define DEFAULT_RSTYLE (RS_None | (Color_fg << RS_fgShift) | (Color_bg << RS_bgShift)) +#define OVERLAY_RSTYLE (RS_None | (Color_Black << RS_fgShift) | (Color_Yellow << RS_bgShift)) enum { C0_NUL = 0x00, @@ -385,7 +409,8 @@ XTerm_Color_pointer_bg = 14, // change actual 'Pointer' bg color XTerm_Color05 = 15, // not implemented (tektronix fg) XTerm_Color06 = 16, // not implemented (tektronix bg) - XTerm_Color_RV = 17, // change actual 'Highlight' color + XTerm_Color_HC = 17, // change actual 'Highlight' bg color + XTerm_Color_HTC = 19, // change actual 'Highlight' fg color XTerm_logfile = 46, // not implemented XTerm_font = 50, @@ -397,21 +422,18 @@ */ // deprecated - Rxvt_Color_BD = 18, - Rxvt_Color_UL = 19, Rxvt_restoreFG = 39, Rxvt_restoreBG = 49, - Rxvt_Pixmap = 20, // new bg pixmap Rxvt_dumpscreen = 55, // dump scrollback and all of screen URxvt_locale = 701, // change locale URxvt_version = 702, // request version URxvt_Color_IT = 704, // change actual 'Italic' colour - URxvt_Color_tint = 705, // change actual tint colour URxvt_Color_BD = 706, // change actual 'Bold' color URxvt_Color_UL = 707, // change actual 'Underline' color + URxvt_Color_border = 708, URxvt_font = 710, URxvt_boldFont = 711, @@ -421,7 +443,7 @@ URxvt_view_up = 720, URxvt_view_down = 721, - URxvt_perl = 777, + URxvt_perl = 777, // for use by perl extensions, starts with "extension-name;" }; /* Words starting with `Color_' are colours. Others are counts */ @@ -461,7 +483,14 @@ Color_White = maxCOLOR, #endif minTermCOLOR = Color_White + 1, +#if USE_256_COLORS + maxTermCOLOR = Color_White + 240, +#else maxTermCOLOR = Color_White + 72, +#endif + minTermCOLOR24, + maxTermCOLOR24 = minTermCOLOR24 + + RGB24_CUBE_SIZE - 1, #ifndef NO_CURSORCOLOR Color_cursor, Color_cursor2, @@ -480,14 +509,12 @@ #endif #ifdef OPTION_HC Color_HC, + Color_HTC, #endif Color_scroll, #ifdef RXVT_SCROLLBAR Color_trough, #endif -#if ENABLE_TRANSPARENCY - Color_tint, -#endif #if OFF_FOCUS_FADING Color_fade, #endif @@ -501,7 +528,15 @@ #endif }; -#define Color_Bits 7 // 0 .. maxTermCOLOR +#if USE_256_COLORS +# define Color_Bits 9 // 0 .. maxTermCOLOR24 +#else +# define Color_Bits 8 // 0 .. maxTermCOLOR24 +#endif + +#if maxTermCOLOR24 >= (1 << Color_Bits) +# error color index overflow +#endif /* * Resource list @@ -539,6 +574,11 @@ #define PrivMode_MouseBtnEvent (1UL<<20) #define PrivMode_MouseAnyEvent (1UL<<21) #define PrivMode_BracketPaste (1UL<<22) +#define PrivMode_ExtMouseUTF8 (1UL<<23) // xterm pseudo-utf-8 hack +#define PrivMode_ExtMouseUrxvt (1UL<<24) // xterm pseudo-utf-8, but works in non-utf-8-locales +#define PrivMode_BlinkingCursor (1UL<<25) +#define PrivMode_FocusEvent (1UL<<26) +#define PrivMode_ExtMouseSGR (1UL<<27) #define PrivMode_mouse_report (PrivMode_MouseX10|PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent) @@ -551,12 +591,14 @@ // do not change these constants lightly, there are many interdependencies #define IMBUFSIZ 128 // input modifier buffer sizes #define KBUFSZ 512 // size of keyboard mapping buffer -#define CBUFSIZ 2048 // size of command buffer +#define CBUFSIZ 32768 // size of command buffer (longest command sequence possible) +#define CBUFCNT 8 // never call pty_fill/cmd_parse more than this often in a row #define UBUFSIZ 2048 // character buffer #if ENABLE_FRILLS # include -typedef struct _mwmhints { +typedef struct _mwmhints +{ CARD32 flags; CARD32 functions; CARD32 decorations; @@ -597,6 +639,8 @@ * MACRO DEFINES ***************************************************************************** */ + +// speed hack, copy some member variable into a local variable of the same name #define dLocal(type,name) type const name = this->name // for speed reasons, we assume that all codepoints 32 to 126 are @@ -613,12 +657,15 @@ #define Width2Pixel(n) ((int32_t)(n) * (int32_t)fwidth) #define Height2Pixel(n) ((int32_t)(n) * (int32_t)fheight) -#define LINENO(n) MOD (term_start + int(n), total_rows) -#define ROW(n) row_buf [LINENO (n)] +#define LINENO_of(t,n) MOD ((t)->term_start + int(n), (t)->total_rows) +#define ROW_of(t,n) (t)->row_buf [LINENO_of ((t), n)] + +#define LINENO(n) LINENO_of (this, n) +#define ROW(n) ROW_of (this, n) /* how to build & extract colors and attributes */ -#define GET_BASEFG(x) (((x) & RS_fgMask)) -#define GET_BASEBG(x) (((x) & RS_bgMask)>>Color_Bits) +#define GET_BASEFG(x) (((x) & RS_fgMask) >> RS_fgShift) +#define GET_BASEBG(x) (((x) & RS_bgMask) >> RS_bgShift) #define GET_FONT(x) (((x) & RS_fontMask) >> RS_fontShift) #define SET_FONT(x,fid) (((x) & ~RS_fontMask) | ((fid) << RS_fontShift)) @@ -627,12 +674,8 @@ #define SET_STYLE(x,style) (((x) & ~RS_styleMask) | ((style) << RS_styleShift)) #define GET_ATTR(x) (((x) & RS_attrMask)) -#define GET_BGATTR(x) \ - (((x) & RS_RVid) ? (((x) & (RS_attrMask & ~RS_RVid)) \ - | (((x) & RS_fgMask)<fontset[GET_STYLE (style)] #else -# define FONTSET(style) fontset[0] +# define FONTSET_of(t,style) (t)->fontset[0] #endif +#define FONTSET(style) FONTSET_of (this, style) + typedef callback log_callback; typedef callback getfd_callback; @@ -657,12 +702,23 @@ #define LINE_FILTER 0x0008 // line needs to be filtered before display (NYI) #define LINE_BIDI 0x0010 // line needs bidi (NYI) -struct line_t { +struct line_t +{ text_t *t; // terminal the text rend_t *r; // rendition, uses RS_ flags tlen_t_ l; // length of each text line uint32_t f; // flags + bool valid () + { + return l >= 0; + } + + void alloc () + { + l = 0; + } + bool is_longer () { return f & LINE_LONGER; @@ -701,7 +757,8 @@ /****************************************************************************/ // primitive wrapper around mbstate_t to ensure initialisation -struct mbstate { +struct mbstate +{ mbstate_t mbs; operator mbstate_t *() { return &mbs; } @@ -732,14 +789,17 @@ // compose chars are used to represent composite characters // that are not representable in unicode, as well as characters // not fitting in the BMP. -struct compose_char { +struct compose_char +{ unicode_t c1, c2; // any chars != NOCHAR are valid + compose_char (unicode_t c1, unicode_t c2) : c1(c1), c2(c2) { } }; -class rxvt_composite_vec { +class rxvt_composite_vec +{ vector v; public: text_t compose (unicode_t c1, unicode_t c2 = NOCHAR); @@ -768,7 +828,20 @@ #define SET_R(r) rxvt_current_term = const_cast(r) #define GET_R rxvt_current_term -typedef struct { +/* ------------------------------------------------------------------------- */ +struct overlay_base +{ + int x, y, w, h; // overlay dimensions + text_t **text; + rend_t **rend; + + // while tempting to add swap() etc. here, it effectively only increases code size +}; + +/* ------------------------------------------------------------------------- */ + +typedef struct +{ int row; int col; } row_col_t; @@ -803,13 +876,16 @@ * | terminal +---------+ * | terminal | * | terminal | - * +------------+···········= term_stat + nrow - 1 + * +------------+···········= term_start + nrow - 1 * | * | * END······················= total_rows */ -struct TermWin_t { +struct TermWin_t +{ + int vt_width; /* actual window width [pixels] */ + int vt_height; /* actual window height [pixels] */ int width; /* window width [pixels] */ int height; /* window height [pixels] */ int fwidth; /* font width [pixels] */ @@ -822,15 +898,15 @@ int int_bwidth; /* internal border width */ int ext_bwidth; /* external border width */ int lineSpace; /* number of extra pixels between rows */ + int letterSpace; /* number of extra pixels between columns */ int saveLines; /* number of lines that fit in scrollback */ int total_rows; /* total number of rows in this terminal */ int term_start; /* term lines start here */ int view_start; /* scrollback view starts here */ int top_row; /* topmost row index of scrollback */ - Window parent[6]; /* parent identifiers - we're parent[0] */ + Window parent; /* parent identifier */ Window vt; /* vt100 window */ GC gc; /* GC for drawing */ - Pixmap pixmap; rxvt_drawable *drawable; rxvt_fontset *fontset[4]; }; @@ -849,11 +925,12 @@ * 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: -nsaved <= beg.row <= mark.row <= end.row < nrow + * * Note: top_row <= beg.row <= mark.row <= end.row < nrow * * Note: col == -1 ==> we're left of screen * */ -typedef struct { +struct screen_t +{ row_col_t cur; /* cursor position on the screen */ int tscroll; /* top of settable scroll region */ int bscroll; /* bottom of settable scroll region */ @@ -863,9 +940,10 @@ unsigned int s_charset; /* saved character set number [0..3] */ char s_charset_char; rend_t s_rstyle; /* saved rendition style */ -} screen_t; +}; -enum selection_op_t { +enum selection_op_t +{ SELECTION_CLEAR = 0, /* nothing selected */ SELECTION_INIT, /* marked a point */ SELECTION_BEGIN, /* started a selection */ @@ -873,7 +951,8 @@ SELECTION_DONE /* selection put in CUT_BUFFER0 */ }; -typedef struct { +struct selection_t +{ wchar_t *text; /* selected text */ unsigned int len; /* length of selected text */ unsigned int screen; /* screen being used */ @@ -883,7 +962,9 @@ row_col_t beg; /* beginning of selection <= mark */ row_col_t mark; /* point of initial click <= end */ row_col_t end; /* one character past end point */ -} selection_t; + wchar_t *clip_text; /* text copied to the clipboard */ + unsigned int clip_len; /* length of clipboard text */ +}; /* ------------------------------------------------------------------------- */ @@ -897,24 +978,26 @@ /* rxvt_vars.options */ enum { -# define def(name,idx) Opt_ ## name = idx, -# define nodef(name) Opt_ ## name = 0, +# define def(name) Opt_ ## name, +# define nodef(name) Opt_prev_ ## name, Opt_ ## name = 0, Opt_next_ ## name = Opt_prev_ ## name - 1, + Opt_0, # include "optinc.h" # undef nodef # undef def -Opt_count + Opt_count }; /* ------------------------------------------------------------------------- */ -struct rxvt_vars : TermWin_t { +struct rxvt_vars : TermWin_t +{ scrollBar_t scrollBar; uint8_t options[(Opt_count + 7) >> 3]; XSizeHints szHint; rxvt_color *pix_colors; Cursor TermWin_cursor; /* cursor for vt window */ - int numlock_state; - line_t *row_buf; // all lines, scrollback + terminal, circular, followed by temp_buf + + line_t *row_buf; // all lines, scrollback + terminal, circular line_t *drawn_buf; // text on screen line_t *swap_buf; // lines for swap buffer char *tabs; /* per location: 1 == tab-stop */ @@ -927,7 +1010,8 @@ #endif }; -struct rxvt_term : zero_initialized, rxvt_vars, rxvt_screen { +struct rxvt_term : zero_initialized, rxvt_vars, rxvt_screen +{ // special markers with magic addresses static const char resval_undef []; // options specifically unset @@ -945,32 +1029,34 @@ current_screen:1, /* primary or secondary */ num_scr_allow:1, bypass_keystate:1, -#ifdef CURSOR_BLINK +#if ENABLE_FRILLS + urgency_hint:1, +#endif +#if CURSOR_BLINK hidden_cursor:1, #endif -#ifdef TEXT_BLINK +#if TEXT_BLINK hidden_text:1, #endif -#ifdef POINTER_BLANK +#if POINTER_BLANK hidden_pointer:1, #endif - enc_utf8:1, /* wether locale uses utf-8 */ - seen_input:1, /* wether we have seen some program output yet */ - seen_resize:1, /* wether we had a resize event */ + enc_utf8:1, /* whether locale uses utf-8 */ + seen_input:1, /* whether we have seen some program output yet */ + seen_resize:1, /* whether we had a resize event */ + init_done:1, parsed_geometry:1; unsigned char refresh_type, #ifdef META8_OPTION - meta_char, /* Alt-key prefix */ + meta_char; /* Alt-key prefix */ #endif - selection_wait, - selection_type; /* ---------- */ bool rvideo_state, rvideo_mode; #ifndef NO_BELL bool rvideo_bell; #endif - int num_scr; /* screen: number lines scrolled */ + int num_scr; /* screen: number of lines scrolled */ int prev_ncol, /* screen: previous number of columns */ prev_nrow; /* screen: previous number of rows */ /* ---------- */ @@ -978,7 +1064,6 @@ /* ---------- */ #ifdef SELECTION_SCROLLING int scroll_selection_lines; - enum page_dirn scroll_selection_dir; int selection_save_x, selection_save_y, selection_save_state; @@ -997,88 +1082,62 @@ # ifdef POINTER_BLANK pointerBlankDelay, # endif + multiClickTime, + cursor_type, allowedxerror; /* ---------- */ unsigned int ModLevel3Mask, ModMetaMask, ModNumLockMask; - int old_width, /* last used width in screen resize */ - old_height; /* last used height in screen resize */ unsigned long priv_modes, SavedModes; /* ---------- */ Atom *xa; /* ---------- */ -#ifdef RXVT_SCROLLBAR - GC scrollbarGC, - topShadowGC, - botShadowGC; -#endif -#ifdef XTERM_SCROLLBAR - GC xscrollbarGC, - ShadowGC; -#endif -#ifdef PLAIN_SCROLLBAR - GC pscrollbarGC; -#endif -#ifdef NEXT_SCROLLBAR - GC blackGC, - whiteGC, - grayGC, - darkGC, - stippleGC; - Pixmap dimple, - upArrow, - downArrow, - upArrowHi, - downArrowHi; -#endif -/* ---------- */ Time selection_time, - selection_request_time; + clipboard_time; + rxvt_selection *selection_req; pid_t cmd_pid; /* process id of child */ - char * incr_buf; - size_t incr_buf_size, incr_buf_fill; /* ---------- */ struct mouse_event MEvent; XComposeStatus compose; - struct termios tio; + static struct termios def_tio; row_col_t oldcursor; -#ifdef HAVE_BG_PIXMAP - bgPixmap_t bgPixmap; -#endif -#ifdef HAVE_AFTERIMAGE - ASVisual *asv; - ASImageManager *asimman; + +#ifdef HAVE_IMG + enum { + BG_IS_TRANSPARENT = 1 << 1, + BG_NEEDS_REFRESH = 1 << 2, + }; + + uint8_t bg_flags; + + rxvt_img *bg_img; #endif #if ENABLE_OVERLAY - int ov_x, ov_y, ov_w, ov_h; // overlay dimensions - text_t **ov_text; - rend_t **ov_rend; - - void scr_swap_overlay () NOTHROW; - void scr_overlay_new (int x, int y, int w, int h) NOTHROW; - void scr_overlay_off () NOTHROW; + overlay_base ov; + + void scr_swap_overlay () noexcept; + void scr_overlay_new (int x, int y, int w, int h) noexcept; + void scr_overlay_off () noexcept; void scr_overlay_set (int x, int y, text_t text, - rend_t rend = OVERLAY_RSTYLE) NOTHROW; - void scr_overlay_set (int x, int y, const char *s) NOTHROW; - void scr_overlay_set (int x, int y, const wchar_t *s) NOTHROW; + rend_t rend = OVERLAY_RSTYLE) noexcept; + void scr_overlay_set (int x, int y, const char *s) noexcept; + void scr_overlay_set (int x, int y, const wchar_t *s) noexcept; #endif vector allocated; // free these memory blocks with free() - char env_windowid[21]; /* environmental variable WINDOWID */ - char env_colorfgbg[sizeof ("COLORFGBG=default;default;bg") + 1]; - char *env_display; /* environmental variable DISPLAY */ - char *env_term; /* environmental variable TERM */ + int parent_x, parent_y; // parent window position relative to root, only updated on demand char *locale; char charsets[4]; char *v_buffer; /* pointer to physical buffer */ unsigned int v_buflen; /* size of area to write */ stringvec *argv, *envv; /* if != 0, will be freed at destroy time */ + char **env; #ifdef KEYSYM_RESOURCE keyboard_manager *keyboard; @@ -1094,8 +1153,14 @@ ptytty *pty; - rxvt_salloc *talloc; // text line allocator - rxvt_salloc *ralloc; // rend line allocator + // chunk contains all line_t's as well as rend_t and text_t buffers + // for drawn_buf, swap_buf and row_buf, in this order + void *chunk; + size_t chunk_size; + + uint32_t rgb24_color[RGB24_CUBE_SIZE]; // the 24-bit color value + uint16_t rgb24_seqno[RGB24_CUBE_SIZE]; // which one is older? + uint16_t rgb24_sequence; static vector termlist; // a vector of all running rxvt_term's @@ -1104,31 +1169,22 @@ unicode_t iso14755buf; void commit_iso14755 (); # if ISO_14755 - void iso14755_51 (unicode_t ch, rend_t r = DEFAULT_RSTYLE, int x = 0, int y = -1); + void iso14755_51 (unicode_t ch, rend_t r = DEFAULT_RSTYLE, int x = 0, int y = -1, int y2 = -1); void iso14755_54 (int x, int y); # endif #endif long vt_emask, vt_emask_perl, vt_emask_xim, vt_emask_mouse; - void vt_select_input () const NOTHROW + void vt_select_input () const noexcept { XSelectInput (dpy, vt, vt_emask | vt_emask_perl | vt_emask_xim | vt_emask_mouse); } -#if ENABLE_TRANSPARENCY || ENABLE_PERL +#if ENABLE_PERL void rootwin_cb (XEvent &xev); xevent_watcher rootwin_ev; #endif -#ifdef HAVE_BG_PIXMAP - void update_background (); -#if TRACE_PIXMAPS - void trace_update_background (const char *file, int line); -# define update_background() trace_update_background (__FILE__, __LINE__) -#endif - void update_background_cb (ev::timer &w, int revents); - ev::timer update_background_ev; -#endif void x_cb (XEvent &xev); xevent_watcher termwin_ev; @@ -1140,11 +1196,13 @@ void refresh_check (); void flush (); void flush_cb (ev::timer &w, int revents); ev::timer flush_ev; + void cmdbuf_reify (); + void cmdbuf_append (const char *str, size_t count); bool pty_fill (); void pty_cb (ev::io &w, int revents); ev::io pty_ev; - void incr_cb (ev::timer &w, int revents) NOTHROW; ev::timer incr_ev; #ifdef CURSOR_BLINK + void cursor_blink_reset (); void cursor_blink_cb (ev::timer &w, int revents); ev::timer cursor_blink_ev; #endif #ifdef TEXT_BLINK @@ -1171,19 +1229,15 @@ void pointer_unblank (); void tt_printf (const char *fmt,...); + void tt_write_ (const char *data, unsigned int len); void tt_write (const char *data, unsigned int len); + void tt_write_user_input (const char *data, unsigned int len); void pty_write (); - void init (stringvec *argv, stringvec *envv) - { - this->argv = argv; - init (argv->size (), argv->begin (), envv); - } - void make_current () const // make this the "currently active" urxvt instance { SET_R (this); - set_environ (envv); + set_environ (env); rxvt_set_locale (locale); } @@ -1196,33 +1250,37 @@ void im_destroy (); void im_cb (); im_watcher im_ev; void im_set_size (XRectangle &size); - void im_set_position (XPoint &pos) NOTHROW; + void im_set_position (XPoint &pos) noexcept; void im_set_color (unsigned long &fg, unsigned long &bg); void im_set_preedit_area (XRectangle &preedit_rect, XRectangle &status_rect, const XRectangle &needed_rect); - bool IMisRunning (); - void IMSendSpot (); - bool IM_get_IC (const char *modifiers); - void IMSetPosition (); + bool im_is_running (); + void im_send_spot (); + bool im_get_ic (const char *modifiers); + void im_set_position (); #endif // command.C void key_press (XKeyEvent &ev); void key_release (XKeyEvent &ev); - unsigned int cmd_write (const char *str, unsigned int count); - wchar_t next_char () NOTHROW; - wchar_t cmd_getc () THROW ((class out_of_input)); - uint32_t next_octet () NOTHROW; - uint32_t cmd_get8 () THROW ((class out_of_input)); + wchar_t next_char () noexcept; + wchar_t cmd_getc (); + uint32_t next_octet () noexcept; + uint32_t cmd_get8 (); - bool cmd_parse (); + void cmd_parse (); void mouse_report (XButtonEvent &ev); void button_press (XButtonEvent &ev); void button_release (XButtonEvent &ev); void focus_in (); void focus_out (); - void update_fade_color (unsigned int idx); +#if ENABLE_FRILLS + void set_urgency (bool enable); +#else + void set_urgency (bool enable) { } +#endif + void update_fade_color (unsigned int idx, bool first_time = false); #ifdef PRINTPIPE FILE *popen_printer (); int pclose_printer (FILE *stream); @@ -1237,15 +1295,18 @@ void process_dcs_seq (); void process_osc_seq (); void process_color_seq (int report, int color, const char *str, char resp); - void process_xterm_seq (int op, const char *str, char resp); + void process_xterm_seq (int op, char *str, char resp); + unsigned int map_rgb24_color (unsigned int r, unsigned int g, unsigned int b, unsigned int a); int privcases (int mode, unsigned long bit); void process_terminal_mode (int mode, int priv, unsigned int nargs, const int *arg); void process_sgr_mode (unsigned int nargs, const int *arg); - void process_graphics (); + void set_cursor_style (int style); // init.C + void init (stringvec *argv, stringvec *envv); + void init (int argc, const char *const *argv, const char *const *envv); + void init2 (int argc, const char *const *argv); void init_vars (); const char **init_resources (int argc, const char *const *argv); - void init (int argc, const char *const *argv, stringvec *envv); void init_env (); void set_locale (const char *locale); void init_xlocale (); @@ -1254,61 +1315,41 @@ int run_child (const char *const *argv); void color_aliases (int idx); void create_windows (int argc, const char *const *argv); - void Get_Colours (); + void get_colors (); void get_ourmods (); + void set_icon (const char *file); // main.C void tt_winch (); rxvt_term (); ~rxvt_term (); void destroy (); void emergency_cleanup (); - void recolour_cursor (); + void recolor_cursor (); void resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent); void window_calc (unsigned int newwidth, unsigned int newheight); bool set_fonts (); void set_string_property (Atom prop, const char *str, int len = -1); + void set_mbstring_property (Atom prop, const char *str, int len = -1); void set_utf8_property (Atom prop, const char *str, int len = -1); void set_title (const char *str); void set_icon_name (const char *str); void set_window_color (int idx, const char *color); - void set_colorfgbg (); + char *get_colorfgbg (); bool set_color (rxvt_color &color, const char *name); void alias_color (int dst, int src); void set_widthheight (unsigned int newwidth, unsigned int newheight); void get_window_origin (int &x, int &y); - Pixmap get_pixmap_property (int prop_id); // screen.C - void lalloc (line_t &l) const + bool option (uint8_t opt) const noexcept { - l.t = (text_t *)talloc->alloc (); - l.r = (rend_t *)ralloc->alloc (); - } - -#if 0 - void lfree (line_t &l) - { - talloc->free (l.t); - ralloc->free (l.r); + return options[opt >> 3] & (1 << (opt & 7)); } -#endif - - void lresize (line_t &l) const - { - if (!l.t) - return; - - l.t = (text_t *)talloc->alloc (l.t, prev_ncol * sizeof (text_t)); - l.r = (rend_t *)ralloc->alloc (l.r, prev_ncol * sizeof (rend_t)); - - l.l = min (l.l, ncol); - if (ncol > prev_ncol) - scr_blank_line (l, prev_ncol, ncol - prev_ncol, DEFAULT_RSTYLE); - } + void set_option (uint8_t opt, bool set = true) noexcept; - int fgcolor_of (rend_t r) const NOTHROW + int fgcolor_of (rend_t r) const noexcept { int base = GET_BASEFG (r); #ifndef NO_BRIGHTCOLOR @@ -1316,13 +1357,13 @@ # if ENABLE_STYLES && option (Opt_intensityStyles) # endif - && IN_RANGE_INC (base, minCOLOR, minBrightCOLOR)) + && IN_RANGE_EXC (base, minCOLOR, minBrightCOLOR)) base += minBrightCOLOR - minCOLOR; #endif return base; } - int bgcolor_of (rend_t r) const NOTHROW + int bgcolor_of (rend_t r) const noexcept { int base = GET_BASEBG (r); #ifndef NO_BRIGHTCOLOR @@ -1330,152 +1371,111 @@ # if ENABLE_STYLES && option (Opt_intensityStyles) # endif - && IN_RANGE_INC (base, minCOLOR, minBrightCOLOR)) + && IN_RANGE_EXC (base, minCOLOR, minBrightCOLOR)) base += minBrightCOLOR - minCOLOR; #endif return base; } - bool option (uint8_t opt) const NOTHROW - { - if (!opt) - return 0; - - --opt; - return options[opt >> 3] & (1 << (opt & 7)); - } - - void set_option (uint8_t opt, bool set = true) NOTHROW - { - if (!opt) - return; - - --opt; - if (set) - options[opt >> 3] |= (1 << (opt & 7)); - else - options[opt >> 3] &= ~(1 << (opt & 7)); - } - - void set_privmode (unsigned bit, int set) NOTHROW - { - if (set) - priv_modes |= bit; - else - priv_modes &= ~bit; - } - // modifies first argument(!) - void paste (char *data, unsigned int len) NOTHROW; - void scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) const NOTHROW; - void scr_blank_screen_mem (line_t &l, rend_t efs) const NOTHROW; - int scr_scroll_text (int row1, int row2, int count) NOTHROW; + void tt_paste (char *data, unsigned int len) noexcept; + void paste (char *data, unsigned int len) noexcept; + void scr_alloc () noexcept; + void scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) const noexcept; + void scr_blank_screen_mem (line_t &l, rend_t efs) const noexcept; + void scr_kill_char (line_t &l, int col) const noexcept; + void scr_set_char_rend (line_t &l, int col, rend_t rend); + int scr_scroll_text (int row1, int row2, int count) noexcept; + void copy_line (line_t &dst, line_t &src); void scr_reset (); - void scr_release () NOTHROW; - void scr_clear (bool really = false) NOTHROW; - void scr_refresh () NOTHROW; - bool scr_refresh_rend (rend_t mask, rend_t value) NOTHROW; - void scr_erase_screen (int mode) NOTHROW; + void scr_release () noexcept; + void scr_clear (bool really = false) noexcept; + void scr_refresh () noexcept; + bool scr_refresh_rend (rend_t mask, rend_t value) noexcept; + void scr_erase_screen (int mode) noexcept; #if ENABLE_FRILLS - void scr_erase_savelines () NOTHROW; - void scr_backindex () NOTHROW; - void scr_forwardindex () NOTHROW; -#endif - void scr_touch (bool refresh) NOTHROW; - void scr_expose (int x, int y, int width, int height, bool refresh) NOTHROW; - void scr_recolour () NOTHROW; - void scr_remap_chars () NOTHROW; - void scr_remap_chars (line_t &l) NOTHROW; + void scr_erase_savelines () noexcept; + void scr_backindex () noexcept; + void scr_forwardindex () noexcept; +#endif + void scr_touch (bool refresh) noexcept; + void scr_expose (int x, int y, int width, int height, bool refresh) noexcept; + void scr_recolor (bool refresh = true) noexcept; + void scr_remap_chars () noexcept; + void scr_remap_chars (line_t &l) noexcept; enum cursor_mode { SAVE, RESTORE }; void scr_poweron (); - void scr_cursor (cursor_mode mode) NOTHROW; - void scr_do_wrap () NOTHROW; - void scr_swap_screen () NOTHROW; + void scr_soft_reset () noexcept; + void scr_cursor (cursor_mode mode) noexcept; + void scr_do_wrap () noexcept; + void scr_swap_screen () noexcept; void scr_change_screen (int scrn); - void scr_color (unsigned int color, int fgbg) NOTHROW; - void scr_rendition (int set, int style) NOTHROW; - void scr_add_lines (const wchar_t *str, int len, int minlines = 0) NOTHROW; - void scr_backspace () NOTHROW; - void scr_tab (int count, bool ht = false) NOTHROW; - void scr_gotorc (int row, int col, int relative) NOTHROW; - void scr_index (enum page_dirn direction) NOTHROW; - void scr_erase_line (int mode) NOTHROW; - void scr_E () NOTHROW; - void scr_insdel_lines (int count, int insdel) NOTHROW; - void scr_insdel_chars (int count, int insdel) NOTHROW; - void scr_scroll_region (int top, int bot) NOTHROW; - void scr_cursor_visible (int mode) NOTHROW; - void scr_autowrap (int mode) NOTHROW; - void scr_relative_origin (int mode) NOTHROW; - void scr_insert_mode (int mode) NOTHROW; - void scr_set_tab (int mode) NOTHROW; - void scr_rvideo_mode (bool on) NOTHROW; - void scr_report_position () NOTHROW; - void set_font_style () NOTHROW; - void scr_charset_choose (int set) NOTHROW; - void scr_charset_set (int set, unsigned int ch) NOTHROW; - void scr_move_to (int y, int len) NOTHROW; - bool scr_page (enum page_dirn direction, int nlines) NOTHROW; - bool scr_changeview (int new_view_start) NOTHROW; - void scr_bell () NOTHROW; - void scr_printscreen (int fullhist) NOTHROW; - void scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle1, rend_t rstyle2) NOTHROW; - void scr_xor_span (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle) NOTHROW; - void scr_reverse_selection () NOTHROW; - void scr_dump (int fd) NOTHROW; - - void selection_check (int check_more) NOTHROW; - void selection_paste (Window win, Atom prop, bool delete_prop) NOTHROW; - void selection_property (Window win, Atom prop) NOTHROW; - void selection_request (Time tm, int selnum = Sel_Primary) NOTHROW; - int selection_request_other (Atom target, int selnum) NOTHROW; - void selection_clear () NOTHROW; + void scr_color (unsigned int color, int fgbg) noexcept; + void scr_rendition (int set, int style) noexcept; + void scr_add_lines (const wchar_t *str, int len, int minlines = 0) noexcept; + void scr_backspace () noexcept; + void scr_tab (int count, bool ht = false) noexcept; + void scr_gotorc (int row, int col, int relative) noexcept; + void scr_index (enum page_dirn direction) noexcept; + void scr_erase_line (int mode) noexcept; + void scr_E () noexcept; + void scr_insdel_lines (int count, int insdel) noexcept; + void scr_insdel_chars (int count, int insdel) noexcept; + void scr_scroll_region (int top, int bot) noexcept; + void scr_cursor_visible (int mode) noexcept; + void scr_autowrap (int mode) noexcept; + void scr_relative_origin (int mode) noexcept; + void scr_insert_mode (int mode) noexcept; + void scr_set_tab (int mode) noexcept; + void scr_rvideo_mode (bool on) noexcept; + void scr_report_position () noexcept; + void set_font_style () noexcept; + void scr_charset_choose (int set) noexcept; + void scr_charset_set (int set, unsigned int ch) noexcept; + void scr_move_to (int y, int len) noexcept; + bool scr_page (int nlines) noexcept; + bool scr_page (enum page_dirn direction, int nlines) noexcept + { + return scr_page (direction * nlines); + } + bool scr_changeview (int new_view_start) noexcept; + void scr_bell () noexcept; + void scr_printscreen (int fullhist) noexcept; + void scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle1, rend_t rstyle2) noexcept; + void scr_xor_span (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle) noexcept; + void scr_reverse_selection () noexcept; + void scr_dump (int fd) noexcept; + + void selection_check (int check_more) noexcept; + void selection_changed () noexcept; /* sets want_refresh, corrects coordinates */ + void selection_request (Time tm, int selnum = Sel_Primary) noexcept; + void selection_clear (bool clipboard = false) noexcept; void selection_make (Time tm); - bool selection_grab (Time tm) NOTHROW; - void selection_start_colrow (int col, int row) NOTHROW; - void selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) NOTHROW; - void selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) NOTHROW; - void selection_remove_trailing_spaces () NOTHROW; - void selection_send (const XSelectionRequestEvent &rq) NOTHROW; - void selection_click (int clicks, int x, int y) NOTHROW; - void selection_extend (int x, int y, int flag) NOTHROW; - void selection_rotate (int x, int y) NOTHROW; - -#if defined(NEXT_SCROLLBAR) - // scrollbar-next.C - Pixmap renderPixmap (const char *const *data, int width, int height); - void init_scrollbar_stuff (); - void drawBevel (Drawable d, int x1, int y1, int w, int h); - int scrollbar_show_next (int update, int last_top, int last_bot, int scrollbar_len); -#endif - -#if defined(RXVT_SCROLLBAR) - // scrollbar-rxvt.C - int scrollbar_show_rxvt (int update, int last_top, int last_bot, int scrollbar_len); -#endif - -#if defined(XTERM_SCROLLBAR) - // scrollbar-xterm.C - int scrollbar_show_xterm (int update, int last_top, int last_bot, int scrollbar_len); -#endif - -#if defined(PLAIN_SCROLLBAR) - // scrollbar-plain.C - int scrollbar_show_plain (int update, int last_top, int last_bot, int scrollbar_len); -#endif - - // scrollbar.C - void resize_scrollbar (); - int scrollbar_mapping (int map); - int scrollbar_show (int update); + bool selection_grab (Time tm, bool clipboard = false) noexcept; + void selection_start_colrow (int col, int row) noexcept; + void selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) noexcept; + void selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) noexcept; + void selection_remove_trailing_spaces () noexcept; + void selection_send (const XSelectionRequestEvent &rq) noexcept; + void selection_click (int clicks, int x, int y) noexcept; + void selection_extend (int x, int y, int flag) noexcept; + void selection_rotate (int x, int y) noexcept; // xdefaults.C - void get_options (int argc, const char *const *argv); - int parse_keysym (const char *str, const char *arg); + void rxvt_usage (int type); + const char **get_options (int argc, const char *const *argv); + int parse_keysym (const char *str, unsigned int &state); + int bind_action (const char *str, const char *arg); const char *x_resource (const char *name); void extract_resources (); + void enumerate_resources (void (*cb)(rxvt_term *, const char *, const char *), const char *name_p = 0, const char *class_p = 0); + void enumerate_keysym_resources (void (*cb)(rxvt_term *, const char *, const char *)) + { + enumerate_resources (cb, "keysym", "Keysym"); + } + void extract_keysym_resources (); }; #endif /* _RXVT_H_ */