Context Navigation

Back to Ticket #4196

Ticket #4196: InstructionStation_v3.8.patch

File InstructionStation_v3.8.patch, 71.6 KB (added by psprint, 4 years ago)

lib/global.h

From 4d62b9b1d16ff99a9d9cbc6033d0b58a24c2696b Mon Sep 17 00:00:00 2001
From: Sebastian Gniazdowski <sgniazdowski@gmail.com>
Date: Wed, 17 Feb 2021 15:02:15 -0600
Subject: CLI window for MCEdit

---
 lib/global.h               |   3 +
 lib/keybind.c              |   1 +
 lib/keybind.h              |   1 +
 lib/tty/key.c              |  10 +-
 lib/widget/wtools.c        |  40 +-
 lib/widget/wtools.h        |   4 +
 misc/mc.default.keymap     |   1 +
 misc/mc.emacs.keymap       |   1 +
 src/editor/Makefile.am     |   1 +
 src/editor/edit-impl.h     |  24 +-
 src/editor/edit.c          |  27 +-
 src/editor/editcmd.c       |  41 +-
 src/editor/editdraw.c      |   1 -
 src/editor/editmenu.c      |   3 +
 src/editor/editwidget.c    | 550 +++++++++++-----------
 src/editor/editwidget.h    |   3 +
 src/editor/instr_station.c | 902 +++++++++++++++++++++++++++++++++++++
 src/editor/instr_station.h |  92 ++++
 src/keybind-defaults.c     |   1 +
 19 files changed, 1416 insertions(+), 290 deletions(-)
 create mode 100644 src/editor/instr_station.c
 create mode 100644 src/editor/instr_station.h

diff --git a/lib/global.h b/lib/global.h
index c60063faa..05d88cbb4 100644

-                      a
 #include "lib/logging.h"
 #endif
+#define has_flag(x,y) (((x) & (y)) != 0)
+#define set_flag_in(x,y) ((x) |= (y))
 /* Just for keeping Your's brains from invention a proper size of the buffer :-) */
 #define BUF_10K 10240L
 #define BUF_8K  8192L

lib/keybind.c

diff --git a/lib/keybind.c b/lib/keybind.c
index abd44d3e2..40e25466c 100644

  static name_keymap_t command_names[] = {
     ADD_KEYMAP_NAME (EditMail),
     ADD_KEYMAP_NAME (ParagraphFormat),
     ADD_KEYMAP_NAME (MatchBracket),
+    ADD_KEYMAP_NAME (InstructionStation),
     ADD_KEYMAP_NAME (ExternalCommand),
     ADD_KEYMAP_NAME (MacroStartRecord),
     ADD_KEYMAP_NAME (MacroStopRecord),

lib/keybind.h

diff --git a/lib/keybind.h b/lib/keybind.h
index af019df09..e99181ec6 100644

  enum
     CK_SyntaxOnOff,
     CK_SyntaxChoose,
     CK_InsertLiteral,
+    CK_InstructionStation,
     CK_ExternalCommand,
     CK_Date,
     CK_EditMail,

lib/tty/key.c

diff --git a/lib/tty/key.c b/lib/tty/key.c
index 4abfc71d7..8876fbf82 100644

  tty_get_event (struct Gpm_Event *event, gboolean redo_event, gboolean block)
             time_out.tv_sec = 0;
             time_out.tv_usec = 0;
+        }
+        else if (time_addr == NULL)
+        {
+            /* Standard timeout to call GLib main loop */
+            time_addr = &time_out;
+            time_addr->tv_sec = 0;
+            time_addr->tv_usec = 200000;
+        }
         tty_enable_interrupt_key ();
         flag = select (nfd, &select_set, NULL, NULL, time_addr);
         tty_disable_interrupt_key ();
-…
+ tty_get_event (struct Gpm_Event *event, gboolean redo_event, gboolean block)
          */
         if (flag == 0)
+        {
+            /* Provide CPU time to GLib main loop's default context */
+            g_main_context_iteration (NULL, FALSE);
             if (redo_event)
                 return EV_MOUSE;
             if (!block || tty_got_winch ())

lib/widget/wtools.c

diff --git a/lib/widget/wtools.c b/lib/widget/wtools.c
index 5c5dc4487..bc5937111 100644

  bg_message (int dummy, int *flags, char *title, const char *text)
 static char *
 fg_input_dialog_help (const char *header, const char *text, const char *help,
                       const char *history_name, const char *def_text, gboolean strip_password,
                       input_complete_t completion_flags)
+                      input_complete_t completion_flags, quick_widget_t * add_w)
+{
     char *p_text;
     char histname[64] = "inp|";
-…
+ fg_input_dialog_help (const char *header, const char *text, const char *help,
+    }
+    {
+        quick_widget_t quick_widgets[] = {
+        int i = 1, norm_i = 0, add_i = 0;
+        quick_widget_t quick_widgets[15] = {
             /* *INDENT-OFF* */
             QUICK_LABELED_INPUT (p_text, input_label_above, def_text, histname, &my_str,
+                                 NULL, is_passwd, strip_password, completion_flags),
+            QUICK_BUTTONS_OK_CANCEL,
+            QUICK_END
+                                 NULL, is_passwd, strip_password, completion_flags)
             /* *INDENT-ON* */
         };
+        quick_widget_t press_end[] = { QUICK_BUTTONS_OK_CANCEL, QUICK_END };
         quick_dialog_t qdlg = {
             -1, -1, COLS / 2, header,
             help, quick_widgets, NULL, NULL
         };
+        /* Handling of additional widgets optionally passed via last argument `add_w` */
+        /* Copy/append any extra widgets (max 10) */
+        while (add_w != NULL && add_w[add_i].widget_type != quick_end && i < 15)
+            quick_widgets[i++] = add_w[add_i++];
+        /* Copy normal buttons */
+        while (norm_i < sizeof (press_end) / sizeof (quick_widget_t) && i < 15)
+            quick_widgets[i++] = press_end[norm_i++];
         ret = quick_dialog (&qdlg);
+    }
-…
+ input_dialog_help (const char *header, const char *text, const char *help,
+        {
             void *p;
             char *(*f) (const char *, const char *, const char *, const char *, const char *,
                         gboolean, input_complete_t);
+                        gboolean, input_complete_t, quick_widget_t * add_w);
         } func;
         func.f = fg_input_dialog_help;
         return wtools_parent_call_string (func.p, 7,
+        return wtools_parent_call_string (func.p, 8,
                                           strlen (header), header, strlen (text),
                                           text, strlen (help), help,
                                           strlen (history_name), history_name,
                                           strlen (def_text), def_text,
                                           sizeof (gboolean), strip_password,
+                                          sizeof (input_complete_t), completion_flags);
+                                          sizeof (input_complete_t), completion_flags,
+                                          sizeof (quick_widget_t *), NULL);
+    }
     else
 #endif /* ENABLE_BACKGROUND */
         return fg_input_dialog_help (header, text, help, history_name, def_text, strip_password,
                                      completion_flags);
+                                     completion_flags, NULL);
+}
 /* --------------------------------------------------------------------------------------------- */
