Daniel Hill : winex11.drv: Improve DetectLayout heuristics.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: b5359b7da0dc5d86b4cbbcf5170c818083ac7766
URL:    https://gitlab.winehq.org/wine/wine/-/commit/b5359b7da0dc5d86b4cbbcf5170c818...

Author: Daniel Hill 
Date:   Thu Jan 18 20:35:13 2024 +1300

winex11.drv: Improve DetectLayout heuristics.

Dvorak detection would sometimes fallback to Phantom keys, because we
only use seq as a tie breaker greater emphasis on locality is required
for layouts using the same language.

Signed-off-by: Daniel Hill

---

dlls/winex11.drv/keyboard.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/dlls/winex11.drv/keyboard.c b/dlls/winex11.drv/keyboard.c
index 89bf7da550a..2e7a118c110 100644
--- a/dlls/winex11.drv/keyboard.c
+++ b/dlls/winex11.drv/keyboard.c
@@ -1522,8 +1522,7 @@ X11DRV_KEYBOARD_DetectLayout( Display *display )
     }
     TRACE("matches=%d, mismatches=%d, seq=%d, score=%d\n",
       match, mismatch, seq, score);
-    if ((score > max_score) ||
-	((score == max_score) && (seq > max_seq))) {
+    if (score + (int)seq > max_score + (int)max_seq) {
       /* best match so far */
       kbd_layout = current;
       max_score = score;