patch 7.4.1318

Problem:    Channel with pipes doesn't work in GUI.
Solution:   Register input handlers for pipes.

Author: brammool

src/channel.c

@@ -9970,12 +9970,12 @@ f_ch_open(typval_T *argvars, typval_T *rettv)
     channel = channel_open((char *)address, port, waittime, NULL);
     if (channel != NULL)
     {
+	rettv->vval.v_channel = channel;
 	channel_set_json_mode(channel, ch_mode);
 	channel_set_timeout(channel, timeout);
 	if (callback != NULL && *callback != NUL)
 	    channel_set_callback(channel, callback);
     }
-    rettv->vval.v_channel = channel;
 }
 
 /*

src/eval.c

@@ -1262,7 +1262,7 @@
 #endif
 
 /*
- * The +job feature requires +eval and Unix or MS-Widndows.
+ * The +job feature requires +eval and Unix or MS-Windows.
  */
 #if (defined(UNIX) || defined(WIN32)) && defined(FEAT_EVAL)
 # define FEAT_JOB

src/feature.h

@@ -1780,14 +1780,15 @@ process_message(void)
 #ifdef FEAT_CHANNEL
     if (msg.message == WM_NETBEANS)
     {
-	channel_T *channel = channel_fd2channel((sock_T)msg.wParam);
+	int	    what;
+	channel_T   *channel = channel_fd2channel((sock_T)msg.wParam, &what);
 
 	if (channel != NULL)
 	{
 	    /* Disable error messages, they can mess up the display and throw
 	     * an exception. */
 	    ++emsg_off;
-	    channel_read(channel, FALSE, "process_message");
+	    channel_read(channel, what, "process_message");
 	    --emsg_off;
 	}
 	return;

src/gui_w48.c

@@ -5116,10 +5116,15 @@ mch_start_job(char **argv, job_T *job)
     close(fd_err[1]);
     channel_set_pipes(channel, fd_in[1], fd_out[0], fd_err[0]);
     channel_set_job(channel, job);
+#ifdef FEAT_GUI
+    channel_gui_register(channel);
+#endif
 
     return;
 
 failed:
+    if (channel != NULL)
+	channel_free(channel);
     if (fd_in[0] >= 0)
     {
 	close(fd_in[0]);

src/os_unix.c

@@ -5039,12 +5039,19 @@ mch_start_job(char *cmd, job_T *job)
     STARTUPINFO		si;
     PROCESS_INFORMATION	pi;
     HANDLE		jo;
+#ifdef FEAT_CHANNEL
+    channel_T	*channel;
+
+    channel = add_channel();
+    if (channel == NULL)
+	return;
+#endif
 
     jo = CreateJobObject(NULL, NULL);
     if (jo == NULL)
     {
 	job->jv_status = JOB_FAILED;
-	return;
+	goto failed;
     }
 
     ZeroMemory(&pi, sizeof(pi));
@@ -5062,22 +5069,40 @@ mch_start_job(char *cmd, job_T *job)
     {
 	CloseHandle(jo);
 	job->jv_status = JOB_FAILED;
+	goto failed;
     }
-    else
+
+    if (!AssignProcessToJobObject(jo, pi.hProcess))
     {
-	if (!AssignProcessToJobObject(jo, pi.hProcess))
-	{
-	    /* if failing, switch the way to terminate
-	     * process with TerminateProcess. */
-	    CloseHandle(jo);
-	    jo = NULL;
-	}
-	ResumeThread(pi.hThread);
-	CloseHandle(job->jv_proc_info.hThread);
-	job->jv_proc_info = pi;
-	job->jv_job_object = jo;
-	job->jv_status = JOB_STARTED;
+	/* if failing, switch the way to terminate
+	 * process with TerminateProcess. */
+	CloseHandle(jo);
+	jo = NULL;
     }
+    ResumeThread(pi.hThread);
+    CloseHandle(job->jv_proc_info.hThread);
+    job->jv_proc_info = pi;
+    job->jv_job_object = jo;
+    job->jv_status = JOB_STARTED;
+
+#ifdef FEAT_CHANNEL
+# if 0
+    /* TODO: connect stdin/stdout/stderr */
+    job->jv_channel = channel;
+    channel_set_pipes(channel, fd_in[1], fd_out[0], fd_err[0]);
+    channel_set_job(channel, job);
+
+#  ifdef FEAT_GUI
+     channel_gui_register(channel);
+#  endif
+# endif
+#endif
+    return;
+
+failed:
+#ifdef FEAT_CHANNEL
+    channel_free(channel);
+#endif
 }
 
     char *

src/os_win32.c

@@ -2,6 +2,7 @@
 void ch_logfile(FILE *file);
 channel_T *add_channel(void);
 void channel_free(channel_T *channel);
+void channel_gui_register(channel_T *channel);
 void channel_gui_register_all(void);
 channel_T *channel_open(char *hostname, int port_in, int waittime, void (*close_cb)(void));
 void channel_set_pipes(channel_T *channel, int in, int out, int err);
@@ -21,10 +22,10 @@ char_u *channel_peek(channel_T *channel);
 void channel_clear(channel_T *channel);
 void channel_free_all(void);
 int channel_get_id(void);
-void channel_read(channel_T *channel, int use_stderr, char *func);
+void channel_read(channel_T *channel, int what, char *func);
 char_u *channel_read_block(channel_T *channel);
 int channel_read_json_block(channel_T *channel, int id, typval_T **rettv);
-channel_T *channel_fd2channel(sock_T fd);
+channel_T *channel_fd2channel(sock_T fd, int *what);
 int channel_send(channel_T *channel, char_u *buf, char *fun);
 int channel_poll_setup(int nfd_in, void *fds_in);
 int channel_poll_check(int ret_in, void *fds_in);

src/proto/channel.pro

@@ -1301,45 +1301,56 @@ typedef enum
     MODE_JS
 } ch_mode_T;
 
