Update MouseEvent (initial pass).

views/widget/widget_win.h

 // 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.
 
 #ifndef VIEWS_WIDGET_WIDGET_WIN_H_
 #define VIEWS_WIDGET_WIDGET_WIN_H_
 #pragma once
 
 #include <atlbase.h>
 #include <atlapp.h>
@@ skipping 121 matching lines @@
   virtual void Show();
   virtual void Hide();
   virtual gfx::NativeView GetNativeView() const;
   virtual void SetOpacity(unsigned char opacity);
   virtual void SetAlwaysOnTop(bool on_top);
   virtual Widget* GetRootWidget() const;
   virtual bool IsVisible() const;
   virtual bool IsActive() const;
   virtual bool IsAccessibleWidget() const;
   virtual TooltipManager* GetTooltipManager();
-  virtual void GenerateMousePressedForView(View* view,
-                                           const gfx::Point& point);
   virtual bool GetAccelerator(int cmd_id, ui::Accelerator* accelerator);
   virtual Window* GetWindow();
   virtual const Window* GetWindow() const;
   virtual void SetNativeWindowProperty(const char* name, void* value);
   virtual void* GetNativeWindowProperty(const char* name);
   virtual ThemeProvider* GetThemeProvider() const;
   virtual FocusManager* GetFocusManager();
   virtual void ViewHierarchyChanged(bool is_add, View *parent,
                                     View *child);
   virtual bool ContainsNativeView(gfx::NativeView native_view);
@@ skipping 94 matching lines @@
 
     // CustomFrameWindow hacks
     MESSAGE_HANDLER_EX(WM_NCUAHDRAWCAPTION, OnNCUAHDrawCaption)
     MESSAGE_HANDLER_EX(WM_NCUAHDRAWFRAME, OnNCUAHDrawFrame)
 
     // Vista and newer
     MESSAGE_HANDLER_EX(WM_DWMCOMPOSITIONCHANGED, OnDwmCompositionChanged)
 
     // Non-atlcrack.h handlers
     MESSAGE_HANDLER_EX(WM_GETOBJECT, OnGetObject)
+
+    // TODO(msw): Many of these handlers could go directly to ProcessMouse*
+    //            Unless they are actually overridder somewhere... (where?)
+    // Mouse events.
+    MESSAGE_HANDLER_EX(WM_LBUTTONDBLCLK, OnLButtonDblClk)

[Ben Goodger (Google), 2011/03/03 00:13:41]

There is definitely room to consolidate all of this with a mouse range handler
and a single mouse handler function instead of all these.

They're overridden in WindowWin as you discovered, but WindowWin could easily
override a single OnMouseMessage() function.

Look at ui/views/widget/native_widget_win.h,cc and copy liberally

+    MESSAGE_HANDLER_EX(WM_LBUTTONDOWN, OnLButtonDown)
+    MESSAGE_HANDLER_EX(WM_LBUTTONUP, OnLButtonUp)
+    MESSAGE_HANDLER_EX(WM_MBUTTONDBLCLK, OnMButtonDblClk)
+    MESSAGE_HANDLER_EX(WM_MBUTTONDOWN, OnMButtonDown)
+    MESSAGE_HANDLER_EX(WM_MBUTTONUP, OnMButtonUp)
+    MESSAGE_HANDLER_EX(WM_MOUSEACTIVATE, OnMouseActivate)
+    MESSAGE_HANDLER_EX(WM_MOUSELEAVE, OnMouseLeave)
+    MESSAGE_HANDLER_EX(WM_MOUSEMOVE, OnMouseMove)
+    MESSAGE_HANDLER_EX(WM_MOUSEWHEEL, OnMouseWheel)
+    MESSAGE_HANDLER_EX(WM_NCLBUTTONDBLCLK, OnNCLButtonDblClk)
+    MESSAGE_HANDLER_EX(WM_NCLBUTTONDOWN, OnNCLButtonDown)
+    MESSAGE_HANDLER_EX(WM_NCLBUTTONUP, OnNCLButtonUp)
+    MESSAGE_HANDLER_EX(WM_NCMBUTTONDBLCLK, OnNCMButtonDblClk)
+    MESSAGE_HANDLER_EX(WM_NCMBUTTONDOWN, OnNCMButtonDown)
+    MESSAGE_HANDLER_EX(WM_NCMBUTTONUP, OnNCMButtonUp)
     MESSAGE_HANDLER_EX(WM_NCMOUSELEAVE, OnNCMouseLeave)
