[ViewVC] Diff of: cvs/rxvt-unicode/src/rxvt.h

Comparing rxvt-unicode/src/rxvt.h (file contents):
Revision 1.356 by ayin, Tue Jan 29 14:45:54 2008 UTC vs.
Revision 1.410 by sf-exg, Mon Jul 19 16:43:21 2010 UTC

 /*
  *****************************************************************************
  * 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
 #ifndef STDIN_FILENO
 # define STDIN_FILENO   0
 # define STDOUT_FILENO  1
 # define STDERR_FILENO  2
-#endif
-#if !defined (EACCESS) && defined(EAGAIN)
-# define EACCESS EAGAIN
 #endif
 #ifndef EXIT_SUCCESS            /* missing from <stdlib.h> */
 # define EXIT_SUCCESS           0       /* exit function success */
 # define EXIT_FAILURE           1       /* exit function failure */
 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_basename                    (const char *str) NOTHROW;
+const char *     rxvt_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;
 /*
  * the 'essential' information for reporting Mouse Events
  * pared down from XButtonEvent
  */
-struct mouse_event {
+struct mouse_event
+{
   int clicks;
   Time time;             /* milliseconds */
   unsigned int state;    /* key or button mask */
   unsigned int button;   /* detail */
 };
 # define COLORTERMENVFULL COLORTERMENV "-xpm"
 #else
 # define COLORTERMENVFULL COLORTERMENV
 #endif
 #ifndef TERMENV
+# if USE_256_COLORS
+#  define TERMENV        "rxvt-unicode-256color"
+# else
-# define TERMENV        "rxvt-unicode"
+#  define TERMENV        "rxvt-unicode"
+# endif
 #endif
 #if defined (NO_MOUSE_REPORT) && !defined (NO_MOUSE_REPORT_SCROLLBAR)
 # define NO_MOUSE_REPORT_SCROLLBAR 1
 #endif
 enum {
   PRIMARY = 0,
   SECONDARY,
 };
+// define various rendition bits and masks. the rendition word
+// is 32 bits in size, and we should use it as efficiently as possible
 #define RS_None                 0
-#define RS_fgMask               0x0000007fUL    // 128 colors
+// GET_BGATTR depends on RS_fgShift > RS_bgShift
-#define RS_bgMask               0x00003f80UL    // 128 colors
+#define RS_colorMask		((1UL << Color_Bits) - 1UL)
+#define RS_bgShift		0
+#define RS_fgShift		(RS_bgShift + Color_Bits)
+#define RS_bgMask               (RS_colorMask << RS_bgShift)
+#define RS_fgMask               (RS_colorMask << RS_fgShift)
+// must have space for rxvt_fontset::fontCount * 2 + 2 values
+#define RS_fontShift            (RS_fgShift + Color_Bits)
+#define RS_Careful		(1UL << RS_fontShift)	/* be careful when drawing these */
+#define RS_fontCount		rxvt_fontset::fontCount
+#define RS_fontMask             ((RS_fontCount << (RS_fontShift + 1)) | RS_Careful)   // includes RS_Careful
+// toggle this to force redraw, must be != RS_Careful and otherwise "pretty neutral"
+#define RS_redraw		(2UL << RS_fontShift)
+#define RS_Sel                  (1UL << 22)
+// 4 custom bits for extensions
+#define RS_customCount          16UL
+#define RS_customShift          23
+#define RS_customMask           ((RS_customCount - 1UL) << RS_customShift)
 // font styles
-#define RS_Bold                 0x00004000UL    // value 1
+#define RS_Bold                 (1UL << RS_styleShift)
-#define RS_Italic		0x00008000UL    // value 2
+#define RS_Italic		(2UL << RS_styleShift)
+#define RS_styleCount		4
+#define RS_styleShift		27
+#define RS_styleMask		(RS_Bold | RS_Italic)
 // fake styles
-#define RS_Blink                0x00010000UL    // blink
+#define RS_Blink                (1UL << 29)
-#define RS_RVid                 0x00020000UL    // reverse video
+#define RS_RVid                 (1UL << 30)    // reverse video
-#define RS_Uline                0x00040000UL    // underline
+#define RS_Uline                (1UL << 31)    // 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
-#define RS_customShift          19
-// other flags
-#define RS_Careful		0x80000000UL	/* be careful when drawing these */
-#define RS_styleCount		4
-#define RS_styleMask		(RS_Bold | RS_Italic)
-#define RS_styleShift		14
 #define RS_baseattrMask         (RS_Italic | RS_Bold | RS_Blink | RS_RVid | RS_Uline)
 #define RS_attrMask             (RS_baseattrMask | RS_fontMask)
-#define RS_fontCount		127		// not 127 or 256, see rxvtfont.h
-#define RS_fontMask             0xff000000UL    // plenty(?) of fonts, includes RS_Careful
-#define RS_fontShift            24
-#define DEFAULT_RSTYLE  (RS_None | Color_fg | (Color_bg << Color_Bits))
+#define DEFAULT_RSTYLE  (RS_None | (Color_fg    << RS_fgShift) | (Color_bg     << RS_bgShift))
-#define OVERLAY_RSTYLE  (RS_None | Color_Black | (Color_Yellow << Color_Bits))
+#define OVERLAY_RSTYLE  (RS_None | (Color_Black << RS_fgShift) | (Color_Yellow << RS_bgShift))
 #define Sel_none                0       /* Not waiting */
 #define Sel_normal              0x01    /* normal selection */
 #define Sel_incr                0x02    /* incremental selection */
 #define Sel_direct              0x00
   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
   XTerm_Color05          = 15,      // not implemented (tektronix fg)
   XTerm_Color06          = 16,      // not implemented (tektronix bg)
-  XTerm_Color_RV         = 17,      // change actual 'Highlight' color
+  XTerm_Color_HC         = 17,      // change actual 'Highlight' bg color
+  XTerm_Color_HTC        = 19,      // change actual 'Highlight' fg color
   XTerm_logfile          = 46,      // not implemented
   XTerm_font             = 50,
   XTerm_konsole30        = 30,      // reserved for konsole
   XTerm_konsole31        = 31,      // reserved for konsole
   /*
    * rxvt extensions of XTerm OSCs: ESC ] Ps;Pt (ST|BEL)
    */
   // deprecated
-  Rxvt_Color_BD          = 18,
-  Rxvt_Color_UL          = 19,
   Rxvt_restoreFG         = 39,
   Rxvt_restoreBG         = 49,
   Rxvt_Pixmap            = 20,      // new bg pixmap
   Rxvt_dumpscreen        = 55,      // dump scrollback and all of screen
   URxvt_Color_IT         = 704,     // change actual 'Italic' colour
   URxvt_Color_tint       = 705,     // change actual tint colour
   URxvt_Color_BD         = 706,     // change actual 'Bold' color
   URxvt_Color_UL         = 707,     // change actual 'Underline' color
+  URxvt_Color_border     = 708,
   URxvt_font             = 710,
   URxvt_boldFont         = 711,
   URxvt_italicFont       = 712,
   URxvt_boldItalicFont   = 713,
   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 */
 /*
  * The PixColor and rendition colour usage should probably be decoupled
   Color_White = maxBrightCOLOR,
 #else
   Color_White = maxCOLOR,
 #endif
   minTermCOLOR = Color_White + 1,
+#if USE_256_COLORS
+  maxTermCOLOR = Color_White + 240,
+#else
   maxTermCOLOR = Color_White + 72,
+#endif
 #ifndef NO_CURSORCOLOR
   Color_cursor,
   Color_cursor2,
 #endif
   Color_pointer_fg,
 #if ENABLE_FRILLS
   Color_underline,
 #endif
 #ifdef OPTION_HC
   Color_HC,
+  Color_HTC,
 #endif
   Color_scroll,
 #ifdef RXVT_SCROLLBAR
   Color_trough,
 #endif
 #else
   TOTAL_COLORS = NRS_COLORS
 #endif
 };
+#if USE_256_COLORS
+# define Color_Bits      9 // 0 .. maxTermCOLOR
+#else
-#define Color_Bits      7 // 0 .. maxTermCOLOR
+# define Color_Bits      7 // 0 .. maxTermCOLOR
+#endif
 /*
  * Resource list
  */
 enum {
 // do not change these constants lightly, there are many interdependencies
 #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
 # include <X11/Xmd.h>
-typedef struct _mwmhints {
+typedef struct _mwmhints
+{
   CARD32 flags;
   CARD32 functions;
   CARD32 decorations;
   INT32  input_mode;
   CARD32 status;
 /*
  *****************************************************************************
  * MACRO DEFINES
  *****************************************************************************
  */
+// speed hack, copy some member variable into a local variable of the same name
 #define dLocal(type,name)       type const name = this->name
 // 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))
 #define Col2Pixel(col)          ((int32_t)Width2Pixel(col))
 #define Row2Pixel(row)          ((int32_t)Height2Pixel(row))
 #define Width2Pixel(n)          ((int32_t)(n) * (int32_t)fwidth)
 #define Height2Pixel(n)         ((int32_t)(n) * (int32_t)fheight)
-#define LINENO(n) MOD (term_start + int(n), total_rows)
+#define LINENO_of(t,n) MOD ((t)->term_start + int(n), (t)->total_rows)
-#define ROW(n) row_buf [LINENO (n)]
+#define ROW_of(t,n) (t)->row_buf [LINENO_of ((t), n)]
+#define LINENO(n) LINENO_of (this, n)
+#define ROW(n) ROW_of (this, n)
 /* how to build & extract colors and attributes */
-#define GET_BASEFG(x)           (((x) & RS_fgMask))
+#define GET_BASEFG(x)           (((x) & RS_fgMask) >> RS_fgShift)
-#define GET_BASEBG(x)           (((x) & RS_bgMask)>>Color_Bits)
+#define GET_BASEBG(x)           (((x) & RS_bgMask) >> RS_bgShift)
 #define GET_FONT(x)             (((x) & RS_fontMask) >> RS_fontShift)
 #define SET_FONT(x,fid)         (((x) & ~RS_fontMask) | ((fid) << RS_fontShift))
 #define GET_STYLE(x)		(((x) & RS_styleMask) >> RS_styleShift)
 #define SET_STYLE(x,style)	(((x) & ~RS_styleMask) | ((style) << RS_styleShift))
 #define GET_ATTR(x)             (((x) & RS_attrMask))
+// return attributes defining the background, encoding doesn't matter
+// depends on RS_fgShift > RS_bgShift
-#define GET_BGATTR(x)                                                   \
+#define GET_BGATTR(x)                                      \
+  (expect_false ((x) & RS_RVid)                            \
-    (((x) & RS_RVid) ? (((x) & (RS_attrMask & ~RS_RVid))                \
+    ? (((x) & (RS_attrMask & ~RS_RVid))                    \
-                        | (((x) & RS_fgMask)<<Color_Bits))              \
+      | (((x) & RS_fgMask) >> (RS_fgShift - RS_bgShift)))  \
-                     : ((x) & (RS_attrMask | RS_bgMask)))
+    : ((x) & (RS_attrMask | RS_bgMask)))
-#define SET_FGCOLOR(x,fg)       (((x) & ~RS_fgMask)   | (fg))
+#define SET_FGCOLOR(x,fg)       (((x) & ~RS_fgMask)   | ((fg) << RS_fgShift))
-#define SET_BGCOLOR(x,bg)       (((x) & ~RS_bgMask)   | ((bg)<<Color_Bits))
+#define SET_BGCOLOR(x,bg)       (((x) & ~RS_bgMask)   | ((bg) << RS_bgShift))
 #define SET_ATTR(x,a)           (((x) & ~RS_attrMask) | (a))
 #define RS_SAME(a,b)		(!(((a) ^ (b)) & ~RS_Careful))
 #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)]
+# define FONTSET_of(t,style) (t)->fontset[GET_STYLE (style)]
 #else
-# define FONTSET(style) fontset[0]
+# define FONTSET_of(t,style) (t)->fontset[0]
 #endif
+#define FONTSET(style) FONTSET_of (this, style)
 typedef callback<void (const char *)> log_callback;
 typedef callback<int (int)> getfd_callback;
 /****************************************************************************/
 #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 {
+struct line_t
+{
    text_t *t; // terminal the text
    rend_t *r; // rendition, uses RS_ flags
    tlen_t_ l; // length of each text line
    uint32_t f; // flags
 };
 /****************************************************************************/
 // primitive wrapper around mbstate_t to ensure initialisation
-struct mbstate {
+struct mbstate
+{
   mbstate_t mbs;
   operator mbstate_t *() { return &mbs; }
   void reset () { memset (&mbs, 0, sizeof (mbs)); }
   mbstate () { reset (); }
 #if ENABLE_COMBINING
 // compose chars are used to represent composite characters
 // that are not representable in unicode, as well as characters
 // not fitting in the BMP.
-struct compose_char {
+struct compose_char
+{
   unicode_t c1, c2; // any chars != NOCHAR are valid
   compose_char (unicode_t c1, unicode_t c2)
   : c1(c1), c2(c2)
   { }
 };
-class rxvt_composite_vec {
+class rxvt_composite_vec
+{
   vector<compose_char> v;
 public:
   text_t compose (unicode_t c1, unicode_t c2 = NOCHAR);
   int expand (unicode_t c, wchar_t *r);
   compose_char *operator [](text_t c)
 extern rxvt_t rxvt_current_term;
 #define SET_R(r) rxvt_current_term = const_cast<rxvt_term *>(r)
 #define GET_R rxvt_current_term
+/* ------------------------------------------------------------------------- */
+struct overlay_base
+{
+  int x, y, w, h; // overlay dimensions
+  text_t **text;
+  rend_t **rend;
+  // while tempting to add swap() etc. here, it effetcively only increases code size
+};
+/* ------------------------------------------------------------------------- */
-typedef struct {
+typedef struct
+{
   int row;
   int col;
 } row_col_t;
 /*
  *  +------------+·display·+·= term_start
  *  |  terminal  | display |
  *  |  terminal  +---------+
  *  |  terminal  |
  *  |  terminal  |
- *  +------------+···········= term_stat + nrow - 1
+ *  +------------+···········= term_start + nrow - 1
  *  |
  *  |
  *  END······················= total_rows
  */
-struct TermWin_t {
+struct TermWin_t
+{
   int            width;         /* window width                    [pixels] */
   int            height;        /* window height                   [pixels] */
   int            fwidth;        /* font width                      [pixels] */
   int            fheight;       /* font height                     [pixels] */
   int            fbase;         /* font ascent (baseline)          [pixels] */
   int            focus;         /* window has focus                         */
   int            mapped;        /* window state mapped?                     */
   int            int_bwidth;    /* internal border width                    */
   int            ext_bwidth;    /* external border width                    */
   int            lineSpace;     /* number of extra pixels between rows      */
+  int            letterSpace;   /* number of extra pixels between columns   */
   int            saveLines;     /* number of lines that fit in scrollback   */
   int            total_rows;    /* total number of rows in this terminal    */
   int            term_start;    /* term lines start here                    */
   int            view_start;    /* scrollback view starts here              */
   int            top_row;       /* topmost row index of scrollback          */
  *   clicks:    1, 2 or 3 clicks - 4 indicates a special condition of 1 where
  *              nothing is selected
  *   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
  *
  */
-typedef struct {
+struct screen_t
+{
   row_col_t       cur;          /* cursor position on the screen             */
   int             tscroll;      /* top of settable scroll region             */
   int             bscroll;      /* bottom of settable scroll region          */
   unsigned int    charset;      /* character set number [0..3]               */
   unsigned int    flags;        /* see below                                 */
   row_col_t       s_cur;        /* saved cursor position                     */
   unsigned int    s_charset;    /* saved character set number [0..3]         */
   char            s_charset_char;
   rend_t          s_rstyle;     /* saved rendition style                     */
-} screen_t;
+};
-enum selection_op_t {
+enum selection_op_t
+{
   SELECTION_CLEAR = 0,  /* nothing selected                          */
   SELECTION_INIT,       /* marked a point                            */
   SELECTION_BEGIN,      /* started a selection                       */
   SELECTION_CONT,       /* continued selection                       */
   SELECTION_DONE        /* selection put in CUT_BUFFER0              */
 };
-typedef struct {
+struct selection_t
+{
   wchar_t          *text;       /* selected text                             */
   unsigned int      len;        /* length of selected text                   */
   unsigned int      screen;     /* screen being used                         */
   unsigned int      clicks;     /* number of clicks                          */
   selection_op_t    op;         /* current operation                         */
   bool              rect;       /* rectangular selection?                    */
   row_col_t         beg;        /* beginning of selection   <= mark          */
   row_col_t         mark;       /* point of initial click   <= end           */
   row_col_t         end;        /* one character past end point              */
-} selection_t;
+  wchar_t          *clip_text;  /* text copied to the clipboard              */
+  unsigned int      clip_len;   /* length of clipboard text                  */
+};
 /* ------------------------------------------------------------------------- */
 /* screen_t flags */
 #define Screen_Relative          (1<<0)  /* relative origin mode flag         */
 Opt_count
 };
 /* ------------------------------------------------------------------------- */
-struct rxvt_vars : TermWin_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             numlock_state;
   line_t         *row_buf;      // all lines, scrollback + terminal, circular, followed by temp_buf
   line_t         *drawn_buf;    // text on screen
   line_t         *swap_buf;     // lines for swap buffer
   char           *tabs;         /* per location: 1 == tab-stop               */
   screen_t        screen;
 #ifdef OFF_FOCUS_FADING
   rxvt_color      pix_colors_unfocused[TOTAL_COLORS];
 #endif
 };
-struct rxvt_term : zero_initialized, rxvt_vars, rxvt_screen {
+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
   unsigned char   want_refresh:1,
                   current_screen:1,	/* primary or secondary              */
                   num_scr_allow:1,
                   bypass_keystate:1,
+#if ENABLE_FRILLS
+                  urgency_hint:1,
+#endif
-#ifdef CURSOR_BLINK
+#if CURSOR_BLINK
                   hidden_cursor:1,
 #endif
-#ifdef TEXT_BLINK
+#if TEXT_BLINK
                   hidden_text:1,
 #endif
-#ifdef POINTER_BLANK
+#if POINTER_BLANK
                   hidden_pointer:1,
 #endif
-                  enc_utf8:1,		/* wether locale uses utf-8 */
+                  enc_utf8:1,		/* whether locale uses utf-8 */
-                  seen_input:1,         /* wether we have seen some program output yet */
+                  seen_input:1,         /* whether we have seen some program output yet */
-                  seen_resize:1,	/* wether we had a resize event */
+                  seen_resize:1,	/* whether we had a resize event */
                   parsed_geometry:1;
   unsigned char   refresh_type,
 #ifdef META8_OPTION
                   meta_char,            /* Alt-key prefix */
 /* ---------- */
   bool            rvideo_state, rvideo_mode;
 #ifndef NO_BELL
   bool            rvideo_bell;
 #endif
-  int             num_scr;              /* screen: number lines scrolled */
+  int             num_scr;              /* screen: number of lines scrolled */
   int             prev_ncol,            /* screen: previous number of columns */
                   prev_nrow;            /* screen: previous number of rows */
 /* ---------- */
   rend_t          rstyle;
 /* ---------- */
                   mouse_slip_wheel_speed,
 #endif
                   refresh_count,
                   window_vt_x,
                   window_vt_y,
-                  window_sb_x,
                   mouse_row,
                   mouse_col,
 # ifdef POINTER_BLANK
                   pointerBlankDelay,
 # endif
   unsigned long   priv_modes,
                   SavedModes;
 /* ---------- */
   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;
+                  selection_request_time,
+                  clipboard_time;
   pid_t           cmd_pid;    /* process id of child */
   char *          incr_buf;
   size_t          incr_buf_size, incr_buf_fill;
 /* ---------- */
   struct mouse_event MEvent;
   bgPixmap_t      bgPixmap;
 #endif
 #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
-  int ov_x, ov_y, ov_w, ov_h; // overlay dimensions
+  overlay_base ov;
-  text_t **ov_text;
-  rend_t **ov_rend;
   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,
 #if ENABLE_FRILLS || ISO_14755
   // 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);
 # endif
 #endif
   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 cmd_parse ();
   void mouse_report (XButtonEvent &ev);
   void button_press (XButtonEvent &ev);
   void button_release (XButtonEvent &ev);
   void focus_in ();
   void focus_out ();
+#if ENABLE_FRILLS
+  void set_urgency (bool enable);
+#else
+  void set_urgency (bool enable) { }
+#endif
   void update_fade_color (unsigned int idx);
 #ifdef PRINTPIPE
   FILE *popen_printer ();
   int pclose_printer (FILE *stream);
 #endif
   void process_window_ops (const int *args, unsigned int nargs);
   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, char resp);
-  void process_xterm_seq (int op, const char *str, char resp);
+  void process_xterm_seq (int op, 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);
   void process_graphics ();
   // init.C
   void init_command (const char *const *argv);
   void run_command (const char *const *argv);
   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 ();
   rxvt_term ();
   ~rxvt_term ();
   void recolour_cursor ();
   void resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent);
   void window_calc (unsigned int newwidth, unsigned int newheight);
   bool set_fonts ();
   void set_string_property (Atom prop, const char *str, int len = -1);
+  void set_mbstring_property (Atom prop, const char *str, int len = -1);
   void set_utf8_property (Atom prop, const char *str, int len = -1);
   void set_title (const char *str);
   void set_icon_name (const char *str);
   void set_window_color (int idx, const char *color);
   void set_colorfgbg ();
       options[opt >> 3] |= (1 << (opt & 7));
     else
       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;
     else
       priv_modes &= ~bit;
   // modifies first argument(!)
   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;
   void scr_clear (bool really = false) NOTHROW;
   void scr_refresh () NOTHROW;
   void scr_remap_chars (line_t &l) NOTHROW;
   enum cursor_mode { SAVE, RESTORE };
   void scr_poweron ();
+  void scr_soft_reset () NOTHROW;
   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 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_clear (bool clipboard = false) NOTHROW;
+  void clipboard_copy (Time tm);
   void selection_make (Time tm);
-  bool selection_grab (Time tm) NOTHROW;
+  bool selection_grab (Time tm, bool clipboard = false) 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;
-#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);
   // xdefaults.C
   void get_options (int argc, const char *const *argv);
   int parse_keysym (const char *str, const char *arg);
   const char *x_resource (const char *name);
   void extract_resources ();

Diff Legend

-–
+Removed lines
-+
+Added lines
-<
+Changed lines
->
+Changed lines

Comparing rxvt-unicode/src/rxvt.h (file contents): Revision 1.356 by ayin, Tue Jan 29 14:45:54 2008 UTC vs. Revision 1.410 by sf-exg, Mon Jul 19 16:43:21 2010 UTC

Diff Legend

Comparing rxvt-unicode/src/rxvt.h (file contents):
Revision 1.356 by ayin, Tue Jan 29 14:45:54 2008 UTC vs.
Revision 1.410 by sf-exg, Mon Jul 19 16:43:21 2010 UTC