--- rxvt-unicode/src/rxvt.h 2006/01/02 15:10:18 1.179 +++ rxvt-unicode/src/rxvt.h 2007/08/10 22:10:36 1.291 @@ -5,6 +5,25 @@ #include "feature.h" +#if defined (ISO_14755) || defined (ENABLE_PERL) +# define ENABLE_OVERLAY 1 +#endif + +#if ENABLE_PERL +# define ENABLE_FRILLS 1 +# define ENABLE_COMBINING 1 +#endif + +#if ENABLE_FRILLS +# 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 + #include #include @@ -16,15 +35,22 @@ #endif #include "encoding.h" +#include "rxvtutil.h" #include "rxvtfont.h" #include "rxvttoolkit.h" #include "iom.h" #include "salloc.h" +#include "libptytty.h" -#if ENABLE_FRILLS -# define ENABLE_XEMBED 1 -# define ENABLE_EWMH 1 -# define CURSOR_BLINK 1 +#include "rxvtperl.h" + +// try to avoid some macros to decrease code size, on some systems +#if ENABLE_MINIMAL +# define strcmp(a,b) (strcmp)(a,b) +# define strlen(a) (strlen)(a) +# define strcpy(a,b) (strcpy)(a,b) +# define memset(a,c,l) (memset)(a,c,l) +# define memcpy(a,b,l) (memcpy)(a,b,l) #endif /* @@ -43,29 +69,16 @@ #endif #ifndef HAVE_XPOINTER -typedef char *XPointer; +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 +#ifdef HAVE_AFTERIMAGE +# include +#undef min +#undef max #endif #ifndef STDIN_FILENO @@ -74,44 +87,74 @@ # 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 (); +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); -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_Draw_Shadow (Display *display, Window win, GC topShadow, GC botShadow, int x, int y, int w, int h); -void rxvt_Draw_Triangle (Display *display, Window win, GC topShadow, GC botShadow, int x, int y, int w, int type); -void rxvt_usleep (int usecs); +#define rxvt_strdup(s) ((s) ? strdup(s) : 0) + +char * rxvt_r_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_splitcommastring (const char *cs) NOTHROW; +void rxvt_freecommastring (char **cs) NOTHROW; + +///////////////////////////////////////////////////////////////////////////// + +// temporarily replace the process environment +extern char **environ; +extern char **rxvt_environ; // the original environ pointer + +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) +{ +#if ENABLE_PERL + assert (envv); +#else + if (envv) +#endif + environ = envv; +} /* ***************************************************************************** @@ -120,28 +163,87 @@ */ struct grwin_t; -/* Sanitize menubar info */ -#ifndef MENUBAR -# undef MENUBAR_MAX -#endif -#ifndef MENUBAR_MAX -# define MENUBAR_MAX 0 -#endif - -/* If we're using either the rxvt scrollbar or menu bars, keep the +/* If we're using either the rxvt scrollbar, keep the * scrollColor resource. */ -#if defined(RXVT_SCROLLBAR) || defined(NEXT_SCROLLBAR) || defined(MENUBAR) || defined(PLAIN_SCROLLBAR) +#if defined(RXVT_SCROLLBAR) || defined(NEXT_SCROLLBAR) || defined(PLAIN_SCROLLBAR) # define KEEP_SCROLLCOLOR 1 #else # undef KEEP_SCROLLCOLOR #endif -#ifdef XPM_BACKGROUND -typedef struct { - short w, h, x, y; +#if defined(XPM_BACKGROUND) || defined(ENABLE_TRANSPARENCY) +# define HAVE_BG_PIXMAP 1/* to simplify further usage */ +struct bgPixmap_t { + + enum { + geometrySet = (1UL<<0), + propScale = (1UL<<1), + geometryFlags = (geometrySet|propScale), + + tintSet = (1UL<<8), + tintNeeded = (1UL<<9), + tintServerSide = (1UL<<10), + tintFlags = (tintSet|tintServerSide|tintNeeded), + + isTransparent = (1UL<<16) + }; + + unsigned long flags; + +# ifdef XPM_BACKGROUND +# ifdef HAVE_AFTERIMAGE + ASImage *original_asim; + bool render_asim (ASImage *background, ARGB32 background_tint); +# endif + + enum { defaultScale = 100, defaultAlign = 50 }; + + 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 */ + void unset_geometry () { flags = flags & ~geometryFlags; }; + bool set_geometry (const char *geom); + void set_defaultGeometry () + { + h_scale = v_scale = defaultScale; + h_align = v_align = defaultAlign; + flags |= geometrySet; + }; + + bool set_file (const char *file); +# endif /* XPM_BACKGROUND */ + + rxvt_term *target; + bool set_target (rxvt_term *new_target); + +# ifdef ENABLE_TRANSPARENCY + int root_depth; /* obtained when target is set */ + Pixmap root_pixmap; /* current root pixmap set */ + rxvt_color tint; + int shade; + int h_blurRadius, v_blurRadius; + + bool set_transparent (); + bool set_blur_radius (const char *geom); + bool set_tint (rxvt_color &new_tint); + bool unset_tint (); + bool set_shade (const char *shade_str); + bool set_root_pixmap (); + bool make_transparency_pixmap (); +# endif + Pixmap pixmap; -} bgPixmap_t; + unsigned int pmap_width, pmap_height; + unsigned int pmap_depth; + + bool window_size_sensitive (); + void apply_background (); + bool render_background (); + +}; +#else +# undef HAVE_BG_PIXMAP #endif /* @@ -211,14 +313,6 @@ # define NO_MOUSE_REPORT_SCROLLBAR 1 #endif -#ifdef NO_RESOURCES -# undef USE_XGETDEFAULT -#endif - -#if ISO_14755 -# define ENABLE_OVERLAY 1 -#endif - /* now look for other badly set stuff */ #if !defined (EACCESS) && defined(EAGAIN) @@ -230,21 +324,12 @@ # define EXIT_FAILURE 1 /* exit function failure */ #endif -#define menuBar_esc 10 #define scrollBar_esc 30 -#define menuBar_margin 2 /* margin below text */ #if defined(RXVT_SCROLLBAR) || defined(NEXT_SCROLLBAR) || defined(XTERM_SCROLLBAR) || defined(PLAIN_SCROLLBAR) # define HAVE_SCROLLBARS 1 #endif -/* width of scrollBar, menuBar shadow, must be 1 or 2 */ -#ifdef HALFSHADOW -# define SHADOW 1 -#else -# define SHADOW 2 -#endif - #define R_SB_ALIGN_CENTRE 0 #define R_SB_ALIGN_TOP 1 #define R_SB_ALIGN_BOTTOM 2 @@ -325,10 +410,9 @@ */ 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 */ + NO_REFRESH = 0, /* Window not visible at all! */ + FAST_REFRESH = 1, /* Fully exposed window */ + SLOW_REFRESH = 2, /* Partially exposed window */ }; #ifdef NO_SECONDARY_SCREEN @@ -383,6 +467,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 @@ -438,10 +525,10 @@ 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_pointer_fg = 13, // change actual 'Pointer' fg color + XTerm_Color_pointer_bg = 14, // change actual 'Pointer' bg color + XTerm_Color05 = 15, // not implemented (tektronix fg) + XTerm_Color06 = 16, // not implemented (tektronix bg) XTerm_Color_RV = 17, // change actual 'Highlight' color XTerm_logfile = 46, // not implemented XTerm_font = 50, @@ -451,18 +538,22 @@ XTerm_emacs51 = 51, // reserved for emacs shell /* * rxvt extensions of XTerm OSCs: ESC ] Ps;Pt (ST|BEL) + * at least Rxvt_Color_BD and Rxvt_Color_UL clash with xterm */ - 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 + Rxvt_Color_BD = 18, // change actual 'Bold' color + Rxvt_Color_UL = 19, // change actual 'Underline' color + Rxvt_Pixmap = 20, // new bg pixmap + Rxvt_restoreFG = 39, // change default fg color + Rxvt_restoreBG = 49, // change default bg color + Rxvt_dumpscreen = 55, // dump scrollback and all of screen URxvt_locale = 701, // change locale - URxvt_Menu = 703, // set menu item + URxvt_version = 702, // request version + URxvt_Color_IT = 704, // change actual 'Italic' colour URxvt_Color_tint = 705, // change actual tint colour + URxvt_Color_BD = 706, + URxvt_Color_UL = 707, URxvt_font = 710, URxvt_boldFont = 711, @@ -471,6 +562,8 @@ URxvt_view_up = 720, URxvt_view_down = 721, + + URxvt_perl = 777, }; /* Words starting with `Color_' are colours. Others are counts */ @@ -481,6 +574,8 @@ */ enum colour_list { + Color_none = -2, + Color_transparent = -1, Color_fg = 0, Color_bg, minCOLOR, /* 2 */ @@ -532,7 +627,7 @@ Color_scroll, Color_trough, #endif -#if TINTING +#if ENABLE_TRANSPARENCY Color_tint, #endif #if OFF_FOCUS_FADING @@ -550,159 +645,18 @@ #define Color_Bits 7 // 0 .. maxTermCOLOR -#define NPIXCLR_SETS ((TOTAL_COLORS + 31) / 32) -#define NPIXCLR_BITS 32 - /* * Resource list */ enum { - Rs_display_name = 0, - Rs_term_name, - Rs_iconName, - Rs_geometry, - Rs_reverseVideo, - Rs_color, - _Rs_color = Rs_color + NRS_COLORS - 1, - Rs_font, -#if ENABLE_STYLES - Rs_boldFont, - Rs_italicFont, - Rs_boldItalicFont, - Rs_intensityStyles, -#endif - Rs_name, - Rs_title, -#if defined (XPM_BACKGROUND) || (MENUBAR_MAX) - Rs_path, -#endif -#ifdef XPM_BACKGROUND - Rs_backgroundPixmap, -#endif -#if (MENUBAR_MAX) - Rs_menu, -#endif - Rs_loginShell, - Rs_jumpScroll, -#ifdef HAVE_SCROLLBARS - Rs_scrollBar, - Rs_scrollBar_right, - Rs_scrollBar_floating, - Rs_scrollBar_align, - Rs_scrollstyle, /* Rs_scrollBar_style */ - Rs_scrollBar_thickness, -#endif - Rs_scrollTtyOutput, - Rs_scrollTtyKeypress, - Rs_scrollWithBuffer, - Rs_saveLines, - Rs_utmpInhibit, - Rs_visualBell, -#if ! defined(NO_MAPALERT) && defined(MAPALERT_OPTION) - Rs_mapAlert, -#endif -#ifdef META8_OPTION - Rs_meta8, -#endif -#ifdef MOUSE_WHEEL - Rs_mouseWheelScrollPage, -#endif -#ifndef NO_BACKSPACE_KEY - Rs_backspace_key, -#endif -#ifndef NO_DELETE_KEY - Rs_delete_key, -#endif - Rs_selectstyle, -#ifdef PRINTPIPE - Rs_print_pipe, -#endif -#ifdef USE_XIM - Rs_preeditType, - Rs_inputMethod, -#endif -#ifdef TRANSPARENT - Rs_transparent, - Rs_transparent_all, -#endif -#if ENABLE_FRILLS - Rs_pty_fd, - Rs_hold, - Rs_ext_bwidth, - Rs_int_bwidth, - Rs_borderLess, - Rs_lineSpace, - Rs_cursorUnderline, -#endif -#if CURSOR_BLINK - Rs_cursorBlink, -#endif -#if ENABLE_XEMBED - Rs_embed, -#endif - Rs_cutchars, - Rs_modifier, - Rs_answerbackstring, - Rs_tripleclickwords, - Rs_insecure, - Rs_pointerBlank, - Rs_pointerBlankDelay, - Rs_imLocale, - Rs_imFont, - Rs_pastableTabs, -#ifndef NO_SECONDARY_SCREEN - Rs_secondaryScreen, - Rs_secondaryScroll, -#endif -#ifdef OFF_FOCUS_FADING - Rs_fade, -#endif -#ifdef TINTING - Rs_shade, -#endif +# define def(name) Rs_ ## name, +# define reserve(name,count) Rs_ ## name ## _ = Rs_ ## name + (count) - 1, +# include "rsinc.h" +# undef def +# undef reserve 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) @@ -719,14 +673,13 @@ #define PrivMode_MouseX10 (1UL<<12) #define PrivMode_MouseX11 (1UL<<13) #define PrivMode_scrollBar (1UL<<14) -#define PrivMode_menuBar (1UL<<15) -#define PrivMode_TtyOutputInh (1UL<<16) -#define PrivMode_Keypress (1UL<<17) -#define PrivMode_smoothScroll (1UL<<18) -#define PrivMode_vt52 (1UL<<19) -#define PrivMode_LFNL (1UL<<20) +#define PrivMode_TtyOutputInh (1UL<<15) +#define PrivMode_Keypress (1UL<<16) +#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<<21) */ +/* #define PrivMode_MouseX11Track (1LU<<20) */ #define PrivMode_mouse_report (PrivMode_MouseX10|PrivMode_MouseX11) #define PrivMode(test,bit) \ @@ -783,23 +736,11 @@ * MACRO DEFINES ***************************************************************************** */ -#define memset(x, y, z) memset((x), (y), (size_t)(z)) -#define memcpy(x, y, z) memcpy((void *)(x), (const void *)(y), (z)) -#define memmove(x, y, z) memmove((void *)(x), (const void *)(y), (z)) -#define strcasecmp(x, y) strcasecmp((x), (y)) -#define strncasecmp(x, y, z) strncasecmp((x), (y), (z)) -#define strcpy(x, y) strcpy((char *)(x), (const char *)(y)) -#define strncpy(x, y, z) strncpy((char *)(x), (const char *)(y), (z)) -#define strcmp(x, y) strcmp((const char *)(x), (const char *)(y)) -#define strncmp(x, y, z) strncmp((const char *)(x), (const char *)(y), (z)) -#define strcat(x, y) strcat((char *)(x), (const char *)(y)) -#define strncat(x, y, z) strncat((char *)(x), (const char *)(y), (z)) -#define strdup(x) strdup((const char *)(x)) -#define strlen(x) strlen((const char *)(x)) -#define strchr(x, y) strchr((const char *)(x), (int)(y)) -#define strrchr(x, y) strrchr((const char *)(x), (int)(y)) +#define dLocal(type,name) type const name = this->name -#define dDisp Display *disp = 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)) @@ -811,9 +752,6 @@ #define Width2Pixel(n) ((int32_t)(n) * (int32_t)fwidth) #define Height2Pixel(n) ((int32_t)(n) * (int32_t)fheight) -#define TermWin_TotalWidth() ((int32_t)this->width) -#define TermWin_TotalHeight() ((int32_t)this->height) - // for m >= -n, ensure remainder lies between 0..n-1 #define MOD(m,n) (((m) + (n)) % (n)) @@ -841,8 +779,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)] @@ -880,96 +818,64 @@ #define scrollbar_size() (scrollBar.end - scrollBar.beg \ - scrollbar_minheight ()) -#if (MENUBAR_MAX > 1) -/* rendition style flags */ -# define menuBar_height() (fheight + SHADOW) -# define menuBar_TotalHeight() (menuBar_height() + SHADOW + menuBar_margin) -# define isMenuBarWindow(w) ((w) == menuBar.win) -#else -# define menuBar_height() (0) -# define menuBar_TotalHeight() (0) -# define isMenuBarWindow(w) (0) -#endif - -#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 UTMP_SUPPORT -# if !defined(RXVT_UTMPX_FILE) || !defined(HAVE_STRUCT_UTMPX) -# undef HAVE_UTMPX_H -# undef HAVE_STRUCT_UTMPX -# endif -# if !defined(RXVT_UTMP_FILE) || !defined(HAVE_STRUCT_UTMP) -# undef HAVE_UTMP_H -# undef HAVE_STRUCT_UTMP -# endif - -# ifdef HAVE_UTMPX_H -# include -# endif -# ifdef HAVE_UTMP_H -# include -# endif -#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); - -/* - ***************************************************************************** - * VARIABLES - ***************************************************************************** - */ -#ifdef MENUBAR -# include "menubar.h" -#endif - -#define BLINK_INTERVAL 0.5 -#define TEXT_BLINK_INTERVAL 0.5 +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 + rend_t *r; // rendition, uses RS_ flags + tlen_t_ l; // length of each text line, LINE_CONT == continued on next line + uint32_t f; // flags + + bool is_longer () + { + return f & LINE_LONGER; + } + + void is_longer (int set) + { + if (set) + f |= LINE_LONGER; + else + f &= ~LINE_LONGER; + } + + void clear () + { + t = 0; + r = 0; + l = 0; + f = 0; + } + + void touch () // call whenever a line is changed/touched/updated + { +#if ENABLE_PERL + f &= ~LINE_FILTERED; +#endif + } + + void touch (int col) + { + max_it (l, col); + touch (); + } +}; -#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 { @@ -980,6 +886,8 @@ mbstate () { reset (); } }; +/****************************************************************************/ + #define UNICODE_MASK 0x1fffffUL #if UNICODE3 @@ -987,9 +895,14 @@ # 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) +# if ENABLE_PERL +# 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 +# define COMPOSE_HI 0xf8ffUL +# endif +# define IS_COMPOSE(n) IN_RANGE_INC ((n), COMPOSE_LO, COMPOSE_HI) #endif #if ENABLE_COMBINING @@ -1019,27 +932,33 @@ extern class rxvt_composite_vec rxvt_composite; #endif +/****************************************************************************/ #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 - getfd_callback *getfd_hook; // convert remote to local fd, 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; +#endif struct mbstate mbstate; // current input multibyte state unsigned char want_refresh:1, -#ifdef TRANSPARENT +#ifdef ENABLE_TRANSPARENCY 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 @@ -1064,15 +983,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; @@ -1087,18 +1007,10 @@ 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 */ scrollbar_len, -#ifdef MENUBAR - menu_readonly, /* okay to alter menu? */ - Arrows_x, -#endif -#if MENUBAR_MAX > 1 - Nbars, -#endif window_vt_x, window_vt_y, window_sb_x, @@ -1115,12 +1027,9 @@ unsigned long priv_modes, SavedModes; /* ---------- */ - Atom xa[NUM_XA]; + Atom *xa; /* ---------- */ -#ifdef MENUBAR - GC menubarGC; -#endif -#if defined(MENUBAR) || defined(RXVT_SCROLLBAR) +#ifdef RXVT_SCROLLBAR GC scrollbarGC, topShadowGC, botShadowGC; @@ -1162,36 +1071,13 @@ struct mouse_event MEvent; XComposeStatus compose; ttymode_t tio; -#ifdef UTMP_SUPPORT -# ifdef HAVE_STRUCT_UTMP - struct utmp ut; -# endif -# ifdef HAVE_STRUCT_UTMPX - struct utmpx utx; -# endif -# if (defined(HAVE_STRUCT_UTMP) && defined(HAVE_UTMP_PID)) || defined(HAVE_STRUCT_UTMPX) - char ut_id[5]; -# endif - int utmp_pos; -#endif row_col_t oldcursor; -#ifdef XPM_BACKGROUND +#ifdef HAVE_BG_PIXMAP bgPixmap_t bgPixmap; - XpmAttributes xpmAttr; /* originally loaded pixmap and its scaling */ -#endif -#ifdef MENUBAR - menu_t *ActiveMenu, /* currently active menu */ - *BuildMenu; /* the menu currently being built */ - bar_t *CurrentBar; -# if ! (MENUBAR_MAX > 1) - bar_t BarList; -# endif /* (MENUBAR_MAX > 1) */ #endif -#ifdef CURSOR_BLINK - struct timeval lastcursorchange; -#endif -#ifdef POINTER_BLANK - struct timeval lastmotion; +#ifdef HAVE_AFTERIMAGE + ASVisual *asv; + ASImageManager *asimman; #endif #if ENABLE_OVERLAY @@ -1199,27 +1085,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]; - unsigned char *v_buffer; /* pointer to physical buffer */ + 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; @@ -1227,8 +1114,10 @@ const char *rs[NUM_RESOURCES]; /* command input buffering */ - unsigned char *cmdbuf_ptr, *cmdbuf_endp; - unsigned char cmdbuf_base[CBUFSIZ]; + char *cmdbuf_ptr, *cmdbuf_endp; + char cmdbuf_base[CBUFSIZ]; + + ptytty *pty; rxvt_salloc *talloc; // text line allocator rxvt_salloc *ralloc; // rend line allocator @@ -1247,32 +1136,39 @@ #endif // modifies first argument(!) - void paste (unsigned char *data, unsigned int len); + void paste (char *data, unsigned int len) NOTHROW; - void flush (); + long vt_emask, vt_emask_perl, vt_emask_xim; -#if TRANSPARENT + void vt_select_input () const NOTHROW + { + XSelectInput (dpy, vt, vt_emask | vt_emask_perl | vt_emask_xim); + } + +#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; +#endif void x_cb (XEvent &xev); + void flush (); xevent_watcher termwin_ev; xevent_watcher vt_ev; #ifdef HAVE_SCROLLBARS xevent_watcher scrollbar_ev; #endif -#ifdef MENUBAR - xevent_watcher menubar_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); 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; @@ -1280,6 +1176,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; @@ -1298,24 +1197,38 @@ void pointer_unblank (); void tt_printf (const char *fmt,...); - void tt_write (const unsigned char *data, unsigned int len); + 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 (int argc, const char *const *argv, stringvec *envv); + + bool init (stringvec *argv, stringvec *envv) + { + this->argv = argv; + return init (argv->size (), argv->begin (), envv); + } + bool init_vars (); bool pty_fill (); + void make_current () const // make this the "currently active" urxvt instance + { + SET_R (this); + 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 (); @@ -1330,42 +1243,35 @@ 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); - unsigned int cmd_write (const unsigned char *str, unsigned int count); - - unicode_t next_char (); - unicode_t cmd_getc (); - unicode_t next_octet (); - unicode_t cmd_get8 (); + void key_press (XKeyEvent &ev); + void key_release (XKeyEvent &ev); + unsigned int cmd_write (const char *str, unsigned int count); + + wchar_t next_char () NOTHROW; + wchar_t cmd_getc () THROW ((class out_of_input)); + uint32_t next_octet () NOTHROW; + uint32_t cmd_get8 () THROW ((class out_of_input)); bool cmd_parse (); void mouse_report (XButtonEvent &ev); @@ -1373,7 +1279,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); @@ -1384,11 +1290,11 @@ 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); + 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); + void process_color_seq (int report, int color, const char *str, char resp); + void process_xterm_seq (int op, const char *str, 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); @@ -1396,11 +1302,7 @@ // init.C void Get_Colours (); void get_ourmods (); - // logging.C - void makeutent (const char *pty, const char *hostname); - void cleanutent (); // main.C - void privileged_utmp (rxvt_privaction action); 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); @@ -1408,45 +1310,13 @@ 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); -#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 lalloc (line_t &l) + void lalloc (line_t &l) const { l.t = (text_t *)talloc->alloc (); l.r = (rend_t *)ralloc->alloc (); @@ -1460,7 +1330,7 @@ } #endif - void lresize (line_t &l) + void lresize (line_t &l) const { if (!l.t) return; @@ -1474,13 +1344,13 @@ scr_blank_line (l, prev_ncol, ncol - prev_ncol, DEFAULT_RSTYLE); } - int fgcolor_of (rend_t r) + 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; @@ -1488,13 +1358,13 @@ return base; } - int bgcolor_of (rend_t r) + 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; @@ -1502,72 +1372,97 @@ return base; } - void scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs); - void scr_blank_screen_mem (line_t &l, rend_t efs); - int scr_scroll_text (int row1, int row2, int count); + bool option (uint8_t opt) const NOTHROW + { + return options[opt >> 3] & (1 << (opt & 7)); + } + + void set_option (uint8_t opt, bool set = true) NOTHROW + { + if (set) + options[opt >> 3] |= (1 << (opt & 7)); + else + options[opt >> 3] &= ~(1 << (opt & 7)); + } + + 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 (unsigned char refresh_type); - 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 (); + void scr_erase_savelines () NOTHROW; + void scr_backindex () NOTHROW; + void scr_forwardindex () NOTHROW; #endif - void scr_touch (bool refresh); - void scr_expose (int x, int y, int width, int height, bool refresh); + 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 (); - void scr_remap_chars (); - void scr_remap_chars (const line_t &l); + 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 unicode_t *str, int nlines, int len); - 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); - int scr_move_to (int y, int len); - int scr_page (enum page_dirn direction, int nlines); - int scr_changeview (unsigned int oldviewstart); - void scr_bell (); - void scr_printscreen (int fullhist); - 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); - 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; + + void pixel_position (int *x, int *y) NOTHROW; #if defined(NEXT_SCROLLBAR) // scrollbar-next.C @@ -1579,7 +1474,6 @@ #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 @@ -1604,9 +1498,8 @@ void get_xdefaults (FILE *stream, const char *name); void extract_resources (); // xpm.C - int scale_pixmap (const char *geom); - void resize_pixmap (); - Pixmap set_bgPixmap (const char *file); + void get_window_origin (int &x, int &y); + Pixmap get_pixmap_property (int prop_id); }; /* @@ -1620,9 +1513,5 @@ # define __PROTO(p) () #endif -#ifdef DEBUG_malloc -# include "dmalloc.h" /* This comes last */ -#endif - #endif /* _RXVT_H_ */