AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

filter out duplicate mouse move events too; moved last mouse event info from wxWindow class to static variables (there is only one mouse in the system after all, no need to duplicate this data in all windows)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35855 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin 2005-10-09 13:04:40 +00:00
parent 2eef85139b
commit c358ea4147
2 changed files with 36 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
include/wx/msw/window.h
View File

@ -13,17 +13,6 @@
#ifndef _WX_WINDOW_H_
#define _WX_WINDOW_H_
// ---------------------------------------------------------------------------
// headers
// ---------------------------------------------------------------------------
// [at least] some version of Windows send extra mouse move messages after
// a mouse click or a key press - to temporarily fix this problem, set the
// define below to 1
//
// a better solution should be found later...
#define wxUSE_MOUSEEVENT_HACK 0
// ---------------------------------------------------------------------------
// constants
// ---------------------------------------------------------------------------
@ -430,13 +419,6 @@ protected:
int m_xThumbSize;
int m_yThumbSize;
#if wxUSE_MOUSEEVENT_HACK
// the coordinates of the last mouse event and the type of it
long m_lastMouseX,
m_lastMouseY;
int m_lastMouseEvent;
#endif // wxUSE_MOUSEEVENT_HACK
// implement the base class pure virtuals
virtual void DoClientToScreen( int *x, int *y ) const;
virtual void DoScreenToClient( int *x, int *y ) const;

54
src/msw/window.cpp
View File

@ -123,6 +123,14 @@
// by setting this to 0 (in the future this should be removed completely)
#define USE_DEFERRED_SIZING 1
// set this to 1 to filter out duplicate mouse events, e.g. mouse move events
// when mouse position didnd't change
#ifdef __WXWINCE__
#define wxUSE_MOUSEEVENT_HACK 0
#else
#define wxUSE_MOUSEEVENT_HACK 1
#endif
// ---------------------------------------------------------------------------
// global variables
// ---------------------------------------------------------------------------
@ -141,6 +149,18 @@ extern const wxChar *wxCanvasClassName;
// wxGetStdColourMap() and wxWindow::OnSysColourChanged() (FIXME-MT)
static bool gs_hasStdCmap = false;
// last mouse event information we need to filter out the duplicates
#if wxUSE_MOUSEEVENT_HACK
static struct
{
// mouse position (in screen coordinates)
wxPoint pos;
// last mouse event type
wxEventType type;
} gs_lastMouseEvent;
#endif // wxUSE_MOUSEEVENT_HACK
// ---------------------------------------------------------------------------
// private functions
// ---------------------------------------------------------------------------
@ -462,12 +482,6 @@ void wxWindowMSW::Init()
m_xThumbSize = 0;
m_yThumbSize = 0;
#if wxUSE_MOUSEEVENT_HACK
m_lastMouseX =
m_lastMouseY = -1;
m_lastMouseEvent = -1;
#endif // wxUSE_MOUSEEVENT_HACK
m_pendingPosition = wxDefaultPosition;
m_pendingSize = wxDefaultSize;
}
@ -4493,9 +4507,8 @@ void wxWindowMSW::InitMouseEvent(wxMouseEvent& event,
event.SetId(GetId());
#if wxUSE_MOUSEEVENT_HACK
m_lastMouseX = x;
m_lastMouseY = y;
m_lastMouseEvent = event.GetEventType();
gs_lastMouseEvent.pos = ClientToScreen(wxPoint(x, y));
gs_lastMouseEvent.type = event.GetEventType();
#endif // wxUSE_MOUSEEVENT_HACK
}
@ -4635,17 +4648,22 @@ bool wxWindowMSW::HandleMouseMove(int x, int y, WXUINT flags)
#endif // HAVE_TRACKMOUSEEVENT
#if wxUSE_MOUSEEVENT_HACK
// Window gets a click down message followed by a mouse move message even
// if position isn't changed! We want to discard the trailing move event
// if x and y are the same.
if ( (m_lastMouseEvent == wxEVT_RIGHT_DOWN ||
m_lastMouseEvent == wxEVT_LEFT_DOWN ||
m_lastMouseEvent == wxEVT_MIDDLE_DOWN) &&
(m_lastMouseX == x && m_lastMouseY == y) )
// Windows often generates mouse events even if mouse position hasn't
// changed (http://article.gmane.org/gmane.comp.lib.wxwidgets.devel/66576)
//
// Filter this out as it can result in unexpected behaviour compared to
// other platforms
if ( gs_lastMouseEvent.type == wxEVT_RIGHT_DOWN ||
gs_lastMouseEvent.type == wxEVT_LEFT_DOWN ||
gs_lastMouseEvent.type == wxEVT_MIDDLE_DOWN ||
gs_lastMouseEvent.type == wxEVT_MOTION )
{
m_lastMouseEvent = wxEVT_MOTION;
if ( ClientToScreen(wxPoint(x, y)) == gs_lastMouseEvent.pos )
{
gs_lastMouseEvent.type = wxEVT_MOTION;
return false;
return false;
}
}
#endif // wxUSE_MOUSEEVENT_HACK