wine/wine-staging
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-staging.git synced 2024-11-21 16:46:54 -08:00
Code Issues Packages Projects Releases Wiki Activity

Rebase against 013f54af1f721dce651c85f87a5339ba3cb9d4a1.

Browse Source
This commit is contained in:
Alistair Leslie-Hughes 2024-05-03 07:32:40 +10:00
parent 0f06925bd9
commit a4b239f15e
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
patches/user32-rawinput-mouse/0005-winex11-Keep-track-of-mouse-device-and-pointer-butto.patch
View File

@ -1,4 +1,4 @@
From c984dc72cccf9ca667bad9b1c334204fb45ad851 Mon Sep 17 00:00:00 2001
From a0452d319eecec33d0e130e19e9d1993b52caa2f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20Bernon?= <rbernon@codeweavers.com>
Date: Thu, 19 Dec 2019 22:34:44 +0100
Subject: [PATCH] winex11: Keep track of mouse device and pointer button
@ -17,10 +17,10 @@ Original patch by Andrew Eikum <aeikum@codeweavers.com>.
5 files changed, 114 insertions(+), 6 deletions(-)
diff --git a/configure.ac b/configure.ac
index 0b8d37fa21b..425a20d73c9 100644
index d95ff178367..5d38e874089 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1203,6 +1203,7 @@ then
@@ -1194,6 +1194,7 @@ then
dnl *** All of the following tests require X11/Xlib.h
AC_CHECK_HEADERS([X11/extensions/shape.h \
@ -215,22 +215,22 @@ index d3c97468fdb..5a5ec51e370 100644
xinput2_available = XQueryExtension( gdi_display, "XInputExtension", &xinput2_opcode, &event, &error );
diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h
index 2f5721d2b8b..05ae23dcfdb 100644
index 70ef0a112ac..a56eb8b0046 100644
--- a/dlls/winex11.drv/x11drv.h
+++ b/dlls/winex11.drv/x11drv.h
@@ -688,6 +688,7 @@ extern void retry_grab_clipping_window(void);
@@ -682,6 +682,7 @@ extern void retry_grab_clipping_window(void);
extern void ungrab_clipping_window(void);
extern void move_resize_window( HWND hwnd, int dir );
extern void X11DRV_InitKeyboard( Display *display );
+extern void X11DRV_InitMouse( Display *display );
extern BOOL process_events( Display *display, Bool (*filter)(Display*, XEvent*, XPointer), ULONG_PTR arg );
extern BOOL X11DRV_ProcessEvents( DWORD mask );
extern HWND *build_hwnd_list(void);
diff --git a/dlls/winex11.drv/x11drv_main.c b/dlls/winex11.drv/x11drv_main.c
index 19419644940..32f23e64378 100644
index c9e0d43c9ce..930f3a1c088 100644
--- a/dlls/winex11.drv/x11drv_main.c
+++ b/dlls/winex11.drv/x11drv_main.c
@@ -700,6 +700,7 @@ static NTSTATUS x11drv_init( void *arg )
@@ -680,6 +680,7 @@ static NTSTATUS x11drv_init( void *arg )
XkbUseExtension( gdi_display, NULL, NULL );
X11DRV_InitKeyboard( gdi_display );

2
staging/upstream-commit
View File

@ -1 +1 @@
25c58e6887647a223aa74f7e7d0402abb4a2a2b8
013f54af1f721dce651c85f87a5339ba3cb9d4a1