*** display.c	2007-08-31 15:48:55.000000000 -0400
--- display.c	2007-11-06 02:20:04.000000000 -0500
***************
*** 1662,1668 ****
                if (!unmodified)
                  begin_move = TRUE;
              }
!           else if (!unmodified && event->xbutton.button == 2)
              {
                if (window->has_resize_func)
                  {
--- 1662,1669 ----
                if (!unmodified)
                  begin_move = TRUE;
              }
! 		  /* left button originally */
!           else if (!unmodified && event->xbutton.button == 3)
              {
                if (window->has_resize_func)
                  {
***************
*** 1711,1717 ****
                                                  event->xbutton.y_root);
                  }
              }
!           else if (event->xbutton.button == 3)
              {
                if (meta_prefs_get_raise_on_click ())
                  meta_window_raise (window);
--- 1712,1719 ----
                                                  event->xbutton.y_root);
                  }
              }
! 			/* middle click moving */
!           else if (event->xbutton.button == 2)
              {
                if (meta_prefs_get_raise_on_click ())
                  meta_window_raise (window);
***************
*** 1813,1818 ****
--- 1815,1821 ----
          {
            switch (meta_prefs_get_focus_mode ())
              {
+ 	    case META_FOCUS_MODE_STRICT:
              case META_FOCUS_MODE_SLOPPY:
              case META_FOCUS_MODE_MOUSE:
                display->mouse_mode = TRUE;