From 62f5c595f379880fd0ebb866622a9f8d5ec9db0d Mon Sep 17 00:00:00 2001
From: Rubidium <rubidium@openttd.org>
Date: Sun, 7 Apr 2024 21:55:40 +0200
Subject: [PATCH] Codechange: use range-based for loops and let count be
 correct count

---
 src/video/allegro_v.cpp | 11 +++++------
 src/video/sdl2_v.cpp    | 24 +++++++++++-------------
 src/video/sdl_v.cpp     | 11 +++++------
 src/video/win32_v.cpp   | 11 +++++------
 4 files changed, 26 insertions(+), 31 deletions(-)

diff --git a/src/video/allegro_v.cpp b/src/video/allegro_v.cpp
index 716c46b773..77c90e1536 100644
--- a/src/video/allegro_v.cpp
+++ b/src/video/allegro_v.cpp
@@ -251,8 +251,8 @@ struct AllegroVkMapping {
 	uint8_t map_to;
 };
 
-#define AS(x, z) {x, 0, z}
-#define AM(x, y, z, w) {x, y - x, z}
+#define AS(x, z) {x, 1, z}
+#define AM(x, y, z, w) {x, y - x + 1, z}
 
 static const AllegroVkMapping _vk_mapping[] = {
 	/* Pageup stuff + up/down */
@@ -312,12 +312,11 @@ static uint32_t ConvertAllegroKeyIntoMy(char32_t *character)
 	int scancode;
 	int unicode = ureadkey(&scancode);
 
-	const AllegroVkMapping *map;
 	uint key = 0;
 
-	for (map = _vk_mapping; map != endof(_vk_mapping); ++map) {
-		if ((uint)(scancode - map->vk_from) <= map->vk_count) {
-			key = scancode - map->vk_from + map->map_to;
+	for (const auto &map : _vk_mapping) {
+		if (IsInsideBS(scancode, map.vk_from, map.vk_count)) {
+			key = scancode - map.vk_from + map.map_to;
 			break;
 		}
 	}
diff --git a/src/video/sdl2_v.cpp b/src/video/sdl2_v.cpp
index 585571385d..d79016f6da 100644
--- a/src/video/sdl2_v.cpp
+++ b/src/video/sdl2_v.cpp
@@ -246,10 +246,10 @@ struct SDLVkMapping {
 	bool unprintable;
 };
 
-#define AS(x, z) {x, 0, z, false}
-#define AM(x, y, z, w) {x, (uint8_t)(y - x), z, false}
-#define AS_UP(x, z) {x, 0, z, true}
-#define AM_UP(x, y, z, w) {x, (uint8_t)(y - x), z, true}
+#define AS(x, z) {x, 1, z, false}
+#define AM(x, y, z, w) {x, (uint8_t)(y - x + 1), z, false}
+#define AS_UP(x, z) {x, 1, z, true}
+#define AM_UP(x, y, z, w) {x, (uint8_t)(y - x + 1), z, true}
 
 static const SDLVkMapping _vk_mapping[] = {
 	/* Pageup stuff + up/down */
@@ -306,14 +306,13 @@ static const SDLVkMapping _vk_mapping[] = {
 
 static uint ConvertSdlKeyIntoMy(SDL_Keysym *sym, char32_t *character)
 {
-	const SDLVkMapping *map;
 	uint key = 0;
 	bool unprintable = false;
 
-	for (map = _vk_mapping; map != endof(_vk_mapping); ++map) {
-		if ((uint)(sym->sym - map->vk_from) <= map->vk_count) {
-			key = sym->sym - map->vk_from + map->map_to;
-			unprintable = map->unprintable;
+	for (const auto &map : _vk_mapping) {
+		if (IsInsideBS(sym, map.vk_from, map.vk_count)) {
+			key = sym->sym - map.vk_from + map.map_to;
+			unprintable = map.unprintable;
 			break;
 		}
 	}
@@ -346,12 +345,11 @@ static uint ConvertSdlKeyIntoMy(SDL_Keysym *sym, char32_t *character)
  */
 static uint ConvertSdlKeycodeIntoMy(SDL_Keycode kc)
 {
-	const SDLVkMapping *map;
 	uint key = 0;
 
-	for (map = _vk_mapping; map != endof(_vk_mapping); ++map) {
-		if ((uint)(kc - map->vk_from) <= map->vk_count) {
-			key = kc - map->vk_from + map->map_to;
+	for (const auto &map : _vk_mapping) {
+		if (IsInsideBS(kc, map.vk_from, map.vk_count)) {
+			key = kc - map.vk_from + map.map_to;
 			break;
 		}
 	}
diff --git a/src/video/sdl_v.cpp b/src/video/sdl_v.cpp
index a950d4d65d..f68168b036 100644
--- a/src/video/sdl_v.cpp
+++ b/src/video/sdl_v.cpp
@@ -378,8 +378,8 @@ struct SDLVkMapping {
 	uint8_t map_to;
 };
 
-#define AS(x, z) {x, 0, z}
-#define AM(x, y, z, w) {x, (uint8_t)(y - x), z}
+#define AS(x, z) {x, 1, z}
+#define AM(x, y, z, w) {x, (uint8_t)(y - x + 1), z}
 
 static const SDLVkMapping _vk_mapping[] = {
 	/* Pageup stuff + up/down */
@@ -435,12 +435,11 @@ static const SDLVkMapping _vk_mapping[] = {
 
 static uint ConvertSdlKeyIntoMy(SDL_keysym *sym, char32_t *character)
 {
-	const SDLVkMapping *map;
 	uint key = 0;
 
-	for (map = _vk_mapping; map != endof(_vk_mapping); ++map) {
-		if ((uint)(sym->sym - map->vk_from) <= map->vk_count) {
-			key = sym->sym - map->vk_from + map->map_to;
+	for (const auto &map : _vk_mapping) {
+		if (IsInsideBS(sym, map.vk_from, map.vk_count)) {
+			key = sym->sym - map.vk_from + map.map_to;
 			break;
 		}
 	}
diff --git a/src/video/win32_v.cpp b/src/video/win32_v.cpp
index b820842966..7c055d253a 100644
--- a/src/video/win32_v.cpp
+++ b/src/video/win32_v.cpp
@@ -61,8 +61,8 @@ struct Win32VkMapping {
 	uint8_t map_to;
 };
 
-#define AS(x, z) {x, 0, z}
-#define AM(x, y, z, w) {x, y - x, z}
+#define AS(x, z) {x, 1, z}
+#define AM(x, y, z, w) {x, y - x + 1, z}
 
 static const Win32VkMapping _vk_mapping[] = {
 	/* Pageup stuff + up/down */
@@ -107,12 +107,11 @@ static const Win32VkMapping _vk_mapping[] = {
 
 static uint MapWindowsKey(uint sym)
 {
-	const Win32VkMapping *map;
 	uint key = 0;
 
-	for (map = _vk_mapping; map != endof(_vk_mapping); ++map) {
-		if ((uint)(sym - map->vk_from) <= map->vk_count) {
-			key = sym - map->vk_from + map->map_to;
+	for (const auto &map : _vk_mapping) {
+		if (IsInsideBS(sym, map.vk_from, map.vk_count)) {
+			key = sym - map.vk_from + map.map_to;
 			break;
 		}
 	}