-    MESSAGE_HANDLER_EX(WM_MOUSELEAVE, OnMouseLeave)
-    MESSAGE_HANDLER_EX(WM_MOUSEWHEEL, OnMouseWheel)
+    MESSAGE_HANDLER_EX(WM_NCMOUSEMOVE, OnNCMouseMove)
+    MESSAGE_HANDLER_EX(WM_NCRBUTTONDBLCLK, OnNCRButtonDblClk)
+    MESSAGE_HANDLER_EX(WM_NCRBUTTONDOWN, OnNCRButtonDown)
+    MESSAGE_HANDLER_EX(WM_NCRBUTTONUP, OnNCRButtonUp)
+    MESSAGE_HANDLER_EX(WM_RBUTTONDBLCLK, OnRButtonDblClk)
+    MESSAGE_HANDLER_EX(WM_RBUTTONDOWN, OnRButtonDown)
+    MESSAGE_HANDLER_EX(WM_RBUTTONUP, OnRButtonUp)
 
     // Key events.
     MESSAGE_HANDLER_EX(WM_KEYDOWN, OnKeyDown)
     MESSAGE_HANDLER_EX(WM_KEYUP, OnKeyUp)
     MESSAGE_HANDLER_EX(WM_SYSKEYDOWN, OnKeyDown);
     MESSAGE_HANDLER_EX(WM_SYSKEYUP, OnKeyUp);
 
     // This list is in _ALPHABETICAL_ order! OR I WILL HURT YOU.
     MSG_WM_ACTIVATE(OnActivate)
     MSG_WM_ACTIVATEAPP(OnActivateApp)
     MSG_WM_APPCOMMAND(OnAppCommand)
     MSG_WM_CANCELMODE(OnCancelMode)
     MSG_WM_CAPTURECHANGED(OnCaptureChanged)
     MSG_WM_CLOSE(OnClose)
     MSG_WM_COMMAND(OnCommand)
     MSG_WM_CREATE(OnCreate)
     MSG_WM_DESTROY(OnDestroy)
     MSG_WM_DISPLAYCHANGE(OnDisplayChange)
     MSG_WM_ERASEBKGND(OnEraseBkgnd)
     MSG_WM_ENDSESSION(OnEndSession)
     MSG_WM_ENTERSIZEMOVE(OnEnterSizeMove)
     MSG_WM_EXITMENULOOP(OnExitMenuLoop)
     MSG_WM_EXITSIZEMOVE(OnExitSizeMove)
     MSG_WM_GETMINMAXINFO(OnGetMinMaxInfo)
     MSG_WM_HSCROLL(OnHScroll)
     MSG_WM_INITMENU(OnInitMenu)
     MSG_WM_INITMENUPOPUP(OnInitMenuPopup)
     MSG_WM_KILLFOCUS(OnKillFocus)
-    MSG_WM_LBUTTONDBLCLK(OnLButtonDblClk)
-    MSG_WM_LBUTTONDOWN(OnLButtonDown)
-    MSG_WM_LBUTTONUP(OnLButtonUp)
-    MSG_WM_MBUTTONDOWN(OnMButtonDown)
-    MSG_WM_MBUTTONUP(OnMButtonUp)
-    MSG_WM_MBUTTONDBLCLK(OnMButtonDblClk)
-    MSG_WM_MOUSEACTIVATE(OnMouseActivate)
-    MSG_WM_MOUSEMOVE(OnMouseMove)
     MSG_WM_MOVE(OnMove)
     MSG_WM_MOVING(OnMoving)
     MSG_WM_NCACTIVATE(OnNCActivate)
     MSG_WM_NCCALCSIZE(OnNCCalcSize)
     MSG_WM_NCHITTEST(OnNCHitTest)
