--- rxvt-unicode/src/rxvt.h 2007/12/28 14:57:04 1.341 +++ rxvt-unicode/src/rxvt.h 2008/02/15 10:56:29 1.358 @@ -78,6 +78,7 @@ #include "rxvtutil.h" #include "rxvtfont.h" #include "rxvttoolkit.h" +#include "scrollbar.h" #include "ev_cpp.h" #include "salloc.h" #include "libptytty.h" @@ -98,22 +99,12 @@ * SYSTEM HACKS ***************************************************************************** */ -/* Consistent defines - please report on the necessity - * @ Unixware: defines (__svr4__) - */ -#if defined (SVR4) && !defined (__svr4__) -# define __svr4__ 1 -#endif -#if defined (sun) && !defined (__sun__) -# define __sun__ 1 -#endif #ifndef HAVE_XPOINTER typedef char *XPointer; #endif #include -typedef struct termios ttymode_t; #include "background.h" @@ -211,15 +202,6 @@ ***************************************************************************** */ -/* If we're using either the rxvt scrollbar, keep the - * scrollColor resource. - */ -#if defined(RXVT_SCROLLBAR) || defined(NEXT_SCROLLBAR) || defined(PLAIN_SCROLLBAR) -# define KEEP_SCROLLCOLOR 1 -#else -# undef KEEP_SCROLLCOLOR -#endif - /* * the 'essential' information for reporting Mouse Events * pared down from XButtonEvent @@ -279,89 +261,10 @@ #define scrollBar_esc 30 -#if defined(RXVT_SCROLLBAR) || defined(NEXT_SCROLLBAR) || defined(XTERM_SCROLLBAR) || defined(PLAIN_SCROLLBAR) -# define HAVE_SCROLLBARS 1 +#if !defined (RXVT_SCROLLBAR) && !defined (NEXT_SCROLLBAR) +# define NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1 #endif -#define R_SB_ALIGN_CENTRE 0 -#define R_SB_ALIGN_TOP 1 -#define R_SB_ALIGN_BOTTOM 2 - -#define R_SB_NEXT 1 -#define R_SB_XTERM 2 -#define R_SB_PLAIN 4 -#define R_SB_RXVT 8 - -#define SB_WIDTH_NEXT 19 -#define SB_WIDTH_XTERM 15 -#define SB_WIDTH_PLAIN 7 -#ifndef SB_WIDTH_RXVT -# define SB_WIDTH_RXVT 10 -#endif - -/* - * NeXT scrollbar defines - */ -#define SB_PADDING 1 -#define SB_BORDER_WIDTH 1 -#define SB_BEVEL_WIDTH_UPPER_LEFT 1 -#define SB_BEVEL_WIDTH_LOWER_RIGHT 2 -#define SB_LEFT_PADDING (SB_PADDING + SB_BORDER_WIDTH) -#define SB_MARGIN_SPACE (SB_PADDING * 2) -#define SB_BUTTON_WIDTH (SB_WIDTH_NEXT - SB_MARGIN_SPACE - SB_BORDER_WIDTH) -#define SB_BUTTON_HEIGHT (SB_BUTTON_WIDTH) -#define SB_BUTTON_SINGLE_HEIGHT (SB_BUTTON_HEIGHT + SB_PADDING) -#define SB_BUTTON_BOTH_HEIGHT (SB_BUTTON_SINGLE_HEIGHT * 2) -#define SB_BUTTON_TOTAL_HEIGHT (SB_BUTTON_BOTH_HEIGHT + SB_PADDING) -#define SB_BUTTON_BEVEL_X (SB_LEFT_PADDING) -#define SB_BUTTON_FACE_X (SB_BUTTON_BEVEL_X + SB_BEVEL_WIDTH_UPPER_LEFT) -#define SB_THUMB_MIN_HEIGHT (SB_BUTTON_WIDTH - (SB_PADDING * 2)) - /* - * +-------------+ - * | | <---< SB_PADDING - * | ::::::::::: | - * | ::::::::::: | - * ''''''''''''''''' - * ,,,,,,,,,,,,,,,,, - * | ::::::::::: | - * | ::::::::::: | - * | +---------------< SB_BEVEL_WIDTH_UPPER_LEFT - * | | :::::::: | - * | V :::: vv-------< SB_BEVEL_WIDTH_LOWER_RIGHT - * | +---------+ | - * | | ......%%| | - * | | ......%%| | - * | | .. ()..%%| | - * | | ......%%| | - * | | %%%%%%%%| | - * | +---------+ | <......................... - * | | <---< SB_PADDING : - * | +---------+ | <-+.......... :---< SB_BUTTON_TOTAL_HEIGHT - * | | ......%%| | | : : - * | | ../\..%%| | |---< SB_BUTTON_HEIGHT : - * | | %%%%%%%%| | | : : - * | +---------+ | <-+ : : - * | | : : - * | +---------+ | <-+ :---< SB_BUTTON_BOTH_HEIGHT - * | | ......%%| | | : : - * | | ..\/..%%| | | : : - * | | %%%%%%%%| | |---< SB_BUTTON_SINGLE_HEIGHT - * | +---------+ | | : : - * | | | : : - * +-------------+ <-+.........:............: - * ^^|_________| : - * || | : - * || +---< SB_BUTTON_WIDTH - * || : - * |+------< SB_PADDING - * |: : - * +----< SB_BORDER_WIDTH - * : : - * :............: - * | - * +---< SB_WIDTH_NEXT - */ - enum { NO_REFRESH = 0, /* Window not visible at all! */ FAST_REFRESH = 1, /* Fully exposed window */ @@ -475,8 +378,8 @@ XTerm_title = 2, XTerm_property = 3, // change X property XTerm_Color = 4, // change colors - XTerm_Color00 = 10, // not implemented, CLASH! - XTerm_Color01 = 11, // not implemented + XTerm_Color00 = 10, // change fg color + XTerm_Color01 = 11, // change bg color XTerm_Color_cursor = 12, // change actual 'Cursor' color XTerm_Color_pointer_fg = 13, // change actual 'Pointer' fg color XTerm_Color_pointer_bg = 14, // change actual 'Pointer' bg color @@ -491,13 +394,15 @@ 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 */ - Rxvt_Color_BD = 18, // change actual 'Bold' color - Rxvt_Color_UL = 19, // change actual 'Underline' color + + // deprecated + Rxvt_Color_BD = 18, + Rxvt_Color_UL = 19, + Rxvt_restoreFG = 39, + Rxvt_restoreBG = 49, + 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 @@ -505,8 +410,8 @@ 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_Color_BD = 706, // change actual 'Bold' color + URxvt_Color_UL = 707, // change actual 'Underline' color URxvt_font = 710, URxvt_boldFont = 711, @@ -576,8 +481,8 @@ #ifdef OPTION_HC Color_HC, #endif -#ifdef KEEP_SCROLLCOLOR Color_scroll, +#ifdef RXVT_SCROLLBAR Color_trough, #endif #if ENABLE_TRANSPARENCY @@ -587,7 +492,7 @@ Color_fade, #endif NRS_COLORS, /* */ -#ifdef KEEP_SCROLLCOLOR +#ifdef RXVT_SCROLLBAR Color_topShadow = NRS_COLORS, Color_bottomShadow, TOTAL_COLORS @@ -633,6 +538,7 @@ #define PrivMode_LFNL (1UL<<19) #define PrivMode_MouseBtnEvent (1UL<<20) #define PrivMode_MouseAnyEvent (1UL<<21) +#define PrivMode_BracketPaste (1UL<<22) #define PrivMode_mouse_report (PrivMode_MouseX10|PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent) @@ -740,36 +646,6 @@ # define FONTSET(style) fontset[0] #endif -#ifdef HAVE_SCROLLBARS -# define scrollbar_TotalWidth() (scrollBar.width + sb_shadow * 2) -#else -# define scrollbar_TotalWidth() (0) -#endif -#define scrollbar_isMotion() (scrollBar.state == 'm') -#define scrollbar_isUp() (scrollBar.state == 'U') -#define scrollbar_isDn() (scrollBar.state == 'D') -#define scrollbar_isUpDn() isupper (scrollBar.state) -#define isScrollbarWindow(w) (scrollBar.state && (w) == scrollBar.win) - -#define scrollbarnext_dnval() (scrollBar.end + (scrollBar.width + 1)) -#define scrollbarnext_upButton(y) ((y) > scrollBar.end \ - && (y) <= scrollbarnext_dnval ()) -#define scrollbarnext_dnButton(y) ((y) > scrollbarnext_dnval()) -#define SCROLLNEXT_MINHEIGHT SB_THUMB_MIN_HEIGHT -#define scrollbarrxvt_upButton(y) ((y) < scrollBar.beg) -#define scrollbarrxvt_dnButton(y) ((y) > scrollBar.end) -#define SCROLLRXVT_MINHEIGHT 10 -#define SCROLLXTERM_MINHEIGHT 10 - -#define scrollbar_minheight() (scrollBar.style == R_SB_NEXT \ - ? SCROLLNEXT_MINHEIGHT \ - : SCROLLRXVT_MINHEIGHT) -#define scrollbar_above_slider(y) ((y) < scrollBar.top) -#define scrollbar_below_slider(y) ((y) > scrollBar.bot) -#define scrollbar_position(y) ((y) - scrollBar.beg) -#define scrollbar_size() (scrollBar.end - scrollBar.beg \ - - scrollbar_minheight ()) - typedef callback log_callback; typedef callback getfd_callback; @@ -1031,31 +907,12 @@ /* ------------------------------------------------------------------------- */ -typedef struct { - char state; /* scrollbar state */ - char init; /* scrollbar has been initialised */ - unsigned int beg; /* slider sub-window begin height */ - unsigned int end; /* slider sub-window end height */ - unsigned int top; /* slider top position */ - unsigned int bot; /* slider bottom position */ - unsigned int style; /* style: rxvt, xterm, next */ - unsigned int width; /* scrollbar width */ - Window win; - int (rxvt_term::*update)(int, int, int, int); - - void setIdle() { state = 1 ; } - void setMotion() { state = 'm'; } - void setUp() { state = 'U'; } - void setDn() { state = 'D'; } -} scrollBar_t; - struct rxvt_vars : TermWin_t { scrollBar_t scrollBar; uint8_t options[(Opt_count + 7) >> 3]; XSizeHints szHint; rxvt_color *pix_colors; Cursor TermWin_cursor; /* cursor for vt window */ - int sb_shadow; /* scrollbar shadow width */ int numlock_state; line_t *row_buf; // all lines, scrollback + terminal, circular, followed by temp_buf line_t *drawn_buf; // text on screen @@ -1106,7 +963,6 @@ #ifdef META8_OPTION meta_char, /* Alt-key prefix */ #endif - scrollbar_align, selection_wait, selection_type; /* ---------- */ @@ -1134,10 +990,6 @@ mouse_slip_wheel_speed, #endif refresh_count, - last_bot, /* scrollbar last bottom position */ - last_top, /* scrollbar last top position */ - last_state, /* scrollbar last state */ - scrollbar_len, window_vt_x, window_vt_y, window_sb_x, @@ -1189,11 +1041,9 @@ char * incr_buf; size_t incr_buf_size, incr_buf_fill; /* ---------- */ - Cursor leftptr_cursor; -/* ---------- */ struct mouse_event MEvent; XComposeStatus compose; - ttymode_t tio; + struct termios tio; row_col_t oldcursor; #ifdef HAVE_BG_PIXMAP bgPixmap_t bgPixmap; @@ -1254,7 +1104,6 @@ // ISO 14755 entry support unicode_t iso14755buf; void commit_iso14755 (); - int hex_keyval (XKeyEvent &ev); # if ISO_14755 void iso14755_51 (unicode_t ch, rend_t r = DEFAULT_RSTYLE, int x = 0, int y = -1); void iso14755_54 (int x, int y); @@ -1285,9 +1134,7 @@ void x_cb (XEvent &xev); xevent_watcher termwin_ev; xevent_watcher vt_ev; -#ifdef HAVE_SCROLLBARS xevent_watcher scrollbar_ev; -#endif void child_cb (ev::child &w, int revents); ev::child child_ev; void destroy_cb (ev::idle &w, int revents); ev::idle destroy_ev; @@ -1398,8 +1245,8 @@ void process_graphics (); // init.C void init_vars (); - void init_secondary (); 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 (); @@ -1416,7 +1263,6 @@ ~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); @@ -1625,7 +1471,6 @@ 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); // xdefaults.C void get_options (int argc, const char *const *argv);