Update MouseEvent (initial pass).

views/events/event_win.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "views/events/event.h"
 
 #include <windows.h>
 
 #include "base/logging.h"
 #include "ui/base/keycodes/keyboard_code_conversion_win.h"
@@ skipping 53 matching lines @@
       return ui::ET_MOUSEWHEEL;
     case WM_MOUSELEAVE:
     case WM_NCMOUSELEAVE:
       return ui::ET_MOUSE_EXITED;
     default:
       NOTREACHED();
   }
   return ui::ET_UNKNOWN;
 }
 
+// Get views::Event flags from a native Windows message
 int GetFlagsFromNative(NativeEvent native_event) {
-  // Allow other applicable messages as necessary.
-  DCHECK(native_event.message == WM_MOUSEWHEEL);
-  return Event::ConvertWindowsFlags(GET_KEYSTATE_WPARAM(native_event.wParam));
+  UINT win_flags = GET_KEYSTATE_WPARAM(native_event.wParam);
+
+  // TODO(msw): ORing the pressed/released button into the flags is _wrong_.
+  // It makes it impossible to tell which button was modified when multiple
+  // buttons are/were held down. We need to instead put the modified button into
+  // a separate member on the MouseEvent, then audit all consumers of
+  // MouseEvents to fix them to use the resulting values correctly.
+  //
+  // TODO(msw): Should I skip WM_NC*BUTTONUP, as WidgetWin::OnNC*ButtonUp did?
+  switch (native_event.message) {
+    case WM_LBUTTONDBLCLK:
+    case WM_LBUTTONDOWN:
+    case WM_LBUTTONUP:
+    case WM_NCLBUTTONDBLCLK:
+    case WM_NCLBUTTONDOWN:
+    case WM_NCLBUTTONUP:
+      win_flags |= MK_LBUTTON;
+      break;
+    case WM_MBUTTONDBLCLK:
+    case WM_MBUTTONDOWN:
+    case WM_MBUTTONUP:
+    case WM_NCMBUTTONDBLCLK:
+    case WM_NCMBUTTONDOWN:
+    case WM_NCMBUTTONUP:
+      win_flags |= MK_MBUTTON;
+      break;
+    case WM_RBUTTONDBLCLK:
+    case WM_RBUTTONDOWN:
+    case WM_RBUTTONUP:
+    case WM_NCRBUTTONDBLCLK:
+    case WM_NCRBUTTONDOWN:
+    case WM_NCRBUTTONUP:
+      win_flags |= MK_RBUTTON;
+      break;
+  }
+
+  int flags = 0;
+  flags |= (win_flags & MK_CONTROL) ? ui::EF_CONTROL_DOWN : 0;
+  flags |= (win_flags & MK_SHIFT) ? ui::EF_SHIFT_DOWN : 0;
+  flags |= (GetKeyState(VK_MENU) < 0) ? ui::EF_ALT_DOWN : 0;
+  flags |= (win_flags & MK_LBUTTON) ? ui::EF_LEFT_BUTTON_DOWN : 0;
+  flags |= (win_flags & MK_MBUTTON) ? ui::EF_MIDDLE_BUTTON_DOWN : 0;
+  flags |= (win_flags & MK_RBUTTON) ? ui::EF_RIGHT_BUTTON_DOWN : 0;
+
+  switch (native_event.message) {
+    case WM_LBUTTONDBLCLK:
+    case WM_MBUTTONDBLCLK:
+    case WM_RBUTTONDBLCLK:
+      flags |= ui::EF_IS_DOUBLE_CLICK;
+      break;
+    case WM_NCLBUTTONDOWN:
+    case WM_NCLBUTTONUP:
+    case WM_NCMBUTTONDOWN:
+    case WM_NCMBUTTONUP:
+    case WM_NCRBUTTONDOWN:
+    case WM_NCRBUTTONUP:
+      flags |= ui::EF_IS_NON_CLIENT;
+      break;
+    case WM_NCLBUTTONDBLCLK:
+    case WM_NCMBUTTONDBLCLK:
+    case WM_NCRBUTTONDBLCLK:
+      flags |= ui::EF_IS_DOUBLE_CLICK | ui::EF_IS_NON_CLIENT;
+      break;
+  }
+
+  return flags;
 }
 
 }  // namespace
 
 ////////////////////////////////////////////////////////////////////////////////
 // Event, public:
 
 int Event::GetWindowsFlags() const {
   // TODO: need support for x1/x2.
   int result = 0;
   result |= (flags_ & ui::EF_SHIFT_DOWN) ? MK_SHIFT : 0;
   result |= (flags_ & ui::EF_CONTROL_DOWN) ? MK_CONTROL : 0;
   result |= (flags_ & ui::EF_LEFT_BUTTON_DOWN) ? MK_LBUTTON : 0;
   result |= (flags_ & ui::EF_MIDDLE_BUTTON_DOWN) ? MK_MBUTTON : 0;
   result |= (flags_ & ui::EF_RIGHT_BUTTON_DOWN) ? MK_RBUTTON : 0;
   return result;
 }
 
-//static
-int Event::ConvertWindowsFlags(UINT win_flags) {
-  int r = 0;
-  if (win_flags & MK_CONTROL)
-    r |= ui::EF_CONTROL_DOWN;
-  if (win_flags & MK_SHIFT)
-    r |= ui::EF_SHIFT_DOWN;
-  if (GetKeyState(VK_MENU) < 0)
-    r |= ui::EF_ALT_DOWN;
-  if (win_flags & MK_LBUTTON)
-    r |= ui::EF_LEFT_BUTTON_DOWN;
-  if (win_flags & MK_MBUTTON)
-    r |= ui::EF_MIDDLE_BUTTON_DOWN;
-  if (win_flags & MK_RBUTTON)
-    r |= ui::EF_RIGHT_BUTTON_DOWN;
-  return r;
-}
-
 ////////////////////////////////////////////////////////////////////////////////
 // Event, private:
 
 void Event::Init() {
   ZeroMemory(&native_event_, sizeof(native_event_));
   native_event_2_ = NULL;
 }
 
 void Event::InitWithNativeEvent(NativeEvent native_event) {
   native_event_ = native_event;
@@ skipping 53 matching lines @@
 
 MouseWheelEvent::MouseWheelEvent(NativeEvent2 native_event_2,
                                  FromNativeEvent2 from_native)
     : LocatedEvent(native_event_2, from_native) {
   // No one should ever call this on Windows.
   // TODO(msw): remove once we rid views of Gtk/Gdk.
   NOTREACHED();
 }
 
 }  // namespace views