wine/wine-staging
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-staging.git synced 2025-09-12 18:50:20 -07:00
Code Issues Packages Projects Releases Wiki Activity

Rebase against 7de36f8e98b2cbbdcc360bdba96a5fe83e815d1a.

Browse Source
This commit is contained in:
Alistair Leslie-Hughes
2022-05-06 10:48:57 +10:00
parent 38391a1d70
commit 6a9fb5a923
5 changed files with 61 additions and 206 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
patches/wintab32-improvements/0003-winex11-Handle-negative-orAltitude-values.patch
View File

@@ -1,4 +1,4 @@
From 674b3d1e35526de8ab073854aae5d457954d40e6 Mon Sep 17 00:00:00 2001
From 76fdede0c6b36240135ce2e6f4419cef13fbe36f Mon Sep 17 00:00:00 2001
From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
Date: Thu, 31 May 2018 11:52:09 +1000
Subject: [PATCH] winex11: Handle negative orAltitude values
@@ -8,10 +8,10 @@ Subject: [PATCH] winex11: Handle negative orAltitude values
1 file changed, 16 insertions(+)
diff --git a/dlls/winex11.drv/wintab.c b/dlls/winex11.drv/wintab.c
index ef42a1f07c..7b1bf38146 100644
index a6b80daedbe..537e96f7808 100644
--- a/dlls/winex11.drv/wintab.c
+++ b/dlls/winex11.drv/wintab.c
@@ -903,6 +903,11 @@ static BOOL motion_event( HWND hwnd, XEvent *event )
@@ -902,6 +902,11 @@ static BOOL motion_event( HWND hwnd, XEvent *event )
(abs(motion->axis_data[3]),
abs(motion->axis_data[4])))
* (gMsgPacket.pkStatus & TPS_INVERT?-1:1));
@@ -23,7 +23,7 @@ index ef42a1f07c..7b1bf38146 100644
gMsgPacket.pkNormalPressure = motion->axis_data[2];
gMsgPacket.pkButtons = get_button_state(curnum);
gMsgPacket.pkChanged = get_changed_state(&gMsgPacket);
@@ -929,6 +934,7 @@ static BOOL button_event( HWND hwnd, XEvent *event )
@@ -928,6 +933,7 @@ static BOOL button_event( HWND hwnd, XEvent *event )
gMsgPacket.pkTime = EVENT_x11_time_to_win32_time(button->time);
gMsgPacket.pkSerialNumber = gSerial++;
gMsgPacket.pkCursor = curnum;
@@ -31,7 +31,7 @@ index ef42a1f07c..7b1bf38146 100644
if (button->axes_count > 0) {
gMsgPacket.pkX = button->axis_data[0];
gMsgPacket.pkY = button->axis_data[1];
@@ -943,6 +949,12 @@ static BOOL button_event( HWND hwnd, XEvent *event )
@@ -942,6 +948,12 @@ static BOOL button_event( HWND hwnd, XEvent *event )
gMsgPacket.pkOrientation = last_packet.pkOrientation;
gMsgPacket.pkNormalPressure = last_packet.pkNormalPressure;
}
@@ -43,8 +43,8 @@ index ef42a1f07c..7b1bf38146 100644
+
gMsgPacket.pkButtons = get_button_state(curnum);
gMsgPacket.pkChanged = get_changed_state(&gMsgPacket);
SendMessageW(hwndTabletDefault,WT_PACKET,gMsgPacket.pkSerialNumber,(LPARAM)hwnd);
@@ -985,6 +997,10 @@ static BOOL proximity_event( HWND hwnd, XEvent *event )
send_message( hwndTabletDefault, WT_PACKET, gMsgPacket.pkSerialNumber, (LPARAM)hwnd );
@@ -984,6 +996,10 @@ static BOOL proximity_event( HWND hwnd, XEvent *event )
gMsgPacket.pkOrientation.orAltitude = ((1000 - 15 * max(abs(proximity->axis_data[3]),
abs(proximity->axis_data[4])))
* (gMsgPacket.pkStatus & TPS_INVERT?-1:1));
@@ -56,5 +56,5 @@ index ef42a1f07c..7b1bf38146 100644
gMsgPacket.pkButtons = get_button_state(curnum);
--
2.17.1
2.35.1