-    MSG_WM_NCMOUSEMOVE(OnNCMouseMove)
-    MSG_WM_NCLBUTTONDBLCLK(OnNCLButtonDblClk)
-    MSG_WM_NCLBUTTONDOWN(OnNCLButtonDown)
-    MSG_WM_NCLBUTTONUP(OnNCLButtonUp)
-    MSG_WM_NCMBUTTONDBLCLK(OnNCMButtonDblClk)
-    MSG_WM_NCMBUTTONDOWN(OnNCMButtonDown)
-    MSG_WM_NCMBUTTONUP(OnNCMButtonUp)
     MSG_WM_NCPAINT(OnNCPaint)
-    MSG_WM_NCRBUTTONDBLCLK(OnNCRButtonDblClk)
-    MSG_WM_NCRBUTTONDOWN(OnNCRButtonDown)
-    MSG_WM_NCRBUTTONUP(OnNCRButtonUp)
     MSG_WM_NOTIFY(OnNotify)
     MSG_WM_PAINT(OnPaint)
     MSG_WM_POWERBROADCAST(OnPowerBroadcast)
-    MSG_WM_RBUTTONDBLCLK(OnRButtonDblClk)
-    MSG_WM_RBUTTONDOWN(OnRButtonDown)
-    MSG_WM_RBUTTONUP(OnRButtonUp)
     MSG_WM_SETFOCUS(OnSetFocus)
     MSG_WM_SETICON(OnSetIcon)
     MSG_WM_SETTEXT(OnSetText)
     MSG_WM_SETTINGCHANGE(OnSettingChange)
     MSG_WM_SIZE(OnSize)
     MSG_WM_SYSCOMMAND(OnSysCommand)
     MSG_WM_THEMECHANGED(OnThemeChanged)
     MSG_WM_VSCROLL(OnVScroll)
     MSG_WM_WINDOWPOSCHANGING(OnWindowPosChanging)
     MSG_WM_WINDOWPOSCHANGED(OnWindowPosChanged)
@@ skipping 29 matching lines @@
   virtual void OnExitMenuLoop(BOOL is_track_popup_menu);
   virtual void OnExitSizeMove();
   virtual LRESULT OnGetObject(UINT uMsg, WPARAM w_param, LPARAM l_param);
   virtual void OnGetMinMaxInfo(MINMAXINFO* minmax_info);
   virtual void OnHScroll(int scroll_type, short position, HWND scrollbar);
   virtual void OnInitMenu(HMENU menu);
   virtual void OnInitMenuPopup(HMENU menu, UINT position, BOOL is_system_menu);
   virtual LRESULT OnKeyDown(UINT message, WPARAM w_param, LPARAM l_param);
   virtual LRESULT OnKeyUp(UINT message, WPARAM w_param, LPARAM l_param);
   virtual void OnKillFocus(HWND focused_window);
