Mercurial > vim
annotate src/terminal.c @ 15144:7960bf50d345 v8.1.0582
patch 8.1.0582: text properties are not enabled
commit https://github.com/vim/vim/commit/fb95e212a2696e5b1c8b5e6b2984af59fa7ead6f
Author: Bram Moolenaar <Bram@vim.org>
Date: Fri Dec 14 12:18:11 2018 +0100
patch 8.1.0582: text properties are not enabled
Problem: Text properties are not enabled.
Solution: Fix sizeof argument and re-enable the text properties feature.
Fix memory leak.
| author | Bram Moolenaar <Bram@vim.org> |
|---|---|
| date | Fri, 14 Dec 2018 12:30:08 +0100 |
| parents | f3b4cd98944c |
| children | 7903dce131d4 |
| rev | line source |
|---|---|
| 12502 | 1 /* vi:set ts=8 sts=4 sw=4 noet: |
| 2 * | |
| 3 * VIM - Vi IMproved by Bram Moolenaar | |
| 4 * | |
| 5 * Do ":help uganda" in Vim to read copying and usage conditions. | |
| 6 * Do ":help credits" in Vim to see a list of people who contributed. | |
| 7 * See README.txt for an overview of the Vim source code. | |
| 8 */ | |
| 9 | |
| 10 /* | |
| 11 * Terminal window support, see ":help :terminal". | |
| 12 * | |
| 13 * There are three parts: | |
| 14 * 1. Generic code for all systems. | |
| 15 * Uses libvterm for the terminal emulator. | |
| 16 * 2. The MS-Windows implementation. | |
| 17 * Uses winpty. | |
| 18 * 3. The Unix-like implementation. | |
| 19 * Uses pseudo-tty's (pty's). | |
| 20 * | |
| 21 * For each terminal one VTerm is constructed. This uses libvterm. A copy of | |
| 22 * this library is in the libvterm directory. | |
| 23 * | |
| 24 * When a terminal window is opened, a job is started that will be connected to | |
| 25 * the terminal emulator. | |
| 26 * | |
| 27 * If the terminal window has keyboard focus, typed keys are converted to the | |
| 28 * terminal encoding and writing to the job over a channel. | |
| 29 * | |
| 30 * If the job produces output, it is written to the terminal emulator. The | |
| 31 * terminal emulator invokes callbacks when its screen content changes. The | |
| 32 * line range is stored in tl_dirty_row_start and tl_dirty_row_end. Once in a | |
| 33 * while, if the terminal window is visible, the screen contents is drawn. | |
| 34 * | |
| 35 * When the job ends the text is put in a buffer. Redrawing then happens from | |
| 36 * that buffer, attributes come from the scrollback buffer tl_scrollback. | |
| 37 * When the buffer is changed it is turned into a normal buffer, the attributes | |
| 38 * in tl_scrollback are no longer used. | |
| 39 */ | |
| 40 | |
| 41 #include "vim.h" | |
| 42 | |
| 43 #if defined(FEAT_TERMINAL) || defined(PROTO) | |
| 44 | |
| 45 #ifndef MIN | |
| 46 # define MIN(x,y) ((x) < (y) ? (x) : (y)) | |
| 47 #endif | |
| 48 #ifndef MAX | |
| 49 # define MAX(x,y) ((x) > (y) ? (x) : (y)) | |
| 50 #endif | |
| 51 | |
| 52 #include "libvterm/include/vterm.h" | |
| 53 | |
| 54 /* This is VTermScreenCell without the characters, thus much smaller. */ | |
| 55 typedef struct { | |
| 56 VTermScreenCellAttrs attrs; | |
| 57 char width; | |
|
13298
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
58 VTermColor fg; |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
59 VTermColor bg; |
| 12502 | 60 } cellattr_T; |
| 61 | |
| 62 typedef struct sb_line_S { | |
| 63 int sb_cols; /* can differ per line */ | |
| 64 cellattr_T *sb_cells; /* allocated */ | |
| 65 cellattr_T sb_fill_attr; /* for short line */ | |
| 66 } sb_line_T; | |
| 67 | |
| 68 /* typedef term_T in structs.h */ | |
| 69 struct terminal_S { | |
| 70 term_T *tl_next; | |
| 71 | |
| 72 VTerm *tl_vterm; | |
| 73 job_T *tl_job; | |
| 74 buf_T *tl_buffer; | |
|
13470
6faef782f50b
patch 8.0.1609: shell commands in the GUI use a dumb terminal
Christian Brabandt <cb@256bit.org>
parents:
13458
diff
changeset
|
75 #if defined(FEAT_GUI) |
|
6faef782f50b
patch 8.0.1609: shell commands in the GUI use a dumb terminal
Christian Brabandt <cb@256bit.org>
parents:
13458
diff
changeset
|
76 int tl_system; /* when non-zero used for :!cmd output */ |
|
6faef782f50b
patch 8.0.1609: shell commands in the GUI use a dumb terminal
Christian Brabandt <cb@256bit.org>
parents:
13458
diff
changeset
|
77 int tl_toprow; /* row with first line of system terminal */ |
|
6faef782f50b
patch 8.0.1609: shell commands in the GUI use a dumb terminal
Christian Brabandt <cb@256bit.org>
parents:
13458
diff
changeset
|
78 #endif |
| 12502 | 79 |
| 80 /* Set when setting the size of a vterm, reset after redrawing. */ | |
| 81 int tl_vterm_size_changed; | |
| 82 | |
| 83 int tl_normal_mode; /* TRUE: Terminal-Normal mode */ | |
| 84 int tl_channel_closed; | |
|
13888
81e8e6181aeb
patch 8.0.1815: crash with terminal window and with 'lazyredraw' set
Christian Brabandt <cb@256bit.org>
parents:
13886
diff
changeset
|
85 int tl_channel_recently_closed; // still need to handle tl_finish |
|
81e8e6181aeb
patch 8.0.1815: crash with terminal window and with 'lazyredraw' set
Christian Brabandt <cb@256bit.org>
parents:
13886
diff
changeset
|
86 |
|
13476
d130044d4f1f
patch 8.0.1612: need to close terminal after shell stopped
Christian Brabandt <cb@256bit.org>
parents:
13474
diff
changeset
|
87 int tl_finish; |
|
d130044d4f1f
patch 8.0.1612: need to close terminal after shell stopped
Christian Brabandt <cb@256bit.org>
parents:
13474
diff
changeset
|
88 #define TL_FINISH_UNSET NUL |
|
d130044d4f1f
patch 8.0.1612: need to close terminal after shell stopped
Christian Brabandt <cb@256bit.org>
parents:
13474
diff
changeset
|
89 #define TL_FINISH_CLOSE 'c' /* ++close or :terminal without argument */ |
|
d130044d4f1f
patch 8.0.1612: need to close terminal after shell stopped
Christian Brabandt <cb@256bit.org>
parents:
13474
diff
changeset
|
90 #define TL_FINISH_NOCLOSE 'n' /* ++noclose */ |
|
d130044d4f1f
patch 8.0.1612: need to close terminal after shell stopped
Christian Brabandt <cb@256bit.org>
parents:
13474
diff
changeset
|
91 #define TL_FINISH_OPEN 'o' /* ++open */ |
| 12502 | 92 char_u *tl_opencmd; |
| 93 char_u *tl_eof_chars; | |
| 94 | |
| 95 #ifdef WIN3264 | |
| 96 void *tl_winpty_config; | |
| 97 void *tl_winpty; | |
|
13860
7f892e37b017
patch 8.0.1801: MS-Windows: redirecting terminal output does not work
Christian Brabandt <cb@256bit.org>
parents:
13851
diff
changeset
|
98 |
|
7f892e37b017
patch 8.0.1801: MS-Windows: redirecting terminal output does not work
Christian Brabandt <cb@256bit.org>
parents:
13851
diff
changeset
|
99 FILE *tl_out_fd; |
| 12502 | 100 #endif |
|
13435
fa198b71bab2
patch 8.0.1592: terminal windows in a session are not properly restored
Christian Brabandt <cb@256bit.org>
parents:
13380
diff
changeset
|
101 #if defined(FEAT_SESSION) |
|
fa198b71bab2
patch 8.0.1592: terminal windows in a session are not properly restored
Christian Brabandt <cb@256bit.org>
parents:
13380
diff
changeset
|
102 char_u *tl_command; |
|
fa198b71bab2
patch 8.0.1592: terminal windows in a session are not properly restored
Christian Brabandt <cb@256bit.org>
parents:
13380
diff
changeset
|
103 #endif |
|
13438
33eea5ce5415
patch 8.0.1593: :qall never exits with an active terminal window
Christian Brabandt <cb@256bit.org>
parents:
13435
diff
changeset
|
104 char_u *tl_kill; |
| 12502 | 105 |
| 106 /* last known vterm size */ | |
| 107 int tl_rows; | |
| 108 int tl_cols; | |
| 109 | |
| 110 char_u *tl_title; /* NULL or allocated */ | |
| 111 char_u *tl_status_text; /* NULL or allocated */ | |
| 112 | |
| 113 /* Range of screen rows to update. Zero based. */ | |
|
12578
f8beecfea2c4
patch 8.0.1167: Motif: typing in terminal window is slow
Christian Brabandt <cb@256bit.org>
parents:
12541
diff
changeset
|
114 int tl_dirty_row_start; /* MAX_ROW if nothing dirty */ |
| 12502 | 115 int tl_dirty_row_end; /* row below last one to update */ |
|
13878
a590029f16a0
patch 8.0.1810: buffer of a terminal only updated in Terminal-Normal mode
Christian Brabandt <cb@256bit.org>
parents:
13864
diff
changeset
|
116 int tl_dirty_snapshot; /* text updated after making snapshot */ |
|
a590029f16a0
patch 8.0.1810: buffer of a terminal only updated in Terminal-Normal mode
Christian Brabandt <cb@256bit.org>
parents:
13864
diff
changeset
|
117 #ifdef FEAT_TIMERS |
|
a590029f16a0
patch 8.0.1810: buffer of a terminal only updated in Terminal-Normal mode
Christian Brabandt <cb@256bit.org>
parents:
13864
diff
changeset
|
118 int tl_timer_set; |
|
a590029f16a0
patch 8.0.1810: buffer of a terminal only updated in Terminal-Normal mode
Christian Brabandt <cb@256bit.org>
parents:
13864
diff
changeset
|
119 proftime_T tl_timer_due; |
|
a590029f16a0
patch 8.0.1810: buffer of a terminal only updated in Terminal-Normal mode
Christian Brabandt <cb@256bit.org>
parents:
13864
diff
changeset
|
120 #endif |
|
13851
3edac4cd1c0a
patch 8.0.1797: terminal window is redrawn too often
Christian Brabandt <cb@256bit.org>
parents:
13849
diff
changeset
|
121 int tl_postponed_scroll; /* to be scrolled up */ |
|
3edac4cd1c0a
patch 8.0.1797: terminal window is redrawn too often
Christian Brabandt <cb@256bit.org>
parents:
13849
diff
changeset
|
122 |
| 12502 | 123 garray_T tl_scrollback; |
| 124 int tl_scrollback_scrolled; | |
| 125 cellattr_T tl_default_color; | |
| 126 | |
|
13298
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
127 linenr_T tl_top_diff_rows; /* rows of top diff file or zero */ |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
128 linenr_T tl_bot_diff_rows; /* rows of bottom diff file */ |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
129 |
| 12502 | 130 VTermPos tl_cursor_pos; |
| 131 int tl_cursor_visible; | |
| 132 int tl_cursor_blink; | |
| 133 int tl_cursor_shape; /* 1: block, 2: underline, 3: bar */ | |
| 134 char_u *tl_cursor_color; /* NULL or allocated */ | |
| 135 | |
| 136 int tl_using_altscreen; | |
| 137 }; | |
| 138 | |
| 139 #define TMODE_ONCE 1 /* CTRL-\ CTRL-N used */ | |
| 140 #define TMODE_LOOP 2 /* CTRL-W N used */ | |
| 141 | |
| 142 /* | |
| 143 * List of all active terminals. | |
| 144 */ | |
| 145 static term_T *first_term = NULL; | |
| 146 | |
| 147 /* Terminal active in terminal_loop(). */ | |
| 148 static term_T *in_terminal_loop = NULL; | |
| 149 | |
| 150 #define MAX_ROW 999999 /* used for tl_dirty_row_end to update all rows */ | |
| 151 #define KEY_BUF_LEN 200 | |
| 152 | |
| 153 /* | |
| 154 * Functions with separate implementation for MS-Windows and Unix-like systems. | |
| 155 */ | |
|
13860
7f892e37b017
patch 8.0.1801: MS-Windows: redirecting terminal output does not work
Christian Brabandt <cb@256bit.org>
parents:
13851
diff
changeset
|
156 static int term_and_job_init(term_T *term, typval_T *argvar, char **argv, jobopt_T *opt, jobopt_T *orig_opt); |
| 12502 | 157 static int create_pty_only(term_T *term, jobopt_T *opt); |
| 158 static void term_report_winsize(term_T *term, int rows, int cols); | |
| 159 static void term_free_vterm(term_T *term); | |
|
13470
6faef782f50b
patch 8.0.1609: shell commands in the GUI use a dumb terminal
Christian Brabandt <cb@256bit.org>
parents:
13458
diff
changeset
|
160 #ifdef FEAT_GUI |
|
6faef782f50b
patch 8.0.1609: shell commands in the GUI use a dumb terminal
Christian Brabandt <cb@256bit.org>
parents:
13458
diff
changeset
|
161 static void update_system_term(term_T *term); |
|
6faef782f50b
patch 8.0.1609: shell commands in the GUI use a dumb terminal
Christian Brabandt <cb@256bit.org>
parents:
13458
diff
changeset
|
162 #endif |
| 12502 | 163 |
|
12800
8dfeed7e07e7
patch 8.0.1277: terminal window CR-NL conversions may cause problems
Christian Brabandt <cb@256bit.org>
parents:
12798
diff
changeset
|
164 /* The character that we know (or assume) that the terminal expects for the |
|
8dfeed7e07e7
patch 8.0.1277: terminal window CR-NL conversions may cause problems
Christian Brabandt <cb@256bit.org>
parents:
12798
diff
changeset
|
165 * backspace key. */ |
| 12502 | 166 static int term_backspace_char = BS; |
| 167 | |
|
12973
418941f0df08
patch 8.0.1362: terminal window colors wrong when using Terminal highlighting
Christian Brabandt <cb@256bit.org>
parents:
12969
diff
changeset
|
168 /* "Terminal" highlight group colors. */ |
|
418941f0df08
patch 8.0.1362: terminal window colors wrong when using Terminal highlighting
Christian Brabandt <cb@256bit.org>
parents:
12969
diff
changeset
|
169 static int term_default_cterm_fg = -1; |
|
418941f0df08
patch 8.0.1362: terminal window colors wrong when using Terminal highlighting
Christian Brabandt <cb@256bit.org>
parents:
12969
diff
changeset
|
170 static int term_default_cterm_bg = -1; |
| 12502 | 171 |
|
13206
53f0c469dfc6
patch 8.0.1477: redraw flicker when moving the mouse outside of terminal window
Christian Brabandt <cb@256bit.org>
parents:
13132
diff
changeset
|
172 /* Store the last set and the desired cursor properties, so that we only update |
|
53f0c469dfc6
patch 8.0.1477: redraw flicker when moving the mouse outside of terminal window
Christian Brabandt <cb@256bit.org>
parents:
13132
diff
changeset
|
173 * them when needed. Doing it unnecessary may result in flicker. */ |
|
13990
017c5462ed5e
patch 8.1.0013: using freed memory when changing terminal cursor color
Christian Brabandt <cb@256bit.org>
parents:
13961
diff
changeset
|
174 static char_u *last_set_cursor_color = NULL; |
|
017c5462ed5e
patch 8.1.0013: using freed memory when changing terminal cursor color
Christian Brabandt <cb@256bit.org>
parents:
13961
diff
changeset
|
175 static char_u *desired_cursor_color = NULL; |
|
13206
53f0c469dfc6
patch 8.0.1477: redraw flicker when moving the mouse outside of terminal window
Christian Brabandt <cb@256bit.org>
parents:
13132
diff
changeset
|
176 static int last_set_cursor_shape = -1; |
|
53f0c469dfc6
patch 8.0.1477: redraw flicker when moving the mouse outside of terminal window
Christian Brabandt <cb@256bit.org>
parents:
13132
diff
changeset
|
177 static int desired_cursor_shape = -1; |
|
53f0c469dfc6
patch 8.0.1477: redraw flicker when moving the mouse outside of terminal window
Christian Brabandt <cb@256bit.org>
parents:
13132
diff
changeset
|
178 static int last_set_cursor_blink = -1; |
|
53f0c469dfc6
patch 8.0.1477: redraw flicker when moving the mouse outside of terminal window
Christian Brabandt <cb@256bit.org>
parents:
13132
diff
changeset
|
179 static int desired_cursor_blink = -1; |
|
53f0c469dfc6
patch 8.0.1477: redraw flicker when moving the mouse outside of terminal window
Christian Brabandt <cb@256bit.org>
parents:
13132
diff
changeset
|
180 |
|
53f0c469dfc6
patch 8.0.1477: redraw flicker when moving the mouse outside of terminal window
Christian Brabandt <cb@256bit.org>
parents:
13132
diff
changeset
|
181 |
| 12502 | 182 /************************************** |
| 183 * 1. Generic code for all systems. | |
| 184 */ | |
| 185 | |
|
13994
411dd50f1daa
patch 8.1.0015: cursor color wrong when closing a terminal window
Christian Brabandt <cb@256bit.org>
parents:
13990
diff
changeset
|
186 static int |
|
13990
017c5462ed5e
patch 8.1.0013: using freed memory when changing terminal cursor color
Christian Brabandt <cb@256bit.org>
parents:
13961
diff
changeset
|
187 cursor_color_equal(char_u *lhs_color, char_u *rhs_color) |
|
017c5462ed5e
patch 8.1.0013: using freed memory when changing terminal cursor color
Christian Brabandt <cb@256bit.org>
parents:
13961
diff
changeset
|
188 { |
|
017c5462ed5e
patch 8.1.0013: using freed memory when changing terminal cursor color
Christian Brabandt <cb@256bit.org>
parents:
13961
diff
changeset
|
189 if (lhs_color != NULL && rhs_color != NULL) |
|
017c5462ed5e
patch 8.1.0013: using freed memory when changing terminal cursor color
Christian Brabandt <cb@256bit.org>
parents:
13961
diff
changeset
|
190 return STRCMP(lhs_color, rhs_color) == 0; |
|
017c5462ed5e
patch 8.1.0013: using freed memory when changing terminal cursor color
Christian Brabandt <cb@256bit.org>
parents:
13961
diff
changeset
|
191 return lhs_color == NULL && rhs_color == NULL; |
|
017c5462ed5e
patch 8.1.0013: using freed memory when changing terminal cursor color
Christian Brabandt <cb@256bit.org>
parents:
13961
diff
changeset
|
192 } |
|
017c5462ed5e
patch 8.1.0013: using freed memory when changing terminal cursor color
Christian Brabandt <cb@256bit.org>
parents:
13961
diff
changeset
|
193 |
|
13994
411dd50f1daa
patch 8.1.0015: cursor color wrong when closing a terminal window
Christian Brabandt <cb@256bit.org>
parents:
13990
diff
changeset
|
194 static void |
|
411dd50f1daa
patch 8.1.0015: cursor color wrong when closing a terminal window
Christian Brabandt <cb@256bit.org>
parents:
13990
diff
changeset
|
195 cursor_color_copy(char_u **to_color, char_u *from_color) |
|
411dd50f1daa
patch 8.1.0015: cursor color wrong when closing a terminal window
Christian Brabandt <cb@256bit.org>
parents:
13990
diff
changeset
|
196 { |
|
411dd50f1daa
patch 8.1.0015: cursor color wrong when closing a terminal window
Christian Brabandt <cb@256bit.org>
parents:
13990
diff
changeset
|
197 // Avoid a free & alloc if the value is already right. |
|
411dd50f1daa
patch 8.1.0015: cursor color wrong when closing a terminal window
Christian Brabandt <cb@256bit.org>
parents:
13990
diff
changeset
|
198 if (cursor_color_equal(*to_color, from_color)) |
|
411dd50f1daa
patch 8.1.0015: cursor color wrong when closing a terminal window
Christian Brabandt <cb@256bit.org>
parents:
13990
diff
changeset
|
199 return; |
|
411dd50f1daa
patch 8.1.0015: cursor color wrong when closing a terminal window
Christian Brabandt <cb@256bit.org>
parents:
13990
diff
changeset
|
200 vim_free(*to_color); |
|
411dd50f1daa
patch 8.1.0015: cursor color wrong when closing a terminal window
Christian Brabandt <cb@256bit.org>
parents:
13990
diff
changeset
|
201 *to_color = (from_color == NULL) ? NULL : vim_strsave(from_color); |
|
411dd50f1daa
patch 8.1.0015: cursor color wrong when closing a terminal window
Christian Brabandt <cb@256bit.org>
parents:
13990
diff
changeset
|
202 } |
|
411dd50f1daa
patch 8.1.0015: cursor color wrong when closing a terminal window
Christian Brabandt <cb@256bit.org>
parents:
13990
diff
changeset
|
203 |
|
411dd50f1daa
patch 8.1.0015: cursor color wrong when closing a terminal window
Christian Brabandt <cb@256bit.org>
parents:
13990
diff
changeset
|
204 static char_u * |
|
13990
017c5462ed5e
patch 8.1.0013: using freed memory when changing terminal cursor color
Christian Brabandt <cb@256bit.org>
parents:
13961
diff
changeset
|
205 cursor_color_get(char_u *color) |
|
017c5462ed5e
patch 8.1.0013: using freed memory when changing terminal cursor color
Christian Brabandt <cb@256bit.org>
parents:
13961
diff
changeset
|
206 { |
|
017c5462ed5e
patch 8.1.0013: using freed memory when changing terminal cursor color
Christian Brabandt <cb@256bit.org>
parents:
13961
diff
changeset
|
207 return (color == NULL) ? (char_u *)"" : color; |
|
017c5462ed5e
patch 8.1.0013: using freed memory when changing terminal cursor color
Christian Brabandt <cb@256bit.org>
parents:
13961
diff
changeset
|
208 } |
|
017c5462ed5e
patch 8.1.0013: using freed memory when changing terminal cursor color
Christian Brabandt <cb@256bit.org>
parents:
13961
diff
changeset
|
209 |
|
017c5462ed5e
patch 8.1.0013: using freed memory when changing terminal cursor color
Christian Brabandt <cb@256bit.org>
parents:
13961
diff
changeset
|
210 |
| 12502 | 211 /* |
|
13845
f22db93bd887
patch 8.0.1794: duplicate term options after renaming
Christian Brabandt <cb@256bit.org>
parents:
13835
diff
changeset
|
212 * Parse 'termwinsize' and set "rows" and "cols" for the terminal size in the |
|
13700
b28d679b1843
patch 8.0.1722: cannot specify a minimal size for a terminal window
Christian Brabandt <cb@256bit.org>
parents:
13696
diff
changeset
|
213 * current window. |
|
b28d679b1843
patch 8.0.1722: cannot specify a minimal size for a terminal window
Christian Brabandt <cb@256bit.org>
parents:
13696
diff
changeset
|
214 * Sets "rows" and/or "cols" to zero when it should follow the window size. |
|
b28d679b1843
patch 8.0.1722: cannot specify a minimal size for a terminal window
Christian Brabandt <cb@256bit.org>
parents:
13696
diff
changeset
|
215 * Return TRUE if the size is the minimum size: "24*80". |
|
b28d679b1843
patch 8.0.1722: cannot specify a minimal size for a terminal window
Christian Brabandt <cb@256bit.org>
parents:
13696
diff
changeset
|
216 */ |
|
b28d679b1843
patch 8.0.1722: cannot specify a minimal size for a terminal window
Christian Brabandt <cb@256bit.org>
parents:
13696
diff
changeset
|
217 static int |
|
13845
f22db93bd887
patch 8.0.1794: duplicate term options after renaming
Christian Brabandt <cb@256bit.org>
parents:
13835
diff
changeset
|
218 parse_termwinsize(win_T *wp, int *rows, int *cols) |
|
13700
b28d679b1843
patch 8.0.1722: cannot specify a minimal size for a terminal window
Christian Brabandt <cb@256bit.org>
parents:
13696
diff
changeset
|
219 { |
|
b28d679b1843
patch 8.0.1722: cannot specify a minimal size for a terminal window
Christian Brabandt <cb@256bit.org>
parents:
13696
diff
changeset
|
220 int minsize = FALSE; |
|
b28d679b1843
patch 8.0.1722: cannot specify a minimal size for a terminal window
Christian Brabandt <cb@256bit.org>
parents:
13696
diff
changeset
|
221 |
|
b28d679b1843
patch 8.0.1722: cannot specify a minimal size for a terminal window
Christian Brabandt <cb@256bit.org>
parents:
13696
diff
changeset
|
222 *rows = 0; |
|
b28d679b1843
patch 8.0.1722: cannot specify a minimal size for a terminal window
Christian Brabandt <cb@256bit.org>
parents:
13696
diff
changeset
|
223 *cols = 0; |
|
b28d679b1843
patch 8.0.1722: cannot specify a minimal size for a terminal window
Christian Brabandt <cb@256bit.org>
parents:
13696
diff
changeset
|
224 |
|
13742
a34b1323286c
patch 8.0.1743: terminal window options are named inconsistently
Christian Brabandt <cb@256bit.org>
parents:
13720
diff
changeset
|
225 if (*wp->w_p_tws != NUL) |
|
13700
b28d679b1843
patch 8.0.1722: cannot specify a minimal size for a terminal window
Christian Brabandt <cb@256bit.org>
parents:
13696
diff
changeset
|
226 { |
|
13742
a34b1323286c
patch 8.0.1743: terminal window options are named inconsistently
Christian Brabandt <cb@256bit.org>
parents:
13720
diff
changeset
|
227 char_u *p = vim_strchr(wp->w_p_tws, 'x'); |
|
13700
b28d679b1843
patch 8.0.1722: cannot specify a minimal size for a terminal window
Christian Brabandt <cb@256bit.org>
parents:
13696
diff
changeset
|
228 |
|
b28d679b1843
patch 8.0.1722: cannot specify a minimal size for a terminal window
Christian Brabandt <cb@256bit.org>
parents:
13696
diff
changeset
|
229 /* Syntax of value was already checked when it's set. */ |
|
b28d679b1843
patch 8.0.1722: cannot specify a minimal size for a terminal window
Christian Brabandt <cb@256bit.org>
parents:
13696
diff
changeset
|
230 if (p == NULL) |
|
b28d679b1843
patch 8.0.1722: cannot specify a minimal size for a terminal window
Christian Brabandt <cb@256bit.org>
parents:
13696
diff
changeset
|
231 { |
|
b28d679b1843
patch 8.0.1722: cannot specify a minimal size for a terminal window
Christian Brabandt <cb@256bit.org>
parents:
13696
diff
changeset
|
232 minsize = TRUE; |
|
13742
a34b1323286c
patch 8.0.1743: terminal window options are named inconsistently
Christian Brabandt <cb@256bit.org>
parents:
13720
diff
changeset
|
233 p = vim_strchr(wp->w_p_tws, '*'); |
|
13700
b28d679b1843
patch 8.0.1722: cannot specify a minimal size for a terminal window
Christian Brabandt <cb@256bit.org>
parents:
13696
diff
changeset
|
234 } |
|
13742
a34b1323286c
patch 8.0.1743: terminal window options are named inconsistently
Christian Brabandt <cb@256bit.org>
parents:
13720
diff
changeset
|
235 *rows = atoi((char *)wp->w_p_tws); |
|
13700
b28d679b1843
patch 8.0.1722: cannot specify a minimal size for a terminal window
Christian Brabandt <cb@256bit.org>
parents:
13696
diff
changeset
|
236 *cols = atoi((char *)p + 1); |
|
b28d679b1843
patch 8.0.1722: cannot specify a minimal size for a terminal window
Christian Brabandt <cb@256bit.org>
parents:
13696
diff
changeset
|
237 } |
|
b28d679b1843
patch 8.0.1722: cannot specify a minimal size for a terminal window
Christian Brabandt <cb@256bit.org>
parents:
13696
diff
changeset
|
238 return minsize; |
|
b28d679b1843
patch 8.0.1722: cannot specify a minimal size for a terminal window
Christian Brabandt <cb@256bit.org>
parents:
13696
diff
changeset
|
239 } |
|
b28d679b1843
patch 8.0.1722: cannot specify a minimal size for a terminal window
Christian Brabandt <cb@256bit.org>
parents:
13696
diff
changeset
|
240 |
|
b28d679b1843
patch 8.0.1722: cannot specify a minimal size for a terminal window
Christian Brabandt <cb@256bit.org>
parents:
13696
diff
changeset
|
241 /* |
|
13845
f22db93bd887
patch 8.0.1794: duplicate term options after renaming
Christian Brabandt <cb@256bit.org>
parents:
13835
diff
changeset
|
242 * Determine the terminal size from 'termwinsize' and the current window. |
| 12502 | 243 */ |
| 244 static void | |
| 245 set_term_and_win_size(term_T *term) | |
| 246 { | |
|
13470
6faef782f50b
patch 8.0.1609: shell commands in the GUI use a dumb terminal
Christian Brabandt <cb@256bit.org>
parents:
13458
diff
changeset
|
247 #ifdef FEAT_GUI |
|
6faef782f50b
patch 8.0.1609: shell commands in the GUI use a dumb terminal
Christian Brabandt <cb@256bit.org>
parents:
13458
diff
changeset
|
248 if (term->tl_system) |
|
6faef782f50b
patch 8.0.1609: shell commands in the GUI use a dumb terminal
Christian Brabandt <cb@256bit.org>
parents:
13458
diff
changeset
|
249 { |
|
6faef782f50b
patch 8.0.1609: shell commands in the GUI use a dumb terminal
Christian Brabandt <cb@256bit.org>
parents:
13458
diff
changeset
|
250 /* Use the whole screen for the system command. However, it will start |
|
6faef782f50b
patch 8.0.1609: shell commands in the GUI use a dumb terminal
Christian Brabandt <cb@256bit.org>
parents:
13458
diff
changeset
|
251 * at the command line and scroll up as needed, using tl_toprow. */ |
|
6faef782f50b
patch 8.0.1609: shell commands in the GUI use a dumb terminal
Christian Brabandt <cb@256bit.org>
parents:
13458
diff
changeset
|
252 term->tl_rows = Rows; |
|
6faef782f50b
patch 8.0.1609: shell commands in the GUI use a dumb terminal
Christian Brabandt <cb@256bit.org>
parents:
13458
diff
changeset
|
253 term->tl_cols = Columns; |
|
13624
429f0eb87d6f
patch 8.0.1684: ml_get errors when using terminal window for shell command
Christian Brabandt <cb@256bit.org>
parents:
13616
diff
changeset
|
254 return; |
|
13470
6faef782f50b
patch 8.0.1609: shell commands in the GUI use a dumb terminal
Christian Brabandt <cb@256bit.org>
parents:
13458
diff
changeset
|
255 } |
|
6faef782f50b
patch 8.0.1609: shell commands in the GUI use a dumb terminal
Christian Brabandt <cb@256bit.org>
parents:
13458
diff
changeset
|
256 #endif |
|
13845
f22db93bd887
patch 8.0.1794: duplicate term options after renaming
Christian Brabandt <cb@256bit.org>
parents:
13835
diff
changeset
|
257 if (parse_termwinsize(curwin, &term->tl_rows, &term->tl_cols)) |
| 12502 | 258 { |
|
13700
b28d679b1843
patch 8.0.1722: cannot specify a minimal size for a terminal window
Christian Brabandt <cb@256bit.org>
parents:
13696
diff
changeset
|
259 if (term->tl_rows != 0) |
|
b28d679b1843
patch 8.0.1722: cannot specify a minimal size for a terminal window
Christian Brabandt <cb@256bit.org>
parents:
13696
diff
changeset
|
260 term->tl_rows = MAX(term->tl_rows, curwin->w_height); |
|
b28d679b1843
patch 8.0.1722: cannot specify a minimal size for a terminal window
Christian Brabandt <cb@256bit.org>
parents:
13696
diff
changeset
|
261 if (term->tl_cols != 0) |
|
b28d679b1843
patch 8.0.1722: cannot specify a minimal size for a terminal window
Christian Brabandt <cb@256bit.org>
parents:
13696
diff
changeset
|
262 term->tl_cols = MAX(term->tl_cols, curwin->w_width); |
| 12502 | 263 } |
| 264 if (term->tl_rows == 0) | |
| 265 term->tl_rows = curwin->w_height; | |
| 266 else | |
| 267 win_setheight_win(term->tl_rows, curwin); | |
| 268 if (term->tl_cols == 0) | |
| 269 term->tl_cols = curwin->w_width; | |
| 270 else | |
| 271 win_setwidth_win(term->tl_cols, curwin); | |
| 272 } | |
| 273 | |
| 274 /* | |
| 275 * Initialize job options for a terminal job. | |
| 276 * Caller may overrule some of them. | |
| 277 */ | |
|
13470
6faef782f50b
patch 8.0.1609: shell commands in the GUI use a dumb terminal
Christian Brabandt <cb@256bit.org>
parents:
13458
diff
changeset
|
278 void |
| 12502 | 279 init_job_options(jobopt_T *opt) |
| 280 { | |
| 281 clear_job_options(opt); | |
| 282 | |
| 283 opt->jo_mode = MODE_RAW; | |
| 284 opt->jo_out_mode = MODE_RAW; | |
| 285 opt->jo_err_mode = MODE_RAW; | |
| 286 opt->jo_set = JO_MODE | JO_OUT_MODE | JO_ERR_MODE; | |
| 287 } | |
| 288 | |
| 289 /* | |
| 290 * Set job options mandatory for a terminal job. | |
| 291 */ | |
| 292 static void | |
| 293 setup_job_options(jobopt_T *opt, int rows, int cols) | |
| 294 { | |
|
13860
7f892e37b017
patch 8.0.1801: MS-Windows: redirecting terminal output does not work
Christian Brabandt <cb@256bit.org>
parents:
13851
diff
changeset
|
295 #ifndef WIN3264 |
|
7f892e37b017
patch 8.0.1801: MS-Windows: redirecting terminal output does not work
Christian Brabandt <cb@256bit.org>
parents:
13851
diff
changeset
|
296 /* Win32: Redirecting the job output won't work, thus always connect stdout |
|
7f892e37b017
patch 8.0.1801: MS-Windows: redirecting terminal output does not work
Christian Brabandt <cb@256bit.org>
parents:
13851
diff
changeset
|
297 * here. */ |
| 12502 | 298 if (!(opt->jo_set & JO_OUT_IO)) |
|
13860
7f892e37b017
patch 8.0.1801: MS-Windows: redirecting terminal output does not work
Christian Brabandt <cb@256bit.org>
parents:
13851
diff
changeset
|
299 #endif |
| 12502 | 300 { |
| 301 /* Connect stdout to the terminal. */ | |
| 302 opt->jo_io[PART_OUT] = JIO_BUFFER; | |
| 303 opt->jo_io_buf[PART_OUT] = curbuf->b_fnum; | |
| 304 opt->jo_modifiable[PART_OUT] = 0; | |
| 305 opt->jo_set |= JO_OUT_IO + JO_OUT_BUF + JO_OUT_MODIFIABLE; | |
| 306 } | |
| 307 | |
|
13860
7f892e37b017
patch 8.0.1801: MS-Windows: redirecting terminal output does not work
Christian Brabandt <cb@256bit.org>
parents:
13851
diff
changeset
|
308 #ifndef WIN3264 |
|
7f892e37b017
patch 8.0.1801: MS-Windows: redirecting terminal output does not work
Christian Brabandt <cb@256bit.org>
parents:
13851
diff
changeset
|
309 /* Win32: Redirecting the job output won't work, thus always connect stderr |
|
7f892e37b017
patch 8.0.1801: MS-Windows: redirecting terminal output does not work
Christian Brabandt <cb@256bit.org>
parents:
13851
diff
changeset
|
310 * here. */ |
| 12502 | 311 if (!(opt->jo_set & JO_ERR_IO)) |
|
13860
7f892e37b017
patch 8.0.1801: MS-Windows: redirecting terminal output does not work
Christian Brabandt <cb@256bit.org>
parents:
13851
diff
changeset
|
312 #endif |
| 12502 | 313 { |
| 314 /* Connect stderr to the terminal. */ | |
| 315 opt->jo_io[PART_ERR] = JIO_BUFFER; | |
| 316 opt->jo_io_buf[PART_ERR] = curbuf->b_fnum; | |
| 317 opt->jo_modifiable[PART_ERR] = 0; | |
| 318 opt->jo_set |= JO_ERR_IO + JO_ERR_BUF + JO_ERR_MODIFIABLE; | |
| 319 } | |
| 320 | |
| 321 opt->jo_pty = TRUE; | |
| 322 if ((opt->jo_set2 & JO2_TERM_ROWS) == 0) | |
| 323 opt->jo_term_rows = rows; | |
| 324 if ((opt->jo_set2 & JO2_TERM_COLS) == 0) | |
| 325 opt->jo_term_cols = cols; | |
| 326 } | |
| 327 | |
| 328 /* | |
|
13298
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
329 * Close a terminal buffer (and its window). Used when creating the terminal |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
330 * fails. |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
331 */ |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
332 static void |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
333 term_close_buffer(buf_T *buf, buf_T *old_curbuf) |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
334 { |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
335 free_terminal(buf); |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
336 if (old_curbuf != NULL) |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
337 { |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
338 --curbuf->b_nwindows; |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
339 curbuf = old_curbuf; |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
340 curwin->w_buffer = curbuf; |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
341 ++curbuf->b_nwindows; |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
342 } |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
343 |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
344 /* Wiping out the buffer will also close the window and call |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
345 * free_terminal(). */ |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
346 do_buffer(DOBUF_WIPE, DOBUF_FIRST, FORWARD, buf->b_fnum, TRUE); |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
347 } |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
348 |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
349 /* |
| 12502 | 350 * Start a terminal window and return its buffer. |
|
13470
6faef782f50b
patch 8.0.1609: shell commands in the GUI use a dumb terminal
Christian Brabandt <cb@256bit.org>
parents:
13458
diff
changeset
|
351 * Use either "argvar" or "argv", the other must be NULL. |
|
6faef782f50b
patch 8.0.1609: shell commands in the GUI use a dumb terminal
Christian Brabandt <cb@256bit.org>
parents:
13458
diff
changeset
|
352 * When "flags" has TERM_START_NOJOB only create the buffer, b_term and open |
|
6faef782f50b
patch 8.0.1609: shell commands in the GUI use a dumb terminal
Christian Brabandt <cb@256bit.org>
parents:
13458
diff
changeset
|
353 * the window. |
| 12502 | 354 * Returns NULL when failed. |
| 355 */ | |
|
13470
6faef782f50b
patch 8.0.1609: shell commands in the GUI use a dumb terminal
Christian Brabandt <cb@256bit.org>
parents:
13458
diff
changeset
|
356 buf_T * |
|
6faef782f50b
patch 8.0.1609: shell commands in the GUI use a dumb terminal
Christian Brabandt <cb@256bit.org>
parents:
13458
diff
changeset
|
357 term_start( |
|
6faef782f50b
patch 8.0.1609: shell commands in the GUI use a dumb terminal
Christian Brabandt <cb@256bit.org>
parents:
13458
diff
changeset
|
358 typval_T *argvar, |
|
6faef782f50b
patch 8.0.1609: shell commands in the GUI use a dumb terminal
Christian Brabandt <cb@256bit.org>
parents:
13458
diff
changeset
|
359 char **argv, |
|
6faef782f50b
patch 8.0.1609: shell commands in the GUI use a dumb terminal
Christian Brabandt <cb@256bit.org>
parents:
13458
diff
changeset
|
360 jobopt_T *opt, |
|
6faef782f50b
patch 8.0.1609: shell commands in the GUI use a dumb terminal
Christian Brabandt <cb@256bit.org>
parents:
13458
diff
changeset
|
361 int flags) |
| 12502 | 362 { |
| 363 exarg_T split_ea; | |
| 364 win_T *old_curwin = curwin; | |
| 365 term_T *term; | |
| 366 buf_T *old_curbuf = NULL; | |
| 367 int res; | |
| 368 buf_T *newbuf; | |
|
13501
a4a559e08798
patch 8.0.1624: options for term_dumpdiff() and term_dumpload() not implemented
Christian Brabandt <cb@256bit.org>
parents:
13483
diff
changeset
|
369 int vertical = opt->jo_vertical || (cmdmod.split & WSP_VERT); |
|
13860
7f892e37b017
patch 8.0.1801: MS-Windows: redirecting terminal output does not work
Christian Brabandt <cb@256bit.org>
parents:
13851
diff
changeset
|
370 jobopt_T orig_opt; // only partly filled |
| 12502 | 371 |
| 372 if (check_restricted() || check_secure()) | |
| 373 return NULL; | |
| 374 | |
| 375 if ((opt->jo_set & (JO_IN_IO + JO_OUT_IO + JO_ERR_IO)) | |
| 376 == (JO_IN_IO + JO_OUT_IO + JO_ERR_IO) | |
| 377 || (!(opt->jo_set & JO_OUT_IO) && (opt->jo_set & JO_OUT_BUF)) | |
| 378 || (!(opt->jo_set & JO_ERR_IO) && (opt->jo_set & JO_ERR_BUF))) | |
| 379 { | |
| 380 EMSG(_(e_invarg)); | |
| 381 return NULL; | |
| 382 } | |
| 383 | |
| 384 term = (term_T *)alloc_clear(sizeof(term_T)); | |
| 385 if (term == NULL) | |
| 386 return NULL; | |
| 387 term->tl_dirty_row_end = MAX_ROW; | |
| 388 term->tl_cursor_visible = TRUE; | |
| 389 term->tl_cursor_shape = VTERM_PROP_CURSORSHAPE_BLOCK; | |
| 390 term->tl_finish = opt->jo_term_finish; | |
|
13470
6faef782f50b
patch 8.0.1609: shell commands in the GUI use a dumb terminal
Christian Brabandt <cb@256bit.org>
parents:
13458
diff
changeset
|
391 #ifdef FEAT_GUI |
|
6faef782f50b
patch 8.0.1609: shell commands in the GUI use a dumb terminal
Christian Brabandt <cb@256bit.org>
parents:
13458
diff
changeset
|
392 term->tl_system = (flags & TERM_START_SYSTEM); |
|
6faef782f50b
patch 8.0.1609: shell commands in the GUI use a dumb terminal
Christian Brabandt <cb@256bit.org>
parents:
13458
diff
changeset
|
393 #endif |
| 12502 | 394 ga_init2(&term->tl_scrollback, sizeof(sb_line_T), 300); |
| 395 | |
| 396 vim_memset(&split_ea, 0, sizeof(split_ea)); | |
| 397 if (opt->jo_curwin) | |
| 398 { | |
| 399 /* Create a new buffer in the current window. */ | |
|
13470
6faef782f50b
patch 8.0.1609: shell commands in the GUI use a dumb terminal
Christian Brabandt <cb@256bit.org>
parents:
13458
diff
changeset
|
400 if (!can_abandon(curbuf, flags & TERM_START_FORCEIT)) |
| 12502 | 401 { |
| 402 no_write_message(); | |
| 403 vim_free(term); | |
| 404 return NULL; | |
| 405 } | |
| 406 if (do_ecmd(0, NULL, NULL, &split_ea, ECMD_ONE, | |
|
13470
6faef782f50b
patch 8.0.1609: shell commands in the GUI use a dumb terminal
Christian Brabandt <cb@256bit.org>
parents:
13458
diff
changeset
|
407 ECMD_HIDE |
|
6faef782f50b
patch 8.0.1609: shell commands in the GUI use a dumb terminal
Christian Brabandt <cb@256bit.org>
parents:
13458
diff
changeset
|
408 + ((flags & TERM_START_FORCEIT) ? ECMD_FORCEIT : 0), |
|
6faef782f50b
patch 8.0.1609: shell commands in the GUI use a dumb terminal
Christian Brabandt <cb@256bit.org>
parents:
13458
diff
changeset
|
409 curwin) == FAIL) |
| 12502 | 410 { |
| 411 vim_free(term); | |
| 412 return NULL; | |
| 413 } | |
| 414 } | |
|
13470
6faef782f50b
patch 8.0.1609: shell commands in the GUI use a dumb terminal
Christian Brabandt <cb@256bit.org>
parents:
13458
diff
changeset
|
415 else if (opt->jo_hidden || (flags & TERM_START_SYSTEM)) |
| 12502 | 416 { |
| 417 buf_T *buf; | |
| 418 | |
| 419 /* Create a new buffer without a window. Make it the current buffer for | |
| 420 * a moment to be able to do the initialisations. */ | |
| 421 buf = buflist_new((char_u *)"", NULL, (linenr_T)0, | |
| 422 BLN_NEW | BLN_LISTED); | |
| 423 if (buf == NULL || ml_open(buf) == FAIL) | |
| 424 { | |
| 425 vim_free(term); | |
| 426 return NULL; | |
| 427 } | |
| 428 old_curbuf = curbuf; | |
| 429 --curbuf->b_nwindows; | |
| 430 curbuf = buf; | |
| 431 curwin->w_buffer = buf; | |
| 432 ++curbuf->b_nwindows; | |
| 433 } | |
| 434 else | |
| 435 { | |
| 436 /* Open a new window or tab. */ | |
| 437 split_ea.cmdidx = CMD_new; | |
| 438 split_ea.cmd = (char_u *)"new"; | |
| 439 split_ea.arg = (char_u *)""; | |
|
13501
a4a559e08798
patch 8.0.1624: options for term_dumpdiff() and term_dumpload() not implemented
Christian Brabandt <cb@256bit.org>
parents:
13483
diff
changeset
|
440 if (opt->jo_term_rows > 0 && !vertical) |
| 12502 | 441 { |
| 442 split_ea.line2 = opt->jo_term_rows; | |
| 443 split_ea.addr_count = 1; | |
| 444 } | |
|
13501
a4a559e08798
patch 8.0.1624: options for term_dumpdiff() and term_dumpload() not implemented
Christian Brabandt <cb@256bit.org>
parents:
13483
diff
changeset
|
445 if (opt->jo_term_cols > 0 && vertical) |
| 12502 | 446 { |
| 447 split_ea.line2 = opt->jo_term_cols; | |
| 448 split_ea.addr_count = 1; | |
| 449 } | |
| 450 | |
|
13501
a4a559e08798
patch 8.0.1624: options for term_dumpdiff() and term_dumpload() not implemented
Christian Brabandt <cb@256bit.org>
parents:
13483
diff
changeset
|
451 if (vertical) |
|
a4a559e08798
patch 8.0.1624: options for term_dumpdiff() and term_dumpload() not implemented
Christian Brabandt <cb@256bit.org>
parents:
13483
diff
changeset
|
452 cmdmod.split |= WSP_VERT; |
| 12502 | 453 ex_splitview(&split_ea); |
| 454 if (curwin == old_curwin) | |
| 455 { | |
| 456 /* split failed */ | |
| 457 vim_free(term); | |
| 458 return NULL; | |
| 459 } | |
| 460 } | |
| 461 term->tl_buffer = curbuf; | |
| 462 curbuf->b_term = term; | |
| 463 | |
| 464 if (!opt->jo_hidden) | |
| 465 { | |
|
13304
013c44d9dc09
patch 8.0.1526: no test using a screen dump yet
Christian Brabandt <cb@256bit.org>
parents:
13300
diff
changeset
|
466 /* Only one size was taken care of with :new, do the other one. With |
|
013c44d9dc09
patch 8.0.1526: no test using a screen dump yet
Christian Brabandt <cb@256bit.org>
parents:
13300
diff
changeset
|
467 * "curwin" both need to be done. */ |
|
13501
a4a559e08798
patch 8.0.1624: options for term_dumpdiff() and term_dumpload() not implemented
Christian Brabandt <cb@256bit.org>
parents:
13483
diff
changeset
|
468 if (opt->jo_term_rows > 0 && (opt->jo_curwin || vertical)) |
| 12502 | 469 win_setheight(opt->jo_term_rows); |
|
13501
a4a559e08798
patch 8.0.1624: options for term_dumpdiff() and term_dumpload() not implemented
Christian Brabandt <cb@256bit.org>
parents:
13483
diff
changeset
|
470 if (opt->jo_term_cols > 0 && (opt->jo_curwin || !vertical)) |
| 12502 | 471 win_setwidth(opt->jo_term_cols); |
| 472 } | |
| 473 | |
| 474 /* Link the new terminal in the list of active terminals. */ | |
| 475 term->tl_next = first_term; | |
| 476 first_term = term; | |
| 477 | |
| 478 if (opt->jo_term_name != NULL) | |
| 479 curbuf->b_ffname = vim_strsave(opt->jo_term_name); | |
|
13470
6faef782f50b
patch 8.0.1609: shell commands in the GUI use a dumb terminal
Christian Brabandt <cb@256bit.org>
parents:
13458
diff
changeset
|
480 else if (argv != NULL) |
|
6faef782f50b
patch 8.0.1609: shell commands in the GUI use a dumb terminal
Christian Brabandt <cb@256bit.org>
parents:
13458
diff
changeset
|
481 curbuf->b_ffname = vim_strsave((char_u *)"!system"); |
| 12502 | 482 else |
| 483 { | |
| 484 int i; | |
| 485 size_t len; | |
| 486 char_u *cmd, *p; | |
| 487 | |
| 488 if (argvar->v_type == VAR_STRING) | |
| 489 { | |
| 490 cmd = argvar->vval.v_string; | |
| 491 if (cmd == NULL) | |
| 492 cmd = (char_u *)""; | |
| 493 else if (STRCMP(cmd, "NONE") == 0) | |
| 494 cmd = (char_u *)"pty"; | |
| 495 } | |
| 496 else if (argvar->v_type != VAR_LIST | |
| 497 || argvar->vval.v_list == NULL | |
| 498 || argvar->vval.v_list->lv_len < 1 | |
| 499 || (cmd = get_tv_string_chk( | |
| 500 &argvar->vval.v_list->lv_first->li_tv)) == NULL) | |
| 501 cmd = (char_u*)""; | |
| 502 | |
| 503 len = STRLEN(cmd) + 10; | |
| 504 p = alloc((int)len); | |
| 505 | |
| 506 for (i = 0; p != NULL; ++i) | |
| 507 { | |
| 508 /* Prepend a ! to the command name to avoid the buffer name equals | |
| 509 * the executable, otherwise ":w!" would overwrite it. */ | |
| 510 if (i == 0) | |
| 511 vim_snprintf((char *)p, len, "!%s", cmd); | |
| 512 else | |
| 513 vim_snprintf((char *)p, len, "!%s (%d)", cmd, i); | |
| 514 if (buflist_findname(p) == NULL) | |
| 515 { | |
| 516 vim_free(curbuf->b_ffname); | |
| 517 curbuf->b_ffname = p; | |
| 518 break; | |
| 519 } | |
| 520 } | |
| 521 } | |
| 522 curbuf->b_fname = curbuf->b_ffname; | |
| 523 | |
| 524 if (opt->jo_term_opencmd != NULL) | |
| 525 term->tl_opencmd = vim_strsave(opt->jo_term_opencmd); | |
| 526 | |
| 527 if (opt->jo_eof_chars != NULL) | |
| 528 term->tl_eof_chars = vim_strsave(opt->jo_eof_chars); | |
| 529 | |
| 530 set_string_option_direct((char_u *)"buftype", -1, | |
| 531 (char_u *)"terminal", OPT_FREE|OPT_LOCAL, 0); | |
|
14449
5faab0545f3c
patch 8.1.0238: 'buftype' is cleared when using ":term ++hidden cat"
Christian Brabandt <cb@256bit.org>
parents:
14311
diff
changeset
|
532 // Avoid that 'buftype' is reset when this buffer is entered. |
|
5faab0545f3c
patch 8.1.0238: 'buftype' is cleared when using ":term ++hidden cat"
Christian Brabandt <cb@256bit.org>
parents:
14311
diff
changeset
|
533 curbuf->b_p_initialized = TRUE; |
| 12502 | 534 |
| 535 /* Mark the buffer as not modifiable. It can only be made modifiable after | |
| 536 * the job finished. */ | |
| 537 curbuf->b_p_ma = FALSE; | |
| 538 | |
| 539 set_term_and_win_size(term); | |
|
13860
7f892e37b017
patch 8.0.1801: MS-Windows: redirecting terminal output does not work
Christian Brabandt <cb@256bit.org>
parents:
13851
diff
changeset
|
540 #ifdef WIN3264 |
|
7f892e37b017
patch 8.0.1801: MS-Windows: redirecting terminal output does not work
Christian Brabandt <cb@256bit.org>
parents:
13851
diff
changeset
|
541 mch_memmove(orig_opt.jo_io, opt->jo_io, sizeof(orig_opt.jo_io)); |
|
7f892e37b017
patch 8.0.1801: MS-Windows: redirecting terminal output does not work
Christian Brabandt <cb@256bit.org>
parents:
13851
diff
changeset
|
542 #endif |
| 12502 | 543 setup_job_options(opt, term->tl_rows, term->tl_cols); |
| 544 | |
|
13470
6faef782f50b
patch 8.0.1609: shell commands in the GUI use a dumb terminal
Christian Brabandt <cb@256bit.org>
parents:
13458
diff
changeset
|
545 if (flags & TERM_START_NOJOB) |
|
13298
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
546 return curbuf; |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
547 |
|
13435
fa198b71bab2
patch 8.0.1592: terminal windows in a session are not properly restored
Christian Brabandt <cb@256bit.org>
parents:
13380
diff
changeset
|
548 #if defined(FEAT_SESSION) |
|
fa198b71bab2
patch 8.0.1592: terminal windows in a session are not properly restored
Christian Brabandt <cb@256bit.org>
parents:
13380
diff
changeset
|
549 /* Remember the command for the session file. */ |
|
13470
6faef782f50b
patch 8.0.1609: shell commands in the GUI use a dumb terminal
Christian Brabandt <cb@256bit.org>
parents:
13458
diff
changeset
|
550 if (opt->jo_term_norestore || argv != NULL) |
|
13435
fa198b71bab2
patch 8.0.1592: terminal windows in a session are not properly restored
Christian Brabandt <cb@256bit.org>
parents:
13380
diff
changeset
|
551 { |
|
fa198b71bab2
patch 8.0.1592: terminal windows in a session are not properly restored
Christian Brabandt <cb@256bit.org>
parents:
13380
diff
changeset
|
552 term->tl_command = vim_strsave((char_u *)"NONE"); |
|
fa198b71bab2
patch 8.0.1592: terminal windows in a session are not properly restored
Christian Brabandt <cb@256bit.org>
parents:
13380
diff
changeset
|
553 } |
|
fa198b71bab2
patch 8.0.1592: terminal windows in a session are not properly restored
Christian Brabandt <cb@256bit.org>
parents:
13380
diff
changeset
|
554 else if (argvar->v_type == VAR_STRING) |
|
fa198b71bab2
patch 8.0.1592: terminal windows in a session are not properly restored
Christian Brabandt <cb@256bit.org>
parents:
13380
diff
changeset
|
555 { |
|
fa198b71bab2
patch 8.0.1592: terminal windows in a session are not properly restored
Christian Brabandt <cb@256bit.org>
parents:
13380
diff
changeset
|
556 char_u *cmd = argvar->vval.v_string; |
|
fa198b71bab2
patch 8.0.1592: terminal windows in a session are not properly restored
Christian Brabandt <cb@256bit.org>
parents:
13380
diff
changeset
|
557 |
|
fa198b71bab2
patch 8.0.1592: terminal windows in a session are not properly restored
Christian Brabandt <cb@256bit.org>
parents:
13380
diff
changeset
|
558 if (cmd != NULL && STRCMP(cmd, p_sh) != 0) |
|
fa198b71bab2
patch 8.0.1592: terminal windows in a session are not properly restored
Christian Brabandt <cb@256bit.org>
parents:
13380
diff
changeset
|
559 term->tl_command = vim_strsave(cmd); |
|
fa198b71bab2
patch 8.0.1592: terminal windows in a session are not properly restored
Christian Brabandt <cb@256bit.org>
parents:
13380
diff
changeset
|
560 } |
|
fa198b71bab2
patch 8.0.1592: terminal windows in a session are not properly restored
Christian Brabandt <cb@256bit.org>
parents:
13380
diff
changeset
|
561 else if (argvar->v_type == VAR_LIST |
|
fa198b71bab2
patch 8.0.1592: terminal windows in a session are not properly restored
Christian Brabandt <cb@256bit.org>
parents:
13380
diff
changeset
|
562 && argvar->vval.v_list != NULL |
|
fa198b71bab2
patch 8.0.1592: terminal windows in a session are not properly restored
Christian Brabandt <cb@256bit.org>
parents:
13380
diff
changeset
|
563 && argvar->vval.v_list->lv_len > 0) |
|
fa198b71bab2
patch 8.0.1592: terminal windows in a session are not properly restored
Christian Brabandt <cb@256bit.org>
parents:
13380
diff
changeset
|
564 { |
|
fa198b71bab2
patch 8.0.1592: terminal windows in a session are not properly restored
Christian Brabandt <cb@256bit.org>
parents:
13380
diff
changeset
|
565 garray_T ga; |
|
fa198b71bab2
patch 8.0.1592: terminal windows in a session are not properly restored
Christian Brabandt <cb@256bit.org>
parents:
13380
diff
changeset
|
566 listitem_T *item; |
|
fa198b71bab2
patch 8.0.1592: terminal windows in a session are not properly restored
Christian Brabandt <cb@256bit.org>
parents:
13380
diff
changeset
|
567 |
|
fa198b71bab2
patch 8.0.1592: terminal windows in a session are not properly restored
Christian Brabandt <cb@256bit.org>
parents:
13380
diff
changeset
|
568 ga_init2(&ga, 1, 100); |
|
fa198b71bab2
patch 8.0.1592: terminal windows in a session are not properly restored
Christian Brabandt <cb@256bit.org>
parents:
13380
diff
changeset
|
569 for (item = argvar->vval.v_list->lv_first; |
|
fa198b71bab2
patch 8.0.1592: terminal windows in a session are not properly restored
Christian Brabandt <cb@256bit.org>
parents:
13380
diff
changeset
|
570 item != NULL; item = item->li_next) |
|
fa198b71bab2
patch 8.0.1592: terminal windows in a session are not properly restored
Christian Brabandt <cb@256bit.org>
parents:
13380
diff
changeset
|
571 { |
|
fa198b71bab2
patch 8.0.1592: terminal windows in a session are not properly restored
Christian Brabandt <cb@256bit.org>
parents:
13380
diff
changeset
|
572 char_u *s = get_tv_string_chk(&item->li_tv); |
|
fa198b71bab2
patch 8.0.1592: terminal windows in a session are not properly restored
Christian Brabandt <cb@256bit.org>
parents:
13380
diff
changeset
|
573 char_u *p; |
|
fa198b71bab2
patch 8.0.1592: terminal windows in a session are not properly restored
Christian Brabandt <cb@256bit.org>
parents:
13380
diff
changeset
|
574 |
|
fa198b71bab2
patch 8.0.1592: terminal windows in a session are not properly restored
Christian Brabandt <cb@256bit.org>
parents:
13380
diff
changeset
|
575 if (s == NULL) |
|
fa198b71bab2
patch 8.0.1592: terminal windows in a session are not properly restored
Christian Brabandt <cb@256bit.org>
parents:
13380
diff
changeset
|
576 break; |
|
fa198b71bab2
patch 8.0.1592: terminal windows in a session are not properly restored
Christian Brabandt <cb@256bit.org>
parents:
13380
diff
changeset
|
577 p = vim_strsave_fnameescape(s, FALSE); |
|
fa198b71bab2
patch 8.0.1592: terminal windows in a session are not properly restored
Christian Brabandt <cb@256bit.org>
parents:
13380
diff
changeset
|
578 if (p == NULL) |
|
fa198b71bab2
patch 8.0.1592: terminal windows in a session are not properly restored
Christian Brabandt <cb@256bit.org>
parents:
13380
diff
changeset
|
579 break; |
|
fa198b71bab2
patch 8.0.1592: terminal windows in a session are not properly restored
Christian Brabandt <cb@256bit.org>
parents:
13380
diff
changeset
|
580 ga_concat(&ga, p); |
|
fa198b71bab2
patch 8.0.1592: terminal windows in a session are not properly restored
Christian Brabandt <cb@256bit.org>
parents:
13380
diff
changeset
|
581 vim_free(p); |
|
fa198b71bab2
patch 8.0.1592: terminal windows in a session are not properly restored
Christian Brabandt <cb@256bit.org>
parents:
13380
diff
changeset
|
582 ga_append(&ga, ' '); |
|
fa198b71bab2
patch 8.0.1592: terminal windows in a session are not properly restored
Christian Brabandt <cb@256bit.org>
parents:
13380
diff
changeset
|
583 } |
|
fa198b71bab2
patch 8.0.1592: terminal windows in a session are not properly restored
Christian Brabandt <cb@256bit.org>
parents:
13380
diff
changeset
|
584 if (item == NULL) |
|
fa198b71bab2
patch 8.0.1592: terminal windows in a session are not properly restored
Christian Brabandt <cb@256bit.org>
parents:
13380
diff
changeset
|
585 { |
|
fa198b71bab2
patch 8.0.1592: terminal windows in a session are not properly restored
Christian Brabandt <cb@256bit.org>
parents:
13380
diff
changeset
|
586 ga_append(&ga, NUL); |
|
fa198b71bab2
patch 8.0.1592: terminal windows in a session are not properly restored
Christian Brabandt <cb@256bit.org>
parents:
13380
diff
changeset
|
587 term->tl_command = ga.ga_data; |
|
fa198b71bab2
patch 8.0.1592: terminal windows in a session are not properly restored
Christian Brabandt <cb@256bit.org>
parents:
13380
diff
changeset
|
588 } |
|
fa198b71bab2
patch 8.0.1592: terminal windows in a session are not properly restored
Christian Brabandt <cb@256bit.org>
parents:
13380
diff
changeset
|
589 else |
|
fa198b71bab2
patch 8.0.1592: terminal windows in a session are not properly restored
Christian Brabandt <cb@256bit.org>
parents:
13380
diff
changeset
|
590 ga_clear(&ga); |
|
fa198b71bab2
patch 8.0.1592: terminal windows in a session are not properly restored
Christian Brabandt <cb@256bit.org>
parents:
13380
diff
changeset
|
591 } |
|
fa198b71bab2
patch 8.0.1592: terminal windows in a session are not properly restored
Christian Brabandt <cb@256bit.org>
parents:
13380
diff
changeset
|
592 #endif |
|
fa198b71bab2
patch 8.0.1592: terminal windows in a session are not properly restored
Christian Brabandt <cb@256bit.org>
parents:
13380
diff
changeset
|
593 |
|
13438
33eea5ce5415
patch 8.0.1593: :qall never exits with an active terminal window
Christian Brabandt <cb@256bit.org>
parents:
13435
diff
changeset
|
594 if (opt->jo_term_kill != NULL) |
|
33eea5ce5415
patch 8.0.1593: :qall never exits with an active terminal window
Christian Brabandt <cb@256bit.org>
parents:
13435
diff
changeset
|
595 { |
|
33eea5ce5415
patch 8.0.1593: :qall never exits with an active terminal window
Christian Brabandt <cb@256bit.org>
parents:
13435
diff
changeset
|
596 char_u *p = skiptowhite(opt->jo_term_kill); |
|
33eea5ce5415
patch 8.0.1593: :qall never exits with an active terminal window
Christian Brabandt <cb@256bit.org>
parents:
13435
diff
changeset
|
597 |
|
33eea5ce5415
patch 8.0.1593: :qall never exits with an active terminal window
Christian Brabandt <cb@256bit.org>
parents:
13435
diff
changeset
|
598 term->tl_kill = vim_strnsave(opt->jo_term_kill, p - opt->jo_term_kill); |
|
33eea5ce5415
patch 8.0.1593: :qall never exits with an active terminal window
Christian Brabandt <cb@256bit.org>
parents:
13435
diff
changeset
|
599 } |
|
33eea5ce5415
patch 8.0.1593: :qall never exits with an active terminal window
Christian Brabandt <cb@256bit.org>
parents:
13435
diff
changeset
|
600 |
| 12502 | 601 /* System dependent: setup the vterm and maybe start the job in it. */ |
|
13470
6faef782f50b
patch 8.0.1609: shell commands in the GUI use a dumb terminal
Christian Brabandt <cb@256bit.org>
parents:
13458
diff
changeset
|
602 if (argv == NULL |
|
6faef782f50b
patch 8.0.1609: shell commands in the GUI use a dumb terminal
Christian Brabandt <cb@256bit.org>
parents:
13458
diff
changeset
|
603 && argvar->v_type == VAR_STRING |
| 12502 | 604 && argvar->vval.v_string != NULL |
| 605 && STRCMP(argvar->vval.v_string, "NONE") == 0) | |
| 606 res = create_pty_only(term, opt); | |
| 607 else | |
|
13860
7f892e37b017
patch 8.0.1801: MS-Windows: redirecting terminal output does not work
Christian Brabandt <cb@256bit.org>
parents:
13851
diff
changeset
|
608 res = term_and_job_init(term, argvar, argv, opt, &orig_opt); |
| 12502 | 609 |
| 610 newbuf = curbuf; | |
| 611 if (res == OK) | |
| 612 { | |
| 613 /* Get and remember the size we ended up with. Update the pty. */ | |
| 614 vterm_get_size(term->tl_vterm, &term->tl_rows, &term->tl_cols); | |
| 615 term_report_winsize(term, term->tl_rows, term->tl_cols); | |
|
13470
6faef782f50b
patch 8.0.1609: shell commands in the GUI use a dumb terminal
Christian Brabandt <cb@256bit.org>
parents:
13458
diff
changeset
|
616 #ifdef FEAT_GUI |
|
6faef782f50b
patch 8.0.1609: shell commands in the GUI use a dumb terminal
Christian Brabandt <cb@256bit.org>
parents:
13458
diff
changeset
|
617 if (term->tl_system) |
|
6faef782f50b
patch 8.0.1609: shell commands in the GUI use a dumb terminal
Christian Brabandt <cb@256bit.org>
parents:
13458
diff
changeset
|
618 { |
|
6faef782f50b
patch 8.0.1609: shell commands in the GUI use a dumb terminal
Christian Brabandt <cb@256bit.org>
parents:
13458
diff
changeset
|
619 /* display first line below typed command */ |
|
6faef782f50b
patch 8.0.1609: shell commands in the GUI use a dumb terminal
Christian Brabandt <cb@256bit.org>
parents:
13458
diff
changeset
|
620 term->tl_toprow = msg_row + 1; |
|
6faef782f50b
patch 8.0.1609: shell commands in the GUI use a dumb terminal
Christian Brabandt <cb@256bit.org>
parents:
13458
diff
changeset
|
621 term->tl_dirty_row_end = 0; |
|
6faef782f50b
patch 8.0.1609: shell commands in the GUI use a dumb terminal
Christian Brabandt <cb@256bit.org>
parents:
13458
diff
changeset
|
622 } |
|
6faef782f50b
patch 8.0.1609: shell commands in the GUI use a dumb terminal
Christian Brabandt <cb@256bit.org>
parents:
13458
diff
changeset
|
623 #endif |
| 12502 | 624 |
| 625 /* Make sure we don't get stuck on sending keys to the job, it leads to | |
| 626 * a deadlock if the job is waiting for Vim to read. */ | |
| 627 channel_set_nonblock(term->tl_job->jv_channel, PART_IN); | |
| 628 | |
|
13835
8e583c52eb44
patch 8.0.1789: BufWinEnter does not work well for a terminal window
Christian Brabandt <cb@256bit.org>
parents:
13829
diff
changeset
|
629 if (old_curbuf != NULL) |
| 12502 | 630 { |
| 631 --curbuf->b_nwindows; | |
| 632 curbuf = old_curbuf; | |
| 633 curwin->w_buffer = curbuf; | |
| 634 ++curbuf->b_nwindows; | |
| 635 } | |
| 636 } | |
| 637 else | |
| 638 { | |
|
13298
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
639 term_close_buffer(curbuf, old_curbuf); |
| 12502 | 640 return NULL; |
| 641 } | |
|
13444
9f06f7aca74c
patch 8.0.1596: no autocommand specifically for opening a terminal window
Christian Brabandt <cb@256bit.org>
parents:
13438
diff
changeset
|
642 |
|
13470
6faef782f50b
patch 8.0.1609: shell commands in the GUI use a dumb terminal
Christian Brabandt <cb@256bit.org>
parents:
13458
diff
changeset
|
643 apply_autocmds(EVENT_TERMINALOPEN, NULL, NULL, FALSE, newbuf); |
| 12502 | 644 return newbuf; |
| 645 } | |
| 646 | |
| 647 /* | |
| 648 * ":terminal": open a terminal window and execute a job in it. | |
| 649 */ | |
| 650 void | |
| 651 ex_terminal(exarg_T *eap) | |
| 652 { | |
| 653 typval_T argvar[2]; | |
| 654 jobopt_T opt; | |
| 655 char_u *cmd; | |
| 656 char_u *tofree = NULL; | |
| 657 | |
| 658 init_job_options(&opt); | |
| 659 | |
| 660 cmd = eap->arg; | |
|
13219
4b8d89ea9edb
patch 8.0.1484: reduntant conditions
Christian Brabandt <cb@256bit.org>
parents:
13206
diff
changeset
|
661 while (*cmd == '+' && *(cmd + 1) == '+') |
| 12502 | 662 { |
| 663 char_u *p, *ep; | |
| 664 | |
| 665 cmd += 2; | |
| 666 p = skiptowhite(cmd); | |
| 667 ep = vim_strchr(cmd, '='); | |
| 668 if (ep != NULL && ep < p) | |
| 669 p = ep; | |
| 670 | |
| 671 if ((int)(p - cmd) == 5 && STRNICMP(cmd, "close", 5) == 0) | |
| 672 opt.jo_term_finish = 'c'; | |
|
13476
d130044d4f1f
patch 8.0.1612: need to close terminal after shell stopped
Christian Brabandt <cb@256bit.org>
parents:
13474
diff
changeset
|
673 else if ((int)(p - cmd) == 7 && STRNICMP(cmd, "noclose", 7) == 0) |
|
d130044d4f1f
patch 8.0.1612: need to close terminal after shell stopped
Christian Brabandt <cb@256bit.org>
parents:
13474
diff
changeset
|
674 opt.jo_term_finish = 'n'; |
| 12502 | 675 else if ((int)(p - cmd) == 4 && STRNICMP(cmd, "open", 4) == 0) |
| 676 opt.jo_term_finish = 'o'; | |
| 677 else if ((int)(p - cmd) == 6 && STRNICMP(cmd, "curwin", 6) == 0) | |
| 678 opt.jo_curwin = 1; | |
| 679 else if ((int)(p - cmd) == 6 && STRNICMP(cmd, "hidden", 6) == 0) | |
| 680 opt.jo_hidden = 1; | |
|
13435
fa198b71bab2
patch 8.0.1592: terminal windows in a session are not properly restored
Christian Brabandt <cb@256bit.org>
parents:
13380
diff
changeset
|
681 else if ((int)(p - cmd) == 9 && STRNICMP(cmd, "norestore", 9) == 0) |
|
fa198b71bab2
patch 8.0.1592: terminal windows in a session are not properly restored
Christian Brabandt <cb@256bit.org>
parents:
13380
diff
changeset
|
682 opt.jo_term_norestore = 1; |
|
13438
33eea5ce5415
patch 8.0.1593: :qall never exits with an active terminal window
Christian Brabandt <cb@256bit.org>
parents:
13435
diff
changeset
|
683 else if ((int)(p - cmd) == 4 && STRNICMP(cmd, "kill", 4) == 0 |
|
33eea5ce5415
patch 8.0.1593: :qall never exits with an active terminal window
Christian Brabandt <cb@256bit.org>
parents:
13435
diff
changeset
|
684 && ep != NULL) |
|
33eea5ce5415
patch 8.0.1593: :qall never exits with an active terminal window
Christian Brabandt <cb@256bit.org>
parents:
13435
diff
changeset
|
685 { |
|
33eea5ce5415
patch 8.0.1593: :qall never exits with an active terminal window
Christian Brabandt <cb@256bit.org>
parents:
13435
diff
changeset
|
686 opt.jo_set2 |= JO2_TERM_KILL; |
|
33eea5ce5415
patch 8.0.1593: :qall never exits with an active terminal window
Christian Brabandt <cb@256bit.org>
parents:
13435
diff
changeset
|
687 opt.jo_term_kill = ep + 1; |
|
33eea5ce5415
patch 8.0.1593: :qall never exits with an active terminal window
Christian Brabandt <cb@256bit.org>
parents:
13435
diff
changeset
|
688 p = skiptowhite(cmd); |
|
33eea5ce5415
patch 8.0.1593: :qall never exits with an active terminal window
Christian Brabandt <cb@256bit.org>
parents:
13435
diff
changeset
|
689 } |
| 12502 | 690 else if ((int)(p - cmd) == 4 && STRNICMP(cmd, "rows", 4) == 0 |
| 691 && ep != NULL && isdigit(ep[1])) | |
| 692 { | |
| 693 opt.jo_set2 |= JO2_TERM_ROWS; | |
| 694 opt.jo_term_rows = atoi((char *)ep + 1); | |
| 695 p = skiptowhite(cmd); | |
| 696 } | |
| 697 else if ((int)(p - cmd) == 4 && STRNICMP(cmd, "cols", 4) == 0 | |
| 698 && ep != NULL && isdigit(ep[1])) | |
| 699 { | |
| 700 opt.jo_set2 |= JO2_TERM_COLS; | |
| 701 opt.jo_term_cols = atoi((char *)ep + 1); | |
| 702 p = skiptowhite(cmd); | |
| 703 } | |
| 704 else if ((int)(p - cmd) == 3 && STRNICMP(cmd, "eof", 3) == 0 | |
| 705 && ep != NULL) | |
| 706 { | |
| 707 char_u *buf = NULL; | |
| 708 char_u *keys; | |
| 709 | |
| 710 p = skiptowhite(cmd); | |
| 711 *p = NUL; | |
| 712 keys = replace_termcodes(ep + 1, &buf, TRUE, TRUE, TRUE); | |
| 713 opt.jo_set2 |= JO2_EOF_CHARS; | |
| 714 opt.jo_eof_chars = vim_strsave(keys); | |
| 715 vim_free(buf); | |
| 716 *p = ' '; | |
| 717 } | |
| 718 else | |
| 719 { | |
| 720 if (*p) | |
| 721 *p = NUL; | |
| 722 EMSG2(_("E181: Invalid attribute: %s"), cmd); | |
|
13438
33eea5ce5415
patch 8.0.1593: :qall never exits with an active terminal window
Christian Brabandt <cb@256bit.org>
parents:
13435
diff
changeset
|
723 goto theend; |
| 12502 | 724 } |
| 725 cmd = skipwhite(p); | |
| 726 } | |
| 727 if (*cmd == NUL) | |
|
13476
d130044d4f1f
patch 8.0.1612: need to close terminal after shell stopped
Christian Brabandt <cb@256bit.org>
parents:
13474
diff
changeset
|
728 { |
| 12502 | 729 /* Make a copy of 'shell', an autocommand may change the option. */ |
| 730 tofree = cmd = vim_strsave(p_sh); | |
| 731 | |
|
13476
d130044d4f1f
patch 8.0.1612: need to close terminal after shell stopped
Christian Brabandt <cb@256bit.org>
parents:
13474
diff
changeset
|
732 /* default to close when the shell exits */ |
|
d130044d4f1f
patch 8.0.1612: need to close terminal after shell stopped
Christian Brabandt <cb@256bit.org>
parents:
13474
diff
changeset
|
733 if (opt.jo_term_finish == NUL) |
|
d130044d4f1f
patch 8.0.1612: need to close terminal after shell stopped
Christian Brabandt <cb@256bit.org>
parents:
13474
diff
changeset
|
734 opt.jo_term_finish = 'c'; |
|
d130044d4f1f
patch 8.0.1612: need to close terminal after shell stopped
Christian Brabandt <cb@256bit.org>
parents:
13474
diff
changeset
|
735 } |
|
d130044d4f1f
patch 8.0.1612: need to close terminal after shell stopped
Christian Brabandt <cb@256bit.org>
parents:
13474
diff
changeset
|
736 |
| 12502 | 737 if (eap->addr_count > 0) |
| 738 { | |
| 739 /* Write lines from current buffer to the job. */ | |
| 740 opt.jo_set |= JO_IN_IO | JO_IN_BUF | JO_IN_TOP | JO_IN_BOT; | |
| 741 opt.jo_io[PART_IN] = JIO_BUFFER; | |
| 742 opt.jo_io_buf[PART_IN] = curbuf->b_fnum; | |
| 743 opt.jo_in_top = eap->line1; | |
| 744 opt.jo_in_bot = eap->line2; | |
| 745 } | |
| 746 | |
| 747 argvar[0].v_type = VAR_STRING; | |
| 748 argvar[0].vval.v_string = cmd; | |
| 749 argvar[1].v_type = VAR_UNKNOWN; | |
|
13470
6faef782f50b
patch 8.0.1609: shell commands in the GUI use a dumb terminal
Christian Brabandt <cb@256bit.org>
parents:
13458
diff
changeset
|
750 term_start(argvar, NULL, &opt, eap->forceit ? TERM_START_FORCEIT : 0); |
| 12502 | 751 vim_free(tofree); |
|
13438
33eea5ce5415
patch 8.0.1593: :qall never exits with an active terminal window
Christian Brabandt <cb@256bit.org>
parents:
13435
diff
changeset
|
752 |
|
33eea5ce5415
patch 8.0.1593: :qall never exits with an active terminal window
Christian Brabandt <cb@256bit.org>
parents:
13435
diff
changeset
|
753 theend: |
| 12502 | 754 vim_free(opt.jo_eof_chars); |
| 755 } | |
| 756 | |
|
13435
fa198b71bab2
patch 8.0.1592: terminal windows in a session are not properly restored
Christian Brabandt <cb@256bit.org>
parents:
13380
diff
changeset
|
757 #if defined(FEAT_SESSION) || defined(PROTO) |
|
fa198b71bab2
patch 8.0.1592: terminal windows in a session are not properly restored
Christian Brabandt <cb@256bit.org>
parents:
13380
diff
changeset
|
758 /* |
|
fa198b71bab2
patch 8.0.1592: terminal windows in a session are not properly restored
Christian Brabandt <cb@256bit.org>
parents:
13380
diff
changeset
|
759 * Write a :terminal command to the session file to restore the terminal in |
|
fa198b71bab2
patch 8.0.1592: terminal windows in a session are not properly restored
Christian Brabandt <cb@256bit.org>
parents:
13380
diff
changeset
|
760 * window "wp". |
|
fa198b71bab2
patch 8.0.1592: terminal windows in a session are not properly restored
Christian Brabandt <cb@256bit.org>
parents:
13380
diff
changeset
|
761 * Return FAIL if writing fails. |
|
fa198b71bab2
patch 8.0.1592: terminal windows in a session are not properly restored
Christian Brabandt <cb@256bit.org>
parents:
13380
diff
changeset
|
762 */ |
|
fa198b71bab2
patch 8.0.1592: terminal windows in a session are not properly restored
Christian Brabandt <cb@256bit.org>
parents:
13380
diff
changeset
|
763 int |
|
fa198b71bab2
patch 8.0.1592: terminal windows in a session are not properly restored
Christian Brabandt <cb@256bit.org>
parents:
13380
diff
changeset
|
764 term_write_session(FILE *fd, win_T *wp) |
|
fa198b71bab2
patch 8.0.1592: terminal windows in a session are not properly restored
Christian Brabandt <cb@256bit.org>
parents:
13380
diff
changeset
|
765 { |
|
fa198b71bab2
patch 8.0.1592: terminal windows in a session are not properly restored
Christian Brabandt <cb@256bit.org>
parents:
13380
diff
changeset
|
766 term_T *term = wp->w_buffer->b_term; |
|
fa198b71bab2
patch 8.0.1592: terminal windows in a session are not properly restored
Christian Brabandt <cb@256bit.org>
parents:
13380
diff
changeset
|
767 |
|
fa198b71bab2
patch 8.0.1592: terminal windows in a session are not properly restored
Christian Brabandt <cb@256bit.org>
parents:
13380
diff
changeset
|
768 /* Create the terminal and run the command. This is not without |
|
fa198b71bab2
patch 8.0.1592: terminal windows in a session are not properly restored
Christian Brabandt <cb@256bit.org>
parents:
13380
diff
changeset
|
769 * risk, but let's assume the user only creates a session when this |
|
fa198b71bab2
patch 8.0.1592: terminal windows in a session are not properly restored
Christian Brabandt <cb@256bit.org>
parents:
13380
diff
changeset
|
770 * will be OK. */ |
|
fa198b71bab2
patch 8.0.1592: terminal windows in a session are not properly restored
Christian Brabandt <cb@256bit.org>
parents:
13380
diff
changeset
|
771 if (fprintf(fd, "terminal ++curwin ++cols=%d ++rows=%d ", |
|
fa198b71bab2
patch 8.0.1592: terminal windows in a session are not properly restored
Christian Brabandt <cb@256bit.org>
parents:
13380
diff
changeset
|
772 term->tl_cols, term->tl_rows) < 0) |
|
fa198b71bab2
patch 8.0.1592: terminal windows in a session are not properly restored
Christian Brabandt <cb@256bit.org>
parents:
13380
diff
changeset
|
773 return FAIL; |
|
fa198b71bab2
patch 8.0.1592: terminal windows in a session are not properly restored
Christian Brabandt <cb@256bit.org>
parents:
13380
diff
changeset
|
774 if (term->tl_command != NULL && fputs((char *)term->tl_command, fd) < 0) |
|
fa198b71bab2
patch 8.0.1592: terminal windows in a session are not properly restored
Christian Brabandt <cb@256bit.org>
parents:
13380
diff
changeset
|
775 return FAIL; |
|
fa198b71bab2
patch 8.0.1592: terminal windows in a session are not properly restored
Christian Brabandt <cb@256bit.org>
parents:
13380
diff
changeset
|
776 |
|
fa198b71bab2
patch 8.0.1592: terminal windows in a session are not properly restored
Christian Brabandt <cb@256bit.org>
parents:
13380
diff
changeset
|
777 return put_eol(fd); |
|
fa198b71bab2
patch 8.0.1592: terminal windows in a session are not properly restored
Christian Brabandt <cb@256bit.org>
parents:
13380
diff
changeset
|
778 } |
|
fa198b71bab2
patch 8.0.1592: terminal windows in a session are not properly restored
Christian Brabandt <cb@256bit.org>
parents:
13380
diff
changeset
|
779 |
|
fa198b71bab2
patch 8.0.1592: terminal windows in a session are not properly restored
Christian Brabandt <cb@256bit.org>
parents:
13380
diff
changeset
|
780 /* |
|
fa198b71bab2
patch 8.0.1592: terminal windows in a session are not properly restored
Christian Brabandt <cb@256bit.org>
parents:
13380
diff
changeset
|
781 * Return TRUE if "buf" has a terminal that should be restored. |
|
fa198b71bab2
patch 8.0.1592: terminal windows in a session are not properly restored
Christian Brabandt <cb@256bit.org>
parents:
13380
diff
changeset
|
782 */ |
|
fa198b71bab2
patch 8.0.1592: terminal windows in a session are not properly restored
Christian Brabandt <cb@256bit.org>
parents:
13380
diff
changeset
|
783 int |
|
fa198b71bab2
patch 8.0.1592: terminal windows in a session are not properly restored
Christian Brabandt <cb@256bit.org>
parents:
13380
diff
changeset
|
784 term_should_restore(buf_T *buf) |
|
fa198b71bab2
patch 8.0.1592: terminal windows in a session are not properly restored
Christian Brabandt <cb@256bit.org>
parents:
13380
diff
changeset
|
785 { |
|
fa198b71bab2
patch 8.0.1592: terminal windows in a session are not properly restored
Christian Brabandt <cb@256bit.org>
parents:
13380
diff
changeset
|
786 term_T *term = buf->b_term; |
|
fa198b71bab2
patch 8.0.1592: terminal windows in a session are not properly restored
Christian Brabandt <cb@256bit.org>
parents:
13380
diff
changeset
|
787 |
|
fa198b71bab2
patch 8.0.1592: terminal windows in a session are not properly restored
Christian Brabandt <cb@256bit.org>
parents:
13380
diff
changeset
|
788 return term != NULL && (term->tl_command == NULL |
|
fa198b71bab2
patch 8.0.1592: terminal windows in a session are not properly restored
Christian Brabandt <cb@256bit.org>
parents:
13380
diff
changeset
|
789 || STRCMP(term->tl_command, "NONE") != 0); |
|
fa198b71bab2
patch 8.0.1592: terminal windows in a session are not properly restored
Christian Brabandt <cb@256bit.org>
parents:
13380
diff
changeset
|
790 } |
|
fa198b71bab2
patch 8.0.1592: terminal windows in a session are not properly restored
Christian Brabandt <cb@256bit.org>
parents:
13380
diff
changeset
|
791 #endif |
|
fa198b71bab2
patch 8.0.1592: terminal windows in a session are not properly restored
Christian Brabandt <cb@256bit.org>
parents:
13380
diff
changeset
|
792 |
| 12502 | 793 /* |
| 794 * Free the scrollback buffer for "term". | |
| 795 */ | |
| 796 static void | |
| 797 free_scrollback(term_T *term) | |
| 798 { | |
| 799 int i; | |
| 800 | |
| 801 for (i = 0; i < term->tl_scrollback.ga_len; ++i) | |
| 802 vim_free(((sb_line_T *)term->tl_scrollback.ga_data + i)->sb_cells); | |
| 803 ga_clear(&term->tl_scrollback); | |
| 804 } | |
| 805 | |
| 806 /* | |
| 807 * Free a terminal and everything it refers to. | |
| 808 * Kills the job if there is one. | |
| 809 * Called when wiping out a buffer. | |
| 810 */ | |
| 811 void | |
| 812 free_terminal(buf_T *buf) | |
| 813 { | |
| 814 term_T *term = buf->b_term; | |
| 815 term_T *tp; | |
| 816 | |
| 817 if (term == NULL) | |
| 818 return; | |
| 819 if (first_term == term) | |
| 820 first_term = term->tl_next; | |
| 821 else | |
| 822 for (tp = first_term; tp->tl_next != NULL; tp = tp->tl_next) | |
| 823 if (tp->tl_next == term) | |
| 824 { | |
| 825 tp->tl_next = term->tl_next; | |
| 826 break; | |
| 827 } | |
| 828 | |
| 829 if (term->tl_job != NULL) | |
| 830 { | |
| 831 if (term->tl_job->jv_status != JOB_ENDED | |
| 832 && term->tl_job->jv_status != JOB_FINISHED | |
|
13206
53f0c469dfc6
patch 8.0.1477: redraw flicker when moving the mouse outside of terminal window
Christian Brabandt <cb@256bit.org>
parents:
13132
diff
changeset
|
833 && term->tl_job->jv_status != JOB_FAILED) |
| 12502 | 834 job_stop(term->tl_job, NULL, "kill"); |
| 835 job_unref(term->tl_job); | |
| 836 } | |
| 837 | |
| 838 free_scrollback(term); | |
| 839 | |
| 840 term_free_vterm(term); | |
| 841 vim_free(term->tl_title); | |
|
13435
fa198b71bab2
patch 8.0.1592: terminal windows in a session are not properly restored
Christian Brabandt <cb@256bit.org>
parents:
13380
diff
changeset
|
842 #ifdef FEAT_SESSION |
|
fa198b71bab2
patch 8.0.1592: terminal windows in a session are not properly restored
Christian Brabandt <cb@256bit.org>
parents:
13380
diff
changeset
|
843 vim_free(term->tl_command); |
|
fa198b71bab2
patch 8.0.1592: terminal windows in a session are not properly restored
Christian Brabandt <cb@256bit.org>
parents:
13380
diff
changeset
|
844 #endif |
|
13438
33eea5ce5415
patch 8.0.1593: :qall never exits with an active terminal window
Christian Brabandt <cb@256bit.org>
parents:
13435
diff
changeset
|
845 vim_free(term->tl_kill); |
| 12502 | 846 vim_free(term->tl_status_text); |
| 847 vim_free(term->tl_opencmd); | |
| 848 vim_free(term->tl_eof_chars); | |
|
13860
7f892e37b017
patch 8.0.1801: MS-Windows: redirecting terminal output does not work
Christian Brabandt <cb@256bit.org>
parents:
13851
diff
changeset
|
849 #ifdef WIN3264 |
|
7f892e37b017
patch 8.0.1801: MS-Windows: redirecting terminal output does not work
Christian Brabandt <cb@256bit.org>
parents:
13851
diff
changeset
|
850 if (term->tl_out_fd != NULL) |
|
7f892e37b017
patch 8.0.1801: MS-Windows: redirecting terminal output does not work
Christian Brabandt <cb@256bit.org>
parents:
13851
diff
changeset
|
851 fclose(term->tl_out_fd); |
|
7f892e37b017
patch 8.0.1801: MS-Windows: redirecting terminal output does not work
Christian Brabandt <cb@256bit.org>
parents:
13851
diff
changeset
|
852 #endif |
| 12502 | 853 vim_free(term->tl_cursor_color); |
| 854 vim_free(term); | |
| 855 buf->b_term = NULL; | |
| 856 if (in_terminal_loop == term) | |
| 857 in_terminal_loop = NULL; | |
| 858 } | |
| 859 | |
| 860 /* | |
|
13132
fe0cec169589
patch 8.0.1440: terminal window: some vterm responses are delayed
Christian Brabandt <cb@256bit.org>
parents:
13111
diff
changeset
|
861 * Get the part that is connected to the tty. Normally this is PART_IN, but |
|
fe0cec169589
patch 8.0.1440: terminal window: some vterm responses are delayed
Christian Brabandt <cb@256bit.org>
parents:
13111
diff
changeset
|
862 * when writing buffer lines to the job it can be another. This makes it |
|
fe0cec169589
patch 8.0.1440: terminal window: some vterm responses are delayed
Christian Brabandt <cb@256bit.org>
parents:
13111
diff
changeset
|
863 * possible to do "1,5term vim -". |
|
fe0cec169589
patch 8.0.1440: terminal window: some vterm responses are delayed
Christian Brabandt <cb@256bit.org>
parents:
13111
diff
changeset
|
864 */ |
|
fe0cec169589
patch 8.0.1440: terminal window: some vterm responses are delayed
Christian Brabandt <cb@256bit.org>
parents:
13111
diff
changeset
|
865 static ch_part_T |
|
fe0cec169589
patch 8.0.1440: terminal window: some vterm responses are delayed
Christian Brabandt <cb@256bit.org>
parents:
13111
diff
changeset
|
866 get_tty_part(term_T *term) |
|
fe0cec169589
patch 8.0.1440: terminal window: some vterm responses are delayed
Christian Brabandt <cb@256bit.org>
parents:
13111
diff
changeset
|
867 { |
|
fe0cec169589
patch 8.0.1440: terminal window: some vterm responses are delayed
Christian Brabandt <cb@256bit.org>
parents:
13111
diff
changeset
|
868 #ifdef UNIX |
|
fe0cec169589
patch 8.0.1440: terminal window: some vterm responses are delayed
Christian Brabandt <cb@256bit.org>
parents:
13111
diff
changeset
|
869 ch_part_T parts[3] = {PART_IN, PART_OUT, PART_ERR}; |
|
fe0cec169589
patch 8.0.1440: terminal window: some vterm responses are delayed
Christian Brabandt <cb@256bit.org>
parents:
13111
diff
changeset
|
870 int i; |
|
fe0cec169589
patch 8.0.1440: terminal window: some vterm responses are delayed
Christian Brabandt <cb@256bit.org>
parents:
13111
diff
changeset
|
871 |
|
fe0cec169589
patch 8.0.1440: terminal window: some vterm responses are delayed
Christian Brabandt <cb@256bit.org>
parents:
13111
diff
changeset
|
872 for (i = 0; i < 3; ++i) |
|
fe0cec169589
patch 8.0.1440: terminal window: some vterm responses are delayed
Christian Brabandt <cb@256bit.org>
parents:
13111
diff
changeset
|
873 { |
|
fe0cec169589
patch 8.0.1440: terminal window: some vterm responses are delayed
Christian Brabandt <cb@256bit.org>
parents:
13111
diff
changeset
|
874 int fd = term->tl_job->jv_channel->ch_part[parts[i]].ch_fd; |
|
fe0cec169589
patch 8.0.1440: terminal window: some vterm responses are delayed
Christian Brabandt <cb@256bit.org>
parents:
13111
diff
changeset
|
875 |
|
fe0cec169589
patch 8.0.1440: terminal window: some vterm responses are delayed
Christian Brabandt <cb@256bit.org>
parents:
13111
diff
changeset
|
876 if (isatty(fd)) |
|
fe0cec169589
patch 8.0.1440: terminal window: some vterm responses are delayed
Christian Brabandt <cb@256bit.org>
parents:
13111
diff
changeset
|
877 return parts[i]; |
|
fe0cec169589
patch 8.0.1440: terminal window: some vterm responses are delayed
Christian Brabandt <cb@256bit.org>
parents:
13111
diff
changeset
|
878 } |
|
fe0cec169589
patch 8.0.1440: terminal window: some vterm responses are delayed
Christian Brabandt <cb@256bit.org>
parents:
13111
diff
changeset
|
879 #endif |
|
fe0cec169589
patch 8.0.1440: terminal window: some vterm responses are delayed
Christian Brabandt <cb@256bit.org>
parents:
13111
diff
changeset
|
880 return PART_IN; |
|
fe0cec169589
patch 8.0.1440: terminal window: some vterm responses are delayed
Christian Brabandt <cb@256bit.org>
parents:
13111
diff
changeset
|
881 } |
|
fe0cec169589
patch 8.0.1440: terminal window: some vterm responses are delayed
Christian Brabandt <cb@256bit.org>
parents:
13111
diff
changeset
|
882 |
|
fe0cec169589
patch 8.0.1440: terminal window: some vterm responses are delayed
Christian Brabandt <cb@256bit.org>
parents:
13111
diff
changeset
|
883 /* |
| 12502 | 884 * Write job output "msg[len]" to the vterm. |
| 885 */ | |
| 886 static void | |
| 887 term_write_job_output(term_T *term, char_u *msg, size_t len) | |
| 888 { | |
| 889 VTerm *vterm = term->tl_vterm; | |
|
13132
fe0cec169589
patch 8.0.1440: terminal window: some vterm responses are delayed
Christian Brabandt <cb@256bit.org>
parents:
13111
diff
changeset
|
890 size_t prevlen = vterm_output_get_buffer_current(vterm); |
|
12800
8dfeed7e07e7
patch 8.0.1277: terminal window CR-NL conversions may cause problems
Christian Brabandt <cb@256bit.org>
parents:
12798
diff
changeset
|
891 |
|
8dfeed7e07e7
patch 8.0.1277: terminal window CR-NL conversions may cause problems
Christian Brabandt <cb@256bit.org>
parents:
12798
diff
changeset
|
892 vterm_input_write(vterm, (char *)msg, len); |
| 12502 | 893 |
|
13132
fe0cec169589
patch 8.0.1440: terminal window: some vterm responses are delayed
Christian Brabandt <cb@256bit.org>
parents:
13111
diff
changeset
|
894 /* flush vterm buffer when vterm responded to control sequence */ |
|
fe0cec169589
patch 8.0.1440: terminal window: some vterm responses are delayed
Christian Brabandt <cb@256bit.org>
parents:
13111
diff
changeset
|
895 if (prevlen != vterm_output_get_buffer_current(vterm)) |
|
fe0cec169589
patch 8.0.1440: terminal window: some vterm responses are delayed
Christian Brabandt <cb@256bit.org>
parents:
13111
diff
changeset
|
896 { |
|
fe0cec169589
patch 8.0.1440: terminal window: some vterm responses are delayed
Christian Brabandt <cb@256bit.org>
parents:
13111
diff
changeset
|
897 char buf[KEY_BUF_LEN]; |
|
fe0cec169589
patch 8.0.1440: terminal window: some vterm responses are delayed
Christian Brabandt <cb@256bit.org>
parents:
13111
diff
changeset
|
898 size_t curlen = vterm_output_read(vterm, buf, KEY_BUF_LEN); |
|
fe0cec169589
patch 8.0.1440: terminal window: some vterm responses are delayed
Christian Brabandt <cb@256bit.org>
parents:
13111
diff
changeset
|
899 |
|
fe0cec169589
patch 8.0.1440: terminal window: some vterm responses are delayed
Christian Brabandt <cb@256bit.org>
parents:
13111
diff
changeset
|
900 if (curlen > 0) |
|
fe0cec169589
patch 8.0.1440: terminal window: some vterm responses are delayed
Christian Brabandt <cb@256bit.org>
parents:
13111
diff
changeset
|
901 channel_send(term->tl_job->jv_channel, get_tty_part(term), |
|
fe0cec169589
patch 8.0.1440: terminal window: some vterm responses are delayed
Christian Brabandt <cb@256bit.org>
parents:
13111
diff
changeset
|
902 (char_u *)buf, (int)curlen, NULL); |
|
fe0cec169589
patch 8.0.1440: terminal window: some vterm responses are delayed
Christian Brabandt <cb@256bit.org>
parents:
13111
diff
changeset
|
903 } |
|
fe0cec169589
patch 8.0.1440: terminal window: some vterm responses are delayed
Christian Brabandt <cb@256bit.org>
parents:
13111
diff
changeset
|
904 |
| 12502 | 905 /* this invokes the damage callbacks */ |
| 906 vterm_screen_flush_damage(vterm_obtain_screen(vterm)); | |
| 907 } | |
| 908 | |
| 909 static void | |
| 910 update_cursor(term_T *term, int redraw) | |
| 911 { | |
| 912 if (term->tl_normal_mode) | |
| 913 return; | |
|
13470
6faef782f50b
patch 8.0.1609: shell commands in the GUI use a dumb terminal
Christian Brabandt <cb@256bit.org>
parents:
13458
diff
changeset
|
914 #ifdef FEAT_GUI |
|
6faef782f50b
patch 8.0.1609: shell commands in the GUI use a dumb terminal
Christian Brabandt <cb@256bit.org>
parents:
13458
diff
changeset
|
915 if (term->tl_system) |
|
6faef782f50b
patch 8.0.1609: shell commands in the GUI use a dumb terminal
Christian Brabandt <cb@256bit.org>
parents:
13458
diff
changeset
|
916 windgoto(term->tl_cursor_pos.row + term->tl_toprow, |
|
6faef782f50b
patch 8.0.1609: shell commands in the GUI use a dumb terminal
Christian Brabandt <cb@256bit.org>
parents:
13458
diff
changeset
|
917 term->tl_cursor_pos.col); |
|
6faef782f50b
patch 8.0.1609: shell commands in the GUI use a dumb terminal
Christian Brabandt <cb@256bit.org>
parents:
13458
diff
changeset
|
918 else |
|
6faef782f50b
patch 8.0.1609: shell commands in the GUI use a dumb terminal
Christian Brabandt <cb@256bit.org>
parents:
13458
diff
changeset
|
919 #endif |
|
6faef782f50b
patch 8.0.1609: shell commands in the GUI use a dumb terminal
Christian Brabandt <cb@256bit.org>
parents:
13458
diff
changeset
|
920 setcursor(); |
| 12502 | 921 if (redraw) |
| 922 { | |
| 923 if (term->tl_buffer == curbuf && term->tl_cursor_visible) | |
| 924 cursor_on(); | |
| 925 out_flush(); | |
| 926 #ifdef FEAT_GUI | |
| 927 if (gui.in_use) | |
|
13000
6f98a5fd0c19
patch 8.0.1376: cursor in terminal not always updated
Christian Brabandt <cb@256bit.org>
parents:
12984
diff
changeset
|
928 { |
| 12502 | 929 gui_update_cursor(FALSE, FALSE); |
|
13000
6f98a5fd0c19
patch 8.0.1376: cursor in terminal not always updated
Christian Brabandt <cb@256bit.org>
parents:
12984
diff
changeset
|
930 gui_mch_flush(); |
|
6f98a5fd0c19
patch 8.0.1376: cursor in terminal not always updated
Christian Brabandt <cb@256bit.org>
parents:
12984
diff
changeset
|
931 } |
| 12502 | 932 #endif |
| 933 } | |
| 934 } | |
| 935 | |
| 936 /* | |
| 937 * Invoked when "msg" output from a job was received. Write it to the terminal | |
| 938 * of "buffer". | |
| 939 */ | |
| 940 void | |
| 941 write_to_term(buf_T *buffer, char_u *msg, channel_T *channel) | |
| 942 { | |
| 943 size_t len = STRLEN(msg); | |
| 944 term_T *term = buffer->b_term; | |
| 945 | |
|
13860
7f892e37b017
patch 8.0.1801: MS-Windows: redirecting terminal output does not work
Christian Brabandt <cb@256bit.org>
parents:
13851
diff
changeset
|
946 #ifdef WIN3264 |
|
7f892e37b017
patch 8.0.1801: MS-Windows: redirecting terminal output does not work
Christian Brabandt <cb@256bit.org>
parents:
13851
diff
changeset
|
947 /* Win32: Cannot redirect output of the job, intercept it here and write to |
|
7f892e37b017
patch 8.0.1801: MS-Windows: redirecting terminal output does not work
Christian Brabandt <cb@256bit.org>
parents:
13851
diff
changeset
|
948 * the file. */ |
|
7f892e37b017
patch 8.0.1801: MS-Windows: redirecting terminal output does not work
Christian Brabandt <cb@256bit.org>
parents:
13851
diff
changeset
|
949 if (term->tl_out_fd != NULL) |
|
7f892e37b017
patch 8.0.1801: MS-Windows: redirecting terminal output does not work
Christian Brabandt <cb@256bit.org>
parents:
13851
diff
changeset
|
950 { |
|
7f892e37b017
patch 8.0.1801: MS-Windows: redirecting terminal output does not work
Christian Brabandt <cb@256bit.org>
parents:
13851
diff
changeset
|
951 ch_log(channel, "Writing %d bytes to output file", (int)len); |
|
7f892e37b017
patch 8.0.1801: MS-Windows: redirecting terminal output does not work
Christian Brabandt <cb@256bit.org>
parents:
13851
diff
changeset
|
952 fwrite(msg, len, 1, term->tl_out_fd); |
|
7f892e37b017
patch 8.0.1801: MS-Windows: redirecting terminal output does not work
Christian Brabandt <cb@256bit.org>
parents:
13851
diff
changeset
|
953 return; |
|
7f892e37b017
patch 8.0.1801: MS-Windows: redirecting terminal output does not work
Christian Brabandt <cb@256bit.org>
parents:
13851
diff
changeset
|
954 } |
|
7f892e37b017
patch 8.0.1801: MS-Windows: redirecting terminal output does not work
Christian Brabandt <cb@256bit.org>
parents:
13851
diff
changeset
|
955 #endif |
|
7f892e37b017
patch 8.0.1801: MS-Windows: redirecting terminal output does not work
Christian Brabandt <cb@256bit.org>
parents:
13851
diff
changeset
|
956 |
| 12502 | 957 if (term->tl_vterm == NULL) |
| 958 { | |
| 959 ch_log(channel, "NOT writing %d bytes to terminal", (int)len); | |
| 960 return; | |
| 961 } | |
| 962 ch_log(channel, "writing %d bytes to terminal", (int)len); | |
| 963 term_write_job_output(term, msg, len); | |
| 964 | |
|
13470
6faef782f50b
patch 8.0.1609: shell commands in the GUI use a dumb terminal
Christian Brabandt <cb@256bit.org>
parents:
13458
diff
changeset
|
965 #ifdef FEAT_GUI |
|
6faef782f50b
patch 8.0.1609: shell commands in the GUI use a dumb terminal
Christian Brabandt <cb@256bit.org>
parents:
13458
diff
changeset
|
966 if (term->tl_system) |
|
6faef782f50b
patch 8.0.1609: shell commands in the GUI use a dumb terminal
Christian Brabandt <cb@256bit.org>
parents:
13458
diff
changeset
|
967 { |
|
6faef782f50b
patch 8.0.1609: shell commands in the GUI use a dumb terminal
Christian Brabandt <cb@256bit.org>
parents:
13458
diff
changeset
|
968 /* show system output, scrolling up the screen as needed */ |
|
6faef782f50b
patch 8.0.1609: shell commands in the GUI use a dumb terminal
Christian Brabandt <cb@256bit.org>
parents:
13458
diff
changeset
|
969 update_system_term(term); |
|
6faef782f50b
patch 8.0.1609: shell commands in the GUI use a dumb terminal
Christian Brabandt <cb@256bit.org>
parents:
13458
diff
changeset
|
970 update_cursor(term, TRUE); |
|
6faef782f50b
patch 8.0.1609: shell commands in the GUI use a dumb terminal
Christian Brabandt <cb@256bit.org>
parents:
13458
diff
changeset
|
971 } |
|
6faef782f50b
patch 8.0.1609: shell commands in the GUI use a dumb terminal
Christian Brabandt <cb@256bit.org>
parents:
13458
diff
changeset
|
972 else |
|
6faef782f50b
patch 8.0.1609: shell commands in the GUI use a dumb terminal
Christian Brabandt <cb@256bit.org>
parents:
13458
diff
changeset
|
973 #endif |
| 12502 | 974 /* In Terminal-Normal mode we are displaying the buffer, not the terminal |
| 975 * contents, thus no screen update is needed. */ | |
| 976 if (!term->tl_normal_mode) | |
| 977 { | |
|
14117
08b0b6d6cbe7
patch 8.1.0076: command getting cleared with CTRL-W : in a terminal window
Christian Brabandt <cb@256bit.org>
parents:
14109
diff
changeset
|
978 // Don't use update_screen() when editing the command line, it gets |
|
08b0b6d6cbe7
patch 8.1.0076: command getting cleared with CTRL-W : in a terminal window
Christian Brabandt <cb@256bit.org>
parents:
14109
diff
changeset
|
979 // cleared. |
|
08b0b6d6cbe7
patch 8.1.0076: command getting cleared with CTRL-W : in a terminal window
Christian Brabandt <cb@256bit.org>
parents:
14109
diff
changeset
|
980 // TODO: only update once in a while. |
| 12502 | 981 ch_log(term->tl_job->jv_channel, "updating screen"); |
|
14117
08b0b6d6cbe7
patch 8.1.0076: command getting cleared with CTRL-W : in a terminal window
Christian Brabandt <cb@256bit.org>
parents:
14109
diff
changeset
|
982 if (buffer == curbuf && (State & CMDLINE) == 0) |
| 12502 | 983 { |
|
14117
08b0b6d6cbe7
patch 8.1.0076: command getting cleared with CTRL-W : in a terminal window
Christian Brabandt <cb@256bit.org>
parents:
14109
diff
changeset
|
984 update_screen(VALID_NO_UPDATE); |
|
13886
bbf5bdba4a80
patch 8.0.1814: crash with terminal window and with 'lazyredraw' set
Christian Brabandt <cb@256bit.org>
parents:
13878
diff
changeset
|
985 /* update_screen() can be slow, check the terminal wasn't closed |
|
bbf5bdba4a80
patch 8.0.1814: crash with terminal window and with 'lazyredraw' set
Christian Brabandt <cb@256bit.org>
parents:
13878
diff
changeset
|
986 * already */ |
|
bbf5bdba4a80
patch 8.0.1814: crash with terminal window and with 'lazyredraw' set
Christian Brabandt <cb@256bit.org>
parents:
13878
diff
changeset
|
987 if (buffer == curbuf && curbuf->b_term != NULL) |
|
bbf5bdba4a80
patch 8.0.1814: crash with terminal window and with 'lazyredraw' set
Christian Brabandt <cb@256bit.org>
parents:
13878
diff
changeset
|
988 update_cursor(curbuf->b_term, TRUE); |
| 12502 | 989 } |
| 990 else | |
| 991 redraw_after_callback(TRUE); | |
| 992 } | |
| 993 } | |
| 994 | |
| 995 /* | |
| 996 * Send a mouse position and click to the vterm | |
| 997 */ | |
| 998 static int | |
| 999 term_send_mouse(VTerm *vterm, int button, int pressed) | |
| 1000 { | |
| 1001 VTermModifier mod = VTERM_MOD_NONE; | |
| 1002 | |
| 1003 vterm_mouse_move(vterm, mouse_row - W_WINROW(curwin), | |
|
12513
3ca08bf99396
patch 8.0.1135: W_WINCOL() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12509
diff
changeset
|
1004 mouse_col - curwin->w_wincol, mod); |
|
12865
ebb4f6c93598
patch 8.0.1309: cannot use 'balloonexpr' in a terminal
Christian Brabandt <cb@256bit.org>
parents:
12845
diff
changeset
|
1005 if (button != 0) |
|
ebb4f6c93598
patch 8.0.1309: cannot use 'balloonexpr' in a terminal
Christian Brabandt <cb@256bit.org>
parents:
12845
diff
changeset
|
1006 vterm_mouse_button(vterm, button, pressed, mod); |
| 12502 | 1007 return TRUE; |
| 1008 } | |
| 1009 | |
|
13448
a62b0bbc8834
patch 8.0.1598: cannot select text in a terminal with the mouse
Christian Brabandt <cb@256bit.org>
parents:
13444
diff
changeset
|
1010 static int enter_mouse_col = -1; |
|
a62b0bbc8834
patch 8.0.1598: cannot select text in a terminal with the mouse
Christian Brabandt <cb@256bit.org>
parents:
13444
diff
changeset
|
1011 static int enter_mouse_row = -1; |
|
a62b0bbc8834
patch 8.0.1598: cannot select text in a terminal with the mouse
Christian Brabandt <cb@256bit.org>
parents:
13444
diff
changeset
|
1012 |
|
a62b0bbc8834
patch 8.0.1598: cannot select text in a terminal with the mouse
Christian Brabandt <cb@256bit.org>
parents:
13444
diff
changeset
|
1013 /* |
|
a62b0bbc8834
patch 8.0.1598: cannot select text in a terminal with the mouse
Christian Brabandt <cb@256bit.org>
parents:
13444
diff
changeset
|
1014 * Handle a mouse click, drag or release. |
|
a62b0bbc8834
patch 8.0.1598: cannot select text in a terminal with the mouse
Christian Brabandt <cb@256bit.org>
parents:
13444
diff
changeset
|
1015 * Return TRUE when a mouse event is sent to the terminal. |
|
a62b0bbc8834
patch 8.0.1598: cannot select text in a terminal with the mouse
Christian Brabandt <cb@256bit.org>
parents:
13444
diff
changeset
|
1016 */ |
|
a62b0bbc8834
patch 8.0.1598: cannot select text in a terminal with the mouse
Christian Brabandt <cb@256bit.org>
parents:
13444
diff
changeset
|
1017 static int |
|
a62b0bbc8834
patch 8.0.1598: cannot select text in a terminal with the mouse
Christian Brabandt <cb@256bit.org>
parents:
13444
diff
changeset
|
1018 term_mouse_click(VTerm *vterm, int key) |
|
a62b0bbc8834
patch 8.0.1598: cannot select text in a terminal with the mouse
Christian Brabandt <cb@256bit.org>
parents:
13444
diff
changeset
|
1019 { |
|
a62b0bbc8834
patch 8.0.1598: cannot select text in a terminal with the mouse
Christian Brabandt <cb@256bit.org>
parents:
13444
diff
changeset
|
1020 #if defined(FEAT_CLIPBOARD) |
|
a62b0bbc8834
patch 8.0.1598: cannot select text in a terminal with the mouse
Christian Brabandt <cb@256bit.org>
parents:
13444
diff
changeset
|
1021 /* For modeless selection mouse drag and release events are ignored, unless |
|
a62b0bbc8834
patch 8.0.1598: cannot select text in a terminal with the mouse
Christian Brabandt <cb@256bit.org>
parents:
13444
diff
changeset
|
1022 * they are preceded with a mouse down event */ |
|
a62b0bbc8834
patch 8.0.1598: cannot select text in a terminal with the mouse
Christian Brabandt <cb@256bit.org>
parents:
13444
diff
changeset
|
1023 static int ignore_drag_release = TRUE; |
|
a62b0bbc8834
patch 8.0.1598: cannot select text in a terminal with the mouse
Christian Brabandt <cb@256bit.org>
parents:
13444
diff
changeset
|
1024 VTermMouseState mouse_state; |
|
a62b0bbc8834
patch 8.0.1598: cannot select text in a terminal with the mouse
Christian Brabandt <cb@256bit.org>
parents:
13444
diff
changeset
|
1025 |
|
a62b0bbc8834
patch 8.0.1598: cannot select text in a terminal with the mouse
Christian Brabandt <cb@256bit.org>
parents:
13444
diff
changeset
|
1026 vterm_state_get_mousestate(vterm_obtain_state(vterm), &mouse_state); |
|
a62b0bbc8834
patch 8.0.1598: cannot select text in a terminal with the mouse
Christian Brabandt <cb@256bit.org>
parents:
13444
diff
changeset
|
1027 if (mouse_state.flags == 0) |
|
a62b0bbc8834
patch 8.0.1598: cannot select text in a terminal with the mouse
Christian Brabandt <cb@256bit.org>
parents:
13444
diff
changeset
|
1028 { |
|
a62b0bbc8834
patch 8.0.1598: cannot select text in a terminal with the mouse
Christian Brabandt <cb@256bit.org>
parents:
13444
diff
changeset
|
1029 /* Terminal is not using the mouse, use modeless selection. */ |
|
a62b0bbc8834
patch 8.0.1598: cannot select text in a terminal with the mouse
Christian Brabandt <cb@256bit.org>
parents:
13444
diff
changeset
|
1030 switch (key) |
|
a62b0bbc8834
patch 8.0.1598: cannot select text in a terminal with the mouse
Christian Brabandt <cb@256bit.org>
parents:
13444
diff
changeset
|
1031 { |
|
a62b0bbc8834
patch 8.0.1598: cannot select text in a terminal with the mouse
Christian Brabandt <cb@256bit.org>
parents:
13444
diff
changeset
|
1032 case K_LEFTDRAG: |
|
a62b0bbc8834
patch 8.0.1598: cannot select text in a terminal with the mouse
Christian Brabandt <cb@256bit.org>
parents:
13444
diff
changeset
|
1033 case K_LEFTRELEASE: |
|
a62b0bbc8834
patch 8.0.1598: cannot select text in a terminal with the mouse
Christian Brabandt <cb@256bit.org>
parents:
13444
diff
changeset
|
1034 case K_RIGHTDRAG: |
|
a62b0bbc8834
patch 8.0.1598: cannot select text in a terminal with the mouse
Christian Brabandt <cb@256bit.org>
parents:
13444
diff
changeset
|
1035 case K_RIGHTRELEASE: |
|
a62b0bbc8834
patch 8.0.1598: cannot select text in a terminal with the mouse
Christian Brabandt <cb@256bit.org>
parents:
13444
diff
changeset
|
1036 /* Ignore drag and release events when the button-down wasn't |
|
a62b0bbc8834
patch 8.0.1598: cannot select text in a terminal with the mouse
Christian Brabandt <cb@256bit.org>
parents:
13444
diff
changeset
|
1037 * seen before. */ |
|
a62b0bbc8834
patch 8.0.1598: cannot select text in a terminal with the mouse
Christian Brabandt <cb@256bit.org>
parents:
13444
diff
changeset
|
1038 if (ignore_drag_release) |
|
a62b0bbc8834
patch 8.0.1598: cannot select text in a terminal with the mouse
Christian Brabandt <cb@256bit.org>
parents:
13444
diff
changeset
|
1039 { |
|
a62b0bbc8834
patch 8.0.1598: cannot select text in a terminal with the mouse
Christian Brabandt <cb@256bit.org>
parents:
13444
diff
changeset
|
1040 int save_mouse_col, save_mouse_row; |
|
a62b0bbc8834
patch 8.0.1598: cannot select text in a terminal with the mouse
Christian Brabandt <cb@256bit.org>
parents:
13444
diff
changeset
|
1041 |
|
a62b0bbc8834
patch 8.0.1598: cannot select text in a terminal with the mouse
Christian Brabandt <cb@256bit.org>
parents:
13444
diff
changeset
|
1042 if (enter_mouse_col < 0) |
|
a62b0bbc8834
patch 8.0.1598: cannot select text in a terminal with the mouse
Christian Brabandt <cb@256bit.org>
parents:
13444
diff
changeset
|
1043 break; |
|
a62b0bbc8834
patch 8.0.1598: cannot select text in a terminal with the mouse
Christian Brabandt <cb@256bit.org>
parents:
13444
diff
changeset
|
1044 |
|
a62b0bbc8834
patch 8.0.1598: cannot select text in a terminal with the mouse
Christian Brabandt <cb@256bit.org>
parents:
13444
diff
changeset
|
1045 /* mouse click in the window gave us focus, handle that |
|
a62b0bbc8834
patch 8.0.1598: cannot select text in a terminal with the mouse
Christian Brabandt <cb@256bit.org>
parents:
13444
diff
changeset
|
1046 * click now */ |
|
a62b0bbc8834
patch 8.0.1598: cannot select text in a terminal with the mouse
Christian Brabandt <cb@256bit.org>
parents:
13444
diff
changeset
|
1047 save_mouse_col = mouse_col; |
|
a62b0bbc8834
patch 8.0.1598: cannot select text in a terminal with the mouse
Christian Brabandt <cb@256bit.org>
parents:
13444
diff
changeset
|
1048 save_mouse_row = mouse_row; |
|
a62b0bbc8834
patch 8.0.1598: cannot select text in a terminal with the mouse
Christian Brabandt <cb@256bit.org>
parents:
13444
diff
changeset
|
1049 mouse_col = enter_mouse_col; |
|
a62b0bbc8834
patch 8.0.1598: cannot select text in a terminal with the mouse
Christian Brabandt <cb@256bit.org>
parents:
13444
diff
changeset
|
1050 mouse_row = enter_mouse_row; |
|
a62b0bbc8834
patch 8.0.1598: cannot select text in a terminal with the mouse
Christian Brabandt <cb@256bit.org>
parents:
13444
diff
changeset
|
1051 clip_modeless(MOUSE_LEFT, TRUE, FALSE); |
|
a62b0bbc8834
patch 8.0.1598: cannot select text in a terminal with the mouse
Christian Brabandt <cb@256bit.org>
parents:
13444
diff
changeset
|
1052 mouse_col = save_mouse_col; |
|
a62b0bbc8834
patch 8.0.1598: cannot select text in a terminal with the mouse
Christian Brabandt <cb@256bit.org>
parents:
13444
diff
changeset
|
1053 mouse_row = save_mouse_row; |
|
a62b0bbc8834
patch 8.0.1598: cannot select text in a terminal with the mouse
Christian Brabandt <cb@256bit.org>
parents:
13444
diff
changeset
|
1054 } |
|
a62b0bbc8834
patch 8.0.1598: cannot select text in a terminal with the mouse
Christian Brabandt <cb@256bit.org>
parents:
13444
diff
changeset
|
1055 /* FALLTHROUGH */ |
|
a62b0bbc8834
patch 8.0.1598: cannot select text in a terminal with the mouse
Christian Brabandt <cb@256bit.org>
parents:
13444
diff
changeset
|
1056 case K_LEFTMOUSE: |
|
a62b0bbc8834
patch 8.0.1598: cannot select text in a terminal with the mouse
Christian Brabandt <cb@256bit.org>
parents:
13444
diff
changeset
|
1057 case K_RIGHTMOUSE: |
|
a62b0bbc8834
patch 8.0.1598: cannot select text in a terminal with the mouse
Christian Brabandt <cb@256bit.org>
parents:
13444
diff
changeset
|
1058 if (key == K_LEFTRELEASE || key == K_RIGHTRELEASE) |
|
a62b0bbc8834
patch 8.0.1598: cannot select text in a terminal with the mouse
Christian Brabandt <cb@256bit.org>
parents:
13444
diff
changeset
|
1059 ignore_drag_release = TRUE; |
|
a62b0bbc8834
patch 8.0.1598: cannot select text in a terminal with the mouse
Christian Brabandt <cb@256bit.org>
parents:
13444
diff
changeset
|
1060 else |
|
a62b0bbc8834
patch 8.0.1598: cannot select text in a terminal with the mouse
Christian Brabandt <cb@256bit.org>
parents:
13444
diff
changeset
|
1061 ignore_drag_release = FALSE; |
|
a62b0bbc8834
patch 8.0.1598: cannot select text in a terminal with the mouse
Christian Brabandt <cb@256bit.org>
parents:
13444
diff
changeset
|
1062 /* Should we call mouse_has() here? */ |
|
a62b0bbc8834
patch 8.0.1598: cannot select text in a terminal with the mouse
Christian Brabandt <cb@256bit.org>
parents:
13444
diff
changeset
|
1063 if (clip_star.available) |
|
a62b0bbc8834
patch 8.0.1598: cannot select text in a terminal with the mouse
Christian Brabandt <cb@256bit.org>
parents:
13444
diff
changeset
|
1064 { |
|
a62b0bbc8834
patch 8.0.1598: cannot select text in a terminal with the mouse
Christian Brabandt <cb@256bit.org>
parents:
13444
diff
changeset
|
1065 int button, is_click, is_drag; |
|
a62b0bbc8834
patch 8.0.1598: cannot select text in a terminal with the mouse
Christian Brabandt <cb@256bit.org>
parents:
13444
diff
changeset
|
1066 |
|
a62b0bbc8834
patch 8.0.1598: cannot select text in a terminal with the mouse
Christian Brabandt <cb@256bit.org>
parents:
13444
diff
changeset
|
1067 button = get_mouse_button(KEY2TERMCAP1(key), |
|
a62b0bbc8834
patch 8.0.1598: cannot select text in a terminal with the mouse
Christian Brabandt <cb@256bit.org>
parents:
13444
diff
changeset
|
1068 &is_click, &is_drag); |
|
a62b0bbc8834
patch 8.0.1598: cannot select text in a terminal with the mouse
Christian Brabandt <cb@256bit.org>
parents:
13444
diff
changeset
|
1069 if (mouse_model_popup() && button == MOUSE_LEFT |
|
a62b0bbc8834
patch 8.0.1598: cannot select text in a terminal with the mouse
Christian Brabandt <cb@256bit.org>
parents:
13444
diff
changeset
|
1070 && (mod_mask & MOD_MASK_SHIFT)) |
|
a62b0bbc8834
patch 8.0.1598: cannot select text in a terminal with the mouse
Christian Brabandt <cb@256bit.org>
parents:
13444
diff
changeset
|
1071 { |
|
a62b0bbc8834
patch 8.0.1598: cannot select text in a terminal with the mouse
Christian Brabandt <cb@256bit.org>
parents:
13444
diff
changeset
|
1072 /* Translate shift-left to right button. */ |
|
a62b0bbc8834
patch 8.0.1598: cannot select text in a terminal with the mouse
Christian Brabandt <cb@256bit.org>
parents:
13444
diff
changeset
|
1073 button = MOUSE_RIGHT; |
|
a62b0bbc8834
patch 8.0.1598: cannot select text in a terminal with the mouse
Christian Brabandt <cb@256bit.org>
parents:
13444
diff
changeset
|
1074 mod_mask &= ~MOD_MASK_SHIFT; |
|
a62b0bbc8834
patch 8.0.1598: cannot select text in a terminal with the mouse
Christian Brabandt <cb@256bit.org>
parents:
13444
diff
changeset
|
1075 } |
|
a62b0bbc8834
patch 8.0.1598: cannot select text in a terminal with the mouse
Christian Brabandt <cb@256bit.org>
parents:
13444
diff
changeset
|
1076 clip_modeless(button, is_click, is_drag); |
|
a62b0bbc8834
patch 8.0.1598: cannot select text in a terminal with the mouse
Christian Brabandt <cb@256bit.org>
parents:
13444
diff
changeset
|
1077 } |
|
a62b0bbc8834
patch 8.0.1598: cannot select text in a terminal with the mouse
Christian Brabandt <cb@256bit.org>
parents:
13444
diff
changeset
|
1078 break; |
|
a62b0bbc8834
patch 8.0.1598: cannot select text in a terminal with the mouse
Christian Brabandt <cb@256bit.org>
parents:
13444
diff
changeset
|
1079 |
|
a62b0bbc8834
patch 8.0.1598: cannot select text in a terminal with the mouse
Christian Brabandt <cb@256bit.org>
parents:
13444
diff
changeset
|
1080 case K_MIDDLEMOUSE: |
|
a62b0bbc8834
patch 8.0.1598: cannot select text in a terminal with the mouse
Christian Brabandt <cb@256bit.org>
parents:
13444
diff
changeset
|
1081 if (clip_star.available) |
|
a62b0bbc8834
patch 8.0.1598: cannot select text in a terminal with the mouse
Christian Brabandt <cb@256bit.org>
parents:
13444
diff
changeset
|
1082 insert_reg('*', TRUE); |
|
a62b0bbc8834
patch 8.0.1598: cannot select text in a terminal with the mouse
Christian Brabandt <cb@256bit.org>
parents:
13444
diff
changeset
|
1083 break; |
|
a62b0bbc8834
patch 8.0.1598: cannot select text in a terminal with the mouse
Christian Brabandt <cb@256bit.org>
parents:
13444
diff
changeset
|
1084 } |
|
a62b0bbc8834
patch 8.0.1598: cannot select text in a terminal with the mouse
Christian Brabandt <cb@256bit.org>
parents:
13444
diff
changeset
|
1085 enter_mouse_col = -1; |
|
a62b0bbc8834
patch 8.0.1598: cannot select text in a terminal with the mouse
Christian Brabandt <cb@256bit.org>
parents:
13444
diff
changeset
|
1086 return FALSE; |
|
a62b0bbc8834
patch 8.0.1598: cannot select text in a terminal with the mouse
Christian Brabandt <cb@256bit.org>
parents:
13444
diff
changeset
|
1087 } |
|
a62b0bbc8834
patch 8.0.1598: cannot select text in a terminal with the mouse
Christian Brabandt <cb@256bit.org>
parents:
13444
diff
changeset
|
1088 #endif |
|
a62b0bbc8834
patch 8.0.1598: cannot select text in a terminal with the mouse
Christian Brabandt <cb@256bit.org>
parents:
13444
diff
changeset
|
1089 enter_mouse_col = -1; |
|
a62b0bbc8834
patch 8.0.1598: cannot select text in a terminal with the mouse
Christian Brabandt <cb@256bit.org>
parents:
13444
diff
changeset
|
1090 |
|
a62b0bbc8834
patch 8.0.1598: cannot select text in a terminal with the mouse
Christian Brabandt <cb@256bit.org>
parents:
13444
diff
changeset
|
1091 switch (key) |
|
a62b0bbc8834
patch 8.0.1598: cannot select text in a terminal with the mouse
Christian Brabandt <cb@256bit.org>
parents:
13444
diff
changeset
|
1092 { |
|
a62b0bbc8834
patch 8.0.1598: cannot select text in a terminal with the mouse
Christian Brabandt <cb@256bit.org>
parents:
13444
diff
changeset
|
1093 case K_LEFTMOUSE: |
|
a62b0bbc8834
patch 8.0.1598: cannot select text in a terminal with the mouse
Christian Brabandt <cb@256bit.org>
parents:
13444
diff
changeset
|
1094 case K_LEFTMOUSE_NM: term_send_mouse(vterm, 1, 1); break; |
|
a62b0bbc8834
patch 8.0.1598: cannot select text in a terminal with the mouse
Christian Brabandt <cb@256bit.org>
parents:
13444
diff
changeset
|
1095 case K_LEFTDRAG: term_send_mouse(vterm, 1, 1); break; |
|
a62b0bbc8834
patch 8.0.1598: cannot select text in a terminal with the mouse
Christian Brabandt <cb@256bit.org>
parents:
13444
diff
changeset
|
1096 case K_LEFTRELEASE: |
|
a62b0bbc8834
patch 8.0.1598: cannot select text in a terminal with the mouse
Christian Brabandt <cb@256bit.org>
parents:
13444
diff
changeset
|
1097 case K_LEFTRELEASE_NM: term_send_mouse(vterm, 1, 0); break; |
|
a62b0bbc8834
patch 8.0.1598: cannot select text in a terminal with the mouse
Christian Brabandt <cb@256bit.org>
parents:
13444
diff
changeset
|
1098 case K_MOUSEMOVE: term_send_mouse(vterm, 0, 0); break; |
|
a62b0bbc8834
patch 8.0.1598: cannot select text in a terminal with the mouse
Christian Brabandt <cb@256bit.org>
parents:
13444
diff
changeset
|
1099 case K_MIDDLEMOUSE: term_send_mouse(vterm, 2, 1); break; |
|
a62b0bbc8834
patch 8.0.1598: cannot select text in a terminal with the mouse
Christian Brabandt <cb@256bit.org>
parents:
13444
diff
changeset
|
1100 case K_MIDDLEDRAG: term_send_mouse(vterm, 2, 1); break; |
|
a62b0bbc8834
patch 8.0.1598: cannot select text in a terminal with the mouse
Christian Brabandt <cb@256bit.org>
parents:
13444
diff
changeset
|
1101 case K_MIDDLERELEASE: term_send_mouse(vterm, 2, 0); break; |
|
a62b0bbc8834
patch 8.0.1598: cannot select text in a terminal with the mouse
Christian Brabandt <cb@256bit.org>
parents:
13444
diff
changeset
|
1102 case K_RIGHTMOUSE: term_send_mouse(vterm, 3, 1); break; |
|
a62b0bbc8834
patch 8.0.1598: cannot select text in a terminal with the mouse
Christian Brabandt <cb@256bit.org>
parents:
13444
diff
changeset
|
1103 case K_RIGHTDRAG: term_send_mouse(vterm, 3, 1); break; |
|
a62b0bbc8834
patch 8.0.1598: cannot select text in a terminal with the mouse
Christian Brabandt <cb@256bit.org>
parents:
13444
diff
changeset
|
1104 case K_RIGHTRELEASE: term_send_mouse(vterm, 3, 0); break; |
|
a62b0bbc8834
patch 8.0.1598: cannot select text in a terminal with the mouse
Christian Brabandt <cb@256bit.org>
parents:
13444
diff
changeset
|
1105 } |
|
a62b0bbc8834
patch 8.0.1598: cannot select text in a terminal with the mouse
Christian Brabandt <cb@256bit.org>
parents:
13444
diff
changeset
|
1106 return TRUE; |
|
a62b0bbc8834
patch 8.0.1598: cannot select text in a terminal with the mouse
Christian Brabandt <cb@256bit.org>
parents:
13444
diff
changeset
|
1107 } |
|
a62b0bbc8834
patch 8.0.1598: cannot select text in a terminal with the mouse
Christian Brabandt <cb@256bit.org>
parents:
13444
diff
changeset
|
1108 |
| 12502 | 1109 /* |
| 1110 * Convert typed key "c" into bytes to send to the job. | |
| 1111 * Return the number of bytes in "buf". | |
| 1112 */ | |
| 1113 static int | |
| 1114 term_convert_key(term_T *term, int c, char *buf) | |
| 1115 { | |
| 1116 VTerm *vterm = term->tl_vterm; | |
| 1117 VTermKey key = VTERM_KEY_NONE; | |
| 1118 VTermModifier mod = VTERM_MOD_NONE; | |
|
12845
15696054bc6c
patch 8.0.1299: bracketed paste does not work well in terminal window
Christian Brabandt <cb@256bit.org>
parents:
12800
diff
changeset
|
1119 int other = FALSE; |
| 12502 | 1120 |
| 1121 switch (c) | |
| 1122 { | |
|
12800
8dfeed7e07e7
patch 8.0.1277: terminal window CR-NL conversions may cause problems
Christian Brabandt <cb@256bit.org>
parents:
12798
diff
changeset
|
1123 /* don't use VTERM_KEY_ENTER, it may do an unwanted conversion */ |
|
8dfeed7e07e7
patch 8.0.1277: terminal window CR-NL conversions may cause problems
Christian Brabandt <cb@256bit.org>
parents:
12798
diff
changeset
|
1124 |
| 12502 | 1125 /* don't use VTERM_KEY_BACKSPACE, it always |
| 1126 * becomes 0x7f DEL */ | |
| 1127 case K_BS: c = term_backspace_char; break; | |
| 1128 | |
| 1129 case ESC: key = VTERM_KEY_ESCAPE; break; | |
| 1130 case K_DEL: key = VTERM_KEY_DEL; break; | |
| 1131 case K_DOWN: key = VTERM_KEY_DOWN; break; | |
| 1132 case K_S_DOWN: mod = VTERM_MOD_SHIFT; | |
| 1133 key = VTERM_KEY_DOWN; break; | |
| 1134 case K_END: key = VTERM_KEY_END; break; | |
| 1135 case K_S_END: mod = VTERM_MOD_SHIFT; | |
| 1136 key = VTERM_KEY_END; break; | |
| 1137 case K_C_END: mod = VTERM_MOD_CTRL; | |
| 1138 key = VTERM_KEY_END; break; | |
| 1139 case K_F10: key = VTERM_KEY_FUNCTION(10); break; | |
| 1140 case K_F11: key = VTERM_KEY_FUNCTION(11); break; | |
| 1141 case K_F12: key = VTERM_KEY_FUNCTION(12); break; | |
| 1142 case K_F1: key = VTERM_KEY_FUNCTION(1); break; | |
| 1143 case K_F2: key = VTERM_KEY_FUNCTION(2); break; | |
| 1144 case K_F3: key = VTERM_KEY_FUNCTION(3); break; | |
| 1145 case K_F4: key = VTERM_KEY_FUNCTION(4); break; | |
| 1146 case K_F5: key = VTERM_KEY_FUNCTION(5); break; | |
| 1147 case K_F6: key = VTERM_KEY_FUNCTION(6); break; | |
| 1148 case K_F7: key = VTERM_KEY_FUNCTION(7); break; | |
| 1149 case K_F8: key = VTERM_KEY_FUNCTION(8); break; | |
| 1150 case K_F9: key = VTERM_KEY_FUNCTION(9); break; | |
| 1151 case K_HOME: key = VTERM_KEY_HOME; break; | |
| 1152 case K_S_HOME: mod = VTERM_MOD_SHIFT; | |
| 1153 key = VTERM_KEY_HOME; break; | |
| 1154 case K_C_HOME: mod = VTERM_MOD_CTRL; | |
| 1155 key = VTERM_KEY_HOME; break; | |
| 1156 case K_INS: key = VTERM_KEY_INS; break; | |
| 1157 case K_K0: key = VTERM_KEY_KP_0; break; | |
| 1158 case K_K1: key = VTERM_KEY_KP_1; break; | |
| 1159 case K_K2: key = VTERM_KEY_KP_2; break; | |
| 1160 case K_K3: key = VTERM_KEY_KP_3; break; | |
| 1161 case K_K4: key = VTERM_KEY_KP_4; break; | |
| 1162 case K_K5: key = VTERM_KEY_KP_5; break; | |
| 1163 case K_K6: key = VTERM_KEY_KP_6; break; | |
| 1164 case K_K7: key = VTERM_KEY_KP_7; break; | |
| 1165 case K_K8: key = VTERM_KEY_KP_8; break; | |
| 1166 case K_K9: key = VTERM_KEY_KP_9; break; | |
| 1167 case K_KDEL: key = VTERM_KEY_DEL; break; /* TODO */ | |
| 1168 case K_KDIVIDE: key = VTERM_KEY_KP_DIVIDE; break; | |
| 1169 case K_KEND: key = VTERM_KEY_KP_1; break; /* TODO */ | |
| 1170 case K_KENTER: key = VTERM_KEY_KP_ENTER; break; | |
| 1171 case K_KHOME: key = VTERM_KEY_KP_7; break; /* TODO */ | |
| 1172 case K_KINS: key = VTERM_KEY_KP_0; break; /* TODO */ | |
| 1173 case K_KMINUS: key = VTERM_KEY_KP_MINUS; break; | |
| 1174 case K_KMULTIPLY: key = VTERM_KEY_KP_MULT; break; | |
| 1175 case K_KPAGEDOWN: key = VTERM_KEY_KP_3; break; /* TODO */ | |
| 1176 case K_KPAGEUP: key = VTERM_KEY_KP_9; break; /* TODO */ | |
| 1177 case K_KPLUS: key = VTERM_KEY_KP_PLUS; break; | |
| 1178 case K_KPOINT: key = VTERM_KEY_KP_PERIOD; break; | |
| 1179 case K_LEFT: key = VTERM_KEY_LEFT; break; | |
| 1180 case K_S_LEFT: mod = VTERM_MOD_SHIFT; | |
| 1181 key = VTERM_KEY_LEFT; break; | |
| 1182 case K_C_LEFT: mod = VTERM_MOD_CTRL; | |
| 1183 key = VTERM_KEY_LEFT; break; | |
| 1184 case K_PAGEDOWN: key = VTERM_KEY_PAGEDOWN; break; | |
| 1185 case K_PAGEUP: key = VTERM_KEY_PAGEUP; break; | |
| 1186 case K_RIGHT: key = VTERM_KEY_RIGHT; break; | |
| 1187 case K_S_RIGHT: mod = VTERM_MOD_SHIFT; | |
| 1188 key = VTERM_KEY_RIGHT; break; | |
| 1189 case K_C_RIGHT: mod = VTERM_MOD_CTRL; | |
| 1190 key = VTERM_KEY_RIGHT; break; | |
| 1191 case K_UP: key = VTERM_KEY_UP; break; | |
| 1192 case K_S_UP: mod = VTERM_MOD_SHIFT; | |
| 1193 key = VTERM_KEY_UP; break; | |
| 1194 case TAB: key = VTERM_KEY_TAB; break; | |
|
13294
5fc59833a748
patch 8.0.1521: Shift-Tab does not work in a terminal window
Christian Brabandt <cb@256bit.org>
parents:
13292
diff
changeset
|
1195 case K_S_TAB: mod = VTERM_MOD_SHIFT; |
|
5fc59833a748
patch 8.0.1521: Shift-Tab does not work in a terminal window
Christian Brabandt <cb@256bit.org>
parents:
13292
diff
changeset
|
1196 key = VTERM_KEY_TAB; break; |
| 12502 | 1197 |
|
12845
15696054bc6c
patch 8.0.1299: bracketed paste does not work well in terminal window
Christian Brabandt <cb@256bit.org>
parents:
12800
diff
changeset
|
1198 case K_MOUSEUP: other = term_send_mouse(vterm, 5, 1); break; |
|
15696054bc6c
patch 8.0.1299: bracketed paste does not work well in terminal window
Christian Brabandt <cb@256bit.org>
parents:
12800
diff
changeset
|
1199 case K_MOUSEDOWN: other = term_send_mouse(vterm, 4, 1); break; |
| 12502 | 1200 case K_MOUSELEFT: /* TODO */ return 0; |
| 1201 case K_MOUSERIGHT: /* TODO */ return 0; | |
| 1202 | |
| 1203 case K_LEFTMOUSE: | |
|
13448
a62b0bbc8834
patch 8.0.1598: cannot select text in a terminal with the mouse
Christian Brabandt <cb@256bit.org>
parents:
13444
diff
changeset
|
1204 case K_LEFTMOUSE_NM: |
|
a62b0bbc8834
patch 8.0.1598: cannot select text in a terminal with the mouse
Christian Brabandt <cb@256bit.org>
parents:
13444
diff
changeset
|
1205 case K_LEFTDRAG: |
| 12502 | 1206 case K_LEFTRELEASE: |
|
13448
a62b0bbc8834
patch 8.0.1598: cannot select text in a terminal with the mouse
Christian Brabandt <cb@256bit.org>
parents:
13444
diff
changeset
|
1207 case K_LEFTRELEASE_NM: |
|
a62b0bbc8834
patch 8.0.1598: cannot select text in a terminal with the mouse
Christian Brabandt <cb@256bit.org>
parents:
13444
diff
changeset
|
1208 case K_MOUSEMOVE: |
|
a62b0bbc8834
patch 8.0.1598: cannot select text in a terminal with the mouse
Christian Brabandt <cb@256bit.org>
parents:
13444
diff
changeset
|
1209 case K_MIDDLEMOUSE: |
|
a62b0bbc8834
patch 8.0.1598: cannot select text in a terminal with the mouse
Christian Brabandt <cb@256bit.org>
parents:
13444
diff
changeset
|
1210 case K_MIDDLEDRAG: |
|
a62b0bbc8834
patch 8.0.1598: cannot select text in a terminal with the mouse
Christian Brabandt <cb@256bit.org>
parents:
13444
diff
changeset
|
1211 case K_MIDDLERELEASE: |
|
a62b0bbc8834
patch 8.0.1598: cannot select text in a terminal with the mouse
Christian Brabandt <cb@256bit.org>
parents:
13444
diff
changeset
|
1212 case K_RIGHTMOUSE: |
|
a62b0bbc8834
patch 8.0.1598: cannot select text in a terminal with the mouse
Christian Brabandt <cb@256bit.org>
parents:
13444
diff
changeset
|
1213 case K_RIGHTDRAG: |
|
a62b0bbc8834
patch 8.0.1598: cannot select text in a terminal with the mouse
Christian Brabandt <cb@256bit.org>
parents:
13444
diff
changeset
|
1214 case K_RIGHTRELEASE: if (!term_mouse_click(vterm, c)) |
|
a62b0bbc8834
patch 8.0.1598: cannot select text in a terminal with the mouse
Christian Brabandt <cb@256bit.org>
parents:
13444
diff
changeset
|
1215 return 0; |
|
a62b0bbc8834
patch 8.0.1598: cannot select text in a terminal with the mouse
Christian Brabandt <cb@256bit.org>
parents:
13444
diff
changeset
|
1216 other = TRUE; |
|
a62b0bbc8834
patch 8.0.1598: cannot select text in a terminal with the mouse
Christian Brabandt <cb@256bit.org>
parents:
13444
diff
changeset
|
1217 break; |
|
a62b0bbc8834
patch 8.0.1598: cannot select text in a terminal with the mouse
Christian Brabandt <cb@256bit.org>
parents:
13444
diff
changeset
|
1218 |
| 12502 | 1219 case K_X1MOUSE: /* TODO */ return 0; |
| 1220 case K_X1DRAG: /* TODO */ return 0; | |
| 1221 case K_X1RELEASE: /* TODO */ return 0; | |
| 1222 case K_X2MOUSE: /* TODO */ return 0; | |
| 1223 case K_X2DRAG: /* TODO */ return 0; | |
| 1224 case K_X2RELEASE: /* TODO */ return 0; | |
| 1225 | |
| 1226 case K_IGNORE: return 0; | |
| 1227 case K_NOP: return 0; | |
| 1228 case K_UNDO: return 0; | |
| 1229 case K_HELP: return 0; | |
| 1230 case K_XF1: key = VTERM_KEY_FUNCTION(1); break; | |
| 1231 case K_XF2: key = VTERM_KEY_FUNCTION(2); break; | |
| 1232 case K_XF3: key = VTERM_KEY_FUNCTION(3); break; | |
| 1233 case K_XF4: key = VTERM_KEY_FUNCTION(4); break; | |
| 1234 case K_SELECT: return 0; | |
| 1235 #ifdef FEAT_GUI | |
| 1236 case K_VER_SCROLLBAR: return 0; | |
| 1237 case K_HOR_SCROLLBAR: return 0; | |
| 1238 #endif | |
| 1239 #ifdef FEAT_GUI_TABLINE | |
| 1240 case K_TABLINE: return 0; | |
| 1241 case K_TABMENU: return 0; | |
| 1242 #endif | |
| 1243 #ifdef FEAT_NETBEANS_INTG | |
| 1244 case K_F21: key = VTERM_KEY_FUNCTION(21); break; | |
| 1245 #endif | |
| 1246 #ifdef FEAT_DND | |
| 1247 case K_DROP: return 0; | |
| 1248 #endif | |
| 1249 case K_CURSORHOLD: return 0; | |
|
12845
15696054bc6c
patch 8.0.1299: bracketed paste does not work well in terminal window
Christian Brabandt <cb@256bit.org>
parents:
12800
diff
changeset
|
1250 case K_PS: vterm_keyboard_start_paste(vterm); |
|
15696054bc6c
patch 8.0.1299: bracketed paste does not work well in terminal window
Christian Brabandt <cb@256bit.org>
parents:
12800
diff
changeset
|
1251 other = TRUE; |
|
15696054bc6c
patch 8.0.1299: bracketed paste does not work well in terminal window
Christian Brabandt <cb@256bit.org>
parents:
12800
diff
changeset
|
1252 break; |
|
15696054bc6c
patch 8.0.1299: bracketed paste does not work well in terminal window
Christian Brabandt <cb@256bit.org>
parents:
12800
diff
changeset
|
1253 case K_PE: vterm_keyboard_end_paste(vterm); |
|
15696054bc6c
patch 8.0.1299: bracketed paste does not work well in terminal window
Christian Brabandt <cb@256bit.org>
parents:
12800
diff
changeset
|
1254 other = TRUE; |
|
15696054bc6c
patch 8.0.1299: bracketed paste does not work well in terminal window
Christian Brabandt <cb@256bit.org>
parents:
12800
diff
changeset
|
1255 break; |
| 12502 | 1256 } |
| 1257 | |
| 1258 /* | |
| 1259 * Convert special keys to vterm keys: | |
| 1260 * - Write keys to vterm: vterm_keyboard_key() | |
| 1261 * - Write output to channel. | |
| 1262 * TODO: use mod_mask | |
| 1263 */ | |
| 1264 if (key != VTERM_KEY_NONE) | |
| 1265 /* Special key, let vterm convert it. */ | |
| 1266 vterm_keyboard_key(vterm, key, mod); | |
|
12845
15696054bc6c
patch 8.0.1299: bracketed paste does not work well in terminal window
Christian Brabandt <cb@256bit.org>
parents:
12800
diff
changeset
|
1267 else if (!other) |
| 12502 | 1268 /* Normal character, let vterm convert it. */ |
| 1269 vterm_keyboard_unichar(vterm, c, mod); | |
| 1270 | |
| 1271 /* Read back the converted escape sequence. */ | |
| 1272 return (int)vterm_output_read(vterm, buf, KEY_BUF_LEN); | |
| 1273 } | |
| 1274 | |
| 1275 /* | |
| 1276 * Return TRUE if the job for "term" is still running. | |
|
13696
3b1cfbc70b43
patch 8.0.1720: when a timer is running a terminal window may not close
Christian Brabandt <cb@256bit.org>
parents:
13686
diff
changeset
|
1277 * If "check_job_status" is TRUE update the job status. |
|
3b1cfbc70b43
patch 8.0.1720: when a timer is running a terminal window may not close
Christian Brabandt <cb@256bit.org>
parents:
13686
diff
changeset
|
1278 */ |
|
3b1cfbc70b43
patch 8.0.1720: when a timer is running a terminal window may not close
Christian Brabandt <cb@256bit.org>
parents:
13686
diff
changeset
|
1279 static int |
|
3b1cfbc70b43
patch 8.0.1720: when a timer is running a terminal window may not close
Christian Brabandt <cb@256bit.org>
parents:
13686
diff
changeset
|
1280 term_job_running_check(term_T *term, int check_job_status) |
|
3b1cfbc70b43
patch 8.0.1720: when a timer is running a terminal window may not close
Christian Brabandt <cb@256bit.org>
parents:
13686
diff
changeset
|
1281 { |
|
3b1cfbc70b43
patch 8.0.1720: when a timer is running a terminal window may not close
Christian Brabandt <cb@256bit.org>
parents:
13686
diff
changeset
|
1282 /* Also consider the job finished when the channel is closed, to avoid a |
|
3b1cfbc70b43
patch 8.0.1720: when a timer is running a terminal window may not close
Christian Brabandt <cb@256bit.org>
parents:
13686
diff
changeset
|
1283 * race condition when updating the title. */ |
|
3b1cfbc70b43
patch 8.0.1720: when a timer is running a terminal window may not close
Christian Brabandt <cb@256bit.org>
parents:
13686
diff
changeset
|
1284 if (term != NULL |
|
3b1cfbc70b43
patch 8.0.1720: when a timer is running a terminal window may not close
Christian Brabandt <cb@256bit.org>
parents:
13686
diff
changeset
|
1285 && term->tl_job != NULL |
|
3b1cfbc70b43
patch 8.0.1720: when a timer is running a terminal window may not close
Christian Brabandt <cb@256bit.org>
parents:
13686
diff
changeset
|
1286 && channel_is_open(term->tl_job->jv_channel)) |
|
3b1cfbc70b43
patch 8.0.1720: when a timer is running a terminal window may not close
Christian Brabandt <cb@256bit.org>
parents:
13686
diff
changeset
|
1287 { |
|
3b1cfbc70b43
patch 8.0.1720: when a timer is running a terminal window may not close
Christian Brabandt <cb@256bit.org>
parents:
13686
diff
changeset
|
1288 if (check_job_status) |
|
3b1cfbc70b43
patch 8.0.1720: when a timer is running a terminal window may not close
Christian Brabandt <cb@256bit.org>
parents:
13686
diff
changeset
|
1289 job_status(term->tl_job); |
|
3b1cfbc70b43
patch 8.0.1720: when a timer is running a terminal window may not close
Christian Brabandt <cb@256bit.org>
parents:
13686
diff
changeset
|
1290 return (term->tl_job->jv_status == JOB_STARTED |
|
3b1cfbc70b43
patch 8.0.1720: when a timer is running a terminal window may not close
Christian Brabandt <cb@256bit.org>
parents:
13686
diff
changeset
|
1291 || term->tl_job->jv_channel->ch_keep_open); |
|
3b1cfbc70b43
patch 8.0.1720: when a timer is running a terminal window may not close
Christian Brabandt <cb@256bit.org>
parents:
13686
diff
changeset
|
1292 } |
|
3b1cfbc70b43
patch 8.0.1720: when a timer is running a terminal window may not close
Christian Brabandt <cb@256bit.org>
parents:
13686
diff
changeset
|
1293 return FALSE; |
|
3b1cfbc70b43
patch 8.0.1720: when a timer is running a terminal window may not close
Christian Brabandt <cb@256bit.org>
parents:
13686
diff
changeset
|
1294 } |
|
3b1cfbc70b43
patch 8.0.1720: when a timer is running a terminal window may not close
Christian Brabandt <cb@256bit.org>
parents:
13686
diff
changeset
|
1295 |
|
3b1cfbc70b43
patch 8.0.1720: when a timer is running a terminal window may not close
Christian Brabandt <cb@256bit.org>
parents:
13686
diff
changeset
|
1296 /* |
|
3b1cfbc70b43
patch 8.0.1720: when a timer is running a terminal window may not close
Christian Brabandt <cb@256bit.org>
parents:
13686
diff
changeset
|
1297 * Return TRUE if the job for "term" is still running. |
| 12502 | 1298 */ |
| 1299 int | |
| 1300 term_job_running(term_T *term) | |
| 1301 { | |
|
13696
3b1cfbc70b43
patch 8.0.1720: when a timer is running a terminal window may not close
Christian Brabandt <cb@256bit.org>
parents:
13686
diff
changeset
|
1302 return term_job_running_check(term, FALSE); |
| 12502 | 1303 } |
| 1304 | |
| 1305 /* | |
| 1306 * Return TRUE if "term" has an active channel and used ":term NONE". | |
| 1307 */ | |
| 1308 int | |
| 1309 term_none_open(term_T *term) | |
| 1310 { | |
| 1311 /* Also consider the job finished when the channel is closed, to avoid a | |
| 1312 * race condition when updating the title. */ | |
| 1313 return term != NULL | |
| 1314 && term->tl_job != NULL | |
| 1315 && channel_is_open(term->tl_job->jv_channel) | |
| 1316 && term->tl_job->jv_channel->ch_keep_open; | |
| 1317 } | |
| 1318 | |
| 1319 /* | |
|
13438
33eea5ce5415
patch 8.0.1593: :qall never exits with an active terminal window
Christian Brabandt <cb@256bit.org>
parents:
13435
diff
changeset
|
1320 * Used when exiting: kill the job in "buf" if so desired. |
|
33eea5ce5415
patch 8.0.1593: :qall never exits with an active terminal window
Christian Brabandt <cb@256bit.org>
parents:
13435
diff
changeset
|
1321 * Return OK when the job finished. |
|
33eea5ce5415
patch 8.0.1593: :qall never exits with an active terminal window
Christian Brabandt <cb@256bit.org>
parents:
13435
diff
changeset
|
1322 * Return FAIL when the job is still running. |
|
33eea5ce5415
patch 8.0.1593: :qall never exits with an active terminal window
Christian Brabandt <cb@256bit.org>
parents:
13435
diff
changeset
|
1323 */ |
|
33eea5ce5415
patch 8.0.1593: :qall never exits with an active terminal window
Christian Brabandt <cb@256bit.org>
parents:
13435
diff
changeset
|
1324 int |
|
33eea5ce5415
patch 8.0.1593: :qall never exits with an active terminal window
Christian Brabandt <cb@256bit.org>
parents:
13435
diff
changeset
|
1325 term_try_stop_job(buf_T *buf) |
|
33eea5ce5415
patch 8.0.1593: :qall never exits with an active terminal window
Christian Brabandt <cb@256bit.org>
parents:
13435
diff
changeset
|
1326 { |
|
33eea5ce5415
patch 8.0.1593: :qall never exits with an active terminal window
Christian Brabandt <cb@256bit.org>
parents:
13435
diff
changeset
|
1327 int count; |
|
33eea5ce5415
patch 8.0.1593: :qall never exits with an active terminal window
Christian Brabandt <cb@256bit.org>
parents:
13435
diff
changeset
|
1328 char *how = (char *)buf->b_term->tl_kill; |
|
33eea5ce5415
patch 8.0.1593: :qall never exits with an active terminal window
Christian Brabandt <cb@256bit.org>
parents:
13435
diff
changeset
|
1329 |
|
33eea5ce5415
patch 8.0.1593: :qall never exits with an active terminal window
Christian Brabandt <cb@256bit.org>
parents:
13435
diff
changeset
|
1330 #if defined(FEAT_GUI_DIALOG) || defined(FEAT_CON_DIALOG) |
|
33eea5ce5415
patch 8.0.1593: :qall never exits with an active terminal window
Christian Brabandt <cb@256bit.org>
parents:
13435
diff
changeset
|
1331 if ((how == NULL || *how == NUL) && (p_confirm || cmdmod.confirm)) |
|
33eea5ce5415
patch 8.0.1593: :qall never exits with an active terminal window
Christian Brabandt <cb@256bit.org>
parents:
13435
diff
changeset
|
1332 { |
|
33eea5ce5415
patch 8.0.1593: :qall never exits with an active terminal window
Christian Brabandt <cb@256bit.org>
parents:
13435
diff
changeset
|
1333 char_u buff[DIALOG_MSG_SIZE]; |
|
33eea5ce5415
patch 8.0.1593: :qall never exits with an active terminal window
Christian Brabandt <cb@256bit.org>
parents:
13435
diff
changeset
|
1334 int ret; |
|
33eea5ce5415
patch 8.0.1593: :qall never exits with an active terminal window
Christian Brabandt <cb@256bit.org>
parents:
13435
diff
changeset
|
1335 |
|
33eea5ce5415
patch 8.0.1593: :qall never exits with an active terminal window
Christian Brabandt <cb@256bit.org>
parents:
13435
diff
changeset
|
1336 dialog_msg(buff, _("Kill job in \"%s\"?"), buf->b_fname); |
|
33eea5ce5415
patch 8.0.1593: :qall never exits with an active terminal window
Christian Brabandt <cb@256bit.org>
parents:
13435
diff
changeset
|
1337 ret = vim_dialog_yesnocancel(VIM_QUESTION, NULL, buff, 1); |
|
33eea5ce5415
patch 8.0.1593: :qall never exits with an active terminal window
Christian Brabandt <cb@256bit.org>
parents:
13435
diff
changeset
|
1338 if (ret == VIM_YES) |
|
33eea5ce5415
patch 8.0.1593: :qall never exits with an active terminal window
Christian Brabandt <cb@256bit.org>
parents:
13435
diff
changeset
|
1339 how = "kill"; |
|
33eea5ce5415
patch 8.0.1593: :qall never exits with an active terminal window
Christian Brabandt <cb@256bit.org>
parents:
13435
diff
changeset
|
1340 else if (ret == VIM_CANCEL) |
|
33eea5ce5415
patch 8.0.1593: :qall never exits with an active terminal window
Christian Brabandt <cb@256bit.org>
parents:
13435
diff
changeset
|
1341 return FAIL; |
|
33eea5ce5415
patch 8.0.1593: :qall never exits with an active terminal window
Christian Brabandt <cb@256bit.org>
parents:
13435
diff
changeset
|
1342 } |
|
33eea5ce5415
patch 8.0.1593: :qall never exits with an active terminal window
Christian Brabandt <cb@256bit.org>
parents:
13435
diff
changeset
|
1343 #endif |
|
33eea5ce5415
patch 8.0.1593: :qall never exits with an active terminal window
Christian Brabandt <cb@256bit.org>
parents:
13435
diff
changeset
|
1344 if (how == NULL || *how == NUL) |
|
33eea5ce5415
patch 8.0.1593: :qall never exits with an active terminal window
Christian Brabandt <cb@256bit.org>
parents:
13435
diff
changeset
|
1345 return FAIL; |
|
33eea5ce5415
patch 8.0.1593: :qall never exits with an active terminal window
Christian Brabandt <cb@256bit.org>
parents:
13435
diff
changeset
|
1346 |
|
33eea5ce5415
patch 8.0.1593: :qall never exits with an active terminal window
Christian Brabandt <cb@256bit.org>
parents:
13435
diff
changeset
|
1347 job_stop(buf->b_term->tl_job, NULL, how); |
|
33eea5ce5415
patch 8.0.1593: :qall never exits with an active terminal window
Christian Brabandt <cb@256bit.org>
parents:
13435
diff
changeset
|
1348 |
|
33eea5ce5415
patch 8.0.1593: :qall never exits with an active terminal window
Christian Brabandt <cb@256bit.org>
parents:
13435
diff
changeset
|
1349 /* wait for up to a second for the job to die */ |
|
33eea5ce5415
patch 8.0.1593: :qall never exits with an active terminal window
Christian Brabandt <cb@256bit.org>
parents:
13435
diff
changeset
|
1350 for (count = 0; count < 100; ++count) |
|
33eea5ce5415
patch 8.0.1593: :qall never exits with an active terminal window
Christian Brabandt <cb@256bit.org>
parents:
13435
diff
changeset
|
1351 { |
|
33eea5ce5415
patch 8.0.1593: :qall never exits with an active terminal window
Christian Brabandt <cb@256bit.org>
parents:
13435
diff
changeset
|
1352 /* buffer, terminal and job may be cleaned up while waiting */ |
|
33eea5ce5415
patch 8.0.1593: :qall never exits with an active terminal window
Christian Brabandt <cb@256bit.org>
parents:
13435
diff
changeset
|
1353 if (!buf_valid(buf) |
|
33eea5ce5415
patch 8.0.1593: :qall never exits with an active terminal window
Christian Brabandt <cb@256bit.org>
parents:
13435
diff
changeset
|
1354 || buf->b_term == NULL |
|
33eea5ce5415
patch 8.0.1593: :qall never exits with an active terminal window
Christian Brabandt <cb@256bit.org>
parents:
13435
diff
changeset
|
1355 || buf->b_term->tl_job == NULL) |
|
33eea5ce5415
patch 8.0.1593: :qall never exits with an active terminal window
Christian Brabandt <cb@256bit.org>
parents:
13435
diff
changeset
|
1356 return OK; |
|
33eea5ce5415
patch 8.0.1593: :qall never exits with an active terminal window
Christian Brabandt <cb@256bit.org>
parents:
13435
diff
changeset
|
1357 |
|
33eea5ce5415
patch 8.0.1593: :qall never exits with an active terminal window
Christian Brabandt <cb@256bit.org>
parents:
13435
diff
changeset
|
1358 /* call job_status() to update jv_status */ |
|
33eea5ce5415
patch 8.0.1593: :qall never exits with an active terminal window
Christian Brabandt <cb@256bit.org>
parents:
13435
diff
changeset
|
1359 job_status(buf->b_term->tl_job); |
|
33eea5ce5415
patch 8.0.1593: :qall never exits with an active terminal window
Christian Brabandt <cb@256bit.org>
parents:
13435
diff
changeset
|
1360 if (buf->b_term->tl_job->jv_status >= JOB_ENDED) |
|
33eea5ce5415
patch 8.0.1593: :qall never exits with an active terminal window
Christian Brabandt <cb@256bit.org>
parents:
13435
diff
changeset
|
1361 return OK; |
|
33eea5ce5415
patch 8.0.1593: :qall never exits with an active terminal window
Christian Brabandt <cb@256bit.org>
parents:
13435
diff
changeset
|
1362 ui_delay(10L, FALSE); |
|
33eea5ce5415
patch 8.0.1593: :qall never exits with an active terminal window
Christian Brabandt <cb@256bit.org>
parents:
13435
diff
changeset
|
1363 mch_check_messages(); |
|
33eea5ce5415
patch 8.0.1593: :qall never exits with an active terminal window
Christian Brabandt <cb@256bit.org>
parents:
13435
diff
changeset
|
1364 parse_queued_messages(); |
|
33eea5ce5415
patch 8.0.1593: :qall never exits with an active terminal window
Christian Brabandt <cb@256bit.org>
parents:
13435
diff
changeset
|
1365 } |
|
33eea5ce5415
patch 8.0.1593: :qall never exits with an active terminal window
Christian Brabandt <cb@256bit.org>
parents:
13435
diff
changeset
|
1366 return FAIL; |
|
33eea5ce5415
patch 8.0.1593: :qall never exits with an active terminal window
Christian Brabandt <cb@256bit.org>
parents:
13435
diff
changeset
|
1367 } |
|
33eea5ce5415
patch 8.0.1593: :qall never exits with an active terminal window
Christian Brabandt <cb@256bit.org>
parents:
13435
diff
changeset
|
1368 |
|
33eea5ce5415
patch 8.0.1593: :qall never exits with an active terminal window
Christian Brabandt <cb@256bit.org>
parents:
13435
diff
changeset
|
1369 /* |
| 12502 | 1370 * Add the last line of the scrollback buffer to the buffer in the window. |
| 1371 */ | |
| 1372 static void | |
| 1373 add_scrollback_line_to_buffer(term_T *term, char_u *text, int len) | |
| 1374 { | |
| 1375 buf_T *buf = term->tl_buffer; | |
| 1376 int empty = (buf->b_ml.ml_flags & ML_EMPTY); | |
| 1377 linenr_T lnum = buf->b_ml.ml_line_count; | |
| 1378 | |
| 1379 #ifdef WIN3264 | |
| 1380 if (!enc_utf8 && enc_codepage > 0) | |
| 1381 { | |
| 1382 WCHAR *ret = NULL; | |
| 1383 int length = 0; | |
| 1384 | |
| 1385 MultiByteToWideChar_alloc(CP_UTF8, 0, (char*)text, len + 1, | |
| 1386 &ret, &length); | |
| 1387 if (ret != NULL) | |
| 1388 { | |
| 1389 WideCharToMultiByte_alloc(enc_codepage, 0, | |
| 1390 ret, length, (char **)&text, &len, 0, 0); | |
| 1391 vim_free(ret); | |
| 1392 ml_append_buf(term->tl_buffer, lnum, text, len, FALSE); | |
| 1393 vim_free(text); | |
| 1394 } | |
| 1395 } | |
| 1396 else | |
| 1397 #endif | |
| 1398 ml_append_buf(term->tl_buffer, lnum, text, len + 1, FALSE); | |
| 1399 if (empty) | |
| 1400 { | |
| 1401 /* Delete the empty line that was in the empty buffer. */ | |
| 1402 curbuf = buf; | |
| 1403 ml_delete(1, FALSE); | |
| 1404 curbuf = curwin->w_buffer; | |
| 1405 } | |
| 1406 } | |
| 1407 | |
| 1408 static void | |
| 1409 cell2cellattr(const VTermScreenCell *cell, cellattr_T *attr) | |
| 1410 { | |
| 1411 attr->width = cell->width; | |
| 1412 attr->attrs = cell->attrs; | |
| 1413 attr->fg = cell->fg; | |
| 1414 attr->bg = cell->bg; | |
| 1415 } | |
| 1416 | |
| 1417 static int | |
| 1418 equal_celattr(cellattr_T *a, cellattr_T *b) | |
| 1419 { | |
| 1420 /* Comparing the colors should be sufficient. */ | |
| 1421 return a->fg.red == b->fg.red | |
| 1422 && a->fg.green == b->fg.green | |
| 1423 && a->fg.blue == b->fg.blue | |
| 1424 && a->bg.red == b->bg.red | |
| 1425 && a->bg.green == b->bg.green | |
| 1426 && a->bg.blue == b->bg.blue; | |
| 1427 } | |
| 1428 | |
|
13298
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
1429 /* |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
1430 * Add an empty scrollback line to "term". When "lnum" is not zero, add the |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
1431 * line at this position. Otherwise at the end. |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
1432 */ |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
1433 static int |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
1434 add_empty_scrollback(term_T *term, cellattr_T *fill_attr, int lnum) |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
1435 { |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
1436 if (ga_grow(&term->tl_scrollback, 1) == OK) |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
1437 { |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
1438 sb_line_T *line = (sb_line_T *)term->tl_scrollback.ga_data |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
1439 + term->tl_scrollback.ga_len; |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
1440 |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
1441 if (lnum > 0) |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
1442 { |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
1443 int i; |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
1444 |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
1445 for (i = 0; i < term->tl_scrollback.ga_len - lnum; ++i) |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
1446 { |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
1447 *line = *(line - 1); |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
1448 --line; |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
1449 } |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
1450 } |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
1451 line->sb_cols = 0; |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
1452 line->sb_cells = NULL; |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
1453 line->sb_fill_attr = *fill_attr; |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
1454 ++term->tl_scrollback.ga_len; |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
1455 return OK; |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
1456 } |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
1457 return FALSE; |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
1458 } |
| 12502 | 1459 |
| 1460 /* | |
|
13878
a590029f16a0
patch 8.0.1810: buffer of a terminal only updated in Terminal-Normal mode
Christian Brabandt <cb@256bit.org>
parents:
13864
diff
changeset
|
1461 * Remove the terminal contents from the scrollback and the buffer. |
|
a590029f16a0
patch 8.0.1810: buffer of a terminal only updated in Terminal-Normal mode
Christian Brabandt <cb@256bit.org>
parents:
13864
diff
changeset
|
1462 * Used before adding a new scrollback line or updating the buffer for lines |
|
a590029f16a0
patch 8.0.1810: buffer of a terminal only updated in Terminal-Normal mode
Christian Brabandt <cb@256bit.org>
parents:
13864
diff
changeset
|
1463 * displayed in the terminal. |
|
a590029f16a0
patch 8.0.1810: buffer of a terminal only updated in Terminal-Normal mode
Christian Brabandt <cb@256bit.org>
parents:
13864
diff
changeset
|
1464 */ |
|
a590029f16a0
patch 8.0.1810: buffer of a terminal only updated in Terminal-Normal mode
Christian Brabandt <cb@256bit.org>
parents:
13864
diff
changeset
|
1465 static void |
|
a590029f16a0
patch 8.0.1810: buffer of a terminal only updated in Terminal-Normal mode
Christian Brabandt <cb@256bit.org>
parents:
13864
diff
changeset
|
1466 cleanup_scrollback(term_T *term) |
|
a590029f16a0
patch 8.0.1810: buffer of a terminal only updated in Terminal-Normal mode
Christian Brabandt <cb@256bit.org>
parents:
13864
diff
changeset
|
1467 { |
|
a590029f16a0
patch 8.0.1810: buffer of a terminal only updated in Terminal-Normal mode
Christian Brabandt <cb@256bit.org>
parents:
13864
diff
changeset
|
1468 sb_line_T *line; |
|
a590029f16a0
patch 8.0.1810: buffer of a terminal only updated in Terminal-Normal mode
Christian Brabandt <cb@256bit.org>
parents:
13864
diff
changeset
|
1469 garray_T *gap; |
|
a590029f16a0
patch 8.0.1810: buffer of a terminal only updated in Terminal-Normal mode
Christian Brabandt <cb@256bit.org>
parents:
13864
diff
changeset
|
1470 |
|
13894
3969c9d3a859
patch 8.0.1818: lines remove from wrong buffer when using terminal window
Christian Brabandt <cb@256bit.org>
parents:
13888
diff
changeset
|
1471 curbuf = term->tl_buffer; |
|
13878
a590029f16a0
patch 8.0.1810: buffer of a terminal only updated in Terminal-Normal mode
Christian Brabandt <cb@256bit.org>
parents:
13864
diff
changeset
|
1472 gap = &term->tl_scrollback; |
|
a590029f16a0
patch 8.0.1810: buffer of a terminal only updated in Terminal-Normal mode
Christian Brabandt <cb@256bit.org>
parents:
13864
diff
changeset
|
1473 while (curbuf->b_ml.ml_line_count > term->tl_scrollback_scrolled |
|
a590029f16a0
patch 8.0.1810: buffer of a terminal only updated in Terminal-Normal mode
Christian Brabandt <cb@256bit.org>
parents:
13864
diff
changeset
|
1474 && gap->ga_len > 0) |
|
a590029f16a0
patch 8.0.1810: buffer of a terminal only updated in Terminal-Normal mode
Christian Brabandt <cb@256bit.org>
parents:
13864
diff
changeset
|
1475 { |
|
a590029f16a0
patch 8.0.1810: buffer of a terminal only updated in Terminal-Normal mode
Christian Brabandt <cb@256bit.org>
parents:
13864
diff
changeset
|
1476 ml_delete(curbuf->b_ml.ml_line_count, FALSE); |
|
a590029f16a0
patch 8.0.1810: buffer of a terminal only updated in Terminal-Normal mode
Christian Brabandt <cb@256bit.org>
parents:
13864
diff
changeset
|
1477 line = (sb_line_T *)gap->ga_data + gap->ga_len - 1; |
|
a590029f16a0
patch 8.0.1810: buffer of a terminal only updated in Terminal-Normal mode
Christian Brabandt <cb@256bit.org>
parents:
13864
diff
changeset
|
1478 vim_free(line->sb_cells); |
|
a590029f16a0
patch 8.0.1810: buffer of a terminal only updated in Terminal-Normal mode
Christian Brabandt <cb@256bit.org>
parents:
13864
diff
changeset
|
1479 --gap->ga_len; |
|
a590029f16a0
patch 8.0.1810: buffer of a terminal only updated in Terminal-Normal mode
Christian Brabandt <cb@256bit.org>
parents:
13864
diff
changeset
|
1480 } |
|
13894
3969c9d3a859
patch 8.0.1818: lines remove from wrong buffer when using terminal window
Christian Brabandt <cb@256bit.org>
parents:
13888
diff
changeset
|
1481 curbuf = curwin->w_buffer; |
|
3969c9d3a859
patch 8.0.1818: lines remove from wrong buffer when using terminal window
Christian Brabandt <cb@256bit.org>
parents:
13888
diff
changeset
|
1482 if (curbuf == term->tl_buffer) |
|
3969c9d3a859
patch 8.0.1818: lines remove from wrong buffer when using terminal window
Christian Brabandt <cb@256bit.org>
parents:
13888
diff
changeset
|
1483 check_cursor(); |
|
13878
a590029f16a0
patch 8.0.1810: buffer of a terminal only updated in Terminal-Normal mode
Christian Brabandt <cb@256bit.org>
parents:
13864
diff
changeset
|
1484 } |
|
a590029f16a0
patch 8.0.1810: buffer of a terminal only updated in Terminal-Normal mode
Christian Brabandt <cb@256bit.org>
parents:
13864
diff
changeset
|
1485 |
|
a590029f16a0
patch 8.0.1810: buffer of a terminal only updated in Terminal-Normal mode
Christian Brabandt <cb@256bit.org>
parents:
13864
diff
changeset
|
1486 /* |
| 12502 | 1487 * Add the current lines of the terminal to scrollback and to the buffer. |
| 1488 */ | |
| 1489 static void | |
|
13919
bfca3dbdbf9e
patch 8.0.1830: switching to Terminal-Normal mode does not redraw
Christian Brabandt <cb@256bit.org>
parents:
13906
diff
changeset
|
1490 update_snapshot(term_T *term) |
| 12502 | 1491 { |
|
13919
bfca3dbdbf9e
patch 8.0.1830: switching to Terminal-Normal mode does not redraw
Christian Brabandt <cb@256bit.org>
parents:
13906
diff
changeset
|
1492 VTermScreen *screen; |
| 12502 | 1493 int len; |
| 1494 int lines_skipped = 0; | |
| 1495 VTermPos pos; | |
| 1496 VTermScreenCell cell; | |
| 1497 cellattr_T fill_attr, new_fill_attr; | |
| 1498 cellattr_T *p; | |
|
13878
a590029f16a0
patch 8.0.1810: buffer of a terminal only updated in Terminal-Normal mode
Christian Brabandt <cb@256bit.org>
parents:
13864
diff
changeset
|
1499 |
|
a590029f16a0
patch 8.0.1810: buffer of a terminal only updated in Terminal-Normal mode
Christian Brabandt <cb@256bit.org>
parents:
13864
diff
changeset
|
1500 ch_log(term->tl_job == NULL ? NULL : term->tl_job->jv_channel, |
|
a590029f16a0
patch 8.0.1810: buffer of a terminal only updated in Terminal-Normal mode
Christian Brabandt <cb@256bit.org>
parents:
13864
diff
changeset
|
1501 "Adding terminal window snapshot to buffer"); |
|
a590029f16a0
patch 8.0.1810: buffer of a terminal only updated in Terminal-Normal mode
Christian Brabandt <cb@256bit.org>
parents:
13864
diff
changeset
|
1502 |
|
a590029f16a0
patch 8.0.1810: buffer of a terminal only updated in Terminal-Normal mode
Christian Brabandt <cb@256bit.org>
parents:
13864
diff
changeset
|
1503 /* First remove the lines that were appended before, they might be |
|
a590029f16a0
patch 8.0.1810: buffer of a terminal only updated in Terminal-Normal mode
Christian Brabandt <cb@256bit.org>
parents:
13864
diff
changeset
|
1504 * outdated. */ |
|
a590029f16a0
patch 8.0.1810: buffer of a terminal only updated in Terminal-Normal mode
Christian Brabandt <cb@256bit.org>
parents:
13864
diff
changeset
|
1505 cleanup_scrollback(term); |
|
a590029f16a0
patch 8.0.1810: buffer of a terminal only updated in Terminal-Normal mode
Christian Brabandt <cb@256bit.org>
parents:
13864
diff
changeset
|
1506 |
| 12502 | 1507 screen = vterm_obtain_screen(term->tl_vterm); |
| 1508 fill_attr = new_fill_attr = term->tl_default_color; | |
| 1509 for (pos.row = 0; pos.row < term->tl_rows; ++pos.row) | |
| 1510 { | |
| 1511 len = 0; | |
| 1512 for (pos.col = 0; pos.col < term->tl_cols; ++pos.col) | |
| 1513 if (vterm_screen_get_cell(screen, pos, &cell) != 0 | |
| 1514 && cell.chars[0] != NUL) | |
| 1515 { | |
| 1516 len = pos.col + 1; | |
| 1517 new_fill_attr = term->tl_default_color; | |
| 1518 } | |
| 1519 else | |
| 1520 /* Assume the last attr is the filler attr. */ | |
| 1521 cell2cellattr(&cell, &new_fill_attr); | |
| 1522 | |
| 1523 if (len == 0 && equal_celattr(&new_fill_attr, &fill_attr)) | |
| 1524 ++lines_skipped; | |
| 1525 else | |
| 1526 { | |
| 1527 while (lines_skipped > 0) | |
| 1528 { | |
| 1529 /* Line was skipped, add an empty line. */ | |
| 1530 --lines_skipped; | |
|
13298
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
1531 if (add_empty_scrollback(term, &fill_attr, 0) == OK) |
| 12502 | 1532 add_scrollback_line_to_buffer(term, (char_u *)"", 0); |
| 1533 } | |
| 1534 | |
| 1535 if (len == 0) | |
| 1536 p = NULL; | |
| 1537 else | |
| 1538 p = (cellattr_T *)alloc((int)sizeof(cellattr_T) * len); | |
| 1539 if ((p != NULL || len == 0) | |
| 1540 && ga_grow(&term->tl_scrollback, 1) == OK) | |
| 1541 { | |
| 1542 garray_T ga; | |
| 1543 int width; | |
| 1544 sb_line_T *line = (sb_line_T *)term->tl_scrollback.ga_data | |
| 1545 + term->tl_scrollback.ga_len; | |
| 1546 | |
| 1547 ga_init2(&ga, 1, 100); | |
| 1548 for (pos.col = 0; pos.col < len; pos.col += width) | |
| 1549 { | |
| 1550 if (vterm_screen_get_cell(screen, pos, &cell) == 0) | |
| 1551 { | |
| 1552 width = 1; | |
| 1553 vim_memset(p + pos.col, 0, sizeof(cellattr_T)); | |
| 1554 if (ga_grow(&ga, 1) == OK) | |
| 1555 ga.ga_len += utf_char2bytes(' ', | |
| 1556 (char_u *)ga.ga_data + ga.ga_len); | |
| 1557 } | |
| 1558 else | |
| 1559 { | |
| 1560 width = cell.width; | |
| 1561 | |
| 1562 cell2cellattr(&cell, &p[pos.col]); | |
| 1563 | |
| 1564 if (ga_grow(&ga, MB_MAXBYTES) == OK) | |
| 1565 { | |
| 1566 int i; | |
| 1567 int c; | |
| 1568 | |
| 1569 for (i = 0; (c = cell.chars[i]) > 0 || i == 0; ++i) | |
| 1570 ga.ga_len += utf_char2bytes(c == NUL ? ' ' : c, | |
| 1571 (char_u *)ga.ga_data + ga.ga_len); | |
| 1572 } | |
| 1573 } | |
| 1574 } | |
| 1575 line->sb_cols = len; | |
| 1576 line->sb_cells = p; | |
| 1577 line->sb_fill_attr = new_fill_attr; | |
| 1578 fill_attr = new_fill_attr; | |
| 1579 ++term->tl_scrollback.ga_len; | |
| 1580 | |
| 1581 if (ga_grow(&ga, 1) == FAIL) | |
| 1582 add_scrollback_line_to_buffer(term, (char_u *)"", 0); | |
| 1583 else | |
| 1584 { | |
| 1585 *((char_u *)ga.ga_data + ga.ga_len) = NUL; | |
| 1586 add_scrollback_line_to_buffer(term, ga.ga_data, ga.ga_len); | |
| 1587 } | |
| 1588 ga_clear(&ga); | |
| 1589 } | |
| 1590 else | |
| 1591 vim_free(p); | |
| 1592 } | |
| 1593 } | |
| 1594 | |
|
15022
f3b4cd98944c
patch 8.1.0522: :terminal does not show trailing empty lines
Bram Moolenaar <Bram@vim.org>
parents:
14960
diff
changeset
|
1595 // Add trailing empty lines. |
|
f3b4cd98944c
patch 8.1.0522: :terminal does not show trailing empty lines
Bram Moolenaar <Bram@vim.org>
parents:
14960
diff
changeset
|
1596 for (pos.row = term->tl_scrollback.ga_len; |
|
f3b4cd98944c
patch 8.1.0522: :terminal does not show trailing empty lines
Bram Moolenaar <Bram@vim.org>
parents:
14960
diff
changeset
|
1597 pos.row < term->tl_scrollback_scrolled + term->tl_cursor_pos.row; |
|
f3b4cd98944c
patch 8.1.0522: :terminal does not show trailing empty lines
Bram Moolenaar <Bram@vim.org>
parents:
14960
diff
changeset
|
1598 ++pos.row) |
|
f3b4cd98944c
patch 8.1.0522: :terminal does not show trailing empty lines
Bram Moolenaar <Bram@vim.org>
parents:
14960
diff
changeset
|
1599 { |
|
f3b4cd98944c
patch 8.1.0522: :terminal does not show trailing empty lines
Bram Moolenaar <Bram@vim.org>
parents:
14960
diff
changeset
|
1600 if (add_empty_scrollback(term, &fill_attr, 0) == OK) |
|
f3b4cd98944c
patch 8.1.0522: :terminal does not show trailing empty lines
Bram Moolenaar <Bram@vim.org>
parents:
14960
diff
changeset
|
1601 add_scrollback_line_to_buffer(term, (char_u *)"", 0); |
|
f3b4cd98944c
patch 8.1.0522: :terminal does not show trailing empty lines
Bram Moolenaar <Bram@vim.org>
parents:
14960
diff
changeset
|
1602 } |
|
f3b4cd98944c
patch 8.1.0522: :terminal does not show trailing empty lines
Bram Moolenaar <Bram@vim.org>
parents:
14960
diff
changeset
|
1603 |
|
13878
a590029f16a0
patch 8.0.1810: buffer of a terminal only updated in Terminal-Normal mode
Christian Brabandt <cb@256bit.org>
parents:
13864
diff
changeset
|
1604 term->tl_dirty_snapshot = FALSE; |
|
a590029f16a0
patch 8.0.1810: buffer of a terminal only updated in Terminal-Normal mode
Christian Brabandt <cb@256bit.org>
parents:
13864
diff
changeset
|
1605 #ifdef FEAT_TIMERS |
|
a590029f16a0
patch 8.0.1810: buffer of a terminal only updated in Terminal-Normal mode
Christian Brabandt <cb@256bit.org>
parents:
13864
diff
changeset
|
1606 term->tl_timer_set = FALSE; |
|
a590029f16a0
patch 8.0.1810: buffer of a terminal only updated in Terminal-Normal mode
Christian Brabandt <cb@256bit.org>
parents:
13864
diff
changeset
|
1607 #endif |
|
13919
bfca3dbdbf9e
patch 8.0.1830: switching to Terminal-Normal mode does not redraw
Christian Brabandt <cb@256bit.org>
parents:
13906
diff
changeset
|
1608 } |
|
bfca3dbdbf9e
patch 8.0.1830: switching to Terminal-Normal mode does not redraw
Christian Brabandt <cb@256bit.org>
parents:
13906
diff
changeset
|
1609 |
|
bfca3dbdbf9e
patch 8.0.1830: switching to Terminal-Normal mode does not redraw
Christian Brabandt <cb@256bit.org>
parents:
13906
diff
changeset
|
1610 /* |
|
bfca3dbdbf9e
patch 8.0.1830: switching to Terminal-Normal mode does not redraw
Christian Brabandt <cb@256bit.org>
parents:
13906
diff
changeset
|
1611 * If needed, add the current lines of the terminal to scrollback and to the |
|
bfca3dbdbf9e
patch 8.0.1830: switching to Terminal-Normal mode does not redraw
Christian Brabandt <cb@256bit.org>
parents:
13906
diff
changeset
|
1612 * buffer. Called after the job has ended and when switching to |
|
bfca3dbdbf9e
patch 8.0.1830: switching to Terminal-Normal mode does not redraw
Christian Brabandt <cb@256bit.org>
parents:
13906
diff
changeset
|
1613 * Terminal-Normal mode. |
|
bfca3dbdbf9e
patch 8.0.1830: switching to Terminal-Normal mode does not redraw
Christian Brabandt <cb@256bit.org>
parents:
13906
diff
changeset
|
1614 * When "redraw" is TRUE redraw the windows that show the terminal. |
|
bfca3dbdbf9e
patch 8.0.1830: switching to Terminal-Normal mode does not redraw
Christian Brabandt <cb@256bit.org>
parents:
13906
diff
changeset
|
1615 */ |
|
bfca3dbdbf9e
patch 8.0.1830: switching to Terminal-Normal mode does not redraw
Christian Brabandt <cb@256bit.org>
parents:
13906
diff
changeset
|
1616 static void |
|
bfca3dbdbf9e
patch 8.0.1830: switching to Terminal-Normal mode does not redraw
Christian Brabandt <cb@256bit.org>
parents:
13906
diff
changeset
|
1617 may_move_terminal_to_buffer(term_T *term, int redraw) |
|
bfca3dbdbf9e
patch 8.0.1830: switching to Terminal-Normal mode does not redraw
Christian Brabandt <cb@256bit.org>
parents:
13906
diff
changeset
|
1618 { |
|
bfca3dbdbf9e
patch 8.0.1830: switching to Terminal-Normal mode does not redraw
Christian Brabandt <cb@256bit.org>
parents:
13906
diff
changeset
|
1619 win_T *wp; |
|
bfca3dbdbf9e
patch 8.0.1830: switching to Terminal-Normal mode does not redraw
Christian Brabandt <cb@256bit.org>
parents:
13906
diff
changeset
|
1620 |
|
bfca3dbdbf9e
patch 8.0.1830: switching to Terminal-Normal mode does not redraw
Christian Brabandt <cb@256bit.org>
parents:
13906
diff
changeset
|
1621 if (term->tl_vterm == NULL) |
|
bfca3dbdbf9e
patch 8.0.1830: switching to Terminal-Normal mode does not redraw
Christian Brabandt <cb@256bit.org>
parents:
13906
diff
changeset
|
1622 return; |
|
bfca3dbdbf9e
patch 8.0.1830: switching to Terminal-Normal mode does not redraw
Christian Brabandt <cb@256bit.org>
parents:
13906
diff
changeset
|
1623 |
|
bfca3dbdbf9e
patch 8.0.1830: switching to Terminal-Normal mode does not redraw
Christian Brabandt <cb@256bit.org>
parents:
13906
diff
changeset
|
1624 /* Update the snapshot only if something changes or the buffer does not |
|
bfca3dbdbf9e
patch 8.0.1830: switching to Terminal-Normal mode does not redraw
Christian Brabandt <cb@256bit.org>
parents:
13906
diff
changeset
|
1625 * have all the lines. */ |
|
bfca3dbdbf9e
patch 8.0.1830: switching to Terminal-Normal mode does not redraw
Christian Brabandt <cb@256bit.org>
parents:
13906
diff
changeset
|
1626 if (term->tl_dirty_snapshot || term->tl_buffer->b_ml.ml_line_count |
|
bfca3dbdbf9e
patch 8.0.1830: switching to Terminal-Normal mode does not redraw
Christian Brabandt <cb@256bit.org>
parents:
13906
diff
changeset
|
1627 <= term->tl_scrollback_scrolled) |
|
bfca3dbdbf9e
patch 8.0.1830: switching to Terminal-Normal mode does not redraw
Christian Brabandt <cb@256bit.org>
parents:
13906
diff
changeset
|
1628 update_snapshot(term); |
|
13878
a590029f16a0
patch 8.0.1810: buffer of a terminal only updated in Terminal-Normal mode
Christian Brabandt <cb@256bit.org>
parents:
13864
diff
changeset
|
1629 |
| 12502 | 1630 /* Obtain the current background color. */ |
| 1631 vterm_state_get_default_colors(vterm_obtain_state(term->tl_vterm), | |
| 1632 &term->tl_default_color.fg, &term->tl_default_color.bg); | |
| 1633 | |
|
13919
bfca3dbdbf9e
patch 8.0.1830: switching to Terminal-Normal mode does not redraw
Christian Brabandt <cb@256bit.org>
parents:
13906
diff
changeset
|
1634 if (redraw) |
|
13900
f71ed35527eb
patch 8.0.1821: cursor in terminal window moves when pressing CTRL-W
Christian Brabandt <cb@256bit.org>
parents:
13894
diff
changeset
|
1635 FOR_ALL_WINDOWS(wp) |
| 12502 | 1636 { |
|
13900
f71ed35527eb
patch 8.0.1821: cursor in terminal window moves when pressing CTRL-W
Christian Brabandt <cb@256bit.org>
parents:
13894
diff
changeset
|
1637 if (wp->w_buffer == term->tl_buffer) |
| 12502 | 1638 { |
|
13900
f71ed35527eb
patch 8.0.1821: cursor in terminal window moves when pressing CTRL-W
Christian Brabandt <cb@256bit.org>
parents:
13894
diff
changeset
|
1639 wp->w_cursor.lnum = term->tl_buffer->b_ml.ml_line_count; |
|
f71ed35527eb
patch 8.0.1821: cursor in terminal window moves when pressing CTRL-W
Christian Brabandt <cb@256bit.org>
parents:
13894
diff
changeset
|
1640 wp->w_cursor.col = 0; |
|
f71ed35527eb
patch 8.0.1821: cursor in terminal window moves when pressing CTRL-W
Christian Brabandt <cb@256bit.org>
parents:
13894
diff
changeset
|
1641 wp->w_valid = 0; |
|
f71ed35527eb
patch 8.0.1821: cursor in terminal window moves when pressing CTRL-W
Christian Brabandt <cb@256bit.org>
parents:
13894
diff
changeset
|
1642 if (wp->w_cursor.lnum >= wp->w_height) |
|
f71ed35527eb
patch 8.0.1821: cursor in terminal window moves when pressing CTRL-W
Christian Brabandt <cb@256bit.org>
parents:
13894
diff
changeset
|
1643 { |
|
f71ed35527eb
patch 8.0.1821: cursor in terminal window moves when pressing CTRL-W
Christian Brabandt <cb@256bit.org>
parents:
13894
diff
changeset
|
1644 linenr_T min_topline = wp->w_cursor.lnum - wp->w_height + 1; |
|
f71ed35527eb
patch 8.0.1821: cursor in terminal window moves when pressing CTRL-W
Christian Brabandt <cb@256bit.org>
parents:
13894
diff
changeset
|
1645 |
|
f71ed35527eb
patch 8.0.1821: cursor in terminal window moves when pressing CTRL-W
Christian Brabandt <cb@256bit.org>
parents:
13894
diff
changeset
|
1646 if (wp->w_topline < min_topline) |
|
f71ed35527eb
patch 8.0.1821: cursor in terminal window moves when pressing CTRL-W
Christian Brabandt <cb@256bit.org>
parents:
13894
diff
changeset
|
1647 wp->w_topline = min_topline; |
|
f71ed35527eb
patch 8.0.1821: cursor in terminal window moves when pressing CTRL-W
Christian Brabandt <cb@256bit.org>
parents:
13894
diff
changeset
|
1648 } |
|
f71ed35527eb
patch 8.0.1821: cursor in terminal window moves when pressing CTRL-W
Christian Brabandt <cb@256bit.org>
parents:
13894
diff
changeset
|
1649 redraw_win_later(wp, NOT_VALID); |
| 12502 | 1650 } |
| 1651 } | |
| 1652 } | |
| 1653 | |
|
13878
a590029f16a0
patch 8.0.1810: buffer of a terminal only updated in Terminal-Normal mode
Christian Brabandt <cb@256bit.org>
parents:
13864
diff
changeset
|
1654 #if defined(FEAT_TIMERS) || defined(PROTO) |
|
a590029f16a0
patch 8.0.1810: buffer of a terminal only updated in Terminal-Normal mode
Christian Brabandt <cb@256bit.org>
parents:
13864
diff
changeset
|
1655 /* |
|
a590029f16a0
patch 8.0.1810: buffer of a terminal only updated in Terminal-Normal mode
Christian Brabandt <cb@256bit.org>
parents:
13864
diff
changeset
|
1656 * Check if any terminal timer expired. If so, copy text from the terminal to |
|
a590029f16a0
patch 8.0.1810: buffer of a terminal only updated in Terminal-Normal mode
Christian Brabandt <cb@256bit.org>
parents:
13864
diff
changeset
|
1657 * the buffer. |
|
a590029f16a0
patch 8.0.1810: buffer of a terminal only updated in Terminal-Normal mode
Christian Brabandt <cb@256bit.org>
parents:
13864
diff
changeset
|
1658 * Return the time until the next timer will expire. |
|
a590029f16a0
patch 8.0.1810: buffer of a terminal only updated in Terminal-Normal mode
Christian Brabandt <cb@256bit.org>
parents:
13864
diff
changeset
|
1659 */ |
|
a590029f16a0
patch 8.0.1810: buffer of a terminal only updated in Terminal-Normal mode
Christian Brabandt <cb@256bit.org>
parents:
13864
diff
changeset
|
1660 int |
|
a590029f16a0
patch 8.0.1810: buffer of a terminal only updated in Terminal-Normal mode
Christian Brabandt <cb@256bit.org>
parents:
13864
diff
changeset
|
1661 term_check_timers(int next_due_arg, proftime_T *now) |
|
a590029f16a0
patch 8.0.1810: buffer of a terminal only updated in Terminal-Normal mode
Christian Brabandt <cb@256bit.org>
parents:
13864
diff
changeset
|
1662 { |
|
a590029f16a0
patch 8.0.1810: buffer of a terminal only updated in Terminal-Normal mode
Christian Brabandt <cb@256bit.org>
parents:
13864
diff
changeset
|
1663 term_T *term; |
|
a590029f16a0
patch 8.0.1810: buffer of a terminal only updated in Terminal-Normal mode
Christian Brabandt <cb@256bit.org>
parents:
13864
diff
changeset
|
1664 int next_due = next_due_arg; |
|
a590029f16a0
patch 8.0.1810: buffer of a terminal only updated in Terminal-Normal mode
Christian Brabandt <cb@256bit.org>
parents:
13864
diff
changeset
|
1665 |
|
a590029f16a0
patch 8.0.1810: buffer of a terminal only updated in Terminal-Normal mode
Christian Brabandt <cb@256bit.org>
parents:
13864
diff
changeset
|
1666 for (term = first_term; term != NULL; term = term->tl_next) |
|
a590029f16a0
patch 8.0.1810: buffer of a terminal only updated in Terminal-Normal mode
Christian Brabandt <cb@256bit.org>
parents:
13864
diff
changeset
|
1667 { |
|
a590029f16a0
patch 8.0.1810: buffer of a terminal only updated in Terminal-Normal mode
Christian Brabandt <cb@256bit.org>
parents:
13864
diff
changeset
|
1668 if (term->tl_timer_set && !term->tl_normal_mode) |
|
a590029f16a0
patch 8.0.1810: buffer of a terminal only updated in Terminal-Normal mode
Christian Brabandt <cb@256bit.org>
parents:
13864
diff
changeset
|
1669 { |
|
a590029f16a0
patch 8.0.1810: buffer of a terminal only updated in Terminal-Normal mode
Christian Brabandt <cb@256bit.org>
parents:
13864
diff
changeset
|
1670 long this_due = proftime_time_left(&term->tl_timer_due, now); |
|
a590029f16a0
patch 8.0.1810: buffer of a terminal only updated in Terminal-Normal mode
Christian Brabandt <cb@256bit.org>
parents:
13864
diff
changeset
|
1671 |
|
a590029f16a0
patch 8.0.1810: buffer of a terminal only updated in Terminal-Normal mode
Christian Brabandt <cb@256bit.org>
parents:
13864
diff
changeset
|
1672 if (this_due <= 1) |
|
a590029f16a0
patch 8.0.1810: buffer of a terminal only updated in Terminal-Normal mode
Christian Brabandt <cb@256bit.org>
parents:
13864
diff
changeset
|
1673 { |
|
a590029f16a0
patch 8.0.1810: buffer of a terminal only updated in Terminal-Normal mode
Christian Brabandt <cb@256bit.org>
parents:
13864
diff
changeset
|
1674 term->tl_timer_set = FALSE; |
|
13919
bfca3dbdbf9e
patch 8.0.1830: switching to Terminal-Normal mode does not redraw
Christian Brabandt <cb@256bit.org>
parents:
13906
diff
changeset
|
1675 may_move_terminal_to_buffer(term, FALSE); |
|
13878
a590029f16a0
patch 8.0.1810: buffer of a terminal only updated in Terminal-Normal mode
Christian Brabandt <cb@256bit.org>
parents:
13864
diff
changeset
|
1676 } |
|
a590029f16a0
patch 8.0.1810: buffer of a terminal only updated in Terminal-Normal mode
Christian Brabandt <cb@256bit.org>
parents:
13864
diff
changeset
|
1677 else if (next_due == -1 || next_due > this_due) |
|
a590029f16a0
patch 8.0.1810: buffer of a terminal only updated in Terminal-Normal mode
Christian Brabandt <cb@256bit.org>
parents:
13864
diff
changeset
|
1678 next_due = this_due; |
|
a590029f16a0
patch 8.0.1810: buffer of a terminal only updated in Terminal-Normal mode
Christian Brabandt <cb@256bit.org>
parents:
13864
diff
changeset
|
1679 } |
|
a590029f16a0
patch 8.0.1810: buffer of a terminal only updated in Terminal-Normal mode
Christian Brabandt <cb@256bit.org>
parents:
13864
diff
changeset
|
1680 } |
|
a590029f16a0
patch 8.0.1810: buffer of a terminal only updated in Terminal-Normal mode
Christian Brabandt <cb@256bit.org>
parents:
13864
diff
changeset
|
1681 |
|
a590029f16a0
patch 8.0.1810: buffer of a terminal only updated in Terminal-Normal mode
Christian Brabandt <cb@256bit.org>
parents:
13864
diff
changeset
|
1682 return next_due; |
|
a590029f16a0
patch 8.0.1810: buffer of a terminal only updated in Terminal-Normal mode
Christian Brabandt <cb@256bit.org>
parents:
13864
diff
changeset
|
1683 } |
|
a590029f16a0
patch 8.0.1810: buffer of a terminal only updated in Terminal-Normal mode
Christian Brabandt <cb@256bit.org>
parents:
13864
diff
changeset
|
1684 #endif |
|
a590029f16a0
patch 8.0.1810: buffer of a terminal only updated in Terminal-Normal mode
Christian Brabandt <cb@256bit.org>
parents:
13864
diff
changeset
|
1685 |
| 12502 | 1686 static void |
| 1687 set_terminal_mode(term_T *term, int normal_mode) | |
| 1688 { | |
| 1689 term->tl_normal_mode = normal_mode; | |
|
13244
ac42c4b11dbc
patch 8.0.1496: clearing a pointer takes two lines
Christian Brabandt <cb@256bit.org>
parents:
13219
diff
changeset
|
1690 VIM_CLEAR(term->tl_status_text); |
| 12502 | 1691 if (term->tl_buffer == curbuf) |
| 1692 maketitle(); | |
| 1693 } | |
| 1694 | |
| 1695 /* | |
| 1696 * Called after the job if finished and Terminal mode is not active: | |
| 1697 * Move the vterm contents into the scrollback buffer and free the vterm. | |
| 1698 */ | |
| 1699 static void | |
| 1700 cleanup_vterm(term_T *term) | |
| 1701 { | |
|
13476
d130044d4f1f
patch 8.0.1612: need to close terminal after shell stopped
Christian Brabandt <cb@256bit.org>
parents:
13474
diff
changeset
|
1702 if (term->tl_finish != TL_FINISH_CLOSE) |
|
13919
bfca3dbdbf9e
patch 8.0.1830: switching to Terminal-Normal mode does not redraw
Christian Brabandt <cb@256bit.org>
parents:
13906
diff
changeset
|
1703 may_move_terminal_to_buffer(term, TRUE); |
| 12502 | 1704 term_free_vterm(term); |
| 1705 set_terminal_mode(term, FALSE); | |
| 1706 } | |
| 1707 | |
| 1708 /* | |
| 1709 * Switch from Terminal-Job mode to Terminal-Normal mode. | |
| 1710 * Suspends updating the terminal window. | |
| 1711 */ | |
| 1712 static void | |
| 1713 term_enter_normal_mode(void) | |
| 1714 { | |
| 1715 term_T *term = curbuf->b_term; | |
| 1716 | |
|
13900
f71ed35527eb
patch 8.0.1821: cursor in terminal window moves when pressing CTRL-W
Christian Brabandt <cb@256bit.org>
parents:
13894
diff
changeset
|
1717 set_terminal_mode(term, TRUE); |
|
f71ed35527eb
patch 8.0.1821: cursor in terminal window moves when pressing CTRL-W
Christian Brabandt <cb@256bit.org>
parents:
13894
diff
changeset
|
1718 |
| 12502 | 1719 /* Append the current terminal contents to the buffer. */ |
|
13919
bfca3dbdbf9e
patch 8.0.1830: switching to Terminal-Normal mode does not redraw
Christian Brabandt <cb@256bit.org>
parents:
13906
diff
changeset
|
1720 may_move_terminal_to_buffer(term, TRUE); |
| 12502 | 1721 |
| 1722 /* Move the window cursor to the position of the cursor in the | |
| 1723 * terminal. */ | |
| 1724 curwin->w_cursor.lnum = term->tl_scrollback_scrolled | |
| 1725 + term->tl_cursor_pos.row + 1; | |
| 1726 check_cursor(); | |
|
13935
cc25795aeec6
patch 8.0.1838: cursor in wrong pos when switching to Terminal-Normal mode
Christian Brabandt <cb@256bit.org>
parents:
13919
diff
changeset
|
1727 if (coladvance(term->tl_cursor_pos.col) == FAIL) |
|
cc25795aeec6
patch 8.0.1838: cursor in wrong pos when switching to Terminal-Normal mode
Christian Brabandt <cb@256bit.org>
parents:
13919
diff
changeset
|
1728 coladvance(MAXCOL); |
| 12502 | 1729 |
| 1730 /* Display the same lines as in the terminal. */ | |
| 1731 curwin->w_topline = term->tl_scrollback_scrolled + 1; | |
| 1732 } | |
| 1733 | |
| 1734 /* | |
| 1735 * Returns TRUE if the current window contains a terminal and we are in | |
| 1736 * Terminal-Normal mode. | |
| 1737 */ | |
| 1738 int | |
| 1739 term_in_normal_mode(void) | |
| 1740 { | |
| 1741 term_T *term = curbuf->b_term; | |
| 1742 | |
| 1743 return term != NULL && term->tl_normal_mode; | |
| 1744 } | |
| 1745 | |
| 1746 /* | |
| 1747 * Switch from Terminal-Normal mode to Terminal-Job mode. | |
| 1748 * Restores updating the terminal window. | |
| 1749 */ | |
| 1750 void | |
| 1751 term_enter_job_mode() | |
| 1752 { | |
| 1753 term_T *term = curbuf->b_term; | |
| 1754 | |
| 1755 set_terminal_mode(term, FALSE); | |
| 1756 | |
| 1757 if (term->tl_channel_closed) | |
| 1758 cleanup_vterm(term); | |
| 1759 redraw_buf_and_status_later(curbuf, NOT_VALID); | |
| 1760 } | |
| 1761 | |
| 1762 /* | |
|
13344
68c4fc9ae216
patch 8.0.1546: using feedkeys() in a terminal may trigger mappings
Christian Brabandt <cb@256bit.org>
parents:
13335
diff
changeset
|
1763 * Get a key from the user with terminal mode mappings. |
| 12502 | 1764 * Note: while waiting a terminal may be closed and freed if the channel is |
| 1765 * closed and ++close was used. | |
| 1766 */ | |
| 1767 static int | |
| 1768 term_vgetc() | |
| 1769 { | |
| 1770 int c; | |
| 1771 int save_State = State; | |
| 1772 | |
| 1773 State = TERMINAL; | |
| 1774 got_int = FALSE; | |
| 1775 #ifdef WIN3264 | |
| 1776 ctrl_break_was_pressed = FALSE; | |
| 1777 #endif | |
| 1778 c = vgetc(); | |
| 1779 got_int = FALSE; | |
| 1780 State = save_State; | |
| 1781 return c; | |
| 1782 } | |
| 1783 | |
|
13448
a62b0bbc8834
patch 8.0.1598: cannot select text in a terminal with the mouse
Christian Brabandt <cb@256bit.org>
parents:
13444
diff
changeset
|
1784 static int mouse_was_outside = FALSE; |
|
a62b0bbc8834
patch 8.0.1598: cannot select text in a terminal with the mouse
Christian Brabandt <cb@256bit.org>
parents:
13444
diff
changeset
|
1785 |
| 12502 | 1786 /* |
| 1787 * Send keys to terminal. | |
| 1788 * Return FAIL when the key needs to be handled in Normal mode. | |
| 1789 * Return OK when the key was dropped or sent to the terminal. | |
| 1790 */ | |
| 1791 int | |
| 1792 send_keys_to_term(term_T *term, int c, int typed) | |
| 1793 { | |
| 1794 char msg[KEY_BUF_LEN]; | |
| 1795 size_t len; | |
| 1796 int dragging_outside = FALSE; | |
| 1797 | |
| 1798 /* Catch keys that need to be handled as in Normal mode. */ | |
| 1799 switch (c) | |
| 1800 { | |
| 1801 case NUL: | |
| 1802 case K_ZERO: | |
| 1803 if (typed) | |
| 1804 stuffcharReadbuff(c); | |
| 1805 return FAIL; | |
| 1806 | |
|
13849
58b6982ca049
patch 8.0.1796: GUI: click on tab fails when the focus is in a terminal
Christian Brabandt <cb@256bit.org>
parents:
13847
diff
changeset
|
1807 case K_TABLINE: |
|
58b6982ca049
patch 8.0.1796: GUI: click on tab fails when the focus is in a terminal
Christian Brabandt <cb@256bit.org>
parents:
13847
diff
changeset
|
1808 stuffcharReadbuff(c); |
|
58b6982ca049
patch 8.0.1796: GUI: click on tab fails when the focus is in a terminal
Christian Brabandt <cb@256bit.org>
parents:
13847
diff
changeset
|
1809 return FAIL; |
|
58b6982ca049
patch 8.0.1796: GUI: click on tab fails when the focus is in a terminal
Christian Brabandt <cb@256bit.org>
parents:
13847
diff
changeset
|
1810 |
| 12502 | 1811 case K_IGNORE: |
|
13829
044337cbf854
patch 8.0.1786: no test for 'termwinkey'
Christian Brabandt <cb@256bit.org>
parents:
13823
diff
changeset
|
1812 case K_CANCEL: // used for :normal when running out of chars |
| 12502 | 1813 return FAIL; |
| 1814 | |
| 1815 case K_LEFTDRAG: | |
| 1816 case K_MIDDLEDRAG: | |
| 1817 case K_RIGHTDRAG: | |
| 1818 case K_X1DRAG: | |
| 1819 case K_X2DRAG: | |
| 1820 dragging_outside = mouse_was_outside; | |
| 1821 /* FALLTHROUGH */ | |
| 1822 case K_LEFTMOUSE: | |
| 1823 case K_LEFTMOUSE_NM: | |
| 1824 case K_LEFTRELEASE: | |
| 1825 case K_LEFTRELEASE_NM: | |
|
12865
ebb4f6c93598
patch 8.0.1309: cannot use 'balloonexpr' in a terminal
Christian Brabandt <cb@256bit.org>
parents:
12845
diff
changeset
|
1826 case K_MOUSEMOVE: |
| 12502 | 1827 case K_MIDDLEMOUSE: |
| 1828 case K_MIDDLERELEASE: | |
| 1829 case K_RIGHTMOUSE: | |
| 1830 case K_RIGHTRELEASE: | |
| 1831 case K_X1MOUSE: | |
| 1832 case K_X1RELEASE: | |
| 1833 case K_X2MOUSE: | |
| 1834 case K_X2RELEASE: | |
| 1835 | |
| 1836 case K_MOUSEUP: | |
| 1837 case K_MOUSEDOWN: | |
| 1838 case K_MOUSELEFT: | |
| 1839 case K_MOUSERIGHT: | |
| 1840 if (mouse_row < W_WINROW(curwin) | |
|
12984
fc0d4a036654
patch 8.0.1368: cannot drag status or separator of new terminal window
Christian Brabandt <cb@256bit.org>
parents:
12973
diff
changeset
|
1841 || mouse_row >= (W_WINROW(curwin) + curwin->w_height) |
|
12513
3ca08bf99396
patch 8.0.1135: W_WINCOL() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12509
diff
changeset
|
1842 || mouse_col < curwin->w_wincol |
|
12984
fc0d4a036654
patch 8.0.1368: cannot drag status or separator of new terminal window
Christian Brabandt <cb@256bit.org>
parents:
12973
diff
changeset
|
1843 || mouse_col >= W_ENDCOL(curwin) |
| 12502 | 1844 || dragging_outside) |
| 1845 { | |
|
12984
fc0d4a036654
patch 8.0.1368: cannot drag status or separator of new terminal window
Christian Brabandt <cb@256bit.org>
parents:
12973
diff
changeset
|
1846 /* click or scroll outside the current window or on status line |
|
fc0d4a036654
patch 8.0.1368: cannot drag status or separator of new terminal window
Christian Brabandt <cb@256bit.org>
parents:
12973
diff
changeset
|
1847 * or vertical separator */ |
| 12502 | 1848 if (typed) |
| 1849 { | |
| 1850 stuffcharReadbuff(c); | |
| 1851 mouse_was_outside = TRUE; | |
| 1852 } | |
| 1853 return FAIL; | |
| 1854 } | |
| 1855 } | |
| 1856 if (typed) | |
| 1857 mouse_was_outside = FALSE; | |
| 1858 | |
| 1859 /* Convert the typed key to a sequence of bytes for the job. */ | |
| 1860 len = term_convert_key(term, c, msg); | |
| 1861 if (len > 0) | |
| 1862 /* TODO: if FAIL is returned, stop? */ | |
| 1863 channel_send(term->tl_job->jv_channel, get_tty_part(term), | |
| 1864 (char_u *)msg, (int)len, NULL); | |
| 1865 | |
| 1866 return OK; | |
| 1867 } | |
| 1868 | |
| 1869 static void | |
| 1870 position_cursor(win_T *wp, VTermPos *pos) | |
| 1871 { | |
| 1872 wp->w_wrow = MIN(pos->row, MAX(0, wp->w_height - 1)); | |
| 1873 wp->w_wcol = MIN(pos->col, MAX(0, wp->w_width - 1)); | |
| 1874 wp->w_valid |= (VALID_WCOL|VALID_WROW); | |
| 1875 } | |
| 1876 | |
| 1877 /* | |
| 1878 * Handle CTRL-W "": send register contents to the job. | |
| 1879 */ | |
| 1880 static void | |
| 1881 term_paste_register(int prev_c UNUSED) | |
| 1882 { | |
| 1883 int c; | |
| 1884 list_T *l; | |
| 1885 listitem_T *item; | |
| 1886 long reglen = 0; | |
| 1887 int type; | |
| 1888 | |
| 1889 #ifdef FEAT_CMDL_INFO | |
| 1890 if (add_to_showcmd(prev_c)) | |
| 1891 if (add_to_showcmd('"')) | |
| 1892 out_flush(); | |
| 1893 #endif | |
| 1894 c = term_vgetc(); | |
| 1895 #ifdef FEAT_CMDL_INFO | |
| 1896 clear_showcmd(); | |
| 1897 #endif | |
| 1898 if (!term_use_loop()) | |
| 1899 /* job finished while waiting for a character */ | |
| 1900 return; | |
| 1901 | |
| 1902 /* CTRL-W "= prompt for expression to evaluate. */ | |
| 1903 if (c == '=' && get_expr_register() != '=') | |
| 1904 return; | |
| 1905 if (!term_use_loop()) | |
| 1906 /* job finished while waiting for a character */ | |
| 1907 return; | |
| 1908 | |
| 1909 l = (list_T *)get_reg_contents(c, GREG_LIST); | |
| 1910 if (l != NULL) | |
| 1911 { | |
| 1912 type = get_reg_type(c, ®len); | |
| 1913 for (item = l->lv_first; item != NULL; item = item->li_next) | |
| 1914 { | |
| 1915 char_u *s = get_tv_string(&item->li_tv); | |
| 1916 #ifdef WIN3264 | |
| 1917 char_u *tmp = s; | |
| 1918 | |
| 1919 if (!enc_utf8 && enc_codepage > 0) | |
| 1920 { | |
| 1921 WCHAR *ret = NULL; | |
| 1922 int length = 0; | |
| 1923 | |
| 1924 MultiByteToWideChar_alloc(enc_codepage, 0, (char *)s, | |
| 1925 (int)STRLEN(s), &ret, &length); | |
| 1926 if (ret != NULL) | |
| 1927 { | |
| 1928 WideCharToMultiByte_alloc(CP_UTF8, 0, | |
| 1929 ret, length, (char **)&s, &length, 0, 0); | |
| 1930 vim_free(ret); | |
| 1931 } | |
| 1932 } | |
| 1933 #endif | |
| 1934 channel_send(curbuf->b_term->tl_job->jv_channel, PART_IN, | |
| 1935 s, (int)STRLEN(s), NULL); | |
| 1936 #ifdef WIN3264 | |
| 1937 if (tmp != s) | |
| 1938 vim_free(s); | |
| 1939 #endif | |
| 1940 | |
| 1941 if (item->li_next != NULL || type == MLINE) | |
| 1942 channel_send(curbuf->b_term->tl_job->jv_channel, PART_IN, | |
| 1943 (char_u *)"\r", 1, NULL); | |
| 1944 } | |
| 1945 list_free(l); | |
| 1946 } | |
| 1947 } | |
| 1948 | |
| 1949 /* | |
|
13829
044337cbf854
patch 8.0.1786: no test for 'termwinkey'
Christian Brabandt <cb@256bit.org>
parents:
13823
diff
changeset
|
1950 * Return TRUE when waiting for a character in the terminal, the cursor of the |
|
044337cbf854
patch 8.0.1786: no test for 'termwinkey'
Christian Brabandt <cb@256bit.org>
parents:
13823
diff
changeset
|
1951 * terminal should be displayed. |
| 12502 | 1952 */ |
| 1953 int | |
| 1954 terminal_is_active() | |
| 1955 { | |
| 1956 return in_terminal_loop != NULL; | |
| 1957 } | |
| 1958 | |
|
13829
044337cbf854
patch 8.0.1786: no test for 'termwinkey'
Christian Brabandt <cb@256bit.org>
parents:
13823
diff
changeset
|
1959 #if defined(FEAT_GUI) || defined(PROTO) |
| 12502 | 1960 cursorentry_T * |
| 1961 term_get_cursor_shape(guicolor_T *fg, guicolor_T *bg) | |
| 1962 { | |
| 1963 term_T *term = in_terminal_loop; | |
| 1964 static cursorentry_T entry; | |
|
14939
c085c4cd9bba
patch 8.1.0481: when "Terminal" highlight is reverted cursor doesn't show
Bram Moolenaar <Bram@vim.org>
parents:
14691
diff
changeset
|
1965 int id; |
|
c085c4cd9bba
patch 8.1.0481: when "Terminal" highlight is reverted cursor doesn't show
Bram Moolenaar <Bram@vim.org>
parents:
14691
diff
changeset
|
1966 guicolor_T term_fg, term_bg; |
| 12502 | 1967 |
| 1968 vim_memset(&entry, 0, sizeof(entry)); | |
| 1969 entry.shape = entry.mshape = | |
| 1970 term->tl_cursor_shape == VTERM_PROP_CURSORSHAPE_UNDERLINE ? SHAPE_HOR : | |
| 1971 term->tl_cursor_shape == VTERM_PROP_CURSORSHAPE_BAR_LEFT ? SHAPE_VER : | |
| 1972 SHAPE_BLOCK; | |
| 1973 entry.percentage = 20; | |
| 1974 if (term->tl_cursor_blink) | |
| 1975 { | |
| 1976 entry.blinkwait = 700; | |
| 1977 entry.blinkon = 400; | |
| 1978 entry.blinkoff = 250; | |
| 1979 } | |
|
14939
c085c4cd9bba
patch 8.1.0481: when "Terminal" highlight is reverted cursor doesn't show
Bram Moolenaar <Bram@vim.org>
parents:
14691
diff
changeset
|
1980 |
|
c085c4cd9bba
patch 8.1.0481: when "Terminal" highlight is reverted cursor doesn't show
Bram Moolenaar <Bram@vim.org>
parents:
14691
diff
changeset
|
1981 /* The "Terminal" highlight group overrules the defaults. */ |
|
c085c4cd9bba
patch 8.1.0481: when "Terminal" highlight is reverted cursor doesn't show
Bram Moolenaar <Bram@vim.org>
parents:
14691
diff
changeset
|
1982 id = syn_name2id((char_u *)"Terminal"); |
|
c085c4cd9bba
patch 8.1.0481: when "Terminal" highlight is reverted cursor doesn't show
Bram Moolenaar <Bram@vim.org>
parents:
14691
diff
changeset
|
1983 if (id != 0) |
|
c085c4cd9bba
patch 8.1.0481: when "Terminal" highlight is reverted cursor doesn't show
Bram Moolenaar <Bram@vim.org>
parents:
14691
diff
changeset
|
1984 { |
|
c085c4cd9bba
patch 8.1.0481: when "Terminal" highlight is reverted cursor doesn't show
Bram Moolenaar <Bram@vim.org>
parents:
14691
diff
changeset
|
1985 syn_id2colors(id, &term_fg, &term_bg); |
|
c085c4cd9bba
patch 8.1.0481: when "Terminal" highlight is reverted cursor doesn't show
Bram Moolenaar <Bram@vim.org>
parents:
14691
diff
changeset
|
1986 *fg = term_bg; |
|
c085c4cd9bba
patch 8.1.0481: when "Terminal" highlight is reverted cursor doesn't show
Bram Moolenaar <Bram@vim.org>
parents:
14691
diff
changeset
|
1987 } |
|
c085c4cd9bba
patch 8.1.0481: when "Terminal" highlight is reverted cursor doesn't show
Bram Moolenaar <Bram@vim.org>
parents:
14691
diff
changeset
|
1988 else |
|
c085c4cd9bba
patch 8.1.0481: when "Terminal" highlight is reverted cursor doesn't show
Bram Moolenaar <Bram@vim.org>
parents:
14691
diff
changeset
|
1989 *fg = gui.back_pixel; |
|
c085c4cd9bba
patch 8.1.0481: when "Terminal" highlight is reverted cursor doesn't show
Bram Moolenaar <Bram@vim.org>
parents:
14691
diff
changeset
|
1990 |
| 12502 | 1991 if (term->tl_cursor_color == NULL) |
|
14939
c085c4cd9bba
patch 8.1.0481: when "Terminal" highlight is reverted cursor doesn't show
Bram Moolenaar <Bram@vim.org>
parents:
14691
diff
changeset
|
1992 { |
|
c085c4cd9bba
patch 8.1.0481: when "Terminal" highlight is reverted cursor doesn't show
Bram Moolenaar <Bram@vim.org>
parents:
14691
diff
changeset
|
1993 if (id != 0) |
|
c085c4cd9bba
patch 8.1.0481: when "Terminal" highlight is reverted cursor doesn't show
Bram Moolenaar <Bram@vim.org>
parents:
14691
diff
changeset
|
1994 *bg = term_fg; |
|
c085c4cd9bba
patch 8.1.0481: when "Terminal" highlight is reverted cursor doesn't show
Bram Moolenaar <Bram@vim.org>
parents:
14691
diff
changeset
|
1995 else |
|
c085c4cd9bba
patch 8.1.0481: when "Terminal" highlight is reverted cursor doesn't show
Bram Moolenaar <Bram@vim.org>
parents:
14691
diff
changeset
|
1996 *bg = gui.norm_pixel; |
|
c085c4cd9bba
patch 8.1.0481: when "Terminal" highlight is reverted cursor doesn't show
Bram Moolenaar <Bram@vim.org>
parents:
14691
diff
changeset
|
1997 } |
| 12502 | 1998 else |
| 1999 *bg = color_name2handle(term->tl_cursor_color); | |
| 2000 entry.name = "n"; | |
| 2001 entry.used_for = SHAPE_CURSOR; | |
| 2002 | |
| 2003 return &entry; | |
| 2004 } | |
| 2005 #endif | |
| 2006 | |
|
13206
53f0c469dfc6
patch 8.0.1477: redraw flicker when moving the mouse outside of terminal window
Christian Brabandt <cb@256bit.org>
parents:
13132
diff
changeset
|
2007 static void |
|
53f0c469dfc6
patch 8.0.1477: redraw flicker when moving the mouse outside of terminal window
Christian Brabandt <cb@256bit.org>
parents:
13132
diff
changeset
|
2008 may_output_cursor_props(void) |
|
53f0c469dfc6
patch 8.0.1477: redraw flicker when moving the mouse outside of terminal window
Christian Brabandt <cb@256bit.org>
parents:
13132
diff
changeset
|
2009 { |
|
13990
017c5462ed5e
patch 8.1.0013: using freed memory when changing terminal cursor color
Christian Brabandt <cb@256bit.org>
parents:
13961
diff
changeset
|
2010 if (!cursor_color_equal(last_set_cursor_color, desired_cursor_color) |
|
13206
53f0c469dfc6
patch 8.0.1477: redraw flicker when moving the mouse outside of terminal window
Christian Brabandt <cb@256bit.org>
parents:
13132
diff
changeset
|
2011 || last_set_cursor_shape != desired_cursor_shape |
|
53f0c469dfc6
patch 8.0.1477: redraw flicker when moving the mouse outside of terminal window
Christian Brabandt <cb@256bit.org>
parents:
13132
diff
changeset
|
2012 || last_set_cursor_blink != desired_cursor_blink) |
|
53f0c469dfc6
patch 8.0.1477: redraw flicker when moving the mouse outside of terminal window
Christian Brabandt <cb@256bit.org>
parents:
13132
diff
changeset
|
2013 { |
|
13990
017c5462ed5e
patch 8.1.0013: using freed memory when changing terminal cursor color
Christian Brabandt <cb@256bit.org>
parents:
13961
diff
changeset
|
2014 cursor_color_copy(&last_set_cursor_color, desired_cursor_color); |
|
13206
53f0c469dfc6
patch 8.0.1477: redraw flicker when moving the mouse outside of terminal window
Christian Brabandt <cb@256bit.org>
parents:
13132
diff
changeset
|
2015 last_set_cursor_shape = desired_cursor_shape; |
|
53f0c469dfc6
patch 8.0.1477: redraw flicker when moving the mouse outside of terminal window
Christian Brabandt <cb@256bit.org>
parents:
13132
diff
changeset
|
2016 last_set_cursor_blink = desired_cursor_blink; |
|
13990
017c5462ed5e
patch 8.1.0013: using freed memory when changing terminal cursor color
Christian Brabandt <cb@256bit.org>
parents:
13961
diff
changeset
|
2017 term_cursor_color(cursor_color_get(desired_cursor_color)); |
|
13206
53f0c469dfc6
patch 8.0.1477: redraw flicker when moving the mouse outside of terminal window
Christian Brabandt <cb@256bit.org>
parents:
13132
diff
changeset
|
2018 if (desired_cursor_shape == -1 || desired_cursor_blink == -1) |
|
53f0c469dfc6
patch 8.0.1477: redraw flicker when moving the mouse outside of terminal window
Christian Brabandt <cb@256bit.org>
parents:
13132
diff
changeset
|
2019 /* this will restore the initial cursor style, if possible */ |
|
53f0c469dfc6
patch 8.0.1477: redraw flicker when moving the mouse outside of terminal window
Christian Brabandt <cb@256bit.org>
parents:
13132
diff
changeset
|
2020 ui_cursor_shape_forced(TRUE); |
|
53f0c469dfc6
patch 8.0.1477: redraw flicker when moving the mouse outside of terminal window
Christian Brabandt <cb@256bit.org>
parents:
13132
diff
changeset
|
2021 else |
|
53f0c469dfc6
patch 8.0.1477: redraw flicker when moving the mouse outside of terminal window
Christian Brabandt <cb@256bit.org>
parents:
13132
diff
changeset
|
2022 term_cursor_shape(desired_cursor_shape, desired_cursor_blink); |
|
53f0c469dfc6
patch 8.0.1477: redraw flicker when moving the mouse outside of terminal window
Christian Brabandt <cb@256bit.org>
parents:
13132
diff
changeset
|
2023 } |
|
53f0c469dfc6
patch 8.0.1477: redraw flicker when moving the mouse outside of terminal window
Christian Brabandt <cb@256bit.org>
parents:
13132
diff
changeset
|
2024 } |
|
53f0c469dfc6
patch 8.0.1477: redraw flicker when moving the mouse outside of terminal window
Christian Brabandt <cb@256bit.org>
parents:
13132
diff
changeset
|
2025 |
|
53f0c469dfc6
patch 8.0.1477: redraw flicker when moving the mouse outside of terminal window
Christian Brabandt <cb@256bit.org>
parents:
13132
diff
changeset
|
2026 /* |
|
53f0c469dfc6
patch 8.0.1477: redraw flicker when moving the mouse outside of terminal window
Christian Brabandt <cb@256bit.org>
parents:
13132
diff
changeset
|
2027 * Set the cursor color and shape, if not last set to these. |
|
53f0c469dfc6
patch 8.0.1477: redraw flicker when moving the mouse outside of terminal window
Christian Brabandt <cb@256bit.org>
parents:
13132
diff
changeset
|
2028 */ |
| 12502 | 2029 static void |
| 2030 may_set_cursor_props(term_T *term) | |
| 2031 { | |
| 2032 #ifdef FEAT_GUI | |
| 2033 /* For the GUI the cursor properties are obtained with | |
| 2034 * term_get_cursor_shape(). */ | |
| 2035 if (gui.in_use) | |
| 2036 return; | |
| 2037 #endif | |
| 2038 if (in_terminal_loop == term) | |
| 2039 { | |
|
13990
017c5462ed5e
patch 8.1.0013: using freed memory when changing terminal cursor color
Christian Brabandt <cb@256bit.org>
parents:
13961
diff
changeset
|
2040 cursor_color_copy(&desired_cursor_color, term->tl_cursor_color); |
|
13206
53f0c469dfc6
patch 8.0.1477: redraw flicker when moving the mouse outside of terminal window
Christian Brabandt <cb@256bit.org>
parents:
13132
diff
changeset
|
2041 desired_cursor_shape = term->tl_cursor_shape; |
|
53f0c469dfc6
patch 8.0.1477: redraw flicker when moving the mouse outside of terminal window
Christian Brabandt <cb@256bit.org>
parents:
13132
diff
changeset
|
2042 desired_cursor_blink = term->tl_cursor_blink; |
|
53f0c469dfc6
patch 8.0.1477: redraw flicker when moving the mouse outside of terminal window
Christian Brabandt <cb@256bit.org>
parents:
13132
diff
changeset
|
2043 may_output_cursor_props(); |
| 12502 | 2044 } |
| 2045 } | |
| 2046 | |
|
13206
53f0c469dfc6
patch 8.0.1477: redraw flicker when moving the mouse outside of terminal window
Christian Brabandt <cb@256bit.org>
parents:
13132
diff
changeset
|
2047 /* |
|
53f0c469dfc6
patch 8.0.1477: redraw flicker when moving the mouse outside of terminal window
Christian Brabandt <cb@256bit.org>
parents:
13132
diff
changeset
|
2048 * Reset the desired cursor properties and restore them when needed. |
|
53f0c469dfc6
patch 8.0.1477: redraw flicker when moving the mouse outside of terminal window
Christian Brabandt <cb@256bit.org>
parents:
13132
diff
changeset
|
2049 */ |
| 12502 | 2050 static void |
|
13206
53f0c469dfc6
patch 8.0.1477: redraw flicker when moving the mouse outside of terminal window
Christian Brabandt <cb@256bit.org>
parents:
13132
diff
changeset
|
2051 prepare_restore_cursor_props(void) |
| 12502 | 2052 { |
| 2053 #ifdef FEAT_GUI | |
| 2054 if (gui.in_use) | |
| 2055 return; | |
| 2056 #endif | |
|
13990
017c5462ed5e
patch 8.1.0013: using freed memory when changing terminal cursor color
Christian Brabandt <cb@256bit.org>
parents:
13961
diff
changeset
|
2057 cursor_color_copy(&desired_cursor_color, NULL); |
|
13206
53f0c469dfc6
patch 8.0.1477: redraw flicker when moving the mouse outside of terminal window
Christian Brabandt <cb@256bit.org>
parents:
13132
diff
changeset
|
2058 desired_cursor_shape = -1; |
|
53f0c469dfc6
patch 8.0.1477: redraw flicker when moving the mouse outside of terminal window
Christian Brabandt <cb@256bit.org>
parents:
13132
diff
changeset
|
2059 desired_cursor_blink = -1; |
|
53f0c469dfc6
patch 8.0.1477: redraw flicker when moving the mouse outside of terminal window
Christian Brabandt <cb@256bit.org>
parents:
13132
diff
changeset
|
2060 may_output_cursor_props(); |
| 12502 | 2061 } |
| 2062 | |
| 2063 /* | |
|
13696
3b1cfbc70b43
patch 8.0.1720: when a timer is running a terminal window may not close
Christian Brabandt <cb@256bit.org>
parents:
13686
diff
changeset
|
2064 * Returns TRUE if the current window contains a terminal and we are sending |
|
3b1cfbc70b43
patch 8.0.1720: when a timer is running a terminal window may not close
Christian Brabandt <cb@256bit.org>
parents:
13686
diff
changeset
|
2065 * keys to the job. |
|
3b1cfbc70b43
patch 8.0.1720: when a timer is running a terminal window may not close
Christian Brabandt <cb@256bit.org>
parents:
13686
diff
changeset
|
2066 * If "check_job_status" is TRUE update the job status. |
|
3b1cfbc70b43
patch 8.0.1720: when a timer is running a terminal window may not close
Christian Brabandt <cb@256bit.org>
parents:
13686
diff
changeset
|
2067 */ |
|
3b1cfbc70b43
patch 8.0.1720: when a timer is running a terminal window may not close
Christian Brabandt <cb@256bit.org>
parents:
13686
diff
changeset
|
2068 static int |
|
3b1cfbc70b43
patch 8.0.1720: when a timer is running a terminal window may not close
Christian Brabandt <cb@256bit.org>
parents:
13686
diff
changeset
|
2069 term_use_loop_check(int check_job_status) |
|
3b1cfbc70b43
patch 8.0.1720: when a timer is running a terminal window may not close
Christian Brabandt <cb@256bit.org>
parents:
13686
diff
changeset
|
2070 { |
|
3b1cfbc70b43
patch 8.0.1720: when a timer is running a terminal window may not close
Christian Brabandt <cb@256bit.org>
parents:
13686
diff
changeset
|
2071 term_T *term = curbuf->b_term; |
|
3b1cfbc70b43
patch 8.0.1720: when a timer is running a terminal window may not close
Christian Brabandt <cb@256bit.org>
parents:
13686
diff
changeset
|
2072 |
|
3b1cfbc70b43
patch 8.0.1720: when a timer is running a terminal window may not close
Christian Brabandt <cb@256bit.org>
parents:
13686
diff
changeset
|
2073 return term != NULL |
|
3b1cfbc70b43
patch 8.0.1720: when a timer is running a terminal window may not close
Christian Brabandt <cb@256bit.org>
parents:
13686
diff
changeset
|
2074 && !term->tl_normal_mode |
|
3b1cfbc70b43
patch 8.0.1720: when a timer is running a terminal window may not close
Christian Brabandt <cb@256bit.org>
parents:
13686
diff
changeset
|
2075 && term->tl_vterm != NULL |
|
3b1cfbc70b43
patch 8.0.1720: when a timer is running a terminal window may not close
Christian Brabandt <cb@256bit.org>
parents:
13686
diff
changeset
|
2076 && term_job_running_check(term, check_job_status); |
|
3b1cfbc70b43
patch 8.0.1720: when a timer is running a terminal window may not close
Christian Brabandt <cb@256bit.org>
parents:
13686
diff
changeset
|
2077 } |
|
3b1cfbc70b43
patch 8.0.1720: when a timer is running a terminal window may not close
Christian Brabandt <cb@256bit.org>
parents:
13686
diff
changeset
|
2078 |
|
3b1cfbc70b43
patch 8.0.1720: when a timer is running a terminal window may not close
Christian Brabandt <cb@256bit.org>
parents:
13686
diff
changeset
|
2079 /* |
|
3b1cfbc70b43
patch 8.0.1720: when a timer is running a terminal window may not close
Christian Brabandt <cb@256bit.org>
parents:
13686
diff
changeset
|
2080 * Returns TRUE if the current window contains a terminal and we are sending |
|
3b1cfbc70b43
patch 8.0.1720: when a timer is running a terminal window may not close
Christian Brabandt <cb@256bit.org>
parents:
13686
diff
changeset
|
2081 * keys to the job. |
|
3b1cfbc70b43
patch 8.0.1720: when a timer is running a terminal window may not close
Christian Brabandt <cb@256bit.org>
parents:
13686
diff
changeset
|
2082 */ |
|
3b1cfbc70b43
patch 8.0.1720: when a timer is running a terminal window may not close
Christian Brabandt <cb@256bit.org>
parents:
13686
diff
changeset
|
2083 int |
|
3b1cfbc70b43
patch 8.0.1720: when a timer is running a terminal window may not close
Christian Brabandt <cb@256bit.org>
parents:
13686
diff
changeset
|
2084 term_use_loop(void) |
|
3b1cfbc70b43
patch 8.0.1720: when a timer is running a terminal window may not close
Christian Brabandt <cb@256bit.org>
parents:
13686
diff
changeset
|
2085 { |
|
3b1cfbc70b43
patch 8.0.1720: when a timer is running a terminal window may not close
Christian Brabandt <cb@256bit.org>
parents:
13686
diff
changeset
|
2086 return term_use_loop_check(FALSE); |
|
3b1cfbc70b43
patch 8.0.1720: when a timer is running a terminal window may not close
Christian Brabandt <cb@256bit.org>
parents:
13686
diff
changeset
|
2087 } |
|
3b1cfbc70b43
patch 8.0.1720: when a timer is running a terminal window may not close
Christian Brabandt <cb@256bit.org>
parents:
13686
diff
changeset
|
2088 |
|
3b1cfbc70b43
patch 8.0.1720: when a timer is running a terminal window may not close
Christian Brabandt <cb@256bit.org>
parents:
13686
diff
changeset
|
2089 /* |
|
13448
a62b0bbc8834
patch 8.0.1598: cannot select text in a terminal with the mouse
Christian Brabandt <cb@256bit.org>
parents:
13444
diff
changeset
|
2090 * Called when entering a window with the mouse. If this is a terminal window |
|
a62b0bbc8834
patch 8.0.1598: cannot select text in a terminal with the mouse
Christian Brabandt <cb@256bit.org>
parents:
13444
diff
changeset
|
2091 * we may want to change state. |
|
a62b0bbc8834
patch 8.0.1598: cannot select text in a terminal with the mouse
Christian Brabandt <cb@256bit.org>
parents:
13444
diff
changeset
|
2092 */ |
|
a62b0bbc8834
patch 8.0.1598: cannot select text in a terminal with the mouse
Christian Brabandt <cb@256bit.org>
parents:
13444
diff
changeset
|
2093 void |
|
a62b0bbc8834
patch 8.0.1598: cannot select text in a terminal with the mouse
Christian Brabandt <cb@256bit.org>
parents:
13444
diff
changeset
|
2094 term_win_entered() |
|
a62b0bbc8834
patch 8.0.1598: cannot select text in a terminal with the mouse
Christian Brabandt <cb@256bit.org>
parents:
13444
diff
changeset
|
2095 { |
|
a62b0bbc8834
patch 8.0.1598: cannot select text in a terminal with the mouse
Christian Brabandt <cb@256bit.org>
parents:
13444
diff
changeset
|
2096 term_T *term = curbuf->b_term; |
|
a62b0bbc8834
patch 8.0.1598: cannot select text in a terminal with the mouse
Christian Brabandt <cb@256bit.org>
parents:
13444
diff
changeset
|
2097 |
|
a62b0bbc8834
patch 8.0.1598: cannot select text in a terminal with the mouse
Christian Brabandt <cb@256bit.org>
parents:
13444
diff
changeset
|
2098 if (term != NULL) |
|
a62b0bbc8834
patch 8.0.1598: cannot select text in a terminal with the mouse
Christian Brabandt <cb@256bit.org>
parents:
13444
diff
changeset
|
2099 { |
|
13696
3b1cfbc70b43
patch 8.0.1720: when a timer is running a terminal window may not close
Christian Brabandt <cb@256bit.org>
parents:
13686
diff
changeset
|
2100 if (term_use_loop_check(TRUE)) |
|
13448
a62b0bbc8834
patch 8.0.1598: cannot select text in a terminal with the mouse
Christian Brabandt <cb@256bit.org>
parents:
13444
diff
changeset
|
2101 { |
|
a62b0bbc8834
patch 8.0.1598: cannot select text in a terminal with the mouse
Christian Brabandt <cb@256bit.org>
parents:
13444
diff
changeset
|
2102 reset_VIsual_and_resel(); |
|
a62b0bbc8834
patch 8.0.1598: cannot select text in a terminal with the mouse
Christian Brabandt <cb@256bit.org>
parents:
13444
diff
changeset
|
2103 if (State & INSERT) |
|
a62b0bbc8834
patch 8.0.1598: cannot select text in a terminal with the mouse
Christian Brabandt <cb@256bit.org>
parents:
13444
diff
changeset
|
2104 stop_insert_mode = TRUE; |
|
a62b0bbc8834
patch 8.0.1598: cannot select text in a terminal with the mouse
Christian Brabandt <cb@256bit.org>
parents:
13444
diff
changeset
|
2105 } |
|
a62b0bbc8834
patch 8.0.1598: cannot select text in a terminal with the mouse
Christian Brabandt <cb@256bit.org>
parents:
13444
diff
changeset
|
2106 mouse_was_outside = FALSE; |
|
a62b0bbc8834
patch 8.0.1598: cannot select text in a terminal with the mouse
Christian Brabandt <cb@256bit.org>
parents:
13444
diff
changeset
|
2107 enter_mouse_col = mouse_col; |
|
a62b0bbc8834
patch 8.0.1598: cannot select text in a terminal with the mouse
Christian Brabandt <cb@256bit.org>
parents:
13444
diff
changeset
|
2108 enter_mouse_row = mouse_row; |
|
a62b0bbc8834
patch 8.0.1598: cannot select text in a terminal with the mouse
Christian Brabandt <cb@256bit.org>
parents:
13444
diff
changeset
|
2109 } |
|
a62b0bbc8834
patch 8.0.1598: cannot select text in a terminal with the mouse
Christian Brabandt <cb@256bit.org>
parents:
13444
diff
changeset
|
2110 } |
|
a62b0bbc8834
patch 8.0.1598: cannot select text in a terminal with the mouse
Christian Brabandt <cb@256bit.org>
parents:
13444
diff
changeset
|
2111 |
|
a62b0bbc8834
patch 8.0.1598: cannot select text in a terminal with the mouse
Christian Brabandt <cb@256bit.org>
parents:
13444
diff
changeset
|
2112 /* |
| 12502 | 2113 * Wait for input and send it to the job. |
| 2114 * When "blocking" is TRUE wait for a character to be typed. Otherwise return | |
| 2115 * when there is no more typahead. | |
| 2116 * Return when the start of a CTRL-W command is typed or anything else that | |
| 2117 * should be handled as a Normal mode command. | |
| 2118 * Returns OK if a typed character is to be handled in Normal mode, FAIL if | |
| 2119 * the terminal was closed. | |
| 2120 */ | |
| 2121 int | |
| 2122 terminal_loop(int blocking) | |
| 2123 { | |
| 2124 int c; | |
|
13845
f22db93bd887
patch 8.0.1794: duplicate term options after renaming
Christian Brabandt <cb@256bit.org>
parents:
13835
diff
changeset
|
2125 int termwinkey = 0; |
| 12502 | 2126 int ret; |
|
12767
4d9cdb1d8bea
patch 8.0.1261: program in terminal window gets NL instead of CR
Christian Brabandt <cb@256bit.org>
parents:
12724
diff
changeset
|
2127 #ifdef UNIX |
|
12800
8dfeed7e07e7
patch 8.0.1277: terminal window CR-NL conversions may cause problems
Christian Brabandt <cb@256bit.org>
parents:
12798
diff
changeset
|
2128 int tty_fd = curbuf->b_term->tl_job->jv_channel |
|
8dfeed7e07e7
patch 8.0.1277: terminal window CR-NL conversions may cause problems
Christian Brabandt <cb@256bit.org>
parents:
12798
diff
changeset
|
2129 ->ch_part[get_tty_part(curbuf->b_term)].ch_fd; |
|
12767
4d9cdb1d8bea
patch 8.0.1261: program in terminal window gets NL instead of CR
Christian Brabandt <cb@256bit.org>
parents:
12724
diff
changeset
|
2130 #endif |
|
13906
0ae89b121c58
patch 8.0.1824: Coverity warns for variable that may be uninitialized
Christian Brabandt <cb@256bit.org>
parents:
13900
diff
changeset
|
2131 int restore_cursor = FALSE; |
| 12502 | 2132 |
| 2133 /* Remember the terminal we are sending keys to. However, the terminal | |
| 2134 * might be closed while waiting for a character, e.g. typing "exit" in a | |
| 2135 * shell and ++close was used. Therefore use curbuf->b_term instead of a | |
| 2136 * stored reference. */ | |
| 2137 in_terminal_loop = curbuf->b_term; | |
| 2138 | |
|
13742
a34b1323286c
patch 8.0.1743: terminal window options are named inconsistently
Christian Brabandt <cb@256bit.org>
parents:
13720
diff
changeset
|
2139 if (*curwin->w_p_twk != NUL) |
|
14109
279465096a16
patch 8.1.0072: use of 'termwinkey' is inconsistent
Christian Brabandt <cb@256bit.org>
parents:
14065
diff
changeset
|
2140 { |
|
13845
f22db93bd887
patch 8.0.1794: duplicate term options after renaming
Christian Brabandt <cb@256bit.org>
parents:
13835
diff
changeset
|
2141 termwinkey = string_to_key(curwin->w_p_twk, TRUE); |
|
14109
279465096a16
patch 8.1.0072: use of 'termwinkey' is inconsistent
Christian Brabandt <cb@256bit.org>
parents:
14065
diff
changeset
|
2142 if (termwinkey == Ctrl_W) |
|
279465096a16
patch 8.1.0072: use of 'termwinkey' is inconsistent
Christian Brabandt <cb@256bit.org>
parents:
14065
diff
changeset
|
2143 termwinkey = 0; |
|
279465096a16
patch 8.1.0072: use of 'termwinkey' is inconsistent
Christian Brabandt <cb@256bit.org>
parents:
14065
diff
changeset
|
2144 } |
| 12502 | 2145 position_cursor(curwin, &curbuf->b_term->tl_cursor_pos); |
| 2146 may_set_cursor_props(curbuf->b_term); | |
| 2147 | |
|
13344
68c4fc9ae216
patch 8.0.1546: using feedkeys() in a terminal may trigger mappings
Christian Brabandt <cb@256bit.org>
parents:
13335
diff
changeset
|
2148 while (blocking || vpeekc_nomap() != NUL) |
| 12502 | 2149 { |
|
13470
6faef782f50b
patch 8.0.1609: shell commands in the GUI use a dumb terminal
Christian Brabandt <cb@256bit.org>
parents:
13458
diff
changeset
|
2150 #ifdef FEAT_GUI |
|
6faef782f50b
patch 8.0.1609: shell commands in the GUI use a dumb terminal
Christian Brabandt <cb@256bit.org>
parents:
13458
diff
changeset
|
2151 if (!curbuf->b_term->tl_system) |
|
6faef782f50b
patch 8.0.1609: shell commands in the GUI use a dumb terminal
Christian Brabandt <cb@256bit.org>
parents:
13458
diff
changeset
|
2152 #endif |
|
6faef782f50b
patch 8.0.1609: shell commands in the GUI use a dumb terminal
Christian Brabandt <cb@256bit.org>
parents:
13458
diff
changeset
|
2153 /* TODO: skip screen update when handling a sequence of keys. */ |
|
6faef782f50b
patch 8.0.1609: shell commands in the GUI use a dumb terminal
Christian Brabandt <cb@256bit.org>
parents:
13458
diff
changeset
|
2154 /* Repeat redrawing in case a message is received while redrawing. |
|
6faef782f50b
patch 8.0.1609: shell commands in the GUI use a dumb terminal
Christian Brabandt <cb@256bit.org>
parents:
13458
diff
changeset
|
2155 */ |
|
6faef782f50b
patch 8.0.1609: shell commands in the GUI use a dumb terminal
Christian Brabandt <cb@256bit.org>
parents:
13458
diff
changeset
|
2156 while (must_redraw != 0) |
|
6faef782f50b
patch 8.0.1609: shell commands in the GUI use a dumb terminal
Christian Brabandt <cb@256bit.org>
parents:
13458
diff
changeset
|
2157 if (update_screen(0) == FAIL) |
|
6faef782f50b
patch 8.0.1609: shell commands in the GUI use a dumb terminal
Christian Brabandt <cb@256bit.org>
parents:
13458
diff
changeset
|
2158 break; |
|
13994
411dd50f1daa
patch 8.1.0015: cursor color wrong when closing a terminal window
Christian Brabandt <cb@256bit.org>
parents:
13990
diff
changeset
|
2159 if (!term_use_loop_check(TRUE) || in_terminal_loop != curbuf->b_term) |
|
13886
bbf5bdba4a80
patch 8.0.1814: crash with terminal window and with 'lazyredraw' set
Christian Brabandt <cb@256bit.org>
parents:
13878
diff
changeset
|
2160 /* job finished while redrawing */ |
|
bbf5bdba4a80
patch 8.0.1814: crash with terminal window and with 'lazyredraw' set
Christian Brabandt <cb@256bit.org>
parents:
13878
diff
changeset
|
2161 break; |
|
bbf5bdba4a80
patch 8.0.1814: crash with terminal window and with 'lazyredraw' set
Christian Brabandt <cb@256bit.org>
parents:
13878
diff
changeset
|
2162 |
| 12502 | 2163 update_cursor(curbuf->b_term, FALSE); |
|
13206
53f0c469dfc6
patch 8.0.1477: redraw flicker when moving the mouse outside of terminal window
Christian Brabandt <cb@256bit.org>
parents:
13132
diff
changeset
|
2164 restore_cursor = TRUE; |
| 12502 | 2165 |
| 2166 c = term_vgetc(); | |
|
13994
411dd50f1daa
patch 8.1.0015: cursor color wrong when closing a terminal window
Christian Brabandt <cb@256bit.org>
parents:
13990
diff
changeset
|
2167 if (!term_use_loop_check(TRUE) || in_terminal_loop != curbuf->b_term) |
|
12798
5ae0d05e046a
patch 8.0.1276: key lost when window closed in exit callback
Christian Brabandt <cb@256bit.org>
parents:
12767
diff
changeset
|
2168 { |
|
12800
8dfeed7e07e7
patch 8.0.1277: terminal window CR-NL conversions may cause problems
Christian Brabandt <cb@256bit.org>
parents:
12798
diff
changeset
|
2169 /* Job finished while waiting for a character. Push back the |
|
8dfeed7e07e7
patch 8.0.1277: terminal window CR-NL conversions may cause problems
Christian Brabandt <cb@256bit.org>
parents:
12798
diff
changeset
|
2170 * received character. */ |
|
12798
5ae0d05e046a
patch 8.0.1276: key lost when window closed in exit callback
Christian Brabandt <cb@256bit.org>
parents:
12767
diff
changeset
|
2171 if (c != K_IGNORE) |
|
5ae0d05e046a
patch 8.0.1276: key lost when window closed in exit callback
Christian Brabandt <cb@256bit.org>
parents:
12767
diff
changeset
|
2172 vungetc(c); |
| 12502 | 2173 break; |
|
12798
5ae0d05e046a
patch 8.0.1276: key lost when window closed in exit callback
Christian Brabandt <cb@256bit.org>
parents:
12767
diff
changeset
|
2174 } |
| 12502 | 2175 if (c == K_IGNORE) |
| 2176 continue; | |
| 2177 | |
|
12800
8dfeed7e07e7
patch 8.0.1277: terminal window CR-NL conversions may cause problems
Christian Brabandt <cb@256bit.org>
parents:
12798
diff
changeset
|
2178 #ifdef UNIX |
|
8dfeed7e07e7
patch 8.0.1277: terminal window CR-NL conversions may cause problems
Christian Brabandt <cb@256bit.org>
parents:
12798
diff
changeset
|
2179 /* |
|
8dfeed7e07e7
patch 8.0.1277: terminal window CR-NL conversions may cause problems
Christian Brabandt <cb@256bit.org>
parents:
12798
diff
changeset
|
2180 * The shell or another program may change the tty settings. Getting |
|
8dfeed7e07e7
patch 8.0.1277: terminal window CR-NL conversions may cause problems
Christian Brabandt <cb@256bit.org>
parents:
12798
diff
changeset
|
2181 * them for every typed character is a bit of overhead, but it's needed |
|
8dfeed7e07e7
patch 8.0.1277: terminal window CR-NL conversions may cause problems
Christian Brabandt <cb@256bit.org>
parents:
12798
diff
changeset
|
2182 * for the first character typed, e.g. when Vim starts in a shell. |
|
8dfeed7e07e7
patch 8.0.1277: terminal window CR-NL conversions may cause problems
Christian Brabandt <cb@256bit.org>
parents:
12798
diff
changeset
|
2183 */ |
|
8dfeed7e07e7
patch 8.0.1277: terminal window CR-NL conversions may cause problems
Christian Brabandt <cb@256bit.org>
parents:
12798
diff
changeset
|
2184 if (isatty(tty_fd)) |
|
8dfeed7e07e7
patch 8.0.1277: terminal window CR-NL conversions may cause problems
Christian Brabandt <cb@256bit.org>
parents:
12798
diff
changeset
|
2185 { |
|
8dfeed7e07e7
patch 8.0.1277: terminal window CR-NL conversions may cause problems
Christian Brabandt <cb@256bit.org>
parents:
12798
diff
changeset
|
2186 ttyinfo_T info; |
|
8dfeed7e07e7
patch 8.0.1277: terminal window CR-NL conversions may cause problems
Christian Brabandt <cb@256bit.org>
parents:
12798
diff
changeset
|
2187 |
|
8dfeed7e07e7
patch 8.0.1277: terminal window CR-NL conversions may cause problems
Christian Brabandt <cb@256bit.org>
parents:
12798
diff
changeset
|
2188 /* Get the current backspace character of the pty. */ |
|
8dfeed7e07e7
patch 8.0.1277: terminal window CR-NL conversions may cause problems
Christian Brabandt <cb@256bit.org>
parents:
12798
diff
changeset
|
2189 if (get_tty_info(tty_fd, &info) == OK) |
|
8dfeed7e07e7
patch 8.0.1277: terminal window CR-NL conversions may cause problems
Christian Brabandt <cb@256bit.org>
parents:
12798
diff
changeset
|
2190 term_backspace_char = info.backspace; |
|
8dfeed7e07e7
patch 8.0.1277: terminal window CR-NL conversions may cause problems
Christian Brabandt <cb@256bit.org>
parents:
12798
diff
changeset
|
2191 } |
|
8dfeed7e07e7
patch 8.0.1277: terminal window CR-NL conversions may cause problems
Christian Brabandt <cb@256bit.org>
parents:
12798
diff
changeset
|
2192 #endif |
|
8dfeed7e07e7
patch 8.0.1277: terminal window CR-NL conversions may cause problems
Christian Brabandt <cb@256bit.org>
parents:
12798
diff
changeset
|
2193 |
| 12502 | 2194 #ifdef WIN3264 |
| 2195 /* On Windows winpty handles CTRL-C, don't send a CTRL_C_EVENT. | |
| 2196 * Use CTRL-BREAK to kill the job. */ | |
| 2197 if (ctrl_break_was_pressed) | |
| 2198 mch_signal_job(curbuf->b_term->tl_job, (char_u *)"kill"); | |
| 2199 #endif | |
|
13845
f22db93bd887
patch 8.0.1794: duplicate term options after renaming
Christian Brabandt <cb@256bit.org>
parents:
13835
diff
changeset
|
2200 /* Was either CTRL-W (termwinkey) or CTRL-\ pressed? |
|
13474
8a8daeb057d1
patch 8.0.1611: CTRL-W in system terminal does not go to job
Christian Brabandt <cb@256bit.org>
parents:
13472
diff
changeset
|
2201 * Not in a system terminal. */ |
|
13845
f22db93bd887
patch 8.0.1794: duplicate term options after renaming
Christian Brabandt <cb@256bit.org>
parents:
13835
diff
changeset
|
2202 if ((c == (termwinkey == 0 ? Ctrl_W : termwinkey) || c == Ctrl_BSL) |
|
13474
8a8daeb057d1
patch 8.0.1611: CTRL-W in system terminal does not go to job
Christian Brabandt <cb@256bit.org>
parents:
13472
diff
changeset
|
2203 #ifdef FEAT_GUI |
|
8a8daeb057d1
patch 8.0.1611: CTRL-W in system terminal does not go to job
Christian Brabandt <cb@256bit.org>
parents:
13472
diff
changeset
|
2204 && !curbuf->b_term->tl_system |
|
8a8daeb057d1
patch 8.0.1611: CTRL-W in system terminal does not go to job
Christian Brabandt <cb@256bit.org>
parents:
13472
diff
changeset
|
2205 #endif |
|
8a8daeb057d1
patch 8.0.1611: CTRL-W in system terminal does not go to job
Christian Brabandt <cb@256bit.org>
parents:
13472
diff
changeset
|
2206 ) |
| 12502 | 2207 { |
| 2208 int prev_c = c; | |
| 2209 | |
| 2210 #ifdef FEAT_CMDL_INFO | |
| 2211 if (add_to_showcmd(c)) | |
| 2212 out_flush(); | |
| 2213 #endif | |
| 2214 c = term_vgetc(); | |
| 2215 #ifdef FEAT_CMDL_INFO | |
| 2216 clear_showcmd(); | |
| 2217 #endif | |
|
13994
411dd50f1daa
patch 8.1.0015: cursor color wrong when closing a terminal window
Christian Brabandt <cb@256bit.org>
parents:
13990
diff
changeset
|
2218 if (!term_use_loop_check(TRUE) |
|
411dd50f1daa
patch 8.1.0015: cursor color wrong when closing a terminal window
Christian Brabandt <cb@256bit.org>
parents:
13990
diff
changeset
|
2219 || in_terminal_loop != curbuf->b_term) |
| 12502 | 2220 /* job finished while waiting for a character */ |
| 2221 break; | |
| 2222 | |
| 2223 if (prev_c == Ctrl_BSL) | |
| 2224 { | |
| 2225 if (c == Ctrl_N) | |
| 2226 { | |
| 2227 /* CTRL-\ CTRL-N : go to Terminal-Normal mode. */ | |
| 2228 term_enter_normal_mode(); | |
| 2229 ret = FAIL; | |
| 2230 goto theend; | |
| 2231 } | |
| 2232 /* Send both keys to the terminal. */ | |
| 2233 send_keys_to_term(curbuf->b_term, prev_c, TRUE); | |
| 2234 } | |
| 2235 else if (c == Ctrl_C) | |
| 2236 { | |
|
13845
f22db93bd887
patch 8.0.1794: duplicate term options after renaming
Christian Brabandt <cb@256bit.org>
parents:
13835
diff
changeset
|
2237 /* "CTRL-W CTRL-C" or 'termwinkey' CTRL-C: end the job */ |
| 12502 | 2238 mch_signal_job(curbuf->b_term->tl_job, (char_u *)"kill"); |
| 2239 } | |
|
14109
279465096a16
patch 8.1.0072: use of 'termwinkey' is inconsistent
Christian Brabandt <cb@256bit.org>
parents:
14065
diff
changeset
|
2240 else if (c == '.') |
| 12502 | 2241 { |
| 2242 /* "CTRL-W .": send CTRL-W to the job */ | |
|
14109
279465096a16
patch 8.1.0072: use of 'termwinkey' is inconsistent
Christian Brabandt <cb@256bit.org>
parents:
14065
diff
changeset
|
2243 /* "'termwinkey' .": send 'termwinkey' to the job */ |
|
279465096a16
patch 8.1.0072: use of 'termwinkey' is inconsistent
Christian Brabandt <cb@256bit.org>
parents:
14065
diff
changeset
|
2244 c = termwinkey == 0 ? Ctrl_W : termwinkey; |
| 12502 | 2245 } |
|
14109
279465096a16
patch 8.1.0072: use of 'termwinkey' is inconsistent
Christian Brabandt <cb@256bit.org>
parents:
14065
diff
changeset
|
2246 else if (c == Ctrl_BSL) |
|
13668
6a84e3d2b810
patch 8.0.1706: cannot sent CTRL- to a terminal window
Christian Brabandt <cb@256bit.org>
parents:
13630
diff
changeset
|
2247 { |
|
6a84e3d2b810
patch 8.0.1706: cannot sent CTRL- to a terminal window
Christian Brabandt <cb@256bit.org>
parents:
13630
diff
changeset
|
2248 /* "CTRL-W CTRL-\": send CTRL-\ to the job */ |
|
6a84e3d2b810
patch 8.0.1706: cannot sent CTRL- to a terminal window
Christian Brabandt <cb@256bit.org>
parents:
13630
diff
changeset
|
2249 c = Ctrl_BSL; |
|
6a84e3d2b810
patch 8.0.1706: cannot sent CTRL- to a terminal window
Christian Brabandt <cb@256bit.org>
parents:
13630
diff
changeset
|
2250 } |
| 12502 | 2251 else if (c == 'N') |
| 2252 { | |
| 2253 /* CTRL-W N : go to Terminal-Normal mode. */ | |
| 2254 term_enter_normal_mode(); | |
| 2255 ret = FAIL; | |
| 2256 goto theend; | |
| 2257 } | |
| 2258 else if (c == '"') | |
| 2259 { | |
| 2260 term_paste_register(prev_c); | |
| 2261 continue; | |
| 2262 } | |
|
13845
f22db93bd887
patch 8.0.1794: duplicate term options after renaming
Christian Brabandt <cb@256bit.org>
parents:
13835
diff
changeset
|
2263 else if (termwinkey == 0 || c != termwinkey) |
| 12502 | 2264 { |
| 2265 stuffcharReadbuff(Ctrl_W); | |
| 2266 stuffcharReadbuff(c); | |
| 2267 ret = OK; | |
| 2268 goto theend; | |
| 2269 } | |
| 2270 } | |
| 2271 # ifdef WIN3264 | |
| 2272 if (!enc_utf8 && has_mbyte && c >= 0x80) | |
| 2273 { | |
| 2274 WCHAR wc; | |
| 2275 char_u mb[3]; | |
| 2276 | |
| 2277 mb[0] = (unsigned)c >> 8; | |
| 2278 mb[1] = c; | |
| 2279 if (MultiByteToWideChar(GetACP(), 0, (char*)mb, 2, &wc, 1) > 0) | |
| 2280 c = wc; | |
| 2281 } | |
| 2282 # endif | |
| 2283 if (send_keys_to_term(curbuf->b_term, c, TRUE) != OK) | |
| 2284 { | |
|
13206
53f0c469dfc6
patch 8.0.1477: redraw flicker when moving the mouse outside of terminal window
Christian Brabandt <cb@256bit.org>
parents:
13132
diff
changeset
|
2285 if (c == K_MOUSEMOVE) |
|
53f0c469dfc6
patch 8.0.1477: redraw flicker when moving the mouse outside of terminal window
Christian Brabandt <cb@256bit.org>
parents:
13132
diff
changeset
|
2286 /* We are sure to come back here, don't reset the cursor color |
|
53f0c469dfc6
patch 8.0.1477: redraw flicker when moving the mouse outside of terminal window
Christian Brabandt <cb@256bit.org>
parents:
13132
diff
changeset
|
2287 * and shape to avoid flickering. */ |
|
53f0c469dfc6
patch 8.0.1477: redraw flicker when moving the mouse outside of terminal window
Christian Brabandt <cb@256bit.org>
parents:
13132
diff
changeset
|
2288 restore_cursor = FALSE; |
|
53f0c469dfc6
patch 8.0.1477: redraw flicker when moving the mouse outside of terminal window
Christian Brabandt <cb@256bit.org>
parents:
13132
diff
changeset
|
2289 |
| 12502 | 2290 ret = OK; |
| 2291 goto theend; | |
| 2292 } | |
| 2293 } | |
| 2294 ret = FAIL; | |
| 2295 | |
| 2296 theend: | |
| 2297 in_terminal_loop = NULL; | |
|
13206
53f0c469dfc6
patch 8.0.1477: redraw flicker when moving the mouse outside of terminal window
Christian Brabandt <cb@256bit.org>
parents:
13132
diff
changeset
|
2298 if (restore_cursor) |
|
53f0c469dfc6
patch 8.0.1477: redraw flicker when moving the mouse outside of terminal window
Christian Brabandt <cb@256bit.org>
parents:
13132
diff
changeset
|
2299 prepare_restore_cursor_props(); |
|
13878
a590029f16a0
patch 8.0.1810: buffer of a terminal only updated in Terminal-Normal mode
Christian Brabandt <cb@256bit.org>
parents:
13864
diff
changeset
|
2300 |
|
a590029f16a0
patch 8.0.1810: buffer of a terminal only updated in Terminal-Normal mode
Christian Brabandt <cb@256bit.org>
parents:
13864
diff
changeset
|
2301 /* Move a snapshot of the screen contents to the buffer, so that completion |
|
a590029f16a0
patch 8.0.1810: buffer of a terminal only updated in Terminal-Normal mode
Christian Brabandt <cb@256bit.org>
parents:
13864
diff
changeset
|
2302 * works in other buffers. */ |
|
13935
cc25795aeec6
patch 8.0.1838: cursor in wrong pos when switching to Terminal-Normal mode
Christian Brabandt <cb@256bit.org>
parents:
13919
diff
changeset
|
2303 if (curbuf->b_term != NULL && !curbuf->b_term->tl_normal_mode) |
|
cc25795aeec6
patch 8.0.1838: cursor in wrong pos when switching to Terminal-Normal mode
Christian Brabandt <cb@256bit.org>
parents:
13919
diff
changeset
|
2304 may_move_terminal_to_buffer(curbuf->b_term, FALSE); |
|
13878
a590029f16a0
patch 8.0.1810: buffer of a terminal only updated in Terminal-Normal mode
Christian Brabandt <cb@256bit.org>
parents:
13864
diff
changeset
|
2305 |
| 12502 | 2306 return ret; |
| 2307 } | |
| 2308 | |
| 2309 /* | |
| 2310 * Called when a job has finished. | |
| 2311 * This updates the title and status, but does not close the vterm, because | |
| 2312 * there might still be pending output in the channel. | |
| 2313 */ | |
| 2314 void | |
| 2315 term_job_ended(job_T *job) | |
| 2316 { | |
| 2317 term_T *term; | |
| 2318 int did_one = FALSE; | |
| 2319 | |
| 2320 for (term = first_term; term != NULL; term = term->tl_next) | |
| 2321 if (term->tl_job == job) | |
| 2322 { | |
|
13244
ac42c4b11dbc
patch 8.0.1496: clearing a pointer takes two lines
Christian Brabandt <cb@256bit.org>
parents:
13219
diff
changeset
|
2323 VIM_CLEAR(term->tl_title); |
|
ac42c4b11dbc
patch 8.0.1496: clearing a pointer takes two lines
Christian Brabandt <cb@256bit.org>
parents:
13219
diff
changeset
|
2324 VIM_CLEAR(term->tl_status_text); |
| 12502 | 2325 redraw_buf_and_status_later(term->tl_buffer, VALID); |
| 2326 did_one = TRUE; | |
| 2327 } | |
| 2328 if (did_one) | |
| 2329 redraw_statuslines(); | |
| 2330 if (curbuf->b_term != NULL) | |
| 2331 { | |
| 2332 if (curbuf->b_term->tl_job == job) | |
| 2333 maketitle(); | |
| 2334 update_cursor(curbuf->b_term, TRUE); | |
| 2335 } | |
| 2336 } | |
| 2337 | |
| 2338 static void | |
| 2339 may_toggle_cursor(term_T *term) | |
| 2340 { | |
| 2341 if (in_terminal_loop == term) | |
| 2342 { | |
| 2343 if (term->tl_cursor_visible) | |
| 2344 cursor_on(); | |
| 2345 else | |
| 2346 cursor_off(); | |
| 2347 } | |
| 2348 } | |
| 2349 | |
| 2350 /* | |
| 2351 * Reverse engineer the RGB value into a cterm color index. | |
|
12966
c5bccd50100e
patch 8.0.1359: libvterm ANSI colors can not always be recognized
Christian Brabandt <cb@256bit.org>
parents:
12907
diff
changeset
|
2352 * First color is 1. Return 0 if no match found (default color). |
| 12502 | 2353 */ |
| 2354 static int | |
| 2355 color2index(VTermColor *color, int fg, int *boldp) | |
| 2356 { | |
| 2357 int red = color->red; | |
| 2358 int blue = color->blue; | |
| 2359 int green = color->green; | |
| 2360 | |
|
12966
c5bccd50100e
patch 8.0.1359: libvterm ANSI colors can not always be recognized
Christian Brabandt <cb@256bit.org>
parents:
12907
diff
changeset
|
2361 if (color->ansi_index != VTERM_ANSI_INDEX_NONE) |
| 12502 | 2362 { |
|
12966
c5bccd50100e
patch 8.0.1359: libvterm ANSI colors can not always be recognized
Christian Brabandt <cb@256bit.org>
parents:
12907
diff
changeset
|
2363 /* First 16 colors and default: use the ANSI index, because these |
|
c5bccd50100e
patch 8.0.1359: libvterm ANSI colors can not always be recognized
Christian Brabandt <cb@256bit.org>
parents:
12907
diff
changeset
|
2364 * colors can be redefined. */ |
|
c5bccd50100e
patch 8.0.1359: libvterm ANSI colors can not always be recognized
Christian Brabandt <cb@256bit.org>
parents:
12907
diff
changeset
|
2365 if (t_colors >= 16) |
|
c5bccd50100e
patch 8.0.1359: libvterm ANSI colors can not always be recognized
Christian Brabandt <cb@256bit.org>
parents:
12907
diff
changeset
|
2366 return color->ansi_index; |
|
c5bccd50100e
patch 8.0.1359: libvterm ANSI colors can not always be recognized
Christian Brabandt <cb@256bit.org>
parents:
12907
diff
changeset
|
2367 switch (color->ansi_index) |
| 12502 | 2368 { |
|
12966
c5bccd50100e
patch 8.0.1359: libvterm ANSI colors can not always be recognized
Christian Brabandt <cb@256bit.org>
parents:
12907
diff
changeset
|
2369 case 0: return 0; |
|
13329
424321d6eea7
patch 8.0.1539: no test for the popup menu positioning
Christian Brabandt <cb@256bit.org>
parents:
13304
diff
changeset
|
2370 case 1: return lookup_color( 0, fg, boldp) + 1; /* black */ |
|
12966
c5bccd50100e
patch 8.0.1359: libvterm ANSI colors can not always be recognized
Christian Brabandt <cb@256bit.org>
parents:
12907
diff
changeset
|
2371 case 2: return lookup_color( 4, fg, boldp) + 1; /* dark red */ |
|
c5bccd50100e
patch 8.0.1359: libvterm ANSI colors can not always be recognized
Christian Brabandt <cb@256bit.org>
parents:
12907
diff
changeset
|
2372 case 3: return lookup_color( 2, fg, boldp) + 1; /* dark green */ |
|
c5bccd50100e
patch 8.0.1359: libvterm ANSI colors can not always be recognized
Christian Brabandt <cb@256bit.org>
parents:
12907
diff
changeset
|
2373 case 4: return lookup_color( 6, fg, boldp) + 1; /* brown */ |
|
13668
6a84e3d2b810
patch 8.0.1706: cannot sent CTRL- to a terminal window
Christian Brabandt <cb@256bit.org>
parents:
13630
diff
changeset
|
2374 case 5: return lookup_color( 1, fg, boldp) + 1; /* dark blue */ |
|
12966
c5bccd50100e
patch 8.0.1359: libvterm ANSI colors can not always be recognized
Christian Brabandt <cb@256bit.org>
parents:
12907
diff
changeset
|
2375 case 6: return lookup_color( 5, fg, boldp) + 1; /* dark magenta */ |
|
c5bccd50100e
patch 8.0.1359: libvterm ANSI colors can not always be recognized
Christian Brabandt <cb@256bit.org>
parents:
12907
diff
changeset
|
2376 case 7: return lookup_color( 3, fg, boldp) + 1; /* dark cyan */ |
|
c5bccd50100e
patch 8.0.1359: libvterm ANSI colors can not always be recognized
Christian Brabandt <cb@256bit.org>
parents:
12907
diff
changeset
|
2377 case 8: return lookup_color( 8, fg, boldp) + 1; /* light grey */ |
|
c5bccd50100e
patch 8.0.1359: libvterm ANSI colors can not always be recognized
Christian Brabandt <cb@256bit.org>
parents:
12907
diff
changeset
|
2378 case 9: return lookup_color(12, fg, boldp) + 1; /* dark grey */ |
|
c5bccd50100e
patch 8.0.1359: libvterm ANSI colors can not always be recognized
Christian Brabandt <cb@256bit.org>
parents:
12907
diff
changeset
|
2379 case 10: return lookup_color(20, fg, boldp) + 1; /* red */ |
|
c5bccd50100e
patch 8.0.1359: libvterm ANSI colors can not always be recognized
Christian Brabandt <cb@256bit.org>
parents:
12907
diff
changeset
|
2380 case 11: return lookup_color(16, fg, boldp) + 1; /* green */ |
|
c5bccd50100e
patch 8.0.1359: libvterm ANSI colors can not always be recognized
Christian Brabandt <cb@256bit.org>
parents:
12907
diff
changeset
|
2381 case 12: return lookup_color(24, fg, boldp) + 1; /* yellow */ |
|
c5bccd50100e
patch 8.0.1359: libvterm ANSI colors can not always be recognized
Christian Brabandt <cb@256bit.org>
parents:
12907
diff
changeset
|
2382 case 13: return lookup_color(14, fg, boldp) + 1; /* blue */ |
|
c5bccd50100e
patch 8.0.1359: libvterm ANSI colors can not always be recognized
Christian Brabandt <cb@256bit.org>
parents:
12907
diff
changeset
|
2383 case 14: return lookup_color(22, fg, boldp) + 1; /* magenta */ |
|
c5bccd50100e
patch 8.0.1359: libvterm ANSI colors can not always be recognized
Christian Brabandt <cb@256bit.org>
parents:
12907
diff
changeset
|
2384 case 15: return lookup_color(18, fg, boldp) + 1; /* cyan */ |
|
c5bccd50100e
patch 8.0.1359: libvterm ANSI colors can not always be recognized
Christian Brabandt <cb@256bit.org>
parents:
12907
diff
changeset
|
2385 case 16: return lookup_color(26, fg, boldp) + 1; /* white */ |
| 12502 | 2386 } |
| 2387 } | |
|
12966
c5bccd50100e
patch 8.0.1359: libvterm ANSI colors can not always be recognized
Christian Brabandt <cb@256bit.org>
parents:
12907
diff
changeset
|
2388 |
| 12502 | 2389 if (t_colors >= 256) |
| 2390 { | |
| 2391 if (red == blue && red == green) | |
| 2392 { | |
|
12541
fcb11cfca8b3
patch 8.0.1149: libvterm colors differ from xterm
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
2393 /* 24-color greyscale plus white and black */ |
| 12502 | 2394 static int cutoff[23] = { |
|
12541
fcb11cfca8b3
patch 8.0.1149: libvterm colors differ from xterm
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
2395 0x0D, 0x17, 0x21, 0x2B, 0x35, 0x3F, 0x49, 0x53, 0x5D, 0x67, |
|
fcb11cfca8b3
patch 8.0.1149: libvterm colors differ from xterm
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
2396 0x71, 0x7B, 0x85, 0x8F, 0x99, 0xA3, 0xAD, 0xB7, 0xC1, 0xCB, |
|
fcb11cfca8b3
patch 8.0.1149: libvterm colors differ from xterm
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
2397 0xD5, 0xDF, 0xE9}; |
| 12502 | 2398 int i; |
| 2399 | |
|
12541
fcb11cfca8b3
patch 8.0.1149: libvterm colors differ from xterm
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
2400 if (red < 5) |
|
fcb11cfca8b3
patch 8.0.1149: libvterm colors differ from xterm
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
2401 return 17; /* 00/00/00 */ |
|
fcb11cfca8b3
patch 8.0.1149: libvterm colors differ from xterm
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
2402 if (red > 245) /* ff/ff/ff */ |
|
fcb11cfca8b3
patch 8.0.1149: libvterm colors differ from xterm
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
2403 return 232; |
| 12502 | 2404 for (i = 0; i < 23; ++i) |
| 2405 if (red < cutoff[i]) | |
| 2406 return i + 233; | |
| 2407 return 256; | |
| 2408 } | |
|
12541
fcb11cfca8b3
patch 8.0.1149: libvterm colors differ from xterm
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
2409 { |
|
fcb11cfca8b3
patch 8.0.1149: libvterm colors differ from xterm
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
2410 static int cutoff[5] = {0x2F, 0x73, 0x9B, 0xC3, 0xEB}; |
|
fcb11cfca8b3
patch 8.0.1149: libvterm colors differ from xterm
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
2411 int ri, gi, bi; |
|
fcb11cfca8b3
patch 8.0.1149: libvterm colors differ from xterm
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
2412 |
|
fcb11cfca8b3
patch 8.0.1149: libvterm colors differ from xterm
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
2413 /* 216-color cube */ |
|
fcb11cfca8b3
patch 8.0.1149: libvterm colors differ from xterm
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
2414 for (ri = 0; ri < 5; ++ri) |
|
fcb11cfca8b3
patch 8.0.1149: libvterm colors differ from xterm
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
2415 if (red < cutoff[ri]) |
|
fcb11cfca8b3
patch 8.0.1149: libvterm colors differ from xterm
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
2416 break; |
|
fcb11cfca8b3
patch 8.0.1149: libvterm colors differ from xterm
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
2417 for (gi = 0; gi < 5; ++gi) |
|
fcb11cfca8b3
patch 8.0.1149: libvterm colors differ from xterm
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
2418 if (green < cutoff[gi]) |
|
fcb11cfca8b3
patch 8.0.1149: libvterm colors differ from xterm
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
2419 break; |
|
fcb11cfca8b3
patch 8.0.1149: libvterm colors differ from xterm
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
2420 for (bi = 0; bi < 5; ++bi) |
|
fcb11cfca8b3
patch 8.0.1149: libvterm colors differ from xterm
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
2421 if (blue < cutoff[bi]) |
|
fcb11cfca8b3
patch 8.0.1149: libvterm colors differ from xterm
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
2422 break; |
|
fcb11cfca8b3
patch 8.0.1149: libvterm colors differ from xterm
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
2423 return 17 + ri * 36 + gi * 6 + bi; |
|
fcb11cfca8b3
patch 8.0.1149: libvterm colors differ from xterm
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
2424 } |
| 12502 | 2425 } |
| 2426 return 0; | |
| 2427 } | |
| 2428 | |
| 2429 /* | |
|
13298
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
2430 * Convert Vterm attributes to highlight flags. |
| 12502 | 2431 */ |
| 2432 static int | |
|
13298
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
2433 vtermAttr2hl(VTermScreenCellAttrs cellattrs) |
| 12502 | 2434 { |
| 2435 int attr = 0; | |
| 2436 | |
| 2437 if (cellattrs.bold) | |
| 2438 attr |= HL_BOLD; | |
| 2439 if (cellattrs.underline) | |
| 2440 attr |= HL_UNDERLINE; | |
| 2441 if (cellattrs.italic) | |
| 2442 attr |= HL_ITALIC; | |
| 2443 if (cellattrs.strike) | |
| 2444 attr |= HL_STRIKETHROUGH; | |
| 2445 if (cellattrs.reverse) | |
| 2446 attr |= HL_INVERSE; | |
|
13298
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
2447 return attr; |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
2448 } |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
2449 |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
2450 /* |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
2451 * Store Vterm attributes in "cell" from highlight flags. |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
2452 */ |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
2453 static void |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
2454 hl2vtermAttr(int attr, cellattr_T *cell) |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
2455 { |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
2456 vim_memset(&cell->attrs, 0, sizeof(VTermScreenCellAttrs)); |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
2457 if (attr & HL_BOLD) |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
2458 cell->attrs.bold = 1; |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
2459 if (attr & HL_UNDERLINE) |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
2460 cell->attrs.underline = 1; |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
2461 if (attr & HL_ITALIC) |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
2462 cell->attrs.italic = 1; |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
2463 if (attr & HL_STRIKETHROUGH) |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
2464 cell->attrs.strike = 1; |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
2465 if (attr & HL_INVERSE) |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
2466 cell->attrs.reverse = 1; |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
2467 } |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
2468 |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
2469 /* |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
2470 * Convert the attributes of a vterm cell into an attribute index. |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
2471 */ |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
2472 static int |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
2473 cell2attr(VTermScreenCellAttrs cellattrs, VTermColor cellfg, VTermColor cellbg) |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
2474 { |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
2475 int attr = vtermAttr2hl(cellattrs); |
| 12502 | 2476 |
| 2477 #ifdef FEAT_GUI | |
| 2478 if (gui.in_use) | |
| 2479 { | |
| 2480 guicolor_T fg, bg; | |
| 2481 | |
| 2482 fg = gui_mch_get_rgb_color(cellfg.red, cellfg.green, cellfg.blue); | |
| 2483 bg = gui_mch_get_rgb_color(cellbg.red, cellbg.green, cellbg.blue); | |
| 2484 return get_gui_attr_idx(attr, fg, bg); | |
| 2485 } | |
| 2486 else | |
| 2487 #endif | |
| 2488 #ifdef FEAT_TERMGUICOLORS | |
| 2489 if (p_tgc) | |
| 2490 { | |
| 2491 guicolor_T fg, bg; | |
| 2492 | |
| 2493 fg = gui_get_rgb_color_cmn(cellfg.red, cellfg.green, cellfg.blue); | |
| 2494 bg = gui_get_rgb_color_cmn(cellbg.red, cellbg.green, cellbg.blue); | |
| 2495 | |
| 2496 return get_tgc_attr_idx(attr, fg, bg); | |
| 2497 } | |
| 2498 else | |
| 2499 #endif | |
| 2500 { | |
| 2501 int bold = MAYBE; | |
| 2502 int fg = color2index(&cellfg, TRUE, &bold); | |
| 2503 int bg = color2index(&cellbg, FALSE, &bold); | |
| 2504 | |
|
12969
a9f6a874b64f
patch 8.0.1360: the Terminal highlighting doesn't work in a terminal
Christian Brabandt <cb@256bit.org>
parents:
12966
diff
changeset
|
2505 /* Use the "Terminal" highlighting for the default colors. */ |
|
12973
418941f0df08
patch 8.0.1362: terminal window colors wrong when using Terminal highlighting
Christian Brabandt <cb@256bit.org>
parents:
12969
diff
changeset
|
2506 if ((fg == 0 || bg == 0) && t_colors >= 16) |
|
12969
a9f6a874b64f
patch 8.0.1360: the Terminal highlighting doesn't work in a terminal
Christian Brabandt <cb@256bit.org>
parents:
12966
diff
changeset
|
2507 { |
|
12973
418941f0df08
patch 8.0.1362: terminal window colors wrong when using Terminal highlighting
Christian Brabandt <cb@256bit.org>
parents:
12969
diff
changeset
|
2508 if (fg == 0 && term_default_cterm_fg >= 0) |
|
418941f0df08
patch 8.0.1362: terminal window colors wrong when using Terminal highlighting
Christian Brabandt <cb@256bit.org>
parents:
12969
diff
changeset
|
2509 fg = term_default_cterm_fg + 1; |
|
418941f0df08
patch 8.0.1362: terminal window colors wrong when using Terminal highlighting
Christian Brabandt <cb@256bit.org>
parents:
12969
diff
changeset
|
2510 if (bg == 0 && term_default_cterm_bg >= 0) |
|
418941f0df08
patch 8.0.1362: terminal window colors wrong when using Terminal highlighting
Christian Brabandt <cb@256bit.org>
parents:
12969
diff
changeset
|
2511 bg = term_default_cterm_bg + 1; |
|
12969
a9f6a874b64f
patch 8.0.1360: the Terminal highlighting doesn't work in a terminal
Christian Brabandt <cb@256bit.org>
parents:
12966
diff
changeset
|
2512 } |
|
a9f6a874b64f
patch 8.0.1360: the Terminal highlighting doesn't work in a terminal
Christian Brabandt <cb@256bit.org>
parents:
12966
diff
changeset
|
2513 |
| 12502 | 2514 /* with 8 colors set the bold attribute to get a bright foreground */ |
| 2515 if (bold == TRUE) | |
| 2516 attr |= HL_BOLD; | |
| 2517 return get_cterm_attr_idx(attr, fg, bg); | |
| 2518 } | |
| 2519 return 0; | |
| 2520 } | |
| 2521 | |
|
13878
a590029f16a0
patch 8.0.1810: buffer of a terminal only updated in Terminal-Normal mode
Christian Brabandt <cb@256bit.org>
parents:
13864
diff
changeset
|
2522 static void |
|
a590029f16a0
patch 8.0.1810: buffer of a terminal only updated in Terminal-Normal mode
Christian Brabandt <cb@256bit.org>
parents:
13864
diff
changeset
|
2523 set_dirty_snapshot(term_T *term) |
|
a590029f16a0
patch 8.0.1810: buffer of a terminal only updated in Terminal-Normal mode
Christian Brabandt <cb@256bit.org>
parents:
13864
diff
changeset
|
2524 { |
|
a590029f16a0
patch 8.0.1810: buffer of a terminal only updated in Terminal-Normal mode
Christian Brabandt <cb@256bit.org>
parents:
13864
diff
changeset
|
2525 term->tl_dirty_snapshot = TRUE; |
|
a590029f16a0
patch 8.0.1810: buffer of a terminal only updated in Terminal-Normal mode
Christian Brabandt <cb@256bit.org>
parents:
13864
diff
changeset
|
2526 #ifdef FEAT_TIMERS |
|
a590029f16a0
patch 8.0.1810: buffer of a terminal only updated in Terminal-Normal mode
Christian Brabandt <cb@256bit.org>
parents:
13864
diff
changeset
|
2527 if (!term->tl_normal_mode) |
|
a590029f16a0
patch 8.0.1810: buffer of a terminal only updated in Terminal-Normal mode
Christian Brabandt <cb@256bit.org>
parents:
13864
diff
changeset
|
2528 { |
|
a590029f16a0
patch 8.0.1810: buffer of a terminal only updated in Terminal-Normal mode
Christian Brabandt <cb@256bit.org>
parents:
13864
diff
changeset
|
2529 /* Update the snapshot after 100 msec of not getting updates. */ |
|
a590029f16a0
patch 8.0.1810: buffer of a terminal only updated in Terminal-Normal mode
Christian Brabandt <cb@256bit.org>
parents:
13864
diff
changeset
|
2530 profile_setlimit(100L, &term->tl_timer_due); |
|
a590029f16a0
patch 8.0.1810: buffer of a terminal only updated in Terminal-Normal mode
Christian Brabandt <cb@256bit.org>
parents:
13864
diff
changeset
|
2531 term->tl_timer_set = TRUE; |
|
a590029f16a0
patch 8.0.1810: buffer of a terminal only updated in Terminal-Normal mode
Christian Brabandt <cb@256bit.org>
parents:
13864
diff
changeset
|
2532 } |
|
a590029f16a0
patch 8.0.1810: buffer of a terminal only updated in Terminal-Normal mode
Christian Brabandt <cb@256bit.org>
parents:
13864
diff
changeset
|
2533 #endif |
|
a590029f16a0
patch 8.0.1810: buffer of a terminal only updated in Terminal-Normal mode
Christian Brabandt <cb@256bit.org>
parents:
13864
diff
changeset
|
2534 } |
|
a590029f16a0
patch 8.0.1810: buffer of a terminal only updated in Terminal-Normal mode
Christian Brabandt <cb@256bit.org>
parents:
13864
diff
changeset
|
2535 |
| 12502 | 2536 static int |
| 2537 handle_damage(VTermRect rect, void *user) | |
| 2538 { | |
| 2539 term_T *term = (term_T *)user; | |
| 2540 | |
| 2541 term->tl_dirty_row_start = MIN(term->tl_dirty_row_start, rect.start_row); | |
| 2542 term->tl_dirty_row_end = MAX(term->tl_dirty_row_end, rect.end_row); | |
|
13878
a590029f16a0
patch 8.0.1810: buffer of a terminal only updated in Terminal-Normal mode
Christian Brabandt <cb@256bit.org>
parents:
13864
diff
changeset
|
2543 set_dirty_snapshot(term); |
|
13851
3edac4cd1c0a
patch 8.0.1797: terminal window is redrawn too often
Christian Brabandt <cb@256bit.org>
parents:
13849
diff
changeset
|
2544 redraw_buf_later(term->tl_buffer, SOME_VALID); |
| 12502 | 2545 return 1; |
| 2546 } | |
| 2547 | |
|
13851
3edac4cd1c0a
patch 8.0.1797: terminal window is redrawn too often
Christian Brabandt <cb@256bit.org>
parents:
13849
diff
changeset
|
2548 static void |
|
3edac4cd1c0a
patch 8.0.1797: terminal window is redrawn too often
Christian Brabandt <cb@256bit.org>
parents:
13849
diff
changeset
|
2549 term_scroll_up(term_T *term, int start_row, int count) |
|
3edac4cd1c0a
patch 8.0.1797: terminal window is redrawn too often
Christian Brabandt <cb@256bit.org>
parents:
13849
diff
changeset
|
2550 { |
|
3edac4cd1c0a
patch 8.0.1797: terminal window is redrawn too often
Christian Brabandt <cb@256bit.org>
parents:
13849
diff
changeset
|
2551 win_T *wp; |
|
3edac4cd1c0a
patch 8.0.1797: terminal window is redrawn too often
Christian Brabandt <cb@256bit.org>
parents:
13849
diff
changeset
|
2552 VTermColor fg, bg; |
|
3edac4cd1c0a
patch 8.0.1797: terminal window is redrawn too often
Christian Brabandt <cb@256bit.org>
parents:
13849
diff
changeset
|
2553 VTermScreenCellAttrs attr; |
|
3edac4cd1c0a
patch 8.0.1797: terminal window is redrawn too often
Christian Brabandt <cb@256bit.org>
parents:
13849
diff
changeset
|
2554 int clear_attr; |
|
3edac4cd1c0a
patch 8.0.1797: terminal window is redrawn too often
Christian Brabandt <cb@256bit.org>
parents:
13849
diff
changeset
|
2555 |
|
3edac4cd1c0a
patch 8.0.1797: terminal window is redrawn too often
Christian Brabandt <cb@256bit.org>
parents:
13849
diff
changeset
|
2556 /* Set the color to clear lines with. */ |
|
3edac4cd1c0a
patch 8.0.1797: terminal window is redrawn too often
Christian Brabandt <cb@256bit.org>
parents:
13849
diff
changeset
|
2557 vterm_state_get_default_colors(vterm_obtain_state(term->tl_vterm), |
|
3edac4cd1c0a
patch 8.0.1797: terminal window is redrawn too often
Christian Brabandt <cb@256bit.org>
parents:
13849
diff
changeset
|
2558 &fg, &bg); |
|
3edac4cd1c0a
patch 8.0.1797: terminal window is redrawn too often
Christian Brabandt <cb@256bit.org>
parents:
13849
diff
changeset
|
2559 vim_memset(&attr, 0, sizeof(attr)); |
|
3edac4cd1c0a
patch 8.0.1797: terminal window is redrawn too often
Christian Brabandt <cb@256bit.org>
parents:
13849
diff
changeset
|
2560 clear_attr = cell2attr(attr, fg, bg); |
|
3edac4cd1c0a
patch 8.0.1797: terminal window is redrawn too often
Christian Brabandt <cb@256bit.org>
parents:
13849
diff
changeset
|
2561 |
|
3edac4cd1c0a
patch 8.0.1797: terminal window is redrawn too often
Christian Brabandt <cb@256bit.org>
parents:
13849
diff
changeset
|
2562 FOR_ALL_WINDOWS(wp) |
|
3edac4cd1c0a
patch 8.0.1797: terminal window is redrawn too often
Christian Brabandt <cb@256bit.org>
parents:
13849
diff
changeset
|
2563 { |
|
3edac4cd1c0a
patch 8.0.1797: terminal window is redrawn too often
Christian Brabandt <cb@256bit.org>
parents:
13849
diff
changeset
|
2564 if (wp->w_buffer == term->tl_buffer) |
|
3edac4cd1c0a
patch 8.0.1797: terminal window is redrawn too often
Christian Brabandt <cb@256bit.org>
parents:
13849
diff
changeset
|
2565 win_del_lines(wp, start_row, count, FALSE, FALSE, clear_attr); |
|
3edac4cd1c0a
patch 8.0.1797: terminal window is redrawn too often
Christian Brabandt <cb@256bit.org>
parents:
13849
diff
changeset
|
2566 } |
|
3edac4cd1c0a
patch 8.0.1797: terminal window is redrawn too often
Christian Brabandt <cb@256bit.org>
parents:
13849
diff
changeset
|
2567 } |
|
3edac4cd1c0a
patch 8.0.1797: terminal window is redrawn too often
Christian Brabandt <cb@256bit.org>
parents:
13849
diff
changeset
|
2568 |
| 12502 | 2569 static int |
| 2570 handle_moverect(VTermRect dest, VTermRect src, void *user) | |
| 2571 { | |
| 2572 term_T *term = (term_T *)user; | |
|
13851
3edac4cd1c0a
patch 8.0.1797: terminal window is redrawn too often
Christian Brabandt <cb@256bit.org>
parents:
13849
diff
changeset
|
2573 int count = src.start_row - dest.start_row; |
| 12502 | 2574 |
| 2575 /* Scrolling up is done much more efficiently by deleting lines instead of | |
|
13851
3edac4cd1c0a
patch 8.0.1797: terminal window is redrawn too often
Christian Brabandt <cb@256bit.org>
parents:
13849
diff
changeset
|
2576 * redrawing the text. But avoid doing this multiple times, postpone until |
|
3edac4cd1c0a
patch 8.0.1797: terminal window is redrawn too often
Christian Brabandt <cb@256bit.org>
parents:
13849
diff
changeset
|
2577 * the redraw happens. */ |
| 12502 | 2578 if (dest.start_col == src.start_col |
| 2579 && dest.end_col == src.end_col | |
| 2580 && dest.start_row < src.start_row) | |
| 2581 { | |
|
13851
3edac4cd1c0a
patch 8.0.1797: terminal window is redrawn too often
Christian Brabandt <cb@256bit.org>
parents:
13849
diff
changeset
|
2582 if (dest.start_row == 0) |
|
3edac4cd1c0a
patch 8.0.1797: terminal window is redrawn too often
Christian Brabandt <cb@256bit.org>
parents:
13849
diff
changeset
|
2583 term->tl_postponed_scroll += count; |
|
3edac4cd1c0a
patch 8.0.1797: terminal window is redrawn too often
Christian Brabandt <cb@256bit.org>
parents:
13849
diff
changeset
|
2584 else |
|
3edac4cd1c0a
patch 8.0.1797: terminal window is redrawn too often
Christian Brabandt <cb@256bit.org>
parents:
13849
diff
changeset
|
2585 term_scroll_up(term, dest.start_row, count); |
| 12502 | 2586 } |
|
12578
f8beecfea2c4
patch 8.0.1167: Motif: typing in terminal window is slow
Christian Brabandt <cb@256bit.org>
parents:
12541
diff
changeset
|
2587 |
|
f8beecfea2c4
patch 8.0.1167: Motif: typing in terminal window is slow
Christian Brabandt <cb@256bit.org>
parents:
12541
diff
changeset
|
2588 term->tl_dirty_row_start = MIN(term->tl_dirty_row_start, dest.start_row); |
|
f8beecfea2c4
patch 8.0.1167: Motif: typing in terminal window is slow
Christian Brabandt <cb@256bit.org>
parents:
12541
diff
changeset
|
2589 term->tl_dirty_row_end = MIN(term->tl_dirty_row_end, dest.end_row); |
|
13878
a590029f16a0
patch 8.0.1810: buffer of a terminal only updated in Terminal-Normal mode
Christian Brabandt <cb@256bit.org>
parents:
13864
diff
changeset
|
2590 set_dirty_snapshot(term); |
|
12578
f8beecfea2c4
patch 8.0.1167: Motif: typing in terminal window is slow
Christian Brabandt <cb@256bit.org>
parents:
12541
diff
changeset
|
2591 |
|
13851
3edac4cd1c0a
patch 8.0.1797: terminal window is redrawn too often
Christian Brabandt <cb@256bit.org>
parents:
13849
diff
changeset
|
2592 /* Note sure if the scrolling will work correctly, let's do a complete |
|
3edac4cd1c0a
patch 8.0.1797: terminal window is redrawn too often
Christian Brabandt <cb@256bit.org>
parents:
13849
diff
changeset
|
2593 * redraw later. */ |
| 12502 | 2594 redraw_buf_later(term->tl_buffer, NOT_VALID); |
| 2595 return 1; | |
| 2596 } | |
| 2597 | |
| 2598 static int | |
| 2599 handle_movecursor( | |
| 2600 VTermPos pos, | |
| 2601 VTermPos oldpos UNUSED, | |
| 2602 int visible, | |
| 2603 void *user) | |
| 2604 { | |
| 2605 term_T *term = (term_T *)user; | |
| 2606 win_T *wp; | |
| 2607 | |
| 2608 term->tl_cursor_pos = pos; | |
| 2609 term->tl_cursor_visible = visible; | |
| 2610 | |
| 2611 FOR_ALL_WINDOWS(wp) | |
| 2612 { | |
| 2613 if (wp->w_buffer == term->tl_buffer) | |
| 2614 position_cursor(wp, &pos); | |
| 2615 } | |
| 2616 if (term->tl_buffer == curbuf && !term->tl_normal_mode) | |
| 2617 { | |
| 2618 may_toggle_cursor(term); | |
| 2619 update_cursor(term, term->tl_cursor_visible); | |
| 2620 } | |
| 2621 | |
| 2622 return 1; | |
| 2623 } | |
| 2624 | |
| 2625 static int | |
| 2626 handle_settermprop( | |
| 2627 VTermProp prop, | |
| 2628 VTermValue *value, | |
| 2629 void *user) | |
| 2630 { | |
| 2631 term_T *term = (term_T *)user; | |
| 2632 | |
| 2633 switch (prop) | |
| 2634 { | |
| 2635 case VTERM_PROP_TITLE: | |
| 2636 vim_free(term->tl_title); | |
| 2637 /* a blank title isn't useful, make it empty, so that "running" is | |
| 2638 * displayed */ | |
| 2639 if (*skipwhite((char_u *)value->string) == NUL) | |
| 2640 term->tl_title = NULL; | |
| 2641 #ifdef WIN3264 | |
| 2642 else if (!enc_utf8 && enc_codepage > 0) | |
| 2643 { | |
| 2644 WCHAR *ret = NULL; | |
| 2645 int length = 0; | |
| 2646 | |
| 2647 MultiByteToWideChar_alloc(CP_UTF8, 0, | |
| 2648 (char*)value->string, (int)STRLEN(value->string), | |
| 2649 &ret, &length); | |
| 2650 if (ret != NULL) | |
| 2651 { | |
| 2652 WideCharToMultiByte_alloc(enc_codepage, 0, | |
| 2653 ret, length, (char**)&term->tl_title, | |
| 2654 &length, 0, 0); | |
| 2655 vim_free(ret); | |
| 2656 } | |
| 2657 } | |
| 2658 #endif | |
| 2659 else | |
| 2660 term->tl_title = vim_strsave((char_u *)value->string); | |
|
13244
ac42c4b11dbc
patch 8.0.1496: clearing a pointer takes two lines
Christian Brabandt <cb@256bit.org>
parents:
13219
diff
changeset
|
2661 VIM_CLEAR(term->tl_status_text); |
| 12502 | 2662 if (term == curbuf->b_term) |
| 2663 maketitle(); | |
| 2664 break; | |
| 2665 | |
| 2666 case VTERM_PROP_CURSORVISIBLE: | |
| 2667 term->tl_cursor_visible = value->boolean; | |
| 2668 may_toggle_cursor(term); | |
| 2669 out_flush(); | |
| 2670 break; | |
| 2671 | |
| 2672 case VTERM_PROP_CURSORBLINK: | |
| 2673 term->tl_cursor_blink = value->boolean; | |
| 2674 may_set_cursor_props(term); | |
| 2675 break; | |
| 2676 | |
| 2677 case VTERM_PROP_CURSORSHAPE: | |
| 2678 term->tl_cursor_shape = value->number; | |
| 2679 may_set_cursor_props(term); | |
| 2680 break; | |
| 2681 | |
| 2682 case VTERM_PROP_CURSORCOLOR: | |
|
13990
017c5462ed5e
patch 8.1.0013: using freed memory when changing terminal cursor color
Christian Brabandt <cb@256bit.org>
parents:
13961
diff
changeset
|
2683 cursor_color_copy(&term->tl_cursor_color, (char_u*)value->string); |
| 12502 | 2684 may_set_cursor_props(term); |
| 2685 break; | |
| 2686 | |
| 2687 case VTERM_PROP_ALTSCREEN: | |
| 2688 /* TODO: do anything else? */ | |
| 2689 term->tl_using_altscreen = value->boolean; | |
| 2690 break; | |
| 2691 | |
| 2692 default: | |
| 2693 break; | |
| 2694 } | |
| 2695 /* Always return 1, otherwise vterm doesn't store the value internally. */ | |
| 2696 return 1; | |
| 2697 } | |
| 2698 | |
| 2699 /* | |
| 2700 * The job running in the terminal resized the terminal. | |
| 2701 */ | |
| 2702 static int | |
| 2703 handle_resize(int rows, int cols, void *user) | |
| 2704 { | |
| 2705 term_T *term = (term_T *)user; | |
| 2706 win_T *wp; | |
| 2707 | |
| 2708 term->tl_rows = rows; | |
| 2709 term->tl_cols = cols; | |
| 2710 if (term->tl_vterm_size_changed) | |
| 2711 /* Size was set by vterm_set_size(), don't set the window size. */ | |
| 2712 term->tl_vterm_size_changed = FALSE; | |
| 2713 else | |
| 2714 { | |
| 2715 FOR_ALL_WINDOWS(wp) | |
| 2716 { | |
| 2717 if (wp->w_buffer == term->tl_buffer) | |
| 2718 { | |
| 2719 win_setheight_win(rows, wp); | |
| 2720 win_setwidth_win(cols, wp); | |
| 2721 } | |
| 2722 } | |
| 2723 redraw_buf_later(term->tl_buffer, NOT_VALID); | |
| 2724 } | |
| 2725 return 1; | |
| 2726 } | |
| 2727 | |
| 2728 /* | |
| 2729 * Handle a line that is pushed off the top of the screen. | |
| 2730 */ | |
| 2731 static int | |
| 2732 handle_pushline(int cols, const VTermScreenCell *cells, void *user) | |
| 2733 { | |
| 2734 term_T *term = (term_T *)user; | |
| 2735 | |
|
13878
a590029f16a0
patch 8.0.1810: buffer of a terminal only updated in Terminal-Normal mode
Christian Brabandt <cb@256bit.org>
parents:
13864
diff
changeset
|
2736 /* First remove the lines that were appended before, the pushed line goes |
|
a590029f16a0
patch 8.0.1810: buffer of a terminal only updated in Terminal-Normal mode
Christian Brabandt <cb@256bit.org>
parents:
13864
diff
changeset
|
2737 * above it. */ |
|
a590029f16a0
patch 8.0.1810: buffer of a terminal only updated in Terminal-Normal mode
Christian Brabandt <cb@256bit.org>
parents:
13864
diff
changeset
|
2738 cleanup_scrollback(term); |
|
a590029f16a0
patch 8.0.1810: buffer of a terminal only updated in Terminal-Normal mode
Christian Brabandt <cb@256bit.org>
parents:
13864
diff
changeset
|
2739 |
|
13680
c32e9628dc30
patch 8.0.1712: terminal scrollback is not limited
Christian Brabandt <cb@256bit.org>
parents:
13678
diff
changeset
|
2740 /* If the number of lines that are stored goes over 'termscrollback' then |
|
c32e9628dc30
patch 8.0.1712: terminal scrollback is not limited
Christian Brabandt <cb@256bit.org>
parents:
13678
diff
changeset
|
2741 * delete the first 10%. */ |
|
13742
a34b1323286c
patch 8.0.1743: terminal window options are named inconsistently
Christian Brabandt <cb@256bit.org>
parents:
13720
diff
changeset
|
2742 if (term->tl_scrollback.ga_len >= term->tl_buffer->b_p_twsl) |
|
13680
c32e9628dc30
patch 8.0.1712: terminal scrollback is not limited
Christian Brabandt <cb@256bit.org>
parents:
13678
diff
changeset
|
2743 { |
|
13742
a34b1323286c
patch 8.0.1743: terminal window options are named inconsistently
Christian Brabandt <cb@256bit.org>
parents:
13720
diff
changeset
|
2744 int todo = term->tl_buffer->b_p_twsl / 10; |
|
13680
c32e9628dc30
patch 8.0.1712: terminal scrollback is not limited
Christian Brabandt <cb@256bit.org>
parents:
13678
diff
changeset
|
2745 int i; |
|
c32e9628dc30
patch 8.0.1712: terminal scrollback is not limited
Christian Brabandt <cb@256bit.org>
parents:
13678
diff
changeset
|
2746 |
|
c32e9628dc30
patch 8.0.1712: terminal scrollback is not limited
Christian Brabandt <cb@256bit.org>
parents:
13678
diff
changeset
|
2747 curbuf = term->tl_buffer; |
|
c32e9628dc30
patch 8.0.1712: terminal scrollback is not limited
Christian Brabandt <cb@256bit.org>
parents:
13678
diff
changeset
|
2748 for (i = 0; i < todo; ++i) |
|
c32e9628dc30
patch 8.0.1712: terminal scrollback is not limited
Christian Brabandt <cb@256bit.org>
parents:
13678
diff
changeset
|
2749 { |
|
c32e9628dc30
patch 8.0.1712: terminal scrollback is not limited
Christian Brabandt <cb@256bit.org>
parents:
13678
diff
changeset
|
2750 vim_free(((sb_line_T *)term->tl_scrollback.ga_data + i)->sb_cells); |
|
c32e9628dc30
patch 8.0.1712: terminal scrollback is not limited
Christian Brabandt <cb@256bit.org>
parents:
13678
diff
changeset
|
2751 ml_delete(1, FALSE); |
|
c32e9628dc30
patch 8.0.1712: terminal scrollback is not limited
Christian Brabandt <cb@256bit.org>
parents:
13678
diff
changeset
|
2752 } |
|
c32e9628dc30
patch 8.0.1712: terminal scrollback is not limited
Christian Brabandt <cb@256bit.org>
parents:
13678
diff
changeset
|
2753 curbuf = curwin->w_buffer; |
|
c32e9628dc30
patch 8.0.1712: terminal scrollback is not limited
Christian Brabandt <cb@256bit.org>
parents:
13678
diff
changeset
|
2754 |
|
c32e9628dc30
patch 8.0.1712: terminal scrollback is not limited
Christian Brabandt <cb@256bit.org>
parents:
13678
diff
changeset
|
2755 term->tl_scrollback.ga_len -= todo; |
|
c32e9628dc30
patch 8.0.1712: terminal scrollback is not limited
Christian Brabandt <cb@256bit.org>
parents:
13678
diff
changeset
|
2756 mch_memmove(term->tl_scrollback.ga_data, |
|
c32e9628dc30
patch 8.0.1712: terminal scrollback is not limited
Christian Brabandt <cb@256bit.org>
parents:
13678
diff
changeset
|
2757 (sb_line_T *)term->tl_scrollback.ga_data + todo, |
|
c32e9628dc30
patch 8.0.1712: terminal scrollback is not limited
Christian Brabandt <cb@256bit.org>
parents:
13678
diff
changeset
|
2758 sizeof(sb_line_T) * term->tl_scrollback.ga_len); |
|
13956
300aab3275c0
patch 8.0.1848: 'termwinscroll' does not work properly
Christian Brabandt <cb@256bit.org>
parents:
13935
diff
changeset
|
2759 term->tl_scrollback_scrolled -= todo; |
|
13680
c32e9628dc30
patch 8.0.1712: terminal scrollback is not limited
Christian Brabandt <cb@256bit.org>
parents:
13678
diff
changeset
|
2760 } |
|
c32e9628dc30
patch 8.0.1712: terminal scrollback is not limited
Christian Brabandt <cb@256bit.org>
parents:
13678
diff
changeset
|
2761 |
| 12502 | 2762 if (ga_grow(&term->tl_scrollback, 1) == OK) |
| 2763 { | |
| 2764 cellattr_T *p = NULL; | |
| 2765 int len = 0; | |
| 2766 int i; | |
| 2767 int c; | |
| 2768 int col; | |
| 2769 sb_line_T *line; | |
| 2770 garray_T ga; | |
| 2771 cellattr_T fill_attr = term->tl_default_color; | |
| 2772 | |
| 2773 /* do not store empty cells at the end */ | |
| 2774 for (i = 0; i < cols; ++i) | |
| 2775 if (cells[i].chars[0] != 0) | |
| 2776 len = i + 1; | |
| 2777 else | |
| 2778 cell2cellattr(&cells[i], &fill_attr); | |
| 2779 | |
| 2780 ga_init2(&ga, 1, 100); | |
| 2781 if (len > 0) | |
| 2782 p = (cellattr_T *)alloc((int)sizeof(cellattr_T) * len); | |
| 2783 if (p != NULL) | |
| 2784 { | |
| 2785 for (col = 0; col < len; col += cells[col].width) | |
| 2786 { | |
| 2787 if (ga_grow(&ga, MB_MAXBYTES) == FAIL) | |
| 2788 { | |
| 2789 ga.ga_len = 0; | |
| 2790 break; | |
| 2791 } | |
| 2792 for (i = 0; (c = cells[col].chars[i]) > 0 || i == 0; ++i) | |
| 2793 ga.ga_len += utf_char2bytes(c == NUL ? ' ' : c, | |
| 2794 (char_u *)ga.ga_data + ga.ga_len); | |
| 2795 cell2cellattr(&cells[col], &p[col]); | |
| 2796 } | |
| 2797 } | |
| 2798 if (ga_grow(&ga, 1) == FAIL) | |
| 2799 add_scrollback_line_to_buffer(term, (char_u *)"", 0); | |
| 2800 else | |
| 2801 { | |
| 2802 *((char_u *)ga.ga_data + ga.ga_len) = NUL; | |
| 2803 add_scrollback_line_to_buffer(term, ga.ga_data, ga.ga_len); | |
| 2804 } | |
| 2805 ga_clear(&ga); | |
| 2806 | |
| 2807 line = (sb_line_T *)term->tl_scrollback.ga_data | |
| 2808 + term->tl_scrollback.ga_len; | |
| 2809 line->sb_cols = len; | |
| 2810 line->sb_cells = p; | |
| 2811 line->sb_fill_attr = fill_attr; | |
| 2812 ++term->tl_scrollback.ga_len; | |
| 2813 ++term->tl_scrollback_scrolled; | |
| 2814 } | |
| 2815 return 0; /* ignored */ | |
| 2816 } | |
| 2817 | |
| 2818 static VTermScreenCallbacks screen_callbacks = { | |
| 2819 handle_damage, /* damage */ | |
| 2820 handle_moverect, /* moverect */ | |
| 2821 handle_movecursor, /* movecursor */ | |
| 2822 handle_settermprop, /* settermprop */ | |
| 2823 NULL, /* bell */ | |
| 2824 handle_resize, /* resize */ | |
| 2825 handle_pushline, /* sb_pushline */ | |
| 2826 NULL /* sb_popline */ | |
| 2827 }; | |
| 2828 | |
| 2829 /* | |
|
13888
81e8e6181aeb
patch 8.0.1815: crash with terminal window and with 'lazyredraw' set
Christian Brabandt <cb@256bit.org>
parents:
13886
diff
changeset
|
2830 * Do the work after the channel of a terminal was closed. |
|
81e8e6181aeb
patch 8.0.1815: crash with terminal window and with 'lazyredraw' set
Christian Brabandt <cb@256bit.org>
parents:
13886
diff
changeset
|
2831 * Must be called only when updating_screen is FALSE. |
|
81e8e6181aeb
patch 8.0.1815: crash with terminal window and with 'lazyredraw' set
Christian Brabandt <cb@256bit.org>
parents:
13886
diff
changeset
|
2832 * Returns TRUE when a buffer was closed (list of terminals may have changed). |
|
81e8e6181aeb
patch 8.0.1815: crash with terminal window and with 'lazyredraw' set
Christian Brabandt <cb@256bit.org>
parents:
13886
diff
changeset
|
2833 */ |
|
81e8e6181aeb
patch 8.0.1815: crash with terminal window and with 'lazyredraw' set
Christian Brabandt <cb@256bit.org>
parents:
13886
diff
changeset
|
2834 static int |
|
81e8e6181aeb
patch 8.0.1815: crash with terminal window and with 'lazyredraw' set
Christian Brabandt <cb@256bit.org>
parents:
13886
diff
changeset
|
2835 term_after_channel_closed(term_T *term) |
|
81e8e6181aeb
patch 8.0.1815: crash with terminal window and with 'lazyredraw' set
Christian Brabandt <cb@256bit.org>
parents:
13886
diff
changeset
|
2836 { |
|
81e8e6181aeb
patch 8.0.1815: crash with terminal window and with 'lazyredraw' set
Christian Brabandt <cb@256bit.org>
parents:
13886
diff
changeset
|
2837 /* Unless in Terminal-Normal mode: clear the vterm. */ |
|
81e8e6181aeb
patch 8.0.1815: crash with terminal window and with 'lazyredraw' set
Christian Brabandt <cb@256bit.org>
parents:
13886
diff
changeset
|
2838 if (!term->tl_normal_mode) |
|
81e8e6181aeb
patch 8.0.1815: crash with terminal window and with 'lazyredraw' set
Christian Brabandt <cb@256bit.org>
parents:
13886
diff
changeset
|
2839 { |
|
81e8e6181aeb
patch 8.0.1815: crash with terminal window and with 'lazyredraw' set
Christian Brabandt <cb@256bit.org>
parents:
13886
diff
changeset
|
2840 int fnum = term->tl_buffer->b_fnum; |
|
81e8e6181aeb
patch 8.0.1815: crash with terminal window and with 'lazyredraw' set
Christian Brabandt <cb@256bit.org>
parents:
13886
diff
changeset
|
2841 |
|
81e8e6181aeb
patch 8.0.1815: crash with terminal window and with 'lazyredraw' set
Christian Brabandt <cb@256bit.org>
parents:
13886
diff
changeset
|
2842 cleanup_vterm(term); |
|
81e8e6181aeb
patch 8.0.1815: crash with terminal window and with 'lazyredraw' set
Christian Brabandt <cb@256bit.org>
parents:
13886
diff
changeset
|
2843 |
|
81e8e6181aeb
patch 8.0.1815: crash with terminal window and with 'lazyredraw' set
Christian Brabandt <cb@256bit.org>
parents:
13886
diff
changeset
|
2844 if (term->tl_finish == TL_FINISH_CLOSE) |
|
81e8e6181aeb
patch 8.0.1815: crash with terminal window and with 'lazyredraw' set
Christian Brabandt <cb@256bit.org>
parents:
13886
diff
changeset
|
2845 { |
|
81e8e6181aeb
patch 8.0.1815: crash with terminal window and with 'lazyredraw' set
Christian Brabandt <cb@256bit.org>
parents:
13886
diff
changeset
|
2846 aco_save_T aco; |
|
14459
ecf6c05d8ac3
patch 8.1.0243: using :term ++close ++hidden closes a window
Christian Brabandt <cb@256bit.org>
parents:
14449
diff
changeset
|
2847 int do_set_w_closing = term->tl_buffer->b_nwindows == 0; |
|
ecf6c05d8ac3
patch 8.1.0243: using :term ++close ++hidden closes a window
Christian Brabandt <cb@256bit.org>
parents:
14449
diff
changeset
|
2848 |
|
ecf6c05d8ac3
patch 8.1.0243: using :term ++close ++hidden closes a window
Christian Brabandt <cb@256bit.org>
parents:
14449
diff
changeset
|
2849 // ++close or term_finish == "close" |
|
13888
81e8e6181aeb
patch 8.0.1815: crash with terminal window and with 'lazyredraw' set
Christian Brabandt <cb@256bit.org>
parents:
13886
diff
changeset
|
2850 ch_log(NULL, "terminal job finished, closing window"); |
|
81e8e6181aeb
patch 8.0.1815: crash with terminal window and with 'lazyredraw' set
Christian Brabandt <cb@256bit.org>
parents:
13886
diff
changeset
|
2851 aucmd_prepbuf(&aco, term->tl_buffer); |
|
14459
ecf6c05d8ac3
patch 8.1.0243: using :term ++close ++hidden closes a window
Christian Brabandt <cb@256bit.org>
parents:
14449
diff
changeset
|
2852 // Avoid closing the window if we temporarily use it. |
|
ecf6c05d8ac3
patch 8.1.0243: using :term ++close ++hidden closes a window
Christian Brabandt <cb@256bit.org>
parents:
14449
diff
changeset
|
2853 if (do_set_w_closing) |
|
ecf6c05d8ac3
patch 8.1.0243: using :term ++close ++hidden closes a window
Christian Brabandt <cb@256bit.org>
parents:
14449
diff
changeset
|
2854 curwin->w_closing = TRUE; |
|
13888
81e8e6181aeb
patch 8.0.1815: crash with terminal window and with 'lazyredraw' set
Christian Brabandt <cb@256bit.org>
parents:
13886
diff
changeset
|
2855 do_bufdel(DOBUF_WIPE, (char_u *)"", 1, fnum, fnum, FALSE); |
|
14459
ecf6c05d8ac3
patch 8.1.0243: using :term ++close ++hidden closes a window
Christian Brabandt <cb@256bit.org>
parents:
14449
diff
changeset
|
2856 if (do_set_w_closing) |
|
ecf6c05d8ac3
patch 8.1.0243: using :term ++close ++hidden closes a window
Christian Brabandt <cb@256bit.org>
parents:
14449
diff
changeset
|
2857 curwin->w_closing = FALSE; |
|
13888
81e8e6181aeb
patch 8.0.1815: crash with terminal window and with 'lazyredraw' set
Christian Brabandt <cb@256bit.org>
parents:
13886
diff
changeset
|
2858 aucmd_restbuf(&aco); |
|
81e8e6181aeb
patch 8.0.1815: crash with terminal window and with 'lazyredraw' set
Christian Brabandt <cb@256bit.org>
parents:
13886
diff
changeset
|
2859 return TRUE; |
|
81e8e6181aeb
patch 8.0.1815: crash with terminal window and with 'lazyredraw' set
Christian Brabandt <cb@256bit.org>
parents:
13886
diff
changeset
|
2860 } |
|
81e8e6181aeb
patch 8.0.1815: crash with terminal window and with 'lazyredraw' set
Christian Brabandt <cb@256bit.org>
parents:
13886
diff
changeset
|
2861 if (term->tl_finish == TL_FINISH_OPEN |
|
81e8e6181aeb
patch 8.0.1815: crash with terminal window and with 'lazyredraw' set
Christian Brabandt <cb@256bit.org>
parents:
13886
diff
changeset
|
2862 && term->tl_buffer->b_nwindows == 0) |
|
81e8e6181aeb
patch 8.0.1815: crash with terminal window and with 'lazyredraw' set
Christian Brabandt <cb@256bit.org>
parents:
13886
diff
changeset
|
2863 { |
|
81e8e6181aeb
patch 8.0.1815: crash with terminal window and with 'lazyredraw' set
Christian Brabandt <cb@256bit.org>
parents:
13886
diff
changeset
|
2864 char buf[50]; |
|
81e8e6181aeb
patch 8.0.1815: crash with terminal window and with 'lazyredraw' set
Christian Brabandt <cb@256bit.org>
parents:
13886
diff
changeset
|
2865 |
|
81e8e6181aeb
patch 8.0.1815: crash with terminal window and with 'lazyredraw' set
Christian Brabandt <cb@256bit.org>
parents:
13886
diff
changeset
|
2866 /* TODO: use term_opencmd */ |
|
81e8e6181aeb
patch 8.0.1815: crash with terminal window and with 'lazyredraw' set
Christian Brabandt <cb@256bit.org>
parents:
13886
diff
changeset
|
2867 ch_log(NULL, "terminal job finished, opening window"); |
|
81e8e6181aeb
patch 8.0.1815: crash with terminal window and with 'lazyredraw' set
Christian Brabandt <cb@256bit.org>
parents:
13886
diff
changeset
|
2868 vim_snprintf(buf, sizeof(buf), |
|
81e8e6181aeb
patch 8.0.1815: crash with terminal window and with 'lazyredraw' set
Christian Brabandt <cb@256bit.org>
parents:
13886
diff
changeset
|
2869 term->tl_opencmd == NULL |
|
81e8e6181aeb
patch 8.0.1815: crash with terminal window and with 'lazyredraw' set
Christian Brabandt <cb@256bit.org>
parents:
13886
diff
changeset
|
2870 ? "botright sbuf %d" |
|
81e8e6181aeb
patch 8.0.1815: crash with terminal window and with 'lazyredraw' set
Christian Brabandt <cb@256bit.org>
parents:
13886
diff
changeset
|
2871 : (char *)term->tl_opencmd, fnum); |
|
81e8e6181aeb
patch 8.0.1815: crash with terminal window and with 'lazyredraw' set
Christian Brabandt <cb@256bit.org>
parents:
13886
diff
changeset
|
2872 do_cmdline_cmd((char_u *)buf); |
|
81e8e6181aeb
patch 8.0.1815: crash with terminal window and with 'lazyredraw' set
Christian Brabandt <cb@256bit.org>
parents:
13886
diff
changeset
|
2873 } |
|
81e8e6181aeb
patch 8.0.1815: crash with terminal window and with 'lazyredraw' set
Christian Brabandt <cb@256bit.org>
parents:
13886
diff
changeset
|
2874 else |
|
81e8e6181aeb
patch 8.0.1815: crash with terminal window and with 'lazyredraw' set
Christian Brabandt <cb@256bit.org>
parents:
13886
diff
changeset
|
2875 ch_log(NULL, "terminal job finished"); |
|
81e8e6181aeb
patch 8.0.1815: crash with terminal window and with 'lazyredraw' set
Christian Brabandt <cb@256bit.org>
parents:
13886
diff
changeset
|
2876 } |
|
81e8e6181aeb
patch 8.0.1815: crash with terminal window and with 'lazyredraw' set
Christian Brabandt <cb@256bit.org>
parents:
13886
diff
changeset
|
2877 |
|
81e8e6181aeb
patch 8.0.1815: crash with terminal window and with 'lazyredraw' set
Christian Brabandt <cb@256bit.org>
parents:
13886
diff
changeset
|
2878 redraw_buf_and_status_later(term->tl_buffer, NOT_VALID); |
|
81e8e6181aeb
patch 8.0.1815: crash with terminal window and with 'lazyredraw' set
Christian Brabandt <cb@256bit.org>
parents:
13886
diff
changeset
|
2879 return FALSE; |
|
81e8e6181aeb
patch 8.0.1815: crash with terminal window and with 'lazyredraw' set
Christian Brabandt <cb@256bit.org>
parents:
13886
diff
changeset
|
2880 } |
|
81e8e6181aeb
patch 8.0.1815: crash with terminal window and with 'lazyredraw' set
Christian Brabandt <cb@256bit.org>
parents:
13886
diff
changeset
|
2881 |
|
81e8e6181aeb
patch 8.0.1815: crash with terminal window and with 'lazyredraw' set
Christian Brabandt <cb@256bit.org>
parents:
13886
diff
changeset
|
2882 /* |
| 12502 | 2883 * Called when a channel has been closed. |
| 2884 * If this was a channel for a terminal window then finish it up. | |
| 2885 */ | |
| 2886 void | |
| 2887 term_channel_closed(channel_T *ch) | |
| 2888 { | |
| 2889 term_T *term; | |
|
13888
81e8e6181aeb
patch 8.0.1815: crash with terminal window and with 'lazyredraw' set
Christian Brabandt <cb@256bit.org>
parents:
13886
diff
changeset
|
2890 term_T *next_term; |
| 12502 | 2891 int did_one = FALSE; |
| 2892 | |
|
13888
81e8e6181aeb
patch 8.0.1815: crash with terminal window and with 'lazyredraw' set
Christian Brabandt <cb@256bit.org>
parents:
13886
diff
changeset
|
2893 for (term = first_term; term != NULL; term = next_term) |
|
81e8e6181aeb
patch 8.0.1815: crash with terminal window and with 'lazyredraw' set
Christian Brabandt <cb@256bit.org>
parents:
13886
diff
changeset
|
2894 { |
|
81e8e6181aeb
patch 8.0.1815: crash with terminal window and with 'lazyredraw' set
Christian Brabandt <cb@256bit.org>
parents:
13886
diff
changeset
|
2895 next_term = term->tl_next; |
| 12502 | 2896 if (term->tl_job == ch->ch_job) |
| 2897 { | |
| 2898 term->tl_channel_closed = TRUE; | |
| 2899 did_one = TRUE; | |
| 2900 | |
|
13244
ac42c4b11dbc
patch 8.0.1496: clearing a pointer takes two lines
Christian Brabandt <cb@256bit.org>
parents:
13219
diff
changeset
|
2901 VIM_CLEAR(term->tl_title); |
|
ac42c4b11dbc
patch 8.0.1496: clearing a pointer takes two lines
Christian Brabandt <cb@256bit.org>
parents:
13219
diff
changeset
|
2902 VIM_CLEAR(term->tl_status_text); |
|
13862
b201372b91a4
patch 8.0.1802: MS-Windows: terminal test fails
Christian Brabandt <cb@256bit.org>
parents:
13860
diff
changeset
|
2903 #ifdef WIN3264 |
|
b201372b91a4
patch 8.0.1802: MS-Windows: terminal test fails
Christian Brabandt <cb@256bit.org>
parents:
13860
diff
changeset
|
2904 if (term->tl_out_fd != NULL) |
|
b201372b91a4
patch 8.0.1802: MS-Windows: terminal test fails
Christian Brabandt <cb@256bit.org>
parents:
13860
diff
changeset
|
2905 { |
|
b201372b91a4
patch 8.0.1802: MS-Windows: terminal test fails
Christian Brabandt <cb@256bit.org>
parents:
13860
diff
changeset
|
2906 fclose(term->tl_out_fd); |
|
b201372b91a4
patch 8.0.1802: MS-Windows: terminal test fails
Christian Brabandt <cb@256bit.org>
parents:
13860
diff
changeset
|
2907 term->tl_out_fd = NULL; |
|
b201372b91a4
patch 8.0.1802: MS-Windows: terminal test fails
Christian Brabandt <cb@256bit.org>
parents:
13860
diff
changeset
|
2908 } |
|
b201372b91a4
patch 8.0.1802: MS-Windows: terminal test fails
Christian Brabandt <cb@256bit.org>
parents:
13860
diff
changeset
|
2909 #endif |
| 12502 | 2910 |
|
13888
81e8e6181aeb
patch 8.0.1815: crash with terminal window and with 'lazyredraw' set
Christian Brabandt <cb@256bit.org>
parents:
13886
diff
changeset
|
2911 if (updating_screen) |
| 12502 | 2912 { |
|
13888
81e8e6181aeb
patch 8.0.1815: crash with terminal window and with 'lazyredraw' set
Christian Brabandt <cb@256bit.org>
parents:
13886
diff
changeset
|
2913 /* Cannot open or close windows now. Can happen when |
|
81e8e6181aeb
patch 8.0.1815: crash with terminal window and with 'lazyredraw' set
Christian Brabandt <cb@256bit.org>
parents:
13886
diff
changeset
|
2914 * 'lazyredraw' is set. */ |
|
81e8e6181aeb
patch 8.0.1815: crash with terminal window and with 'lazyredraw' set
Christian Brabandt <cb@256bit.org>
parents:
13886
diff
changeset
|
2915 term->tl_channel_recently_closed = TRUE; |
|
81e8e6181aeb
patch 8.0.1815: crash with terminal window and with 'lazyredraw' set
Christian Brabandt <cb@256bit.org>
parents:
13886
diff
changeset
|
2916 continue; |
| 12502 | 2917 } |
| 2918 | |
|
13888
81e8e6181aeb
patch 8.0.1815: crash with terminal window and with 'lazyredraw' set
Christian Brabandt <cb@256bit.org>
parents:
13886
diff
changeset
|
2919 if (term_after_channel_closed(term)) |
|
81e8e6181aeb
patch 8.0.1815: crash with terminal window and with 'lazyredraw' set
Christian Brabandt <cb@256bit.org>
parents:
13886
diff
changeset
|
2920 next_term = first_term; |
| 12502 | 2921 } |
|
13888
81e8e6181aeb
patch 8.0.1815: crash with terminal window and with 'lazyredraw' set
Christian Brabandt <cb@256bit.org>
parents:
13886
diff
changeset
|
2922 } |
|
81e8e6181aeb
patch 8.0.1815: crash with terminal window and with 'lazyredraw' set
Christian Brabandt <cb@256bit.org>
parents:
13886
diff
changeset
|
2923 |
| 12502 | 2924 if (did_one) |
| 2925 { | |
| 2926 redraw_statuslines(); | |
| 2927 | |
| 2928 /* Need to break out of vgetc(). */ | |
| 2929 ins_char_typebuf(K_IGNORE); | |
| 2930 typebuf_was_filled = TRUE; | |
| 2931 | |
| 2932 term = curbuf->b_term; | |
| 2933 if (term != NULL) | |
| 2934 { | |
| 2935 if (term->tl_job == ch->ch_job) | |
| 2936 maketitle(); | |
| 2937 update_cursor(term, term->tl_cursor_visible); | |
| 2938 } | |
| 2939 } | |
| 2940 } | |
| 2941 | |
| 2942 /* | |
|
13888
81e8e6181aeb
patch 8.0.1815: crash with terminal window and with 'lazyredraw' set
Christian Brabandt <cb@256bit.org>
parents:
13886
diff
changeset
|
2943 * To be called after resetting updating_screen: handle any terminal where the |
|
81e8e6181aeb
patch 8.0.1815: crash with terminal window and with 'lazyredraw' set
Christian Brabandt <cb@256bit.org>
parents:
13886
diff
changeset
|
2944 * channel was closed. |
|
81e8e6181aeb
patch 8.0.1815: crash with terminal window and with 'lazyredraw' set
Christian Brabandt <cb@256bit.org>
parents:
13886
diff
changeset
|
2945 */ |
|
81e8e6181aeb
patch 8.0.1815: crash with terminal window and with 'lazyredraw' set
Christian Brabandt <cb@256bit.org>
parents:
13886
diff
changeset
|
2946 void |
|
81e8e6181aeb
patch 8.0.1815: crash with terminal window and with 'lazyredraw' set
Christian Brabandt <cb@256bit.org>
parents:
13886
diff
changeset
|
2947 term_check_channel_closed_recently() |
|
81e8e6181aeb
patch 8.0.1815: crash with terminal window and with 'lazyredraw' set
Christian Brabandt <cb@256bit.org>
parents:
13886
diff
changeset
|
2948 { |
|
81e8e6181aeb
patch 8.0.1815: crash with terminal window and with 'lazyredraw' set
Christian Brabandt <cb@256bit.org>
parents:
13886
diff
changeset
|
2949 term_T *term; |
|
81e8e6181aeb
patch 8.0.1815: crash with terminal window and with 'lazyredraw' set
Christian Brabandt <cb@256bit.org>
parents:
13886
diff
changeset
|
2950 term_T *next_term; |
|
81e8e6181aeb
patch 8.0.1815: crash with terminal window and with 'lazyredraw' set
Christian Brabandt <cb@256bit.org>
parents:
13886
diff
changeset
|
2951 |
|
81e8e6181aeb
patch 8.0.1815: crash with terminal window and with 'lazyredraw' set
Christian Brabandt <cb@256bit.org>
parents:
13886
diff
changeset
|
2952 for (term = first_term; term != NULL; term = next_term) |
|
81e8e6181aeb
patch 8.0.1815: crash with terminal window and with 'lazyredraw' set
Christian Brabandt <cb@256bit.org>
parents:
13886
diff
changeset
|
2953 { |
|
81e8e6181aeb
patch 8.0.1815: crash with terminal window and with 'lazyredraw' set
Christian Brabandt <cb@256bit.org>
parents:
13886
diff
changeset
|
2954 next_term = term->tl_next; |
|
81e8e6181aeb
patch 8.0.1815: crash with terminal window and with 'lazyredraw' set
Christian Brabandt <cb@256bit.org>
parents:
13886
diff
changeset
|
2955 if (term->tl_channel_recently_closed) |
|
81e8e6181aeb
patch 8.0.1815: crash with terminal window and with 'lazyredraw' set
Christian Brabandt <cb@256bit.org>
parents:
13886
diff
changeset
|
2956 { |
|
81e8e6181aeb
patch 8.0.1815: crash with terminal window and with 'lazyredraw' set
Christian Brabandt <cb@256bit.org>
parents:
13886
diff
changeset
|
2957 term->tl_channel_recently_closed = FALSE; |
|
81e8e6181aeb
patch 8.0.1815: crash with terminal window and with 'lazyredraw' set
Christian Brabandt <cb@256bit.org>
parents:
13886
diff
changeset
|
2958 if (term_after_channel_closed(term)) |
|
81e8e6181aeb
patch 8.0.1815: crash with terminal window and with 'lazyredraw' set
Christian Brabandt <cb@256bit.org>
parents:
13886
diff
changeset
|
2959 // start over, the list may have changed |
|
81e8e6181aeb
patch 8.0.1815: crash with terminal window and with 'lazyredraw' set
Christian Brabandt <cb@256bit.org>
parents:
13886
diff
changeset
|
2960 next_term = first_term; |
|
81e8e6181aeb
patch 8.0.1815: crash with terminal window and with 'lazyredraw' set
Christian Brabandt <cb@256bit.org>
parents:
13886
diff
changeset
|
2961 } |
|
81e8e6181aeb
patch 8.0.1815: crash with terminal window and with 'lazyredraw' set
Christian Brabandt <cb@256bit.org>
parents:
13886
diff
changeset
|
2962 } |
|
81e8e6181aeb
patch 8.0.1815: crash with terminal window and with 'lazyredraw' set
Christian Brabandt <cb@256bit.org>
parents:
13886
diff
changeset
|
2963 } |
|
81e8e6181aeb
patch 8.0.1815: crash with terminal window and with 'lazyredraw' set
Christian Brabandt <cb@256bit.org>
parents:
13886
diff
changeset
|
2964 |
|
81e8e6181aeb
patch 8.0.1815: crash with terminal window and with 'lazyredraw' set
Christian Brabandt <cb@256bit.org>
parents:
13886
diff
changeset
|
2965 /* |
|
13470
6faef782f50b
patch 8.0.1609: shell commands in the GUI use a dumb terminal
Christian Brabandt <cb@256bit.org>
parents:
13458
diff
changeset
|
2966 * Fill one screen line from a line of the terminal. |
|
6faef782f50b
patch 8.0.1609: shell commands in the GUI use a dumb terminal
Christian Brabandt <cb@256bit.org>
parents:
13458
diff
changeset
|
2967 * Advances "pos" to past the last column. |
|
6faef782f50b
patch 8.0.1609: shell commands in the GUI use a dumb terminal
Christian Brabandt <cb@256bit.org>
parents:
13458
diff
changeset
|
2968 */ |
|
6faef782f50b
patch 8.0.1609: shell commands in the GUI use a dumb terminal
Christian Brabandt <cb@256bit.org>
parents:
13458
diff
changeset
|
2969 static void |
|
6faef782f50b
patch 8.0.1609: shell commands in the GUI use a dumb terminal
Christian Brabandt <cb@256bit.org>
parents:
13458
diff
changeset
|
2970 term_line2screenline(VTermScreen *screen, VTermPos *pos, int max_col) |
|
6faef782f50b
patch 8.0.1609: shell commands in the GUI use a dumb terminal
Christian Brabandt <cb@256bit.org>
parents:
13458
diff
changeset
|
2971 { |
|
6faef782f50b
patch 8.0.1609: shell commands in the GUI use a dumb terminal
Christian Brabandt <cb@256bit.org>
parents:
13458
diff
changeset
|
2972 int off = screen_get_current_line_off(); |
|
6faef782f50b
patch 8.0.1609: shell commands in the GUI use a dumb terminal
Christian Brabandt <cb@256bit.org>
parents:
13458
diff
changeset
|
2973 |
|
6faef782f50b
patch 8.0.1609: shell commands in the GUI use a dumb terminal
Christian Brabandt <cb@256bit.org>
parents:
13458
diff
changeset
|
2974 for (pos->col = 0; pos->col < max_col; ) |
|
6faef782f50b
patch 8.0.1609: shell commands in the GUI use a dumb terminal
Christian Brabandt <cb@256bit.org>
parents:
13458
diff
changeset
|
2975 { |
|
6faef782f50b
patch 8.0.1609: shell commands in the GUI use a dumb terminal
Christian Brabandt <cb@256bit.org>
parents:
13458
diff
changeset
|
2976 VTermScreenCell cell; |
|
6faef782f50b
patch 8.0.1609: shell commands in the GUI use a dumb terminal
Christian Brabandt <cb@256bit.org>
parents:
13458
diff
changeset
|
2977 int c; |
|
6faef782f50b
patch 8.0.1609: shell commands in the GUI use a dumb terminal
Christian Brabandt <cb@256bit.org>
parents:
13458
diff
changeset
|
2978 |
|
6faef782f50b
patch 8.0.1609: shell commands in the GUI use a dumb terminal
Christian Brabandt <cb@256bit.org>
parents:
13458
diff
changeset
|
2979 if (vterm_screen_get_cell(screen, *pos, &cell) == 0) |
|
6faef782f50b
patch 8.0.1609: shell commands in the GUI use a dumb terminal
Christian Brabandt <cb@256bit.org>
parents:
13458
diff
changeset
|
2980 vim_memset(&cell, 0, sizeof(cell)); |
|
6faef782f50b
patch 8.0.1609: shell commands in the GUI use a dumb terminal
Christian Brabandt <cb@256bit.org>
parents:
13458
diff
changeset
|
2981 |
|
6faef782f50b
patch 8.0.1609: shell commands in the GUI use a dumb terminal
Christian Brabandt <cb@256bit.org>
parents:
13458
diff
changeset
|
2982 c = cell.chars[0]; |
|
6faef782f50b
patch 8.0.1609: shell commands in the GUI use a dumb terminal
Christian Brabandt <cb@256bit.org>
parents:
13458
diff
changeset
|
2983 if (c == NUL) |
|
6faef782f50b
patch 8.0.1609: shell commands in the GUI use a dumb terminal
Christian Brabandt <cb@256bit.org>
parents:
13458
diff
changeset
|
2984 { |
|
6faef782f50b
patch 8.0.1609: shell commands in the GUI use a dumb terminal
Christian Brabandt <cb@256bit.org>
parents:
13458
diff
changeset
|
2985 ScreenLines[off] = ' '; |
|
6faef782f50b
patch 8.0.1609: shell commands in the GUI use a dumb terminal
Christian Brabandt <cb@256bit.org>
parents:
13458
diff
changeset
|
2986 if (enc_utf8) |
|
6faef782f50b
patch 8.0.1609: shell commands in the GUI use a dumb terminal
Christian Brabandt <cb@256bit.org>
parents:
13458
diff
changeset
|
2987 ScreenLinesUC[off] = NUL; |
|
6faef782f50b
patch 8.0.1609: shell commands in the GUI use a dumb terminal
Christian Brabandt <cb@256bit.org>
parents:
13458
diff
changeset
|
2988 } |
|
6faef782f50b
patch 8.0.1609: shell commands in the GUI use a dumb terminal
Christian Brabandt <cb@256bit.org>
parents:
13458
diff
changeset
|
2989 else |
|
6faef782f50b
patch 8.0.1609: shell commands in the GUI use a dumb terminal
Christian Brabandt <cb@256bit.org>
parents:
13458
diff
changeset
|
2990 { |
|
6faef782f50b
patch 8.0.1609: shell commands in the GUI use a dumb terminal
Christian Brabandt <cb@256bit.org>
parents:
13458
diff
changeset
|
2991 if (enc_utf8) |
|
6faef782f50b
patch 8.0.1609: shell commands in the GUI use a dumb terminal
Christian Brabandt <cb@256bit.org>
parents:
13458
diff
changeset
|
2992 { |
|
6faef782f50b
patch 8.0.1609: shell commands in the GUI use a dumb terminal
Christian Brabandt <cb@256bit.org>
parents:
13458
diff
changeset
|
2993 int i; |
|
6faef782f50b
patch 8.0.1609: shell commands in the GUI use a dumb terminal
Christian Brabandt <cb@256bit.org>
parents:
13458
diff
changeset
|
2994 |
|
6faef782f50b
patch 8.0.1609: shell commands in the GUI use a dumb terminal
Christian Brabandt <cb@256bit.org>
parents:
13458
diff
changeset
|
2995 /* composing chars */ |
|
6faef782f50b
patch 8.0.1609: shell commands in the GUI use a dumb terminal
Christian Brabandt <cb@256bit.org>
parents:
13458
diff
changeset
|
2996 for (i = 0; i < Screen_mco |
|
6faef782f50b
patch 8.0.1609: shell commands in the GUI use a dumb terminal
Christian Brabandt <cb@256bit.org>
parents:
13458
diff
changeset
|
2997 && i + 1 < VTERM_MAX_CHARS_PER_CELL; ++i) |
|
6faef782f50b
patch 8.0.1609: shell commands in the GUI use a dumb terminal
Christian Brabandt <cb@256bit.org>
parents:
13458
diff
changeset
|
2998 { |
|
6faef782f50b
patch 8.0.1609: shell commands in the GUI use a dumb terminal
Christian Brabandt <cb@256bit.org>
parents:
13458
diff
changeset
|
2999 ScreenLinesC[i][off] = cell.chars[i + 1]; |
|
6faef782f50b
patch 8.0.1609: shell commands in the GUI use a dumb terminal
Christian Brabandt <cb@256bit.org>
parents:
13458
diff
changeset
|
3000 if (cell.chars[i + 1] == 0) |
|
6faef782f50b
patch 8.0.1609: shell commands in the GUI use a dumb terminal
Christian Brabandt <cb@256bit.org>
parents:
13458
diff
changeset
|
3001 break; |
|
6faef782f50b
patch 8.0.1609: shell commands in the GUI use a dumb terminal
Christian Brabandt <cb@256bit.org>
parents:
13458
diff
changeset
|
3002 } |
|
6faef782f50b
patch 8.0.1609: shell commands in the GUI use a dumb terminal
Christian Brabandt <cb@256bit.org>
parents:
13458
diff
changeset
|
3003 if (c >= 0x80 || (Screen_mco > 0 |
|
6faef782f50b
patch 8.0.1609: shell commands in the GUI use a dumb terminal
Christian Brabandt <cb@256bit.org>
parents:
13458
diff
changeset
|
3004 && ScreenLinesC[0][off] != 0)) |
|
6faef782f50b
patch 8.0.1609: shell commands in the GUI use a dumb terminal
Christian Brabandt <cb@256bit.org>
parents:
13458
diff
changeset
|
3005 { |
|
6faef782f50b
patch 8.0.1609: shell commands in the GUI use a dumb terminal
Christian Brabandt <cb@256bit.org>
parents:
13458
diff
changeset
|
3006 ScreenLines[off] = ' '; |
|
6faef782f50b
patch 8.0.1609: shell commands in the GUI use a dumb terminal
Christian Brabandt <cb@256bit.org>
parents:
13458
diff
changeset
|
3007 ScreenLinesUC[off] = c; |
|
6faef782f50b
patch 8.0.1609: shell commands in the GUI use a dumb terminal
Christian Brabandt <cb@256bit.org>
parents:
13458
diff
changeset
|
3008 } |
|
6faef782f50b
patch 8.0.1609: shell commands in the GUI use a dumb terminal
Christian Brabandt <cb@256bit.org>
parents:
13458
diff
changeset
|
3009 else |
|
6faef782f50b
patch 8.0.1609: shell commands in the GUI use a dumb terminal
Christian Brabandt <cb@256bit.org>
parents:
13458
diff
changeset
|
3010 { |
|
6faef782f50b
patch 8.0.1609: shell commands in the GUI use a dumb terminal
Christian Brabandt <cb@256bit.org>
parents:
13458
diff
changeset
|
3011 ScreenLines[off] = c; |
|
6faef782f50b
patch 8.0.1609: shell commands in the GUI use a dumb terminal
Christian Brabandt <cb@256bit.org>
parents:
13458
diff
changeset
|
3012 ScreenLinesUC[off] = NUL; |
|
6faef782f50b
patch 8.0.1609: shell commands in the GUI use a dumb terminal
Christian Brabandt <cb@256bit.org>
parents:
13458
diff
changeset
|
3013 } |
|
6faef782f50b
patch 8.0.1609: shell commands in the GUI use a dumb terminal
Christian Brabandt <cb@256bit.org>
parents:
13458
diff
changeset
|
3014 } |
|
6faef782f50b
patch 8.0.1609: shell commands in the GUI use a dumb terminal
Christian Brabandt <cb@256bit.org>
parents:
13458
diff
changeset
|
3015 #ifdef WIN3264 |
|
6faef782f50b
patch 8.0.1609: shell commands in the GUI use a dumb terminal
Christian Brabandt <cb@256bit.org>
parents:
13458
diff
changeset
|
3016 else if (has_mbyte && c >= 0x80) |
|
6faef782f50b
patch 8.0.1609: shell commands in the GUI use a dumb terminal
Christian Brabandt <cb@256bit.org>
parents:
13458
diff
changeset
|
3017 { |
|
6faef782f50b
patch 8.0.1609: shell commands in the GUI use a dumb terminal
Christian Brabandt <cb@256bit.org>
parents:
13458
diff
changeset
|
3018 char_u mb[MB_MAXBYTES+1]; |
|
6faef782f50b
patch 8.0.1609: shell commands in the GUI use a dumb terminal
Christian Brabandt <cb@256bit.org>
parents:
13458
diff
changeset
|
3019 WCHAR wc = c; |
|
6faef782f50b
patch 8.0.1609: shell commands in the GUI use a dumb terminal
Christian Brabandt <cb@256bit.org>
parents:
13458
diff
changeset
|
3020 |
|
6faef782f50b
patch 8.0.1609: shell commands in the GUI use a dumb terminal
Christian Brabandt <cb@256bit.org>
parents:
13458
diff
changeset
|
3021 if (WideCharToMultiByte(GetACP(), 0, &wc, 1, |
|
6faef782f50b
patch 8.0.1609: shell commands in the GUI use a dumb terminal
Christian Brabandt <cb@256bit.org>
parents:
13458
diff
changeset
|
3022 (char*)mb, 2, 0, 0) > 1) |
|
6faef782f50b
patch 8.0.1609: shell commands in the GUI use a dumb terminal
Christian Brabandt <cb@256bit.org>
parents:
13458
diff
changeset
|
3023 { |
|
6faef782f50b
patch 8.0.1609: shell commands in the GUI use a dumb terminal
Christian Brabandt <cb@256bit.org>
parents:
13458
diff
changeset
|
3024 ScreenLines[off] = mb[0]; |
|
6faef782f50b
patch 8.0.1609: shell commands in the GUI use a dumb terminal
Christian Brabandt <cb@256bit.org>
parents:
13458
diff
changeset
|
3025 ScreenLines[off + 1] = mb[1]; |
|
6faef782f50b
patch 8.0.1609: shell commands in the GUI use a dumb terminal
Christian Brabandt <cb@256bit.org>
parents:
13458
diff
changeset
|
3026 cell.width = mb_ptr2cells(mb); |
|
6faef782f50b
patch 8.0.1609: shell commands in the GUI use a dumb terminal
Christian Brabandt <cb@256bit.org>
parents:
13458
diff
changeset
|
3027 } |
|
6faef782f50b
patch 8.0.1609: shell commands in the GUI use a dumb terminal
Christian Brabandt <cb@256bit.org>
parents:
13458
diff
changeset
|
3028 else |
|
6faef782f50b
patch 8.0.1609: shell commands in the GUI use a dumb terminal
Christian Brabandt <cb@256bit.org>
parents:
13458
diff
changeset
|
3029 ScreenLines[off] = c; |
|
6faef782f50b
patch 8.0.1609: shell commands in the GUI use a dumb terminal
Christian Brabandt <cb@256bit.org>
parents:
13458
diff
changeset
|
3030 } |
|
6faef782f50b
patch 8.0.1609: shell commands in the GUI use a dumb terminal
Christian Brabandt <cb@256bit.org>
parents:
13458
diff
changeset
|
3031 #endif |
|
6faef782f50b
patch 8.0.1609: shell commands in the GUI use a dumb terminal
Christian Brabandt <cb@256bit.org>
parents:
13458
diff
changeset
|
3032 else |
|
6faef782f50b
patch 8.0.1609: shell commands in the GUI use a dumb terminal
Christian Brabandt <cb@256bit.org>
parents:
13458
diff
changeset
|
3033 ScreenLines[off] = c; |
|
6faef782f50b
patch 8.0.1609: shell commands in the GUI use a dumb terminal
Christian Brabandt <cb@256bit.org>
parents:
13458
diff
changeset
|
3034 } |
|
6faef782f50b
patch 8.0.1609: shell commands in the GUI use a dumb terminal
Christian Brabandt <cb@256bit.org>
parents:
13458
diff
changeset
|
3035 ScreenAttrs[off] = cell2attr(cell.attrs, cell.fg, cell.bg); |
|
6faef782f50b
patch 8.0.1609: shell commands in the GUI use a dumb terminal
Christian Brabandt <cb@256bit.org>
parents:
13458
diff
changeset
|
3036 |
|
6faef782f50b
patch 8.0.1609: shell commands in the GUI use a dumb terminal
Christian Brabandt <cb@256bit.org>
parents:
13458
diff
changeset
|
3037 ++pos->col; |
|
6faef782f50b
patch 8.0.1609: shell commands in the GUI use a dumb terminal
Christian Brabandt <cb@256bit.org>
parents:
13458
diff
changeset
|
3038 ++off; |
|
6faef782f50b
patch 8.0.1609: shell commands in the GUI use a dumb terminal
Christian Brabandt <cb@256bit.org>
parents:
13458
diff
changeset
|
3039 if (cell.width == 2) |
|
6faef782f50b
patch 8.0.1609: shell commands in the GUI use a dumb terminal
Christian Brabandt <cb@256bit.org>
parents:
13458
diff
changeset
|
3040 { |
|
6faef782f50b
patch 8.0.1609: shell commands in the GUI use a dumb terminal
Christian Brabandt <cb@256bit.org>
parents:
13458
diff
changeset
|
3041 if (enc_utf8) |
|
6faef782f50b
patch 8.0.1609: shell commands in the GUI use a dumb terminal
Christian Brabandt <cb@256bit.org>
parents:
13458
diff
changeset
|
3042 ScreenLinesUC[off] = NUL; |
|
6faef782f50b
patch 8.0.1609: shell commands in the GUI use a dumb terminal
Christian Brabandt <cb@256bit.org>
parents:
13458
diff
changeset
|
3043 |
|
6faef782f50b
patch 8.0.1609: shell commands in the GUI use a dumb terminal
Christian Brabandt <cb@256bit.org>
parents:
13458
diff
changeset
|
3044 /* don't set the second byte to NUL for a DBCS encoding, it |
|
6faef782f50b
patch 8.0.1609: shell commands in the GUI use a dumb terminal
Christian Brabandt <cb@256bit.org>
parents:
13458
diff
changeset
|
3045 * has been set above */ |
|
6faef782f50b
patch 8.0.1609: shell commands in the GUI use a dumb terminal
Christian Brabandt <cb@256bit.org>
parents:
13458
diff
changeset
|
3046 if (enc_utf8 || !has_mbyte) |
|
6faef782f50b
patch 8.0.1609: shell commands in the GUI use a dumb terminal
Christian Brabandt <cb@256bit.org>
parents:
13458
diff
changeset
|
3047 ScreenLines[off] = NUL; |
|
6faef782f50b
patch 8.0.1609: shell commands in the GUI use a dumb terminal
Christian Brabandt <cb@256bit.org>
parents:
13458
diff
changeset
|
3048 |
|
6faef782f50b
patch 8.0.1609: shell commands in the GUI use a dumb terminal
Christian Brabandt <cb@256bit.org>
parents:
13458
diff
changeset
|
3049 ++pos->col; |
|
6faef782f50b
patch 8.0.1609: shell commands in the GUI use a dumb terminal
Christian Brabandt <cb@256bit.org>
parents:
13458
diff
changeset
|
3050 ++off; |
|
6faef782f50b
patch 8.0.1609: shell commands in the GUI use a dumb terminal
Christian Brabandt <cb@256bit.org>
parents:
13458
diff
changeset
|
3051 } |
|
6faef782f50b
patch 8.0.1609: shell commands in the GUI use a dumb terminal
Christian Brabandt <cb@256bit.org>
parents:
13458
diff
changeset
|
3052 } |
|
6faef782f50b
patch 8.0.1609: shell commands in the GUI use a dumb terminal
Christian Brabandt <cb@256bit.org>
parents:
13458
diff
changeset
|
3053 } |
|
6faef782f50b
patch 8.0.1609: shell commands in the GUI use a dumb terminal
Christian Brabandt <cb@256bit.org>
parents:
13458
diff
changeset
|
3054 |
|
13472
f6a4614edea4
patch 8.0.1610: cannot build without GUI
Christian Brabandt <cb@256bit.org>
parents:
13470
diff
changeset
|
3055 #if defined(FEAT_GUI) |
|
13470
6faef782f50b
patch 8.0.1609: shell commands in the GUI use a dumb terminal
Christian Brabandt <cb@256bit.org>
parents:
13458
diff
changeset
|
3056 static void |
|
6faef782f50b
patch 8.0.1609: shell commands in the GUI use a dumb terminal
Christian Brabandt <cb@256bit.org>
parents:
13458
diff
changeset
|
3057 update_system_term(term_T *term) |
|
6faef782f50b
patch 8.0.1609: shell commands in the GUI use a dumb terminal
Christian Brabandt <cb@256bit.org>
parents:
13458
diff
changeset
|
3058 { |
|
6faef782f50b
patch 8.0.1609: shell commands in the GUI use a dumb terminal
Christian Brabandt <cb@256bit.org>
parents:
13458
diff
changeset
|
3059 VTermPos pos; |
|
6faef782f50b
patch 8.0.1609: shell commands in the GUI use a dumb terminal
Christian Brabandt <cb@256bit.org>
parents:
13458
diff
changeset
|
3060 VTermScreen *screen; |
|
6faef782f50b
patch 8.0.1609: shell commands in the GUI use a dumb terminal
Christian Brabandt <cb@256bit.org>
parents:
13458
diff
changeset
|
3061 |
|
6faef782f50b
patch 8.0.1609: shell commands in the GUI use a dumb terminal
Christian Brabandt <cb@256bit.org>
parents:
13458
diff
changeset
|
3062 if (term->tl_vterm == NULL) |
|
6faef782f50b
patch 8.0.1609: shell commands in the GUI use a dumb terminal
Christian Brabandt <cb@256bit.org>
parents:
13458
diff
changeset
|
3063 return; |
|
6faef782f50b
patch 8.0.1609: shell commands in the GUI use a dumb terminal
Christian Brabandt <cb@256bit.org>
parents:
13458
diff
changeset
|
3064 screen = vterm_obtain_screen(term->tl_vterm); |
|
6faef782f50b
patch 8.0.1609: shell commands in the GUI use a dumb terminal
Christian Brabandt <cb@256bit.org>
parents:
13458
diff
changeset
|
3065 |
|
6faef782f50b
patch 8.0.1609: shell commands in the GUI use a dumb terminal
Christian Brabandt <cb@256bit.org>
parents:
13458
diff
changeset
|
3066 /* Scroll up to make more room for terminal lines if needed. */ |
|
6faef782f50b
patch 8.0.1609: shell commands in the GUI use a dumb terminal
Christian Brabandt <cb@256bit.org>
parents:
13458
diff
changeset
|
3067 while (term->tl_toprow > 0 |
|
6faef782f50b
patch 8.0.1609: shell commands in the GUI use a dumb terminal
Christian Brabandt <cb@256bit.org>
parents:
13458
diff
changeset
|
3068 && (Rows - term->tl_toprow) < term->tl_dirty_row_end) |
|
6faef782f50b
patch 8.0.1609: shell commands in the GUI use a dumb terminal
Christian Brabandt <cb@256bit.org>
parents:
13458
diff
changeset
|
3069 { |
|
6faef782f50b
patch 8.0.1609: shell commands in the GUI use a dumb terminal
Christian Brabandt <cb@256bit.org>
parents:
13458
diff
changeset
|
3070 int save_p_more = p_more; |
|
6faef782f50b
patch 8.0.1609: shell commands in the GUI use a dumb terminal
Christian Brabandt <cb@256bit.org>
parents:
13458
diff
changeset
|
3071 |
|
6faef782f50b
patch 8.0.1609: shell commands in the GUI use a dumb terminal
Christian Brabandt <cb@256bit.org>
parents:
13458
diff
changeset
|
3072 p_more = FALSE; |
|
6faef782f50b
patch 8.0.1609: shell commands in the GUI use a dumb terminal
Christian Brabandt <cb@256bit.org>
parents:
13458
diff
changeset
|
3073 msg_row = Rows - 1; |
|
6faef782f50b
patch 8.0.1609: shell commands in the GUI use a dumb terminal
Christian Brabandt <cb@256bit.org>
parents:
13458
diff
changeset
|
3074 msg_puts((char_u *)"\n"); |
|
6faef782f50b
patch 8.0.1609: shell commands in the GUI use a dumb terminal
Christian Brabandt <cb@256bit.org>
parents:
13458
diff
changeset
|
3075 p_more = save_p_more; |
|
6faef782f50b
patch 8.0.1609: shell commands in the GUI use a dumb terminal
Christian Brabandt <cb@256bit.org>
parents:
13458
diff
changeset
|
3076 --term->tl_toprow; |
|
6faef782f50b
patch 8.0.1609: shell commands in the GUI use a dumb terminal
Christian Brabandt <cb@256bit.org>
parents:
13458
diff
changeset
|
3077 } |
|
6faef782f50b
patch 8.0.1609: shell commands in the GUI use a dumb terminal
Christian Brabandt <cb@256bit.org>
parents:
13458
diff
changeset
|
3078 |
|
6faef782f50b
patch 8.0.1609: shell commands in the GUI use a dumb terminal
Christian Brabandt <cb@256bit.org>
parents:
13458
diff
changeset
|
3079 for (pos.row = term->tl_dirty_row_start; pos.row < term->tl_dirty_row_end |
|
6faef782f50b
patch 8.0.1609: shell commands in the GUI use a dumb terminal
Christian Brabandt <cb@256bit.org>
parents:
13458
diff
changeset
|
3080 && pos.row < Rows; ++pos.row) |
|
6faef782f50b
patch 8.0.1609: shell commands in the GUI use a dumb terminal
Christian Brabandt <cb@256bit.org>
parents:
13458
diff
changeset
|
3081 { |
|
6faef782f50b
patch 8.0.1609: shell commands in the GUI use a dumb terminal
Christian Brabandt <cb@256bit.org>
parents:
13458
diff
changeset
|
3082 if (pos.row < term->tl_rows) |
|
6faef782f50b
patch 8.0.1609: shell commands in the GUI use a dumb terminal
Christian Brabandt <cb@256bit.org>
parents:
13458
diff
changeset
|
3083 { |
|
6faef782f50b
patch 8.0.1609: shell commands in the GUI use a dumb terminal
Christian Brabandt <cb@256bit.org>
parents:
13458
diff
changeset
|
3084 int max_col = MIN(Columns, term->tl_cols); |
|
6faef782f50b
patch 8.0.1609: shell commands in the GUI use a dumb terminal
Christian Brabandt <cb@256bit.org>
parents:
13458
diff
changeset
|
3085 |
|
6faef782f50b
patch 8.0.1609: shell commands in the GUI use a dumb terminal
Christian Brabandt <cb@256bit.org>
parents:
13458
diff
changeset
|
3086 term_line2screenline(screen, &pos, max_col); |
|
6faef782f50b
patch 8.0.1609: shell commands in the GUI use a dumb terminal
Christian Brabandt <cb@256bit.org>
parents:
13458
diff
changeset
|
3087 } |
|
6faef782f50b
patch 8.0.1609: shell commands in the GUI use a dumb terminal
Christian Brabandt <cb@256bit.org>
parents:
13458
diff
changeset
|
3088 else |
|
6faef782f50b
patch 8.0.1609: shell commands in the GUI use a dumb terminal
Christian Brabandt <cb@256bit.org>
parents:
13458
diff
changeset
|
3089 pos.col = 0; |
|
6faef782f50b
patch 8.0.1609: shell commands in the GUI use a dumb terminal
Christian Brabandt <cb@256bit.org>
parents:
13458
diff
changeset
|
3090 |
|
6faef782f50b
patch 8.0.1609: shell commands in the GUI use a dumb terminal
Christian Brabandt <cb@256bit.org>
parents:
13458
diff
changeset
|
3091 screen_line(term->tl_toprow + pos.row, 0, pos.col, Columns, FALSE); |
|
6faef782f50b
patch 8.0.1609: shell commands in the GUI use a dumb terminal
Christian Brabandt <cb@256bit.org>
parents:
13458
diff
changeset
|
3092 } |
|
6faef782f50b
patch 8.0.1609: shell commands in the GUI use a dumb terminal
Christian Brabandt <cb@256bit.org>
parents:
13458
diff
changeset
|
3093 |
|
6faef782f50b
patch 8.0.1609: shell commands in the GUI use a dumb terminal
Christian Brabandt <cb@256bit.org>
parents:
13458
diff
changeset
|
3094 term->tl_dirty_row_start = MAX_ROW; |
|
6faef782f50b
patch 8.0.1609: shell commands in the GUI use a dumb terminal
Christian Brabandt <cb@256bit.org>
parents:
13458
diff
changeset
|
3095 term->tl_dirty_row_end = 0; |
|
6faef782f50b
patch 8.0.1609: shell commands in the GUI use a dumb terminal
Christian Brabandt <cb@256bit.org>
parents:
13458
diff
changeset
|
3096 update_cursor(term, TRUE); |
|
6faef782f50b
patch 8.0.1609: shell commands in the GUI use a dumb terminal
Christian Brabandt <cb@256bit.org>
parents:
13458
diff
changeset
|
3097 } |
|
13472
f6a4614edea4
patch 8.0.1610: cannot build without GUI
Christian Brabandt <cb@256bit.org>
parents:
13470
diff
changeset
|
3098 #endif |
|
13470
6faef782f50b
patch 8.0.1609: shell commands in the GUI use a dumb terminal
Christian Brabandt <cb@256bit.org>
parents:
13458
diff
changeset
|
3099 |
|
6faef782f50b
patch 8.0.1609: shell commands in the GUI use a dumb terminal
Christian Brabandt <cb@256bit.org>
parents:
13458
diff
changeset
|
3100 /* |
|
13851
3edac4cd1c0a
patch 8.0.1797: terminal window is redrawn too often
Christian Brabandt <cb@256bit.org>
parents:
13849
diff
changeset
|
3101 * Return TRUE if window "wp" is to be redrawn with term_update_window(). |
|
3edac4cd1c0a
patch 8.0.1797: terminal window is redrawn too often
Christian Brabandt <cb@256bit.org>
parents:
13849
diff
changeset
|
3102 * Returns FALSE when there is no terminal running in this window or it is in |
| 12502 | 3103 * Terminal-Normal mode. |
| 3104 */ | |
| 3105 int | |
|
13851
3edac4cd1c0a
patch 8.0.1797: terminal window is redrawn too often
Christian Brabandt <cb@256bit.org>
parents:
13849
diff
changeset
|
3106 term_do_update_window(win_T *wp) |
|
3edac4cd1c0a
patch 8.0.1797: terminal window is redrawn too often
Christian Brabandt <cb@256bit.org>
parents:
13849
diff
changeset
|
3107 { |
|
3edac4cd1c0a
patch 8.0.1797: terminal window is redrawn too often
Christian Brabandt <cb@256bit.org>
parents:
13849
diff
changeset
|
3108 term_T *term = wp->w_buffer->b_term; |
|
3edac4cd1c0a
patch 8.0.1797: terminal window is redrawn too often
Christian Brabandt <cb@256bit.org>
parents:
13849
diff
changeset
|
3109 |
|
3edac4cd1c0a
patch 8.0.1797: terminal window is redrawn too often
Christian Brabandt <cb@256bit.org>
parents:
13849
diff
changeset
|
3110 return term != NULL && term->tl_vterm != NULL && !term->tl_normal_mode; |
|
3edac4cd1c0a
patch 8.0.1797: terminal window is redrawn too often
Christian Brabandt <cb@256bit.org>
parents:
13849
diff
changeset
|
3111 } |
|
3edac4cd1c0a
patch 8.0.1797: terminal window is redrawn too often
Christian Brabandt <cb@256bit.org>
parents:
13849
diff
changeset
|
3112 |
|
3edac4cd1c0a
patch 8.0.1797: terminal window is redrawn too often
Christian Brabandt <cb@256bit.org>
parents:
13849
diff
changeset
|
3113 /* |
|
3edac4cd1c0a
patch 8.0.1797: terminal window is redrawn too often
Christian Brabandt <cb@256bit.org>
parents:
13849
diff
changeset
|
3114 * Called to update a window that contains an active terminal. |
|
3edac4cd1c0a
patch 8.0.1797: terminal window is redrawn too often
Christian Brabandt <cb@256bit.org>
parents:
13849
diff
changeset
|
3115 */ |
|
3edac4cd1c0a
patch 8.0.1797: terminal window is redrawn too often
Christian Brabandt <cb@256bit.org>
parents:
13849
diff
changeset
|
3116 void |
| 12502 | 3117 term_update_window(win_T *wp) |
| 3118 { | |
| 3119 term_T *term = wp->w_buffer->b_term; | |
| 3120 VTerm *vterm; | |
| 3121 VTermScreen *screen; | |
| 3122 VTermState *state; | |
| 3123 VTermPos pos; | |
|
13700
b28d679b1843
patch 8.0.1722: cannot specify a minimal size for a terminal window
Christian Brabandt <cb@256bit.org>
parents:
13696
diff
changeset
|
3124 int rows, cols; |
|
b28d679b1843
patch 8.0.1722: cannot specify a minimal size for a terminal window
Christian Brabandt <cb@256bit.org>
parents:
13696
diff
changeset
|
3125 int newrows, newcols; |
|
b28d679b1843
patch 8.0.1722: cannot specify a minimal size for a terminal window
Christian Brabandt <cb@256bit.org>
parents:
13696
diff
changeset
|
3126 int minsize; |
|
b28d679b1843
patch 8.0.1722: cannot specify a minimal size for a terminal window
Christian Brabandt <cb@256bit.org>
parents:
13696
diff
changeset
|
3127 win_T *twp; |
| 12502 | 3128 |
| 3129 vterm = term->tl_vterm; | |
| 3130 screen = vterm_obtain_screen(vterm); | |
| 3131 state = vterm_obtain_state(vterm); | |
| 3132 | |
|
13851
3edac4cd1c0a
patch 8.0.1797: terminal window is redrawn too often
Christian Brabandt <cb@256bit.org>
parents:
13849
diff
changeset
|
3133 /* We use NOT_VALID on a resize or scroll, redraw everything then. With |
|
3edac4cd1c0a
patch 8.0.1797: terminal window is redrawn too often
Christian Brabandt <cb@256bit.org>
parents:
13849
diff
changeset
|
3134 * SOME_VALID only redraw what was marked dirty. */ |
|
3edac4cd1c0a
patch 8.0.1797: terminal window is redrawn too often
Christian Brabandt <cb@256bit.org>
parents:
13849
diff
changeset
|
3135 if (wp->w_redr_type > SOME_VALID) |
|
12590
3c46dcf3b335
patch 8.0.1173: terminal window is not redrawn after CTRL-L
Christian Brabandt <cb@256bit.org>
parents:
12578
diff
changeset
|
3136 { |
|
3c46dcf3b335
patch 8.0.1173: terminal window is not redrawn after CTRL-L
Christian Brabandt <cb@256bit.org>
parents:
12578
diff
changeset
|
3137 term->tl_dirty_row_start = 0; |
|
3c46dcf3b335
patch 8.0.1173: terminal window is not redrawn after CTRL-L
Christian Brabandt <cb@256bit.org>
parents:
12578
diff
changeset
|
3138 term->tl_dirty_row_end = MAX_ROW; |
|
13851
3edac4cd1c0a
patch 8.0.1797: terminal window is redrawn too often
Christian Brabandt <cb@256bit.org>
parents:
13849
diff
changeset
|
3139 |
|
3edac4cd1c0a
patch 8.0.1797: terminal window is redrawn too often
Christian Brabandt <cb@256bit.org>
parents:
13849
diff
changeset
|
3140 if (term->tl_postponed_scroll > 0 |
|
3edac4cd1c0a
patch 8.0.1797: terminal window is redrawn too often
Christian Brabandt <cb@256bit.org>
parents:
13849
diff
changeset
|
3141 && term->tl_postponed_scroll < term->tl_rows / 3) |
|
3edac4cd1c0a
patch 8.0.1797: terminal window is redrawn too often
Christian Brabandt <cb@256bit.org>
parents:
13849
diff
changeset
|
3142 /* Scrolling is usually faster than redrawing, when there are only |
|
3edac4cd1c0a
patch 8.0.1797: terminal window is redrawn too often
Christian Brabandt <cb@256bit.org>
parents:
13849
diff
changeset
|
3143 * a few lines to scroll. */ |
|
3edac4cd1c0a
patch 8.0.1797: terminal window is redrawn too often
Christian Brabandt <cb@256bit.org>
parents:
13849
diff
changeset
|
3144 term_scroll_up(term, 0, term->tl_postponed_scroll); |
|
3edac4cd1c0a
patch 8.0.1797: terminal window is redrawn too often
Christian Brabandt <cb@256bit.org>
parents:
13849
diff
changeset
|
3145 term->tl_postponed_scroll = 0; |
|
12590
3c46dcf3b335
patch 8.0.1173: terminal window is not redrawn after CTRL-L
Christian Brabandt <cb@256bit.org>
parents:
12578
diff
changeset
|
3146 } |
|
3c46dcf3b335
patch 8.0.1173: terminal window is not redrawn after CTRL-L
Christian Brabandt <cb@256bit.org>
parents:
12578
diff
changeset
|
3147 |
| 12502 | 3148 /* |
| 3149 * If the window was resized a redraw will be triggered and we get here. | |
|
13845
f22db93bd887
patch 8.0.1794: duplicate term options after renaming
Christian Brabandt <cb@256bit.org>
parents:
13835
diff
changeset
|
3150 * Adjust the size of the vterm unless 'termwinsize' specifies a fixed size. |
| 12502 | 3151 */ |
|
13845
f22db93bd887
patch 8.0.1794: duplicate term options after renaming
Christian Brabandt <cb@256bit.org>
parents:
13835
diff
changeset
|
3152 minsize = parse_termwinsize(wp, &rows, &cols); |
|
13700
b28d679b1843
patch 8.0.1722: cannot specify a minimal size for a terminal window
Christian Brabandt <cb@256bit.org>
parents:
13696
diff
changeset
|
3153 |
|
b28d679b1843
patch 8.0.1722: cannot specify a minimal size for a terminal window
Christian Brabandt <cb@256bit.org>
parents:
13696
diff
changeset
|
3154 newrows = 99999; |
|
b28d679b1843
patch 8.0.1722: cannot specify a minimal size for a terminal window
Christian Brabandt <cb@256bit.org>
parents:
13696
diff
changeset
|
3155 newcols = 99999; |
|
b28d679b1843
patch 8.0.1722: cannot specify a minimal size for a terminal window
Christian Brabandt <cb@256bit.org>
parents:
13696
diff
changeset
|
3156 FOR_ALL_WINDOWS(twp) |
| 12502 | 3157 { |
|
13700
b28d679b1843
patch 8.0.1722: cannot specify a minimal size for a terminal window
Christian Brabandt <cb@256bit.org>
parents:
13696
diff
changeset
|
3158 /* When more than one window shows the same terminal, use the |
|
b28d679b1843
patch 8.0.1722: cannot specify a minimal size for a terminal window
Christian Brabandt <cb@256bit.org>
parents:
13696
diff
changeset
|
3159 * smallest size. */ |
|
b28d679b1843
patch 8.0.1722: cannot specify a minimal size for a terminal window
Christian Brabandt <cb@256bit.org>
parents:
13696
diff
changeset
|
3160 if (twp->w_buffer == term->tl_buffer) |
| 12502 | 3161 { |
|
13700
b28d679b1843
patch 8.0.1722: cannot specify a minimal size for a terminal window
Christian Brabandt <cb@256bit.org>
parents:
13696
diff
changeset
|
3162 newrows = MIN(newrows, twp->w_height); |
|
b28d679b1843
patch 8.0.1722: cannot specify a minimal size for a terminal window
Christian Brabandt <cb@256bit.org>
parents:
13696
diff
changeset
|
3163 newcols = MIN(newcols, twp->w_width); |
| 12502 | 3164 } |
|
13700
b28d679b1843
patch 8.0.1722: cannot specify a minimal size for a terminal window
Christian Brabandt <cb@256bit.org>
parents:
13696
diff
changeset
|
3165 } |
|
b28d679b1843
patch 8.0.1722: cannot specify a minimal size for a terminal window
Christian Brabandt <cb@256bit.org>
parents:
13696
diff
changeset
|
3166 newrows = rows == 0 ? newrows : minsize ? MAX(rows, newrows) : rows; |
|
b28d679b1843
patch 8.0.1722: cannot specify a minimal size for a terminal window
Christian Brabandt <cb@256bit.org>
parents:
13696
diff
changeset
|
3167 newcols = cols == 0 ? newcols : minsize ? MAX(cols, newcols) : cols; |
|
b28d679b1843
patch 8.0.1722: cannot specify a minimal size for a terminal window
Christian Brabandt <cb@256bit.org>
parents:
13696
diff
changeset
|
3168 |
|
b28d679b1843
patch 8.0.1722: cannot specify a minimal size for a terminal window
Christian Brabandt <cb@256bit.org>
parents:
13696
diff
changeset
|
3169 if (term->tl_rows != newrows || term->tl_cols != newcols) |
|
b28d679b1843
patch 8.0.1722: cannot specify a minimal size for a terminal window
Christian Brabandt <cb@256bit.org>
parents:
13696
diff
changeset
|
3170 { |
| 12502 | 3171 term->tl_vterm_size_changed = TRUE; |
|
13700
b28d679b1843
patch 8.0.1722: cannot specify a minimal size for a terminal window
Christian Brabandt <cb@256bit.org>
parents:
13696
diff
changeset
|
3172 vterm_set_size(vterm, newrows, newcols); |
| 12502 | 3173 ch_log(term->tl_job->jv_channel, "Resizing terminal to %d lines", |
|
13700
b28d679b1843
patch 8.0.1722: cannot specify a minimal size for a terminal window
Christian Brabandt <cb@256bit.org>
parents:
13696
diff
changeset
|
3174 newrows); |
|
b28d679b1843
patch 8.0.1722: cannot specify a minimal size for a terminal window
Christian Brabandt <cb@256bit.org>
parents:
13696
diff
changeset
|
3175 term_report_winsize(term, newrows, newcols); |
|
14311
83b870d9ac4b
patch 8.1.0171: typing CTRL-W n in a terminal window causes ml_get error
Christian Brabandt <cb@256bit.org>
parents:
14301
diff
changeset
|
3176 |
|
83b870d9ac4b
patch 8.1.0171: typing CTRL-W n in a terminal window causes ml_get error
Christian Brabandt <cb@256bit.org>
parents:
14301
diff
changeset
|
3177 // Updating the terminal size will cause the snapshot to be cleared. |
|
83b870d9ac4b
patch 8.1.0171: typing CTRL-W n in a terminal window causes ml_get error
Christian Brabandt <cb@256bit.org>
parents:
14301
diff
changeset
|
3178 // When not in terminal_loop() we need to restore it. |
|
83b870d9ac4b
patch 8.1.0171: typing CTRL-W n in a terminal window causes ml_get error
Christian Brabandt <cb@256bit.org>
parents:
14301
diff
changeset
|
3179 if (term != in_terminal_loop) |
|
83b870d9ac4b
patch 8.1.0171: typing CTRL-W n in a terminal window causes ml_get error
Christian Brabandt <cb@256bit.org>
parents:
14301
diff
changeset
|
3180 may_move_terminal_to_buffer(term, FALSE); |
| 12502 | 3181 } |
| 3182 | |
| 3183 /* The cursor may have been moved when resizing. */ | |
| 3184 vterm_state_get_cursorpos(state, &pos); | |
| 3185 position_cursor(wp, &pos); | |
| 3186 | |
|
12578
f8beecfea2c4
patch 8.0.1167: Motif: typing in terminal window is slow
Christian Brabandt <cb@256bit.org>
parents:
12541
diff
changeset
|
3187 for (pos.row = term->tl_dirty_row_start; pos.row < term->tl_dirty_row_end |
|
f8beecfea2c4
patch 8.0.1167: Motif: typing in terminal window is slow
Christian Brabandt <cb@256bit.org>
parents:
12541
diff
changeset
|
3188 && pos.row < wp->w_height; ++pos.row) |
| 12502 | 3189 { |
| 3190 if (pos.row < term->tl_rows) | |
| 3191 { | |
|
13470
6faef782f50b
patch 8.0.1609: shell commands in the GUI use a dumb terminal
Christian Brabandt <cb@256bit.org>
parents:
13458
diff
changeset
|
3192 int max_col = MIN(wp->w_width, term->tl_cols); |
|
6faef782f50b
patch 8.0.1609: shell commands in the GUI use a dumb terminal
Christian Brabandt <cb@256bit.org>
parents:
13458
diff
changeset
|
3193 |
|
6faef782f50b
patch 8.0.1609: shell commands in the GUI use a dumb terminal
Christian Brabandt <cb@256bit.org>
parents:
13458
diff
changeset
|
3194 term_line2screenline(screen, &pos, max_col); |
| 12502 | 3195 } |
| 3196 else | |
| 3197 pos.col = 0; | |
| 3198 | |
|
13458
0e7a56b18d61
patch 8.0.1603: cannot build with +terminal but without +menu
Christian Brabandt <cb@256bit.org>
parents:
13448
diff
changeset
|
3199 screen_line(wp->w_winrow + pos.row |
|
0e7a56b18d61
patch 8.0.1603: cannot build with +terminal but without +menu
Christian Brabandt <cb@256bit.org>
parents:
13448
diff
changeset
|
3200 #ifdef FEAT_MENU |
|
0e7a56b18d61
patch 8.0.1603: cannot build with +terminal but without +menu
Christian Brabandt <cb@256bit.org>
parents:
13448
diff
changeset
|
3201 + winbar_height(wp) |
|
0e7a56b18d61
patch 8.0.1603: cannot build with +terminal but without +menu
Christian Brabandt <cb@256bit.org>
parents:
13448
diff
changeset
|
3202 #endif |
|
0e7a56b18d61
patch 8.0.1603: cannot build with +terminal but without +menu
Christian Brabandt <cb@256bit.org>
parents:
13448
diff
changeset
|
3203 , wp->w_wincol, pos.col, wp->w_width, FALSE); |
| 12502 | 3204 } |
|
12578
f8beecfea2c4
patch 8.0.1167: Motif: typing in terminal window is slow
Christian Brabandt <cb@256bit.org>
parents:
12541
diff
changeset
|
3205 term->tl_dirty_row_start = MAX_ROW; |
|
f8beecfea2c4
patch 8.0.1167: Motif: typing in terminal window is slow
Christian Brabandt <cb@256bit.org>
parents:
12541
diff
changeset
|
3206 term->tl_dirty_row_end = 0; |
| 12502 | 3207 } |
| 3208 | |
| 3209 /* | |
| 3210 * Return TRUE if "wp" is a terminal window where the job has finished. | |
| 3211 */ | |
| 3212 int | |
| 3213 term_is_finished(buf_T *buf) | |
| 3214 { | |
| 3215 return buf->b_term != NULL && buf->b_term->tl_vterm == NULL; | |
| 3216 } | |
| 3217 | |
| 3218 /* | |
| 3219 * Return TRUE if "wp" is a terminal window where the job has finished or we | |
| 3220 * are in Terminal-Normal mode, thus we show the buffer contents. | |
| 3221 */ | |
| 3222 int | |
| 3223 term_show_buffer(buf_T *buf) | |
| 3224 { | |
| 3225 term_T *term = buf->b_term; | |
| 3226 | |
| 3227 return term != NULL && (term->tl_vterm == NULL || term->tl_normal_mode); | |
| 3228 } | |
| 3229 | |
| 3230 /* | |
| 3231 * The current buffer is going to be changed. If there is terminal | |
| 3232 * highlighting remove it now. | |
| 3233 */ | |
| 3234 void | |
| 3235 term_change_in_curbuf(void) | |
| 3236 { | |
| 3237 term_T *term = curbuf->b_term; | |
| 3238 | |
| 3239 if (term_is_finished(curbuf) && term->tl_scrollback.ga_len > 0) | |
| 3240 { | |
| 3241 free_scrollback(term); | |
| 3242 redraw_buf_later(term->tl_buffer, NOT_VALID); | |
| 3243 | |
| 3244 /* The buffer is now like a normal buffer, it cannot be easily | |
| 3245 * abandoned when changed. */ | |
| 3246 set_string_option_direct((char_u *)"buftype", -1, | |
| 3247 (char_u *)"", OPT_FREE|OPT_LOCAL, 0); | |
| 3248 } | |
| 3249 } | |
| 3250 | |
| 3251 /* | |
| 3252 * Get the screen attribute for a position in the buffer. | |
| 3253 * Use a negative "col" to get the filler background color. | |
| 3254 */ | |
| 3255 int | |
| 3256 term_get_attr(buf_T *buf, linenr_T lnum, int col) | |
| 3257 { | |
| 3258 term_T *term = buf->b_term; | |
| 3259 sb_line_T *line; | |
| 3260 cellattr_T *cellattr; | |
| 3261 | |
| 3262 if (lnum > term->tl_scrollback.ga_len) | |
| 3263 cellattr = &term->tl_default_color; | |
| 3264 else | |
| 3265 { | |
| 3266 line = (sb_line_T *)term->tl_scrollback.ga_data + lnum - 1; | |
| 3267 if (col < 0 || col >= line->sb_cols) | |
| 3268 cellattr = &line->sb_fill_attr; | |
| 3269 else | |
| 3270 cellattr = line->sb_cells + col; | |
| 3271 } | |
| 3272 return cell2attr(cellattr->attrs, cellattr->fg, cellattr->bg); | |
| 3273 } | |
| 3274 | |
| 3275 /* | |
| 3276 * Convert a cterm color number 0 - 255 to RGB. | |
|
12541
fcb11cfca8b3
patch 8.0.1149: libvterm colors differ from xterm
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
3277 * This is compatible with xterm. |
| 12502 | 3278 */ |
| 3279 static void | |
|
13823
d0d8125ba692
patch 8.0.1783: cannot use 256 colors in a MS-Windows console
Christian Brabandt <cb@256bit.org>
parents:
13750
diff
changeset
|
3280 cterm_color2vterm(int nr, VTermColor *rgb) |
| 12502 | 3281 { |
|
13823
d0d8125ba692
patch 8.0.1783: cannot use 256 colors in a MS-Windows console
Christian Brabandt <cb@256bit.org>
parents:
13750
diff
changeset
|
3282 cterm_color2rgb(nr, &rgb->red, &rgb->green, &rgb->blue, &rgb->ansi_index); |
| 12502 | 3283 } |
| 3284 | |
| 3285 /* | |
|
13483
f7ef5d579758
patch 8.0.1615: term_dumpload() does not use the right colors
Christian Brabandt <cb@256bit.org>
parents:
13476
diff
changeset
|
3286 * Initialize term->tl_default_color from the environment. |
| 12502 | 3287 */ |
| 3288 static void | |
|
13483
f7ef5d579758
patch 8.0.1615: term_dumpload() does not use the right colors
Christian Brabandt <cb@256bit.org>
parents:
13476
diff
changeset
|
3289 init_default_colors(term_T *term) |
| 12502 | 3290 { |
| 3291 VTermColor *fg, *bg; | |
| 3292 int fgval, bgval; | |
| 3293 int id; | |
| 3294 | |
| 3295 vim_memset(&term->tl_default_color.attrs, 0, sizeof(VTermScreenCellAttrs)); | |
| 3296 term->tl_default_color.width = 1; | |
| 3297 fg = &term->tl_default_color.fg; | |
| 3298 bg = &term->tl_default_color.bg; | |
| 3299 | |
| 3300 /* Vterm uses a default black background. Set it to white when | |
| 3301 * 'background' is "light". */ | |
| 3302 if (*p_bg == 'l') | |
| 3303 { | |
| 3304 fgval = 0; | |
| 3305 bgval = 255; | |
| 3306 } | |
| 3307 else | |
| 3308 { | |
| 3309 fgval = 255; | |
| 3310 bgval = 0; | |
| 3311 } | |
| 3312 fg->red = fg->green = fg->blue = fgval; | |
| 3313 bg->red = bg->green = bg->blue = bgval; | |
|
12973
418941f0df08
patch 8.0.1362: terminal window colors wrong when using Terminal highlighting
Christian Brabandt <cb@256bit.org>
parents:
12969
diff
changeset
|
3314 fg->ansi_index = bg->ansi_index = VTERM_ANSI_INDEX_DEFAULT; |
| 12502 | 3315 |
| 3316 /* The "Terminal" highlight group overrules the defaults. */ | |
| 3317 id = syn_name2id((char_u *)"Terminal"); | |
| 3318 | |
|
12966
c5bccd50100e
patch 8.0.1359: libvterm ANSI colors can not always be recognized
Christian Brabandt <cb@256bit.org>
parents:
12907
diff
changeset
|
3319 /* Use the actual color for the GUI and when 'termguicolors' is set. */ |
| 12502 | 3320 #if defined(FEAT_GUI) || defined(FEAT_TERMGUICOLORS) |
| 3321 if (0 | |
| 3322 # ifdef FEAT_GUI | |
| 3323 || gui.in_use | |
| 3324 # endif | |
| 3325 # ifdef FEAT_TERMGUICOLORS | |
| 3326 || p_tgc | |
|
13823
d0d8125ba692
patch 8.0.1783: cannot use 256 colors in a MS-Windows console
Christian Brabandt <cb@256bit.org>
parents:
13750
diff
changeset
|
3327 # ifdef FEAT_VTP |
|
d0d8125ba692
patch 8.0.1783: cannot use 256 colors in a MS-Windows console
Christian Brabandt <cb@256bit.org>
parents:
13750
diff
changeset
|
3328 /* Finally get INVALCOLOR on this execution path */ |
|
d0d8125ba692
patch 8.0.1783: cannot use 256 colors in a MS-Windows console
Christian Brabandt <cb@256bit.org>
parents:
13750
diff
changeset
|
3329 || (!p_tgc && t_colors >= 256) |
|
d0d8125ba692
patch 8.0.1783: cannot use 256 colors in a MS-Windows console
Christian Brabandt <cb@256bit.org>
parents:
13750
diff
changeset
|
3330 # endif |
| 12502 | 3331 # endif |
| 3332 ) | |
| 3333 { | |
| 3334 guicolor_T fg_rgb = INVALCOLOR; | |
| 3335 guicolor_T bg_rgb = INVALCOLOR; | |
| 3336 | |
| 3337 if (id != 0) | |
| 3338 syn_id2colors(id, &fg_rgb, &bg_rgb); | |
| 3339 | |
| 3340 # ifdef FEAT_GUI | |
| 3341 if (gui.in_use) | |
| 3342 { | |
| 3343 if (fg_rgb == INVALCOLOR) | |
| 3344 fg_rgb = gui.norm_pixel; | |
| 3345 if (bg_rgb == INVALCOLOR) | |
| 3346 bg_rgb = gui.back_pixel; | |
| 3347 } | |
| 3348 # ifdef FEAT_TERMGUICOLORS | |
| 3349 else | |
| 3350 # endif | |
| 3351 # endif | |
| 3352 # ifdef FEAT_TERMGUICOLORS | |
| 3353 { | |
| 3354 if (fg_rgb == INVALCOLOR) | |
| 3355 fg_rgb = cterm_normal_fg_gui_color; | |
| 3356 if (bg_rgb == INVALCOLOR) | |
| 3357 bg_rgb = cterm_normal_bg_gui_color; | |
| 3358 } | |
| 3359 # endif | |
| 3360 if (fg_rgb != INVALCOLOR) | |
| 3361 { | |
| 3362 long_u rgb = GUI_MCH_GET_RGB(fg_rgb); | |
| 3363 | |
| 3364 fg->red = (unsigned)(rgb >> 16); | |
| 3365 fg->green = (unsigned)(rgb >> 8) & 255; | |
| 3366 fg->blue = (unsigned)rgb & 255; | |
| 3367 } | |
| 3368 if (bg_rgb != INVALCOLOR) | |
| 3369 { | |
| 3370 long_u rgb = GUI_MCH_GET_RGB(bg_rgb); | |
| 3371 | |
| 3372 bg->red = (unsigned)(rgb >> 16); | |
| 3373 bg->green = (unsigned)(rgb >> 8) & 255; | |
| 3374 bg->blue = (unsigned)rgb & 255; | |
| 3375 } | |
| 3376 } | |
| 3377 else | |
| 3378 #endif | |
| 3379 if (id != 0 && t_colors >= 16) | |
| 3380 { | |
|
12973
418941f0df08
patch 8.0.1362: terminal window colors wrong when using Terminal highlighting
Christian Brabandt <cb@256bit.org>
parents:
12969
diff
changeset
|
3381 if (term_default_cterm_fg >= 0) |
|
13823
d0d8125ba692
patch 8.0.1783: cannot use 256 colors in a MS-Windows console
Christian Brabandt <cb@256bit.org>
parents:
13750
diff
changeset
|
3382 cterm_color2vterm(term_default_cterm_fg, fg); |
|
12973
418941f0df08
patch 8.0.1362: terminal window colors wrong when using Terminal highlighting
Christian Brabandt <cb@256bit.org>
parents:
12969
diff
changeset
|
3383 if (term_default_cterm_bg >= 0) |
|
13823
d0d8125ba692
patch 8.0.1783: cannot use 256 colors in a MS-Windows console
Christian Brabandt <cb@256bit.org>
parents:
13750
diff
changeset
|
3384 cterm_color2vterm(term_default_cterm_bg, bg); |
| 12502 | 3385 } |
| 3386 else | |
| 3387 { | |
|
12632
b1a7e3968a31
patch 8.0.1194: actual fg and bg colors of terminal are unknown
Christian Brabandt <cb@256bit.org>
parents:
12598
diff
changeset
|
3388 #if defined(WIN3264) && !defined(FEAT_GUI_W32) |
| 12502 | 3389 int tmp; |
|
12632
b1a7e3968a31
patch 8.0.1194: actual fg and bg colors of terminal are unknown
Christian Brabandt <cb@256bit.org>
parents:
12598
diff
changeset
|
3390 #endif |
| 12502 | 3391 |
| 3392 /* In an MS-Windows console we know the normal colors. */ | |
| 3393 if (cterm_normal_fg_color > 0) | |
| 3394 { | |
|
13823
d0d8125ba692
patch 8.0.1783: cannot use 256 colors in a MS-Windows console
Christian Brabandt <cb@256bit.org>
parents:
13750
diff
changeset
|
3395 cterm_color2vterm(cterm_normal_fg_color - 1, fg); |
|
12632
b1a7e3968a31
patch 8.0.1194: actual fg and bg colors of terminal are unknown
Christian Brabandt <cb@256bit.org>
parents:
12598
diff
changeset
|
3396 # if defined(WIN3264) && !defined(FEAT_GUI_W32) |
| 12502 | 3397 tmp = fg->red; |
| 3398 fg->red = fg->blue; | |
| 3399 fg->blue = tmp; | |
|
12632
b1a7e3968a31
patch 8.0.1194: actual fg and bg colors of terminal are unknown
Christian Brabandt <cb@256bit.org>
parents:
12598
diff
changeset
|
3400 # endif |
| 12502 | 3401 } |
|
12634
94566ecb55f0
patch 8.0.1195: can't build on MS-Windows
Christian Brabandt <cb@256bit.org>
parents:
12632
diff
changeset
|
3402 # ifdef FEAT_TERMRESPONSE |
|
12632
b1a7e3968a31
patch 8.0.1194: actual fg and bg colors of terminal are unknown
Christian Brabandt <cb@256bit.org>
parents:
12598
diff
changeset
|
3403 else |
|
b1a7e3968a31
patch 8.0.1194: actual fg and bg colors of terminal are unknown
Christian Brabandt <cb@256bit.org>
parents:
12598
diff
changeset
|
3404 term_get_fg_color(&fg->red, &fg->green, &fg->blue); |
|
12634
94566ecb55f0
patch 8.0.1195: can't build on MS-Windows
Christian Brabandt <cb@256bit.org>
parents:
12632
diff
changeset
|
3405 # endif |
|
12632
b1a7e3968a31
patch 8.0.1194: actual fg and bg colors of terminal are unknown
Christian Brabandt <cb@256bit.org>
parents:
12598
diff
changeset
|
3406 |
| 12502 | 3407 if (cterm_normal_bg_color > 0) |
| 3408 { | |
|
13823
d0d8125ba692
patch 8.0.1783: cannot use 256 colors in a MS-Windows console
Christian Brabandt <cb@256bit.org>
parents:
13750
diff
changeset
|
3409 cterm_color2vterm(cterm_normal_bg_color - 1, bg); |
|
12632
b1a7e3968a31
patch 8.0.1194: actual fg and bg colors of terminal are unknown
Christian Brabandt <cb@256bit.org>
parents:
12598
diff
changeset
|
3410 # if defined(WIN3264) && !defined(FEAT_GUI_W32) |
| 12502 | 3411 tmp = bg->red; |
| 3412 bg->red = bg->blue; | |
| 3413 bg->blue = tmp; | |
|
12632
b1a7e3968a31
patch 8.0.1194: actual fg and bg colors of terminal are unknown
Christian Brabandt <cb@256bit.org>
parents:
12598
diff
changeset
|
3414 # endif |
| 12502 | 3415 } |
|
12634
94566ecb55f0
patch 8.0.1195: can't build on MS-Windows
Christian Brabandt <cb@256bit.org>
parents:
12632
diff
changeset
|
3416 # ifdef FEAT_TERMRESPONSE |
|
12632
b1a7e3968a31
patch 8.0.1194: actual fg and bg colors of terminal are unknown
Christian Brabandt <cb@256bit.org>
parents:
12598
diff
changeset
|
3417 else |
|
b1a7e3968a31
patch 8.0.1194: actual fg and bg colors of terminal are unknown
Christian Brabandt <cb@256bit.org>
parents:
12598
diff
changeset
|
3418 term_get_bg_color(&bg->red, &bg->green, &bg->blue); |
|
12634
94566ecb55f0
patch 8.0.1195: can't build on MS-Windows
Christian Brabandt <cb@256bit.org>
parents:
12632
diff
changeset
|
3419 # endif |
| 12502 | 3420 } |
|
13483
f7ef5d579758
patch 8.0.1615: term_dumpload() does not use the right colors
Christian Brabandt <cb@256bit.org>
parents:
13476
diff
changeset
|
3421 } |
|
f7ef5d579758
patch 8.0.1615: term_dumpload() does not use the right colors
Christian Brabandt <cb@256bit.org>
parents:
13476
diff
changeset
|
3422 |
|
13626
ab89131d30e0
patch 8.0.1685: can't set ANSI colors of a terminal window
Christian Brabandt <cb@256bit.org>
parents:
13624
diff
changeset
|
3423 #if defined(FEAT_GUI) || defined(FEAT_TERMGUICOLORS) |
|
ab89131d30e0
patch 8.0.1685: can't set ANSI colors of a terminal window
Christian Brabandt <cb@256bit.org>
parents:
13624
diff
changeset
|
3424 /* |
|
ab89131d30e0
patch 8.0.1685: can't set ANSI colors of a terminal window
Christian Brabandt <cb@256bit.org>
parents:
13624
diff
changeset
|
3425 * Set the 16 ANSI colors from array of RGB values |
|
ab89131d30e0
patch 8.0.1685: can't set ANSI colors of a terminal window
Christian Brabandt <cb@256bit.org>
parents:
13624
diff
changeset
|
3426 */ |
|
ab89131d30e0
patch 8.0.1685: can't set ANSI colors of a terminal window
Christian Brabandt <cb@256bit.org>
parents:
13624
diff
changeset
|
3427 static void |
|
ab89131d30e0
patch 8.0.1685: can't set ANSI colors of a terminal window
Christian Brabandt <cb@256bit.org>
parents:
13624
diff
changeset
|
3428 set_vterm_palette(VTerm *vterm, long_u *rgb) |
|
ab89131d30e0
patch 8.0.1685: can't set ANSI colors of a terminal window
Christian Brabandt <cb@256bit.org>
parents:
13624
diff
changeset
|
3429 { |
|
ab89131d30e0
patch 8.0.1685: can't set ANSI colors of a terminal window
Christian Brabandt <cb@256bit.org>
parents:
13624
diff
changeset
|
3430 int index = 0; |
|
ab89131d30e0
patch 8.0.1685: can't set ANSI colors of a terminal window
Christian Brabandt <cb@256bit.org>
parents:
13624
diff
changeset
|
3431 VTermState *state = vterm_obtain_state(vterm); |
|
ab89131d30e0
patch 8.0.1685: can't set ANSI colors of a terminal window
Christian Brabandt <cb@256bit.org>
parents:
13624
diff
changeset
|
3432 for (; index < 16; index++) |
|
ab89131d30e0
patch 8.0.1685: can't set ANSI colors of a terminal window
Christian Brabandt <cb@256bit.org>
parents:
13624
diff
changeset
|
3433 { |
|
ab89131d30e0
patch 8.0.1685: can't set ANSI colors of a terminal window
Christian Brabandt <cb@256bit.org>
parents:
13624
diff
changeset
|
3434 VTermColor color; |
|
ab89131d30e0
patch 8.0.1685: can't set ANSI colors of a terminal window
Christian Brabandt <cb@256bit.org>
parents:
13624
diff
changeset
|
3435 color.red = (unsigned)(rgb[index] >> 16); |
|
ab89131d30e0
patch 8.0.1685: can't set ANSI colors of a terminal window
Christian Brabandt <cb@256bit.org>
parents:
13624
diff
changeset
|
3436 color.green = (unsigned)(rgb[index] >> 8) & 255; |
|
ab89131d30e0
patch 8.0.1685: can't set ANSI colors of a terminal window
Christian Brabandt <cb@256bit.org>
parents:
13624
diff
changeset
|
3437 color.blue = (unsigned)rgb[index] & 255; |
|
ab89131d30e0
patch 8.0.1685: can't set ANSI colors of a terminal window
Christian Brabandt <cb@256bit.org>
parents:
13624
diff
changeset
|
3438 vterm_state_set_palette_color(state, index, &color); |
|
ab89131d30e0
patch 8.0.1685: can't set ANSI colors of a terminal window
Christian Brabandt <cb@256bit.org>
parents:
13624
diff
changeset
|
3439 } |
|
ab89131d30e0
patch 8.0.1685: can't set ANSI colors of a terminal window
Christian Brabandt <cb@256bit.org>
parents:
13624
diff
changeset
|
3440 } |
|
ab89131d30e0
patch 8.0.1685: can't set ANSI colors of a terminal window
Christian Brabandt <cb@256bit.org>
parents:
13624
diff
changeset
|
3441 |
|
ab89131d30e0
patch 8.0.1685: can't set ANSI colors of a terminal window
Christian Brabandt <cb@256bit.org>
parents:
13624
diff
changeset
|
3442 /* |
|
ab89131d30e0
patch 8.0.1685: can't set ANSI colors of a terminal window
Christian Brabandt <cb@256bit.org>
parents:
13624
diff
changeset
|
3443 * Set the ANSI color palette from a list of colors |
|
ab89131d30e0
patch 8.0.1685: can't set ANSI colors of a terminal window
Christian Brabandt <cb@256bit.org>
parents:
13624
diff
changeset
|
3444 */ |
|
ab89131d30e0
patch 8.0.1685: can't set ANSI colors of a terminal window
Christian Brabandt <cb@256bit.org>
parents:
13624
diff
changeset
|
3445 static int |
|
ab89131d30e0
patch 8.0.1685: can't set ANSI colors of a terminal window
Christian Brabandt <cb@256bit.org>
parents:
13624
diff
changeset
|
3446 set_ansi_colors_list(VTerm *vterm, list_T *list) |
|
ab89131d30e0
patch 8.0.1685: can't set ANSI colors of a terminal window
Christian Brabandt <cb@256bit.org>
parents:
13624
diff
changeset
|
3447 { |
|
ab89131d30e0
patch 8.0.1685: can't set ANSI colors of a terminal window
Christian Brabandt <cb@256bit.org>
parents:
13624
diff
changeset
|
3448 int n = 0; |
|
ab89131d30e0
patch 8.0.1685: can't set ANSI colors of a terminal window
Christian Brabandt <cb@256bit.org>
parents:
13624
diff
changeset
|
3449 long_u rgb[16]; |
|
ab89131d30e0
patch 8.0.1685: can't set ANSI colors of a terminal window
Christian Brabandt <cb@256bit.org>
parents:
13624
diff
changeset
|
3450 listitem_T *li = list->lv_first; |
|
ab89131d30e0
patch 8.0.1685: can't set ANSI colors of a terminal window
Christian Brabandt <cb@256bit.org>
parents:
13624
diff
changeset
|
3451 |
|
ab89131d30e0
patch 8.0.1685: can't set ANSI colors of a terminal window
Christian Brabandt <cb@256bit.org>
parents:
13624
diff
changeset
|
3452 for (; li != NULL && n < 16; li = li->li_next, n++) |
|
ab89131d30e0
patch 8.0.1685: can't set ANSI colors of a terminal window
Christian Brabandt <cb@256bit.org>
parents:
13624
diff
changeset
|
3453 { |
|
ab89131d30e0
patch 8.0.1685: can't set ANSI colors of a terminal window
Christian Brabandt <cb@256bit.org>
parents:
13624
diff
changeset
|
3454 char_u *color_name; |
|
ab89131d30e0
patch 8.0.1685: can't set ANSI colors of a terminal window
Christian Brabandt <cb@256bit.org>
parents:
13624
diff
changeset
|
3455 guicolor_T guicolor; |
|
ab89131d30e0
patch 8.0.1685: can't set ANSI colors of a terminal window
Christian Brabandt <cb@256bit.org>
parents:
13624
diff
changeset
|
3456 |
|
ab89131d30e0
patch 8.0.1685: can't set ANSI colors of a terminal window
Christian Brabandt <cb@256bit.org>
parents:
13624
diff
changeset
|
3457 color_name = get_tv_string_chk(&li->li_tv); |
|
ab89131d30e0
patch 8.0.1685: can't set ANSI colors of a terminal window
Christian Brabandt <cb@256bit.org>
parents:
13624
diff
changeset
|
3458 if (color_name == NULL) |
|
ab89131d30e0
patch 8.0.1685: can't set ANSI colors of a terminal window
Christian Brabandt <cb@256bit.org>
parents:
13624
diff
changeset
|
3459 return FAIL; |
|
ab89131d30e0
patch 8.0.1685: can't set ANSI colors of a terminal window
Christian Brabandt <cb@256bit.org>
parents:
13624
diff
changeset
|
3460 |
|
ab89131d30e0
patch 8.0.1685: can't set ANSI colors of a terminal window
Christian Brabandt <cb@256bit.org>
parents:
13624
diff
changeset
|
3461 guicolor = GUI_GET_COLOR(color_name); |
|
ab89131d30e0
patch 8.0.1685: can't set ANSI colors of a terminal window
Christian Brabandt <cb@256bit.org>
parents:
13624
diff
changeset
|
3462 if (guicolor == INVALCOLOR) |
|
ab89131d30e0
patch 8.0.1685: can't set ANSI colors of a terminal window
Christian Brabandt <cb@256bit.org>
parents:
13624
diff
changeset
|
3463 return FAIL; |
|
ab89131d30e0
patch 8.0.1685: can't set ANSI colors of a terminal window
Christian Brabandt <cb@256bit.org>
parents:
13624
diff
changeset
|
3464 |
|
ab89131d30e0
patch 8.0.1685: can't set ANSI colors of a terminal window
Christian Brabandt <cb@256bit.org>
parents:
13624
diff
changeset
|
3465 rgb[n] = GUI_MCH_GET_RGB(guicolor); |
|
ab89131d30e0
patch 8.0.1685: can't set ANSI colors of a terminal window
Christian Brabandt <cb@256bit.org>
parents:
13624
diff
changeset
|
3466 } |
|
ab89131d30e0
patch 8.0.1685: can't set ANSI colors of a terminal window
Christian Brabandt <cb@256bit.org>
parents:
13624
diff
changeset
|
3467 |
|
ab89131d30e0
patch 8.0.1685: can't set ANSI colors of a terminal window
Christian Brabandt <cb@256bit.org>
parents:
13624
diff
changeset
|
3468 if (n != 16 || li != NULL) |
|
ab89131d30e0
patch 8.0.1685: can't set ANSI colors of a terminal window
Christian Brabandt <cb@256bit.org>
parents:
13624
diff
changeset
|
3469 return FAIL; |
|
ab89131d30e0
patch 8.0.1685: can't set ANSI colors of a terminal window
Christian Brabandt <cb@256bit.org>
parents:
13624
diff
changeset
|
3470 |
|
ab89131d30e0
patch 8.0.1685: can't set ANSI colors of a terminal window
Christian Brabandt <cb@256bit.org>
parents:
13624
diff
changeset
|
3471 set_vterm_palette(vterm, rgb); |
|
ab89131d30e0
patch 8.0.1685: can't set ANSI colors of a terminal window
Christian Brabandt <cb@256bit.org>
parents:
13624
diff
changeset
|
3472 |
|
ab89131d30e0
patch 8.0.1685: can't set ANSI colors of a terminal window
Christian Brabandt <cb@256bit.org>
parents:
13624
diff
changeset
|
3473 return OK; |
|
ab89131d30e0
patch 8.0.1685: can't set ANSI colors of a terminal window
Christian Brabandt <cb@256bit.org>
parents:
13624
diff
changeset
|
3474 } |
|
ab89131d30e0
patch 8.0.1685: can't set ANSI colors of a terminal window
Christian Brabandt <cb@256bit.org>
parents:
13624
diff
changeset
|
3475 |
|
ab89131d30e0
patch 8.0.1685: can't set ANSI colors of a terminal window
Christian Brabandt <cb@256bit.org>
parents:
13624
diff
changeset
|
3476 /* |
|
ab89131d30e0
patch 8.0.1685: can't set ANSI colors of a terminal window
Christian Brabandt <cb@256bit.org>
parents:
13624
diff
changeset
|
3477 * Initialize the ANSI color palette from g:terminal_ansi_colors[0:15] |
|
ab89131d30e0
patch 8.0.1685: can't set ANSI colors of a terminal window
Christian Brabandt <cb@256bit.org>
parents:
13624
diff
changeset
|
3478 */ |
|
ab89131d30e0
patch 8.0.1685: can't set ANSI colors of a terminal window
Christian Brabandt <cb@256bit.org>
parents:
13624
diff
changeset
|
3479 static void |
|
ab89131d30e0
patch 8.0.1685: can't set ANSI colors of a terminal window
Christian Brabandt <cb@256bit.org>
parents:
13624
diff
changeset
|
3480 init_vterm_ansi_colors(VTerm *vterm) |
|
ab89131d30e0
patch 8.0.1685: can't set ANSI colors of a terminal window
Christian Brabandt <cb@256bit.org>
parents:
13624
diff
changeset
|
3481 { |
|
ab89131d30e0
patch 8.0.1685: can't set ANSI colors of a terminal window
Christian Brabandt <cb@256bit.org>
parents:
13624
diff
changeset
|
3482 dictitem_T *var = find_var((char_u *)"g:terminal_ansi_colors", NULL, TRUE); |
|
ab89131d30e0
patch 8.0.1685: can't set ANSI colors of a terminal window
Christian Brabandt <cb@256bit.org>
parents:
13624
diff
changeset
|
3483 |
|
ab89131d30e0
patch 8.0.1685: can't set ANSI colors of a terminal window
Christian Brabandt <cb@256bit.org>
parents:
13624
diff
changeset
|
3484 if (var != NULL |
|
ab89131d30e0
patch 8.0.1685: can't set ANSI colors of a terminal window
Christian Brabandt <cb@256bit.org>
parents:
13624
diff
changeset
|
3485 && (var->di_tv.v_type != VAR_LIST |
|
ab89131d30e0
patch 8.0.1685: can't set ANSI colors of a terminal window
Christian Brabandt <cb@256bit.org>
parents:
13624
diff
changeset
|
3486 || var->di_tv.vval.v_list == NULL |
|
ab89131d30e0
patch 8.0.1685: can't set ANSI colors of a terminal window
Christian Brabandt <cb@256bit.org>
parents:
13624
diff
changeset
|
3487 || set_ansi_colors_list(vterm, var->di_tv.vval.v_list) == FAIL)) |
|
ab89131d30e0
patch 8.0.1685: can't set ANSI colors of a terminal window
Christian Brabandt <cb@256bit.org>
parents:
13624
diff
changeset
|
3488 EMSG2(_(e_invarg2), "g:terminal_ansi_colors"); |
|
ab89131d30e0
patch 8.0.1685: can't set ANSI colors of a terminal window
Christian Brabandt <cb@256bit.org>
parents:
13624
diff
changeset
|
3489 } |
|
ab89131d30e0
patch 8.0.1685: can't set ANSI colors of a terminal window
Christian Brabandt <cb@256bit.org>
parents:
13624
diff
changeset
|
3490 #endif |
|
ab89131d30e0
patch 8.0.1685: can't set ANSI colors of a terminal window
Christian Brabandt <cb@256bit.org>
parents:
13624
diff
changeset
|
3491 |
|
13483
f7ef5d579758
patch 8.0.1615: term_dumpload() does not use the right colors
Christian Brabandt <cb@256bit.org>
parents:
13476
diff
changeset
|
3492 /* |
|
13535
e9ffb5b35266
patch 8.0.1641: job in terminal can't communicate with Vim
Christian Brabandt <cb@256bit.org>
parents:
13517
diff
changeset
|
3493 * Handles a "drop" command from the job in the terminal. |
|
e9ffb5b35266
patch 8.0.1641: job in terminal can't communicate with Vim
Christian Brabandt <cb@256bit.org>
parents:
13517
diff
changeset
|
3494 * "item" is the file name, "item->li_next" may have options. |
|
e9ffb5b35266
patch 8.0.1641: job in terminal can't communicate with Vim
Christian Brabandt <cb@256bit.org>
parents:
13517
diff
changeset
|
3495 */ |
|
e9ffb5b35266
patch 8.0.1641: job in terminal can't communicate with Vim
Christian Brabandt <cb@256bit.org>
parents:
13517
diff
changeset
|
3496 static void |
|
e9ffb5b35266
patch 8.0.1641: job in terminal can't communicate with Vim
Christian Brabandt <cb@256bit.org>
parents:
13517
diff
changeset
|
3497 handle_drop_command(listitem_T *item) |
|
e9ffb5b35266
patch 8.0.1641: job in terminal can't communicate with Vim
Christian Brabandt <cb@256bit.org>
parents:
13517
diff
changeset
|
3498 { |
|
e9ffb5b35266
patch 8.0.1641: job in terminal can't communicate with Vim
Christian Brabandt <cb@256bit.org>
parents:
13517
diff
changeset
|
3499 char_u *fname = get_tv_string(&item->li_tv); |
|
13575
4df23d9bad47
patch 8.0.1660: the terminal API "drop" command doesn't support options
Christian Brabandt <cb@256bit.org>
parents:
13557
diff
changeset
|
3500 listitem_T *opt_item = item->li_next; |
|
13535
e9ffb5b35266
patch 8.0.1641: job in terminal can't communicate with Vim
Christian Brabandt <cb@256bit.org>
parents:
13517
diff
changeset
|
3501 int bufnr; |
|
e9ffb5b35266
patch 8.0.1641: job in terminal can't communicate with Vim
Christian Brabandt <cb@256bit.org>
parents:
13517
diff
changeset
|
3502 win_T *wp; |
|
e9ffb5b35266
patch 8.0.1641: job in terminal can't communicate with Vim
Christian Brabandt <cb@256bit.org>
parents:
13517
diff
changeset
|
3503 tabpage_T *tp; |
|
e9ffb5b35266
patch 8.0.1641: job in terminal can't communicate with Vim
Christian Brabandt <cb@256bit.org>
parents:
13517
diff
changeset
|
3504 exarg_T ea; |
|
13575
4df23d9bad47
patch 8.0.1660: the terminal API "drop" command doesn't support options
Christian Brabandt <cb@256bit.org>
parents:
13557
diff
changeset
|
3505 char_u *tofree = NULL; |
|
13535
e9ffb5b35266
patch 8.0.1641: job in terminal can't communicate with Vim
Christian Brabandt <cb@256bit.org>
parents:
13517
diff
changeset
|
3506 |
|
e9ffb5b35266
patch 8.0.1641: job in terminal can't communicate with Vim
Christian Brabandt <cb@256bit.org>
parents:
13517
diff
changeset
|
3507 bufnr = buflist_add(fname, BLN_LISTED | BLN_NOOPT); |
|
e9ffb5b35266
patch 8.0.1641: job in terminal can't communicate with Vim
Christian Brabandt <cb@256bit.org>
parents:
13517
diff
changeset
|
3508 FOR_ALL_TAB_WINDOWS(tp, wp) |
|
e9ffb5b35266
patch 8.0.1641: job in terminal can't communicate with Vim
Christian Brabandt <cb@256bit.org>
parents:
13517
diff
changeset
|
3509 { |
|
e9ffb5b35266
patch 8.0.1641: job in terminal can't communicate with Vim
Christian Brabandt <cb@256bit.org>
parents:
13517
diff
changeset
|
3510 if (wp->w_buffer->b_fnum == bufnr) |
|
e9ffb5b35266
patch 8.0.1641: job in terminal can't communicate with Vim
Christian Brabandt <cb@256bit.org>
parents:
13517
diff
changeset
|
3511 { |
|
e9ffb5b35266
patch 8.0.1641: job in terminal can't communicate with Vim
Christian Brabandt <cb@256bit.org>
parents:
13517
diff
changeset
|
3512 /* buffer is in a window already, go there */ |
|
e9ffb5b35266
patch 8.0.1641: job in terminal can't communicate with Vim
Christian Brabandt <cb@256bit.org>
parents:
13517
diff
changeset
|
3513 goto_tabpage_win(tp, wp); |
|
e9ffb5b35266
patch 8.0.1641: job in terminal can't communicate with Vim
Christian Brabandt <cb@256bit.org>
parents:
13517
diff
changeset
|
3514 return; |
|
e9ffb5b35266
patch 8.0.1641: job in terminal can't communicate with Vim
Christian Brabandt <cb@256bit.org>
parents:
13517
diff
changeset
|
3515 } |
|
e9ffb5b35266
patch 8.0.1641: job in terminal can't communicate with Vim
Christian Brabandt <cb@256bit.org>
parents:
13517
diff
changeset
|
3516 } |
|
e9ffb5b35266
patch 8.0.1641: job in terminal can't communicate with Vim
Christian Brabandt <cb@256bit.org>
parents:
13517
diff
changeset
|
3517 |
|
e9ffb5b35266
patch 8.0.1641: job in terminal can't communicate with Vim
Christian Brabandt <cb@256bit.org>
parents:
13517
diff
changeset
|
3518 vim_memset(&ea, 0, sizeof(ea)); |
|
13575
4df23d9bad47
patch 8.0.1660: the terminal API "drop" command doesn't support options
Christian Brabandt <cb@256bit.org>
parents:
13557
diff
changeset
|
3519 |
|
4df23d9bad47
patch 8.0.1660: the terminal API "drop" command doesn't support options
Christian Brabandt <cb@256bit.org>
parents:
13557
diff
changeset
|
3520 if (opt_item != NULL && opt_item->li_tv.v_type == VAR_DICT |
|
4df23d9bad47
patch 8.0.1660: the terminal API "drop" command doesn't support options
Christian Brabandt <cb@256bit.org>
parents:
13557
diff
changeset
|
3521 && opt_item->li_tv.vval.v_dict != NULL) |
|
4df23d9bad47
patch 8.0.1660: the terminal API "drop" command doesn't support options
Christian Brabandt <cb@256bit.org>
parents:
13557
diff
changeset
|
3522 { |
|
4df23d9bad47
patch 8.0.1660: the terminal API "drop" command doesn't support options
Christian Brabandt <cb@256bit.org>
parents:
13557
diff
changeset
|
3523 dict_T *dict = opt_item->li_tv.vval.v_dict; |
|
4df23d9bad47
patch 8.0.1660: the terminal API "drop" command doesn't support options
Christian Brabandt <cb@256bit.org>
parents:
13557
diff
changeset
|
3524 char_u *p; |
|
4df23d9bad47
patch 8.0.1660: the terminal API "drop" command doesn't support options
Christian Brabandt <cb@256bit.org>
parents:
13557
diff
changeset
|
3525 |
|
4df23d9bad47
patch 8.0.1660: the terminal API "drop" command doesn't support options
Christian Brabandt <cb@256bit.org>
parents:
13557
diff
changeset
|
3526 p = get_dict_string(dict, (char_u *)"ff", FALSE); |
|
4df23d9bad47
patch 8.0.1660: the terminal API "drop" command doesn't support options
Christian Brabandt <cb@256bit.org>
parents:
13557
diff
changeset
|
3527 if (p == NULL) |
|
4df23d9bad47
patch 8.0.1660: the terminal API "drop" command doesn't support options
Christian Brabandt <cb@256bit.org>
parents:
13557
diff
changeset
|
3528 p = get_dict_string(dict, (char_u *)"fileformat", FALSE); |
|
4df23d9bad47
patch 8.0.1660: the terminal API "drop" command doesn't support options
Christian Brabandt <cb@256bit.org>
parents:
13557
diff
changeset
|
3529 if (p != NULL) |
|
4df23d9bad47
patch 8.0.1660: the terminal API "drop" command doesn't support options
Christian Brabandt <cb@256bit.org>
parents:
13557
diff
changeset
|
3530 { |
|
4df23d9bad47
patch 8.0.1660: the terminal API "drop" command doesn't support options
Christian Brabandt <cb@256bit.org>
parents:
13557
diff
changeset
|
3531 if (check_ff_value(p) == FAIL) |
|
4df23d9bad47
patch 8.0.1660: the terminal API "drop" command doesn't support options
Christian Brabandt <cb@256bit.org>
parents:
13557
diff
changeset
|
3532 ch_log(NULL, "Invalid ff argument to drop: %s", p); |
|
4df23d9bad47
patch 8.0.1660: the terminal API "drop" command doesn't support options
Christian Brabandt <cb@256bit.org>
parents:
13557
diff
changeset
|
3533 else |
|
4df23d9bad47
patch 8.0.1660: the terminal API "drop" command doesn't support options
Christian Brabandt <cb@256bit.org>
parents:
13557
diff
changeset
|
3534 ea.force_ff = *p; |
|
4df23d9bad47
patch 8.0.1660: the terminal API "drop" command doesn't support options
Christian Brabandt <cb@256bit.org>
parents:
13557
diff
changeset
|
3535 } |
|
4df23d9bad47
patch 8.0.1660: the terminal API "drop" command doesn't support options
Christian Brabandt <cb@256bit.org>
parents:
13557
diff
changeset
|
3536 p = get_dict_string(dict, (char_u *)"enc", FALSE); |
|
4df23d9bad47
patch 8.0.1660: the terminal API "drop" command doesn't support options
Christian Brabandt <cb@256bit.org>
parents:
13557
diff
changeset
|
3537 if (p == NULL) |
|
4df23d9bad47
patch 8.0.1660: the terminal API "drop" command doesn't support options
Christian Brabandt <cb@256bit.org>
parents:
13557
diff
changeset
|
3538 p = get_dict_string(dict, (char_u *)"encoding", FALSE); |
|
4df23d9bad47
patch 8.0.1660: the terminal API "drop" command doesn't support options
Christian Brabandt <cb@256bit.org>
parents:
13557
diff
changeset
|
3539 if (p != NULL) |
|
4df23d9bad47
patch 8.0.1660: the terminal API "drop" command doesn't support options
Christian Brabandt <cb@256bit.org>
parents:
13557
diff
changeset
|
3540 { |
|
13583
200ef826e7dd
patch 8.0.1664: test failure because of not allocating enough space
Christian Brabandt <cb@256bit.org>
parents:
13579
diff
changeset
|
3541 ea.cmd = alloc((int)STRLEN(p) + 12); |
|
13575
4df23d9bad47
patch 8.0.1660: the terminal API "drop" command doesn't support options
Christian Brabandt <cb@256bit.org>
parents:
13557
diff
changeset
|
3542 if (ea.cmd != NULL) |
|
4df23d9bad47
patch 8.0.1660: the terminal API "drop" command doesn't support options
Christian Brabandt <cb@256bit.org>
parents:
13557
diff
changeset
|
3543 { |
|
4df23d9bad47
patch 8.0.1660: the terminal API "drop" command doesn't support options
Christian Brabandt <cb@256bit.org>
parents:
13557
diff
changeset
|
3544 sprintf((char *)ea.cmd, "sbuf ++enc=%s", p); |
|
4df23d9bad47
patch 8.0.1660: the terminal API "drop" command doesn't support options
Christian Brabandt <cb@256bit.org>
parents:
13557
diff
changeset
|
3545 ea.force_enc = 11; |
|
4df23d9bad47
patch 8.0.1660: the terminal API "drop" command doesn't support options
Christian Brabandt <cb@256bit.org>
parents:
13557
diff
changeset
|
3546 tofree = ea.cmd; |
|
4df23d9bad47
patch 8.0.1660: the terminal API "drop" command doesn't support options
Christian Brabandt <cb@256bit.org>
parents:
13557
diff
changeset
|
3547 } |
|
4df23d9bad47
patch 8.0.1660: the terminal API "drop" command doesn't support options
Christian Brabandt <cb@256bit.org>
parents:
13557
diff
changeset
|
3548 } |
|
4df23d9bad47
patch 8.0.1660: the terminal API "drop" command doesn't support options
Christian Brabandt <cb@256bit.org>
parents:
13557
diff
changeset
|
3549 |
|
4df23d9bad47
patch 8.0.1660: the terminal API "drop" command doesn't support options
Christian Brabandt <cb@256bit.org>
parents:
13557
diff
changeset
|
3550 p = get_dict_string(dict, (char_u *)"bad", FALSE); |
|
4df23d9bad47
patch 8.0.1660: the terminal API "drop" command doesn't support options
Christian Brabandt <cb@256bit.org>
parents:
13557
diff
changeset
|
3551 if (p != NULL) |
|
4df23d9bad47
patch 8.0.1660: the terminal API "drop" command doesn't support options
Christian Brabandt <cb@256bit.org>
parents:
13557
diff
changeset
|
3552 get_bad_opt(p, &ea); |
|
4df23d9bad47
patch 8.0.1660: the terminal API "drop" command doesn't support options
Christian Brabandt <cb@256bit.org>
parents:
13557
diff
changeset
|
3553 |
|
4df23d9bad47
patch 8.0.1660: the terminal API "drop" command doesn't support options
Christian Brabandt <cb@256bit.org>
parents:
13557
diff
changeset
|
3554 if (dict_find(dict, (char_u *)"bin", -1) != NULL) |
|
4df23d9bad47
patch 8.0.1660: the terminal API "drop" command doesn't support options
Christian Brabandt <cb@256bit.org>
parents:
13557
diff
changeset
|
3555 ea.force_bin = FORCE_BIN; |
|
4df23d9bad47
patch 8.0.1660: the terminal API "drop" command doesn't support options
Christian Brabandt <cb@256bit.org>
parents:
13557
diff
changeset
|
3556 if (dict_find(dict, (char_u *)"binary", -1) != NULL) |
|
4df23d9bad47
patch 8.0.1660: the terminal API "drop" command doesn't support options
Christian Brabandt <cb@256bit.org>
parents:
13557
diff
changeset
|
3557 ea.force_bin = FORCE_BIN; |
|
4df23d9bad47
patch 8.0.1660: the terminal API "drop" command doesn't support options
Christian Brabandt <cb@256bit.org>
parents:
13557
diff
changeset
|
3558 if (dict_find(dict, (char_u *)"nobin", -1) != NULL) |
|
4df23d9bad47
patch 8.0.1660: the terminal API "drop" command doesn't support options
Christian Brabandt <cb@256bit.org>
parents:
13557
diff
changeset
|
3559 ea.force_bin = FORCE_NOBIN; |
|
4df23d9bad47
patch 8.0.1660: the terminal API "drop" command doesn't support options
Christian Brabandt <cb@256bit.org>
parents:
13557
diff
changeset
|
3560 if (dict_find(dict, (char_u *)"nobinary", -1) != NULL) |
|
4df23d9bad47
patch 8.0.1660: the terminal API "drop" command doesn't support options
Christian Brabandt <cb@256bit.org>
parents:
13557
diff
changeset
|
3561 ea.force_bin = FORCE_NOBIN; |
|
4df23d9bad47
patch 8.0.1660: the terminal API "drop" command doesn't support options
Christian Brabandt <cb@256bit.org>
parents:
13557
diff
changeset
|
3562 } |
|
4df23d9bad47
patch 8.0.1660: the terminal API "drop" command doesn't support options
Christian Brabandt <cb@256bit.org>
parents:
13557
diff
changeset
|
3563 |
|
4df23d9bad47
patch 8.0.1660: the terminal API "drop" command doesn't support options
Christian Brabandt <cb@256bit.org>
parents:
13557
diff
changeset
|
3564 /* open in new window, like ":split fname" */ |
|
4df23d9bad47
patch 8.0.1660: the terminal API "drop" command doesn't support options
Christian Brabandt <cb@256bit.org>
parents:
13557
diff
changeset
|
3565 if (ea.cmd == NULL) |
|
4df23d9bad47
patch 8.0.1660: the terminal API "drop" command doesn't support options
Christian Brabandt <cb@256bit.org>
parents:
13557
diff
changeset
|
3566 ea.cmd = (char_u *)"split"; |
|
4df23d9bad47
patch 8.0.1660: the terminal API "drop" command doesn't support options
Christian Brabandt <cb@256bit.org>
parents:
13557
diff
changeset
|
3567 ea.arg = fname; |
|
4df23d9bad47
patch 8.0.1660: the terminal API "drop" command doesn't support options
Christian Brabandt <cb@256bit.org>
parents:
13557
diff
changeset
|
3568 ea.cmdidx = CMD_split; |
|
4df23d9bad47
patch 8.0.1660: the terminal API "drop" command doesn't support options
Christian Brabandt <cb@256bit.org>
parents:
13557
diff
changeset
|
3569 ex_splitview(&ea); |
|
4df23d9bad47
patch 8.0.1660: the terminal API "drop" command doesn't support options
Christian Brabandt <cb@256bit.org>
parents:
13557
diff
changeset
|
3570 |
|
4df23d9bad47
patch 8.0.1660: the terminal API "drop" command doesn't support options
Christian Brabandt <cb@256bit.org>
parents:
13557
diff
changeset
|
3571 vim_free(tofree); |
|
13535
e9ffb5b35266
patch 8.0.1641: job in terminal can't communicate with Vim
Christian Brabandt <cb@256bit.org>
parents:
13517
diff
changeset
|
3572 } |
|
e9ffb5b35266
patch 8.0.1641: job in terminal can't communicate with Vim
Christian Brabandt <cb@256bit.org>
parents:
13517
diff
changeset
|
3573 |
|
e9ffb5b35266
patch 8.0.1641: job in terminal can't communicate with Vim
Christian Brabandt <cb@256bit.org>
parents:
13517
diff
changeset
|
3574 /* |
|
e9ffb5b35266
patch 8.0.1641: job in terminal can't communicate with Vim
Christian Brabandt <cb@256bit.org>
parents:
13517
diff
changeset
|
3575 * Handles a function call from the job running in a terminal. |
|
e9ffb5b35266
patch 8.0.1641: job in terminal can't communicate with Vim
Christian Brabandt <cb@256bit.org>
parents:
13517
diff
changeset
|
3576 * "item" is the function name, "item->li_next" has the arguments. |
|
e9ffb5b35266
patch 8.0.1641: job in terminal can't communicate with Vim
Christian Brabandt <cb@256bit.org>
parents:
13517
diff
changeset
|
3577 */ |
|
e9ffb5b35266
patch 8.0.1641: job in terminal can't communicate with Vim
Christian Brabandt <cb@256bit.org>
parents:
13517
diff
changeset
|
3578 static void |
|
e9ffb5b35266
patch 8.0.1641: job in terminal can't communicate with Vim
Christian Brabandt <cb@256bit.org>
parents:
13517
diff
changeset
|
3579 handle_call_command(term_T *term, channel_T *channel, listitem_T *item) |
|
e9ffb5b35266
patch 8.0.1641: job in terminal can't communicate with Vim
Christian Brabandt <cb@256bit.org>
parents:
13517
diff
changeset
|
3580 { |
|
e9ffb5b35266
patch 8.0.1641: job in terminal can't communicate with Vim
Christian Brabandt <cb@256bit.org>
parents:
13517
diff
changeset
|
3581 char_u *func; |
|
e9ffb5b35266
patch 8.0.1641: job in terminal can't communicate with Vim
Christian Brabandt <cb@256bit.org>
parents:
13517
diff
changeset
|
3582 typval_T argvars[2]; |
|
e9ffb5b35266
patch 8.0.1641: job in terminal can't communicate with Vim
Christian Brabandt <cb@256bit.org>
parents:
13517
diff
changeset
|
3583 typval_T rettv; |
|
e9ffb5b35266
patch 8.0.1641: job in terminal can't communicate with Vim
Christian Brabandt <cb@256bit.org>
parents:
13517
diff
changeset
|
3584 int doesrange; |
|
e9ffb5b35266
patch 8.0.1641: job in terminal can't communicate with Vim
Christian Brabandt <cb@256bit.org>
parents:
13517
diff
changeset
|
3585 |
|
e9ffb5b35266
patch 8.0.1641: job in terminal can't communicate with Vim
Christian Brabandt <cb@256bit.org>
parents:
13517
diff
changeset
|
3586 if (item->li_next == NULL) |
|
e9ffb5b35266
patch 8.0.1641: job in terminal can't communicate with Vim
Christian Brabandt <cb@256bit.org>
parents:
13517
diff
changeset
|
3587 { |
|
e9ffb5b35266
patch 8.0.1641: job in terminal can't communicate with Vim
Christian Brabandt <cb@256bit.org>
parents:
13517
diff
changeset
|
3588 ch_log(channel, "Missing function arguments for call"); |
|
e9ffb5b35266
patch 8.0.1641: job in terminal can't communicate with Vim
Christian Brabandt <cb@256bit.org>
parents:
13517
diff
changeset
|
3589 return; |
|
e9ffb5b35266
patch 8.0.1641: job in terminal can't communicate with Vim
Christian Brabandt <cb@256bit.org>
parents:
13517
diff
changeset
|
3590 } |
|
e9ffb5b35266
patch 8.0.1641: job in terminal can't communicate with Vim
Christian Brabandt <cb@256bit.org>
parents:
13517
diff
changeset
|
3591 func = get_tv_string(&item->li_tv); |
|
e9ffb5b35266
patch 8.0.1641: job in terminal can't communicate with Vim
Christian Brabandt <cb@256bit.org>
parents:
13517
diff
changeset
|
3592 |
|
13547
87a9c1be0ae3
patch 8.0.1647: terminal API may call any user function
Christian Brabandt <cb@256bit.org>
parents:
13535
diff
changeset
|
3593 if (STRNCMP(func, "Tapi_", 5) != 0) |
|
13535
e9ffb5b35266
patch 8.0.1641: job in terminal can't communicate with Vim
Christian Brabandt <cb@256bit.org>
parents:
13517
diff
changeset
|
3594 { |
|
e9ffb5b35266
patch 8.0.1641: job in terminal can't communicate with Vim
Christian Brabandt <cb@256bit.org>
parents:
13517
diff
changeset
|
3595 ch_log(channel, "Invalid function name: %s", func); |
|
e9ffb5b35266
patch 8.0.1641: job in terminal can't communicate with Vim
Christian Brabandt <cb@256bit.org>
parents:
13517
diff
changeset
|
3596 return; |
|
e9ffb5b35266
patch 8.0.1641: job in terminal can't communicate with Vim
Christian Brabandt <cb@256bit.org>
parents:
13517
diff
changeset
|
3597 } |
|
e9ffb5b35266
patch 8.0.1641: job in terminal can't communicate with Vim
Christian Brabandt <cb@256bit.org>
parents:
13517
diff
changeset
|
3598 |
|
e9ffb5b35266
patch 8.0.1641: job in terminal can't communicate with Vim
Christian Brabandt <cb@256bit.org>
parents:
13517
diff
changeset
|
3599 argvars[0].v_type = VAR_NUMBER; |
|
e9ffb5b35266
patch 8.0.1641: job in terminal can't communicate with Vim
Christian Brabandt <cb@256bit.org>
parents:
13517
diff
changeset
|
3600 argvars[0].vval.v_number = term->tl_buffer->b_fnum; |
|
e9ffb5b35266
patch 8.0.1641: job in terminal can't communicate with Vim
Christian Brabandt <cb@256bit.org>
parents:
13517
diff
changeset
|
3601 argvars[1] = item->li_next->li_tv; |
|
13577
4cb743db55b3
patch 8.0.1661: warnings from 64 bit compiler
Christian Brabandt <cb@256bit.org>
parents:
13575
diff
changeset
|
3602 if (call_func(func, (int)STRLEN(func), &rettv, |
|
13535
e9ffb5b35266
patch 8.0.1641: job in terminal can't communicate with Vim
Christian Brabandt <cb@256bit.org>
parents:
13517
diff
changeset
|
3603 2, argvars, /* argv_func */ NULL, |
|
e9ffb5b35266
patch 8.0.1641: job in terminal can't communicate with Vim
Christian Brabandt <cb@256bit.org>
parents:
13517
diff
changeset
|
3604 /* firstline */ 1, /* lastline */ 1, |
|
e9ffb5b35266
patch 8.0.1641: job in terminal can't communicate with Vim
Christian Brabandt <cb@256bit.org>
parents:
13517
diff
changeset
|
3605 &doesrange, /* evaluate */ TRUE, |
|
e9ffb5b35266
patch 8.0.1641: job in terminal can't communicate with Vim
Christian Brabandt <cb@256bit.org>
parents:
13517
diff
changeset
|
3606 /* partial */ NULL, /* selfdict */ NULL) == OK) |
|
e9ffb5b35266
patch 8.0.1641: job in terminal can't communicate with Vim
Christian Brabandt <cb@256bit.org>
parents:
13517
diff
changeset
|
3607 { |
|
e9ffb5b35266
patch 8.0.1641: job in terminal can't communicate with Vim
Christian Brabandt <cb@256bit.org>
parents:
13517
diff
changeset
|
3608 clear_tv(&rettv); |
|
e9ffb5b35266
patch 8.0.1641: job in terminal can't communicate with Vim
Christian Brabandt <cb@256bit.org>
parents:
13517
diff
changeset
|
3609 ch_log(channel, "Function %s called", func); |
|
e9ffb5b35266
patch 8.0.1641: job in terminal can't communicate with Vim
Christian Brabandt <cb@256bit.org>
parents:
13517
diff
changeset
|
3610 } |
|
e9ffb5b35266
patch 8.0.1641: job in terminal can't communicate with Vim
Christian Brabandt <cb@256bit.org>
parents:
13517
diff
changeset
|
3611 else |
|
e9ffb5b35266
patch 8.0.1641: job in terminal can't communicate with Vim
Christian Brabandt <cb@256bit.org>
parents:
13517
diff
changeset
|
3612 ch_log(channel, "Calling function %s failed", func); |
|
e9ffb5b35266
patch 8.0.1641: job in terminal can't communicate with Vim
Christian Brabandt <cb@256bit.org>
parents:
13517
diff
changeset
|
3613 } |
|
e9ffb5b35266
patch 8.0.1641: job in terminal can't communicate with Vim
Christian Brabandt <cb@256bit.org>
parents:
13517
diff
changeset
|
3614 |
|
e9ffb5b35266
patch 8.0.1641: job in terminal can't communicate with Vim
Christian Brabandt <cb@256bit.org>
parents:
13517
diff
changeset
|
3615 /* |
|
e9ffb5b35266
patch 8.0.1641: job in terminal can't communicate with Vim
Christian Brabandt <cb@256bit.org>
parents:
13517
diff
changeset
|
3616 * Called by libvterm when it cannot recognize an OSC sequence. |
|
e9ffb5b35266
patch 8.0.1641: job in terminal can't communicate with Vim
Christian Brabandt <cb@256bit.org>
parents:
13517
diff
changeset
|
3617 * We recognize a terminal API command. |
|
e9ffb5b35266
patch 8.0.1641: job in terminal can't communicate with Vim
Christian Brabandt <cb@256bit.org>
parents:
13517
diff
changeset
|
3618 */ |
|
e9ffb5b35266
patch 8.0.1641: job in terminal can't communicate with Vim
Christian Brabandt <cb@256bit.org>
parents:
13517
diff
changeset
|
3619 static int |
|
e9ffb5b35266
patch 8.0.1641: job in terminal can't communicate with Vim
Christian Brabandt <cb@256bit.org>
parents:
13517
diff
changeset
|
3620 parse_osc(const char *command, size_t cmdlen, void *user) |
|
e9ffb5b35266
patch 8.0.1641: job in terminal can't communicate with Vim
Christian Brabandt <cb@256bit.org>
parents:
13517
diff
changeset
|
3621 { |
|
e9ffb5b35266
patch 8.0.1641: job in terminal can't communicate with Vim
Christian Brabandt <cb@256bit.org>
parents:
13517
diff
changeset
|
3622 term_T *term = (term_T *)user; |
|
e9ffb5b35266
patch 8.0.1641: job in terminal can't communicate with Vim
Christian Brabandt <cb@256bit.org>
parents:
13517
diff
changeset
|
3623 js_read_T reader; |
|
e9ffb5b35266
patch 8.0.1641: job in terminal can't communicate with Vim
Christian Brabandt <cb@256bit.org>
parents:
13517
diff
changeset
|
3624 typval_T tv; |
|
e9ffb5b35266
patch 8.0.1641: job in terminal can't communicate with Vim
Christian Brabandt <cb@256bit.org>
parents:
13517
diff
changeset
|
3625 channel_T *channel = term->tl_job == NULL ? NULL |
|
e9ffb5b35266
patch 8.0.1641: job in terminal can't communicate with Vim
Christian Brabandt <cb@256bit.org>
parents:
13517
diff
changeset
|
3626 : term->tl_job->jv_channel; |
|
e9ffb5b35266
patch 8.0.1641: job in terminal can't communicate with Vim
Christian Brabandt <cb@256bit.org>
parents:
13517
diff
changeset
|
3627 |
|
e9ffb5b35266
patch 8.0.1641: job in terminal can't communicate with Vim
Christian Brabandt <cb@256bit.org>
parents:
13517
diff
changeset
|
3628 /* We recognize only OSC 5 1 ; {command} */ |
|
e9ffb5b35266
patch 8.0.1641: job in terminal can't communicate with Vim
Christian Brabandt <cb@256bit.org>
parents:
13517
diff
changeset
|
3629 if (cmdlen < 3 || STRNCMP(command, "51;", 3) != 0) |
|
e9ffb5b35266
patch 8.0.1641: job in terminal can't communicate with Vim
Christian Brabandt <cb@256bit.org>
parents:
13517
diff
changeset
|
3630 return 0; /* not handled */ |
|
e9ffb5b35266
patch 8.0.1641: job in terminal can't communicate with Vim
Christian Brabandt <cb@256bit.org>
parents:
13517
diff
changeset
|
3631 |
|
13577
4cb743db55b3
patch 8.0.1661: warnings from 64 bit compiler
Christian Brabandt <cb@256bit.org>
parents:
13575
diff
changeset
|
3632 reader.js_buf = vim_strnsave((char_u *)command + 3, (int)(cmdlen - 3)); |
|
13535
e9ffb5b35266
patch 8.0.1641: job in terminal can't communicate with Vim
Christian Brabandt <cb@256bit.org>
parents:
13517
diff
changeset
|
3633 if (reader.js_buf == NULL) |
|
e9ffb5b35266
patch 8.0.1641: job in terminal can't communicate with Vim
Christian Brabandt <cb@256bit.org>
parents:
13517
diff
changeset
|
3634 return 1; |
|
e9ffb5b35266
patch 8.0.1641: job in terminal can't communicate with Vim
Christian Brabandt <cb@256bit.org>
parents:
13517
diff
changeset
|
3635 reader.js_fill = NULL; |
|
e9ffb5b35266
patch 8.0.1641: job in terminal can't communicate with Vim
Christian Brabandt <cb@256bit.org>
parents:
13517
diff
changeset
|
3636 reader.js_used = 0; |
|
e9ffb5b35266
patch 8.0.1641: job in terminal can't communicate with Vim
Christian Brabandt <cb@256bit.org>
parents:
13517
diff
changeset
|
3637 if (json_decode(&reader, &tv, 0) == OK |
|
e9ffb5b35266
patch 8.0.1641: job in terminal can't communicate with Vim
Christian Brabandt <cb@256bit.org>
parents:
13517
diff
changeset
|
3638 && tv.v_type == VAR_LIST |
|
e9ffb5b35266
patch 8.0.1641: job in terminal can't communicate with Vim
Christian Brabandt <cb@256bit.org>
parents:
13517
diff
changeset
|
3639 && tv.vval.v_list != NULL) |
|
e9ffb5b35266
patch 8.0.1641: job in terminal can't communicate with Vim
Christian Brabandt <cb@256bit.org>
parents:
13517
diff
changeset
|
3640 { |
|
e9ffb5b35266
patch 8.0.1641: job in terminal can't communicate with Vim
Christian Brabandt <cb@256bit.org>
parents:
13517
diff
changeset
|
3641 listitem_T *item = tv.vval.v_list->lv_first; |
|
e9ffb5b35266
patch 8.0.1641: job in terminal can't communicate with Vim
Christian Brabandt <cb@256bit.org>
parents:
13517
diff
changeset
|
3642 |
|
e9ffb5b35266
patch 8.0.1641: job in terminal can't communicate with Vim
Christian Brabandt <cb@256bit.org>
parents:
13517
diff
changeset
|
3643 if (item == NULL) |
|
e9ffb5b35266
patch 8.0.1641: job in terminal can't communicate with Vim
Christian Brabandt <cb@256bit.org>
parents:
13517
diff
changeset
|
3644 ch_log(channel, "Missing command"); |
|
e9ffb5b35266
patch 8.0.1641: job in terminal can't communicate with Vim
Christian Brabandt <cb@256bit.org>
parents:
13517
diff
changeset
|
3645 else |
|
e9ffb5b35266
patch 8.0.1641: job in terminal can't communicate with Vim
Christian Brabandt <cb@256bit.org>
parents:
13517
diff
changeset
|
3646 { |
|
e9ffb5b35266
patch 8.0.1641: job in terminal can't communicate with Vim
Christian Brabandt <cb@256bit.org>
parents:
13517
diff
changeset
|
3647 char_u *cmd = get_tv_string(&item->li_tv); |
|
e9ffb5b35266
patch 8.0.1641: job in terminal can't communicate with Vim
Christian Brabandt <cb@256bit.org>
parents:
13517
diff
changeset
|
3648 |
|
13720
7d2039b2ecc8
patch 8.0.1732: crash when terminal API call deletes the buffer
Christian Brabandt <cb@256bit.org>
parents:
13700
diff
changeset
|
3649 /* Make sure an invoked command doesn't delete the buffer (and the |
|
7d2039b2ecc8
patch 8.0.1732: crash when terminal API call deletes the buffer
Christian Brabandt <cb@256bit.org>
parents:
13700
diff
changeset
|
3650 * terminal) under our fingers. */ |
|
7d2039b2ecc8
patch 8.0.1732: crash when terminal API call deletes the buffer
Christian Brabandt <cb@256bit.org>
parents:
13700
diff
changeset
|
3651 ++term->tl_buffer->b_locked; |
|
7d2039b2ecc8
patch 8.0.1732: crash when terminal API call deletes the buffer
Christian Brabandt <cb@256bit.org>
parents:
13700
diff
changeset
|
3652 |
|
13535
e9ffb5b35266
patch 8.0.1641: job in terminal can't communicate with Vim
Christian Brabandt <cb@256bit.org>
parents:
13517
diff
changeset
|
3653 item = item->li_next; |
|
e9ffb5b35266
patch 8.0.1641: job in terminal can't communicate with Vim
Christian Brabandt <cb@256bit.org>
parents:
13517
diff
changeset
|
3654 if (item == NULL) |
|
e9ffb5b35266
patch 8.0.1641: job in terminal can't communicate with Vim
Christian Brabandt <cb@256bit.org>
parents:
13517
diff
changeset
|
3655 ch_log(channel, "Missing argument for %s", cmd); |
|
e9ffb5b35266
patch 8.0.1641: job in terminal can't communicate with Vim
Christian Brabandt <cb@256bit.org>
parents:
13517
diff
changeset
|
3656 else if (STRCMP(cmd, "drop") == 0) |
|
e9ffb5b35266
patch 8.0.1641: job in terminal can't communicate with Vim
Christian Brabandt <cb@256bit.org>
parents:
13517
diff
changeset
|
3657 handle_drop_command(item); |
|
e9ffb5b35266
patch 8.0.1641: job in terminal can't communicate with Vim
Christian Brabandt <cb@256bit.org>
parents:
13517
diff
changeset
|
3658 else if (STRCMP(cmd, "call") == 0) |
|
e9ffb5b35266
patch 8.0.1641: job in terminal can't communicate with Vim
Christian Brabandt <cb@256bit.org>
parents:
13517
diff
changeset
|
3659 handle_call_command(term, channel, item); |
|
e9ffb5b35266
patch 8.0.1641: job in terminal can't communicate with Vim
Christian Brabandt <cb@256bit.org>
parents:
13517
diff
changeset
|
3660 else |
|
e9ffb5b35266
patch 8.0.1641: job in terminal can't communicate with Vim
Christian Brabandt <cb@256bit.org>
parents:
13517
diff
changeset
|
3661 ch_log(channel, "Invalid command received: %s", cmd); |
|
13720
7d2039b2ecc8
patch 8.0.1732: crash when terminal API call deletes the buffer
Christian Brabandt <cb@256bit.org>
parents:
13700
diff
changeset
|
3662 --term->tl_buffer->b_locked; |
|
13535
e9ffb5b35266
patch 8.0.1641: job in terminal can't communicate with Vim
Christian Brabandt <cb@256bit.org>
parents:
13517
diff
changeset
|
3663 } |
|
e9ffb5b35266
patch 8.0.1641: job in terminal can't communicate with Vim
Christian Brabandt <cb@256bit.org>
parents:
13517
diff
changeset
|
3664 } |
|
e9ffb5b35266
patch 8.0.1641: job in terminal can't communicate with Vim
Christian Brabandt <cb@256bit.org>
parents:
13517
diff
changeset
|
3665 else |
|
e9ffb5b35266
patch 8.0.1641: job in terminal can't communicate with Vim
Christian Brabandt <cb@256bit.org>
parents:
13517
diff
changeset
|
3666 ch_log(channel, "Invalid JSON received"); |
|
e9ffb5b35266
patch 8.0.1641: job in terminal can't communicate with Vim
Christian Brabandt <cb@256bit.org>
parents:
13517
diff
changeset
|
3667 |
|
e9ffb5b35266
patch 8.0.1641: job in terminal can't communicate with Vim
Christian Brabandt <cb@256bit.org>
parents:
13517
diff
changeset
|
3668 vim_free(reader.js_buf); |
|
e9ffb5b35266
patch 8.0.1641: job in terminal can't communicate with Vim
Christian Brabandt <cb@256bit.org>
parents:
13517
diff
changeset
|
3669 clear_tv(&tv); |
|
e9ffb5b35266
patch 8.0.1641: job in terminal can't communicate with Vim
Christian Brabandt <cb@256bit.org>
parents:
13517
diff
changeset
|
3670 return 1; |
|
e9ffb5b35266
patch 8.0.1641: job in terminal can't communicate with Vim
Christian Brabandt <cb@256bit.org>
parents:
13517
diff
changeset
|
3671 } |
|
e9ffb5b35266
patch 8.0.1641: job in terminal can't communicate with Vim
Christian Brabandt <cb@256bit.org>
parents:
13517
diff
changeset
|
3672 |
|
e9ffb5b35266
patch 8.0.1641: job in terminal can't communicate with Vim
Christian Brabandt <cb@256bit.org>
parents:
13517
diff
changeset
|
3673 static VTermParserCallbacks parser_fallbacks = { |
|
e9ffb5b35266
patch 8.0.1641: job in terminal can't communicate with Vim
Christian Brabandt <cb@256bit.org>
parents:
13517
diff
changeset
|
3674 NULL, /* text */ |
|
e9ffb5b35266
patch 8.0.1641: job in terminal can't communicate with Vim
Christian Brabandt <cb@256bit.org>
parents:
13517
diff
changeset
|
3675 NULL, /* control */ |
|
e9ffb5b35266
patch 8.0.1641: job in terminal can't communicate with Vim
Christian Brabandt <cb@256bit.org>
parents:
13517
diff
changeset
|
3676 NULL, /* escape */ |
|
e9ffb5b35266
patch 8.0.1641: job in terminal can't communicate with Vim
Christian Brabandt <cb@256bit.org>
parents:
13517
diff
changeset
|
3677 NULL, /* csi */ |
|
e9ffb5b35266
patch 8.0.1641: job in terminal can't communicate with Vim
Christian Brabandt <cb@256bit.org>
parents:
13517
diff
changeset
|
3678 parse_osc, /* osc */ |
|
e9ffb5b35266
patch 8.0.1641: job in terminal can't communicate with Vim
Christian Brabandt <cb@256bit.org>
parents:
13517
diff
changeset
|
3679 NULL, /* dcs */ |
|
e9ffb5b35266
patch 8.0.1641: job in terminal can't communicate with Vim
Christian Brabandt <cb@256bit.org>
parents:
13517
diff
changeset
|
3680 NULL /* resize */ |
|
e9ffb5b35266
patch 8.0.1641: job in terminal can't communicate with Vim
Christian Brabandt <cb@256bit.org>
parents:
13517
diff
changeset
|
3681 }; |
|
e9ffb5b35266
patch 8.0.1641: job in terminal can't communicate with Vim
Christian Brabandt <cb@256bit.org>
parents:
13517
diff
changeset
|
3682 |
|
e9ffb5b35266
patch 8.0.1641: job in terminal can't communicate with Vim
Christian Brabandt <cb@256bit.org>
parents:
13517
diff
changeset
|
3683 /* |
|
13616
b6998c6374e1
patch 8.0.1680: memory allocated by libvterm is not profiled
Christian Brabandt <cb@256bit.org>
parents:
13583
diff
changeset
|
3684 * Use Vim's allocation functions for vterm so profiling works. |
|
b6998c6374e1
patch 8.0.1680: memory allocated by libvterm is not profiled
Christian Brabandt <cb@256bit.org>
parents:
13583
diff
changeset
|
3685 */ |
|
b6998c6374e1
patch 8.0.1680: memory allocated by libvterm is not profiled
Christian Brabandt <cb@256bit.org>
parents:
13583
diff
changeset
|
3686 static void * |
|
b6998c6374e1
patch 8.0.1680: memory allocated by libvterm is not profiled
Christian Brabandt <cb@256bit.org>
parents:
13583
diff
changeset
|
3687 vterm_malloc(size_t size, void *data UNUSED) |
|
b6998c6374e1
patch 8.0.1680: memory allocated by libvterm is not profiled
Christian Brabandt <cb@256bit.org>
parents:
13583
diff
changeset
|
3688 { |
|
13630
fd3389d64825
patch 8.0.1687: 64 bit compiler warnings
Christian Brabandt <cb@256bit.org>
parents:
13626
diff
changeset
|
3689 return alloc_clear((unsigned) size); |
|
13616
b6998c6374e1
patch 8.0.1680: memory allocated by libvterm is not profiled
Christian Brabandt <cb@256bit.org>
parents:
13583
diff
changeset
|
3690 } |
|
b6998c6374e1
patch 8.0.1680: memory allocated by libvterm is not profiled
Christian Brabandt <cb@256bit.org>
parents:
13583
diff
changeset
|
3691 |
|
b6998c6374e1
patch 8.0.1680: memory allocated by libvterm is not profiled
Christian Brabandt <cb@256bit.org>
parents:
13583
diff
changeset
|
3692 static void |
|
b6998c6374e1
patch 8.0.1680: memory allocated by libvterm is not profiled
Christian Brabandt <cb@256bit.org>
parents:
13583
diff
changeset
|
3693 vterm_memfree(void *ptr, void *data UNUSED) |
|
b6998c6374e1
patch 8.0.1680: memory allocated by libvterm is not profiled
Christian Brabandt <cb@256bit.org>
parents:
13583
diff
changeset
|
3694 { |
|
b6998c6374e1
patch 8.0.1680: memory allocated by libvterm is not profiled
Christian Brabandt <cb@256bit.org>
parents:
13583
diff
changeset
|
3695 vim_free(ptr); |
|
b6998c6374e1
patch 8.0.1680: memory allocated by libvterm is not profiled
Christian Brabandt <cb@256bit.org>
parents:
13583
diff
changeset
|
3696 } |
|
b6998c6374e1
patch 8.0.1680: memory allocated by libvterm is not profiled
Christian Brabandt <cb@256bit.org>
parents:
13583
diff
changeset
|
3697 |
|
b6998c6374e1
patch 8.0.1680: memory allocated by libvterm is not profiled
Christian Brabandt <cb@256bit.org>
parents:
13583
diff
changeset
|
3698 static VTermAllocatorFunctions vterm_allocator = { |
|
b6998c6374e1
patch 8.0.1680: memory allocated by libvterm is not profiled
Christian Brabandt <cb@256bit.org>
parents:
13583
diff
changeset
|
3699 &vterm_malloc, |
|
b6998c6374e1
patch 8.0.1680: memory allocated by libvterm is not profiled
Christian Brabandt <cb@256bit.org>
parents:
13583
diff
changeset
|
3700 &vterm_memfree |
|
b6998c6374e1
patch 8.0.1680: memory allocated by libvterm is not profiled
Christian Brabandt <cb@256bit.org>
parents:
13583
diff
changeset
|
3701 }; |
|
b6998c6374e1
patch 8.0.1680: memory allocated by libvterm is not profiled
Christian Brabandt <cb@256bit.org>
parents:
13583
diff
changeset
|
3702 |
|
b6998c6374e1
patch 8.0.1680: memory allocated by libvterm is not profiled
Christian Brabandt <cb@256bit.org>
parents:
13583
diff
changeset
|
3703 /* |
|
13483
f7ef5d579758
patch 8.0.1615: term_dumpload() does not use the right colors
Christian Brabandt <cb@256bit.org>
parents:
13476
diff
changeset
|
3704 * Create a new vterm and initialize it. |
|
f7ef5d579758
patch 8.0.1615: term_dumpload() does not use the right colors
Christian Brabandt <cb@256bit.org>
parents:
13476
diff
changeset
|
3705 */ |
|
f7ef5d579758
patch 8.0.1615: term_dumpload() does not use the right colors
Christian Brabandt <cb@256bit.org>
parents:
13476
diff
changeset
|
3706 static void |
|
f7ef5d579758
patch 8.0.1615: term_dumpload() does not use the right colors
Christian Brabandt <cb@256bit.org>
parents:
13476
diff
changeset
|
3707 create_vterm(term_T *term, int rows, int cols) |
|
f7ef5d579758
patch 8.0.1615: term_dumpload() does not use the right colors
Christian Brabandt <cb@256bit.org>
parents:
13476
diff
changeset
|
3708 { |
|
f7ef5d579758
patch 8.0.1615: term_dumpload() does not use the right colors
Christian Brabandt <cb@256bit.org>
parents:
13476
diff
changeset
|
3709 VTerm *vterm; |
|
f7ef5d579758
patch 8.0.1615: term_dumpload() does not use the right colors
Christian Brabandt <cb@256bit.org>
parents:
13476
diff
changeset
|
3710 VTermScreen *screen; |
|
13535
e9ffb5b35266
patch 8.0.1641: job in terminal can't communicate with Vim
Christian Brabandt <cb@256bit.org>
parents:
13517
diff
changeset
|
3711 VTermState *state; |
|
13483
f7ef5d579758
patch 8.0.1615: term_dumpload() does not use the right colors
Christian Brabandt <cb@256bit.org>
parents:
13476
diff
changeset
|
3712 VTermValue value; |
|
f7ef5d579758
patch 8.0.1615: term_dumpload() does not use the right colors
Christian Brabandt <cb@256bit.org>
parents:
13476
diff
changeset
|
3713 |
|
13616
b6998c6374e1
patch 8.0.1680: memory allocated by libvterm is not profiled
Christian Brabandt <cb@256bit.org>
parents:
13583
diff
changeset
|
3714 vterm = vterm_new_with_allocator(rows, cols, &vterm_allocator, NULL); |
|
13483
f7ef5d579758
patch 8.0.1615: term_dumpload() does not use the right colors
Christian Brabandt <cb@256bit.org>
parents:
13476
diff
changeset
|
3715 term->tl_vterm = vterm; |
|
f7ef5d579758
patch 8.0.1615: term_dumpload() does not use the right colors
Christian Brabandt <cb@256bit.org>
parents:
13476
diff
changeset
|
3716 screen = vterm_obtain_screen(vterm); |
|
f7ef5d579758
patch 8.0.1615: term_dumpload() does not use the right colors
Christian Brabandt <cb@256bit.org>
parents:
13476
diff
changeset
|
3717 vterm_screen_set_callbacks(screen, &screen_callbacks, term); |
|
f7ef5d579758
patch 8.0.1615: term_dumpload() does not use the right colors
Christian Brabandt <cb@256bit.org>
parents:
13476
diff
changeset
|
3718 /* TODO: depends on 'encoding'. */ |
|
f7ef5d579758
patch 8.0.1615: term_dumpload() does not use the right colors
Christian Brabandt <cb@256bit.org>
parents:
13476
diff
changeset
|
3719 vterm_set_utf8(vterm, 1); |
|
f7ef5d579758
patch 8.0.1615: term_dumpload() does not use the right colors
Christian Brabandt <cb@256bit.org>
parents:
13476
diff
changeset
|
3720 |
|
f7ef5d579758
patch 8.0.1615: term_dumpload() does not use the right colors
Christian Brabandt <cb@256bit.org>
parents:
13476
diff
changeset
|
3721 init_default_colors(term); |
|
f7ef5d579758
patch 8.0.1615: term_dumpload() does not use the right colors
Christian Brabandt <cb@256bit.org>
parents:
13476
diff
changeset
|
3722 |
|
f7ef5d579758
patch 8.0.1615: term_dumpload() does not use the right colors
Christian Brabandt <cb@256bit.org>
parents:
13476
diff
changeset
|
3723 vterm_state_set_default_colors( |
|
f7ef5d579758
patch 8.0.1615: term_dumpload() does not use the right colors
Christian Brabandt <cb@256bit.org>
parents:
13476
diff
changeset
|
3724 vterm_obtain_state(vterm), |
|
f7ef5d579758
patch 8.0.1615: term_dumpload() does not use the right colors
Christian Brabandt <cb@256bit.org>
parents:
13476
diff
changeset
|
3725 &term->tl_default_color.fg, |
|
f7ef5d579758
patch 8.0.1615: term_dumpload() does not use the right colors
Christian Brabandt <cb@256bit.org>
parents:
13476
diff
changeset
|
3726 &term->tl_default_color.bg); |
| 12502 | 3727 |
|
13626
ab89131d30e0
patch 8.0.1685: can't set ANSI colors of a terminal window
Christian Brabandt <cb@256bit.org>
parents:
13624
diff
changeset
|
3728 if (t_colors >= 16) |
|
ab89131d30e0
patch 8.0.1685: can't set ANSI colors of a terminal window
Christian Brabandt <cb@256bit.org>
parents:
13624
diff
changeset
|
3729 vterm_state_set_bold_highbright(vterm_obtain_state(vterm), 1); |
|
ab89131d30e0
patch 8.0.1685: can't set ANSI colors of a terminal window
Christian Brabandt <cb@256bit.org>
parents:
13624
diff
changeset
|
3730 |
| 12502 | 3731 /* Required to initialize most things. */ |
| 3732 vterm_screen_reset(screen, 1 /* hard */); | |
| 3733 | |
| 3734 /* Allow using alternate screen. */ | |
| 3735 vterm_screen_enable_altscreen(screen, 1); | |
| 3736 | |
| 3737 /* For unix do not use a blinking cursor. In an xterm this causes the | |
| 3738 * cursor to blink if it's blinking in the xterm. | |
| 3739 * For Windows we respect the system wide setting. */ | |
| 3740 #ifdef WIN3264 | |
| 3741 if (GetCaretBlinkTime() == INFINITE) | |
| 3742 value.boolean = 0; | |
| 3743 else | |
| 3744 value.boolean = 1; | |
| 3745 #else | |
| 3746 value.boolean = 0; | |
| 3747 #endif | |
|
13535
e9ffb5b35266
patch 8.0.1641: job in terminal can't communicate with Vim
Christian Brabandt <cb@256bit.org>
parents:
13517
diff
changeset
|
3748 state = vterm_obtain_state(vterm); |
|
e9ffb5b35266
patch 8.0.1641: job in terminal can't communicate with Vim
Christian Brabandt <cb@256bit.org>
parents:
13517
diff
changeset
|
3749 vterm_state_set_termprop(state, VTERM_PROP_CURSORBLINK, &value); |
|
e9ffb5b35266
patch 8.0.1641: job in terminal can't communicate with Vim
Christian Brabandt <cb@256bit.org>
parents:
13517
diff
changeset
|
3750 vterm_state_set_unrecognised_fallbacks(state, &parser_fallbacks, term); |
| 12502 | 3751 } |
| 3752 | |
| 3753 /* | |
| 3754 * Return the text to show for the buffer name and status. | |
| 3755 */ | |
| 3756 char_u * | |
| 3757 term_get_status_text(term_T *term) | |
| 3758 { | |
| 3759 if (term->tl_status_text == NULL) | |
| 3760 { | |
| 3761 char_u *txt; | |
| 3762 size_t len; | |
| 3763 | |
| 3764 if (term->tl_normal_mode) | |
| 3765 { | |
| 3766 if (term_job_running(term)) | |
| 3767 txt = (char_u *)_("Terminal"); | |
| 3768 else | |
| 3769 txt = (char_u *)_("Terminal-finished"); | |
| 3770 } | |
| 3771 else if (term->tl_title != NULL) | |
| 3772 txt = term->tl_title; | |
| 3773 else if (term_none_open(term)) | |
| 3774 txt = (char_u *)_("active"); | |
| 3775 else if (term_job_running(term)) | |
| 3776 txt = (char_u *)_("running"); | |
| 3777 else | |
| 3778 txt = (char_u *)_("finished"); | |
| 3779 len = 9 + STRLEN(term->tl_buffer->b_fname) + STRLEN(txt); | |
| 3780 term->tl_status_text = alloc((int)len); | |
| 3781 if (term->tl_status_text != NULL) | |
| 3782 vim_snprintf((char *)term->tl_status_text, len, "%s [%s]", | |
| 3783 term->tl_buffer->b_fname, txt); | |
| 3784 } | |
| 3785 return term->tl_status_text; | |
| 3786 } | |
| 3787 | |
| 3788 /* | |
| 3789 * Mark references in jobs of terminals. | |
| 3790 */ | |
| 3791 int | |
| 3792 set_ref_in_term(int copyID) | |
| 3793 { | |
| 3794 int abort = FALSE; | |
| 3795 term_T *term; | |
| 3796 typval_T tv; | |
| 3797 | |
| 3798 for (term = first_term; term != NULL; term = term->tl_next) | |
| 3799 if (term->tl_job != NULL) | |
| 3800 { | |
| 3801 tv.v_type = VAR_JOB; | |
| 3802 tv.vval.v_job = term->tl_job; | |
| 3803 abort = abort || set_ref_in_item(&tv, copyID, NULL, NULL); | |
| 3804 } | |
| 3805 return abort; | |
| 3806 } | |
| 3807 | |
| 3808 /* | |
|
12973
418941f0df08
patch 8.0.1362: terminal window colors wrong when using Terminal highlighting
Christian Brabandt <cb@256bit.org>
parents:
12969
diff
changeset
|
3809 * Cache "Terminal" highlight group colors. |
|
418941f0df08
patch 8.0.1362: terminal window colors wrong when using Terminal highlighting
Christian Brabandt <cb@256bit.org>
parents:
12969
diff
changeset
|
3810 */ |
|
418941f0df08
patch 8.0.1362: terminal window colors wrong when using Terminal highlighting
Christian Brabandt <cb@256bit.org>
parents:
12969
diff
changeset
|
3811 void |
|
418941f0df08
patch 8.0.1362: terminal window colors wrong when using Terminal highlighting
Christian Brabandt <cb@256bit.org>
parents:
12969
diff
changeset
|
3812 set_terminal_default_colors(int cterm_fg, int cterm_bg) |
|
418941f0df08
patch 8.0.1362: terminal window colors wrong when using Terminal highlighting
Christian Brabandt <cb@256bit.org>
parents:
12969
diff
changeset
|
3813 { |
|
418941f0df08
patch 8.0.1362: terminal window colors wrong when using Terminal highlighting
Christian Brabandt <cb@256bit.org>
parents:
12969
diff
changeset
|
3814 term_default_cterm_fg = cterm_fg - 1; |
|
418941f0df08
patch 8.0.1362: terminal window colors wrong when using Terminal highlighting
Christian Brabandt <cb@256bit.org>
parents:
12969
diff
changeset
|
3815 term_default_cterm_bg = cterm_bg - 1; |
|
418941f0df08
patch 8.0.1362: terminal window colors wrong when using Terminal highlighting
Christian Brabandt <cb@256bit.org>
parents:
12969
diff
changeset
|
3816 } |
|
418941f0df08
patch 8.0.1362: terminal window colors wrong when using Terminal highlighting
Christian Brabandt <cb@256bit.org>
parents:
12969
diff
changeset
|
3817 |
|
418941f0df08
patch 8.0.1362: terminal window colors wrong when using Terminal highlighting
Christian Brabandt <cb@256bit.org>
parents:
12969
diff
changeset
|
3818 /* |
| 12502 | 3819 * Get the buffer from the first argument in "argvars". |
|
13438
33eea5ce5415
patch 8.0.1593: :qall never exits with an active terminal window
Christian Brabandt <cb@256bit.org>
parents:
13435
diff
changeset
|
3820 * Returns NULL when the buffer is not for a terminal window and logs a message |
|
33eea5ce5415
patch 8.0.1593: :qall never exits with an active terminal window
Christian Brabandt <cb@256bit.org>
parents:
13435
diff
changeset
|
3821 * with "where". |
| 12502 | 3822 */ |
| 3823 static buf_T * | |
|
13438
33eea5ce5415
patch 8.0.1593: :qall never exits with an active terminal window
Christian Brabandt <cb@256bit.org>
parents:
13435
diff
changeset
|
3824 term_get_buf(typval_T *argvars, char *where) |
| 12502 | 3825 { |
| 3826 buf_T *buf; | |
| 3827 | |
| 3828 (void)get_tv_number(&argvars[0]); /* issue errmsg if type error */ | |
| 3829 ++emsg_off; | |
| 3830 buf = get_buf_tv(&argvars[0], FALSE); | |
| 3831 --emsg_off; | |
| 3832 if (buf == NULL || buf->b_term == NULL) | |
|
13438
33eea5ce5415
patch 8.0.1593: :qall never exits with an active terminal window
Christian Brabandt <cb@256bit.org>
parents:
13435
diff
changeset
|
3833 { |
|
33eea5ce5415
patch 8.0.1593: :qall never exits with an active terminal window
Christian Brabandt <cb@256bit.org>
parents:
13435
diff
changeset
|
3834 ch_log(NULL, "%s: invalid buffer argument", where); |
| 12502 | 3835 return NULL; |
|
13438
33eea5ce5415
patch 8.0.1593: :qall never exits with an active terminal window
Christian Brabandt <cb@256bit.org>
parents:
13435
diff
changeset
|
3836 } |
| 12502 | 3837 return buf; |
| 3838 } | |
| 3839 | |
|
13298
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
3840 static int |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
3841 same_color(VTermColor *a, VTermColor *b) |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
3842 { |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
3843 return a->red == b->red |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
3844 && a->green == b->green |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
3845 && a->blue == b->blue |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
3846 && a->ansi_index == b->ansi_index; |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
3847 } |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
3848 |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
3849 static void |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
3850 dump_term_color(FILE *fd, VTermColor *color) |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
3851 { |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
3852 fprintf(fd, "%02x%02x%02x%d", |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
3853 (int)color->red, (int)color->green, (int)color->blue, |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
3854 (int)color->ansi_index); |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
3855 } |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
3856 |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
3857 /* |
|
13329
424321d6eea7
patch 8.0.1539: no test for the popup menu positioning
Christian Brabandt <cb@256bit.org>
parents:
13304
diff
changeset
|
3858 * "term_dumpwrite(buf, filename, options)" function |
|
13298
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
3859 * |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
3860 * Each screen cell in full is: |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
3861 * |{characters}+{attributes}#{fg-color}{color-idx}#{bg-color}{color-idx} |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
3862 * {characters} is a space for an empty cell |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
3863 * For a double-width character "+" is changed to "*" and the next cell is |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
3864 * skipped. |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
3865 * {attributes} is the decimal value of HL_BOLD + HL_UNDERLINE, etc. |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
3866 * when "&" use the same as the previous cell. |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
3867 * {fg-color} is hex RGB, when "&" use the same as the previous cell. |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
3868 * {bg-color} is hex RGB, when "&" use the same as the previous cell. |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
3869 * {color-idx} is a number from 0 to 255 |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
3870 * |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
3871 * Screen cell with same width, attributes and color as the previous one: |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
3872 * |{characters} |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
3873 * |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
3874 * To use the color of the previous cell, use "&" instead of {color}-{idx}. |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
3875 * |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
3876 * Repeating the previous screen cell: |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
3877 * @{count} |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
3878 */ |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
3879 void |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
3880 f_term_dumpwrite(typval_T *argvars, typval_T *rettv UNUSED) |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
3881 { |
|
13438
33eea5ce5415
patch 8.0.1593: :qall never exits with an active terminal window
Christian Brabandt <cb@256bit.org>
parents:
13435
diff
changeset
|
3882 buf_T *buf = term_get_buf(argvars, "term_dumpwrite()"); |
|
13298
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
3883 term_T *term; |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
3884 char_u *fname; |
|
13329
424321d6eea7
patch 8.0.1539: no test for the popup menu positioning
Christian Brabandt <cb@256bit.org>
parents:
13304
diff
changeset
|
3885 int max_height = 0; |
|
424321d6eea7
patch 8.0.1539: no test for the popup menu positioning
Christian Brabandt <cb@256bit.org>
parents:
13304
diff
changeset
|
3886 int max_width = 0; |
|
13298
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
3887 stat_T st; |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
3888 FILE *fd; |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
3889 VTermPos pos; |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
3890 VTermScreen *screen; |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
3891 VTermScreenCell prev_cell; |
|
13335
73325d39591a
patch 8.0.1542: terminal screen dump does not include cursor position
Christian Brabandt <cb@256bit.org>
parents:
13329
diff
changeset
|
3892 VTermState *state; |
|
73325d39591a
patch 8.0.1542: terminal screen dump does not include cursor position
Christian Brabandt <cb@256bit.org>
parents:
13329
diff
changeset
|
3893 VTermPos cursor_pos; |
|
13298
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
3894 |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
3895 if (check_restricted() || check_secure()) |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
3896 return; |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
3897 if (buf == NULL) |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
3898 return; |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
3899 term = buf->b_term; |
|
14691
e2497d9c51c4
patch 8.1.0358: crash when using term_dumpwrite() after the job finished
Christian Brabandt <cb@256bit.org>
parents:
14625
diff
changeset
|
3900 if (term->tl_vterm == NULL) |
|
e2497d9c51c4
patch 8.1.0358: crash when using term_dumpwrite() after the job finished
Christian Brabandt <cb@256bit.org>
parents:
14625
diff
changeset
|
3901 { |
|
e2497d9c51c4
patch 8.1.0358: crash when using term_dumpwrite() after the job finished
Christian Brabandt <cb@256bit.org>
parents:
14625
diff
changeset
|
3902 EMSG(_("E958: Job already finished")); |
|
e2497d9c51c4
patch 8.1.0358: crash when using term_dumpwrite() after the job finished
Christian Brabandt <cb@256bit.org>
parents:
14625
diff
changeset
|
3903 return; |
|
e2497d9c51c4
patch 8.1.0358: crash when using term_dumpwrite() after the job finished
Christian Brabandt <cb@256bit.org>
parents:
14625
diff
changeset
|
3904 } |
|
13298
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
3905 |
|
13329
424321d6eea7
patch 8.0.1539: no test for the popup menu positioning
Christian Brabandt <cb@256bit.org>
parents:
13304
diff
changeset
|
3906 if (argvars[2].v_type != VAR_UNKNOWN) |
|
424321d6eea7
patch 8.0.1539: no test for the popup menu positioning
Christian Brabandt <cb@256bit.org>
parents:
13304
diff
changeset
|
3907 { |
|
424321d6eea7
patch 8.0.1539: no test for the popup menu positioning
Christian Brabandt <cb@256bit.org>
parents:
13304
diff
changeset
|
3908 dict_T *d; |
|
424321d6eea7
patch 8.0.1539: no test for the popup menu positioning
Christian Brabandt <cb@256bit.org>
parents:
13304
diff
changeset
|
3909 |
|
424321d6eea7
patch 8.0.1539: no test for the popup menu positioning
Christian Brabandt <cb@256bit.org>
parents:
13304
diff
changeset
|
3910 if (argvars[2].v_type != VAR_DICT) |
|
424321d6eea7
patch 8.0.1539: no test for the popup menu positioning
Christian Brabandt <cb@256bit.org>
parents:
13304
diff
changeset
|
3911 { |
|
424321d6eea7
patch 8.0.1539: no test for the popup menu positioning
Christian Brabandt <cb@256bit.org>
parents:
13304
diff
changeset
|
3912 EMSG(_(e_dictreq)); |
|
424321d6eea7
patch 8.0.1539: no test for the popup menu positioning
Christian Brabandt <cb@256bit.org>
parents:
13304
diff
changeset
|
3913 return; |
|
424321d6eea7
patch 8.0.1539: no test for the popup menu positioning
Christian Brabandt <cb@256bit.org>
parents:
13304
diff
changeset
|
3914 } |
|
424321d6eea7
patch 8.0.1539: no test for the popup menu positioning
Christian Brabandt <cb@256bit.org>
parents:
13304
diff
changeset
|
3915 d = argvars[2].vval.v_dict; |
|
424321d6eea7
patch 8.0.1539: no test for the popup menu positioning
Christian Brabandt <cb@256bit.org>
parents:
13304
diff
changeset
|
3916 if (d != NULL) |
|
424321d6eea7
patch 8.0.1539: no test for the popup menu positioning
Christian Brabandt <cb@256bit.org>
parents:
13304
diff
changeset
|
3917 { |
|
424321d6eea7
patch 8.0.1539: no test for the popup menu positioning
Christian Brabandt <cb@256bit.org>
parents:
13304
diff
changeset
|
3918 max_height = get_dict_number(d, (char_u *)"rows"); |
|
424321d6eea7
patch 8.0.1539: no test for the popup menu positioning
Christian Brabandt <cb@256bit.org>
parents:
13304
diff
changeset
|
3919 max_width = get_dict_number(d, (char_u *)"columns"); |
|
424321d6eea7
patch 8.0.1539: no test for the popup menu positioning
Christian Brabandt <cb@256bit.org>
parents:
13304
diff
changeset
|
3920 } |
|
424321d6eea7
patch 8.0.1539: no test for the popup menu positioning
Christian Brabandt <cb@256bit.org>
parents:
13304
diff
changeset
|
3921 } |
|
424321d6eea7
patch 8.0.1539: no test for the popup menu positioning
Christian Brabandt <cb@256bit.org>
parents:
13304
diff
changeset
|
3922 |
|
13298
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
3923 fname = get_tv_string_chk(&argvars[1]); |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
3924 if (fname == NULL) |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
3925 return; |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
3926 if (mch_stat((char *)fname, &st) >= 0) |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
3927 { |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
3928 EMSG2(_("E953: File exists: %s"), fname); |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
3929 return; |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
3930 } |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
3931 |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
3932 if (*fname == NUL || (fd = mch_fopen((char *)fname, WRITEBIN)) == NULL) |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
3933 { |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
3934 EMSG2(_(e_notcreate), *fname == NUL ? (char_u *)_("<empty>") : fname); |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
3935 return; |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
3936 } |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
3937 |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
3938 vim_memset(&prev_cell, 0, sizeof(prev_cell)); |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
3939 |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
3940 screen = vterm_obtain_screen(term->tl_vterm); |
|
13335
73325d39591a
patch 8.0.1542: terminal screen dump does not include cursor position
Christian Brabandt <cb@256bit.org>
parents:
13329
diff
changeset
|
3941 state = vterm_obtain_state(term->tl_vterm); |
|
73325d39591a
patch 8.0.1542: terminal screen dump does not include cursor position
Christian Brabandt <cb@256bit.org>
parents:
13329
diff
changeset
|
3942 vterm_state_get_cursorpos(state, &cursor_pos); |
|
73325d39591a
patch 8.0.1542: terminal screen dump does not include cursor position
Christian Brabandt <cb@256bit.org>
parents:
13329
diff
changeset
|
3943 |
|
13329
424321d6eea7
patch 8.0.1539: no test for the popup menu positioning
Christian Brabandt <cb@256bit.org>
parents:
13304
diff
changeset
|
3944 for (pos.row = 0; (max_height == 0 || pos.row < max_height) |
|
424321d6eea7
patch 8.0.1539: no test for the popup menu positioning
Christian Brabandt <cb@256bit.org>
parents:
13304
diff
changeset
|
3945 && pos.row < term->tl_rows; ++pos.row) |
|
13298
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
3946 { |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
3947 int repeat = 0; |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
3948 |
|
13329
424321d6eea7
patch 8.0.1539: no test for the popup menu positioning
Christian Brabandt <cb@256bit.org>
parents:
13304
diff
changeset
|
3949 for (pos.col = 0; (max_width == 0 || pos.col < max_width) |
|
424321d6eea7
patch 8.0.1539: no test for the popup menu positioning
Christian Brabandt <cb@256bit.org>
parents:
13304
diff
changeset
|
3950 && pos.col < term->tl_cols; ++pos.col) |
|
13298
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
3951 { |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
3952 VTermScreenCell cell; |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
3953 int same_attr; |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
3954 int same_chars = TRUE; |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
3955 int i; |
|
13335
73325d39591a
patch 8.0.1542: terminal screen dump does not include cursor position
Christian Brabandt <cb@256bit.org>
parents:
13329
diff
changeset
|
3956 int is_cursor_pos = (pos.col == cursor_pos.col |
|
73325d39591a
patch 8.0.1542: terminal screen dump does not include cursor position
Christian Brabandt <cb@256bit.org>
parents:
13329
diff
changeset
|
3957 && pos.row == cursor_pos.row); |
|
13298
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
3958 |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
3959 if (vterm_screen_get_cell(screen, pos, &cell) == 0) |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
3960 vim_memset(&cell, 0, sizeof(cell)); |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
3961 |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
3962 for (i = 0; i < VTERM_MAX_CHARS_PER_CELL; ++i) |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
3963 { |
|
13517
d0d66898e98b
patch 8.0.1632: in a terminal dump NUL and space are different
Christian Brabandt <cb@256bit.org>
parents:
13505
diff
changeset
|
3964 int c = cell.chars[i]; |
|
d0d66898e98b
patch 8.0.1632: in a terminal dump NUL and space are different
Christian Brabandt <cb@256bit.org>
parents:
13505
diff
changeset
|
3965 int pc = prev_cell.chars[i]; |
|
d0d66898e98b
patch 8.0.1632: in a terminal dump NUL and space are different
Christian Brabandt <cb@256bit.org>
parents:
13505
diff
changeset
|
3966 |
|
d0d66898e98b
patch 8.0.1632: in a terminal dump NUL and space are different
Christian Brabandt <cb@256bit.org>
parents:
13505
diff
changeset
|
3967 /* For the first character NUL is the same as space. */ |
|
d0d66898e98b
patch 8.0.1632: in a terminal dump NUL and space are different
Christian Brabandt <cb@256bit.org>
parents:
13505
diff
changeset
|
3968 if (i == 0) |
|
d0d66898e98b
patch 8.0.1632: in a terminal dump NUL and space are different
Christian Brabandt <cb@256bit.org>
parents:
13505
diff
changeset
|
3969 { |
|
d0d66898e98b
patch 8.0.1632: in a terminal dump NUL and space are different
Christian Brabandt <cb@256bit.org>
parents:
13505
diff
changeset
|
3970 c = (c == NUL) ? ' ' : c; |
|
d0d66898e98b
patch 8.0.1632: in a terminal dump NUL and space are different
Christian Brabandt <cb@256bit.org>
parents:
13505
diff
changeset
|
3971 pc = (pc == NUL) ? ' ' : pc; |
|
d0d66898e98b
patch 8.0.1632: in a terminal dump NUL and space are different
Christian Brabandt <cb@256bit.org>
parents:
13505
diff
changeset
|
3972 } |
|
14625
cd3f0987c0bc
patch 8.1.0326: screen dump does not consider NUL and space equal
Christian Brabandt <cb@256bit.org>
parents:
14459
diff
changeset
|
3973 if (c != pc) |
|
13298
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
3974 same_chars = FALSE; |
|
14625
cd3f0987c0bc
patch 8.1.0326: screen dump does not consider NUL and space equal
Christian Brabandt <cb@256bit.org>
parents:
14459
diff
changeset
|
3975 if (c == NUL || pc == NUL) |
|
13298
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
3976 break; |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
3977 } |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
3978 same_attr = vtermAttr2hl(cell.attrs) |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
3979 == vtermAttr2hl(prev_cell.attrs) |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
3980 && same_color(&cell.fg, &prev_cell.fg) |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
3981 && same_color(&cell.bg, &prev_cell.bg); |
|
13335
73325d39591a
patch 8.0.1542: terminal screen dump does not include cursor position
Christian Brabandt <cb@256bit.org>
parents:
13329
diff
changeset
|
3982 if (same_chars && cell.width == prev_cell.width && same_attr |
|
73325d39591a
patch 8.0.1542: terminal screen dump does not include cursor position
Christian Brabandt <cb@256bit.org>
parents:
13329
diff
changeset
|
3983 && !is_cursor_pos) |
|
13298
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
3984 { |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
3985 ++repeat; |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
3986 } |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
3987 else |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
3988 { |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
3989 if (repeat > 0) |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
3990 { |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
3991 fprintf(fd, "@%d", repeat); |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
3992 repeat = 0; |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
3993 } |
|
13335
73325d39591a
patch 8.0.1542: terminal screen dump does not include cursor position
Christian Brabandt <cb@256bit.org>
parents:
13329
diff
changeset
|
3994 fputs(is_cursor_pos ? ">" : "|", fd); |
|
13298
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
3995 |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
3996 if (cell.chars[0] == NUL) |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
3997 fputs(" ", fd); |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
3998 else |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
3999 { |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4000 char_u charbuf[10]; |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4001 int len; |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4002 |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4003 for (i = 0; i < VTERM_MAX_CHARS_PER_CELL |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4004 && cell.chars[i] != NUL; ++i) |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4005 { |
|
13557
4911058c43eb
patch 8.0.1652: term_dumpwrite() does not output composing characters
Christian Brabandt <cb@256bit.org>
parents:
13547
diff
changeset
|
4006 len = utf_char2bytes(cell.chars[i], charbuf); |
|
13298
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4007 fwrite(charbuf, len, 1, fd); |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4008 } |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4009 } |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4010 |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4011 /* When only the characters differ we don't write anything, the |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4012 * following "|", "@" or NL will indicate using the same |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4013 * attributes. */ |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4014 if (cell.width != prev_cell.width || !same_attr) |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4015 { |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4016 if (cell.width == 2) |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4017 { |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4018 fputs("*", fd); |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4019 ++pos.col; |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4020 } |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4021 else |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4022 fputs("+", fd); |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4023 |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4024 if (same_attr) |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4025 { |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4026 fputs("&", fd); |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4027 } |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4028 else |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4029 { |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4030 fprintf(fd, "%d", vtermAttr2hl(cell.attrs)); |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4031 if (same_color(&cell.fg, &prev_cell.fg)) |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4032 fputs("&", fd); |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4033 else |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4034 { |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4035 fputs("#", fd); |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4036 dump_term_color(fd, &cell.fg); |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4037 } |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4038 if (same_color(&cell.bg, &prev_cell.bg)) |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4039 fputs("&", fd); |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4040 else |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4041 { |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4042 fputs("#", fd); |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4043 dump_term_color(fd, &cell.bg); |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4044 } |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4045 } |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4046 } |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4047 |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4048 prev_cell = cell; |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4049 } |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4050 } |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4051 if (repeat > 0) |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4052 fprintf(fd, "@%d", repeat); |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4053 fputs("\n", fd); |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4054 } |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4055 |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4056 fclose(fd); |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4057 } |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4058 |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4059 /* |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4060 * Called when a dump is corrupted. Put a breakpoint here when debugging. |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4061 */ |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4062 static void |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4063 dump_is_corrupt(garray_T *gap) |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4064 { |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4065 ga_concat(gap, (char_u *)"CORRUPT"); |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4066 } |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4067 |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4068 static void |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4069 append_cell(garray_T *gap, cellattr_T *cell) |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4070 { |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4071 if (ga_grow(gap, 1) == OK) |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4072 { |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4073 *(((cellattr_T *)gap->ga_data) + gap->ga_len) = *cell; |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4074 ++gap->ga_len; |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4075 } |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4076 } |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4077 |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4078 /* |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4079 * Read the dump file from "fd" and append lines to the current buffer. |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4080 * Return the cell width of the longest line. |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4081 */ |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4082 static int |
|
13335
73325d39591a
patch 8.0.1542: terminal screen dump does not include cursor position
Christian Brabandt <cb@256bit.org>
parents:
13329
diff
changeset
|
4083 read_dump_file(FILE *fd, VTermPos *cursor_pos) |
|
13298
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4084 { |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4085 int c; |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4086 garray_T ga_text; |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4087 garray_T ga_cell; |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4088 char_u *prev_char = NULL; |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4089 int attr = 0; |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4090 cellattr_T cell; |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4091 term_T *term = curbuf->b_term; |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4092 int max_cells = 0; |
|
13335
73325d39591a
patch 8.0.1542: terminal screen dump does not include cursor position
Christian Brabandt <cb@256bit.org>
parents:
13329
diff
changeset
|
4093 int start_row = term->tl_scrollback.ga_len; |
|
13298
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4094 |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4095 ga_init2(&ga_text, 1, 90); |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4096 ga_init2(&ga_cell, sizeof(cellattr_T), 90); |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4097 vim_memset(&cell, 0, sizeof(cell)); |
|
13335
73325d39591a
patch 8.0.1542: terminal screen dump does not include cursor position
Christian Brabandt <cb@256bit.org>
parents:
13329
diff
changeset
|
4098 cursor_pos->row = -1; |
|
73325d39591a
patch 8.0.1542: terminal screen dump does not include cursor position
Christian Brabandt <cb@256bit.org>
parents:
13329
diff
changeset
|
4099 cursor_pos->col = -1; |
|
13298
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4100 |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4101 c = fgetc(fd); |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4102 for (;;) |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4103 { |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4104 if (c == EOF) |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4105 break; |
|
14960
47931abb9f31
patch 8.1.0491: if a terminal dump has CR it is considered corrupt
Bram Moolenaar <Bram@vim.org>
parents:
14939
diff
changeset
|
4106 if (c == '\r') |
|
47931abb9f31
patch 8.1.0491: if a terminal dump has CR it is considered corrupt
Bram Moolenaar <Bram@vim.org>
parents:
14939
diff
changeset
|
4107 { |
|
47931abb9f31
patch 8.1.0491: if a terminal dump has CR it is considered corrupt
Bram Moolenaar <Bram@vim.org>
parents:
14939
diff
changeset
|
4108 // DOS line endings? Ignore. |
|
47931abb9f31
patch 8.1.0491: if a terminal dump has CR it is considered corrupt
Bram Moolenaar <Bram@vim.org>
parents:
14939
diff
changeset
|
4109 c = fgetc(fd); |
|
47931abb9f31
patch 8.1.0491: if a terminal dump has CR it is considered corrupt
Bram Moolenaar <Bram@vim.org>
parents:
14939
diff
changeset
|
4110 } |
|
47931abb9f31
patch 8.1.0491: if a terminal dump has CR it is considered corrupt
Bram Moolenaar <Bram@vim.org>
parents:
14939
diff
changeset
|
4111 else if (c == '\n') |
|
13298
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4112 { |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4113 /* End of a line: append it to the buffer. */ |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4114 if (ga_text.ga_data == NULL) |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4115 dump_is_corrupt(&ga_text); |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4116 if (ga_grow(&term->tl_scrollback, 1) == OK) |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4117 { |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4118 sb_line_T *line = (sb_line_T *)term->tl_scrollback.ga_data |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4119 + term->tl_scrollback.ga_len; |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4120 |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4121 if (max_cells < ga_cell.ga_len) |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4122 max_cells = ga_cell.ga_len; |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4123 line->sb_cols = ga_cell.ga_len; |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4124 line->sb_cells = ga_cell.ga_data; |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4125 line->sb_fill_attr = term->tl_default_color; |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4126 ++term->tl_scrollback.ga_len; |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4127 ga_init(&ga_cell); |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4128 |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4129 ga_append(&ga_text, NUL); |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4130 ml_append(curbuf->b_ml.ml_line_count, ga_text.ga_data, |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4131 ga_text.ga_len, FALSE); |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4132 } |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4133 else |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4134 ga_clear(&ga_cell); |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4135 ga_text.ga_len = 0; |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4136 |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4137 c = fgetc(fd); |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4138 } |
|
13335
73325d39591a
patch 8.0.1542: terminal screen dump does not include cursor position
Christian Brabandt <cb@256bit.org>
parents:
13329
diff
changeset
|
4139 else if (c == '|' || c == '>') |
|
13298
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4140 { |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4141 int prev_len = ga_text.ga_len; |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4142 |
|
13335
73325d39591a
patch 8.0.1542: terminal screen dump does not include cursor position
Christian Brabandt <cb@256bit.org>
parents:
13329
diff
changeset
|
4143 if (c == '>') |
|
73325d39591a
patch 8.0.1542: terminal screen dump does not include cursor position
Christian Brabandt <cb@256bit.org>
parents:
13329
diff
changeset
|
4144 { |
|
73325d39591a
patch 8.0.1542: terminal screen dump does not include cursor position
Christian Brabandt <cb@256bit.org>
parents:
13329
diff
changeset
|
4145 if (cursor_pos->row != -1) |
|
73325d39591a
patch 8.0.1542: terminal screen dump does not include cursor position
Christian Brabandt <cb@256bit.org>
parents:
13329
diff
changeset
|
4146 dump_is_corrupt(&ga_text); /* duplicate cursor */ |
|
73325d39591a
patch 8.0.1542: terminal screen dump does not include cursor position
Christian Brabandt <cb@256bit.org>
parents:
13329
diff
changeset
|
4147 cursor_pos->row = term->tl_scrollback.ga_len - start_row; |
|
73325d39591a
patch 8.0.1542: terminal screen dump does not include cursor position
Christian Brabandt <cb@256bit.org>
parents:
13329
diff
changeset
|
4148 cursor_pos->col = ga_cell.ga_len; |
|
73325d39591a
patch 8.0.1542: terminal screen dump does not include cursor position
Christian Brabandt <cb@256bit.org>
parents:
13329
diff
changeset
|
4149 } |
|
73325d39591a
patch 8.0.1542: terminal screen dump does not include cursor position
Christian Brabandt <cb@256bit.org>
parents:
13329
diff
changeset
|
4150 |
|
13298
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4151 /* normal character(s) followed by "+", "*", "|", "@" or NL */ |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4152 c = fgetc(fd); |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4153 if (c != EOF) |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4154 ga_append(&ga_text, c); |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4155 for (;;) |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4156 { |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4157 c = fgetc(fd); |
|
13335
73325d39591a
patch 8.0.1542: terminal screen dump does not include cursor position
Christian Brabandt <cb@256bit.org>
parents:
13329
diff
changeset
|
4158 if (c == '+' || c == '*' || c == '|' || c == '>' || c == '@' |
|
13298
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4159 || c == EOF || c == '\n') |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4160 break; |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4161 ga_append(&ga_text, c); |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4162 } |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4163 |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4164 /* save the character for repeating it */ |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4165 vim_free(prev_char); |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4166 if (ga_text.ga_data != NULL) |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4167 prev_char = vim_strnsave(((char_u *)ga_text.ga_data) + prev_len, |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4168 ga_text.ga_len - prev_len); |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4169 |
|
13335
73325d39591a
patch 8.0.1542: terminal screen dump does not include cursor position
Christian Brabandt <cb@256bit.org>
parents:
13329
diff
changeset
|
4170 if (c == '@' || c == '|' || c == '>' || c == '\n') |
|
13298
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4171 { |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4172 /* use all attributes from previous cell */ |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4173 } |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4174 else if (c == '+' || c == '*') |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4175 { |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4176 int is_bg; |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4177 |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4178 cell.width = c == '+' ? 1 : 2; |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4179 |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4180 c = fgetc(fd); |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4181 if (c == '&') |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4182 { |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4183 /* use same attr as previous cell */ |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4184 c = fgetc(fd); |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4185 } |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4186 else if (isdigit(c)) |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4187 { |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4188 /* get the decimal attribute */ |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4189 attr = 0; |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4190 while (isdigit(c)) |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4191 { |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4192 attr = attr * 10 + (c - '0'); |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4193 c = fgetc(fd); |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4194 } |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4195 hl2vtermAttr(attr, &cell); |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4196 } |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4197 else |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4198 dump_is_corrupt(&ga_text); |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4199 |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4200 /* is_bg == 0: fg, is_bg == 1: bg */ |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4201 for (is_bg = 0; is_bg <= 1; ++is_bg) |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4202 { |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4203 if (c == '&') |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4204 { |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4205 /* use same color as previous cell */ |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4206 c = fgetc(fd); |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4207 } |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4208 else if (c == '#') |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4209 { |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4210 int red, green, blue, index = 0; |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4211 |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4212 c = fgetc(fd); |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4213 red = hex2nr(c); |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4214 c = fgetc(fd); |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4215 red = (red << 4) + hex2nr(c); |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4216 c = fgetc(fd); |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4217 green = hex2nr(c); |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4218 c = fgetc(fd); |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4219 green = (green << 4) + hex2nr(c); |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4220 c = fgetc(fd); |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4221 blue = hex2nr(c); |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4222 c = fgetc(fd); |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4223 blue = (blue << 4) + hex2nr(c); |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4224 c = fgetc(fd); |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4225 if (!isdigit(c)) |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4226 dump_is_corrupt(&ga_text); |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4227 while (isdigit(c)) |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4228 { |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4229 index = index * 10 + (c - '0'); |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4230 c = fgetc(fd); |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4231 } |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4232 |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4233 if (is_bg) |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4234 { |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4235 cell.bg.red = red; |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4236 cell.bg.green = green; |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4237 cell.bg.blue = blue; |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4238 cell.bg.ansi_index = index; |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4239 } |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4240 else |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4241 { |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4242 cell.fg.red = red; |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4243 cell.fg.green = green; |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4244 cell.fg.blue = blue; |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4245 cell.fg.ansi_index = index; |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4246 } |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4247 } |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4248 else |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4249 dump_is_corrupt(&ga_text); |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4250 } |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4251 } |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4252 else |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4253 dump_is_corrupt(&ga_text); |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4254 |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4255 append_cell(&ga_cell, &cell); |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4256 } |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4257 else if (c == '@') |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4258 { |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4259 if (prev_char == NULL) |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4260 dump_is_corrupt(&ga_text); |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4261 else |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4262 { |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4263 int count = 0; |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4264 |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4265 /* repeat previous character, get the count */ |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4266 for (;;) |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4267 { |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4268 c = fgetc(fd); |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4269 if (!isdigit(c)) |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4270 break; |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4271 count = count * 10 + (c - '0'); |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4272 } |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4273 |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4274 while (count-- > 0) |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4275 { |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4276 ga_concat(&ga_text, prev_char); |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4277 append_cell(&ga_cell, &cell); |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4278 } |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4279 } |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4280 } |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4281 else |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4282 { |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4283 dump_is_corrupt(&ga_text); |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4284 c = fgetc(fd); |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4285 } |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4286 } |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4287 |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4288 if (ga_text.ga_len > 0) |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4289 { |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4290 /* trailing characters after last NL */ |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4291 dump_is_corrupt(&ga_text); |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4292 ga_append(&ga_text, NUL); |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4293 ml_append(curbuf->b_ml.ml_line_count, ga_text.ga_data, |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4294 ga_text.ga_len, FALSE); |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4295 } |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4296 |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4297 ga_clear(&ga_text); |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4298 vim_free(prev_char); |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4299 |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4300 return max_cells; |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4301 } |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4302 |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4303 /* |
|
13579
486ad9fd9038
patch 8.0.1662: showing dump diff doesn't mention both file names
Christian Brabandt <cb@256bit.org>
parents:
13577
diff
changeset
|
4304 * Return an allocated string with at least "text_width" "=" characters and |
|
486ad9fd9038
patch 8.0.1662: showing dump diff doesn't mention both file names
Christian Brabandt <cb@256bit.org>
parents:
13577
diff
changeset
|
4305 * "fname" inserted in the middle. |
|
486ad9fd9038
patch 8.0.1662: showing dump diff doesn't mention both file names
Christian Brabandt <cb@256bit.org>
parents:
13577
diff
changeset
|
4306 */ |
|
486ad9fd9038
patch 8.0.1662: showing dump diff doesn't mention both file names
Christian Brabandt <cb@256bit.org>
parents:
13577
diff
changeset
|
4307 static char_u * |
|
486ad9fd9038
patch 8.0.1662: showing dump diff doesn't mention both file names
Christian Brabandt <cb@256bit.org>
parents:
13577
diff
changeset
|
4308 get_separator(int text_width, char_u *fname) |
|
486ad9fd9038
patch 8.0.1662: showing dump diff doesn't mention both file names
Christian Brabandt <cb@256bit.org>
parents:
13577
diff
changeset
|
4309 { |
|
486ad9fd9038
patch 8.0.1662: showing dump diff doesn't mention both file names
Christian Brabandt <cb@256bit.org>
parents:
13577
diff
changeset
|
4310 int width = MAX(text_width, curwin->w_width); |
|
486ad9fd9038
patch 8.0.1662: showing dump diff doesn't mention both file names
Christian Brabandt <cb@256bit.org>
parents:
13577
diff
changeset
|
4311 char_u *textline; |
|
486ad9fd9038
patch 8.0.1662: showing dump diff doesn't mention both file names
Christian Brabandt <cb@256bit.org>
parents:
13577
diff
changeset
|
4312 int fname_size; |
|
486ad9fd9038
patch 8.0.1662: showing dump diff doesn't mention both file names
Christian Brabandt <cb@256bit.org>
parents:
13577
diff
changeset
|
4313 char_u *p = fname; |
|
486ad9fd9038
patch 8.0.1662: showing dump diff doesn't mention both file names
Christian Brabandt <cb@256bit.org>
parents:
13577
diff
changeset
|
4314 int i; |
|
13630
fd3389d64825
patch 8.0.1687: 64 bit compiler warnings
Christian Brabandt <cb@256bit.org>
parents:
13626
diff
changeset
|
4315 size_t off; |
|
fd3389d64825
patch 8.0.1687: 64 bit compiler warnings
Christian Brabandt <cb@256bit.org>
parents:
13626
diff
changeset
|
4316 |
|
fd3389d64825
patch 8.0.1687: 64 bit compiler warnings
Christian Brabandt <cb@256bit.org>
parents:
13626
diff
changeset
|
4317 textline = alloc(width + (int)STRLEN(fname) + 1); |
|
13579
486ad9fd9038
patch 8.0.1662: showing dump diff doesn't mention both file names
Christian Brabandt <cb@256bit.org>
parents:
13577
diff
changeset
|
4318 if (textline == NULL) |
|
486ad9fd9038
patch 8.0.1662: showing dump diff doesn't mention both file names
Christian Brabandt <cb@256bit.org>
parents:
13577
diff
changeset
|
4319 return NULL; |
|
486ad9fd9038
patch 8.0.1662: showing dump diff doesn't mention both file names
Christian Brabandt <cb@256bit.org>
parents:
13577
diff
changeset
|
4320 |
|
486ad9fd9038
patch 8.0.1662: showing dump diff doesn't mention both file names
Christian Brabandt <cb@256bit.org>
parents:
13577
diff
changeset
|
4321 fname_size = vim_strsize(fname); |
|
486ad9fd9038
patch 8.0.1662: showing dump diff doesn't mention both file names
Christian Brabandt <cb@256bit.org>
parents:
13577
diff
changeset
|
4322 if (fname_size < width - 8) |
|
486ad9fd9038
patch 8.0.1662: showing dump diff doesn't mention both file names
Christian Brabandt <cb@256bit.org>
parents:
13577
diff
changeset
|
4323 { |
|
486ad9fd9038
patch 8.0.1662: showing dump diff doesn't mention both file names
Christian Brabandt <cb@256bit.org>
parents:
13577
diff
changeset
|
4324 /* enough room, don't use the full window width */ |
|
486ad9fd9038
patch 8.0.1662: showing dump diff doesn't mention both file names
Christian Brabandt <cb@256bit.org>
parents:
13577
diff
changeset
|
4325 width = MAX(text_width, fname_size + 8); |
|
486ad9fd9038
patch 8.0.1662: showing dump diff doesn't mention both file names
Christian Brabandt <cb@256bit.org>
parents:
13577
diff
changeset
|
4326 } |
|
486ad9fd9038
patch 8.0.1662: showing dump diff doesn't mention both file names
Christian Brabandt <cb@256bit.org>
parents:
13577
diff
changeset
|
4327 else if (fname_size > width - 8) |
|
486ad9fd9038
patch 8.0.1662: showing dump diff doesn't mention both file names
Christian Brabandt <cb@256bit.org>
parents:
13577
diff
changeset
|
4328 { |
|
486ad9fd9038
patch 8.0.1662: showing dump diff doesn't mention both file names
Christian Brabandt <cb@256bit.org>
parents:
13577
diff
changeset
|
4329 /* full name doesn't fit, use only the tail */ |
|
486ad9fd9038
patch 8.0.1662: showing dump diff doesn't mention both file names
Christian Brabandt <cb@256bit.org>
parents:
13577
diff
changeset
|
4330 p = gettail(fname); |
|
486ad9fd9038
patch 8.0.1662: showing dump diff doesn't mention both file names
Christian Brabandt <cb@256bit.org>
parents:
13577
diff
changeset
|
4331 fname_size = vim_strsize(p); |
|
486ad9fd9038
patch 8.0.1662: showing dump diff doesn't mention both file names
Christian Brabandt <cb@256bit.org>
parents:
13577
diff
changeset
|
4332 } |
|
486ad9fd9038
patch 8.0.1662: showing dump diff doesn't mention both file names
Christian Brabandt <cb@256bit.org>
parents:
13577
diff
changeset
|
4333 /* skip characters until the name fits */ |
|
486ad9fd9038
patch 8.0.1662: showing dump diff doesn't mention both file names
Christian Brabandt <cb@256bit.org>
parents:
13577
diff
changeset
|
4334 while (fname_size > width - 8) |
|
486ad9fd9038
patch 8.0.1662: showing dump diff doesn't mention both file names
Christian Brabandt <cb@256bit.org>
parents:
13577
diff
changeset
|
4335 { |
|
486ad9fd9038
patch 8.0.1662: showing dump diff doesn't mention both file names
Christian Brabandt <cb@256bit.org>
parents:
13577
diff
changeset
|
4336 p += (*mb_ptr2len)(p); |
|
486ad9fd9038
patch 8.0.1662: showing dump diff doesn't mention both file names
Christian Brabandt <cb@256bit.org>
parents:
13577
diff
changeset
|
4337 fname_size = vim_strsize(p); |
|
486ad9fd9038
patch 8.0.1662: showing dump diff doesn't mention both file names
Christian Brabandt <cb@256bit.org>
parents:
13577
diff
changeset
|
4338 } |
|
486ad9fd9038
patch 8.0.1662: showing dump diff doesn't mention both file names
Christian Brabandt <cb@256bit.org>
parents:
13577
diff
changeset
|
4339 |
|
486ad9fd9038
patch 8.0.1662: showing dump diff doesn't mention both file names
Christian Brabandt <cb@256bit.org>
parents:
13577
diff
changeset
|
4340 for (i = 0; i < (width - fname_size) / 2 - 1; ++i) |
|
486ad9fd9038
patch 8.0.1662: showing dump diff doesn't mention both file names
Christian Brabandt <cb@256bit.org>
parents:
13577
diff
changeset
|
4341 textline[i] = '='; |
|
486ad9fd9038
patch 8.0.1662: showing dump diff doesn't mention both file names
Christian Brabandt <cb@256bit.org>
parents:
13577
diff
changeset
|
4342 textline[i++] = ' '; |
|
486ad9fd9038
patch 8.0.1662: showing dump diff doesn't mention both file names
Christian Brabandt <cb@256bit.org>
parents:
13577
diff
changeset
|
4343 |
|
486ad9fd9038
patch 8.0.1662: showing dump diff doesn't mention both file names
Christian Brabandt <cb@256bit.org>
parents:
13577
diff
changeset
|
4344 STRCPY(textline + i, p); |
|
486ad9fd9038
patch 8.0.1662: showing dump diff doesn't mention both file names
Christian Brabandt <cb@256bit.org>
parents:
13577
diff
changeset
|
4345 off = STRLEN(textline); |
|
486ad9fd9038
patch 8.0.1662: showing dump diff doesn't mention both file names
Christian Brabandt <cb@256bit.org>
parents:
13577
diff
changeset
|
4346 textline[off] = ' '; |
|
486ad9fd9038
patch 8.0.1662: showing dump diff doesn't mention both file names
Christian Brabandt <cb@256bit.org>
parents:
13577
diff
changeset
|
4347 for (i = 1; i < (width - fname_size) / 2; ++i) |
|
486ad9fd9038
patch 8.0.1662: showing dump diff doesn't mention both file names
Christian Brabandt <cb@256bit.org>
parents:
13577
diff
changeset
|
4348 textline[off + i] = '='; |
|
486ad9fd9038
patch 8.0.1662: showing dump diff doesn't mention both file names
Christian Brabandt <cb@256bit.org>
parents:
13577
diff
changeset
|
4349 textline[off + i] = NUL; |
|
486ad9fd9038
patch 8.0.1662: showing dump diff doesn't mention both file names
Christian Brabandt <cb@256bit.org>
parents:
13577
diff
changeset
|
4350 |
|
486ad9fd9038
patch 8.0.1662: showing dump diff doesn't mention both file names
Christian Brabandt <cb@256bit.org>
parents:
13577
diff
changeset
|
4351 return textline; |
|
486ad9fd9038
patch 8.0.1662: showing dump diff doesn't mention both file names
Christian Brabandt <cb@256bit.org>
parents:
13577
diff
changeset
|
4352 } |
|
486ad9fd9038
patch 8.0.1662: showing dump diff doesn't mention both file names
Christian Brabandt <cb@256bit.org>
parents:
13577
diff
changeset
|
4353 |
|
486ad9fd9038
patch 8.0.1662: showing dump diff doesn't mention both file names
Christian Brabandt <cb@256bit.org>
parents:
13577
diff
changeset
|
4354 /* |
|
13298
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4355 * Common for "term_dumpdiff()" and "term_dumpload()". |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4356 */ |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4357 static void |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4358 term_load_dump(typval_T *argvars, typval_T *rettv, int do_diff) |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4359 { |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4360 jobopt_T opt; |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4361 buf_T *buf; |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4362 char_u buf1[NUMBUFLEN]; |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4363 char_u buf2[NUMBUFLEN]; |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4364 char_u *fname1; |
|
13300
803294329951
patch 8.0.1524: compiler warnings for uninitialized variables
Christian Brabandt <cb@256bit.org>
parents:
13298
diff
changeset
|
4365 char_u *fname2 = NULL; |
|
13501
a4a559e08798
patch 8.0.1624: options for term_dumpdiff() and term_dumpload() not implemented
Christian Brabandt <cb@256bit.org>
parents:
13483
diff
changeset
|
4366 char_u *fname_tofree = NULL; |
|
13298
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4367 FILE *fd1; |
|
13300
803294329951
patch 8.0.1524: compiler warnings for uninitialized variables
Christian Brabandt <cb@256bit.org>
parents:
13298
diff
changeset
|
4368 FILE *fd2 = NULL; |
|
13298
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4369 char_u *textline = NULL; |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4370 |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4371 /* First open the files. If this fails bail out. */ |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4372 fname1 = get_tv_string_buf_chk(&argvars[0], buf1); |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4373 if (do_diff) |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4374 fname2 = get_tv_string_buf_chk(&argvars[1], buf2); |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4375 if (fname1 == NULL || (do_diff && fname2 == NULL)) |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4376 { |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4377 EMSG(_(e_invarg)); |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4378 return; |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4379 } |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4380 fd1 = mch_fopen((char *)fname1, READBIN); |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4381 if (fd1 == NULL) |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4382 { |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4383 EMSG2(_(e_notread), fname1); |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4384 return; |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4385 } |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4386 if (do_diff) |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4387 { |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4388 fd2 = mch_fopen((char *)fname2, READBIN); |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4389 if (fd2 == NULL) |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4390 { |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4391 fclose(fd1); |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4392 EMSG2(_(e_notread), fname2); |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4393 return; |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4394 } |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4395 } |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4396 |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4397 init_job_options(&opt); |
|
13501
a4a559e08798
patch 8.0.1624: options for term_dumpdiff() and term_dumpload() not implemented
Christian Brabandt <cb@256bit.org>
parents:
13483
diff
changeset
|
4398 if (argvars[do_diff ? 2 : 1].v_type != VAR_UNKNOWN |
|
a4a559e08798
patch 8.0.1624: options for term_dumpdiff() and term_dumpload() not implemented
Christian Brabandt <cb@256bit.org>
parents:
13483
diff
changeset
|
4399 && get_job_options(&argvars[do_diff ? 2 : 1], &opt, 0, |
|
a4a559e08798
patch 8.0.1624: options for term_dumpdiff() and term_dumpload() not implemented
Christian Brabandt <cb@256bit.org>
parents:
13483
diff
changeset
|
4400 JO2_TERM_NAME + JO2_TERM_COLS + JO2_TERM_ROWS |
|
a4a559e08798
patch 8.0.1624: options for term_dumpdiff() and term_dumpload() not implemented
Christian Brabandt <cb@256bit.org>
parents:
13483
diff
changeset
|
4401 + JO2_VERTICAL + JO2_CURWIN + JO2_NORESTORE) == FAIL) |
|
a4a559e08798
patch 8.0.1624: options for term_dumpdiff() and term_dumpload() not implemented
Christian Brabandt <cb@256bit.org>
parents:
13483
diff
changeset
|
4402 goto theend; |
|
a4a559e08798
patch 8.0.1624: options for term_dumpdiff() and term_dumpload() not implemented
Christian Brabandt <cb@256bit.org>
parents:
13483
diff
changeset
|
4403 |
|
a4a559e08798
patch 8.0.1624: options for term_dumpdiff() and term_dumpload() not implemented
Christian Brabandt <cb@256bit.org>
parents:
13483
diff
changeset
|
4404 if (opt.jo_term_name == NULL) |
|
a4a559e08798
patch 8.0.1624: options for term_dumpdiff() and term_dumpload() not implemented
Christian Brabandt <cb@256bit.org>
parents:
13483
diff
changeset
|
4405 { |
|
13505
a784ef72b617
patch 8.0.1626: compiler warning for possible loss of data
Christian Brabandt <cb@256bit.org>
parents:
13501
diff
changeset
|
4406 size_t len = STRLEN(fname1) + 12; |
|
a784ef72b617
patch 8.0.1626: compiler warning for possible loss of data
Christian Brabandt <cb@256bit.org>
parents:
13501
diff
changeset
|
4407 |
|
a784ef72b617
patch 8.0.1626: compiler warning for possible loss of data
Christian Brabandt <cb@256bit.org>
parents:
13501
diff
changeset
|
4408 fname_tofree = alloc((int)len); |
|
13501
a4a559e08798
patch 8.0.1624: options for term_dumpdiff() and term_dumpload() not implemented
Christian Brabandt <cb@256bit.org>
parents:
13483
diff
changeset
|
4409 if (fname_tofree != NULL) |
|
a4a559e08798
patch 8.0.1624: options for term_dumpdiff() and term_dumpload() not implemented
Christian Brabandt <cb@256bit.org>
parents:
13483
diff
changeset
|
4410 { |
|
a4a559e08798
patch 8.0.1624: options for term_dumpdiff() and term_dumpload() not implemented
Christian Brabandt <cb@256bit.org>
parents:
13483
diff
changeset
|
4411 vim_snprintf((char *)fname_tofree, len, "dump diff %s", fname1); |
|
a4a559e08798
patch 8.0.1624: options for term_dumpdiff() and term_dumpload() not implemented
Christian Brabandt <cb@256bit.org>
parents:
13483
diff
changeset
|
4412 opt.jo_term_name = fname_tofree; |
|
a4a559e08798
patch 8.0.1624: options for term_dumpdiff() and term_dumpload() not implemented
Christian Brabandt <cb@256bit.org>
parents:
13483
diff
changeset
|
4413 } |
|
a4a559e08798
patch 8.0.1624: options for term_dumpdiff() and term_dumpload() not implemented
Christian Brabandt <cb@256bit.org>
parents:
13483
diff
changeset
|
4414 } |
|
13298
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4415 |
|
13470
6faef782f50b
patch 8.0.1609: shell commands in the GUI use a dumb terminal
Christian Brabandt <cb@256bit.org>
parents:
13458
diff
changeset
|
4416 buf = term_start(&argvars[0], NULL, &opt, TERM_START_NOJOB); |
|
13298
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4417 if (buf != NULL && buf->b_term != NULL) |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4418 { |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4419 int i; |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4420 linenr_T bot_lnum; |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4421 linenr_T lnum; |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4422 term_T *term = buf->b_term; |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4423 int width; |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4424 int width2; |
|
13335
73325d39591a
patch 8.0.1542: terminal screen dump does not include cursor position
Christian Brabandt <cb@256bit.org>
parents:
13329
diff
changeset
|
4425 VTermPos cursor_pos1; |
|
73325d39591a
patch 8.0.1542: terminal screen dump does not include cursor position
Christian Brabandt <cb@256bit.org>
parents:
13329
diff
changeset
|
4426 VTermPos cursor_pos2; |
|
13298
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4427 |
|
13483
f7ef5d579758
patch 8.0.1615: term_dumpload() does not use the right colors
Christian Brabandt <cb@256bit.org>
parents:
13476
diff
changeset
|
4428 init_default_colors(term); |
|
f7ef5d579758
patch 8.0.1615: term_dumpload() does not use the right colors
Christian Brabandt <cb@256bit.org>
parents:
13476
diff
changeset
|
4429 |
|
13298
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4430 rettv->vval.v_number = buf->b_fnum; |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4431 |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4432 /* read the files, fill the buffer with the diff */ |
|
13335
73325d39591a
patch 8.0.1542: terminal screen dump does not include cursor position
Christian Brabandt <cb@256bit.org>
parents:
13329
diff
changeset
|
4433 width = read_dump_file(fd1, &cursor_pos1); |
|
73325d39591a
patch 8.0.1542: terminal screen dump does not include cursor position
Christian Brabandt <cb@256bit.org>
parents:
13329
diff
changeset
|
4434 |
|
73325d39591a
patch 8.0.1542: terminal screen dump does not include cursor position
Christian Brabandt <cb@256bit.org>
parents:
13329
diff
changeset
|
4435 /* position the cursor */ |
|
73325d39591a
patch 8.0.1542: terminal screen dump does not include cursor position
Christian Brabandt <cb@256bit.org>
parents:
13329
diff
changeset
|
4436 if (cursor_pos1.row >= 0) |
|
73325d39591a
patch 8.0.1542: terminal screen dump does not include cursor position
Christian Brabandt <cb@256bit.org>
parents:
13329
diff
changeset
|
4437 { |
|
73325d39591a
patch 8.0.1542: terminal screen dump does not include cursor position
Christian Brabandt <cb@256bit.org>
parents:
13329
diff
changeset
|
4438 curwin->w_cursor.lnum = cursor_pos1.row + 1; |
|
73325d39591a
patch 8.0.1542: terminal screen dump does not include cursor position
Christian Brabandt <cb@256bit.org>
parents:
13329
diff
changeset
|
4439 coladvance(cursor_pos1.col); |
|
73325d39591a
patch 8.0.1542: terminal screen dump does not include cursor position
Christian Brabandt <cb@256bit.org>
parents:
13329
diff
changeset
|
4440 } |
|
13298
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4441 |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4442 /* Delete the empty line that was in the empty buffer. */ |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4443 ml_delete(1, FALSE); |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4444 |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4445 /* For term_dumpload() we are done here. */ |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4446 if (!do_diff) |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4447 goto theend; |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4448 |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4449 term->tl_top_diff_rows = curbuf->b_ml.ml_line_count; |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4450 |
|
13579
486ad9fd9038
patch 8.0.1662: showing dump diff doesn't mention both file names
Christian Brabandt <cb@256bit.org>
parents:
13577
diff
changeset
|
4451 textline = get_separator(width, fname1); |
|
13298
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4452 if (textline == NULL) |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4453 goto theend; |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4454 if (add_empty_scrollback(term, &term->tl_default_color, 0) == OK) |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4455 ml_append(curbuf->b_ml.ml_line_count, textline, 0, FALSE); |
|
13579
486ad9fd9038
patch 8.0.1662: showing dump diff doesn't mention both file names
Christian Brabandt <cb@256bit.org>
parents:
13577
diff
changeset
|
4456 vim_free(textline); |
|
486ad9fd9038
patch 8.0.1662: showing dump diff doesn't mention both file names
Christian Brabandt <cb@256bit.org>
parents:
13577
diff
changeset
|
4457 |
|
486ad9fd9038
patch 8.0.1662: showing dump diff doesn't mention both file names
Christian Brabandt <cb@256bit.org>
parents:
13577
diff
changeset
|
4458 textline = get_separator(width, fname2); |
|
486ad9fd9038
patch 8.0.1662: showing dump diff doesn't mention both file names
Christian Brabandt <cb@256bit.org>
parents:
13577
diff
changeset
|
4459 if (textline == NULL) |
|
486ad9fd9038
patch 8.0.1662: showing dump diff doesn't mention both file names
Christian Brabandt <cb@256bit.org>
parents:
13577
diff
changeset
|
4460 goto theend; |
|
13298
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4461 if (add_empty_scrollback(term, &term->tl_default_color, 0) == OK) |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4462 ml_append(curbuf->b_ml.ml_line_count, textline, 0, FALSE); |
|
13579
486ad9fd9038
patch 8.0.1662: showing dump diff doesn't mention both file names
Christian Brabandt <cb@256bit.org>
parents:
13577
diff
changeset
|
4463 textline[width] = NUL; |
|
13298
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4464 |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4465 bot_lnum = curbuf->b_ml.ml_line_count; |
|
13335
73325d39591a
patch 8.0.1542: terminal screen dump does not include cursor position
Christian Brabandt <cb@256bit.org>
parents:
13329
diff
changeset
|
4466 width2 = read_dump_file(fd2, &cursor_pos2); |
|
13298
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4467 if (width2 > width) |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4468 { |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4469 vim_free(textline); |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4470 textline = alloc(width2 + 1); |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4471 if (textline == NULL) |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4472 goto theend; |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4473 width = width2; |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4474 textline[width] = NUL; |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4475 } |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4476 term->tl_bot_diff_rows = curbuf->b_ml.ml_line_count - bot_lnum; |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4477 |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4478 for (lnum = 1; lnum <= term->tl_top_diff_rows; ++lnum) |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4479 { |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4480 if (lnum + bot_lnum > curbuf->b_ml.ml_line_count) |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4481 { |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4482 /* bottom part has fewer rows, fill with "-" */ |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4483 for (i = 0; i < width; ++i) |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4484 textline[i] = '-'; |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4485 } |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4486 else |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4487 { |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4488 char_u *line1; |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4489 char_u *line2; |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4490 char_u *p1; |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4491 char_u *p2; |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4492 int col; |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4493 sb_line_T *sb_line = (sb_line_T *)term->tl_scrollback.ga_data; |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4494 cellattr_T *cellattr1 = (sb_line + lnum - 1)->sb_cells; |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4495 cellattr_T *cellattr2 = (sb_line + lnum + bot_lnum - 1) |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4496 ->sb_cells; |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4497 |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4498 /* Make a copy, getting the second line will invalidate it. */ |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4499 line1 = vim_strsave(ml_get(lnum)); |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4500 if (line1 == NULL) |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4501 break; |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4502 p1 = line1; |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4503 |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4504 line2 = ml_get(lnum + bot_lnum); |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4505 p2 = line2; |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4506 for (col = 0; col < width && *p1 != NUL && *p2 != NUL; ++col) |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4507 { |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4508 int len1 = utfc_ptr2len(p1); |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4509 int len2 = utfc_ptr2len(p2); |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4510 |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4511 textline[col] = ' '; |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4512 if (len1 != len2 || STRNCMP(p1, p2, len1) != 0) |
|
13335
73325d39591a
patch 8.0.1542: terminal screen dump does not include cursor position
Christian Brabandt <cb@256bit.org>
parents:
13329
diff
changeset
|
4513 /* text differs */ |
|
13298
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4514 textline[col] = 'X'; |
|
13335
73325d39591a
patch 8.0.1542: terminal screen dump does not include cursor position
Christian Brabandt <cb@256bit.org>
parents:
13329
diff
changeset
|
4515 else if (lnum == cursor_pos1.row + 1 |
|
73325d39591a
patch 8.0.1542: terminal screen dump does not include cursor position
Christian Brabandt <cb@256bit.org>
parents:
13329
diff
changeset
|
4516 && col == cursor_pos1.col |
|
73325d39591a
patch 8.0.1542: terminal screen dump does not include cursor position
Christian Brabandt <cb@256bit.org>
parents:
13329
diff
changeset
|
4517 && (cursor_pos1.row != cursor_pos2.row |
|
73325d39591a
patch 8.0.1542: terminal screen dump does not include cursor position
Christian Brabandt <cb@256bit.org>
parents:
13329
diff
changeset
|
4518 || cursor_pos1.col != cursor_pos2.col)) |
|
73325d39591a
patch 8.0.1542: terminal screen dump does not include cursor position
Christian Brabandt <cb@256bit.org>
parents:
13329
diff
changeset
|
4519 /* cursor in first but not in second */ |
|
73325d39591a
patch 8.0.1542: terminal screen dump does not include cursor position
Christian Brabandt <cb@256bit.org>
parents:
13329
diff
changeset
|
4520 textline[col] = '>'; |
|
73325d39591a
patch 8.0.1542: terminal screen dump does not include cursor position
Christian Brabandt <cb@256bit.org>
parents:
13329
diff
changeset
|
4521 else if (lnum == cursor_pos2.row + 1 |
|
73325d39591a
patch 8.0.1542: terminal screen dump does not include cursor position
Christian Brabandt <cb@256bit.org>
parents:
13329
diff
changeset
|
4522 && col == cursor_pos2.col |
|
73325d39591a
patch 8.0.1542: terminal screen dump does not include cursor position
Christian Brabandt <cb@256bit.org>
parents:
13329
diff
changeset
|
4523 && (cursor_pos1.row != cursor_pos2.row |
|
73325d39591a
patch 8.0.1542: terminal screen dump does not include cursor position
Christian Brabandt <cb@256bit.org>
parents:
13329
diff
changeset
|
4524 || cursor_pos1.col != cursor_pos2.col)) |
|
73325d39591a
patch 8.0.1542: terminal screen dump does not include cursor position
Christian Brabandt <cb@256bit.org>
parents:
13329
diff
changeset
|
4525 /* cursor in second but not in first */ |
|
73325d39591a
patch 8.0.1542: terminal screen dump does not include cursor position
Christian Brabandt <cb@256bit.org>
parents:
13329
diff
changeset
|
4526 textline[col] = '<'; |
|
13298
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4527 else if (cellattr1 != NULL && cellattr2 != NULL) |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4528 { |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4529 if ((cellattr1 + col)->width |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4530 != (cellattr2 + col)->width) |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4531 textline[col] = 'w'; |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4532 else if (!same_color(&(cellattr1 + col)->fg, |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4533 &(cellattr2 + col)->fg)) |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4534 textline[col] = 'f'; |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4535 else if (!same_color(&(cellattr1 + col)->bg, |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4536 &(cellattr2 + col)->bg)) |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4537 textline[col] = 'b'; |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4538 else if (vtermAttr2hl((cellattr1 + col)->attrs) |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4539 != vtermAttr2hl(((cellattr2 + col)->attrs))) |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4540 textline[col] = 'a'; |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4541 } |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4542 p1 += len1; |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4543 p2 += len2; |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4544 /* TODO: handle different width */ |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4545 } |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4546 vim_free(line1); |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4547 |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4548 while (col < width) |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4549 { |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4550 if (*p1 == NUL && *p2 == NUL) |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4551 textline[col] = '?'; |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4552 else if (*p1 == NUL) |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4553 { |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4554 textline[col] = '+'; |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4555 p2 += utfc_ptr2len(p2); |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4556 } |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4557 else |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4558 { |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4559 textline[col] = '-'; |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4560 p1 += utfc_ptr2len(p1); |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4561 } |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4562 ++col; |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4563 } |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4564 } |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4565 if (add_empty_scrollback(term, &term->tl_default_color, |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4566 term->tl_top_diff_rows) == OK) |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4567 ml_append(term->tl_top_diff_rows + lnum, textline, 0, FALSE); |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4568 ++bot_lnum; |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4569 } |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4570 |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4571 while (lnum + bot_lnum <= curbuf->b_ml.ml_line_count) |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4572 { |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4573 /* bottom part has more rows, fill with "+" */ |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4574 for (i = 0; i < width; ++i) |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4575 textline[i] = '+'; |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4576 if (add_empty_scrollback(term, &term->tl_default_color, |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4577 term->tl_top_diff_rows) == OK) |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4578 ml_append(term->tl_top_diff_rows + lnum, textline, 0, FALSE); |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4579 ++lnum; |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4580 ++bot_lnum; |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4581 } |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4582 |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4583 term->tl_cols = width; |
|
13579
486ad9fd9038
patch 8.0.1662: showing dump diff doesn't mention both file names
Christian Brabandt <cb@256bit.org>
parents:
13577
diff
changeset
|
4584 |
|
486ad9fd9038
patch 8.0.1662: showing dump diff doesn't mention both file names
Christian Brabandt <cb@256bit.org>
parents:
13577
diff
changeset
|
4585 /* looks better without wrapping */ |
|
486ad9fd9038
patch 8.0.1662: showing dump diff doesn't mention both file names
Christian Brabandt <cb@256bit.org>
parents:
13577
diff
changeset
|
4586 curwin->w_p_wrap = 0; |
|
13298
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4587 } |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4588 |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4589 theend: |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4590 vim_free(textline); |
|
13501
a4a559e08798
patch 8.0.1624: options for term_dumpdiff() and term_dumpload() not implemented
Christian Brabandt <cb@256bit.org>
parents:
13483
diff
changeset
|
4591 vim_free(fname_tofree); |
|
13298
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4592 fclose(fd1); |
|
13300
803294329951
patch 8.0.1524: compiler warnings for uninitialized variables
Christian Brabandt <cb@256bit.org>
parents:
13298
diff
changeset
|
4593 if (fd2 != NULL) |
|
13298
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4594 fclose(fd2); |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4595 } |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4596 |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4597 /* |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4598 * If the current buffer shows the output of term_dumpdiff(), swap the top and |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4599 * bottom files. |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4600 * Return FAIL when this is not possible. |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4601 */ |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4602 int |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4603 term_swap_diff() |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4604 { |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4605 term_T *term = curbuf->b_term; |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4606 linenr_T line_count; |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4607 linenr_T top_rows; |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4608 linenr_T bot_rows; |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4609 linenr_T bot_start; |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4610 linenr_T lnum; |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4611 char_u *p; |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4612 sb_line_T *sb_line; |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4613 |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4614 if (term == NULL |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4615 || !term_is_finished(curbuf) |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4616 || term->tl_top_diff_rows == 0 |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4617 || term->tl_scrollback.ga_len == 0) |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4618 return FAIL; |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4619 |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4620 line_count = curbuf->b_ml.ml_line_count; |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4621 top_rows = term->tl_top_diff_rows; |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4622 bot_rows = term->tl_bot_diff_rows; |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4623 bot_start = line_count - bot_rows; |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4624 sb_line = (sb_line_T *)term->tl_scrollback.ga_data; |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4625 |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4626 /* move lines from top to above the bottom part */ |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4627 for (lnum = 1; lnum <= top_rows; ++lnum) |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4628 { |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4629 p = vim_strsave(ml_get(1)); |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4630 if (p == NULL) |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4631 return OK; |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4632 ml_append(bot_start, p, 0, FALSE); |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4633 ml_delete(1, FALSE); |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4634 vim_free(p); |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4635 } |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4636 |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4637 /* move lines from bottom to the top */ |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4638 for (lnum = 1; lnum <= bot_rows; ++lnum) |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4639 { |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4640 p = vim_strsave(ml_get(bot_start + lnum)); |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4641 if (p == NULL) |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4642 return OK; |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4643 ml_delete(bot_start + lnum, FALSE); |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4644 ml_append(lnum - 1, p, 0, FALSE); |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4645 vim_free(p); |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4646 } |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4647 |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4648 if (top_rows == bot_rows) |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4649 { |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4650 /* rows counts are equal, can swap cell properties */ |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4651 for (lnum = 0; lnum < top_rows; ++lnum) |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4652 { |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4653 sb_line_T temp; |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4654 |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4655 temp = *(sb_line + lnum); |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4656 *(sb_line + lnum) = *(sb_line + bot_start + lnum); |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4657 *(sb_line + bot_start + lnum) = temp; |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4658 } |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4659 } |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4660 else |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4661 { |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4662 size_t size = sizeof(sb_line_T) * term->tl_scrollback.ga_len; |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4663 sb_line_T *temp = (sb_line_T *)alloc((int)size); |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4664 |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4665 /* need to copy cell properties into temp memory */ |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4666 if (temp != NULL) |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4667 { |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4668 mch_memmove(temp, term->tl_scrollback.ga_data, size); |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4669 mch_memmove(term->tl_scrollback.ga_data, |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4670 temp + bot_start, |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4671 sizeof(sb_line_T) * bot_rows); |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4672 mch_memmove((sb_line_T *)term->tl_scrollback.ga_data + bot_rows, |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4673 temp + top_rows, |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4674 sizeof(sb_line_T) * (line_count - top_rows - bot_rows)); |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4675 mch_memmove((sb_line_T *)term->tl_scrollback.ga_data |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4676 + line_count - top_rows, |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4677 temp, |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4678 sizeof(sb_line_T) * top_rows); |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4679 vim_free(temp); |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4680 } |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4681 } |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4682 |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4683 term->tl_top_diff_rows = bot_rows; |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4684 term->tl_bot_diff_rows = top_rows; |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4685 |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4686 update_screen(NOT_VALID); |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4687 return OK; |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4688 } |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4689 |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4690 /* |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4691 * "term_dumpdiff(filename, filename, options)" function |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4692 */ |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4693 void |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4694 f_term_dumpdiff(typval_T *argvars, typval_T *rettv) |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4695 { |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4696 term_load_dump(argvars, rettv, TRUE); |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4697 } |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4698 |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4699 /* |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4700 * "term_dumpload(filename, options)" function |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4701 */ |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4702 void |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4703 f_term_dumpload(typval_T *argvars, typval_T *rettv) |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4704 { |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4705 term_load_dump(argvars, rettv, FALSE); |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4706 } |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4707 |
| 12502 | 4708 /* |
| 4709 * "term_getaltscreen(buf)" function | |
| 4710 */ | |
| 4711 void | |
| 4712 f_term_getaltscreen(typval_T *argvars, typval_T *rettv) | |
| 4713 { | |
|
13438
33eea5ce5415
patch 8.0.1593: :qall never exits with an active terminal window
Christian Brabandt <cb@256bit.org>
parents:
13435
diff
changeset
|
4714 buf_T *buf = term_get_buf(argvars, "term_getaltscreen()"); |
| 12502 | 4715 |
| 4716 if (buf == NULL) | |
| 4717 return; | |
| 4718 rettv->vval.v_number = buf->b_term->tl_using_altscreen; | |
| 4719 } | |
| 4720 | |
| 4721 /* | |
| 4722 * "term_getattr(attr, name)" function | |
| 4723 */ | |
| 4724 void | |
| 4725 f_term_getattr(typval_T *argvars, typval_T *rettv) | |
| 4726 { | |
| 4727 int attr; | |
| 4728 size_t i; | |
| 4729 char_u *name; | |
| 4730 | |
| 4731 static struct { | |
| 4732 char *name; | |
| 4733 int attr; | |
| 4734 } attrs[] = { | |
| 4735 {"bold", HL_BOLD}, | |
| 4736 {"italic", HL_ITALIC}, | |
| 4737 {"underline", HL_UNDERLINE}, | |
| 4738 {"strike", HL_STRIKETHROUGH}, | |
| 4739 {"reverse", HL_INVERSE}, | |
| 4740 }; | |
| 4741 | |
| 4742 attr = get_tv_number(&argvars[0]); | |
| 4743 name = get_tv_string_chk(&argvars[1]); | |
| 4744 if (name == NULL) | |
| 4745 return; | |
| 4746 | |
| 4747 for (i = 0; i < sizeof(attrs)/sizeof(attrs[0]); ++i) | |
| 4748 if (STRCMP(name, attrs[i].name) == 0) | |
| 4749 { | |
| 4750 rettv->vval.v_number = (attr & attrs[i].attr) != 0 ? 1 : 0; | |
| 4751 break; | |
| 4752 } | |
| 4753 } | |
| 4754 | |
| 4755 /* | |
| 4756 * "term_getcursor(buf)" function | |
| 4757 */ | |
| 4758 void | |
| 4759 f_term_getcursor(typval_T *argvars, typval_T *rettv) | |
| 4760 { | |
|
13438
33eea5ce5415
patch 8.0.1593: :qall never exits with an active terminal window
Christian Brabandt <cb@256bit.org>
parents:
13435
diff
changeset
|
4761 buf_T *buf = term_get_buf(argvars, "term_getcursor()"); |
| 12502 | 4762 term_T *term; |
| 4763 list_T *l; | |
| 4764 dict_T *d; | |
| 4765 | |
| 4766 if (rettv_list_alloc(rettv) == FAIL) | |
| 4767 return; | |
| 4768 if (buf == NULL) | |
| 4769 return; | |
| 4770 term = buf->b_term; | |
| 4771 | |
| 4772 l = rettv->vval.v_list; | |
| 4773 list_append_number(l, term->tl_cursor_pos.row + 1); | |
| 4774 list_append_number(l, term->tl_cursor_pos.col + 1); | |
| 4775 | |
| 4776 d = dict_alloc(); | |
| 4777 if (d != NULL) | |
| 4778 { | |
|
14301
3c80092eb211
patch 8.1.0166: using dict_add_nr_str() is clumsy
Christian Brabandt <cb@256bit.org>
parents:
14139
diff
changeset
|
4779 dict_add_number(d, "visible", term->tl_cursor_visible); |
|
3c80092eb211
patch 8.1.0166: using dict_add_nr_str() is clumsy
Christian Brabandt <cb@256bit.org>
parents:
14139
diff
changeset
|
4780 dict_add_number(d, "blink", blink_state_is_inverted() |
|
3c80092eb211
patch 8.1.0166: using dict_add_nr_str() is clumsy
Christian Brabandt <cb@256bit.org>
parents:
14139
diff
changeset
|
4781 ? !term->tl_cursor_blink : term->tl_cursor_blink); |
|
3c80092eb211
patch 8.1.0166: using dict_add_nr_str() is clumsy
Christian Brabandt <cb@256bit.org>
parents:
14139
diff
changeset
|
4782 dict_add_number(d, "shape", term->tl_cursor_shape); |
|
3c80092eb211
patch 8.1.0166: using dict_add_nr_str() is clumsy
Christian Brabandt <cb@256bit.org>
parents:
14139
diff
changeset
|
4783 dict_add_string(d, "color", cursor_color_get(term->tl_cursor_color)); |
| 12502 | 4784 list_append_dict(l, d); |
| 4785 } | |
| 4786 } | |
| 4787 | |
| 4788 /* | |
| 4789 * "term_getjob(buf)" function | |
| 4790 */ | |
| 4791 void | |
| 4792 f_term_getjob(typval_T *argvars, typval_T *rettv) | |
| 4793 { | |
|
13438
33eea5ce5415
patch 8.0.1593: :qall never exits with an active terminal window
Christian Brabandt <cb@256bit.org>
parents:
13435
diff
changeset
|
4794 buf_T *buf = term_get_buf(argvars, "term_getjob()"); |
| 12502 | 4795 |
| 4796 rettv->v_type = VAR_JOB; | |
| 4797 rettv->vval.v_job = NULL; | |
| 4798 if (buf == NULL) | |
| 4799 return; | |
| 4800 | |
| 4801 rettv->vval.v_job = buf->b_term->tl_job; | |
| 4802 if (rettv->vval.v_job != NULL) | |
| 4803 ++rettv->vval.v_job->jv_refcount; | |
| 4804 } | |
| 4805 | |
| 4806 static int | |
| 4807 get_row_number(typval_T *tv, term_T *term) | |
| 4808 { | |
| 4809 if (tv->v_type == VAR_STRING | |
| 4810 && tv->vval.v_string != NULL | |
| 4811 && STRCMP(tv->vval.v_string, ".") == 0) | |
| 4812 return term->tl_cursor_pos.row; | |
| 4813 return (int)get_tv_number(tv) - 1; | |
| 4814 } | |
| 4815 | |
| 4816 /* | |
| 4817 * "term_getline(buf, row)" function | |
| 4818 */ | |
| 4819 void | |
| 4820 f_term_getline(typval_T *argvars, typval_T *rettv) | |
| 4821 { | |
|
13438
33eea5ce5415
patch 8.0.1593: :qall never exits with an active terminal window
Christian Brabandt <cb@256bit.org>
parents:
13435
diff
changeset
|
4822 buf_T *buf = term_get_buf(argvars, "term_getline()"); |
| 12502 | 4823 term_T *term; |
| 4824 int row; | |
| 4825 | |
| 4826 rettv->v_type = VAR_STRING; | |
| 4827 if (buf == NULL) | |
| 4828 return; | |
| 4829 term = buf->b_term; | |
| 4830 row = get_row_number(&argvars[1], term); | |
| 4831 | |
| 4832 if (term->tl_vterm == NULL) | |
| 4833 { | |
| 4834 linenr_T lnum = row + term->tl_scrollback_scrolled + 1; | |
| 4835 | |
| 4836 /* vterm is finished, get the text from the buffer */ | |
| 4837 if (lnum > 0 && lnum <= buf->b_ml.ml_line_count) | |
| 4838 rettv->vval.v_string = vim_strsave(ml_get_buf(buf, lnum, FALSE)); | |
| 4839 } | |
| 4840 else | |
| 4841 { | |
| 4842 VTermScreen *screen = vterm_obtain_screen(term->tl_vterm); | |
| 4843 VTermRect rect; | |
| 4844 int len; | |
| 4845 char_u *p; | |
| 4846 | |
| 4847 if (row < 0 || row >= term->tl_rows) | |
| 4848 return; | |
| 4849 len = term->tl_cols * MB_MAXBYTES + 1; | |
| 4850 p = alloc(len); | |
| 4851 if (p == NULL) | |
| 4852 return; | |
| 4853 rettv->vval.v_string = p; | |
| 4854 | |
| 4855 rect.start_col = 0; | |
| 4856 rect.end_col = term->tl_cols; | |
| 4857 rect.start_row = row; | |
| 4858 rect.end_row = row + 1; | |
| 4859 p[vterm_screen_get_text(screen, (char *)p, len, rect)] = NUL; | |
| 4860 } | |
| 4861 } | |
| 4862 | |
| 4863 /* | |
| 4864 * "term_getscrolled(buf)" function | |
| 4865 */ | |
| 4866 void | |
| 4867 f_term_getscrolled(typval_T *argvars, typval_T *rettv) | |
| 4868 { | |
|
13438
33eea5ce5415
patch 8.0.1593: :qall never exits with an active terminal window
Christian Brabandt <cb@256bit.org>
parents:
13435
diff
changeset
|
4869 buf_T *buf = term_get_buf(argvars, "term_getscrolled()"); |
| 12502 | 4870 |
| 4871 if (buf == NULL) | |
| 4872 return; | |
| 4873 rettv->vval.v_number = buf->b_term->tl_scrollback_scrolled; | |
| 4874 } | |
| 4875 | |
| 4876 /* | |
| 4877 * "term_getsize(buf)" function | |
| 4878 */ | |
| 4879 void | |
| 4880 f_term_getsize(typval_T *argvars, typval_T *rettv) | |
| 4881 { | |
|
13438
33eea5ce5415
patch 8.0.1593: :qall never exits with an active terminal window
Christian Brabandt <cb@256bit.org>
parents:
13435
diff
changeset
|
4882 buf_T *buf = term_get_buf(argvars, "term_getsize()"); |
| 12502 | 4883 list_T *l; |
| 4884 | |
| 4885 if (rettv_list_alloc(rettv) == FAIL) | |
| 4886 return; | |
| 4887 if (buf == NULL) | |
| 4888 return; | |
| 4889 | |
| 4890 l = rettv->vval.v_list; | |
| 4891 list_append_number(l, buf->b_term->tl_rows); | |
| 4892 list_append_number(l, buf->b_term->tl_cols); | |
| 4893 } | |
| 4894 | |
| 4895 /* | |
|
13678
39fcaaa973db
patch 8.0.1711: term_setsize() is not implemented yet
Christian Brabandt <cb@256bit.org>
parents:
13668
diff
changeset
|
4896 * "term_setsize(buf, rows, cols)" function |
|
39fcaaa973db
patch 8.0.1711: term_setsize() is not implemented yet
Christian Brabandt <cb@256bit.org>
parents:
13668
diff
changeset
|
4897 */ |
|
39fcaaa973db
patch 8.0.1711: term_setsize() is not implemented yet
Christian Brabandt <cb@256bit.org>
parents:
13668
diff
changeset
|
4898 void |
|
39fcaaa973db
patch 8.0.1711: term_setsize() is not implemented yet
Christian Brabandt <cb@256bit.org>
parents:
13668
diff
changeset
|
4899 f_term_setsize(typval_T *argvars UNUSED, typval_T *rettv UNUSED) |
|
39fcaaa973db
patch 8.0.1711: term_setsize() is not implemented yet
Christian Brabandt <cb@256bit.org>
parents:
13668
diff
changeset
|
4900 { |
|
39fcaaa973db
patch 8.0.1711: term_setsize() is not implemented yet
Christian Brabandt <cb@256bit.org>
parents:
13668
diff
changeset
|
4901 buf_T *buf = term_get_buf(argvars, "term_setsize()"); |
|
39fcaaa973db
patch 8.0.1711: term_setsize() is not implemented yet
Christian Brabandt <cb@256bit.org>
parents:
13668
diff
changeset
|
4902 term_T *term; |
|
39fcaaa973db
patch 8.0.1711: term_setsize() is not implemented yet
Christian Brabandt <cb@256bit.org>
parents:
13668
diff
changeset
|
4903 varnumber_T rows, cols; |
|
39fcaaa973db
patch 8.0.1711: term_setsize() is not implemented yet
Christian Brabandt <cb@256bit.org>
parents:
13668
diff
changeset
|
4904 |
|
13684
1651a4c5c27a
patch 8.0.1714: term_setsize() does not give an error in a normal buffer
Christian Brabandt <cb@256bit.org>
parents:
13680
diff
changeset
|
4905 if (buf == NULL) |
|
1651a4c5c27a
patch 8.0.1714: term_setsize() does not give an error in a normal buffer
Christian Brabandt <cb@256bit.org>
parents:
13680
diff
changeset
|
4906 { |
|
1651a4c5c27a
patch 8.0.1714: term_setsize() does not give an error in a normal buffer
Christian Brabandt <cb@256bit.org>
parents:
13680
diff
changeset
|
4907 EMSG(_("E955: Not a terminal buffer")); |
|
1651a4c5c27a
patch 8.0.1714: term_setsize() does not give an error in a normal buffer
Christian Brabandt <cb@256bit.org>
parents:
13680
diff
changeset
|
4908 return; |
|
1651a4c5c27a
patch 8.0.1714: term_setsize() does not give an error in a normal buffer
Christian Brabandt <cb@256bit.org>
parents:
13680
diff
changeset
|
4909 } |
|
1651a4c5c27a
patch 8.0.1714: term_setsize() does not give an error in a normal buffer
Christian Brabandt <cb@256bit.org>
parents:
13680
diff
changeset
|
4910 if (buf->b_term->tl_vterm == NULL) |
|
13678
39fcaaa973db
patch 8.0.1711: term_setsize() is not implemented yet
Christian Brabandt <cb@256bit.org>
parents:
13668
diff
changeset
|
4911 return; |
|
39fcaaa973db
patch 8.0.1711: term_setsize() is not implemented yet
Christian Brabandt <cb@256bit.org>
parents:
13668
diff
changeset
|
4912 term = buf->b_term; |
|
39fcaaa973db
patch 8.0.1711: term_setsize() is not implemented yet
Christian Brabandt <cb@256bit.org>
parents:
13668
diff
changeset
|
4913 rows = get_tv_number(&argvars[1]); |
|
39fcaaa973db
patch 8.0.1711: term_setsize() is not implemented yet
Christian Brabandt <cb@256bit.org>
parents:
13668
diff
changeset
|
4914 rows = rows <= 0 ? term->tl_rows : rows; |
|
39fcaaa973db
patch 8.0.1711: term_setsize() is not implemented yet
Christian Brabandt <cb@256bit.org>
parents:
13668
diff
changeset
|
4915 cols = get_tv_number(&argvars[2]); |
|
39fcaaa973db
patch 8.0.1711: term_setsize() is not implemented yet
Christian Brabandt <cb@256bit.org>
parents:
13668
diff
changeset
|
4916 cols = cols <= 0 ? term->tl_cols : cols; |
|
39fcaaa973db
patch 8.0.1711: term_setsize() is not implemented yet
Christian Brabandt <cb@256bit.org>
parents:
13668
diff
changeset
|
4917 vterm_set_size(term->tl_vterm, rows, cols); |
|
39fcaaa973db
patch 8.0.1711: term_setsize() is not implemented yet
Christian Brabandt <cb@256bit.org>
parents:
13668
diff
changeset
|
4918 /* handle_resize() will resize the windows */ |
|
39fcaaa973db
patch 8.0.1711: term_setsize() is not implemented yet
Christian Brabandt <cb@256bit.org>
parents:
13668
diff
changeset
|
4919 |
|
39fcaaa973db
patch 8.0.1711: term_setsize() is not implemented yet
Christian Brabandt <cb@256bit.org>
parents:
13668
diff
changeset
|
4920 /* Get and remember the size we ended up with. Update the pty. */ |
|
39fcaaa973db
patch 8.0.1711: term_setsize() is not implemented yet
Christian Brabandt <cb@256bit.org>
parents:
13668
diff
changeset
|
4921 vterm_get_size(term->tl_vterm, &term->tl_rows, &term->tl_cols); |
|
39fcaaa973db
patch 8.0.1711: term_setsize() is not implemented yet
Christian Brabandt <cb@256bit.org>
parents:
13668
diff
changeset
|
4922 term_report_winsize(term, term->tl_rows, term->tl_cols); |
|
39fcaaa973db
patch 8.0.1711: term_setsize() is not implemented yet
Christian Brabandt <cb@256bit.org>
parents:
13668
diff
changeset
|
4923 } |
|
39fcaaa973db
patch 8.0.1711: term_setsize() is not implemented yet
Christian Brabandt <cb@256bit.org>
parents:
13668
diff
changeset
|
4924 |
|
39fcaaa973db
patch 8.0.1711: term_setsize() is not implemented yet
Christian Brabandt <cb@256bit.org>
parents:
13668
diff
changeset
|
4925 /* |
| 12502 | 4926 * "term_getstatus(buf)" function |
| 4927 */ | |
| 4928 void | |
| 4929 f_term_getstatus(typval_T *argvars, typval_T *rettv) | |
| 4930 { | |
|
13438
33eea5ce5415
patch 8.0.1593: :qall never exits with an active terminal window
Christian Brabandt <cb@256bit.org>
parents:
13435
diff
changeset
|
4931 buf_T *buf = term_get_buf(argvars, "term_getstatus()"); |
| 12502 | 4932 term_T *term; |
| 4933 char_u val[100]; | |
| 4934 | |
| 4935 rettv->v_type = VAR_STRING; | |
| 4936 if (buf == NULL) | |
| 4937 return; | |
| 4938 term = buf->b_term; | |
| 4939 | |
| 4940 if (term_job_running(term)) | |
| 4941 STRCPY(val, "running"); | |
| 4942 else | |
| 4943 STRCPY(val, "finished"); | |
| 4944 if (term->tl_normal_mode) | |
| 4945 STRCAT(val, ",normal"); | |
| 4946 rettv->vval.v_string = vim_strsave(val); | |
| 4947 } | |
| 4948 | |
| 4949 /* | |
| 4950 * "term_gettitle(buf)" function | |
| 4951 */ | |
| 4952 void | |
| 4953 f_term_gettitle(typval_T *argvars, typval_T *rettv) | |
| 4954 { | |
|
13438
33eea5ce5415
patch 8.0.1593: :qall never exits with an active terminal window
Christian Brabandt <cb@256bit.org>
parents:
13435
diff
changeset
|
4955 buf_T *buf = term_get_buf(argvars, "term_gettitle()"); |
| 12502 | 4956 |
| 4957 rettv->v_type = VAR_STRING; | |
| 4958 if (buf == NULL) | |
| 4959 return; | |
| 4960 | |
| 4961 if (buf->b_term->tl_title != NULL) | |
| 4962 rettv->vval.v_string = vim_strsave(buf->b_term->tl_title); | |
| 4963 } | |
| 4964 | |
| 4965 /* | |
| 4966 * "term_gettty(buf)" function | |
| 4967 */ | |
| 4968 void | |
| 4969 f_term_gettty(typval_T *argvars, typval_T *rettv) | |
| 4970 { | |
|
13438
33eea5ce5415
patch 8.0.1593: :qall never exits with an active terminal window
Christian Brabandt <cb@256bit.org>
parents:
13435
diff
changeset
|
4971 buf_T *buf = term_get_buf(argvars, "term_gettty()"); |
|
13864
de8455bd2d05
patch 8.0.1803: warning for uninitialized variable
Christian Brabandt <cb@256bit.org>
parents:
13862
diff
changeset
|
4972 char_u *p = NULL; |
| 12502 | 4973 int num = 0; |
| 4974 | |
| 4975 rettv->v_type = VAR_STRING; | |
| 4976 if (buf == NULL) | |
| 4977 return; | |
| 4978 if (argvars[1].v_type != VAR_UNKNOWN) | |
| 4979 num = get_tv_number(&argvars[1]); | |
| 4980 | |
| 4981 switch (num) | |
| 4982 { | |
| 4983 case 0: | |
| 4984 if (buf->b_term->tl_job != NULL) | |
| 4985 p = buf->b_term->tl_job->jv_tty_out; | |
| 4986 break; | |
| 4987 case 1: | |
| 4988 if (buf->b_term->tl_job != NULL) | |
| 4989 p = buf->b_term->tl_job->jv_tty_in; | |
| 4990 break; | |
| 4991 default: | |
| 4992 EMSG2(_(e_invarg2), get_tv_string(&argvars[1])); | |
| 4993 return; | |
| 4994 } | |
| 4995 if (p != NULL) | |
| 4996 rettv->vval.v_string = vim_strsave(p); | |
| 4997 } | |
| 4998 | |
| 4999 /* | |
| 5000 * "term_list()" function | |
| 5001 */ | |
| 5002 void | |
| 5003 f_term_list(typval_T *argvars UNUSED, typval_T *rettv) | |
| 5004 { | |
| 5005 term_T *tp; | |
| 5006 list_T *l; | |
| 5007 | |
| 5008 if (rettv_list_alloc(rettv) == FAIL || first_term == NULL) | |
| 5009 return; | |
| 5010 | |
| 5011 l = rettv->vval.v_list; | |
| 5012 for (tp = first_term; tp != NULL; tp = tp->tl_next) | |
| 5013 if (tp != NULL && tp->tl_buffer != NULL) | |
| 5014 if (list_append_number(l, | |
| 5015 (varnumber_T)tp->tl_buffer->b_fnum) == FAIL) | |
| 5016 return; | |
| 5017 } | |
| 5018 | |
| 5019 /* | |
| 5020 * "term_scrape(buf, row)" function | |
| 5021 */ | |
| 5022 void | |
| 5023 f_term_scrape(typval_T *argvars, typval_T *rettv) | |
| 5024 { | |
|
13438
33eea5ce5415
patch 8.0.1593: :qall never exits with an active terminal window
Christian Brabandt <cb@256bit.org>
parents:
13435
diff
changeset
|
5025 buf_T *buf = term_get_buf(argvars, "term_scrape()"); |
| 12502 | 5026 VTermScreen *screen = NULL; |
| 5027 VTermPos pos; | |
| 5028 list_T *l; | |
| 5029 term_T *term; | |
| 5030 char_u *p; | |
| 5031 sb_line_T *line; | |
| 5032 | |
| 5033 if (rettv_list_alloc(rettv) == FAIL) | |
| 5034 return; | |
| 5035 if (buf == NULL) | |
| 5036 return; | |
| 5037 term = buf->b_term; | |
| 5038 | |
| 5039 l = rettv->vval.v_list; | |
| 5040 pos.row = get_row_number(&argvars[1], term); | |
| 5041 | |
| 5042 if (term->tl_vterm != NULL) | |
| 5043 { | |
| 5044 screen = vterm_obtain_screen(term->tl_vterm); | |
| 5045 p = NULL; | |
| 5046 line = NULL; | |
| 5047 } | |
| 5048 else | |
| 5049 { | |
| 5050 linenr_T lnum = pos.row + term->tl_scrollback_scrolled; | |
| 5051 | |
| 5052 if (lnum < 0 || lnum >= term->tl_scrollback.ga_len) | |
| 5053 return; | |
| 5054 p = ml_get_buf(buf, lnum + 1, FALSE); | |
| 5055 line = (sb_line_T *)term->tl_scrollback.ga_data + lnum; | |
| 5056 } | |
| 5057 | |
| 5058 for (pos.col = 0; pos.col < term->tl_cols; ) | |
| 5059 { | |
| 5060 dict_T *dcell; | |
| 5061 int width; | |
| 5062 VTermScreenCellAttrs attrs; | |
| 5063 VTermColor fg, bg; | |
| 5064 char_u rgb[8]; | |
| 5065 char_u mbs[MB_MAXBYTES * VTERM_MAX_CHARS_PER_CELL + 1]; | |
| 5066 int off = 0; | |
| 5067 int i; | |
| 5068 | |
| 5069 if (screen == NULL) | |
| 5070 { | |
| 5071 cellattr_T *cellattr; | |
| 5072 int len; | |
| 5073 | |
| 5074 /* vterm has finished, get the cell from scrollback */ | |
| 5075 if (pos.col >= line->sb_cols) | |
| 5076 break; | |
| 5077 cellattr = line->sb_cells + pos.col; | |
| 5078 width = cellattr->width; | |
| 5079 attrs = cellattr->attrs; | |
| 5080 fg = cellattr->fg; | |
| 5081 bg = cellattr->bg; | |
| 5082 len = MB_PTR2LEN(p); | |
| 5083 mch_memmove(mbs, p, len); | |
| 5084 mbs[len] = NUL; | |
| 5085 p += len; | |
| 5086 } | |
| 5087 else | |
| 5088 { | |
| 5089 VTermScreenCell cell; | |
| 5090 if (vterm_screen_get_cell(screen, pos, &cell) == 0) | |
| 5091 break; | |
| 5092 for (i = 0; i < VTERM_MAX_CHARS_PER_CELL; ++i) | |
| 5093 { | |
| 5094 if (cell.chars[i] == 0) | |
| 5095 break; | |
| 5096 off += (*utf_char2bytes)((int)cell.chars[i], mbs + off); | |
| 5097 } | |
| 5098 mbs[off] = NUL; | |
| 5099 width = cell.width; | |
| 5100 attrs = cell.attrs; | |
| 5101 fg = cell.fg; | |
| 5102 bg = cell.bg; | |
| 5103 } | |
| 5104 dcell = dict_alloc(); | |
|
13250
fc33325c91c1
patch 8.0.1499: out-of-memory situation not correctly handled
Christian Brabandt <cb@256bit.org>
parents:
13244
diff
changeset
|
5105 if (dcell == NULL) |
|
fc33325c91c1
patch 8.0.1499: out-of-memory situation not correctly handled
Christian Brabandt <cb@256bit.org>
parents:
13244
diff
changeset
|
5106 break; |
| 12502 | 5107 list_append_dict(l, dcell); |
| 5108 | |
|
14301
3c80092eb211
patch 8.1.0166: using dict_add_nr_str() is clumsy
Christian Brabandt <cb@256bit.org>
parents:
14139
diff
changeset
|
5109 dict_add_string(dcell, "chars", mbs); |
| 12502 | 5110 |
| 5111 vim_snprintf((char *)rgb, 8, "#%02x%02x%02x", | |
| 5112 fg.red, fg.green, fg.blue); | |
|
14301
3c80092eb211
patch 8.1.0166: using dict_add_nr_str() is clumsy
Christian Brabandt <cb@256bit.org>
parents:
14139
diff
changeset
|
5113 dict_add_string(dcell, "fg", rgb); |
| 12502 | 5114 vim_snprintf((char *)rgb, 8, "#%02x%02x%02x", |
| 5115 bg.red, bg.green, bg.blue); | |
|
14301
3c80092eb211
patch 8.1.0166: using dict_add_nr_str() is clumsy
Christian Brabandt <cb@256bit.org>
parents:
14139
diff
changeset
|
5116 dict_add_string(dcell, "bg", rgb); |
|
3c80092eb211
patch 8.1.0166: using dict_add_nr_str() is clumsy
Christian Brabandt <cb@256bit.org>
parents:
14139
diff
changeset
|
5117 |
|
3c80092eb211
patch 8.1.0166: using dict_add_nr_str() is clumsy
Christian Brabandt <cb@256bit.org>
parents:
14139
diff
changeset
|
5118 dict_add_number(dcell, "attr", cell2attr(attrs, fg, bg)); |
|
3c80092eb211
patch 8.1.0166: using dict_add_nr_str() is clumsy
Christian Brabandt <cb@256bit.org>
parents:
14139
diff
changeset
|
5119 dict_add_number(dcell, "width", width); |
| 12502 | 5120 |
| 5121 ++pos.col; | |
| 5122 if (width == 2) | |
| 5123 ++pos.col; | |
| 5124 } | |
| 5125 } | |
| 5126 | |
| 5127 /* | |
| 5128 * "term_sendkeys(buf, keys)" function | |
| 5129 */ | |
| 5130 void | |
| 5131 f_term_sendkeys(typval_T *argvars, typval_T *rettv) | |
| 5132 { | |
|
13438
33eea5ce5415
patch 8.0.1593: :qall never exits with an active terminal window
Christian Brabandt <cb@256bit.org>
parents:
13435
diff
changeset
|
5133 buf_T *buf = term_get_buf(argvars, "term_sendkeys()"); |
| 12502 | 5134 char_u *msg; |
| 5135 term_T *term; | |
| 5136 | |
| 5137 rettv->v_type = VAR_UNKNOWN; | |
| 5138 if (buf == NULL) | |
| 5139 return; | |
| 5140 | |
| 5141 msg = get_tv_string_chk(&argvars[1]); | |
| 5142 if (msg == NULL) | |
| 5143 return; | |
| 5144 term = buf->b_term; | |
| 5145 if (term->tl_vterm == NULL) | |
| 5146 return; | |
| 5147 | |
| 5148 while (*msg != NUL) | |
| 5149 { | |
|
14029
d9fc15c833d5
patch 8.1.0032: BS in prompt buffer starts new line
Christian Brabandt <cb@256bit.org>
parents:
13996
diff
changeset
|
5150 int c; |
|
d9fc15c833d5
patch 8.1.0032: BS in prompt buffer starts new line
Christian Brabandt <cb@256bit.org>
parents:
13996
diff
changeset
|
5151 |
|
d9fc15c833d5
patch 8.1.0032: BS in prompt buffer starts new line
Christian Brabandt <cb@256bit.org>
parents:
13996
diff
changeset
|
5152 if (*msg == K_SPECIAL && msg[1] != NUL && msg[2] != NUL) |
|
d9fc15c833d5
patch 8.1.0032: BS in prompt buffer starts new line
Christian Brabandt <cb@256bit.org>
parents:
13996
diff
changeset
|
5153 { |
|
d9fc15c833d5
patch 8.1.0032: BS in prompt buffer starts new line
Christian Brabandt <cb@256bit.org>
parents:
13996
diff
changeset
|
5154 c = TO_SPECIAL(msg[1], msg[2]); |
|
d9fc15c833d5
patch 8.1.0032: BS in prompt buffer starts new line
Christian Brabandt <cb@256bit.org>
parents:
13996
diff
changeset
|
5155 msg += 3; |
|
d9fc15c833d5
patch 8.1.0032: BS in prompt buffer starts new line
Christian Brabandt <cb@256bit.org>
parents:
13996
diff
changeset
|
5156 } |
|
d9fc15c833d5
patch 8.1.0032: BS in prompt buffer starts new line
Christian Brabandt <cb@256bit.org>
parents:
13996
diff
changeset
|
5157 else |
|
d9fc15c833d5
patch 8.1.0032: BS in prompt buffer starts new line
Christian Brabandt <cb@256bit.org>
parents:
13996
diff
changeset
|
5158 { |
|
d9fc15c833d5
patch 8.1.0032: BS in prompt buffer starts new line
Christian Brabandt <cb@256bit.org>
parents:
13996
diff
changeset
|
5159 c = PTR2CHAR(msg); |
|
d9fc15c833d5
patch 8.1.0032: BS in prompt buffer starts new line
Christian Brabandt <cb@256bit.org>
parents:
13996
diff
changeset
|
5160 msg += MB_CPTR2LEN(msg); |
|
d9fc15c833d5
patch 8.1.0032: BS in prompt buffer starts new line
Christian Brabandt <cb@256bit.org>
parents:
13996
diff
changeset
|
5161 } |
|
d9fc15c833d5
patch 8.1.0032: BS in prompt buffer starts new line
Christian Brabandt <cb@256bit.org>
parents:
13996
diff
changeset
|
5162 send_keys_to_term(term, c, FALSE); |
| 12502 | 5163 } |
| 5164 } | |
| 5165 | |
|
13626
ab89131d30e0
patch 8.0.1685: can't set ANSI colors of a terminal window
Christian Brabandt <cb@256bit.org>
parents:
13624
diff
changeset
|
5166 #if defined(FEAT_GUI) || defined(FEAT_TERMGUICOLORS) || defined(PROTO) |
|
ab89131d30e0
patch 8.0.1685: can't set ANSI colors of a terminal window
Christian Brabandt <cb@256bit.org>
parents:
13624
diff
changeset
|
5167 /* |
|
ab89131d30e0
patch 8.0.1685: can't set ANSI colors of a terminal window
Christian Brabandt <cb@256bit.org>
parents:
13624
diff
changeset
|
5168 * "term_getansicolors(buf)" function |
|
ab89131d30e0
patch 8.0.1685: can't set ANSI colors of a terminal window
Christian Brabandt <cb@256bit.org>
parents:
13624
diff
changeset
|
5169 */ |
|
ab89131d30e0
patch 8.0.1685: can't set ANSI colors of a terminal window
Christian Brabandt <cb@256bit.org>
parents:
13624
diff
changeset
|
5170 void |
|
ab89131d30e0
patch 8.0.1685: can't set ANSI colors of a terminal window
Christian Brabandt <cb@256bit.org>
parents:
13624
diff
changeset
|
5171 f_term_getansicolors(typval_T *argvars, typval_T *rettv) |
|
ab89131d30e0
patch 8.0.1685: can't set ANSI colors of a terminal window
Christian Brabandt <cb@256bit.org>
parents:
13624
diff
changeset
|
5172 { |
|
ab89131d30e0
patch 8.0.1685: can't set ANSI colors of a terminal window
Christian Brabandt <cb@256bit.org>
parents:
13624
diff
changeset
|
5173 buf_T *buf = term_get_buf(argvars, "term_getansicolors()"); |
|
ab89131d30e0
patch 8.0.1685: can't set ANSI colors of a terminal window
Christian Brabandt <cb@256bit.org>
parents:
13624
diff
changeset
|
5174 term_T *term; |
|
ab89131d30e0
patch 8.0.1685: can't set ANSI colors of a terminal window
Christian Brabandt <cb@256bit.org>
parents:
13624
diff
changeset
|
5175 VTermState *state; |
|
ab89131d30e0
patch 8.0.1685: can't set ANSI colors of a terminal window
Christian Brabandt <cb@256bit.org>
parents:
13624
diff
changeset
|
5176 VTermColor color; |
|
ab89131d30e0
patch 8.0.1685: can't set ANSI colors of a terminal window
Christian Brabandt <cb@256bit.org>
parents:
13624
diff
changeset
|
5177 char_u hexbuf[10]; |
|
ab89131d30e0
patch 8.0.1685: can't set ANSI colors of a terminal window
Christian Brabandt <cb@256bit.org>
parents:
13624
diff
changeset
|
5178 int index; |
|
ab89131d30e0
patch 8.0.1685: can't set ANSI colors of a terminal window
Christian Brabandt <cb@256bit.org>
parents:
13624
diff
changeset
|
5179 list_T *list; |
|
ab89131d30e0
patch 8.0.1685: can't set ANSI colors of a terminal window
Christian Brabandt <cb@256bit.org>
parents:
13624
diff
changeset
|
5180 |
|
ab89131d30e0
patch 8.0.1685: can't set ANSI colors of a terminal window
Christian Brabandt <cb@256bit.org>
parents:
13624
diff
changeset
|
5181 if (rettv_list_alloc(rettv) == FAIL) |
|
ab89131d30e0
patch 8.0.1685: can't set ANSI colors of a terminal window
Christian Brabandt <cb@256bit.org>
parents:
13624
diff
changeset
|
5182 return; |
|
ab89131d30e0
patch 8.0.1685: can't set ANSI colors of a terminal window
Christian Brabandt <cb@256bit.org>
parents:
13624
diff
changeset
|
5183 |
|
ab89131d30e0
patch 8.0.1685: can't set ANSI colors of a terminal window
Christian Brabandt <cb@256bit.org>
parents:
13624
diff
changeset
|
5184 if (buf == NULL) |
|
ab89131d30e0
patch 8.0.1685: can't set ANSI colors of a terminal window
Christian Brabandt <cb@256bit.org>
parents:
13624
diff
changeset
|
5185 return; |
|
ab89131d30e0
patch 8.0.1685: can't set ANSI colors of a terminal window
Christian Brabandt <cb@256bit.org>
parents:
13624
diff
changeset
|
5186 term = buf->b_term; |
|
ab89131d30e0
patch 8.0.1685: can't set ANSI colors of a terminal window
Christian Brabandt <cb@256bit.org>
parents:
13624
diff
changeset
|
5187 if (term->tl_vterm == NULL) |
|
ab89131d30e0
patch 8.0.1685: can't set ANSI colors of a terminal window
Christian Brabandt <cb@256bit.org>
parents:
13624
diff
changeset
|
5188 return; |
|
ab89131d30e0
patch 8.0.1685: can't set ANSI colors of a terminal window
Christian Brabandt <cb@256bit.org>
parents:
13624
diff
changeset
|
5189 |
|
ab89131d30e0
patch 8.0.1685: can't set ANSI colors of a terminal window
Christian Brabandt <cb@256bit.org>
parents:
13624
diff
changeset
|
5190 list = rettv->vval.v_list; |
|
ab89131d30e0
patch 8.0.1685: can't set ANSI colors of a terminal window
Christian Brabandt <cb@256bit.org>
parents:
13624
diff
changeset
|
5191 state = vterm_obtain_state(term->tl_vterm); |
|
ab89131d30e0
patch 8.0.1685: can't set ANSI colors of a terminal window
Christian Brabandt <cb@256bit.org>
parents:
13624
diff
changeset
|
5192 for (index = 0; index < 16; index++) |
|
ab89131d30e0
patch 8.0.1685: can't set ANSI colors of a terminal window
Christian Brabandt <cb@256bit.org>
parents:
13624
diff
changeset
|
5193 { |
|
ab89131d30e0
patch 8.0.1685: can't set ANSI colors of a terminal window
Christian Brabandt <cb@256bit.org>
parents:
13624
diff
changeset
|
5194 vterm_state_get_palette_color(state, index, &color); |
|
ab89131d30e0
patch 8.0.1685: can't set ANSI colors of a terminal window
Christian Brabandt <cb@256bit.org>
parents:
13624
diff
changeset
|
5195 sprintf((char *)hexbuf, "#%02x%02x%02x", |
|
ab89131d30e0
patch 8.0.1685: can't set ANSI colors of a terminal window
Christian Brabandt <cb@256bit.org>
parents:
13624
diff
changeset
|
5196 color.red, color.green, color.blue); |
|
ab89131d30e0
patch 8.0.1685: can't set ANSI colors of a terminal window
Christian Brabandt <cb@256bit.org>
parents:
13624
diff
changeset
|
5197 if (list_append_string(list, hexbuf, 7) == FAIL) |
|
ab89131d30e0
patch 8.0.1685: can't set ANSI colors of a terminal window
Christian Brabandt <cb@256bit.org>
parents:
13624
diff
changeset
|
5198 return; |
|
ab89131d30e0
patch 8.0.1685: can't set ANSI colors of a terminal window
Christian Brabandt <cb@256bit.org>
parents:
13624
diff
changeset
|
5199 } |
|
ab89131d30e0
patch 8.0.1685: can't set ANSI colors of a terminal window
Christian Brabandt <cb@256bit.org>
parents:
13624
diff
changeset
|
5200 } |
|
ab89131d30e0
patch 8.0.1685: can't set ANSI colors of a terminal window
Christian Brabandt <cb@256bit.org>
parents:
13624
diff
changeset
|
5201 |
|
ab89131d30e0
patch 8.0.1685: can't set ANSI colors of a terminal window
Christian Brabandt <cb@256bit.org>
parents:
13624
diff
changeset
|
5202 /* |
|
ab89131d30e0
patch 8.0.1685: can't set ANSI colors of a terminal window
Christian Brabandt <cb@256bit.org>
parents:
13624
diff
changeset
|
5203 * "term_setansicolors(buf, list)" function |
|
ab89131d30e0
patch 8.0.1685: can't set ANSI colors of a terminal window
Christian Brabandt <cb@256bit.org>
parents:
13624
diff
changeset
|
5204 */ |
|
ab89131d30e0
patch 8.0.1685: can't set ANSI colors of a terminal window
Christian Brabandt <cb@256bit.org>
parents:
13624
diff
changeset
|
5205 void |
|
ab89131d30e0
patch 8.0.1685: can't set ANSI colors of a terminal window
Christian Brabandt <cb@256bit.org>
parents:
13624
diff
changeset
|
5206 f_term_setansicolors(typval_T *argvars, typval_T *rettv UNUSED) |
|
ab89131d30e0
patch 8.0.1685: can't set ANSI colors of a terminal window
Christian Brabandt <cb@256bit.org>
parents:
13624
diff
changeset
|
5207 { |
|
ab89131d30e0
patch 8.0.1685: can't set ANSI colors of a terminal window
Christian Brabandt <cb@256bit.org>
parents:
13624
diff
changeset
|
5208 buf_T *buf = term_get_buf(argvars, "term_setansicolors()"); |
|
ab89131d30e0
patch 8.0.1685: can't set ANSI colors of a terminal window
Christian Brabandt <cb@256bit.org>
parents:
13624
diff
changeset
|
5209 term_T *term; |
|
ab89131d30e0
patch 8.0.1685: can't set ANSI colors of a terminal window
Christian Brabandt <cb@256bit.org>
parents:
13624
diff
changeset
|
5210 |
|
ab89131d30e0
patch 8.0.1685: can't set ANSI colors of a terminal window
Christian Brabandt <cb@256bit.org>
parents:
13624
diff
changeset
|
5211 if (buf == NULL) |
|
ab89131d30e0
patch 8.0.1685: can't set ANSI colors of a terminal window
Christian Brabandt <cb@256bit.org>
parents:
13624
diff
changeset
|
5212 return; |
|
ab89131d30e0
patch 8.0.1685: can't set ANSI colors of a terminal window
Christian Brabandt <cb@256bit.org>
parents:
13624
diff
changeset
|
5213 term = buf->b_term; |
|
ab89131d30e0
patch 8.0.1685: can't set ANSI colors of a terminal window
Christian Brabandt <cb@256bit.org>
parents:
13624
diff
changeset
|
5214 if (term->tl_vterm == NULL) |
|
ab89131d30e0
patch 8.0.1685: can't set ANSI colors of a terminal window
Christian Brabandt <cb@256bit.org>
parents:
13624
diff
changeset
|
5215 return; |
|
ab89131d30e0
patch 8.0.1685: can't set ANSI colors of a terminal window
Christian Brabandt <cb@256bit.org>
parents:
13624
diff
changeset
|
5216 |
|
ab89131d30e0
patch 8.0.1685: can't set ANSI colors of a terminal window
Christian Brabandt <cb@256bit.org>
parents:
13624
diff
changeset
|
5217 if (argvars[1].v_type != VAR_LIST || argvars[1].vval.v_list == NULL) |
|
ab89131d30e0
patch 8.0.1685: can't set ANSI colors of a terminal window
Christian Brabandt <cb@256bit.org>
parents:
13624
diff
changeset
|
5218 { |
|
ab89131d30e0
patch 8.0.1685: can't set ANSI colors of a terminal window
Christian Brabandt <cb@256bit.org>
parents:
13624
diff
changeset
|
5219 EMSG(_(e_listreq)); |
|
ab89131d30e0
patch 8.0.1685: can't set ANSI colors of a terminal window
Christian Brabandt <cb@256bit.org>
parents:
13624
diff
changeset
|
5220 return; |
|
ab89131d30e0
patch 8.0.1685: can't set ANSI colors of a terminal window
Christian Brabandt <cb@256bit.org>
parents:
13624
diff
changeset
|
5221 } |
|
ab89131d30e0
patch 8.0.1685: can't set ANSI colors of a terminal window
Christian Brabandt <cb@256bit.org>
parents:
13624
diff
changeset
|
5222 |
|
ab89131d30e0
patch 8.0.1685: can't set ANSI colors of a terminal window
Christian Brabandt <cb@256bit.org>
parents:
13624
diff
changeset
|
5223 if (set_ansi_colors_list(term->tl_vterm, argvars[1].vval.v_list) == FAIL) |
|
ab89131d30e0
patch 8.0.1685: can't set ANSI colors of a terminal window
Christian Brabandt <cb@256bit.org>
parents:
13624
diff
changeset
|
5224 EMSG(_(e_invarg)); |
|
ab89131d30e0
patch 8.0.1685: can't set ANSI colors of a terminal window
Christian Brabandt <cb@256bit.org>
parents:
13624
diff
changeset
|
5225 } |
|
ab89131d30e0
patch 8.0.1685: can't set ANSI colors of a terminal window
Christian Brabandt <cb@256bit.org>
parents:
13624
diff
changeset
|
5226 #endif |
|
ab89131d30e0
patch 8.0.1685: can't set ANSI colors of a terminal window
Christian Brabandt <cb@256bit.org>
parents:
13624
diff
changeset
|
5227 |
| 12502 | 5228 /* |
|
13435
fa198b71bab2
patch 8.0.1592: terminal windows in a session are not properly restored
Christian Brabandt <cb@256bit.org>
parents:
13380
diff
changeset
|
5229 * "term_setrestore(buf, command)" function |
|
fa198b71bab2
patch 8.0.1592: terminal windows in a session are not properly restored
Christian Brabandt <cb@256bit.org>
parents:
13380
diff
changeset
|
5230 */ |
|
fa198b71bab2
patch 8.0.1592: terminal windows in a session are not properly restored
Christian Brabandt <cb@256bit.org>
parents:
13380
diff
changeset
|
5231 void |
|
fa198b71bab2
patch 8.0.1592: terminal windows in a session are not properly restored
Christian Brabandt <cb@256bit.org>
parents:
13380
diff
changeset
|
5232 f_term_setrestore(typval_T *argvars UNUSED, typval_T *rettv UNUSED) |
|
fa198b71bab2
patch 8.0.1592: terminal windows in a session are not properly restored
Christian Brabandt <cb@256bit.org>
parents:
13380
diff
changeset
|
5233 { |
|
fa198b71bab2
patch 8.0.1592: terminal windows in a session are not properly restored
Christian Brabandt <cb@256bit.org>
parents:
13380
diff
changeset
|
5234 #if defined(FEAT_SESSION) |
|
13438
33eea5ce5415
patch 8.0.1593: :qall never exits with an active terminal window
Christian Brabandt <cb@256bit.org>
parents:
13435
diff
changeset
|
5235 buf_T *buf = term_get_buf(argvars, "term_setrestore()"); |
|
13435
fa198b71bab2
patch 8.0.1592: terminal windows in a session are not properly restored
Christian Brabandt <cb@256bit.org>
parents:
13380
diff
changeset
|
5236 term_T *term; |
|
fa198b71bab2
patch 8.0.1592: terminal windows in a session are not properly restored
Christian Brabandt <cb@256bit.org>
parents:
13380
diff
changeset
|
5237 char_u *cmd; |
|
fa198b71bab2
patch 8.0.1592: terminal windows in a session are not properly restored
Christian Brabandt <cb@256bit.org>
parents:
13380
diff
changeset
|
5238 |
|
fa198b71bab2
patch 8.0.1592: terminal windows in a session are not properly restored
Christian Brabandt <cb@256bit.org>
parents:
13380
diff
changeset
|
5239 if (buf == NULL) |
|
fa198b71bab2
patch 8.0.1592: terminal windows in a session are not properly restored
Christian Brabandt <cb@256bit.org>
parents:
13380
diff
changeset
|
5240 return; |
|
fa198b71bab2
patch 8.0.1592: terminal windows in a session are not properly restored
Christian Brabandt <cb@256bit.org>
parents:
13380
diff
changeset
|
5241 term = buf->b_term; |
|
fa198b71bab2
patch 8.0.1592: terminal windows in a session are not properly restored
Christian Brabandt <cb@256bit.org>
parents:
13380
diff
changeset
|
5242 vim_free(term->tl_command); |
|
fa198b71bab2
patch 8.0.1592: terminal windows in a session are not properly restored
Christian Brabandt <cb@256bit.org>
parents:
13380
diff
changeset
|
5243 cmd = get_tv_string_chk(&argvars[1]); |
|
fa198b71bab2
patch 8.0.1592: terminal windows in a session are not properly restored
Christian Brabandt <cb@256bit.org>
parents:
13380
diff
changeset
|
5244 if (cmd != NULL) |
|
fa198b71bab2
patch 8.0.1592: terminal windows in a session are not properly restored
Christian Brabandt <cb@256bit.org>
parents:
13380
diff
changeset
|
5245 term->tl_command = vim_strsave(cmd); |
|
fa198b71bab2
patch 8.0.1592: terminal windows in a session are not properly restored
Christian Brabandt <cb@256bit.org>
parents:
13380
diff
changeset
|
5246 else |
|
fa198b71bab2
patch 8.0.1592: terminal windows in a session are not properly restored
Christian Brabandt <cb@256bit.org>
parents:
13380
diff
changeset
|
5247 term->tl_command = NULL; |
|
fa198b71bab2
patch 8.0.1592: terminal windows in a session are not properly restored
Christian Brabandt <cb@256bit.org>
parents:
13380
diff
changeset
|
5248 #endif |
|
fa198b71bab2
patch 8.0.1592: terminal windows in a session are not properly restored
Christian Brabandt <cb@256bit.org>
parents:
13380
diff
changeset
|
5249 } |
|
fa198b71bab2
patch 8.0.1592: terminal windows in a session are not properly restored
Christian Brabandt <cb@256bit.org>
parents:
13380
diff
changeset
|
5250 |
|
fa198b71bab2
patch 8.0.1592: terminal windows in a session are not properly restored
Christian Brabandt <cb@256bit.org>
parents:
13380
diff
changeset
|
5251 /* |
|
13438
33eea5ce5415
patch 8.0.1593: :qall never exits with an active terminal window
Christian Brabandt <cb@256bit.org>
parents:
13435
diff
changeset
|
5252 * "term_setkill(buf, how)" function |
|
33eea5ce5415
patch 8.0.1593: :qall never exits with an active terminal window
Christian Brabandt <cb@256bit.org>
parents:
13435
diff
changeset
|
5253 */ |
|
33eea5ce5415
patch 8.0.1593: :qall never exits with an active terminal window
Christian Brabandt <cb@256bit.org>
parents:
13435
diff
changeset
|
5254 void |
|
33eea5ce5415
patch 8.0.1593: :qall never exits with an active terminal window
Christian Brabandt <cb@256bit.org>
parents:
13435
diff
changeset
|
5255 f_term_setkill(typval_T *argvars UNUSED, typval_T *rettv UNUSED) |
|
33eea5ce5415
patch 8.0.1593: :qall never exits with an active terminal window
Christian Brabandt <cb@256bit.org>
parents:
13435
diff
changeset
|
5256 { |
|
33eea5ce5415
patch 8.0.1593: :qall never exits with an active terminal window
Christian Brabandt <cb@256bit.org>
parents:
13435
diff
changeset
|
5257 buf_T *buf = term_get_buf(argvars, "term_setkill()"); |
|
33eea5ce5415
patch 8.0.1593: :qall never exits with an active terminal window
Christian Brabandt <cb@256bit.org>
parents:
13435
diff
changeset
|
5258 term_T *term; |
|
33eea5ce5415
patch 8.0.1593: :qall never exits with an active terminal window
Christian Brabandt <cb@256bit.org>
parents:
13435
diff
changeset
|
5259 char_u *how; |
|
33eea5ce5415
patch 8.0.1593: :qall never exits with an active terminal window
Christian Brabandt <cb@256bit.org>
parents:
13435
diff
changeset
|
5260 |
|
33eea5ce5415
patch 8.0.1593: :qall never exits with an active terminal window
Christian Brabandt <cb@256bit.org>
parents:
13435
diff
changeset
|
5261 if (buf == NULL) |
|
33eea5ce5415
patch 8.0.1593: :qall never exits with an active terminal window
Christian Brabandt <cb@256bit.org>
parents:
13435
diff
changeset
|
5262 return; |
|
33eea5ce5415
patch 8.0.1593: :qall never exits with an active terminal window
Christian Brabandt <cb@256bit.org>
parents:
13435
diff
changeset
|
5263 term = buf->b_term; |
|
33eea5ce5415
patch 8.0.1593: :qall never exits with an active terminal window
Christian Brabandt <cb@256bit.org>
parents:
13435
diff
changeset
|
5264 vim_free(term->tl_kill); |
|
33eea5ce5415
patch 8.0.1593: :qall never exits with an active terminal window
Christian Brabandt <cb@256bit.org>
parents:
13435
diff
changeset
|
5265 how = get_tv_string_chk(&argvars[1]); |
|
33eea5ce5415
patch 8.0.1593: :qall never exits with an active terminal window
Christian Brabandt <cb@256bit.org>
parents:
13435
diff
changeset
|
5266 if (how != NULL) |
|
33eea5ce5415
patch 8.0.1593: :qall never exits with an active terminal window
Christian Brabandt <cb@256bit.org>
parents:
13435
diff
changeset
|
5267 term->tl_kill = vim_strsave(how); |
|
33eea5ce5415
patch 8.0.1593: :qall never exits with an active terminal window
Christian Brabandt <cb@256bit.org>
parents:
13435
diff
changeset
|
5268 else |
|
33eea5ce5415
patch 8.0.1593: :qall never exits with an active terminal window
Christian Brabandt <cb@256bit.org>
parents:
13435
diff
changeset
|
5269 term->tl_kill = NULL; |
|
33eea5ce5415
patch 8.0.1593: :qall never exits with an active terminal window
Christian Brabandt <cb@256bit.org>
parents:
13435
diff
changeset
|
5270 } |
|
33eea5ce5415
patch 8.0.1593: :qall never exits with an active terminal window
Christian Brabandt <cb@256bit.org>
parents:
13435
diff
changeset
|
5271 |
|
33eea5ce5415
patch 8.0.1593: :qall never exits with an active terminal window
Christian Brabandt <cb@256bit.org>
parents:
13435
diff
changeset
|
5272 /* |
| 12502 | 5273 * "term_start(command, options)" function |
| 5274 */ | |
| 5275 void | |
| 5276 f_term_start(typval_T *argvars, typval_T *rettv) | |
| 5277 { | |
| 5278 jobopt_T opt; | |
| 5279 buf_T *buf; | |
| 5280 | |
| 5281 init_job_options(&opt); | |
| 5282 if (argvars[1].v_type != VAR_UNKNOWN | |
| 5283 && get_job_options(&argvars[1], &opt, | |
| 5284 JO_TIMEOUT_ALL + JO_STOPONEXIT | |
| 5285 + JO_CALLBACK + JO_OUT_CALLBACK + JO_ERR_CALLBACK | |
| 5286 + JO_EXIT_CB + JO_CLOSE_CALLBACK + JO_OUT_IO, | |
| 5287 JO2_TERM_NAME + JO2_TERM_FINISH + JO2_HIDDEN + JO2_TERM_OPENCMD | |
| 5288 + JO2_TERM_COLS + JO2_TERM_ROWS + JO2_VERTICAL + JO2_CURWIN | |
|
13435
fa198b71bab2
patch 8.0.1592: terminal windows in a session are not properly restored
Christian Brabandt <cb@256bit.org>
parents:
13380
diff
changeset
|
5289 + JO2_CWD + JO2_ENV + JO2_EOF_CHARS |
|
13626
ab89131d30e0
patch 8.0.1685: can't set ANSI colors of a terminal window
Christian Brabandt <cb@256bit.org>
parents:
13624
diff
changeset
|
5290 + JO2_NORESTORE + JO2_TERM_KILL |
|
ab89131d30e0
patch 8.0.1685: can't set ANSI colors of a terminal window
Christian Brabandt <cb@256bit.org>
parents:
13624
diff
changeset
|
5291 + JO2_ANSI_COLORS) == FAIL) |
| 12502 | 5292 return; |
| 5293 | |
|
13470
6faef782f50b
patch 8.0.1609: shell commands in the GUI use a dumb terminal
Christian Brabandt <cb@256bit.org>
parents:
13458
diff
changeset
|
5294 buf = term_start(&argvars[0], NULL, &opt, 0); |
| 12502 | 5295 |
| 5296 if (buf != NULL && buf->b_term != NULL) | |
| 5297 rettv->vval.v_number = buf->b_fnum; | |
| 5298 } | |
| 5299 | |
| 5300 /* | |
| 5301 * "term_wait" function | |
| 5302 */ | |
| 5303 void | |
| 5304 f_term_wait(typval_T *argvars, typval_T *rettv UNUSED) | |
| 5305 { | |
|
13438
33eea5ce5415
patch 8.0.1593: :qall never exits with an active terminal window
Christian Brabandt <cb@256bit.org>
parents:
13435
diff
changeset
|
5306 buf_T *buf = term_get_buf(argvars, "term_wait()"); |
| 12502 | 5307 |
| 5308 if (buf == NULL) | |
| 5309 return; | |
| 5310 if (buf->b_term->tl_job == NULL) | |
| 5311 { | |
| 5312 ch_log(NULL, "term_wait(): no job to wait for"); | |
| 5313 return; | |
| 5314 } | |
| 5315 if (buf->b_term->tl_job->jv_channel == NULL) | |
| 5316 /* channel is closed, nothing to do */ | |
| 5317 return; | |
| 5318 | |
| 5319 /* Get the job status, this will detect a job that finished. */ | |
|
13219
4b8d89ea9edb
patch 8.0.1484: reduntant conditions
Christian Brabandt <cb@256bit.org>
parents:
13206
diff
changeset
|
5320 if (!buf->b_term->tl_job->jv_channel->ch_keep_open |
| 12502 | 5321 && STRCMP(job_status(buf->b_term->tl_job), "dead") == 0) |
| 5322 { | |
| 5323 /* The job is dead, keep reading channel I/O until the channel is | |
| 5324 * closed. buf->b_term may become NULL if the terminal was closed while | |
| 5325 * waiting. */ | |
| 5326 ch_log(NULL, "term_wait(): waiting for channel to close"); | |
| 5327 while (buf->b_term != NULL && !buf->b_term->tl_channel_closed) | |
| 5328 { | |
| 5329 mch_check_messages(); | |
| 5330 parse_queued_messages(); | |
|
13996
59121ffd7fce
patch 8.1.0016: possible crash in term_wait()
Christian Brabandt <cb@256bit.org>
parents:
13994
diff
changeset
|
5331 ui_delay(10L, FALSE); |
|
12881
1c05b29ab125
patch 8.0.1317: accessing freed memory in term_wait()
Christian Brabandt <cb@256bit.org>
parents:
12865
diff
changeset
|
5332 if (!buf_valid(buf)) |
|
1c05b29ab125
patch 8.0.1317: accessing freed memory in term_wait()
Christian Brabandt <cb@256bit.org>
parents:
12865
diff
changeset
|
5333 /* If the terminal is closed when the channel is closed the |
|
1c05b29ab125
patch 8.0.1317: accessing freed memory in term_wait()
Christian Brabandt <cb@256bit.org>
parents:
12865
diff
changeset
|
5334 * buffer disappears. */ |
|
1c05b29ab125
patch 8.0.1317: accessing freed memory in term_wait()
Christian Brabandt <cb@256bit.org>
parents:
12865
diff
changeset
|
5335 break; |
| 12502 | 5336 } |
| 5337 mch_check_messages(); | |
| 5338 parse_queued_messages(); | |
| 5339 } | |
| 5340 else | |
| 5341 { | |
| 5342 long wait = 10L; | |
| 5343 | |
| 5344 mch_check_messages(); | |
| 5345 parse_queued_messages(); | |
| 5346 | |
| 5347 /* Wait for some time for any channel I/O. */ | |
| 5348 if (argvars[1].v_type != VAR_UNKNOWN) | |
| 5349 wait = get_tv_number(&argvars[1]); | |
| 5350 ui_delay(wait, TRUE); | |
| 5351 mch_check_messages(); | |
| 5352 | |
| 5353 /* Flushing messages on channels is hopefully sufficient. | |
| 5354 * TODO: is there a better way? */ | |
| 5355 parse_queued_messages(); | |
| 5356 } | |
| 5357 } | |
| 5358 | |
| 5359 /* | |
| 5360 * Called when a channel has sent all the lines to a terminal. | |
| 5361 * Send a CTRL-D to mark the end of the text. | |
| 5362 */ | |
| 5363 void | |
| 5364 term_send_eof(channel_T *ch) | |
| 5365 { | |
| 5366 term_T *term; | |
| 5367 | |
| 5368 for (term = first_term; term != NULL; term = term->tl_next) | |
| 5369 if (term->tl_job == ch->ch_job) | |
| 5370 { | |
| 5371 if (term->tl_eof_chars != NULL) | |
| 5372 { | |
| 5373 channel_send(ch, PART_IN, term->tl_eof_chars, | |
| 5374 (int)STRLEN(term->tl_eof_chars), NULL); | |
| 5375 channel_send(ch, PART_IN, (char_u *)"\r", 1, NULL); | |
| 5376 } | |
| 5377 # ifdef WIN3264 | |
| 5378 else | |
| 5379 /* Default: CTRL-D */ | |
| 5380 channel_send(ch, PART_IN, (char_u *)"\004\r", 2, NULL); | |
| 5381 # endif | |
| 5382 } | |
| 5383 } | |
| 5384 | |
|
14139
4d3f6bf86bec
patch 8.1.0087: v:shell_error is always zero when using terminal for "!cmd"
Christian Brabandt <cb@256bit.org>
parents:
14117
diff
changeset
|
5385 job_T * |
|
4d3f6bf86bec
patch 8.1.0087: v:shell_error is always zero when using terminal for "!cmd"
Christian Brabandt <cb@256bit.org>
parents:
14117
diff
changeset
|
5386 term_getjob(term_T *term) |
|
4d3f6bf86bec
patch 8.1.0087: v:shell_error is always zero when using terminal for "!cmd"
Christian Brabandt <cb@256bit.org>
parents:
14117
diff
changeset
|
5387 { |
|
4d3f6bf86bec
patch 8.1.0087: v:shell_error is always zero when using terminal for "!cmd"
Christian Brabandt <cb@256bit.org>
parents:
14117
diff
changeset
|
5388 return term != NULL ? term->tl_job : NULL; |
|
4d3f6bf86bec
patch 8.1.0087: v:shell_error is always zero when using terminal for "!cmd"
Christian Brabandt <cb@256bit.org>
parents:
14117
diff
changeset
|
5389 } |
|
4d3f6bf86bec
patch 8.1.0087: v:shell_error is always zero when using terminal for "!cmd"
Christian Brabandt <cb@256bit.org>
parents:
14117
diff
changeset
|
5390 |
| 12502 | 5391 # if defined(WIN3264) || defined(PROTO) |
| 5392 | |
| 5393 /************************************** | |
| 5394 * 2. MS-Windows implementation. | |
| 5395 */ | |
| 5396 | |
| 5397 # ifndef PROTO | |
| 5398 | |
| 5399 #define WINPTY_SPAWN_FLAG_AUTO_SHUTDOWN 1ul | |
| 5400 #define WINPTY_SPAWN_FLAG_EXIT_AFTER_SHUTDOWN 2ull | |
|
13206
53f0c469dfc6
patch 8.0.1477: redraw flicker when moving the mouse outside of terminal window
Christian Brabandt <cb@256bit.org>
parents:
13132
diff
changeset
|
5401 #define WINPTY_MOUSE_MODE_FORCE 2 |
| 12502 | 5402 |
| 5403 void* (*winpty_config_new)(UINT64, void*); | |
| 5404 void* (*winpty_open)(void*, void*); | |
| 5405 void* (*winpty_spawn_config_new)(UINT64, void*, LPCWSTR, void*, void*, void*); | |
| 5406 BOOL (*winpty_spawn)(void*, void*, HANDLE*, HANDLE*, DWORD*, void*); | |
| 5407 void (*winpty_config_set_mouse_mode)(void*, int); | |
| 5408 void (*winpty_config_set_initial_size)(void*, int, int); | |
| 5409 LPCWSTR (*winpty_conin_name)(void*); | |
| 5410 LPCWSTR (*winpty_conout_name)(void*); | |
| 5411 LPCWSTR (*winpty_conerr_name)(void*); | |
| 5412 void (*winpty_free)(void*); | |
| 5413 void (*winpty_config_free)(void*); | |
| 5414 void (*winpty_spawn_config_free)(void*); | |
| 5415 void (*winpty_error_free)(void*); | |
| 5416 LPCWSTR (*winpty_error_msg)(void*); | |
| 5417 BOOL (*winpty_set_size)(void*, int, int, void*); | |
| 5418 HANDLE (*winpty_agent_process)(void*); | |
| 5419 | |
| 5420 #define WINPTY_DLL "winpty.dll" | |
| 5421 | |
| 5422 static HINSTANCE hWinPtyDLL = NULL; | |
| 5423 # endif | |
| 5424 | |
| 5425 static int | |
| 5426 dyn_winpty_init(int verbose) | |
| 5427 { | |
| 5428 int i; | |
| 5429 static struct | |
| 5430 { | |
| 5431 char *name; | |
| 5432 FARPROC *ptr; | |
| 5433 } winpty_entry[] = | |
| 5434 { | |
| 5435 {"winpty_conerr_name", (FARPROC*)&winpty_conerr_name}, | |
| 5436 {"winpty_config_free", (FARPROC*)&winpty_config_free}, | |
| 5437 {"winpty_config_new", (FARPROC*)&winpty_config_new}, | |
| 5438 {"winpty_config_set_mouse_mode", | |
| 5439 (FARPROC*)&winpty_config_set_mouse_mode}, | |
| 5440 {"winpty_config_set_initial_size", | |
| 5441 (FARPROC*)&winpty_config_set_initial_size}, | |
| 5442 {"winpty_conin_name", (FARPROC*)&winpty_conin_name}, | |
| 5443 {"winpty_conout_name", (FARPROC*)&winpty_conout_name}, | |
| 5444 {"winpty_error_free", (FARPROC*)&winpty_error_free}, | |
| 5445 {"winpty_free", (FARPROC*)&winpty_free}, | |
| 5446 {"winpty_open", (FARPROC*)&winpty_open}, | |
| 5447 {"winpty_spawn", (FARPROC*)&winpty_spawn}, | |
| 5448 {"winpty_spawn_config_free", (FARPROC*)&winpty_spawn_config_free}, | |
| 5449 {"winpty_spawn_config_new", (FARPROC*)&winpty_spawn_config_new}, | |
| 5450 {"winpty_error_msg", (FARPROC*)&winpty_error_msg}, | |
| 5451 {"winpty_set_size", (FARPROC*)&winpty_set_size}, | |
| 5452 {"winpty_agent_process", (FARPROC*)&winpty_agent_process}, | |
| 5453 {NULL, NULL} | |
| 5454 }; | |
| 5455 | |
| 5456 /* No need to initialize twice. */ | |
| 5457 if (hWinPtyDLL) | |
| 5458 return OK; | |
| 5459 /* Load winpty.dll, prefer using the 'winptydll' option, fall back to just | |
| 5460 * winpty.dll. */ | |
| 5461 if (*p_winptydll != NUL) | |
| 5462 hWinPtyDLL = vimLoadLib((char *)p_winptydll); | |
| 5463 if (!hWinPtyDLL) | |
| 5464 hWinPtyDLL = vimLoadLib(WINPTY_DLL); | |
| 5465 if (!hWinPtyDLL) | |
| 5466 { | |
| 5467 if (verbose) | |
| 5468 EMSG2(_(e_loadlib), *p_winptydll != NUL ? p_winptydll | |
| 5469 : (char_u *)WINPTY_DLL); | |
| 5470 return FAIL; | |
| 5471 } | |
| 5472 for (i = 0; winpty_entry[i].name != NULL | |
| 5473 && winpty_entry[i].ptr != NULL; ++i) | |
| 5474 { | |
| 5475 if ((*winpty_entry[i].ptr = (FARPROC)GetProcAddress(hWinPtyDLL, | |
| 5476 winpty_entry[i].name)) == NULL) | |
| 5477 { | |
| 5478 if (verbose) | |
| 5479 EMSG2(_(e_loadfunc), winpty_entry[i].name); | |
| 5480 return FAIL; | |
| 5481 } | |
| 5482 } | |
| 5483 | |
| 5484 return OK; | |
| 5485 } | |
| 5486 | |
| 5487 /* | |
| 5488 * Create a new terminal of "rows" by "cols" cells. | |
| 5489 * Store a reference in "term". | |
| 5490 * Return OK or FAIL. | |
| 5491 */ | |
| 5492 static int | |
| 5493 term_and_job_init( | |
| 5494 term_T *term, | |
| 5495 typval_T *argvar, | |
|
13470
6faef782f50b
patch 8.0.1609: shell commands in the GUI use a dumb terminal
Christian Brabandt <cb@256bit.org>
parents:
13458
diff
changeset
|
5496 char **argv UNUSED, |
|
13860
7f892e37b017
patch 8.0.1801: MS-Windows: redirecting terminal output does not work
Christian Brabandt <cb@256bit.org>
parents:
13851
diff
changeset
|
5497 jobopt_T *opt, |
|
7f892e37b017
patch 8.0.1801: MS-Windows: redirecting terminal output does not work
Christian Brabandt <cb@256bit.org>
parents:
13851
diff
changeset
|
5498 jobopt_T *orig_opt) |
| 12502 | 5499 { |
| 5500 WCHAR *cmd_wchar = NULL; | |
| 5501 WCHAR *cwd_wchar = NULL; | |
|
12724
17c257dd2438
patch 8.0.1240: MS-Windows: term_start() does not support environment
Christian Brabandt <cb@256bit.org>
parents:
12650
diff
changeset
|
5502 WCHAR *env_wchar = NULL; |
| 12502 | 5503 channel_T *channel = NULL; |
| 5504 job_T *job = NULL; | |
| 5505 DWORD error; | |
| 5506 HANDLE jo = NULL; | |
| 5507 HANDLE child_process_handle; | |
| 5508 HANDLE child_thread_handle; | |
|
13111
149347fda678
patch 8.0.1430: crash when term_start() fails
Christian Brabandt <cb@256bit.org>
parents:
13109
diff
changeset
|
5509 void *winpty_err = NULL; |
| 12502 | 5510 void *spawn_config = NULL; |
|
12724
17c257dd2438
patch 8.0.1240: MS-Windows: term_start() does not support environment
Christian Brabandt <cb@256bit.org>
parents:
12650
diff
changeset
|
5511 garray_T ga_cmd, ga_env; |
|
13109
fb1b162cdcf6
patch 8.0.1429: crash when calling term_start() with empty argument
Christian Brabandt <cb@256bit.org>
parents:
13000
diff
changeset
|
5512 char_u *cmd = NULL; |
| 12502 | 5513 |
| 5514 if (dyn_winpty_init(TRUE) == FAIL) | |
| 5515 return FAIL; | |
|
13109
fb1b162cdcf6
patch 8.0.1429: crash when calling term_start() with empty argument
Christian Brabandt <cb@256bit.org>
parents:
13000
diff
changeset
|
5516 ga_init2(&ga_cmd, (int)sizeof(char*), 20); |
|
fb1b162cdcf6
patch 8.0.1429: crash when calling term_start() with empty argument
Christian Brabandt <cb@256bit.org>
parents:
13000
diff
changeset
|
5517 ga_init2(&ga_env, (int)sizeof(char*), 20); |
| 12502 | 5518 |
| 5519 if (argvar->v_type == VAR_STRING) | |
|
13109
fb1b162cdcf6
patch 8.0.1429: crash when calling term_start() with empty argument
Christian Brabandt <cb@256bit.org>
parents:
13000
diff
changeset
|
5520 { |
| 12502 | 5521 cmd = argvar->vval.v_string; |
|
13109
fb1b162cdcf6
patch 8.0.1429: crash when calling term_start() with empty argument
Christian Brabandt <cb@256bit.org>
parents:
13000
diff
changeset
|
5522 } |
|
fb1b162cdcf6
patch 8.0.1429: crash when calling term_start() with empty argument
Christian Brabandt <cb@256bit.org>
parents:
13000
diff
changeset
|
5523 else if (argvar->v_type == VAR_LIST) |
| 12502 | 5524 { |
|
12724
17c257dd2438
patch 8.0.1240: MS-Windows: term_start() does not support environment
Christian Brabandt <cb@256bit.org>
parents:
12650
diff
changeset
|
5525 if (win32_build_cmd(argvar->vval.v_list, &ga_cmd) == FAIL) |
| 12502 | 5526 goto failed; |
|
12724
17c257dd2438
patch 8.0.1240: MS-Windows: term_start() does not support environment
Christian Brabandt <cb@256bit.org>
parents:
12650
diff
changeset
|
5527 cmd = ga_cmd.ga_data; |
| 12502 | 5528 } |
|
13109
fb1b162cdcf6
patch 8.0.1429: crash when calling term_start() with empty argument
Christian Brabandt <cb@256bit.org>
parents:
13000
diff
changeset
|
5529 if (cmd == NULL || *cmd == NUL) |
|
fb1b162cdcf6
patch 8.0.1429: crash when calling term_start() with empty argument
Christian Brabandt <cb@256bit.org>
parents:
13000
diff
changeset
|
5530 { |
|
fb1b162cdcf6
patch 8.0.1429: crash when calling term_start() with empty argument
Christian Brabandt <cb@256bit.org>
parents:
13000
diff
changeset
|
5531 EMSG(_(e_invarg)); |
|
fb1b162cdcf6
patch 8.0.1429: crash when calling term_start() with empty argument
Christian Brabandt <cb@256bit.org>
parents:
13000
diff
changeset
|
5532 goto failed; |
|
fb1b162cdcf6
patch 8.0.1429: crash when calling term_start() with empty argument
Christian Brabandt <cb@256bit.org>
parents:
13000
diff
changeset
|
5533 } |
| 12502 | 5534 |
| 5535 cmd_wchar = enc_to_utf16(cmd, NULL); | |
|
13109
fb1b162cdcf6
patch 8.0.1429: crash when calling term_start() with empty argument
Christian Brabandt <cb@256bit.org>
parents:
13000
diff
changeset
|
5536 ga_clear(&ga_cmd); |
| 12502 | 5537 if (cmd_wchar == NULL) |
|
13109
fb1b162cdcf6
patch 8.0.1429: crash when calling term_start() with empty argument
Christian Brabandt <cb@256bit.org>
parents:
13000
diff
changeset
|
5538 goto failed; |
| 12502 | 5539 if (opt->jo_cwd != NULL) |
| 5540 cwd_wchar = enc_to_utf16(opt->jo_cwd, NULL); | |
|
12907
32531a3eab1f
patch 8.0.1330: MS-Windows: job in terminal can't get back to Vim
Christian Brabandt <cb@256bit.org>
parents:
12903
diff
changeset
|
5541 |
|
32531a3eab1f
patch 8.0.1330: MS-Windows: job in terminal can't get back to Vim
Christian Brabandt <cb@256bit.org>
parents:
12903
diff
changeset
|
5542 win32_build_env(opt->jo_env, &ga_env, TRUE); |
|
32531a3eab1f
patch 8.0.1330: MS-Windows: job in terminal can't get back to Vim
Christian Brabandt <cb@256bit.org>
parents:
12903
diff
changeset
|
5543 env_wchar = ga_env.ga_data; |
| 12502 | 5544 |
| 5545 term->tl_winpty_config = winpty_config_new(0, &winpty_err); | |
| 5546 if (term->tl_winpty_config == NULL) | |
| 5547 goto failed; | |
| 5548 | |
| 5549 winpty_config_set_mouse_mode(term->tl_winpty_config, | |
| 5550 WINPTY_MOUSE_MODE_FORCE); | |
| 5551 winpty_config_set_initial_size(term->tl_winpty_config, | |
| 5552 term->tl_cols, term->tl_rows); | |
| 5553 term->tl_winpty = winpty_open(term->tl_winpty_config, &winpty_err); | |
| 5554 if (term->tl_winpty == NULL) | |
| 5555 goto failed; | |
| 5556 | |
| 5557 spawn_config = winpty_spawn_config_new( | |
| 5558 WINPTY_SPAWN_FLAG_AUTO_SHUTDOWN | | |
| 5559 WINPTY_SPAWN_FLAG_EXIT_AFTER_SHUTDOWN, | |
| 5560 NULL, | |
| 5561 cmd_wchar, | |
| 5562 cwd_wchar, | |
|
12724
17c257dd2438
patch 8.0.1240: MS-Windows: term_start() does not support environment
Christian Brabandt <cb@256bit.org>
parents:
12650
diff
changeset
|
5563 env_wchar, |
| 12502 | 5564 &winpty_err); |
| 5565 if (spawn_config == NULL) | |
| 5566 goto failed; | |
| 5567 | |
| 5568 channel = add_channel(); | |
| 5569 if (channel == NULL) | |
| 5570 goto failed; | |
| 5571 | |
| 5572 job = job_alloc(); | |
| 5573 if (job == NULL) | |
| 5574 goto failed; | |
|
13750
3ab6198c1f9a
patch 8.0.1747: MS-Windows: term_start() does not set job_info() cmd
Christian Brabandt <cb@256bit.org>
parents:
13746
diff
changeset
|
5575 if (argvar->v_type == VAR_STRING) |
|
3ab6198c1f9a
patch 8.0.1747: MS-Windows: term_start() does not set job_info() cmd
Christian Brabandt <cb@256bit.org>
parents:
13746
diff
changeset
|
5576 { |
|
3ab6198c1f9a
patch 8.0.1747: MS-Windows: term_start() does not set job_info() cmd
Christian Brabandt <cb@256bit.org>
parents:
13746
diff
changeset
|
5577 int argc; |
|
3ab6198c1f9a
patch 8.0.1747: MS-Windows: term_start() does not set job_info() cmd
Christian Brabandt <cb@256bit.org>
parents:
13746
diff
changeset
|
5578 |
|
3ab6198c1f9a
patch 8.0.1747: MS-Windows: term_start() does not set job_info() cmd
Christian Brabandt <cb@256bit.org>
parents:
13746
diff
changeset
|
5579 build_argv_from_string(cmd, &job->jv_argv, &argc); |
|
3ab6198c1f9a
patch 8.0.1747: MS-Windows: term_start() does not set job_info() cmd
Christian Brabandt <cb@256bit.org>
parents:
13746
diff
changeset
|
5580 } |
|
3ab6198c1f9a
patch 8.0.1747: MS-Windows: term_start() does not set job_info() cmd
Christian Brabandt <cb@256bit.org>
parents:
13746
diff
changeset
|
5581 else |
|
3ab6198c1f9a
patch 8.0.1747: MS-Windows: term_start() does not set job_info() cmd
Christian Brabandt <cb@256bit.org>
parents:
13746
diff
changeset
|
5582 { |
|
3ab6198c1f9a
patch 8.0.1747: MS-Windows: term_start() does not set job_info() cmd
Christian Brabandt <cb@256bit.org>
parents:
13746
diff
changeset
|
5583 int argc; |
|
3ab6198c1f9a
patch 8.0.1747: MS-Windows: term_start() does not set job_info() cmd
Christian Brabandt <cb@256bit.org>
parents:
13746
diff
changeset
|
5584 |
|
3ab6198c1f9a
patch 8.0.1747: MS-Windows: term_start() does not set job_info() cmd
Christian Brabandt <cb@256bit.org>
parents:
13746
diff
changeset
|
5585 build_argv_from_list(argvar->vval.v_list, &job->jv_argv, &argc); |
|
3ab6198c1f9a
patch 8.0.1747: MS-Windows: term_start() does not set job_info() cmd
Christian Brabandt <cb@256bit.org>
parents:
13746
diff
changeset
|
5586 } |
| 12502 | 5587 |
| 5588 if (opt->jo_set & JO_IN_BUF) | |
| 5589 job->jv_in_buf = buflist_findnr(opt->jo_io_buf[PART_IN]); | |
| 5590 | |
| 5591 if (!winpty_spawn(term->tl_winpty, spawn_config, &child_process_handle, | |
| 5592 &child_thread_handle, &error, &winpty_err)) | |
| 5593 goto failed; | |
| 5594 | |
| 5595 channel_set_pipes(channel, | |
| 5596 (sock_T)CreateFileW( | |
| 5597 winpty_conin_name(term->tl_winpty), | |
| 5598 GENERIC_WRITE, 0, NULL, | |
| 5599 OPEN_EXISTING, 0, NULL), | |
| 5600 (sock_T)CreateFileW( | |
| 5601 winpty_conout_name(term->tl_winpty), | |
| 5602 GENERIC_READ, 0, NULL, | |
| 5603 OPEN_EXISTING, 0, NULL), | |
| 5604 (sock_T)CreateFileW( | |
| 5605 winpty_conerr_name(term->tl_winpty), | |
| 5606 GENERIC_READ, 0, NULL, | |
| 5607 OPEN_EXISTING, 0, NULL)); | |
| 5608 | |
| 5609 /* Write lines with CR instead of NL. */ | |
| 5610 channel->ch_write_text_mode = TRUE; | |
| 5611 | |
| 5612 jo = CreateJobObject(NULL, NULL); | |
| 5613 if (jo == NULL) | |
| 5614 goto failed; | |
| 5615 | |
| 5616 if (!AssignProcessToJobObject(jo, child_process_handle)) | |
| 5617 { | |
| 5618 /* Failed, switch the way to terminate process with TerminateProcess. */ | |
| 5619 CloseHandle(jo); | |
| 5620 jo = NULL; | |
| 5621 } | |
| 5622 | |
| 5623 winpty_spawn_config_free(spawn_config); | |
| 5624 vim_free(cmd_wchar); | |
| 5625 vim_free(cwd_wchar); | |
|
13109
fb1b162cdcf6
patch 8.0.1429: crash when calling term_start() with empty argument
Christian Brabandt <cb@256bit.org>
parents:
13000
diff
changeset
|
5626 vim_free(env_wchar); |
| 12502 | 5627 |
| 5628 create_vterm(term, term->tl_rows, term->tl_cols); | |
| 5629 | |
|
13626
ab89131d30e0
patch 8.0.1685: can't set ANSI colors of a terminal window
Christian Brabandt <cb@256bit.org>
parents:
13624
diff
changeset
|
5630 #if defined(FEAT_GUI) || defined(FEAT_TERMGUICOLORS) |
|
ab89131d30e0
patch 8.0.1685: can't set ANSI colors of a terminal window
Christian Brabandt <cb@256bit.org>
parents:
13624
diff
changeset
|
5631 if (opt->jo_set2 & JO2_ANSI_COLORS) |
|
ab89131d30e0
patch 8.0.1685: can't set ANSI colors of a terminal window
Christian Brabandt <cb@256bit.org>
parents:
13624
diff
changeset
|
5632 set_vterm_palette(term->tl_vterm, opt->jo_ansi_colors); |
|
ab89131d30e0
patch 8.0.1685: can't set ANSI colors of a terminal window
Christian Brabandt <cb@256bit.org>
parents:
13624
diff
changeset
|
5633 else |
|
ab89131d30e0
patch 8.0.1685: can't set ANSI colors of a terminal window
Christian Brabandt <cb@256bit.org>
parents:
13624
diff
changeset
|
5634 init_vterm_ansi_colors(term->tl_vterm); |
|
ab89131d30e0
patch 8.0.1685: can't set ANSI colors of a terminal window
Christian Brabandt <cb@256bit.org>
parents:
13624
diff
changeset
|
5635 #endif |
|
ab89131d30e0
patch 8.0.1685: can't set ANSI colors of a terminal window
Christian Brabandt <cb@256bit.org>
parents:
13624
diff
changeset
|
5636 |
| 12502 | 5637 channel_set_job(channel, job, opt); |
| 5638 job_set_options(job, opt); | |
| 5639 | |
| 5640 job->jv_channel = channel; | |
| 5641 job->jv_proc_info.hProcess = child_process_handle; | |
| 5642 job->jv_proc_info.dwProcessId = GetProcessId(child_process_handle); | |
| 5643 job->jv_job_object = jo; | |
| 5644 job->jv_status = JOB_STARTED; | |
| 5645 job->jv_tty_in = utf16_to_enc( | |
| 5646 (short_u*)winpty_conin_name(term->tl_winpty), NULL); | |
| 5647 job->jv_tty_out = utf16_to_enc( | |
| 5648 (short_u*)winpty_conout_name(term->tl_winpty), NULL); | |
| 5649 ++job->jv_refcount; | |
| 5650 term->tl_job = job; | |
| 5651 | |
|
13860
7f892e37b017
patch 8.0.1801: MS-Windows: redirecting terminal output does not work
Christian Brabandt <cb@256bit.org>
parents:
13851
diff
changeset
|
5652 /* Redirecting stdout and stderr doesn't work at the job level. Instead |
|
7f892e37b017
patch 8.0.1801: MS-Windows: redirecting terminal output does not work
Christian Brabandt <cb@256bit.org>
parents:
13851
diff
changeset
|
5653 * open the file here and handle it in. opt->jo_io was changed in |
|
7f892e37b017
patch 8.0.1801: MS-Windows: redirecting terminal output does not work
Christian Brabandt <cb@256bit.org>
parents:
13851
diff
changeset
|
5654 * setup_job_options(), use the original flags here. */ |
|
7f892e37b017
patch 8.0.1801: MS-Windows: redirecting terminal output does not work
Christian Brabandt <cb@256bit.org>
parents:
13851
diff
changeset
|
5655 if (orig_opt->jo_io[PART_OUT] == JIO_FILE) |
|
7f892e37b017
patch 8.0.1801: MS-Windows: redirecting terminal output does not work
Christian Brabandt <cb@256bit.org>
parents:
13851
diff
changeset
|
5656 { |
|
7f892e37b017
patch 8.0.1801: MS-Windows: redirecting terminal output does not work
Christian Brabandt <cb@256bit.org>
parents:
13851
diff
changeset
|
5657 char_u *fname = opt->jo_io_name[PART_OUT]; |
|
7f892e37b017
patch 8.0.1801: MS-Windows: redirecting terminal output does not work
Christian Brabandt <cb@256bit.org>
parents:
13851
diff
changeset
|
5658 |
|
7f892e37b017
patch 8.0.1801: MS-Windows: redirecting terminal output does not work
Christian Brabandt <cb@256bit.org>
parents:
13851
diff
changeset
|
5659 ch_log(channel, "Opening output file %s", fname); |
|
7f892e37b017
patch 8.0.1801: MS-Windows: redirecting terminal output does not work
Christian Brabandt <cb@256bit.org>
parents:
13851
diff
changeset
|
5660 term->tl_out_fd = mch_fopen((char *)fname, WRITEBIN); |
|
7f892e37b017
patch 8.0.1801: MS-Windows: redirecting terminal output does not work
Christian Brabandt <cb@256bit.org>
parents:
13851
diff
changeset
|
5661 if (term->tl_out_fd == NULL) |
|
7f892e37b017
patch 8.0.1801: MS-Windows: redirecting terminal output does not work
Christian Brabandt <cb@256bit.org>
parents:
13851
diff
changeset
|
5662 EMSG2(_(e_notopen), fname); |
|
7f892e37b017
patch 8.0.1801: MS-Windows: redirecting terminal output does not work
Christian Brabandt <cb@256bit.org>
parents:
13851
diff
changeset
|
5663 } |
|
7f892e37b017
patch 8.0.1801: MS-Windows: redirecting terminal output does not work
Christian Brabandt <cb@256bit.org>
parents:
13851
diff
changeset
|
5664 |
| 12502 | 5665 return OK; |
| 5666 | |
| 5667 failed: | |
|
13109
fb1b162cdcf6
patch 8.0.1429: crash when calling term_start() with empty argument
Christian Brabandt <cb@256bit.org>
parents:
13000
diff
changeset
|
5668 ga_clear(&ga_cmd); |
|
fb1b162cdcf6
patch 8.0.1429: crash when calling term_start() with empty argument
Christian Brabandt <cb@256bit.org>
parents:
13000
diff
changeset
|
5669 ga_clear(&ga_env); |
| 12502 | 5670 vim_free(cmd_wchar); |
| 5671 vim_free(cwd_wchar); | |
| 5672 if (spawn_config != NULL) | |
| 5673 winpty_spawn_config_free(spawn_config); | |
| 5674 if (channel != NULL) | |
| 5675 channel_clear(channel); | |
| 5676 if (job != NULL) | |
| 5677 { | |
| 5678 job->jv_channel = NULL; | |
| 5679 job_cleanup(job); | |
| 5680 } | |
| 5681 term->tl_job = NULL; | |
| 5682 if (jo != NULL) | |
| 5683 CloseHandle(jo); | |
| 5684 if (term->tl_winpty != NULL) | |
| 5685 winpty_free(term->tl_winpty); | |
| 5686 term->tl_winpty = NULL; | |
| 5687 if (term->tl_winpty_config != NULL) | |
| 5688 winpty_config_free(term->tl_winpty_config); | |
| 5689 term->tl_winpty_config = NULL; | |
| 5690 if (winpty_err != NULL) | |
| 5691 { | |
| 5692 char_u *msg = utf16_to_enc( | |
| 5693 (short_u *)winpty_error_msg(winpty_err), NULL); | |
| 5694 | |
| 5695 EMSG(msg); | |
| 5696 winpty_error_free(winpty_err); | |
| 5697 } | |
| 5698 return FAIL; | |
| 5699 } | |
| 5700 | |
| 5701 static int | |
| 5702 create_pty_only(term_T *term, jobopt_T *options) | |
| 5703 { | |
| 5704 HANDLE hPipeIn = INVALID_HANDLE_VALUE; | |
| 5705 HANDLE hPipeOut = INVALID_HANDLE_VALUE; | |
| 5706 char in_name[80], out_name[80]; | |
| 5707 channel_T *channel = NULL; | |
| 5708 | |
| 5709 create_vterm(term, term->tl_rows, term->tl_cols); | |
| 5710 | |
| 5711 vim_snprintf(in_name, sizeof(in_name), "\\\\.\\pipe\\vim-%d-in-%d", | |
| 5712 GetCurrentProcessId(), | |
| 5713 curbuf->b_fnum); | |
| 5714 hPipeIn = CreateNamedPipe(in_name, PIPE_ACCESS_OUTBOUND, | |
| 5715 PIPE_TYPE_MESSAGE | PIPE_NOWAIT, | |
| 5716 PIPE_UNLIMITED_INSTANCES, | |
| 5717 0, 0, NMPWAIT_NOWAIT, NULL); | |
| 5718 if (hPipeIn == INVALID_HANDLE_VALUE) | |
| 5719 goto failed; | |
| 5720 | |
| 5721 vim_snprintf(out_name, sizeof(out_name), "\\\\.\\pipe\\vim-%d-out-%d", | |
| 5722 GetCurrentProcessId(), | |
| 5723 curbuf->b_fnum); | |
| 5724 hPipeOut = CreateNamedPipe(out_name, PIPE_ACCESS_INBOUND, | |
| 5725 PIPE_TYPE_MESSAGE | PIPE_NOWAIT, | |
| 5726 PIPE_UNLIMITED_INSTANCES, | |
| 5727 0, 0, 0, NULL); | |
| 5728 if (hPipeOut == INVALID_HANDLE_VALUE) | |
| 5729 goto failed; | |
| 5730 | |
| 5731 ConnectNamedPipe(hPipeIn, NULL); | |
| 5732 ConnectNamedPipe(hPipeOut, NULL); | |
| 5733 | |
| 5734 term->tl_job = job_alloc(); | |
| 5735 if (term->tl_job == NULL) | |
| 5736 goto failed; | |
| 5737 ++term->tl_job->jv_refcount; | |
| 5738 | |
| 5739 /* behave like the job is already finished */ | |
| 5740 term->tl_job->jv_status = JOB_FINISHED; | |
| 5741 | |
| 5742 channel = add_channel(); | |
| 5743 if (channel == NULL) | |
| 5744 goto failed; | |
| 5745 term->tl_job->jv_channel = channel; | |
| 5746 channel->ch_keep_open = TRUE; | |
| 5747 channel->ch_named_pipe = TRUE; | |
| 5748 | |
| 5749 channel_set_pipes(channel, | |
| 5750 (sock_T)hPipeIn, | |
| 5751 (sock_T)hPipeOut, | |
| 5752 (sock_T)hPipeOut); | |
| 5753 channel_set_job(channel, term->tl_job, options); | |
| 5754 term->tl_job->jv_tty_in = vim_strsave((char_u*)in_name); | |
| 5755 term->tl_job->jv_tty_out = vim_strsave((char_u*)out_name); | |
| 5756 | |
| 5757 return OK; | |
| 5758 | |
| 5759 failed: | |
| 5760 if (hPipeIn != NULL) | |
| 5761 CloseHandle(hPipeIn); | |
| 5762 if (hPipeOut != NULL) | |
| 5763 CloseHandle(hPipeOut); | |
| 5764 return FAIL; | |
| 5765 } | |
| 5766 | |
| 5767 /* | |
| 5768 * Free the terminal emulator part of "term". | |
| 5769 */ | |
| 5770 static void | |
| 5771 term_free_vterm(term_T *term) | |
| 5772 { | |
| 5773 if (term->tl_winpty != NULL) | |
| 5774 winpty_free(term->tl_winpty); | |
| 5775 term->tl_winpty = NULL; | |
| 5776 if (term->tl_winpty_config != NULL) | |
| 5777 winpty_config_free(term->tl_winpty_config); | |
| 5778 term->tl_winpty_config = NULL; | |
| 5779 if (term->tl_vterm != NULL) | |
| 5780 vterm_free(term->tl_vterm); | |
| 5781 term->tl_vterm = NULL; | |
| 5782 } | |
| 5783 | |
| 5784 /* | |
|
13678
39fcaaa973db
patch 8.0.1711: term_setsize() is not implemented yet
Christian Brabandt <cb@256bit.org>
parents:
13668
diff
changeset
|
5785 * Report the size to the terminal. |
| 12502 | 5786 */ |
| 5787 static void | |
| 5788 term_report_winsize(term_T *term, int rows, int cols) | |
| 5789 { | |
| 5790 if (term->tl_winpty) | |
| 5791 winpty_set_size(term->tl_winpty, cols, rows, NULL); | |
| 5792 } | |
| 5793 | |
| 5794 int | |
| 5795 terminal_enabled(void) | |
| 5796 { | |
| 5797 return dyn_winpty_init(FALSE) == OK; | |
| 5798 } | |
| 5799 | |
| 5800 # else | |
| 5801 | |
| 5802 /************************************** | |
| 5803 * 3. Unix-like implementation. | |
| 5804 */ | |
| 5805 | |
| 5806 /* | |
| 5807 * Create a new terminal of "rows" by "cols" cells. | |
| 5808 * Start job for "cmd". | |
| 5809 * Store the pointers in "term". | |
|
13470
6faef782f50b
patch 8.0.1609: shell commands in the GUI use a dumb terminal
Christian Brabandt <cb@256bit.org>
parents:
13458
diff
changeset
|
5810 * When "argv" is not NULL then "argvar" is not used. |
| 12502 | 5811 * Return OK or FAIL. |
| 5812 */ | |
| 5813 static int | |
| 5814 term_and_job_init( | |
| 5815 term_T *term, | |
| 5816 typval_T *argvar, | |
|
13470
6faef782f50b
patch 8.0.1609: shell commands in the GUI use a dumb terminal
Christian Brabandt <cb@256bit.org>
parents:
13458
diff
changeset
|
5817 char **argv, |
|
13860
7f892e37b017
patch 8.0.1801: MS-Windows: redirecting terminal output does not work
Christian Brabandt <cb@256bit.org>
parents:
13851
diff
changeset
|
5818 jobopt_T *opt, |
|
7f892e37b017
patch 8.0.1801: MS-Windows: redirecting terminal output does not work
Christian Brabandt <cb@256bit.org>
parents:
13851
diff
changeset
|
5819 jobopt_T *orig_opt UNUSED) |
| 12502 | 5820 { |
| 5821 create_vterm(term, term->tl_rows, term->tl_cols); | |
| 5822 | |
|
13626
ab89131d30e0
patch 8.0.1685: can't set ANSI colors of a terminal window
Christian Brabandt <cb@256bit.org>
parents:
13624
diff
changeset
|
5823 #if defined(FEAT_GUI) || defined(FEAT_TERMGUICOLORS) |
|
ab89131d30e0
patch 8.0.1685: can't set ANSI colors of a terminal window
Christian Brabandt <cb@256bit.org>
parents:
13624
diff
changeset
|
5824 if (opt->jo_set2 & JO2_ANSI_COLORS) |
|
ab89131d30e0
patch 8.0.1685: can't set ANSI colors of a terminal window
Christian Brabandt <cb@256bit.org>
parents:
13624
diff
changeset
|
5825 set_vterm_palette(term->tl_vterm, opt->jo_ansi_colors); |
|
ab89131d30e0
patch 8.0.1685: can't set ANSI colors of a terminal window
Christian Brabandt <cb@256bit.org>
parents:
13624
diff
changeset
|
5826 else |
|
ab89131d30e0
patch 8.0.1685: can't set ANSI colors of a terminal window
Christian Brabandt <cb@256bit.org>
parents:
13624
diff
changeset
|
5827 init_vterm_ansi_colors(term->tl_vterm); |
|
ab89131d30e0
patch 8.0.1685: can't set ANSI colors of a terminal window
Christian Brabandt <cb@256bit.org>
parents:
13624
diff
changeset
|
5828 #endif |
|
ab89131d30e0
patch 8.0.1685: can't set ANSI colors of a terminal window
Christian Brabandt <cb@256bit.org>
parents:
13624
diff
changeset
|
5829 |
|
13470
6faef782f50b
patch 8.0.1609: shell commands in the GUI use a dumb terminal
Christian Brabandt <cb@256bit.org>
parents:
13458
diff
changeset
|
5830 /* This may change a string in "argvar". */ |
|
14065
e271ca6f32f9
patch 8.1.0050: $VIM_TERMINAL is also set when not in a terminal window
Christian Brabandt <cb@256bit.org>
parents:
14029
diff
changeset
|
5831 term->tl_job = job_start(argvar, argv, opt, TRUE); |
| 12502 | 5832 if (term->tl_job != NULL) |
| 5833 ++term->tl_job->jv_refcount; | |
| 5834 | |
| 5835 return term->tl_job != NULL | |
| 5836 && term->tl_job->jv_channel != NULL | |
| 5837 && term->tl_job->jv_status != JOB_FAILED ? OK : FAIL; | |
| 5838 } | |
| 5839 | |
| 5840 static int | |
| 5841 create_pty_only(term_T *term, jobopt_T *opt) | |
| 5842 { | |
| 5843 create_vterm(term, term->tl_rows, term->tl_cols); | |
| 5844 | |
| 5845 term->tl_job = job_alloc(); | |
| 5846 if (term->tl_job == NULL) | |
| 5847 return FAIL; | |
| 5848 ++term->tl_job->jv_refcount; | |
| 5849 | |
| 5850 /* behave like the job is already finished */ | |
| 5851 term->tl_job->jv_status = JOB_FINISHED; | |
| 5852 | |
| 5853 return mch_create_pty_channel(term->tl_job, opt); | |
| 5854 } | |
| 5855 | |
| 5856 /* | |
| 5857 * Free the terminal emulator part of "term". | |
| 5858 */ | |
| 5859 static void | |
| 5860 term_free_vterm(term_T *term) | |
| 5861 { | |
| 5862 if (term->tl_vterm != NULL) | |
| 5863 vterm_free(term->tl_vterm); | |
| 5864 term->tl_vterm = NULL; | |
| 5865 } | |
| 5866 | |
| 5867 /* | |
|
13678
39fcaaa973db
patch 8.0.1711: term_setsize() is not implemented yet
Christian Brabandt <cb@256bit.org>
parents:
13668
diff
changeset
|
5868 * Report the size to the terminal. |
| 12502 | 5869 */ |
| 5870 static void | |
| 5871 term_report_winsize(term_T *term, int rows, int cols) | |
| 5872 { | |
| 5873 /* Use an ioctl() to report the new window size to the job. */ | |
| 5874 if (term->tl_job != NULL && term->tl_job->jv_channel != NULL) | |
| 5875 { | |
| 5876 int fd = -1; | |
| 5877 int part; | |
| 5878 | |
| 5879 for (part = PART_OUT; part < PART_COUNT; ++part) | |
| 5880 { | |
| 5881 fd = term->tl_job->jv_channel->ch_part[part].ch_fd; | |
| 5882 if (isatty(fd)) | |
| 5883 break; | |
| 5884 } | |
| 5885 if (part < PART_COUNT && mch_report_winsize(fd, rows, cols) == OK) | |
| 5886 mch_signal_job(term->tl_job, (char_u *)"winch"); | |
| 5887 } | |
| 5888 } | |
| 5889 | |
| 5890 # endif | |
| 5891 | |
| 5892 #endif /* FEAT_TERMINAL */ |