From 8c4ae8961cb2447cce64667b5dc40785f3b4709a Mon Sep 17 00:00:00 2001 From: Brecht Van Lommel Date: Tue, 18 Dec 2018 14:30:00 +0100 Subject: Fix T59564: Huion pen pressure not working on Linux, after recent changes. --- intern/ghost/intern/GHOST_SystemX11.cpp | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'intern/ghost') diff --git a/intern/ghost/intern/GHOST_SystemX11.cpp b/intern/ghost/intern/GHOST_SystemX11.cpp index ce056ef2c62..e53379a4f22 100644 --- a/intern/ghost/intern/GHOST_SystemX11.cpp +++ b/intern/ghost/intern/GHOST_SystemX11.cpp @@ -2356,10 +2356,7 @@ void GHOST_SystemX11::refreshXInputDevices() GHOST_TTabletMode tablet_mode = tablet_mode_from_name(device_info[i].name, device_type); - if ((m_xtablet.StylusDevice == NULL) && - ((tablet_mode == GHOST_kTabletModeStylus) && (device_info[i].type != m_atom.TABLET))) - /* for libinput to work reliable, only lookup ValuatorClass in Tablet type:'STYLUS' */ - { + if ((m_xtablet.StylusDevice == NULL) && (tablet_mode == GHOST_kTabletModeStylus)) { // printf("\tfound stylus\n"); m_xtablet.StylusID = device_info[i].id; m_xtablet.StylusDevice = XOpenDevice(m_display, m_xtablet.StylusID); @@ -2386,7 +2383,7 @@ void GHOST_SystemX11::refreshXInputDevices() m_xtablet.YtiltLevels = 0; } - found_valuator_class = true; + found_valuator_class = (m_xtablet.PressureLevels > 0); break; } -- cgit v1.2.3