sdl3/vulkan_sdl3: allow ID for display

This is a bit tricky because the ID seems to be a (small) ordinal and may
potentially clash with the index... Index is considered first, this
approach may bbe re-evaluated (eg. letters for the indexes?).

Author: MartinPulec

src/video_display/sdl3.c

@@ -466,7 +466,7 @@ sdl3_print_displays()
                 if (dname == NULL) {
                         dname = SDL_GetError();
                 }
-                color_printf(TBOLD("%d") " - %s", i, dname);
+                color_printf(TBOLD("%d") " - %s (ID: %d)", i, dname, displays[i]);
         }
 }
 
@@ -481,7 +481,12 @@ get_display_id_from_idx(int idx)
         if (idx < count) {
                 return displays[idx];
         }
-        MSG(ERROR, "Display index %d out of range!\n", idx);
+        for (int i = 0; i < count; ++i) {
+                if (displays[i] == (unsigned) idx) {
+                        return idx;
+                }
+        }
+        MSG(ERROR, "Display index %d out of range or ID invalid!\n", idx);
         return 0;
 }
 
@@ -494,7 +499,7 @@ show_help(const char *driver, bool full)
         SDL_CHECK(SDL_InitSubSystem(SDL_INIT_VIDEO));
         printf("SDL options:\n");
         color_printf(TBOLD(TRED(
-            "\t-d sdl") "[[:fs|:d|:display=<didx>|:driver=<drv>|:novsync|:"
+            "\t-d sdl") "[[:fs|:d|:display=<d>|:driver=<drv>|:novsync|:"
                         "renderer=<name[s]>|:nodecorate|:size[=WxH]|:window_"
                         "flags=<f>|:keep-aspect]*]") "\n");
         color_printf(TBOLD(
@@ -504,7 +509,7 @@ show_help(const char *driver, bool full)
             "\td[force]") " - deinterlace (force even for progressive video)\n");
         color_printf(TBOLD("\t      fs") " - fullscreen\n");
         color_printf(
-            TBOLD("\t  <didx>") " - display index, available indices: ");
+            TBOLD("\t     <d>") " - display index or ID, available indices: ");
         sdl3_print_displays();
         color_printf("%s\n", (driver == NULL ? TBOLD(" *")  : ""));
         color_printf(TBOLD("\t   <drv>") " - one of following: ");

src/video_display/vulkan/vulkan_sdl3.cpp

@@ -424,7 +424,7 @@ void sdl3_print_displays() {
                 if (dname == nullptr) {
                         dname = SDL_GetError();
                 }
-                col() << SBOLD(displays[i]) << " - " << dname;
+                col() << SBOLD(i) << " - " << dname << " (ID: " << displays[i] << ")" ;
         }
         std::cout << "\n";
 }
@@ -460,7 +460,7 @@ void show_help() {
 
         col() << "VULKAN_SDL3 options:\n";
         col() << SBOLD(SRED("\t-d vulkan")
-                        << "[:d|:fs|:keep-aspect|:nocursor|:nodecorate|:novsync|:tearing|:validation|:display=<dis_id>|"
+                        << "[:d|:fs|:keep-aspect|:nocursor|:nodecorate|:novsync|:tearing|:validation|:display=<d>|"
                         ":driver=<drv>|:gpu=<gpu_id>|:pos=<x>,<y>|:size=<W>x<H>|:window_flags=<f>|:help])") << "\n";
 
         col() << ("\twhere:\n");
@@ -475,7 +475,7 @@ void show_help() {
         col() << SBOLD("\t         tearing") << " - permits screen tearing\n";
         col() << SBOLD("\t      validation") << " - enable vulkan validation layers\n";
 
-        col() << SBOLD("\tdisplay=<dis_id>") << " - display index, available indices: ";
+        col() << SBOLD("\t     display=<d>") << " - display index or ID, available indices: ";
         sdl3_print_displays();
         col() << SBOLD("\t    driver=<drv>") << " - available drivers: ";
         print_drivers();
@@ -734,7 +734,12 @@ get_display_id_from_idx(int idx)
         if (idx < count) {
                 return displays[idx];
         }
-        MSG(ERROR, "Display index %d out of range!\n", idx);
+        for (int i = 0; i < count; ++i) {
+                if (displays[i] == (unsigned) idx) {
+                        return idx;
+                }
+        }
+        MSG(ERROR, "Display index %d out of range or ID invalid!\n", idx);
         return 0;
 }