Unified · Split
| @@ -2423,11 +2423,10 @@ static int lookupkey(int key) · 2422 unmodified lines | |||
| 2423 | mpkey = lookup_keymap_table(keymap, key); | 2423 | mpkey = lookup_keymap_table(keymap, key); |
| 2424 | 2424 | ||
| 2425 | // XFree86 keysym range; typically contains obscure "extra" keys | 2425 | // XFree86 keysym range; typically contains obscure "extra" keys |
| 2426 | if (!mpkey && key >= 0x10080001 && key <= 0x1008FFFF) { | 2426 | static_assert(MP_KEY_UNKNOWN_RESERVED_START + (0x1008FFFF - 0x10080000) <= |
| 2427 | MP_KEY_UNKNOWN_RESERVED_LAST, ""); | ||
| 2428 | if (!mpkey && key >= 0x10080001 && key <= 0x1008FFFF) | ||
| 2427 | mpkey = MP_KEY_UNKNOWN_RESERVED_START + (key - 0x10080000); | 2429 | mpkey = MP_KEY_UNKNOWN_RESERVED_START + (key - 0x10080000); |
| 2428 | if (mpkey > MP_KEY_UNKNOWN_RESERVED_LAST) | ||
| 2429 | mpkey = 0; | ||
| 2430 | } | ||
| 2431 | 2430 | ||
| 2432 | return mpkey; | 2431 | return mpkey; |
| 2433 | } | 2432 | } |
| @@ -831,11 +831,10 @@ static int vo_x11_lookupkey(int key) · 830 unmodified lines | |||
| 831 | mpkey = lookup_keymap_table(keymap, key); | 831 | mpkey = lookup_keymap_table(keymap, key); |
| 832 | 832 | ||
| 833 | // XFree86 keysym range; typically contains obscure "extra" keys | 833 | // XFree86 keysym range; typically contains obscure "extra" keys |
| 834 | if (!mpkey && key >= 0x10080001 && key <= 0x1008FFFF) { | 834 | static_assert(MP_KEY_UNKNOWN_RESERVED_START + (0x1008FFFF - 0x10080000) <= |
| 835 | MP_KEY_UNKNOWN_RESERVED_LAST, ""); | ||
| 836 | if (!mpkey && key >= 0x10080001 && key <= 0x1008FFFF) | ||
| 835 | mpkey = MP_KEY_UNKNOWN_RESERVED_START + (key - 0x10080000); | 837 | mpkey = MP_KEY_UNKNOWN_RESERVED_START + (key - 0x10080000); |
| 836 | if (mpkey > MP_KEY_UNKNOWN_RESERVED_LAST) | ||
| 837 | mpkey = 0; | ||
| 838 | } | ||
| 839 | 838 | ||
| 840 | return mpkey; | 839 | return mpkey; |
| 841 | } | 840 | } |