-  virtual void OnLButtonDblClk(UINT flags, const CPoint& point);
-  virtual void OnLButtonDown(UINT flags, const CPoint& point);
-  virtual void OnLButtonUp(UINT flags, const CPoint& point);
-  virtual void OnMButtonDblClk(UINT flags, const CPoint& point);
-  virtual void OnMButtonDown(UINT flags, const CPoint& point);
-  virtual void OnMButtonUp(UINT flags, const CPoint& point);
-  virtual LRESULT OnMouseActivate(HWND window, UINT hittest_code, UINT message);
-  virtual void OnMouseMove(UINT flags, const CPoint& point);
+  virtual LRESULT OnLButtonDblClk(UINT message, WPARAM w_param, LPARAM l_param);
+  virtual LRESULT OnLButtonDown(UINT message, WPARAM w_param, LPARAM l_param);
+  virtual LRESULT OnLButtonUp(UINT message, WPARAM w_param, LPARAM l_param);
+  virtual LRESULT OnMButtonDblClk(UINT message, WPARAM w_param, LPARAM l_param);
+  virtual LRESULT OnMButtonDown(UINT message, WPARAM w_param, LPARAM l_param);
+  virtual LRESULT OnMButtonUp(UINT message, WPARAM w_param, LPARAM l_param);
+  virtual LRESULT OnMouseActivate(UINT message, WPARAM w_param, LPARAM l_param);
+  virtual LRESULT OnMouseMove(UINT message, WPARAM w_param, LPARAM l_param);
   virtual LRESULT OnMouseLeave(UINT message, WPARAM w_param, LPARAM l_param);
   virtual LRESULT OnMouseWheel(UINT message, WPARAM w_param, LPARAM l_param);
   virtual void OnMove(const CPoint& point);
   virtual void OnMoving(UINT param, LPRECT new_bounds);
   virtual LRESULT OnMouseRange(UINT msg, WPARAM w_param, LPARAM l_param);
   virtual LRESULT OnNCActivate(BOOL active);
   virtual LRESULT OnNCCalcSize(BOOL w_param, LPARAM l_param);
   virtual LRESULT OnNCHitTest(const CPoint& pt);
-  virtual void OnNCLButtonDblClk(UINT flags, const CPoint& point);
-  virtual void OnNCLButtonDown(UINT flags, const CPoint& point);
-  virtual void OnNCLButtonUp(UINT flags, const CPoint& point);
-  virtual void OnNCMButtonDblClk(UINT flags, const CPoint& point);
-  virtual void OnNCMButtonDown(UINT flags, const CPoint& point);
-  virtual void OnNCMButtonUp(UINT flags, const CPoint& point);
-  virtual LRESULT OnNCMouseLeave(UINT uMsg, WPARAM w_param, LPARAM l_param);
-  virtual LRESULT OnNCMouseMove(UINT flags, const CPoint& point);
+  virtual LRESULT OnNCLButtonDblClk(UINT message,
+                                    WPARAM w_param,
+                                    LPARAM l_param);
+  virtual LRESULT OnNCLButtonDown(UINT message, WPARAM w_param, LPARAM l_param);
+  virtual LRESULT OnNCLButtonUp(UINT message, WPARAM w_param, LPARAM l_param);
+  virtual LRESULT OnNCMButtonDblClk(UINT message,
+                                    WPARAM w_param,
+                                    LPARAM l_param);
+  virtual LRESULT OnNCMButtonDown(UINT message, WPARAM w_param, LPARAM l_param);
+  virtual LRESULT OnNCMButtonUp(UINT message, WPARAM w_param, LPARAM l_param);
+  virtual LRESULT OnNCMouseLeave(UINT message, WPARAM w_param, LPARAM l_param);
+  virtual LRESULT OnNCMouseMove(UINT message, WPARAM w_param, LPARAM l_param);
   virtual void OnNCPaint(HRGN rgn);
-  virtual void OnNCRButtonDblClk(UINT flags, const CPoint& point);
-  virtual void OnNCRButtonDown(UINT flags, const CPoint& point);
-  virtual void OnNCRButtonUp(UINT flags, const CPoint& point);
+  virtual LRESULT OnNCRButtonDblClk(UINT message,
+                                    WPARAM w_param,
+                                    LPARAM l_param);
+  virtual LRESULT OnNCRButtonDown(UINT message, WPARAM w_param, LPARAM l_param);
+  virtual LRESULT OnNCRButtonUp(UINT message, WPARAM w_param, LPARAM l_param);
   virtual LRESULT OnNCUAHDrawCaption(UINT msg,
                                      WPARAM w_param,
                                      LPARAM l_param);
   virtual LRESULT OnNCUAHDrawFrame(UINT msg, WPARAM w_param, LPARAM l_param);
   virtual LRESULT OnNotify(int w_param, NMHDR* l_param);
   virtual void OnPaint(HDC dc);
   virtual LRESULT OnPowerBroadcast(DWORD power_event, DWORD data);
