gnustep/libs-back
0
0
Fork 0
mirror of https://github.com/gnustep/libs-back.git synced 2025-02-23 11:51:27 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix for missing mouse down events

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/back/trunk@28989 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Richard Frith-MacDonald 2009-11-10 14:45:50 +00:00
parent 76b8a13298
commit 43eaa1d512
2 changed files with 88 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -1,3 +1,9 @@
2009-11-10 Richard Frith-Macdonald <rfm@gnu.org>
* Source\win32\WIN32Server.m: Track mouse button state so that when
mouse down events are lost (which appears occasionally to be the case)
we can simulate the missing event.
2009-11-08 Fred Kiefer <FredKiefer@gmx.de>
* Source/x11/XGServerWindow.m (-windowDevice:): Don't return a

85
Source/win32/WIN32Server.m
View file

@ -96,7 +96,7 @@ LRESULT CALLBACK MainWndProc(HWND hwnd, UINT uMsg,
{
MSG msg;
WINBOOL bRet;
NSLog(@"Callback");
//NSLog(@"Callback");
while ((bRet = PeekMessage(&msg, NULL, 0, 0, PM_REMOVE)) != 0)
{
if (msg.message == WM_QUIT)
@ -563,9 +563,9 @@ NSLog(@"Callback");
if ([self handlesWindowDecorations])
[self decodeWM_NCPAINTParams: wParam : lParam : hwnd];
break;
//case WM_SHOWWINDOW:
case WM_SHOWWINDOW:
//[self decodeWM_SHOWWINDOWParams: wParam : lParam : hwnd];
//break;
break;
case WM_NCDESTROY:
[self decodeWM_NCDESTROYParams: wParam : lParam : hwnd];
break;
@ -711,6 +711,8 @@ NSLog(@"Callback");
break;
case WM_LBUTTONUP: //MOUSE
NSDebugLLog(@"NSEvent", @"Got Message %s for %d", "LBUTTONUP", hwnd);
ev = process_mouse_event(self, hwnd, wParam, lParam, NSLeftMouseDown);
[GSCurrentServer() postEvent: ev atStart: NO];
ev = process_mouse_event(self, hwnd, wParam, lParam, NSLeftMouseUp);
break;
case WM_LBUTTONDBLCLK: //MOUSE
@ -1172,6 +1174,9 @@ NSLog(@"Callback");
SetWindowPos((HWND)winNum, (HWND)otherWin, 0, 0, 0, 0,
SWP_NOSIZE | SWP_NOMOVE | SWP_NOACTIVATE);
if (otherWin == (int)HWND_TOP)
SetForegroundWindow((HWND)winNum);
/* For debug log window stack.
*/
if (GSDebugSet(@"WTrace") == YES)
@ -1778,6 +1783,14 @@ process_mouse_event(WIN32Server *svr, HWND hwnd, WPARAM wParam, LPARAM lParam,
short deltaY = 0;
static int clickCount = 1;
static LONG lastTime = 0;
/*
* Occasionally the mouse down events are lost ... don't know why.
* So we track the mouse status and simulate mouse down or up events
* if the button states appear to have changed when we get a move.
*/
static BOOL lDown = NO;
static BOOL oDown = NO;
static BOOL rDown = NO;
gcontext = GSCurrentContext();
eventLocation = MSWindowPointToGS(svr, hwnd, GET_X_LPARAM(lParam),
@ -1811,18 +1824,77 @@ process_mouse_event(WIN32Server *svr, HWND hwnd, WPARAM wParam, LPARAM lParam,
}
else if (eventType == NSMouseMoved)
{
NSEvent *e;
if (wParam & MK_LBUTTON)
{
if (lDown == NO)
{
e = process_mouse_event(svr, hwnd, wParam, lParam,
NSLeftMouseDown);
[GSCurrentServer() postEvent: e atStart: NO];
}
eventType = NSLeftMouseDragged;
}
else if (wParam & MK_RBUTTON)
{
if (lDown == YES)
{
e = process_mouse_event(svr, hwnd, wParam, lParam,
NSLeftMouseUp);
[GSCurrentServer() postEvent: e atStart: NO];
}
if (rDown == NO)
{
e = process_mouse_event(svr, hwnd, wParam, lParam,
NSRightMouseDown);
[GSCurrentServer() postEvent: e atStart: NO];
}
eventType = NSRightMouseDragged;
}
else if (wParam & MK_MBUTTON)
{
if (lDown == YES)
{
e = process_mouse_event(svr, hwnd, wParam, lParam,
NSLeftMouseUp);
[GSCurrentServer() postEvent: e atStart: NO];
}
if (rDown == YES)
{
e = process_mouse_event(svr, hwnd, wParam, lParam,
NSRightMouseUp);
[GSCurrentServer() postEvent: e atStart: NO];
}
if (oDown == NO)
{
e = process_mouse_event(svr, hwnd, wParam, lParam,
NSOtherMouseDown);
[GSCurrentServer() postEvent: e atStart: NO];
}
eventType = NSOtherMouseDragged;
}
else
{
if (lDown == YES)
{
e = process_mouse_event(svr, hwnd, wParam, lParam,
NSLeftMouseUp);
[GSCurrentServer() postEvent: e atStart: NO];
}
if (rDown == YES)
{
e = process_mouse_event(svr, hwnd, wParam, lParam,
NSRightMouseUp);
[GSCurrentServer() postEvent: e atStart: NO];
}
if (oDown == YES)
{
e = process_mouse_event(svr, hwnd, wParam, lParam,
NSOtherMouseUp);
[GSCurrentServer() postEvent: e atStart: NO];
}
}
}
else if ((eventType == NSLeftMouseDown)
|| (eventType == NSRightMouseDown)
@ -1839,6 +1911,13 @@ process_mouse_event(WIN32Server *svr, HWND hwnd, WPARAM wParam, LPARAM lParam,
}
}
if (eventType == NSLeftMouseDown) lDown = YES;
if (eventType == NSRightMouseDown) rDown = YES;
if (eventType == NSOtherMouseDown) oDown = YES;
if (eventType == NSLeftMouseUp) lDown = NO;
if (eventType == NSRightMouseUp) rDown = NO;
if (eventType == NSOtherMouseUp) oDown = NO;
event = [NSEvent mouseEventWithType: eventType
location: eventLocation
modifierFlags: eventFlags