--- rxvt-unicode/src/rxvt.h 2003/12/24 09:22:29 1.20 +++ rxvt-unicode/src/rxvt.h 2004/04/02 20:41:01 1.69 @@ -1,26 +1,23 @@ -/* - * $Id: rxvt.h,v 1.20 2003/12/24 09:22:29 pcg Exp $ - */ - -#ifndef _RXVT_H_ /* include once only */ -#define _RXVT_H_ +#ifndef RXVT_H_ /* include once only */ +#define RXVT_H_ #include "rxvtlib.h" #include "feature.h" +#include + #include #include #include #include +#include "encoding.h" #include "defaultfont.h" #include "rxvtcolor.h" #include "iom.h" #include "salloc.h" -#include - /* ***************************************************************************** * SYSTEM HACKS @@ -36,7 +33,6 @@ # define __sun__ #endif - #ifndef HAVE_XPOINTER typedef char *XPointer; #endif @@ -55,9 +51,6 @@ } ttymode_t; #endif -#ifdef GREEK_SUPPORT -# include "grkelot.h" -#endif #ifdef XPM_BACKGROUND # ifdef XPM_INC_X11 # include @@ -136,9 +129,9 @@ (swapittmp) = (one); (one) = (two); (two) = (swapittmp); \ } while (/* CONSTCOND */ 0) #define BOUND_POSITIVE_INT16(val) \ - (int16_t)((val) <= 0 \ + (int16_t) ((val) <= 0 \ ? 0 \ - : min((val), (((uint16_t)-1)>>1))) + : min ((val), (((uint16_t)-1)>>1))) /* ***************************************************************************** @@ -146,14 +139,6 @@ ***************************************************************************** */ -#if defined (NO_OLD_SELECTION) && defined(NO_NEW_SELECTION) -# error if you disable both selection styles, how can you select, silly? -#endif - -#define APL_CLASS "XTerm" /* class name */ -#define APL_SUBCLASS "Rxvt" /* also check resources under this name */ -#define APL_NAME "rxvt" /* normal name */ - /* COLORTERM, TERM environment variables */ #define COLORTERMENV "rxvt" #ifdef XPM_BACKGROUND @@ -162,7 +147,7 @@ # define COLORTERMENVFULL COLORTERMENV #endif #ifndef TERMENV -# define TERMENV "xterm" +# define TERMENV "rxvt" #endif #if defined (NO_MOUSE_REPORT) && !defined (NO_MOUSE_REPORT_SCROLLBAR) @@ -188,7 +173,7 @@ #define scrollBar_esc 30 #define menuBar_margin 2 /* margin below text */ -#if defined(RXVT_SCROLLBAR) || defined(NEXT_SCROLLBAR) || defined(XTERM_SCROLLBAR) +#if defined(RXVT_SCROLLBAR) || defined(NEXT_SCROLLBAR) || defined(XTERM_SCROLLBAR) || defined(PLAIN_SCROLLBAR) # define HAVE_SCROLLBARS #endif @@ -206,9 +191,11 @@ #define R_SB_RXVT 0 #define R_SB_NEXT 1 #define R_SB_XTERM 2 +#define R_SB_PLAIN 4 #define SB_WIDTH_NEXT 19 -#define SB_WIDTH_XTERM 7 +#define SB_WIDTH_XTERM 15 +#define SB_WIDTH_PLAIN 7 #ifndef SB_WIDTH_RXVT # define SB_WIDTH_RXVT 10 #endif @@ -245,7 +232,7 @@ * | +---------+ | * | | ......%%| | * | | ......%%| | - * | | ..()..%%| | + * | | .. ()..%%| | * | | ......%%| | * | | %%%%%%%%| | * | +---------+ | <......................... @@ -276,11 +263,13 @@ * +---< SB_WIDTH_NEXT */ -#define NO_REFRESH 0 /* Window not visible at all! */ -#define FAST_REFRESH (1<<0) /* Fully exposed window */ -#define SLOW_REFRESH (1<<1) /* Partially exposed window */ -#define SMOOTH_REFRESH (1<<2) /* Do sync'ing to make it smooth */ -#define REFRESH_BOUNDS (1<<3) +enum { + NO_REFRESH = 0 , /* Window not visible at all! */ + FAST_REFRESH = 1<<0, /* Fully exposed window */ + SLOW_REFRESH = 1<<1, /* Partially exposed window */ + SMOOTH_REFRESH = 1<<2, /* Do sync'ing to make it smooth */ + REFRESH_BOUNDS = 1<<3 +}; #ifdef NO_SECONDARY_SCREEN # define NSCREENS 0 @@ -297,36 +286,34 @@ #define FONT_DN "#-" #define FONT_UP "#+" -/* flags for rxvt_scr_gotorc() */ -#define C_RELATIVE 1 /* col movement is relative */ -#define R_RELATIVE 2 /* row movement is relative */ -#define RELATIVE (R_RELATIVE|C_RELATIVE) - -/* modes for rxvt_scr_insdel_chars(), rxvt_scr_insdel_lines() */ -#define INSERT -1 /* don't change these values */ -#define DELETE +1 -#define ERASE +2 +/* flags for rxvt_scr_gotorc () */ +enum { + C_RELATIVE = 1 , /* col movement is relative */ + R_RELATIVE = 2, /* row movement is relative */ + RELATIVE = 1 | 2, +}; + +/* modes for rxvt_scr_insdel_chars (), rxvt_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_scr_page () - scroll page. used by scrollbar window */ enum page_dirn { UP, DN, - NO_DIR + NO_DIR, }; -/* arguments for rxvt_scr_change_screen() */ +/* arguments for rxvt_scr_change_screen () */ enum { PRIMARY = 0, - SECONDARY -}; - -enum { - SBYTE = 0, - WBYTE + SECONDARY, }; - -#define RS_None 0 /* Normal */ +#define RS_None 0 /* Normal */ #define RS_fgMask 0x000001FFu /* 512 colors */ #define RS_bgMask 0x0003FE00u /* 512 colors */ @@ -335,14 +322,11 @@ #define RS_RVid 0x00100000u /* reverse video */ #define RS_Uline 0x00200000u /* underline */ -#define RS_wide 0x00400000u /* only multibyte characters */ -#define IS_WIDE(r) ((r) & RS_wide) - -#define RS_fontMask 0xff000000u /* plenty(?) of fonts */ -#define RS_fontShift 24 +#define RS_fontMask 0xffc00000u /* plenty(?) of fonts */ +#define RS_fontShift 22 #define RS_baseattrMask (RS_Bold|RS_Blink|RS_RVid|RS_Uline) -#define RS_attrMask (RS_baseattrMask|RS_fontMask|RS_wide) +#define RS_attrMask (RS_baseattrMask|RS_fontMask) #define Sel_none 0 /* Not waiting */ #define Sel_normal 0x01 /* normal selection */ @@ -352,14 +336,15 @@ #define Sel_Secondary 0x02 #define Sel_Clipboard 0x03 #define Sel_whereMask 0x0f -#define Sel_CompoundText 0x10 /* last request was Compound */ +#define Sel_CompoundText 0x10 /* last request was COMPOUND_TEXT */ +#define Sel_UTF8String 0x20 /* last request was UTF8_STRING */ enum { C0_NUL = 0x00, C0_SOH, C0_STX, C0_ETX, C0_EOT, C0_ENQ, C0_ACK, C0_BEL, C0_BS , C0_HT , C0_LF , C0_VT , C0_FF , C0_CR , C0_SO , C0_SI , C0_DLE, C0_DC1, C0_DC2, D0_DC3, C0_DC4, C0_NAK, C0_SYN, C0_ETB, - C0_CAN, C0_EM , C0_SUB, C0_ESC, C0_IS4, C0_IS3, C0_IS2, C0_IS1 + C0_CAN, C0_EM , C0_SUB, C0_ESC, C0_IS4, C0_IS3, C0_IS2, C0_IS1, }; #define CHAR_ST 0x9c /* 0234 */ @@ -367,26 +352,39 @@ * XTerm Operating System Commands: ESC ] Ps;Pt (ST|BEL) * colour extensions by Christian W. Zuckschwerdt */ -#define XTerm_name 0 -#define XTerm_iconName 1 -#define XTerm_title 2 -#define XTerm_Color 4 /* change colors */ -#define XTerm_Color_cursor 12 /* change actual 'Cursor' color */ -#define XTerm_Color_pointer 13 /* change actual 'Pointer' color */ -#define XTerm_Color_RV 17 /* change actual 'Highlight' color */ -#define XTerm_Color_BD 18 /* change actual 'Bold' color */ -#define XTerm_Color_UL 19 /* change actual 'Underline' color */ -#define XTerm_logfile 46 /* not implemented */ -#define XTerm_font 50 - -/* - * rxvt extensions of XTerm OSCs: ESC ] Ps;Pt (ST|BEL) - */ -#define XTerm_Menu 10 /* set menu item */ -#define XTerm_Pixmap 20 /* new bg pixmap */ -#define XTerm_restoreFG 39 /* change default fg color */ -#define XTerm_restoreBG 49 /* change default bg color */ -#define XTerm_dumpscreen 55 /* dump scrollback and all of screen */ +enum { + XTerm_name = 0, + XTerm_iconName = 1, + XTerm_title = 2, + XTerm_property = 3, // change X property + XTerm_Color = 4, // change colors + XTerm_Color00 = 10, // not implemented, CLASH! + XTerm_Color01 = 11, // not implemented + XTerm_Color_cursor = 12, // change actual 'Cursor' color + XTerm_Color_pointer_fg = 13, // change actual 'Pointer' color + XTerm_Color_pointer_bg = 14, // not implemented + XTerm_Color05 = 15, // not implemented + XTerm_Color06 = 16, // not implemented + XTerm_Color_RV = 17, // change actual 'Highlight' color + XTerm_logfile = 46, // not implemented + XTerm_font = 50, + + XTerm_konsole30 = 30, // reserved for konsole + XTerm_konsole31 = 31, // reserved for konsole + XTerm_emacs51 = 51, // reserved for emacs shell + /* + * rxvt extensions of XTerm OSCs: ESC ] Ps;Pt (ST|BEL) + */ + XTerm_Color_BD = 18, // change actual 'Bold' color + XTerm_Color_UL = 19, // change actual 'Underline' color + XTerm_Pixmap = 20, // new bg pixmap + XTerm_restoreFG = 39, // change default fg color + XTerm_restoreBG = 49, // change default bg color + XTerm_dumpscreen = 55, // dump scrollback and all of screen + XTerm_locale = 701, // change locale + XTerm_findfont = 702, // find font of given character (in decimal) + XTerm_Menu = 703, // set menu item +}; /* Words starting with `Color_' are colours. Others are counts */ /* @@ -432,7 +430,8 @@ Color_cursor, Color_cursor2, #endif - Color_pointer, + Color_pointer_fg, + Color_pointer_bg, Color_border, #ifndef NO_BOLD_UNDERLINE_REVERSE Color_BD, @@ -446,6 +445,9 @@ Color_scroll, Color_trough, #endif +#if TINTING + Color_tint, +#endif NRS_COLORS, /* */ #ifdef KEEP_SCROLLCOLOR Color_topShadow = NRS_COLORS, @@ -457,10 +459,10 @@ }; #define Color_Bits 9 -#define NPIXCLR_SETS 9 /* (256 + 14) bits / 32 bits */ +#define NPIXCLR_SETS ((TOTAL_COLORS + 31) / 32) #define NPIXCLR_BITS 32 -#define DEFAULT_RSTYLE (RS_None | (Color_fg) | (Color_bg<PrivateModes |= (bit); \ + PrivateModes |= (bit); \ else \ - R->PrivateModes &= ~(bit) + PrivateModes &= ~(bit) #ifdef ALLOW_132_MODE -# define PrivMode_Default \ -(PrivMode_Autowrap|PrivMode_aplKP|PrivMode_ShiftKeys|PrivMode_VisibleCursor|PrivMode_132OK) +# define PrivMode_Default (PrivMode_Autowrap|PrivMode_aplKP|PrivMode_ShiftKeys|PrivMode_VisibleCursor|PrivMode_132OK) #else -# define PrivMode_Default \ -(PrivMode_Autowrap|PrivMode_aplKP|PrivMode_ShiftKeys|PrivMode_VisibleCursor) +# define PrivMode_Default (PrivMode_Autowrap|PrivMode_aplKP|PrivMode_ShiftKeys|PrivMode_VisibleCursor) #endif -#ifdef PREFER_24BIT -# define XDEPTH R->Xdepth -# define XCMAP R->Xcmap -# define XVISUAL R->Xvisual -#else -# ifdef DEBUG_DEPTH -# define XDEPTH DEBUG_DEPTH -# else -# define XDEPTH DefaultDepth(R->Xdisplay,Xscreen) -# define XCMAP DefaultColormap(R->Xdisplay,Xscreen) -# define XVISUAL DefaultVisual(R->Xdisplay,Xscreen) -# endif -#endif -#define IMBUFSIZ 128 /* input modifier buffer sizes */ -#ifndef BUFSIZ -# define BUFSIZ 4096 +#define XDEPTH display->depth +#define XCMAP display->cmap +#define XVISUAL display->visual + +#define IMBUFSIZ 128 // input modifier buffer sizes +#define KBUFSZ 512 // size of keyboard mapping buffer +#define CBUFSIZ 4096 // size of command buffer +#define UBUFSIZ 4096 // character buffer + +#ifndef PATH_MAX +# define PATH_MAX 16384 #endif -#define KBUFSZ 512 /* size of keyboard mapping buffer */ /* ***************************************************************************** @@ -676,25 +660,22 @@ #define TermWin_TotalWidth() ((int32_t)TermWin.width + 2 * (int32_t)TermWin.int_bwidth) #define TermWin_TotalHeight() ((int32_t)TermWin.height + 2 * (int32_t)TermWin.int_bwidth) -#define Xscreen DefaultScreen(R->Xdisplay) -#define Xroot DefaultRootWindow(R->Xdisplay) - /* how to build & extract colors and attributes */ #define GET_BASEFG(x) (((x) & RS_fgMask)) #define GET_BASEBG(x) (((x) & RS_bgMask)>>Color_Bits) #ifndef NO_BRIGHTCOLOR # define GET_FGCOLOR(x) \ ((((x) & RS_Bold) == 0 \ - || GET_BASEFG(x) < minCOLOR \ - || GET_BASEFG(x) >= minBrightCOLOR) \ - ? GET_BASEFG(x) \ - : (GET_BASEFG(x) + (minBrightCOLOR - minCOLOR))) + || GET_BASEFG (x) < minCOLOR \ + || GET_BASEFG (x) >= minBrightCOLOR) \ + ? GET_BASEFG (x) \ + : (GET_BASEFG (x) + (minBrightCOLOR - minCOLOR))) # define GET_BGCOLOR(x) \ ((((x) & RS_Blink) == 0 \ - || GET_BASEBG(x) < minCOLOR \ - || GET_BASEBG(x) >= minBrightCOLOR) \ - ? GET_BASEBG(x) \ - : (GET_BASEBG(x) + (minBrightCOLOR - minCOLOR))) + || GET_BASEBG (x) < minCOLOR \ + || GET_BASEBG (x) >= minBrightCOLOR) \ + ? GET_BASEBG (x) \ + : (GET_BASEBG (x) + (minBrightCOLOR - minCOLOR))) #else # define GET_FGCOLOR(x) GET_BASEFG(x) # define GET_BGCOLOR(x) GET_BASEBG(x) @@ -712,44 +693,44 @@ #define SET_BGCOLOR(x,bg) (((x) & ~RS_bgMask) | ((bg)<pixcolor_set[(x) / NPIXCLR_BITS] |= (1 << ((x) % NPIXCLR_BITS))) -#define ISSET_PIXCOLOR(h, x) ((h)->pixcolor_set[(x) / NPIXCLR_BITS] & (1 << ((x) % NPIXCLR_BITS))) +#define SET_PIXCOLOR(x) (pixcolor_set[(x) / NPIXCLR_BITS] |= (1 << ((x) % NPIXCLR_BITS))) +#define ISSET_PIXCOLOR(x) (pixcolor_set[(x) / NPIXCLR_BITS] & (1 << ((x) % NPIXCLR_BITS))) #ifdef HAVE_SCROLLBARS # define scrollbar_TotalWidth() (scrollBar.width + sb_shadow * 2) #else # define scrollbar_TotalWidth() (0) #endif -#define scrollbar_isMotion() (R->scrollBar.state == 'm') -#define scrollbar_isUp() (R->scrollBar.state == 'U') -#define scrollbar_isDn() (R->scrollBar.state == 'D') -#define scrollbar_isUpDn() isupper (R->scrollBar.state) -#define isScrollbarWindow(w) (R->scrollBar.state && (w) == R->scrollBar.win) - -#define scrollbarnext_dnval() (R->scrollBar.end + (R->scrollBar.width + 1)) -#define scrollbarnext_upButton(y) ((y) > R->scrollBar.end \ - && (y) <= scrollbarnext_dnval()) +#define scrollbar_isMotion() (scrollBar.state == 'm') +#define scrollbar_isUp() (scrollBar.state == 'U') +#define scrollbar_isDn() (scrollBar.state == 'D') +#define scrollbar_isUpDn() isupper (scrollBar.state) +#define isScrollbarWindow(w) (scrollBar.state && (w) == scrollBar.win) + +#define scrollbarnext_dnval() (scrollBar.end + (scrollBar.width + 1)) +#define scrollbarnext_upButton(y) ((y) > scrollBar.end \ + && (y) <= scrollbarnext_dnval ()) #define scrollbarnext_dnButton(y) ((y) > scrollbarnext_dnval()) #define SCROLLNEXT_MINHEIGHT SB_THUMB_MIN_HEIGHT -#define scrollbarrxvt_upButton(y) ((y) < R->scrollBar.beg) -#define scrollbarrxvt_dnButton(y) ((y) > R->scrollBar.end) +#define scrollbarrxvt_upButton(y) ((y) < scrollBar.beg) +#define scrollbarrxvt_dnButton(y) ((y) > scrollBar.end) #define SCROLLRXVT_MINHEIGHT 10 #define SCROLLXTERM_MINHEIGHT 10 -#define scrollbar_minheight() (R->scrollBar.style == R_SB_NEXT \ +#define scrollbar_minheight() (scrollBar.style == R_SB_NEXT \ ? SCROLLNEXT_MINHEIGHT \ : SCROLLRXVT_MINHEIGHT) -#define scrollbar_above_slider(y) ((y) < R->scrollBar.top) -#define scrollbar_below_slider(y) ((y) > R->scrollBar.bot) -#define scrollbar_position(y) ((y) - R->scrollBar.beg) -#define scrollbar_size() (R->scrollBar.end - R->scrollBar.beg \ - - scrollbar_minheight()) +#define scrollbar_above_slider(y) ((y) < scrollBar.top) +#define scrollbar_below_slider(y) ((y) > scrollBar.bot) +#define scrollbar_position(y) ((y) - scrollBar.beg) +#define scrollbar_size() (scrollBar.end - scrollBar.beg \ + - scrollbar_minheight ()) #if (MENUBAR_MAX > 1) /* rendition style flags */ # define menuBar_height() (TermWin.fheight + SHADOW) # define menuBar_TotalHeight() (menuBar_height() + SHADOW + menuBar_margin) -# define isMenuBarWindow(w) ((w) == R->menuBar.win) +# define isMenuBarWindow(w) ((w) == menuBar.win) #else # define menuBar_height() (0) # define menuBar_TotalHeight() (0) @@ -823,6 +804,19 @@ # define D_X(x) #endif +extern class rxvt_failure_exception { } rxvt_failure_exception; + +typedef callback1 log_callback; + +extern void rxvt_vlog (const char *fmt, va_list arg_ptr); +extern void rxvt_log (const char *fmt, ...); +extern void rxvt_warn (const char *fmt, ...); +extern void rxvt_fatal (const char *fmt, ...) __attribute__ ((noreturn)); +extern void rxvt_exit_failure () __attribute__ ((noreturn)); + +#define SET_LOCALE(locale) rxvt_set_locale (locale) +extern bool rxvt_set_locale (const char *locale); + /* ***************************************************************************** * VARIABLES @@ -833,18 +827,68 @@ #endif #define BLINK_INTERVAL 0.5 +#define TEXT_BLINK_INTERVAL 0.5 +#ifndef __attribute__ +# ifdef __GNUC__ +# if (__GNUC__ == 2 && __GNUC_MINOR__ < 5) || (__GNUC__ < 2) +# define __attribute__(x) +# endif +# endif +# define __attribute__(x) +#endif + +// primivite wrapper around mbstate_t to ensure initialisation struct mbstate { mbstate_t mbs; - mbstate () + operator mbstate_t *() { return &mbs; } + void reset () { MEMSET (&mbs, 0, sizeof (mbs)); } + mbstate () { reset (); } +}; + +#if UNICODE3 +# define COMPOSE_LO 0x40000000UL +# define COMPOSE_HI 0x400fffffUL +# define IS_COMPOSE(n) ((int32_t)(n) >= COMPOSE_LO) +#else +# define COMPOSE_LO 0xd800UL +# define COMPOSE_HI 0xf8ffUL // dfff should be safer, but... +# define IS_COMPOSE(n) (COMPOSE_LO <= (n) && (n) <= COMPOSE_HI) +#endif + +#if ENABLE_COMBINING +// 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 { + 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 { + vector v; +public: + text_t compose (unicode_t c1, unicode_t c2 = NOCHAR); + int expand (unicode_t c, wchar_t *r); + compose_char *operator [](text_t c) { - MEMSET (&mbs, 0, sizeof (mbs)); + return c >= COMPOSE_LO && c < COMPOSE_LO + v.size () + ? &v[c - COMPOSE_LO] + : 0; } }; +extern class rxvt_composite_vec rxvt_composite; +#endif + + struct rxvt_term : rxvt_vars { - struct mbstate mbstate; + log_callback *log_hook; // log error messages through this hook, if != 0 + + struct mbstate mbstate; // current input multibyte state unsigned char want_refresh:1, #ifdef TRANSPARENT @@ -861,12 +905,15 @@ #ifdef CURSOR_BLINK hidden_cursor:1, #endif +#ifdef TEXT_BLINK + hidden_text:1, +#endif #ifdef POINTER_BLANK hidden_pointer:1, #endif parsed_geometry:1, - seen_input:1, /* wether any input has been seen so far */ - enc_utf8:1; /* wether terminal reads/writes utf-8 */ +// enc_utf8:1, /* wether terminal reads/writes utf-8 */ + seen_input:1; /* wether any input has been seen so far */ unsigned char refresh_type, #ifdef UTMP_SUPPORT @@ -876,22 +923,16 @@ next_tty_action, #endif #ifdef META8_OPTION - meta_char, /* Alt-key prefix */ + meta_char, /* Alt-key prefix */ #endif scrollbar_align, selection_wait, selection_type; /* ---------- */ -#ifdef GREEK_SUPPORT - short greek_mode; /* greek keyboard mode */ -#endif short rvideo; - int16_t num_scr; /* screen: number lines scrolled */ - unsigned int prev_ncol, /* screen: previous number of columns */ - prev_nrow; /* screen: previous number of rows */ -#ifdef RXVT_GRAPHICS - uint16_t gr_prev_start; -#endif + int16_t num_scr; /* screen: number lines scrolled */ + unsigned int prev_ncol, /* screen: previous number of columns */ + prev_nrow; /* screen: previous number of rows */ /* ---------- */ rend_t rstyle; /* ---------- */ @@ -923,7 +964,6 @@ last_top, /* scrollbar last top position */ last_state, /* scrollbar last state */ scrollbar_len, - currmaxcol, #ifdef MENUBAR menu_readonly, /* okay to alter menu? */ Arrows_x, @@ -950,10 +990,6 @@ unsigned long PrivateModes, SavedModes; /* ---------- */ -#ifdef PREFER_24BIT - Visual *Xvisual; -#endif -/* ---------- */ Atom xa[NUM_XA]; /* ---------- */ #ifdef MENUBAR @@ -968,6 +1004,9 @@ GC xscrollbarGC, ShadowGC; #endif +#ifdef PLAIN_SCROLLBAR + GC pscrollbarGC; +#endif #ifdef NEXT_SCROLLBAR GC blackGC, whiteGC, @@ -1002,23 +1041,14 @@ #ifndef NO_DELETE_KEY const char *key_delete; #endif -#if defined (HOTKEY_CTRL) || defined (HOTKEY_META) - KeySym ks_bigfont, ks_smallfont; -#endif -#ifdef GREEK_SUPPORT - KeySym ks_greekmodeswith; -#endif #ifdef USE_XIM + rxvt_xim *input_method; XIC Input_Context; XIMStyle input_style; int event_type; #endif struct mouse_event MEvent; XComposeStatus compose; -#ifdef RXVT_GRAPHICS - int graphics_up; - struct grwin_t *gr_root; -#endif ttymode_t tio; #ifdef UTMP_SUPPORT # ifdef HAVE_STRUCT_UTMP @@ -1037,10 +1067,6 @@ bgPixmap_t bgPixmap; XpmAttributes xpmAttr; /* originally loaded pixmap and its scaling */ #endif -#ifdef MULTICHAR_SET - int oldcursormulti; - void (*multichar_decode)(unsigned char *str, int len); -#endif #ifndef RESET_TTY_TO_COMMON_DEFAULTS struct stat ttyfd_stat; /* original status of our tty */ #endif @@ -1048,13 +1074,10 @@ menu_t *ActiveMenu, /* currently active menu */ *BuildMenu; /* the menu currently being built */ bar_t *CurrentBar; -# if !(MENUBAR_MAX > 1) +# if ! (MENUBAR_MAX > 1) bar_t BarList; # endif /* (MENUBAR_MAX > 1) */ #endif -#ifdef RXVT_GRAPHICS - Window gr_last_id; -#endif #ifdef CURSOR_BLINK struct timeval lastcursorchange; #endif @@ -1062,43 +1085,62 @@ struct timeval lastmotion; #endif -/* these three don't need to be kept but do so to placate some mem checkers */ + vector allocated; // free these memory blocks with free() + char *env_windowid; /* environmental variable WINDOWID */ char *env_display; /* environmental variable DISPLAY */ char *env_term; /* environmental variable TERM */ char *env_colorfgbg; - char *buffer; char *locale; +#if 0 char *codeset; +#endif char charsets[4]; - unsigned char *v_buffer; /* pointer to physical buffer */ - unsigned int v_buflen; /* size of area to write */ - char *newfont[MAX_NFONTS]; + unsigned char *v_buffer; /* pointer to physical buffer */ + unsigned int v_buflen; /* size of area to write */ + stringvec *argv, *envv; /* if != 0, will be freed on destroy time */ #ifdef KEYSYM_RESOURCE const unsigned char *Keysym_map[256]; #endif const char *rs[NUM_RESOURCES]; -/* command input buffering */ + /* command input buffering */ unsigned char *cmdbuf_ptr, *cmdbuf_endp; - unsigned char cmdbuf_base[BUFSIZ]; + unsigned char cmdbuf_base[CBUFSIZ]; - rxvt_salloc *ralloc; - rxvt_salloc *talloc; + rxvt_salloc *talloc; // text line allocator + rxvt_salloc *ralloc; // rend line allocator + + static vector termlist; // a vector of all running rxvt_term's void paste (const unsigned char *data, unsigned int len); void flush (); + void rootwin_cb (XEvent &xev); + xevent_watcher rootwin_ev; + + void x_cb (XEvent &xev); + xevent_watcher termwin_ev; + xevent_watcher vt_ev; +#ifdef HAVE_SCROLLBARS + xevent_watcher scrollbar_ev; +#endif +#ifdef MENUBAR + xevent_watcher menubar_ev; +#endif + void check_cb (check_watcher &w); check_watcher check_ev; void destroy_cb (time_watcher &w); time_watcher destroy_ev; void pty_cb (io_watcher &w, short revents); io_watcher pty_ev; - void x_cb (io_watcher &w, short revents); io_watcher x_ev; void incr_cb (time_watcher &w); time_watcher incr_ev; #ifdef CURSOR_BLINK - void blink_cb (time_watcher &w); time_watcher blink_ev; + void cursor_blink_cb (time_watcher &w); time_watcher cursor_blink_ev; +#endif +#ifdef TEXT_BLINK + void text_blink_cb (time_watcher &w); time_watcher text_blink_ev; #endif #ifdef POINTER_BLANK @@ -1119,10 +1161,9 @@ bool init (int argc, const char *const *argv); bool init_vars (); - uint32_t next_char (); + unicode_t next_char (); bool pty_fill (); - void process_x_events (); void *operator new (size_t s); void operator delete (void *p, size_t s); @@ -1135,18 +1176,26 @@ void init_command (const char *const *argv); int run_command (const char *const *argv); int run_child (const char *const *argv); + static void child_exited (int pid); - void color_aliases(int idx); + void color_aliases (int idx); void recolour_cursor (); void create_windows (int argc, const char *const *argv); void resize_all_windows (unsigned int width, unsigned int height, int ignoreparent); void window_calc (unsigned int width, unsigned int height); - void set_preedit_area (XRectangle * preedit_rect, XRectangle * status_rect, XRectangle * needed_rect); #if USE_XIM - void set_size (XRectangle *size); - void set_position (XPoint *pos); - void set_color (unsigned long *fg, unsigned long *bg); + void im_destroy (); + void im_cb (); im_watcher im_ev; + void im_set_size (XRectangle *size); + void im_set_position (XPoint *pos); + void im_set_color (unsigned long *fg, unsigned long *bg); + void im_set_preedit_area (XRectangle * preedit_rect, XRectangle * status_rect, XRectangle * needed_rect); + + bool IMisRunning (); + void IMSendSpot (); + bool IM_get_IC (const char *modifiers); + void IMSetStatusPosition (); #endif void resize_scrollbar (); @@ -1157,31 +1206,191 @@ void selection_extend (int x, int y, int flag); void selection_rotate (int x, int y); - /* screen(!) */ + /* screen (!) */ void scr_blank_line (text_t *et, rend_t *er, unsigned int width, rend_t efs); void scr_blank_screen_mem (text_t **tp, rend_t **rp, unsigned int row, rend_t efs); int scr_scroll_text (int row1, int row2, int count, int spec); void scr_reset (); void scr_reset_realloc (); void scr_release (); - void scr_clear (); + void scr_clear (bool really = true); void scr_refresh (unsigned char refresh_type); + bool scr_refresh_rend (rend_t mask, rend_t value); void scr_erase_screen (int mode); void scr_touch (bool refresh); void scr_expose (int x, int y, int width, int height, bool refresh); -}; + void scr_remap_chars (); + void scr_remap_chars (text_t *tp, rend_t *rp); -#define SET_LOCALE(locale) rxvt_set_locale (locale) -extern void rxvt_set_locale (const char *locale); + /* autoconvert */ -#ifndef __attribute__ -# ifdef __GNUC__ -# if (__GNUC__ == 2 && __GNUC_MINOR__ < 5) || (__GNUC__ < 2) -# define __attribute__(x) -# endif -# endif -# define __attribute__(x) + // command.C + void lookup_key (XKeyEvent &ev); + unsigned int cmd_write (const unsigned char *str, unsigned int count); + unicode_t cmd_getc (); + bool cmd_parse (); + void mouse_report (XButtonEvent &ev); + void button_press (XButtonEvent &ev); + void button_release (XButtonEvent &ev); + int check_our_parents (); +#ifdef PRINTPIPE + FILE *popen_printer (); + int pclose_printer (FILE *stream); #endif + void process_print_pipe (); + void process_nonprinting (unicode_t ch); + void process_escape_vt52 (unicode_t ch); + void process_escape_seq (); + void process_csi_seq (); + void process_window_ops (const int *args, unsigned int nargs); + unsigned char *get_to_st (unicode_t &ends_how); + void process_dcs_seq (); + void process_osc_seq (); + void process_color_seq (int report, int color, const char *str, unsigned char resp); + void process_xterm_seq (int op, const char *str, unsigned char resp); + 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 (); + // init.C + void Get_Colours (); + void get_ourmods (); + // logging.C + void makeutent (const char *pty, const char *hostname); + void cleanutent (); + // main.C; + void privileges (int mode); + void privileged_utmp (char action); + void privileged_ttydev (char action); + bool change_font (const char *fontname); + bool font_up_down (int n, int direction); + 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 (); + int rXParseAllocColor (rxvt_color * screen_in_out, const char *colour); + void set_widthheight (unsigned int width, unsigned int height); + +#ifdef MENUBAR + // menubar.C + void menuitem_free (menu_t *menu, menuitem_t *item); + int action_dispatch (action_t *action); + void menuarrow_free (char name); + void menuarrow_add (char *string); + char *menu_find_base (menu_t **menu, char *path); + menu_t *menu_delete (menu_t *menu); + menu_t *menu_add (menu_t *parent, char *path); + void drawbox_menubar (int x, int len, int state); + void drawtriangle (int x, int y, int state); + void drawbox_menuitem (int y, int state); + void menu_show (); + void menu_display (void (rxvt_term::*update) ()); + void menu_hide_all (); + void menu_hide (); + void menu_clear (menu_t *menu); + void menubar_clear (); + bar_t *menubar_find (const char *name); + int menubar_push (const char *name); + void menubar_remove (const char *name); + void menubar_dump (FILE *fp); + void menubar_read (const char *filename); + void menubar_dispatch (char *str); + void draw_Arrows (int name, int state); + void menubar_expose (); + int menubar_mapping (int map); + int menu_select (XButtonEvent &ev); + void menubar_select (XButtonEvent &ev); + void menubar_control (XButtonEvent &ev); + void map_menuBar (int map); +#endif + + // screen.C + void scr_poweron (); + void scr_cursor (int mode); + int scr_change_screen (int scrn); + void scr_color (unsigned int color, int fgbg); + void scr_rendition (int set, int style); + void scr_add_lines (const unicode_t *str, int nlines, int len); + void scr_backspace (); + void scr_tab (int count); + void scr_backindex (); + void scr_forwardindex (); + void scr_gotorc (int row, int col, int relative); + void scr_index (enum page_dirn direction); + void scr_erase_line (int mode); + void scr_E (); + void scr_insdel_lines (int count, int insdel); + void scr_insdel_chars (int count, int insdel); + void scr_scroll_region (int top, int bot); + void scr_cursor_visible (int mode); + void scr_autowrap (int mode); + void scr_relative_origin (int mode); + void scr_insert_mode (int mode); + void scr_set_tab (int mode); + void scr_rvideo_mode (int mode); + void scr_report_position (); + void set_font_style (); + void scr_charset_choose (int set); + void scr_charset_set (int set, unsigned int ch); + int scr_move_to (int y, int len); + int scr_page (enum page_dirn direction, int nlines); + int scr_changeview (uint16_t oldviewstart); + void scr_bell (); + void scr_printscreen (int fullhist); + void scr_reverse_selection (); + void scr_dump (int fd); + void selection_check (int check_more); + int selection_paste (Window win, Atom prop, bool delete_prop); + void selection_property (Window win, Atom prop); + void selection_request (Time tm, int x, int y); + int selection_request_other (Atom target, int selnum); + void selection_clear (); + void selection_make (Time tm); + void selection_start_colrow (int col, int row); + void selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret); + void selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange); + void selection_remove_trailing_spaces (); + void selection_send (const XSelectionRequestEvent &rq); + +#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 + void Draw_button (int x, int y, int state, int dirn); + 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 + int scrollbar_mapping (int map); + int scrollbar_show (int update); + void setup_scrollbar (const char *scrollalign, const char *scrollstyle, const char *thickness); + + // xdefaults.C + void get_options (int argc, const char *const *argv); + int parse_keysym (const char *str, const char *arg); + void get_xdefaults (FILE *stream, const char *name); + void extract_resources (Display *display, const char *name); + // xpm.C + int scale_pixmap (const char *geom); + void resize_pixmap (); + Pixmap set_bgPixmap (const char *file); +}; /* *****************************************************************************