--- rxvt-unicode/src/rxvt.h 2006/01/12 00:35:39 1.198 +++ rxvt-unicode/src/rxvt.h 2006/01/16 15:12:48 1.209 @@ -5,6 +5,23 @@ #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 CURSOR_BLINK 1 +#else +# define ENABLE_MINIMAL 1 +#endif + #include #include @@ -23,10 +40,13 @@ #include "rxvtperl.h" -#if ENABLE_FRILLS -# define ENABLE_XEMBED 1 -# define ENABLE_EWMH 1 -# define CURSOR_BLINK 1 +// 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 /* @@ -45,7 +65,7 @@ #endif #ifndef HAVE_XPOINTER -typedef char *XPointer; +typedef char *XPointer; #endif #ifdef HAVE_TERMIOS_H @@ -121,31 +141,17 @@ extern char **environ; extern char **rxvt_environ; // the original environ pointer -struct temp_environ +inline void set_environ (stringvec *envv) { - char **prev; - - temp_environ (const stringvec *envv) - : prev(environ) - { - if (envv) - environ = (char **)envv->begin (); - } + if (envv) + environ = (char **)envv->begin (); +} - temp_environ (char **env) - : prev(environ) - { - if (env) - environ = env; - } - - ~temp_environ () - { - environ = prev; - } -}; - -#define TEMP_ENV temp_environ temp_environ (envv) +inline void set_environ (char **envv) +{ + if (envv) + environ = envv; +} /* ***************************************************************************** @@ -154,18 +160,10 @@ */ 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 @@ -245,10 +243,6 @@ # define NO_MOUSE_REPORT_SCROLLBAR 1 #endif -#if defined (ISO_14755) || defined (ENABLE_PERL) -# define ENABLE_OVERLAY 1 -#endif - /* now look for other badly set stuff */ #if !defined (EACCESS) && defined(EAGAIN) @@ -260,21 +254,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 MENU_SHADOW 1 -#else -# define MENU_SHADOW 2 -#endif - #define R_SB_ALIGN_CENTRE 0 #define R_SB_ALIGN_TOP 1 #define R_SB_ALIGN_BOTTOM 2 @@ -491,7 +476,7 @@ Rxvt_dumpscreen = 55, // dump scrollback and all of screen URxvt_locale = 701, // change locale - URxvt_Menu = 703, // set menu item + URxvt_Color_IT = 704, // change actual 'Italic' colour URxvt_Color_tint = 705, // change actual tint colour URxvt_Color_BD = 706, @@ -656,14 +641,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) \ @@ -803,17 +787,6 @@ #define scrollbar_size() (scrollBar.end - scrollBar.beg \ - scrollbar_minheight ()) -#if (MENUBAR_MAX > 1) -/* rendition style flags */ -# define menuBar_height() (fheight + MENU_SHADOW) -# define menuBar_TotalHeight() (menuBar_height() + MENU_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 @@ -877,10 +850,6 @@ /****************************************************************************/ -#ifdef MENUBAR -# include "menubar.h" -#endif - #define BLINK_INTERVAL 0.5 #define TEXT_BLINK_INTERVAL 0.5 @@ -1073,13 +1042,6 @@ 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, @@ -1098,10 +1060,7 @@ /* ---------- */ Atom xa[NUM_XA]; /* ---------- */ -#ifdef MENUBAR - GC menubarGC; -#endif -#if defined(MENUBAR) || defined(RXVT_SCROLLBAR) +#ifdef RXVT_SCROLLBAR GC scrollbarGC, topShadowGC, botShadowGC; @@ -1160,14 +1119,6 @@ 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 #if ENABLE_OVERLAY int ov_x, ov_y, ov_w, ov_h; // overlay dimensions @@ -1224,7 +1175,12 @@ // modifies first argument(!) void paste (char *data, unsigned int len); - void flush (); + long vt_emask, vt_emask_perl; + + void vt_select_input () const + { + XSelectInput (display->display, vt, vt_emask | vt_emask_perl); + } #if TRANSPARENT void rootwin_cb (XEvent &xev); @@ -1232,14 +1188,12 @@ #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 check_cb (check_watcher &w); check_watcher check_ev; void destroy_cb (time_watcher &w); time_watcher destroy_ev; @@ -1289,6 +1243,13 @@ bool pty_fill (); + void make_current () const // make this the "currently active" urxvt instance + { + SET_R (this); + rxvt_set_locale (locale); + set_environ (envv); + } + void init_secondary (); const char **init_resources (int argc, const char *const *argv); const char *x_resource (const char *name); @@ -1387,42 +1348,9 @@ int rXParseAllocColor (rxvt_color * screen_in_out, const char *colour); 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 (); @@ -1436,7 +1364,7 @@ } #endif - void lresize (line_t &l) + void lresize (line_t &l) const { if (!l.t) return; @@ -1450,7 +1378,7 @@ scr_blank_line (l, prev_ncol, ncol - prev_ncol, DEFAULT_RSTYLE); } - int fgcolor_of (rend_t r) + int fgcolor_of (rend_t r) const { int base = GET_BASEFG (r); #ifndef NO_BRIGHTCOLOR @@ -1464,7 +1392,7 @@ return base; } - int bgcolor_of (rend_t r) + int bgcolor_of (rend_t r) const { int base = GET_BASEBG (r); #ifndef NO_BRIGHTCOLOR @@ -1478,7 +1406,7 @@ return base; } - bool option (uint32_t opt) + bool option (uint32_t opt) const { return OPTION (opt); } @@ -1491,8 +1419,8 @@ options &= ~opt; } - 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); + void scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) const; + void scr_blank_screen_mem (line_t &l, rend_t efs) const; int scr_scroll_text (int row1, int row2, int count); void scr_reset (); void scr_release (); @@ -1538,9 +1466,9 @@ 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_move_to (int y, int len); + bool scr_page (enum page_dirn direction, int nlines); + bool scr_changeview (int new_view_start); void scr_bell (); void scr_printscreen (int fullhist); void scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle1, rend_t rstyle2);