Mercurial > vim
annotate src/terminal.c @ 13961:dc648848f8be v8.0.1850
patch 8.0.1850: todo items in source code not visible for users
commit https://github.com/vim/vim/commit/03998f606a846e7995047b0356dbb9f515f5244c
Author: Bram Moolenaar <Bram@vim.org>
Date: Thu May 17 13:20:45 2018 +0200
patch 8.0.1850: todo items in source code not visible for users
Problem: Todo items in source code not visible for users.
Solution: Move the todo items to the help file.
| author | Christian Brabandt <cb@256bit.org> |
|---|---|
| date | Thu, 17 May 2018 13:30:07 +0200 |
| parents | 300aab3275c0 |
| children | 017c5462ed5e |
| 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. */ |
|
53f0c469dfc6
patch 8.0.1477: redraw flicker when moving the mouse outside of terminal window
Christian Brabandt <cb@256bit.org>
parents:
13132
diff
changeset
|
174 static char_u *last_set_cursor_color = (char_u *)""; |
|
53f0c469dfc6
patch 8.0.1477: redraw flicker when moving the mouse outside of terminal window
Christian Brabandt <cb@256bit.org>
parents:
13132
diff
changeset
|
175 static char_u *desired_cursor_color = (char_u *)""; |
|
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 | |
| 186 /* | |
|
13845
f22db93bd887
patch 8.0.1794: duplicate term options after renaming
Christian Brabandt <cb@256bit.org>
parents:
13835
diff
changeset
|
187 * 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
|
188 * 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
|
189 * 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
|
190 * 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
|
191 */ |
|
b28d679b1843
patch 8.0.1722: cannot specify a minimal size for a terminal window
Christian Brabandt <cb@256bit.org>
parents:
13696
diff
changeset
|
192 static int |
|
13845
f22db93bd887
patch 8.0.1794: duplicate term options after renaming
Christian Brabandt <cb@256bit.org>
parents:
13835
diff
changeset
|
193 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
|
194 { |
|
b28d679b1843
patch 8.0.1722: cannot specify a minimal size for a terminal window
Christian Brabandt <cb@256bit.org>
parents:
13696
diff
changeset
|
195 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
|
196 |
|
b28d679b1843
patch 8.0.1722: cannot specify a minimal size for a terminal window
Christian Brabandt <cb@256bit.org>
parents:
13696
diff
changeset
|
197 *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
|
198 *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
|
199 |
|
13742
a34b1323286c
patch 8.0.1743: terminal window options are named inconsistently
Christian Brabandt <cb@256bit.org>
parents:
13720
diff
changeset
|
200 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
|
201 { |
|
13742
a34b1323286c
patch 8.0.1743: terminal window options are named inconsistently
Christian Brabandt <cb@256bit.org>
parents:
13720
diff
changeset
|
202 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
|
203 |
|
b28d679b1843
patch 8.0.1722: cannot specify a minimal size for a terminal window
Christian Brabandt <cb@256bit.org>
parents:
13696
diff
changeset
|
204 /* 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
|
205 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
|
206 { |
|
b28d679b1843
patch 8.0.1722: cannot specify a minimal size for a terminal window
Christian Brabandt <cb@256bit.org>
parents:
13696
diff
changeset
|
207 minsize = TRUE; |
|
13742
a34b1323286c
patch 8.0.1743: terminal window options are named inconsistently
Christian Brabandt <cb@256bit.org>
parents:
13720
diff
changeset
|
208 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
|
209 } |
|
13742
a34b1323286c
patch 8.0.1743: terminal window options are named inconsistently
Christian Brabandt <cb@256bit.org>
parents:
13720
diff
changeset
|
210 *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
|
211 *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
|
212 } |
|
b28d679b1843
patch 8.0.1722: cannot specify a minimal size for a terminal window
Christian Brabandt <cb@256bit.org>
parents:
13696
diff
changeset
|
213 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
|
214 } |
|
b28d679b1843
patch 8.0.1722: cannot specify a minimal size for a terminal window
Christian Brabandt <cb@256bit.org>
parents:
13696
diff
changeset
|
215 |
|
b28d679b1843
patch 8.0.1722: cannot specify a minimal size for a terminal window
Christian Brabandt <cb@256bit.org>
parents:
13696
diff
changeset
|
216 /* |
|
13845
f22db93bd887
patch 8.0.1794: duplicate term options after renaming
Christian Brabandt <cb@256bit.org>
parents:
13835
diff
changeset
|
217 * Determine the terminal size from 'termwinsize' and the current window. |
| 12502 | 218 */ |
| 219 static void | |
| 220 set_term_and_win_size(term_T *term) | |
| 221 { | |
|
13470
6faef782f50b
patch 8.0.1609: shell commands in the GUI use a dumb terminal
Christian Brabandt <cb@256bit.org>
parents:
13458
diff
changeset
|
222 #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
|
223 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
|
224 { |
|
6faef782f50b
patch 8.0.1609: shell commands in the GUI use a dumb terminal
Christian Brabandt <cb@256bit.org>
parents:
13458
diff
changeset
|
225 /* 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
|
226 * 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
|
227 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
|
228 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
|
229 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
|
230 } |
|
6faef782f50b
patch 8.0.1609: shell commands in the GUI use a dumb terminal
Christian Brabandt <cb@256bit.org>
parents:
13458
diff
changeset
|
231 #endif |
|
13845
f22db93bd887
patch 8.0.1794: duplicate term options after renaming
Christian Brabandt <cb@256bit.org>
parents:
13835
diff
changeset
|
232 if (parse_termwinsize(curwin, &term->tl_rows, &term->tl_cols)) |
| 12502 | 233 { |
|
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 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
|
235 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
|
236 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
|
237 term->tl_cols = MAX(term->tl_cols, curwin->w_width); |
| 12502 | 238 } |
| 239 if (term->tl_rows == 0) | |
| 240 term->tl_rows = curwin->w_height; | |
| 241 else | |
| 242 win_setheight_win(term->tl_rows, curwin); | |
| 243 if (term->tl_cols == 0) | |
| 244 term->tl_cols = curwin->w_width; | |
| 245 else | |
| 246 win_setwidth_win(term->tl_cols, curwin); | |
| 247 } | |
| 248 | |
| 249 /* | |
| 250 * Initialize job options for a terminal job. | |
| 251 * Caller may overrule some of them. | |
| 252 */ | |
|
13470
6faef782f50b
patch 8.0.1609: shell commands in the GUI use a dumb terminal
Christian Brabandt <cb@256bit.org>
parents:
13458
diff
changeset
|
253 void |
| 12502 | 254 init_job_options(jobopt_T *opt) |
| 255 { | |
| 256 clear_job_options(opt); | |
| 257 | |
| 258 opt->jo_mode = MODE_RAW; | |
| 259 opt->jo_out_mode = MODE_RAW; | |
| 260 opt->jo_err_mode = MODE_RAW; | |
| 261 opt->jo_set = JO_MODE | JO_OUT_MODE | JO_ERR_MODE; | |
| 262 } | |
| 263 | |
| 264 /* | |
| 265 * Set job options mandatory for a terminal job. | |
| 266 */ | |
| 267 static void | |
| 268 setup_job_options(jobopt_T *opt, int rows, int cols) | |
| 269 { | |
|
13860
7f892e37b017
patch 8.0.1801: MS-Windows: redirecting terminal output does not work
Christian Brabandt <cb@256bit.org>
parents:
13851
diff
changeset
|
270 #ifndef WIN3264 |
|
7f892e37b017
patch 8.0.1801: MS-Windows: redirecting terminal output does not work
Christian Brabandt <cb@256bit.org>
parents:
13851
diff
changeset
|
271 /* 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
|
272 * here. */ |
| 12502 | 273 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
|
274 #endif |
| 12502 | 275 { |
| 276 /* Connect stdout to the terminal. */ | |
| 277 opt->jo_io[PART_OUT] = JIO_BUFFER; | |
| 278 opt->jo_io_buf[PART_OUT] = curbuf->b_fnum; | |
| 279 opt->jo_modifiable[PART_OUT] = 0; | |
| 280 opt->jo_set |= JO_OUT_IO + JO_OUT_BUF + JO_OUT_MODIFIABLE; | |
| 281 } | |
| 282 | |
|
13860
7f892e37b017
patch 8.0.1801: MS-Windows: redirecting terminal output does not work
Christian Brabandt <cb@256bit.org>
parents:
13851
diff
changeset
|
283 #ifndef WIN3264 |
|
7f892e37b017
patch 8.0.1801: MS-Windows: redirecting terminal output does not work
Christian Brabandt <cb@256bit.org>
parents:
13851
diff
changeset
|
284 /* 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
|
285 * here. */ |
| 12502 | 286 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
|
287 #endif |
| 12502 | 288 { |
| 289 /* Connect stderr to the terminal. */ | |
| 290 opt->jo_io[PART_ERR] = JIO_BUFFER; | |
| 291 opt->jo_io_buf[PART_ERR] = curbuf->b_fnum; | |
| 292 opt->jo_modifiable[PART_ERR] = 0; | |
| 293 opt->jo_set |= JO_ERR_IO + JO_ERR_BUF + JO_ERR_MODIFIABLE; | |
| 294 } | |
| 295 | |
| 296 opt->jo_pty = TRUE; | |
| 297 if ((opt->jo_set2 & JO2_TERM_ROWS) == 0) | |
| 298 opt->jo_term_rows = rows; | |
| 299 if ((opt->jo_set2 & JO2_TERM_COLS) == 0) | |
| 300 opt->jo_term_cols = cols; | |
| 301 } | |
| 302 | |
| 303 /* | |
|
13298
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
304 * 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
|
305 * fails. |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
306 */ |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
307 static void |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
308 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
|
309 { |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
310 free_terminal(buf); |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
311 if (old_curbuf != NULL) |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
312 { |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
313 --curbuf->b_nwindows; |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
314 curbuf = old_curbuf; |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
315 curwin->w_buffer = curbuf; |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
316 ++curbuf->b_nwindows; |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
317 } |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
318 |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
319 /* 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
|
320 * free_terminal(). */ |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
321 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
|
322 } |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
323 |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
324 /* |
| 12502 | 325 * 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
|
326 * 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
|
327 * 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
|
328 * the window. |
| 12502 | 329 * Returns NULL when failed. |
| 330 */ | |
|
13470
6faef782f50b
patch 8.0.1609: shell commands in the GUI use a dumb terminal
Christian Brabandt <cb@256bit.org>
parents:
13458
diff
changeset
|
331 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
|
332 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
|
333 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
|
334 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
|
335 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
|
336 int flags) |
| 12502 | 337 { |
| 338 exarg_T split_ea; | |
| 339 win_T *old_curwin = curwin; | |
| 340 term_T *term; | |
| 341 buf_T *old_curbuf = NULL; | |
| 342 int res; | |
| 343 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
|
344 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
|
345 jobopt_T orig_opt; // only partly filled |
| 12502 | 346 |
| 347 if (check_restricted() || check_secure()) | |
| 348 return NULL; | |
| 349 | |
| 350 if ((opt->jo_set & (JO_IN_IO + JO_OUT_IO + JO_ERR_IO)) | |
| 351 == (JO_IN_IO + JO_OUT_IO + JO_ERR_IO) | |
| 352 || (!(opt->jo_set & JO_OUT_IO) && (opt->jo_set & JO_OUT_BUF)) | |
| 353 || (!(opt->jo_set & JO_ERR_IO) && (opt->jo_set & JO_ERR_BUF))) | |
| 354 { | |
| 355 EMSG(_(e_invarg)); | |
| 356 return NULL; | |
| 357 } | |
| 358 | |
| 359 term = (term_T *)alloc_clear(sizeof(term_T)); | |
| 360 if (term == NULL) | |
| 361 return NULL; | |
| 362 term->tl_dirty_row_end = MAX_ROW; | |
| 363 term->tl_cursor_visible = TRUE; | |
| 364 term->tl_cursor_shape = VTERM_PROP_CURSORSHAPE_BLOCK; | |
| 365 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
|
366 #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
|
367 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
|
368 #endif |
| 12502 | 369 ga_init2(&term->tl_scrollback, sizeof(sb_line_T), 300); |
| 370 | |
| 371 vim_memset(&split_ea, 0, sizeof(split_ea)); | |
| 372 if (opt->jo_curwin) | |
| 373 { | |
| 374 /* 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
|
375 if (!can_abandon(curbuf, flags & TERM_START_FORCEIT)) |
| 12502 | 376 { |
| 377 no_write_message(); | |
| 378 vim_free(term); | |
| 379 return NULL; | |
| 380 } | |
| 381 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
|
382 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
|
383 + ((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
|
384 curwin) == FAIL) |
| 12502 | 385 { |
| 386 vim_free(term); | |
| 387 return NULL; | |
| 388 } | |
| 389 } | |
|
13470
6faef782f50b
patch 8.0.1609: shell commands in the GUI use a dumb terminal
Christian Brabandt <cb@256bit.org>
parents:
13458
diff
changeset
|
390 else if (opt->jo_hidden || (flags & TERM_START_SYSTEM)) |
| 12502 | 391 { |
| 392 buf_T *buf; | |
| 393 | |
| 394 /* Create a new buffer without a window. Make it the current buffer for | |
| 395 * a moment to be able to do the initialisations. */ | |
| 396 buf = buflist_new((char_u *)"", NULL, (linenr_T)0, | |
| 397 BLN_NEW | BLN_LISTED); | |
| 398 if (buf == NULL || ml_open(buf) == FAIL) | |
| 399 { | |
| 400 vim_free(term); | |
| 401 return NULL; | |
| 402 } | |
| 403 old_curbuf = curbuf; | |
| 404 --curbuf->b_nwindows; | |
| 405 curbuf = buf; | |
| 406 curwin->w_buffer = buf; | |
| 407 ++curbuf->b_nwindows; | |
| 408 } | |
| 409 else | |
| 410 { | |
| 411 /* Open a new window or tab. */ | |
| 412 split_ea.cmdidx = CMD_new; | |
| 413 split_ea.cmd = (char_u *)"new"; | |
| 414 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
|
415 if (opt->jo_term_rows > 0 && !vertical) |
| 12502 | 416 { |
| 417 split_ea.line2 = opt->jo_term_rows; | |
| 418 split_ea.addr_count = 1; | |
| 419 } | |
|
13501
a4a559e08798
patch 8.0.1624: options for term_dumpdiff() and term_dumpload() not implemented
Christian Brabandt <cb@256bit.org>
parents:
13483
diff
changeset
|
420 if (opt->jo_term_cols > 0 && vertical) |
| 12502 | 421 { |
| 422 split_ea.line2 = opt->jo_term_cols; | |
| 423 split_ea.addr_count = 1; | |
| 424 } | |
| 425 | |
|
13501
a4a559e08798
patch 8.0.1624: options for term_dumpdiff() and term_dumpload() not implemented
Christian Brabandt <cb@256bit.org>
parents:
13483
diff
changeset
|
426 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
|
427 cmdmod.split |= WSP_VERT; |
| 12502 | 428 ex_splitview(&split_ea); |
| 429 if (curwin == old_curwin) | |
| 430 { | |
| 431 /* split failed */ | |
| 432 vim_free(term); | |
| 433 return NULL; | |
| 434 } | |
| 435 } | |
| 436 term->tl_buffer = curbuf; | |
| 437 curbuf->b_term = term; | |
| 438 | |
| 439 if (!opt->jo_hidden) | |
| 440 { | |
|
13304
013c44d9dc09
patch 8.0.1526: no test using a screen dump yet
Christian Brabandt <cb@256bit.org>
parents:
13300
diff
changeset
|
441 /* 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
|
442 * "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
|
443 if (opt->jo_term_rows > 0 && (opt->jo_curwin || vertical)) |
| 12502 | 444 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
|
445 if (opt->jo_term_cols > 0 && (opt->jo_curwin || !vertical)) |
| 12502 | 446 win_setwidth(opt->jo_term_cols); |
| 447 } | |
| 448 | |
| 449 /* Link the new terminal in the list of active terminals. */ | |
| 450 term->tl_next = first_term; | |
| 451 first_term = term; | |
| 452 | |
| 453 if (opt->jo_term_name != NULL) | |
| 454 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
|
455 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
|
456 curbuf->b_ffname = vim_strsave((char_u *)"!system"); |
| 12502 | 457 else |
| 458 { | |
| 459 int i; | |
| 460 size_t len; | |
| 461 char_u *cmd, *p; | |
| 462 | |
| 463 if (argvar->v_type == VAR_STRING) | |
| 464 { | |
| 465 cmd = argvar->vval.v_string; | |
| 466 if (cmd == NULL) | |
| 467 cmd = (char_u *)""; | |
| 468 else if (STRCMP(cmd, "NONE") == 0) | |
| 469 cmd = (char_u *)"pty"; | |
| 470 } | |
| 471 else if (argvar->v_type != VAR_LIST | |
| 472 || argvar->vval.v_list == NULL | |
| 473 || argvar->vval.v_list->lv_len < 1 | |
| 474 || (cmd = get_tv_string_chk( | |
| 475 &argvar->vval.v_list->lv_first->li_tv)) == NULL) | |
| 476 cmd = (char_u*)""; | |
| 477 | |
| 478 len = STRLEN(cmd) + 10; | |
| 479 p = alloc((int)len); | |
| 480 | |
| 481 for (i = 0; p != NULL; ++i) | |
| 482 { | |
| 483 /* Prepend a ! to the command name to avoid the buffer name equals | |
| 484 * the executable, otherwise ":w!" would overwrite it. */ | |
| 485 if (i == 0) | |
| 486 vim_snprintf((char *)p, len, "!%s", cmd); | |
| 487 else | |
| 488 vim_snprintf((char *)p, len, "!%s (%d)", cmd, i); | |
| 489 if (buflist_findname(p) == NULL) | |
| 490 { | |
| 491 vim_free(curbuf->b_ffname); | |
| 492 curbuf->b_ffname = p; | |
| 493 break; | |
| 494 } | |
| 495 } | |
| 496 } | |
| 497 curbuf->b_fname = curbuf->b_ffname; | |
| 498 | |
| 499 if (opt->jo_term_opencmd != NULL) | |
| 500 term->tl_opencmd = vim_strsave(opt->jo_term_opencmd); | |
| 501 | |
| 502 if (opt->jo_eof_chars != NULL) | |
| 503 term->tl_eof_chars = vim_strsave(opt->jo_eof_chars); | |
| 504 | |
| 505 set_string_option_direct((char_u *)"buftype", -1, | |
| 506 (char_u *)"terminal", OPT_FREE|OPT_LOCAL, 0); | |
| 507 | |
| 508 /* Mark the buffer as not modifiable. It can only be made modifiable after | |
| 509 * the job finished. */ | |
| 510 curbuf->b_p_ma = FALSE; | |
| 511 | |
| 512 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
|
513 #ifdef WIN3264 |
|
7f892e37b017
patch 8.0.1801: MS-Windows: redirecting terminal output does not work
Christian Brabandt <cb@256bit.org>
parents:
13851
diff
changeset
|
514 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
|
515 #endif |
| 12502 | 516 setup_job_options(opt, term->tl_rows, term->tl_cols); |
| 517 | |
|
13470
6faef782f50b
patch 8.0.1609: shell commands in the GUI use a dumb terminal
Christian Brabandt <cb@256bit.org>
parents:
13458
diff
changeset
|
518 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
|
519 return curbuf; |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
520 |
|
13435
fa198b71bab2
patch 8.0.1592: terminal windows in a session are not properly restored
Christian Brabandt <cb@256bit.org>
parents:
13380
diff
changeset
|
521 #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
|
522 /* 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
|
523 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
|
524 { |
|
fa198b71bab2
patch 8.0.1592: terminal windows in a session are not properly restored
Christian Brabandt <cb@256bit.org>
parents:
13380
diff
changeset
|
525 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
|
526 } |
|
fa198b71bab2
patch 8.0.1592: terminal windows in a session are not properly restored
Christian Brabandt <cb@256bit.org>
parents:
13380
diff
changeset
|
527 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
|
528 { |
|
fa198b71bab2
patch 8.0.1592: terminal windows in a session are not properly restored
Christian Brabandt <cb@256bit.org>
parents:
13380
diff
changeset
|
529 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
|
530 |
|
fa198b71bab2
patch 8.0.1592: terminal windows in a session are not properly restored
Christian Brabandt <cb@256bit.org>
parents:
13380
diff
changeset
|
531 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
|
532 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
|
533 } |
|
fa198b71bab2
patch 8.0.1592: terminal windows in a session are not properly restored
Christian Brabandt <cb@256bit.org>
parents:
13380
diff
changeset
|
534 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
|
535 && 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
|
536 && 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
|
537 { |
|
fa198b71bab2
patch 8.0.1592: terminal windows in a session are not properly restored
Christian Brabandt <cb@256bit.org>
parents:
13380
diff
changeset
|
538 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
|
539 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
|
540 |
|
fa198b71bab2
patch 8.0.1592: terminal windows in a session are not properly restored
Christian Brabandt <cb@256bit.org>
parents:
13380
diff
changeset
|
541 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
|
542 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
|
543 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
|
544 { |
|
fa198b71bab2
patch 8.0.1592: terminal windows in a session are not properly restored
Christian Brabandt <cb@256bit.org>
parents:
13380
diff
changeset
|
545 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
|
546 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
|
547 |
|
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 (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
|
549 break; |
|
fa198b71bab2
patch 8.0.1592: terminal windows in a session are not properly restored
Christian Brabandt <cb@256bit.org>
parents:
13380
diff
changeset
|
550 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
|
551 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
|
552 break; |
|
fa198b71bab2
patch 8.0.1592: terminal windows in a session are not properly restored
Christian Brabandt <cb@256bit.org>
parents:
13380
diff
changeset
|
553 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
|
554 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
|
555 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
|
556 } |
|
fa198b71bab2
patch 8.0.1592: terminal windows in a session are not properly restored
Christian Brabandt <cb@256bit.org>
parents:
13380
diff
changeset
|
557 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
|
558 { |
|
fa198b71bab2
patch 8.0.1592: terminal windows in a session are not properly restored
Christian Brabandt <cb@256bit.org>
parents:
13380
diff
changeset
|
559 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
|
560 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
|
561 } |
|
fa198b71bab2
patch 8.0.1592: terminal windows in a session are not properly restored
Christian Brabandt <cb@256bit.org>
parents:
13380
diff
changeset
|
562 else |
|
fa198b71bab2
patch 8.0.1592: terminal windows in a session are not properly restored
Christian Brabandt <cb@256bit.org>
parents:
13380
diff
changeset
|
563 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
|
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 #endif |
|
fa198b71bab2
patch 8.0.1592: terminal windows in a session are not properly restored
Christian Brabandt <cb@256bit.org>
parents:
13380
diff
changeset
|
566 |
|
13438
33eea5ce5415
patch 8.0.1593: :qall never exits with an active terminal window
Christian Brabandt <cb@256bit.org>
parents:
13435
diff
changeset
|
567 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
|
568 { |
|
33eea5ce5415
patch 8.0.1593: :qall never exits with an active terminal window
Christian Brabandt <cb@256bit.org>
parents:
13435
diff
changeset
|
569 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
|
570 |
|
33eea5ce5415
patch 8.0.1593: :qall never exits with an active terminal window
Christian Brabandt <cb@256bit.org>
parents:
13435
diff
changeset
|
571 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
|
572 } |
|
33eea5ce5415
patch 8.0.1593: :qall never exits with an active terminal window
Christian Brabandt <cb@256bit.org>
parents:
13435
diff
changeset
|
573 |
| 12502 | 574 /* 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
|
575 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
|
576 && argvar->v_type == VAR_STRING |
| 12502 | 577 && argvar->vval.v_string != NULL |
| 578 && STRCMP(argvar->vval.v_string, "NONE") == 0) | |
| 579 res = create_pty_only(term, opt); | |
| 580 else | |
|
13860
7f892e37b017
patch 8.0.1801: MS-Windows: redirecting terminal output does not work
Christian Brabandt <cb@256bit.org>
parents:
13851
diff
changeset
|
581 res = term_and_job_init(term, argvar, argv, opt, &orig_opt); |
| 12502 | 582 |
| 583 newbuf = curbuf; | |
| 584 if (res == OK) | |
| 585 { | |
| 586 /* Get and remember the size we ended up with. Update the pty. */ | |
| 587 vterm_get_size(term->tl_vterm, &term->tl_rows, &term->tl_cols); | |
| 588 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
|
589 #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
|
590 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
|
591 { |
|
6faef782f50b
patch 8.0.1609: shell commands in the GUI use a dumb terminal
Christian Brabandt <cb@256bit.org>
parents:
13458
diff
changeset
|
592 /* 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
|
593 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
|
594 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
|
595 } |
|
6faef782f50b
patch 8.0.1609: shell commands in the GUI use a dumb terminal
Christian Brabandt <cb@256bit.org>
parents:
13458
diff
changeset
|
596 #endif |
| 12502 | 597 |
| 598 /* Make sure we don't get stuck on sending keys to the job, it leads to | |
| 599 * a deadlock if the job is waiting for Vim to read. */ | |
| 600 channel_set_nonblock(term->tl_job->jv_channel, PART_IN); | |
| 601 | |
|
13835
8e583c52eb44
patch 8.0.1789: BufWinEnter does not work well for a terminal window
Christian Brabandt <cb@256bit.org>
parents:
13829
diff
changeset
|
602 if (old_curbuf != NULL) |
| 12502 | 603 { |
| 604 --curbuf->b_nwindows; | |
| 605 curbuf = old_curbuf; | |
| 606 curwin->w_buffer = curbuf; | |
| 607 ++curbuf->b_nwindows; | |
| 608 } | |
| 609 } | |
| 610 else | |
| 611 { | |
|
13298
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
612 term_close_buffer(curbuf, old_curbuf); |
| 12502 | 613 return NULL; |
| 614 } | |
|
13444
9f06f7aca74c
patch 8.0.1596: no autocommand specifically for opening a terminal window
Christian Brabandt <cb@256bit.org>
parents:
13438
diff
changeset
|
615 |
|
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 apply_autocmds(EVENT_TERMINALOPEN, NULL, NULL, FALSE, newbuf); |
| 12502 | 617 return newbuf; |
| 618 } | |
| 619 | |
| 620 /* | |
| 621 * ":terminal": open a terminal window and execute a job in it. | |
| 622 */ | |
| 623 void | |
| 624 ex_terminal(exarg_T *eap) | |
| 625 { | |
| 626 typval_T argvar[2]; | |
| 627 jobopt_T opt; | |
| 628 char_u *cmd; | |
| 629 char_u *tofree = NULL; | |
| 630 | |
| 631 init_job_options(&opt); | |
| 632 | |
| 633 cmd = eap->arg; | |
|
13219
4b8d89ea9edb
patch 8.0.1484: reduntant conditions
Christian Brabandt <cb@256bit.org>
parents:
13206
diff
changeset
|
634 while (*cmd == '+' && *(cmd + 1) == '+') |
| 12502 | 635 { |
| 636 char_u *p, *ep; | |
| 637 | |
| 638 cmd += 2; | |
| 639 p = skiptowhite(cmd); | |
| 640 ep = vim_strchr(cmd, '='); | |
| 641 if (ep != NULL && ep < p) | |
| 642 p = ep; | |
| 643 | |
| 644 if ((int)(p - cmd) == 5 && STRNICMP(cmd, "close", 5) == 0) | |
| 645 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
|
646 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
|
647 opt.jo_term_finish = 'n'; |
| 12502 | 648 else if ((int)(p - cmd) == 4 && STRNICMP(cmd, "open", 4) == 0) |
| 649 opt.jo_term_finish = 'o'; | |
| 650 else if ((int)(p - cmd) == 6 && STRNICMP(cmd, "curwin", 6) == 0) | |
| 651 opt.jo_curwin = 1; | |
| 652 else if ((int)(p - cmd) == 6 && STRNICMP(cmd, "hidden", 6) == 0) | |
| 653 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
|
654 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
|
655 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
|
656 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
|
657 && ep != NULL) |
|
33eea5ce5415
patch 8.0.1593: :qall never exits with an active terminal window
Christian Brabandt <cb@256bit.org>
parents:
13435
diff
changeset
|
658 { |
|
33eea5ce5415
patch 8.0.1593: :qall never exits with an active terminal window
Christian Brabandt <cb@256bit.org>
parents:
13435
diff
changeset
|
659 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
|
660 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
|
661 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
|
662 } |
| 12502 | 663 else if ((int)(p - cmd) == 4 && STRNICMP(cmd, "rows", 4) == 0 |
| 664 && ep != NULL && isdigit(ep[1])) | |
| 665 { | |
| 666 opt.jo_set2 |= JO2_TERM_ROWS; | |
| 667 opt.jo_term_rows = atoi((char *)ep + 1); | |
| 668 p = skiptowhite(cmd); | |
| 669 } | |
| 670 else if ((int)(p - cmd) == 4 && STRNICMP(cmd, "cols", 4) == 0 | |
| 671 && ep != NULL && isdigit(ep[1])) | |
| 672 { | |
| 673 opt.jo_set2 |= JO2_TERM_COLS; | |
| 674 opt.jo_term_cols = atoi((char *)ep + 1); | |
| 675 p = skiptowhite(cmd); | |
| 676 } | |
| 677 else if ((int)(p - cmd) == 3 && STRNICMP(cmd, "eof", 3) == 0 | |
| 678 && ep != NULL) | |
| 679 { | |
| 680 char_u *buf = NULL; | |
| 681 char_u *keys; | |
| 682 | |
| 683 p = skiptowhite(cmd); | |
| 684 *p = NUL; | |
| 685 keys = replace_termcodes(ep + 1, &buf, TRUE, TRUE, TRUE); | |
| 686 opt.jo_set2 |= JO2_EOF_CHARS; | |
| 687 opt.jo_eof_chars = vim_strsave(keys); | |
| 688 vim_free(buf); | |
| 689 *p = ' '; | |
| 690 } | |
| 691 else | |
| 692 { | |
| 693 if (*p) | |
| 694 *p = NUL; | |
| 695 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
|
696 goto theend; |
| 12502 | 697 } |
| 698 cmd = skipwhite(p); | |
| 699 } | |
| 700 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
|
701 { |
| 12502 | 702 /* Make a copy of 'shell', an autocommand may change the option. */ |
| 703 tofree = cmd = vim_strsave(p_sh); | |
| 704 | |
|
13476
d130044d4f1f
patch 8.0.1612: need to close terminal after shell stopped
Christian Brabandt <cb@256bit.org>
parents:
13474
diff
changeset
|
705 /* 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
|
706 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
|
707 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
|
708 } |
|
d130044d4f1f
patch 8.0.1612: need to close terminal after shell stopped
Christian Brabandt <cb@256bit.org>
parents:
13474
diff
changeset
|
709 |
| 12502 | 710 if (eap->addr_count > 0) |
| 711 { | |
| 712 /* Write lines from current buffer to the job. */ | |
| 713 opt.jo_set |= JO_IN_IO | JO_IN_BUF | JO_IN_TOP | JO_IN_BOT; | |
| 714 opt.jo_io[PART_IN] = JIO_BUFFER; | |
| 715 opt.jo_io_buf[PART_IN] = curbuf->b_fnum; | |
| 716 opt.jo_in_top = eap->line1; | |
| 717 opt.jo_in_bot = eap->line2; | |
| 718 } | |
| 719 | |
| 720 argvar[0].v_type = VAR_STRING; | |
| 721 argvar[0].vval.v_string = cmd; | |
| 722 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
|
723 term_start(argvar, NULL, &opt, eap->forceit ? TERM_START_FORCEIT : 0); |
| 12502 | 724 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
|
725 |
|
33eea5ce5415
patch 8.0.1593: :qall never exits with an active terminal window
Christian Brabandt <cb@256bit.org>
parents:
13435
diff
changeset
|
726 theend: |
| 12502 | 727 vim_free(opt.jo_eof_chars); |
| 728 } | |
| 729 | |
|
13435
fa198b71bab2
patch 8.0.1592: terminal windows in a session are not properly restored
Christian Brabandt <cb@256bit.org>
parents:
13380
diff
changeset
|
730 #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
|
731 /* |
|
fa198b71bab2
patch 8.0.1592: terminal windows in a session are not properly restored
Christian Brabandt <cb@256bit.org>
parents:
13380
diff
changeset
|
732 * 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
|
733 * 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
|
734 * 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
|
735 */ |
|
fa198b71bab2
patch 8.0.1592: terminal windows in a session are not properly restored
Christian Brabandt <cb@256bit.org>
parents:
13380
diff
changeset
|
736 int |
|
fa198b71bab2
patch 8.0.1592: terminal windows in a session are not properly restored
Christian Brabandt <cb@256bit.org>
parents:
13380
diff
changeset
|
737 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
|
738 { |
|
fa198b71bab2
patch 8.0.1592: terminal windows in a session are not properly restored
Christian Brabandt <cb@256bit.org>
parents:
13380
diff
changeset
|
739 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
|
740 |
|
fa198b71bab2
patch 8.0.1592: terminal windows in a session are not properly restored
Christian Brabandt <cb@256bit.org>
parents:
13380
diff
changeset
|
741 /* 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
|
742 * 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
|
743 * 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
|
744 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
|
745 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
|
746 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
|
747 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
|
748 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
|
749 |
|
fa198b71bab2
patch 8.0.1592: terminal windows in a session are not properly restored
Christian Brabandt <cb@256bit.org>
parents:
13380
diff
changeset
|
750 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
|
751 } |
|
fa198b71bab2
patch 8.0.1592: terminal windows in a session are not properly restored
Christian Brabandt <cb@256bit.org>
parents:
13380
diff
changeset
|
752 |
|
fa198b71bab2
patch 8.0.1592: terminal windows in a session are not properly restored
Christian Brabandt <cb@256bit.org>
parents:
13380
diff
changeset
|
753 /* |
|
fa198b71bab2
patch 8.0.1592: terminal windows in a session are not properly restored
Christian Brabandt <cb@256bit.org>
parents:
13380
diff
changeset
|
754 * 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
|
755 */ |
|
fa198b71bab2
patch 8.0.1592: terminal windows in a session are not properly restored
Christian Brabandt <cb@256bit.org>
parents:
13380
diff
changeset
|
756 int |
|
fa198b71bab2
patch 8.0.1592: terminal windows in a session are not properly restored
Christian Brabandt <cb@256bit.org>
parents:
13380
diff
changeset
|
757 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
|
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 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
|
760 |
|
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 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
|
762 || 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
|
763 } |
|
fa198b71bab2
patch 8.0.1592: terminal windows in a session are not properly restored
Christian Brabandt <cb@256bit.org>
parents:
13380
diff
changeset
|
764 #endif |
|
fa198b71bab2
patch 8.0.1592: terminal windows in a session are not properly restored
Christian Brabandt <cb@256bit.org>
parents:
13380
diff
changeset
|
765 |
| 12502 | 766 /* |
| 767 * Free the scrollback buffer for "term". | |
| 768 */ | |
| 769 static void | |
| 770 free_scrollback(term_T *term) | |
| 771 { | |
| 772 int i; | |
| 773 | |
| 774 for (i = 0; i < term->tl_scrollback.ga_len; ++i) | |
| 775 vim_free(((sb_line_T *)term->tl_scrollback.ga_data + i)->sb_cells); | |
| 776 ga_clear(&term->tl_scrollback); | |
| 777 } | |
| 778 | |
| 779 /* | |
| 780 * Free a terminal and everything it refers to. | |
| 781 * Kills the job if there is one. | |
| 782 * Called when wiping out a buffer. | |
| 783 */ | |
| 784 void | |
| 785 free_terminal(buf_T *buf) | |
| 786 { | |
| 787 term_T *term = buf->b_term; | |
| 788 term_T *tp; | |
| 789 | |
| 790 if (term == NULL) | |
| 791 return; | |
| 792 if (first_term == term) | |
| 793 first_term = term->tl_next; | |
| 794 else | |
| 795 for (tp = first_term; tp->tl_next != NULL; tp = tp->tl_next) | |
| 796 if (tp->tl_next == term) | |
| 797 { | |
| 798 tp->tl_next = term->tl_next; | |
| 799 break; | |
| 800 } | |
| 801 | |
| 802 if (term->tl_job != NULL) | |
| 803 { | |
| 804 if (term->tl_job->jv_status != JOB_ENDED | |
| 805 && 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
|
806 && term->tl_job->jv_status != JOB_FAILED) |
| 12502 | 807 job_stop(term->tl_job, NULL, "kill"); |
| 808 job_unref(term->tl_job); | |
| 809 } | |
| 810 | |
| 811 free_scrollback(term); | |
| 812 | |
| 813 term_free_vterm(term); | |
| 814 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
|
815 #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
|
816 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
|
817 #endif |
|
13438
33eea5ce5415
patch 8.0.1593: :qall never exits with an active terminal window
Christian Brabandt <cb@256bit.org>
parents:
13435
diff
changeset
|
818 vim_free(term->tl_kill); |
| 12502 | 819 vim_free(term->tl_status_text); |
| 820 vim_free(term->tl_opencmd); | |
| 821 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
|
822 #ifdef WIN3264 |
|
7f892e37b017
patch 8.0.1801: MS-Windows: redirecting terminal output does not work
Christian Brabandt <cb@256bit.org>
parents:
13851
diff
changeset
|
823 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
|
824 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
|
825 #endif |
|
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
|
826 if (desired_cursor_color == term->tl_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
|
827 desired_cursor_color = (char_u *)""; |
| 12502 | 828 vim_free(term->tl_cursor_color); |
| 829 vim_free(term); | |
| 830 buf->b_term = NULL; | |
| 831 if (in_terminal_loop == term) | |
| 832 in_terminal_loop = NULL; | |
| 833 } | |
| 834 | |
| 835 /* | |
|
13132
fe0cec169589
patch 8.0.1440: terminal window: some vterm responses are delayed
Christian Brabandt <cb@256bit.org>
parents:
13111
diff
changeset
|
836 * 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
|
837 * 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
|
838 * 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
|
839 */ |
|
fe0cec169589
patch 8.0.1440: terminal window: some vterm responses are delayed
Christian Brabandt <cb@256bit.org>
parents:
13111
diff
changeset
|
840 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
|
841 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
|
842 { |
|
fe0cec169589
patch 8.0.1440: terminal window: some vterm responses are delayed
Christian Brabandt <cb@256bit.org>
parents:
13111
diff
changeset
|
843 #ifdef UNIX |
|
fe0cec169589
patch 8.0.1440: terminal window: some vterm responses are delayed
Christian Brabandt <cb@256bit.org>
parents:
13111
diff
changeset
|
844 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
|
845 int i; |
|
fe0cec169589
patch 8.0.1440: terminal window: some vterm responses are delayed
Christian Brabandt <cb@256bit.org>
parents:
13111
diff
changeset
|
846 |
|
fe0cec169589
patch 8.0.1440: terminal window: some vterm responses are delayed
Christian Brabandt <cb@256bit.org>
parents:
13111
diff
changeset
|
847 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
|
848 { |
|
fe0cec169589
patch 8.0.1440: terminal window: some vterm responses are delayed
Christian Brabandt <cb@256bit.org>
parents:
13111
diff
changeset
|
849 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
|
850 |
|
fe0cec169589
patch 8.0.1440: terminal window: some vterm responses are delayed
Christian Brabandt <cb@256bit.org>
parents:
13111
diff
changeset
|
851 if (isatty(fd)) |
|
fe0cec169589
patch 8.0.1440: terminal window: some vterm responses are delayed
Christian Brabandt <cb@256bit.org>
parents:
13111
diff
changeset
|
852 return parts[i]; |
|
fe0cec169589
patch 8.0.1440: terminal window: some vterm responses are delayed
Christian Brabandt <cb@256bit.org>
parents:
13111
diff
changeset
|
853 } |
|
fe0cec169589
patch 8.0.1440: terminal window: some vterm responses are delayed
Christian Brabandt <cb@256bit.org>
parents:
13111
diff
changeset
|
854 #endif |
|
fe0cec169589
patch 8.0.1440: terminal window: some vterm responses are delayed
Christian Brabandt <cb@256bit.org>
parents:
13111
diff
changeset
|
855 return PART_IN; |
|
fe0cec169589
patch 8.0.1440: terminal window: some vterm responses are delayed
Christian Brabandt <cb@256bit.org>
parents:
13111
diff
changeset
|
856 } |
|
fe0cec169589
patch 8.0.1440: terminal window: some vterm responses are delayed
Christian Brabandt <cb@256bit.org>
parents:
13111
diff
changeset
|
857 |
|
fe0cec169589
patch 8.0.1440: terminal window: some vterm responses are delayed
Christian Brabandt <cb@256bit.org>
parents:
13111
diff
changeset
|
858 /* |
| 12502 | 859 * Write job output "msg[len]" to the vterm. |
| 860 */ | |
| 861 static void | |
| 862 term_write_job_output(term_T *term, char_u *msg, size_t len) | |
| 863 { | |
| 864 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
|
865 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
|
866 |
|
8dfeed7e07e7
patch 8.0.1277: terminal window CR-NL conversions may cause problems
Christian Brabandt <cb@256bit.org>
parents:
12798
diff
changeset
|
867 vterm_input_write(vterm, (char *)msg, len); |
| 12502 | 868 |
|
13132
fe0cec169589
patch 8.0.1440: terminal window: some vterm responses are delayed
Christian Brabandt <cb@256bit.org>
parents:
13111
diff
changeset
|
869 /* 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
|
870 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
|
871 { |
|
fe0cec169589
patch 8.0.1440: terminal window: some vterm responses are delayed
Christian Brabandt <cb@256bit.org>
parents:
13111
diff
changeset
|
872 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
|
873 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
|
874 |
|
fe0cec169589
patch 8.0.1440: terminal window: some vterm responses are delayed
Christian Brabandt <cb@256bit.org>
parents:
13111
diff
changeset
|
875 if (curlen > 0) |
|
fe0cec169589
patch 8.0.1440: terminal window: some vterm responses are delayed
Christian Brabandt <cb@256bit.org>
parents:
13111
diff
changeset
|
876 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
|
877 (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
|
878 } |
|
fe0cec169589
patch 8.0.1440: terminal window: some vterm responses are delayed
Christian Brabandt <cb@256bit.org>
parents:
13111
diff
changeset
|
879 |
| 12502 | 880 /* this invokes the damage callbacks */ |
| 881 vterm_screen_flush_damage(vterm_obtain_screen(vterm)); | |
| 882 } | |
| 883 | |
| 884 static void | |
| 885 update_cursor(term_T *term, int redraw) | |
| 886 { | |
| 887 if (term->tl_normal_mode) | |
| 888 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
|
889 #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
|
890 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
|
891 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
|
892 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
|
893 else |
|
6faef782f50b
patch 8.0.1609: shell commands in the GUI use a dumb terminal
Christian Brabandt <cb@256bit.org>
parents:
13458
diff
changeset
|
894 #endif |
|
6faef782f50b
patch 8.0.1609: shell commands in the GUI use a dumb terminal
Christian Brabandt <cb@256bit.org>
parents:
13458
diff
changeset
|
895 setcursor(); |
| 12502 | 896 if (redraw) |
| 897 { | |
| 898 if (term->tl_buffer == curbuf && term->tl_cursor_visible) | |
| 899 cursor_on(); | |
| 900 out_flush(); | |
| 901 #ifdef FEAT_GUI | |
| 902 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
|
903 { |
| 12502 | 904 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
|
905 gui_mch_flush(); |
|
6f98a5fd0c19
patch 8.0.1376: cursor in terminal not always updated
Christian Brabandt <cb@256bit.org>
parents:
12984
diff
changeset
|
906 } |
| 12502 | 907 #endif |
| 908 } | |
| 909 } | |
| 910 | |
| 911 /* | |
| 912 * Invoked when "msg" output from a job was received. Write it to the terminal | |
| 913 * of "buffer". | |
| 914 */ | |
| 915 void | |
| 916 write_to_term(buf_T *buffer, char_u *msg, channel_T *channel) | |
| 917 { | |
| 918 size_t len = STRLEN(msg); | |
| 919 term_T *term = buffer->b_term; | |
| 920 | |
|
13860
7f892e37b017
patch 8.0.1801: MS-Windows: redirecting terminal output does not work
Christian Brabandt <cb@256bit.org>
parents:
13851
diff
changeset
|
921 #ifdef WIN3264 |
|
7f892e37b017
patch 8.0.1801: MS-Windows: redirecting terminal output does not work
Christian Brabandt <cb@256bit.org>
parents:
13851
diff
changeset
|
922 /* 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
|
923 * the file. */ |
|
7f892e37b017
patch 8.0.1801: MS-Windows: redirecting terminal output does not work
Christian Brabandt <cb@256bit.org>
parents:
13851
diff
changeset
|
924 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
|
925 { |
|
7f892e37b017
patch 8.0.1801: MS-Windows: redirecting terminal output does not work
Christian Brabandt <cb@256bit.org>
parents:
13851
diff
changeset
|
926 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
|
927 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
|
928 return; |
|
7f892e37b017
patch 8.0.1801: MS-Windows: redirecting terminal output does not work
Christian Brabandt <cb@256bit.org>
parents:
13851
diff
changeset
|
929 } |
|
7f892e37b017
patch 8.0.1801: MS-Windows: redirecting terminal output does not work
Christian Brabandt <cb@256bit.org>
parents:
13851
diff
changeset
|
930 #endif |
|
7f892e37b017
patch 8.0.1801: MS-Windows: redirecting terminal output does not work
Christian Brabandt <cb@256bit.org>
parents:
13851
diff
changeset
|
931 |
| 12502 | 932 if (term->tl_vterm == NULL) |
| 933 { | |
| 934 ch_log(channel, "NOT writing %d bytes to terminal", (int)len); | |
| 935 return; | |
| 936 } | |
| 937 ch_log(channel, "writing %d bytes to terminal", (int)len); | |
| 938 term_write_job_output(term, msg, len); | |
| 939 | |
|
13470
6faef782f50b
patch 8.0.1609: shell commands in the GUI use a dumb terminal
Christian Brabandt <cb@256bit.org>
parents:
13458
diff
changeset
|
940 #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
|
941 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
|
942 { |
|
6faef782f50b
patch 8.0.1609: shell commands in the GUI use a dumb terminal
Christian Brabandt <cb@256bit.org>
parents:
13458
diff
changeset
|
943 /* 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
|
944 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
|
945 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
|
946 } |
|
6faef782f50b
patch 8.0.1609: shell commands in the GUI use a dumb terminal
Christian Brabandt <cb@256bit.org>
parents:
13458
diff
changeset
|
947 else |
|
6faef782f50b
patch 8.0.1609: shell commands in the GUI use a dumb terminal
Christian Brabandt <cb@256bit.org>
parents:
13458
diff
changeset
|
948 #endif |
| 12502 | 949 /* In Terminal-Normal mode we are displaying the buffer, not the terminal |
| 950 * contents, thus no screen update is needed. */ | |
| 951 if (!term->tl_normal_mode) | |
| 952 { | |
| 953 /* TODO: only update once in a while. */ | |
| 954 ch_log(term->tl_job->jv_channel, "updating screen"); | |
| 955 if (buffer == curbuf) | |
| 956 { | |
| 957 update_screen(0); | |
|
13886
bbf5bdba4a80
patch 8.0.1814: crash with terminal window and with 'lazyredraw' set
Christian Brabandt <cb@256bit.org>
parents:
13878
diff
changeset
|
958 /* 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
|
959 * already */ |
|
bbf5bdba4a80
patch 8.0.1814: crash with terminal window and with 'lazyredraw' set
Christian Brabandt <cb@256bit.org>
parents:
13878
diff
changeset
|
960 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
|
961 update_cursor(curbuf->b_term, TRUE); |
| 12502 | 962 } |
| 963 else | |
| 964 redraw_after_callback(TRUE); | |
| 965 } | |
| 966 } | |
| 967 | |
| 968 /* | |
| 969 * Send a mouse position and click to the vterm | |
| 970 */ | |
| 971 static int | |
| 972 term_send_mouse(VTerm *vterm, int button, int pressed) | |
| 973 { | |
| 974 VTermModifier mod = VTERM_MOD_NONE; | |
| 975 | |
| 976 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
|
977 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
|
978 if (button != 0) |
|
ebb4f6c93598
patch 8.0.1309: cannot use 'balloonexpr' in a terminal
Christian Brabandt <cb@256bit.org>
parents:
12845
diff
changeset
|
979 vterm_mouse_button(vterm, button, pressed, mod); |
| 12502 | 980 return TRUE; |
| 981 } | |
| 982 | |
|
13448
a62b0bbc8834
patch 8.0.1598: cannot select text in a terminal with the mouse
Christian Brabandt <cb@256bit.org>
parents:
13444
diff
changeset
|
983 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
|
984 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
|
985 |
|
a62b0bbc8834
patch 8.0.1598: cannot select text in a terminal with the mouse
Christian Brabandt <cb@256bit.org>
parents:
13444
diff
changeset
|
986 /* |
|
a62b0bbc8834
patch 8.0.1598: cannot select text in a terminal with the mouse
Christian Brabandt <cb@256bit.org>
parents:
13444
diff
changeset
|
987 * 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
|
988 * 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
|
989 */ |
|
a62b0bbc8834
patch 8.0.1598: cannot select text in a terminal with the mouse
Christian Brabandt <cb@256bit.org>
parents:
13444
diff
changeset
|
990 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
|
991 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
|
992 { |
|
a62b0bbc8834
patch 8.0.1598: cannot select text in a terminal with the mouse
Christian Brabandt <cb@256bit.org>
parents:
13444
diff
changeset
|
993 #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
|
994 /* 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
|
995 * 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
|
996 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
|
997 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
|
998 |
|
a62b0bbc8834
patch 8.0.1598: cannot select text in a terminal with the mouse
Christian Brabandt <cb@256bit.org>
parents:
13444
diff
changeset
|
999 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
|
1000 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
|
1001 { |
|
a62b0bbc8834
patch 8.0.1598: cannot select text in a terminal with the mouse
Christian Brabandt <cb@256bit.org>
parents:
13444
diff
changeset
|
1002 /* 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
|
1003 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
|
1004 { |
|
a62b0bbc8834
patch 8.0.1598: cannot select text in a terminal with the mouse
Christian Brabandt <cb@256bit.org>
parents:
13444
diff
changeset
|
1005 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
|
1006 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
|
1007 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
|
1008 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
|
1009 /* 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
|
1010 * 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
|
1011 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
|
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 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
|
1014 |
|
a62b0bbc8834
patch 8.0.1598: cannot select text in a terminal with the mouse
Christian Brabandt <cb@256bit.org>
parents:
13444
diff
changeset
|
1015 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
|
1016 break; |
|
a62b0bbc8834
patch 8.0.1598: cannot select text in a terminal with the mouse
Christian Brabandt <cb@256bit.org>
parents:
13444
diff
changeset
|
1017 |
|
a62b0bbc8834
patch 8.0.1598: cannot select text in a terminal with the mouse
Christian Brabandt <cb@256bit.org>
parents:
13444
diff
changeset
|
1018 /* 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
|
1019 * 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
|
1020 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
|
1021 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
|
1022 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
|
1023 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
|
1024 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
|
1025 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
|
1026 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
|
1027 } |
|
a62b0bbc8834
patch 8.0.1598: cannot select text in a terminal with the mouse
Christian Brabandt <cb@256bit.org>
parents:
13444
diff
changeset
|
1028 /* FALLTHROUGH */ |
|
a62b0bbc8834
patch 8.0.1598: cannot select text in a terminal with the mouse
Christian Brabandt <cb@256bit.org>
parents:
13444
diff
changeset
|
1029 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
|
1030 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
|
1031 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
|
1032 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
|
1033 else |
|
a62b0bbc8834
patch 8.0.1598: cannot select text in a terminal with the mouse
Christian Brabandt <cb@256bit.org>
parents:
13444
diff
changeset
|
1034 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
|
1035 /* 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
|
1036 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
|
1037 { |
|
a62b0bbc8834
patch 8.0.1598: cannot select text in a terminal with the mouse
Christian Brabandt <cb@256bit.org>
parents:
13444
diff
changeset
|
1038 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
|
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 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
|
1041 &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
|
1042 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
|
1043 && (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
|
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 /* 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
|
1046 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
|
1047 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
|
1048 } |
|
a62b0bbc8834
patch 8.0.1598: cannot select text in a terminal with the mouse
Christian Brabandt <cb@256bit.org>
parents:
13444
diff
changeset
|
1049 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
|
1050 } |
|
a62b0bbc8834
patch 8.0.1598: cannot select text in a terminal with the mouse
Christian Brabandt <cb@256bit.org>
parents:
13444
diff
changeset
|
1051 break; |
|
a62b0bbc8834
patch 8.0.1598: cannot select text in a terminal with the mouse
Christian Brabandt <cb@256bit.org>
parents:
13444
diff
changeset
|
1052 |
|
a62b0bbc8834
patch 8.0.1598: cannot select text in a terminal with the mouse
Christian Brabandt <cb@256bit.org>
parents:
13444
diff
changeset
|
1053 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
|
1054 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
|
1055 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
|
1056 break; |
|
a62b0bbc8834
patch 8.0.1598: cannot select text in a terminal with the mouse
Christian Brabandt <cb@256bit.org>
parents:
13444
diff
changeset
|
1057 } |
|
a62b0bbc8834
patch 8.0.1598: cannot select text in a terminal with the mouse
Christian Brabandt <cb@256bit.org>
parents:
13444
diff
changeset
|
1058 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
|
1059 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
|
1060 } |
|
a62b0bbc8834
patch 8.0.1598: cannot select text in a terminal with the mouse
Christian Brabandt <cb@256bit.org>
parents:
13444
diff
changeset
|
1061 #endif |
|
a62b0bbc8834
patch 8.0.1598: cannot select text in a terminal with the mouse
Christian Brabandt <cb@256bit.org>
parents:
13444
diff
changeset
|
1062 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
|
1063 |
|
a62b0bbc8834
patch 8.0.1598: cannot select text in a terminal with the mouse
Christian Brabandt <cb@256bit.org>
parents:
13444
diff
changeset
|
1064 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
|
1065 { |
|
a62b0bbc8834
patch 8.0.1598: cannot select text in a terminal with the mouse
Christian Brabandt <cb@256bit.org>
parents:
13444
diff
changeset
|
1066 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
|
1067 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
|
1068 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
|
1069 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
|
1070 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
|
1071 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
|
1072 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
|
1073 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
|
1074 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
|
1075 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
|
1076 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
|
1077 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
|
1078 } |
|
a62b0bbc8834
patch 8.0.1598: cannot select text in a terminal with the mouse
Christian Brabandt <cb@256bit.org>
parents:
13444
diff
changeset
|
1079 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
|
1080 } |
|
a62b0bbc8834
patch 8.0.1598: cannot select text in a terminal with the mouse
Christian Brabandt <cb@256bit.org>
parents:
13444
diff
changeset
|
1081 |
| 12502 | 1082 /* |
| 1083 * Convert typed key "c" into bytes to send to the job. | |
| 1084 * Return the number of bytes in "buf". | |
| 1085 */ | |
| 1086 static int | |
| 1087 term_convert_key(term_T *term, int c, char *buf) | |
| 1088 { | |
| 1089 VTerm *vterm = term->tl_vterm; | |
| 1090 VTermKey key = VTERM_KEY_NONE; | |
| 1091 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
|
1092 int other = FALSE; |
| 12502 | 1093 |
| 1094 switch (c) | |
| 1095 { | |
|
12800
8dfeed7e07e7
patch 8.0.1277: terminal window CR-NL conversions may cause problems
Christian Brabandt <cb@256bit.org>
parents:
12798
diff
changeset
|
1096 /* 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
|
1097 |
| 12502 | 1098 /* don't use VTERM_KEY_BACKSPACE, it always |
| 1099 * becomes 0x7f DEL */ | |
| 1100 case K_BS: c = term_backspace_char; break; | |
| 1101 | |
| 1102 case ESC: key = VTERM_KEY_ESCAPE; break; | |
| 1103 case K_DEL: key = VTERM_KEY_DEL; break; | |
| 1104 case K_DOWN: key = VTERM_KEY_DOWN; break; | |
| 1105 case K_S_DOWN: mod = VTERM_MOD_SHIFT; | |
| 1106 key = VTERM_KEY_DOWN; break; | |
| 1107 case K_END: key = VTERM_KEY_END; break; | |
| 1108 case K_S_END: mod = VTERM_MOD_SHIFT; | |
| 1109 key = VTERM_KEY_END; break; | |
| 1110 case K_C_END: mod = VTERM_MOD_CTRL; | |
| 1111 key = VTERM_KEY_END; break; | |
| 1112 case K_F10: key = VTERM_KEY_FUNCTION(10); break; | |
| 1113 case K_F11: key = VTERM_KEY_FUNCTION(11); break; | |
| 1114 case K_F12: key = VTERM_KEY_FUNCTION(12); break; | |
| 1115 case K_F1: key = VTERM_KEY_FUNCTION(1); break; | |
| 1116 case K_F2: key = VTERM_KEY_FUNCTION(2); break; | |
| 1117 case K_F3: key = VTERM_KEY_FUNCTION(3); break; | |
| 1118 case K_F4: key = VTERM_KEY_FUNCTION(4); break; | |
| 1119 case K_F5: key = VTERM_KEY_FUNCTION(5); break; | |
| 1120 case K_F6: key = VTERM_KEY_FUNCTION(6); break; | |
| 1121 case K_F7: key = VTERM_KEY_FUNCTION(7); break; | |
| 1122 case K_F8: key = VTERM_KEY_FUNCTION(8); break; | |
| 1123 case K_F9: key = VTERM_KEY_FUNCTION(9); break; | |
| 1124 case K_HOME: key = VTERM_KEY_HOME; break; | |
| 1125 case K_S_HOME: mod = VTERM_MOD_SHIFT; | |
| 1126 key = VTERM_KEY_HOME; break; | |
| 1127 case K_C_HOME: mod = VTERM_MOD_CTRL; | |
| 1128 key = VTERM_KEY_HOME; break; | |
| 1129 case K_INS: key = VTERM_KEY_INS; break; | |
| 1130 case K_K0: key = VTERM_KEY_KP_0; break; | |
| 1131 case K_K1: key = VTERM_KEY_KP_1; break; | |
| 1132 case K_K2: key = VTERM_KEY_KP_2; break; | |
| 1133 case K_K3: key = VTERM_KEY_KP_3; break; | |
| 1134 case K_K4: key = VTERM_KEY_KP_4; break; | |
| 1135 case K_K5: key = VTERM_KEY_KP_5; break; | |
| 1136 case K_K6: key = VTERM_KEY_KP_6; break; | |
| 1137 case K_K7: key = VTERM_KEY_KP_7; break; | |
| 1138 case K_K8: key = VTERM_KEY_KP_8; break; | |
| 1139 case K_K9: key = VTERM_KEY_KP_9; break; | |
| 1140 case K_KDEL: key = VTERM_KEY_DEL; break; /* TODO */ | |
| 1141 case K_KDIVIDE: key = VTERM_KEY_KP_DIVIDE; break; | |
| 1142 case K_KEND: key = VTERM_KEY_KP_1; break; /* TODO */ | |
| 1143 case K_KENTER: key = VTERM_KEY_KP_ENTER; break; | |
| 1144 case K_KHOME: key = VTERM_KEY_KP_7; break; /* TODO */ | |
| 1145 case K_KINS: key = VTERM_KEY_KP_0; break; /* TODO */ | |
| 1146 case K_KMINUS: key = VTERM_KEY_KP_MINUS; break; | |
| 1147 case K_KMULTIPLY: key = VTERM_KEY_KP_MULT; break; | |
| 1148 case K_KPAGEDOWN: key = VTERM_KEY_KP_3; break; /* TODO */ | |
| 1149 case K_KPAGEUP: key = VTERM_KEY_KP_9; break; /* TODO */ | |
| 1150 case K_KPLUS: key = VTERM_KEY_KP_PLUS; break; | |
| 1151 case K_KPOINT: key = VTERM_KEY_KP_PERIOD; break; | |
| 1152 case K_LEFT: key = VTERM_KEY_LEFT; break; | |
| 1153 case K_S_LEFT: mod = VTERM_MOD_SHIFT; | |
| 1154 key = VTERM_KEY_LEFT; break; | |
| 1155 case K_C_LEFT: mod = VTERM_MOD_CTRL; | |
| 1156 key = VTERM_KEY_LEFT; break; | |
| 1157 case K_PAGEDOWN: key = VTERM_KEY_PAGEDOWN; break; | |
| 1158 case K_PAGEUP: key = VTERM_KEY_PAGEUP; break; | |
| 1159 case K_RIGHT: key = VTERM_KEY_RIGHT; break; | |
| 1160 case K_S_RIGHT: mod = VTERM_MOD_SHIFT; | |
| 1161 key = VTERM_KEY_RIGHT; break; | |
| 1162 case K_C_RIGHT: mod = VTERM_MOD_CTRL; | |
| 1163 key = VTERM_KEY_RIGHT; break; | |
| 1164 case K_UP: key = VTERM_KEY_UP; break; | |
| 1165 case K_S_UP: mod = VTERM_MOD_SHIFT; | |
| 1166 key = VTERM_KEY_UP; break; | |
| 1167 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
|
1168 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
|
1169 key = VTERM_KEY_TAB; break; |
| 12502 | 1170 |
|
12845
15696054bc6c
patch 8.0.1299: bracketed paste does not work well in terminal window
Christian Brabandt <cb@256bit.org>
parents:
12800
diff
changeset
|
1171 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
|
1172 case K_MOUSEDOWN: other = term_send_mouse(vterm, 4, 1); break; |
| 12502 | 1173 case K_MOUSELEFT: /* TODO */ return 0; |
| 1174 case K_MOUSERIGHT: /* TODO */ return 0; | |
| 1175 | |
| 1176 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
|
1177 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
|
1178 case K_LEFTDRAG: |
| 12502 | 1179 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
|
1180 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
|
1181 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
|
1182 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
|
1183 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
|
1184 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
|
1185 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
|
1186 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
|
1187 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
|
1188 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
|
1189 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
|
1190 break; |
|
a62b0bbc8834
patch 8.0.1598: cannot select text in a terminal with the mouse
Christian Brabandt <cb@256bit.org>
parents:
13444
diff
changeset
|
1191 |
| 12502 | 1192 case K_X1MOUSE: /* TODO */ return 0; |
| 1193 case K_X1DRAG: /* TODO */ return 0; | |
| 1194 case K_X1RELEASE: /* TODO */ return 0; | |
| 1195 case K_X2MOUSE: /* TODO */ return 0; | |
| 1196 case K_X2DRAG: /* TODO */ return 0; | |
| 1197 case K_X2RELEASE: /* TODO */ return 0; | |
| 1198 | |
| 1199 case K_IGNORE: return 0; | |
| 1200 case K_NOP: return 0; | |
| 1201 case K_UNDO: return 0; | |
| 1202 case K_HELP: return 0; | |
| 1203 case K_XF1: key = VTERM_KEY_FUNCTION(1); break; | |
| 1204 case K_XF2: key = VTERM_KEY_FUNCTION(2); break; | |
| 1205 case K_XF3: key = VTERM_KEY_FUNCTION(3); break; | |
| 1206 case K_XF4: key = VTERM_KEY_FUNCTION(4); break; | |
| 1207 case K_SELECT: return 0; | |
| 1208 #ifdef FEAT_GUI | |
| 1209 case K_VER_SCROLLBAR: return 0; | |
| 1210 case K_HOR_SCROLLBAR: return 0; | |
| 1211 #endif | |
| 1212 #ifdef FEAT_GUI_TABLINE | |
| 1213 case K_TABLINE: return 0; | |
| 1214 case K_TABMENU: return 0; | |
| 1215 #endif | |
| 1216 #ifdef FEAT_NETBEANS_INTG | |
| 1217 case K_F21: key = VTERM_KEY_FUNCTION(21); break; | |
| 1218 #endif | |
| 1219 #ifdef FEAT_DND | |
| 1220 case K_DROP: return 0; | |
| 1221 #endif | |
| 1222 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
|
1223 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
|
1224 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
|
1225 break; |
|
15696054bc6c
patch 8.0.1299: bracketed paste does not work well in terminal window
Christian Brabandt <cb@256bit.org>
parents:
12800
diff
changeset
|
1226 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
|
1227 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
|
1228 break; |
| 12502 | 1229 } |
| 1230 | |
| 1231 /* | |
| 1232 * Convert special keys to vterm keys: | |
| 1233 * - Write keys to vterm: vterm_keyboard_key() | |
| 1234 * - Write output to channel. | |
| 1235 * TODO: use mod_mask | |
| 1236 */ | |
| 1237 if (key != VTERM_KEY_NONE) | |
| 1238 /* Special key, let vterm convert it. */ | |
| 1239 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
|
1240 else if (!other) |
| 12502 | 1241 /* Normal character, let vterm convert it. */ |
| 1242 vterm_keyboard_unichar(vterm, c, mod); | |
| 1243 | |
| 1244 /* Read back the converted escape sequence. */ | |
| 1245 return (int)vterm_output_read(vterm, buf, KEY_BUF_LEN); | |
| 1246 } | |
| 1247 | |
| 1248 /* | |
| 1249 * 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
|
1250 * 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
|
1251 */ |
|
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
|
1252 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
|
1253 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
|
1254 { |
|
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
|
1255 /* 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
|
1256 * 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
|
1257 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
|
1258 && 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
|
1259 && 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
|
1260 { |
|
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
|
1261 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
|
1262 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
|
1263 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
|
1264 || 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
|
1265 } |
|
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
|
1266 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
|
1267 } |
|
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
|
1268 |
|
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
|
1269 /* |
|
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
|
1270 * Return TRUE if the job for "term" is still running. |
| 12502 | 1271 */ |
| 1272 int | |
| 1273 term_job_running(term_T *term) | |
| 1274 { | |
|
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
|
1275 return term_job_running_check(term, FALSE); |
| 12502 | 1276 } |
| 1277 | |
| 1278 /* | |
| 1279 * Return TRUE if "term" has an active channel and used ":term NONE". | |
| 1280 */ | |
| 1281 int | |
| 1282 term_none_open(term_T *term) | |
| 1283 { | |
| 1284 /* Also consider the job finished when the channel is closed, to avoid a | |
| 1285 * race condition when updating the title. */ | |
| 1286 return term != NULL | |
| 1287 && term->tl_job != NULL | |
| 1288 && channel_is_open(term->tl_job->jv_channel) | |
| 1289 && term->tl_job->jv_channel->ch_keep_open; | |
| 1290 } | |
| 1291 | |
| 1292 /* | |
|
13438
33eea5ce5415
patch 8.0.1593: :qall never exits with an active terminal window
Christian Brabandt <cb@256bit.org>
parents:
13435
diff
changeset
|
1293 * 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
|
1294 * 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
|
1295 * 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
|
1296 */ |
|
33eea5ce5415
patch 8.0.1593: :qall never exits with an active terminal window
Christian Brabandt <cb@256bit.org>
parents:
13435
diff
changeset
|
1297 int |
|
33eea5ce5415
patch 8.0.1593: :qall never exits with an active terminal window
Christian Brabandt <cb@256bit.org>
parents:
13435
diff
changeset
|
1298 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
|
1299 { |
|
33eea5ce5415
patch 8.0.1593: :qall never exits with an active terminal window
Christian Brabandt <cb@256bit.org>
parents:
13435
diff
changeset
|
1300 int count; |
|
33eea5ce5415
patch 8.0.1593: :qall never exits with an active terminal window
Christian Brabandt <cb@256bit.org>
parents:
13435
diff
changeset
|
1301 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
|
1302 |
|
33eea5ce5415
patch 8.0.1593: :qall never exits with an active terminal window
Christian Brabandt <cb@256bit.org>
parents:
13435
diff
changeset
|
1303 #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
|
1304 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
|
1305 { |
|
33eea5ce5415
patch 8.0.1593: :qall never exits with an active terminal window
Christian Brabandt <cb@256bit.org>
parents:
13435
diff
changeset
|
1306 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
|
1307 int ret; |
|
33eea5ce5415
patch 8.0.1593: :qall never exits with an active terminal window
Christian Brabandt <cb@256bit.org>
parents:
13435
diff
changeset
|
1308 |
|
33eea5ce5415
patch 8.0.1593: :qall never exits with an active terminal window
Christian Brabandt <cb@256bit.org>
parents:
13435
diff
changeset
|
1309 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
|
1310 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
|
1311 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
|
1312 how = "kill"; |
|
33eea5ce5415
patch 8.0.1593: :qall never exits with an active terminal window
Christian Brabandt <cb@256bit.org>
parents:
13435
diff
changeset
|
1313 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
|
1314 return FAIL; |
|
33eea5ce5415
patch 8.0.1593: :qall never exits with an active terminal window
Christian Brabandt <cb@256bit.org>
parents:
13435
diff
changeset
|
1315 } |
|
33eea5ce5415
patch 8.0.1593: :qall never exits with an active terminal window
Christian Brabandt <cb@256bit.org>
parents:
13435
diff
changeset
|
1316 #endif |
|
33eea5ce5415
patch 8.0.1593: :qall never exits with an active terminal window
Christian Brabandt <cb@256bit.org>
parents:
13435
diff
changeset
|
1317 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
|
1318 return FAIL; |
|
33eea5ce5415
patch 8.0.1593: :qall never exits with an active terminal window
Christian Brabandt <cb@256bit.org>
parents:
13435
diff
changeset
|
1319 |
|
33eea5ce5415
patch 8.0.1593: :qall never exits with an active terminal window
Christian Brabandt <cb@256bit.org>
parents:
13435
diff
changeset
|
1320 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
|
1321 |
|
33eea5ce5415
patch 8.0.1593: :qall never exits with an active terminal window
Christian Brabandt <cb@256bit.org>
parents:
13435
diff
changeset
|
1322 /* 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
|
1323 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
|
1324 { |
|
33eea5ce5415
patch 8.0.1593: :qall never exits with an active terminal window
Christian Brabandt <cb@256bit.org>
parents:
13435
diff
changeset
|
1325 /* 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
|
1326 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
|
1327 || 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
|
1328 || 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
|
1329 return OK; |
|
33eea5ce5415
patch 8.0.1593: :qall never exits with an active terminal window
Christian Brabandt <cb@256bit.org>
parents:
13435
diff
changeset
|
1330 |
|
33eea5ce5415
patch 8.0.1593: :qall never exits with an active terminal window
Christian Brabandt <cb@256bit.org>
parents:
13435
diff
changeset
|
1331 /* 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
|
1332 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
|
1333 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
|
1334 return OK; |
|
33eea5ce5415
patch 8.0.1593: :qall never exits with an active terminal window
Christian Brabandt <cb@256bit.org>
parents:
13435
diff
changeset
|
1335 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
|
1336 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
|
1337 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
|
1338 } |
|
33eea5ce5415
patch 8.0.1593: :qall never exits with an active terminal window
Christian Brabandt <cb@256bit.org>
parents:
13435
diff
changeset
|
1339 return FAIL; |
|
33eea5ce5415
patch 8.0.1593: :qall never exits with an active terminal window
Christian Brabandt <cb@256bit.org>
parents:
13435
diff
changeset
|
1340 } |
|
33eea5ce5415
patch 8.0.1593: :qall never exits with an active terminal window
Christian Brabandt <cb@256bit.org>
parents:
13435
diff
changeset
|
1341 |
|
33eea5ce5415
patch 8.0.1593: :qall never exits with an active terminal window
Christian Brabandt <cb@256bit.org>
parents:
13435
diff
changeset
|
1342 /* |
| 12502 | 1343 * Add the last line of the scrollback buffer to the buffer in the window. |
| 1344 */ | |
| 1345 static void | |
| 1346 add_scrollback_line_to_buffer(term_T *term, char_u *text, int len) | |
| 1347 { | |
| 1348 buf_T *buf = term->tl_buffer; | |
| 1349 int empty = (buf->b_ml.ml_flags & ML_EMPTY); | |
| 1350 linenr_T lnum = buf->b_ml.ml_line_count; | |
| 1351 | |
| 1352 #ifdef WIN3264 | |
| 1353 if (!enc_utf8 && enc_codepage > 0) | |
| 1354 { | |
| 1355 WCHAR *ret = NULL; | |
| 1356 int length = 0; | |
| 1357 | |
| 1358 MultiByteToWideChar_alloc(CP_UTF8, 0, (char*)text, len + 1, | |
| 1359 &ret, &length); | |
| 1360 if (ret != NULL) | |
| 1361 { | |
| 1362 WideCharToMultiByte_alloc(enc_codepage, 0, | |
| 1363 ret, length, (char **)&text, &len, 0, 0); | |
| 1364 vim_free(ret); | |
| 1365 ml_append_buf(term->tl_buffer, lnum, text, len, FALSE); | |
| 1366 vim_free(text); | |
| 1367 } | |
| 1368 } | |
| 1369 else | |
| 1370 #endif | |
| 1371 ml_append_buf(term->tl_buffer, lnum, text, len + 1, FALSE); | |
| 1372 if (empty) | |
| 1373 { | |
| 1374 /* Delete the empty line that was in the empty buffer. */ | |
| 1375 curbuf = buf; | |
| 1376 ml_delete(1, FALSE); | |
| 1377 curbuf = curwin->w_buffer; | |
| 1378 } | |
| 1379 } | |
| 1380 | |
| 1381 static void | |
| 1382 cell2cellattr(const VTermScreenCell *cell, cellattr_T *attr) | |
| 1383 { | |
| 1384 attr->width = cell->width; | |
| 1385 attr->attrs = cell->attrs; | |
| 1386 attr->fg = cell->fg; | |
| 1387 attr->bg = cell->bg; | |
| 1388 } | |
| 1389 | |
| 1390 static int | |
| 1391 equal_celattr(cellattr_T *a, cellattr_T *b) | |
| 1392 { | |
| 1393 /* Comparing the colors should be sufficient. */ | |
| 1394 return a->fg.red == b->fg.red | |
| 1395 && a->fg.green == b->fg.green | |
| 1396 && a->fg.blue == b->fg.blue | |
| 1397 && a->bg.red == b->bg.red | |
| 1398 && a->bg.green == b->bg.green | |
| 1399 && a->bg.blue == b->bg.blue; | |
| 1400 } | |
| 1401 | |
|
13298
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
1402 /* |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
1403 * 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
|
1404 * 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
|
1405 */ |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
1406 static int |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
1407 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
|
1408 { |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
1409 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
|
1410 { |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
1411 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
|
1412 + 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
|
1413 |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
1414 if (lnum > 0) |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
1415 { |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
1416 int i; |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
1417 |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
1418 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
|
1419 { |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
1420 *line = *(line - 1); |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
1421 --line; |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
1422 } |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
1423 } |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
1424 line->sb_cols = 0; |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
1425 line->sb_cells = NULL; |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
1426 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
|
1427 ++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
|
1428 return OK; |
|
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 return FALSE; |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
1431 } |
| 12502 | 1432 |
| 1433 /* | |
|
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
|
1434 * 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
|
1435 * 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
|
1436 * 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
|
1437 */ |
|
a590029f16a0
patch 8.0.1810: buffer of a terminal only updated in Terminal-Normal mode
Christian Brabandt <cb@256bit.org>
parents:
13864
diff
changeset
|
1438 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
|
1439 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
|
1440 { |
|
a590029f16a0
patch 8.0.1810: buffer of a terminal only updated in Terminal-Normal mode
Christian Brabandt <cb@256bit.org>
parents:
13864
diff
changeset
|
1441 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
|
1442 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
|
1443 |
|
13894
3969c9d3a859
patch 8.0.1818: lines remove from wrong buffer when using terminal window
Christian Brabandt <cb@256bit.org>
parents:
13888
diff
changeset
|
1444 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
|
1445 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
|
1446 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
|
1447 && 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
|
1448 { |
|
a590029f16a0
patch 8.0.1810: buffer of a terminal only updated in Terminal-Normal mode
Christian Brabandt <cb@256bit.org>
parents:
13864
diff
changeset
|
1449 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
|
1450 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
|
1451 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
|
1452 --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
|
1453 } |
|
13894
3969c9d3a859
patch 8.0.1818: lines remove from wrong buffer when using terminal window
Christian Brabandt <cb@256bit.org>
parents:
13888
diff
changeset
|
1454 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
|
1455 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
|
1456 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
|
1457 } |
|
a590029f16a0
patch 8.0.1810: buffer of a terminal only updated in Terminal-Normal mode
Christian Brabandt <cb@256bit.org>
parents:
13864
diff
changeset
|
1458 |
|
a590029f16a0
patch 8.0.1810: buffer of a terminal only updated in Terminal-Normal mode
Christian Brabandt <cb@256bit.org>
parents:
13864
diff
changeset
|
1459 /* |
| 12502 | 1460 * Add the current lines of the terminal to scrollback and to the buffer. |
| 1461 */ | |
| 1462 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
|
1463 update_snapshot(term_T *term) |
| 12502 | 1464 { |
|
13919
bfca3dbdbf9e
patch 8.0.1830: switching to Terminal-Normal mode does not redraw
Christian Brabandt <cb@256bit.org>
parents:
13906
diff
changeset
|
1465 VTermScreen *screen; |
| 12502 | 1466 int len; |
| 1467 int lines_skipped = 0; | |
| 1468 VTermPos pos; | |
| 1469 VTermScreenCell cell; | |
| 1470 cellattr_T fill_attr, new_fill_attr; | |
| 1471 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
|
1472 |
|
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 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
|
1474 "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
|
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 /* 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
|
1477 * 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
|
1478 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
|
1479 |
| 12502 | 1480 screen = vterm_obtain_screen(term->tl_vterm); |
| 1481 fill_attr = new_fill_attr = term->tl_default_color; | |
| 1482 for (pos.row = 0; pos.row < term->tl_rows; ++pos.row) | |
| 1483 { | |
| 1484 len = 0; | |
| 1485 for (pos.col = 0; pos.col < term->tl_cols; ++pos.col) | |
| 1486 if (vterm_screen_get_cell(screen, pos, &cell) != 0 | |
| 1487 && cell.chars[0] != NUL) | |
| 1488 { | |
| 1489 len = pos.col + 1; | |
| 1490 new_fill_attr = term->tl_default_color; | |
| 1491 } | |
| 1492 else | |
| 1493 /* Assume the last attr is the filler attr. */ | |
| 1494 cell2cellattr(&cell, &new_fill_attr); | |
| 1495 | |
| 1496 if (len == 0 && equal_celattr(&new_fill_attr, &fill_attr)) | |
| 1497 ++lines_skipped; | |
| 1498 else | |
| 1499 { | |
| 1500 while (lines_skipped > 0) | |
| 1501 { | |
| 1502 /* Line was skipped, add an empty line. */ | |
| 1503 --lines_skipped; | |
|
13298
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
1504 if (add_empty_scrollback(term, &fill_attr, 0) == OK) |
| 12502 | 1505 add_scrollback_line_to_buffer(term, (char_u *)"", 0); |
| 1506 } | |
| 1507 | |
| 1508 if (len == 0) | |
| 1509 p = NULL; | |
| 1510 else | |
| 1511 p = (cellattr_T *)alloc((int)sizeof(cellattr_T) * len); | |
| 1512 if ((p != NULL || len == 0) | |
| 1513 && ga_grow(&term->tl_scrollback, 1) == OK) | |
| 1514 { | |
| 1515 garray_T ga; | |
| 1516 int width; | |
| 1517 sb_line_T *line = (sb_line_T *)term->tl_scrollback.ga_data | |
| 1518 + term->tl_scrollback.ga_len; | |
| 1519 | |
| 1520 ga_init2(&ga, 1, 100); | |
| 1521 for (pos.col = 0; pos.col < len; pos.col += width) | |
| 1522 { | |
| 1523 if (vterm_screen_get_cell(screen, pos, &cell) == 0) | |
| 1524 { | |
| 1525 width = 1; | |
| 1526 vim_memset(p + pos.col, 0, sizeof(cellattr_T)); | |
| 1527 if (ga_grow(&ga, 1) == OK) | |
| 1528 ga.ga_len += utf_char2bytes(' ', | |
| 1529 (char_u *)ga.ga_data + ga.ga_len); | |
| 1530 } | |
| 1531 else | |
| 1532 { | |
| 1533 width = cell.width; | |
| 1534 | |
| 1535 cell2cellattr(&cell, &p[pos.col]); | |
| 1536 | |
| 1537 if (ga_grow(&ga, MB_MAXBYTES) == OK) | |
| 1538 { | |
| 1539 int i; | |
| 1540 int c; | |
| 1541 | |
| 1542 for (i = 0; (c = cell.chars[i]) > 0 || i == 0; ++i) | |
| 1543 ga.ga_len += utf_char2bytes(c == NUL ? ' ' : c, | |
| 1544 (char_u *)ga.ga_data + ga.ga_len); | |
| 1545 } | |
| 1546 } | |
| 1547 } | |
| 1548 line->sb_cols = len; | |
| 1549 line->sb_cells = p; | |
| 1550 line->sb_fill_attr = new_fill_attr; | |
| 1551 fill_attr = new_fill_attr; | |
| 1552 ++term->tl_scrollback.ga_len; | |
| 1553 | |
| 1554 if (ga_grow(&ga, 1) == FAIL) | |
| 1555 add_scrollback_line_to_buffer(term, (char_u *)"", 0); | |
| 1556 else | |
| 1557 { | |
| 1558 *((char_u *)ga.ga_data + ga.ga_len) = NUL; | |
| 1559 add_scrollback_line_to_buffer(term, ga.ga_data, ga.ga_len); | |
| 1560 } | |
| 1561 ga_clear(&ga); | |
| 1562 } | |
| 1563 else | |
| 1564 vim_free(p); | |
| 1565 } | |
| 1566 } | |
| 1567 | |
|
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
|
1568 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
|
1569 #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
|
1570 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
|
1571 #endif |
|
13919
bfca3dbdbf9e
patch 8.0.1830: switching to Terminal-Normal mode does not redraw
Christian Brabandt <cb@256bit.org>
parents:
13906
diff
changeset
|
1572 } |
|
bfca3dbdbf9e
patch 8.0.1830: switching to Terminal-Normal mode does not redraw
Christian Brabandt <cb@256bit.org>
parents:
13906
diff
changeset
|
1573 |
|
bfca3dbdbf9e
patch 8.0.1830: switching to Terminal-Normal mode does not redraw
Christian Brabandt <cb@256bit.org>
parents:
13906
diff
changeset
|
1574 /* |
|
bfca3dbdbf9e
patch 8.0.1830: switching to Terminal-Normal mode does not redraw
Christian Brabandt <cb@256bit.org>
parents:
13906
diff
changeset
|
1575 * 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
|
1576 * 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
|
1577 * 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
|
1578 * 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
|
1579 */ |
|
bfca3dbdbf9e
patch 8.0.1830: switching to Terminal-Normal mode does not redraw
Christian Brabandt <cb@256bit.org>
parents:
13906
diff
changeset
|
1580 static void |
|
bfca3dbdbf9e
patch 8.0.1830: switching to Terminal-Normal mode does not redraw
Christian Brabandt <cb@256bit.org>
parents:
13906
diff
changeset
|
1581 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
|
1582 { |
|
bfca3dbdbf9e
patch 8.0.1830: switching to Terminal-Normal mode does not redraw
Christian Brabandt <cb@256bit.org>
parents:
13906
diff
changeset
|
1583 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
|
1584 |
|
bfca3dbdbf9e
patch 8.0.1830: switching to Terminal-Normal mode does not redraw
Christian Brabandt <cb@256bit.org>
parents:
13906
diff
changeset
|
1585 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
|
1586 return; |
|
bfca3dbdbf9e
patch 8.0.1830: switching to Terminal-Normal mode does not redraw
Christian Brabandt <cb@256bit.org>
parents:
13906
diff
changeset
|
1587 |
|
bfca3dbdbf9e
patch 8.0.1830: switching to Terminal-Normal mode does not redraw
Christian Brabandt <cb@256bit.org>
parents:
13906
diff
changeset
|
1588 /* 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
|
1589 * 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
|
1590 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
|
1591 <= 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
|
1592 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
|
1593 |
| 12502 | 1594 /* Obtain the current background color. */ |
| 1595 vterm_state_get_default_colors(vterm_obtain_state(term->tl_vterm), | |
| 1596 &term->tl_default_color.fg, &term->tl_default_color.bg); | |
| 1597 | |
|
13919
bfca3dbdbf9e
patch 8.0.1830: switching to Terminal-Normal mode does not redraw
Christian Brabandt <cb@256bit.org>
parents:
13906
diff
changeset
|
1598 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
|
1599 FOR_ALL_WINDOWS(wp) |
| 12502 | 1600 { |
|
13900
f71ed35527eb
patch 8.0.1821: cursor in terminal window moves when pressing CTRL-W
Christian Brabandt <cb@256bit.org>
parents:
13894
diff
changeset
|
1601 if (wp->w_buffer == term->tl_buffer) |
| 12502 | 1602 { |
|
13900
f71ed35527eb
patch 8.0.1821: cursor in terminal window moves when pressing CTRL-W
Christian Brabandt <cb@256bit.org>
parents:
13894
diff
changeset
|
1603 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
|
1604 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
|
1605 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
|
1606 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
|
1607 { |
|
f71ed35527eb
patch 8.0.1821: cursor in terminal window moves when pressing CTRL-W
Christian Brabandt <cb@256bit.org>
parents:
13894
diff
changeset
|
1608 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
|
1609 |
|
f71ed35527eb
patch 8.0.1821: cursor in terminal window moves when pressing CTRL-W
Christian Brabandt <cb@256bit.org>
parents:
13894
diff
changeset
|
1610 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
|
1611 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
|
1612 } |
|
f71ed35527eb
patch 8.0.1821: cursor in terminal window moves when pressing CTRL-W
Christian Brabandt <cb@256bit.org>
parents:
13894
diff
changeset
|
1613 redraw_win_later(wp, NOT_VALID); |
| 12502 | 1614 } |
| 1615 } | |
| 1616 } | |
| 1617 | |
|
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
|
1618 #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
|
1619 /* |
|
a590029f16a0
patch 8.0.1810: buffer of a terminal only updated in Terminal-Normal mode
Christian Brabandt <cb@256bit.org>
parents:
13864
diff
changeset
|
1620 * 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
|
1621 * 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
|
1622 * 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
|
1623 */ |
|
a590029f16a0
patch 8.0.1810: buffer of a terminal only updated in Terminal-Normal mode
Christian Brabandt <cb@256bit.org>
parents:
13864
diff
changeset
|
1624 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
|
1625 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
|
1626 { |
|
a590029f16a0
patch 8.0.1810: buffer of a terminal only updated in Terminal-Normal mode
Christian Brabandt <cb@256bit.org>
parents:
13864
diff
changeset
|
1627 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
|
1628 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
|
1629 |
|
a590029f16a0
patch 8.0.1810: buffer of a terminal only updated in Terminal-Normal mode
Christian Brabandt <cb@256bit.org>
parents:
13864
diff
changeset
|
1630 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
|
1631 { |
|
a590029f16a0
patch 8.0.1810: buffer of a terminal only updated in Terminal-Normal mode
Christian Brabandt <cb@256bit.org>
parents:
13864
diff
changeset
|
1632 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
|
1633 { |
|
a590029f16a0
patch 8.0.1810: buffer of a terminal only updated in Terminal-Normal mode
Christian Brabandt <cb@256bit.org>
parents:
13864
diff
changeset
|
1634 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
|
1635 |
|
a590029f16a0
patch 8.0.1810: buffer of a terminal only updated in Terminal-Normal mode
Christian Brabandt <cb@256bit.org>
parents:
13864
diff
changeset
|
1636 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
|
1637 { |
|
a590029f16a0
patch 8.0.1810: buffer of a terminal only updated in Terminal-Normal mode
Christian Brabandt <cb@256bit.org>
parents:
13864
diff
changeset
|
1638 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
|
1639 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
|
1640 } |
|
a590029f16a0
patch 8.0.1810: buffer of a terminal only updated in Terminal-Normal mode
Christian Brabandt <cb@256bit.org>
parents:
13864
diff
changeset
|
1641 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
|
1642 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
|
1643 } |
|
a590029f16a0
patch 8.0.1810: buffer of a terminal only updated in Terminal-Normal mode
Christian Brabandt <cb@256bit.org>
parents:
13864
diff
changeset
|
1644 } |
|
a590029f16a0
patch 8.0.1810: buffer of a terminal only updated in Terminal-Normal mode
Christian Brabandt <cb@256bit.org>
parents:
13864
diff
changeset
|
1645 |
|
a590029f16a0
patch 8.0.1810: buffer of a terminal only updated in Terminal-Normal mode
Christian Brabandt <cb@256bit.org>
parents:
13864
diff
changeset
|
1646 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
|
1647 } |
|
a590029f16a0
patch 8.0.1810: buffer of a terminal only updated in Terminal-Normal mode
Christian Brabandt <cb@256bit.org>
parents:
13864
diff
changeset
|
1648 #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
|
1649 |
| 12502 | 1650 static void |
| 1651 set_terminal_mode(term_T *term, int normal_mode) | |
| 1652 { | |
| 1653 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
|
1654 VIM_CLEAR(term->tl_status_text); |
| 12502 | 1655 if (term->tl_buffer == curbuf) |
| 1656 maketitle(); | |
| 1657 } | |
| 1658 | |
| 1659 /* | |
| 1660 * Called after the job if finished and Terminal mode is not active: | |
| 1661 * Move the vterm contents into the scrollback buffer and free the vterm. | |
| 1662 */ | |
| 1663 static void | |
| 1664 cleanup_vterm(term_T *term) | |
| 1665 { | |
|
13476
d130044d4f1f
patch 8.0.1612: need to close terminal after shell stopped
Christian Brabandt <cb@256bit.org>
parents:
13474
diff
changeset
|
1666 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
|
1667 may_move_terminal_to_buffer(term, TRUE); |
| 12502 | 1668 term_free_vterm(term); |
| 1669 set_terminal_mode(term, FALSE); | |
| 1670 } | |
| 1671 | |
| 1672 /* | |
| 1673 * Switch from Terminal-Job mode to Terminal-Normal mode. | |
| 1674 * Suspends updating the terminal window. | |
| 1675 */ | |
| 1676 static void | |
| 1677 term_enter_normal_mode(void) | |
| 1678 { | |
| 1679 term_T *term = curbuf->b_term; | |
| 1680 | |
|
13900
f71ed35527eb
patch 8.0.1821: cursor in terminal window moves when pressing CTRL-W
Christian Brabandt <cb@256bit.org>
parents:
13894
diff
changeset
|
1681 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
|
1682 |
| 12502 | 1683 /* 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
|
1684 may_move_terminal_to_buffer(term, TRUE); |
| 12502 | 1685 |
| 1686 /* Move the window cursor to the position of the cursor in the | |
| 1687 * terminal. */ | |
| 1688 curwin->w_cursor.lnum = term->tl_scrollback_scrolled | |
| 1689 + term->tl_cursor_pos.row + 1; | |
| 1690 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
|
1691 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
|
1692 coladvance(MAXCOL); |
| 12502 | 1693 |
| 1694 /* Display the same lines as in the terminal. */ | |
| 1695 curwin->w_topline = term->tl_scrollback_scrolled + 1; | |
| 1696 } | |
| 1697 | |
| 1698 /* | |
| 1699 * Returns TRUE if the current window contains a terminal and we are in | |
| 1700 * Terminal-Normal mode. | |
| 1701 */ | |
| 1702 int | |
| 1703 term_in_normal_mode(void) | |
| 1704 { | |
| 1705 term_T *term = curbuf->b_term; | |
| 1706 | |
| 1707 return term != NULL && term->tl_normal_mode; | |
| 1708 } | |
| 1709 | |
| 1710 /* | |
| 1711 * Switch from Terminal-Normal mode to Terminal-Job mode. | |
| 1712 * Restores updating the terminal window. | |
| 1713 */ | |
| 1714 void | |
| 1715 term_enter_job_mode() | |
| 1716 { | |
| 1717 term_T *term = curbuf->b_term; | |
| 1718 | |
| 1719 set_terminal_mode(term, FALSE); | |
| 1720 | |
| 1721 if (term->tl_channel_closed) | |
| 1722 cleanup_vterm(term); | |
| 1723 redraw_buf_and_status_later(curbuf, NOT_VALID); | |
| 1724 } | |
| 1725 | |
| 1726 /* | |
|
13344
68c4fc9ae216
patch 8.0.1546: using feedkeys() in a terminal may trigger mappings
Christian Brabandt <cb@256bit.org>
parents:
13335
diff
changeset
|
1727 * Get a key from the user with terminal mode mappings. |
| 12502 | 1728 * Note: while waiting a terminal may be closed and freed if the channel is |
| 1729 * closed and ++close was used. | |
| 1730 */ | |
| 1731 static int | |
| 1732 term_vgetc() | |
| 1733 { | |
| 1734 int c; | |
| 1735 int save_State = State; | |
| 1736 | |
| 1737 State = TERMINAL; | |
| 1738 got_int = FALSE; | |
| 1739 #ifdef WIN3264 | |
| 1740 ctrl_break_was_pressed = FALSE; | |
| 1741 #endif | |
| 1742 c = vgetc(); | |
| 1743 got_int = FALSE; | |
| 1744 State = save_State; | |
| 1745 return c; | |
| 1746 } | |
| 1747 | |
|
13448
a62b0bbc8834
patch 8.0.1598: cannot select text in a terminal with the mouse
Christian Brabandt <cb@256bit.org>
parents:
13444
diff
changeset
|
1748 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
|
1749 |
| 12502 | 1750 /* |
| 1751 * Send keys to terminal. | |
| 1752 * Return FAIL when the key needs to be handled in Normal mode. | |
| 1753 * Return OK when the key was dropped or sent to the terminal. | |
| 1754 */ | |
| 1755 int | |
| 1756 send_keys_to_term(term_T *term, int c, int typed) | |
| 1757 { | |
| 1758 char msg[KEY_BUF_LEN]; | |
| 1759 size_t len; | |
| 1760 int dragging_outside = FALSE; | |
| 1761 | |
| 1762 /* Catch keys that need to be handled as in Normal mode. */ | |
| 1763 switch (c) | |
| 1764 { | |
| 1765 case NUL: | |
| 1766 case K_ZERO: | |
| 1767 if (typed) | |
| 1768 stuffcharReadbuff(c); | |
| 1769 return FAIL; | |
| 1770 | |
|
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
|
1771 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
|
1772 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
|
1773 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
|
1774 |
| 12502 | 1775 case K_IGNORE: |
|
13829
044337cbf854
patch 8.0.1786: no test for 'termwinkey'
Christian Brabandt <cb@256bit.org>
parents:
13823
diff
changeset
|
1776 case K_CANCEL: // used for :normal when running out of chars |
| 12502 | 1777 return FAIL; |
| 1778 | |
| 1779 case K_LEFTDRAG: | |
| 1780 case K_MIDDLEDRAG: | |
| 1781 case K_RIGHTDRAG: | |
| 1782 case K_X1DRAG: | |
| 1783 case K_X2DRAG: | |
| 1784 dragging_outside = mouse_was_outside; | |
| 1785 /* FALLTHROUGH */ | |
| 1786 case K_LEFTMOUSE: | |
| 1787 case K_LEFTMOUSE_NM: | |
| 1788 case K_LEFTRELEASE: | |
| 1789 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
|
1790 case K_MOUSEMOVE: |
| 12502 | 1791 case K_MIDDLEMOUSE: |
| 1792 case K_MIDDLERELEASE: | |
| 1793 case K_RIGHTMOUSE: | |
| 1794 case K_RIGHTRELEASE: | |
| 1795 case K_X1MOUSE: | |
| 1796 case K_X1RELEASE: | |
| 1797 case K_X2MOUSE: | |
| 1798 case K_X2RELEASE: | |
| 1799 | |
| 1800 case K_MOUSEUP: | |
| 1801 case K_MOUSEDOWN: | |
| 1802 case K_MOUSELEFT: | |
| 1803 case K_MOUSERIGHT: | |
| 1804 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
|
1805 || 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
|
1806 || 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
|
1807 || mouse_col >= W_ENDCOL(curwin) |
| 12502 | 1808 || dragging_outside) |
| 1809 { | |
|
12984
fc0d4a036654
patch 8.0.1368: cannot drag status or separator of new terminal window
Christian Brabandt <cb@256bit.org>
parents:
12973
diff
changeset
|
1810 /* 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
|
1811 * or vertical separator */ |
| 12502 | 1812 if (typed) |
| 1813 { | |
| 1814 stuffcharReadbuff(c); | |
| 1815 mouse_was_outside = TRUE; | |
| 1816 } | |
| 1817 return FAIL; | |
| 1818 } | |
| 1819 } | |
| 1820 if (typed) | |
| 1821 mouse_was_outside = FALSE; | |
| 1822 | |
| 1823 /* Convert the typed key to a sequence of bytes for the job. */ | |
| 1824 len = term_convert_key(term, c, msg); | |
| 1825 if (len > 0) | |
| 1826 /* TODO: if FAIL is returned, stop? */ | |
| 1827 channel_send(term->tl_job->jv_channel, get_tty_part(term), | |
| 1828 (char_u *)msg, (int)len, NULL); | |
| 1829 | |
| 1830 return OK; | |
| 1831 } | |
| 1832 | |
| 1833 static void | |
| 1834 position_cursor(win_T *wp, VTermPos *pos) | |
| 1835 { | |
| 1836 wp->w_wrow = MIN(pos->row, MAX(0, wp->w_height - 1)); | |
| 1837 wp->w_wcol = MIN(pos->col, MAX(0, wp->w_width - 1)); | |
| 1838 wp->w_valid |= (VALID_WCOL|VALID_WROW); | |
| 1839 } | |
| 1840 | |
| 1841 /* | |
| 1842 * Handle CTRL-W "": send register contents to the job. | |
| 1843 */ | |
| 1844 static void | |
| 1845 term_paste_register(int prev_c UNUSED) | |
| 1846 { | |
| 1847 int c; | |
| 1848 list_T *l; | |
| 1849 listitem_T *item; | |
| 1850 long reglen = 0; | |
| 1851 int type; | |
| 1852 | |
| 1853 #ifdef FEAT_CMDL_INFO | |
| 1854 if (add_to_showcmd(prev_c)) | |
| 1855 if (add_to_showcmd('"')) | |
| 1856 out_flush(); | |
| 1857 #endif | |
| 1858 c = term_vgetc(); | |
| 1859 #ifdef FEAT_CMDL_INFO | |
| 1860 clear_showcmd(); | |
| 1861 #endif | |
| 1862 if (!term_use_loop()) | |
| 1863 /* job finished while waiting for a character */ | |
| 1864 return; | |
| 1865 | |
| 1866 /* CTRL-W "= prompt for expression to evaluate. */ | |
| 1867 if (c == '=' && get_expr_register() != '=') | |
| 1868 return; | |
| 1869 if (!term_use_loop()) | |
| 1870 /* job finished while waiting for a character */ | |
| 1871 return; | |
| 1872 | |
| 1873 l = (list_T *)get_reg_contents(c, GREG_LIST); | |
| 1874 if (l != NULL) | |
| 1875 { | |
| 1876 type = get_reg_type(c, ®len); | |
| 1877 for (item = l->lv_first; item != NULL; item = item->li_next) | |
| 1878 { | |
| 1879 char_u *s = get_tv_string(&item->li_tv); | |
| 1880 #ifdef WIN3264 | |
| 1881 char_u *tmp = s; | |
| 1882 | |
| 1883 if (!enc_utf8 && enc_codepage > 0) | |
| 1884 { | |
| 1885 WCHAR *ret = NULL; | |
| 1886 int length = 0; | |
| 1887 | |
| 1888 MultiByteToWideChar_alloc(enc_codepage, 0, (char *)s, | |
| 1889 (int)STRLEN(s), &ret, &length); | |
| 1890 if (ret != NULL) | |
| 1891 { | |
| 1892 WideCharToMultiByte_alloc(CP_UTF8, 0, | |
| 1893 ret, length, (char **)&s, &length, 0, 0); | |
| 1894 vim_free(ret); | |
| 1895 } | |
| 1896 } | |
| 1897 #endif | |
| 1898 channel_send(curbuf->b_term->tl_job->jv_channel, PART_IN, | |
| 1899 s, (int)STRLEN(s), NULL); | |
| 1900 #ifdef WIN3264 | |
| 1901 if (tmp != s) | |
| 1902 vim_free(s); | |
| 1903 #endif | |
| 1904 | |
| 1905 if (item->li_next != NULL || type == MLINE) | |
| 1906 channel_send(curbuf->b_term->tl_job->jv_channel, PART_IN, | |
| 1907 (char_u *)"\r", 1, NULL); | |
| 1908 } | |
| 1909 list_free(l); | |
| 1910 } | |
| 1911 } | |
| 1912 | |
| 1913 /* | |
|
13829
044337cbf854
patch 8.0.1786: no test for 'termwinkey'
Christian Brabandt <cb@256bit.org>
parents:
13823
diff
changeset
|
1914 * 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
|
1915 * terminal should be displayed. |
| 12502 | 1916 */ |
| 1917 int | |
| 1918 terminal_is_active() | |
| 1919 { | |
| 1920 return in_terminal_loop != NULL; | |
| 1921 } | |
| 1922 | |
|
13829
044337cbf854
patch 8.0.1786: no test for 'termwinkey'
Christian Brabandt <cb@256bit.org>
parents:
13823
diff
changeset
|
1923 #if defined(FEAT_GUI) || defined(PROTO) |
| 12502 | 1924 cursorentry_T * |
| 1925 term_get_cursor_shape(guicolor_T *fg, guicolor_T *bg) | |
| 1926 { | |
| 1927 term_T *term = in_terminal_loop; | |
| 1928 static cursorentry_T entry; | |
| 1929 | |
| 1930 vim_memset(&entry, 0, sizeof(entry)); | |
| 1931 entry.shape = entry.mshape = | |
| 1932 term->tl_cursor_shape == VTERM_PROP_CURSORSHAPE_UNDERLINE ? SHAPE_HOR : | |
| 1933 term->tl_cursor_shape == VTERM_PROP_CURSORSHAPE_BAR_LEFT ? SHAPE_VER : | |
| 1934 SHAPE_BLOCK; | |
| 1935 entry.percentage = 20; | |
| 1936 if (term->tl_cursor_blink) | |
| 1937 { | |
| 1938 entry.blinkwait = 700; | |
| 1939 entry.blinkon = 400; | |
| 1940 entry.blinkoff = 250; | |
| 1941 } | |
| 1942 *fg = gui.back_pixel; | |
| 1943 if (term->tl_cursor_color == NULL) | |
| 1944 *bg = gui.norm_pixel; | |
| 1945 else | |
| 1946 *bg = color_name2handle(term->tl_cursor_color); | |
| 1947 entry.name = "n"; | |
| 1948 entry.used_for = SHAPE_CURSOR; | |
| 1949 | |
| 1950 return &entry; | |
| 1951 } | |
| 1952 #endif | |
| 1953 | |
|
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
|
1954 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
|
1955 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
|
1956 { |
|
53f0c469dfc6
patch 8.0.1477: redraw flicker when moving the mouse outside of terminal window
Christian Brabandt <cb@256bit.org>
parents:
13132
diff
changeset
|
1957 if (STRCMP(last_set_cursor_color, desired_cursor_color) != 0 |
|
53f0c469dfc6
patch 8.0.1477: redraw flicker when moving the mouse outside of terminal window
Christian Brabandt <cb@256bit.org>
parents:
13132
diff
changeset
|
1958 || 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
|
1959 || 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
|
1960 { |
|
53f0c469dfc6
patch 8.0.1477: redraw flicker when moving the mouse outside of terminal window
Christian Brabandt <cb@256bit.org>
parents:
13132
diff
changeset
|
1961 last_set_cursor_color = desired_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
|
1962 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
|
1963 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
|
1964 term_cursor_color(desired_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
|
1965 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
|
1966 /* 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
|
1967 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
|
1968 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
|
1969 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
|
1970 } |
|
53f0c469dfc6
patch 8.0.1477: redraw flicker when moving the mouse outside of terminal window
Christian Brabandt <cb@256bit.org>
parents:
13132
diff
changeset
|
1971 } |
|
53f0c469dfc6
patch 8.0.1477: redraw flicker when moving the mouse outside of terminal window
Christian Brabandt <cb@256bit.org>
parents:
13132
diff
changeset
|
1972 |
|
53f0c469dfc6
patch 8.0.1477: redraw flicker when moving the mouse outside of terminal window
Christian Brabandt <cb@256bit.org>
parents:
13132
diff
changeset
|
1973 /* |
|
53f0c469dfc6
patch 8.0.1477: redraw flicker when moving the mouse outside of terminal window
Christian Brabandt <cb@256bit.org>
parents:
13132
diff
changeset
|
1974 * 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
|
1975 */ |
| 12502 | 1976 static void |
| 1977 may_set_cursor_props(term_T *term) | |
| 1978 { | |
| 1979 #ifdef FEAT_GUI | |
| 1980 /* For the GUI the cursor properties are obtained with | |
| 1981 * term_get_cursor_shape(). */ | |
| 1982 if (gui.in_use) | |
| 1983 return; | |
| 1984 #endif | |
| 1985 if (in_terminal_loop == term) | |
| 1986 { | |
| 1987 if (term->tl_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
|
1988 desired_cursor_color = term->tl_cursor_color; |
| 12502 | 1989 else |
|
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
|
1990 desired_cursor_color = (char_u *)""; |
|
53f0c469dfc6
patch 8.0.1477: redraw flicker when moving the mouse outside of terminal window
Christian Brabandt <cb@256bit.org>
parents:
13132
diff
changeset
|
1991 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
|
1992 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
|
1993 may_output_cursor_props(); |
| 12502 | 1994 } |
| 1995 } | |
| 1996 | |
|
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
|
1997 /* |
|
53f0c469dfc6
patch 8.0.1477: redraw flicker when moving the mouse outside of terminal window
Christian Brabandt <cb@256bit.org>
parents:
13132
diff
changeset
|
1998 * 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
|
1999 */ |
| 12502 | 2000 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
|
2001 prepare_restore_cursor_props(void) |
| 12502 | 2002 { |
| 2003 #ifdef FEAT_GUI | |
| 2004 if (gui.in_use) | |
| 2005 return; | |
| 2006 #endif | |
|
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 desired_cursor_color = (char_u *)""; |
|
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 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
|
2009 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
|
2010 may_output_cursor_props(); |
| 12502 | 2011 } |
| 2012 | |
| 2013 /* | |
|
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
|
2014 * 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
|
2015 * 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
|
2016 * 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
|
2017 */ |
|
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
|
2018 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
|
2019 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
|
2020 { |
|
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
|
2021 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
|
2022 |
|
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
|
2023 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
|
2024 && !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
|
2025 && 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
|
2026 && 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
|
2027 } |
|
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
|
2028 |
|
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
|
2029 /* |
|
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
|
2030 * 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
|
2031 * 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
|
2032 */ |
|
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
|
2033 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
|
2034 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
|
2035 { |
|
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
|
2036 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
|
2037 } |
|
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
|
2038 |
|
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
|
2039 /* |
|
13448
a62b0bbc8834
patch 8.0.1598: cannot select text in a terminal with the mouse
Christian Brabandt <cb@256bit.org>
parents:
13444
diff
changeset
|
2040 * 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
|
2041 * 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
|
2042 */ |
|
a62b0bbc8834
patch 8.0.1598: cannot select text in a terminal with the mouse
Christian Brabandt <cb@256bit.org>
parents:
13444
diff
changeset
|
2043 void |
|
a62b0bbc8834
patch 8.0.1598: cannot select text in a terminal with the mouse
Christian Brabandt <cb@256bit.org>
parents:
13444
diff
changeset
|
2044 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
|
2045 { |
|
a62b0bbc8834
patch 8.0.1598: cannot select text in a terminal with the mouse
Christian Brabandt <cb@256bit.org>
parents:
13444
diff
changeset
|
2046 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
|
2047 |
|
a62b0bbc8834
patch 8.0.1598: cannot select text in a terminal with the mouse
Christian Brabandt <cb@256bit.org>
parents:
13444
diff
changeset
|
2048 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
|
2049 { |
|
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
|
2050 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
|
2051 { |
|
a62b0bbc8834
patch 8.0.1598: cannot select text in a terminal with the mouse
Christian Brabandt <cb@256bit.org>
parents:
13444
diff
changeset
|
2052 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
|
2053 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
|
2054 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
|
2055 } |
|
a62b0bbc8834
patch 8.0.1598: cannot select text in a terminal with the mouse
Christian Brabandt <cb@256bit.org>
parents:
13444
diff
changeset
|
2056 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
|
2057 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
|
2058 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
|
2059 } |
|
a62b0bbc8834
patch 8.0.1598: cannot select text in a terminal with the mouse
Christian Brabandt <cb@256bit.org>
parents:
13444
diff
changeset
|
2060 } |
|
a62b0bbc8834
patch 8.0.1598: cannot select text in a terminal with the mouse
Christian Brabandt <cb@256bit.org>
parents:
13444
diff
changeset
|
2061 |
|
a62b0bbc8834
patch 8.0.1598: cannot select text in a terminal with the mouse
Christian Brabandt <cb@256bit.org>
parents:
13444
diff
changeset
|
2062 /* |
| 12502 | 2063 * Wait for input and send it to the job. |
| 2064 * When "blocking" is TRUE wait for a character to be typed. Otherwise return | |
| 2065 * when there is no more typahead. | |
| 2066 * Return when the start of a CTRL-W command is typed or anything else that | |
| 2067 * should be handled as a Normal mode command. | |
| 2068 * Returns OK if a typed character is to be handled in Normal mode, FAIL if | |
| 2069 * the terminal was closed. | |
| 2070 */ | |
| 2071 int | |
| 2072 terminal_loop(int blocking) | |
| 2073 { | |
| 2074 int c; | |
|
13845
f22db93bd887
patch 8.0.1794: duplicate term options after renaming
Christian Brabandt <cb@256bit.org>
parents:
13835
diff
changeset
|
2075 int termwinkey = 0; |
| 12502 | 2076 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
|
2077 #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
|
2078 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
|
2079 ->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
|
2080 #endif |
|
13906
0ae89b121c58
patch 8.0.1824: Coverity warns for variable that may be uninitialized
Christian Brabandt <cb@256bit.org>
parents:
13900
diff
changeset
|
2081 int restore_cursor = FALSE; |
| 12502 | 2082 |
| 2083 /* Remember the terminal we are sending keys to. However, the terminal | |
| 2084 * might be closed while waiting for a character, e.g. typing "exit" in a | |
| 2085 * shell and ++close was used. Therefore use curbuf->b_term instead of a | |
| 2086 * stored reference. */ | |
| 2087 in_terminal_loop = curbuf->b_term; | |
| 2088 | |
|
13742
a34b1323286c
patch 8.0.1743: terminal window options are named inconsistently
Christian Brabandt <cb@256bit.org>
parents:
13720
diff
changeset
|
2089 if (*curwin->w_p_twk != NUL) |
|
13845
f22db93bd887
patch 8.0.1794: duplicate term options after renaming
Christian Brabandt <cb@256bit.org>
parents:
13835
diff
changeset
|
2090 termwinkey = string_to_key(curwin->w_p_twk, TRUE); |
| 12502 | 2091 position_cursor(curwin, &curbuf->b_term->tl_cursor_pos); |
| 2092 may_set_cursor_props(curbuf->b_term); | |
| 2093 | |
|
13344
68c4fc9ae216
patch 8.0.1546: using feedkeys() in a terminal may trigger mappings
Christian Brabandt <cb@256bit.org>
parents:
13335
diff
changeset
|
2094 while (blocking || vpeekc_nomap() != NUL) |
| 12502 | 2095 { |
|
13470
6faef782f50b
patch 8.0.1609: shell commands in the GUI use a dumb terminal
Christian Brabandt <cb@256bit.org>
parents:
13458
diff
changeset
|
2096 #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
|
2097 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
|
2098 #endif |
|
6faef782f50b
patch 8.0.1609: shell commands in the GUI use a dumb terminal
Christian Brabandt <cb@256bit.org>
parents:
13458
diff
changeset
|
2099 /* 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
|
2100 /* 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
|
2101 */ |
|
6faef782f50b
patch 8.0.1609: shell commands in the GUI use a dumb terminal
Christian Brabandt <cb@256bit.org>
parents:
13458
diff
changeset
|
2102 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
|
2103 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
|
2104 break; |
|
13886
bbf5bdba4a80
patch 8.0.1814: crash with terminal window and with 'lazyredraw' set
Christian Brabandt <cb@256bit.org>
parents:
13878
diff
changeset
|
2105 if (!term_use_loop_check(TRUE)) |
|
bbf5bdba4a80
patch 8.0.1814: crash with terminal window and with 'lazyredraw' set
Christian Brabandt <cb@256bit.org>
parents:
13878
diff
changeset
|
2106 /* 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
|
2107 break; |
|
bbf5bdba4a80
patch 8.0.1814: crash with terminal window and with 'lazyredraw' set
Christian Brabandt <cb@256bit.org>
parents:
13878
diff
changeset
|
2108 |
| 12502 | 2109 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
|
2110 restore_cursor = TRUE; |
| 12502 | 2111 |
| 2112 c = term_vgetc(); | |
|
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
|
2113 if (!term_use_loop_check(TRUE)) |
|
12798
5ae0d05e046a
patch 8.0.1276: key lost when window closed in exit callback
Christian Brabandt <cb@256bit.org>
parents:
12767
diff
changeset
|
2114 { |
|
12800
8dfeed7e07e7
patch 8.0.1277: terminal window CR-NL conversions may cause problems
Christian Brabandt <cb@256bit.org>
parents:
12798
diff
changeset
|
2115 /* 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
|
2116 * 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
|
2117 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
|
2118 vungetc(c); |
| 12502 | 2119 break; |
|
12798
5ae0d05e046a
patch 8.0.1276: key lost when window closed in exit callback
Christian Brabandt <cb@256bit.org>
parents:
12767
diff
changeset
|
2120 } |
| 12502 | 2121 if (c == K_IGNORE) |
| 2122 continue; | |
| 2123 | |
|
12800
8dfeed7e07e7
patch 8.0.1277: terminal window CR-NL conversions may cause problems
Christian Brabandt <cb@256bit.org>
parents:
12798
diff
changeset
|
2124 #ifdef UNIX |
|
8dfeed7e07e7
patch 8.0.1277: terminal window CR-NL conversions may cause problems
Christian Brabandt <cb@256bit.org>
parents:
12798
diff
changeset
|
2125 /* |
|
8dfeed7e07e7
patch 8.0.1277: terminal window CR-NL conversions may cause problems
Christian Brabandt <cb@256bit.org>
parents:
12798
diff
changeset
|
2126 * 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
|
2127 * 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
|
2128 * 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
|
2129 */ |
|
8dfeed7e07e7
patch 8.0.1277: terminal window CR-NL conversions may cause problems
Christian Brabandt <cb@256bit.org>
parents:
12798
diff
changeset
|
2130 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
|
2131 { |
|
8dfeed7e07e7
patch 8.0.1277: terminal window CR-NL conversions may cause problems
Christian Brabandt <cb@256bit.org>
parents:
12798
diff
changeset
|
2132 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
|
2133 |
|
8dfeed7e07e7
patch 8.0.1277: terminal window CR-NL conversions may cause problems
Christian Brabandt <cb@256bit.org>
parents:
12798
diff
changeset
|
2134 /* 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
|
2135 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
|
2136 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
|
2137 } |
|
8dfeed7e07e7
patch 8.0.1277: terminal window CR-NL conversions may cause problems
Christian Brabandt <cb@256bit.org>
parents:
12798
diff
changeset
|
2138 #endif |
|
8dfeed7e07e7
patch 8.0.1277: terminal window CR-NL conversions may cause problems
Christian Brabandt <cb@256bit.org>
parents:
12798
diff
changeset
|
2139 |
| 12502 | 2140 #ifdef WIN3264 |
| 2141 /* On Windows winpty handles CTRL-C, don't send a CTRL_C_EVENT. | |
| 2142 * Use CTRL-BREAK to kill the job. */ | |
| 2143 if (ctrl_break_was_pressed) | |
| 2144 mch_signal_job(curbuf->b_term->tl_job, (char_u *)"kill"); | |
| 2145 #endif | |
|
13845
f22db93bd887
patch 8.0.1794: duplicate term options after renaming
Christian Brabandt <cb@256bit.org>
parents:
13835
diff
changeset
|
2146 /* 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
|
2147 * 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
|
2148 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
|
2149 #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
|
2150 && !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
|
2151 #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
|
2152 ) |
| 12502 | 2153 { |
| 2154 int prev_c = c; | |
| 2155 | |
| 2156 #ifdef FEAT_CMDL_INFO | |
| 2157 if (add_to_showcmd(c)) | |
| 2158 out_flush(); | |
| 2159 #endif | |
| 2160 c = term_vgetc(); | |
| 2161 #ifdef FEAT_CMDL_INFO | |
| 2162 clear_showcmd(); | |
| 2163 #endif | |
|
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
|
2164 if (!term_use_loop_check(TRUE)) |
| 12502 | 2165 /* job finished while waiting for a character */ |
| 2166 break; | |
| 2167 | |
| 2168 if (prev_c == Ctrl_BSL) | |
| 2169 { | |
| 2170 if (c == Ctrl_N) | |
| 2171 { | |
| 2172 /* CTRL-\ CTRL-N : go to Terminal-Normal mode. */ | |
| 2173 term_enter_normal_mode(); | |
| 2174 ret = FAIL; | |
| 2175 goto theend; | |
| 2176 } | |
| 2177 /* Send both keys to the terminal. */ | |
| 2178 send_keys_to_term(curbuf->b_term, prev_c, TRUE); | |
| 2179 } | |
| 2180 else if (c == Ctrl_C) | |
| 2181 { | |
|
13845
f22db93bd887
patch 8.0.1794: duplicate term options after renaming
Christian Brabandt <cb@256bit.org>
parents:
13835
diff
changeset
|
2182 /* "CTRL-W CTRL-C" or 'termwinkey' CTRL-C: end the job */ |
| 12502 | 2183 mch_signal_job(curbuf->b_term->tl_job, (char_u *)"kill"); |
| 2184 } | |
|
13845
f22db93bd887
patch 8.0.1794: duplicate term options after renaming
Christian Brabandt <cb@256bit.org>
parents:
13835
diff
changeset
|
2185 else if (termwinkey == 0 && c == '.') |
| 12502 | 2186 { |
| 2187 /* "CTRL-W .": send CTRL-W to the job */ | |
| 2188 c = Ctrl_W; | |
| 2189 } | |
|
13845
f22db93bd887
patch 8.0.1794: duplicate term options after renaming
Christian Brabandt <cb@256bit.org>
parents:
13835
diff
changeset
|
2190 else if (termwinkey == 0 && 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
|
2191 { |
|
6a84e3d2b810
patch 8.0.1706: cannot sent CTRL- to a terminal window
Christian Brabandt <cb@256bit.org>
parents:
13630
diff
changeset
|
2192 /* "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
|
2193 c = Ctrl_BSL; |
|
6a84e3d2b810
patch 8.0.1706: cannot sent CTRL- to a terminal window
Christian Brabandt <cb@256bit.org>
parents:
13630
diff
changeset
|
2194 } |
| 12502 | 2195 else if (c == 'N') |
| 2196 { | |
| 2197 /* CTRL-W N : go to Terminal-Normal mode. */ | |
| 2198 term_enter_normal_mode(); | |
| 2199 ret = FAIL; | |
| 2200 goto theend; | |
| 2201 } | |
| 2202 else if (c == '"') | |
| 2203 { | |
| 2204 term_paste_register(prev_c); | |
| 2205 continue; | |
| 2206 } | |
|
13845
f22db93bd887
patch 8.0.1794: duplicate term options after renaming
Christian Brabandt <cb@256bit.org>
parents:
13835
diff
changeset
|
2207 else if (termwinkey == 0 || c != termwinkey) |
| 12502 | 2208 { |
| 2209 stuffcharReadbuff(Ctrl_W); | |
| 2210 stuffcharReadbuff(c); | |
| 2211 ret = OK; | |
| 2212 goto theend; | |
| 2213 } | |
| 2214 } | |
| 2215 # ifdef WIN3264 | |
| 2216 if (!enc_utf8 && has_mbyte && c >= 0x80) | |
| 2217 { | |
| 2218 WCHAR wc; | |
| 2219 char_u mb[3]; | |
| 2220 | |
| 2221 mb[0] = (unsigned)c >> 8; | |
| 2222 mb[1] = c; | |
| 2223 if (MultiByteToWideChar(GetACP(), 0, (char*)mb, 2, &wc, 1) > 0) | |
| 2224 c = wc; | |
| 2225 } | |
| 2226 # endif | |
| 2227 if (send_keys_to_term(curbuf->b_term, c, TRUE) != OK) | |
| 2228 { | |
|
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
|
2229 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
|
2230 /* 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
|
2231 * 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
|
2232 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
|
2233 |
| 12502 | 2234 ret = OK; |
| 2235 goto theend; | |
| 2236 } | |
| 2237 } | |
| 2238 ret = FAIL; | |
| 2239 | |
| 2240 theend: | |
| 2241 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
|
2242 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
|
2243 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
|
2244 |
|
a590029f16a0
patch 8.0.1810: buffer of a terminal only updated in Terminal-Normal mode
Christian Brabandt <cb@256bit.org>
parents:
13864
diff
changeset
|
2245 /* 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
|
2246 * 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
|
2247 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
|
2248 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
|
2249 |
| 12502 | 2250 return ret; |
| 2251 } | |
| 2252 | |
| 2253 /* | |
| 2254 * Called when a job has finished. | |
| 2255 * This updates the title and status, but does not close the vterm, because | |
| 2256 * there might still be pending output in the channel. | |
| 2257 */ | |
| 2258 void | |
| 2259 term_job_ended(job_T *job) | |
| 2260 { | |
| 2261 term_T *term; | |
| 2262 int did_one = FALSE; | |
| 2263 | |
| 2264 for (term = first_term; term != NULL; term = term->tl_next) | |
| 2265 if (term->tl_job == job) | |
| 2266 { | |
|
13244
ac42c4b11dbc
patch 8.0.1496: clearing a pointer takes two lines
Christian Brabandt <cb@256bit.org>
parents:
13219
diff
changeset
|
2267 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
|
2268 VIM_CLEAR(term->tl_status_text); |
| 12502 | 2269 redraw_buf_and_status_later(term->tl_buffer, VALID); |
| 2270 did_one = TRUE; | |
| 2271 } | |
| 2272 if (did_one) | |
| 2273 redraw_statuslines(); | |
| 2274 if (curbuf->b_term != NULL) | |
| 2275 { | |
| 2276 if (curbuf->b_term->tl_job == job) | |
| 2277 maketitle(); | |
| 2278 update_cursor(curbuf->b_term, TRUE); | |
| 2279 } | |
| 2280 } | |
| 2281 | |
| 2282 static void | |
| 2283 may_toggle_cursor(term_T *term) | |
| 2284 { | |
| 2285 if (in_terminal_loop == term) | |
| 2286 { | |
| 2287 if (term->tl_cursor_visible) | |
| 2288 cursor_on(); | |
| 2289 else | |
| 2290 cursor_off(); | |
| 2291 } | |
| 2292 } | |
| 2293 | |
| 2294 /* | |
| 2295 * 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
|
2296 * First color is 1. Return 0 if no match found (default color). |
| 12502 | 2297 */ |
| 2298 static int | |
| 2299 color2index(VTermColor *color, int fg, int *boldp) | |
| 2300 { | |
| 2301 int red = color->red; | |
| 2302 int blue = color->blue; | |
| 2303 int green = color->green; | |
| 2304 | |
|
12966
c5bccd50100e
patch 8.0.1359: libvterm ANSI colors can not always be recognized
Christian Brabandt <cb@256bit.org>
parents:
12907
diff
changeset
|
2305 if (color->ansi_index != VTERM_ANSI_INDEX_NONE) |
| 12502 | 2306 { |
|
12966
c5bccd50100e
patch 8.0.1359: libvterm ANSI colors can not always be recognized
Christian Brabandt <cb@256bit.org>
parents:
12907
diff
changeset
|
2307 /* 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
|
2308 * 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
|
2309 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
|
2310 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
|
2311 switch (color->ansi_index) |
| 12502 | 2312 { |
|
12966
c5bccd50100e
patch 8.0.1359: libvterm ANSI colors can not always be recognized
Christian Brabandt <cb@256bit.org>
parents:
12907
diff
changeset
|
2313 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
|
2314 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
|
2315 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
|
2316 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
|
2317 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
|
2318 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
|
2319 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
|
2320 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
|
2321 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
|
2322 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
|
2323 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
|
2324 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
|
2325 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
|
2326 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
|
2327 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
|
2328 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
|
2329 case 16: return lookup_color(26, fg, boldp) + 1; /* white */ |
| 12502 | 2330 } |
| 2331 } | |
|
12966
c5bccd50100e
patch 8.0.1359: libvterm ANSI colors can not always be recognized
Christian Brabandt <cb@256bit.org>
parents:
12907
diff
changeset
|
2332 |
| 12502 | 2333 if (t_colors >= 256) |
| 2334 { | |
| 2335 if (red == blue && red == green) | |
| 2336 { | |
|
12541
fcb11cfca8b3
patch 8.0.1149: libvterm colors differ from xterm
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
2337 /* 24-color greyscale plus white and black */ |
| 12502 | 2338 static int cutoff[23] = { |
|
12541
fcb11cfca8b3
patch 8.0.1149: libvterm colors differ from xterm
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
2339 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
|
2340 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
|
2341 0xD5, 0xDF, 0xE9}; |
| 12502 | 2342 int i; |
| 2343 | |
|
12541
fcb11cfca8b3
patch 8.0.1149: libvterm colors differ from xterm
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
2344 if (red < 5) |
|
fcb11cfca8b3
patch 8.0.1149: libvterm colors differ from xterm
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
2345 return 17; /* 00/00/00 */ |
|
fcb11cfca8b3
patch 8.0.1149: libvterm colors differ from xterm
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
2346 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
|
2347 return 232; |
| 12502 | 2348 for (i = 0; i < 23; ++i) |
| 2349 if (red < cutoff[i]) | |
| 2350 return i + 233; | |
| 2351 return 256; | |
| 2352 } | |
|
12541
fcb11cfca8b3
patch 8.0.1149: libvterm colors differ from xterm
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
2353 { |
|
fcb11cfca8b3
patch 8.0.1149: libvterm colors differ from xterm
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
2354 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
|
2355 int ri, gi, bi; |
|
fcb11cfca8b3
patch 8.0.1149: libvterm colors differ from xterm
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
2356 |
|
fcb11cfca8b3
patch 8.0.1149: libvterm colors differ from xterm
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
2357 /* 216-color cube */ |
|
fcb11cfca8b3
patch 8.0.1149: libvterm colors differ from xterm
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
2358 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
|
2359 if (red < cutoff[ri]) |
|
fcb11cfca8b3
patch 8.0.1149: libvterm colors differ from xterm
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
2360 break; |
|
fcb11cfca8b3
patch 8.0.1149: libvterm colors differ from xterm
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
2361 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
|
2362 if (green < cutoff[gi]) |
|
fcb11cfca8b3
patch 8.0.1149: libvterm colors differ from xterm
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
2363 break; |
|
fcb11cfca8b3
patch 8.0.1149: libvterm colors differ from xterm
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
2364 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
|
2365 if (blue < cutoff[bi]) |
|
fcb11cfca8b3
patch 8.0.1149: libvterm colors differ from xterm
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
2366 break; |
|
fcb11cfca8b3
patch 8.0.1149: libvterm colors differ from xterm
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
2367 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
|
2368 } |
| 12502 | 2369 } |
| 2370 return 0; | |
| 2371 } | |
| 2372 | |
| 2373 /* | |
|
13298
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
2374 * Convert Vterm attributes to highlight flags. |
| 12502 | 2375 */ |
| 2376 static int | |
|
13298
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
2377 vtermAttr2hl(VTermScreenCellAttrs cellattrs) |
| 12502 | 2378 { |
| 2379 int attr = 0; | |
| 2380 | |
| 2381 if (cellattrs.bold) | |
| 2382 attr |= HL_BOLD; | |
| 2383 if (cellattrs.underline) | |
| 2384 attr |= HL_UNDERLINE; | |
| 2385 if (cellattrs.italic) | |
| 2386 attr |= HL_ITALIC; | |
| 2387 if (cellattrs.strike) | |
| 2388 attr |= HL_STRIKETHROUGH; | |
| 2389 if (cellattrs.reverse) | |
| 2390 attr |= HL_INVERSE; | |
|
13298
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
2391 return attr; |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
2392 } |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
2393 |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
2394 /* |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
2395 * 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
|
2396 */ |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
2397 static void |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
2398 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
|
2399 { |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
2400 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
|
2401 if (attr & HL_BOLD) |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
2402 cell->attrs.bold = 1; |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
2403 if (attr & HL_UNDERLINE) |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
2404 cell->attrs.underline = 1; |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
2405 if (attr & HL_ITALIC) |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
2406 cell->attrs.italic = 1; |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
2407 if (attr & HL_STRIKETHROUGH) |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
2408 cell->attrs.strike = 1; |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
2409 if (attr & HL_INVERSE) |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
2410 cell->attrs.reverse = 1; |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
2411 } |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
2412 |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
2413 /* |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
2414 * 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
|
2415 */ |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
2416 static int |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
2417 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
|
2418 { |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
2419 int attr = vtermAttr2hl(cellattrs); |
| 12502 | 2420 |
| 2421 #ifdef FEAT_GUI | |
| 2422 if (gui.in_use) | |
| 2423 { | |
| 2424 guicolor_T fg, bg; | |
| 2425 | |
| 2426 fg = gui_mch_get_rgb_color(cellfg.red, cellfg.green, cellfg.blue); | |
| 2427 bg = gui_mch_get_rgb_color(cellbg.red, cellbg.green, cellbg.blue); | |
| 2428 return get_gui_attr_idx(attr, fg, bg); | |
| 2429 } | |
| 2430 else | |
| 2431 #endif | |
| 2432 #ifdef FEAT_TERMGUICOLORS | |
| 2433 if (p_tgc) | |
| 2434 { | |
| 2435 guicolor_T fg, bg; | |
| 2436 | |
| 2437 fg = gui_get_rgb_color_cmn(cellfg.red, cellfg.green, cellfg.blue); | |
| 2438 bg = gui_get_rgb_color_cmn(cellbg.red, cellbg.green, cellbg.blue); | |
| 2439 | |
| 2440 return get_tgc_attr_idx(attr, fg, bg); | |
| 2441 } | |
| 2442 else | |
| 2443 #endif | |
| 2444 { | |
| 2445 int bold = MAYBE; | |
| 2446 int fg = color2index(&cellfg, TRUE, &bold); | |
| 2447 int bg = color2index(&cellbg, FALSE, &bold); | |
| 2448 | |
|
12969
a9f6a874b64f
patch 8.0.1360: the Terminal highlighting doesn't work in a terminal
Christian Brabandt <cb@256bit.org>
parents:
12966
diff
changeset
|
2449 /* 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
|
2450 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
|
2451 { |
|
12973
418941f0df08
patch 8.0.1362: terminal window colors wrong when using Terminal highlighting
Christian Brabandt <cb@256bit.org>
parents:
12969
diff
changeset
|
2452 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
|
2453 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
|
2454 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
|
2455 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
|
2456 } |
|
a9f6a874b64f
patch 8.0.1360: the Terminal highlighting doesn't work in a terminal
Christian Brabandt <cb@256bit.org>
parents:
12966
diff
changeset
|
2457 |
| 12502 | 2458 /* with 8 colors set the bold attribute to get a bright foreground */ |
| 2459 if (bold == TRUE) | |
| 2460 attr |= HL_BOLD; | |
| 2461 return get_cterm_attr_idx(attr, fg, bg); | |
| 2462 } | |
| 2463 return 0; | |
| 2464 } | |
| 2465 | |
|
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
|
2466 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
|
2467 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
|
2468 { |
|
a590029f16a0
patch 8.0.1810: buffer of a terminal only updated in Terminal-Normal mode
Christian Brabandt <cb@256bit.org>
parents:
13864
diff
changeset
|
2469 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
|
2470 #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
|
2471 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
|
2472 { |
|
a590029f16a0
patch 8.0.1810: buffer of a terminal only updated in Terminal-Normal mode
Christian Brabandt <cb@256bit.org>
parents:
13864
diff
changeset
|
2473 /* 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
|
2474 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
|
2475 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
|
2476 } |
|
a590029f16a0
patch 8.0.1810: buffer of a terminal only updated in Terminal-Normal mode
Christian Brabandt <cb@256bit.org>
parents:
13864
diff
changeset
|
2477 #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
|
2478 } |
|
a590029f16a0
patch 8.0.1810: buffer of a terminal only updated in Terminal-Normal mode
Christian Brabandt <cb@256bit.org>
parents:
13864
diff
changeset
|
2479 |
| 12502 | 2480 static int |
| 2481 handle_damage(VTermRect rect, void *user) | |
| 2482 { | |
| 2483 term_T *term = (term_T *)user; | |
| 2484 | |
| 2485 term->tl_dirty_row_start = MIN(term->tl_dirty_row_start, rect.start_row); | |
| 2486 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
|
2487 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
|
2488 redraw_buf_later(term->tl_buffer, SOME_VALID); |
| 12502 | 2489 return 1; |
| 2490 } | |
| 2491 | |
|
13851
3edac4cd1c0a
patch 8.0.1797: terminal window is redrawn too often
Christian Brabandt <cb@256bit.org>
parents:
13849
diff
changeset
|
2492 static void |
|
3edac4cd1c0a
patch 8.0.1797: terminal window is redrawn too often
Christian Brabandt <cb@256bit.org>
parents:
13849
diff
changeset
|
2493 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
|
2494 { |
|
3edac4cd1c0a
patch 8.0.1797: terminal window is redrawn too often
Christian Brabandt <cb@256bit.org>
parents:
13849
diff
changeset
|
2495 win_T *wp; |
|
3edac4cd1c0a
patch 8.0.1797: terminal window is redrawn too often
Christian Brabandt <cb@256bit.org>
parents:
13849
diff
changeset
|
2496 VTermColor fg, bg; |
|
3edac4cd1c0a
patch 8.0.1797: terminal window is redrawn too often
Christian Brabandt <cb@256bit.org>
parents:
13849
diff
changeset
|
2497 VTermScreenCellAttrs attr; |
|
3edac4cd1c0a
patch 8.0.1797: terminal window is redrawn too often
Christian Brabandt <cb@256bit.org>
parents:
13849
diff
changeset
|
2498 int clear_attr; |
|
3edac4cd1c0a
patch 8.0.1797: terminal window is redrawn too often
Christian Brabandt <cb@256bit.org>
parents:
13849
diff
changeset
|
2499 |
|
3edac4cd1c0a
patch 8.0.1797: terminal window is redrawn too often
Christian Brabandt <cb@256bit.org>
parents:
13849
diff
changeset
|
2500 /* 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
|
2501 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
|
2502 &fg, &bg); |
|
3edac4cd1c0a
patch 8.0.1797: terminal window is redrawn too often
Christian Brabandt <cb@256bit.org>
parents:
13849
diff
changeset
|
2503 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
|
2504 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
|
2505 |
|
3edac4cd1c0a
patch 8.0.1797: terminal window is redrawn too often
Christian Brabandt <cb@256bit.org>
parents:
13849
diff
changeset
|
2506 FOR_ALL_WINDOWS(wp) |
|
3edac4cd1c0a
patch 8.0.1797: terminal window is redrawn too often
Christian Brabandt <cb@256bit.org>
parents:
13849
diff
changeset
|
2507 { |
|
3edac4cd1c0a
patch 8.0.1797: terminal window is redrawn too often
Christian Brabandt <cb@256bit.org>
parents:
13849
diff
changeset
|
2508 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
|
2509 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
|
2510 } |
|
3edac4cd1c0a
patch 8.0.1797: terminal window is redrawn too often
Christian Brabandt <cb@256bit.org>
parents:
13849
diff
changeset
|
2511 } |
|
3edac4cd1c0a
patch 8.0.1797: terminal window is redrawn too often
Christian Brabandt <cb@256bit.org>
parents:
13849
diff
changeset
|
2512 |
| 12502 | 2513 static int |
| 2514 handle_moverect(VTermRect dest, VTermRect src, void *user) | |
| 2515 { | |
| 2516 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
|
2517 int count = src.start_row - dest.start_row; |
| 12502 | 2518 |
| 2519 /* 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
|
2520 * 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
|
2521 * the redraw happens. */ |
| 12502 | 2522 if (dest.start_col == src.start_col |
| 2523 && dest.end_col == src.end_col | |
| 2524 && dest.start_row < src.start_row) | |
| 2525 { | |
|
13851
3edac4cd1c0a
patch 8.0.1797: terminal window is redrawn too often
Christian Brabandt <cb@256bit.org>
parents:
13849
diff
changeset
|
2526 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
|
2527 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
|
2528 else |
|
3edac4cd1c0a
patch 8.0.1797: terminal window is redrawn too often
Christian Brabandt <cb@256bit.org>
parents:
13849
diff
changeset
|
2529 term_scroll_up(term, dest.start_row, count); |
| 12502 | 2530 } |
|
12578
f8beecfea2c4
patch 8.0.1167: Motif: typing in terminal window is slow
Christian Brabandt <cb@256bit.org>
parents:
12541
diff
changeset
|
2531 |
|
f8beecfea2c4
patch 8.0.1167: Motif: typing in terminal window is slow
Christian Brabandt <cb@256bit.org>
parents:
12541
diff
changeset
|
2532 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
|
2533 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
|
2534 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
|
2535 |
|
13851
3edac4cd1c0a
patch 8.0.1797: terminal window is redrawn too often
Christian Brabandt <cb@256bit.org>
parents:
13849
diff
changeset
|
2536 /* 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
|
2537 * redraw later. */ |
| 12502 | 2538 redraw_buf_later(term->tl_buffer, NOT_VALID); |
| 2539 return 1; | |
| 2540 } | |
| 2541 | |
| 2542 static int | |
| 2543 handle_movecursor( | |
| 2544 VTermPos pos, | |
| 2545 VTermPos oldpos UNUSED, | |
| 2546 int visible, | |
| 2547 void *user) | |
| 2548 { | |
| 2549 term_T *term = (term_T *)user; | |
| 2550 win_T *wp; | |
| 2551 | |
| 2552 term->tl_cursor_pos = pos; | |
| 2553 term->tl_cursor_visible = visible; | |
| 2554 | |
| 2555 FOR_ALL_WINDOWS(wp) | |
| 2556 { | |
| 2557 if (wp->w_buffer == term->tl_buffer) | |
| 2558 position_cursor(wp, &pos); | |
| 2559 } | |
| 2560 if (term->tl_buffer == curbuf && !term->tl_normal_mode) | |
| 2561 { | |
| 2562 may_toggle_cursor(term); | |
| 2563 update_cursor(term, term->tl_cursor_visible); | |
| 2564 } | |
| 2565 | |
| 2566 return 1; | |
| 2567 } | |
| 2568 | |
| 2569 static int | |
| 2570 handle_settermprop( | |
| 2571 VTermProp prop, | |
| 2572 VTermValue *value, | |
| 2573 void *user) | |
| 2574 { | |
| 2575 term_T *term = (term_T *)user; | |
| 2576 | |
| 2577 switch (prop) | |
| 2578 { | |
| 2579 case VTERM_PROP_TITLE: | |
| 2580 vim_free(term->tl_title); | |
| 2581 /* a blank title isn't useful, make it empty, so that "running" is | |
| 2582 * displayed */ | |
| 2583 if (*skipwhite((char_u *)value->string) == NUL) | |
| 2584 term->tl_title = NULL; | |
| 2585 #ifdef WIN3264 | |
| 2586 else if (!enc_utf8 && enc_codepage > 0) | |
| 2587 { | |
| 2588 WCHAR *ret = NULL; | |
| 2589 int length = 0; | |
| 2590 | |
| 2591 MultiByteToWideChar_alloc(CP_UTF8, 0, | |
| 2592 (char*)value->string, (int)STRLEN(value->string), | |
| 2593 &ret, &length); | |
| 2594 if (ret != NULL) | |
| 2595 { | |
| 2596 WideCharToMultiByte_alloc(enc_codepage, 0, | |
| 2597 ret, length, (char**)&term->tl_title, | |
| 2598 &length, 0, 0); | |
| 2599 vim_free(ret); | |
| 2600 } | |
| 2601 } | |
| 2602 #endif | |
| 2603 else | |
| 2604 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
|
2605 VIM_CLEAR(term->tl_status_text); |
| 12502 | 2606 if (term == curbuf->b_term) |
| 2607 maketitle(); | |
| 2608 break; | |
| 2609 | |
| 2610 case VTERM_PROP_CURSORVISIBLE: | |
| 2611 term->tl_cursor_visible = value->boolean; | |
| 2612 may_toggle_cursor(term); | |
| 2613 out_flush(); | |
| 2614 break; | |
| 2615 | |
| 2616 case VTERM_PROP_CURSORBLINK: | |
| 2617 term->tl_cursor_blink = value->boolean; | |
| 2618 may_set_cursor_props(term); | |
| 2619 break; | |
| 2620 | |
| 2621 case VTERM_PROP_CURSORSHAPE: | |
| 2622 term->tl_cursor_shape = value->number; | |
| 2623 may_set_cursor_props(term); | |
| 2624 break; | |
| 2625 | |
| 2626 case VTERM_PROP_CURSORCOLOR: | |
|
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
|
2627 if (desired_cursor_color == term->tl_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
|
2628 desired_cursor_color = (char_u *)""; |
| 12502 | 2629 vim_free(term->tl_cursor_color); |
| 2630 if (*value->string == NUL) | |
| 2631 term->tl_cursor_color = NULL; | |
| 2632 else | |
| 2633 term->tl_cursor_color = vim_strsave((char_u *)value->string); | |
| 2634 may_set_cursor_props(term); | |
| 2635 break; | |
| 2636 | |
| 2637 case VTERM_PROP_ALTSCREEN: | |
| 2638 /* TODO: do anything else? */ | |
| 2639 term->tl_using_altscreen = value->boolean; | |
| 2640 break; | |
| 2641 | |
| 2642 default: | |
| 2643 break; | |
| 2644 } | |
| 2645 /* Always return 1, otherwise vterm doesn't store the value internally. */ | |
| 2646 return 1; | |
| 2647 } | |
| 2648 | |
| 2649 /* | |
| 2650 * The job running in the terminal resized the terminal. | |
| 2651 */ | |
| 2652 static int | |
| 2653 handle_resize(int rows, int cols, void *user) | |
| 2654 { | |
| 2655 term_T *term = (term_T *)user; | |
| 2656 win_T *wp; | |
| 2657 | |
| 2658 term->tl_rows = rows; | |
| 2659 term->tl_cols = cols; | |
| 2660 if (term->tl_vterm_size_changed) | |
| 2661 /* Size was set by vterm_set_size(), don't set the window size. */ | |
| 2662 term->tl_vterm_size_changed = FALSE; | |
| 2663 else | |
| 2664 { | |
| 2665 FOR_ALL_WINDOWS(wp) | |
| 2666 { | |
| 2667 if (wp->w_buffer == term->tl_buffer) | |
| 2668 { | |
| 2669 win_setheight_win(rows, wp); | |
| 2670 win_setwidth_win(cols, wp); | |
| 2671 } | |
| 2672 } | |
| 2673 redraw_buf_later(term->tl_buffer, NOT_VALID); | |
| 2674 } | |
| 2675 return 1; | |
| 2676 } | |
| 2677 | |
| 2678 /* | |
| 2679 * Handle a line that is pushed off the top of the screen. | |
| 2680 */ | |
| 2681 static int | |
| 2682 handle_pushline(int cols, const VTermScreenCell *cells, void *user) | |
| 2683 { | |
| 2684 term_T *term = (term_T *)user; | |
| 2685 | |
|
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
|
2686 /* 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
|
2687 * 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
|
2688 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
|
2689 |
|
13680
c32e9628dc30
patch 8.0.1712: terminal scrollback is not limited
Christian Brabandt <cb@256bit.org>
parents:
13678
diff
changeset
|
2690 /* 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
|
2691 * 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
|
2692 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
|
2693 { |
|
13742
a34b1323286c
patch 8.0.1743: terminal window options are named inconsistently
Christian Brabandt <cb@256bit.org>
parents:
13720
diff
changeset
|
2694 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
|
2695 int i; |
|
c32e9628dc30
patch 8.0.1712: terminal scrollback is not limited
Christian Brabandt <cb@256bit.org>
parents:
13678
diff
changeset
|
2696 |
|
c32e9628dc30
patch 8.0.1712: terminal scrollback is not limited
Christian Brabandt <cb@256bit.org>
parents:
13678
diff
changeset
|
2697 curbuf = term->tl_buffer; |
|
c32e9628dc30
patch 8.0.1712: terminal scrollback is not limited
Christian Brabandt <cb@256bit.org>
parents:
13678
diff
changeset
|
2698 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
|
2699 { |
|
c32e9628dc30
patch 8.0.1712: terminal scrollback is not limited
Christian Brabandt <cb@256bit.org>
parents:
13678
diff
changeset
|
2700 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
|
2701 ml_delete(1, FALSE); |
|
c32e9628dc30
patch 8.0.1712: terminal scrollback is not limited
Christian Brabandt <cb@256bit.org>
parents:
13678
diff
changeset
|
2702 } |
|
c32e9628dc30
patch 8.0.1712: terminal scrollback is not limited
Christian Brabandt <cb@256bit.org>
parents:
13678
diff
changeset
|
2703 curbuf = curwin->w_buffer; |
|
c32e9628dc30
patch 8.0.1712: terminal scrollback is not limited
Christian Brabandt <cb@256bit.org>
parents:
13678
diff
changeset
|
2704 |
|
c32e9628dc30
patch 8.0.1712: terminal scrollback is not limited
Christian Brabandt <cb@256bit.org>
parents:
13678
diff
changeset
|
2705 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
|
2706 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
|
2707 (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
|
2708 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
|
2709 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
|
2710 } |
|
c32e9628dc30
patch 8.0.1712: terminal scrollback is not limited
Christian Brabandt <cb@256bit.org>
parents:
13678
diff
changeset
|
2711 |
| 12502 | 2712 if (ga_grow(&term->tl_scrollback, 1) == OK) |
| 2713 { | |
| 2714 cellattr_T *p = NULL; | |
| 2715 int len = 0; | |
| 2716 int i; | |
| 2717 int c; | |
| 2718 int col; | |
| 2719 sb_line_T *line; | |
| 2720 garray_T ga; | |
| 2721 cellattr_T fill_attr = term->tl_default_color; | |
| 2722 | |
| 2723 /* do not store empty cells at the end */ | |
| 2724 for (i = 0; i < cols; ++i) | |
| 2725 if (cells[i].chars[0] != 0) | |
| 2726 len = i + 1; | |
| 2727 else | |
| 2728 cell2cellattr(&cells[i], &fill_attr); | |
| 2729 | |
| 2730 ga_init2(&ga, 1, 100); | |
| 2731 if (len > 0) | |
| 2732 p = (cellattr_T *)alloc((int)sizeof(cellattr_T) * len); | |
| 2733 if (p != NULL) | |
| 2734 { | |
| 2735 for (col = 0; col < len; col += cells[col].width) | |
| 2736 { | |
| 2737 if (ga_grow(&ga, MB_MAXBYTES) == FAIL) | |
| 2738 { | |
| 2739 ga.ga_len = 0; | |
| 2740 break; | |
| 2741 } | |
| 2742 for (i = 0; (c = cells[col].chars[i]) > 0 || i == 0; ++i) | |
| 2743 ga.ga_len += utf_char2bytes(c == NUL ? ' ' : c, | |
| 2744 (char_u *)ga.ga_data + ga.ga_len); | |
| 2745 cell2cellattr(&cells[col], &p[col]); | |
| 2746 } | |
| 2747 } | |
| 2748 if (ga_grow(&ga, 1) == FAIL) | |
| 2749 add_scrollback_line_to_buffer(term, (char_u *)"", 0); | |
| 2750 else | |
| 2751 { | |
| 2752 *((char_u *)ga.ga_data + ga.ga_len) = NUL; | |
| 2753 add_scrollback_line_to_buffer(term, ga.ga_data, ga.ga_len); | |
| 2754 } | |
| 2755 ga_clear(&ga); | |
| 2756 | |
| 2757 line = (sb_line_T *)term->tl_scrollback.ga_data | |
| 2758 + term->tl_scrollback.ga_len; | |
| 2759 line->sb_cols = len; | |
| 2760 line->sb_cells = p; | |
| 2761 line->sb_fill_attr = fill_attr; | |
| 2762 ++term->tl_scrollback.ga_len; | |
| 2763 ++term->tl_scrollback_scrolled; | |
| 2764 } | |
| 2765 return 0; /* ignored */ | |
| 2766 } | |
| 2767 | |
| 2768 static VTermScreenCallbacks screen_callbacks = { | |
| 2769 handle_damage, /* damage */ | |
| 2770 handle_moverect, /* moverect */ | |
| 2771 handle_movecursor, /* movecursor */ | |
| 2772 handle_settermprop, /* settermprop */ | |
| 2773 NULL, /* bell */ | |
| 2774 handle_resize, /* resize */ | |
| 2775 handle_pushline, /* sb_pushline */ | |
| 2776 NULL /* sb_popline */ | |
| 2777 }; | |
| 2778 | |
| 2779 /* | |
|
13888
81e8e6181aeb
patch 8.0.1815: crash with terminal window and with 'lazyredraw' set
Christian Brabandt <cb@256bit.org>
parents:
13886
diff
changeset
|
2780 * 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
|
2781 * 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
|
2782 * 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
|
2783 */ |
|
81e8e6181aeb
patch 8.0.1815: crash with terminal window and with 'lazyredraw' set
Christian Brabandt <cb@256bit.org>
parents:
13886
diff
changeset
|
2784 static int |
|
81e8e6181aeb
patch 8.0.1815: crash with terminal window and with 'lazyredraw' set
Christian Brabandt <cb@256bit.org>
parents:
13886
diff
changeset
|
2785 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
|
2786 { |
|
81e8e6181aeb
patch 8.0.1815: crash with terminal window and with 'lazyredraw' set
Christian Brabandt <cb@256bit.org>
parents:
13886
diff
changeset
|
2787 /* 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
|
2788 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
|
2789 { |
|
81e8e6181aeb
patch 8.0.1815: crash with terminal window and with 'lazyredraw' set
Christian Brabandt <cb@256bit.org>
parents:
13886
diff
changeset
|
2790 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
|
2791 |
|
81e8e6181aeb
patch 8.0.1815: crash with terminal window and with 'lazyredraw' set
Christian Brabandt <cb@256bit.org>
parents:
13886
diff
changeset
|
2792 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
|
2793 |
|
81e8e6181aeb
patch 8.0.1815: crash with terminal window and with 'lazyredraw' set
Christian Brabandt <cb@256bit.org>
parents:
13886
diff
changeset
|
2794 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
|
2795 { |
|
81e8e6181aeb
patch 8.0.1815: crash with terminal window and with 'lazyredraw' set
Christian Brabandt <cb@256bit.org>
parents:
13886
diff
changeset
|
2796 aco_save_T aco; |
|
81e8e6181aeb
patch 8.0.1815: crash with terminal window and with 'lazyredraw' set
Christian Brabandt <cb@256bit.org>
parents:
13886
diff
changeset
|
2797 |
|
81e8e6181aeb
patch 8.0.1815: crash with terminal window and with 'lazyredraw' set
Christian Brabandt <cb@256bit.org>
parents:
13886
diff
changeset
|
2798 /* ++close or term_finish == "close" */ |
|
81e8e6181aeb
patch 8.0.1815: crash with terminal window and with 'lazyredraw' set
Christian Brabandt <cb@256bit.org>
parents:
13886
diff
changeset
|
2799 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
|
2800 aucmd_prepbuf(&aco, term->tl_buffer); |
|
81e8e6181aeb
patch 8.0.1815: crash with terminal window and with 'lazyredraw' set
Christian Brabandt <cb@256bit.org>
parents:
13886
diff
changeset
|
2801 do_bufdel(DOBUF_WIPE, (char_u *)"", 1, fnum, fnum, FALSE); |
|
81e8e6181aeb
patch 8.0.1815: crash with terminal window and with 'lazyredraw' set
Christian Brabandt <cb@256bit.org>
parents:
13886
diff
changeset
|
2802 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
|
2803 return TRUE; |
|
81e8e6181aeb
patch 8.0.1815: crash with terminal window and with 'lazyredraw' set
Christian Brabandt <cb@256bit.org>
parents:
13886
diff
changeset
|
2804 } |
|
81e8e6181aeb
patch 8.0.1815: crash with terminal window and with 'lazyredraw' set
Christian Brabandt <cb@256bit.org>
parents:
13886
diff
changeset
|
2805 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
|
2806 && 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
|
2807 { |
|
81e8e6181aeb
patch 8.0.1815: crash with terminal window and with 'lazyredraw' set
Christian Brabandt <cb@256bit.org>
parents:
13886
diff
changeset
|
2808 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
|
2809 |
|
81e8e6181aeb
patch 8.0.1815: crash with terminal window and with 'lazyredraw' set
Christian Brabandt <cb@256bit.org>
parents:
13886
diff
changeset
|
2810 /* 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
|
2811 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
|
2812 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
|
2813 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
|
2814 ? "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
|
2815 : (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
|
2816 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
|
2817 } |
|
81e8e6181aeb
patch 8.0.1815: crash with terminal window and with 'lazyredraw' set
Christian Brabandt <cb@256bit.org>
parents:
13886
diff
changeset
|
2818 else |
|
81e8e6181aeb
patch 8.0.1815: crash with terminal window and with 'lazyredraw' set
Christian Brabandt <cb@256bit.org>
parents:
13886
diff
changeset
|
2819 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
|
2820 } |
|
81e8e6181aeb
patch 8.0.1815: crash with terminal window and with 'lazyredraw' set
Christian Brabandt <cb@256bit.org>
parents:
13886
diff
changeset
|
2821 |
|
81e8e6181aeb
patch 8.0.1815: crash with terminal window and with 'lazyredraw' set
Christian Brabandt <cb@256bit.org>
parents:
13886
diff
changeset
|
2822 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
|
2823 return FALSE; |
|
81e8e6181aeb
patch 8.0.1815: crash with terminal window and with 'lazyredraw' set
Christian Brabandt <cb@256bit.org>
parents:
13886
diff
changeset
|
2824 } |
|
81e8e6181aeb
patch 8.0.1815: crash with terminal window and with 'lazyredraw' set
Christian Brabandt <cb@256bit.org>
parents:
13886
diff
changeset
|
2825 |
|
81e8e6181aeb
patch 8.0.1815: crash with terminal window and with 'lazyredraw' set
Christian Brabandt <cb@256bit.org>
parents:
13886
diff
changeset
|
2826 /* |
| 12502 | 2827 * Called when a channel has been closed. |
| 2828 * If this was a channel for a terminal window then finish it up. | |
| 2829 */ | |
| 2830 void | |
| 2831 term_channel_closed(channel_T *ch) | |
| 2832 { | |
| 2833 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
|
2834 term_T *next_term; |
| 12502 | 2835 int did_one = FALSE; |
| 2836 | |
|
13888
81e8e6181aeb
patch 8.0.1815: crash with terminal window and with 'lazyredraw' set
Christian Brabandt <cb@256bit.org>
parents:
13886
diff
changeset
|
2837 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
|
2838 { |
|
81e8e6181aeb
patch 8.0.1815: crash with terminal window and with 'lazyredraw' set
Christian Brabandt <cb@256bit.org>
parents:
13886
diff
changeset
|
2839 next_term = term->tl_next; |
| 12502 | 2840 if (term->tl_job == ch->ch_job) |
| 2841 { | |
| 2842 term->tl_channel_closed = TRUE; | |
| 2843 did_one = TRUE; | |
| 2844 | |
|
13244
ac42c4b11dbc
patch 8.0.1496: clearing a pointer takes two lines
Christian Brabandt <cb@256bit.org>
parents:
13219
diff
changeset
|
2845 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
|
2846 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
|
2847 #ifdef WIN3264 |
|
b201372b91a4
patch 8.0.1802: MS-Windows: terminal test fails
Christian Brabandt <cb@256bit.org>
parents:
13860
diff
changeset
|
2848 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
|
2849 { |
|
b201372b91a4
patch 8.0.1802: MS-Windows: terminal test fails
Christian Brabandt <cb@256bit.org>
parents:
13860
diff
changeset
|
2850 fclose(term->tl_out_fd); |
|
b201372b91a4
patch 8.0.1802: MS-Windows: terminal test fails
Christian Brabandt <cb@256bit.org>
parents:
13860
diff
changeset
|
2851 term->tl_out_fd = NULL; |
|
b201372b91a4
patch 8.0.1802: MS-Windows: terminal test fails
Christian Brabandt <cb@256bit.org>
parents:
13860
diff
changeset
|
2852 } |
|
b201372b91a4
patch 8.0.1802: MS-Windows: terminal test fails
Christian Brabandt <cb@256bit.org>
parents:
13860
diff
changeset
|
2853 #endif |
| 12502 | 2854 |
|
13888
81e8e6181aeb
patch 8.0.1815: crash with terminal window and with 'lazyredraw' set
Christian Brabandt <cb@256bit.org>
parents:
13886
diff
changeset
|
2855 if (updating_screen) |
| 12502 | 2856 { |
|
13888
81e8e6181aeb
patch 8.0.1815: crash with terminal window and with 'lazyredraw' set
Christian Brabandt <cb@256bit.org>
parents:
13886
diff
changeset
|
2857 /* 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
|
2858 * '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
|
2859 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
|
2860 continue; |
| 12502 | 2861 } |
| 2862 | |
|
13888
81e8e6181aeb
patch 8.0.1815: crash with terminal window and with 'lazyredraw' set
Christian Brabandt <cb@256bit.org>
parents:
13886
diff
changeset
|
2863 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
|
2864 next_term = first_term; |
| 12502 | 2865 } |
|
13888
81e8e6181aeb
patch 8.0.1815: crash with terminal window and with 'lazyredraw' set
Christian Brabandt <cb@256bit.org>
parents:
13886
diff
changeset
|
2866 } |
|
81e8e6181aeb
patch 8.0.1815: crash with terminal window and with 'lazyredraw' set
Christian Brabandt <cb@256bit.org>
parents:
13886
diff
changeset
|
2867 |
| 12502 | 2868 if (did_one) |
| 2869 { | |
| 2870 redraw_statuslines(); | |
| 2871 | |
| 2872 /* Need to break out of vgetc(). */ | |
| 2873 ins_char_typebuf(K_IGNORE); | |
| 2874 typebuf_was_filled = TRUE; | |
| 2875 | |
| 2876 term = curbuf->b_term; | |
| 2877 if (term != NULL) | |
| 2878 { | |
| 2879 if (term->tl_job == ch->ch_job) | |
| 2880 maketitle(); | |
| 2881 update_cursor(term, term->tl_cursor_visible); | |
| 2882 } | |
| 2883 } | |
| 2884 } | |
| 2885 | |
| 2886 /* | |
|
13888
81e8e6181aeb
patch 8.0.1815: crash with terminal window and with 'lazyredraw' set
Christian Brabandt <cb@256bit.org>
parents:
13886
diff
changeset
|
2887 * 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
|
2888 * 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
|
2889 */ |
|
81e8e6181aeb
patch 8.0.1815: crash with terminal window and with 'lazyredraw' set
Christian Brabandt <cb@256bit.org>
parents:
13886
diff
changeset
|
2890 void |
|
81e8e6181aeb
patch 8.0.1815: crash with terminal window and with 'lazyredraw' set
Christian Brabandt <cb@256bit.org>
parents:
13886
diff
changeset
|
2891 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
|
2892 { |
|
81e8e6181aeb
patch 8.0.1815: crash with terminal window and with 'lazyredraw' set
Christian Brabandt <cb@256bit.org>
parents:
13886
diff
changeset
|
2893 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
|
2894 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
|
2895 |
|
81e8e6181aeb
patch 8.0.1815: crash with terminal window and with 'lazyredraw' set
Christian Brabandt <cb@256bit.org>
parents:
13886
diff
changeset
|
2896 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
|
2897 { |
|
81e8e6181aeb
patch 8.0.1815: crash with terminal window and with 'lazyredraw' set
Christian Brabandt <cb@256bit.org>
parents:
13886
diff
changeset
|
2898 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
|
2899 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
|
2900 { |
|
81e8e6181aeb
patch 8.0.1815: crash with terminal window and with 'lazyredraw' set
Christian Brabandt <cb@256bit.org>
parents:
13886
diff
changeset
|
2901 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
|
2902 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
|
2903 // 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
|
2904 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
|
2905 } |
|
81e8e6181aeb
patch 8.0.1815: crash with terminal window and with 'lazyredraw' set
Christian Brabandt <cb@256bit.org>
parents:
13886
diff
changeset
|
2906 } |
|
81e8e6181aeb
patch 8.0.1815: crash with terminal window and with 'lazyredraw' set
Christian Brabandt <cb@256bit.org>
parents:
13886
diff
changeset
|
2907 } |
|
81e8e6181aeb
patch 8.0.1815: crash with terminal window and with 'lazyredraw' set
Christian Brabandt <cb@256bit.org>
parents:
13886
diff
changeset
|
2908 |
|
81e8e6181aeb
patch 8.0.1815: crash with terminal window and with 'lazyredraw' set
Christian Brabandt <cb@256bit.org>
parents:
13886
diff
changeset
|
2909 /* |
|
13470
6faef782f50b
patch 8.0.1609: shell commands in the GUI use a dumb terminal
Christian Brabandt <cb@256bit.org>
parents:
13458
diff
changeset
|
2910 * 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
|
2911 * 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
|
2912 */ |
|
6faef782f50b
patch 8.0.1609: shell commands in the GUI use a dumb terminal
Christian Brabandt <cb@256bit.org>
parents:
13458
diff
changeset
|
2913 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
|
2914 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
|
2915 { |
|
6faef782f50b
patch 8.0.1609: shell commands in the GUI use a dumb terminal
Christian Brabandt <cb@256bit.org>
parents:
13458
diff
changeset
|
2916 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
|
2917 |
|
6faef782f50b
patch 8.0.1609: shell commands in the GUI use a dumb terminal
Christian Brabandt <cb@256bit.org>
parents:
13458
diff
changeset
|
2918 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
|
2919 { |
|
6faef782f50b
patch 8.0.1609: shell commands in the GUI use a dumb terminal
Christian Brabandt <cb@256bit.org>
parents:
13458
diff
changeset
|
2920 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
|
2921 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
|
2922 |
|
6faef782f50b
patch 8.0.1609: shell commands in the GUI use a dumb terminal
Christian Brabandt <cb@256bit.org>
parents:
13458
diff
changeset
|
2923 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
|
2924 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
|
2925 |
|
6faef782f50b
patch 8.0.1609: shell commands in the GUI use a dumb terminal
Christian Brabandt <cb@256bit.org>
parents:
13458
diff
changeset
|
2926 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
|
2927 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
|
2928 { |
|
6faef782f50b
patch 8.0.1609: shell commands in the GUI use a dumb terminal
Christian Brabandt <cb@256bit.org>
parents:
13458
diff
changeset
|
2929 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
|
2930 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
|
2931 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
|
2932 } |
|
6faef782f50b
patch 8.0.1609: shell commands in the GUI use a dumb terminal
Christian Brabandt <cb@256bit.org>
parents:
13458
diff
changeset
|
2933 else |
|
6faef782f50b
patch 8.0.1609: shell commands in the GUI use a dumb terminal
Christian Brabandt <cb@256bit.org>
parents:
13458
diff
changeset
|
2934 { |
|
6faef782f50b
patch 8.0.1609: shell commands in the GUI use a dumb terminal
Christian Brabandt <cb@256bit.org>
parents:
13458
diff
changeset
|
2935 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
|
2936 { |
|
6faef782f50b
patch 8.0.1609: shell commands in the GUI use a dumb terminal
Christian Brabandt <cb@256bit.org>
parents:
13458
diff
changeset
|
2937 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
|
2938 |
|
6faef782f50b
patch 8.0.1609: shell commands in the GUI use a dumb terminal
Christian Brabandt <cb@256bit.org>
parents:
13458
diff
changeset
|
2939 /* 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
|
2940 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
|
2941 && 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
|
2942 { |
|
6faef782f50b
patch 8.0.1609: shell commands in the GUI use a dumb terminal
Christian Brabandt <cb@256bit.org>
parents:
13458
diff
changeset
|
2943 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
|
2944 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
|
2945 break; |
|
6faef782f50b
patch 8.0.1609: shell commands in the GUI use a dumb terminal
Christian Brabandt <cb@256bit.org>
parents:
13458
diff
changeset
|
2946 } |
|
6faef782f50b
patch 8.0.1609: shell commands in the GUI use a dumb terminal
Christian Brabandt <cb@256bit.org>
parents:
13458
diff
changeset
|
2947 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
|
2948 && 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
|
2949 { |
|
6faef782f50b
patch 8.0.1609: shell commands in the GUI use a dumb terminal
Christian Brabandt <cb@256bit.org>
parents:
13458
diff
changeset
|
2950 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
|
2951 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
|
2952 } |
|
6faef782f50b
patch 8.0.1609: shell commands in the GUI use a dumb terminal
Christian Brabandt <cb@256bit.org>
parents:
13458
diff
changeset
|
2953 else |
|
6faef782f50b
patch 8.0.1609: shell commands in the GUI use a dumb terminal
Christian Brabandt <cb@256bit.org>
parents:
13458
diff
changeset
|
2954 { |
|
6faef782f50b
patch 8.0.1609: shell commands in the GUI use a dumb terminal
Christian Brabandt <cb@256bit.org>
parents:
13458
diff
changeset
|
2955 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
|
2956 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
|
2957 } |
|
6faef782f50b
patch 8.0.1609: shell commands in the GUI use a dumb terminal
Christian Brabandt <cb@256bit.org>
parents:
13458
diff
changeset
|
2958 } |
|
6faef782f50b
patch 8.0.1609: shell commands in the GUI use a dumb terminal
Christian Brabandt <cb@256bit.org>
parents:
13458
diff
changeset
|
2959 #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
|
2960 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
|
2961 { |
|
6faef782f50b
patch 8.0.1609: shell commands in the GUI use a dumb terminal
Christian Brabandt <cb@256bit.org>
parents:
13458
diff
changeset
|
2962 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
|
2963 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
|
2964 |
|
6faef782f50b
patch 8.0.1609: shell commands in the GUI use a dumb terminal
Christian Brabandt <cb@256bit.org>
parents:
13458
diff
changeset
|
2965 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
|
2966 (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
|
2967 { |
|
6faef782f50b
patch 8.0.1609: shell commands in the GUI use a dumb terminal
Christian Brabandt <cb@256bit.org>
parents:
13458
diff
changeset
|
2968 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
|
2969 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
|
2970 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
|
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 else |
|
6faef782f50b
patch 8.0.1609: shell commands in the GUI use a dumb terminal
Christian Brabandt <cb@256bit.org>
parents:
13458
diff
changeset
|
2973 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
|
2974 } |
|
6faef782f50b
patch 8.0.1609: shell commands in the GUI use a dumb terminal
Christian Brabandt <cb@256bit.org>
parents:
13458
diff
changeset
|
2975 #endif |
|
6faef782f50b
patch 8.0.1609: shell commands in the GUI use a dumb terminal
Christian Brabandt <cb@256bit.org>
parents:
13458
diff
changeset
|
2976 else |
|
6faef782f50b
patch 8.0.1609: shell commands in the GUI use a dumb terminal
Christian Brabandt <cb@256bit.org>
parents:
13458
diff
changeset
|
2977 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
|
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 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
|
2980 |
|
6faef782f50b
patch 8.0.1609: shell commands in the GUI use a dumb terminal
Christian Brabandt <cb@256bit.org>
parents:
13458
diff
changeset
|
2981 ++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
|
2982 ++off; |
|
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 (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
|
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 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
|
2986 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
|
2987 |
|
6faef782f50b
patch 8.0.1609: shell commands in the GUI use a dumb terminal
Christian Brabandt <cb@256bit.org>
parents:
13458
diff
changeset
|
2988 /* 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
|
2989 * 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
|
2990 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
|
2991 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
|
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 ++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
|
2994 ++off; |
|
6faef782f50b
patch 8.0.1609: shell commands in the GUI use a dumb terminal
Christian Brabandt <cb@256bit.org>
parents:
13458
diff
changeset
|
2995 } |
|
6faef782f50b
patch 8.0.1609: shell commands in the GUI use a dumb terminal
Christian Brabandt <cb@256bit.org>
parents:
13458
diff
changeset
|
2996 } |
|
6faef782f50b
patch 8.0.1609: shell commands in the GUI use a dumb terminal
Christian Brabandt <cb@256bit.org>
parents:
13458
diff
changeset
|
2997 } |
|
6faef782f50b
patch 8.0.1609: shell commands in the GUI use a dumb terminal
Christian Brabandt <cb@256bit.org>
parents:
13458
diff
changeset
|
2998 |
|
13472
f6a4614edea4
patch 8.0.1610: cannot build without GUI
Christian Brabandt <cb@256bit.org>
parents:
13470
diff
changeset
|
2999 #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
|
3000 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
|
3001 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
|
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 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
|
3004 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
|
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 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
|
3007 return; |
|
6faef782f50b
patch 8.0.1609: shell commands in the GUI use a dumb terminal
Christian Brabandt <cb@256bit.org>
parents:
13458
diff
changeset
|
3008 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
|
3009 |
|
6faef782f50b
patch 8.0.1609: shell commands in the GUI use a dumb terminal
Christian Brabandt <cb@256bit.org>
parents:
13458
diff
changeset
|
3010 /* 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
|
3011 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
|
3012 && (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
|
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 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
|
3015 |
|
6faef782f50b
patch 8.0.1609: shell commands in the GUI use a dumb terminal
Christian Brabandt <cb@256bit.org>
parents:
13458
diff
changeset
|
3016 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
|
3017 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
|
3018 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
|
3019 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
|
3020 --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
|
3021 } |
|
6faef782f50b
patch 8.0.1609: shell commands in the GUI use a dumb terminal
Christian Brabandt <cb@256bit.org>
parents:
13458
diff
changeset
|
3022 |
|
6faef782f50b
patch 8.0.1609: shell commands in the GUI use a dumb terminal
Christian Brabandt <cb@256bit.org>
parents:
13458
diff
changeset
|
3023 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
|
3024 && 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
|
3025 { |
|
6faef782f50b
patch 8.0.1609: shell commands in the GUI use a dumb terminal
Christian Brabandt <cb@256bit.org>
parents:
13458
diff
changeset
|
3026 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
|
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 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
|
3029 |
|
6faef782f50b
patch 8.0.1609: shell commands in the GUI use a dumb terminal
Christian Brabandt <cb@256bit.org>
parents:
13458
diff
changeset
|
3030 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
|
3031 } |
|
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 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
|
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 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
|
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 |
|
6faef782f50b
patch 8.0.1609: shell commands in the GUI use a dumb terminal
Christian Brabandt <cb@256bit.org>
parents:
13458
diff
changeset
|
3038 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
|
3039 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
|
3040 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
|
3041 } |
|
13472
f6a4614edea4
patch 8.0.1610: cannot build without GUI
Christian Brabandt <cb@256bit.org>
parents:
13470
diff
changeset
|
3042 #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
|
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 /* |
|
13851
3edac4cd1c0a
patch 8.0.1797: terminal window is redrawn too often
Christian Brabandt <cb@256bit.org>
parents:
13849
diff
changeset
|
3045 * 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
|
3046 * Returns FALSE when there is no terminal running in this window or it is in |
| 12502 | 3047 * Terminal-Normal mode. |
| 3048 */ | |
| 3049 int | |
|
13851
3edac4cd1c0a
patch 8.0.1797: terminal window is redrawn too often
Christian Brabandt <cb@256bit.org>
parents:
13849
diff
changeset
|
3050 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
|
3051 { |
|
3edac4cd1c0a
patch 8.0.1797: terminal window is redrawn too often
Christian Brabandt <cb@256bit.org>
parents:
13849
diff
changeset
|
3052 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
|
3053 |
|
3edac4cd1c0a
patch 8.0.1797: terminal window is redrawn too often
Christian Brabandt <cb@256bit.org>
parents:
13849
diff
changeset
|
3054 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
|
3055 } |
|
3edac4cd1c0a
patch 8.0.1797: terminal window is redrawn too often
Christian Brabandt <cb@256bit.org>
parents:
13849
diff
changeset
|
3056 |
|
3edac4cd1c0a
patch 8.0.1797: terminal window is redrawn too often
Christian Brabandt <cb@256bit.org>
parents:
13849
diff
changeset
|
3057 /* |
|
3edac4cd1c0a
patch 8.0.1797: terminal window is redrawn too often
Christian Brabandt <cb@256bit.org>
parents:
13849
diff
changeset
|
3058 * 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
|
3059 */ |
|
3edac4cd1c0a
patch 8.0.1797: terminal window is redrawn too often
Christian Brabandt <cb@256bit.org>
parents:
13849
diff
changeset
|
3060 void |
| 12502 | 3061 term_update_window(win_T *wp) |
| 3062 { | |
| 3063 term_T *term = wp->w_buffer->b_term; | |
| 3064 VTerm *vterm; | |
| 3065 VTermScreen *screen; | |
| 3066 VTermState *state; | |
| 3067 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
|
3068 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
|
3069 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
|
3070 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
|
3071 win_T *twp; |
| 12502 | 3072 |
| 3073 vterm = term->tl_vterm; | |
| 3074 screen = vterm_obtain_screen(vterm); | |
| 3075 state = vterm_obtain_state(vterm); | |
| 3076 | |
|
13851
3edac4cd1c0a
patch 8.0.1797: terminal window is redrawn too often
Christian Brabandt <cb@256bit.org>
parents:
13849
diff
changeset
|
3077 /* 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
|
3078 * 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
|
3079 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
|
3080 { |
|
3c46dcf3b335
patch 8.0.1173: terminal window is not redrawn after CTRL-L
Christian Brabandt <cb@256bit.org>
parents:
12578
diff
changeset
|
3081 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
|
3082 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
|
3083 |
|
3edac4cd1c0a
patch 8.0.1797: terminal window is redrawn too often
Christian Brabandt <cb@256bit.org>
parents:
13849
diff
changeset
|
3084 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
|
3085 && 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
|
3086 /* 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
|
3087 * 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
|
3088 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
|
3089 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
|
3090 } |
|
3c46dcf3b335
patch 8.0.1173: terminal window is not redrawn after CTRL-L
Christian Brabandt <cb@256bit.org>
parents:
12578
diff
changeset
|
3091 |
| 12502 | 3092 /* |
| 3093 * 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
|
3094 * Adjust the size of the vterm unless 'termwinsize' specifies a fixed size. |
| 12502 | 3095 */ |
|
13845
f22db93bd887
patch 8.0.1794: duplicate term options after renaming
Christian Brabandt <cb@256bit.org>
parents:
13835
diff
changeset
|
3096 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
|
3097 |
|
b28d679b1843
patch 8.0.1722: cannot specify a minimal size for a terminal window
Christian Brabandt <cb@256bit.org>
parents:
13696
diff
changeset
|
3098 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
|
3099 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
|
3100 FOR_ALL_WINDOWS(twp) |
| 12502 | 3101 { |
|
13700
b28d679b1843
patch 8.0.1722: cannot specify a minimal size for a terminal window
Christian Brabandt <cb@256bit.org>
parents:
13696
diff
changeset
|
3102 /* 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
|
3103 * 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
|
3104 if (twp->w_buffer == term->tl_buffer) |
| 12502 | 3105 { |
|
13700
b28d679b1843
patch 8.0.1722: cannot specify a minimal size for a terminal window
Christian Brabandt <cb@256bit.org>
parents:
13696
diff
changeset
|
3106 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
|
3107 newcols = MIN(newcols, twp->w_width); |
| 12502 | 3108 } |
|
13700
b28d679b1843
patch 8.0.1722: cannot specify a minimal size for a terminal window
Christian Brabandt <cb@256bit.org>
parents:
13696
diff
changeset
|
3109 } |
|
b28d679b1843
patch 8.0.1722: cannot specify a minimal size for a terminal window
Christian Brabandt <cb@256bit.org>
parents:
13696
diff
changeset
|
3110 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
|
3111 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
|
3112 |
|
b28d679b1843
patch 8.0.1722: cannot specify a minimal size for a terminal window
Christian Brabandt <cb@256bit.org>
parents:
13696
diff
changeset
|
3113 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
|
3114 { |
|
b28d679b1843
patch 8.0.1722: cannot specify a minimal size for a terminal window
Christian Brabandt <cb@256bit.org>
parents:
13696
diff
changeset
|
3115 |
| 12502 | 3116 |
| 3117 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
|
3118 vterm_set_size(vterm, newrows, newcols); |
| 12502 | 3119 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
|
3120 newrows); |
|
b28d679b1843
patch 8.0.1722: cannot specify a minimal size for a terminal window
Christian Brabandt <cb@256bit.org>
parents:
13696
diff
changeset
|
3121 term_report_winsize(term, newrows, newcols); |
| 12502 | 3122 } |
| 3123 | |
| 3124 /* The cursor may have been moved when resizing. */ | |
| 3125 vterm_state_get_cursorpos(state, &pos); | |
| 3126 position_cursor(wp, &pos); | |
| 3127 | |
|
12578
f8beecfea2c4
patch 8.0.1167: Motif: typing in terminal window is slow
Christian Brabandt <cb@256bit.org>
parents:
12541
diff
changeset
|
3128 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
|
3129 && pos.row < wp->w_height; ++pos.row) |
| 12502 | 3130 { |
| 3131 if (pos.row < term->tl_rows) | |
| 3132 { | |
|
13470
6faef782f50b
patch 8.0.1609: shell commands in the GUI use a dumb terminal
Christian Brabandt <cb@256bit.org>
parents:
13458
diff
changeset
|
3133 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
|
3134 |
|
6faef782f50b
patch 8.0.1609: shell commands in the GUI use a dumb terminal
Christian Brabandt <cb@256bit.org>
parents:
13458
diff
changeset
|
3135 term_line2screenline(screen, &pos, max_col); |
| 12502 | 3136 } |
| 3137 else | |
| 3138 pos.col = 0; | |
| 3139 | |
|
13458
0e7a56b18d61
patch 8.0.1603: cannot build with +terminal but without +menu
Christian Brabandt <cb@256bit.org>
parents:
13448
diff
changeset
|
3140 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
|
3141 #ifdef FEAT_MENU |
|
0e7a56b18d61
patch 8.0.1603: cannot build with +terminal but without +menu
Christian Brabandt <cb@256bit.org>
parents:
13448
diff
changeset
|
3142 + winbar_height(wp) |
|
0e7a56b18d61
patch 8.0.1603: cannot build with +terminal but without +menu
Christian Brabandt <cb@256bit.org>
parents:
13448
diff
changeset
|
3143 #endif |
|
0e7a56b18d61
patch 8.0.1603: cannot build with +terminal but without +menu
Christian Brabandt <cb@256bit.org>
parents:
13448
diff
changeset
|
3144 , wp->w_wincol, pos.col, wp->w_width, FALSE); |
| 12502 | 3145 } |
|
12578
f8beecfea2c4
patch 8.0.1167: Motif: typing in terminal window is slow
Christian Brabandt <cb@256bit.org>
parents:
12541
diff
changeset
|
3146 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
|
3147 term->tl_dirty_row_end = 0; |
| 12502 | 3148 } |
| 3149 | |
| 3150 /* | |
| 3151 * Return TRUE if "wp" is a terminal window where the job has finished. | |
| 3152 */ | |
| 3153 int | |
| 3154 term_is_finished(buf_T *buf) | |
| 3155 { | |
| 3156 return buf->b_term != NULL && buf->b_term->tl_vterm == NULL; | |
| 3157 } | |
| 3158 | |
| 3159 /* | |
| 3160 * Return TRUE if "wp" is a terminal window where the job has finished or we | |
| 3161 * are in Terminal-Normal mode, thus we show the buffer contents. | |
| 3162 */ | |
| 3163 int | |
| 3164 term_show_buffer(buf_T *buf) | |
| 3165 { | |
| 3166 term_T *term = buf->b_term; | |
| 3167 | |
| 3168 return term != NULL && (term->tl_vterm == NULL || term->tl_normal_mode); | |
| 3169 } | |
| 3170 | |
| 3171 /* | |
| 3172 * The current buffer is going to be changed. If there is terminal | |
| 3173 * highlighting remove it now. | |
| 3174 */ | |
| 3175 void | |
| 3176 term_change_in_curbuf(void) | |
| 3177 { | |
| 3178 term_T *term = curbuf->b_term; | |
| 3179 | |
| 3180 if (term_is_finished(curbuf) && term->tl_scrollback.ga_len > 0) | |
| 3181 { | |
| 3182 free_scrollback(term); | |
| 3183 redraw_buf_later(term->tl_buffer, NOT_VALID); | |
| 3184 | |
| 3185 /* The buffer is now like a normal buffer, it cannot be easily | |
| 3186 * abandoned when changed. */ | |
| 3187 set_string_option_direct((char_u *)"buftype", -1, | |
| 3188 (char_u *)"", OPT_FREE|OPT_LOCAL, 0); | |
| 3189 } | |
| 3190 } | |
| 3191 | |
| 3192 /* | |
| 3193 * Get the screen attribute for a position in the buffer. | |
| 3194 * Use a negative "col" to get the filler background color. | |
| 3195 */ | |
| 3196 int | |
| 3197 term_get_attr(buf_T *buf, linenr_T lnum, int col) | |
| 3198 { | |
| 3199 term_T *term = buf->b_term; | |
| 3200 sb_line_T *line; | |
| 3201 cellattr_T *cellattr; | |
| 3202 | |
| 3203 if (lnum > term->tl_scrollback.ga_len) | |
| 3204 cellattr = &term->tl_default_color; | |
| 3205 else | |
| 3206 { | |
| 3207 line = (sb_line_T *)term->tl_scrollback.ga_data + lnum - 1; | |
| 3208 if (col < 0 || col >= line->sb_cols) | |
| 3209 cellattr = &line->sb_fill_attr; | |
| 3210 else | |
| 3211 cellattr = line->sb_cells + col; | |
| 3212 } | |
| 3213 return cell2attr(cellattr->attrs, cellattr->fg, cellattr->bg); | |
| 3214 } | |
| 3215 | |
| 3216 /* | |
| 3217 * 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
|
3218 * This is compatible with xterm. |
| 12502 | 3219 */ |
| 3220 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
|
3221 cterm_color2vterm(int nr, VTermColor *rgb) |
| 12502 | 3222 { |
|
13823
d0d8125ba692
patch 8.0.1783: cannot use 256 colors in a MS-Windows console
Christian Brabandt <cb@256bit.org>
parents:
13750
diff
changeset
|
3223 cterm_color2rgb(nr, &rgb->red, &rgb->green, &rgb->blue, &rgb->ansi_index); |
| 12502 | 3224 } |
| 3225 | |
| 3226 /* | |
|
13483
f7ef5d579758
patch 8.0.1615: term_dumpload() does not use the right colors
Christian Brabandt <cb@256bit.org>
parents:
13476
diff
changeset
|
3227 * Initialize term->tl_default_color from the environment. |
| 12502 | 3228 */ |
| 3229 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
|
3230 init_default_colors(term_T *term) |
| 12502 | 3231 { |
| 3232 VTermColor *fg, *bg; | |
| 3233 int fgval, bgval; | |
| 3234 int id; | |
| 3235 | |
| 3236 vim_memset(&term->tl_default_color.attrs, 0, sizeof(VTermScreenCellAttrs)); | |
| 3237 term->tl_default_color.width = 1; | |
| 3238 fg = &term->tl_default_color.fg; | |
| 3239 bg = &term->tl_default_color.bg; | |
| 3240 | |
| 3241 /* Vterm uses a default black background. Set it to white when | |
| 3242 * 'background' is "light". */ | |
| 3243 if (*p_bg == 'l') | |
| 3244 { | |
| 3245 fgval = 0; | |
| 3246 bgval = 255; | |
| 3247 } | |
| 3248 else | |
| 3249 { | |
| 3250 fgval = 255; | |
| 3251 bgval = 0; | |
| 3252 } | |
| 3253 fg->red = fg->green = fg->blue = fgval; | |
| 3254 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
|
3255 fg->ansi_index = bg->ansi_index = VTERM_ANSI_INDEX_DEFAULT; |
| 12502 | 3256 |
| 3257 /* The "Terminal" highlight group overrules the defaults. */ | |
| 3258 id = syn_name2id((char_u *)"Terminal"); | |
| 3259 | |
|
12966
c5bccd50100e
patch 8.0.1359: libvterm ANSI colors can not always be recognized
Christian Brabandt <cb@256bit.org>
parents:
12907
diff
changeset
|
3260 /* Use the actual color for the GUI and when 'termguicolors' is set. */ |
| 12502 | 3261 #if defined(FEAT_GUI) || defined(FEAT_TERMGUICOLORS) |
| 3262 if (0 | |
| 3263 # ifdef FEAT_GUI | |
| 3264 || gui.in_use | |
| 3265 # endif | |
| 3266 # ifdef FEAT_TERMGUICOLORS | |
| 3267 || 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
|
3268 # 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
|
3269 /* 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
|
3270 || (!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
|
3271 # endif |
| 12502 | 3272 # endif |
| 3273 ) | |
| 3274 { | |
| 3275 guicolor_T fg_rgb = INVALCOLOR; | |
| 3276 guicolor_T bg_rgb = INVALCOLOR; | |
| 3277 | |
| 3278 if (id != 0) | |
| 3279 syn_id2colors(id, &fg_rgb, &bg_rgb); | |
| 3280 | |
| 3281 # ifdef FEAT_GUI | |
| 3282 if (gui.in_use) | |
| 3283 { | |
| 3284 if (fg_rgb == INVALCOLOR) | |
| 3285 fg_rgb = gui.norm_pixel; | |
| 3286 if (bg_rgb == INVALCOLOR) | |
| 3287 bg_rgb = gui.back_pixel; | |
| 3288 } | |
| 3289 # ifdef FEAT_TERMGUICOLORS | |
| 3290 else | |
| 3291 # endif | |
| 3292 # endif | |
| 3293 # ifdef FEAT_TERMGUICOLORS | |
| 3294 { | |
| 3295 if (fg_rgb == INVALCOLOR) | |
| 3296 fg_rgb = cterm_normal_fg_gui_color; | |
| 3297 if (bg_rgb == INVALCOLOR) | |
| 3298 bg_rgb = cterm_normal_bg_gui_color; | |
| 3299 } | |
| 3300 # endif | |
| 3301 if (fg_rgb != INVALCOLOR) | |
| 3302 { | |
| 3303 long_u rgb = GUI_MCH_GET_RGB(fg_rgb); | |
| 3304 | |
| 3305 fg->red = (unsigned)(rgb >> 16); | |
| 3306 fg->green = (unsigned)(rgb >> 8) & 255; | |
| 3307 fg->blue = (unsigned)rgb & 255; | |
| 3308 } | |
| 3309 if (bg_rgb != INVALCOLOR) | |
| 3310 { | |
| 3311 long_u rgb = GUI_MCH_GET_RGB(bg_rgb); | |
| 3312 | |
| 3313 bg->red = (unsigned)(rgb >> 16); | |
| 3314 bg->green = (unsigned)(rgb >> 8) & 255; | |
| 3315 bg->blue = (unsigned)rgb & 255; | |
| 3316 } | |
| 3317 } | |
| 3318 else | |
| 3319 #endif | |
| 3320 if (id != 0 && t_colors >= 16) | |
| 3321 { | |
|
12973
418941f0df08
patch 8.0.1362: terminal window colors wrong when using Terminal highlighting
Christian Brabandt <cb@256bit.org>
parents:
12969
diff
changeset
|
3322 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
|
3323 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
|
3324 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
|
3325 cterm_color2vterm(term_default_cterm_bg, bg); |
| 12502 | 3326 } |
| 3327 else | |
| 3328 { | |
|
12632
b1a7e3968a31
patch 8.0.1194: actual fg and bg colors of terminal are unknown
Christian Brabandt <cb@256bit.org>
parents:
12598
diff
changeset
|
3329 #if defined(WIN3264) && !defined(FEAT_GUI_W32) |
| 12502 | 3330 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
|
3331 #endif |
| 12502 | 3332 |
| 3333 /* In an MS-Windows console we know the normal colors. */ | |
| 3334 if (cterm_normal_fg_color > 0) | |
| 3335 { | |
|
13823
d0d8125ba692
patch 8.0.1783: cannot use 256 colors in a MS-Windows console
Christian Brabandt <cb@256bit.org>
parents:
13750
diff
changeset
|
3336 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
|
3337 # if defined(WIN3264) && !defined(FEAT_GUI_W32) |
| 12502 | 3338 tmp = fg->red; |
| 3339 fg->red = fg->blue; | |
| 3340 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
|
3341 # endif |
| 12502 | 3342 } |
|
12634
94566ecb55f0
patch 8.0.1195: can't build on MS-Windows
Christian Brabandt <cb@256bit.org>
parents:
12632
diff
changeset
|
3343 # 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
|
3344 else |
|
b1a7e3968a31
patch 8.0.1194: actual fg and bg colors of terminal are unknown
Christian Brabandt <cb@256bit.org>
parents:
12598
diff
changeset
|
3345 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
|
3346 # 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
|
3347 |
| 12502 | 3348 if (cterm_normal_bg_color > 0) |
| 3349 { | |
|
13823
d0d8125ba692
patch 8.0.1783: cannot use 256 colors in a MS-Windows console
Christian Brabandt <cb@256bit.org>
parents:
13750
diff
changeset
|
3350 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
|
3351 # if defined(WIN3264) && !defined(FEAT_GUI_W32) |
| 12502 | 3352 tmp = bg->red; |
| 3353 bg->red = bg->blue; | |
| 3354 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
|
3355 # endif |
| 12502 | 3356 } |
|
12634
94566ecb55f0
patch 8.0.1195: can't build on MS-Windows
Christian Brabandt <cb@256bit.org>
parents:
12632
diff
changeset
|
3357 # 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
|
3358 else |
|
b1a7e3968a31
patch 8.0.1194: actual fg and bg colors of terminal are unknown
Christian Brabandt <cb@256bit.org>
parents:
12598
diff
changeset
|
3359 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
|
3360 # endif |
| 12502 | 3361 } |
|
13483
f7ef5d579758
patch 8.0.1615: term_dumpload() does not use the right colors
Christian Brabandt <cb@256bit.org>
parents:
13476
diff
changeset
|
3362 } |
|
f7ef5d579758
patch 8.0.1615: term_dumpload() does not use the right colors
Christian Brabandt <cb@256bit.org>
parents:
13476
diff
changeset
|
3363 |
|
13626
ab89131d30e0
patch 8.0.1685: can't set ANSI colors of a terminal window
Christian Brabandt <cb@256bit.org>
parents:
13624
diff
changeset
|
3364 #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
|
3365 /* |
|
ab89131d30e0
patch 8.0.1685: can't set ANSI colors of a terminal window
Christian Brabandt <cb@256bit.org>
parents:
13624
diff
changeset
|
3366 * 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
|
3367 */ |
|
ab89131d30e0
patch 8.0.1685: can't set ANSI colors of a terminal window
Christian Brabandt <cb@256bit.org>
parents:
13624
diff
changeset
|
3368 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
|
3369 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
|
3370 { |
|
ab89131d30e0
patch 8.0.1685: can't set ANSI colors of a terminal window
Christian Brabandt <cb@256bit.org>
parents:
13624
diff
changeset
|
3371 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
|
3372 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
|
3373 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
|
3374 { |
|
ab89131d30e0
patch 8.0.1685: can't set ANSI colors of a terminal window
Christian Brabandt <cb@256bit.org>
parents:
13624
diff
changeset
|
3375 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
|
3376 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
|
3377 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
|
3378 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
|
3379 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
|
3380 } |
|
ab89131d30e0
patch 8.0.1685: can't set ANSI colors of a terminal window
Christian Brabandt <cb@256bit.org>
parents:
13624
diff
changeset
|
3381 } |
|
ab89131d30e0
patch 8.0.1685: can't set ANSI colors of a terminal window
Christian Brabandt <cb@256bit.org>
parents:
13624
diff
changeset
|
3382 |
|
ab89131d30e0
patch 8.0.1685: can't set ANSI colors of a terminal window
Christian Brabandt <cb@256bit.org>
parents:
13624
diff
changeset
|
3383 /* |
|
ab89131d30e0
patch 8.0.1685: can't set ANSI colors of a terminal window
Christian Brabandt <cb@256bit.org>
parents:
13624
diff
changeset
|
3384 * 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
|
3385 */ |
|
ab89131d30e0
patch 8.0.1685: can't set ANSI colors of a terminal window
Christian Brabandt <cb@256bit.org>
parents:
13624
diff
changeset
|
3386 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
|
3387 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
|
3388 { |
|
ab89131d30e0
patch 8.0.1685: can't set ANSI colors of a terminal window
Christian Brabandt <cb@256bit.org>
parents:
13624
diff
changeset
|
3389 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
|
3390 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
|
3391 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
|
3392 |
|
ab89131d30e0
patch 8.0.1685: can't set ANSI colors of a terminal window
Christian Brabandt <cb@256bit.org>
parents:
13624
diff
changeset
|
3393 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
|
3394 { |
|
ab89131d30e0
patch 8.0.1685: can't set ANSI colors of a terminal window
Christian Brabandt <cb@256bit.org>
parents:
13624
diff
changeset
|
3395 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
|
3396 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
|
3397 |
|
ab89131d30e0
patch 8.0.1685: can't set ANSI colors of a terminal window
Christian Brabandt <cb@256bit.org>
parents:
13624
diff
changeset
|
3398 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
|
3399 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
|
3400 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
|
3401 |
|
ab89131d30e0
patch 8.0.1685: can't set ANSI colors of a terminal window
Christian Brabandt <cb@256bit.org>
parents:
13624
diff
changeset
|
3402 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
|
3403 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
|
3404 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
|
3405 |
|
ab89131d30e0
patch 8.0.1685: can't set ANSI colors of a terminal window
Christian Brabandt <cb@256bit.org>
parents:
13624
diff
changeset
|
3406 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
|
3407 } |
|
ab89131d30e0
patch 8.0.1685: can't set ANSI colors of a terminal window
Christian Brabandt <cb@256bit.org>
parents:
13624
diff
changeset
|
3408 |
|
ab89131d30e0
patch 8.0.1685: can't set ANSI colors of a terminal window
Christian Brabandt <cb@256bit.org>
parents:
13624
diff
changeset
|
3409 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
|
3410 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
|
3411 |
|
ab89131d30e0
patch 8.0.1685: can't set ANSI colors of a terminal window
Christian Brabandt <cb@256bit.org>
parents:
13624
diff
changeset
|
3412 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
|
3413 |
|
ab89131d30e0
patch 8.0.1685: can't set ANSI colors of a terminal window
Christian Brabandt <cb@256bit.org>
parents:
13624
diff
changeset
|
3414 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
|
3415 } |
|
ab89131d30e0
patch 8.0.1685: can't set ANSI colors of a terminal window
Christian Brabandt <cb@256bit.org>
parents:
13624
diff
changeset
|
3416 |
|
ab89131d30e0
patch 8.0.1685: can't set ANSI colors of a terminal window
Christian Brabandt <cb@256bit.org>
parents:
13624
diff
changeset
|
3417 /* |
|
ab89131d30e0
patch 8.0.1685: can't set ANSI colors of a terminal window
Christian Brabandt <cb@256bit.org>
parents:
13624
diff
changeset
|
3418 * 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
|
3419 */ |
|
ab89131d30e0
patch 8.0.1685: can't set ANSI colors of a terminal window
Christian Brabandt <cb@256bit.org>
parents:
13624
diff
changeset
|
3420 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
|
3421 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
|
3422 { |
|
ab89131d30e0
patch 8.0.1685: can't set ANSI colors of a terminal window
Christian Brabandt <cb@256bit.org>
parents:
13624
diff
changeset
|
3423 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
|
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 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
|
3426 && (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
|
3427 || 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
|
3428 || 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
|
3429 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
|
3430 } |
|
ab89131d30e0
patch 8.0.1685: can't set ANSI colors of a terminal window
Christian Brabandt <cb@256bit.org>
parents:
13624
diff
changeset
|
3431 #endif |
|
ab89131d30e0
patch 8.0.1685: can't set ANSI colors of a terminal window
Christian Brabandt <cb@256bit.org>
parents:
13624
diff
changeset
|
3432 |
|
13483
f7ef5d579758
patch 8.0.1615: term_dumpload() does not use the right colors
Christian Brabandt <cb@256bit.org>
parents:
13476
diff
changeset
|
3433 /* |
|
13535
e9ffb5b35266
patch 8.0.1641: job in terminal can't communicate with Vim
Christian Brabandt <cb@256bit.org>
parents:
13517
diff
changeset
|
3434 * 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
|
3435 * "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
|
3436 */ |
|
e9ffb5b35266
patch 8.0.1641: job in terminal can't communicate with Vim
Christian Brabandt <cb@256bit.org>
parents:
13517
diff
changeset
|
3437 static void |
|
e9ffb5b35266
patch 8.0.1641: job in terminal can't communicate with Vim
Christian Brabandt <cb@256bit.org>
parents:
13517
diff
changeset
|
3438 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
|
3439 { |
|
e9ffb5b35266
patch 8.0.1641: job in terminal can't communicate with Vim
Christian Brabandt <cb@256bit.org>
parents:
13517
diff
changeset
|
3440 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
|
3441 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
|
3442 int bufnr; |
|
e9ffb5b35266
patch 8.0.1641: job in terminal can't communicate with Vim
Christian Brabandt <cb@256bit.org>
parents:
13517
diff
changeset
|
3443 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
|
3444 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
|
3445 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
|
3446 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
|
3447 |
|
e9ffb5b35266
patch 8.0.1641: job in terminal can't communicate with Vim
Christian Brabandt <cb@256bit.org>
parents:
13517
diff
changeset
|
3448 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
|
3449 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
|
3450 { |
|
e9ffb5b35266
patch 8.0.1641: job in terminal can't communicate with Vim
Christian Brabandt <cb@256bit.org>
parents:
13517
diff
changeset
|
3451 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
|
3452 { |
|
e9ffb5b35266
patch 8.0.1641: job in terminal can't communicate with Vim
Christian Brabandt <cb@256bit.org>
parents:
13517
diff
changeset
|
3453 /* 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
|
3454 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
|
3455 return; |
|
e9ffb5b35266
patch 8.0.1641: job in terminal can't communicate with Vim
Christian Brabandt <cb@256bit.org>
parents:
13517
diff
changeset
|
3456 } |
|
e9ffb5b35266
patch 8.0.1641: job in terminal can't communicate with Vim
Christian Brabandt <cb@256bit.org>
parents:
13517
diff
changeset
|
3457 } |
|
e9ffb5b35266
patch 8.0.1641: job in terminal can't communicate with Vim
Christian Brabandt <cb@256bit.org>
parents:
13517
diff
changeset
|
3458 |
|
e9ffb5b35266
patch 8.0.1641: job in terminal can't communicate with Vim
Christian Brabandt <cb@256bit.org>
parents:
13517
diff
changeset
|
3459 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
|
3460 |
|
4df23d9bad47
patch 8.0.1660: the terminal API "drop" command doesn't support options
Christian Brabandt <cb@256bit.org>
parents:
13557
diff
changeset
|
3461 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
|
3462 && 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
|
3463 { |
|
4df23d9bad47
patch 8.0.1660: the terminal API "drop" command doesn't support options
Christian Brabandt <cb@256bit.org>
parents:
13557
diff
changeset
|
3464 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
|
3465 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
|
3466 |
|
4df23d9bad47
patch 8.0.1660: the terminal API "drop" command doesn't support options
Christian Brabandt <cb@256bit.org>
parents:
13557
diff
changeset
|
3467 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
|
3468 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
|
3469 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
|
3470 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
|
3471 { |
|
4df23d9bad47
patch 8.0.1660: the terminal API "drop" command doesn't support options
Christian Brabandt <cb@256bit.org>
parents:
13557
diff
changeset
|
3472 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
|
3473 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
|
3474 else |
|
4df23d9bad47
patch 8.0.1660: the terminal API "drop" command doesn't support options
Christian Brabandt <cb@256bit.org>
parents:
13557
diff
changeset
|
3475 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
|
3476 } |
|
4df23d9bad47
patch 8.0.1660: the terminal API "drop" command doesn't support options
Christian Brabandt <cb@256bit.org>
parents:
13557
diff
changeset
|
3477 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
|
3478 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
|
3479 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
|
3480 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
|
3481 { |
|
13583
200ef826e7dd
patch 8.0.1664: test failure because of not allocating enough space
Christian Brabandt <cb@256bit.org>
parents:
13579
diff
changeset
|
3482 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
|
3483 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
|
3484 { |
|
4df23d9bad47
patch 8.0.1660: the terminal API "drop" command doesn't support options
Christian Brabandt <cb@256bit.org>
parents:
13557
diff
changeset
|
3485 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
|
3486 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
|
3487 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
|
3488 } |
|
4df23d9bad47
patch 8.0.1660: the terminal API "drop" command doesn't support options
Christian Brabandt <cb@256bit.org>
parents:
13557
diff
changeset
|
3489 } |
|
4df23d9bad47
patch 8.0.1660: the terminal API "drop" command doesn't support options
Christian Brabandt <cb@256bit.org>
parents:
13557
diff
changeset
|
3490 |
|
4df23d9bad47
patch 8.0.1660: the terminal API "drop" command doesn't support options
Christian Brabandt <cb@256bit.org>
parents:
13557
diff
changeset
|
3491 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
|
3492 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
|
3493 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
|
3494 |
|
4df23d9bad47
patch 8.0.1660: the terminal API "drop" command doesn't support options
Christian Brabandt <cb@256bit.org>
parents:
13557
diff
changeset
|
3495 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
|
3496 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
|
3497 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
|
3498 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
|
3499 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
|
3500 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
|
3501 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
|
3502 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
|
3503 } |
|
4df23d9bad47
patch 8.0.1660: the terminal API "drop" command doesn't support options
Christian Brabandt <cb@256bit.org>
parents:
13557
diff
changeset
|
3504 |
|
4df23d9bad47
patch 8.0.1660: the terminal API "drop" command doesn't support options
Christian Brabandt <cb@256bit.org>
parents:
13557
diff
changeset
|
3505 /* 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
|
3506 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
|
3507 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
|
3508 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
|
3509 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
|
3510 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
|
3511 |
|
4df23d9bad47
patch 8.0.1660: the terminal API "drop" command doesn't support options
Christian Brabandt <cb@256bit.org>
parents:
13557
diff
changeset
|
3512 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
|
3513 } |
|
e9ffb5b35266
patch 8.0.1641: job in terminal can't communicate with Vim
Christian Brabandt <cb@256bit.org>
parents:
13517
diff
changeset
|
3514 |
|
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 * 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
|
3517 * "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
|
3518 */ |
|
e9ffb5b35266
patch 8.0.1641: job in terminal can't communicate with Vim
Christian Brabandt <cb@256bit.org>
parents:
13517
diff
changeset
|
3519 static void |
|
e9ffb5b35266
patch 8.0.1641: job in terminal can't communicate with Vim
Christian Brabandt <cb@256bit.org>
parents:
13517
diff
changeset
|
3520 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
|
3521 { |
|
e9ffb5b35266
patch 8.0.1641: job in terminal can't communicate with Vim
Christian Brabandt <cb@256bit.org>
parents:
13517
diff
changeset
|
3522 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
|
3523 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
|
3524 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
|
3525 int doesrange; |
|
e9ffb5b35266
patch 8.0.1641: job in terminal can't communicate with Vim
Christian Brabandt <cb@256bit.org>
parents:
13517
diff
changeset
|
3526 |
|
e9ffb5b35266
patch 8.0.1641: job in terminal can't communicate with Vim
Christian Brabandt <cb@256bit.org>
parents:
13517
diff
changeset
|
3527 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
|
3528 { |
|
e9ffb5b35266
patch 8.0.1641: job in terminal can't communicate with Vim
Christian Brabandt <cb@256bit.org>
parents:
13517
diff
changeset
|
3529 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
|
3530 return; |
|
e9ffb5b35266
patch 8.0.1641: job in terminal can't communicate with Vim
Christian Brabandt <cb@256bit.org>
parents:
13517
diff
changeset
|
3531 } |
|
e9ffb5b35266
patch 8.0.1641: job in terminal can't communicate with Vim
Christian Brabandt <cb@256bit.org>
parents:
13517
diff
changeset
|
3532 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
|
3533 |
|
13547
87a9c1be0ae3
patch 8.0.1647: terminal API may call any user function
Christian Brabandt <cb@256bit.org>
parents:
13535
diff
changeset
|
3534 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
|
3535 { |
|
e9ffb5b35266
patch 8.0.1641: job in terminal can't communicate with Vim
Christian Brabandt <cb@256bit.org>
parents:
13517
diff
changeset
|
3536 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
|
3537 return; |
|
e9ffb5b35266
patch 8.0.1641: job in terminal can't communicate with Vim
Christian Brabandt <cb@256bit.org>
parents:
13517
diff
changeset
|
3538 } |
|
e9ffb5b35266
patch 8.0.1641: job in terminal can't communicate with Vim
Christian Brabandt <cb@256bit.org>
parents:
13517
diff
changeset
|
3539 |
|
e9ffb5b35266
patch 8.0.1641: job in terminal can't communicate with Vim
Christian Brabandt <cb@256bit.org>
parents:
13517
diff
changeset
|
3540 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
|
3541 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
|
3542 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
|
3543 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
|
3544 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
|
3545 /* 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
|
3546 &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
|
3547 /* 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
|
3548 { |
|
e9ffb5b35266
patch 8.0.1641: job in terminal can't communicate with Vim
Christian Brabandt <cb@256bit.org>
parents:
13517
diff
changeset
|
3549 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
|
3550 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
|
3551 } |
|
e9ffb5b35266
patch 8.0.1641: job in terminal can't communicate with Vim
Christian Brabandt <cb@256bit.org>
parents:
13517
diff
changeset
|
3552 else |
|
e9ffb5b35266
patch 8.0.1641: job in terminal can't communicate with Vim
Christian Brabandt <cb@256bit.org>
parents:
13517
diff
changeset
|
3553 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
|
3554 } |
|
e9ffb5b35266
patch 8.0.1641: job in terminal can't communicate with Vim
Christian Brabandt <cb@256bit.org>
parents:
13517
diff
changeset
|
3555 |
|
e9ffb5b35266
patch 8.0.1641: job in terminal can't communicate with Vim
Christian Brabandt <cb@256bit.org>
parents:
13517
diff
changeset
|
3556 /* |
|
e9ffb5b35266
patch 8.0.1641: job in terminal can't communicate with Vim
Christian Brabandt <cb@256bit.org>
parents:
13517
diff
changeset
|
3557 * 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
|
3558 * 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
|
3559 */ |
|
e9ffb5b35266
patch 8.0.1641: job in terminal can't communicate with Vim
Christian Brabandt <cb@256bit.org>
parents:
13517
diff
changeset
|
3560 static int |
|
e9ffb5b35266
patch 8.0.1641: job in terminal can't communicate with Vim
Christian Brabandt <cb@256bit.org>
parents:
13517
diff
changeset
|
3561 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
|
3562 { |
|
e9ffb5b35266
patch 8.0.1641: job in terminal can't communicate with Vim
Christian Brabandt <cb@256bit.org>
parents:
13517
diff
changeset
|
3563 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
|
3564 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
|
3565 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
|
3566 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
|
3567 : 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
|
3568 |
|
e9ffb5b35266
patch 8.0.1641: job in terminal can't communicate with Vim
Christian Brabandt <cb@256bit.org>
parents:
13517
diff
changeset
|
3569 /* 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
|
3570 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
|
3571 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
|
3572 |
|
13577
4cb743db55b3
patch 8.0.1661: warnings from 64 bit compiler
Christian Brabandt <cb@256bit.org>
parents:
13575
diff
changeset
|
3573 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
|
3574 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
|
3575 return 1; |
|
e9ffb5b35266
patch 8.0.1641: job in terminal can't communicate with Vim
Christian Brabandt <cb@256bit.org>
parents:
13517
diff
changeset
|
3576 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
|
3577 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
|
3578 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
|
3579 && 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
|
3580 && 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
|
3581 { |
|
e9ffb5b35266
patch 8.0.1641: job in terminal can't communicate with Vim
Christian Brabandt <cb@256bit.org>
parents:
13517
diff
changeset
|
3582 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
|
3583 |
|
e9ffb5b35266
patch 8.0.1641: job in terminal can't communicate with Vim
Christian Brabandt <cb@256bit.org>
parents:
13517
diff
changeset
|
3584 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
|
3585 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
|
3586 else |
|
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 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
|
3589 |
|
13720
7d2039b2ecc8
patch 8.0.1732: crash when terminal API call deletes the buffer
Christian Brabandt <cb@256bit.org>
parents:
13700
diff
changeset
|
3590 /* 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
|
3591 * 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
|
3592 ++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
|
3593 |
|
13535
e9ffb5b35266
patch 8.0.1641: job in terminal can't communicate with Vim
Christian Brabandt <cb@256bit.org>
parents:
13517
diff
changeset
|
3594 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
|
3595 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
|
3596 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
|
3597 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
|
3598 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
|
3599 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
|
3600 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
|
3601 else |
|
e9ffb5b35266
patch 8.0.1641: job in terminal can't communicate with Vim
Christian Brabandt <cb@256bit.org>
parents:
13517
diff
changeset
|
3602 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
|
3603 --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
|
3604 } |
|
e9ffb5b35266
patch 8.0.1641: job in terminal can't communicate with Vim
Christian Brabandt <cb@256bit.org>
parents:
13517
diff
changeset
|
3605 } |
|
e9ffb5b35266
patch 8.0.1641: job in terminal can't communicate with Vim
Christian Brabandt <cb@256bit.org>
parents:
13517
diff
changeset
|
3606 else |
|
e9ffb5b35266
patch 8.0.1641: job in terminal can't communicate with Vim
Christian Brabandt <cb@256bit.org>
parents:
13517
diff
changeset
|
3607 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
|
3608 |
|
e9ffb5b35266
patch 8.0.1641: job in terminal can't communicate with Vim
Christian Brabandt <cb@256bit.org>
parents:
13517
diff
changeset
|
3609 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
|
3610 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
|
3611 return 1; |
|
e9ffb5b35266
patch 8.0.1641: job in terminal can't communicate with Vim
Christian Brabandt <cb@256bit.org>
parents:
13517
diff
changeset
|
3612 } |
|
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 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
|
3615 NULL, /* text */ |
|
e9ffb5b35266
patch 8.0.1641: job in terminal can't communicate with Vim
Christian Brabandt <cb@256bit.org>
parents:
13517
diff
changeset
|
3616 NULL, /* control */ |
|
e9ffb5b35266
patch 8.0.1641: job in terminal can't communicate with Vim
Christian Brabandt <cb@256bit.org>
parents:
13517
diff
changeset
|
3617 NULL, /* escape */ |
|
e9ffb5b35266
patch 8.0.1641: job in terminal can't communicate with Vim
Christian Brabandt <cb@256bit.org>
parents:
13517
diff
changeset
|
3618 NULL, /* csi */ |
|
e9ffb5b35266
patch 8.0.1641: job in terminal can't communicate with Vim
Christian Brabandt <cb@256bit.org>
parents:
13517
diff
changeset
|
3619 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
|
3620 NULL, /* dcs */ |
|
e9ffb5b35266
patch 8.0.1641: job in terminal can't communicate with Vim
Christian Brabandt <cb@256bit.org>
parents:
13517
diff
changeset
|
3621 NULL /* resize */ |
|
e9ffb5b35266
patch 8.0.1641: job in terminal can't communicate with Vim
Christian Brabandt <cb@256bit.org>
parents:
13517
diff
changeset
|
3622 }; |
|
e9ffb5b35266
patch 8.0.1641: job in terminal can't communicate with Vim
Christian Brabandt <cb@256bit.org>
parents:
13517
diff
changeset
|
3623 |
|
e9ffb5b35266
patch 8.0.1641: job in terminal can't communicate with Vim
Christian Brabandt <cb@256bit.org>
parents:
13517
diff
changeset
|
3624 /* |
|
13616
b6998c6374e1
patch 8.0.1680: memory allocated by libvterm is not profiled
Christian Brabandt <cb@256bit.org>
parents:
13583
diff
changeset
|
3625 * 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
|
3626 */ |
|
b6998c6374e1
patch 8.0.1680: memory allocated by libvterm is not profiled
Christian Brabandt <cb@256bit.org>
parents:
13583
diff
changeset
|
3627 static void * |
|
b6998c6374e1
patch 8.0.1680: memory allocated by libvterm is not profiled
Christian Brabandt <cb@256bit.org>
parents:
13583
diff
changeset
|
3628 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
|
3629 { |
|
13630
fd3389d64825
patch 8.0.1687: 64 bit compiler warnings
Christian Brabandt <cb@256bit.org>
parents:
13626
diff
changeset
|
3630 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
|
3631 } |
|
b6998c6374e1
patch 8.0.1680: memory allocated by libvterm is not profiled
Christian Brabandt <cb@256bit.org>
parents:
13583
diff
changeset
|
3632 |
|
b6998c6374e1
patch 8.0.1680: memory allocated by libvterm is not profiled
Christian Brabandt <cb@256bit.org>
parents:
13583
diff
changeset
|
3633 static void |
|
b6998c6374e1
patch 8.0.1680: memory allocated by libvterm is not profiled
Christian Brabandt <cb@256bit.org>
parents:
13583
diff
changeset
|
3634 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
|
3635 { |
|
b6998c6374e1
patch 8.0.1680: memory allocated by libvterm is not profiled
Christian Brabandt <cb@256bit.org>
parents:
13583
diff
changeset
|
3636 vim_free(ptr); |
|
b6998c6374e1
patch 8.0.1680: memory allocated by libvterm is not profiled
Christian Brabandt <cb@256bit.org>
parents:
13583
diff
changeset
|
3637 } |
|
b6998c6374e1
patch 8.0.1680: memory allocated by libvterm is not profiled
Christian Brabandt <cb@256bit.org>
parents:
13583
diff
changeset
|
3638 |
|
b6998c6374e1
patch 8.0.1680: memory allocated by libvterm is not profiled
Christian Brabandt <cb@256bit.org>
parents:
13583
diff
changeset
|
3639 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
|
3640 &vterm_malloc, |
|
b6998c6374e1
patch 8.0.1680: memory allocated by libvterm is not profiled
Christian Brabandt <cb@256bit.org>
parents:
13583
diff
changeset
|
3641 &vterm_memfree |
|
b6998c6374e1
patch 8.0.1680: memory allocated by libvterm is not profiled
Christian Brabandt <cb@256bit.org>
parents:
13583
diff
changeset
|
3642 }; |
|
b6998c6374e1
patch 8.0.1680: memory allocated by libvterm is not profiled
Christian Brabandt <cb@256bit.org>
parents:
13583
diff
changeset
|
3643 |
|
b6998c6374e1
patch 8.0.1680: memory allocated by libvterm is not profiled
Christian Brabandt <cb@256bit.org>
parents:
13583
diff
changeset
|
3644 /* |
|
13483
f7ef5d579758
patch 8.0.1615: term_dumpload() does not use the right colors
Christian Brabandt <cb@256bit.org>
parents:
13476
diff
changeset
|
3645 * 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
|
3646 */ |
|
f7ef5d579758
patch 8.0.1615: term_dumpload() does not use the right colors
Christian Brabandt <cb@256bit.org>
parents:
13476
diff
changeset
|
3647 static void |
|
f7ef5d579758
patch 8.0.1615: term_dumpload() does not use the right colors
Christian Brabandt <cb@256bit.org>
parents:
13476
diff
changeset
|
3648 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
|
3649 { |
|
f7ef5d579758
patch 8.0.1615: term_dumpload() does not use the right colors
Christian Brabandt <cb@256bit.org>
parents:
13476
diff
changeset
|
3650 VTerm *vterm; |
|
f7ef5d579758
patch 8.0.1615: term_dumpload() does not use the right colors
Christian Brabandt <cb@256bit.org>
parents:
13476
diff
changeset
|
3651 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
|
3652 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
|
3653 VTermValue value; |
|
f7ef5d579758
patch 8.0.1615: term_dumpload() does not use the right colors
Christian Brabandt <cb@256bit.org>
parents:
13476
diff
changeset
|
3654 |
|
13616
b6998c6374e1
patch 8.0.1680: memory allocated by libvterm is not profiled
Christian Brabandt <cb@256bit.org>
parents:
13583
diff
changeset
|
3655 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
|
3656 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
|
3657 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
|
3658 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
|
3659 /* 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
|
3660 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
|
3661 |
|
f7ef5d579758
patch 8.0.1615: term_dumpload() does not use the right colors
Christian Brabandt <cb@256bit.org>
parents:
13476
diff
changeset
|
3662 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
|
3663 |
|
f7ef5d579758
patch 8.0.1615: term_dumpload() does not use the right colors
Christian Brabandt <cb@256bit.org>
parents:
13476
diff
changeset
|
3664 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
|
3665 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
|
3666 &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
|
3667 &term->tl_default_color.bg); |
| 12502 | 3668 |
|
13626
ab89131d30e0
patch 8.0.1685: can't set ANSI colors of a terminal window
Christian Brabandt <cb@256bit.org>
parents:
13624
diff
changeset
|
3669 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
|
3670 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
|
3671 |
| 12502 | 3672 /* Required to initialize most things. */ |
| 3673 vterm_screen_reset(screen, 1 /* hard */); | |
| 3674 | |
| 3675 /* Allow using alternate screen. */ | |
| 3676 vterm_screen_enable_altscreen(screen, 1); | |
| 3677 | |
| 3678 /* For unix do not use a blinking cursor. In an xterm this causes the | |
| 3679 * cursor to blink if it's blinking in the xterm. | |
| 3680 * For Windows we respect the system wide setting. */ | |
| 3681 #ifdef WIN3264 | |
| 3682 if (GetCaretBlinkTime() == INFINITE) | |
| 3683 value.boolean = 0; | |
| 3684 else | |
| 3685 value.boolean = 1; | |
| 3686 #else | |
| 3687 value.boolean = 0; | |
| 3688 #endif | |
|
13535
e9ffb5b35266
patch 8.0.1641: job in terminal can't communicate with Vim
Christian Brabandt <cb@256bit.org>
parents:
13517
diff
changeset
|
3689 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
|
3690 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
|
3691 vterm_state_set_unrecognised_fallbacks(state, &parser_fallbacks, term); |
| 12502 | 3692 } |
| 3693 | |
| 3694 /* | |
| 3695 * Return the text to show for the buffer name and status. | |
| 3696 */ | |
| 3697 char_u * | |
| 3698 term_get_status_text(term_T *term) | |
| 3699 { | |
| 3700 if (term->tl_status_text == NULL) | |
| 3701 { | |
| 3702 char_u *txt; | |
| 3703 size_t len; | |
| 3704 | |
| 3705 if (term->tl_normal_mode) | |
| 3706 { | |
| 3707 if (term_job_running(term)) | |
| 3708 txt = (char_u *)_("Terminal"); | |
| 3709 else | |
| 3710 txt = (char_u *)_("Terminal-finished"); | |
| 3711 } | |
| 3712 else if (term->tl_title != NULL) | |
| 3713 txt = term->tl_title; | |
| 3714 else if (term_none_open(term)) | |
| 3715 txt = (char_u *)_("active"); | |
| 3716 else if (term_job_running(term)) | |
| 3717 txt = (char_u *)_("running"); | |
| 3718 else | |
| 3719 txt = (char_u *)_("finished"); | |
| 3720 len = 9 + STRLEN(term->tl_buffer->b_fname) + STRLEN(txt); | |
| 3721 term->tl_status_text = alloc((int)len); | |
| 3722 if (term->tl_status_text != NULL) | |
| 3723 vim_snprintf((char *)term->tl_status_text, len, "%s [%s]", | |
| 3724 term->tl_buffer->b_fname, txt); | |
| 3725 } | |
| 3726 return term->tl_status_text; | |
| 3727 } | |
| 3728 | |
| 3729 /* | |
| 3730 * Mark references in jobs of terminals. | |
| 3731 */ | |
| 3732 int | |
| 3733 set_ref_in_term(int copyID) | |
| 3734 { | |
| 3735 int abort = FALSE; | |
| 3736 term_T *term; | |
| 3737 typval_T tv; | |
| 3738 | |
| 3739 for (term = first_term; term != NULL; term = term->tl_next) | |
| 3740 if (term->tl_job != NULL) | |
| 3741 { | |
| 3742 tv.v_type = VAR_JOB; | |
| 3743 tv.vval.v_job = term->tl_job; | |
| 3744 abort = abort || set_ref_in_item(&tv, copyID, NULL, NULL); | |
| 3745 } | |
| 3746 return abort; | |
| 3747 } | |
| 3748 | |
| 3749 /* | |
|
12973
418941f0df08
patch 8.0.1362: terminal window colors wrong when using Terminal highlighting
Christian Brabandt <cb@256bit.org>
parents:
12969
diff
changeset
|
3750 * 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
|
3751 */ |
|
418941f0df08
patch 8.0.1362: terminal window colors wrong when using Terminal highlighting
Christian Brabandt <cb@256bit.org>
parents:
12969
diff
changeset
|
3752 void |
|
418941f0df08
patch 8.0.1362: terminal window colors wrong when using Terminal highlighting
Christian Brabandt <cb@256bit.org>
parents:
12969
diff
changeset
|
3753 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
|
3754 { |
|
418941f0df08
patch 8.0.1362: terminal window colors wrong when using Terminal highlighting
Christian Brabandt <cb@256bit.org>
parents:
12969
diff
changeset
|
3755 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
|
3756 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
|
3757 } |
|
418941f0df08
patch 8.0.1362: terminal window colors wrong when using Terminal highlighting
Christian Brabandt <cb@256bit.org>
parents:
12969
diff
changeset
|
3758 |
|
418941f0df08
patch 8.0.1362: terminal window colors wrong when using Terminal highlighting
Christian Brabandt <cb@256bit.org>
parents:
12969
diff
changeset
|
3759 /* |
| 12502 | 3760 * 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
|
3761 * 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
|
3762 * with "where". |
| 12502 | 3763 */ |
| 3764 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
|
3765 term_get_buf(typval_T *argvars, char *where) |
| 12502 | 3766 { |
| 3767 buf_T *buf; | |
| 3768 | |
| 3769 (void)get_tv_number(&argvars[0]); /* issue errmsg if type error */ | |
| 3770 ++emsg_off; | |
| 3771 buf = get_buf_tv(&argvars[0], FALSE); | |
| 3772 --emsg_off; | |
| 3773 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
|
3774 { |
|
33eea5ce5415
patch 8.0.1593: :qall never exits with an active terminal window
Christian Brabandt <cb@256bit.org>
parents:
13435
diff
changeset
|
3775 ch_log(NULL, "%s: invalid buffer argument", where); |
| 12502 | 3776 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
|
3777 } |
| 12502 | 3778 return buf; |
| 3779 } | |
| 3780 | |
|
13298
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
3781 static int |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
3782 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
|
3783 { |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
3784 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
|
3785 && a->green == b->green |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
3786 && a->blue == b->blue |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
3787 && 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
|
3788 } |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
3789 |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
3790 static void |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
3791 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
|
3792 { |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
3793 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
|
3794 (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
|
3795 (int)color->ansi_index); |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
3796 } |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
3797 |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
3798 /* |
|
13329
424321d6eea7
patch 8.0.1539: no test for the popup menu positioning
Christian Brabandt <cb@256bit.org>
parents:
13304
diff
changeset
|
3799 * "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
|
3800 * |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
3801 * 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
|
3802 * |{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
|
3803 * {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
|
3804 * 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
|
3805 * skipped. |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
3806 * {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
|
3807 * 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
|
3808 * {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
|
3809 * {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
|
3810 * {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
|
3811 * |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
3812 * 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
|
3813 * |{characters} |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
3814 * |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
3815 * 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
|
3816 * |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
3817 * 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
|
3818 * @{count} |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
3819 */ |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
3820 void |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
3821 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
|
3822 { |
|
13438
33eea5ce5415
patch 8.0.1593: :qall never exits with an active terminal window
Christian Brabandt <cb@256bit.org>
parents:
13435
diff
changeset
|
3823 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
|
3824 term_T *term; |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
3825 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
|
3826 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
|
3827 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
|
3828 stat_T st; |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
3829 FILE *fd; |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
3830 VTermPos pos; |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
3831 VTermScreen *screen; |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
3832 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
|
3833 VTermState *state; |
|
73325d39591a
patch 8.0.1542: terminal screen dump does not include cursor position
Christian Brabandt <cb@256bit.org>
parents:
13329
diff
changeset
|
3834 VTermPos cursor_pos; |
|
13298
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
3835 |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
3836 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
|
3837 return; |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
3838 if (buf == NULL) |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
3839 return; |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
3840 term = buf->b_term; |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
3841 |
|
13329
424321d6eea7
patch 8.0.1539: no test for the popup menu positioning
Christian Brabandt <cb@256bit.org>
parents:
13304
diff
changeset
|
3842 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
|
3843 { |
|
424321d6eea7
patch 8.0.1539: no test for the popup menu positioning
Christian Brabandt <cb@256bit.org>
parents:
13304
diff
changeset
|
3844 dict_T *d; |
|
424321d6eea7
patch 8.0.1539: no test for the popup menu positioning
Christian Brabandt <cb@256bit.org>
parents:
13304
diff
changeset
|
3845 |
|
424321d6eea7
patch 8.0.1539: no test for the popup menu positioning
Christian Brabandt <cb@256bit.org>
parents:
13304
diff
changeset
|
3846 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
|
3847 { |
|
424321d6eea7
patch 8.0.1539: no test for the popup menu positioning
Christian Brabandt <cb@256bit.org>
parents:
13304
diff
changeset
|
3848 EMSG(_(e_dictreq)); |
|
424321d6eea7
patch 8.0.1539: no test for the popup menu positioning
Christian Brabandt <cb@256bit.org>
parents:
13304
diff
changeset
|
3849 return; |
|
424321d6eea7
patch 8.0.1539: no test for the popup menu positioning
Christian Brabandt <cb@256bit.org>
parents:
13304
diff
changeset
|
3850 } |
|
424321d6eea7
patch 8.0.1539: no test for the popup menu positioning
Christian Brabandt <cb@256bit.org>
parents:
13304
diff
changeset
|
3851 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
|
3852 if (d != NULL) |
|
424321d6eea7
patch 8.0.1539: no test for the popup menu positioning
Christian Brabandt <cb@256bit.org>
parents:
13304
diff
changeset
|
3853 { |
|
424321d6eea7
patch 8.0.1539: no test for the popup menu positioning
Christian Brabandt <cb@256bit.org>
parents:
13304
diff
changeset
|
3854 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
|
3855 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
|
3856 } |
|
424321d6eea7
patch 8.0.1539: no test for the popup menu positioning
Christian Brabandt <cb@256bit.org>
parents:
13304
diff
changeset
|
3857 } |
|
424321d6eea7
patch 8.0.1539: no test for the popup menu positioning
Christian Brabandt <cb@256bit.org>
parents:
13304
diff
changeset
|
3858 |
|
13298
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
3859 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
|
3860 if (fname == NULL) |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
3861 return; |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
3862 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
|
3863 { |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
3864 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
|
3865 return; |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
3866 } |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
3867 |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
3868 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
|
3869 { |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
3870 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
|
3871 return; |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
3872 } |
|
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 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
|
3875 |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
3876 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
|
3877 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
|
3878 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
|
3879 |
|
13329
424321d6eea7
patch 8.0.1539: no test for the popup menu positioning
Christian Brabandt <cb@256bit.org>
parents:
13304
diff
changeset
|
3880 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
|
3881 && 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
|
3882 { |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
3883 int repeat = 0; |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
3884 |
|
13329
424321d6eea7
patch 8.0.1539: no test for the popup menu positioning
Christian Brabandt <cb@256bit.org>
parents:
13304
diff
changeset
|
3885 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
|
3886 && 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
|
3887 { |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
3888 VTermScreenCell cell; |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
3889 int same_attr; |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
3890 int same_chars = TRUE; |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
3891 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
|
3892 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
|
3893 && 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
|
3894 |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
3895 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
|
3896 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
|
3897 |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
3898 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
|
3899 { |
|
13517
d0d66898e98b
patch 8.0.1632: in a terminal dump NUL and space are different
Christian Brabandt <cb@256bit.org>
parents:
13505
diff
changeset
|
3900 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
|
3901 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
|
3902 |
|
d0d66898e98b
patch 8.0.1632: in a terminal dump NUL and space are different
Christian Brabandt <cb@256bit.org>
parents:
13505
diff
changeset
|
3903 /* 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
|
3904 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
|
3905 { |
|
d0d66898e98b
patch 8.0.1632: in a terminal dump NUL and space are different
Christian Brabandt <cb@256bit.org>
parents:
13505
diff
changeset
|
3906 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
|
3907 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
|
3908 } |
|
13298
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
3909 if (cell.chars[i] != prev_cell.chars[i]) |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
3910 same_chars = FALSE; |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
3911 if (cell.chars[i] == NUL || prev_cell.chars[i] == NUL) |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
3912 break; |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
3913 } |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
3914 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
|
3915 == vtermAttr2hl(prev_cell.attrs) |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
3916 && 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
|
3917 && 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
|
3918 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
|
3919 && !is_cursor_pos) |
|
13298
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
3920 { |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
3921 ++repeat; |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
3922 } |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
3923 else |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
3924 { |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
3925 if (repeat > 0) |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
3926 { |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
3927 fprintf(fd, "@%d", repeat); |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
3928 repeat = 0; |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
3929 } |
|
13335
73325d39591a
patch 8.0.1542: terminal screen dump does not include cursor position
Christian Brabandt <cb@256bit.org>
parents:
13329
diff
changeset
|
3930 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
|
3931 |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
3932 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
|
3933 fputs(" ", fd); |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
3934 else |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
3935 { |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
3936 char_u charbuf[10]; |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
3937 int len; |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
3938 |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
3939 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
|
3940 && 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
|
3941 { |
|
13557
4911058c43eb
patch 8.0.1652: term_dumpwrite() does not output composing characters
Christian Brabandt <cb@256bit.org>
parents:
13547
diff
changeset
|
3942 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
|
3943 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
|
3944 } |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
3945 } |
|
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 /* 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
|
3948 * 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
|
3949 * attributes. */ |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
3950 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
|
3951 { |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
3952 if (cell.width == 2) |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
3953 { |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
3954 fputs("*", fd); |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
3955 ++pos.col; |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
3956 } |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
3957 else |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
3958 fputs("+", fd); |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
3959 |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
3960 if (same_attr) |
|
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 fputs("&", fd); |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
3963 } |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
3964 else |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
3965 { |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
3966 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
|
3967 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
|
3968 fputs("&", fd); |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
3969 else |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
3970 { |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
3971 fputs("#", fd); |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
3972 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
|
3973 } |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
3974 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
|
3975 fputs("&", fd); |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
3976 else |
|
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 fputs("#", fd); |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
3979 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
|
3980 } |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
3981 } |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
3982 } |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
3983 |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
3984 prev_cell = cell; |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
3985 } |
|
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 if (repeat > 0) |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
3988 fprintf(fd, "@%d", repeat); |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
3989 fputs("\n", fd); |
|
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 |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
3992 fclose(fd); |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
3993 } |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
3994 |
|
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 * 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
|
3997 */ |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
3998 static void |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
3999 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
|
4000 { |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4001 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
|
4002 } |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4003 |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4004 static void |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4005 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
|
4006 { |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4007 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
|
4008 { |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4009 *(((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
|
4010 ++gap->ga_len; |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4011 } |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4012 } |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4013 |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4014 /* |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4015 * 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
|
4016 * 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
|
4017 */ |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4018 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
|
4019 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
|
4020 { |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4021 int c; |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4022 garray_T ga_text; |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4023 garray_T ga_cell; |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4024 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
|
4025 int attr = 0; |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4026 cellattr_T cell; |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4027 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
|
4028 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
|
4029 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
|
4030 |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4031 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
|
4032 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
|
4033 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
|
4034 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
|
4035 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
|
4036 |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4037 c = fgetc(fd); |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4038 for (;;) |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4039 { |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4040 if (c == EOF) |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4041 break; |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4042 if (c == '\n') |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4043 { |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4044 /* 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
|
4045 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
|
4046 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
|
4047 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
|
4048 { |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4049 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
|
4050 + 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
|
4051 |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4052 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
|
4053 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
|
4054 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
|
4055 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
|
4056 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
|
4057 ++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
|
4058 ga_init(&ga_cell); |
|
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 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
|
4061 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
|
4062 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
|
4063 } |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4064 else |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4065 ga_clear(&ga_cell); |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4066 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
|
4067 |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4068 c = fgetc(fd); |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4069 } |
|
13335
73325d39591a
patch 8.0.1542: terminal screen dump does not include cursor position
Christian Brabandt <cb@256bit.org>
parents:
13329
diff
changeset
|
4070 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
|
4071 { |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4072 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
|
4073 |
|
13335
73325d39591a
patch 8.0.1542: terminal screen dump does not include cursor position
Christian Brabandt <cb@256bit.org>
parents:
13329
diff
changeset
|
4074 if (c == '>') |
|
73325d39591a
patch 8.0.1542: terminal screen dump does not include cursor position
Christian Brabandt <cb@256bit.org>
parents:
13329
diff
changeset
|
4075 { |
|
73325d39591a
patch 8.0.1542: terminal screen dump does not include cursor position
Christian Brabandt <cb@256bit.org>
parents:
13329
diff
changeset
|
4076 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
|
4077 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
|
4078 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
|
4079 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
|
4080 } |
|
73325d39591a
patch 8.0.1542: terminal screen dump does not include cursor position
Christian Brabandt <cb@256bit.org>
parents:
13329
diff
changeset
|
4081 |
|
13298
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4082 /* 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
|
4083 c = fgetc(fd); |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4084 if (c != EOF) |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4085 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
|
4086 for (;;) |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4087 { |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4088 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
|
4089 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
|
4090 || c == EOF || c == '\n') |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4091 break; |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4092 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
|
4093 } |
|
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 /* 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
|
4096 vim_free(prev_char); |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4097 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
|
4098 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
|
4099 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
|
4100 |
|
13335
73325d39591a
patch 8.0.1542: terminal screen dump does not include cursor position
Christian Brabandt <cb@256bit.org>
parents:
13329
diff
changeset
|
4101 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
|
4102 { |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4103 /* 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
|
4104 } |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4105 else if (c == '+' || c == '*') |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4106 { |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4107 int is_bg; |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4108 |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4109 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
|
4110 |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4111 c = fgetc(fd); |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4112 if (c == '&') |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4113 { |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4114 /* 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
|
4115 c = fgetc(fd); |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4116 } |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4117 else if (isdigit(c)) |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4118 { |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4119 /* get the decimal attribute */ |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4120 attr = 0; |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4121 while (isdigit(c)) |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4122 { |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4123 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
|
4124 c = fgetc(fd); |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4125 } |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4126 hl2vtermAttr(attr, &cell); |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4127 } |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4128 else |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4129 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
|
4130 |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4131 /* 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
|
4132 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
|
4133 { |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4134 if (c == '&') |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4135 { |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4136 /* 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
|
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 } |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4139 else if (c == '#') |
|
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 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
|
4142 |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4143 c = fgetc(fd); |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4144 red = hex2nr(c); |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4145 c = fgetc(fd); |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4146 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
|
4147 c = fgetc(fd); |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4148 green = hex2nr(c); |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4149 c = fgetc(fd); |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4150 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
|
4151 c = fgetc(fd); |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4152 blue = hex2nr(c); |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4153 c = fgetc(fd); |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4154 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
|
4155 c = fgetc(fd); |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4156 if (!isdigit(c)) |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4157 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
|
4158 while (isdigit(c)) |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4159 { |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4160 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
|
4161 c = fgetc(fd); |
|
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 if (is_bg) |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4165 { |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4166 cell.bg.red = red; |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4167 cell.bg.green = green; |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4168 cell.bg.blue = blue; |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4169 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
|
4170 } |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4171 else |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4172 { |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4173 cell.fg.red = red; |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4174 cell.fg.green = green; |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4175 cell.fg.blue = blue; |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4176 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
|
4177 } |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4178 } |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4179 else |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4180 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
|
4181 } |
|
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 else |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4184 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
|
4185 |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4186 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
|
4187 } |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4188 else if (c == '@') |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4189 { |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4190 if (prev_char == NULL) |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4191 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
|
4192 else |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4193 { |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4194 int count = 0; |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4195 |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4196 /* 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
|
4197 for (;;) |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4198 { |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4199 c = fgetc(fd); |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4200 if (!isdigit(c)) |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4201 break; |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4202 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
|
4203 } |
|
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 while (count-- > 0) |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4206 { |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4207 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
|
4208 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
|
4209 } |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4210 } |
|
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 else |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4213 { |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4214 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
|
4215 c = fgetc(fd); |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4216 } |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4217 } |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4218 |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4219 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
|
4220 { |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4221 /* 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
|
4222 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
|
4223 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
|
4224 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
|
4225 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
|
4226 } |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4227 |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4228 ga_clear(&ga_text); |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4229 vim_free(prev_char); |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4230 |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4231 return max_cells; |
|
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 |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4234 /* |
|
13579
486ad9fd9038
patch 8.0.1662: showing dump diff doesn't mention both file names
Christian Brabandt <cb@256bit.org>
parents:
13577
diff
changeset
|
4235 * 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
|
4236 * "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
|
4237 */ |
|
486ad9fd9038
patch 8.0.1662: showing dump diff doesn't mention both file names
Christian Brabandt <cb@256bit.org>
parents:
13577
diff
changeset
|
4238 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
|
4239 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
|
4240 { |
|
486ad9fd9038
patch 8.0.1662: showing dump diff doesn't mention both file names
Christian Brabandt <cb@256bit.org>
parents:
13577
diff
changeset
|
4241 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
|
4242 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
|
4243 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
|
4244 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
|
4245 int i; |
|
13630
fd3389d64825
patch 8.0.1687: 64 bit compiler warnings
Christian Brabandt <cb@256bit.org>
parents:
13626
diff
changeset
|
4246 size_t off; |
|
fd3389d64825
patch 8.0.1687: 64 bit compiler warnings
Christian Brabandt <cb@256bit.org>
parents:
13626
diff
changeset
|
4247 |
|
fd3389d64825
patch 8.0.1687: 64 bit compiler warnings
Christian Brabandt <cb@256bit.org>
parents:
13626
diff
changeset
|
4248 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
|
4249 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
|
4250 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
|
4251 |
|
486ad9fd9038
patch 8.0.1662: showing dump diff doesn't mention both file names
Christian Brabandt <cb@256bit.org>
parents:
13577
diff
changeset
|
4252 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
|
4253 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
|
4254 { |
|
486ad9fd9038
patch 8.0.1662: showing dump diff doesn't mention both file names
Christian Brabandt <cb@256bit.org>
parents:
13577
diff
changeset
|
4255 /* 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
|
4256 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
|
4257 } |
|
486ad9fd9038
patch 8.0.1662: showing dump diff doesn't mention both file names
Christian Brabandt <cb@256bit.org>
parents:
13577
diff
changeset
|
4258 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
|
4259 { |
|
486ad9fd9038
patch 8.0.1662: showing dump diff doesn't mention both file names
Christian Brabandt <cb@256bit.org>
parents:
13577
diff
changeset
|
4260 /* 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
|
4261 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
|
4262 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
|
4263 } |
|
486ad9fd9038
patch 8.0.1662: showing dump diff doesn't mention both file names
Christian Brabandt <cb@256bit.org>
parents:
13577
diff
changeset
|
4264 /* 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
|
4265 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
|
4266 { |
|
486ad9fd9038
patch 8.0.1662: showing dump diff doesn't mention both file names
Christian Brabandt <cb@256bit.org>
parents:
13577
diff
changeset
|
4267 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
|
4268 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
|
4269 } |
|
486ad9fd9038
patch 8.0.1662: showing dump diff doesn't mention both file names
Christian Brabandt <cb@256bit.org>
parents:
13577
diff
changeset
|
4270 |
|
486ad9fd9038
patch 8.0.1662: showing dump diff doesn't mention both file names
Christian Brabandt <cb@256bit.org>
parents:
13577
diff
changeset
|
4271 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
|
4272 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
|
4273 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
|
4274 |
|
486ad9fd9038
patch 8.0.1662: showing dump diff doesn't mention both file names
Christian Brabandt <cb@256bit.org>
parents:
13577
diff
changeset
|
4275 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
|
4276 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
|
4277 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
|
4278 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
|
4279 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
|
4280 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
|
4281 |
|
486ad9fd9038
patch 8.0.1662: showing dump diff doesn't mention both file names
Christian Brabandt <cb@256bit.org>
parents:
13577
diff
changeset
|
4282 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
|
4283 } |
|
486ad9fd9038
patch 8.0.1662: showing dump diff doesn't mention both file names
Christian Brabandt <cb@256bit.org>
parents:
13577
diff
changeset
|
4284 |
|
486ad9fd9038
patch 8.0.1662: showing dump diff doesn't mention both file names
Christian Brabandt <cb@256bit.org>
parents:
13577
diff
changeset
|
4285 /* |
|
13298
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4286 * 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
|
4287 */ |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4288 static void |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4289 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
|
4290 { |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4291 jobopt_T opt; |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4292 buf_T *buf; |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4293 char_u buf1[NUMBUFLEN]; |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4294 char_u buf2[NUMBUFLEN]; |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4295 char_u *fname1; |
|
13300
803294329951
patch 8.0.1524: compiler warnings for uninitialized variables
Christian Brabandt <cb@256bit.org>
parents:
13298
diff
changeset
|
4296 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
|
4297 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
|
4298 FILE *fd1; |
|
13300
803294329951
patch 8.0.1524: compiler warnings for uninitialized variables
Christian Brabandt <cb@256bit.org>
parents:
13298
diff
changeset
|
4299 FILE *fd2 = NULL; |
|
13298
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4300 char_u *textline = NULL; |
|
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 /* 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
|
4303 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
|
4304 if (do_diff) |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4305 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
|
4306 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
|
4307 { |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4308 EMSG(_(e_invarg)); |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4309 return; |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4310 } |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4311 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
|
4312 if (fd1 == NULL) |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4313 { |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4314 EMSG2(_(e_notread), fname1); |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4315 return; |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4316 } |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4317 if (do_diff) |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4318 { |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4319 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
|
4320 if (fd2 == NULL) |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4321 { |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4322 fclose(fd1); |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4323 EMSG2(_(e_notread), fname2); |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4324 return; |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4325 } |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4326 } |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4327 |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4328 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
|
4329 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
|
4330 && 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
|
4331 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
|
4332 + 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
|
4333 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
|
4334 |
|
a4a559e08798
patch 8.0.1624: options for term_dumpdiff() and term_dumpload() not implemented
Christian Brabandt <cb@256bit.org>
parents:
13483
diff
changeset
|
4335 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
|
4336 { |
|
13505
a784ef72b617
patch 8.0.1626: compiler warning for possible loss of data
Christian Brabandt <cb@256bit.org>
parents:
13501
diff
changeset
|
4337 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
|
4338 |
|
a784ef72b617
patch 8.0.1626: compiler warning for possible loss of data
Christian Brabandt <cb@256bit.org>
parents:
13501
diff
changeset
|
4339 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
|
4340 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
|
4341 { |
|
a4a559e08798
patch 8.0.1624: options for term_dumpdiff() and term_dumpload() not implemented
Christian Brabandt <cb@256bit.org>
parents:
13483
diff
changeset
|
4342 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
|
4343 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
|
4344 } |
|
a4a559e08798
patch 8.0.1624: options for term_dumpdiff() and term_dumpload() not implemented
Christian Brabandt <cb@256bit.org>
parents:
13483
diff
changeset
|
4345 } |
|
13298
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4346 |
|
13470
6faef782f50b
patch 8.0.1609: shell commands in the GUI use a dumb terminal
Christian Brabandt <cb@256bit.org>
parents:
13458
diff
changeset
|
4347 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
|
4348 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
|
4349 { |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4350 int i; |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4351 linenr_T bot_lnum; |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4352 linenr_T lnum; |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4353 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
|
4354 int width; |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4355 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
|
4356 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
|
4357 VTermPos cursor_pos2; |
|
13298
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4358 |
|
13483
f7ef5d579758
patch 8.0.1615: term_dumpload() does not use the right colors
Christian Brabandt <cb@256bit.org>
parents:
13476
diff
changeset
|
4359 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
|
4360 |
|
13298
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4361 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
|
4362 |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4363 /* 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
|
4364 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
|
4365 |
|
73325d39591a
patch 8.0.1542: terminal screen dump does not include cursor position
Christian Brabandt <cb@256bit.org>
parents:
13329
diff
changeset
|
4366 /* 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
|
4367 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
|
4368 { |
|
73325d39591a
patch 8.0.1542: terminal screen dump does not include cursor position
Christian Brabandt <cb@256bit.org>
parents:
13329
diff
changeset
|
4369 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
|
4370 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
|
4371 } |
|
13298
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4372 |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4373 /* 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
|
4374 ml_delete(1, FALSE); |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4375 |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4376 /* 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
|
4377 if (!do_diff) |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4378 goto theend; |
|
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 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
|
4381 |
|
13579
486ad9fd9038
patch 8.0.1662: showing dump diff doesn't mention both file names
Christian Brabandt <cb@256bit.org>
parents:
13577
diff
changeset
|
4382 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
|
4383 if (textline == NULL) |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4384 goto theend; |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4385 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
|
4386 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
|
4387 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
|
4388 |
|
486ad9fd9038
patch 8.0.1662: showing dump diff doesn't mention both file names
Christian Brabandt <cb@256bit.org>
parents:
13577
diff
changeset
|
4389 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
|
4390 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
|
4391 goto theend; |
|
13298
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4392 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
|
4393 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
|
4394 textline[width] = NUL; |
|
13298
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 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
|
4397 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
|
4398 if (width2 > width) |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4399 { |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4400 vim_free(textline); |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4401 textline = alloc(width2 + 1); |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4402 if (textline == NULL) |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4403 goto theend; |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4404 width = width2; |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4405 textline[width] = NUL; |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4406 } |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4407 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
|
4408 |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4409 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
|
4410 { |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4411 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
|
4412 { |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4413 /* 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
|
4414 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
|
4415 textline[i] = '-'; |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4416 } |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4417 else |
|
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 char_u *line1; |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4420 char_u *line2; |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4421 char_u *p1; |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4422 char_u *p2; |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4423 int col; |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4424 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
|
4425 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
|
4426 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
|
4427 ->sb_cells; |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4428 |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4429 /* 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
|
4430 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
|
4431 if (line1 == NULL) |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4432 break; |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4433 p1 = line1; |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4434 |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4435 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
|
4436 p2 = line2; |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4437 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
|
4438 { |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4439 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
|
4440 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
|
4441 |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4442 textline[col] = ' '; |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4443 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
|
4444 /* text differs */ |
|
13298
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4445 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
|
4446 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
|
4447 && 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
|
4448 && (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
|
4449 || 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
|
4450 /* 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
|
4451 textline[col] = '>'; |
|
73325d39591a
patch 8.0.1542: terminal screen dump does not include cursor position
Christian Brabandt <cb@256bit.org>
parents:
13329
diff
changeset
|
4452 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
|
4453 && 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
|
4454 && (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
|
4455 || 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
|
4456 /* 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
|
4457 textline[col] = '<'; |
|
13298
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4458 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
|
4459 { |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4460 if ((cellattr1 + col)->width |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4461 != (cellattr2 + col)->width) |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4462 textline[col] = 'w'; |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4463 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
|
4464 &(cellattr2 + col)->fg)) |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4465 textline[col] = 'f'; |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4466 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
|
4467 &(cellattr2 + col)->bg)) |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4468 textline[col] = 'b'; |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4469 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
|
4470 != vtermAttr2hl(((cellattr2 + col)->attrs))) |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4471 textline[col] = 'a'; |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4472 } |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4473 p1 += len1; |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4474 p2 += len2; |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4475 /* TODO: handle different width */ |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4476 } |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4477 vim_free(line1); |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4478 |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4479 while (col < width) |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4480 { |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4481 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
|
4482 textline[col] = '?'; |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4483 else if (*p1 == NUL) |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4484 { |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4485 textline[col] = '+'; |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4486 p2 += utfc_ptr2len(p2); |
|
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 else |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4489 { |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4490 textline[col] = '-'; |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4491 p1 += utfc_ptr2len(p1); |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4492 } |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4493 ++col; |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4494 } |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4495 } |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4496 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
|
4497 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
|
4498 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
|
4499 ++bot_lnum; |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4500 } |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4501 |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4502 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
|
4503 { |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4504 /* 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
|
4505 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
|
4506 textline[i] = '+'; |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4507 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
|
4508 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
|
4509 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
|
4510 ++lnum; |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4511 ++bot_lnum; |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4512 } |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4513 |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4514 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
|
4515 |
|
486ad9fd9038
patch 8.0.1662: showing dump diff doesn't mention both file names
Christian Brabandt <cb@256bit.org>
parents:
13577
diff
changeset
|
4516 /* 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
|
4517 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
|
4518 } |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4519 |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4520 theend: |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4521 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
|
4522 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
|
4523 fclose(fd1); |
|
13300
803294329951
patch 8.0.1524: compiler warnings for uninitialized variables
Christian Brabandt <cb@256bit.org>
parents:
13298
diff
changeset
|
4524 if (fd2 != NULL) |
|
13298
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4525 fclose(fd2); |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4526 } |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4527 |
|
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 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
|
4530 * bottom files. |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4531 * 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
|
4532 */ |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4533 int |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4534 term_swap_diff() |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4535 { |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4536 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
|
4537 linenr_T line_count; |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4538 linenr_T top_rows; |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4539 linenr_T bot_rows; |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4540 linenr_T bot_start; |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4541 linenr_T lnum; |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4542 char_u *p; |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4543 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
|
4544 |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4545 if (term == NULL |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4546 || !term_is_finished(curbuf) |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4547 || 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
|
4548 || 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
|
4549 return FAIL; |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4550 |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4551 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
|
4552 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
|
4553 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
|
4554 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
|
4555 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
|
4556 |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4557 /* 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
|
4558 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
|
4559 { |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4560 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
|
4561 if (p == NULL) |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4562 return OK; |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4563 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
|
4564 ml_delete(1, FALSE); |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4565 vim_free(p); |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4566 } |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4567 |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4568 /* 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
|
4569 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
|
4570 { |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4571 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
|
4572 if (p == NULL) |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4573 return OK; |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4574 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
|
4575 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
|
4576 vim_free(p); |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4577 } |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4578 |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4579 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
|
4580 { |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4581 /* 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
|
4582 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
|
4583 { |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4584 sb_line_T temp; |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4585 |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4586 temp = *(sb_line + lnum); |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4587 *(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
|
4588 *(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
|
4589 } |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4590 } |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4591 else |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4592 { |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4593 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
|
4594 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
|
4595 |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4596 /* 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
|
4597 if (temp != NULL) |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4598 { |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4599 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
|
4600 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
|
4601 temp + bot_start, |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4602 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
|
4603 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
|
4604 temp + top_rows, |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4605 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
|
4606 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
|
4607 + line_count - top_rows, |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4608 temp, |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4609 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
|
4610 vim_free(temp); |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4611 } |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4612 } |
|
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 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
|
4615 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
|
4616 |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4617 update_screen(NOT_VALID); |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4618 return OK; |
|
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 |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4621 /* |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4622 * "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
|
4623 */ |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4624 void |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4625 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
|
4626 { |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4627 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
|
4628 } |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4629 |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4630 /* |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4631 * "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
|
4632 */ |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4633 void |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4634 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
|
4635 { |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4636 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
|
4637 } |
|
a88c5e12b860
patch 8.0.1523: cannot write and read terminal screendumps
Christian Brabandt <cb@256bit.org>
parents:
13294
diff
changeset
|
4638 |
| 12502 | 4639 /* |
| 4640 * "term_getaltscreen(buf)" function | |
| 4641 */ | |
| 4642 void | |
| 4643 f_term_getaltscreen(typval_T *argvars, typval_T *rettv) | |
| 4644 { | |
|
13438
33eea5ce5415
patch 8.0.1593: :qall never exits with an active terminal window
Christian Brabandt <cb@256bit.org>
parents:
13435
diff
changeset
|
4645 buf_T *buf = term_get_buf(argvars, "term_getaltscreen()"); |
| 12502 | 4646 |
| 4647 if (buf == NULL) | |
| 4648 return; | |
| 4649 rettv->vval.v_number = buf->b_term->tl_using_altscreen; | |
| 4650 } | |
| 4651 | |
| 4652 /* | |
| 4653 * "term_getattr(attr, name)" function | |
| 4654 */ | |
| 4655 void | |
| 4656 f_term_getattr(typval_T *argvars, typval_T *rettv) | |
| 4657 { | |
| 4658 int attr; | |
| 4659 size_t i; | |
| 4660 char_u *name; | |
| 4661 | |
| 4662 static struct { | |
| 4663 char *name; | |
| 4664 int attr; | |
| 4665 } attrs[] = { | |
| 4666 {"bold", HL_BOLD}, | |
| 4667 {"italic", HL_ITALIC}, | |
| 4668 {"underline", HL_UNDERLINE}, | |
| 4669 {"strike", HL_STRIKETHROUGH}, | |
| 4670 {"reverse", HL_INVERSE}, | |
| 4671 }; | |
| 4672 | |
| 4673 attr = get_tv_number(&argvars[0]); | |
| 4674 name = get_tv_string_chk(&argvars[1]); | |
| 4675 if (name == NULL) | |
| 4676 return; | |
| 4677 | |
| 4678 for (i = 0; i < sizeof(attrs)/sizeof(attrs[0]); ++i) | |
| 4679 if (STRCMP(name, attrs[i].name) == 0) | |
| 4680 { | |
| 4681 rettv->vval.v_number = (attr & attrs[i].attr) != 0 ? 1 : 0; | |
| 4682 break; | |
| 4683 } | |
| 4684 } | |
| 4685 | |
| 4686 /* | |
| 4687 * "term_getcursor(buf)" function | |
| 4688 */ | |
| 4689 void | |
| 4690 f_term_getcursor(typval_T *argvars, typval_T *rettv) | |
| 4691 { | |
|
13438
33eea5ce5415
patch 8.0.1593: :qall never exits with an active terminal window
Christian Brabandt <cb@256bit.org>
parents:
13435
diff
changeset
|
4692 buf_T *buf = term_get_buf(argvars, "term_getcursor()"); |
| 12502 | 4693 term_T *term; |
| 4694 list_T *l; | |
| 4695 dict_T *d; | |
| 4696 | |
| 4697 if (rettv_list_alloc(rettv) == FAIL) | |
| 4698 return; | |
| 4699 if (buf == NULL) | |
| 4700 return; | |
| 4701 term = buf->b_term; | |
| 4702 | |
| 4703 l = rettv->vval.v_list; | |
| 4704 list_append_number(l, term->tl_cursor_pos.row + 1); | |
| 4705 list_append_number(l, term->tl_cursor_pos.col + 1); | |
| 4706 | |
| 4707 d = dict_alloc(); | |
| 4708 if (d != NULL) | |
| 4709 { | |
| 4710 dict_add_nr_str(d, "visible", term->tl_cursor_visible, NULL); | |
| 4711 dict_add_nr_str(d, "blink", blink_state_is_inverted() | |
| 4712 ? !term->tl_cursor_blink : term->tl_cursor_blink, NULL); | |
| 4713 dict_add_nr_str(d, "shape", term->tl_cursor_shape, NULL); | |
| 4714 dict_add_nr_str(d, "color", 0L, term->tl_cursor_color == NULL | |
| 4715 ? (char_u *)"" : term->tl_cursor_color); | |
| 4716 list_append_dict(l, d); | |
| 4717 } | |
| 4718 } | |
| 4719 | |
| 4720 /* | |
| 4721 * "term_getjob(buf)" function | |
| 4722 */ | |
| 4723 void | |
| 4724 f_term_getjob(typval_T *argvars, typval_T *rettv) | |
| 4725 { | |
|
13438
33eea5ce5415
patch 8.0.1593: :qall never exits with an active terminal window
Christian Brabandt <cb@256bit.org>
parents:
13435
diff
changeset
|
4726 buf_T *buf = term_get_buf(argvars, "term_getjob()"); |
| 12502 | 4727 |
| 4728 rettv->v_type = VAR_JOB; | |
| 4729 rettv->vval.v_job = NULL; | |
| 4730 if (buf == NULL) | |
| 4731 return; | |
| 4732 | |
| 4733 rettv->vval.v_job = buf->b_term->tl_job; | |
| 4734 if (rettv->vval.v_job != NULL) | |
| 4735 ++rettv->vval.v_job->jv_refcount; | |
| 4736 } | |
| 4737 | |
| 4738 static int | |
| 4739 get_row_number(typval_T *tv, term_T *term) | |
| 4740 { | |
| 4741 if (tv->v_type == VAR_STRING | |
| 4742 && tv->vval.v_string != NULL | |
| 4743 && STRCMP(tv->vval.v_string, ".") == 0) | |
| 4744 return term->tl_cursor_pos.row; | |
| 4745 return (int)get_tv_number(tv) - 1; | |
| 4746 } | |
| 4747 | |
| 4748 /* | |
| 4749 * "term_getline(buf, row)" function | |
| 4750 */ | |
| 4751 void | |
| 4752 f_term_getline(typval_T *argvars, typval_T *rettv) | |
| 4753 { | |
|
13438
33eea5ce5415
patch 8.0.1593: :qall never exits with an active terminal window
Christian Brabandt <cb@256bit.org>
parents:
13435
diff
changeset
|
4754 buf_T *buf = term_get_buf(argvars, "term_getline()"); |
| 12502 | 4755 term_T *term; |
| 4756 int row; | |
| 4757 | |
| 4758 rettv->v_type = VAR_STRING; | |
| 4759 if (buf == NULL) | |
| 4760 return; | |
| 4761 term = buf->b_term; | |
| 4762 row = get_row_number(&argvars[1], term); | |
| 4763 | |
| 4764 if (term->tl_vterm == NULL) | |
| 4765 { | |
| 4766 linenr_T lnum = row + term->tl_scrollback_scrolled + 1; | |
| 4767 | |
| 4768 /* vterm is finished, get the text from the buffer */ | |
| 4769 if (lnum > 0 && lnum <= buf->b_ml.ml_line_count) | |
| 4770 rettv->vval.v_string = vim_strsave(ml_get_buf(buf, lnum, FALSE)); | |
| 4771 } | |
| 4772 else | |
| 4773 { | |
| 4774 VTermScreen *screen = vterm_obtain_screen(term->tl_vterm); | |
| 4775 VTermRect rect; | |
| 4776 int len; | |
| 4777 char_u *p; | |
| 4778 | |
| 4779 if (row < 0 || row >= term->tl_rows) | |
| 4780 return; | |
| 4781 len = term->tl_cols * MB_MAXBYTES + 1; | |
| 4782 p = alloc(len); | |
| 4783 if (p == NULL) | |
| 4784 return; | |
| 4785 rettv->vval.v_string = p; | |
| 4786 | |
| 4787 rect.start_col = 0; | |
| 4788 rect.end_col = term->tl_cols; | |
| 4789 rect.start_row = row; | |
| 4790 rect.end_row = row + 1; | |
| 4791 p[vterm_screen_get_text(screen, (char *)p, len, rect)] = NUL; | |
| 4792 } | |
| 4793 } | |
| 4794 | |
| 4795 /* | |
| 4796 * "term_getscrolled(buf)" function | |
| 4797 */ | |
| 4798 void | |
| 4799 f_term_getscrolled(typval_T *argvars, typval_T *rettv) | |
| 4800 { | |
|
13438
33eea5ce5415
patch 8.0.1593: :qall never exits with an active terminal window
Christian Brabandt <cb@256bit.org>
parents:
13435
diff
changeset
|
4801 buf_T *buf = term_get_buf(argvars, "term_getscrolled()"); |
| 12502 | 4802 |
| 4803 if (buf == NULL) | |
| 4804 return; | |
| 4805 rettv->vval.v_number = buf->b_term->tl_scrollback_scrolled; | |
| 4806 } | |
| 4807 | |
| 4808 /* | |
| 4809 * "term_getsize(buf)" function | |
| 4810 */ | |
| 4811 void | |
| 4812 f_term_getsize(typval_T *argvars, typval_T *rettv) | |
| 4813 { | |
|
13438
33eea5ce5415
patch 8.0.1593: :qall never exits with an active terminal window
Christian Brabandt <cb@256bit.org>
parents:
13435
diff
changeset
|
4814 buf_T *buf = term_get_buf(argvars, "term_getsize()"); |
| 12502 | 4815 list_T *l; |
| 4816 | |
| 4817 if (rettv_list_alloc(rettv) == FAIL) | |
| 4818 return; | |
| 4819 if (buf == NULL) | |
| 4820 return; | |
| 4821 | |
| 4822 l = rettv->vval.v_list; | |
| 4823 list_append_number(l, buf->b_term->tl_rows); | |
| 4824 list_append_number(l, buf->b_term->tl_cols); | |
| 4825 } | |
| 4826 | |
| 4827 /* | |
|
13678
39fcaaa973db
patch 8.0.1711: term_setsize() is not implemented yet
Christian Brabandt <cb@256bit.org>
parents:
13668
diff
changeset
|
4828 * "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
|
4829 */ |
|
39fcaaa973db
patch 8.0.1711: term_setsize() is not implemented yet
Christian Brabandt <cb@256bit.org>
parents:
13668
diff
changeset
|
4830 void |
|
39fcaaa973db
patch 8.0.1711: term_setsize() is not implemented yet
Christian Brabandt <cb@256bit.org>
parents:
13668
diff
changeset
|
4831 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
|
4832 { |
|
39fcaaa973db
patch 8.0.1711: term_setsize() is not implemented yet
Christian Brabandt <cb@256bit.org>
parents:
13668
diff
changeset
|
4833 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
|
4834 term_T *term; |
|
39fcaaa973db
patch 8.0.1711: term_setsize() is not implemented yet
Christian Brabandt <cb@256bit.org>
parents:
13668
diff
changeset
|
4835 varnumber_T rows, cols; |
|
39fcaaa973db
patch 8.0.1711: term_setsize() is not implemented yet
Christian Brabandt <cb@256bit.org>
parents:
13668
diff
changeset
|
4836 |
|
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
|
4837 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
|
4838 { |
|
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
|
4839 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
|
4840 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
|
4841 } |
|
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
|
4842 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
|
4843 return; |
|
39fcaaa973db
patch 8.0.1711: term_setsize() is not implemented yet
Christian Brabandt <cb@256bit.org>
parents:
13668
diff
changeset
|
4844 term = buf->b_term; |
|
39fcaaa973db
patch 8.0.1711: term_setsize() is not implemented yet
Christian Brabandt <cb@256bit.org>
parents:
13668
diff
changeset
|
4845 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
|
4846 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
|
4847 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
|
4848 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
|
4849 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
|
4850 /* 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
|
4851 |
|
39fcaaa973db
patch 8.0.1711: term_setsize() is not implemented yet
Christian Brabandt <cb@256bit.org>
parents:
13668
diff
changeset
|
4852 /* 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
|
4853 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
|
4854 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
|
4855 } |
|
39fcaaa973db
patch 8.0.1711: term_setsize() is not implemented yet
Christian Brabandt <cb@256bit.org>
parents:
13668
diff
changeset
|
4856 |
|
39fcaaa973db
patch 8.0.1711: term_setsize() is not implemented yet
Christian Brabandt <cb@256bit.org>
parents:
13668
diff
changeset
|
4857 /* |
| 12502 | 4858 * "term_getstatus(buf)" function |
| 4859 */ | |
| 4860 void | |
| 4861 f_term_getstatus(typval_T *argvars, typval_T *rettv) | |
| 4862 { | |
|
13438
33eea5ce5415
patch 8.0.1593: :qall never exits with an active terminal window
Christian Brabandt <cb@256bit.org>
parents:
13435
diff
changeset
|
4863 buf_T *buf = term_get_buf(argvars, "term_getstatus()"); |
| 12502 | 4864 term_T *term; |
| 4865 char_u val[100]; | |
| 4866 | |
| 4867 rettv->v_type = VAR_STRING; | |
| 4868 if (buf == NULL) | |
| 4869 return; | |
| 4870 term = buf->b_term; | |
| 4871 | |
| 4872 if (term_job_running(term)) | |
| 4873 STRCPY(val, "running"); | |
| 4874 else | |
| 4875 STRCPY(val, "finished"); | |
| 4876 if (term->tl_normal_mode) | |
| 4877 STRCAT(val, ",normal"); | |
| 4878 rettv->vval.v_string = vim_strsave(val); | |
| 4879 } | |
| 4880 | |
| 4881 /* | |
| 4882 * "term_gettitle(buf)" function | |
| 4883 */ | |
| 4884 void | |
| 4885 f_term_gettitle(typval_T *argvars, typval_T *rettv) | |
| 4886 { | |
|
13438
33eea5ce5415
patch 8.0.1593: :qall never exits with an active terminal window
Christian Brabandt <cb@256bit.org>
parents:
13435
diff
changeset
|
4887 buf_T *buf = term_get_buf(argvars, "term_gettitle()"); |
| 12502 | 4888 |
| 4889 rettv->v_type = VAR_STRING; | |
| 4890 if (buf == NULL) | |
| 4891 return; | |
| 4892 | |
| 4893 if (buf->b_term->tl_title != NULL) | |
| 4894 rettv->vval.v_string = vim_strsave(buf->b_term->tl_title); | |
| 4895 } | |
| 4896 | |
| 4897 /* | |
| 4898 * "term_gettty(buf)" function | |
| 4899 */ | |
| 4900 void | |
| 4901 f_term_gettty(typval_T *argvars, typval_T *rettv) | |
| 4902 { | |
|
13438
33eea5ce5415
patch 8.0.1593: :qall never exits with an active terminal window
Christian Brabandt <cb@256bit.org>
parents:
13435
diff
changeset
|
4903 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
|
4904 char_u *p = NULL; |
| 12502 | 4905 int num = 0; |
| 4906 | |
| 4907 rettv->v_type = VAR_STRING; | |
| 4908 if (buf == NULL) | |
| 4909 return; | |
| 4910 if (argvars[1].v_type != VAR_UNKNOWN) | |
| 4911 num = get_tv_number(&argvars[1]); | |
| 4912 | |
| 4913 switch (num) | |
| 4914 { | |
| 4915 case 0: | |
| 4916 if (buf->b_term->tl_job != NULL) | |
| 4917 p = buf->b_term->tl_job->jv_tty_out; | |
| 4918 break; | |
| 4919 case 1: | |
| 4920 if (buf->b_term->tl_job != NULL) | |
| 4921 p = buf->b_term->tl_job->jv_tty_in; | |
| 4922 break; | |
| 4923 default: | |
| 4924 EMSG2(_(e_invarg2), get_tv_string(&argvars[1])); | |
| 4925 return; | |
| 4926 } | |
| 4927 if (p != NULL) | |
| 4928 rettv->vval.v_string = vim_strsave(p); | |
| 4929 } | |
| 4930 | |
| 4931 /* | |
| 4932 * "term_list()" function | |
| 4933 */ | |
| 4934 void | |
| 4935 f_term_list(typval_T *argvars UNUSED, typval_T *rettv) | |
| 4936 { | |
| 4937 term_T *tp; | |
| 4938 list_T *l; | |
| 4939 | |
| 4940 if (rettv_list_alloc(rettv) == FAIL || first_term == NULL) | |
| 4941 return; | |
| 4942 | |
| 4943 l = rettv->vval.v_list; | |
| 4944 for (tp = first_term; tp != NULL; tp = tp->tl_next) | |
| 4945 if (tp != NULL && tp->tl_buffer != NULL) | |
| 4946 if (list_append_number(l, | |
| 4947 (varnumber_T)tp->tl_buffer->b_fnum) == FAIL) | |
| 4948 return; | |
| 4949 } | |
| 4950 | |
| 4951 /* | |
| 4952 * "term_scrape(buf, row)" function | |
| 4953 */ | |
| 4954 void | |
| 4955 f_term_scrape(typval_T *argvars, typval_T *rettv) | |
| 4956 { | |
|
13438
33eea5ce5415
patch 8.0.1593: :qall never exits with an active terminal window
Christian Brabandt <cb@256bit.org>
parents:
13435
diff
changeset
|
4957 buf_T *buf = term_get_buf(argvars, "term_scrape()"); |
| 12502 | 4958 VTermScreen *screen = NULL; |
| 4959 VTermPos pos; | |
| 4960 list_T *l; | |
| 4961 term_T *term; | |
| 4962 char_u *p; | |
| 4963 sb_line_T *line; | |
| 4964 | |
| 4965 if (rettv_list_alloc(rettv) == FAIL) | |
| 4966 return; | |
| 4967 if (buf == NULL) | |
| 4968 return; | |
| 4969 term = buf->b_term; | |
| 4970 | |
| 4971 l = rettv->vval.v_list; | |
| 4972 pos.row = get_row_number(&argvars[1], term); | |
| 4973 | |
| 4974 if (term->tl_vterm != NULL) | |
| 4975 { | |
| 4976 screen = vterm_obtain_screen(term->tl_vterm); | |
| 4977 p = NULL; | |
| 4978 line = NULL; | |
| 4979 } | |
| 4980 else | |
| 4981 { | |
| 4982 linenr_T lnum = pos.row + term->tl_scrollback_scrolled; | |
| 4983 | |
| 4984 if (lnum < 0 || lnum >= term->tl_scrollback.ga_len) | |
| 4985 return; | |
| 4986 p = ml_get_buf(buf, lnum + 1, FALSE); | |
| 4987 line = (sb_line_T *)term->tl_scrollback.ga_data + lnum; | |
| 4988 } | |
| 4989 | |
| 4990 for (pos.col = 0; pos.col < term->tl_cols; ) | |
| 4991 { | |
| 4992 dict_T *dcell; | |
| 4993 int width; | |
| 4994 VTermScreenCellAttrs attrs; | |
| 4995 VTermColor fg, bg; | |
| 4996 char_u rgb[8]; | |
| 4997 char_u mbs[MB_MAXBYTES * VTERM_MAX_CHARS_PER_CELL + 1]; | |
| 4998 int off = 0; | |
| 4999 int i; | |
| 5000 | |
| 5001 if (screen == NULL) | |
| 5002 { | |
| 5003 cellattr_T *cellattr; | |
| 5004 int len; | |
| 5005 | |
| 5006 /* vterm has finished, get the cell from scrollback */ | |
| 5007 if (pos.col >= line->sb_cols) | |
| 5008 break; | |
| 5009 cellattr = line->sb_cells + pos.col; | |
| 5010 width = cellattr->width; | |
| 5011 attrs = cellattr->attrs; | |
| 5012 fg = cellattr->fg; | |
| 5013 bg = cellattr->bg; | |
| 5014 len = MB_PTR2LEN(p); | |
| 5015 mch_memmove(mbs, p, len); | |
| 5016 mbs[len] = NUL; | |
| 5017 p += len; | |
| 5018 } | |
| 5019 else | |
| 5020 { | |
| 5021 VTermScreenCell cell; | |
| 5022 if (vterm_screen_get_cell(screen, pos, &cell) == 0) | |
| 5023 break; | |
| 5024 for (i = 0; i < VTERM_MAX_CHARS_PER_CELL; ++i) | |
| 5025 { | |
| 5026 if (cell.chars[i] == 0) | |
| 5027 break; | |
| 5028 off += (*utf_char2bytes)((int)cell.chars[i], mbs + off); | |
| 5029 } | |
| 5030 mbs[off] = NUL; | |
| 5031 width = cell.width; | |
| 5032 attrs = cell.attrs; | |
| 5033 fg = cell.fg; | |
| 5034 bg = cell.bg; | |
| 5035 } | |
| 5036 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
|
5037 if (dcell == NULL) |
|
fc33325c91c1
patch 8.0.1499: out-of-memory situation not correctly handled
Christian Brabandt <cb@256bit.org>
parents:
13244
diff
changeset
|
5038 break; |
| 12502 | 5039 list_append_dict(l, dcell); |
| 5040 | |
| 5041 dict_add_nr_str(dcell, "chars", 0, mbs); | |
| 5042 | |
| 5043 vim_snprintf((char *)rgb, 8, "#%02x%02x%02x", | |
| 5044 fg.red, fg.green, fg.blue); | |
| 5045 dict_add_nr_str(dcell, "fg", 0, rgb); | |
| 5046 vim_snprintf((char *)rgb, 8, "#%02x%02x%02x", | |
| 5047 bg.red, bg.green, bg.blue); | |
| 5048 dict_add_nr_str(dcell, "bg", 0, rgb); | |
| 5049 | |
| 5050 dict_add_nr_str(dcell, "attr", | |
| 5051 cell2attr(attrs, fg, bg), NULL); | |
| 5052 dict_add_nr_str(dcell, "width", width, NULL); | |
| 5053 | |
| 5054 ++pos.col; | |
| 5055 if (width == 2) | |
| 5056 ++pos.col; | |
| 5057 } | |
| 5058 } | |
| 5059 | |
| 5060 /* | |
| 5061 * "term_sendkeys(buf, keys)" function | |
| 5062 */ | |
| 5063 void | |
| 5064 f_term_sendkeys(typval_T *argvars, typval_T *rettv) | |
| 5065 { | |
|
13438
33eea5ce5415
patch 8.0.1593: :qall never exits with an active terminal window
Christian Brabandt <cb@256bit.org>
parents:
13435
diff
changeset
|
5066 buf_T *buf = term_get_buf(argvars, "term_sendkeys()"); |
| 12502 | 5067 char_u *msg; |
| 5068 term_T *term; | |
| 5069 | |
| 5070 rettv->v_type = VAR_UNKNOWN; | |
| 5071 if (buf == NULL) | |
| 5072 return; | |
| 5073 | |
| 5074 msg = get_tv_string_chk(&argvars[1]); | |
| 5075 if (msg == NULL) | |
| 5076 return; | |
| 5077 term = buf->b_term; | |
| 5078 if (term->tl_vterm == NULL) | |
| 5079 return; | |
| 5080 | |
| 5081 while (*msg != NUL) | |
| 5082 { | |
| 5083 send_keys_to_term(term, PTR2CHAR(msg), FALSE); | |
|
12650
f58755eb453e
patch 8.0.1203: terminal window mistreats composing characters
Christian Brabandt <cb@256bit.org>
parents:
12634
diff
changeset
|
5084 msg += MB_CPTR2LEN(msg); |
| 12502 | 5085 } |
| 5086 } | |
| 5087 | |
|
13626
ab89131d30e0
patch 8.0.1685: can't set ANSI colors of a terminal window
Christian Brabandt <cb@256bit.org>
parents:
13624
diff
changeset
|
5088 #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
|
5089 /* |
|
ab89131d30e0
patch 8.0.1685: can't set ANSI colors of a terminal window
Christian Brabandt <cb@256bit.org>
parents:
13624
diff
changeset
|
5090 * "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
|
5091 */ |
|
ab89131d30e0
patch 8.0.1685: can't set ANSI colors of a terminal window
Christian Brabandt <cb@256bit.org>
parents:
13624
diff
changeset
|
5092 void |
|
ab89131d30e0
patch 8.0.1685: can't set ANSI colors of a terminal window
Christian Brabandt <cb@256bit.org>
parents:
13624
diff
changeset
|
5093 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
|
5094 { |
|
ab89131d30e0
patch 8.0.1685: can't set ANSI colors of a terminal window
Christian Brabandt <cb@256bit.org>
parents:
13624
diff
changeset
|
5095 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
|
5096 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
|
5097 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
|
5098 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
|
5099 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
|
5100 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
|
5101 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
|
5102 |
|
ab89131d30e0
patch 8.0.1685: can't set ANSI colors of a terminal window
Christian Brabandt <cb@256bit.org>
parents:
13624
diff
changeset
|
5103 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
|
5104 return; |
|
ab89131d30e0
patch 8.0.1685: can't set ANSI colors of a terminal window
Christian Brabandt <cb@256bit.org>
parents:
13624
diff
changeset
|
5105 |
|
ab89131d30e0
patch 8.0.1685: can't set ANSI colors of a terminal window
Christian Brabandt <cb@256bit.org>
parents:
13624
diff
changeset
|
5106 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
|
5107 return; |
|
ab89131d30e0
patch 8.0.1685: can't set ANSI colors of a terminal window
Christian Brabandt <cb@256bit.org>
parents:
13624
diff
changeset
|
5108 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
|
5109 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
|
5110 return; |
|
ab89131d30e0
patch 8.0.1685: can't set ANSI colors of a terminal window
Christian Brabandt <cb@256bit.org>
parents:
13624
diff
changeset
|
5111 |
|
ab89131d30e0
patch 8.0.1685: can't set ANSI colors of a terminal window
Christian Brabandt <cb@256bit.org>
parents:
13624
diff
changeset
|
5112 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
|
5113 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
|
5114 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
|
5115 { |
|
ab89131d30e0
patch 8.0.1685: can't set ANSI colors of a terminal window
Christian Brabandt <cb@256bit.org>
parents:
13624
diff
changeset
|
5116 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
|
5117 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
|
5118 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
|
5119 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
|
5120 return; |
|
ab89131d30e0
patch 8.0.1685: can't set ANSI colors of a terminal window
Christian Brabandt <cb@256bit.org>
parents:
13624
diff
changeset
|
5121 } |
|
ab89131d30e0
patch 8.0.1685: can't set ANSI colors of a terminal window
Christian Brabandt <cb@256bit.org>
parents:
13624
diff
changeset
|
5122 } |
|
ab89131d30e0
patch 8.0.1685: can't set ANSI colors of a terminal window
Christian Brabandt <cb@256bit.org>
parents:
13624
diff
changeset
|
5123 |
|
ab89131d30e0
patch 8.0.1685: can't set ANSI colors of a terminal window
Christian Brabandt <cb@256bit.org>
parents:
13624
diff
changeset
|
5124 /* |
|
ab89131d30e0
patch 8.0.1685: can't set ANSI colors of a terminal window
Christian Brabandt <cb@256bit.org>
parents:
13624
diff
changeset
|
5125 * "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
|
5126 */ |
|
ab89131d30e0
patch 8.0.1685: can't set ANSI colors of a terminal window
Christian Brabandt <cb@256bit.org>
parents:
13624
diff
changeset
|
5127 void |
|
ab89131d30e0
patch 8.0.1685: can't set ANSI colors of a terminal window
Christian Brabandt <cb@256bit.org>
parents:
13624
diff
changeset
|
5128 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
|
5129 { |
|
ab89131d30e0
patch 8.0.1685: can't set ANSI colors of a terminal window
Christian Brabandt <cb@256bit.org>
parents:
13624
diff
changeset
|
5130 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
|
5131 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
|
5132 |
|
ab89131d30e0
patch 8.0.1685: can't set ANSI colors of a terminal window
Christian Brabandt <cb@256bit.org>
parents:
13624
diff
changeset
|
5133 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
|
5134 return; |
|
ab89131d30e0
patch 8.0.1685: can't set ANSI colors of a terminal window
Christian Brabandt <cb@256bit.org>
parents:
13624
diff
changeset
|
5135 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
|
5136 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
|
5137 return; |
|
ab89131d30e0
patch 8.0.1685: can't set ANSI colors of a terminal window
Christian Brabandt <cb@256bit.org>
parents:
13624
diff
changeset
|
5138 |
|
ab89131d30e0
patch 8.0.1685: can't set ANSI colors of a terminal window
Christian Brabandt <cb@256bit.org>
parents:
13624
diff
changeset
|
5139 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
|
5140 { |
|
ab89131d30e0
patch 8.0.1685: can't set ANSI colors of a terminal window
Christian Brabandt <cb@256bit.org>
parents:
13624
diff
changeset
|
5141 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
|
5142 return; |
|
ab89131d30e0
patch 8.0.1685: can't set ANSI colors of a terminal window
Christian Brabandt <cb@256bit.org>
parents:
13624
diff
changeset
|
5143 } |
|
ab89131d30e0
patch 8.0.1685: can't set ANSI colors of a terminal window
Christian Brabandt <cb@256bit.org>
parents:
13624
diff
changeset
|
5144 |
|
ab89131d30e0
patch 8.0.1685: can't set ANSI colors of a terminal window
Christian Brabandt <cb@256bit.org>
parents:
13624
diff
changeset
|
5145 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
|
5146 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
|
5147 } |
|
ab89131d30e0
patch 8.0.1685: can't set ANSI colors of a terminal window
Christian Brabandt <cb@256bit.org>
parents:
13624
diff
changeset
|
5148 #endif |
|
ab89131d30e0
patch 8.0.1685: can't set ANSI colors of a terminal window
Christian Brabandt <cb@256bit.org>
parents:
13624
diff
changeset
|
5149 |
| 12502 | 5150 /* |
|
13435
fa198b71bab2
patch 8.0.1592: terminal windows in a session are not properly restored
Christian Brabandt <cb@256bit.org>
parents:
13380
diff
changeset
|
5151 * "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
|
5152 */ |
|
fa198b71bab2
patch 8.0.1592: terminal windows in a session are not properly restored
Christian Brabandt <cb@256bit.org>
parents:
13380
diff
changeset
|
5153 void |
|
fa198b71bab2
patch 8.0.1592: terminal windows in a session are not properly restored
Christian Brabandt <cb@256bit.org>
parents:
13380
diff
changeset
|
5154 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
|
5155 { |
|
fa198b71bab2
patch 8.0.1592: terminal windows in a session are not properly restored
Christian Brabandt <cb@256bit.org>
parents:
13380
diff
changeset
|
5156 #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
|
5157 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
|
5158 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
|
5159 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
|
5160 |
|
fa198b71bab2
patch 8.0.1592: terminal windows in a session are not properly restored
Christian Brabandt <cb@256bit.org>
parents:
13380
diff
changeset
|
5161 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
|
5162 return; |
|
fa198b71bab2
patch 8.0.1592: terminal windows in a session are not properly restored
Christian Brabandt <cb@256bit.org>
parents:
13380
diff
changeset
|
5163 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
|
5164 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
|
5165 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
|
5166 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
|
5167 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
|
5168 else |
|
fa198b71bab2
patch 8.0.1592: terminal windows in a session are not properly restored
Christian Brabandt <cb@256bit.org>
parents:
13380
diff
changeset
|
5169 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
|
5170 #endif |
|
fa198b71bab2
patch 8.0.1592: terminal windows in a session are not properly restored
Christian Brabandt <cb@256bit.org>
parents:
13380
diff
changeset
|
5171 } |
|
fa198b71bab2
patch 8.0.1592: terminal windows in a session are not properly restored
Christian Brabandt <cb@256bit.org>
parents:
13380
diff
changeset
|
5172 |
|
fa198b71bab2
patch 8.0.1592: terminal windows in a session are not properly restored
Christian Brabandt <cb@256bit.org>
parents:
13380
diff
changeset
|
5173 /* |
|
13438
33eea5ce5415
patch 8.0.1593: :qall never exits with an active terminal window
Christian Brabandt <cb@256bit.org>
parents:
13435
diff
changeset
|
5174 * "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
|
5175 */ |
|
33eea5ce5415
patch 8.0.1593: :qall never exits with an active terminal window
Christian Brabandt <cb@256bit.org>
parents:
13435
diff
changeset
|
5176 void |
|
33eea5ce5415
patch 8.0.1593: :qall never exits with an active terminal window
Christian Brabandt <cb@256bit.org>
parents:
13435
diff
changeset
|
5177 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
|
5178 { |
|
33eea5ce5415
patch 8.0.1593: :qall never exits with an active terminal window
Christian Brabandt <cb@256bit.org>
parents:
13435
diff
changeset
|
5179 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
|
5180 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
|
5181 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
|
5182 |
|
33eea5ce5415
patch 8.0.1593: :qall never exits with an active terminal window
Christian Brabandt <cb@256bit.org>
parents:
13435
diff
changeset
|
5183 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
|
5184 return; |
|
33eea5ce5415
patch 8.0.1593: :qall never exits with an active terminal window
Christian Brabandt <cb@256bit.org>
parents:
13435
diff
changeset
|
5185 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
|
5186 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
|
5187 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
|
5188 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
|
5189 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
|
5190 else |
|
33eea5ce5415
patch 8.0.1593: :qall never exits with an active terminal window
Christian Brabandt <cb@256bit.org>
parents:
13435
diff
changeset
|
5191 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
|
5192 } |
|
33eea5ce5415
patch 8.0.1593: :qall never exits with an active terminal window
Christian Brabandt <cb@256bit.org>
parents:
13435
diff
changeset
|
5193 |
|
33eea5ce5415
patch 8.0.1593: :qall never exits with an active terminal window
Christian Brabandt <cb@256bit.org>
parents:
13435
diff
changeset
|
5194 /* |
| 12502 | 5195 * "term_start(command, options)" function |
| 5196 */ | |
| 5197 void | |
| 5198 f_term_start(typval_T *argvars, typval_T *rettv) | |
| 5199 { | |
| 5200 jobopt_T opt; | |
| 5201 buf_T *buf; | |
| 5202 | |
| 5203 init_job_options(&opt); | |
| 5204 if (argvars[1].v_type != VAR_UNKNOWN | |
| 5205 && get_job_options(&argvars[1], &opt, | |
| 5206 JO_TIMEOUT_ALL + JO_STOPONEXIT | |
| 5207 + JO_CALLBACK + JO_OUT_CALLBACK + JO_ERR_CALLBACK | |
| 5208 + JO_EXIT_CB + JO_CLOSE_CALLBACK + JO_OUT_IO, | |
| 5209 JO2_TERM_NAME + JO2_TERM_FINISH + JO2_HIDDEN + JO2_TERM_OPENCMD | |
| 5210 + 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
|
5211 + 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
|
5212 + 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
|
5213 + JO2_ANSI_COLORS) == FAIL) |
| 12502 | 5214 return; |
| 5215 | |
|
13470
6faef782f50b
patch 8.0.1609: shell commands in the GUI use a dumb terminal
Christian Brabandt <cb@256bit.org>
parents:
13458
diff
changeset
|
5216 buf = term_start(&argvars[0], NULL, &opt, 0); |
| 12502 | 5217 |
| 5218 if (buf != NULL && buf->b_term != NULL) | |
| 5219 rettv->vval.v_number = buf->b_fnum; | |
| 5220 } | |
| 5221 | |
| 5222 /* | |
| 5223 * "term_wait" function | |
| 5224 */ | |
| 5225 void | |
| 5226 f_term_wait(typval_T *argvars, typval_T *rettv UNUSED) | |
| 5227 { | |
|
13438
33eea5ce5415
patch 8.0.1593: :qall never exits with an active terminal window
Christian Brabandt <cb@256bit.org>
parents:
13435
diff
changeset
|
5228 buf_T *buf = term_get_buf(argvars, "term_wait()"); |
| 12502 | 5229 |
| 5230 if (buf == NULL) | |
| 5231 return; | |
| 5232 if (buf->b_term->tl_job == NULL) | |
| 5233 { | |
| 5234 ch_log(NULL, "term_wait(): no job to wait for"); | |
| 5235 return; | |
| 5236 } | |
| 5237 if (buf->b_term->tl_job->jv_channel == NULL) | |
| 5238 /* channel is closed, nothing to do */ | |
| 5239 return; | |
| 5240 | |
| 5241 /* 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
|
5242 if (!buf->b_term->tl_job->jv_channel->ch_keep_open |
| 12502 | 5243 && STRCMP(job_status(buf->b_term->tl_job), "dead") == 0) |
| 5244 { | |
| 5245 /* The job is dead, keep reading channel I/O until the channel is | |
| 5246 * closed. buf->b_term may become NULL if the terminal was closed while | |
| 5247 * waiting. */ | |
| 5248 ch_log(NULL, "term_wait(): waiting for channel to close"); | |
| 5249 while (buf->b_term != NULL && !buf->b_term->tl_channel_closed) | |
| 5250 { | |
| 5251 mch_check_messages(); | |
| 5252 parse_queued_messages(); | |
|
12881
1c05b29ab125
patch 8.0.1317: accessing freed memory in term_wait()
Christian Brabandt <cb@256bit.org>
parents:
12865
diff
changeset
|
5253 if (!buf_valid(buf)) |
|
1c05b29ab125
patch 8.0.1317: accessing freed memory in term_wait()
Christian Brabandt <cb@256bit.org>
parents:
12865
diff
changeset
|
5254 /* 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
|
5255 * buffer disappears. */ |
|
1c05b29ab125
patch 8.0.1317: accessing freed memory in term_wait()
Christian Brabandt <cb@256bit.org>
parents:
12865
diff
changeset
|
5256 break; |
| 12502 | 5257 ui_delay(10L, FALSE); |
| 5258 } | |
| 5259 mch_check_messages(); | |
| 5260 parse_queued_messages(); | |
| 5261 } | |
| 5262 else | |
| 5263 { | |
| 5264 long wait = 10L; | |
| 5265 | |
| 5266 mch_check_messages(); | |
| 5267 parse_queued_messages(); | |
| 5268 | |
| 5269 /* Wait for some time for any channel I/O. */ | |
| 5270 if (argvars[1].v_type != VAR_UNKNOWN) | |
| 5271 wait = get_tv_number(&argvars[1]); | |
| 5272 ui_delay(wait, TRUE); | |
| 5273 mch_check_messages(); | |
| 5274 | |
| 5275 /* Flushing messages on channels is hopefully sufficient. | |
| 5276 * TODO: is there a better way? */ | |
| 5277 parse_queued_messages(); | |
| 5278 } | |
| 5279 } | |
| 5280 | |
| 5281 /* | |
| 5282 * Called when a channel has sent all the lines to a terminal. | |
| 5283 * Send a CTRL-D to mark the end of the text. | |
| 5284 */ | |
| 5285 void | |
| 5286 term_send_eof(channel_T *ch) | |
| 5287 { | |
| 5288 term_T *term; | |
| 5289 | |
| 5290 for (term = first_term; term != NULL; term = term->tl_next) | |
| 5291 if (term->tl_job == ch->ch_job) | |
| 5292 { | |
| 5293 if (term->tl_eof_chars != NULL) | |
| 5294 { | |
| 5295 channel_send(ch, PART_IN, term->tl_eof_chars, | |
| 5296 (int)STRLEN(term->tl_eof_chars), NULL); | |
| 5297 channel_send(ch, PART_IN, (char_u *)"\r", 1, NULL); | |
| 5298 } | |
| 5299 # ifdef WIN3264 | |
| 5300 else | |
| 5301 /* Default: CTRL-D */ | |
| 5302 channel_send(ch, PART_IN, (char_u *)"\004\r", 2, NULL); | |
| 5303 # endif | |
| 5304 } | |
| 5305 } | |
| 5306 | |
| 5307 # if defined(WIN3264) || defined(PROTO) | |
| 5308 | |
| 5309 /************************************** | |
| 5310 * 2. MS-Windows implementation. | |
| 5311 */ | |
| 5312 | |
| 5313 # ifndef PROTO | |
| 5314 | |
| 5315 #define WINPTY_SPAWN_FLAG_AUTO_SHUTDOWN 1ul | |
| 5316 #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
|
5317 #define WINPTY_MOUSE_MODE_FORCE 2 |
| 12502 | 5318 |
| 5319 void* (*winpty_config_new)(UINT64, void*); | |
| 5320 void* (*winpty_open)(void*, void*); | |
| 5321 void* (*winpty_spawn_config_new)(UINT64, void*, LPCWSTR, void*, void*, void*); | |
| 5322 BOOL (*winpty_spawn)(void*, void*, HANDLE*, HANDLE*, DWORD*, void*); | |
| 5323 void (*winpty_config_set_mouse_mode)(void*, int); | |
| 5324 void (*winpty_config_set_initial_size)(void*, int, int); | |
| 5325 LPCWSTR (*winpty_conin_name)(void*); | |
| 5326 LPCWSTR (*winpty_conout_name)(void*); | |
| 5327 LPCWSTR (*winpty_conerr_name)(void*); | |
| 5328 void (*winpty_free)(void*); | |
| 5329 void (*winpty_config_free)(void*); | |
| 5330 void (*winpty_spawn_config_free)(void*); | |
| 5331 void (*winpty_error_free)(void*); | |
| 5332 LPCWSTR (*winpty_error_msg)(void*); | |
| 5333 BOOL (*winpty_set_size)(void*, int, int, void*); | |
| 5334 HANDLE (*winpty_agent_process)(void*); | |
| 5335 | |
| 5336 #define WINPTY_DLL "winpty.dll" | |
| 5337 | |
| 5338 static HINSTANCE hWinPtyDLL = NULL; | |
| 5339 # endif | |
| 5340 | |
| 5341 static int | |
| 5342 dyn_winpty_init(int verbose) | |
| 5343 { | |
| 5344 int i; | |
| 5345 static struct | |
| 5346 { | |
| 5347 char *name; | |
| 5348 FARPROC *ptr; | |
| 5349 } winpty_entry[] = | |
| 5350 { | |
| 5351 {"winpty_conerr_name", (FARPROC*)&winpty_conerr_name}, | |
| 5352 {"winpty_config_free", (FARPROC*)&winpty_config_free}, | |
| 5353 {"winpty_config_new", (FARPROC*)&winpty_config_new}, | |
| 5354 {"winpty_config_set_mouse_mode", | |
| 5355 (FARPROC*)&winpty_config_set_mouse_mode}, | |
| 5356 {"winpty_config_set_initial_size", | |
| 5357 (FARPROC*)&winpty_config_set_initial_size}, | |
| 5358 {"winpty_conin_name", (FARPROC*)&winpty_conin_name}, | |
| 5359 {"winpty_conout_name", (FARPROC*)&winpty_conout_name}, | |
| 5360 {"winpty_error_free", (FARPROC*)&winpty_error_free}, | |
| 5361 {"winpty_free", (FARPROC*)&winpty_free}, | |
| 5362 {"winpty_open", (FARPROC*)&winpty_open}, | |
| 5363 {"winpty_spawn", (FARPROC*)&winpty_spawn}, | |
| 5364 {"winpty_spawn_config_free", (FARPROC*)&winpty_spawn_config_free}, | |
| 5365 {"winpty_spawn_config_new", (FARPROC*)&winpty_spawn_config_new}, | |
| 5366 {"winpty_error_msg", (FARPROC*)&winpty_error_msg}, | |
| 5367 {"winpty_set_size", (FARPROC*)&winpty_set_size}, | |
| 5368 {"winpty_agent_process", (FARPROC*)&winpty_agent_process}, | |
| 5369 {NULL, NULL} | |
| 5370 }; | |
| 5371 | |
| 5372 /* No need to initialize twice. */ | |
| 5373 if (hWinPtyDLL) | |
| 5374 return OK; | |
| 5375 /* Load winpty.dll, prefer using the 'winptydll' option, fall back to just | |
| 5376 * winpty.dll. */ | |
| 5377 if (*p_winptydll != NUL) | |
| 5378 hWinPtyDLL = vimLoadLib((char *)p_winptydll); | |
| 5379 if (!hWinPtyDLL) | |
| 5380 hWinPtyDLL = vimLoadLib(WINPTY_DLL); | |
| 5381 if (!hWinPtyDLL) | |
| 5382 { | |
| 5383 if (verbose) | |
| 5384 EMSG2(_(e_loadlib), *p_winptydll != NUL ? p_winptydll | |
| 5385 : (char_u *)WINPTY_DLL); | |
| 5386 return FAIL; | |
| 5387 } | |
| 5388 for (i = 0; winpty_entry[i].name != NULL | |
| 5389 && winpty_entry[i].ptr != NULL; ++i) | |
| 5390 { | |
| 5391 if ((*winpty_entry[i].ptr = (FARPROC)GetProcAddress(hWinPtyDLL, | |
| 5392 winpty_entry[i].name)) == NULL) | |
| 5393 { | |
| 5394 if (verbose) | |
| 5395 EMSG2(_(e_loadfunc), winpty_entry[i].name); | |
| 5396 return FAIL; | |
| 5397 } | |
| 5398 } | |
| 5399 | |
| 5400 return OK; | |
| 5401 } | |
| 5402 | |
| 5403 /* | |
| 5404 * Create a new terminal of "rows" by "cols" cells. | |
| 5405 * Store a reference in "term". | |
| 5406 * Return OK or FAIL. | |
| 5407 */ | |
| 5408 static int | |
| 5409 term_and_job_init( | |
| 5410 term_T *term, | |
| 5411 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
|
5412 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
|
5413 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
|
5414 jobopt_T *orig_opt) |
| 12502 | 5415 { |
| 5416 WCHAR *cmd_wchar = NULL; | |
| 5417 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
|
5418 WCHAR *env_wchar = NULL; |
| 12502 | 5419 channel_T *channel = NULL; |
| 5420 job_T *job = NULL; | |
| 5421 DWORD error; | |
| 5422 HANDLE jo = NULL; | |
| 5423 HANDLE child_process_handle; | |
| 5424 HANDLE child_thread_handle; | |
|
13111
149347fda678
patch 8.0.1430: crash when term_start() fails
Christian Brabandt <cb@256bit.org>
parents:
13109
diff
changeset
|
5425 void *winpty_err = NULL; |
| 12502 | 5426 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
|
5427 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
|
5428 char_u *cmd = NULL; |
| 12502 | 5429 |
| 5430 if (dyn_winpty_init(TRUE) == FAIL) | |
| 5431 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
|
5432 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
|
5433 ga_init2(&ga_env, (int)sizeof(char*), 20); |
| 12502 | 5434 |
| 5435 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
|
5436 { |
| 12502 | 5437 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
|
5438 } |
|
fb1b162cdcf6
patch 8.0.1429: crash when calling term_start() with empty argument
Christian Brabandt <cb@256bit.org>
parents:
13000
diff
changeset
|
5439 else if (argvar->v_type == VAR_LIST) |
| 12502 | 5440 { |
|
12724
17c257dd2438
patch 8.0.1240: MS-Windows: term_start() does not support environment
Christian Brabandt <cb@256bit.org>
parents:
12650
diff
changeset
|
5441 if (win32_build_cmd(argvar->vval.v_list, &ga_cmd) == FAIL) |
| 12502 | 5442 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
|
5443 cmd = ga_cmd.ga_data; |
| 12502 | 5444 } |
|
13109
fb1b162cdcf6
patch 8.0.1429: crash when calling term_start() with empty argument
Christian Brabandt <cb@256bit.org>
parents:
13000
diff
changeset
|
5445 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
|
5446 { |
|
fb1b162cdcf6
patch 8.0.1429: crash when calling term_start() with empty argument
Christian Brabandt <cb@256bit.org>
parents:
13000
diff
changeset
|
5447 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
|
5448 goto failed; |
|
fb1b162cdcf6
patch 8.0.1429: crash when calling term_start() with empty argument
Christian Brabandt <cb@256bit.org>
parents:
13000
diff
changeset
|
5449 } |
| 12502 | 5450 |
| 5451 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
|
5452 ga_clear(&ga_cmd); |
| 12502 | 5453 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
|
5454 goto failed; |
| 12502 | 5455 if (opt->jo_cwd != NULL) |
| 5456 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
|
5457 |
|
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
|
5458 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
|
5459 env_wchar = ga_env.ga_data; |
| 12502 | 5460 |
| 5461 term->tl_winpty_config = winpty_config_new(0, &winpty_err); | |
| 5462 if (term->tl_winpty_config == NULL) | |
| 5463 goto failed; | |
| 5464 | |
| 5465 winpty_config_set_mouse_mode(term->tl_winpty_config, | |
| 5466 WINPTY_MOUSE_MODE_FORCE); | |
| 5467 winpty_config_set_initial_size(term->tl_winpty_config, | |
| 5468 term->tl_cols, term->tl_rows); | |
| 5469 term->tl_winpty = winpty_open(term->tl_winpty_config, &winpty_err); | |
| 5470 if (term->tl_winpty == NULL) | |
| 5471 goto failed; | |
| 5472 | |
| 5473 spawn_config = winpty_spawn_config_new( | |
| 5474 WINPTY_SPAWN_FLAG_AUTO_SHUTDOWN | | |
| 5475 WINPTY_SPAWN_FLAG_EXIT_AFTER_SHUTDOWN, | |
| 5476 NULL, | |
| 5477 cmd_wchar, | |
| 5478 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
|
5479 env_wchar, |
| 12502 | 5480 &winpty_err); |
| 5481 if (spawn_config == NULL) | |
| 5482 goto failed; | |
| 5483 | |
| 5484 channel = add_channel(); | |
| 5485 if (channel == NULL) | |
| 5486 goto failed; | |
| 5487 | |
| 5488 job = job_alloc(); | |
| 5489 if (job == NULL) | |
| 5490 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
|
5491 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
|
5492 { |
|
3ab6198c1f9a
patch 8.0.1747: MS-Windows: term_start() does not set job_info() cmd
Christian Brabandt <cb@256bit.org>
parents:
13746
diff
changeset
|
5493 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
|
5494 |
|
3ab6198c1f9a
patch 8.0.1747: MS-Windows: term_start() does not set job_info() cmd
Christian Brabandt <cb@256bit.org>
parents:
13746
diff
changeset
|
5495 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
|
5496 } |
|
3ab6198c1f9a
patch 8.0.1747: MS-Windows: term_start() does not set job_info() cmd
Christian Brabandt <cb@256bit.org>
parents:
13746
diff
changeset
|
5497 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
|
5498 { |
|
3ab6198c1f9a
patch 8.0.1747: MS-Windows: term_start() does not set job_info() cmd
Christian Brabandt <cb@256bit.org>
parents:
13746
diff
changeset
|
5499 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
|
5500 |
|
3ab6198c1f9a
patch 8.0.1747: MS-Windows: term_start() does not set job_info() cmd
Christian Brabandt <cb@256bit.org>
parents:
13746
diff
changeset
|
5501 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
|
5502 } |
| 12502 | 5503 |
| 5504 if (opt->jo_set & JO_IN_BUF) | |
| 5505 job->jv_in_buf = buflist_findnr(opt->jo_io_buf[PART_IN]); | |
| 5506 | |
| 5507 if (!winpty_spawn(term->tl_winpty, spawn_config, &child_process_handle, | |
| 5508 &child_thread_handle, &error, &winpty_err)) | |
| 5509 goto failed; | |
| 5510 | |
| 5511 channel_set_pipes(channel, | |
| 5512 (sock_T)CreateFileW( | |
| 5513 winpty_conin_name(term->tl_winpty), | |
| 5514 GENERIC_WRITE, 0, NULL, | |
| 5515 OPEN_EXISTING, 0, NULL), | |
| 5516 (sock_T)CreateFileW( | |
| 5517 winpty_conout_name(term->tl_winpty), | |
| 5518 GENERIC_READ, 0, NULL, | |
| 5519 OPEN_EXISTING, 0, NULL), | |
| 5520 (sock_T)CreateFileW( | |
| 5521 winpty_conerr_name(term->tl_winpty), | |
| 5522 GENERIC_READ, 0, NULL, | |
| 5523 OPEN_EXISTING, 0, NULL)); | |
| 5524 | |
| 5525 /* Write lines with CR instead of NL. */ | |
| 5526 channel->ch_write_text_mode = TRUE; | |
| 5527 | |
| 5528 jo = CreateJobObject(NULL, NULL); | |
| 5529 if (jo == NULL) | |
| 5530 goto failed; | |
| 5531 | |
| 5532 if (!AssignProcessToJobObject(jo, child_process_handle)) | |
| 5533 { | |
| 5534 /* Failed, switch the way to terminate process with TerminateProcess. */ | |
| 5535 CloseHandle(jo); | |
| 5536 jo = NULL; | |
| 5537 } | |
| 5538 | |
| 5539 winpty_spawn_config_free(spawn_config); | |
| 5540 vim_free(cmd_wchar); | |
| 5541 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
|
5542 vim_free(env_wchar); |
| 12502 | 5543 |
| 5544 create_vterm(term, term->tl_rows, term->tl_cols); | |
| 5545 | |
|
13626
ab89131d30e0
patch 8.0.1685: can't set ANSI colors of a terminal window
Christian Brabandt <cb@256bit.org>
parents:
13624
diff
changeset
|
5546 #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
|
5547 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
|
5548 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
|
5549 else |
|
ab89131d30e0
patch 8.0.1685: can't set ANSI colors of a terminal window
Christian Brabandt <cb@256bit.org>
parents:
13624
diff
changeset
|
5550 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
|
5551 #endif |
|
ab89131d30e0
patch 8.0.1685: can't set ANSI colors of a terminal window
Christian Brabandt <cb@256bit.org>
parents:
13624
diff
changeset
|
5552 |
| 12502 | 5553 channel_set_job(channel, job, opt); |
| 5554 job_set_options(job, opt); | |
| 5555 | |
| 5556 job->jv_channel = channel; | |
| 5557 job->jv_proc_info.hProcess = child_process_handle; | |
| 5558 job->jv_proc_info.dwProcessId = GetProcessId(child_process_handle); | |
| 5559 job->jv_job_object = jo; | |
| 5560 job->jv_status = JOB_STARTED; | |
| 5561 job->jv_tty_in = utf16_to_enc( | |
| 5562 (short_u*)winpty_conin_name(term->tl_winpty), NULL); | |
| 5563 job->jv_tty_out = utf16_to_enc( | |
| 5564 (short_u*)winpty_conout_name(term->tl_winpty), NULL); | |
| 5565 ++job->jv_refcount; | |
| 5566 term->tl_job = job; | |
| 5567 | |
|
13860
7f892e37b017
patch 8.0.1801: MS-Windows: redirecting terminal output does not work
Christian Brabandt <cb@256bit.org>
parents:
13851
diff
changeset
|
5568 /* 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
|
5569 * 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
|
5570 * 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
|
5571 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
|
5572 { |
|
7f892e37b017
patch 8.0.1801: MS-Windows: redirecting terminal output does not work
Christian Brabandt <cb@256bit.org>
parents:
13851
diff
changeset
|
5573 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
|
5574 |
|
7f892e37b017
patch 8.0.1801: MS-Windows: redirecting terminal output does not work
Christian Brabandt <cb@256bit.org>
parents:
13851
diff
changeset
|
5575 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
|
5576 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
|
5577 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
|
5578 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
|
5579 } |
|
7f892e37b017
patch 8.0.1801: MS-Windows: redirecting terminal output does not work
Christian Brabandt <cb@256bit.org>
parents:
13851
diff
changeset
|
5580 |
| 12502 | 5581 return OK; |
| 5582 | |
| 5583 failed: | |
|
13109
fb1b162cdcf6
patch 8.0.1429: crash when calling term_start() with empty argument
Christian Brabandt <cb@256bit.org>
parents:
13000
diff
changeset
|
5584 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
|
5585 ga_clear(&ga_env); |
| 12502 | 5586 vim_free(cmd_wchar); |
| 5587 vim_free(cwd_wchar); | |
| 5588 if (spawn_config != NULL) | |
| 5589 winpty_spawn_config_free(spawn_config); | |
| 5590 if (channel != NULL) | |
| 5591 channel_clear(channel); | |
| 5592 if (job != NULL) | |
| 5593 { | |
| 5594 job->jv_channel = NULL; | |
| 5595 job_cleanup(job); | |
| 5596 } | |
| 5597 term->tl_job = NULL; | |
| 5598 if (jo != NULL) | |
| 5599 CloseHandle(jo); | |
| 5600 if (term->tl_winpty != NULL) | |
| 5601 winpty_free(term->tl_winpty); | |
| 5602 term->tl_winpty = NULL; | |
| 5603 if (term->tl_winpty_config != NULL) | |
| 5604 winpty_config_free(term->tl_winpty_config); | |
| 5605 term->tl_winpty_config = NULL; | |
| 5606 if (winpty_err != NULL) | |
| 5607 { | |
| 5608 char_u *msg = utf16_to_enc( | |
| 5609 (short_u *)winpty_error_msg(winpty_err), NULL); | |
| 5610 | |
| 5611 EMSG(msg); | |
| 5612 winpty_error_free(winpty_err); | |
| 5613 } | |
| 5614 return FAIL; | |
| 5615 } | |
| 5616 | |
| 5617 static int | |
| 5618 create_pty_only(term_T *term, jobopt_T *options) | |
| 5619 { | |
| 5620 HANDLE hPipeIn = INVALID_HANDLE_VALUE; | |
| 5621 HANDLE hPipeOut = INVALID_HANDLE_VALUE; | |
| 5622 char in_name[80], out_name[80]; | |
| 5623 channel_T *channel = NULL; | |
| 5624 | |
| 5625 create_vterm(term, term->tl_rows, term->tl_cols); | |
| 5626 | |
| 5627 vim_snprintf(in_name, sizeof(in_name), "\\\\.\\pipe\\vim-%d-in-%d", | |
| 5628 GetCurrentProcessId(), | |
| 5629 curbuf->b_fnum); | |
| 5630 hPipeIn = CreateNamedPipe(in_name, PIPE_ACCESS_OUTBOUND, | |
| 5631 PIPE_TYPE_MESSAGE | PIPE_NOWAIT, | |
| 5632 PIPE_UNLIMITED_INSTANCES, | |
| 5633 0, 0, NMPWAIT_NOWAIT, NULL); | |
| 5634 if (hPipeIn == INVALID_HANDLE_VALUE) | |
| 5635 goto failed; | |
| 5636 | |
| 5637 vim_snprintf(out_name, sizeof(out_name), "\\\\.\\pipe\\vim-%d-out-%d", | |
| 5638 GetCurrentProcessId(), | |
| 5639 curbuf->b_fnum); | |
| 5640 hPipeOut = CreateNamedPipe(out_name, PIPE_ACCESS_INBOUND, | |
| 5641 PIPE_TYPE_MESSAGE | PIPE_NOWAIT, | |
| 5642 PIPE_UNLIMITED_INSTANCES, | |
| 5643 0, 0, 0, NULL); | |
| 5644 if (hPipeOut == INVALID_HANDLE_VALUE) | |
| 5645 goto failed; | |
| 5646 | |
| 5647 ConnectNamedPipe(hPipeIn, NULL); | |
| 5648 ConnectNamedPipe(hPipeOut, NULL); | |
| 5649 | |
| 5650 term->tl_job = job_alloc(); | |
| 5651 if (term->tl_job == NULL) | |
| 5652 goto failed; | |
| 5653 ++term->tl_job->jv_refcount; | |
| 5654 | |
| 5655 /* behave like the job is already finished */ | |
| 5656 term->tl_job->jv_status = JOB_FINISHED; | |
| 5657 | |
| 5658 channel = add_channel(); | |
| 5659 if (channel == NULL) | |
| 5660 goto failed; | |
| 5661 term->tl_job->jv_channel = channel; | |
| 5662 channel->ch_keep_open = TRUE; | |
| 5663 channel->ch_named_pipe = TRUE; | |
| 5664 | |
| 5665 channel_set_pipes(channel, | |
| 5666 (sock_T)hPipeIn, | |
| 5667 (sock_T)hPipeOut, | |
| 5668 (sock_T)hPipeOut); | |
| 5669 channel_set_job(channel, term->tl_job, options); | |
| 5670 term->tl_job->jv_tty_in = vim_strsave((char_u*)in_name); | |
| 5671 term->tl_job->jv_tty_out = vim_strsave((char_u*)out_name); | |
| 5672 | |
| 5673 return OK; | |
| 5674 | |
| 5675 failed: | |
| 5676 if (hPipeIn != NULL) | |
| 5677 CloseHandle(hPipeIn); | |
| 5678 if (hPipeOut != NULL) | |
| 5679 CloseHandle(hPipeOut); | |
| 5680 return FAIL; | |
| 5681 } | |
| 5682 | |
| 5683 /* | |
| 5684 * Free the terminal emulator part of "term". | |
| 5685 */ | |
| 5686 static void | |
| 5687 term_free_vterm(term_T *term) | |
| 5688 { | |
| 5689 if (term->tl_winpty != NULL) | |
| 5690 winpty_free(term->tl_winpty); | |
| 5691 term->tl_winpty = NULL; | |
| 5692 if (term->tl_winpty_config != NULL) | |
| 5693 winpty_config_free(term->tl_winpty_config); | |
| 5694 term->tl_winpty_config = NULL; | |
| 5695 if (term->tl_vterm != NULL) | |
| 5696 vterm_free(term->tl_vterm); | |
| 5697 term->tl_vterm = NULL; | |
| 5698 } | |
| 5699 | |
| 5700 /* | |
|
13678
39fcaaa973db
patch 8.0.1711: term_setsize() is not implemented yet
Christian Brabandt <cb@256bit.org>
parents:
13668
diff
changeset
|
5701 * Report the size to the terminal. |
| 12502 | 5702 */ |
| 5703 static void | |
| 5704 term_report_winsize(term_T *term, int rows, int cols) | |
| 5705 { | |
| 5706 if (term->tl_winpty) | |
| 5707 winpty_set_size(term->tl_winpty, cols, rows, NULL); | |
| 5708 } | |
| 5709 | |
| 5710 int | |
| 5711 terminal_enabled(void) | |
| 5712 { | |
| 5713 return dyn_winpty_init(FALSE) == OK; | |
| 5714 } | |
| 5715 | |
| 5716 # else | |
| 5717 | |
| 5718 /************************************** | |
| 5719 * 3. Unix-like implementation. | |
| 5720 */ | |
| 5721 | |
| 5722 /* | |
| 5723 * Create a new terminal of "rows" by "cols" cells. | |
| 5724 * Start job for "cmd". | |
| 5725 * 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
|
5726 * When "argv" is not NULL then "argvar" is not used. |
| 12502 | 5727 * Return OK or FAIL. |
| 5728 */ | |
| 5729 static int | |
| 5730 term_and_job_init( | |
| 5731 term_T *term, | |
| 5732 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
|
5733 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
|
5734 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
|
5735 jobopt_T *orig_opt UNUSED) |
| 12502 | 5736 { |
| 5737 create_vterm(term, term->tl_rows, term->tl_cols); | |
| 5738 | |
|
13626
ab89131d30e0
patch 8.0.1685: can't set ANSI colors of a terminal window
Christian Brabandt <cb@256bit.org>
parents:
13624
diff
changeset
|
5739 #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
|
5740 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
|
5741 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
|
5742 else |
|
ab89131d30e0
patch 8.0.1685: can't set ANSI colors of a terminal window
Christian Brabandt <cb@256bit.org>
parents:
13624
diff
changeset
|
5743 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
|
5744 #endif |
|
ab89131d30e0
patch 8.0.1685: can't set ANSI colors of a terminal window
Christian Brabandt <cb@256bit.org>
parents:
13624
diff
changeset
|
5745 |
|
13470
6faef782f50b
patch 8.0.1609: shell commands in the GUI use a dumb terminal
Christian Brabandt <cb@256bit.org>
parents:
13458
diff
changeset
|
5746 /* This may change a string in "argvar". */ |
|
6faef782f50b
patch 8.0.1609: shell commands in the GUI use a dumb terminal
Christian Brabandt <cb@256bit.org>
parents:
13458
diff
changeset
|
5747 term->tl_job = job_start(argvar, argv, opt); |
| 12502 | 5748 if (term->tl_job != NULL) |
| 5749 ++term->tl_job->jv_refcount; | |
| 5750 | |
| 5751 return term->tl_job != NULL | |
| 5752 && term->tl_job->jv_channel != NULL | |
| 5753 && term->tl_job->jv_status != JOB_FAILED ? OK : FAIL; | |
| 5754 } | |
| 5755 | |
| 5756 static int | |
| 5757 create_pty_only(term_T *term, jobopt_T *opt) | |
| 5758 { | |
| 5759 create_vterm(term, term->tl_rows, term->tl_cols); | |
| 5760 | |
| 5761 term->tl_job = job_alloc(); | |
| 5762 if (term->tl_job == NULL) | |
| 5763 return FAIL; | |
| 5764 ++term->tl_job->jv_refcount; | |
| 5765 | |
| 5766 /* behave like the job is already finished */ | |
| 5767 term->tl_job->jv_status = JOB_FINISHED; | |
| 5768 | |
| 5769 return mch_create_pty_channel(term->tl_job, opt); | |
| 5770 } | |
| 5771 | |
| 5772 /* | |
| 5773 * Free the terminal emulator part of "term". | |
| 5774 */ | |
| 5775 static void | |
| 5776 term_free_vterm(term_T *term) | |
| 5777 { | |
| 5778 if (term->tl_vterm != NULL) | |
| 5779 vterm_free(term->tl_vterm); | |
| 5780 term->tl_vterm = NULL; | |
| 5781 } | |
| 5782 | |
| 5783 /* | |
|
13678
39fcaaa973db
patch 8.0.1711: term_setsize() is not implemented yet
Christian Brabandt <cb@256bit.org>
parents:
13668
diff
changeset
|
5784 * Report the size to the terminal. |
| 12502 | 5785 */ |
| 5786 static void | |
| 5787 term_report_winsize(term_T *term, int rows, int cols) | |
| 5788 { | |
| 5789 /* Use an ioctl() to report the new window size to the job. */ | |
| 5790 if (term->tl_job != NULL && term->tl_job->jv_channel != NULL) | |
| 5791 { | |
| 5792 int fd = -1; | |
| 5793 int part; | |
| 5794 | |
| 5795 for (part = PART_OUT; part < PART_COUNT; ++part) | |
| 5796 { | |
| 5797 fd = term->tl_job->jv_channel->ch_part[part].ch_fd; | |
| 5798 if (isatty(fd)) | |
| 5799 break; | |
| 5800 } | |
| 5801 if (part < PART_COUNT && mch_report_winsize(fd, rows, cols) == OK) | |
| 5802 mch_signal_job(term->tl_job, (char_u *)"winch"); | |
| 5803 } | |
| 5804 } | |
| 5805 | |
| 5806 # endif | |
| 5807 | |
| 5808 #endif /* FEAT_TERMINAL */ |