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

Comparing rxvt-unicode/src/rxvt.h (file contents):
Revision 1.382 by root, Tue Mar 30 22:46:25 2010 UTC vs.
Revision 1.422 by root, Thu Dec 16 23:03:50 2010 UTC

   if (envv)
 #endif
     environ = envv;
 }
+struct localise_env
+{
+  char **orig_env;
+  localise_env (char **new_env)
+  {
+    orig_env = environ;
+    environ = new_env;
+  }
+  ~localise_env ()
+  {
+    environ = orig_env;
+  }
+};
 /*
  *****************************************************************************
  * STRUCTURES AND TYPEDEFS
  *****************************************************************************
  */
 # 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		rxvt_fontset::fontCount
-#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
   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 {
 #define PrivMode_vt52           (1UL<<18)
 #define PrivMode_LFNL		(1UL<<19)
 #define PrivMode_MouseBtnEvent  (1UL<<20)
 #define PrivMode_MouseAnyEvent  (1UL<<21)
 #define PrivMode_BracketPaste   (1UL<<22)
+#define PrivMode_ExtModeMouse   (1UL<<23) // xterm pseudo-utf-8 hack
+#define PrivMode_ExtMouseRight  (1UL<<24) // xterm pseudo-utf-8, but works in non-utf-8-locales
 #define PrivMode_mouse_report   (PrivMode_MouseX10|PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent)
 #ifdef ALLOW_132_MODE
 # define PrivMode_Default (PrivMode_Autowrap|PrivMode_ShiftKeys|PrivMode_VisibleCursor|PrivMode_132OK)
 /*
  *****************************************************************************
  * 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 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)]
 {
   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
+  // while tempting to add swap() etc. here, it effectively only increases code size
 };
 /* ------------------------------------------------------------------------- */
 typedef struct
 #define Screen_WrapNext          (1<<4)  /* need to wrap for next char?       */
 #define Screen_DefaultFlags      (Screen_VisibleCursor | Screen_Autowrap)
 /* rxvt_vars.options */
 enum {
-# define def(name,idx) Opt_ ## name = idx,
-# define nodef(name)   Opt_ ## name = 0,
+# define def(name)   Opt_ ## name,
+# define nodef(name) Opt_prev_ ## name, Opt_ ## name = 0, Opt_next_ ## name = Opt_prev_ ## name - 1,
+  Opt_0,
 # include "optinc.h"
 # undef nodef
 # undef def
-Opt_count
+  Opt_count
 };
 /* ------------------------------------------------------------------------- */
 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;
                   hidden_text:1,
 #endif
 #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 */
   char *          incr_buf;
   size_t          incr_buf_size, incr_buf_fill;
 /* ---------- */
   struct mouse_event MEvent;
   XComposeStatus  compose;
-  struct termios  tio;
+  static struct termios def_tio;
   row_col_t       oldcursor;
 #ifdef HAVE_BG_PIXMAP
   bgPixmap_t      bgPixmap;
 #endif
 #ifdef HAVE_AFTERIMAGE
   void rootwin_cb (XEvent &xev);
   xevent_watcher rootwin_ev;
 #endif
 #ifdef HAVE_BG_PIXMAP
   void update_background ();
-#if TRACE_PIXMAPS
-  void trace_update_background (const char *file, int line);
-# define update_background() trace_update_background (__FILE__, __LINE__)
-#endif
   void update_background_cb (ev::timer &w, int revents);
   ev::timer update_background_ev;
 #endif
   void x_cb (XEvent &xev);
   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_ourmods ();
+  void set_icon (const char *file);
   // main.C
   void tt_winch ();
   rxvt_term ();
   ~rxvt_term ();
   void destroy ();
   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 ();
     return base;
   }
   bool option (uint8_t opt) const NOTHROW
   {
-    if (!opt)
-      return 0;
-    --opt;
     return options[opt >> 3] & (1 << (opt & 7));
   }
-  void set_option (uint8_t opt, bool set = true) NOTHROW
+  void set_option (uint8_t opt, bool set = true) NOTHROW;
-  {
-    if (!opt)
-      return;
-    --opt;
-    if (set)
-      options[opt >> 3] |= (1 << (opt & 7));
-    else
-      options[opt >> 3] &= ~(1 << (opt & 7));
-  }
   void set_privmode (unsigned bit, int set) NOTHROW
   {
     if (set)
       priv_modes |= bit;
     else
       priv_modes &= ~bit;
   }
   // modifies first argument(!)
+  void tt_paste (char *data, unsigned int len) NOTHROW;
   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 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 (bool clipboard = false) NOTHROW;
-  void clipboard_copy (Time tm);
   void selection_make (Time tm);
   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;

Diff Legend

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

Comparing rxvt-unicode/src/rxvt.h (file contents): Revision 1.382 by root, Tue Mar 30 22:46:25 2010 UTC vs. Revision 1.422 by root, Thu Dec 16 23:03:50 2010 UTC

Diff Legend

Comparing rxvt-unicode/src/rxvt.h (file contents):
Revision 1.382 by root, Tue Mar 30 22:46:25 2010 UTC vs.
Revision 1.422 by root, Thu Dec 16 23:03:50 2010 UTC