[vulkan_]sdl3: do not set pos if not req

if neither of display/x/y is set, do not set the window position

Author: MartinPulec

src/video_display/sdl3.c

@@ -473,9 +473,6 @@ sdl3_print_displays()
 static SDL_DisplayID
 get_display_id_from_idx(int idx)
 {
-        if (idx == -1) {
-                idx = 0;
-        }
         int            count    = 0;
         SDL_DisplayID *displays = SDL_GetDisplays(&count);
         if (idx < count) {
@@ -782,7 +779,19 @@ vulkan_warn(const char *req_renderers_name, const char *actual_renderer_name)
 }
 
 static void
-sdl3_set_window_position(struct state_sdl3 *s, int x, int y) {
+sdl3_set_window_position(struct state_sdl3 *s) {
+        if (s->display_idx == -1 && s->x == SDL_WINDOWPOS_UNDEFINED &&
+            s->y == SDL_WINDOWPOS_UNDEFINED) {
+                return;
+        }
+        int x = s->x;
+        int y = s->y;
+        if (s->display_idx != -1) {
+                const SDL_DisplayID display_id =
+                    get_display_id_from_idx(s->display_idx);
+                x = (int) SDL_WINDOWPOS_CENTERED_DISPLAY(display_id);
+                y = (int) SDL_WINDOWPOS_CENTERED_DISPLAY(display_id);
+        }
         if (SDL_SetWindowPosition(s->window, x, y)) {
                 return;
         }
@@ -795,10 +804,7 @@ sdl3_set_window_position(struct state_sdl3 *s, int x, int y) {
                     SDL_GetError());
                 return;
         }
-        const int ll = !is_wayland || s->x != SDL_WINDOWPOS_UNDEFINED ||
-                               s->y != SDL_WINDOWPOS_UNDEFINED
-                           ? LOG_LEVEL_ERROR
-                           : LOG_LEVEL_VERBOSE;
+        const int ll = !is_wayland ? LOG_LEVEL_ERROR : LOG_LEVEL_VERBOSE;
         log_msg(ll, MOD_NAME "Error (SDL_SetWindowPosition): %s\n",
                 SDL_GetError());
 }
@@ -828,19 +834,12 @@ display_sdl3_reconfigure_real(void *state, struct video_desc desc)
         }
         int width  = s->fixed_w ? s->fixed_w : desc.width;
         int height = s->fixed_h ? s->fixed_h : desc.height;
-        const SDL_DisplayID display_id = get_display_id_from_idx(s->display_idx);
-        int x      = s->x == SDL_WINDOWPOS_UNDEFINED
-                         ? (int) SDL_WINDOWPOS_CENTERED_DISPLAY(display_id)
-                         : s->x;
-        int y      = s->y == SDL_WINDOWPOS_UNDEFINED
-                         ? (int) SDL_WINDOWPOS_CENTERED_DISPLAY(display_id)
-                         : s->y;
         s->window  = SDL_CreateWindow(window_title, width, height, flags);
         if (!s->window) {
                 MSG(ERROR, "Unable to create window: %s\n", SDL_GetError());
                 return false;
         }
-        sdl3_set_window_position(s, x, y);
+        sdl3_set_window_position(s);
 
         if (s->renderer) {
                 SDL_DestroyRenderer(s->renderer);

src/video_display/vulkan/vulkan_sdl3.cpp

@@ -702,9 +702,6 @@ sdl_set_log_level()
 SDL_DisplayID
 get_display_id_from_idx(int idx)
 {
-        if (idx == -1) {
-                idx = 0;
-        }
         int            count    = 0;
         SDL_DisplayID *displays = SDL_GetDisplays(&count);
         if (idx < count) {
@@ -721,9 +718,20 @@ get_display_id_from_idx(int idx)
 
 void
 vulkan_sdl3_set_window_position(state_vulkan_sdl3            *s,
-                                const command_line_arguments *args, int x,
-                                int y)
+                                const command_line_arguments *args)
 {
+        if (args->display_idx == -1 && args->x == SDL_WINDOWPOS_UNDEFINED &&
+            args->y == SDL_WINDOWPOS_UNDEFINED) {
+                return;
+        }
+        int x = args->x;
+        int y = args->y;
+        if (args->display_idx != -1) {
+                const SDL_DisplayID display_id =
+                    get_display_id_from_idx(args->display_idx);
+                x = SDL_WINDOWPOS_CENTERED_DISPLAY(display_id);
+                y = SDL_WINDOWPOS_CENTERED_DISPLAY(display_id);
+        }
         if (SDL_SetWindowPosition(s->window, x, y)) {
                 return;
         }
@@ -736,10 +744,7 @@ vulkan_sdl3_set_window_position(state_vulkan_sdl3            *s,
                     SDL_GetError());
                 return;
         }
-        const int ll = !is_wayland || args->x != SDL_WINDOWPOS_UNDEFINED ||
-                               args->y != SDL_WINDOWPOS_UNDEFINED
-                           ? LOG_LEVEL_ERROR
-                           : LOG_LEVEL_VERBOSE;
+        const int ll = !is_wayland ? LOG_LEVEL_ERROR : LOG_LEVEL_VERBOSE;
         log_msg(ll, MOD_NAME "Error (SDL_SetWindowPosition): %s\n",
                 SDL_GetError());
 }
@@ -797,9 +802,6 @@ void* display_vulkan_init(module* parent, const char* fmt, unsigned int flags) {
                 window_title = get_commandline_param("window-title");
         }
 
-        const SDL_DisplayID display_id = get_display_id_from_idx(args.display_idx);
-        int x = (args.x == SDL_WINDOWPOS_UNDEFINED ? SDL_WINDOWPOS_CENTERED_DISPLAY(display_id) : args.x);
-        int y = (args.y == SDL_WINDOWPOS_UNDEFINED ? SDL_WINDOWPOS_CENTERED_DISPLAY(display_id) : args.y);
         if(s->width == -1 && s->height == -1){
                 int display_index = 0;
                 const SDL_DisplayMode *mode = SDL_GetDesktopDisplayMode(display_index);
@@ -827,7 +829,7 @@ void* display_vulkan_init(module* parent, const char* fmt, unsigned int flags) {
                 return nullptr;
         }
         s->window_callback = new WindowCallback(s->window);
-        vulkan_sdl3_set_window_position(s.get(), &args, x, y);
+        vulkan_sdl3_set_window_position(s.get(), &args);
 
         uint32_t extension_count = 0;
         const char *const *extensions = SDL_Vulkan_GetInstanceExtensions(&extension_count);