--- rxvt-unicode/src/rxvt.h	2007/10/15 07:40:26	1.311
+++ rxvt-unicode/src/rxvt.h	2007/11/03 16:43:24	1.317
@@ -75,12 +75,6 @@
 #include <termios.h>
 typedef struct termios ttymode_t;
 
-#ifdef HAVE_AFTERIMAGE
-#  include <afterimage.h>
-#undef min
-#undef max
-#endif
-
 #include "background.h"
 
 #ifndef STDIN_FILENO
@@ -99,7 +93,7 @@
 
 /*
  *****************************************************************************
- * PROTOTYPES                    
+ * PROTOTYPES
  *****************************************************************************
  */
 // main.C
@@ -113,8 +107,6 @@
 char *           rxvt_wcstoutf8                   (const wchar_t *str, int len = -1);
 wchar_t *        rxvt_utf8towcs                   (const char *str, int len = -1);
 
-#define rxvt_strdup(s) ((s) ? strdup(s) : 0)
-
 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;
@@ -191,24 +183,24 @@
 
 #if ENABLE_XEMBED
 // XEMBED messages
-# define XEMBED_EMBEDDED_NOTIFY          0 
-# define XEMBED_WINDOW_ACTIVATE          1 
-# define XEMBED_WINDOW_DEACTIVATE        2 
-# define XEMBED_REQUEST_FOCUS            3 
-# define XEMBED_FOCUS_IN                 4 
-# define XEMBED_FOCUS_OUT                5 
-# define XEMBED_FOCUS_NEXT               6 
+# define XEMBED_EMBEDDED_NOTIFY          0
+# define XEMBED_WINDOW_ACTIVATE          1
+# define XEMBED_WINDOW_DEACTIVATE        2
+# define XEMBED_REQUEST_FOCUS            3
+# define XEMBED_FOCUS_IN                 4
+# define XEMBED_FOCUS_OUT                5
+# define XEMBED_FOCUS_NEXT               6
 # define XEMBED_FOCUS_PREV               7
 
-# define XEMBED_MODALITY_ON              10 
-# define XEMBED_MODALITY_OFF             11 
-# define XEMBED_REGISTER_ACCELERATOR     12 
-# define XEMBED_UNREGISTER_ACCELERATOR   13 
+# define XEMBED_MODALITY_ON              10
+# define XEMBED_MODALITY_OFF             11
+# define XEMBED_REGISTER_ACCELERATOR     12
+# define XEMBED_UNREGISTER_ACCELERATOR   13
 # define XEMBED_ACTIVATE_ACCELERATOR     14
 
 // XEMBED detail code
-# define XEMBED_FOCUS_CURRENT            0 
-# define XEMBED_FOCUS_FIRST              1 
+# define XEMBED_FOCUS_CURRENT            0
+# define XEMBED_FOCUS_FIRST              1
 # define XEMBED_FOCUS_LAST               2
 
 # define XEMBED_MAPPED			(1 << 0)
@@ -431,7 +423,7 @@
   C0_BS , C0_HT , C0_LF , C0_VT , C0_FF , C0_CR , C0_SO , C0_SI ,
   C0_DLE, C0_DC1, C0_DC2, D0_DC3, C0_DC4, C0_NAK, C0_SYN, C0_ETB,
   C0_CAN, C0_EM , C0_SUB, C0_ESC, C0_IS4, C0_IS3, C0_IS2, C0_IS1,
-}; 
+};
 #define CHAR_ST                 0x9c    /* 0234 */
 
 /*
@@ -600,10 +592,12 @@
 #define PrivMode_smoothScroll   (1UL<<17)
 #define PrivMode_vt52           (1UL<<18)
 #define PrivMode_LFNL		(1UL<<19)
+#define PrivMode_MouseBtnEvent  (1UL<<20)
+#define PrivMode_MouseAnyEvent  (1UL<<21)
 /* too annoying to implement X11 highlight tracking */
 /* #define PrivMode_MouseX11Track       (1LU<<20) */
 
-#define PrivMode_mouse_report   (PrivMode_MouseX10|PrivMode_MouseX11)
+#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)
@@ -794,7 +788,7 @@
 
 /****************************************************************************/
 
-// primivite wrapper around mbstate_t to ensure initialisation
+// primitive wrapper around mbstate_t to ensure initialisation
 struct mbstate {
   mbstate_t mbs;
 
@@ -861,7 +855,7 @@
   static const char resval_undef [];    // options specifically unset
   static const char resval_on [];       // boolean options switched on
   static const char resval_off [];      // or off
-  
+
   log_callback   *log_hook;             // log error messages through this hook, if != 0
   getfd_callback *getfd_hook;           // convert remote to local fd, if != 0
 #if ENABLE_PERL
@@ -926,6 +920,8 @@
                   window_vt_x,
                   window_vt_y,
                   window_sb_x,
+                  mouse_row,
+                  mouse_col,
 # ifdef POINTER_BLANK
                   pointerBlankDelay,
 # endif
@@ -1041,11 +1037,11 @@
 # endif
 #endif
 
-  long vt_emask, vt_emask_perl, vt_emask_xim;
+  long vt_emask, vt_emask_perl, vt_emask_xim, vt_emask_mouse;
 
   void vt_select_input () const NOTHROW
   {
-    XSelectInput (dpy, vt, vt_emask | vt_emask_perl | vt_emask_xim);
+    XSelectInput (dpy, vt, vt_emask | vt_emask_perl | vt_emask_xim | vt_emask_mouse);
   }
 
 #if ENABLE_TRANSPARENCY || ENABLE_PERL
@@ -1080,7 +1076,7 @@
 #ifdef TEXT_BLINK
   void text_blink_cb (time_watcher &w); time_watcher text_blink_ev;
 #endif
-#ifndef NO_BELL     
+#ifndef NO_BELL
   void bell_cb (time_watcher &w); time_watcher bell_ev;
 #endif
 
@@ -1366,8 +1362,6 @@
   void selection_extend (int x, int y, int flag) NOTHROW;
   void selection_rotate (int x, int y) NOTHROW;
 
-  void pixel_position (int *x, int *y) NOTHROW;
-
 #if defined(NEXT_SCROLLBAR)
   // scrollbar-next.C
   Pixmap renderPixmap (const char *const *data, int width, int height);