-  virtual void OnRButtonDblClk(UINT flags, const CPoint& point);
-  virtual void OnRButtonDown(UINT flags, const CPoint& point);
-  virtual void OnRButtonUp(UINT flags, const CPoint& point);
+  virtual LRESULT OnRButtonDblClk(UINT message, WPARAM w_param, LPARAM l_param);
+  virtual LRESULT OnRButtonDown(UINT message, WPARAM w_param, LPARAM l_param);
+  virtual LRESULT OnRButtonUp(UINT message, WPARAM w_param, LPARAM l_param);
   virtual LRESULT OnReflectedMessage(UINT msg, WPARAM w_param, LPARAM l_param);
   virtual void OnSetFocus(HWND focused_window);
   virtual LRESULT OnSetIcon(UINT size_type, HICON new_icon);
   virtual LRESULT OnSetText(const wchar_t* text);
   virtual void OnSettingChange(UINT flags, const wchar_t* section);
   virtual void OnSize(UINT param, const CSize& size);
   virtual void OnSysCommand(UINT notification_code, CPoint click);
   virtual void OnThemeChanged();
   virtual void OnVScroll(int scroll_type, short position, HWND scrollbar);
   virtual void OnWindowPosChanging(WINDOWPOS* window_pos);
   virtual void OnWindowPosChanged(WINDOWPOS* window_pos);
 
   // Deletes this window as it is destroyed, override to provide different
   // behavior.
   virtual void OnFinalMessage(HWND window);
 
   // Returns the size that the RootView should be set to in LayoutRootView().
   virtual gfx::Size GetRootViewSize() const;
 
   // Start tracking all mouse events so that this window gets sent mouse leave
   // messages too.
   void TrackMouseEvents(DWORD mouse_tracking_flags);
 
   // Actually handle mouse events. These functions are called by subclasses who
   // override the message handlers above to do the actual real work of handling
   // the event in the View system.
-  bool ProcessMousePressed(const CPoint& point,
-                           UINT flags,
-                           bool dbl_click,
-                           bool non_client);
-  void ProcessMouseDragged(const CPoint& point, UINT flags);
-  void ProcessMouseReleased(const CPoint& point, UINT flags);
-  void ProcessMouseMoved(const CPoint& point, UINT flags, bool is_nonclient);
+  bool ProcessMousePressed(UINT message, WPARAM w_param, LPARAM l_param);
+  // TODO(msw): ProcessMouseDragged could be made class/file private.
+  void ProcessMouseDragged(UINT message, WPARAM w_param, LPARAM l_param);
+  void ProcessMouseReleased(UINT message, WPARAM w_param, LPARAM l_param);
+  void ProcessMouseMoved(UINT message, WPARAM w_param, LPARAM l_param);
   void ProcessMouseExited();
 
   // Lays out the root view to fit the appropriate area within the widget.
   // Called when the window size or non client metrics change.
   void LayoutRootView();
 
   // Called when a MSAA screen reader client is detected.
   virtual void OnScreenReaderDetected();
 
   // Returns whether capture should be released on mouse release. The default
@@ skipping 142 matching lines @@
   gfx::NativeCursor previous_cursor_;
 
   ViewProps props_;
 
   DISALLOW_COPY_AND_ASSIGN(WidgetWin);
 };
 
 }  // namespace views
 
 #endif  // VIEWS_WIDGET_WIDGET_WIN_H_