system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-10-07 05:34:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

winemac: Rename MOUSE_MOVE_RELATIVE to avoid collision with wincontypes.h.

Browse source 
Signed-off-by: Jacek Caban <jacek@codeweavers.com>
This commit is contained in:
Jacek Caban 2022-06-03 02:00:15 +02:00 committed by Alexandre Julliard
parent 7a8254fd05
commit 4998bbacef
5 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
dlls/winemac.drv/cocoa_app.m
View file

@ -1188,7 +1188,7 @@ - (BOOL) setCursorPosition:(CGPoint)pos
[eventQueuesLock lock];
for (queue in eventQueues)
{
[queue discardEventsMatchingMask:event_mask_for_type(MOUSE_MOVED) |
[queue discardEventsMatchingMask:event_mask_for_type(MOUSE_MOVED_RELATIVE) |
event_mask_for_type(MOUSE_MOVED_ABSOLUTE)
forWindow:nil];
[queue resetMouseEventPositions:pos];
@ -1444,7 +1444,7 @@ - (void) handleMouseMove:(NSEvent*)anEvent
mouseMoveDeltaX += [anEvent deltaX];
mouseMoveDeltaY += [anEvent deltaY];
event = macdrv_create_event(MOUSE_MOVED, targetWindow);
event = macdrv_create_event(MOUSE_MOVED_RELATIVE, targetWindow);
event->mouse_moved.x = mouseMoveDeltaX * scale;
event->mouse_moved.y = mouseMoveDeltaY * scale;

6
dlls/winemac.drv/cocoa_event.m
View file

@ -204,17 +204,17 @@ - (void) postEventObject:(MacDrvEvent*)event
}];
[events removeObjectsAtIndexes:indexes];
if ((event->event->type == MOUSE_MOVED ||
if ((event->event->type == MOUSE_MOVED_RELATIVE ||
event->event->type == MOUSE_MOVED_ABSOLUTE) &&
event->event->deliver == INT_MAX &&
(lastEvent = [events lastObject]) &&
(lastEvent->event->type == MOUSE_MOVED ||
(lastEvent->event->type == MOUSE_MOVED_RELATIVE ||
lastEvent->event->type == MOUSE_MOVED_ABSOLUTE) &&
lastEvent->event->deliver == INT_MAX &&
lastEvent->event->window == event->event->window &&
lastEvent->event->mouse_moved.drag == event->event->mouse_moved.drag)
{
if (event->event->type == MOUSE_MOVED)
if (event->event->type == MOUSE_MOVED_RELATIVE)
{
lastEvent->event->mouse_moved.x += event->event->mouse_moved.x;
lastEvent->event->mouse_moved.y += event->event->mouse_moved.y;

6
dlls/winemac.drv/event.c
View file

@ -44,7 +44,7 @@ static const char *dbgstr_event(int type)
"KEYBOARD_CHANGED",
"LOST_PASTEBOARD_OWNERSHIP",
"MOUSE_BUTTON",
"MOUSE_MOVED",
"MOUSE_MOVED_RELATIVE",
"MOUSE_MOVED_ABSOLUTE",
"MOUSE_SCROLL",
"QUERY_EVENT",
@ -100,7 +100,7 @@ static macdrv_event_mask get_event_mask(DWORD mask)
if (mask & QS_MOUSEMOVE)
{
event_mask |= event_mask_for_type(MOUSE_MOVED);
event_mask |= event_mask_for_type(MOUSE_MOVED_RELATIVE);
event_mask |= event_mask_for_type(MOUSE_MOVED_ABSOLUTE);
}
@ -325,7 +325,7 @@ void macdrv_handle_event(const macdrv_event *event)
case MOUSE_BUTTON:
macdrv_mouse_button(hwnd, event);
break;
case MOUSE_MOVED:
case MOUSE_MOVED_RELATIVE:
case MOUSE_MOVED_ABSOLUTE:
macdrv_mouse_moved(hwnd, event);
break;

2
dlls/winemac.drv/macdrv_cocoa.h
View file

@ -328,7 +328,7 @@ extern int macdrv_set_display_mode(const struct macdrv_display* display,
KEYBOARD_CHANGED,
LOST_PASTEBOARD_OWNERSHIP,
MOUSE_BUTTON,
MOUSE_MOVED,
MOUSE_MOVED_RELATIVE,
MOUSE_MOVED_ABSOLUTE,
MOUSE_SCROLL,
QUERY_EVENT,

4
dlls/winemac.drv/mouse.c
View file

@ -892,14 +892,14 @@ void macdrv_mouse_button(HWND hwnd, const macdrv_event *event)
/***********************************************************************
* macdrv_mouse_moved
*
* Handler for MOUSE_MOVED and MOUSE_MOVED_ABSOLUTE events.
* Handler for MOUSE_MOVED_RELATIVE and MOUSE_MOVED_ABSOLUTE events.
*/
void macdrv_mouse_moved(HWND hwnd, const macdrv_event *event)
{
UINT flags = MOUSEEVENTF_MOVE;
TRACE("win %p/%p %s (%d,%d) drag %d time %lu (%lu ticks ago)\n", hwnd, event->window,
(event->type == MOUSE_MOVED) ? "relative" : "absolute",
(event->type == MOUSE_MOVED_RELATIVE) ? "relative" : "absolute",
event->mouse_moved.x, event->mouse_moved.y, event->mouse_moved.drag,
event->mouse_moved.time_ms, (NtGetTickCount() - event->mouse_moved.time_ms));