Rebase against 369b540abf32869df8e9b28e283d795ae92b6a05.

patches/winex11-Fixed-scancodes/0005-winex11-Use-the-user-configured-keyboard-layout-if-a.patch

@@ -1,4 +1,4 @@
-From d277822336764e01d8edfef93332738dfbd678a3 Mon Sep 17 00:00:00 2001
+From 4c7d3e59dc62e62aac5ce273494e1a7cb5349bd1 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?R=C3=A9mi=20Bernon?= <rbernon@codeweavers.com>
 Date: Fri, 6 Jan 2023 08:09:11 +0100
 Subject: [PATCH] winex11: Use the user configured keyboard layout if any.
@@ -94,18 +94,18 @@ index 1846bd923a5..fe87ae2235d 100644
      syms = (keysyms_per_keycode > 4) ? 4 : keysyms_per_keycode;
  
 diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h
-index da501ad4618..9549d427583 100644
+index 52260474ad2..f6baca922ef 100644
 --- a/dlls/winex11.drv/x11drv.h
 +++ b/dlls/winex11.drv/x11drv.h
-@@ -444,6 +444,7 @@ extern BOOL use_primary_selection;
+@@ -447,6 +447,7 @@ extern BOOL use_take_focus;
+ extern BOOL use_primary_selection;
  extern BOOL use_system_cursors;
- extern BOOL show_systray;
  extern BOOL grab_fullscreen;
 +extern int keyboard_layout;
  extern BOOL usexcomposite;
  extern BOOL managed_mode;
  extern BOOL decorated_mode;
-@@ -703,6 +704,7 @@ extern void init_recursive_mutex( pthread_mutex_t *mutex );
+@@ -707,6 +708,7 @@ extern void init_recursive_mutex( pthread_mutex_t *mutex );
  
  /* keyboard.c */
  
@@ -114,18 +114,18 @@ index da501ad4618..9549d427583 100644
  
  #define DEPTH_COUNT 3
 diff --git a/dlls/winex11.drv/x11drv_main.c b/dlls/winex11.drv/x11drv_main.c
-index 73b2237778b..3ac9b24d941 100644
+index b83365861d4..842f03be998 100644
 --- a/dlls/winex11.drv/x11drv_main.c
 +++ b/dlls/winex11.drv/x11drv_main.c
-@@ -75,6 +75,7 @@ BOOL use_primary_selection = FALSE;
+@@ -75,6 +75,7 @@ BOOL use_take_focus = TRUE;
+ BOOL use_primary_selection = FALSE;
  BOOL use_system_cursors = TRUE;
- BOOL show_systray = TRUE;
  BOOL grab_fullscreen = FALSE;
 +int keyboard_layout = -1;
  BOOL managed_mode = TRUE;
  BOOL decorated_mode = TRUE;
  BOOL private_color_map = FALSE;
-@@ -574,6 +575,9 @@ static void setup_options(void)
+@@ -571,6 +572,9 @@ static void setup_options(void)
      if (!get_config_key( hkey, appkey, "GrabFullscreen", buffer, sizeof(buffer) ))
          grab_fullscreen = IS_OPTION_TRUE( buffer[0] );
  

patches/winex11-Fixed-scancodes/0008-winex11-Support-fixed-X11-keycode-to-scancode-conver.patch

@@ -1,4 +1,4 @@
-From 8eed5c775bd6138ba5acb838a37ca7579697f65c Mon Sep 17 00:00:00 2001
+From c61fac8a28ccc3f6bfb1e502cfc1e4027fe2d2c9 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?R=C3=A9mi=20Bernon?= <rbernon@codeweavers.com>
 Date: Wed, 30 Nov 2022 18:46:00 +0100
 Subject: [PATCH] winex11: Support fixed X11 keycode to scancode conversion.
@@ -85,11 +85,11 @@ index dbc1e1ea689..6a71da1a5d9 100644
  	const char *ksname;
  	keysym = XkbKeycodeToKeysym( display, keyc, 0, 0 );
 diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h
-index 193e34037e3..367eb7b5f97 100644
+index f6baca922ef..e11c48dd3e2 100644
 --- a/dlls/winex11.drv/x11drv.h
 +++ b/dlls/winex11.drv/x11drv.h
-@@ -445,6 +445,7 @@ extern BOOL use_system_cursors;
- extern BOOL show_systray;
+@@ -448,6 +448,7 @@ extern BOOL use_primary_selection;
+ extern BOOL use_system_cursors;
  extern BOOL grab_fullscreen;
  extern int keyboard_layout;
 +extern BOOL keyboard_scancode_detect;
@@ -97,18 +97,18 @@ index 193e34037e3..367eb7b5f97 100644
  extern BOOL managed_mode;
  extern BOOL decorated_mode;
 diff --git a/dlls/winex11.drv/x11drv_main.c b/dlls/winex11.drv/x11drv_main.c
-index 3ac9b24d941..60f624d4aec 100644
+index 842f03be998..782989dab4b 100644
 --- a/dlls/winex11.drv/x11drv_main.c
 +++ b/dlls/winex11.drv/x11drv_main.c
-@@ -76,6 +76,7 @@ BOOL use_system_cursors = TRUE;
- BOOL show_systray = TRUE;
+@@ -76,6 +76,7 @@ BOOL use_primary_selection = FALSE;
+ BOOL use_system_cursors = TRUE;
  BOOL grab_fullscreen = FALSE;
  int keyboard_layout = -1;
 +BOOL keyboard_scancode_detect = TRUE;
  BOOL managed_mode = TRUE;
  BOOL decorated_mode = TRUE;
  BOOL private_color_map = FALSE;
-@@ -582,6 +583,9 @@ static void setup_options(void)
+@@ -579,6 +580,9 @@ static void setup_options(void)
      if (p) set_reg_string_value( hkey, "KeyboardLayoutList", p, len * sizeof(WCHAR) );
      free( p );
  

patches/winex11-Fixed-scancodes/0009-winex11-Disable-keyboard-scancode-auto-detection-by-.patch

@@ -1,4 +1,4 @@
-From fea8e9e597fd7b92166b2e78321506b884051d99 Mon Sep 17 00:00:00 2001
+From cdb9c20dfeede2240d102ac2f407f58591b3ec2d Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?R=C3=A9mi=20Bernon?= <rbernon@codeweavers.com>
 Date: Fri, 6 Jan 2023 11:31:36 +0100
 Subject: [PATCH] winex11: Disable keyboard scancode auto-detection by default.
@@ -11,11 +11,11 @@ Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45605
  2 files changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/dlls/winex11.drv/x11drv_main.c b/dlls/winex11.drv/x11drv_main.c
-index 802bbae7815..26cf404731b 100644
+index 782989dab4b..3bee214e09b 100644
 --- a/dlls/winex11.drv/x11drv_main.c
 +++ b/dlls/winex11.drv/x11drv_main.c
-@@ -76,7 +76,7 @@ BOOL use_system_cursors = TRUE;
- BOOL show_systray = TRUE;
+@@ -76,7 +76,7 @@ BOOL use_primary_selection = FALSE;
+ BOOL use_system_cursors = TRUE;
  BOOL grab_fullscreen = FALSE;
  int keyboard_layout = -1;
 -BOOL keyboard_scancode_detect = TRUE;
@@ -37,5 +37,5 @@ index a9d83b45f00..3ee20d49874 100644
      else CheckDlgButton( dialog, IDC_KEYBOARD_SCANCODE_DETECT, BST_UNCHECKED );
      free( buffer );
 -- 
-2.40.1
+2.42.0