Mercurial > vim

comparison src/structs.h @ 15725:a3e2e7948ee4 v8.1.0870

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patch 8.1.0870: Vim doesn't use the new ConPTY support in Windows 10 commit https://github.com/vim/vim/commit/aa5df7e3127dff6b7336df0903f5c569a40eb174 Author: Bram Moolenaar <Bram@vim.org> Date: Sun Feb 3 14:53:10 2019 +0100 patch 8.1.0870: Vim doesn't use the new ConPTY support in Windows 10 Problem: Vim doesn't use the new ConPTY support in Windows 10. Solution: Use ConPTY support, if available. (Nobuhiro Takasaki, closes https://github.com/vim/vim/issues/3794)
author Bram Moolenaar <Bram@vim.org>
date Sun, 03 Feb 2019 15:00:08 +0100
parents ad8b2c109b22
children c017195b121b
comparison
equal deleted inserted replaced
15724:c75264abac54 15725:a3e2e7948ee4
280 #ifdef FEAT_TERMINAL 280 #ifdef FEAT_TERMINAL
281 char_u *wo_twk; 281 char_u *wo_twk;
282 # define w_p_twk w_onebuf_opt.wo_twk /* 'termwinkey' */ 282 # define w_p_twk w_onebuf_opt.wo_twk /* 'termwinkey' */
283 char_u *wo_tws; 283 char_u *wo_tws;
284 # define w_p_tws w_onebuf_opt.wo_tws /* 'termwinsize' */ 284 # define w_p_tws w_onebuf_opt.wo_tws /* 'termwinsize' */
285 char_u *wo_tmod;
286 # define w_p_tmod w_onebuf_opt.wo_tmod /* 'termmode' */
285 #endif 287 #endif
286 288
287 #ifdef FEAT_EVAL 289 #ifdef FEAT_EVAL
288 sctx_T wo_script_ctx[WV_COUNT]; /* SCTXs for window-local options */ 290 sctx_T wo_script_ctx[WV_COUNT]; /* SCTXs for window-local options */
289 # define w_p_script_ctx w_onebuf_opt.wo_script_ctx 291 # define w_p_script_ctx w_onebuf_opt.wo_script_ctx
1726 partial_T *ch_close_partial; 1728 partial_T *ch_close_partial;
1727 int ch_drop_never; 1729 int ch_drop_never;
1728 int ch_keep_open; /* do not close on read error */ 1730 int ch_keep_open; /* do not close on read error */
1729 int ch_nonblock; 1731 int ch_nonblock;
1730 1732
1731 job_T *ch_job; /* Job that uses this channel; this does not 1733 job_T *ch_job; // Job that uses this channel; this does not
1732 * count as a reference to avoid a circular 1734 // count as a reference to avoid a circular
1733 * reference, the job refers to the channel. */ 1735 // reference, the job refers to the channel.
1734 int ch_job_killed; /* TRUE when there was a job and it was killed 1736 int ch_job_killed; // TRUE when there was a job and it was killed
1735 * or we know it died. */ 1737 // or we know it died.
1736 1738 int ch_anonymous_pipe; // ConPTY
1737 int ch_refcount; /* reference count */ 1739 int ch_killing; // TerminateJobObject() was called
1740
1741 int ch_refcount; // reference count
1738 int ch_copyID; 1742 int ch_copyID;
1739 }; 1743 };
1740 1744
1741 #define JO_MODE 0x0001 /* channel mode */ 1745 #define JO_MODE 0x0001 /* channel mode */
1742 #define JO_IN_MODE 0x0002 /* stdin mode */ 1746 #define JO_IN_MODE 0x0002 /* stdin mode */
1785 #define JO2_TERM_OPENCMD 0x0800 /* "term_opencmd" */ 1789 #define JO2_TERM_OPENCMD 0x0800 /* "term_opencmd" */
1786 #define JO2_EOF_CHARS 0x1000 /* "eof_chars" */ 1790 #define JO2_EOF_CHARS 0x1000 /* "eof_chars" */
1787 #define JO2_NORESTORE 0x2000 /* "norestore" */ 1791 #define JO2_NORESTORE 0x2000 /* "norestore" */
1788 #define JO2_TERM_KILL 0x4000 /* "term_kill" */ 1792 #define JO2_TERM_KILL 0x4000 /* "term_kill" */
1789 #define JO2_ANSI_COLORS 0x8000 /* "ansi_colors" */ 1793 #define JO2_ANSI_COLORS 0x8000 /* "ansi_colors" */
1794 #define JO2_TERM_MODE 0x10000 /* "term_mode" */
1790 1795
1791 #define JO_MODE_ALL (JO_MODE + JO_IN_MODE + JO_OUT_MODE + JO_ERR_MODE) 1796 #define JO_MODE_ALL (JO_MODE + JO_IN_MODE + JO_OUT_MODE + JO_ERR_MODE)
1792 #define JO_CB_ALL \ 1797 #define JO_CB_ALL \
1793 (JO_CALLBACK + JO_OUT_CALLBACK + JO_ERR_CALLBACK + JO_CLOSE_CALLBACK) 1798 (JO_CALLBACK + JO_OUT_CALLBACK + JO_ERR_CALLBACK + JO_CLOSE_CALLBACK)
1794 #define JO_TIMEOUT_ALL (JO_TIMEOUT + JO_OUT_TIMEOUT + JO_ERR_TIMEOUT) 1799 #define JO_TIMEOUT_ALL (JO_TIMEOUT + JO_OUT_TIMEOUT + JO_ERR_TIMEOUT)
1857 char_u *jo_eof_chars; 1862 char_u *jo_eof_chars;
1858 char_u *jo_term_kill; 1863 char_u *jo_term_kill;
1859 # if defined(FEAT_GUI) || defined(FEAT_TERMGUICOLORS) 1864 # if defined(FEAT_GUI) || defined(FEAT_TERMGUICOLORS)
1860 long_u jo_ansi_colors[16]; 1865 long_u jo_ansi_colors[16];
1861 # endif 1866 # endif
1867 int jo_term_mode; // first character of "term_mode"
1862 #endif 1868 #endif
1863 } jobopt_T; 1869 } jobopt_T;
1864 1870
1865 1871
1866 /* structure used for explicit stack while garbage collecting hash tables */ 1872 /* structure used for explicit stack while garbage collecting hash tables */