--- rxvt-unicode/src/command.C	2003/12/18 14:11:47	1.23
+++ rxvt-unicode/src/command.C	2004/01/19 17:26:43	1.29
@@ -1,7 +1,7 @@
 /*--------------------------------*-C-*---------------------------------*
  * File:	command.c
  *----------------------------------------------------------------------*
- * $Id: command.C,v 1.23 2003/12/18 14:11:47 pcg Exp $
+ * $Id: command.C,v 1.29 2004/01/19 17:26:43 pcg Exp $
  *
  * All portions of code are copyright by their respective author/s.
  * Copyright (c) 1992      John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk>
@@ -66,7 +66,7 @@
     static int      debug_key = 1;	/* accessible by a debugger only */
 #endif
     int             valid_keysym;
-    unsigned char  *kbuf = R->kbuf;
+    unsigned char kbuf[KBUFSZ];
 
 /*
  * use Num_Lock to toggle Keypad on/off.  If Num_Lock is off, allow an
@@ -697,10 +697,6 @@
     }
 
   XFlush (Xdisplay);
-#if 0
-  if (XPending (Xdisplay)) process_x_events ();
-  if (XPending (Xdisplay)) process_x_events ();
-#endif
 }
 
 void
@@ -758,13 +754,16 @@
   while (XPending (Xdisplay));
 }
 
+#ifdef CURSOR_BLINK
 void
 rxvt_term::blink_cb (time_watcher &w)
 {
-  w.at += BLINK_INTERVAL;
   hidden_cursor = !hidden_cursor;
   want_refresh = 1;
+
+  w.start (w.at + BLINK_INTERVAL);
 }
+#endif
 
 void
 rxvt_term::x_cb (io_watcher &w, short revents)
@@ -1023,26 +1022,22 @@
 #endif
 }
 
+#ifdef POINTER_BLANK
 void
 rxvt_term::pointer_unblank ()
 {
   XDefineCursor (Xdisplay, TermWin.vt, TermWin_cursor);
   recolour_cursor ();
 
-#ifdef POINTER_BLANK
   hidden_pointer = 0;
 
   if (Options & Opt_pointerBlank)
     pointer_ev.start (NOW + pointerBlankDelay);
-#endif
 }
 
-#ifdef POINTER_BLANK
 void
 rxvt_term::pointer_blank ()
 {
-  pointer_ev.stop ();
-
   if (!(Options & Opt_pointerBlank))
     return;
 
@@ -1532,7 +1527,7 @@
 void
 rxvt_button_press(pR_ XButtonEvent *ev)
 {
-    int             reportmode = 0, clickintime;
+    int reportmode = 0, clickintime;
 
     R->bypass_keystate = ev->state & (R->ModMetaMask | ShiftMask);
     if (!R->bypass_keystate)
@@ -1590,7 +1585,7 @@
                   {
                     case Button1:
                         /* allow shift+left click to extend selection */
-                        if (ev->state & ShiftMask)
+                        if (ev->state & ShiftMask && !(R->PrivateModes & PrivMode_mouse_report))
                           {
                             if (R->MEvent.button == Button1 && clickintime)
                               R->selection_rotate (ev->x, ev->y);