--- rxvt-unicode/src/rxvt.h 2006/01/17 09:24:53 1.214 +++ rxvt-unicode/src/rxvt.h 2007/10/28 11:25:04 1.315 @@ -10,14 +10,16 @@ #endif #if ENABLE_PERL -# define ENABLE_FRILLS 1 +# define ENABLE_FRILLS 1 # define ENABLE_COMBINING 1 #endif #if ENABLE_FRILLS -# define ENABLE_XEMBED 1 -# define ENABLE_EWMH 1 -# define CURSOR_BLINK 1 +# define ENABLE_XEMBED 1 +# define ENABLE_EWMH 1 +# define ENABLE_XIM_ONTHESPOT 1 +# define CURSOR_BLINK 1 +# define OPTION_HC 1 #else # define ENABLE_MINIMAL 1 #endif @@ -33,13 +35,14 @@ #endif #include "encoding.h" +#include "rxvtutil.h" #include "rxvtfont.h" #include "rxvttoolkit.h" #include "iom.h" #include "salloc.h" +#include "libptytty.h" #include "rxvtperl.h" -#include "logging.h" // try to avoid some macros to decrease code size, on some systems #if ENABLE_MINIMAL @@ -69,27 +72,10 @@ typedef char *XPointer; #endif -#ifdef HAVE_TERMIOS_H -# include +#include typedef struct termios ttymode_t; -#else -# include -typedef struct { - struct sgttyb sg; - struct tchars tc; - struct ltchars lc; - int line; - int local; -} ttymode_t; -#endif -#ifdef XPM_BACKGROUND -# ifdef XPM_INC_X11 -# include -# else -# include -# endif -#endif +#include "background.h" #ifndef STDIN_FILENO # define STDIN_FILENO 0 @@ -97,42 +83,40 @@ # define STDERR_FILENO 2 #endif +/****************************************************************************/ + +// exception thrown on fatal (per-instance) errors +class rxvt_failure_exception { }; + +// exception thrown when the command parser runs out of input data +class out_of_input { }; + /* ***************************************************************************** * PROTOTYPES ***************************************************************************** */ // main.C -RETSIGTYPE rxvt_Child_signal (int sig); -RETSIGTYPE rxvt_Exit_signal (int sig); -void rxvt_clean_exit (); void * rxvt_malloc (size_t size); void * rxvt_calloc (size_t number, size_t size); void * rxvt_realloc (void *ptr, size_t size); -void rxvt_privileges (rxvt_privaction action); -// util.C +// misc.C char * rxvt_wcstombs (const wchar_t *str, int len = -1); wchar_t * rxvt_mbstowcs (const char *str, int len = -1); char * rxvt_wcstoutf8 (const wchar_t *str, int len = -1); wchar_t * rxvt_utf8towcs (const char *str, int len = -1); -char * rxvt_strdup (const char *str); -// misc.C -char * rxvt_r_basename (const char *str); -void rxvt_vlog (const char *fmt, va_list arg_ptr); -void rxvt_log (const char *fmt,...); -void rxvt_warn (const char *fmt,...); -void rxvt_fatal (const char *fmt,...); -void rxvt_exit_failure (); -int rxvt_Str_match (const char *s1, const char *s2); -const char * rxvt_Str_skip_space (const char *str); -char * rxvt_Str_trim (char *str); -int rxvt_Str_escaped (char *str); -char ** rxvt_splitcommastring (const char *cs); -void rxvt_freecommastring (char **cs); -char * rxvt_File_find (const char *file, const char *ext, const char *path); -void rxvt_usleep (int usecs); +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; ///////////////////////////////////////////////////////////////////////////// @@ -140,15 +124,23 @@ extern char **environ; extern char **rxvt_environ; // the original environ pointer -inline void set_environ (stringvec *envv) +static inline void set_environ (stringvec *envv) { +#if ENABLE_PERL + assert (envv); +#else if (envv) +#endif environ = (char **)envv->begin (); } -inline void set_environ (char **envv) +static inline void set_environ (char **envv) { +#if ENABLE_PERL + assert (envv); +#else if (envv) +#endif environ = envv; } @@ -168,13 +160,6 @@ # undef KEEP_SCROLLCOLOR #endif -#ifdef XPM_BACKGROUND -typedef struct { - short w, h, x, y; - Pixmap pixmap; -} bgPixmap_t; -#endif - /* * the 'essential' information for reporting Mouse Events * pared down from XButtonEvent @@ -229,7 +214,7 @@ /* COLORTERM, TERM environment variables */ #define COLORTERMENV "rxvt" -#ifdef XPM_BACKGROUND +#ifdef BG_IMAGE_FROM_FILE # define COLORTERMENVFULL COLORTERMENV "-xpm" #else # define COLORTERMENVFULL COLORTERMENV @@ -396,6 +381,9 @@ #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 @@ -474,6 +462,7 @@ 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 @@ -499,6 +488,8 @@ */ enum colour_list { + Color_none = -2, + Color_transparent = -1, Color_fg = 0, Color_bg, minCOLOR, /* 2 */ @@ -550,7 +541,7 @@ Color_scroll, Color_trough, #endif -#if TINTING +#if ENABLE_TRANSPARENCY Color_tint, #endif #if OFF_FOCUS_FADING @@ -568,9 +559,6 @@ #define Color_Bits 7 // 0 .. maxTermCOLOR -#define NPIXCLR_SETS ((TOTAL_COLORS + 31) / 32) -#define NPIXCLR_BITS 32 - /* * Resource list */ @@ -583,46 +571,6 @@ NUM_RESOURCES }; -// see init.C:xa_names, which must be kept in sync -enum { - XA_TEXT = 0, - XA_COMPOUND_TEXT, - XA_UTF8_STRING, - XA_MULTIPLE, - XA_TARGETS, - XA_TIMESTAMP, - XA_VT_SELECTION, - XA_INCR, - XA_WM_PROTOCOLS, - XA_WM_DELETE_WINDOW, - XA_CLIPBOARD, -#if ENABLE_FRILLS - XA_MOTIF_WM_HINTS, -#endif -#if ENABLE_EWMH - XA_NET_WM_PID, - XA_NET_WM_NAME, - XA_NET_WM_ICON_NAME, - XA_NET_WM_PING, -#endif -#if USE_XIM - XA_WM_LOCALE_NAME, -#endif -#if TRANSPARENT - XA_XROOTPMAP_ID, - XA_ESETROOT_PMAP_ID, -#endif -#if OFFIX_DND /* OffiX Dnd (drag 'n' drop) support */ - XA_DNDPROTOCOL, - XA_DNDSELECTION, -#endif -#if ENABLE_XEMBED - XA_XEMBED, - XA_XEMBED_INFO, -#endif - NUM_XA -}; - /* DEC private modes */ #define PrivMode_132 (1UL<<0) #define PrivMode_132OK (1UL<<1) @@ -644,15 +592,12 @@ #define PrivMode_smoothScroll (1UL<<17) #define PrivMode_vt52 (1UL<<18) #define PrivMode_LFNL (1UL<<19) +#define PrivMode_MouseBtnEvent (1UL<<20) +#define PrivMode_MouseAnyEvent (1UL<<21) /* too annoying to implement X11 highlight tracking */ /* #define PrivMode_MouseX11Track (1LU<<20) */ -#define PrivMode_mouse_report (PrivMode_MouseX10|PrivMode_MouseX11) -#define PrivMode(test,bit) \ - if (test) \ - priv_modes |= (bit); \ - else \ - priv_modes &= ~(bit) +#define PrivMode_mouse_report (PrivMode_MouseX10|PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent) #ifdef ALLOW_132_MODE # define PrivMode_Default (PrivMode_Autowrap|PrivMode_ShiftKeys|PrivMode_VisibleCursor|PrivMode_132OK) @@ -703,7 +648,10 @@ ***************************************************************************** */ #define dLocal(type,name) type const name = this->name -#define dDisp Display *disp = this->display->display + +// for speed reasons, we assume that all codepoints 32 to 126 are +// single-width. +#define WCWIDTH(c) (IN_RANGE_INC (c, 0x20, 0x7e) ? 1 : wcwidth (c)) /* convert pixel dimensions to row/column values. Everything as int32_t */ #define Pixel2Col(x) Pixel2Width((int32_t)(x)) @@ -715,11 +663,6 @@ #define Width2Pixel(n) ((int32_t)(n) * (int32_t)fwidth) #define Height2Pixel(n) ((int32_t)(n) * (int32_t)fheight) -#define OPTION(opt) (options & (opt)) -#define DEFAULT_OPTIONS (Opt_scrollBar | Opt_scrollTtyOutput \ - | Opt_jumpScroll | Opt_secondaryScreen \ - | Opt_pastableTabs | Opt_intensityStyles) - // for m >= -n, ensure remainder lies between 0..n-1 #define MOD(m,n) (((m) + (n)) % (n)) @@ -747,8 +690,8 @@ #define RS_SAME(a,b) (!(((a) ^ (b)) & ~RS_Careful)) -#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))) +#define PIXCOLOR_NAME(idx) rs[Rs_color + (idx)] +#define ISSET_PIXCOLOR(idx) (!!rs[Rs_color + (idx)]) #if ENABLE_STYLES # define FONTSET(style) fontset[GET_STYLE (style)] @@ -786,68 +729,21 @@ #define scrollbar_size() (scrollBar.end - scrollBar.beg \ - scrollbar_minheight ()) -#ifdef XPM_BACKGROUND -# define XPMClearArea(a, b, c, d, e, f, g) XClearArea((a), (b), (c), (d), (e), (f), (g)) -#else -# define XPMClearArea(a, b, c, d, e, f, g) -#endif - -#ifdef DEBUG_CMD -# define D_CMD(x) fprintf x ; fputc('\n', stderr) -#else -# define D_CMD(x) -#endif -#ifdef DEBUG_INIT -# define D_INIT(x) fprintf x ; fputc('\n', stderr) -#else -# define D_INIT(x) -#endif -#ifdef DEBUG_MAIN -# define D_MAIN(x) fprintf x ; fputc('\n', stderr) -#else -# define D_MAIN(x) -#endif -#ifdef DEBUG_SIZE -# define D_SIZE(x) fprintf x ; fputc('\n', stderr) -#else -# define D_SIZE(x) -#endif - -extern class rxvt_failure_exception { } rxvt_failure_exception; - -typedef callback1 log_callback; -typedef callback1 getfd_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)); +typedef callback log_callback; +typedef callback getfd_callback; #define SET_LOCALE(locale) rxvt_set_locale (locale) -extern bool rxvt_set_locale (const char *locale); -extern void rxvt_push_locale (const char *locale); -extern void rxvt_pop_locale (); - -/****************************************************************************/ - -#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 +extern bool rxvt_set_locale (const char *locale) NOTHROW; +extern void rxvt_push_locale (const char *locale) NOTHROW; +extern void rxvt_pop_locale () NOTHROW; /****************************************************************************/ #define LINE_LONGER 0x0001 // line is continued on the next row #define LINE_FILTERED 0x0002 // line has been filtered #define LINE_COMPRESSED 0x0004 // line has been compressed (NYI) +#define LINE_FILTER 0x0008 // line needs to be filtered before display (NYI) +#define LINE_BIDI 0x0010 // line needs bidi (NYI) struct line_t { text_t *t; // terminal the text @@ -911,7 +807,7 @@ # define IS_COMPOSE(n) ((int32_t)(n) >= COMPOSE_LO) #else # if ENABLE_PERL -# define COMPOSE_LO 0xe000UL // our _own_ routiens don't like (illegal) surrogates +# define COMPOSE_LO 0xe000UL // our _own_ functions don't like (illegal) surrogates # define COMPOSE_HI 0xf8ffUL // in utf-8, so use private use area only # else # define COMPOSE_LO 0xd800UL @@ -950,11 +846,17 @@ /****************************************************************************/ #ifdef KEYSYM_RESOURCE - class keyboard_manager; +class keyboard_manager; #endif -struct rxvt_term : zero_initialized, rxvt_vars { - log_callback *log_hook; // log error messages through this hook, if != 0 +struct rxvt_term : zero_initialized, rxvt_vars, rxvt_screen { + + // special markers with magic addresses + static const char resval_undef []; // options specifically unset + static const char resval_on []; // boolean options switched on + static const char resval_off []; // or off + + log_callback *log_hook; // log error messages through this hook, if != 0 getfd_callback *getfd_hook; // convert remote to local fd, if != 0 #if ENABLE_PERL rxvt_perl_term perl; @@ -962,15 +864,7 @@ struct mbstate mbstate; // current input multibyte state unsigned char want_refresh:1, -#ifdef TRANSPARENT - want_full_refresh:1, /* awaiting full screen refresh */ -#endif -#if defined(XPM_BACKGROUND) || defined(TRANSPARENT) - am_transparent:1, /* is a transparent term */ - am_pixmap_trans:1, /* transparency w/known root pixmap */ -#endif current_screen:1, /* primary or secondary */ - hate_those_clicks:1, /* a.k.a. keep mark position */ num_scr_allow:1, bypass_keystate:1, #ifdef CURSOR_BLINK @@ -995,15 +889,16 @@ selection_wait, selection_type; /* ---------- */ - short rvideo; + bool rvideo_state, rvideo_mode; +#ifndef NO_BELL + bool rvideo_bell; +#endif int num_scr; /* screen: number lines scrolled */ int prev_ncol, /* screen: previous number of columns */ prev_nrow; /* screen: previous number of rows */ /* ---------- */ rend_t rstyle; /* ---------- */ - uint32_t pixcolor_set[NPIXCLR_SETS]; -/* ---------- */ #ifdef SELECTION_SCROLLING int scroll_selection_lines; enum page_dirn scroll_selection_dir; @@ -1018,7 +913,6 @@ mouse_slip_wheel_speed, #endif refresh_count, - refresh_limit, last_bot, /* scrollbar last bottom position */ last_top, /* scrollbar last top position */ last_state, /* scrollbar last state */ @@ -1026,6 +920,8 @@ window_vt_x, window_vt_y, window_sb_x, + mouse_row, + mouse_col, # ifdef POINTER_BLANK pointerBlankDelay, # endif @@ -1039,7 +935,7 @@ unsigned long priv_modes, SavedModes; /* ---------- */ - Atom xa[NUM_XA]; + Atom *xa; /* ---------- */ #ifdef RXVT_SCROLLBAR GC scrollbarGC, @@ -1074,19 +970,16 @@ /* ---------- */ Cursor leftptr_cursor; /* ---------- */ -#ifndef NO_BACKSPACE_KEY - const char *key_backspace; -#endif -#ifndef NO_DELETE_KEY - const char *key_delete; -#endif struct mouse_event MEvent; XComposeStatus compose; ttymode_t tio; row_col_t oldcursor; -#ifdef XPM_BACKGROUND +#ifdef HAVE_BG_PIXMAP bgPixmap_t bgPixmap; - XpmAttributes xpmAttr; /* originally loaded pixmap and its scaling */ +#endif +#ifdef HAVE_AFTERIMAGE + ASVisual *asv; + ASImageManager *asimman; #endif #if ENABLE_OVERLAY @@ -1094,27 +987,28 @@ text_t **ov_text; rend_t **ov_rend; - void scr_swap_overlay (); - void scr_overlay_new (int x, int y, int w, int h); - void scr_overlay_off (); + void scr_swap_overlay () NOTHROW; + void scr_overlay_new (int x, int y, int w, int h) NOTHROW; + void scr_overlay_off () NOTHROW; void scr_overlay_set (int x, int y, text_t text, - rend_t rend = OVERLAY_RSTYLE); - void scr_overlay_set (int x, int y, const char *s); - void scr_overlay_set (int x, int y, const wchar_t *s); + 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; #endif vector allocated; // free these memory blocks with free() - char *env_windowid; /* environmental variable WINDOWID */ + 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 */ - char *env_colorfgbg; + 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 on destroy time */ + stringvec *argv, *envv; /* if != 0, will be freed at destroy time */ #ifdef KEYSYM_RESOURCE keyboard_manager *keyboard; @@ -1125,8 +1019,7 @@ char *cmdbuf_ptr, *cmdbuf_endp; char cmdbuf_base[CBUFSIZ]; - rxvt_ptytty pty; - rxvt_session session; + ptytty *pty; rxvt_salloc *talloc; // text line allocator rxvt_salloc *ralloc; // rend line allocator @@ -1144,36 +1037,38 @@ # endif #endif - // modifies first argument(!) - void paste (char *data, unsigned int len); - - long vt_emask, vt_emask_perl; + long vt_emask, vt_emask_perl, vt_emask_xim, vt_emask_mouse; - void vt_select_input () const + void vt_select_input () const NOTHROW { - XSelectInput (display->display, vt, vt_emask | vt_emask_perl); + XSelectInput (dpy, vt, vt_emask | vt_emask_perl | vt_emask_xim | vt_emask_mouse); } -#if TRANSPARENT +#if ENABLE_TRANSPARENCY || ENABLE_PERL void rootwin_cb (XEvent &xev); xevent_watcher rootwin_ev; #endif +#ifdef HAVE_BG_PIXMAP + int update_background (); + void update_background_cb (time_watcher &w); + time_watcher update_background_ev; +#endif void x_cb (XEvent &xev); - void flush (); xevent_watcher termwin_ev; xevent_watcher vt_ev; #ifdef HAVE_SCROLLBARS xevent_watcher scrollbar_ev; #endif + void child_cb (child_watcher &w, int status); child_watcher child_ev; void check_cb (check_watcher &w); check_watcher check_ev; void destroy_cb (time_watcher &w); time_watcher destroy_ev; + void flush (); void flush_cb (time_watcher &w); time_watcher flush_ev; - + bool pty_fill (); void pty_cb (io_watcher &w, short revents); io_watcher pty_ev; - - void incr_cb (time_watcher &w); time_watcher incr_ev; + void incr_cb (time_watcher &w) NOTHROW; time_watcher incr_ev; #ifdef CURSOR_BLINK void cursor_blink_cb (time_watcher &w); time_watcher cursor_blink_ev; @@ -1181,6 +1076,9 @@ #ifdef TEXT_BLINK void text_blink_cb (time_watcher &w); time_watcher text_blink_ev; #endif +#ifndef NO_BELL + void bell_cb (time_watcher &w); time_watcher bell_ev; +#endif #ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING void cont_scroll_cb (time_watcher &w); time_watcher cont_scroll_ev; @@ -1202,79 +1100,47 @@ void tt_write (const char *data, unsigned int len); void pty_write (); - void tt_winch (); - - rxvt_term (); - ~rxvt_term (); - void child_exit (); // child has exited, usually destroys - void destroy (); - void emergency_cleanup (); - - bool init (int argc, const char *const *argv); - bool init_vars (); - - bool pty_fill (); + bool init (stringvec *argv, stringvec *envv) + { + this->argv = argv; + return init (argv->size (), argv->begin (), envv); + } void make_current () const // make this the "currently active" urxvt instance { SET_R (this); - rxvt_set_locale (locale); set_environ (envv); + rxvt_set_locale (locale); } - void init_secondary (); - const char **init_resources (int argc, const char *const *argv); - const char *x_resource (const char *name); - void init_env (); - void set_locale (const char *locale); - void init_xlocale (); - void init_command (const char *const *argv); - void run_command (const char *const *argv); - int run_child (const char *const *argv); - - void color_aliases (int idx); - void recolour_cursor (); - void create_windows (int argc, const char *const *argv); - void resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent); - void window_calc (unsigned int newwidth, unsigned int newheight); - #if USE_XIM - rxvt_xim *input_method; - XIC Input_Context; - XIMStyle input_style; - XPoint spot; // most recently sent spot position + rxvt_xim *input_method; + XIC Input_Context; + XIMStyle input_style; + XPoint spot; // most recently sent spot position 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_position (XPoint &pos) NOTHROW; 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 IMSetStatusPosition (); + void IMSetPosition (); #endif - void resize_scrollbar (); - - void pixel_position (int *x, int *y); - - void selection_click (int clicks, int x, int y); - void selection_extend (int x, int y, int flag); - void selection_rotate (int x, int y); - - /* autoconvert */ - // command.C - void lookup_key (XKeyEvent &ev); + void key_press (XKeyEvent &ev); + void key_release (XKeyEvent &ev); unsigned int cmd_write (const char *str, unsigned int count); - wchar_t next_char (); - wchar_t cmd_getc (); - uint32_t next_octet (); - uint32_t cmd_get8 (); + 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)); bool cmd_parse (); void mouse_report (XButtonEvent &ev); @@ -1282,7 +1148,7 @@ void button_release (XButtonEvent &ev); void focus_in (); void focus_out (); - int check_our_parents (); + void update_fade_color (unsigned int idx); #ifdef PRINTPIPE FILE *popen_printer (); int pclose_printer (FILE *stream); @@ -1303,10 +1169,29 @@ void process_sgr_mode (unsigned int nargs, const int *arg); void process_graphics (); // init.C + bool init_vars (); + void init_secondary (); + const char **init_resources (int argc, const char *const *argv); + void init_env (); + void set_locale (const char *locale); + void init_xlocale (); + void init_command (const char *const *argv); + void run_command (const char *const *argv); + 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_ourmods (); // main.C - void privileged_utmp (rxvt_privaction action); + void tt_winch (); + rxvt_term (); + ~rxvt_term (); + void destroy (); + void emergency_cleanup (); + bool init (int argc, const char *const *argv, stringvec *envv); + void recolour_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_utf8_property (Atom prop, const char *str, int len = -1); @@ -1314,8 +1199,11 @@ 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); + 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 @@ -1347,13 +1235,13 @@ scr_blank_line (l, prev_ncol, ncol - prev_ncol, DEFAULT_RSTYLE); } - int fgcolor_of (rend_t r) const + int fgcolor_of (rend_t r) const NOTHROW { int base = GET_BASEFG (r); #ifndef NO_BRIGHTCOLOR if (r & RS_Bold # if ENABLE_STYLES - && OPTION (Opt_intensityStyles) + && option (Opt_intensityStyles) # endif && IN_RANGE_INC (base, minCOLOR, minBrightCOLOR)) base += minBrightCOLOR - minCOLOR; @@ -1361,13 +1249,13 @@ return base; } - int bgcolor_of (rend_t r) const + int bgcolor_of (rend_t r) const NOTHROW { int base = GET_BASEBG (r); #ifndef NO_BRIGHTCOLOR if (r & RS_Blink # if ENABLE_STYLES - && OPTION (Opt_intensityStyles) + && option (Opt_intensityStyles) # endif && IN_RANGE_INC (base, minCOLOR, minBrightCOLOR)) base += minBrightCOLOR - minCOLOR; @@ -1375,88 +1263,104 @@ return base; } - bool option (uint32_t opt) const + bool option (uint8_t opt) const NOTHROW { - return OPTION (opt); + return options[opt >> 3] & (1 << (opt & 7)); } - void set_option (uint32_t opt, bool set) + void set_option (uint8_t opt, bool set = true) NOTHROW { if (set) - options |= opt; + options[opt >> 3] |= (1 << (opt & 7)); else - options &= ~opt; + options[opt >> 3] &= ~(1 << (opt & 7)); } - void scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) const; - void scr_blank_screen_mem (line_t &l, rend_t efs) const; - int scr_scroll_text (int row1, int row2, int count); + void PrivMode (int set, unsigned bit) 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 scr_reset (); - void scr_release (); - void scr_clear (bool really = false); - void scr_refresh (); - bool scr_refresh_rend (rend_t mask, rend_t value); - void scr_erase_screen (int mode); + 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; #if ENABLE_FRILLS - void scr_erase_savelines (); - void scr_backindex (); - void scr_forwardindex (); -#endif - void scr_touch (bool refresh); - void scr_expose (int x, int y, int width, int height, bool refresh); - rxvt_fontset *scr_find_fontset (rend_t r = DEFAULT_RSTYLE); - void scr_recolour (); - void scr_remap_chars (); - void scr_remap_chars (line_t &l); + 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; + + enum cursor_mode { SAVE, RESTORE }; void scr_poweron (); - void scr_cursor (int mode); - void scr_do_wrap (); - 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 wchar_t *str, int len, int minlines = 0); - void scr_backspace (); - void scr_tab (int count, bool ht = false); - 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); - void scr_move_to (int y, int len); - bool scr_page (enum page_dirn direction, int nlines); - bool scr_changeview (int new_view_start); - void scr_bell (); - void scr_printscreen (int fullhist); - void scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle1, rend_t rstyle2); - void scr_xor_span (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle); - void scr_reverse_selection (); - void scr_dump (int fd); - void selection_check (int check_more); - void 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 scr_cursor (cursor_mode mode) NOTHROW; + void scr_do_wrap () NOTHROW; + void scr_swap_screen () NOTHROW; + 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 selection_make (Time tm); - bool selection_grab (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); + 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 @@ -1482,6 +1386,7 @@ #endif // scrollbar.C + void resize_scrollbar (); int scrollbar_mapping (int map); int scrollbar_show (int update); void setup_scrollbar (const char *scrollalign, const char *scrollstyle, const char *thickness); @@ -1489,28 +1394,9 @@ // 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); + const char *x_resource (const char *name); void extract_resources (); - // xpm.C - int scale_pixmap (const char *geom); - void resize_pixmap (); - Pixmap set_bgPixmap (const char *file); }; -/* - ***************************************************************************** - * PROTOTYPES - ***************************************************************************** - */ -#ifdef PROTOTYPES -# define __PROTO(p) p -#else -# define __PROTO(p) () -#endif - -#ifdef DEBUG_malloc -# include "dmalloc.h" /* This comes last */ -#endif - #endif /* _RXVT_H_ */