From 41d03dca2a65dc4f2b8073cd7061c2d2ee1173d8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kacper=20Michaj=C5=82ow?= Date: Wed, 5 Mar 2025 19:53:18 +0100 Subject: [PATCH] {x11,wayland}_common: convert dead code to static sanity check --- video/out/wayland_common.c | 7 +++---- video/out/x11_common.c | 7 +++---- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/video/out/wayland_common.c b/video/out/wayland_common.c index e80d32a326..47d317e42b 100644 --- a/video/out/wayland_common.c +++ b/video/out/wayland_common.c @@ -2423,11 +2423,10 @@ static int lookupkey(int key) mpkey = lookup_keymap_table(keymap, key); // XFree86 keysym range; typically contains obscure "extra" keys - if (!mpkey && key >= 0x10080001 && key <= 0x1008FFFF) { + static_assert(MP_KEY_UNKNOWN_RESERVED_START + (0x1008FFFF - 0x10080000) <= + MP_KEY_UNKNOWN_RESERVED_LAST, ""); + if (!mpkey && key >= 0x10080001 && key <= 0x1008FFFF) mpkey = MP_KEY_UNKNOWN_RESERVED_START + (key - 0x10080000); - if (mpkey > MP_KEY_UNKNOWN_RESERVED_LAST) - mpkey = 0; - } return mpkey; } diff --git a/video/out/x11_common.c b/video/out/x11_common.c index 52e661f3f8..7099199e3a 100644 --- a/video/out/x11_common.c +++ b/video/out/x11_common.c @@ -831,11 +831,10 @@ static int vo_x11_lookupkey(int key) mpkey = lookup_keymap_table(keymap, key); // XFree86 keysym range; typically contains obscure "extra" keys - if (!mpkey && key >= 0x10080001 && key <= 0x1008FFFF) { + static_assert(MP_KEY_UNKNOWN_RESERVED_START + (0x1008FFFF - 0x10080000) <= + MP_KEY_UNKNOWN_RESERVED_LAST, ""); + if (!mpkey && key >= 0x10080001 && key <= 0x1008FFFF) mpkey = MP_KEY_UNKNOWN_RESERVED_START + (key - 0x10080000); - if (mpkey > MP_KEY_UNKNOWN_RESERVED_LAST) - mpkey = 0; - } return mpkey; }