-…
+ input_dialog (const char *header, const char *text, const char *history_name, co
 /* --------------------------------------------------------------------------------------------- */
+char *
+input_dialog_ext (const char *header, const char *text, const char *history_name,
+                  const char *def_text, input_complete_t completion_flags, quick_widget_t * add_w)
+{
+    return fg_input_dialog_help (header, text, "[Input Line Keys]", history_name, def_text, FALSE,
+                                 completion_flags, add_w);
+}
+/* --------------------------------------------------------------------------------------------- */
 char *
 input_expand_dialog (const char *header, const char *text,
                      const char *history_name, const char *def_text,

lib/widget/wtools.h

diff --git a/lib/widget/wtools.h b/lib/widget/wtools.h
index cd0bc3253..d5a39971b 100644

  struct simple_status_msg_t
 char *input_dialog (const char *header, const char *text,
                     const char *history_name, const char *def_text,
                     input_complete_t completion_flags);
+/* The input dialogs */
+char *input_dialog_ext (const char *header, const char *text,
+                        const char *history_name, const char *def_text,
+                        input_complete_t completion_flags, quick_widget_t * add_w);
 char *input_dialog_help (const char *header, const char *text, const char *help,
                          const char *history_name, const char *def_text, gboolean strip_password,
                          input_complete_t completion_flags);

misc/mc.default.keymap

diff --git a/misc/mc.default.keymap b/misc/mc.default.keymap
index 2931ddd0a..af2ddc59d 100644

  Sort = alt-t
 Mail = alt-m
 ParagraphFormat = alt-p
 MatchBracket = alt-b
+InstructionStation = alt-i
 ExternalCommand = alt-u
 UserMenu = f11
 Menu = f9

misc/mc.emacs.keymap

diff --git a/misc/mc.emacs.keymap b/misc/mc.emacs.keymap
index 7cc305db7..e0e1a9173 100644

  Sort = alt-t
 # Mail =
 ParagraphFormat = alt-p
 # MatchBracket =
+InstructionStation = alt-i
 ExternalCommand = alt-u
 UserMenu = f11
 Menu = f9

src/editor/Makefile.am

diff --git a/src/editor/Makefile.am b/src/editor/Makefile.am
index 235ed76af..0ac4b4af7 100644

  libedit_la_SOURCES = \
         editmenu.c \
         editoptions.c \
         editwidget.c editwidget.h \
+        instr_station.c instr_station.h \
         etags.c etags.h \
         format.c \
         syntax.c

src/editor/edit-impl.h

diff --git a/src/editor/edit-impl.h b/src/editor/edit-impl.h
index 3ad04dbea..8f8dce2f1 100644

  typedef enum
     LB_MAC
 } LineBreaks;
+typedef enum
+{
+    EDIT_DO_INIT_BASE_CLASS = 1 << 0,
+} edit_init_flags_t;
+typedef enum instr_stn_flags
+{
+    INSTR_STN_NO_FLAGS = 0,
+    INSTR_STN_NO_STDIN = 1 << 17,
+    INSTR_STN_NO_PROMPT = 1 << 18
+} instr_stn_flags_t;
 typedef enum
+{
     EDIT_QUICK_SAVE = 0,
-…
+ extern char *edit_window_state_char;
 extern char *edit_window_close_char;
 /*** declarations of public functions ************************************************************/
+cb_ret_t edit_dialog_callback (Widget * w, Widget * sender, widget_msg_t msg, int parm, void *data);
+cb_ret_t edit_callback (Widget * w, Widget * sender, widget_msg_t msg, int parm, void *data);
+cb_ret_t edit_dialog_command_execute (WDialog * h, long command, void *data);
+void edit_mouse_callback (Widget * w, mouse_msg_t msg, mouse_event_t * event);
 gboolean edit_add_window (WDialog * h, int y, int x, int lines, int cols,
                           const vfs_path_t * f, long fline);
-…
+ void edit_move_to_prev_col (WEdit * edit, off_t p);
 long edit_get_col (const WEdit * edit);
 void edit_update_curs_row (WEdit * edit);
 void edit_update_curs_col (WEdit * edit);
+gboolean edit_newline_end_check_only (const WEdit * edit);
 void edit_find_bracket (WEdit * edit);
 gboolean edit_reload_line (WEdit * edit, const vfs_path_t * filename_vpath, long line);
 void edit_set_codeset (WEdit * edit);
-…
+ void edit_delete_line (WEdit * edit);
 int edit_delete (WEdit * edit, gboolean byte_delete);
 int edit_backspace (WEdit * edit, gboolean byte_delete);
+void edit_insert_string (WEdit * edit, char *str_text, gsize len);
 void edit_insert (WEdit * edit, int c);
 void edit_insert_over (WEdit * edit);
 void edit_cursor_move (WEdit * edit, off_t increment);
-…
+ char *edit_get_write_filter (const vfs_path_t * write_name_vpath,
 gboolean edit_save_confirm_cmd (WEdit * edit);
 gboolean edit_save_as_cmd (WEdit * edit);
 WEdit *edit_init (WEdit * edit, int y, int x, int lines, int cols,
                   const vfs_path_t * filename_vpath, long line);
+                  const vfs_path_t * filename_vpath, long line, edit_init_flags_t flags);
 gboolean edit_clean (WEdit * edit);
 gboolean edit_ok_to_exit (WEdit * edit);
 gboolean edit_load_cmd (WDialog * h);
-…
+ void edit_move_to_line (WEdit * e, long line);
 void edit_move_display (WEdit * e, long line);
 void edit_word_wrap (WEdit * edit);
 int edit_sort_cmd (WEdit * edit);
+gboolean edit_add_instr_stn_window (WDialog * h, instr_stn_flags_t flags, void *data);
 int edit_ext_cmd (WEdit * edit);
 int edit_store_macro_cmd (WEdit * edit);

src/editor/edit.c

diff --git a/src/editor/edit.c b/src/editor/edit.c
index edda1f832..56653700b 100644

  edit_modification (WEdit * edit)
+{
     edit->caches_valid = FALSE;
     /* raise lock when file modified */
     if (!edit->modified && !edit->delete_file)
+    /* raise lock when file is about to be modified */
+    if (edit->filename_vpath && !edit->modified && !edit->delete_file)
         edit->locked = lock_file (edit->filename_vpath);
     edit->modified = 1;
+}
-…
+ edit_insert_file (WEdit * edit, const vfs_path_t * filename_vpath)
 WEdit *
 edit_init (WEdit * edit, int y, int x, int lines, int cols, const vfs_path_t * filename_vpath,
            long line)
+           long line, edit_init_flags_t flags)
+{
     gboolean to_free = FALSE;
-…
+ edit_init (WEdit * edit, int y, int x, int lines, int cols, const vfs_path_t * f
         edit->fullscreen = fullscreen;
         edit->loc_prev = loc_prev;
+    }
     else
+    if (has_flag (flags, EDIT_DO_INIT_BASE_CLASS) || edit == NULL)
+    {
         Widget *w;
+        edit = g_malloc0 (sizeof (WEdit));
+        to_free = TRUE;
+        if (edit == NULL)
+        {
+            edit = g_malloc0 (sizeof (WEdit));
+            to_free = TRUE;
+        }
         w = WIDGET (edit);
         widget_init (w, y, x, lines, cols, NULL, NULL);
-…
+ edit_reload_line (WEdit * edit, const vfs_path_t * filename_vpath, long line)
     e->fullscreen = edit->fullscreen;
     e->loc_prev = edit->loc_prev;
     if (edit_init (e, w->y, w->x, w->lines, w->cols, filename_vpath, line) == NULL)
+    if (edit_init (e, w->y, w->x, w->lines, w->cols, filename_vpath, line, 0) == NULL)
+    {
         g_free (e);
         return FALSE;
-…
+ edit_push_redo_action (WEdit * edit, long c)
         edit->redo_stack_bottom = edit->redo_stack_pointer = 0;
+}
+/* --------------------------------------------------------------------------------------------- */
+void
+edit_insert_string (WEdit * edit, char *str_text, gsize len)
+{
+    size_t i;
+    for (i = 0; i < len; i++)
+        edit_insert (edit, str_text[i]);
+}
 /* --------------------------------------------------------------------------------------------- */
 /**
    Basic low level single character buffer alterations and movements at the cursor.

src/editor/editcmd.c

diff --git a/src/editor/editcmd.c b/src/editor/editcmd.c
index 0d2caa923..080bfad24 100644

  edit_complete_word_insert_recoded_completion (WEdit * edit, char *completion, gs
 /*** public functions ****************************************************************************/
 /* --------------------------------------------------------------------------------------------- */
+gboolean
+edit_newline_end_check_only (const WEdit * e)
+{
+    const edit_buffer_t *buf = &e->buffer;
+    return (buf->size > 0 && edit_buffer_get_byte (buf, buf->size - 1) == '\n');
+}
+/* --------------------------------------------------------------------------------------------- */
 void
 edit_refresh_cmd (void)
+{
-…
+ edit_close_cmd (WEdit * edit)
         group_remove_widget (w);
         widget_destroy (w);
+        if (edit_widget_is_editor (CONST_WIDGET (g->current->data)))
+        if (edit_widget_is_editor (CONST_WIDGET (g->current->data))
+            || edit_widget_is_cli (CONST_WIDGET (g->current->data)))
             edit = (WEdit *) (g->current->data);
         else
+        {
+            /* Look for a file window or a CLI window */
             edit = find_editor (DIALOG (g));
+            if (!edit)
+                edit = find_cli (DIALOG (g));
             if (edit != NULL)
                 widget_select (w);
+        }
-…
+ edit_ext_cmd (WEdit * edit)
+{
     char *exp, *tmp, *tmp_edit_temp_file;
     int e;
+    gboolean run_in_cli = FALSE;
+    quick_widget_t chbox[3] = { QUICK_SEPARATOR (TRUE),
+        QUICK_CHECKBOX ("&Open in CLI window", &run_in_cli, NULL),
+        QUICK_END
+    };
     exp =
+        input_dialog (_("Paste output of external command"),
+                      _("Enter shell command(s):"), MC_HISTORY_EDIT_PASTE_EXTCMD, INPUT_LAST_TEXT,
+                      INPUT_COMPLETE_FILENAMES | INPUT_COMPLETE_VARIABLES | INPUT_COMPLETE_USERNAMES
+                      | INPUT_COMPLETE_HOSTNAMES | INPUT_COMPLETE_CD | INPUT_COMPLETE_COMMANDS |
+                      INPUT_COMPLETE_SHELL_ESC);
+        input_dialog_ext (_("Paste output of external command"),
+                          _("Enter shell command(s):"), MC_HISTORY_EDIT_PASTE_EXTCMD,
+                          INPUT_LAST_TEXT,
+                          INPUT_COMPLETE_FILENAMES | INPUT_COMPLETE_VARIABLES |
+                          INPUT_COMPLETE_USERNAMES | INPUT_COMPLETE_HOSTNAMES | INPUT_COMPLETE_CD |
+                          INPUT_COMPLETE_COMMANDS | INPUT_COMPLETE_SHELL_ESC, chbox);
     if (!exp)
         return 1;
+    /* Should start a CLI window with the command ? */
+    if (run_in_cli)
+    {
+        edit_add_instr_stn_window (DIALOG (WIDGET (edit)->owner),
+                                   INSTR_STN_NO_STDIN | INSTR_STN_NO_PROMPT, exp);
+        g_free (exp);
+        return 0;
+    }
     tmp_edit_temp_file = mc_config_get_full_path (EDIT_HOME_TEMP_FILE);
     tmp = g_strconcat (exp, " > ", tmp_edit_temp_file, (char *) NULL);
     g_free (tmp_edit_temp_file);

src/editor/editdraw.c

diff --git a/src/editor/editdraw.c b/src/editor/editdraw.c
index 248128b68..d2fddc13d 100644

a	b	edit_draw_this_line (WEdit edit, off_t b, long row, long start_col, long end_c*
820	820	}
821	821
822	822	p->ch = 0;
823
824	823	print_to_widget (edit, row, start_col, start_col_real, end_col, line, line_stat, book_mark);
825	824	}
826	825

src/editor/editmenu.c

diff --git a/src/editor/editmenu.c b/src/editor/editmenu.c
index 489893849..02bf43aa3 100644

  create_window_menu (void)
     entries = g_list_prepend (entries, menu_entry_create (_("&Next"), CK_WindowNext));
     entries = g_list_prepend (entries, menu_entry_create (_("&Previous"), CK_WindowPrev));
     entries = g_list_prepend (entries, menu_entry_create (_("&List..."), CK_WindowList));
+    entries =
+        g_list_prepend (entries,
+                        menu_entry_create (_("Instr&uction Station"), CK_InstructionStation));
     return g_list_reverse (entries);
+}

src/editor/editwidget.c

diff --git a/src/editor/editwidget.c b/src/editor/editwidget.c
index 18ac00e66..2e49fe3ed 100644

-                      a
 #ifdef HAVE_ASPELL
 #include "spell.h"
 #endif
+#include "src/editor/instr_station.h"
 /*** global variables ****************************************************************************/
-…
+ static unsigned int edit_dlg_init_refcounter = 0;
 /*** file scope functions ************************************************************************/
-static cb_ret_t edit_dialog_callback (Widget * w, Widget * sender, widget_msg_t msg, int parm,
-                                      void *data);
 /* --------------------------------------------------------------------------------------------- */
 /**
  * Init the 'edit' subsystem
-…
+ edit_get_title (const WDialog * h, size_t len)
     return g_strconcat (_("Edit: "), modified, file_label, (char *) NULL);
+}
-/* --------------------------------------------------------------------------------------------- */
-static cb_ret_t
-edit_dialog_command_execute (WDialog * h, long command)
+{
-    WGroup *g = GROUP (h);
-    Widget *wh = WIDGET (h);
-    cb_ret_t ret = MSG_HANDLED;
-    switch (command)
+    {
-    case CK_EditNew:
-        edit_add_window (h, wh->y + 1, wh->x, wh->lines - 2, wh->cols, NULL, 0);
-        break;
-    case CK_EditFile:
-        edit_load_cmd (h);
-        break;
-    case CK_History:
-        edit_load_file_from_history (h);
-        break;
-    case CK_EditSyntaxFile:
-        edit_load_syntax_file (h);
-        break;
-    case CK_EditUserMenu:
-        edit_load_menu_file (h);
-        break;
-    case CK_Close:
-        /* if there are no opened files anymore, close MC editor */
-        if (edit_widget_is_editor (CONST_WIDGET (g->current->data)) &&
-            edit_close_cmd ((WEdit *) g->current->data) && find_editor (h) == NULL)
-            dlg_stop (h);
-        break;
-    case CK_Help:
-        edit_help ();
-        /* edit->force |= REDRAW_COMPLETELY; */
-        break;
-    case CK_Menu:
-        edit_menu_cmd (h);
-        break;
-    case CK_Quit:
-    case CK_Cancel:
-        /* don't close editor due to SIGINT, but stop move/resize window */
+        {
-            Widget *w = WIDGET (g->current->data);
-            if (edit_widget_is_editor (w) && ((WEdit *) w)->drag_state != MCEDIT_DRAG_NONE)
-                edit_restore_size ((WEdit *) w);
-            else if (command == CK_Quit)
-                dlg_stop (h);
+        }
-        break;
-    case CK_About:
-        edit_about ();
-        break;
-    case CK_SyntaxOnOff:
-        edit_syntax_onoff_cmd (h);
-        break;
-    case CK_ShowTabTws:
-        edit_show_tabs_tws_cmd (h);
-        break;
-    case CK_ShowMargin:
-        edit_show_margin_cmd (h);
-        break;
-    case CK_ShowNumbers:
-        edit_show_numbers_cmd (h);
-        break;
-    case CK_Refresh:
-        edit_refresh_cmd ();
-        break;
-    case CK_Shell:
-        toggle_subshell ();
-        break;
-    case CK_LearnKeys:
-        learn_keys ();
-        break;
-    case CK_WindowMove:
-    case CK_WindowResize:
-        if (edit_widget_is_editor (CONST_WIDGET (g->current->data)))
-            edit_handle_move_resize ((WEdit *) g->current->data, command);
-        break;
-    case CK_WindowList:
-        edit_window_list (h);
-        break;
-    case CK_WindowNext:
-        group_select_next_widget (g);
-        break;
-    case CK_WindowPrev:
-        group_select_prev_widget (g);
-        break;
-    case CK_Options:
-        edit_options_dialog (h);
-        break;
-    case CK_OptionsSaveMode:
-        edit_save_mode_cmd ();
-        break;
-    case CK_SaveSetup:
-        save_setup_cmd ();
-        break;
-    default:
-        ret = MSG_NOT_HANDLED;
-        break;
+    }
-    return ret;
+}
 /* --------------------------------------------------------------------------------------------- */
 /*
  * Translate the keycode into either 'command' or 'char_for_insertion'.
-…
+ edit_update_cursor (WEdit * edit, const mouse_event_t * event)
     return done;
+}
-/* --------------------------------------------------------------------------------------------- */
-/** Callback for the edit dialog */
-static cb_ret_t
-edit_dialog_callback (Widget * w, Widget * sender, widget_msg_t msg, int parm, void *data)
+{
-    WGroup *g = GROUP (w);
-    WDialog *h = DIALOG (w);
-    switch (msg)
+    {
-    case MSG_INIT:
-        edit_dlg_init ();
-        return MSG_HANDLED;
-    case MSG_RESIZE:
-        dlg_default_callback (w, NULL, MSG_RESIZE, 0, NULL);
-        menubar_arrange (find_menubar (h));
-        return MSG_HANDLED;
-    case MSG_ACTION:
+        {
-            /* Handle shortcuts, menu, and buttonbar. */
-            cb_ret_t result;
-            result = edit_dialog_command_execute (h, parm);
-            /* We forward any commands coming from the menu, and which haven't been
-               handled by the dialog, to the focused WEdit window. */
-            if (result == MSG_NOT_HANDLED && sender == WIDGET (find_menubar (h)))
-                result = send_message (g->current->data, NULL, MSG_ACTION, parm, NULL);
-            return result;
+        }
-    case MSG_KEY:
+        {
-            Widget *we = WIDGET (g->current->data);
-            cb_ret_t ret = MSG_NOT_HANDLED;
-            if (edit_widget_is_editor (we))
+            {
-                gboolean ext_mode;
-                long command;
-                /* keep and then extmod flag */
-                ext_mode = we->ext_mode;
-                command = widget_lookup_key (we, parm);
-                we->ext_mode = ext_mode;
-                if (command == CK_IgnoreKey)
-                    we->ext_mode = FALSE;
-                else
+                {
-                    ret = edit_dialog_command_execute (h, command);
-                    /* if command was not handled, keep the extended mode
-                       for the further key processing */
-                    if (ret == MSG_HANDLED)
-                        we->ext_mode = FALSE;
+                }
+            }
-            /*
-             * Due to the "end of bracket" escape the editor sees input with is_idle() == false
-             * (expects more characters) and hence doesn't yet refresh the screen, but then
-             * no further characters arrive (there's only an "end of bracket" which is swallowed
-             * by tty_get_event()), so you end up with a screen that's not refreshed after pasting.
-             * So let's trigger an IDLE signal.
-             */
-            if (!is_idle ())
-                widget_idle (w, TRUE);
-            return ret;
+        }
-        /* hardcoded menu hotkeys (see edit_drop_hotkey_menu) */
-    case MSG_UNHANDLED_KEY:
-        return edit_drop_hotkey_menu (h, parm) ? MSG_HANDLED : MSG_NOT_HANDLED;
-    case MSG_VALIDATE:
-        edit_quit (h);
-        return MSG_HANDLED;
-    case MSG_END:
-        edit_dlg_deinit ();
-        return MSG_HANDLED;
-    case MSG_IDLE:
-        widget_idle (w, FALSE);
-        return send_message (g->current->data, NULL, MSG_IDLE, 0, NULL);
-    default:
-        return dlg_default_callback (w, sender, msg, parm, data);
+    }
+}
 /* --------------------------------------------------------------------------------------------- */
 /**
-…
+ edit_dialog_bg_callback (Widget * w, Widget * sender, widget_msg_t msg, int parm
 /* --------------------------------------------------------------------------------------------- */
+static cb_ret_t
+/**
+ * Handle move/resize mouse events.
+ */
+static void
+edit_mouse_handle_move_resize (Widget * w, mouse_msg_t msg, mouse_event_t * event)
+{
+    WEdit *edit = (WEdit *) (w);
+    Widget *h = WIDGET (w->owner);
+    int global_x, global_y;
+    if (msg == MSG_MOUSE_UP)
+    {
+        /* Exit move/resize mode. */
+        edit_execute_cmd (edit, CK_Enter, -1);
+        edit_update_screen (edit);      /* Paint the buttonbar over our possibly overlapping frame. */
+        return;
+    }
+    if (msg != MSG_MOUSE_DRAG)
+        /**
+         * We ignore any other events. Specifically, MSG_MOUSE_DOWN.
+         *
+         * When the move/resize is initiated by the menu, we let the user
+         * stop it by clicking with the mouse. Which is why we don't want
+         * a mouse down to affect the window.
+         */
+        return;
+    /* Convert point to global coordinates for easier calculations. */
+    global_x = event->x + w->x;
+    global_y = event->y + w->y;
+    /* Clamp the point to the dialog's client area. */
+    global_y = CLAMP (global_y, h->y + 1, h->y + h->lines - 2); /* Status line, buttonbar */
+    global_x = CLAMP (global_x, h->x, h->x + h->cols - 1);      /* Currently a no-op, as the dialog has no left/right margins. */
+    if (edit->drag_state == MCEDIT_DRAG_MOVE)
+    {
+        w->y = global_y;
+        w->x = global_x - edit->drag_state_start;
+    }
+    else if (edit->drag_state == MCEDIT_DRAG_RESIZE)
+    {
+        w->lines = MAX (WINDOW_MIN_LINES, global_y - w->y + 1);
+        w->cols = MAX (WINDOW_MIN_COLS, global_x - w->x + 1);
+    }
+    edit->force |= REDRAW_COMPLETELY;   /* Not really needed as WEdit's MSG_DRAW already does this. */
+    /* We draw the whole dialog because dragging/resizing exposes area beneath. */
+    widget_draw (WIDGET (w->owner));
+}
+/* --------------------------------------------------------------------------------------------- */
+/*** public functions ****************************************************************************/
+/* --------------------------------------------------------------------------------------------- */
+cb_ret_t
+edit_dialog_command_execute (WDialog * h, long command, void *data)
+{
+    WGroup *g = GROUP (h);
+    Widget *wh = WIDGET (h);
+    cb_ret_t ret = MSG_HANDLED;
+    switch (command)
+    {
+    case CK_EditNew:
+        edit_add_window (h, wh->y + 1, wh->x, wh->lines - 2, wh->cols, NULL, 0);
+        break;
+    case CK_EditFile:
+        edit_load_cmd (h);
+        break;
+    case CK_History:
+        edit_load_file_from_history (h);
+        break;
+    case CK_EditSyntaxFile:
+        edit_load_syntax_file (h);
+        break;
+    case CK_EditUserMenu:
+        edit_load_menu_file (h);
+        break;
+    case CK_Close:
+        /* if there are no opened files anymore, close MC editor */
+        if ((edit_widget_is_editor (CONST_WIDGET (g->current->data)) ||
+             edit_widget_is_cli (CONST_WIDGET (g->current->data))) &&
+            edit_close_cmd ((WEdit *) g->current->data) && find_editor (h) == NULL)
+            dlg_stop (h);
+        break;
+    case CK_Help:
+        edit_help ();
+        /* edit->force |= REDRAW_COMPLETELY; */
+        break;
+    case CK_Menu:
+        edit_menu_cmd (h);
+        break;
+    case CK_Quit:
+    case CK_Cancel:
+        /* don't close editor due to SIGINT, but stop move/resize window */
+        {
+            Widget *w = WIDGET (g->current->data);
+            if (edit_widget_is_editor (w) && ((WEdit *) w)->drag_state != MCEDIT_DRAG_NONE)
+                edit_restore_size ((WEdit *) w);
+            else if (command == CK_Quit)
+                dlg_stop (h);
+        }
+        break;
+    case CK_About:
+        edit_about ();
+        break;
+    case CK_SyntaxOnOff:
+        edit_syntax_onoff_cmd (h);
+        break;
+    case CK_ShowTabTws:
+        edit_show_tabs_tws_cmd (h);
+        break;
+    case CK_ShowMargin:
+        edit_show_margin_cmd (h);
+        break;
+    case CK_ShowNumbers:
+        edit_show_numbers_cmd (h);
+        break;
+    case CK_Refresh:
+        edit_refresh_cmd ();
+        break;
+    case CK_InstructionStation:
+        edit_add_instr_stn_window (h, INSTR_STN_NO_FLAGS, data);
+        break;
+    case CK_Shell:
+        toggle_subshell ();
+        break;
+    case CK_LearnKeys:
+        learn_keys ();
+        break;
+    case CK_WindowMove:
+    case CK_WindowResize:
+        if (edit_widget_is_editor (CONST_WIDGET (g->current->data)))
+            edit_handle_move_resize ((WEdit *) g->current->data, command);
+        break;
+    case CK_WindowList:
+        edit_window_list (h);
+        break;
+    case CK_WindowNext:
+        group_select_next_widget (g);
+        break;
+    case CK_WindowPrev:
+        group_select_prev_widget (g);
+        break;
+    case CK_Options:
+        edit_options_dialog (h);
+        break;
+    case CK_OptionsSaveMode:
+        edit_save_mode_cmd ();
+        break;
+    case CK_SaveSetup:
+        save_setup_cmd ();
+        break;
+    default:
+        ret = MSG_NOT_HANDLED;
+        break;
+    }
+    return ret;
+}
+/* --------------------------------------------------------------------------------------------- */
+/** Callback for the edit dialog */
+cb_ret_t
+edit_dialog_callback (Widget * w, Widget * sender, widget_msg_t msg, int parm, void *data)
+{
+    WGroup *g = GROUP (w);
+    WDialog *h = DIALOG (w);
+    switch (msg)
+    {
+    case MSG_INIT:
+        edit_dlg_init ();
+        return MSG_HANDLED;
+    case MSG_RESIZE:
+        dlg_default_callback (w, NULL, MSG_RESIZE, 0, NULL);
+        menubar_arrange (find_menubar (h));
+        return MSG_HANDLED;
+    case MSG_ACTION:
+        {
+            /* Handle shortcuts, menu, and buttonbar. */
+            cb_ret_t result;
+            result = edit_dialog_command_execute (h, parm, data);
+            /* We forward any commands coming from the menu, and which haven't been
+               handled by the dialog, to the focused WEdit window. */
+            if (result == MSG_NOT_HANDLED && sender == WIDGET (find_menubar (h)))
+                result = send_message (g->current->data, NULL, MSG_ACTION, parm, NULL);
+            return result;
+        }
+    case MSG_KEY:
+        {
+            Widget *we = WIDGET (g->current->data);
+            cb_ret_t ret = MSG_NOT_HANDLED;
+            if (edit_widget_is_editor (we))
+            {
+                gboolean ext_mode;
+                long command;
+                /* keep and then extmod flag */
+                ext_mode = we->ext_mode;
+                command = widget_lookup_key (we, parm);
+                we->ext_mode = ext_mode;
+                if (command == CK_IgnoreKey)
+                    we->ext_mode = FALSE;
+                else
+                {
+                    ret = edit_dialog_command_execute (h, command, data);
+                    /* if command was not handled, keep the extended mode
+                       for the further key processing */
+                    if (ret == MSG_HANDLED)
+                        we->ext_mode = FALSE;
+                }
+            }
+            /*
+             * Due to the "end of bracket" escape the editor sees input with is_idle() == false
+             * (expects more characters) and hence doesn't yet refresh the screen, but then
+             * no further characters arrive (there's only an "end of bracket" which is swallowed
+             * by tty_get_event()), so you end up with a screen that's not refreshed after pasting.
+             * So let's trigger an IDLE signal.
+             */
+            if (!is_idle ())
+                widget_idle (w, TRUE);
+            return ret;
+        }
+        /* hardcoded menu hotkeys (see edit_drop_hotkey_menu) */
+    case MSG_UNHANDLED_KEY:
+        return edit_drop_hotkey_menu (h, parm) ? MSG_HANDLED : MSG_NOT_HANDLED;
+    case MSG_VALIDATE:
+        edit_quit (h);
+        return MSG_HANDLED;
+    case MSG_END:
+        edit_dlg_deinit ();
+        return MSG_HANDLED;
+    case MSG_IDLE:
+        widget_idle (w, FALSE);
+        return send_message (g->current->data, NULL, MSG_IDLE, 0, NULL);
+    default:
+        return dlg_default_callback (w, sender, msg, parm, data);
+    }
+}
+/* --------------------------------------------------------------------------------------------- */
+cb_ret_t
 edit_callback (Widget * w, Widget * sender, widget_msg_t msg, int parm, void *data)
+{
     WEdit *e = (WEdit *) w;
-…
+ edit_callback (Widget * w, Widget * sender, widget_msg_t msg, int parm, void *da
 /* --------------------------------------------------------------------------------------------- */
-/**
- * Handle move/resize mouse events.
- */
-static void
-edit_mouse_handle_move_resize (Widget * w, mouse_msg_t msg, mouse_event_t * event)
+{
-    WEdit *edit = (WEdit *) (w);
-    Widget *h = WIDGET (w->owner);
-    int global_x, global_y;
-    if (msg == MSG_MOUSE_UP)
+    {
-        /* Exit move/resize mode. */
-        edit_execute_cmd (edit, CK_Enter, -1);
-        edit_update_screen (edit);      /* Paint the buttonbar over our possibly overlapping frame. */
-        return;
+    }
-    if (msg != MSG_MOUSE_DRAG)
-        /**
-         * We ignore any other events. Specifically, MSG_MOUSE_DOWN.
+         *
-         * When the move/resize is initiated by the menu, we let the user
-         * stop it by clicking with the mouse. Which is why we don't want
-         * a mouse down to affect the window.
-         */
-        return;
-    /* Convert point to global coordinates for easier calculations. */
-    global_x = event->x + w->x;
-    global_y = event->y + w->y;
-    /* Clamp the point to the dialog's client area. */
-    global_y = CLAMP (global_y, h->y + 1, h->y + h->lines - 2); /* Status line, buttonbar */
-    global_x = CLAMP (global_x, h->x, h->x + h->cols - 1);      /* Currently a no-op, as the dialog has no left/right margins. */
-    if (edit->drag_state == MCEDIT_DRAG_MOVE)
+    {
-        w->y = global_y;
-        w->x = global_x - edit->drag_state_start;
+    }
-    else if (edit->drag_state == MCEDIT_DRAG_RESIZE)
+    {
-        w->lines = MAX (WINDOW_MIN_LINES, global_y - w->y + 1);
-        w->cols = MAX (WINDOW_MIN_COLS, global_x - w->x + 1);
+    }
-    edit->force |= REDRAW_COMPLETELY;   /* Not really needed as WEdit's MSG_DRAW already does this. */
-    /* We draw the whole dialog because dragging/resizing exposes area beneath. */
-    widget_draw (WIDGET (w->owner));
+}
-/* --------------------------------------------------------------------------------------------- */
 /**
  * Handle mouse events of editor window
+ *
-…
+ edit_mouse_handle_move_resize (Widget * w, mouse_msg_t msg, mouse_event_t * even
  * @param msg mouse event message
  * @param event mouse event data
  */
 static void
+void
 edit_mouse_callback (Widget * w, mouse_msg_t msg, mouse_event_t * event)
+{
     WEdit *edit = (WEdit *) w;
-…
+ edit_mouse_callback (Widget * w, mouse_msg_t msg, mouse_event_t * event)
+}
 /* --------------------------------------------------------------------------------------------- */
+/*** public functions ****************************************************************************/
+/* Creates a CLI special window, windowed (not fullscreen) */
+gboolean
+edit_add_instr_stn_window (WDialog * h, instr_stn_flags_t flags, void *data)
+{
+    WInstructionStation *ip;
+    /* Note passing of data - ability to alter program that's run in this station */
+    ip = instr_stn_create (3, 10, 17, 80, flags, (const char *) data);
+    if (ip == NULL)
+        return FALSE;
+    /* Add CLI-extended editor window (extending WEdit) to front dialog */
+    group_add_widget_autopos (GROUP (h), ip, WPOS_KEEP_ALL, NULL);
+    widget_draw (WIDGET (h));
+    return TRUE;
+}
 /* --------------------------------------------------------------------------------------------- */
 /**
  * Edit one file.
-…
+ edit_add_window (WDialog * h, int y, int x, int lines, int cols, const vfs_path_
     WEdit *edit;
     Widget *w;
     edit = edit_init (NULL, y, x, lines, cols, f, fline);
+    edit = edit_init (NULL, y, x, lines, cols, f, fline, 0);
     if (edit == NULL)
         return FALSE;

src/editor/editwidget.h

diff --git a/src/editor/editwidget.h b/src/editor/editwidget.h
index 446ef07ac..e8d1586e2 100644

-                      a
 /*** typedefs(not structures) and defined constants **********************************************/
+#define EDIT(x) ((WEdit *)(x))
+#define CONST_EDIT(x) ((const WEdit *)(x))
 #define N_LINE_CACHES 32
 /*** enums ***************************************************************************************/

new file src/editor/instr_station.c

diff --git a/src/editor/instr_station.c b/src/editor/instr_station.c
new file mode 100644
index 000000000..e4bb6ad65

-                      -
+/*
+   Implementation of a CLI window for MCEdit.
+   Copyright (C) 2021
+   Free Software Foundation, Inc.
+   Written by:
+   Sebastian Gniazdowski <sgniazdowski@gmail.com>, 2021.
+   This file is part of the Midnight Commander.
+   The Midnight Commander is free software: you can redistribute it
+   and/or modify it under the terms of the GNU General Public License as
+   published by the Free Software Foundation, either version 3 of the License,
+   or (at your option) any later version.
+   The Midnight Commander is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+/** \file instr_station.c
+ *  \brief Implementation of a CLI special window for MCEdit.
+ *  \author Sebastian Gniazdowski
+ *  \date 2021
+ *
+ *  Such window runs a set up program (/bin/bash by default) allowing to
+ *  provide an input to it and read its output.
+ */
+#include <config.h>
+#include "lib/global.h"
+#include <sys/types.h>
+#include <sys/wait.h>
+#include "src/editor/editwidget.h"
+#include "lib/util.h"
+#include "lib/tty/key.h"
+#include "lib/widget.h"
+#include "src/editor/instr_station.h"
+/*** global variables ****************************************************************************/
+/*** file scope macro definitions ****************************************************************/
+/*** file scope type declarations ****************************************************************/
+typedef enum instr_stn_io_type
+{
+    STDIN = 0,
+    STDOUT,
+    STDERR
+} instr_stn_io_type_t;
+/*** file scope variables ************************************************************************/
+static gboolean alt_prog_first_run = TRUE;
+/*** file scope functions ************************************************************************/
+/* --------------------------------------------------------------------------------------------- */
+static char *
+instr_stn_get_instruction_text (WInstructionStation * ip)
+{
+    char *ret_str;
+    GString *instr;
+    off_t bol, eol, begin_instr;
+    long size;
+    int idx, byte;
+    /* Calculate offset of text after prompt */
+    bol = edit_buffer_get_current_bol (&EDIT (ip)->buffer);
+    eol = edit_buffer_get_current_eol (&EDIT (ip)->buffer);
+    begin_instr = bol + ip->prompt_span;
+    /* Is there anything entered? */
+    size = ((long) eol) - ((long) begin_instr);
+    if (size <= 0)
+        return NULL;
+    /* Allocate expected size string and fill it */
+    instr = g_string_sized_new (size + 2);
+    for (idx = 0; idx < size; idx++)
+    {
+        byte = edit_buffer_get_byte (&EDIT (ip)->buffer, begin_instr + idx);
+        g_string_append_c (instr, byte);
+    }
+    /* Append new line if needed */
+    if (instr->str[instr->len - 1] != '\n')
+        g_string_append_c (instr, '\n');
+    /* Return char buffer */
+    ret_str = instr->str;
+    g_string_free (instr, FALSE);
+    return ret_str;
+}
+/* --------------------------------------------------------------------------------------------- */
+static gboolean
+instr_stn_release (WInstructionStation * ip, gboolean free_all)
+{
+    /* Already relased? */
+    if (ip == NULL)
+    {
+        if (free_all)
+            return TRUE;
+        else
+            return FALSE;
+    }
+    /* Already cleaned up (for a restart of program) ? */
+    if (ip->finalized && !free_all)
+        return FALSE;
+    ip->finalized = TRUE;
+    /* Close process watcher first, suppressing *program_ended_cb() callback */
+    if (ip->proc_src_id != 0)
+    {
+        GSource *src;
+        src = g_main_context_find_source_by_id (NULL, ip->proc_src_id);
+        if (src != NULL)
+            g_source_destroy (src);
+        ip->proc_src_id = 0;
+    }
+    /* Release the pipes, channels, etc. */
+    for (int i = 0; i <= STDERR; i++)
+    {
+        /* Source */
+        if (ip->io[i].src_id != 0)
+        {
+            GSource *src;
+            src = g_main_context_find_source_by_id (NULL, ip->io[i].src_id);
+            if (src != NULL)
+                g_source_destroy (src);
+            ip->io[i].src_id = 0;
+        }
+        /* Channel */
+        if (ip->io[i].ch != NULL)
+        {
+            g_io_channel_unref (ip->io[i].ch);
+            ip->io[i].ch = NULL;
+        }
+        /* Pipe */
+        if (ip->io[i].fd >= 0)
+        {
+            close (ip->io[i].fd);
+            ip->io[i].fd = -1;
+        }
+    }
+    /* Remove prompt guard recurring timeout callback function */
+    if (ip->prompt_timeout_id != 0)
+    {
+        g_source_remove (ip->prompt_timeout_id);
+        ip->prompt_timeout_id = 0;
+    }
+    MC_PTR_FREE (ip->instruction);
+    /* Release prompt */
+    MC_PTR_FREE (ip->prompt);
+    /* Release error prompt */
+    MC_PTR_FREE (ip->eprompt);
+    /* Clear prompt information */
+    ip->prompt_span = 0;
+    ip->eprompt_span = 0;
+    /* Set various indicator flags to some inactive state */
+    ip->io_complete = TRUE;
+    ip->first_response = TRUE;
+    ip->before_first_prompt = TRUE;
+    ip->prompt_shown = FALSE;
+    ip->flags = INSTR_STN_NO_FLAGS;
+    /* Clear any GError */
+    if (ip->error != NULL)
+    {
+        g_error_free (ip->error);
+        ip->error = NULL;
+    }
+    /* Release space occupied by WInstructionStation object? */
+    if (free_all)
+    {
+        MC_PTR_FREE (ip->program);
+        /* Free main object */
+        g_free (ip);
+    }
+    else
+        /* Value is still accessible in prev_program field */
+        ip->program = NULL;
+    return TRUE;
+}
+/* --------------------------------------------------------------------------------------------- */
+static cb_ret_t
+instr_stn_run_novel_state_id (WInstructionStation * ip, long novel_state_id, void *data)
+{
+    WGroup *owner = WIDGET (ip)->owner;
+    cb_ret_t ret = MSG_NOT_HANDLED;
+    switch (novel_state_id)
+    {
+    case CK_BackSpace:
+        if (ip->cur_col <= ip->prompt_span)
+            ret = MSG_HANDLED;
+        else
+        {
+            EDIT (ip)->force |= REDRAW_PAGE;
+            edit_update_screen (EDIT (ip));
+        }
+        break;
+    case CK_Enter:
+    case CK_Return:
+        if (EDIT (ip)->buffer.curs_line == ip->cur_line)
+        {
+            ip->instruction = instr_stn_get_instruction_text (ip);
+            ip->io_complete = FALSE;
+            /* Should dispatch to write callback which will send instruction */
+            g_main_context_iteration (NULL, 0);
+            repaint_screen ();
+        }
+        ret = MSG_HANDLED;
+        break;
+        /* InstructionStation activity invoked when focus is at a station window behaves differently */
+    case CK_InstructionStation:
+        {
+            /* Save needed information */
+            char *program_save;
+            /* End previous program */
+            if (kill (ip->process_id, 15) == -1)
+                mc_log ("Problem sending TERM signal to %d: %s.", ip->process_id,
+                        g_strerror (errno));
+            else
+                mc_log ("Ending process %d.", ip->process_id);
+            if (!ip->proc_support)
+                waitpid (ip->process_id, NULL, 0);
+            /* Allow process watcher callbacks to be called */
+            g_usleep (150000);
+            g_main_context_iteration (NULL, FALSE);
+            /* Allow the process end message to flash noticeably long */
+            g_usleep (200000);
+            /* Clean WInstructionStation object */
+            instr_stn_release (ip, FALSE);
+            /* ...and reinitialize it */
+            program_save = data != NULL ? g_strdup (data) : ip->prev_program;
+            if (instr_stn_init (ip, -1, -1, -1, -1, ip->prev_flags, program_save) == NULL)
+            {
+                /* Init failed -> close faulty station window */
+                ret =
+                    edit_dialog_callback (WIDGET (owner), WIDGET (ip), MSG_ACTION, CK_Close, NULL);
+                if (ret == MSG_HANDLED)
+                    /* Update pointer in case of some future code like widget_draw(ip), etc. */
+                    ip = INSTR_STATION (owner->current->data);
+            }
+            else
+            {
+                repaint_screen ();
+                ret = MSG_HANDLED;
+            }
+            g_free (program_save);
+        }
+        break;
+    default:
+        break;
+    }
+    return ret;
+}
+/* --------------------------------------------------------------------------------------------- */
+static void
+instr_stn_show_prompt (WInstructionStation * ip, gboolean is_ok)
+{
+    char *sel_prompt = is_ok ? ip->prompt : ip->eprompt;
+    int sel_prompt_span = is_ok ? ip->prompt_span : ip->eprompt_span;
+    if (has_flag (ip->flags, INSTR_STN_NO_PROMPT))
+        return;
+    /* Print prompt */
+    if (!edit_newline_end_check_only (EDIT (ip)) && !ip->before_first_prompt)
+    {
+        edit_insert (EDIT (ip), '\n');
+        ip->cur_line += 1;
+    }
+    else
+        ip->before_first_prompt = FALSE;
+    edit_insert_string (EDIT (ip), sel_prompt, sel_prompt_span);
+    /* Raise an indicator flag */
+    ip->prompt_shown = TRUE;
+    /* Set cursor position to reflect state */
+    ip->cur_col = sel_prompt_span;
+}
+/* --------------------------------------------------------------------------------------------- */
+/* Remove prompt from buffer (basically clear current line). */
+static void
+instr_stn_clear_prompt (WInstructionStation * ip)
+{
+    off_t bol, eol, idx;
+    if (has_flag (ip->flags, INSTR_STN_NO_PROMPT))
+        return;
+    eol = edit_buffer_get_current_eol (&EDIT (ip)->buffer);
+    bol = edit_buffer_get_current_bol (&EDIT (ip)->buffer);
+    for (idx = 0; idx < eol - bol; idx++)
+        edit_backspace (EDIT (ip), TRUE);
+    ip->prompt_shown = FALSE;
+}
+/* --------------------------------------------------------------------------------------------- */
+static gboolean
+prompt_drawing_timeout_callback (gpointer data)
+{
+    WInstructionStation *ip = INSTR_STATION (data);
+    guint64 cur_time;
+    cur_time = g_get_real_time ();
+    /* Draw prompt after 0.5 seconds of no output from program */
+    if (cur_time - ip->read_time > 500000 && !ip->prompt_shown)
+    {
+        instr_stn_show_prompt (ip, TRUE);
+        repaint_screen ();
+    }
+    return TRUE;
+}
+/* --------------------------------------------------------------------------------------------- */
+#ifdef GLIB_VERSION_2_40
+static void
+program_ended_callback (GPid pid, gint exit_code, gpointer user_data)
+{
+    WInstructionStation *ip = INSTR_STATION (user_data);
+    char *msg;
+    gboolean st_ret;
+    /* Release object leaving it uninitialized (no freeing of main object pointer) */
+    instr_stn_release (ip, FALSE);
+    g_spawn_close_pid (pid);
+    /* Examine exit code of closed program */
+#ifdef GLIB_VERSION_2_34
+    st_ret = g_spawn_check_exit_status (exit_code, NULL);
+#else
+    st_ret = (exit_code == 0);
+#endif
+    /* Choose message basing on exit code */
+    if (st_ret)
+        msg = g_strdup (_("\nProgram closed.\n"));
+    else
+        msg = g_strdup_printf (_("\nProgram closed abnormally (exit code: %d).\n"), exit_code);
+    /* Insert/print message to buffer and to mc.log */
+    edit_insert_string (EDIT (ip), msg, strlen (msg));
+    mc_log ("%s", msg);
+    /* Release message upon using/printing it */
+    g_free (msg);
+    repaint_screen ();
+}
+#endif
+/* --------------------------------------------------------------------------------------------- */
+static gboolean
+helper_configure_src_and_ch (GIOChannel ** ch, gint fd, guint * src_id, gboolean write,
+                             GIOFunc cb_fun, gpointer data, const char *name)
+{
+    /* Initialize the output variables */
+    *ch = NULL;
+    *src_id = 0;
+    *ch = g_io_channel_unix_new (fd);
+    /* Channel created? */
+    if (*ch == NULL)
+        goto cleanup_and_err;
+    /* Automatic shutdown of channel */
+    g_io_channel_set_close_on_unref (*ch, TRUE);
+    /* Trim down buffering on this channel */
+    g_io_channel_set_buffer_size (*ch, 5);
+    /* Attempt to set non-blocking flag on channel */
+    if (g_io_channel_set_flags (*ch, G_IO_FLAG_NONBLOCK, NULL) != G_IO_STATUS_NORMAL)
+        mc_log ("Problem setting a channel to non-blocking state (channel flags: 0x%x)",
+                g_io_channel_get_flags (*ch));
+    /* Create GSource */
+    *src_id =
+        g_io_add_watch (*ch, (write ? G_IO_OUT : G_IO_IN) | G_IO_HUP | G_IO_ERR, cb_fun, data);
+    /* Source created OK? */
+    if (*src_id == 0)
+        goto cleanup_and_err;
+    /* Configure the sources */
+    g_source_set_name_by_id (*src_id, name);
+    /* Return true */
+    return TRUE;
+  cleanup_and_err:
+    if (*src_id != 0)
+    {
+        GSource *src;
+        src = g_main_context_find_source_by_id (NULL, *src_id);
+        if (src != NULL)
+            /* Triggers also unref of wrapped channel */
+            g_source_destroy (src);
+    }
+    if (*ch != NULL)
+        g_io_channel_unref (*ch);
+    *ch = NULL;
+    *src_id = 0;
+    return FALSE;
+}
+/* --------------------------------------------------------------------------------------------- */
+static gboolean
+helper_read_all (GIOChannel * channel, char *buf, gsize * out_bytes_read_in_len)
+{
+    gsize len = *out_bytes_read_in_len;
+    gsize count, retries = 10;
+    GIOStatus stat;
+    *out_bytes_read_in_len = 0;
+    while (*out_bytes_read_in_len < len)
+    {
+        count = 0;
+        stat =
+            g_io_channel_read_chars (channel, buf + *out_bytes_read_in_len,
+                                     len - *out_bytes_read_in_len, &count, NULL);
+        *out_bytes_read_in_len += count;
+        /* Should end the reading ? */
+        if (stat == G_IO_STATUS_ERROR || (stat == G_IO_STATUS_NORMAL && count == 0) ||
+            stat == G_IO_STATUS_EOF)
+            return (stat != G_IO_STATUS_ERROR);
+        else if (stat == G_IO_STATUS_AGAIN && retries-- == 0)
+            /* Exhausted retries - there must be no data to read - return OK */
+            return TRUE;
+    }
+    return TRUE;
+}
+/* --------------------------------------------------------------------------------------------- */
+static gboolean
+helper_write_all (GIOChannel * channel, char *buf, gsize * out_bytes_written_in_len)
+{
+    gsize len = *out_bytes_written_in_len;
+    gsize count;
+    GIOError err;
+    *out_bytes_written_in_len = 0;
+    while (*out_bytes_written_in_len < len)
+    {
+        count = 0;
+        err =
+            g_io_channel_write (channel, buf + *out_bytes_written_in_len,
+                                len - *out_bytes_written_in_len, &count);
+        *out_bytes_written_in_len += count;
+        if (err && err != G_IO_ERROR_AGAIN)
+            return FALSE;
+    }
+    return TRUE;
+}
+/* --------------------------------------------------------------------------------------------- */
+static gboolean
+stdout_read_callback (GIOChannel * source, GIOCondition condition, gpointer data)
+{
+    WInstructionStation *ip = INSTR_STATION (data);
+    char buf[2048];
+    gsize count = 2047;
+    gboolean r_ret;
+    /* Active only when a recognized event of interest occurs */
+    if ((condition & (G_IO_IN | G_IO_HUP | G_IO_ERR)) == 0)
+        return TRUE;
+    else
+        ip->io_complete = FALSE;
+    /* Repeat read of 2KiB-1 maximum bytes until 0 bytes are being read */
+    do
+    {
+        r_ret = helper_read_all (source, buf, &count);
+        buf[count] = '\0';
+        if (count == 0 && !r_ret)
+        {
+            mc_log ("Error while reading program's output: %s", g_strerror (errno));
+        }
+        else
+        {
+            ip->read_time = g_get_real_time ();
+            buf[count] = '\0';
+            if (count > 0)
+            {
+                gsize idx = 0, nl_count = 0;
+                /* Count number of read lines */
+                char *p = buf;
+                while (idx++ < count)
+                    if (*p++ == '\n')
+                        nl_count++;
+                /* Move to next line after prompt */
+                if (ip->first_response)
+                {
+                    edit_insert (EDIT (ip), '\n');
+                    nl_count++;
+                    ip->first_response = FALSE;
+                    ip->prompt_shown = FALSE;
+                }
+                else if (ip->prompt_shown)
+                    instr_stn_clear_prompt (ip);
+                /* Print whole buffer into file's window  */
+                edit_insert_string (EDIT (ip), buf, count);
+                /* Increase the row pointer */
+                ip->cur_line += nl_count;
+            }
+            else if (!ip->prompt_shown)
+                instr_stn_show_prompt (ip, r_ret);
+            repaint_screen ();
+        }
+    }
+    while (count != 0);
+    ip->io_complete = r_ret;
+    return condition != G_IO_HUP;
+}
+/* --------------------------------------------------------------------------------------------- */
+static gboolean
+stdin_write_callback (GIOChannel * source, GIOCondition condition, gpointer data)
+{
+    WInstructionStation *ip = INSTR_STATION (data);
+    gsize count;
+    gboolean ret = TRUE;
+    /* Any instruction to send? */
+    if (ip->instruction == NULL)
+        return ret;
+    else
+        ip->io_complete = FALSE;
+    if ((condition & G_IO_OUT) == 0)
+        return TRUE;
+    errno = 0;
+    count = strlen (ip->instruction);
+    ret = helper_write_all (source, ip->instruction, &count);
+    if (!ret)
+    {
+        mc_log ("Error during sending instruction to program: %s", g_strerror (errno));
+    }
+    else
+    {
+        ip->first_response = TRUE;
+        MC_PTR_FREE (ip->instruction);
+        if (ip->prompt_timeout_id == 0)
+            ip->prompt_timeout_id = g_timeout_add (200, prompt_drawing_timeout_callback, ip);
+    }
+    g_io_channel_flush (ip->io[STDIN].ch, NULL);
+    ip->io_complete = TRUE;
+    return ret;
+}
+/* --------------------------------------------------------------------------------------------- */
+/* --------------------------------------------------------------------------------------------- */
+/*** public functions ****************************************************************************/
+/* --------------------------------------------------------------------------------------------- */
+WInstructionStation *
+instr_stn_create (int y, int x, int lines, int cols, instr_stn_flags_t flags, const char *program)
+{
+    WInstructionStation *ip, *iret;
+    ip = g_new0 (WInstructionStation, 1);
+    if (ip == NULL)
+        return NULL;
+    iret = instr_stn_init (ip, y, x, lines, cols, flags, program);
+    if (iret == NULL)
+        MC_PTR_FREE (ip);
+    return ip;
+}
+/* --------------------------------------------------------------------------------------------- */
+/* Initializes a preallocated object */
+WInstructionStation *
+instr_stn_init (WInstructionStation * ip, int y, int x, int lines, int cols,
+                instr_stn_flags_t flags, const char *program)
+{
+    WEdit *iret;
+    WGroup *owner_save = NULL;
+    gboolean tmp_ret = FALSE;
+    char **program_cline;
+    int rounds = 0;
+    if (ip == NULL)
+        goto cleanup_and_err;
+    /* Handle special -1 values indicating reuse of old values */
+    if (ip->finalized)
+    {
+        y = (y == -1) ? WIDGET (ip)->y : y;
+        x = (x == -1) ? WIDGET (ip)->x : x;
+        lines = (lines == -1) ? WIDGET (ip)->lines : lines;
+        cols = (cols == -1) ? WIDGET (ip)->cols : cols;
+        /* Save owner */
+        owner_save = WIDGET (ip)->owner;
+        ip->finalized = FALSE;
+    }
+    /* Initialize base object (WEdit) */
+    iret = edit_init (EDIT (ip), y, x, lines, cols, NULL, 0, EDIT_DO_INIT_BASE_CLASS);
+    if (iret == NULL)
+        goto cleanup_and_err;
+    /* Restore owner field value */
+    WIDGET (ip)->owner = owner_save;
+    WIDGET (ip)->callback = instr_stn_callback;
+    WIDGET (ip)->mouse_callback = edit_mouse_callback;
+    EDIT (ip)->fullscreen = 0;
+    ip->io[0].name = g_strdup ("Std-In (WInstructionStation)");
+    ip->io[1].name = g_strdup ("Std-Out (WInstructionStation)");
+    ip->io[2].name = g_strdup ("Std-Error (WInstructionStation)");
+    ip->io[0].fd = ip->io[1].fd = ip->io[2].fd = -1;
+    ip->before_first_prompt = TRUE;
+    ip->prompt = g_strdup ("[guest@localhost]# ");
+    ip->prompt_span = strlen (ip->prompt);
+    ip->eprompt = g_strdup ("[guest@localhost]! ");
+    ip->eprompt_span = strlen (ip->eprompt);
+    ip->cur_col = 0;
+    ip->cur_line = 0;
+    ip->flags = flags;
+    ip->prev_flags = flags;
+    /* Set initial program (most probably a shell, like Bash) */
+    if (program != NULL)
+    {
+        if (program[0] == 's' && program[1] == 'h')
+            ip->program = g_strdup (program);
+        else
+            ip->program = g_strdup_printf ("sh -c '%s'", program);
+    }
+    else
+        /* Fallback instruction if no program given */
+        ip->program = g_strdup ("bash");
+    while (++rounds <= 2 && !tmp_ret)
+    {
+        int argc = 0;
+        if (ip->error != NULL)
+        {
+            g_error_free (ip->error);
+            ip->error = NULL;
+        }
+        tmp_ret = g_shell_parse_argv (ip->program, &argc, &program_cline, &ip->error);
+        if (tmp_ret)
+        {
+            tmp_ret = g_spawn_async_with_pipes (NULL, program_cline,
+                                                NULL, G_SPAWN_SEARCH_PATH |
+                                                G_SPAWN_DO_NOT_REAP_CHILD |
+                                                G_SPAWN_LEAVE_DESCRIPTORS_OPEN,
+                                                NULL, NULL, &ip->process_id,
+                                                has_flag (flags,
+                                                          INSTR_STN_NO_STDIN) ? NULL :
+                                                &ip->io[STDIN].fd, &ip->io[STDOUT].fd,
+                                                &ip->io[STDERR].fd, &ip->error);
+            g_strfreev (program_cline);
+        }
+        if (!tmp_ret)
+        {
+            char *new_program, *msg_text;
+            mc_log ("Creating CLI process [instruction:%s] failed: %s",
+                    program, ip->error ? ip->error->message : "<no error message>");
+            /* Create a transatable, parametrized message */
+            msg_text = g_strdup_printf ("%s%s:", _("The specified program has failed to run.\n"
+                                                   "Enter a new full path or a program name"),
+                                        (rounds >= 2 ? _(" (last try)") : ""));
+            /* Display message asking for a new program */
+            new_program = input_expand_dialog (_("Provide an alternate program to run"),
+                                               msg_text, "instruction-station",
+                                               alt_prog_first_run ? ip->program : INPUT_LAST_TEXT,
+                                               INPUT_COMPLETE_COMMANDS | INPUT_COMPLETE_FILENAMES |
+                                               INPUT_COMPLETE_VARIABLES);
+            g_free (msg_text);
+            alt_prog_first_run = FALSE;
+            /* Obtained a new program? */
+            if (new_program != NULL)
+            {
+                g_free (ip->program);
+                ip->program = new_program;
+            }
+        }
+    }
+    /* If no program to run has been found, then exit. */
+    if (!tmp_ret)
+    {
+        message (D_ERROR, _("InstructionStation startup failed"),
+                 _("Failed to initialize the CLI window\n(reason: %s)."),
+                 ip->error ? ip->error->message : "<no error message>");
+        goto cleanup_and_err;
+    }
+    ip->prev_program = ip->program;
+    for (int i = 0; i <= STDERR; i++)
+    {
+        if (has_flag (flags, INSTR_STN_NO_STDIN) && i == STDIN)
+        {
+            /* There is no standard input pipe for program */
+            ip->io[i].fd = -1;
+            continue;
+        }
+        if (helper_configure_src_and_ch (&ip->io[i].ch, ip->io[i].fd, &ip->io[i].src_id,
+                                         (i == STDIN ? TRUE : FALSE),
+                                         (i == STDIN ? stdin_write_callback : stdout_read_callback),
+                                         ip, ip->io[i].name) == FALSE)
+            goto cleanup_and_err;
+    }
+#ifdef GLIB_VERSION_2_40
+    /* Set a process watcher and restarter for the program */
+    ip->proc_src_id = g_child_watch_add (ip->process_id, program_ended_callback, ip);
+    ip->proc_support = TRUE;
+#endif
+    /* Display initial prompt */
+    instr_stn_show_prompt (ip, TRUE);
+    ip->io_complete = TRUE;
+    return ip;
+  cleanup_and_err:
+    instr_stn_release (ip, TRUE);
+    return NULL;
+}
+/* --------------------------------------------------------------------------------------------- */
+WEdit *
+find_cli (const WDialog * h)
+{
+    const WGroup *g = CONST_GROUP (h);
+    if (edit_widget_is_cli (CONST_WIDGET (g->current->data)))
+        return (WEdit *) g->current->data;
+    return (WEdit *) widget_find_by_type (CONST_WIDGET (h), instr_stn_callback);
+}
+/* --------------------------------------------------------------------------------------------- */
+/* Check if widget is a WInstructionStation class type. */
+gboolean
+edit_widget_is_cli (const Widget * w)
+{
+    return (w != NULL && w->callback == instr_stn_callback);
+}
+/* --------------------------------------------------------------------------------------------- */
+cb_ret_t
+instr_stn_callback (Widget * w, Widget * sender, widget_msg_t msg, int parm, void *data)
+{
+    cb_ret_t ret = MSG_NOT_HANDLED;
+    WInstructionStation *ip = INSTR_STATION (w);
+    WGroup *owner = w->owner;
+    switch (msg)
+    {
+    case MSG_KEY:
+        {
+            gboolean ext_mode;
+            long novel_state_id;
+            /* keep and then extmod flag */
+            ext_mode = w->ext_mode;
+            novel_state_id = widget_lookup_key (w, parm);
+            w->ext_mode = ext_mode;
+            if (novel_state_id == CK_IgnoreKey)
+                w->ext_mode = FALSE;
+            else
+            {
+                /* Treat Station action specially when run from within a station window */
+                if (novel_state_id != CK_InstructionStation)
+                    ret = edit_dialog_command_execute (DIALOG (owner), novel_state_id, data);
+                if (ret == MSG_NOT_HANDLED)
+                    ret = instr_stn_run_novel_state_id (ip, novel_state_id, data);
+                /*
+                 * If activity was not handled, keep the extended mode
+                 * for the further key processing, checking if the
+                 * window is still open */
+                if (novel_state_id != CK_Close)
+                {
+                    if (ret == MSG_HANDLED)
+                        w->ext_mode = FALSE;
+                }
+                else if (ret == MSG_HANDLED)
+                    /* Window closed -> update `w` variable */
+                    w = WIDGET (owner->current->data);
+            }
+            /*
+             * Due to the "end of bracket" escape the editor sees input with is_idle() == false
+             * (expects more characters) and hence doesn't yet refresh the screen, but then
+             * no further characters arrive (there's only an "end of bracket" which is swallowed
+             * by tty_get_event()), so you end up with a screen that's not refreshed after pasting.
+             * So let's trigger an IDLE signal.
+             */
+            if (!is_idle ())
+                widget_idle (w, TRUE);
+        }
+        break;
+    case MSG_ACTION:
+        ret = instr_stn_run_novel_state_id (ip, parm, data);
+        break;
+    case MSG_DESTROY:
+        kill (ip->process_id, 15);
+        /* Have to wait directly (no GLib support for watchers) ? */
+        if (!ip->proc_support)
+            waitpid (ip->process_id, NULL, 0);
+        /*
+         * Message will be passed on to WEdit callback which will g_free(), so passing FALSE (i.e.:
+         * requesting cleanup of WInstructionStation object without full release of its main
+         * pointer) */
+        instr_stn_release (ip, FALSE);
+        /* Not restarting the station, so release program string backup field */
+        g_free (ip->prev_program);
+        break;
+    default:
+        break;
+    }
+    /* Redirect message to base object (i.e.: editor window «» WEdit) if needed */
+    if (ret == MSG_NOT_HANDLED)
+    {
+        ret = edit_callback (w, sender, msg, parm, data);
+        if (msg != MSG_DESTROY)
+            ip->cur_col = EDIT (w)->curs_col;
+    }
+    return ret;
+}
+/* --------------------------------------------------------------------------------------------- */

new file src/editor/instr_station.h

diff --git a/src/editor/instr_station.h b/src/editor/instr_station.h
new file mode 100644
index 000000000..0f05900c1

-                      -
+#ifndef MC__INSTR_STATION_H
+#define MC__INSTR_STATION_H
+/*** typedefs(not structures) and defined constants **********************************************/
+#define INSTR_STATION(x) ((WInstructionStation *)x)
+#define CONST_INSTR_STATION(x) ((const WInstructionStation *)x)
+/*** enums ***************************************************************************************/
+/*** structures declarations (and typedefs of structures)*****************************************/
+typedef struct
+{
+    WEdit base;
+    /* Configuration flags */
+    instr_stn_flags_t flags;
+    /* Save of flags for use upon finalization of this object */
+    instr_stn_flags_t prev_flags;
+    int cur_line;               /* Current line where prompt is */
+    int cur_col;                /* Current column where prompt ends */
+    int prompt_span;            /* Length of prompt in bytes */
+    int eprompt_span;           /* Length of error prompt */
+    /* Complete command that's being run in this station */
+    char *program;
+    /* Saved program string from before calling instr_stn_release(...,FALSE) (i.e.: finalization) */
+    char *prev_program;
+    /* OK prompt */
+    char *prompt;
+    /* Failure prompt */
+    char *eprompt;
+    /* The current instruction to send (filled for the writer GSource's pseudo thread) */
+    char *instruction;
+    /* An indicator of whether the prompt to show is the first one */
+    gboolean before_first_prompt;
+    /* An indicator of waiting for an initial response from program */
+    gboolean first_response;
+    /* An indicator of the prompt being printed or not */
+    gboolean prompt_shown;
+    /* ID of prompt drawing GLib's timeout recurring function */
+    guint prompt_timeout_id;
+    /* Process ID of the program */
+    GPid process_id;
+    /* Pipes to and from the program – series of fd+channel+GSource collections */
+    struct
+    {
+        gint fd;
+        GIOChannel *ch;
+        guint src_id;
+        char *name;
+    } io[3];
+    /* Time of last non empty read of data from program */
+    guint64 read_time;
+    /* GSource id of program process watcher */
+    guint proc_src_id;
+    /* A flag indicating whether there is (can be) a process watcher running */
+    gboolean proc_support;
+    /* A GError placeholder */
+    GError *error;
+    /* Indicator of an idle state – set when there's no data to send and read */
+    gboolean io_complete;
+    /* Indicator of instr_release being already called on WInstructionStation object */
+    gboolean finalized;
+} WInstructionStation;
+/*** global variables defined in .c file *********************************************************/
+/*** declarations of public functions ************************************************************/
+WInstructionStation *instr_stn_create (int y, int x, int lines, int cols, instr_stn_flags_t flags,
+                                       const char *program);
+WInstructionStation *instr_stn_init (WInstructionStation * ip, int y, int x, int lines, int cols,
+                                     instr_stn_flags_t flags, const char *program);
+WEdit *find_cli (const WDialog * h);
+gboolean edit_widget_is_cli (const Widget * w);
+cb_ret_t instr_stn_callback (Widget * w, Widget * sender, widget_msg_t msg, int parm, void *data);
+/*** inline functions ****************************************************************************/
+#endif /* MC__INSTR_STATION_H */

src/keybind-defaults.c

diff --git a/src/keybind-defaults.c b/src/keybind-defaults.c
index 7b87c2f5a..0f45f9c09 100644

  static const global_keymap_ini_t default_editor_keymap[] = {
     {"FileNext", "alt-plus"},
     {"Sort", "alt-t"},
     {"Mail", "alt-m"},
+    {"InstructionStation", "alt-i"},
     {"ExternalCommand", "alt-u"},
 #ifdef HAVE_ASPELL
     {"SpellCheckCurrentWord", "ctrl-p"},

Download in other formats:

Original Format