--- rxvt-unicode/src/command.C	2006/01/18 10:31:37	1.270
+++ rxvt-unicode/src/command.C	2006/01/19 16:22:12	1.272
@@ -466,7 +466,7 @@
                 {
                     /* normal XTerm key bindings */
                   case XK_Insert:	/* Shift+Insert = paste mouse selection */
-                    selection_request (ev.time, 0, 0);
+                    selection_request (ev.time);
                     return;
 #if TODO
                     /* rxvt extras */
@@ -2157,9 +2157,14 @@
           case Button3:
             selection_make (ev.time);
             break;
+
           case Button2:
-            selection_request (ev.time, ev.x, ev.y);
+            if (IN_RANGE_EXC (ev.x, 0, width)
+                && IN_RANGE_EXC (ev.y, 0, height))  // inside window?
+              selection_request (ev.time);
+
             break;
+
 #ifdef MOUSE_WHEEL
           case Button4:
           case Button5:
@@ -3768,7 +3773,6 @@
 void
 rxvt_term::process_xterm_seq (int op, const char *str, char resp)
 {
-  int changed = 0;
   int color;
   char *buf, *name;
   bool query = str[0] == '?' && !str[1];
@@ -3894,30 +3898,34 @@
 #endif
 
       case Rxvt_Pixmap:
-        if (*str != ';')
-          {
+        {
+          if (*str != ';')
+            {
 #if XPM_BACKGROUND
-            scale_pixmap ("");	/* reset to default scaling */
-            set_bgPixmap (str);	/* change pixmap */
-            scr_touch (true);
+              scale_pixmap ("");	/* reset to default scaling */
+              set_bgPixmap (str);	/* change pixmap */
+              scr_touch (true);
 #endif
-          }
+            }
 
-        while ((str = strchr (str, ';')) != NULL)
-          {
-            str++;
+          int changed = 0;
+
+          while ((str = strchr (str, ';')) != NULL)
+            {
+              str++;
 #if XPM_BACKGROUND
-            changed += scale_pixmap (str);
+              changed += scale_pixmap (str);
 #endif
-          }
+            }
 
-        if (changed)
-          {
+          if (changed)
+            {
 #ifdef XPM_BACKGROUND
-            resize_pixmap ();
-            scr_touch (true);
+              resize_pixmap ();
+              scr_touch (true);
 #endif
-          }
+            }
+        }
         break;
 
       case Rxvt_restoreFG: