--- rxvt-unicode/src/rxvt.h 2007/12/29 14:40:09 1.345 +++ rxvt-unicode/src/rxvt.h 2008/11/04 14:25:10 1.370 @@ -99,15 +99,6 @@ * 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; @@ -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,8 +261,8 @@ #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 enum { @@ -396,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 @@ -412,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 @@ -426,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, @@ -437,7 +421,7 @@ URxvt_view_up = 720, URxvt_view_down = 721, - URxvt_perl = 777, + URxvt_perl = 777, // for use by perl extensions, starts with "extension-name;" }; /* Words starting with `Color_' are colours. Others are counts */ @@ -497,8 +481,8 @@ #ifdef OPTION_HC Color_HC, #endif -#ifdef KEEP_SCROLLCOLOR Color_scroll, +#ifdef RXVT_SCROLLBAR Color_trough, #endif #if ENABLE_TRANSPARENCY @@ -508,7 +492,7 @@ Color_fade, #endif NRS_COLORS, /* */ -#ifdef KEEP_SCROLLCOLOR +#ifdef RXVT_SCROLLBAR Color_topShadow = NRS_COLORS, Color_bottomShadow, TOTAL_COLORS @@ -554,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) @@ -567,6 +552,7 @@ #define IMBUFSIZ 128 // input modifier buffer sizes #define KBUFSZ 512 // size of keyboard mapping buffer #define CBUFSIZ 2048 // size of command buffer +#define CBUFCNT 8 // never call pty_fill/cmd_parse more than this often in a row #define UBUFSIZ 2048 // character buffer #if ENABLE_FRILLS @@ -818,7 +804,7 @@ * | terminal +---------+ * | terminal | * | terminal | - * +------------+···········= term_stat + nrow - 1 + * +------------+···········= term_start + nrow - 1 * | * | * END······················= total_rows @@ -864,7 +850,7 @@ * beg: row/column of beginning of selection : never past mark * mark: row/column of initial click : never past end * end: row/column of one character past end of selection - * * Note: -nsaved <= beg.row <= mark.row <= end.row < nrow + * * Note: top_row <= beg.row <= mark.row <= end.row < nrow * * Note: col == -1 ==> we're left of screen * */ @@ -960,6 +946,9 @@ current_screen:1, /* primary or secondary */ num_scr_allow:1, bypass_keystate:1, +#ifdef ENABLE_FRILLS + urgency_hint:1, +#endif #ifdef CURSOR_BLINK hidden_cursor:1, #endif @@ -978,7 +967,6 @@ #ifdef META8_OPTION meta_char, /* Alt-key prefix */ #endif - scrollbar_align, selection_wait, selection_type; /* ---------- */ @@ -1006,12 +994,8 @@ mouse_slip_wheel_speed, #endif refresh_count, - last_bot, /* scrollbar last bottom position */ - last_top, /* scrollbar last top position */ - last_state, /* scrollbar last state */ window_vt_x, window_vt_y, - window_sb_x, mouse_row, mouse_col, # ifdef POINTER_BLANK @@ -1029,39 +1013,12 @@ /* ---------- */ Atom *xa; /* ---------- */ -#ifdef RXVT_SCROLLBAR - GC scrollbarGC, - topShadowGC, - botShadowGC; -#endif -#ifdef XTERM_SCROLLBAR - GC xscrollbarGC, - ShadowGC; -#endif -#ifdef PLAIN_SCROLLBAR - GC pscrollbarGC; -#endif -#ifdef NEXT_SCROLLBAR - GC blackGC, - whiteGC, - grayGC, - darkGC, - stippleGC; - Pixmap dimple, - upArrow, - downArrow, - upArrowHi, - downArrowHi; -#endif -/* ---------- */ Time selection_time, selection_request_time; pid_t cmd_pid; /* process id of child */ char * incr_buf; size_t incr_buf_size, incr_buf_fill; /* ---------- */ - Cursor leftptr_cursor; -/* ---------- */ struct mouse_event MEvent; XComposeStatus compose; struct termios tio; @@ -1072,6 +1029,12 @@ #ifdef HAVE_AFTERIMAGE ASVisual *asv; ASImageManager *asimman; + + void init_asv () + { + if (!asv) + asv = create_asvisual_for_id (dpy, display->screen, depth, XVisualIDFromVisual (visual), cmap, NULL); + } #endif #if ENABLE_OVERLAY @@ -1125,7 +1088,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); @@ -1156,9 +1118,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; @@ -1241,12 +1201,13 @@ uint32_t next_octet () NOTHROW; uint32_t cmd_get8 () THROW ((class out_of_input)); - bool cmd_parse (); + void cmd_parse (); void mouse_report (XButtonEvent &ev); void button_press (XButtonEvent &ev); void button_release (XButtonEvent &ev); void focus_in (); void focus_out (); + void set_urgency (bool enable); void update_fade_color (unsigned int idx); #ifdef PRINTPIPE FILE *popen_printer (); @@ -1269,8 +1230,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 (); @@ -1279,7 +1240,7 @@ 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_colours (); void get_ourmods (); // main.C void tt_winch (); @@ -1287,7 +1248,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); @@ -1383,7 +1343,7 @@ options[opt >> 3] &= ~(1 << (opt & 7)); } - void PrivMode (int set, unsigned bit) NOTHROW + void set_privmode (unsigned bit, int set) NOTHROW { if (set) priv_modes |= bit; @@ -1395,6 +1355,7 @@ 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; + void scr_kill_char (line_t &l, int col) const NOTHROW; int scr_scroll_text (int row1, int row2, int count) NOTHROW; void scr_reset (); void scr_release () NOTHROW; @@ -1469,35 +1430,6 @@ 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 - Pixmap renderPixmap (const char *const *data, int width, int height); - void init_scrollbar_stuff (); - void drawBevel (Drawable d, int x1, int y1, int w, int h); - int scrollbar_show_next (int update, int last_top, int last_bot, int scrollbar_len); -#endif - -#if defined(RXVT_SCROLLBAR) - // scrollbar-rxvt.C - int scrollbar_show_rxvt (int update, int last_top, int last_bot, int scrollbar_len); -#endif - -#if defined(XTERM_SCROLLBAR) - // scrollbar-xterm.C - int scrollbar_show_xterm (int update, int last_top, int last_bot, int scrollbar_len); -#endif - -#if defined(PLAIN_SCROLLBAR) - // scrollbar-plain.C - int scrollbar_show_plain (int update, int last_top, int last_bot, int scrollbar_len); -#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); - // xdefaults.C void get_options (int argc, const char *const *argv); int parse_keysym (const char *str, const char *arg);