--- metacity-2.4.0/src/display.c	Tue Aug  6 14:25:39 2002
+++ display.c	Sat Sep  7 07:07:43 2002
@@ -1120,7 +1120,7 @@
               if (!unmodified)
                 begin_move = TRUE;
             }
-          else if (event->xbutton.button == 2)
+          else if (event->xbutton.button == 3)
             {
               if (window->has_resize_func)
                 {
@@ -1153,9 +1153,16 @@
                                               event->xbutton.time,
                                               event->xbutton.x_root,
                                               event->xbutton.y_root);
-                }
+                   if (meta_prefs_get_auto_raise())
+                   meta_window_raise (window);
+		   
+ 		   meta_topic (META_DEBUG_FOCUS,                                                         
+                               "Focusing %s due to unmodified button %d press (display.c)\n",            
+                               window->desc, event->xbutton.button);                                     
+                   meta_window_focus (window, event->xbutton.time);
+		}
             }
-          else if (event->xbutton.button == 3)
+          else if (event->xbutton.button == 2)
             {
               meta_window_show_menu (window,
                                      event->xbutton.x_root,
