--- rxvt-unicode/src/rxvtperl.xs	2006/02/20 20:44:22	1.100
+++ rxvt-unicode/src/rxvtperl.xs	2006/08/07 21:38:24	1.103
@@ -270,6 +270,9 @@
 overlay::overlay (rxvt_term *THIS, int x_, int y_, int w_, int h_, rend_t rstyle, int border)
 : THIS(THIS), x(x_), y(y_), w(w_), h(h_), border(border == 2), overlay_av (0)
 {
+  if (w < 0) w = 0;
+  if (h < 0) h = 0;
+
   if (border == 2)
     {
       w += 2;
@@ -357,10 +360,7 @@
 
   for (i = AvFILL (overlay_av); i >= 0; i--)
     if (SvIV (*av_fetch (overlay_av, i, 1)) == (long)this)
-      {
-        av_delete (overlay_av, i, G_DISCARD);
-        break;
-      }
+      break;
 
   for (; i < AvFILL (overlay_av); i++)
     av_store (overlay_av, i, SvREFCNT_inc (*av_fetch (overlay_av, i + 1, 0)));
@@ -793,6 +793,10 @@
     const_iv (Button5Mask),
     const_iv (AnyModifier),
 
+    const_iv (NoSymbol),
+    const_iv (GrabModeSync),
+    const_iv (GrabModeAsync),
+
     const_iv (EVENT_NONE),
     const_iv (EVENT_READ),
     const_iv (EVENT_WRITE),
@@ -1017,31 +1021,35 @@
 	CODE:
         THIS->perl.should_invoke [htype] += inc;
 
-void
+int
 rxvt_term::grab_button (int button, U32 modifiers, Window window = THIS->vt)
 	CODE:
-        XGrabButton (THIS->dpy, button, modifiers, window, 1,
-                     ButtonPressMask | ButtonReleaseMask | EnterWindowMask | LeaveWindowMask | PointerMotionMask,
-                     GrabModeSync, GrabModeSync, None, GRAB_CURSOR);
+        RETVAL = XGrabButton (THIS->dpy, button, modifiers, window, 1,
+                              ButtonPressMask | ButtonReleaseMask | EnterWindowMask | LeaveWindowMask | PointerMotionMask,
+                              GrabModeSync, GrabModeSync, None, GRAB_CURSOR);
+	OUTPUT: RETVAL
 
-void
+int
 rxvt_term::ungrab_button (int button, U32 modifiers, Window window = THIS->vt)
 	CODE:
-        XUngrabButton (THIS->dpy, button, modifiers, window);
-
-#if 0
+        RETVAL = XUngrabButton (THIS->dpy, button, modifiers, window);
+	OUTPUT: RETVAL
 
 void
-XGrabKey (rxvt_term *THIS, int keycode, U32 modifiers, Window window = THIS->vt)
-	C_ARGS:
-        THIS->dpy, keycode, modifiers, window, 1,
-        GrabModeSync, GrabModeSync
+rxvt_term::XGrabKey (int keycode, U32 modifiers, Window window = THIS->vt, \
+                     int owner_events = 1, int pointer_mode = GrabModeAsync, int keyboard_mode = GrabModeAsync)
+	CODE:
+        XGrabKey (THIS->dpy, keycode, modifiers, window, owner_events, pointer_mode, keyboard_mode);
 
 void
-XUngrabKey (rxvt_term *THIS, int keycode, U32 modifiers, Window window = THIS->vt)
-	C_ARGS: THIS->dpy, keycode, modifiers, window
+rxvt_term::XUngrabKey (int keycode, U32 modifiers, Window window = THIS->vt)
+	CODE:
+	XUngrabKey (THIS->dpy, keycode, modifiers, window);
 
-#endif
+void
+rxvt_term::XUngrabKeyboard (Time eventtime)
+	CODE:
+	XUngrabKeyboard (THIS->dpy, eventtime);
 
 bool
 rxvt_term::grab (Time eventtime, int sync = 0)
@@ -1086,6 +1094,30 @@
         ungrab (THIS);
 
 int
+rxvt_term::XStringToKeysym (char *string)
+	CODE:
+        RETVAL = XStringToKeysym (string);
+	OUTPUT: RETVAL
+
+char *
+rxvt_term::XKeysymToString (int sym)
+	CODE:
+        RETVAL = XKeysymToString (sym);
+	OUTPUT: RETVAL
+
+int
+rxvt_term::XKeysymToKeycode (int sym)
+	CODE:
+        RETVAL = XKeysymToKeycode (THIS->dpy, sym);
+	OUTPUT: RETVAL
+
+int
+rxvt_term::XKeycodeToKeysym (int code, int index)
+	CODE:
+        RETVAL = XKeycodeToKeysym (THIS->dpy, code, index);
+	OUTPUT: RETVAL
+
+int
 rxvt_term::strwidth (SV *str)
 	CODE:
 {