--- rxvt-unicode/src/rxvt.h 2010/08/29 15:04:40 1.415 +++ rxvt-unicode/src/rxvt.h 2012/05/20 16:23:42 1.481 @@ -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,6 +72,15 @@ #include #include +#ifdef HAVE_PIXBUF +# include +#endif + +#if defined(BG_IMAGE_FROM_FILE) || defined(ENABLE_TRANSPARENCY) +# define HAVE_BG_PIXMAP 1 +#endif + +#include #include "encoding.h" #include "rxvtutil.h" #include "rxvtfont.h" @@ -100,14 +107,8 @@ ***************************************************************************** */ -#ifndef HAVE_XPOINTER -typedef char *XPointer; -#endif - #include -#include "background.h" - #ifndef STDIN_FILENO # define STDIN_FILENO 0 # define STDOUT_FILENO 1 @@ -119,10 +120,6 @@ # define EXIT_FAILURE 1 /* exit function failure */ #endif -#ifndef PATH_MAX -# define PATH_MAX 16384 -#endif - /****************************************************************************/ // exception thrown on fatal (per-instance) errors @@ -153,12 +150,18 @@ 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; +void rxvt_fatal (const char *fmt, ...) THROW ((class rxvt_failure_exception)) ecb_noreturn; +void rxvt_exit_failure () THROW ((class rxvt_failure_exception)) ecb_noreturn; char * rxvt_strtrim (char *str) NOTHROW; -char ** rxvt_splitcommastring (const char *cs) NOTHROW; -void rxvt_freecommastring (char **cs) NOTHROW; +char ** rxvt_strsplit (char delim, const char *str) NOTHROW; + +static inline void +rxvt_free_strsplit (char **ptr) NOTHROW +{ + free (ptr[0]); + free (ptr); +} void * rxvt_malloc (size_t size); void * rxvt_calloc (size_t number, size_t size); @@ -192,6 +195,73 @@ environ = envv; } +struct localise_env +{ + char **orig_env; + + localise_env (char **new_env) + { + orig_env = environ; + environ = new_env; + } + + ~localise_env () + { + environ = orig_env; + } +}; + +#ifdef HAVE_BG_PIXMAP +# ifdef BG_IMAGE_FROM_FILE +enum { + IM_IS_SET = 1 << 0, + IM_IS_SIZE_SENSITIVE = 1 << 1, + IM_KEEP_ASPECT = 1 << 2, + IM_ROOT_ALIGN = 1 << 3, + IM_TILE = 1 << 4, + IM_GEOMETRY_FLAGS = IM_KEEP_ASPECT | IM_ROOT_ALIGN | IM_TILE, +}; + +enum { + noScale = 0, + windowScale = 100, + defaultScale = windowScale, + centerAlign = 50, + defaultAlign = centerAlign, +}; + +struct rxvt_image +{ + uint8_t flags; + unsigned int h_scale, v_scale; /* percents of the window size */ + int h_align, v_align; /* percents of the window size: + 0 - left align, 50 - center, 100 - right */ + +# ifdef HAVE_PIXBUF + GdkPixbuf *pixbuf; + + ~rxvt_image () + { + if (pixbuf) + g_object_unref (pixbuf); + } + + int width () + { + return gdk_pixbuf_get_width (pixbuf); + } + int height () + { + return gdk_pixbuf_get_height (pixbuf); + } +# endif + + bool set_file (const char *file); + bool set_geometry (const char *geom, bool update = false); +}; +# endif +#endif + /* ***************************************************************************** * STRUCTURES AND TYPEDEFS @@ -278,33 +348,28 @@ # 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, }; -/* arguments for rxvt_scr_change_screen () */ +/* arguments for rxvt_term::scr_change_screen () */ enum { PRIMARY = 0, SECONDARY, @@ -357,17 +422,6 @@ #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)) -#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 */ - enum { C0_NUL = 0x00, C0_SOH, C0_STX, C0_ETX, C0_EOT, C0_ENQ, C0_ACK, C0_BEL, @@ -557,6 +611,8 @@ #define PrivMode_MouseBtnEvent (1UL<<20) #define PrivMode_MouseAnyEvent (1UL<<21) #define PrivMode_BracketPaste (1UL<<22) +#define PrivMode_ExtModeMouse (1UL<<23) // xterm pseudo-utf-8 hack +#define PrivMode_ExtMouseRight (1UL<<24) // xterm pseudo-utf-8, but works in non-utf-8-locales #define PrivMode_mouse_report (PrivMode_MouseX10|PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent) @@ -655,7 +711,7 @@ // return attributes defining the background, encoding doesn't matter // depends on RS_fgShift > RS_bgShift #define GET_BGATTR(x) \ - (expect_false ((x) & RS_RVid) \ + (ecb_unlikely ((x) & RS_RVid) \ ? (((x) & (RS_attrMask & ~RS_RVid)) \ | (((x) & RS_fgMask) >> (RS_fgShift - RS_bgShift))) \ : ((x) & (RS_attrMask | RS_bgMask))) @@ -767,6 +823,9 @@ struct compose_char { unicode_t c1, c2; // any chars != NOCHAR are valid + #if __cplusplus >= 201103L || ECB_GCC_VERSION(4,4) + compose_char () = default; + #endif compose_char (unicode_t c1, unicode_t c2) : c1(c1), c2(c2) { } @@ -858,6 +917,8 @@ 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] */ @@ -876,10 +937,9 @@ 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]; }; @@ -951,12 +1011,13 @@ /* 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 }; /* ------------------------------------------------------------------------- */ @@ -968,7 +1029,7 @@ XSizeHints szHint; rxvt_color *pix_colors; Cursor TermWin_cursor; /* cursor for vt window */ - 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 */ @@ -1015,14 +1076,13 @@ 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 @@ -1060,37 +1120,89 @@ 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; /* ---------- */ 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; static struct termios def_tio; row_col_t oldcursor; #ifdef HAVE_BG_PIXMAP - bgPixmap_t bgPixmap; -#endif -#ifdef HAVE_AFTERIMAGE - ASVisual *asv; - ASImageManager *asimman; + void bg_init (); + void bg_destroy (); + + enum { + BG_IS_VALID = 1 << 0, + + BG_IS_TRANSPARENT = 1 << 1, + BG_NEEDS_REFRESH = 1 << 2, + + BG_HAS_RENDER = 1 << 3, + BG_HAS_RENDER_CONV = 1 << 4, + BG_CLIENT_RENDER = 1 << 5, + + BG_TINT_SET = 1 << 6, + BG_TINT_BITAND = 1 << 7, + }; + + uint8_t bg_flags; + +# ifdef BG_IMAGE_FROM_FILE + rxvt_image bg_image; + void get_image_geometry (rxvt_image &image, int &w, int &h, int &x, int &y); + bool render_image (rxvt_image &image); +# endif + +# ifdef ENABLE_TRANSPARENCY + Pixmap root_pixmap; /* current root pixmap set */ + rxvt_color tint; + int shade; + int h_blurRadius, v_blurRadius; + + void bg_set_transparent () + { + bg_flags |= BG_IS_TRANSPARENT; + } + void bg_set_root_pixmap (); + bool bg_set_tint (rxvt_color &new_tint); + bool bg_set_shade (const char *shade_str); + bool bg_set_blur (const char *geom); + + bool blur_pixmap (Pixmap pixmap, int width, int height); + bool tint_pixmap (Pixmap pixmap, int width, int height); + void tint_ximage (XImage *ximage); + bool make_transparency_pixmap (); +# endif + + ev_tstamp bg_valid_since; + + Pixmap bg_pixmap; + unsigned int bg_pmap_width, bg_pmap_height; + + int target_x; + int target_y; + bool bg_set_position (int x, int y); + bool bg_window_size_sensitive (); + bool bg_window_position_sensitive (); - void init_asv () + bool bg_render (); + void bg_invalidate () { - if (!asv) - asv = create_asvisual_for_id (dpy, display->screen, depth, XVisualIDFromVisual (visual), cmap, NULL); + bg_flags &= ~BG_IS_VALID; } #endif +#ifdef HAVE_PIXBUF + bool pixbuf_to_pixmap (GdkPixbuf *pixbuf, Pixmap pixmap, GC gc, + int src_x, int src_y, int dst_x, int dst_y, + unsigned int width, unsigned int height); +#endif #if ENABLE_OVERLAY overlay_base ov; @@ -1107,11 +1219,6 @@ 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 */ - char *locale; char charsets[4]; char *v_buffer; /* pointer to physical buffer */ @@ -1160,10 +1267,6 @@ #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 @@ -1178,11 +1281,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 @@ -1212,12 +1317,6 @@ void tt_write (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); @@ -1238,16 +1337,15 @@ 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)); @@ -1284,11 +1382,12 @@ 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 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 (); @@ -1316,12 +1415,12 @@ 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); + Pixmap get_pixmap_property (Atom property); // screen.C @@ -1361,7 +1460,7 @@ # 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; @@ -1375,7 +1474,7 @@ # 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; @@ -1383,32 +1482,10 @@ 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; - } + void set_option (uint8_t opt, bool set = true) NOTHROW; // modifies first argument(!) void tt_paste (char *data, unsigned int len) NOTHROW; @@ -1430,7 +1507,7 @@ #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_recolour (bool refresh = true) NOTHROW; void scr_remap_chars () NOTHROW; void scr_remap_chars (line_t &l) NOTHROW; @@ -1475,10 +1552,7 @@ 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 (bool clipboard = false) NOTHROW; void selection_make (Time tm); bool selection_grab (Time tm, bool clipboard = false) NOTHROW; @@ -1492,10 +1566,11 @@ void selection_rotate (int x, int y) NOTHROW; // xdefaults.C - void get_options (int argc, const char *const *argv); + const char **get_options (int argc, const char *const *argv); int parse_keysym (const char *str, const char *arg); const char *x_resource (const char *name); void extract_resources (); + void extract_keysym_resources (); }; #endif /* _RXVT_H_ */