Flag mouse messages received when cursor is hidden.

ui/views/win/hwnd_message_handler.cc

 // Copyright (c) 2012 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 "ui/views/win/hwnd_message_handler.h"
 
 #include <dwmapi.h>
 #include <oleacc.h>
 #include <shellapi.h>
 #include <tchar.h>
@@ skipping 302 matching lines @@
 };
 
 // static HWNDMessageHandler member initialization.
 base::LazyInstance<HWNDMessageHandler::FullscreenWindowMonitorMap>::
     DestructorAtExit HWNDMessageHandler::fullscreen_monitor_map_ =
         LAZY_INSTANCE_INITIALIZER;
 
 ////////////////////////////////////////////////////////////////////////////////
 // HWNDMessageHandler, public:
 
-long HWNDMessageHandler::last_touch_message_time_ = 0;
-
 HWNDMessageHandler::HWNDMessageHandler(HWNDMessageHandlerDelegate* delegate)
     : msg_handled_(FALSE),
       delegate_(delegate),
       fullscreen_handler_(new FullscreenHandler),
       waiting_for_close_now_(false),
       use_system_default_icon_(false),
       restored_enabled_(false),
       current_cursor_(NULL),
       previous_cursor_(NULL),
       dpi_(0),
@@ skipping 1994 matching lines @@
         // ignore touch events in the non-client area.
         LPARAM l_param_ht = MAKELPARAM(point.x, point.y);
         LRESULT hittest = SendMessage(hwnd(), WM_NCHITTEST, 0, l_param_ht);
 
         if (hittest != HTCLIENT)
           return 0;
       }
 
       ScreenToClient(hwnd(), &point);
 
-      last_touch_message_time_ = ::GetMessageTime();
-
       gfx::Point touch_point(point.x, point.y);
       unsigned int touch_id = id_generator_.GetGeneratedID(input[i].dwID);
 
       if (input[i].dwFlags & TOUCHEVENTF_DOWN) {
         touch_ids_.insert(input[i].dwID);
         GenerateTouchEvent(ui::ET_TOUCH_PRESSED, touch_point, touch_id,
                            event_time, &touch_events);
         touch_down_contexts_++;
         base::ThreadTaskRunnerHandle::Get()->PostDelayedTask(
             FROM_HERE, base::Bind(&HWNDMessageHandler::ResetTouchDownContext,
@@ skipping 296 matching lines @@
     // down and up are both on the caption. Note: this causes the button up to
     // be WM_RBUTTONUP instead of WM_NCRBUTTONUP.
     SetCapture();
   }
 
   long message_time = GetMessageTime();
   MSG msg = { hwnd(), message, w_param, l_param,
               static_cast<DWORD>(message_time),
               { CR_GET_X_LPARAM(l_param), CR_GET_Y_LPARAM(l_param) } };
   ui::MouseEvent event(msg);
-  if (IsSynthesizedMouseMessage(message, message_time, l_param))
+  if (ui::IsMouseEventFromTouch(message))
     event.set_flags(event.flags() | ui::EF_FROM_TOUCH);
+  if (ui::IsWindowsCursorHidden())
+    event.set_flags(event.flags() | ui::EF_CURSOR_HIDDEN);
 
   if (event.type() == ui::ET_MOUSE_MOVED && !HasCapture() && track_mouse) {
     // Windows only fires WM_MOUSELEAVE events if the application begins
     // "tracking" mouse events for a given HWND during WM_MOUSEMOVE events.
     // We need to call |TrackMouseEvents| to listen for WM_MOUSELEAVE.
     TrackMouseEvents((message == WM_NCMOUSEMOVE) ?
         TME_NONCLIENT | TME_LEAVE : TME_LEAVE);
   } else if (event.type() == ui::ET_MOUSE_EXITED) {
     // Reset our tracking flags so future mouse movement over this
     // NativeWidget results in a new tracking session. Fall through for
@@ skipping 34 matching lines @@
   // Please refer to the HandleMouseInputForCaption() function for more
   // information.
   if (!handled)
     handled = HandleMouseInputForCaption(message, w_param, l_param);
 
   if (ref.get())
     SetMsgHandled(handled);
   return 0;
 }
 
-bool HWNDMessageHandler::IsSynthesizedMouseMessage(unsigned int message,
-                                                   int message_time,
-                                                   LPARAM l_param) {
-  if (ui::IsMouseEventFromTouch(message))
-    return true;
-  // Ignore mouse messages which occur at the same location as the current
-  // cursor position and within a time difference of 500 ms from the last
-  // touch message.
-  if (last_touch_message_time_ && message_time >= last_touch_message_time_ &&
-      ((message_time - last_touch_message_time_) <=
-          kSynthesizedMouseTouchMessagesTimeDifference)) {
-    POINT mouse_location = CR_POINT_INITIALIZER_FROM_LPARAM(l_param);
-    ::ClientToScreen(hwnd(), &mouse_location);
-    POINT cursor_pos = {0};
-    ::GetCursorPos(&cursor_pos);
-    if (memcmp(&cursor_pos, &mouse_location, sizeof(POINT)))
-      return false;
-    return true;
-  }
-  return false;
-}
-
 void HWNDMessageHandler::PerformDwmTransition() {
   dwm_transition_desired_ = false;
 
   UpdateDwmNcRenderingPolicy();
   // Don't redraw the window here, because we need to hide and show the window
   // which will also trigger a redraw.
   ResetWindowRegion(true, false);
   // The non-client view needs to update too.
   delegate_->HandleFrameChanged();
 
@@ skipping 168 matching lines @@
   MONITORINFO monitor_info = {sizeof(monitor_info)};
   GetMonitorInfo(MonitorFromWindow(hwnd(), MONITOR_DEFAULTTOPRIMARY),
                  &monitor_info);
   gfx::Rect shrunk_rect(monitor_info.rcMonitor);
   shrunk_rect.set_height(shrunk_rect.height() - 1);
   background_fullscreen_hack_ = true;
   SetBoundsInternal(shrunk_rect, false);
 }
 
 }  // namespace views