-struct channel_S {
-    channel_T	*ch_next;
-    channel_T	*ch_prev;
-
-    int		ch_id;		/* ID of the channel */
+/* Ordering matters: IN is last, only SOCK/OUT/ERR are polled */
 
-    sock_T	ch_sock;	/* the socket, -1 for a closed channel */
+#define CHAN_SOCK   0
+#define CH_SOCK	    ch_pfd[CHAN_SOCK].ch_fd
 
 #ifdef UNIX
 # define CHANNEL_PIPES
-    int		ch_in;		/* stdin of the job, -1 if not used */
-    int		ch_out;		/* stdout of the job, -1 if not used */
-    int		ch_err;		/* stderr of the job, -1 if not used */
 
-# if defined(UNIX) && !defined(HAVE_SELECT)
-    int		ch_sock_idx;	/* used by channel_poll_setup() */
-    int		ch_in_idx;	/* used by channel_poll_setup() */
-    int		ch_out_idx;	/* used by channel_poll_setup() */
-    int		ch_err_idx;	/* used by channel_poll_setup() */
-# endif
+# define CHAN_OUT   1
+# define CHAN_ERR   2
+# define CHAN_IN    3
+# define CH_OUT	    ch_pfd[CHAN_OUT].ch_fd
+# define CH_ERR	    ch_pfd[CHAN_ERR].ch_fd
+# define CH_IN	    ch_pfd[CHAN_IN].ch_fd
 #endif
 
-    readq_T	ch_head;	/* dummy node, header for circular queue */
+/* The per-fd info for a channel. */
+typedef struct {
+    sock_T	ch_fd;	    /* socket/stdin/stdout/stderr, -1 if not used */
+
+# if defined(UNIX) && !defined(HAVE_SELECT)
+    int		ch_poll_idx;	/* used by channel_poll_setup() */
+# endif
 
-    int		ch_error;	/* When TRUE an error was reported.  Avoids
-				 * giving pages full of error messages when
-				 * the other side has exited, only mention the
-				 * first error until the connection works
-				 * again. */
 #ifdef FEAT_GUI_X11
     XtInputId	ch_inputHandler; /* Cookie for input */
 #endif
 #ifdef FEAT_GUI_GTK
     gint	ch_inputHandler; /* Cookie for input */
 #endif
 #ifdef WIN32
-    int		ch_inputHandler; /* simply ret.value of WSAAsyncSelect() */
+    int		ch_inputHandler; /* ret.value of WSAAsyncSelect() */
 #endif
+} chan_fd_T;
+
+struct channel_S {
+    channel_T	*ch_next;
+    channel_T	*ch_prev;
+
+    int		ch_id;		/* ID of the channel */
+
+    chan_fd_T	ch_pfd[4];	/* info for socket, in, out and err */
 
+    readq_T	ch_head;	/* dummy node, header for circular queue */
+
+    int		ch_error;	/* When TRUE an error was reported.  Avoids
+				 * giving pages full of error messages when
+				 * the other side has exited, only mention the
+				 * first error until the connection works
+				 * again. */
     void	(*ch_close_cb)(void); /* callback for when channel is closed */
 
     int		ch_block_id;	/* ID that channel_read_json_block() is

src/structs.h

@@ -747,6 +747,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1318,
 /**/
     1317,
 /**/