From 5d462847dc37bec1fc445245f60f03f7bd0a3e25 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Deuc=D0=B5?= <shurd@sasktel.net>
Date: Fri, 14 May 2021 20:57:12 -0400
Subject: [PATCH] Prefer X11 mode over SDL mode
I do, so you should too!
---
src/conio/ciolib.c | 10 +++++-----
src/syncterm/bbslist.c | 2 +-
src/syncterm/syncterm.c | 2 +-
3 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/src/conio/ciolib.c b/src/conio/ciolib.c
index 665d2ed315..109d5cdb35 100644
--- a/src/conio/ciolib.c
+++ b/src/conio/ciolib.c
@@ -397,15 +397,15 @@ CIOLIBEXPORT int initciolib(int mode)
switch(mode) {
case CIOLIB_MODE_AUTO:
+#ifndef NO_X
+ if(!try_x_init(mode))
+#endif
#if defined(WITH_SDL)
- if(!try_sdl_init(CIOLIB_MODE_SDL))
+ if(!try_sdl_init(CIOLIB_MODE_SDL))
#endif
#ifdef _WIN32
- if(!try_conio_init(mode))
+ if(!try_conio_init(mode))
#else
-#ifndef NO_X
- if(!try_x_init(mode))
-#endif
if(!try_curses_init(mode))
#endif
try_ansi_init(mode);
diff --git a/src/syncterm/bbslist.c b/src/syncterm/bbslist.c
index e5d950794c..5f586da90f 100644
--- a/src/syncterm/bbslist.c
+++ b/src/syncterm/bbslist.c
@@ -1699,7 +1699,7 @@ void change_settings(int connected)
#ifdef NO_X
" SDL, then Curses\n\n"
#else
- " SDL, X11 then Curses\n\n"
+ " X11, SDL, then Curses\n\n"
#endif
#else
" SDL, then Windows Console\n\n"
diff --git a/src/syncterm/syncterm.c b/src/syncterm/syncterm.c
index 45cf98f97e..53aa4135af 100644
--- a/src/syncterm/syncterm.c
+++ b/src/syncterm/syncterm.c
@@ -716,7 +716,7 @@ static const struct {
char *output_types[]={
"Autodetect"
#ifdef __unix__
- " (SDL, X11, Curses)"
+ " (X11, SDL, Curses)"
#elif defined(_WIN32)
" (SDL, Console, ANSI)"
#endif
--
GitLab