--- rxvt-unicode/src/rxvt.h	2006/01/22 17:10:01	1.236
+++ rxvt-unicode/src/rxvt.h	2006/01/25 00:42:20	1.241
@@ -17,6 +17,7 @@
 #if ENABLE_FRILLS
 # define ENABLE_XEMBED 1
 # define ENABLE_EWMH   1
+# define ENABLE_XIM_ONTHESPOT 1
 # define CURSOR_BLINK  1
 #else
 # define ENABLE_MINIMAL 1
@@ -738,6 +739,11 @@
 #define dLocal(type,name)       type const name = this->name
 #define dDisp			Display *disp = this->display->display
 
+// for speed reasons, we assume that all latin1 characters
+// are single-width (the first unicdoe combining character
+// is actually 0x300, but ascii is what matters most).
+#define WCWIDTH(c) ((c) < 0x100 ? 1 : wcwidth (c))
+
 /* convert pixel dimensions to row/column values.  Everything as int32_t */
 #define Pixel2Col(x)            Pixel2Width((int32_t)(x))
 #define Pixel2Row(y)            Pixel2Height((int32_t)(y))
@@ -825,27 +831,6 @@
 # define XPMClearArea(a, b, c, d, e, f, g)
 #endif
 
-#ifdef DEBUG_CMD
-# define D_CMD(x)               fprintf x ; fputc('\n', stderr)
-#else
-# define D_CMD(x)
-#endif
-#ifdef DEBUG_INIT
-# define D_INIT(x)              fprintf x ; fputc('\n', stderr)
-#else
-# define D_INIT(x)
-#endif
-#ifdef DEBUG_MAIN
-# define D_MAIN(x)              fprintf x ; fputc('\n', stderr)
-#else
-# define D_MAIN(x)
-#endif
-#ifdef DEBUG_SIZE
-# define D_SIZE(x)              fprintf x ; fputc('\n', stderr)
-#else
-# define D_SIZE(x)
-#endif
-
 typedef callback1<void, const char *> log_callback;
 typedef callback1<int, int> getfd_callback;
 
@@ -1159,11 +1144,11 @@
   // modifies first argument(!)
   void paste (char *data, unsigned int len) NOTHROW;
 
-  long vt_emask, vt_emask_perl;
+  long vt_emask, vt_emask_perl, vt_emask_xim;
 
   void vt_select_input () const NOTHROW
   {
-    XSelectInput (display->display, vt, vt_emask | vt_emask_perl);
+    XSelectInput (display->display, vt, vt_emask | vt_emask_perl | vt_emask_xim);
   }
 
 #if TRANSPARENT
@@ -1330,7 +1315,7 @@
 
   // screen.C
 
-  void lalloc (line_t &l) const NOTHROW
+  void lalloc (line_t &l) const
   {
     l.t = (text_t *)talloc->alloc ();
     l.r = (rend_t *)ralloc->alloc ();
@@ -1344,7 +1329,7 @@
   }
 #endif
 
-  void lresize (line_t &l) const NOTHROW
+  void lresize (line_t &l) const
   {
     if (!l.t)
       return;
@@ -1422,10 +1407,11 @@
 
   enum cursor_mode { SAVE, RESTORE };
 
-  void scr_poweron () NOTHROW;
+  void scr_poweron ();
   void scr_cursor (cursor_mode mode) NOTHROW;
   void scr_do_wrap () NOTHROW;
-  int scr_change_screen (int scrn) NOTHROW;
+  void scr_swap_screen () NOTHROW;
+  void scr_change_screen (int scrn);
   void scr_color (unsigned int color, int fgbg) NOTHROW;
   void scr_rendition (int set, int style) NOTHROW;
   void scr_add_lines (const wchar_t *str, int len, int minlines = 0) NOTHROW;
@@ -1527,9 +1513,5 @@
 # define __PROTO(p)     ()
 #endif
 
-#ifdef DEBUG_malloc
-# include "dmalloc.h"           /* This comes last */
-#endif
-
 #endif                          /* _RXVT_H_ */