--- rxvt-unicode/src/command.C	2007/12/24 06:51:37	1.385
+++ rxvt-unicode/src/command.C	2008/01/09 01:14:29	1.391
@@ -28,6 +28,7 @@
  *				- Ctrl/Mod4+Tab works like Meta+Tab (options)
  * Copyright (c) 2003      Rob McMullen <robm@flipturn.org>
  * Copyright (c) 2003-2007 Marc Lehmann <pcg@goof.com>
+ * Copyright (c) 2007      Emanuele Giaquinta <e.giaquinta@glauco.it>
  *
  * 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
@@ -222,7 +223,7 @@
       sprintf (buf, "%8x", ch);
       scr_overlay_set (0, y, buf);
       scr_overlay_set (9, y, '=');
-# if !UNICODE3
+# if !UNICODE_3
       if (ch >= 0x10000)
         ch = 0xfffd;
 # endif
@@ -1531,7 +1532,7 @@
             while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
               ;
 
-            if (isScrollbarWindow (ev.xany.window))
+            if (scrollBar.state && ev.xany.window == scrollBar.win)
               {
                 scrollBar.setIdle ();
                 scrollbar_show (0);
@@ -1631,7 +1632,7 @@
 #endif
               }
           }
-        else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
+        else if (scrollbar_isMotion () && ev.xany.window == scrollBar.win)
           {
             while (XCheckTypedWindowEvent (dpy, scrollBar.win,
                                            MotionNotify, &ev))
@@ -1925,7 +1926,7 @@
   /*
    * Scrollbar window processing of button press
    */
-  if (isScrollbarWindow (ev.window))
+  if (scrollBar.state && ev.window == scrollBar.win)
     {
       scrollBar.setIdle ();
       /*
@@ -2009,7 +2010,7 @@
             switch (ev.button)
               {
                 case Button2:
-                  switch (scrollbar_align)
+                  switch (scrollBar.align)
                     {
                       case R_SB_ALIGN_TOP:
                         csrO = 0;
@@ -2031,7 +2032,7 @@
                   break;
 
                 case Button1:
-                  if (scrollbar_align == R_SB_ALIGN_CENTRE)
+                  if (scrollBar.align == R_SB_ALIGN_CENTRE)
                     csrO = ev.y - scrollBar.top;
                   /* FALLTHROUGH */
 
@@ -2171,13 +2172,11 @@
                     slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
                 }
               else
-                {
 # endif
+                {
                   scr_page (v, i);
                   scrollbar_show (1);
-# ifdef MOUSE_SLIP_WHEELING
                 }
-# endif
             }
             break;
 #endif
@@ -3673,7 +3672,10 @@
               break;
             case 3:			/* 80/132 */
               if (priv_modes & PrivMode_132OK)
-                set_widthheight (((state ? 132 : 80) * fwidth), height);
+                {
+                  scr_poweron ();
+                  set_widthheight (((state ? 132 : 80) * fwidth), 24 * fheight);
+                }
               break;
             case 4:			/* smooth scrolling */
               set_option (Opt_jumpScroll, !state);