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))
 #endif
 #ifdef _WIN32
 					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);

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"

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