refactor: unify pointer movement

In nested mode we can use the same code path as in drm mode now.
This commit is contained in:
Roman Gilg 2020-02-25 17:31:07 +01:00
parent a4fa525255
commit d4361f4649
2 changed files with 8 additions and 8 deletions

View file

@ -680,15 +680,15 @@ void wlserver_mousefocus( struct wlr_surface *wlrsurface )
wlr_seat_pointer_notify_enter( wlserver.wlr.seat, wlrsurface, wlserver.mouse_surface_cursorx, wlserver.mouse_surface_cursory );
}
void wlserver_mousemotion( int x, int y, uint32_t time )
void wlserver_mousemotion( int dx, int dy, uint32_t time )
{
pointerX += x;
pointerY += y;
if ( g_XWLDpy != NULL )
{
XTestFakeRelativeMotionEvent( g_XWLDpy, x, y, CurrentTime );
XFlush( g_XWLDpy );
if (!wlserver.mouse_focus_surface) {
return;
}
wlserver_movecursor(dx, dy, dx, dy, time);
wlr_seat_pointer_notify_motion(wlserver.wlr.seat, time, wlserver.mouse_surface_cursorx,
wlserver.mouse_surface_cursory);
wlr_seat_pointer_notify_frame(wlserver.wlr.seat);
}
void wlserver_mousebutton( int button, bool press, uint32_t time )

View file

@ -103,7 +103,7 @@ void wlserver_keyboardfocus( struct wlr_surface *surface );
void wlserver_key( uint32_t key, bool press, uint32_t time );
void wlserver_mousefocus( struct wlr_surface *wlrsurface );
void wlserver_mousemotion( int x, int y, uint32_t time );
void wlserver_mousemotion( int dx, int dy, uint32_t time );
void wlserver_mousebutton( int button, bool press, uint32_t time );
void wlserver_mousewheel( int x, int y, uint32_t time );