--- rxvt-unicode/src/rxvt.h	2004/08/25 03:52:09	1.121
+++ rxvt-unicode/src/rxvt.h	2004/12/01 02:12:18	1.126
@@ -101,6 +101,7 @@
 char           * rxvt_Str_trim                    (char *str);
 int              rxvt_Str_escaped                 (char *str);
 char          ** rxvt_splitcommastring            (const char *cs);
+void             rxvt_freecommastring             (char **cs);
 char           * rxvt_File_find                   (const char *file, const char *ext, const char *path);
 void             rxvt_Draw_Shadow                 (Display *display, Window win, GC topShadow, GC botShadow, int x, int y, int w, int h);
 void             rxvt_Draw_Triangle               (Display *display, Window win, GC topShadow, GC botShadow, int x, int y, int w, int type);
@@ -611,6 +612,7 @@
   Rs_pointerBlank,
   Rs_pointerBlankDelay,
   Rs_imLocale,
+  Rs_pastableTabs,
 #ifndef NO_SECONDARY_SCREEN
   Rs_secondaryScreen,
   Rs_secondaryScroll,
@@ -1017,8 +1019,8 @@
                   selection_type;
 /* ---------- */
   short           rvideo;
-  int16_t         num_scr;              /* screen: number lines scrolled */
-  unsigned int    prev_ncol,            /* screen: previous number of columns */
+  int             num_scr;              /* screen: number lines scrolled */
+  int             prev_ncol,            /* screen: previous number of columns */
                   prev_nrow;            /* screen: previous number of rows */
 /* ---------- */
   rend_t          rstyle;
@@ -1060,8 +1062,8 @@
                   allowedxerror;
 /* ---------- */
   unsigned int    ModMetaMask,
-                  ModNumLockMask,
-                  old_width,  /* last used width in screen resize          */
+                  ModNumLockMask;
+  int             old_width,  /* last used width in screen resize          */
                   old_height; /* last used height in screen resize         */
   unsigned long   priv_modes,
                   SavedModes;
@@ -1111,11 +1113,6 @@
 #ifndef NO_DELETE_KEY
   const char     *key_delete;
 #endif
-#ifdef USE_XIM
-  rxvt_xim       *input_method;
-  XIC             Input_Context;
-  XIMStyle        input_style;
-#endif
   struct mouse_event MEvent;
   XComposeStatus  compose;
   ttymode_t       tio;
@@ -1212,6 +1209,10 @@
   xevent_watcher rootwin_ev;
 #endif
 
+
+  void sig_term (sig_watcher &w); sig_watcher sw_term;
+  void sig_chld (sig_watcher &w); sig_watcher sw_chld;
+
   void x_cb (XEvent &xev);
   xevent_watcher termwin_ev;
   xevent_watcher vt_ev;
@@ -1275,7 +1276,6 @@
   void init_command (const char *const *argv);
   void run_command (const char *const *argv);
   int run_child (const char *const *argv);
-  static void child_exited (int pid);
 
   void color_aliases (int idx);
   void recolour_cursor ();
@@ -1284,6 +1284,11 @@
   void window_calc (unsigned int width, unsigned int height);
 
 #if USE_XIM
+  rxvt_xim       *input_method;
+  XIC             Input_Context;
+  XIMStyle        input_style;
+  XPoint          spot; // most recently sent spot position
+
   void im_destroy ();
   void im_cb (); im_watcher im_ev;
   void im_set_size (XRectangle &size);