Rebase against c0ea1ad37d3343c403d80ee18bf0d90c2699148b.

This commit is contained in:
Alistair Leslie-Hughes
2021-12-01 10:27:42 +11:00
parent 3b7c98ebf1
commit 4c51f4f5f6
7 changed files with 39 additions and 72 deletions

View File

@@ -1,7 +1,7 @@
From 36e0b9f5b0b0ecb9de225dd3b1f092c99a1837f4 Mon Sep 17 00:00:00 2001
From 1687b01c234b57803be7099f81ccce2136642670 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 4/8] winex11.drv: Keep track of pointer and device button
Subject: [PATCH] winex11.drv: Keep track of pointer and device button
mappings.
We are going to receive raw button events and we will need to apply the
@@ -196,10 +196,10 @@ index 9088aada596..6905d0827f8 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 463c2027077..f7af7f346e5 100644
index 8cddfa05904..b8d1bb100de 100644
--- a/dlls/winex11.drv/x11drv.h
+++ b/dlls/winex11.drv/x11drv.h
@@ -642,6 +642,7 @@ extern void retry_grab_clipping_window(void) DECLSPEC_HIDDEN;
@@ -698,6 +698,7 @@ extern void retry_grab_clipping_window(void) DECLSPEC_HIDDEN;
extern BOOL clip_fullscreen_window( HWND hwnd, BOOL reset ) DECLSPEC_HIDDEN;
extern void move_resize_window( HWND hwnd, int dir ) DECLSPEC_HIDDEN;
extern void X11DRV_InitKeyboard( Display *display ) DECLSPEC_HIDDEN;
@@ -208,7 +208,7 @@ index 463c2027077..f7af7f346e5 100644
DWORD mask, DWORD flags ) DECLSPEC_HIDDEN;
diff --git a/dlls/winex11.drv/x11drv_main.c b/dlls/winex11.drv/x11drv_main.c
index 98f57383bc2..2a35a6a8548 100644
index d8e2a88c5f6..21437d99c5c 100644
--- a/dlls/winex11.drv/x11drv_main.c
+++ b/dlls/winex11.drv/x11drv_main.c
@@ -629,6 +629,7 @@ static BOOL process_attach(void)
@@ -218,7 +218,7 @@ index 98f57383bc2..2a35a6a8548 100644
+ X11DRV_InitMouse( gdi_display );
if (use_xim) use_xim = X11DRV_InitXIM( input_style );
X11DRV_DisplayDevices_Init(FALSE);
init_user_driver();
--
2.33.0