--- rxvt-unicode/src/rxvt.h 2007/07/12 22:33:16 1.277 +++ rxvt-unicode/src/rxvt.h 2007/12/28 11:02:32 1.338 @@ -20,6 +20,7 @@ # define ENABLE_XIM_ONTHESPOT 1 # define CURSOR_BLINK 1 # define OPTION_HC 1 +# define BUILTIN_GLYPHS 1 #else # define ENABLE_MINIMAL 1 #endif @@ -30,15 +31,12 @@ #include #include #include -#if ENABLE_FRILLS -# include -#endif #include "encoding.h" #include "rxvtutil.h" #include "rxvtfont.h" #include "rxvttoolkit.h" -#include "iom.h" +#include "ev_cpp.h" #include "salloc.h" #include "libptytty.h" @@ -75,17 +73,7 @@ #include typedef struct termios ttymode_t; -#ifdef HAVE_AFTERIMAGE -# include -#undef min -#undef max -#elif defined(XPM_BACKGROUND) -# ifdef XPM_INC_X11 -# include -# else -# include -# endif -#endif +#include "background.h" #ifndef STDIN_FILENO # define STDIN_FILENO 0 @@ -93,6 +81,19 @@ # 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 @@ -103,47 +104,44 @@ /* ***************************************************************************** - * PROTOTYPES + * PROTOTYPES ***************************************************************************** */ // main.C -RETSIGTYPE rxvt_Child_signal (int sig) NOTHROW; -RETSIGTYPE rxvt_Exit_signal (int sig) NOTHROW; -void rxvt_clean_exit () NOTHROW; -void * rxvt_malloc (size_t size); -void * rxvt_calloc (size_t number, size_t size); -void * rxvt_realloc (void *ptr, size_t size); +#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; // 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_cpp (const char *str); - -#define rxvt_strdup(s) ((s) ? strdup(s) : 0) -char * rxvt_r_basename (const char *str) NOTHROW; +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; -int rxvt_Str_match (const char *s1, const char *s2) NOTHROW; -const char * rxvt_Str_skip_space (const char *str) NOTHROW; -char * rxvt_Str_trim (char *str) NOTHROW; -int rxvt_Str_escaped (char *str) NOTHROW; +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); + ///////////////////////////////////////////////////////////////////////////// // temporarily replace the process environment 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); @@ -153,7 +151,8 @@ environ = (char **)envv->begin (); } -inline void set_environ (char **envv) +static inline void +set_environ (char **envv) { #if ENABLE_PERL assert (envv); @@ -168,7 +167,6 @@ * STRUCTURES AND TYPEDEFS ***************************************************************************** */ -struct grwin_t; /* If we're using either the rxvt scrollbar, keep the * scrollColor resource. @@ -179,14 +177,6 @@ # undef KEEP_SCROLLCOLOR #endif -#ifdef XPM_BACKGROUND -typedef struct { - short w, h, x, y; - bool auto_resize ; - Pixmap pixmap; -} bgPixmap_t; -#endif - /* * the 'essential' information for reporting Mouse Events * pared down from XButtonEvent @@ -198,36 +188,26 @@ unsigned int button; /* detail */ }; -#if ENABLE_FRILLS -typedef struct _mwmhints { - CARD32 flags; - CARD32 functions; - CARD32 decorations; - INT32 input_mode; - CARD32 status; -} MWMHints; -#endif - #if ENABLE_XEMBED // XEMBED messages -# define XEMBED_EMBEDDED_NOTIFY 0 -# define XEMBED_WINDOW_ACTIVATE 1 -# define XEMBED_WINDOW_DEACTIVATE 2 -# define XEMBED_REQUEST_FOCUS 3 -# define XEMBED_FOCUS_IN 4 -# define XEMBED_FOCUS_OUT 5 -# define XEMBED_FOCUS_NEXT 6 +# define XEMBED_EMBEDDED_NOTIFY 0 +# define XEMBED_WINDOW_ACTIVATE 1 +# define XEMBED_WINDOW_DEACTIVATE 2 +# define XEMBED_REQUEST_FOCUS 3 +# define XEMBED_FOCUS_IN 4 +# define XEMBED_FOCUS_OUT 5 +# define XEMBED_FOCUS_NEXT 6 # define XEMBED_FOCUS_PREV 7 -# define XEMBED_MODALITY_ON 10 -# define XEMBED_MODALITY_OFF 11 -# define XEMBED_REGISTER_ACCELERATOR 12 -# define XEMBED_UNREGISTER_ACCELERATOR 13 +# define XEMBED_MODALITY_ON 10 +# define XEMBED_MODALITY_OFF 11 +# define XEMBED_REGISTER_ACCELERATOR 12 +# define XEMBED_UNREGISTER_ACCELERATOR 13 # define XEMBED_ACTIVATE_ACCELERATOR 14 // XEMBED detail code -# define XEMBED_FOCUS_CURRENT 0 -# define XEMBED_FOCUS_FIRST 1 +# define XEMBED_FOCUS_CURRENT 0 +# define XEMBED_FOCUS_FIRST 1 # define XEMBED_FOCUS_LAST 2 # define XEMBED_MAPPED (1 << 0) @@ -241,7 +221,7 @@ /* COLORTERM, TERM environment variables */ #define COLORTERMENV "rxvt" -#ifdef XPM_BACKGROUND +#ifdef BG_IMAGE_FROM_FILE # define COLORTERMENVFULL COLORTERMENV "-xpm" #else # define COLORTERMENVFULL COLORTERMENV @@ -254,17 +234,6 @@ # define NO_MOUSE_REPORT_SCROLLBAR 1 #endif -/* now look for other badly set stuff */ - -#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 - #define scrollBar_esc 30 #if defined(RXVT_SCROLLBAR) || defined(NEXT_SCROLLBAR) || defined(XTERM_SCROLLBAR) || defined(PLAIN_SCROLLBAR) @@ -450,7 +419,7 @@ 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, -}; +}; #define CHAR_ST 0x9c /* 0234 */ /* @@ -568,7 +537,7 @@ Color_scroll, Color_trough, #endif -#if TINTING +#if ENABLE_TRANSPARENCY Color_tint, #endif #if OFF_FOCUS_FADING @@ -619,15 +588,10 @@ #define PrivMode_smoothScroll (1UL<<17) #define PrivMode_vt52 (1UL<<18) #define PrivMode_LFNL (1UL<<19) -/* too annoying to implement X11 highlight tracking */ -/* #define PrivMode_MouseX11Track (1LU<<20) */ +#define PrivMode_MouseBtnEvent (1UL<<20) +#define PrivMode_MouseAnyEvent (1UL<<21) -#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) @@ -641,8 +605,15 @@ #define CBUFSIZ 2048 // size of command buffer #define UBUFSIZ 2048 // character buffer -#ifndef PATH_MAX -# define PATH_MAX 16384 +#if ENABLE_FRILLS +# include +typedef struct _mwmhints { + CARD32 flags; + CARD32 functions; + CARD32 decorations; + INT32 input_mode; + CARD32 status; +} MWMHints; #endif /* Motif window hints */ @@ -693,9 +664,6 @@ #define Width2Pixel(n) ((int32_t)(n) * (int32_t)fwidth) #define Height2Pixel(n) ((int32_t)(n) * (int32_t)fheight) -// for m >= -n, ensure remainder lies between 0..n-1 -#define MOD(m,n) (((m) + (n)) % (n)) - #define LINENO(n) MOD (term_start + int(n), total_rows) #define ROW(n) row_buf [LINENO (n)] @@ -759,20 +727,9 @@ #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 - typedef callback log_callback; typedef callback getfd_callback; -#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; - /****************************************************************************/ #define LINE_LONGER 0x0001 // line is continued on the next row @@ -824,7 +781,7 @@ /****************************************************************************/ -// primivite wrapper around mbstate_t to ensure initialisation +// primitive wrapper around mbstate_t to ensure initialisation struct mbstate { mbstate_t mbs; @@ -837,7 +794,7 @@ #define UNICODE_MASK 0x1fffffUL -#if UNICODE3 +#if UNICODE_3 # define COMPOSE_LO 0x40000000UL # define COMPOSE_HI 0x400fffffUL # define IS_COMPOSE(n) ((int32_t)(n) >= COMPOSE_LO) @@ -891,7 +848,7 @@ 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 @@ -900,11 +857,6 @@ struct mbstate mbstate; // current input multibyte state unsigned char want_refresh:1, -#ifdef ENABLE_TRANSPARENCY - want_full_refresh:1, /* awaiting full screen refresh */ - am_transparent:1, /* is a transparent term */ - am_pixmap_trans:1, /* transparency w/known root pixmap */ -#endif current_screen:1, /* primary or secondary */ num_scr_allow:1, bypass_keystate:1, @@ -961,6 +913,8 @@ window_vt_x, window_vt_y, window_sb_x, + mouse_row, + mouse_col, # ifdef POINTER_BLANK pointerBlankDelay, # endif @@ -1009,29 +963,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; -#ifdef HAVE_AFTERIMAGE - struct ASVisual *asv; - /* to get libAfterImage to work with multiple displays we use that hack : */ - /* should not need that with libAfterImage version >= 1.15 */ -#define AFTERIMAGE_DPY_OP(_op) ({::dpy = dpy; _op;}) +#endif +#ifdef HAVE_AFTERIMAGE + ASVisual *asv; ASImageManager *asimman; - ASImage *original_asim; - struct { unsigned int width, height; } xpmAttr; /* all we need is width/height */ -#else - XpmAttributes xpmAttr; /* originally loaded pixmap and its scaling */ -#endif #endif #if ENABLE_OVERLAY @@ -1065,6 +1006,9 @@ #ifdef KEYSYM_RESOURCE keyboard_manager *keyboard; #endif +#ifndef NO_RESOURCES + XrmDatabase option_db; +#endif const char *rs[NUM_RESOURCES]; /* command input buffering */ @@ -1089,63 +1033,65 @@ # endif #endif - // modifies first argument(!) - void paste (char *data, unsigned int len) NOTHROW; - - long vt_emask, vt_emask_perl, vt_emask_xim; + long vt_emask, vt_emask_perl, vt_emask_xim, vt_emask_mouse; void vt_select_input () const NOTHROW { - XSelectInput (dpy, vt, vt_emask | vt_emask_perl | vt_emask_xim); + XSelectInput (dpy, vt, vt_emask | vt_emask_perl | vt_emask_xim | vt_emask_mouse); } #if ENABLE_TRANSPARENCY || ENABLE_PERL void rootwin_cb (XEvent &xev); xevent_watcher rootwin_ev; #endif -#if ENABLE_TRANSPARENCY - int check_our_parents (); - void check_our_parents_cb (time_watcher &w); - time_watcher check_our_parents_ev; +#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); - 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_cb (time_watcher &w); time_watcher flush_ev; - void pty_cb (io_watcher &w, short revents); io_watcher pty_ev; - void incr_cb (time_watcher &w) NOTHROW; time_watcher incr_ev; + void child_cb (ev::child &w, int revents); ev::child child_ev; + void destroy_cb (ev::idle &w, int revents); ev::idle destroy_ev; + void refresh_check (); + void flush (); + void flush_cb (ev::timer &w, int revents); ev::timer flush_ev; + 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_cb (time_watcher &w); time_watcher cursor_blink_ev; + void cursor_blink_cb (ev::timer &w, int revents); ev::timer cursor_blink_ev; #endif #ifdef TEXT_BLINK - void text_blink_cb (time_watcher &w); time_watcher text_blink_ev; + void text_blink_cb (ev::timer &w, int revents); ev::timer text_blink_ev; #endif -#ifndef NO_BELL - void bell_cb (time_watcher &w); time_watcher bell_ev; +#ifndef NO_BELL + void bell_cb (ev::timer &w, int revents); ev::timer bell_ev; #endif #ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING - void cont_scroll_cb (time_watcher &w); time_watcher cont_scroll_ev; + void cont_scroll_cb (ev::timer &w, int revents); ev::timer cont_scroll_ev; #endif #ifdef SELECTION_SCROLLING - void sel_scroll_cb (time_watcher &w); time_watcher sel_scroll_ev; + void sel_scroll_cb (ev::timer &w, int revents); ev::timer sel_scroll_ev; #endif #if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) - void slip_wheel_cb (time_watcher &w); time_watcher slip_wheel_ev; + void slip_wheel_cb (ev::timer &w, int revents); ev::timer slip_wheel_ev; #endif #ifdef POINTER_BLANK - void pointer_cb (time_watcher &w); time_watcher pointer_ev; + void pointer_cb (ev::timer &w, int revents); ev::timer pointer_ev; void pointer_blank (); #endif void pointer_unblank (); @@ -1154,24 +1100,11 @@ void tt_write (const char *data, unsigned int len); void pty_write (); - void tt_winch (); - - rxvt_term (); - ~rxvt_term (); - void destroy (); - void emergency_cleanup (); - - bool init (int argc, const char *const *argv, stringvec *envv); - - bool init (stringvec *argv, stringvec *envv) + void init (stringvec *argv, stringvec *envv) { this->argv = argv; - return init (argv->size (), argv->begin (), envv); + init (argv->size (), argv->begin (), envv); } - - bool init_vars (); - - bool pty_fill (); void make_current () const // make this the "currently active" urxvt instance { @@ -1180,22 +1113,6 @@ 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; @@ -1215,8 +1132,6 @@ void IMSetPosition (); #endif - void resize_scrollbar (); - // command.C void key_press (XKeyEvent &ev); void key_release (XKeyEvent &ev); @@ -1254,9 +1169,29 @@ void process_sgr_mode (unsigned int nargs, const int *arg); void process_graphics (); // init.C + void 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 tt_winch (); + rxvt_term (); + ~rxvt_term (); + void destroy (); + void emergency_cleanup (); + void 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); @@ -1267,6 +1202,8 @@ 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 @@ -1328,17 +1265,35 @@ 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 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; @@ -1355,7 +1310,6 @@ #endif void scr_touch (bool refresh) NOTHROW; void scr_expose (int x, int y, int width, int height, bool refresh) NOTHROW; - rxvt_fontset *scr_find_fontset (rend_t r = DEFAULT_RSTYLE); void scr_recolour () NOTHROW; void scr_remap_chars () NOTHROW; void scr_remap_chars (line_t &l) NOTHROW; @@ -1416,8 +1370,6 @@ void selection_extend (int x, int y, int flag) NOTHROW; void selection_rotate (int x, int y) NOTHROW; - void pixel_position (int *x, int *y) NOTHROW; - #if defined(NEXT_SCROLLBAR) // scrollbar-next.C Pixmap renderPixmap (const char *const *data, int width, int height); @@ -1442,6 +1394,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); @@ -1449,24 +1402,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 - -#endif /* _RXVT_H_ */ +#endif /* _RXVT_H_ */