--- rxvt-unicode/src/rxvtperl.xs	2007/12/14 05:25:25	1.118
+++ rxvt-unicode/src/rxvtperl.xs	2008/07/31 03:24:08	1.124
@@ -3,7 +3,7 @@
  *----------------------------------------------------------------------*
  *
  * All portions of code are copyright by their respective author/s.
- * Copyright (c) 2005-2006 Marc Lehmann <pcg@goof.com>
+ * Copyright (c) 2005-2008 Marc Lehmann <pcg@goof.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -41,11 +41,7 @@
 
 #include "perlxsi.c"
 
-#ifdef HAVE_SCROLLBARS
-# define GRAB_CURSOR THIS->leftptr_cursor
-#else
-# define GRAB_CURSOR None
-#endif
+#define GRAB_CURSOR THIS->scrollBar.leftptr_cursor
 
 #undef LINENO
 #define LINENO(n) MOD (THIS->term_start + int(n), THIS->total_rows)
@@ -302,7 +298,7 @@
 
 #define IOM_CLASS "urxvt"
 #define IOM_WARN rxvt_warn
-#include <iom_perl.h>
+#include "iom_perl.h"
 
 /////////////////////////////////////////////////////////////////////////////
 
@@ -645,6 +641,7 @@
     IV iv;
   } *civ, const_iv[] = {
 #   define const_iv(name) { # name, (IV)name }
+    const_iv (NUM_RESOURCES),
     const_iv (DEFAULT_RSTYLE),
     const_iv (OVERLAY_RSTYLE),
     const_iv (RS_Bold),
@@ -1102,7 +1099,9 @@
             case 1: RETVAL = THIS->ModMetaMask;    break;
             case 2: RETVAL = THIS->ModNumLockMask; break;
             case 3: RETVAL = THIS->current_screen; break;
+#ifdef CURSOR_BLINK
             case 4: RETVAL = THIS->hidden_cursor;  break;
+#endif
           }
         OUTPUT:
         RETVAL
@@ -1436,12 +1435,20 @@
 
         rs = rslist + sizeof (rslist) / sizeof (rslist [0]);
 
-        do {
-          if (rs-- == rslist)
-            croak ("no such resource '%s', requested", name);
-        } while (strcmp (name, rs->name));
+        if (*name)
+          {
+            do {
+              if (rs-- == rslist)
+                croak ("no such resource '%s', requested", name);
+            } while (strcmp (name, rs->name));
 
-        index += rs->value;
+            index += rs->value;
+          }
+        else
+          {
+            --rs;
+            name = "";
+          }
 
         if (!IN_RANGE_EXC (index, 0, NUM_RESOURCES))
           croak ("requested out-of-bound resource %s+%d,", name, index - rs->value);
@@ -1709,7 +1716,7 @@
 }
 
 void
-rxvt_term::XChangeWindowProperty (Window window, Atom property, Atom type, int format, SV *data)
+rxvt_term::XChangeProperty (Window window, Atom property, Atom type, int format, SV *data)
 	CODE:
 {
 	STRLEN len;