Skip to content

Wayland: Remove splash screen if HAVE_LIBDECOR_H to fix fullscreen on Auto monitor index #18252

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
LibretroAdmin merged 1 commit into from
Oct 4, 2025
Merged

Wayland: Remove splash screen if HAVE_LIBDECOR_H to fix fullscreen on Auto monitor index #18252

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 16 additions & 19 deletions gfx/common/wayland_common.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -912,6 +912,7 @@ bool gfx_ctx_wl_init_common(
wl_display_roundtrip(wl->input.dpy);
xdg_wm_base_add_listener(wl->xdg_shell, &xdg_shell_listener, NULL);

#ifndef HAVE_LIBDECOR_H
/* Bind SHM based wl_buffer to wl_surface until the vulkan surface is ready.
* This shows the window which assigns us a display (wl_output)
* which is useful for HiDPI and auto selecting a display for fullscreen. */
Expand All @@ -921,23 +922,12 @@ bool gfx_ctx_wl_init_common(
RARCH_ERR("[Wayland] Failed to draw splash screen.\n");

/* Make sure splash screen is on screen and sized */
#ifdef HAVE_LIBDECOR_H
if (wl->libdecor)
{
wl->configured = true;
while (wl->configured)
if (wl->libdecor_dispatch(wl->libdecor_context, 0) < 0)
RARCH_ERR("[Wayland] libdecor failed to dispatch.\n");
}
else
#endif
{
wl->configured = true;

while (wl->configured)
wl_display_dispatch(wl->input.dpy);
}
wl->configured = true;

while (wl->configured)
wl_display_dispatch(wl->input.dpy);
}
#endif

// Ignore configure events until splash screen has been replaced
wl->ignore_configuration = true;
Expand Down Expand Up @@ -1018,12 +1008,19 @@ bool gfx_ctx_wl_set_video_mode_common_fullscreen(gfx_ctx_wayland_data_t *wl,
struct wl_output *output = NULL;
int output_i = 0;

#ifdef HAVE_LIBDECOR_H
if (video_monitor_index <= 0)
{
RARCH_LOG("[Wayland] Auto fullscreen monitor index, letting compositor decide.\n");
}
#else
if (video_monitor_index <= 0 && wl->current_output != NULL)
{
oi = wl->current_output;
output = oi->output;
RARCH_LOG("[Wayland] Auto fullscreen on display \"%s\" \"%s\".\n", oi->make, oi->model);
}
#endif
else
{
wl_list_for_each(od, &wl->all_outputs, link)
Expand All @@ -1036,10 +1033,10 @@ bool gfx_ctx_wl_set_video_mode_common_fullscreen(gfx_ctx_wayland_data_t *wl,
break;
}
};
}

if (!output)
RARCH_LOG("[Wayland] Failed to specify monitor for fullscreen, letting compositor decide.\n");
if (!output)
RARCH_LOG("[Wayland] Failed to specify monitor for fullscreen, letting compositor decide.\n");
}

#ifdef HAVE_LIBDECOR_H
if (wl->libdecor)
Expand Down
Loading