Skip to content

Commit 8ceba27

Browse files
committed
video: Prefer Wayland over X11
1 parent 68a71f9 commit 8ceba27

File tree

1 file changed

+12
-12
lines changed

1 file changed

+12
-12
lines changed

src/video/SDL_video.c

+12-12
Original file line numberDiff line numberDiff line change
@@ -61,12 +61,12 @@ static VideoBootStrap *bootstrap[] = {
6161
#if SDL_VIDEO_DRIVER_COCOA
6262
&COCOA_bootstrap,
6363
#endif
64-
#if SDL_VIDEO_DRIVER_X11
65-
&X11_bootstrap,
66-
#endif
6764
#if SDL_VIDEO_DRIVER_WAYLAND
6865
&Wayland_bootstrap,
6966
#endif
67+
#if SDL_VIDEO_DRIVER_X11
68+
&X11_bootstrap,
69+
#endif
7070
#if SDL_VIDEO_DRIVER_VIVANTE
7171
&VIVANTE_bootstrap,
7272
#endif
@@ -4249,12 +4249,12 @@ SDL_IsScreenKeyboardShown(SDL_Window *window)
42494249
#if SDL_VIDEO_DRIVER_UIKIT
42504250
#include "uikit/SDL_uikitmessagebox.h"
42514251
#endif
4252-
#if SDL_VIDEO_DRIVER_X11
4253-
#include "x11/SDL_x11messagebox.h"
4254-
#endif
42554252
#if SDL_VIDEO_DRIVER_WAYLAND
42564253
#include "wayland/SDL_waylandmessagebox.h"
42574254
#endif
4255+
#if SDL_VIDEO_DRIVER_X11
4256+
#include "x11/SDL_x11messagebox.h"
4257+
#endif
42584258
#if SDL_VIDEO_DRIVER_HAIKU
42594259
#include "haiku/SDL_bmessagebox.h"
42604260
#endif
@@ -4362,17 +4362,17 @@ SDL_ShowMessageBox(const SDL_MessageBoxData *messageboxdata, int *buttonid)
43624362
retval = 0;
43634363
}
43644364
#endif
4365-
#if SDL_VIDEO_DRIVER_X11
4365+
#if SDL_VIDEO_DRIVER_WAYLAND
43664366
if (retval == -1 &&
4367-
SDL_MessageboxValidForDriver(messageboxdata, SDL_SYSWM_X11) &&
4368-
X11_ShowMessageBox(messageboxdata, buttonid) == 0) {
4367+
SDL_MessageboxValidForDriver(messageboxdata, SDL_SYSWM_WAYLAND) &&
4368+
Wayland_ShowMessageBox(messageboxdata, buttonid) == 0) {
43694369
retval = 0;
43704370
}
43714371
#endif
4372-
#if SDL_VIDEO_DRIVER_WAYLAND
4372+
#if SDL_VIDEO_DRIVER_X11
43734373
if (retval == -1 &&
4374-
SDL_MessageboxValidForDriver(messageboxdata, SDL_SYSWM_WAYLAND) &&
4375-
Wayland_ShowMessageBox(messageboxdata, buttonid) == 0) {
4374+
SDL_MessageboxValidForDriver(messageboxdata, SDL_SYSWM_X11) &&
4375+
X11_ShowMessageBox(messageboxdata, buttonid) == 0) {
43764376
retval = 0;
43774377
}
43784378
#endif

0 commit comments

Comments
 (0)