From cffcd655e955767b069266a9ee32e32f534da665 Mon Sep 17 00:00:00 2001 From: Arun Prakash Jana Date: Sat, 30 Oct 2021 12:26:31 +0530 Subject: [PATCH] Minor code refactor --- src/nnn.c | 33 ++++++++++++++++++++------------- 1 file changed, 20 insertions(+), 13 deletions(-) diff --git a/src/nnn.c b/src/nnn.c index e13357aa..97177537 100644 --- a/src/nnn.c +++ b/src/nnn.c @@ -1269,6 +1269,25 @@ static void reset_tilde_in_path(char *path) home[homelen] = '\0'; } +#ifndef NOX11 +static void xterm_cfg(char *path) +{ + if (cfg.x11 && !g_state.picker) { + /* Signal CWD change to terminal */ + printf("\033]7;file://%s%s\033\\", hostname, path); + + /* Set terminal window title */ + bool r = set_tilde_in_path(path); + + printf("\033]2;%s\007", r ? &path[homelen - 1] : path); + fflush(stdout); + + if (r) + reset_tilde_in_path(path); + } +} +#endif + static void convert_tilde(const char *path, char *buf) { if (path[0] == '~') { @@ -6623,19 +6642,7 @@ begin: } #ifndef NOX11 - if (cfg.x11 && !g_state.picker) { - /* Signal CWD change to terminal */ - printf("\033]7;file://%s%s\033\\", hostname, path); - - /* Set terminal window title */ - r = set_tilde_in_path(path); - - printf("\033]2;%s\007", r ? &path[homelen - 1] : path); - fflush(stdout); - - if (r) - reset_tilde_in_path(path); - } + xterm_cfg(path); #endif #ifdef LINUX_INOTIFY