set _NET_WM_USER_TIME on the window

[dana/urxvt.git] / src / rxvt.h

diff --git a/src/rxvt.h b/src/rxvt.h
index 0d009ec..3799b62 100644 (file)
--- a/src/rxvt.h
+++ b/src/rxvt.h
@@ -249,7 +249,11 @@ struct mouse_event
 # define COLORTERMENVFULL COLORTERMENV
 #endif
 #ifndef TERMENV
-# define TERMENV        "rxvt-unicode"
+# ifdef USE_256_COLORS
+#  define TERMENV        "rxvt-unicode-256color"
+# else
+#  define TERMENV        "rxvt-unicode"
+# endif
 #endif
 
 #if defined (NO_MOUSE_REPORT) && !defined (NO_MOUSE_REPORT_SCROLLBAR)
@@ -306,28 +310,18 @@ enum {
   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
 
+// GET_BGATTR depends on RS_fgShift > RS_bgShift
 #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)
 
-// font styles
-#define RS_Bold                 0x08000000UL    // value 1
-#define RS_Italic              0x10000000UL    // value 2
-
-// fake styles
-#define RS_Blink                0x20000000UL    // blink
-#define RS_RVid                 0x40000000UL    // reverse video
-#define RS_Uline                0x80000000UL    // underline
-
-// 5 custom bits for extensions
-#define RS_customCount          16UL
-#define RS_customShift          23
-#define RS_customMask           ((RS_customCount - 1UL) << RS_customShift)
-
 // 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 */
@@ -336,9 +330,25 @@ enum {
 // toggle this to force redraw, must be != RS_Careful and otherwise "pretty neutral"
 #define RS_redraw              (2UL << RS_fontShift)
 
+#define RS_Sel                  (1UL << 22)
+
+// 5 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                 (1UL << RS_styleShift)
+#define RS_Italic              (2UL << RS_styleShift)
+
 #define RS_styleCount          4
-#define RS_styleMask           (RS_Bold | RS_Italic)
 #define RS_styleShift          27
+#define RS_styleMask           (RS_Bold | RS_Italic)
+
+// fake styles
+#define RS_Blink                (1UL << 29)
+#define RS_RVid                 (1UL << 30)    // reverse video
+#define RS_Uline                (1UL << 31)    // underline
 
 #define RS_baseattrMask         (RS_Italic | RS_Bold | RS_Blink | RS_RVid | RS_Uline)
 #define RS_attrMask             (RS_baseattrMask | RS_fontMask)
@@ -383,7 +393,8 @@ enum {
   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,
 
@@ -395,8 +406,6 @@ enum {
    */
 
   // deprecated
-  Rxvt_Color_BD          = 18,
-  Rxvt_Color_UL          = 19,
   Rxvt_restoreFG         = 39,
   Rxvt_restoreBG         = 49,
 
@@ -483,6 +492,7 @@ enum colour_list {
 #endif
 #ifdef OPTION_HC
   Color_HC,
+  Color_HTC,
 #endif
   Color_scroll,
 #ifdef RXVT_SCROLLBAR
@@ -639,10 +649,13 @@ typedef struct _mwmhints
 #define SET_STYLE(x,style)     (((x) & ~RS_styleMask) | ((style) << RS_styleShift))
 
 #define GET_ATTR(x)             (((x) & RS_attrMask))
-#define GET_BGATTR(x)                                                   \
-    (((x) & RS_RVid) ? (((x) & (RS_attrMask & ~RS_RVid))                \
-                        | (((x) & RS_colorMask) << RS_bgShift))              \
-                     : ((x) & (RS_attrMask | RS_bgMask)))
+// return attributes defining the background, encoding doesn't matter
+// depends on RS_fgShift > RS_bgShift
+#define GET_BGATTR(x)                                      \
+  (expect_false ((x) & RS_RVid)                            \
+    ? (((x) & (RS_attrMask & ~RS_RVid))                    \
+      | (((x) & RS_fgMask) >> (RS_fgShift - RS_bgShift)))  \
+    : ((x) & (RS_attrMask | RS_bgMask)))
 #define SET_FGCOLOR(x,fg)       (((x) & ~RS_fgMask)   | ((fg) << RS_fgShift))
 #define SET_BGCOLOR(x,bg)       (((x) & ~RS_bgMask)   | ((bg) << RS_bgShift))
 #define SET_ATTR(x,a)           (((x) & ~RS_attrMask) | (a))
@@ -952,7 +965,6 @@ struct rxvt_vars : TermWin_t
   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
@@ -1049,6 +1061,7 @@ struct rxvt_term : zero_initialized, rxvt_vars, rxvt_screen
                   old_height; /* last used height in screen resize         */
   unsigned long   priv_modes,
                   SavedModes;
+  bool            button_state[5];
 /* ---------- */
   Atom            *xa;
 /* ---------- */
@@ -1232,6 +1245,7 @@ struct rxvt_term : zero_initialized, rxvt_vars, rxvt_screen
   // command.C
   void key_press (XKeyEvent &ev);
   void key_release (XKeyEvent &ev);
+  void update_user_time (Time time);
   unsigned int cmd_write (const char *str, unsigned int count);
 
   wchar_t next_char () NOTHROW;
@@ -1463,7 +1477,7 @@ struct rxvt_term : zero_initialized, rxvt_vars, rxvt_screen
   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);
+  void selection_make (Time tm, bool clipboard = false);
   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;