blender
/
blender
129
398
Fork 572
Code Issues 6.2k Pull Requests 745 Projects 19 Wiki Activity

Revert fix for T48901: Use of XIWarpPointer 

Xorg's XIWarpPointer doesn't support multi-head display while
XWarpPointer does.

Revert since this is a known TODO in Xorg and setting a custom
xinput matrix seems not to be used often.

Resolves T50383
This commit is contained in:
Campbell Barton 2019-01-15 16:44:08 +11:00
parent dde4375d5c
commit 9461af299c
Notes: blender-bot 2023-02-14 07:18:49 +01:00 
Referenced by issue #50383, Mouse jumps monitors on middle button release
3 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
intern/ghost/intern/GHOST_SystemX11.cpp
View File

@ -1671,7 +1671,7 @@ setCursorPosition(
}
#endif
#ifdef WITH_X11_XINPUT
#if defined(WITH_X11_XINPUT) && defined(USE_X11_XINPUT_WARP)
if ((m_xinput_version.present) &&
(m_xinput_version.major_version >= 2))
{

6
intern/ghost/intern/GHOST_SystemX11.h
View File

@ -42,6 +42,12 @@
// For tablets
#ifdef WITH_X11_XINPUT
# include <X11/extensions/XInput.h>
/* Disable xinput warp, currently not implemented by Xorg for multi-head display.
* (see comment in xserver "Xi/xiwarppointer.c" -> "FIXME: panoramix stuff is missing" ~ v1.13.4)
* If this is supported we can add back xinput for warping (fixing T48901).
* For now disable (see T50383). */
// # define USE_X11_XINPUT_WARP
#endif
#if defined(WITH_X11_XINPUT) && defined(X_HAVE_UTF8_STRING)

2
intern/ghost/intern/GHOST_WindowX11.cpp
View File

@ -1515,7 +1515,7 @@ setWindowCursorGrab(
* blender gets can be outside the screen causing menus not to show
* properly unless the user moves the mouse */
#ifdef WITH_X11_XINPUT
#if defined(WITH_X11_XINPUT) && defined(USE_X11_XINPUT_WARP)
if ((m_system->m_xinput_version.present) &&
(m_system->m_xinput_version.major_version >= 2))
{