options: add --no-terminal switch

Mostly useful for internal reasons. This code will be enabled by
default if mpv is started via the client API.

4 files changed, 29 insertions, 17 deletions

diff --git a/player/loadfile.c b/player/loadfile.c
index 9ba5a00758..662a714ec0 100644
--- a/player/loadfile.c
+++ b/player/loadfile.c
@@ -1097,7 +1097,7 @@ static void play_current_file(struct MPContext *mpctx)
     load_per_file_options(mpctx->mconfig, mpctx->playlist->current->params,
                           mpctx->playlist->current->num_params);
 
-    if (!opts->consolecontrols)
+    if (opts->use_terminal && !opts->consolecontrols)
         getch2_disable();
 
 #if HAVE_LIBASS
@@ -1393,7 +1393,7 @@ terminate_playback:  // don't jump here after ao/vo/getch initialization!
     if (mpctx->stop_play != PT_RESTART)
         m_config_restore_backups(mpctx->mconfig);
 
-    if (opts->consolecontrols)
+    if (opts->use_terminal && opts->consolecontrols)
         getch2_enable();
 
     mpctx->filename = NULL;
diff --git a/player/main.c b/player/main.c
index d1c1017414..1709776fa7 100644
--- a/player/main.c
+++ b/player/main.c
@@ -149,7 +149,8 @@ static MP_NORETURN void exit_player(struct MPContext *mpctx,
     mpctx->ass_library = NULL;
 #endif
 
-    getch2_disable();
+    if (mpctx->opts->use_terminal)
+        getch2_disable();
     uninit_libav(mpctx->global);
 
     if (how != EXIT_NONE) {
@@ -288,8 +289,6 @@ static void osdep_preinit(int *p_argc, char ***p_argv)
         pSetSearchPathMode(BASE_SEARCH_PATH_ENABLE_SAFE_SEARCHMODE);
 #endif
 
-    terminal_init();
-
     mp_time_init();
 }
 
@@ -342,18 +341,21 @@ static int mpv_main(int argc, char *argv[])
     char *verbose_env = getenv("MPV_VERBOSE");
     if (verbose_env)
         opts->verbose = atoi(verbose_env);
+
+    // Preparse the command line
+    m_config_preparse_command_line(mpctx->mconfig, mpctx->global, argc, argv);
+
     mp_msg_update_msglevels(mpctx->global);
 
+    if (opts->use_terminal)
+        terminal_init();
+
     init_libav(mpctx->global);
     GetCpuCaps(&gCpuCaps);
     screenshot_init(mpctx);
     mpctx->mixer = mixer_init(mpctx, mpctx->global);
     command_init(mpctx);
 
-    // Preparse the command line
-    m_config_preparse_command_line(mpctx->mconfig, mpctx->global, argc, argv);
-    mp_msg_update_msglevels(mpctx->global);
-
     mp_print_version(mpctx->log, false);
 
     if (!mp_parse_cfgfiles(mpctx))
@@ -413,13 +415,15 @@ static int mpv_main(int argc, char *argv[])
     }
 #endif
 
-    if (mpctx->opts->slave_mode)
-        terminal_setup_stdin_cmd_input(mpctx->input);
-    else if (mpctx->opts->consolecontrols)
-        terminal_setup_getch(mpctx->input);
+    if (opts->use_terminal) {
+        if (mpctx->opts->slave_mode)
+            terminal_setup_stdin_cmd_input(mpctx->input);
+        else if (mpctx->opts->consolecontrols)
+            terminal_setup_getch(mpctx->input);
 
-    if (opts->consolecontrols)
-        getch2_enable();
+        if (opts->consolecontrols)
+            getch2_enable();
+    }
 
 #if HAVE_LIBASS
     mpctx->ass_log = mp_log_new(mpctx, mpctx->global->log, "!libass");
diff --git a/player/osd.c b/player/osd.c
index 1f15e3ddc7..abfe826a81 100644
--- a/player/osd.c
+++ b/player/osd.c
@@ -70,6 +70,9 @@ static void term_osd_update(struct MPContext *mpctx)
     int num_parts = 0;
     char *parts[3] = {0};
 
+    if (!mpctx->opts->use_terminal)
+        return;
+
     if (mpctx->term_osd_subs && mpctx->term_osd_subs[0])
         parts[num_parts++] = mpctx->term_osd_subs;
     if (mpctx->term_osd_text && mpctx->term_osd_text[0])
@@ -147,6 +150,9 @@ void print_status(struct MPContext *mpctx)
 
     update_window_title(mpctx, false);
 
+    if (!opts->use_terminal)
+        return;
+
     if (opts->quiet || !(mpctx->initialized_flags & INITIALIZED_PLAYBACK)) {
         term_osd_set_status(mpctx, "");
         return;
diff --git a/player/playloop.c b/player/playloop.c
index 4faa3ba01d..e28d387801 100644
--- a/player/playloop.c
+++ b/player/playloop.c
@@ -1300,7 +1300,8 @@ void run_playloop(struct MPContext *mpctx)
 
     execute_queued_seek(mpctx);
 
-    getch2_poll();
+    if (mpctx->opts->use_terminal)
+        getch2_poll();
 }
 
 // Waiting for the slave master to send us a new file to play.
@@ -1330,6 +1331,7 @@ void idle_loop(struct MPContext *mpctx)
             run_command(mpctx, cmd);
         mp_cmd_free(cmd);
         mp_flush_events(mpctx);
-        getch2_poll();
+        if (mpctx->opts->use_terminal)
+            getch2_poll();
     }
 }