--- rxvt-unicode/src/rxvt.h 2003/12/18 07:31:19 1.17 +++ rxvt-unicode/src/rxvt.h 2004/02/09 07:11:49 1.31 @@ -1,9 +1,5 @@ -/* - * $Id: rxvt.h,v 1.17 2003/12/18 07:31:19 pcg Exp $ - */ - -#ifndef _RXVT_H_ /* include once only */ -#define _RXVT_H_ +#ifndef RXVT_H_ /* include once only */ +#define RXVT_H_ #include "rxvtlib.h" @@ -188,7 +184,7 @@ #define scrollBar_esc 30 #define menuBar_margin 2 /* margin below text */ -#if defined(RXVT_SCROLLBAR) || defined(NEXT_SCROLLBAR) || defined(XTERM_SCROLLBAR) +#if defined(RXVT_SCROLLBAR) || defined(NEXT_SCROLLBAR) || defined(XTERM_SCROLLBAR) || defined(PLAIN_SCROLLBAR) # define HAVE_SCROLLBARS #endif @@ -206,9 +202,11 @@ #define R_SB_RXVT 0 #define R_SB_NEXT 1 #define R_SB_XTERM 2 +#define R_SB_PLAIN 4 #define SB_WIDTH_NEXT 19 -#define SB_WIDTH_XTERM 7 +#define SB_WIDTH_XTERM 15 +#define SB_WIDTH_PLAIN 7 #ifndef SB_WIDTH_RXVT # define SB_WIDTH_RXVT 10 #endif @@ -320,13 +318,7 @@ SECONDARY }; -enum { - SBYTE = 0, - WBYTE -}; - - -#define RS_None 0 /* Normal */ +#define RS_None 0 /* Normal */ #define RS_fgMask 0x000001FFu /* 512 colors */ #define RS_bgMask 0x0003FE00u /* 512 colors */ @@ -335,14 +327,11 @@ #define RS_RVid 0x00100000u /* reverse video */ #define RS_Uline 0x00200000u /* underline */ -#define RS_wide 0x00400000u /* only multibyte characters */ -#define IS_WIDE(r) ((r) & RS_wide) - -#define RS_fontMask 0xff000000u /* plenty(?) of fonts */ -#define RS_fontShift 24 +#define RS_fontMask 0xffc00000u /* plenty(?) of fonts */ +#define RS_fontShift 22 #define RS_baseattrMask (RS_Bold|RS_Blink|RS_RVid|RS_Uline) -#define RS_attrMask (RS_baseattrMask|RS_fontMask|RS_wide) +#define RS_attrMask (RS_baseattrMask|RS_fontMask) #define Sel_none 0 /* Not waiting */ #define Sel_normal 0x01 /* normal selection */ @@ -352,7 +341,8 @@ #define Sel_Secondary 0x02 #define Sel_Clipboard 0x03 #define Sel_whereMask 0x0f -#define Sel_CompoundText 0x10 /* last request was Compound */ +#define Sel_CompoundText 0x10 /* last request was COMPOUND_TEXT */ +#define Sel_UTF8String 0x20 /* last request was UTF8_STRING */ enum { C0_NUL = 0x00, @@ -457,10 +447,10 @@ }; #define Color_Bits 9 -#define NPIXCLR_SETS 9 /* (256 + 14) bits / 32 bits */ +#define NPIXCLR_SETS ((TOTAL_COLORS + 31) / 32) #define NPIXCLR_BITS 32 -#define DEFAULT_RSTYLE (RS_None | (Color_fg) | (Color_bg<PrivateModes |= (bit); \ + PrivateModes |= (bit); \ else \ - R->PrivateModes &= ~(bit) + PrivateModes &= ~(bit) #ifdef ALLOW_132_MODE # define PrivMode_Default \ @@ -623,24 +608,15 @@ (PrivMode_Autowrap|PrivMode_aplKP|PrivMode_ShiftKeys|PrivMode_VisibleCursor) #endif -#ifdef PREFER_24BIT -# define XDEPTH R->Xdepth -# define XCMAP R->Xcmap -# define XVISUAL R->Xvisual -#else -# ifdef DEBUG_DEPTH -# define XDEPTH DEBUG_DEPTH -# else -# define XDEPTH DefaultDepth(R->Xdisplay,Xscreen) -# define XCMAP DefaultColormap(R->Xdisplay,Xscreen) -# define XVISUAL DefaultVisual(R->Xdisplay,Xscreen) -# endif -#endif -#define IMBUFSIZ 128 /* input modifier buffer sizes */ +#define XDEPTH display->depth +#define XCMAP display->cmap +#define XVISUAL display->visual + +#define IMBUFSIZ 128 /* input modifier buffer sizes */ #ifndef BUFSIZ -# define BUFSIZ 4096 +# define BUFSIZ 4096 #endif -#define KBUFSZ 512 /* size of keyboard mapping buffer */ +#define KBUFSZ 512 /* size of keyboard mapping buffer */ /* ***************************************************************************** @@ -664,20 +640,17 @@ #define STRRCHR(x, y) strrchr((const char *)(x), (int)(y)) /* convert pixel dimensions to row/column values. Everything as int32_t */ -#define Pixel2Col(x) Pixel2Width((int32_t)(x) - (int32_t)R->TermWin.int_bwidth) -#define Pixel2Row(y) Pixel2Height((int32_t)(y) - (int32_t)R->TermWin.int_bwidth) -#define Pixel2Width(x) ((int32_t)(x) / (int32_t)R->TermWin.fwidth) -#define Pixel2Height(y) ((int32_t)(y) / (int32_t)R->TermWin.fheight) -#define Col2Pixel(col) ((int32_t)Width2Pixel(col) + (int32_t)R->TermWin.int_bwidth) -#define Row2Pixel(row) ((int32_t)Height2Pixel(row) + (int32_t)R->TermWin.int_bwidth) -#define Width2Pixel(n) ((int32_t)(n) * (int32_t)R->TermWin.fwidth) -#define Height2Pixel(n) ((int32_t)(n) * (int32_t)R->TermWin.fheight) - -#define TermWin_TotalWidth() ((int32_t)R->TermWin.width + 2 * (int32_t)R->TermWin.int_bwidth) -#define TermWin_TotalHeight() ((int32_t)R->TermWin.height + 2 * (int32_t)R->TermWin.int_bwidth) +#define Pixel2Col(x) Pixel2Width((int32_t)(x) - (int32_t)TermWin.int_bwidth) +#define Pixel2Row(y) Pixel2Height((int32_t)(y) - (int32_t)TermWin.int_bwidth) +#define Pixel2Width(x) ((int32_t)(x) / (int32_t)TermWin.fwidth) +#define Pixel2Height(y) ((int32_t)(y) / (int32_t)TermWin.fheight) +#define Col2Pixel(col) ((int32_t)Width2Pixel(col) + (int32_t)TermWin.int_bwidth) +#define Row2Pixel(row) ((int32_t)Height2Pixel(row) + (int32_t)TermWin.int_bwidth) +#define Width2Pixel(n) ((int32_t)(n) * (int32_t)TermWin.fwidth) +#define Height2Pixel(n) ((int32_t)(n) * (int32_t)TermWin.fheight) -#define Xscreen DefaultScreen(R->Xdisplay) -#define Xroot DefaultRootWindow(R->Xdisplay) +#define TermWin_TotalWidth() ((int32_t)TermWin.width + 2 * (int32_t)TermWin.int_bwidth) +#define TermWin_TotalHeight() ((int32_t)TermWin.height + 2 * (int32_t)TermWin.int_bwidth) /* how to build & extract colors and attributes */ #define GET_BASEFG(x) (((x) & RS_fgMask)) @@ -712,44 +685,44 @@ #define SET_BGCOLOR(x,bg) (((x) & ~RS_bgMask) | ((bg)<pixcolor_set[(x) / NPIXCLR_BITS] |= (1 << ((x) % NPIXCLR_BITS))) -#define ISSET_PIXCOLOR(h, x) ((h)->pixcolor_set[(x) / NPIXCLR_BITS] & (1 << ((x) % NPIXCLR_BITS))) +#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))) #ifdef HAVE_SCROLLBARS -# define scrollbar_TotalWidth() (R->scrollBar.width + R->sb_shadow * 2) +# define scrollbar_TotalWidth() (scrollBar.width + sb_shadow * 2) #else # define scrollbar_TotalWidth() (0) #endif -#define scrollbar_isMotion() (R->scrollBar.state == 'm') -#define scrollbar_isUp() (R->scrollBar.state == 'U') -#define scrollbar_isDn() (R->scrollBar.state == 'D') -#define scrollbar_isUpDn() isupper (R->scrollBar.state) -#define isScrollbarWindow(w) (R->scrollBar.state && (w) == R->scrollBar.win) +#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() (R->scrollBar.end + (R->scrollBar.width + 1)) -#define scrollbarnext_upButton(y) ((y) > R->scrollBar.end \ +#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) < R->scrollBar.beg) -#define scrollbarrxvt_dnButton(y) ((y) > R->scrollBar.end) +#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() (R->scrollBar.style == R_SB_NEXT \ +#define scrollbar_minheight() (scrollBar.style == R_SB_NEXT \ ? SCROLLNEXT_MINHEIGHT \ : SCROLLRXVT_MINHEIGHT) -#define scrollbar_above_slider(y) ((y) < R->scrollBar.top) -#define scrollbar_below_slider(y) ((y) > R->scrollBar.bot) -#define scrollbar_position(y) ((y) - R->scrollBar.beg) -#define scrollbar_size() (R->scrollBar.end - R->scrollBar.beg \ +#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()) #if (MENUBAR_MAX > 1) /* rendition style flags */ -# define menuBar_height() (R->TermWin.fheight + SHADOW) +# define menuBar_height() (TermWin.fheight + SHADOW) # define menuBar_TotalHeight() (menuBar_height() + SHADOW + menuBar_margin) -# define isMenuBarWindow(w) ((w) == R->menuBar.win) +# define isMenuBarWindow(w) ((w) == menuBar.win) #else # define menuBar_height() (0) # define menuBar_TotalHeight() (0) @@ -833,7 +806,18 @@ #endif #define BLINK_INTERVAL 0.5 +#define TEXT_BLINK_INTERVAL 0.5 + +#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 { mbstate_t mbs; @@ -861,6 +845,9 @@ #ifdef CURSOR_BLINK hidden_cursor:1, #endif +#ifdef TEXT_BLINK + hidden_text:1, +#endif #ifdef POINTER_BLANK hidden_pointer:1, #endif @@ -887,7 +874,7 @@ #endif short rvideo; int16_t num_scr; /* screen: number lines scrolled */ - uint16_t prev_ncol, /* screen: previous number of columns */ + unsigned int prev_ncol, /* screen: previous number of columns */ prev_nrow; /* screen: previous number of rows */ #ifdef RXVT_GRAPHICS uint16_t gr_prev_start; @@ -923,7 +910,6 @@ last_top, /* scrollbar last top position */ last_state, /* scrollbar last state */ scrollbar_len, - currmaxcol, #ifdef MENUBAR menu_readonly, /* okay to alter menu? */ Arrows_x, @@ -950,10 +936,6 @@ unsigned long PrivateModes, SavedModes; /* ---------- */ -#ifdef PREFER_24BIT - Visual *Xvisual; -#endif -/* ---------- */ Atom xa[NUM_XA]; /* ---------- */ #ifdef MENUBAR @@ -968,6 +950,9 @@ GC xscrollbarGC, ShadowGC; #endif +#ifdef PLAIN_SCROLLBAR + GC pscrollbarGC; +#endif #ifdef NEXT_SCROLLBAR GC blackGC, whiteGC, @@ -1067,7 +1052,6 @@ char *env_display; /* environmental variable DISPLAY */ char *env_term; /* environmental variable TERM */ char *env_colorfgbg; - char *buffer; char *locale; char *codeset; char charsets[4]; @@ -1081,7 +1065,6 @@ /* command input buffering */ unsigned char *cmdbuf_ptr, *cmdbuf_endp; unsigned char cmdbuf_base[BUFSIZ]; - unsigned char kbuf[KBUFSZ]; rxvt_salloc *ralloc; rxvt_salloc *talloc; @@ -1090,16 +1073,33 @@ void flush (); +#ifdef TRANSPARENT + void rootwin_cb (XEvent &xev); + xevent_watcher rootwin_ev; +#endif + + void x_cb (XEvent &xev); + xevent_watcher termwin_ev; + xevent_watcher vt_ev; +#ifdef HAVE_SCROLLBARS + xevent_watcher scrollbar_ev; +#endif +#ifdef MENUBAR + xevent_watcher menubar_ev; +#endif + void check_cb (check_watcher &w); check_watcher check_ev; void destroy_cb (time_watcher &w); time_watcher destroy_ev; void pty_cb (io_watcher &w, short revents); io_watcher pty_ev; - void x_cb (io_watcher &w, short revents); io_watcher x_ev; void incr_cb (time_watcher &w); time_watcher incr_ev; #ifdef CURSOR_BLINK - void blink_cb (time_watcher &w); time_watcher blink_ev; + void cursor_blink_cb (time_watcher &w); time_watcher cursor_blink_ev; +#endif +#ifdef TEXT_BLINK + void text_blink_cb (time_watcher &w); time_watcher text_blink_ev; #endif #ifdef POINTER_BLANK @@ -1123,7 +1123,6 @@ uint32_t next_char (); bool pty_fill (); - void process_x_events (); void *operator new (size_t s); void operator delete (void *p, size_t s); @@ -1139,6 +1138,24 @@ void color_aliases(int idx); void recolour_cursor (); + void create_windows (int argc, const char *const *argv); + void resize_all_windows (unsigned int width, unsigned int height, int ignoreparent); + void window_calc (unsigned int width, unsigned int height); + void set_preedit_area (XRectangle * preedit_rect, XRectangle * status_rect, XRectangle * needed_rect); + +#if USE_XIM + void set_size (XRectangle *size); + void set_position (XPoint *pos); + void set_color (unsigned long *fg, unsigned long *bg); +#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); /* screen(!) */ void scr_blank_line (text_t *et, rend_t *er, unsigned int width, rend_t efs); @@ -1147,20 +1164,188 @@ void scr_reset (); void scr_reset_realloc (); void scr_release (); + void scr_clear (); + 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_touch (bool refresh); + void scr_expose (int x, int y, int width, int height, bool refresh); + + /* autoconvert */ + + // command.C + void lookup_key (XKeyEvent &ev); + unsigned int cmd_write (const unsigned char *str, unsigned int count); + uint32_t cmd_getc (); + void mouse_report (const XButtonEvent &ev); + void button_press (const XButtonEvent &ev); + void button_release (const XButtonEvent &ev); + int check_our_parents (); +#ifdef PRINTPIPE + FILE * popen_printer (); + int pclose_printer (FILE *stream); +#endif + void process_print_pipe (); + void process_nonprinting (unsigned char ch); + void process_escape_vt52 (unsigned char ch); + void process_escape_seq (); + void process_csi_seq (); + void process_window_ops (const int *args, unsigned int nargs); + unsigned char * get_to_st (unsigned char *ends_how); + void process_dcs_seq (); + void process_osc_seq (); + void xterm_seq (int op, const char *str, unsigned char resp __attribute__((unused))); + 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 Get_Colours (); + void get_ourmods (); + // logging.C + void makeutent (const char *pty, const char *hostname); + void cleanutent (); + // main.C; + void privileges (int mode); + void privileged_utmp (char action); + void privileged_ttydev (char action); + void change_font (int init, const char *fontname); + void font_up_down (int n, int direction); + void set_title (const char *str); + void set_iconName (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); + void set_widthheight (unsigned int width, unsigned int height); + bool IMisRunning (); + void IMSendSpot (); + bool IM_get_IC (); + void IMSetStatusPosition (); + +#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 (*update)(rxvt_t *)); + 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 scr_poweron (); + void scr_cursor (int mode); + 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 uint32_t *str, int nlines, int len); + void scr_backspace (); + void scr_tab (int count); + void scr_backindex (); + void scr_forwardindex (); + 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 (uint16_t oldviewstart); + void scr_bell (); + void scr_printscreen (int fullhist); + void scr_reverse_selection (); + void scr_dump (int fd); + void selection_check (int check_more); + int 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 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); + +#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 + 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 + +#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 + 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); + void get_xdefaults (FILE *stream, const char *name); + void extract_resources (Display *display, const char *name); + // xpm.C + int scale_pixmap (const char *geom); + void resize_pixmap (); + Pixmap set_bgPixmap (const char *file); }; #define SET_LOCALE(locale) rxvt_set_locale (locale) extern void rxvt_set_locale (const char *locale); -#ifndef __attribute__ -# ifdef __GNUC__ -# if (__GNUC__ == 2 && __GNUC_MINOR__ < 5) || (__GNUC__ < 2) -# define __attribute__(x) -# endif -# endif -# define __attribute__(x) -#endif - /* ***************************************************************************** * PROTOTYPES