Mercurial > vim
annotate src/screen.c @ 15629:dd2e0b83a660
patch 8.1.0822: peeking and flushing output slows down execution
commit https://github.com/vim/vim/commit/cb574f415486adff645ce384979bfecf27f5be8c
Author: Bram Moolenaar <Bram@vim.org>
Date: Fri Jan 25 22:29:57 2019 +0100
patch 8.1.0822: peeking and flushing output slows down execution
Problem: Peeking and flushing output slows down execution.
Solution: Do not update the mode message when global_busy is set. Do not
flush when only peeking for a character. (Ken Takata)
| author | Bram Moolenaar <Bram@vim.org> |
|---|---|
| date | Fri, 25 Jan 2019 22:30:13 +0100 |
| parents | b440c7becbca |
| children | 6f1c7e9a6393 |
| rev | line source |
|---|---|
|
10042
4aead6a9b7a9
commit https://github.com/vim/vim/commit/edf3f97ae2af024708ebb4ac614227327033ca47
Christian Brabandt <cb@256bit.org>
parents:
9992
diff
changeset
|
1 /* vi:set ts=8 sts=4 sw=4 noet: |
| 7 | 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 * screen.c: code for displaying on the screen | |
| 12 * | |
| 13 * Output to the screen (console, terminal emulator or GUI window) is minimized | |
| 14 * by remembering what is already on the screen, and only updating the parts | |
| 15 * that changed. | |
| 16 * | |
| 17 * ScreenLines[off] Contains a copy of the whole screen, as it is currently | |
| 18 * displayed (excluding text written by external commands). | |
| 19 * ScreenAttrs[off] Contains the associated attributes. | |
| 20 * LineOffset[row] Contains the offset into ScreenLines*[] and ScreenAttrs[] | |
| 21 * for each line. | |
| 22 * LineWraps[row] Flag for each line whether it wraps to the next line. | |
| 23 * | |
| 24 * For double-byte characters, two consecutive bytes in ScreenLines[] can form | |
| 25 * one character which occupies two display cells. | |
| 26 * For UTF-8 a multi-byte character is converted to Unicode and stored in | |
| 27 * ScreenLinesUC[]. ScreenLines[] contains the first byte only. For an ASCII | |
|
2124
dc8a5699253b
updated for version 7.2.406
Bram Moolenaar <bram@zimbu.org>
parents:
2122
diff
changeset
|
28 * character without composing chars ScreenLinesUC[] will be 0 and |
|
dc8a5699253b
updated for version 7.2.406
Bram Moolenaar <bram@zimbu.org>
parents:
2122
diff
changeset
|
29 * ScreenLinesC[][] is not used. When the character occupies two display |
|
dc8a5699253b
updated for version 7.2.406
Bram Moolenaar <bram@zimbu.org>
parents:
2122
diff
changeset
|
30 * cells the next byte in ScreenLines[] is 0. |
| 714 | 31 * ScreenLinesC[][] contain up to 'maxcombine' composing characters |
|
2124
dc8a5699253b
updated for version 7.2.406
Bram Moolenaar <bram@zimbu.org>
parents:
2122
diff
changeset
|
32 * (drawn on top of the first character). There is 0 after the last one used. |
| 7 | 33 * ScreenLines2[] is only used for euc-jp to store the second byte if the |
| 34 * first byte is 0x8e (single-width character). | |
| 35 * | |
| 36 * The screen_*() functions write to the screen and handle updating | |
| 37 * ScreenLines[]. | |
| 38 * | |
| 39 * update_screen() is the function that updates all windows and status lines. | |
| 40 * It is called form the main loop when must_redraw is non-zero. It may be | |
| 1213 | 41 * called from other places when an immediate screen update is needed. |
| 7 | 42 * |
| 43 * The part of the buffer that is displayed in a window is set with: | |
| 44 * - w_topline (first buffer line in window) | |
| 5946 | 45 * - w_topfill (filler lines above the first line) |
| 7 | 46 * - w_leftcol (leftmost window cell in window), |
| 47 * - w_skipcol (skipped window cells of first line) | |
| 48 * | |
| 49 * Commands that only move the cursor around in a window, do not need to take | |
| 50 * action to update the display. The main loop will check if w_topline is | |
| 51 * valid and update it (scroll the window) when needed. | |
| 52 * | |
| 53 * Commands that scroll a window change w_topline and must call | |
| 54 * check_cursor() to move the cursor into the visible part of the window, and | |
| 55 * call redraw_later(VALID) to have the window displayed by update_screen() | |
| 56 * later. | |
| 57 * | |
| 58 * Commands that change text in the buffer must call changed_bytes() or | |
| 59 * changed_lines() to mark the area that changed and will require updating | |
| 60 * later. The main loop will call update_screen(), which will update each | |
| 61 * window that shows the changed buffer. This assumes text above the change | |
| 62 * can remain displayed as it is. Text after the change may need updating for | |
| 63 * scrolling, folding and syntax highlighting. | |
| 64 * | |
| 65 * Commands that change how a window is displayed (e.g., setting 'list') or | |
| 66 * invalidate the contents of a window in another way (e.g., change fold | |
| 67 * settings), must call redraw_later(NOT_VALID) to have the whole window | |
| 68 * redisplayed by update_screen() later. | |
| 69 * | |
| 70 * Commands that change how a buffer is displayed (e.g., setting 'tabstop') | |
| 71 * must call redraw_curbuf_later(NOT_VALID) to have all the windows for the | |
| 72 * buffer redisplayed by update_screen() later. | |
| 73 * | |
| 743 | 74 * Commands that change highlighting and possibly cause a scroll too must call |
| 75 * redraw_later(SOME_VALID) to update the whole window but still use scrolling | |
| 76 * to avoid redrawing everything. But the length of displayed lines must not | |
| 77 * change, use NOT_VALID then. | |
| 78 * | |
| 7 | 79 * Commands that move the window position must call redraw_later(NOT_VALID). |
| 80 * TODO: should minimize redrawing by scrolling when possible. | |
| 81 * | |
| 82 * Commands that change everything (e.g., resizing the screen) must call | |
| 83 * redraw_all_later(NOT_VALID) or redraw_all_later(CLEAR). | |
| 84 * | |
| 85 * Things that are handled indirectly: | |
| 86 * - When messages scroll the screen up, msg_scrolled will be set and | |
| 87 * update_screen() called to redraw. | |
| 88 */ | |
| 89 | |
| 90 #include "vim.h" | |
| 91 | |
| 3586 | 92 #define MB_FILLER_CHAR '<' /* character used when a double-width character |
| 93 * doesn't fit. */ | |
| 94 | |
| 7 | 95 /* |
| 96 * The attributes that are actually active for writing to the screen. | |
| 97 */ | |
| 98 static int screen_attr = 0; | |
| 99 | |
| 100 /* | |
| 101 * Positioning the cursor is reduced by remembering the last position. | |
| 102 * Mostly used by windgoto() and screen_char(). | |
| 103 */ | |
| 104 static int screen_cur_row, screen_cur_col; /* last known cursor position */ | |
| 105 | |
| 106 #ifdef FEAT_SEARCH_EXTRA | |
| 107 static match_T search_hl; /* used for 'hlsearch' highlight matching */ | |
| 108 #endif | |
| 109 | |
| 110 #ifdef FEAT_FOLDING | |
| 111 static foldinfo_T win_foldinfo; /* info for 'foldcolumn' */ | |
|
7805
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7697
diff
changeset
|
112 static int compute_foldcolumn(win_T *wp, int col); |
| 7 | 113 #endif |
| 114 | |
|
11698
4f59d2a66bf7
patch 8.0.0732: when updating a buffer modeless selection is lost
Christian Brabandt <cb@256bit.org>
parents:
11672
diff
changeset
|
115 /* Flag that is set when drawing for a callback, not from the main command |
|
4f59d2a66bf7
patch 8.0.0732: when updating a buffer modeless selection is lost
Christian Brabandt <cb@256bit.org>
parents:
11672
diff
changeset
|
116 * loop. */ |
|
4f59d2a66bf7
patch 8.0.0732: when updating a buffer modeless selection is lost
Christian Brabandt <cb@256bit.org>
parents:
11672
diff
changeset
|
117 static int redrawing_for_callback = 0; |
|
4f59d2a66bf7
patch 8.0.0732: when updating a buffer modeless selection is lost
Christian Brabandt <cb@256bit.org>
parents:
11672
diff
changeset
|
118 |
| 7 | 119 /* |
| 120 * Buffer for one screen line (characters and attributes). | |
| 121 */ | |
| 122 static schar_T *current_ScreenLine; | |
| 123 | |
|
7805
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7697
diff
changeset
|
124 static void win_update(win_T *wp); |
|
14079
b5e43a048878
patch 8.1.0057: popup menu displayed wrong when using autocmd
Christian Brabandt <cb@256bit.org>
parents:
14004
diff
changeset
|
125 static void win_redr_status(win_T *wp, int ignore_pum); |
|
7805
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7697
diff
changeset
|
126 static void win_draw_end(win_T *wp, int c1, int c2, int row, int endrow, hlf_T hl); |
| 7 | 127 #ifdef FEAT_FOLDING |
|
7805
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7697
diff
changeset
|
128 static void fold_line(win_T *wp, long fold_count, foldinfo_T *foldinfo, linenr_T lnum, int row); |
|
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7697
diff
changeset
|
129 static void fill_foldcolumn(char_u *p, win_T *wp, int closed, linenr_T lnum); |
|
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7697
diff
changeset
|
130 static void copy_text_attr(int off, char_u *buf, int len, int attr); |
|
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7697
diff
changeset
|
131 #endif |
|
14724
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
132 static int win_line(win_T *, linenr_T, int, int, int nochange, int number_only); |
|
7805
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7697
diff
changeset
|
133 static void draw_vsep_win(win_T *wp, int row); |
| 680 | 134 #ifdef FEAT_STL_OPT |
|
7805
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7697
diff
changeset
|
135 static void redraw_custom_statusline(win_T *wp); |
| 680 | 136 #endif |
| 7 | 137 #ifdef FEAT_SEARCH_EXTRA |
| 5985 | 138 # define SEARCH_HL_PRIORITY 0 |
|
7805
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7697
diff
changeset
|
139 static void start_search_hl(void); |
|
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7697
diff
changeset
|
140 static void end_search_hl(void); |
|
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7697
diff
changeset
|
141 static void init_search_hl(win_T *wp); |
|
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7697
diff
changeset
|
142 static void prepare_search_hl(win_T *wp, linenr_T lnum); |
|
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7697
diff
changeset
|
143 static void next_search_hl(win_T *win, match_T *shl, linenr_T lnum, colnr_T mincol, matchitem_T *cur); |
|
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7697
diff
changeset
|
144 static int next_search_hl_pos(match_T *shl, linenr_T lnum, posmatch_T *pos, colnr_T mincol); |
|
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7697
diff
changeset
|
145 #endif |
|
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7697
diff
changeset
|
146 static void screen_char(unsigned off, int row, int col); |
|
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7697
diff
changeset
|
147 static void screen_char_2(unsigned off, int row, int col); |
|
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7697
diff
changeset
|
148 static void screenclear2(void); |
|
12152
69af108df70e
patch 8.0.0956: scrolling in a terminal window has flicker
Christian Brabandt <cb@256bit.org>
parents:
12122
diff
changeset
|
149 static void lineclear(unsigned off, int width, int attr); |
|
7805
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7697
diff
changeset
|
150 static void lineinvalid(unsigned off, int width); |
|
12152
69af108df70e
patch 8.0.0956: scrolling in a terminal window has flicker
Christian Brabandt <cb@256bit.org>
parents:
12122
diff
changeset
|
151 static int win_do_lines(win_T *wp, int row, int line_count, int mayclear, int del, int clear_attr); |
|
7805
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7697
diff
changeset
|
152 static void win_rest_invalid(win_T *wp); |
|
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7697
diff
changeset
|
153 static void msg_pos_mode(void); |
|
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7697
diff
changeset
|
154 static void recording_mode(int attr); |
|
11890
318ae82d8ba4
patch 8.0.0825: not easy to see that a window is a terminal window
Christian Brabandt <cb@256bit.org>
parents:
11866
diff
changeset
|
155 static int fillchar_status(int *attr, win_T *wp); |
|
7805
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7697
diff
changeset
|
156 static int fillchar_vsep(int *attr); |
|
12487
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
157 #ifdef FEAT_MENU |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
158 static void redraw_win_toolbar(win_T *wp); |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
159 #endif |
| 7 | 160 #ifdef FEAT_STL_OPT |
|
7805
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7697
diff
changeset
|
161 static void win_redr_custom(win_T *wp, int draw_ruler); |
| 7 | 162 #endif |
| 163 #ifdef FEAT_CMDL_INFO | |
|
14089
ae53a9274f50
patch 8.1.0062: popup menu broken if a callback changes the window layout
Christian Brabandt <cb@256bit.org>
parents:
14081
diff
changeset
|
164 static void win_redr_ruler(win_T *wp, int always, int ignore_pum); |
| 7 | 165 #endif |
| 166 | |
| 167 /* Ugly global: overrule attribute used by screen_char() */ | |
| 168 static int screen_char_attr = 0; | |
| 169 | |
|
11529
998d2cf59caa
patch 8.0.0647: syntax highlighting can make cause a freeze
Christian Brabandt <cb@256bit.org>
parents:
11521
diff
changeset
|
170 #if defined(FEAT_SYN_HL) && defined(FEAT_RELTIME) |
|
998d2cf59caa
patch 8.0.0647: syntax highlighting can make cause a freeze
Christian Brabandt <cb@256bit.org>
parents:
11521
diff
changeset
|
171 /* Can limit syntax highlight time to 'redrawtime'. */ |
|
998d2cf59caa
patch 8.0.0647: syntax highlighting can make cause a freeze
Christian Brabandt <cb@256bit.org>
parents:
11521
diff
changeset
|
172 # define SYN_TIME_LIMIT 1 |
|
998d2cf59caa
patch 8.0.0647: syntax highlighting can make cause a freeze
Christian Brabandt <cb@256bit.org>
parents:
11521
diff
changeset
|
173 #endif |
|
998d2cf59caa
patch 8.0.0647: syntax highlighting can make cause a freeze
Christian Brabandt <cb@256bit.org>
parents:
11521
diff
changeset
|
174 |
|
11672
3c6cc2f24645
patch 8.0.0719: build failure without +terminal feature
Christian Brabandt <cb@256bit.org>
parents:
11670
diff
changeset
|
175 #ifdef FEAT_RIGHTLEFT |
|
3c6cc2f24645
patch 8.0.0719: build failure without +terminal feature
Christian Brabandt <cb@256bit.org>
parents:
11670
diff
changeset
|
176 # define HAS_RIGHTLEFT(x) x |
|
3c6cc2f24645
patch 8.0.0719: build failure without +terminal feature
Christian Brabandt <cb@256bit.org>
parents:
11670
diff
changeset
|
177 #else |
|
3c6cc2f24645
patch 8.0.0719: build failure without +terminal feature
Christian Brabandt <cb@256bit.org>
parents:
11670
diff
changeset
|
178 # define HAS_RIGHTLEFT(x) FALSE |
|
3c6cc2f24645
patch 8.0.0719: build failure without +terminal feature
Christian Brabandt <cb@256bit.org>
parents:
11670
diff
changeset
|
179 #endif |
|
3c6cc2f24645
patch 8.0.0719: build failure without +terminal feature
Christian Brabandt <cb@256bit.org>
parents:
11670
diff
changeset
|
180 |
| 7 | 181 /* |
| 182 * Redraw the current window later, with update_screen(type). | |
| 183 * Set must_redraw only if not already set to a higher value. | |
|
15521
6d949e552e99
patch 8.1.0768: updating completions may cause the popup menu to flicker
Bram Moolenaar <Bram@vim.org>
parents:
15502
diff
changeset
|
184 * E.g. if must_redraw is CLEAR, type NOT_VALID will do nothing. |
| 7 | 185 */ |
| 186 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
187 redraw_later(int type) |
| 7 | 188 { |
| 189 redraw_win_later(curwin, type); | |
| 190 } | |
| 191 | |
| 192 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
193 redraw_win_later( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
194 win_T *wp, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
195 int type) |
| 7 | 196 { |
|
12672
4e846c9d61a8
patch 8.0.1214: accessing freed memory when EXITFREE is set
Christian Brabandt <cb@256bit.org>
parents:
12582
diff
changeset
|
197 if (!exiting && wp->w_redr_type < type) |
| 7 | 198 { |
| 199 wp->w_redr_type = type; | |
| 200 if (type >= NOT_VALID) | |
| 201 wp->w_lines_valid = 0; | |
| 202 if (must_redraw < type) /* must_redraw is the maximum of all windows */ | |
| 203 must_redraw = type; | |
| 204 } | |
| 205 } | |
| 206 | |
| 207 /* | |
| 208 * Force a complete redraw later. Also resets the highlighting. To be used | |
| 209 * after executing a shell command that messes up the screen. | |
| 210 */ | |
| 211 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
212 redraw_later_clear(void) |
| 7 | 213 { |
| 214 redraw_all_later(CLEAR); | |
| 826 | 215 #ifdef FEAT_GUI |
| 216 if (gui.in_use) | |
| 217 /* Use a code that will reset gui.highlight_mask in | |
| 218 * gui_stop_highlight(). */ | |
| 219 screen_attr = HL_ALL + 1; | |
| 220 else | |
| 221 #endif | |
| 222 /* Use attributes that is very unlikely to appear in text. */ | |
|
12317
2a8890b80923
patch 8.0.1038: strike-through text not supported
Christian Brabandt <cb@256bit.org>
parents:
12293
diff
changeset
|
223 screen_attr = HL_BOLD | HL_UNDERLINE | HL_INVERSE | HL_STRIKETHROUGH; |
| 7 | 224 } |
| 225 | |
| 226 /* | |
| 227 * Mark all windows to be redrawn later. | |
| 228 */ | |
| 229 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
230 redraw_all_later(int type) |
| 7 | 231 { |
| 232 win_T *wp; | |
| 233 | |
| 234 FOR_ALL_WINDOWS(wp) | |
| 235 { | |
| 236 redraw_win_later(wp, type); | |
| 237 } | |
|
15384
a4fb69fd62a6
patch 8.1.0700: using "gt" sometimes does not redraw a tab
Bram Moolenaar <Bram@vim.org>
parents:
15351
diff
changeset
|
238 // This may be needed when switching tabs. |
|
a4fb69fd62a6
patch 8.1.0700: using "gt" sometimes does not redraw a tab
Bram Moolenaar <Bram@vim.org>
parents:
15351
diff
changeset
|
239 if (must_redraw < type) |
|
a4fb69fd62a6
patch 8.1.0700: using "gt" sometimes does not redraw a tab
Bram Moolenaar <Bram@vim.org>
parents:
15351
diff
changeset
|
240 must_redraw = type; |
| 7 | 241 } |
| 242 | |
| 243 /* | |
| 301 | 244 * Mark all windows that are editing the current buffer to be updated later. |
| 7 | 245 */ |
| 246 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
247 redraw_curbuf_later(int type) |
| 7 | 248 { |
| 249 redraw_buf_later(curbuf, type); | |
| 250 } | |
| 251 | |
| 252 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
253 redraw_buf_later(buf_T *buf, int type) |
| 7 | 254 { |
| 255 win_T *wp; | |
| 256 | |
| 257 FOR_ALL_WINDOWS(wp) | |
| 258 { | |
| 259 if (wp->w_buffer == buf) | |
| 260 redraw_win_later(wp, type); | |
| 261 } | |
| 262 } | |
| 263 | |
|
15555
d89c5b339c2a
patch 8.1.0785: depending on the configuration some functions are unused
Bram Moolenaar <Bram@vim.org>
parents:
15543
diff
changeset
|
264 #if defined(FEAT_SIGNS) || defined(PROTO) |
|
11416
32aed0993813
patch 8.0.0592: if a job writes to a buffer screen is not updated
Christian Brabandt <cb@256bit.org>
parents:
11277
diff
changeset
|
265 void |
|
15402
c17b5e30a0af
patch 8.1.0709: windows are updated for every added/deleted sign
Bram Moolenaar <Bram@vim.org>
parents:
15400
diff
changeset
|
266 redraw_buf_line_later(buf_T *buf, linenr_T lnum) |
|
c17b5e30a0af
patch 8.1.0709: windows are updated for every added/deleted sign
Bram Moolenaar <Bram@vim.org>
parents:
15400
diff
changeset
|
267 { |
|
c17b5e30a0af
patch 8.1.0709: windows are updated for every added/deleted sign
Bram Moolenaar <Bram@vim.org>
parents:
15400
diff
changeset
|
268 win_T *wp; |
|
c17b5e30a0af
patch 8.1.0709: windows are updated for every added/deleted sign
Bram Moolenaar <Bram@vim.org>
parents:
15400
diff
changeset
|
269 |
|
c17b5e30a0af
patch 8.1.0709: windows are updated for every added/deleted sign
Bram Moolenaar <Bram@vim.org>
parents:
15400
diff
changeset
|
270 FOR_ALL_WINDOWS(wp) |
|
c17b5e30a0af
patch 8.1.0709: windows are updated for every added/deleted sign
Bram Moolenaar <Bram@vim.org>
parents:
15400
diff
changeset
|
271 if (wp->w_buffer == buf && lnum >= wp->w_topline |
|
c17b5e30a0af
patch 8.1.0709: windows are updated for every added/deleted sign
Bram Moolenaar <Bram@vim.org>
parents:
15400
diff
changeset
|
272 && lnum < wp->w_botline) |
|
c17b5e30a0af
patch 8.1.0709: windows are updated for every added/deleted sign
Bram Moolenaar <Bram@vim.org>
parents:
15400
diff
changeset
|
273 redrawWinline(wp, lnum); |
|
c17b5e30a0af
patch 8.1.0709: windows are updated for every added/deleted sign
Bram Moolenaar <Bram@vim.org>
parents:
15400
diff
changeset
|
274 } |
|
15555
d89c5b339c2a
patch 8.1.0785: depending on the configuration some functions are unused
Bram Moolenaar <Bram@vim.org>
parents:
15543
diff
changeset
|
275 #endif |
|
d89c5b339c2a
patch 8.1.0785: depending on the configuration some functions are unused
Bram Moolenaar <Bram@vim.org>
parents:
15543
diff
changeset
|
276 |
|
d89c5b339c2a
patch 8.1.0785: depending on the configuration some functions are unused
Bram Moolenaar <Bram@vim.org>
parents:
15543
diff
changeset
|
277 #if defined(FEAT_JOB_CHANNEL) || defined(PROTO) |
|
15402
c17b5e30a0af
patch 8.1.0709: windows are updated for every added/deleted sign
Bram Moolenaar <Bram@vim.org>
parents:
15400
diff
changeset
|
278 void |
|
11416
32aed0993813
patch 8.0.0592: if a job writes to a buffer screen is not updated
Christian Brabandt <cb@256bit.org>
parents:
11277
diff
changeset
|
279 redraw_buf_and_status_later(buf_T *buf, int type) |
|
32aed0993813
patch 8.0.0592: if a job writes to a buffer screen is not updated
Christian Brabandt <cb@256bit.org>
parents:
11277
diff
changeset
|
280 { |
|
32aed0993813
patch 8.0.0592: if a job writes to a buffer screen is not updated
Christian Brabandt <cb@256bit.org>
parents:
11277
diff
changeset
|
281 win_T *wp; |
|
32aed0993813
patch 8.0.0592: if a job writes to a buffer screen is not updated
Christian Brabandt <cb@256bit.org>
parents:
11277
diff
changeset
|
282 |
|
11657
a7cd2a53590c
patch 8.0.0711: cannot build without the wildmenu feature
Christian Brabandt <cb@256bit.org>
parents:
11655
diff
changeset
|
283 #ifdef FEAT_WILDMENU |
|
11655
8014350fe51a
patch 8.0.0710: a job that writes to a buffer clears completion
Christian Brabandt <cb@256bit.org>
parents:
11607
diff
changeset
|
284 if (wild_menu_showing != 0) |
|
8014350fe51a
patch 8.0.0710: a job that writes to a buffer clears completion
Christian Brabandt <cb@256bit.org>
parents:
11607
diff
changeset
|
285 /* Don't redraw while the command line completion is displayed, it |
|
8014350fe51a
patch 8.0.0710: a job that writes to a buffer clears completion
Christian Brabandt <cb@256bit.org>
parents:
11607
diff
changeset
|
286 * would disappear. */ |
|
8014350fe51a
patch 8.0.0710: a job that writes to a buffer clears completion
Christian Brabandt <cb@256bit.org>
parents:
11607
diff
changeset
|
287 return; |
|
11657
a7cd2a53590c
patch 8.0.0711: cannot build without the wildmenu feature
Christian Brabandt <cb@256bit.org>
parents:
11655
diff
changeset
|
288 #endif |
|
11416
32aed0993813
patch 8.0.0592: if a job writes to a buffer screen is not updated
Christian Brabandt <cb@256bit.org>
parents:
11277
diff
changeset
|
289 FOR_ALL_WINDOWS(wp) |
|
32aed0993813
patch 8.0.0592: if a job writes to a buffer screen is not updated
Christian Brabandt <cb@256bit.org>
parents:
11277
diff
changeset
|
290 { |
|
32aed0993813
patch 8.0.0592: if a job writes to a buffer screen is not updated
Christian Brabandt <cb@256bit.org>
parents:
11277
diff
changeset
|
291 if (wp->w_buffer == buf) |
|
32aed0993813
patch 8.0.0592: if a job writes to a buffer screen is not updated
Christian Brabandt <cb@256bit.org>
parents:
11277
diff
changeset
|
292 { |
|
32aed0993813
patch 8.0.0592: if a job writes to a buffer screen is not updated
Christian Brabandt <cb@256bit.org>
parents:
11277
diff
changeset
|
293 redraw_win_later(wp, type); |
|
32aed0993813
patch 8.0.0592: if a job writes to a buffer screen is not updated
Christian Brabandt <cb@256bit.org>
parents:
11277
diff
changeset
|
294 wp->w_redr_status = TRUE; |
|
32aed0993813
patch 8.0.0592: if a job writes to a buffer screen is not updated
Christian Brabandt <cb@256bit.org>
parents:
11277
diff
changeset
|
295 } |
|
32aed0993813
patch 8.0.0592: if a job writes to a buffer screen is not updated
Christian Brabandt <cb@256bit.org>
parents:
11277
diff
changeset
|
296 } |
|
32aed0993813
patch 8.0.0592: if a job writes to a buffer screen is not updated
Christian Brabandt <cb@256bit.org>
parents:
11277
diff
changeset
|
297 } |
|
15555
d89c5b339c2a
patch 8.1.0785: depending on the configuration some functions are unused
Bram Moolenaar <Bram@vim.org>
parents:
15543
diff
changeset
|
298 #endif |
|
d89c5b339c2a
patch 8.1.0785: depending on the configuration some functions are unused
Bram Moolenaar <Bram@vim.org>
parents:
15543
diff
changeset
|
299 |
|
d89c5b339c2a
patch 8.1.0785: depending on the configuration some functions are unused
Bram Moolenaar <Bram@vim.org>
parents:
15543
diff
changeset
|
300 #if defined(FEAT_TERMRESPONSE) || defined(PROTO) |
| 7 | 301 /* |
|
5090
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
302 * Redraw as soon as possible. When the command line is not scrolled redraw |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
303 * right away and restore what was on the command line. |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
304 * Return a code indicating what happened. |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
305 */ |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
306 int |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
307 redraw_asap(int type) |
|
5090
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
308 { |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
309 int rows; |
| 6959 | 310 int cols = screen_Columns; |
|
5090
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
311 int r; |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
312 int ret = 0; |
|
5096
a6ddcab6a240
updated for version 7.3.1291
Bram Moolenaar <bram@vim.org>
parents:
5090
diff
changeset
|
313 schar_T *screenline; /* copy from ScreenLines[] */ |
|
a6ddcab6a240
updated for version 7.3.1291
Bram Moolenaar <bram@vim.org>
parents:
5090
diff
changeset
|
314 sattr_T *screenattr; /* copy from ScreenAttrs[] */ |
|
5090
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
315 int i; |
|
5096
a6ddcab6a240
updated for version 7.3.1291
Bram Moolenaar <bram@vim.org>
parents:
5090
diff
changeset
|
316 u8char_T *screenlineUC = NULL; /* copy from ScreenLinesUC[] */ |
|
5090
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
317 u8char_T *screenlineC[MAX_MCO]; /* copy from ScreenLinesC[][] */ |
|
5096
a6ddcab6a240
updated for version 7.3.1291
Bram Moolenaar <bram@vim.org>
parents:
5090
diff
changeset
|
318 schar_T *screenline2 = NULL; /* copy from ScreenLines2[] */ |
|
5090
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
319 |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
320 redraw_later(type); |
| 6959 | 321 if (msg_scrolled || (State != NORMAL && State != NORMAL_BUSY) || exiting) |
|
5090
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
322 return ret; |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
323 |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
324 /* Allocate space to save the text displayed in the command line area. */ |
| 6959 | 325 rows = screen_Rows - cmdline_row; |
|
5090
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
326 screenline = (schar_T *)lalloc( |
| 6959 | 327 (long_u)(rows * cols * sizeof(schar_T)), FALSE); |
|
5090
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
328 screenattr = (sattr_T *)lalloc( |
| 6959 | 329 (long_u)(rows * cols * sizeof(sattr_T)), FALSE); |
|
5090
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
330 if (screenline == NULL || screenattr == NULL) |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
331 ret = 2; |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
332 if (enc_utf8) |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
333 { |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
334 screenlineUC = (u8char_T *)lalloc( |
| 6959 | 335 (long_u)(rows * cols * sizeof(u8char_T)), FALSE); |
|
5090
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
336 if (screenlineUC == NULL) |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
337 ret = 2; |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
338 for (i = 0; i < p_mco; ++i) |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
339 { |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
340 screenlineC[i] = (u8char_T *)lalloc( |
| 6959 | 341 (long_u)(rows * cols * sizeof(u8char_T)), FALSE); |
|
5090
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
342 if (screenlineC[i] == NULL) |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
343 ret = 2; |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
344 } |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
345 } |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
346 if (enc_dbcs == DBCS_JPNU) |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
347 { |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
348 screenline2 = (schar_T *)lalloc( |
| 6959 | 349 (long_u)(rows * cols * sizeof(schar_T)), FALSE); |
|
5090
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
350 if (screenline2 == NULL) |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
351 ret = 2; |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
352 } |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
353 |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
354 if (ret != 2) |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
355 { |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
356 /* Save the text displayed in the command line area. */ |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
357 for (r = 0; r < rows; ++r) |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
358 { |
| 6959 | 359 mch_memmove(screenline + r * cols, |
|
5090
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
360 ScreenLines + LineOffset[cmdline_row + r], |
| 6959 | 361 (size_t)cols * sizeof(schar_T)); |
| 362 mch_memmove(screenattr + r * cols, | |
|
5090
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
363 ScreenAttrs + LineOffset[cmdline_row + r], |
| 6959 | 364 (size_t)cols * sizeof(sattr_T)); |
|
5090
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
365 if (enc_utf8) |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
366 { |
| 6959 | 367 mch_memmove(screenlineUC + r * cols, |
|
5090
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
368 ScreenLinesUC + LineOffset[cmdline_row + r], |
| 6959 | 369 (size_t)cols * sizeof(u8char_T)); |
|
5090
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
370 for (i = 0; i < p_mco; ++i) |
| 6959 | 371 mch_memmove(screenlineC[i] + r * cols, |
| 372 ScreenLinesC[i] + LineOffset[cmdline_row + r], | |
| 373 (size_t)cols * sizeof(u8char_T)); | |
|
5090
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
374 } |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
375 if (enc_dbcs == DBCS_JPNU) |
| 6959 | 376 mch_memmove(screenline2 + r * cols, |
|
5090
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
377 ScreenLines2 + LineOffset[cmdline_row + r], |
| 6959 | 378 (size_t)cols * sizeof(schar_T)); |
|
5090
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
379 } |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
380 |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
381 update_screen(0); |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
382 ret = 3; |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
383 |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
384 if (must_redraw == 0) |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
385 { |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
386 int off = (int)(current_ScreenLine - ScreenLines); |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
387 |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
388 /* Restore the text displayed in the command line area. */ |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
389 for (r = 0; r < rows; ++r) |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
390 { |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
391 mch_memmove(current_ScreenLine, |
| 6959 | 392 screenline + r * cols, |
| 393 (size_t)cols * sizeof(schar_T)); | |
|
5090
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
394 mch_memmove(ScreenAttrs + off, |
| 6959 | 395 screenattr + r * cols, |
| 396 (size_t)cols * sizeof(sattr_T)); | |
|
5090
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
397 if (enc_utf8) |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
398 { |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
399 mch_memmove(ScreenLinesUC + off, |
| 6959 | 400 screenlineUC + r * cols, |
| 401 (size_t)cols * sizeof(u8char_T)); | |
|
5090
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
402 for (i = 0; i < p_mco; ++i) |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
403 mch_memmove(ScreenLinesC[i] + off, |
| 6959 | 404 screenlineC[i] + r * cols, |
| 405 (size_t)cols * sizeof(u8char_T)); | |
|
5090
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
406 } |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
407 if (enc_dbcs == DBCS_JPNU) |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
408 mch_memmove(ScreenLines2 + off, |
| 6959 | 409 screenline2 + r * cols, |
| 410 (size_t)cols * sizeof(schar_T)); | |
|
11670
3b2afa2b77b3
patch 8.0.0718: output of job in terminal is not displayed
Christian Brabandt <cb@256bit.org>
parents:
11657
diff
changeset
|
411 screen_line(cmdline_row + r, 0, cols, cols, FALSE); |
|
5090
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
412 } |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
413 ret = 4; |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
414 } |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
415 } |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
416 |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
417 vim_free(screenline); |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
418 vim_free(screenattr); |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
419 if (enc_utf8) |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
420 { |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
421 vim_free(screenlineUC); |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
422 for (i = 0; i < p_mco; ++i) |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
423 vim_free(screenlineC[i]); |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
424 } |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
425 if (enc_dbcs == DBCS_JPNU) |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
426 vim_free(screenline2); |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
427 |
|
5126
71859e71b1f9
updated for version 7.3.1306
Bram Moolenaar <bram@vim.org>
parents:
5096
diff
changeset
|
428 /* Show the intro message when appropriate. */ |
|
71859e71b1f9
updated for version 7.3.1306
Bram Moolenaar <bram@vim.org>
parents:
5096
diff
changeset
|
429 maybe_intro_message(); |
|
71859e71b1f9
updated for version 7.3.1306
Bram Moolenaar <bram@vim.org>
parents:
5096
diff
changeset
|
430 |
|
71859e71b1f9
updated for version 7.3.1306
Bram Moolenaar <bram@vim.org>
parents:
5096
diff
changeset
|
431 setcursor(); |
|
71859e71b1f9
updated for version 7.3.1306
Bram Moolenaar <bram@vim.org>
parents:
5096
diff
changeset
|
432 |
|
5090
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
433 return ret; |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
434 } |
|
15555
d89c5b339c2a
patch 8.1.0785: depending on the configuration some functions are unused
Bram Moolenaar <Bram@vim.org>
parents:
15543
diff
changeset
|
435 #endif |
|
5090
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
436 |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
437 /* |
|
8577
63dc856bd13d
commit https://github.com/vim/vim/commit/975b5271eed4fa0500c24a8f37be0b1797cb9db7
Christian Brabandt <cb@256bit.org>
parents:
8212
diff
changeset
|
438 * Invoked after an asynchronous callback is called. |
|
63dc856bd13d
commit https://github.com/vim/vim/commit/975b5271eed4fa0500c24a8f37be0b1797cb9db7
Christian Brabandt <cb@256bit.org>
parents:
8212
diff
changeset
|
439 * If an echo command was used the cursor needs to be put back where |
|
63dc856bd13d
commit https://github.com/vim/vim/commit/975b5271eed4fa0500c24a8f37be0b1797cb9db7
Christian Brabandt <cb@256bit.org>
parents:
8212
diff
changeset
|
440 * it belongs. If highlighting was changed a redraw is needed. |
|
12244
d0b039e2ed56
patch 8.0.1002: unnecessarily updating screen after timer callback
Christian Brabandt <cb@256bit.org>
parents:
12152
diff
changeset
|
441 * If "call_update_screen" is FALSE don't call update_screen() when at the |
|
d0b039e2ed56
patch 8.0.1002: unnecessarily updating screen after timer callback
Christian Brabandt <cb@256bit.org>
parents:
12152
diff
changeset
|
442 * command line. |
|
8577
63dc856bd13d
commit https://github.com/vim/vim/commit/975b5271eed4fa0500c24a8f37be0b1797cb9db7
Christian Brabandt <cb@256bit.org>
parents:
8212
diff
changeset
|
443 */ |
|
63dc856bd13d
commit https://github.com/vim/vim/commit/975b5271eed4fa0500c24a8f37be0b1797cb9db7
Christian Brabandt <cb@256bit.org>
parents:
8212
diff
changeset
|
444 void |
|
12244
d0b039e2ed56
patch 8.0.1002: unnecessarily updating screen after timer callback
Christian Brabandt <cb@256bit.org>
parents:
12152
diff
changeset
|
445 redraw_after_callback(int call_update_screen) |
|
8577
63dc856bd13d
commit https://github.com/vim/vim/commit/975b5271eed4fa0500c24a8f37be0b1797cb9db7
Christian Brabandt <cb@256bit.org>
parents:
8212
diff
changeset
|
446 { |
|
11698
4f59d2a66bf7
patch 8.0.0732: when updating a buffer modeless selection is lost
Christian Brabandt <cb@256bit.org>
parents:
11672
diff
changeset
|
447 ++redrawing_for_callback; |
|
4f59d2a66bf7
patch 8.0.0732: when updating a buffer modeless selection is lost
Christian Brabandt <cb@256bit.org>
parents:
11672
diff
changeset
|
448 |
|
8627
7c98c5d0298c
commit https://github.com/vim/vim/commit/bfb96c047b79b2aab5fd57a2472871508819f3ef
Christian Brabandt <cb@256bit.org>
parents:
8577
diff
changeset
|
449 if (State == HITRETURN || State == ASKMORE) |
|
14629
100a44722322
patch 8.1.0328: inputlist() doesn't work with a timer
Christian Brabandt <cb@256bit.org>
parents:
14515
diff
changeset
|
450 ; // do nothing |
|
8627
7c98c5d0298c
commit https://github.com/vim/vim/commit/bfb96c047b79b2aab5fd57a2472871508819f3ef
Christian Brabandt <cb@256bit.org>
parents:
8577
diff
changeset
|
451 else if (State & CMDLINE) |
|
11416
32aed0993813
patch 8.0.0592: if a job writes to a buffer screen is not updated
Christian Brabandt <cb@256bit.org>
parents:
11277
diff
changeset
|
452 { |
|
14629
100a44722322
patch 8.1.0328: inputlist() doesn't work with a timer
Christian Brabandt <cb@256bit.org>
parents:
14515
diff
changeset
|
453 // Don't redraw when in prompt_for_number(). |
|
100a44722322
patch 8.1.0328: inputlist() doesn't work with a timer
Christian Brabandt <cb@256bit.org>
parents:
14515
diff
changeset
|
454 if (cmdline_row > 0) |
|
100a44722322
patch 8.1.0328: inputlist() doesn't work with a timer
Christian Brabandt <cb@256bit.org>
parents:
14515
diff
changeset
|
455 { |
|
100a44722322
patch 8.1.0328: inputlist() doesn't work with a timer
Christian Brabandt <cb@256bit.org>
parents:
14515
diff
changeset
|
456 // Redrawing only works when the screen didn't scroll. Don't clear |
|
100a44722322
patch 8.1.0328: inputlist() doesn't work with a timer
Christian Brabandt <cb@256bit.org>
parents:
14515
diff
changeset
|
457 // wildmenu entries. |
|
100a44722322
patch 8.1.0328: inputlist() doesn't work with a timer
Christian Brabandt <cb@256bit.org>
parents:
14515
diff
changeset
|
458 if (msg_scrolled == 0 |
|
11657
a7cd2a53590c
patch 8.0.0711: cannot build without the wildmenu feature
Christian Brabandt <cb@256bit.org>
parents:
11655
diff
changeset
|
459 #ifdef FEAT_WILDMENU |
|
14629
100a44722322
patch 8.1.0328: inputlist() doesn't work with a timer
Christian Brabandt <cb@256bit.org>
parents:
14515
diff
changeset
|
460 && wild_menu_showing == 0 |
|
100a44722322
patch 8.1.0328: inputlist() doesn't work with a timer
Christian Brabandt <cb@256bit.org>
parents:
14515
diff
changeset
|
461 #endif |
|
100a44722322
patch 8.1.0328: inputlist() doesn't work with a timer
Christian Brabandt <cb@256bit.org>
parents:
14515
diff
changeset
|
462 && call_update_screen) |
|
100a44722322
patch 8.1.0328: inputlist() doesn't work with a timer
Christian Brabandt <cb@256bit.org>
parents:
14515
diff
changeset
|
463 update_screen(0); |
|
100a44722322
patch 8.1.0328: inputlist() doesn't work with a timer
Christian Brabandt <cb@256bit.org>
parents:
14515
diff
changeset
|
464 |
|
100a44722322
patch 8.1.0328: inputlist() doesn't work with a timer
Christian Brabandt <cb@256bit.org>
parents:
14515
diff
changeset
|
465 // Redraw in the same position, so that the user can continue |
|
100a44722322
patch 8.1.0328: inputlist() doesn't work with a timer
Christian Brabandt <cb@256bit.org>
parents:
14515
diff
changeset
|
466 // editing the command. |
|
100a44722322
patch 8.1.0328: inputlist() doesn't work with a timer
Christian Brabandt <cb@256bit.org>
parents:
14515
diff
changeset
|
467 redrawcmdline_ex(FALSE); |
|
100a44722322
patch 8.1.0328: inputlist() doesn't work with a timer
Christian Brabandt <cb@256bit.org>
parents:
14515
diff
changeset
|
468 } |
|
11416
32aed0993813
patch 8.0.0592: if a job writes to a buffer screen is not updated
Christian Brabandt <cb@256bit.org>
parents:
11277
diff
changeset
|
469 } |
|
12487
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
470 else if (State & (NORMAL | INSERT | TERMINAL)) |
|
8627
7c98c5d0298c
commit https://github.com/vim/vim/commit/bfb96c047b79b2aab5fd57a2472871508819f3ef
Christian Brabandt <cb@256bit.org>
parents:
8577
diff
changeset
|
471 { |
|
14629
100a44722322
patch 8.1.0328: inputlist() doesn't work with a timer
Christian Brabandt <cb@256bit.org>
parents:
14515
diff
changeset
|
472 // keep the command line if possible |
|
11416
32aed0993813
patch 8.0.0592: if a job writes to a buffer screen is not updated
Christian Brabandt <cb@256bit.org>
parents:
11277
diff
changeset
|
473 update_screen(VALID_NO_UPDATE); |
|
8627
7c98c5d0298c
commit https://github.com/vim/vim/commit/bfb96c047b79b2aab5fd57a2472871508819f3ef
Christian Brabandt <cb@256bit.org>
parents:
8577
diff
changeset
|
474 setcursor(); |
|
7c98c5d0298c
commit https://github.com/vim/vim/commit/bfb96c047b79b2aab5fd57a2472871508819f3ef
Christian Brabandt <cb@256bit.org>
parents:
8577
diff
changeset
|
475 } |
|
8577
63dc856bd13d
commit https://github.com/vim/vim/commit/975b5271eed4fa0500c24a8f37be0b1797cb9db7
Christian Brabandt <cb@256bit.org>
parents:
8212
diff
changeset
|
476 cursor_on(); |
|
63dc856bd13d
commit https://github.com/vim/vim/commit/975b5271eed4fa0500c24a8f37be0b1797cb9db7
Christian Brabandt <cb@256bit.org>
parents:
8212
diff
changeset
|
477 #ifdef FEAT_GUI |
|
13150
808625d4b71b
patch 8.0.1449: slow redrawing with DirectX
Christian Brabandt <cb@256bit.org>
parents:
13094
diff
changeset
|
478 if (gui.in_use && !gui_mch_is_blink_off()) |
|
14629
100a44722322
patch 8.1.0328: inputlist() doesn't work with a timer
Christian Brabandt <cb@256bit.org>
parents:
14515
diff
changeset
|
479 // Don't update the cursor when it is blinking and off to avoid |
|
100a44722322
patch 8.1.0328: inputlist() doesn't work with a timer
Christian Brabandt <cb@256bit.org>
parents:
14515
diff
changeset
|
480 // flicker. |
|
13150
808625d4b71b
patch 8.0.1449: slow redrawing with DirectX
Christian Brabandt <cb@256bit.org>
parents:
13094
diff
changeset
|
481 out_flush_cursor(FALSE, FALSE); |
|
808625d4b71b
patch 8.0.1449: slow redrawing with DirectX
Christian Brabandt <cb@256bit.org>
parents:
13094
diff
changeset
|
482 else |
|
13204
a8a154cafc60
patch 8.0.1476: screen isn't always updated right away
Christian Brabandt <cb@256bit.org>
parents:
13150
diff
changeset
|
483 #endif |
|
13150
808625d4b71b
patch 8.0.1449: slow redrawing with DirectX
Christian Brabandt <cb@256bit.org>
parents:
13094
diff
changeset
|
484 out_flush(); |
|
11698
4f59d2a66bf7
patch 8.0.0732: when updating a buffer modeless selection is lost
Christian Brabandt <cb@256bit.org>
parents:
11672
diff
changeset
|
485 |
|
4f59d2a66bf7
patch 8.0.0732: when updating a buffer modeless selection is lost
Christian Brabandt <cb@256bit.org>
parents:
11672
diff
changeset
|
486 --redrawing_for_callback; |
|
8577
63dc856bd13d
commit https://github.com/vim/vim/commit/975b5271eed4fa0500c24a8f37be0b1797cb9db7
Christian Brabandt <cb@256bit.org>
parents:
8212
diff
changeset
|
487 } |
|
63dc856bd13d
commit https://github.com/vim/vim/commit/975b5271eed4fa0500c24a8f37be0b1797cb9db7
Christian Brabandt <cb@256bit.org>
parents:
8212
diff
changeset
|
488 |
|
63dc856bd13d
commit https://github.com/vim/vim/commit/975b5271eed4fa0500c24a8f37be0b1797cb9db7
Christian Brabandt <cb@256bit.org>
parents:
8212
diff
changeset
|
489 /* |
| 7 | 490 * Changed something in the current window, at buffer line "lnum", that |
| 491 * requires that line and possibly other lines to be redrawn. | |
| 492 * Used when entering/leaving Insert mode with the cursor on a folded line. | |
| 493 * Used to remove the "$" from a change command. | |
| 494 * Note that when also inserting/deleting lines w_redraw_top and w_redraw_bot | |
| 495 * may become invalid and the whole window will have to be redrawn. | |
| 496 */ | |
| 497 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
498 redrawWinline( |
|
14720
a9665096074b
patch 8.1.0372: screen updating slow when 'cursorline' is set
Christian Brabandt <cb@256bit.org>
parents:
14673
diff
changeset
|
499 win_T *wp, |
|
15400
ac5542aadd9c
patch 8.1.0708: third argument for redrawWinline() is always FALSE
Bram Moolenaar <Bram@vim.org>
parents:
15396
diff
changeset
|
500 linenr_T lnum) |
|
ac5542aadd9c
patch 8.1.0708: third argument for redrawWinline() is always FALSE
Bram Moolenaar <Bram@vim.org>
parents:
15396
diff
changeset
|
501 { |
|
14720
a9665096074b
patch 8.1.0372: screen updating slow when 'cursorline' is set
Christian Brabandt <cb@256bit.org>
parents:
14673
diff
changeset
|
502 if (wp->w_redraw_top == 0 || wp->w_redraw_top > lnum) |
|
a9665096074b
patch 8.1.0372: screen updating slow when 'cursorline' is set
Christian Brabandt <cb@256bit.org>
parents:
14673
diff
changeset
|
503 wp->w_redraw_top = lnum; |
|
a9665096074b
patch 8.1.0372: screen updating slow when 'cursorline' is set
Christian Brabandt <cb@256bit.org>
parents:
14673
diff
changeset
|
504 if (wp->w_redraw_bot == 0 || wp->w_redraw_bot < lnum) |
|
a9665096074b
patch 8.1.0372: screen updating slow when 'cursorline' is set
Christian Brabandt <cb@256bit.org>
parents:
14673
diff
changeset
|
505 wp->w_redraw_bot = lnum; |
|
a9665096074b
patch 8.1.0372: screen updating slow when 'cursorline' is set
Christian Brabandt <cb@256bit.org>
parents:
14673
diff
changeset
|
506 redraw_win_later(wp, VALID); |
| 7 | 507 } |
| 508 | |
|
13888
81e8e6181aeb
patch 8.0.1815: crash with terminal window and with 'lazyredraw' set
Christian Brabandt <cb@256bit.org>
parents:
13876
diff
changeset
|
509 void |
|
81e8e6181aeb
patch 8.0.1815: crash with terminal window and with 'lazyredraw' set
Christian Brabandt <cb@256bit.org>
parents:
13876
diff
changeset
|
510 reset_updating_screen(int may_resize_shell UNUSED) |
|
81e8e6181aeb
patch 8.0.1815: crash with terminal window and with 'lazyredraw' set
Christian Brabandt <cb@256bit.org>
parents:
13876
diff
changeset
|
511 { |
|
81e8e6181aeb
patch 8.0.1815: crash with terminal window and with 'lazyredraw' set
Christian Brabandt <cb@256bit.org>
parents:
13876
diff
changeset
|
512 updating_screen = FALSE; |
|
81e8e6181aeb
patch 8.0.1815: crash with terminal window and with 'lazyredraw' set
Christian Brabandt <cb@256bit.org>
parents:
13876
diff
changeset
|
513 #ifdef FEAT_GUI |
|
81e8e6181aeb
patch 8.0.1815: crash with terminal window and with 'lazyredraw' set
Christian Brabandt <cb@256bit.org>
parents:
13876
diff
changeset
|
514 if (may_resize_shell) |
|
81e8e6181aeb
patch 8.0.1815: crash with terminal window and with 'lazyredraw' set
Christian Brabandt <cb@256bit.org>
parents:
13876
diff
changeset
|
515 gui_may_resize_shell(); |
|
81e8e6181aeb
patch 8.0.1815: crash with terminal window and with 'lazyredraw' set
Christian Brabandt <cb@256bit.org>
parents:
13876
diff
changeset
|
516 #endif |
|
81e8e6181aeb
patch 8.0.1815: crash with terminal window and with 'lazyredraw' set
Christian Brabandt <cb@256bit.org>
parents:
13876
diff
changeset
|
517 #ifdef FEAT_TERMINAL |
|
81e8e6181aeb
patch 8.0.1815: crash with terminal window and with 'lazyredraw' set
Christian Brabandt <cb@256bit.org>
parents:
13876
diff
changeset
|
518 term_check_channel_closed_recently(); |
|
81e8e6181aeb
patch 8.0.1815: crash with terminal window and with 'lazyredraw' set
Christian Brabandt <cb@256bit.org>
parents:
13876
diff
changeset
|
519 #endif |
|
14428
aab5947be7c5
patch 8.1.0228: dropping files is ignored while Vim is busy
Christian Brabandt <cb@256bit.org>
parents:
14424
diff
changeset
|
520 |
|
aab5947be7c5
patch 8.1.0228: dropping files is ignored while Vim is busy
Christian Brabandt <cb@256bit.org>
parents:
14424
diff
changeset
|
521 #ifdef HAVE_DROP_FILE |
|
aab5947be7c5
patch 8.1.0228: dropping files is ignored while Vim is busy
Christian Brabandt <cb@256bit.org>
parents:
14424
diff
changeset
|
522 // If handle_drop() was called while updating_screen was TRUE need to |
|
aab5947be7c5
patch 8.1.0228: dropping files is ignored while Vim is busy
Christian Brabandt <cb@256bit.org>
parents:
14424
diff
changeset
|
523 // handle the drop now. |
|
aab5947be7c5
patch 8.1.0228: dropping files is ignored while Vim is busy
Christian Brabandt <cb@256bit.org>
parents:
14424
diff
changeset
|
524 handle_any_postponed_drop(); |
|
aab5947be7c5
patch 8.1.0228: dropping files is ignored while Vim is busy
Christian Brabandt <cb@256bit.org>
parents:
14424
diff
changeset
|
525 #endif |
|
13888
81e8e6181aeb
patch 8.0.1815: crash with terminal window and with 'lazyredraw' set
Christian Brabandt <cb@256bit.org>
parents:
13876
diff
changeset
|
526 } |
|
81e8e6181aeb
patch 8.0.1815: crash with terminal window and with 'lazyredraw' set
Christian Brabandt <cb@256bit.org>
parents:
13876
diff
changeset
|
527 |
| 7 | 528 /* |
|
11416
32aed0993813
patch 8.0.0592: if a job writes to a buffer screen is not updated
Christian Brabandt <cb@256bit.org>
parents:
11277
diff
changeset
|
529 * Update all windows that are editing the current buffer. |
| 7 | 530 */ |
| 531 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
532 update_curbuf(int type) |
| 7 | 533 { |
| 534 redraw_curbuf_later(type); | |
| 535 update_screen(type); | |
| 536 } | |
| 537 | |
| 538 /* | |
| 539 * Based on the current value of curwin->w_topline, transfer a screenfull | |
| 540 * of stuff from Filemem to ScreenLines[], and update curwin->w_botline. | |
|
12441
854f49cf0abe
patch 8.0.1100: stuck in redraw loop when 'lazyredraw' is set
Christian Brabandt <cb@256bit.org>
parents:
12435
diff
changeset
|
541 * Return OK when the screen was updated, FAIL if it was not done. |
|
854f49cf0abe
patch 8.0.1100: stuck in redraw loop when 'lazyredraw' is set
Christian Brabandt <cb@256bit.org>
parents:
12435
diff
changeset
|
542 */ |
|
854f49cf0abe
patch 8.0.1100: stuck in redraw loop when 'lazyredraw' is set
Christian Brabandt <cb@256bit.org>
parents:
12435
diff
changeset
|
543 int |
|
11416
32aed0993813
patch 8.0.0592: if a job writes to a buffer screen is not updated
Christian Brabandt <cb@256bit.org>
parents:
11277
diff
changeset
|
544 update_screen(int type_arg) |
|
32aed0993813
patch 8.0.0592: if a job writes to a buffer screen is not updated
Christian Brabandt <cb@256bit.org>
parents:
11277
diff
changeset
|
545 { |
|
32aed0993813
patch 8.0.0592: if a job writes to a buffer screen is not updated
Christian Brabandt <cb@256bit.org>
parents:
11277
diff
changeset
|
546 int type = type_arg; |
| 7 | 547 win_T *wp; |
| 548 static int did_intro = FALSE; | |
| 549 #if defined(FEAT_SEARCH_EXTRA) || defined(FEAT_CLIPBOARD) | |
| 550 int did_one; | |
| 551 #endif | |
|
9444
e08c8502d7ce
commit https://github.com/vim/vim/commit/144445d15f2369a58b94b6fee2fe162fc81c8abe
Christian Brabandt <cb@256bit.org>
parents:
9428
diff
changeset
|
552 #ifdef FEAT_GUI |
|
9848
664276833670
commit https://github.com/vim/vim/commit/107abd2ca53c31fd3bb40d77ff296e98eaae2975
Christian Brabandt <cb@256bit.org>
parents:
9754
diff
changeset
|
553 int did_undraw = FALSE; |
|
9444
e08c8502d7ce
commit https://github.com/vim/vim/commit/144445d15f2369a58b94b6fee2fe162fc81c8abe
Christian Brabandt <cb@256bit.org>
parents:
9428
diff
changeset
|
554 int gui_cursor_col; |
|
e08c8502d7ce
commit https://github.com/vim/vim/commit/144445d15f2369a58b94b6fee2fe162fc81c8abe
Christian Brabandt <cb@256bit.org>
parents:
9428
diff
changeset
|
555 int gui_cursor_row; |
|
e08c8502d7ce
commit https://github.com/vim/vim/commit/144445d15f2369a58b94b6fee2fe162fc81c8abe
Christian Brabandt <cb@256bit.org>
parents:
9428
diff
changeset
|
556 #endif |
|
11416
32aed0993813
patch 8.0.0592: if a job writes to a buffer screen is not updated
Christian Brabandt <cb@256bit.org>
parents:
11277
diff
changeset
|
557 int no_update = FALSE; |
| 7 | 558 |
| 2008 | 559 /* Don't do anything if the screen structures are (not yet) valid. */ |
| 7 | 560 if (!screen_valid(TRUE)) |
|
12441
854f49cf0abe
patch 8.0.1100: stuck in redraw loop when 'lazyredraw' is set
Christian Brabandt <cb@256bit.org>
parents:
12435
diff
changeset
|
561 return FAIL; |
| 7 | 562 |
|
11416
32aed0993813
patch 8.0.0592: if a job writes to a buffer screen is not updated
Christian Brabandt <cb@256bit.org>
parents:
11277
diff
changeset
|
563 if (type == VALID_NO_UPDATE) |
|
32aed0993813
patch 8.0.0592: if a job writes to a buffer screen is not updated
Christian Brabandt <cb@256bit.org>
parents:
11277
diff
changeset
|
564 { |
|
32aed0993813
patch 8.0.0592: if a job writes to a buffer screen is not updated
Christian Brabandt <cb@256bit.org>
parents:
11277
diff
changeset
|
565 no_update = TRUE; |
|
32aed0993813
patch 8.0.0592: if a job writes to a buffer screen is not updated
Christian Brabandt <cb@256bit.org>
parents:
11277
diff
changeset
|
566 type = 0; |
|
32aed0993813
patch 8.0.0592: if a job writes to a buffer screen is not updated
Christian Brabandt <cb@256bit.org>
parents:
11277
diff
changeset
|
567 } |
|
32aed0993813
patch 8.0.0592: if a job writes to a buffer screen is not updated
Christian Brabandt <cb@256bit.org>
parents:
11277
diff
changeset
|
568 |
| 7 | 569 if (must_redraw) |
| 570 { | |
| 571 if (type < must_redraw) /* use maximal type */ | |
| 572 type = must_redraw; | |
| 1331 | 573 |
| 574 /* must_redraw is reset here, so that when we run into some weird | |
| 575 * reason to redraw while busy redrawing (e.g., asynchronous | |
| 576 * scrolling), or update_topline() in win_update() will cause a | |
| 577 * scroll, the screen will be redrawn later or in win_update(). */ | |
| 7 | 578 must_redraw = 0; |
| 579 } | |
| 580 | |
|
13851
3edac4cd1c0a
patch 8.0.1797: terminal window is redrawn too often
Christian Brabandt <cb@256bit.org>
parents:
13792
diff
changeset
|
581 /* May need to update w_lines[]. */ |
|
3edac4cd1c0a
patch 8.0.1797: terminal window is redrawn too often
Christian Brabandt <cb@256bit.org>
parents:
13792
diff
changeset
|
582 if (curwin->w_lines_valid == 0 && type < NOT_VALID |
|
3edac4cd1c0a
patch 8.0.1797: terminal window is redrawn too often
Christian Brabandt <cb@256bit.org>
parents:
13792
diff
changeset
|
583 #ifdef FEAT_TERMINAL |
|
3edac4cd1c0a
patch 8.0.1797: terminal window is redrawn too often
Christian Brabandt <cb@256bit.org>
parents:
13792
diff
changeset
|
584 && !term_do_update_window(curwin) |
|
3edac4cd1c0a
patch 8.0.1797: terminal window is redrawn too often
Christian Brabandt <cb@256bit.org>
parents:
13792
diff
changeset
|
585 #endif |
|
3edac4cd1c0a
patch 8.0.1797: terminal window is redrawn too often
Christian Brabandt <cb@256bit.org>
parents:
13792
diff
changeset
|
586 ) |
| 7 | 587 type = NOT_VALID; |
| 588 | |
| 2008 | 589 /* Postpone the redrawing when it's not needed and when being called |
| 590 * recursively. */ | |
| 591 if (!redrawing() || updating_screen) | |
| 7 | 592 { |
| 593 redraw_later(type); /* remember type for next time */ | |
| 594 must_redraw = type; | |
| 595 if (type > INVERTED_ALL) | |
| 596 curwin->w_lines_valid = 0; /* don't use w_lines[].wl_size now */ | |
|
12441
854f49cf0abe
patch 8.0.1100: stuck in redraw loop when 'lazyredraw' is set
Christian Brabandt <cb@256bit.org>
parents:
12435
diff
changeset
|
597 return FAIL; |
| 7 | 598 } |
| 599 | |
| 600 updating_screen = TRUE; | |
| 601 #ifdef FEAT_SYN_HL | |
| 602 ++display_tick; /* let syntax code know we're in a next round of | |
| 603 * display updating */ | |
| 604 #endif | |
|
11416
32aed0993813
patch 8.0.0592: if a job writes to a buffer screen is not updated
Christian Brabandt <cb@256bit.org>
parents:
11277
diff
changeset
|
605 if (no_update) |
|
32aed0993813
patch 8.0.0592: if a job writes to a buffer screen is not updated
Christian Brabandt <cb@256bit.org>
parents:
11277
diff
changeset
|
606 ++no_win_do_lines_ins; |
| 7 | 607 |
| 608 /* | |
| 609 * if the screen was scrolled up when displaying a message, scroll it down | |
| 610 */ | |
| 611 if (msg_scrolled) | |
| 612 { | |
| 613 clear_cmdline = TRUE; | |
| 614 if (msg_scrolled > Rows - 5) /* clearing is faster */ | |
| 615 type = CLEAR; | |
| 616 else if (type != CLEAR) | |
| 617 { | |
| 618 check_for_delay(FALSE); | |
|
12152
69af108df70e
patch 8.0.0956: scrolling in a terminal window has flicker
Christian Brabandt <cb@256bit.org>
parents:
12122
diff
changeset
|
619 if (screen_ins_lines(0, 0, msg_scrolled, (int)Rows, 0, NULL) |
|
69af108df70e
patch 8.0.0956: scrolling in a terminal window has flicker
Christian Brabandt <cb@256bit.org>
parents:
12122
diff
changeset
|
620 == FAIL) |
| 7 | 621 type = CLEAR; |
| 622 FOR_ALL_WINDOWS(wp) | |
| 623 { | |
| 624 if (W_WINROW(wp) < msg_scrolled) | |
| 625 { | |
| 626 if (W_WINROW(wp) + wp->w_height > msg_scrolled | |
| 627 && wp->w_redr_type < REDRAW_TOP | |
| 628 && wp->w_lines_valid > 0 | |
| 629 && wp->w_topline == wp->w_lines[0].wl_lnum) | |
| 630 { | |
| 631 wp->w_upd_rows = msg_scrolled - W_WINROW(wp); | |
| 632 wp->w_redr_type = REDRAW_TOP; | |
| 633 } | |
| 634 else | |
| 635 { | |
| 636 wp->w_redr_type = NOT_VALID; | |
|
12529
158917d728b4
patch 8.0.1143: macros always expand to the same thing
Christian Brabandt <cb@256bit.org>
parents:
12515
diff
changeset
|
637 if (W_WINROW(wp) + wp->w_height + wp->w_status_height |
|
158917d728b4
patch 8.0.1143: macros always expand to the same thing
Christian Brabandt <cb@256bit.org>
parents:
12515
diff
changeset
|
638 <= msg_scrolled) |
| 7 | 639 wp->w_redr_status = TRUE; |
| 640 } | |
| 641 } | |
| 642 } | |
|
11416
32aed0993813
patch 8.0.0592: if a job writes to a buffer screen is not updated
Christian Brabandt <cb@256bit.org>
parents:
11277
diff
changeset
|
643 if (!no_update) |
|
32aed0993813
patch 8.0.0592: if a job writes to a buffer screen is not updated
Christian Brabandt <cb@256bit.org>
parents:
11277
diff
changeset
|
644 redraw_cmdline = TRUE; |
| 673 | 645 redraw_tabline = TRUE; |
| 7 | 646 } |
| 647 msg_scrolled = 0; | |
| 648 need_wait_return = FALSE; | |
| 649 } | |
| 650 | |
| 651 /* reset cmdline_row now (may have been changed temporarily) */ | |
| 652 compute_cmdrow(); | |
| 653 | |
| 654 /* Check for changed highlighting */ | |
| 655 if (need_highlight_changed) | |
| 656 highlight_changed(); | |
| 657 | |
| 658 if (type == CLEAR) /* first clear screen */ | |
| 659 { | |
| 660 screenclear(); /* will reset clear_cmdline */ | |
| 661 type = NOT_VALID; | |
|
11607
24664144de4e
patch 8.0.0686: extra redraw when using CTRL-L in second window
Christian Brabandt <cb@256bit.org>
parents:
11585
diff
changeset
|
662 /* must_redraw may be set indirectly, avoid another redraw later */ |
|
24664144de4e
patch 8.0.0686: extra redraw when using CTRL-L in second window
Christian Brabandt <cb@256bit.org>
parents:
11585
diff
changeset
|
663 must_redraw = 0; |
| 7 | 664 } |
| 665 | |
| 666 if (clear_cmdline) /* going to clear cmdline (done below) */ | |
| 667 check_for_delay(FALSE); | |
| 668 | |
| 13 | 669 #ifdef FEAT_LINEBREAK |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
670 /* Force redraw when width of 'number' or 'relativenumber' column |
|
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
671 * changes. */ |
| 13 | 672 if (curwin->w_redr_type < NOT_VALID |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
673 && curwin->w_nrwidth != ((curwin->w_p_nu || curwin->w_p_rnu) |
|
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
674 ? number_width(curwin) : 0)) |
| 13 | 675 curwin->w_redr_type = NOT_VALID; |
| 676 #endif | |
| 677 | |
| 7 | 678 /* |
| 679 * Only start redrawing if there is really something to do. | |
| 680 */ | |
| 681 if (type == INVERTED) | |
| 682 update_curswant(); | |
| 683 if (curwin->w_redr_type < type | |
| 684 && !((type == VALID | |
| 685 && curwin->w_lines[0].wl_valid | |
| 686 #ifdef FEAT_DIFF | |
| 687 && curwin->w_topfill == curwin->w_old_topfill | |
| 688 && curwin->w_botfill == curwin->w_old_botfill | |
| 689 #endif | |
| 690 && curwin->w_topline == curwin->w_lines[0].wl_lnum) | |
| 691 || (type == INVERTED | |
| 1043 | 692 && VIsual_active |
| 7 | 693 && curwin->w_old_cursor_lnum == curwin->w_cursor.lnum |
| 694 && curwin->w_old_visual_mode == VIsual_mode | |
| 695 && (curwin->w_valid & VALID_VIRTCOL) | |
| 696 && curwin->w_old_curswant == curwin->w_curswant) | |
| 697 )) | |
| 698 curwin->w_redr_type = type; | |
| 699 | |
| 849 | 700 /* Redraw the tab pages line if needed. */ |
| 701 if (redraw_tabline || type >= NOT_VALID) | |
| 702 draw_tabline(); | |
| 703 | |
| 7 | 704 #ifdef FEAT_SYN_HL |
| 705 /* | |
| 706 * Correct stored syntax highlighting info for changes in each displayed | |
| 707 * buffer. Each buffer must only be done once. | |
| 708 */ | |
| 709 FOR_ALL_WINDOWS(wp) | |
| 710 { | |
| 711 if (wp->w_buffer->b_mod_set) | |
| 712 { | |
| 713 win_T *wwp; | |
| 714 | |
| 715 /* Check if we already did this buffer. */ | |
| 716 for (wwp = firstwin; wwp != wp; wwp = wwp->w_next) | |
| 717 if (wwp->w_buffer == wp->w_buffer) | |
| 718 break; | |
|
12477
68d7bc045dbe
patch 8.0.1118: FEAT_WINDOWS adds a lot of #ifdefs
Christian Brabandt <cb@256bit.org>
parents:
12441
diff
changeset
|
719 if (wwp == wp && syntax_present(wp)) |
| 7 | 720 syn_stack_apply_changes(wp->w_buffer); |
| 721 } | |
| 722 } | |
| 723 #endif | |
| 724 | |
| 725 /* | |
| 726 * Go from top to bottom through the windows, redrawing the ones that need | |
| 727 * it. | |
| 728 */ | |
| 729 #if defined(FEAT_SEARCH_EXTRA) || defined(FEAT_CLIPBOARD) | |
| 730 did_one = FALSE; | |
| 731 #endif | |
| 732 #ifdef FEAT_SEARCH_EXTRA | |
| 733 search_hl.rm.regprog = NULL; | |
| 734 #endif | |
| 735 FOR_ALL_WINDOWS(wp) | |
| 736 { | |
| 737 if (wp->w_redr_type != 0) | |
| 738 { | |
| 739 cursor_off(); | |
| 740 #if defined(FEAT_SEARCH_EXTRA) || defined(FEAT_CLIPBOARD) | |
| 741 if (!did_one) | |
| 742 { | |
| 743 did_one = TRUE; | |
| 744 # ifdef FEAT_SEARCH_EXTRA | |
| 745 start_search_hl(); | |
| 746 # endif | |
| 747 # ifdef FEAT_CLIPBOARD | |
| 748 /* When Visual area changed, may have to update selection. */ | |
| 3674 | 749 if (clip_star.available && clip_isautosel_star()) |
| 750 clip_update_selection(&clip_star); | |
| 751 if (clip_plus.available && clip_isautosel_plus()) | |
| 752 clip_update_selection(&clip_plus); | |
| 7 | 753 # endif |
| 754 #ifdef FEAT_GUI | |
| 755 /* Remove the cursor before starting to do anything, because | |
| 756 * scrolling may make it difficult to redraw the text under | |
| 757 * it. */ | |
|
9848
664276833670
commit https://github.com/vim/vim/commit/107abd2ca53c31fd3bb40d77ff296e98eaae2975
Christian Brabandt <cb@256bit.org>
parents:
9754
diff
changeset
|
758 if (gui.in_use && wp == curwin) |
|
9444
e08c8502d7ce
commit https://github.com/vim/vim/commit/144445d15f2369a58b94b6fee2fe162fc81c8abe
Christian Brabandt <cb@256bit.org>
parents:
9428
diff
changeset
|
759 { |
|
e08c8502d7ce
commit https://github.com/vim/vim/commit/144445d15f2369a58b94b6fee2fe162fc81c8abe
Christian Brabandt <cb@256bit.org>
parents:
9428
diff
changeset
|
760 gui_cursor_col = gui.cursor_col; |
|
e08c8502d7ce
commit https://github.com/vim/vim/commit/144445d15f2369a58b94b6fee2fe162fc81c8abe
Christian Brabandt <cb@256bit.org>
parents:
9428
diff
changeset
|
761 gui_cursor_row = gui.cursor_row; |
| 7 | 762 gui_undraw_cursor(); |
|
9848
664276833670
commit https://github.com/vim/vim/commit/107abd2ca53c31fd3bb40d77ff296e98eaae2975
Christian Brabandt <cb@256bit.org>
parents:
9754
diff
changeset
|
763 did_undraw = TRUE; |
|
9444
e08c8502d7ce
commit https://github.com/vim/vim/commit/144445d15f2369a58b94b6fee2fe162fc81c8abe
Christian Brabandt <cb@256bit.org>
parents:
9428
diff
changeset
|
764 } |
| 7 | 765 #endif |
| 766 } | |
| 767 #endif | |
| 768 win_update(wp); | |
| 769 } | |
| 770 | |
| 771 /* redraw status line after the window to minimize cursor movement */ | |
| 772 if (wp->w_redr_status) | |
| 773 { | |
| 774 cursor_off(); | |
|
14079
b5e43a048878
patch 8.1.0057: popup menu displayed wrong when using autocmd
Christian Brabandt <cb@256bit.org>
parents:
14004
diff
changeset
|
775 win_redr_status(wp, TRUE); // any popup menu will be redrawn below |
| 7 | 776 } |
| 777 } | |
| 778 #if defined(FEAT_SEARCH_EXTRA) | |
| 779 end_search_hl(); | |
| 780 #endif | |
| 4107 | 781 #ifdef FEAT_INS_EXPAND |
| 782 /* May need to redraw the popup menu. */ | |
|
14089
ae53a9274f50
patch 8.1.0062: popup menu broken if a callback changes the window layout
Christian Brabandt <cb@256bit.org>
parents:
14081
diff
changeset
|
783 pum_may_redraw(); |
| 4107 | 784 #endif |
| 7 | 785 |
| 786 /* Reset b_mod_set flags. Going through all windows is probably faster | |
| 787 * than going through all buffers (there could be many buffers). */ | |
|
9649
fd9727ae3c49
commit https://github.com/vim/vim/commit/2932359000b2f918d5fade79ea4d124d5943cd07
Christian Brabandt <cb@256bit.org>
parents:
9645
diff
changeset
|
788 FOR_ALL_WINDOWS(wp) |
| 7 | 789 wp->w_buffer->b_mod_set = FALSE; |
| 790 | |
|
13888
81e8e6181aeb
patch 8.0.1815: crash with terminal window and with 'lazyredraw' set
Christian Brabandt <cb@256bit.org>
parents:
13876
diff
changeset
|
791 reset_updating_screen(TRUE); |
| 7 | 792 |
| 793 /* Clear or redraw the command line. Done last, because scrolling may | |
| 794 * mess up the command line. */ | |
| 795 if (clear_cmdline || redraw_cmdline) | |
| 796 showmode(); | |
| 797 | |
|
11416
32aed0993813
patch 8.0.0592: if a job writes to a buffer screen is not updated
Christian Brabandt <cb@256bit.org>
parents:
11277
diff
changeset
|
798 if (no_update) |
|
32aed0993813
patch 8.0.0592: if a job writes to a buffer screen is not updated
Christian Brabandt <cb@256bit.org>
parents:
11277
diff
changeset
|
799 --no_win_do_lines_ins; |
|
32aed0993813
patch 8.0.0592: if a job writes to a buffer screen is not updated
Christian Brabandt <cb@256bit.org>
parents:
11277
diff
changeset
|
800 |
| 7 | 801 /* May put up an introductory message when not editing a file */ |
|
5126
71859e71b1f9
updated for version 7.3.1306
Bram Moolenaar <bram@vim.org>
parents:
5096
diff
changeset
|
802 if (!did_intro) |
|
71859e71b1f9
updated for version 7.3.1306
Bram Moolenaar <bram@vim.org>
parents:
5096
diff
changeset
|
803 maybe_intro_message(); |
| 7 | 804 did_intro = TRUE; |
| 805 | |
| 806 #ifdef FEAT_GUI | |
| 807 /* Redraw the cursor and update the scrollbars when all screen updating is | |
| 808 * done. */ | |
| 809 if (gui.in_use) | |
| 810 { | |
|
9848
664276833670
commit https://github.com/vim/vim/commit/107abd2ca53c31fd3bb40d77ff296e98eaae2975
Christian Brabandt <cb@256bit.org>
parents:
9754
diff
changeset
|
811 if (did_undraw && !gui_mch_is_blink_off()) |
|
9444
e08c8502d7ce
commit https://github.com/vim/vim/commit/144445d15f2369a58b94b6fee2fe162fc81c8abe
Christian Brabandt <cb@256bit.org>
parents:
9428
diff
changeset
|
812 { |
|
13150
808625d4b71b
patch 8.0.1449: slow redrawing with DirectX
Christian Brabandt <cb@256bit.org>
parents:
13094
diff
changeset
|
813 mch_disable_flush(); |
|
808625d4b71b
patch 8.0.1449: slow redrawing with DirectX
Christian Brabandt <cb@256bit.org>
parents:
13094
diff
changeset
|
814 out_flush(); /* required before updating the cursor */ |
|
808625d4b71b
patch 8.0.1449: slow redrawing with DirectX
Christian Brabandt <cb@256bit.org>
parents:
13094
diff
changeset
|
815 mch_enable_flush(); |
|
808625d4b71b
patch 8.0.1449: slow redrawing with DirectX
Christian Brabandt <cb@256bit.org>
parents:
13094
diff
changeset
|
816 |
|
9444
e08c8502d7ce
commit https://github.com/vim/vim/commit/144445d15f2369a58b94b6fee2fe162fc81c8abe
Christian Brabandt <cb@256bit.org>
parents:
9428
diff
changeset
|
817 /* Put the GUI position where the cursor was, gui_update_cursor() |
|
e08c8502d7ce
commit https://github.com/vim/vim/commit/144445d15f2369a58b94b6fee2fe162fc81c8abe
Christian Brabandt <cb@256bit.org>
parents:
9428
diff
changeset
|
818 * uses that. */ |
|
e08c8502d7ce
commit https://github.com/vim/vim/commit/144445d15f2369a58b94b6fee2fe162fc81c8abe
Christian Brabandt <cb@256bit.org>
parents:
9428
diff
changeset
|
819 gui.col = gui_cursor_col; |
|
e08c8502d7ce
commit https://github.com/vim/vim/commit/144445d15f2369a58b94b6fee2fe162fc81c8abe
Christian Brabandt <cb@256bit.org>
parents:
9428
diff
changeset
|
820 gui.row = gui_cursor_row; |
|
10247
d54d4a258b96
commit https://github.com/vim/vim/commit/84dbd494dca599ecff05b2c2279d402c12e6d197
Christian Brabandt <cb@256bit.org>
parents:
10042
diff
changeset
|
821 gui.col = mb_fix_col(gui.col, gui.row); |
| 7 | 822 gui_update_cursor(FALSE, FALSE); |
|
13150
808625d4b71b
patch 8.0.1449: slow redrawing with DirectX
Christian Brabandt <cb@256bit.org>
parents:
13094
diff
changeset
|
823 gui_may_flush(); |
|
9446
aaa6639b6f14
commit https://github.com/vim/vim/commit/65549bdef5805ba5a18a3d2d3909998dd7d9ed46
Christian Brabandt <cb@256bit.org>
parents:
9444
diff
changeset
|
824 screen_cur_col = gui.col; |
|
aaa6639b6f14
commit https://github.com/vim/vim/commit/65549bdef5805ba5a18a3d2d3909998dd7d9ed46
Christian Brabandt <cb@256bit.org>
parents:
9444
diff
changeset
|
825 screen_cur_row = gui.row; |
|
9444
e08c8502d7ce
commit https://github.com/vim/vim/commit/144445d15f2369a58b94b6fee2fe162fc81c8abe
Christian Brabandt <cb@256bit.org>
parents:
9428
diff
changeset
|
826 } |
|
13150
808625d4b71b
patch 8.0.1449: slow redrawing with DirectX
Christian Brabandt <cb@256bit.org>
parents:
13094
diff
changeset
|
827 else |
|
808625d4b71b
patch 8.0.1449: slow redrawing with DirectX
Christian Brabandt <cb@256bit.org>
parents:
13094
diff
changeset
|
828 out_flush(); |
| 7 | 829 gui_update_scrollbars(FALSE); |
| 830 } | |
| 831 #endif | |
|
12441
854f49cf0abe
patch 8.0.1100: stuck in redraw loop when 'lazyredraw' is set
Christian Brabandt <cb@256bit.org>
parents:
12435
diff
changeset
|
832 return OK; |
| 7 | 833 } |
| 834 | |
|
10793
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
835 #if defined(FEAT_SIGNS) || defined(FEAT_GUI) || defined(FEAT_CONCEAL) |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
836 /* |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
837 * Prepare for updating one or more windows. |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
838 * Caller must check for "updating_screen" already set to avoid recursiveness. |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
839 */ |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
840 static void |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
841 update_prepare(void) |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
842 { |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
843 cursor_off(); |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
844 updating_screen = TRUE; |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
845 #ifdef FEAT_GUI |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
846 /* Remove the cursor before starting to do anything, because scrolling may |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
847 * make it difficult to redraw the text under it. */ |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
848 if (gui.in_use) |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
849 gui_undraw_cursor(); |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
850 #endif |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
851 #ifdef FEAT_SEARCH_EXTRA |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
852 start_search_hl(); |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
853 #endif |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
854 } |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
855 |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
856 /* |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
857 * Finish updating one or more windows. |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
858 */ |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
859 static void |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
860 update_finish(void) |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
861 { |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
862 if (redraw_cmdline) |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
863 showmode(); |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
864 |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
865 # ifdef FEAT_SEARCH_EXTRA |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
866 end_search_hl(); |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
867 # endif |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
868 |
|
13888
81e8e6181aeb
patch 8.0.1815: crash with terminal window and with 'lazyredraw' set
Christian Brabandt <cb@256bit.org>
parents:
13876
diff
changeset
|
869 reset_updating_screen(TRUE); |
|
10793
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
870 |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
871 # ifdef FEAT_GUI |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
872 /* Redraw the cursor and update the scrollbars when all screen updating is |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
873 * done. */ |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
874 if (gui.in_use) |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
875 { |
|
13150
808625d4b71b
patch 8.0.1449: slow redrawing with DirectX
Christian Brabandt <cb@256bit.org>
parents:
13094
diff
changeset
|
876 out_flush_cursor(FALSE, FALSE); |
|
10793
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
877 gui_update_scrollbars(FALSE); |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
878 } |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
879 # endif |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
880 } |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
881 #endif |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
882 |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
883 #if defined(FEAT_CONCEAL) || defined(PROTO) |
|
2378
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
884 /* |
|
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
885 * Return TRUE if the cursor line in window "wp" may be concealed, according |
|
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
886 * to the 'concealcursor' option. |
|
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
887 */ |
|
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
888 int |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
889 conceal_cursor_line(win_T *wp) |
|
2378
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
890 { |
|
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
891 int c; |
|
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
892 |
|
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
893 if (*wp->w_p_cocu == NUL) |
|
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
894 return FALSE; |
|
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
895 if (get_real_state() & VISUAL) |
|
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
896 c = 'v'; |
|
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
897 else if (State & INSERT) |
|
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
898 c = 'i'; |
|
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
899 else if (State & NORMAL) |
|
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
900 c = 'n'; |
|
2382
3a5ededa240a
Add the 'c' flag to 'concealcursor'.
Bram Moolenaar <bram@vim.org>
parents:
2381
diff
changeset
|
901 else if (State & CMDLINE) |
|
3a5ededa240a
Add the 'c' flag to 'concealcursor'.
Bram Moolenaar <bram@vim.org>
parents:
2381
diff
changeset
|
902 c = 'c'; |
|
2378
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
903 else |
|
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
904 return FALSE; |
|
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
905 return vim_strchr(wp->w_p_cocu, c) != NULL; |
|
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
906 } |
|
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
907 |
|
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
908 /* |
|
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
909 * Check if the cursor line needs to be redrawn because of 'concealcursor'. |
|
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
910 */ |
|
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
911 void |
|
13876
156ebdcb8ef5
patch 8.0.1809: various typos
Christian Brabandt <cb@256bit.org>
parents:
13851
diff
changeset
|
912 conceal_check_cursor_line(void) |
|
2378
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
913 { |
|
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
914 if (curwin->w_p_cole > 0 && conceal_cursor_line(curwin)) |
|
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
915 { |
|
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
916 need_cursor_line_redraw = TRUE; |
|
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
917 /* Need to recompute cursor column, e.g., when starting Visual mode |
|
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
918 * without concealing. */ |
|
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
919 curs_columns(TRUE); |
|
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
920 } |
|
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
921 } |
| 7 | 922 #endif |
| 923 | |
|
15555
d89c5b339c2a
patch 8.1.0785: depending on the configuration some functions are unused
Bram Moolenaar <Bram@vim.org>
parents:
15543
diff
changeset
|
924 #if defined(FEAT_NETBEANS_INTG) || defined(PROTO) |
| 7 | 925 void |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
926 update_debug_sign(buf_T *buf, linenr_T lnum) |
| 7 | 927 { |
| 928 win_T *wp; | |
| 929 int doit = FALSE; | |
| 930 | |
| 931 # ifdef FEAT_FOLDING | |
| 932 win_foldinfo.fi_level = 0; | |
| 933 # endif | |
| 934 | |
|
15402
c17b5e30a0af
patch 8.1.0709: windows are updated for every added/deleted sign
Bram Moolenaar <Bram@vim.org>
parents:
15400
diff
changeset
|
935 // update/delete a specific sign |
|
c17b5e30a0af
patch 8.1.0709: windows are updated for every added/deleted sign
Bram Moolenaar <Bram@vim.org>
parents:
15400
diff
changeset
|
936 redraw_buf_line_later(buf, lnum); |
|
c17b5e30a0af
patch 8.1.0709: windows are updated for every added/deleted sign
Bram Moolenaar <Bram@vim.org>
parents:
15400
diff
changeset
|
937 |
|
c17b5e30a0af
patch 8.1.0709: windows are updated for every added/deleted sign
Bram Moolenaar <Bram@vim.org>
parents:
15400
diff
changeset
|
938 // check if it resulted in the need to redraw a window |
| 7 | 939 FOR_ALL_WINDOWS(wp) |
| 940 if (wp->w_redr_type != 0) | |
| 941 doit = TRUE; | |
| 942 | |
| 3250 | 943 /* Return when there is nothing to do, screen updating is already |
|
11915
594d96ac226b
patch 8.0.0837: signs can be drawn on top of console messages
Christian Brabandt <cb@256bit.org>
parents:
11890
diff
changeset
|
944 * happening (recursive call), messages on the screen or still starting up. |
|
594d96ac226b
patch 8.0.0837: signs can be drawn on top of console messages
Christian Brabandt <cb@256bit.org>
parents:
11890
diff
changeset
|
945 */ |
| 3250 | 946 if (!doit || updating_screen |
|
11915
594d96ac226b
patch 8.0.0837: signs can be drawn on top of console messages
Christian Brabandt <cb@256bit.org>
parents:
11890
diff
changeset
|
947 || State == ASKMORE || State == HITRETURN |
|
594d96ac226b
patch 8.0.0837: signs can be drawn on top of console messages
Christian Brabandt <cb@256bit.org>
parents:
11890
diff
changeset
|
948 || msg_scrolled |
| 3250 | 949 #ifdef FEAT_GUI |
| 950 || gui.starting | |
| 951 #endif | |
| 952 || starting) | |
| 7 | 953 return; |
| 954 | |
| 955 /* update all windows that need updating */ | |
| 956 update_prepare(); | |
| 957 | |
|
9649
fd9727ae3c49
commit https://github.com/vim/vim/commit/2932359000b2f918d5fade79ea4d124d5943cd07
Christian Brabandt <cb@256bit.org>
parents:
9645
diff
changeset
|
958 FOR_ALL_WINDOWS(wp) |
| 7 | 959 { |
| 960 if (wp->w_redr_type != 0) | |
| 961 win_update(wp); | |
| 962 if (wp->w_redr_status) | |
|
14079
b5e43a048878
patch 8.1.0057: popup menu displayed wrong when using autocmd
Christian Brabandt <cb@256bit.org>
parents:
14004
diff
changeset
|
963 win_redr_status(wp, FALSE); |
| 7 | 964 } |
| 965 | |
| 966 update_finish(); | |
| 967 } | |
| 968 #endif | |
| 969 | |
| 970 | |
| 971 #if defined(FEAT_GUI) || defined(PROTO) | |
| 972 /* | |
| 973 * Update a single window, its status line and maybe the command line msg. | |
| 974 * Used for the GUI scrollbar. | |
| 975 */ | |
| 976 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
977 updateWindow(win_T *wp) |
| 7 | 978 { |
| 2008 | 979 /* return if already busy updating */ |
| 980 if (updating_screen) | |
| 981 return; | |
| 982 | |
| 7 | 983 update_prepare(); |
| 984 | |
| 985 #ifdef FEAT_CLIPBOARD | |
| 986 /* When Visual area changed, may have to update selection. */ | |
| 3674 | 987 if (clip_star.available && clip_isautosel_star()) |
| 988 clip_update_selection(&clip_star); | |
| 989 if (clip_plus.available && clip_isautosel_plus()) | |
| 990 clip_update_selection(&clip_plus); | |
| 7 | 991 #endif |
| 670 | 992 |
| 7 | 993 win_update(wp); |
| 670 | 994 |
| 995 /* When the screen was cleared redraw the tab pages line. */ | |
| 673 | 996 if (redraw_tabline) |
| 677 | 997 draw_tabline(); |
| 670 | 998 |
| 7 | 999 if (wp->w_redr_status |
| 1000 # ifdef FEAT_CMDL_INFO | |
| 1001 || p_ru | |
| 1002 # endif | |
| 1003 # ifdef FEAT_STL_OPT | |
| 40 | 1004 || *p_stl != NUL || *wp->w_p_stl != NUL |
| 7 | 1005 # endif |
| 1006 ) | |
|
14079
b5e43a048878
patch 8.1.0057: popup menu displayed wrong when using autocmd
Christian Brabandt <cb@256bit.org>
parents:
14004
diff
changeset
|
1007 win_redr_status(wp, FALSE); |
| 7 | 1008 |
| 1009 update_finish(); | |
| 1010 } | |
| 1011 #endif | |
| 1012 | |
| 1013 /* | |
| 1014 * Update a single window. | |
| 1015 * | |
| 1016 * This may cause the windows below it also to be redrawn (when clearing the | |
| 1017 * screen or scrolling lines). | |
| 1018 * | |
| 1019 * How the window is redrawn depends on wp->w_redr_type. Each type also | |
| 1020 * implies the one below it. | |
| 1021 * NOT_VALID redraw the whole window | |
| 743 | 1022 * SOME_VALID redraw the whole window but do scroll when possible |
| 7 | 1023 * REDRAW_TOP redraw the top w_upd_rows window lines, otherwise like VALID |
| 1024 * INVERTED redraw the changed part of the Visual area | |
| 1025 * INVERTED_ALL redraw the whole Visual area | |
| 1026 * VALID 1. scroll up/down to adjust for a changed w_topline | |
| 1027 * 2. update lines at the top when scrolled down | |
| 1028 * 3. redraw changed text: | |
| 301 | 1029 * - if wp->w_buffer->b_mod_set set, update lines between |
| 7 | 1030 * b_mod_top and b_mod_bot. |
| 1031 * - if wp->w_redraw_top non-zero, redraw lines between | |
| 1032 * wp->w_redraw_top and wp->w_redr_bot. | |
| 1033 * - continue redrawing when syntax status is invalid. | |
| 1034 * 4. if scrolled up, update lines at the bottom. | |
| 1035 * This results in three areas that may need updating: | |
| 1036 * top: from first row to top_end (when scrolled down) | |
| 1037 * mid: from mid_start to mid_end (update inversion or changed text) | |
| 1038 * bot: from bot_start to last row (when scrolled up) | |
| 1039 */ | |
| 1040 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1041 win_update(win_T *wp) |
| 7 | 1042 { |
| 1043 buf_T *buf = wp->w_buffer; | |
| 1044 int type; | |
| 1045 int top_end = 0; /* Below last row of the top area that needs | |
| 1046 updating. 0 when no top area updating. */ | |
| 1047 int mid_start = 999;/* first row of the mid area that needs | |
| 1048 updating. 999 when no mid area updating. */ | |
| 1049 int mid_end = 0; /* Below last row of the mid area that needs | |
| 1050 updating. 0 when no mid area updating. */ | |
| 1051 int bot_start = 999;/* first row of the bot area that needs | |
| 1052 updating. 999 when no bot area updating */ | |
| 1053 int scrolled_down = FALSE; /* TRUE when scrolled down when | |
| 1054 w_topline got smaller a bit */ | |
| 1055 #ifdef FEAT_SEARCH_EXTRA | |
| 1326 | 1056 matchitem_T *cur; /* points to the match list */ |
| 7 | 1057 int top_to_mod = FALSE; /* redraw above mod_top */ |
| 1058 #endif | |
| 1059 | |
| 1060 int row; /* current window row to display */ | |
| 1061 linenr_T lnum; /* current buffer lnum to display */ | |
| 1062 int idx; /* current index in w_lines[] */ | |
| 1063 int srow; /* starting row of the current line */ | |
| 1064 | |
| 1065 int eof = FALSE; /* if TRUE, we hit the end of the file */ | |
| 1066 int didline = FALSE; /* if TRUE, we finished the last line */ | |
| 1067 int i; | |
| 1068 long j; | |
| 1069 static int recursive = FALSE; /* being called recursively */ | |
| 1070 int old_botline = wp->w_botline; | |
| 1071 #ifdef FEAT_FOLDING | |
| 1072 long fold_count; | |
| 1073 #endif | |
| 1074 #ifdef FEAT_SYN_HL | |
| 1075 /* remember what happened to the previous line, to know if | |
| 1076 * check_visual_highlight() can be used */ | |
| 1077 #define DID_NONE 1 /* didn't update a line */ | |
| 1078 #define DID_LINE 2 /* updated a normal line */ | |
| 1079 #define DID_FOLD 3 /* updated a folded line */ | |
| 1080 int did_update = DID_NONE; | |
| 1081 linenr_T syntax_last_parsed = 0; /* last parsed text line */ | |
| 1082 #endif | |
| 1083 linenr_T mod_top = 0; | |
| 1084 linenr_T mod_bot = 0; | |
| 1085 #if defined(FEAT_SYN_HL) || defined(FEAT_SEARCH_EXTRA) | |
| 1086 int save_got_int; | |
| 1087 #endif | |
|
11529
998d2cf59caa
patch 8.0.0647: syntax highlighting can make cause a freeze
Christian Brabandt <cb@256bit.org>
parents:
11521
diff
changeset
|
1088 #ifdef SYN_TIME_LIMIT |
|
998d2cf59caa
patch 8.0.0647: syntax highlighting can make cause a freeze
Christian Brabandt <cb@256bit.org>
parents:
11521
diff
changeset
|
1089 proftime_T syntax_tm; |
|
998d2cf59caa
patch 8.0.0647: syntax highlighting can make cause a freeze
Christian Brabandt <cb@256bit.org>
parents:
11521
diff
changeset
|
1090 #endif |
| 7 | 1091 |
| 1092 type = wp->w_redr_type; | |
| 1093 | |
| 1094 if (type == NOT_VALID) | |
| 1095 { | |
| 1096 wp->w_redr_status = TRUE; | |
| 1097 wp->w_lines_valid = 0; | |
| 1098 } | |
| 1099 | |
| 1100 /* Window is zero-height: nothing to draw. */ | |
|
12998
dd734ee3e2fe
patch 8.0.1375: window size wrong after maximizing with WinBar
Christian Brabandt <cb@256bit.org>
parents:
12964
diff
changeset
|
1101 if (wp->w_height + WINBAR_HEIGHT(wp) == 0) |
| 7 | 1102 { |
| 1103 wp->w_redr_type = 0; | |
| 1104 return; | |
| 1105 } | |
| 1106 | |
| 1107 /* Window is zero-width: Only need to draw the separator. */ | |
| 1108 if (wp->w_width == 0) | |
| 1109 { | |
| 1110 /* draw the vertical separator right of this window */ | |
| 1111 draw_vsep_win(wp, 0); | |
| 1112 wp->w_redr_type = 0; | |
| 1113 return; | |
| 1114 } | |
| 1115 | |
|
11670
3b2afa2b77b3
patch 8.0.0718: output of job in terminal is not displayed
Christian Brabandt <cb@256bit.org>
parents:
11657
diff
changeset
|
1116 #ifdef FEAT_TERMINAL |
|
13851
3edac4cd1c0a
patch 8.0.1797: terminal window is redrawn too often
Christian Brabandt <cb@256bit.org>
parents:
13792
diff
changeset
|
1117 // If this window contains a terminal, redraw works completely differently. |
|
3edac4cd1c0a
patch 8.0.1797: terminal window is redrawn too often
Christian Brabandt <cb@256bit.org>
parents:
13792
diff
changeset
|
1118 if (term_do_update_window(wp)) |
|
3edac4cd1c0a
patch 8.0.1797: terminal window is redrawn too often
Christian Brabandt <cb@256bit.org>
parents:
13792
diff
changeset
|
1119 { |
|
3edac4cd1c0a
patch 8.0.1797: terminal window is redrawn too often
Christian Brabandt <cb@256bit.org>
parents:
13792
diff
changeset
|
1120 term_update_window(wp); |
|
13292
c42fe898b578
patch 8.0.1520: cursor in wrong line when using a WinBar in Terminal window
Christian Brabandt <cb@256bit.org>
parents:
13244
diff
changeset
|
1121 # ifdef FEAT_MENU |
|
c42fe898b578
patch 8.0.1520: cursor in wrong line when using a WinBar in Terminal window
Christian Brabandt <cb@256bit.org>
parents:
13244
diff
changeset
|
1122 /* Draw the window toolbar, if there is one. */ |
|
c42fe898b578
patch 8.0.1520: cursor in wrong line when using a WinBar in Terminal window
Christian Brabandt <cb@256bit.org>
parents:
13244
diff
changeset
|
1123 if (winbar_height(wp) > 0) |
|
c42fe898b578
patch 8.0.1520: cursor in wrong line when using a WinBar in Terminal window
Christian Brabandt <cb@256bit.org>
parents:
13244
diff
changeset
|
1124 redraw_win_toolbar(wp); |
|
c42fe898b578
patch 8.0.1520: cursor in wrong line when using a WinBar in Terminal window
Christian Brabandt <cb@256bit.org>
parents:
13244
diff
changeset
|
1125 # endif |
|
11670
3b2afa2b77b3
patch 8.0.0718: output of job in terminal is not displayed
Christian Brabandt <cb@256bit.org>
parents:
11657
diff
changeset
|
1126 wp->w_redr_type = 0; |
|
3b2afa2b77b3
patch 8.0.0718: output of job in terminal is not displayed
Christian Brabandt <cb@256bit.org>
parents:
11657
diff
changeset
|
1127 return; |
|
3b2afa2b77b3
patch 8.0.0718: output of job in terminal is not displayed
Christian Brabandt <cb@256bit.org>
parents:
11657
diff
changeset
|
1128 } |
|
3b2afa2b77b3
patch 8.0.0718: output of job in terminal is not displayed
Christian Brabandt <cb@256bit.org>
parents:
11657
diff
changeset
|
1129 #endif |
|
3b2afa2b77b3
patch 8.0.0718: output of job in terminal is not displayed
Christian Brabandt <cb@256bit.org>
parents:
11657
diff
changeset
|
1130 |
| 7 | 1131 #ifdef FEAT_SEARCH_EXTRA |
|
2284
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
1132 init_search_hl(wp); |
| 7 | 1133 #endif |
| 1134 | |
| 13 | 1135 #ifdef FEAT_LINEBREAK |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
1136 /* Force redraw when width of 'number' or 'relativenumber' column |
|
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
1137 * changes. */ |
|
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
1138 i = (wp->w_p_nu || wp->w_p_rnu) ? number_width(wp) : 0; |
| 677 | 1139 if (wp->w_nrwidth != i) |
| 13 | 1140 { |
| 1141 type = NOT_VALID; | |
| 677 | 1142 wp->w_nrwidth = i; |
| 13 | 1143 } |
| 1144 else | |
| 1145 #endif | |
| 1146 | |
| 7 | 1147 if (buf->b_mod_set && buf->b_mod_xlines != 0 && wp->w_redraw_top != 0) |
| 1148 { | |
| 1149 /* | |
| 1150 * When there are both inserted/deleted lines and specific lines to be | |
| 1151 * redrawn, w_redraw_top and w_redraw_bot may be invalid, just redraw | |
| 1152 * everything (only happens when redrawing is off for while). | |
| 1153 */ | |
| 1154 type = NOT_VALID; | |
| 1155 } | |
| 1156 else | |
| 1157 { | |
| 1158 /* | |
| 1159 * Set mod_top to the first line that needs displaying because of | |
| 1160 * changes. Set mod_bot to the first line after the changes. | |
| 1161 */ | |
| 1162 mod_top = wp->w_redraw_top; | |
| 1163 if (wp->w_redraw_bot != 0) | |
| 1164 mod_bot = wp->w_redraw_bot + 1; | |
| 1165 else | |
| 1166 mod_bot = 0; | |
| 1167 wp->w_redraw_top = 0; /* reset for next time */ | |
| 1168 wp->w_redraw_bot = 0; | |
| 1169 if (buf->b_mod_set) | |
| 1170 { | |
| 1171 if (mod_top == 0 || mod_top > buf->b_mod_top) | |
| 1172 { | |
| 1173 mod_top = buf->b_mod_top; | |
| 1174 #ifdef FEAT_SYN_HL | |
| 1175 /* Need to redraw lines above the change that may be included | |
| 1176 * in a pattern match. */ | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
1177 if (syntax_present(wp)) |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
1178 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
1179 mod_top -= buf->b_s.b_syn_sync_linebreaks; |
| 7 | 1180 if (mod_top < 1) |
| 1181 mod_top = 1; | |
| 1182 } | |
| 1183 #endif | |
| 1184 } | |
| 1185 if (mod_bot == 0 || mod_bot < buf->b_mod_bot) | |
| 1186 mod_bot = buf->b_mod_bot; | |
| 1187 | |
| 1188 #ifdef FEAT_SEARCH_EXTRA | |
| 1189 /* When 'hlsearch' is on and using a multi-line search pattern, a | |
| 1190 * change in one line may make the Search highlighting in a | |
| 1191 * previous line invalid. Simple solution: redraw all visible | |
| 1192 * lines above the change. | |
| 1326 | 1193 * Same for a match pattern. |
| 7 | 1194 */ |
| 699 | 1195 if (search_hl.rm.regprog != NULL |
| 1196 && re_multiline(search_hl.rm.regprog)) | |
| 7 | 1197 top_to_mod = TRUE; |
| 699 | 1198 else |
| 1326 | 1199 { |
| 1200 cur = wp->w_match_head; | |
| 1201 while (cur != NULL) | |
| 1202 { | |
| 1203 if (cur->match.regprog != NULL | |
| 1204 && re_multiline(cur->match.regprog)) | |
| 699 | 1205 { |
| 1206 top_to_mod = TRUE; | |
| 1207 break; | |
| 1208 } | |
| 1326 | 1209 cur = cur->next; |
| 1210 } | |
| 1211 } | |
| 7 | 1212 #endif |
| 1213 } | |
| 1214 #ifdef FEAT_FOLDING | |
| 1215 if (mod_top != 0 && hasAnyFolding(wp)) | |
| 1216 { | |
| 1217 linenr_T lnumt, lnumb; | |
| 1218 | |
| 1219 /* | |
| 1220 * A change in a line can cause lines above it to become folded or | |
| 1221 * unfolded. Find the top most buffer line that may be affected. | |
| 1222 * If the line was previously folded and displayed, get the first | |
| 1223 * line of that fold. If the line is folded now, get the first | |
| 1224 * folded line. Use the minimum of these two. | |
| 1225 */ | |
| 1226 | |
| 1227 /* Find last valid w_lines[] entry above mod_top. Set lnumt to | |
| 1228 * the line below it. If there is no valid entry, use w_topline. | |
| 1229 * Find the first valid w_lines[] entry below mod_bot. Set lnumb | |
| 1230 * to this line. If there is no valid entry, use MAXLNUM. */ | |
| 1231 lnumt = wp->w_topline; | |
| 1232 lnumb = MAXLNUM; | |
| 1233 for (i = 0; i < wp->w_lines_valid; ++i) | |
| 1234 if (wp->w_lines[i].wl_valid) | |
| 1235 { | |
| 1236 if (wp->w_lines[i].wl_lastlnum < mod_top) | |
| 1237 lnumt = wp->w_lines[i].wl_lastlnum + 1; | |
| 1238 if (lnumb == MAXLNUM && wp->w_lines[i].wl_lnum >= mod_bot) | |
| 1239 { | |
| 1240 lnumb = wp->w_lines[i].wl_lnum; | |
| 1241 /* When there is a fold column it might need updating | |
| 1242 * in the next line ("J" just above an open fold). */ | |
| 6553 | 1243 if (compute_foldcolumn(wp, 0) > 0) |
| 7 | 1244 ++lnumb; |
| 1245 } | |
| 1246 } | |
| 1247 | |
| 1248 (void)hasFoldingWin(wp, mod_top, &mod_top, NULL, TRUE, NULL); | |
| 1249 if (mod_top > lnumt) | |
| 1250 mod_top = lnumt; | |
| 1251 | |
| 1252 /* Now do the same for the bottom line (one above mod_bot). */ | |
| 1253 --mod_bot; | |
| 1254 (void)hasFoldingWin(wp, mod_bot, NULL, &mod_bot, TRUE, NULL); | |
| 1255 ++mod_bot; | |
| 1256 if (mod_bot < lnumb) | |
| 1257 mod_bot = lnumb; | |
| 1258 } | |
| 1259 #endif | |
| 1260 | |
| 1261 /* When a change starts above w_topline and the end is below | |
| 1262 * w_topline, start redrawing at w_topline. | |
| 36 | 1263 * If the end of the change is above w_topline: do like no change was |
| 1264 * made, but redraw the first line to find changes in syntax. */ | |
| 7 | 1265 if (mod_top != 0 && mod_top < wp->w_topline) |
| 1266 { | |
| 1267 if (mod_bot > wp->w_topline) | |
| 1268 mod_top = wp->w_topline; | |
| 1269 #ifdef FEAT_SYN_HL | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
1270 else if (syntax_present(wp)) |
| 7 | 1271 top_end = 1; |
| 1272 #endif | |
| 1273 } | |
| 36 | 1274 |
| 1275 /* When line numbers are displayed need to redraw all lines below | |
| 1276 * inserted/deleted lines. */ | |
| 1277 if (mod_top != 0 && buf->b_mod_xlines != 0 && wp->w_p_nu) | |
| 1278 mod_bot = MAXLNUM; | |
| 7 | 1279 } |
| 1280 | |
| 1281 /* | |
| 1282 * When only displaying the lines at the top, set top_end. Used when | |
| 1283 * window has scrolled down for msg_scrolled. | |
| 1284 */ | |
| 1285 if (type == REDRAW_TOP) | |
| 1286 { | |
| 1287 j = 0; | |
| 1288 for (i = 0; i < wp->w_lines_valid; ++i) | |
| 1289 { | |
| 1290 j += wp->w_lines[i].wl_size; | |
| 1291 if (j >= wp->w_upd_rows) | |
| 1292 { | |
| 1293 top_end = j; | |
| 1294 break; | |
| 1295 } | |
| 1296 } | |
| 1297 if (top_end == 0) | |
| 1298 /* not found (cannot happen?): redraw everything */ | |
| 1299 type = NOT_VALID; | |
| 1300 else | |
| 1301 /* top area defined, the rest is VALID */ | |
| 1302 type = VALID; | |
| 1303 } | |
| 1304 | |
| 1378 | 1305 /* Trick: we want to avoid clearing the screen twice. screenclear() will |
| 1331 | 1306 * set "screen_cleared" to TRUE. The special value MAYBE (which is still |
| 1307 * non-zero and thus not FALSE) will indicate that screenclear() was not | |
| 1308 * called. */ | |
| 1309 if (screen_cleared) | |
| 1310 screen_cleared = MAYBE; | |
| 1311 | |
| 7 | 1312 /* |
| 1313 * If there are no changes on the screen that require a complete redraw, | |
| 1314 * handle three cases: | |
| 1315 * 1: we are off the top of the screen by a few lines: scroll down | |
| 1316 * 2: wp->w_topline is below wp->w_lines[0].wl_lnum: may scroll up | |
| 1317 * 3: wp->w_topline is wp->w_lines[0].wl_lnum: find first entry in | |
| 1318 * w_lines[] that needs updating. | |
| 1319 */ | |
| 743 | 1320 if ((type == VALID || type == SOME_VALID |
| 1321 || type == INVERTED || type == INVERTED_ALL) | |
| 7 | 1322 #ifdef FEAT_DIFF |
| 1323 && !wp->w_botfill && !wp->w_old_botfill | |
| 1324 #endif | |
| 1325 ) | |
| 1326 { | |
| 1327 if (mod_top != 0 && wp->w_topline == mod_top) | |
| 1328 { | |
| 1329 /* | |
| 1330 * w_topline is the first changed line, the scrolling will be done | |
| 1331 * further down. | |
| 1332 */ | |
| 1333 } | |
| 1334 else if (wp->w_lines[0].wl_valid | |
| 1335 && (wp->w_topline < wp->w_lines[0].wl_lnum | |
| 1336 #ifdef FEAT_DIFF | |
| 1337 || (wp->w_topline == wp->w_lines[0].wl_lnum | |
| 1338 && wp->w_topfill > wp->w_old_topfill) | |
| 1339 #endif | |
| 1340 )) | |
| 1341 { | |
| 1342 /* | |
| 1343 * New topline is above old topline: May scroll down. | |
| 1344 */ | |
| 1345 #ifdef FEAT_FOLDING | |
| 1346 if (hasAnyFolding(wp)) | |
| 1347 { | |
| 1348 linenr_T ln; | |
| 1349 | |
| 1350 /* count the number of lines we are off, counting a sequence | |
| 1351 * of folded lines as one */ | |
| 1352 j = 0; | |
| 1353 for (ln = wp->w_topline; ln < wp->w_lines[0].wl_lnum; ++ln) | |
| 1354 { | |
| 1355 ++j; | |
| 1356 if (j >= wp->w_height - 2) | |
| 1357 break; | |
| 1358 (void)hasFoldingWin(wp, ln, NULL, &ln, TRUE, NULL); | |
| 1359 } | |
| 1360 } | |
| 1361 else | |
| 1362 #endif | |
| 1363 j = wp->w_lines[0].wl_lnum - wp->w_topline; | |
| 1364 if (j < wp->w_height - 2) /* not too far off */ | |
| 1365 { | |
| 1366 i = plines_m_win(wp, wp->w_topline, wp->w_lines[0].wl_lnum - 1); | |
| 1367 #ifdef FEAT_DIFF | |
| 1368 /* insert extra lines for previously invisible filler lines */ | |
| 1369 if (wp->w_lines[0].wl_lnum != wp->w_topline) | |
| 1370 i += diff_check_fill(wp, wp->w_lines[0].wl_lnum) | |
| 1371 - wp->w_old_topfill; | |
| 1372 #endif | |
| 1373 if (i < wp->w_height - 2) /* less than a screen off */ | |
| 1374 { | |
| 1375 /* | |
| 1376 * Try to insert the correct number of lines. | |
| 1377 * If not the last window, delete the lines at the bottom. | |
| 1378 * win_ins_lines may fail when the terminal can't do it. | |
| 1379 */ | |
| 1380 if (i > 0) | |
| 1381 check_for_delay(FALSE); | |
| 1382 if (win_ins_lines(wp, 0, i, FALSE, wp == firstwin) == OK) | |
| 1383 { | |
| 1384 if (wp->w_lines_valid != 0) | |
| 1385 { | |
| 1386 /* Need to update rows that are new, stop at the | |
| 1387 * first one that scrolled down. */ | |
| 1388 top_end = i; | |
| 1389 scrolled_down = TRUE; | |
| 1390 | |
| 1391 /* Move the entries that were scrolled, disable | |
| 1392 * the entries for the lines to be redrawn. */ | |
| 1393 if ((wp->w_lines_valid += j) > wp->w_height) | |
| 1394 wp->w_lines_valid = wp->w_height; | |
| 1395 for (idx = wp->w_lines_valid; idx - j >= 0; idx--) | |
| 1396 wp->w_lines[idx] = wp->w_lines[idx - j]; | |
| 1397 while (idx >= 0) | |
| 1398 wp->w_lines[idx--].wl_valid = FALSE; | |
| 1399 } | |
| 1400 } | |
| 1401 else | |
| 1402 mid_start = 0; /* redraw all lines */ | |
| 1403 } | |
| 1404 else | |
| 1405 mid_start = 0; /* redraw all lines */ | |
| 1406 } | |
| 1407 else | |
| 1408 mid_start = 0; /* redraw all lines */ | |
| 1409 } | |
| 1410 else | |
| 1411 { | |
| 1412 /* | |
| 1413 * New topline is at or below old topline: May scroll up. | |
| 1414 * When topline didn't change, find first entry in w_lines[] that | |
| 1415 * needs updating. | |
| 1416 */ | |
| 1417 | |
| 1418 /* try to find wp->w_topline in wp->w_lines[].wl_lnum */ | |
| 1419 j = -1; | |
| 1420 row = 0; | |
| 1421 for (i = 0; i < wp->w_lines_valid; i++) | |
| 1422 { | |
| 1423 if (wp->w_lines[i].wl_valid | |
| 1424 && wp->w_lines[i].wl_lnum == wp->w_topline) | |
| 1425 { | |
| 1426 j = i; | |
| 1427 break; | |
| 1428 } | |
| 1429 row += wp->w_lines[i].wl_size; | |
| 1430 } | |
| 1431 if (j == -1) | |
| 1432 { | |
| 1433 /* if wp->w_topline is not in wp->w_lines[].wl_lnum redraw all | |
| 1434 * lines */ | |
| 1435 mid_start = 0; | |
| 1436 } | |
| 1437 else | |
| 1438 { | |
| 1439 /* | |
| 1440 * Try to delete the correct number of lines. | |
| 1441 * wp->w_topline is at wp->w_lines[i].wl_lnum. | |
| 1442 */ | |
| 1443 #ifdef FEAT_DIFF | |
| 1444 /* If the topline didn't change, delete old filler lines, | |
| 1445 * otherwise delete filler lines of the new topline... */ | |
| 1446 if (wp->w_lines[0].wl_lnum == wp->w_topline) | |
| 1447 row += wp->w_old_topfill; | |
| 1448 else | |
| 1449 row += diff_check_fill(wp, wp->w_topline); | |
| 1450 /* ... but don't delete new filler lines. */ | |
| 1451 row -= wp->w_topfill; | |
| 1452 #endif | |
| 1453 if (row > 0) | |
| 1454 { | |
| 1455 check_for_delay(FALSE); | |
|
12152
69af108df70e
patch 8.0.0956: scrolling in a terminal window has flicker
Christian Brabandt <cb@256bit.org>
parents:
12122
diff
changeset
|
1456 if (win_del_lines(wp, 0, row, FALSE, wp == firstwin, 0) |
|
69af108df70e
patch 8.0.0956: scrolling in a terminal window has flicker
Christian Brabandt <cb@256bit.org>
parents:
12122
diff
changeset
|
1457 == OK) |
| 7 | 1458 bot_start = wp->w_height - row; |
| 1459 else | |
| 1460 mid_start = 0; /* redraw all lines */ | |
| 1461 } | |
| 1462 if ((row == 0 || bot_start < 999) && wp->w_lines_valid != 0) | |
| 1463 { | |
| 1464 /* | |
| 1465 * Skip the lines (below the deleted lines) that are still | |
| 1466 * valid and don't need redrawing. Copy their info | |
| 1467 * upwards, to compensate for the deleted lines. Set | |
| 1468 * bot_start to the first row that needs redrawing. | |
| 1469 */ | |
| 1470 bot_start = 0; | |
| 1471 idx = 0; | |
| 1472 for (;;) | |
| 1473 { | |
| 1474 wp->w_lines[idx] = wp->w_lines[j]; | |
| 1475 /* stop at line that didn't fit, unless it is still | |
| 1476 * valid (no lines deleted) */ | |
| 1477 if (row > 0 && bot_start + row | |
| 1478 + (int)wp->w_lines[j].wl_size > wp->w_height) | |
| 1479 { | |
| 1480 wp->w_lines_valid = idx + 1; | |
| 1481 break; | |
| 1482 } | |
| 1483 bot_start += wp->w_lines[idx++].wl_size; | |
| 1484 | |
| 1485 /* stop at the last valid entry in w_lines[].wl_size */ | |
| 1486 if (++j >= wp->w_lines_valid) | |
| 1487 { | |
| 1488 wp->w_lines_valid = idx; | |
| 1489 break; | |
| 1490 } | |
| 1491 } | |
| 1492 #ifdef FEAT_DIFF | |
| 1493 /* Correct the first entry for filler lines at the top | |
| 1494 * when it won't get updated below. */ | |
| 1495 if (wp->w_p_diff && bot_start > 0) | |
| 1496 wp->w_lines[0].wl_size = | |
| 1497 plines_win_nofill(wp, wp->w_topline, TRUE) | |
| 1498 + wp->w_topfill; | |
| 1499 #endif | |
| 1500 } | |
| 1501 } | |
| 1502 } | |
| 1503 | |
| 1504 /* When starting redraw in the first line, redraw all lines. When | |
| 1505 * there is only one window it's probably faster to clear the screen | |
| 1506 * first. */ | |
| 1507 if (mid_start == 0) | |
| 1508 { | |
| 1509 mid_end = wp->w_height; | |
|
10349
cf988222b150
commit https://github.com/vim/vim/commit/a1f4cb93ba50ea9e40cd4b1f5592b8a6d1398660
Christian Brabandt <cb@256bit.org>
parents:
10307
diff
changeset
|
1510 if (ONE_WINDOW) |
| 981 | 1511 { |
| 1331 | 1512 /* Clear the screen when it was not done by win_del_lines() or |
| 1513 * win_ins_lines() above, "screen_cleared" is FALSE or MAYBE | |
| 1514 * then. */ | |
| 1515 if (screen_cleared != TRUE) | |
| 1516 screenclear(); | |
| 981 | 1517 /* The screen was cleared, redraw the tab pages line. */ |
| 1518 if (redraw_tabline) | |
| 1519 draw_tabline(); | |
| 1520 } | |
| 7 | 1521 } |
| 1331 | 1522 |
| 1523 /* When win_del_lines() or win_ins_lines() caused the screen to be | |
| 1524 * cleared (only happens for the first window) or when screenclear() | |
| 1525 * was called directly above, "must_redraw" will have been set to | |
| 1526 * NOT_VALID, need to reset it here to avoid redrawing twice. */ | |
| 1527 if (screen_cleared == TRUE) | |
| 1528 must_redraw = 0; | |
| 7 | 1529 } |
| 1530 else | |
| 1531 { | |
| 1532 /* Not VALID or INVERTED: redraw all lines. */ | |
| 1533 mid_start = 0; | |
| 1534 mid_end = wp->w_height; | |
| 1535 } | |
| 1536 | |
| 743 | 1537 if (type == SOME_VALID) |
| 1538 { | |
| 1539 /* SOME_VALID: redraw all lines. */ | |
| 1540 mid_start = 0; | |
| 1541 mid_end = wp->w_height; | |
| 1542 type = NOT_VALID; | |
| 1543 } | |
| 1544 | |
| 7 | 1545 /* check if we are updating or removing the inverted part */ |
| 1546 if ((VIsual_active && buf == curwin->w_buffer) | |
| 1547 || (wp->w_old_cursor_lnum != 0 && type != NOT_VALID)) | |
| 1548 { | |
| 1549 linenr_T from, to; | |
| 1550 | |
| 1551 if (VIsual_active) | |
| 1552 { | |
| 1553 if (VIsual_active | |
| 1554 && (VIsual_mode != wp->w_old_visual_mode | |
| 1555 || type == INVERTED_ALL)) | |
| 1556 { | |
| 1557 /* | |
| 1558 * If the type of Visual selection changed, redraw the whole | |
| 1559 * selection. Also when the ownership of the X selection is | |
| 1560 * gained or lost. | |
| 1561 */ | |
| 1562 if (curwin->w_cursor.lnum < VIsual.lnum) | |
| 1563 { | |
| 1564 from = curwin->w_cursor.lnum; | |
| 1565 to = VIsual.lnum; | |
| 1566 } | |
| 1567 else | |
| 1568 { | |
| 1569 from = VIsual.lnum; | |
| 1570 to = curwin->w_cursor.lnum; | |
| 1571 } | |
| 1572 /* redraw more when the cursor moved as well */ | |
| 1573 if (wp->w_old_cursor_lnum < from) | |
| 1574 from = wp->w_old_cursor_lnum; | |
| 1575 if (wp->w_old_cursor_lnum > to) | |
| 1576 to = wp->w_old_cursor_lnum; | |
| 1577 if (wp->w_old_visual_lnum < from) | |
| 1578 from = wp->w_old_visual_lnum; | |
| 1579 if (wp->w_old_visual_lnum > to) | |
| 1580 to = wp->w_old_visual_lnum; | |
| 1581 } | |
| 1582 else | |
| 1583 { | |
| 1584 /* | |
| 1585 * Find the line numbers that need to be updated: The lines | |
| 1586 * between the old cursor position and the current cursor | |
| 1587 * position. Also check if the Visual position changed. | |
| 1588 */ | |
| 1589 if (curwin->w_cursor.lnum < wp->w_old_cursor_lnum) | |
| 1590 { | |
| 1591 from = curwin->w_cursor.lnum; | |
| 1592 to = wp->w_old_cursor_lnum; | |
| 1593 } | |
| 1594 else | |
| 1595 { | |
| 1596 from = wp->w_old_cursor_lnum; | |
| 1597 to = curwin->w_cursor.lnum; | |
| 1598 if (from == 0) /* Visual mode just started */ | |
| 1599 from = to; | |
| 1600 } | |
| 1601 | |
| 422 | 1602 if (VIsual.lnum != wp->w_old_visual_lnum |
| 1603 || VIsual.col != wp->w_old_visual_col) | |
| 7 | 1604 { |
| 1605 if (wp->w_old_visual_lnum < from | |
| 1606 && wp->w_old_visual_lnum != 0) | |
| 1607 from = wp->w_old_visual_lnum; | |
| 1608 if (wp->w_old_visual_lnum > to) | |
| 1609 to = wp->w_old_visual_lnum; | |
| 1610 if (VIsual.lnum < from) | |
| 1611 from = VIsual.lnum; | |
| 1612 if (VIsual.lnum > to) | |
| 1613 to = VIsual.lnum; | |
| 1614 } | |
| 1615 } | |
| 1616 | |
| 1617 /* | |
| 1618 * If in block mode and changed column or curwin->w_curswant: | |
| 1619 * update all lines. | |
| 1620 * First compute the actual start and end column. | |
| 1621 */ | |
| 1622 if (VIsual_mode == Ctrl_V) | |
| 1623 { | |
| 6266 | 1624 colnr_T fromc, toc; |
| 1625 #if defined(FEAT_VIRTUALEDIT) && defined(FEAT_LINEBREAK) | |
| 1626 int save_ve_flags = ve_flags; | |
| 1627 | |
| 1628 if (curwin->w_p_lbr) | |
| 1629 ve_flags = VE_ALL; | |
| 1630 #endif | |
| 7 | 1631 getvcols(wp, &VIsual, &curwin->w_cursor, &fromc, &toc); |
| 6266 | 1632 #if defined(FEAT_VIRTUALEDIT) && defined(FEAT_LINEBREAK) |
| 1633 ve_flags = save_ve_flags; | |
| 1634 #endif | |
| 7 | 1635 ++toc; |
| 1636 if (curwin->w_curswant == MAXCOL) | |
| 1637 toc = MAXCOL; | |
| 1638 | |
| 1639 if (fromc != wp->w_old_cursor_fcol | |
| 1640 || toc != wp->w_old_cursor_lcol) | |
| 1641 { | |
| 1642 if (from > VIsual.lnum) | |
| 1643 from = VIsual.lnum; | |
| 1644 if (to < VIsual.lnum) | |
| 1645 to = VIsual.lnum; | |
| 1646 } | |
| 1647 wp->w_old_cursor_fcol = fromc; | |
| 1648 wp->w_old_cursor_lcol = toc; | |
| 1649 } | |
| 1650 } | |
| 1651 else | |
| 1652 { | |
| 1653 /* Use the line numbers of the old Visual area. */ | |
| 1654 if (wp->w_old_cursor_lnum < wp->w_old_visual_lnum) | |
| 1655 { | |
| 1656 from = wp->w_old_cursor_lnum; | |
| 1657 to = wp->w_old_visual_lnum; | |
| 1658 } | |
| 1659 else | |
| 1660 { | |
| 1661 from = wp->w_old_visual_lnum; | |
| 1662 to = wp->w_old_cursor_lnum; | |
| 1663 } | |
| 1664 } | |
| 1665 | |
| 1666 /* | |
| 1667 * There is no need to update lines above the top of the window. | |
| 1668 */ | |
| 1669 if (from < wp->w_topline) | |
| 1670 from = wp->w_topline; | |
| 1671 | |
| 1672 /* | |
| 1673 * If we know the value of w_botline, use it to restrict the update to | |
| 1674 * the lines that are visible in the window. | |
| 1675 */ | |
| 1676 if (wp->w_valid & VALID_BOTLINE) | |
| 1677 { | |
| 1678 if (from >= wp->w_botline) | |
| 1679 from = wp->w_botline - 1; | |
| 1680 if (to >= wp->w_botline) | |
| 1681 to = wp->w_botline - 1; | |
| 1682 } | |
| 1683 | |
| 1684 /* | |
| 1685 * Find the minimal part to be updated. | |
| 1686 * Watch out for scrolling that made entries in w_lines[] invalid. | |
| 1687 * E.g., CTRL-U makes the first half of w_lines[] invalid and sets | |
| 1688 * top_end; need to redraw from top_end to the "to" line. | |
| 1689 * A middle mouse click with a Visual selection may change the text | |
| 1690 * above the Visual area and reset wl_valid, do count these for | |
| 1691 * mid_end (in srow). | |
| 1692 */ | |
| 1693 if (mid_start > 0) | |
| 1694 { | |
| 1695 lnum = wp->w_topline; | |
| 1696 idx = 0; | |
| 1697 srow = 0; | |
| 1698 if (scrolled_down) | |
| 1699 mid_start = top_end; | |
| 1700 else | |
| 1701 mid_start = 0; | |
| 1702 while (lnum < from && idx < wp->w_lines_valid) /* find start */ | |
| 1703 { | |
| 1704 if (wp->w_lines[idx].wl_valid) | |
| 1705 mid_start += wp->w_lines[idx].wl_size; | |
| 1706 else if (!scrolled_down) | |
| 1707 srow += wp->w_lines[idx].wl_size; | |
| 1708 ++idx; | |
| 1709 # ifdef FEAT_FOLDING | |
| 1710 if (idx < wp->w_lines_valid && wp->w_lines[idx].wl_valid) | |
| 1711 lnum = wp->w_lines[idx].wl_lnum; | |
| 1712 else | |
| 1713 # endif | |
| 1714 ++lnum; | |
| 1715 } | |
| 1716 srow += mid_start; | |
| 1717 mid_end = wp->w_height; | |
| 1718 for ( ; idx < wp->w_lines_valid; ++idx) /* find end */ | |
| 1719 { | |
| 1720 if (wp->w_lines[idx].wl_valid | |
| 1721 && wp->w_lines[idx].wl_lnum >= to + 1) | |
| 1722 { | |
| 1723 /* Only update until first row of this line */ | |
| 1724 mid_end = srow; | |
| 1725 break; | |
| 1726 } | |
| 1727 srow += wp->w_lines[idx].wl_size; | |
| 1728 } | |
| 1729 } | |
| 1730 } | |
| 1731 | |
| 1732 if (VIsual_active && buf == curwin->w_buffer) | |
| 1733 { | |
| 1734 wp->w_old_visual_mode = VIsual_mode; | |
| 1735 wp->w_old_cursor_lnum = curwin->w_cursor.lnum; | |
| 1736 wp->w_old_visual_lnum = VIsual.lnum; | |
| 422 | 1737 wp->w_old_visual_col = VIsual.col; |
| 7 | 1738 wp->w_old_curswant = curwin->w_curswant; |
| 1739 } | |
| 1740 else | |
| 1741 { | |
| 1742 wp->w_old_visual_mode = 0; | |
| 1743 wp->w_old_cursor_lnum = 0; | |
| 1744 wp->w_old_visual_lnum = 0; | |
| 422 | 1745 wp->w_old_visual_col = 0; |
| 7 | 1746 } |
| 1747 | |
| 1748 #if defined(FEAT_SYN_HL) || defined(FEAT_SEARCH_EXTRA) | |
| 1749 /* reset got_int, otherwise regexp won't work */ | |
| 1750 save_got_int = got_int; | |
| 1751 got_int = 0; | |
| 1752 #endif | |
|
11529
998d2cf59caa
patch 8.0.0647: syntax highlighting can make cause a freeze
Christian Brabandt <cb@256bit.org>
parents:
11521
diff
changeset
|
1753 #ifdef SYN_TIME_LIMIT |
|
998d2cf59caa
patch 8.0.0647: syntax highlighting can make cause a freeze
Christian Brabandt <cb@256bit.org>
parents:
11521
diff
changeset
|
1754 /* Set the time limit to 'redrawtime'. */ |
|
998d2cf59caa
patch 8.0.0647: syntax highlighting can make cause a freeze
Christian Brabandt <cb@256bit.org>
parents:
11521
diff
changeset
|
1755 profile_setlimit(p_rdt, &syntax_tm); |
|
12510
7a887dccd13a
patch 8.0.1133: syntax timeout not used correctly
Christian Brabandt <cb@256bit.org>
parents:
12487
diff
changeset
|
1756 syn_set_timeout(&syntax_tm); |
|
11529
998d2cf59caa
patch 8.0.0647: syntax highlighting can make cause a freeze
Christian Brabandt <cb@256bit.org>
parents:
11521
diff
changeset
|
1757 #endif |
| 7 | 1758 #ifdef FEAT_FOLDING |
| 1759 win_foldinfo.fi_level = 0; | |
| 1760 #endif | |
| 1761 | |
|
12487
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
1762 #ifdef FEAT_MENU |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
1763 /* |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
1764 * Draw the window toolbar, if there is one. |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
1765 * TODO: only when needed. |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
1766 */ |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
1767 if (winbar_height(wp) > 0) |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
1768 redraw_win_toolbar(wp); |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
1769 #endif |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
1770 |
| 7 | 1771 /* |
| 1772 * Update all the window rows. | |
| 1773 */ | |
| 1774 idx = 0; /* first entry in w_lines[].wl_size */ | |
| 1775 row = 0; | |
| 1776 srow = 0; | |
| 1777 lnum = wp->w_topline; /* first line shown in window */ | |
| 1778 for (;;) | |
| 1779 { | |
| 1780 /* stop updating when reached the end of the window (check for _past_ | |
| 1781 * the end of the window is at the end of the loop) */ | |
| 1782 if (row == wp->w_height) | |
| 1783 { | |
| 1784 didline = TRUE; | |
| 1785 break; | |
| 1786 } | |
| 1787 | |
| 1788 /* stop updating when hit the end of the file */ | |
| 1789 if (lnum > buf->b_ml.ml_line_count) | |
| 1790 { | |
| 1791 eof = TRUE; | |
| 1792 break; | |
| 1793 } | |
| 1794 | |
| 1795 /* Remember the starting row of the line that is going to be dealt | |
| 1796 * with. It is used further down when the line doesn't fit. */ | |
| 1797 srow = row; | |
| 1798 | |
| 1799 /* | |
| 1800 * Update a line when it is in an area that needs updating, when it | |
| 1801 * has changes or w_lines[idx] is invalid. | |
|
14724
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
1802 * "bot_start" may be halfway a wrapped line after using |
| 7 | 1803 * win_del_lines(), check if the current line includes it. |
| 1804 * When syntax folding is being used, the saved syntax states will | |
| 1805 * already have been updated, we can't see where the syntax state is | |
| 1806 * the same again, just update until the end of the window. | |
| 1807 */ | |
| 1808 if (row < top_end | |
| 1809 || (row >= mid_start && row < mid_end) | |
| 1810 #ifdef FEAT_SEARCH_EXTRA | |
| 1811 || top_to_mod | |
| 1812 #endif | |
| 1813 || idx >= wp->w_lines_valid | |
| 1814 || (row + wp->w_lines[idx].wl_size > bot_start) | |
| 1815 || (mod_top != 0 | |
| 1816 && (lnum == mod_top | |
| 1817 || (lnum >= mod_top | |
| 1818 && (lnum < mod_bot | |
| 1819 #ifdef FEAT_SYN_HL | |
| 1820 || did_update == DID_FOLD | |
| 1821 || (did_update == DID_LINE | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
1822 && syntax_present(wp) |
| 7 | 1823 && ( |
| 1824 # ifdef FEAT_FOLDING | |
| 1825 (foldmethodIsSyntax(wp) | |
| 1826 && hasAnyFolding(wp)) || | |
| 1827 # endif | |
| 1828 syntax_check_changed(lnum))) | |
| 1829 #endif | |
|
4916
ba328b4a990e
updated for version 7.3.1203
Bram Moolenaar <bram@vim.org>
parents:
4805
diff
changeset
|
1830 #ifdef FEAT_SEARCH_EXTRA |
| 6018 | 1831 /* match in fixed position might need redraw |
| 1832 * if lines were inserted or deleted */ | |
| 1833 || (wp->w_match_head != NULL | |
| 1834 && buf->b_mod_xlines != 0) | |
|
4916
ba328b4a990e
updated for version 7.3.1203
Bram Moolenaar <bram@vim.org>
parents:
4805
diff
changeset
|
1835 #endif |
| 7 | 1836 ))))) |
| 1837 { | |
| 1838 #ifdef FEAT_SEARCH_EXTRA | |
| 1839 if (lnum == mod_top) | |
| 1840 top_to_mod = FALSE; | |
| 1841 #endif | |
| 1842 | |
| 1843 /* | |
| 1844 * When at start of changed lines: May scroll following lines | |
| 1845 * up or down to minimize redrawing. | |
| 1846 * Don't do this when the change continues until the end. | |
| 3318 | 1847 * Don't scroll when dollar_vcol >= 0, keep the "$". |
| 7 | 1848 */ |
| 1849 if (lnum == mod_top | |
| 1850 && mod_bot != MAXLNUM | |
| 3318 | 1851 && !(dollar_vcol >= 0 && mod_bot == mod_top + 1)) |
| 7 | 1852 { |
| 1853 int old_rows = 0; | |
| 1854 int new_rows = 0; | |
| 1855 int xtra_rows; | |
| 1856 linenr_T l; | |
| 1857 | |
| 1858 /* Count the old number of window rows, using w_lines[], which | |
| 1859 * should still contain the sizes for the lines as they are | |
| 1860 * currently displayed. */ | |
| 1861 for (i = idx; i < wp->w_lines_valid; ++i) | |
| 1862 { | |
| 1863 /* Only valid lines have a meaningful wl_lnum. Invalid | |
| 1864 * lines are part of the changed area. */ | |
| 1865 if (wp->w_lines[i].wl_valid | |
| 1866 && wp->w_lines[i].wl_lnum == mod_bot) | |
| 1867 break; | |
| 1868 old_rows += wp->w_lines[i].wl_size; | |
| 1869 #ifdef FEAT_FOLDING | |
| 1870 if (wp->w_lines[i].wl_valid | |
| 1871 && wp->w_lines[i].wl_lastlnum + 1 == mod_bot) | |
| 1872 { | |
| 1873 /* Must have found the last valid entry above mod_bot. | |
| 1874 * Add following invalid entries. */ | |
| 1875 ++i; | |
| 1876 while (i < wp->w_lines_valid | |
| 1877 && !wp->w_lines[i].wl_valid) | |
| 1878 old_rows += wp->w_lines[i++].wl_size; | |
| 1879 break; | |
| 1880 } | |
| 1881 #endif | |
| 1882 } | |
| 1883 | |
| 1884 if (i >= wp->w_lines_valid) | |
| 1885 { | |
| 1886 /* We can't find a valid line below the changed lines, | |
| 1887 * need to redraw until the end of the window. | |
| 1888 * Inserting/deleting lines has no use. */ | |
| 1889 bot_start = 0; | |
| 1890 } | |
| 1891 else | |
| 1892 { | |
| 1893 /* Able to count old number of rows: Count new window | |
| 1894 * rows, and may insert/delete lines */ | |
| 1895 j = idx; | |
| 1896 for (l = lnum; l < mod_bot; ++l) | |
| 1897 { | |
| 1898 #ifdef FEAT_FOLDING | |
| 1899 if (hasFoldingWin(wp, l, NULL, &l, TRUE, NULL)) | |
| 1900 ++new_rows; | |
| 1901 else | |
| 1902 #endif | |
| 1903 #ifdef FEAT_DIFF | |
| 1904 if (l == wp->w_topline) | |
| 1905 new_rows += plines_win_nofill(wp, l, TRUE) | |
| 1906 + wp->w_topfill; | |
| 1907 else | |
| 1908 #endif | |
| 1909 new_rows += plines_win(wp, l, TRUE); | |
| 1910 ++j; | |
| 1911 if (new_rows > wp->w_height - row - 2) | |
| 1912 { | |
| 1913 /* it's getting too much, must redraw the rest */ | |
| 1914 new_rows = 9999; | |
| 1915 break; | |
| 1916 } | |
| 1917 } | |
| 1918 xtra_rows = new_rows - old_rows; | |
| 1919 if (xtra_rows < 0) | |
| 1920 { | |
| 1921 /* May scroll text up. If there is not enough | |
| 1922 * remaining text or scrolling fails, must redraw the | |
| 1923 * rest. If scrolling works, must redraw the text | |
| 1924 * below the scrolled text. */ | |
| 1925 if (row - xtra_rows >= wp->w_height - 2) | |
| 1926 mod_bot = MAXLNUM; | |
| 1927 else | |
| 1928 { | |
| 1929 check_for_delay(FALSE); | |
| 1930 if (win_del_lines(wp, row, | |
|
12152
69af108df70e
patch 8.0.0956: scrolling in a terminal window has flicker
Christian Brabandt <cb@256bit.org>
parents:
12122
diff
changeset
|
1931 -xtra_rows, FALSE, FALSE, 0) == FAIL) |
| 7 | 1932 mod_bot = MAXLNUM; |
| 1933 else | |
| 1934 bot_start = wp->w_height + xtra_rows; | |
| 1935 } | |
| 1936 } | |
| 1937 else if (xtra_rows > 0) | |
| 1938 { | |
| 1939 /* May scroll text down. If there is not enough | |
| 1940 * remaining text of scrolling fails, must redraw the | |
| 1941 * rest. */ | |
| 1942 if (row + xtra_rows >= wp->w_height - 2) | |
| 1943 mod_bot = MAXLNUM; | |
| 1944 else | |
| 1945 { | |
| 1946 check_for_delay(FALSE); | |
| 1947 if (win_ins_lines(wp, row + old_rows, | |
| 1948 xtra_rows, FALSE, FALSE) == FAIL) | |
| 1949 mod_bot = MAXLNUM; | |
| 1950 else if (top_end > row + old_rows) | |
| 1951 /* Scrolled the part at the top that requires | |
| 1952 * updating down. */ | |
| 1953 top_end += xtra_rows; | |
| 1954 } | |
| 1955 } | |
| 1956 | |
| 1957 /* When not updating the rest, may need to move w_lines[] | |
| 1958 * entries. */ | |
| 1959 if (mod_bot != MAXLNUM && i != j) | |
| 1960 { | |
| 1961 if (j < i) | |
| 1962 { | |
| 1963 int x = row + new_rows; | |
| 1964 | |
| 1965 /* move entries in w_lines[] upwards */ | |
| 1966 for (;;) | |
| 1967 { | |
| 1968 /* stop at last valid entry in w_lines[] */ | |
| 1969 if (i >= wp->w_lines_valid) | |
| 1970 { | |
| 1971 wp->w_lines_valid = j; | |
| 1972 break; | |
| 1973 } | |
| 1974 wp->w_lines[j] = wp->w_lines[i]; | |
| 1975 /* stop at a line that won't fit */ | |
| 1976 if (x + (int)wp->w_lines[j].wl_size | |
| 1977 > wp->w_height) | |
| 1978 { | |
| 1979 wp->w_lines_valid = j + 1; | |
| 1980 break; | |
| 1981 } | |
| 1982 x += wp->w_lines[j++].wl_size; | |
| 1983 ++i; | |
| 1984 } | |
| 1985 if (bot_start > x) | |
| 1986 bot_start = x; | |
| 1987 } | |
| 1988 else /* j > i */ | |
| 1989 { | |
| 1990 /* move entries in w_lines[] downwards */ | |
| 1991 j -= i; | |
| 1992 wp->w_lines_valid += j; | |
| 1993 if (wp->w_lines_valid > wp->w_height) | |
| 1994 wp->w_lines_valid = wp->w_height; | |
| 1995 for (i = wp->w_lines_valid; i - j >= idx; --i) | |
| 1996 wp->w_lines[i] = wp->w_lines[i - j]; | |
| 1997 | |
| 1998 /* The w_lines[] entries for inserted lines are | |
| 1999 * now invalid, but wl_size may be used above. | |
| 2000 * Reset to zero. */ | |
| 2001 while (i >= idx) | |
| 2002 { | |
| 2003 wp->w_lines[i].wl_size = 0; | |
| 2004 wp->w_lines[i--].wl_valid = FALSE; | |
| 2005 } | |
| 2006 } | |
| 2007 } | |
| 2008 } | |
| 2009 } | |
| 2010 | |
| 2011 #ifdef FEAT_FOLDING | |
| 2012 /* | |
| 2013 * When lines are folded, display one line for all of them. | |
| 2014 * Otherwise, display normally (can be several display lines when | |
| 2015 * 'wrap' is on). | |
| 2016 */ | |
| 2017 fold_count = foldedCount(wp, lnum, &win_foldinfo); | |
| 2018 if (fold_count != 0) | |
| 2019 { | |
| 2020 fold_line(wp, fold_count, &win_foldinfo, lnum, row); | |
| 2021 ++row; | |
| 2022 --fold_count; | |
| 2023 wp->w_lines[idx].wl_folded = TRUE; | |
| 2024 wp->w_lines[idx].wl_lastlnum = lnum + fold_count; | |
| 2025 # ifdef FEAT_SYN_HL | |
| 2026 did_update = DID_FOLD; | |
| 2027 # endif | |
| 2028 } | |
| 2029 else | |
| 2030 #endif | |
| 2031 if (idx < wp->w_lines_valid | |
| 2032 && wp->w_lines[idx].wl_valid | |
| 2033 && wp->w_lines[idx].wl_lnum == lnum | |
| 2034 && lnum > wp->w_topline | |
|
9665
b193bdb6ea25
commit https://github.com/vim/vim/commit/ad9c2a08f0509294269a2f11a59a438b944bdd5a
Christian Brabandt <cb@256bit.org>
parents:
9649
diff
changeset
|
2035 && !(dy_flags & (DY_LASTLINE | DY_TRUNCATE)) |
| 7 | 2036 && srow + wp->w_lines[idx].wl_size > wp->w_height |
| 2037 #ifdef FEAT_DIFF | |
| 2038 && diff_check_fill(wp, lnum) == 0 | |
| 2039 #endif | |
| 2040 ) | |
| 2041 { | |
| 2042 /* This line is not going to fit. Don't draw anything here, | |
| 2043 * will draw "@ " lines below. */ | |
| 2044 row = wp->w_height + 1; | |
| 2045 } | |
| 2046 else | |
| 2047 { | |
| 2048 #ifdef FEAT_SEARCH_EXTRA | |
| 2049 prepare_search_hl(wp, lnum); | |
| 2050 #endif | |
| 2051 #ifdef FEAT_SYN_HL | |
| 2052 /* Let the syntax stuff know we skipped a few lines. */ | |
| 2053 if (syntax_last_parsed != 0 && syntax_last_parsed + 1 < lnum | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
2054 && syntax_present(wp)) |
| 7 | 2055 syntax_end_parsing(syntax_last_parsed + 1); |
| 2056 #endif | |
| 2057 | |
| 2058 /* | |
| 2059 * Display one line. | |
| 2060 */ | |
|
14724
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
2061 row = win_line(wp, lnum, srow, wp->w_height, |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
2062 mod_top == 0, FALSE); |
| 7 | 2063 |
| 2064 #ifdef FEAT_FOLDING | |
| 2065 wp->w_lines[idx].wl_folded = FALSE; | |
| 2066 wp->w_lines[idx].wl_lastlnum = lnum; | |
| 2067 #endif | |
| 2068 #ifdef FEAT_SYN_HL | |
| 2069 did_update = DID_LINE; | |
| 2070 syntax_last_parsed = lnum; | |
| 2071 #endif | |
| 2072 } | |
| 2073 | |
| 2074 wp->w_lines[idx].wl_lnum = lnum; | |
| 2075 wp->w_lines[idx].wl_valid = TRUE; | |
|
12700
306a7a357c71
patch 8.0.1228: invalid memory access in GUI test
Christian Brabandt <cb@256bit.org>
parents:
12672
diff
changeset
|
2076 |
|
306a7a357c71
patch 8.0.1228: invalid memory access in GUI test
Christian Brabandt <cb@256bit.org>
parents:
12672
diff
changeset
|
2077 /* Past end of the window or end of the screen. Note that after |
|
306a7a357c71
patch 8.0.1228: invalid memory access in GUI test
Christian Brabandt <cb@256bit.org>
parents:
12672
diff
changeset
|
2078 * resizing wp->w_height may be end up too big. That's a problem |
|
306a7a357c71
patch 8.0.1228: invalid memory access in GUI test
Christian Brabandt <cb@256bit.org>
parents:
12672
diff
changeset
|
2079 * elsewhere, but prevent a crash here. */ |
|
306a7a357c71
patch 8.0.1228: invalid memory access in GUI test
Christian Brabandt <cb@256bit.org>
parents:
12672
diff
changeset
|
2080 if (row > wp->w_height || row + wp->w_winrow >= Rows) |
| 7 | 2081 { |
| 2082 /* we may need the size of that too long line later on */ | |
| 3318 | 2083 if (dollar_vcol == -1) |
| 7 | 2084 wp->w_lines[idx].wl_size = plines_win(wp, lnum, TRUE); |
| 2085 ++idx; | |
| 2086 break; | |
| 2087 } | |
| 3318 | 2088 if (dollar_vcol == -1) |
| 7 | 2089 wp->w_lines[idx].wl_size = row - srow; |
| 2090 ++idx; | |
| 2091 #ifdef FEAT_FOLDING | |
| 2092 lnum += fold_count + 1; | |
| 2093 #else | |
| 2094 ++lnum; | |
| 2095 #endif | |
| 2096 } | |
| 2097 else | |
| 2098 { | |
|
14724
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
2099 if (wp->w_p_rnu) |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
2100 { |
|
14877
8b6124732e8f
patch 8.1.0450: build failure without the +fold feature
Christian Brabandt <cb@256bit.org>
parents:
14875
diff
changeset
|
2101 #ifdef FEAT_FOLDING |
|
14724
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
2102 // 'relativenumber' set: The text doesn't need to be drawn, but |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
2103 // the number column nearly always does. |
|
14875
081f30c50300
patch 8.1.0449: when 'rnu' is set folded lines are not displayed correctly
Christian Brabandt <cb@256bit.org>
parents:
14862
diff
changeset
|
2104 fold_count = foldedCount(wp, lnum, &win_foldinfo); |
|
081f30c50300
patch 8.1.0449: when 'rnu' is set folded lines are not displayed correctly
Christian Brabandt <cb@256bit.org>
parents:
14862
diff
changeset
|
2105 if (fold_count != 0) |
|
081f30c50300
patch 8.1.0449: when 'rnu' is set folded lines are not displayed correctly
Christian Brabandt <cb@256bit.org>
parents:
14862
diff
changeset
|
2106 fold_line(wp, fold_count, &win_foldinfo, lnum, row); |
|
081f30c50300
patch 8.1.0449: when 'rnu' is set folded lines are not displayed correctly
Christian Brabandt <cb@256bit.org>
parents:
14862
diff
changeset
|
2107 else |
|
14877
8b6124732e8f
patch 8.1.0450: build failure without the +fold feature
Christian Brabandt <cb@256bit.org>
parents:
14875
diff
changeset
|
2108 #endif |
|
14875
081f30c50300
patch 8.1.0449: when 'rnu' is set folded lines are not displayed correctly
Christian Brabandt <cb@256bit.org>
parents:
14862
diff
changeset
|
2109 (void)win_line(wp, lnum, srow, wp->w_height, TRUE, TRUE); |
|
14724
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
2110 } |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
2111 |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
2112 // This line does not need to be drawn, advance to the next one. |
| 7 | 2113 row += wp->w_lines[idx++].wl_size; |
| 2114 if (row > wp->w_height) /* past end of screen */ | |
| 2115 break; | |
| 2116 #ifdef FEAT_FOLDING | |
| 2117 lnum = wp->w_lines[idx - 1].wl_lastlnum + 1; | |
| 2118 #else | |
| 2119 ++lnum; | |
| 2120 #endif | |
| 2121 #ifdef FEAT_SYN_HL | |
| 2122 did_update = DID_NONE; | |
| 2123 #endif | |
| 2124 } | |
| 2125 | |
| 2126 if (lnum > buf->b_ml.ml_line_count) | |
| 2127 { | |
| 2128 eof = TRUE; | |
| 2129 break; | |
| 2130 } | |
| 2131 } | |
| 2132 /* | |
| 2133 * End of loop over all window lines. | |
| 2134 */ | |
| 2135 | |
|
13314
65c3e8259124
patch 8.0.1531: cannot use 24 bit colors in MS-Windows console
Christian Brabandt <cb@256bit.org>
parents:
13308
diff
changeset
|
2136 #ifdef FEAT_VTP |
|
65c3e8259124
patch 8.0.1531: cannot use 24 bit colors in MS-Windows console
Christian Brabandt <cb@256bit.org>
parents:
13308
diff
changeset
|
2137 /* Rewrite the character at the end of the screen line. */ |
|
65c3e8259124
patch 8.0.1531: cannot use 24 bit colors in MS-Windows console
Christian Brabandt <cb@256bit.org>
parents:
13308
diff
changeset
|
2138 if (use_vtp()) |
|
65c3e8259124
patch 8.0.1531: cannot use 24 bit colors in MS-Windows console
Christian Brabandt <cb@256bit.org>
parents:
13308
diff
changeset
|
2139 { |
|
65c3e8259124
patch 8.0.1531: cannot use 24 bit colors in MS-Windows console
Christian Brabandt <cb@256bit.org>
parents:
13308
diff
changeset
|
2140 int i; |
|
65c3e8259124
patch 8.0.1531: cannot use 24 bit colors in MS-Windows console
Christian Brabandt <cb@256bit.org>
parents:
13308
diff
changeset
|
2141 |
|
65c3e8259124
patch 8.0.1531: cannot use 24 bit colors in MS-Windows console
Christian Brabandt <cb@256bit.org>
parents:
13308
diff
changeset
|
2142 for (i = 0; i < Rows; ++i) |
|
65c3e8259124
patch 8.0.1531: cannot use 24 bit colors in MS-Windows console
Christian Brabandt <cb@256bit.org>
parents:
13308
diff
changeset
|
2143 if (enc_utf8) |
|
65c3e8259124
patch 8.0.1531: cannot use 24 bit colors in MS-Windows console
Christian Brabandt <cb@256bit.org>
parents:
13308
diff
changeset
|
2144 if ((*mb_off2cells)(LineOffset[i] + Columns - 2, |
|
65c3e8259124
patch 8.0.1531: cannot use 24 bit colors in MS-Windows console
Christian Brabandt <cb@256bit.org>
parents:
13308
diff
changeset
|
2145 LineOffset[i] + screen_Columns) > 1) |
|
65c3e8259124
patch 8.0.1531: cannot use 24 bit colors in MS-Windows console
Christian Brabandt <cb@256bit.org>
parents:
13308
diff
changeset
|
2146 screen_draw_rectangle(i, Columns - 2, 1, 2, FALSE); |
|
65c3e8259124
patch 8.0.1531: cannot use 24 bit colors in MS-Windows console
Christian Brabandt <cb@256bit.org>
parents:
13308
diff
changeset
|
2147 else |
|
65c3e8259124
patch 8.0.1531: cannot use 24 bit colors in MS-Windows console
Christian Brabandt <cb@256bit.org>
parents:
13308
diff
changeset
|
2148 screen_draw_rectangle(i, Columns - 1, 1, 1, FALSE); |
|
65c3e8259124
patch 8.0.1531: cannot use 24 bit colors in MS-Windows console
Christian Brabandt <cb@256bit.org>
parents:
13308
diff
changeset
|
2149 else |
|
65c3e8259124
patch 8.0.1531: cannot use 24 bit colors in MS-Windows console
Christian Brabandt <cb@256bit.org>
parents:
13308
diff
changeset
|
2150 screen_char(LineOffset[i] + Columns - 1, i, Columns - 1); |
|
65c3e8259124
patch 8.0.1531: cannot use 24 bit colors in MS-Windows console
Christian Brabandt <cb@256bit.org>
parents:
13308
diff
changeset
|
2151 } |
|
65c3e8259124
patch 8.0.1531: cannot use 24 bit colors in MS-Windows console
Christian Brabandt <cb@256bit.org>
parents:
13308
diff
changeset
|
2152 #endif |
| 7 | 2153 |
| 2154 if (idx > wp->w_lines_valid) | |
| 2155 wp->w_lines_valid = idx; | |
| 2156 | |
| 2157 #ifdef FEAT_SYN_HL | |
| 2158 /* | |
| 2159 * Let the syntax stuff know we stop parsing here. | |
| 2160 */ | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
2161 if (syntax_last_parsed != 0 && syntax_present(wp)) |
| 7 | 2162 syntax_end_parsing(syntax_last_parsed + 1); |
| 2163 #endif | |
| 2164 | |
| 2165 /* | |
| 2166 * If we didn't hit the end of the file, and we didn't finish the last | |
| 2167 * line we were working on, then the line didn't fit. | |
| 2168 */ | |
| 2169 wp->w_empty_rows = 0; | |
| 2170 #ifdef FEAT_DIFF | |
| 2171 wp->w_filler_rows = 0; | |
| 2172 #endif | |
| 2173 if (!eof && !didline) | |
| 2174 { | |
| 2175 if (lnum == wp->w_topline) | |
| 2176 { | |
| 2177 /* | |
| 2178 * Single line that does not fit! | |
| 2179 * Don't overwrite it, it can be edited. | |
| 2180 */ | |
| 2181 wp->w_botline = lnum + 1; | |
| 2182 } | |
| 2183 #ifdef FEAT_DIFF | |
| 2184 else if (diff_check_fill(wp, lnum) >= wp->w_height - srow) | |
| 2185 { | |
| 2186 /* Window ends in filler lines. */ | |
| 2187 wp->w_botline = lnum; | |
| 2188 wp->w_filler_rows = wp->w_height - srow; | |
| 2189 } | |
| 2190 #endif | |
|
9665
b193bdb6ea25
commit https://github.com/vim/vim/commit/ad9c2a08f0509294269a2f11a59a438b944bdd5a
Christian Brabandt <cb@256bit.org>
parents:
9649
diff
changeset
|
2191 else if (dy_flags & DY_TRUNCATE) /* 'display' has "truncate" */ |
|
b193bdb6ea25
commit https://github.com/vim/vim/commit/ad9c2a08f0509294269a2f11a59a438b944bdd5a
Christian Brabandt <cb@256bit.org>
parents:
9649
diff
changeset
|
2192 { |
|
b193bdb6ea25
commit https://github.com/vim/vim/commit/ad9c2a08f0509294269a2f11a59a438b944bdd5a
Christian Brabandt <cb@256bit.org>
parents:
9649
diff
changeset
|
2193 int scr_row = W_WINROW(wp) + wp->w_height - 1; |
|
b193bdb6ea25
commit https://github.com/vim/vim/commit/ad9c2a08f0509294269a2f11a59a438b944bdd5a
Christian Brabandt <cb@256bit.org>
parents:
9649
diff
changeset
|
2194 |
|
b193bdb6ea25
commit https://github.com/vim/vim/commit/ad9c2a08f0509294269a2f11a59a438b944bdd5a
Christian Brabandt <cb@256bit.org>
parents:
9649
diff
changeset
|
2195 /* |
|
b193bdb6ea25
commit https://github.com/vim/vim/commit/ad9c2a08f0509294269a2f11a59a438b944bdd5a
Christian Brabandt <cb@256bit.org>
parents:
9649
diff
changeset
|
2196 * Last line isn't finished: Display "@@@" in the last screen line. |
|
b193bdb6ea25
commit https://github.com/vim/vim/commit/ad9c2a08f0509294269a2f11a59a438b944bdd5a
Christian Brabandt <cb@256bit.org>
parents:
9649
diff
changeset
|
2197 */ |
|
12513
3ca08bf99396
patch 8.0.1135: W_WINCOL() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12510
diff
changeset
|
2198 screen_puts_len((char_u *)"@@", 2, scr_row, wp->w_wincol, |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
2199 HL_ATTR(HLF_AT)); |
|
9665
b193bdb6ea25
commit https://github.com/vim/vim/commit/ad9c2a08f0509294269a2f11a59a438b944bdd5a
Christian Brabandt <cb@256bit.org>
parents:
9649
diff
changeset
|
2200 screen_fill(scr_row, scr_row + 1, |
|
12513
3ca08bf99396
patch 8.0.1135: W_WINCOL() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12510
diff
changeset
|
2201 (int)wp->w_wincol + 2, (int)W_ENDCOL(wp), |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
2202 '@', ' ', HL_ATTR(HLF_AT)); |
|
9665
b193bdb6ea25
commit https://github.com/vim/vim/commit/ad9c2a08f0509294269a2f11a59a438b944bdd5a
Christian Brabandt <cb@256bit.org>
parents:
9649
diff
changeset
|
2203 set_empty_rows(wp, srow); |
|
b193bdb6ea25
commit https://github.com/vim/vim/commit/ad9c2a08f0509294269a2f11a59a438b944bdd5a
Christian Brabandt <cb@256bit.org>
parents:
9649
diff
changeset
|
2204 wp->w_botline = lnum; |
|
b193bdb6ea25
commit https://github.com/vim/vim/commit/ad9c2a08f0509294269a2f11a59a438b944bdd5a
Christian Brabandt <cb@256bit.org>
parents:
9649
diff
changeset
|
2205 } |
| 7 | 2206 else if (dy_flags & DY_LASTLINE) /* 'display' has "lastline" */ |
| 2207 { | |
| 2208 /* | |
| 2209 * Last line isn't finished: Display "@@@" at the end. | |
| 2210 */ | |
| 2211 screen_fill(W_WINROW(wp) + wp->w_height - 1, | |
| 2212 W_WINROW(wp) + wp->w_height, | |
| 2213 (int)W_ENDCOL(wp) - 3, (int)W_ENDCOL(wp), | |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
2214 '@', '@', HL_ATTR(HLF_AT)); |
| 7 | 2215 set_empty_rows(wp, srow); |
| 2216 wp->w_botline = lnum; | |
| 2217 } | |
| 2218 else | |
| 2219 { | |
| 2220 win_draw_end(wp, '@', ' ', srow, wp->w_height, HLF_AT); | |
| 2221 wp->w_botline = lnum; | |
| 2222 } | |
| 2223 } | |
| 2224 else | |
| 2225 { | |
| 2226 draw_vsep_win(wp, row); | |
| 2227 if (eof) /* we hit the end of the file */ | |
| 2228 { | |
| 2229 wp->w_botline = buf->b_ml.ml_line_count + 1; | |
| 2230 #ifdef FEAT_DIFF | |
| 2231 j = diff_check_fill(wp, wp->w_botline); | |
| 2232 if (j > 0 && !wp->w_botfill) | |
| 2233 { | |
| 2234 /* | |
| 2235 * Display filler lines at the end of the file | |
| 2236 */ | |
| 2237 if (char2cells(fill_diff) > 1) | |
| 2238 i = '-'; | |
| 2239 else | |
| 2240 i = fill_diff; | |
| 2241 if (row + j > wp->w_height) | |
| 2242 j = wp->w_height - row; | |
| 2243 win_draw_end(wp, i, i, row, row + (int)j, HLF_DED); | |
| 2244 row += j; | |
| 2245 } | |
| 2246 #endif | |
| 2247 } | |
| 3318 | 2248 else if (dollar_vcol == -1) |
| 7 | 2249 wp->w_botline = lnum; |
| 2250 | |
| 2251 /* make sure the rest of the screen is blank */ | |
| 2252 /* put '~'s on rows that aren't part of the file. */ | |
|
9877
7da89d9c744b
commit https://github.com/vim/vim/commit/58b853460add42098ab08017df9e030fb14fd34b
Christian Brabandt <cb@256bit.org>
parents:
9852
diff
changeset
|
2253 win_draw_end(wp, '~', ' ', row, wp->w_height, HLF_EOB); |
| 7 | 2254 } |
| 2255 | |
|
12510
7a887dccd13a
patch 8.0.1133: syntax timeout not used correctly
Christian Brabandt <cb@256bit.org>
parents:
12487
diff
changeset
|
2256 #ifdef SYN_TIME_LIMIT |
|
7a887dccd13a
patch 8.0.1133: syntax timeout not used correctly
Christian Brabandt <cb@256bit.org>
parents:
12487
diff
changeset
|
2257 syn_set_timeout(NULL); |
|
7a887dccd13a
patch 8.0.1133: syntax timeout not used correctly
Christian Brabandt <cb@256bit.org>
parents:
12487
diff
changeset
|
2258 #endif |
|
7a887dccd13a
patch 8.0.1133: syntax timeout not used correctly
Christian Brabandt <cb@256bit.org>
parents:
12487
diff
changeset
|
2259 |
| 7 | 2260 /* Reset the type of redrawing required, the window has been updated. */ |
| 2261 wp->w_redr_type = 0; | |
| 2262 #ifdef FEAT_DIFF | |
| 2263 wp->w_old_topfill = wp->w_topfill; | |
| 2264 wp->w_old_botfill = wp->w_botfill; | |
| 2265 #endif | |
| 2266 | |
| 3318 | 2267 if (dollar_vcol == -1) |
| 7 | 2268 { |
| 2269 /* | |
| 2270 * There is a trick with w_botline. If we invalidate it on each | |
| 2271 * change that might modify it, this will cause a lot of expensive | |
| 2272 * calls to plines() in update_topline() each time. Therefore the | |
| 2273 * value of w_botline is often approximated, and this value is used to | |
| 2274 * compute the value of w_topline. If the value of w_botline was | |
| 2275 * wrong, check that the value of w_topline is correct (cursor is on | |
| 2276 * the visible part of the text). If it's not, we need to redraw | |
| 2277 * again. Mostly this just means scrolling up a few lines, so it | |
| 2278 * doesn't look too bad. Only do this for the current window (where | |
| 2279 * changes are relevant). | |
| 2280 */ | |
| 2281 wp->w_valid |= VALID_BOTLINE; | |
| 2282 if (wp == curwin && wp->w_botline != old_botline && !recursive) | |
| 2283 { | |
| 2284 recursive = TRUE; | |
| 2285 curwin->w_valid &= ~VALID_TOPLINE; | |
| 2286 update_topline(); /* may invalidate w_botline again */ | |
| 2287 if (must_redraw != 0) | |
| 2288 { | |
| 2289 /* Don't update for changes in buffer again. */ | |
| 2290 i = curbuf->b_mod_set; | |
| 2291 curbuf->b_mod_set = FALSE; | |
| 2292 win_update(curwin); | |
| 2293 must_redraw = 0; | |
| 2294 curbuf->b_mod_set = i; | |
| 2295 } | |
| 2296 recursive = FALSE; | |
| 2297 } | |
| 2298 } | |
| 2299 | |
| 2300 #if defined(FEAT_SYN_HL) || defined(FEAT_SEARCH_EXTRA) | |
| 2301 /* restore got_int, unless CTRL-C was hit while redrawing */ | |
| 2302 if (!got_int) | |
| 2303 got_int = save_got_int; | |
| 2304 #endif | |
| 2305 } | |
| 2306 | |
| 2307 /* | |
| 2308 * Clear the rest of the window and mark the unused lines with "c1". use "c2" | |
| 2309 * as the filler character. | |
| 2310 */ | |
| 2311 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2312 win_draw_end( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2313 win_T *wp, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2314 int c1, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2315 int c2, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2316 int row, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2317 int endrow, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2318 hlf_T hl) |
| 7 | 2319 { |
| 2320 #if defined(FEAT_FOLDING) || defined(FEAT_SIGNS) || defined(FEAT_CMDWIN) | |
| 2321 int n = 0; | |
| 2322 # define FDC_OFF n | |
| 2323 #else | |
| 2324 # define FDC_OFF 0 | |
| 2325 #endif | |
| 6553 | 2326 #ifdef FEAT_FOLDING |
| 2327 int fdc = compute_foldcolumn(wp, 0); | |
| 2328 #endif | |
| 7 | 2329 |
| 2330 #ifdef FEAT_RIGHTLEFT | |
| 2331 if (wp->w_p_rl) | |
| 2332 { | |
| 2333 /* No check for cmdline window: should never be right-left. */ | |
| 2334 # ifdef FEAT_FOLDING | |
| 6553 | 2335 n = fdc; |
| 7 | 2336 |
| 2337 if (n > 0) | |
| 2338 { | |
| 2339 /* draw the fold column at the right */ | |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
2340 if (n > wp->w_width) |
|
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
2341 n = wp->w_width; |
| 7 | 2342 screen_fill(W_WINROW(wp) + row, W_WINROW(wp) + endrow, |
| 2343 W_ENDCOL(wp) - n, (int)W_ENDCOL(wp), | |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
2344 ' ', ' ', HL_ATTR(HLF_FC)); |
| 7 | 2345 } |
| 2346 # endif | |
| 2347 # ifdef FEAT_SIGNS | |
|
9852
4eea48b76d03
commit https://github.com/vim/vim/commit/95ec9d6a6ab3117d60ff638670a803d43974ba51
Christian Brabandt <cb@256bit.org>
parents:
9848
diff
changeset
|
2348 if (signcolumn_on(wp)) |
| 7 | 2349 { |
| 2350 int nn = n + 2; | |
| 2351 | |
| 2352 /* draw the sign column left of the fold column */ | |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
2353 if (nn > wp->w_width) |
|
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
2354 nn = wp->w_width; |
| 7 | 2355 screen_fill(W_WINROW(wp) + row, W_WINROW(wp) + endrow, |
| 2356 W_ENDCOL(wp) - nn, (int)W_ENDCOL(wp) - n, | |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
2357 ' ', ' ', HL_ATTR(HLF_SC)); |
| 7 | 2358 n = nn; |
| 2359 } | |
| 2360 # endif | |
| 2361 screen_fill(W_WINROW(wp) + row, W_WINROW(wp) + endrow, | |
|
12513
3ca08bf99396
patch 8.0.1135: W_WINCOL() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12510
diff
changeset
|
2362 wp->w_wincol, W_ENDCOL(wp) - 1 - FDC_OFF, |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
2363 c2, c2, HL_ATTR(hl)); |
| 7 | 2364 screen_fill(W_WINROW(wp) + row, W_WINROW(wp) + endrow, |
| 2365 W_ENDCOL(wp) - 1 - FDC_OFF, W_ENDCOL(wp) - FDC_OFF, | |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
2366 c1, c2, HL_ATTR(hl)); |
| 7 | 2367 } |
| 2368 else | |
| 2369 #endif | |
| 2370 { | |
| 2371 #ifdef FEAT_CMDWIN | |
| 2372 if (cmdwin_type != 0 && wp == curwin) | |
| 2373 { | |
| 2374 /* draw the cmdline character in the leftmost column */ | |
| 2375 n = 1; | |
| 2376 if (n > wp->w_width) | |
| 2377 n = wp->w_width; | |
| 2378 screen_fill(W_WINROW(wp) + row, W_WINROW(wp) + endrow, | |
|
12513
3ca08bf99396
patch 8.0.1135: W_WINCOL() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12510
diff
changeset
|
2379 wp->w_wincol, (int)wp->w_wincol + n, |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
2380 cmdwin_type, ' ', HL_ATTR(HLF_AT)); |
| 7 | 2381 } |
| 2382 #endif | |
| 2383 #ifdef FEAT_FOLDING | |
| 6553 | 2384 if (fdc > 0) |
| 2385 { | |
| 2386 int nn = n + fdc; | |
| 7 | 2387 |
| 2388 /* draw the fold column at the left */ | |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
2389 if (nn > wp->w_width) |
|
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
2390 nn = wp->w_width; |
| 7 | 2391 screen_fill(W_WINROW(wp) + row, W_WINROW(wp) + endrow, |
|
12513
3ca08bf99396
patch 8.0.1135: W_WINCOL() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12510
diff
changeset
|
2392 wp->w_wincol + n, (int)wp->w_wincol + nn, |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
2393 ' ', ' ', HL_ATTR(HLF_FC)); |
| 7 | 2394 n = nn; |
| 2395 } | |
| 2396 #endif | |
| 2397 #ifdef FEAT_SIGNS | |
|
9852
4eea48b76d03
commit https://github.com/vim/vim/commit/95ec9d6a6ab3117d60ff638670a803d43974ba51
Christian Brabandt <cb@256bit.org>
parents:
9848
diff
changeset
|
2398 if (signcolumn_on(wp)) |
| 7 | 2399 { |
| 2400 int nn = n + 2; | |
| 2401 | |
| 2402 /* draw the sign column after the fold column */ | |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
2403 if (nn > wp->w_width) |
|
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
2404 nn = wp->w_width; |
| 7 | 2405 screen_fill(W_WINROW(wp) + row, W_WINROW(wp) + endrow, |
|
12513
3ca08bf99396
patch 8.0.1135: W_WINCOL() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12510
diff
changeset
|
2406 wp->w_wincol + n, (int)wp->w_wincol + nn, |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
2407 ' ', ' ', HL_ATTR(HLF_SC)); |
| 7 | 2408 n = nn; |
| 2409 } | |
| 2410 #endif | |
| 2411 screen_fill(W_WINROW(wp) + row, W_WINROW(wp) + endrow, | |
|
12513
3ca08bf99396
patch 8.0.1135: W_WINCOL() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12510
diff
changeset
|
2412 wp->w_wincol + FDC_OFF, (int)W_ENDCOL(wp), |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
2413 c1, c2, HL_ATTR(hl)); |
| 7 | 2414 } |
| 2415 set_empty_rows(wp, row); | |
| 2416 } | |
| 2417 | |
|
2314
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
2418 #ifdef FEAT_SYN_HL |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
2419 /* |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
2420 * Advance **color_cols and return TRUE when there are columns to draw. |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
2421 */ |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
2422 static int |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2423 advance_color_col(int vcol, int **color_cols) |
|
2314
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
2424 { |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
2425 while (**color_cols >= 0 && vcol > **color_cols) |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
2426 ++*color_cols; |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
2427 return (**color_cols >= 0); |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
2428 } |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
2429 #endif |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
2430 |
|
12487
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2431 #if defined(FEAT_MENU) || defined(FEAT_FOLDING) |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2432 /* |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2433 * Copy "text" to ScreenLines using "attr". |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2434 * Returns the next screen column. |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2435 */ |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2436 static int |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2437 text_to_screenline(win_T *wp, char_u *text, int col) |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2438 { |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2439 int off = (int)(current_ScreenLine - ScreenLines); |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2440 |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2441 if (has_mbyte) |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2442 { |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2443 int cells; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2444 int u8c, u8cc[MAX_MCO]; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2445 int i; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2446 int idx; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2447 int c_len; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2448 char_u *p; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2449 # ifdef FEAT_ARABIC |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2450 int prev_c = 0; /* previous Arabic character */ |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2451 int prev_c1 = 0; /* first composing char for prev_c */ |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2452 # endif |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2453 |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2454 # ifdef FEAT_RIGHTLEFT |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2455 if (wp->w_p_rl) |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2456 idx = off; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2457 else |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2458 # endif |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2459 idx = off + col; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2460 |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2461 /* Store multibyte characters in ScreenLines[] et al. correctly. */ |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2462 for (p = text; *p != NUL; ) |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2463 { |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2464 cells = (*mb_ptr2cells)(p); |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2465 c_len = (*mb_ptr2len)(p); |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
2466 if (col + cells > wp->w_width |
|
12487
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2467 # ifdef FEAT_RIGHTLEFT |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2468 - (wp->w_p_rl ? col : 0) |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2469 # endif |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2470 ) |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2471 break; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2472 ScreenLines[idx] = *p; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2473 if (enc_utf8) |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2474 { |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2475 u8c = utfc_ptr2char(p, u8cc); |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2476 if (*p < 0x80 && u8cc[0] == 0) |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2477 { |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2478 ScreenLinesUC[idx] = 0; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2479 #ifdef FEAT_ARABIC |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2480 prev_c = u8c; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2481 #endif |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2482 } |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2483 else |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2484 { |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2485 #ifdef FEAT_ARABIC |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2486 if (p_arshape && !p_tbidi && ARABIC_CHAR(u8c)) |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2487 { |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2488 /* Do Arabic shaping. */ |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2489 int pc, pc1, nc; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2490 int pcc[MAX_MCO]; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2491 int firstbyte = *p; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2492 |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2493 /* The idea of what is the previous and next |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2494 * character depends on 'rightleft'. */ |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2495 if (wp->w_p_rl) |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2496 { |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2497 pc = prev_c; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2498 pc1 = prev_c1; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2499 nc = utf_ptr2char(p + c_len); |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2500 prev_c1 = u8cc[0]; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2501 } |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2502 else |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2503 { |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2504 pc = utfc_ptr2char(p + c_len, pcc); |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2505 nc = prev_c; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2506 pc1 = pcc[0]; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2507 } |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2508 prev_c = u8c; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2509 |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2510 u8c = arabic_shape(u8c, &firstbyte, &u8cc[0], |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2511 pc, pc1, nc); |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2512 ScreenLines[idx] = firstbyte; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2513 } |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2514 else |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2515 prev_c = u8c; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2516 #endif |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2517 /* Non-BMP character: display as ? or fullwidth ?. */ |
|
15609
b440c7becbca
patch 8.1.0812: Unicode 16 feature is not useful
Bram Moolenaar <Bram@vim.org>
parents:
15603
diff
changeset
|
2518 ScreenLinesUC[idx] = u8c; |
|
12487
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2519 for (i = 0; i < Screen_mco; ++i) |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2520 { |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2521 ScreenLinesC[i][idx] = u8cc[i]; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2522 if (u8cc[i] == 0) |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2523 break; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2524 } |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2525 } |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2526 if (cells > 1) |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2527 ScreenLines[idx + 1] = 0; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2528 } |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2529 else if (enc_dbcs == DBCS_JPNU && *p == 0x8e) |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2530 /* double-byte single width character */ |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2531 ScreenLines2[idx] = p[1]; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2532 else if (cells > 1) |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2533 /* double-width character */ |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2534 ScreenLines[idx + 1] = p[1]; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2535 col += cells; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2536 idx += cells; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2537 p += c_len; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2538 } |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2539 } |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2540 else |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2541 { |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2542 int len = (int)STRLEN(text); |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2543 |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
2544 if (len > wp->w_width - col) |
|
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
2545 len = wp->w_width - col; |
|
12487
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2546 if (len > 0) |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2547 { |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2548 #ifdef FEAT_RIGHTLEFT |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2549 if (wp->w_p_rl) |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2550 STRNCPY(current_ScreenLine, text, len); |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2551 else |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2552 #endif |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2553 STRNCPY(current_ScreenLine + col, text, len); |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2554 col += len; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2555 } |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2556 } |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2557 return col; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2558 } |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2559 #endif |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2560 |
| 7 | 2561 #ifdef FEAT_FOLDING |
| 2562 /* | |
| 6553 | 2563 * Compute the width of the foldcolumn. Based on 'foldcolumn' and how much |
| 2564 * space is available for window "wp", minus "col". | |
| 2565 */ | |
| 2566 static int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2567 compute_foldcolumn(win_T *wp, int col) |
| 6553 | 2568 { |
| 2569 int fdc = wp->w_p_fdc; | |
| 2570 int wmw = wp == curwin && p_wmw == 0 ? 1 : p_wmw; | |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
2571 int wwidth = wp->w_width; |
| 6553 | 2572 |
| 2573 if (fdc > wwidth - (col + wmw)) | |
| 2574 fdc = wwidth - (col + wmw); | |
| 2575 return fdc; | |
| 2576 } | |
| 2577 | |
| 2578 /* | |
| 7 | 2579 * Display one folded line. |
| 2580 */ | |
| 2581 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2582 fold_line( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2583 win_T *wp, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2584 long fold_count, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2585 foldinfo_T *foldinfo, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2586 linenr_T lnum, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2587 int row) |
| 7 | 2588 { |
|
9754
a990e7ed260b
commit https://github.com/vim/vim/commit/ee695f787ade7fd88fc5f5497553d95c0c3645b5
Christian Brabandt <cb@256bit.org>
parents:
9665
diff
changeset
|
2589 char_u buf[FOLD_TEXT_LEN]; |
| 7 | 2590 pos_T *top, *bot; |
| 2591 linenr_T lnume = lnum + fold_count - 1; | |
| 2592 int len; | |
| 29 | 2593 char_u *text; |
| 7 | 2594 int fdc; |
| 2595 int col; | |
| 2596 int txtcol; | |
| 2597 int off = (int)(current_ScreenLine - ScreenLines); | |
| 216 | 2598 int ri; |
| 7 | 2599 |
| 2600 /* Build the fold line: | |
| 2601 * 1. Add the cmdwin_type for the command-line window | |
| 2602 * 2. Add the 'foldcolumn' | |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
2603 * 3. Add the 'number' or 'relativenumber' column |
| 7 | 2604 * 4. Compose the text |
| 2605 * 5. Add the text | |
| 2606 * 6. set highlighting for the Visual area an other text | |
| 2607 */ | |
| 2608 col = 0; | |
| 2609 | |
| 2610 /* | |
| 2611 * 1. Add the cmdwin_type for the command-line window | |
| 2612 * Ignores 'rightleft', this window is never right-left. | |
| 2613 */ | |
| 2614 #ifdef FEAT_CMDWIN | |
| 2615 if (cmdwin_type != 0 && wp == curwin) | |
| 2616 { | |
| 2617 ScreenLines[off] = cmdwin_type; | |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
2618 ScreenAttrs[off] = HL_ATTR(HLF_AT); |
| 7 | 2619 if (enc_utf8) |
| 2620 ScreenLinesUC[off] = 0; | |
| 2621 ++col; | |
| 2622 } | |
| 2623 #endif | |
| 2624 | |
| 2625 /* | |
| 2626 * 2. Add the 'foldcolumn' | |
| 6553 | 2627 * Reduce the width when there is not enough space. |
| 7 | 2628 */ |
| 6553 | 2629 fdc = compute_foldcolumn(wp, col); |
| 7 | 2630 if (fdc > 0) |
| 2631 { | |
| 2632 fill_foldcolumn(buf, wp, TRUE, lnum); | |
| 2633 #ifdef FEAT_RIGHTLEFT | |
| 2634 if (wp->w_p_rl) | |
| 2635 { | |
| 2636 int i; | |
| 2637 | |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
2638 copy_text_attr(off + wp->w_width - fdc - col, buf, fdc, |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
2639 HL_ATTR(HLF_FC)); |
| 7 | 2640 /* reverse the fold column */ |
| 2641 for (i = 0; i < fdc; ++i) | |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
2642 ScreenLines[off + wp->w_width - i - 1 - col] = buf[i]; |
| 7 | 2643 } |
| 2644 else | |
| 2645 #endif | |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
2646 copy_text_attr(off + col, buf, fdc, HL_ATTR(HLF_FC)); |
| 7 | 2647 col += fdc; |
| 2648 } | |
| 2649 | |
| 2650 #ifdef FEAT_RIGHTLEFT | |
|
13632
cec5137d5332
patch 8.0.1688: some macros are used without a semicolon
Christian Brabandt <cb@256bit.org>
parents:
13452
diff
changeset
|
2651 # define RL_MEMSET(p, v, l) \ |
|
cec5137d5332
patch 8.0.1688: some macros are used without a semicolon
Christian Brabandt <cb@256bit.org>
parents:
13452
diff
changeset
|
2652 do { \ |
|
cec5137d5332
patch 8.0.1688: some macros are used without a semicolon
Christian Brabandt <cb@256bit.org>
parents:
13452
diff
changeset
|
2653 if (wp->w_p_rl) \ |
|
cec5137d5332
patch 8.0.1688: some macros are used without a semicolon
Christian Brabandt <cb@256bit.org>
parents:
13452
diff
changeset
|
2654 for (ri = 0; ri < l; ++ri) \ |
|
cec5137d5332
patch 8.0.1688: some macros are used without a semicolon
Christian Brabandt <cb@256bit.org>
parents:
13452
diff
changeset
|
2655 ScreenAttrs[off + (wp->w_width - (p) - (l)) + ri] = v; \ |
|
cec5137d5332
patch 8.0.1688: some macros are used without a semicolon
Christian Brabandt <cb@256bit.org>
parents:
13452
diff
changeset
|
2656 else \ |
|
cec5137d5332
patch 8.0.1688: some macros are used without a semicolon
Christian Brabandt <cb@256bit.org>
parents:
13452
diff
changeset
|
2657 for (ri = 0; ri < l; ++ri) \ |
|
cec5137d5332
patch 8.0.1688: some macros are used without a semicolon
Christian Brabandt <cb@256bit.org>
parents:
13452
diff
changeset
|
2658 ScreenAttrs[off + (p) + ri] = v; \ |
|
cec5137d5332
patch 8.0.1688: some macros are used without a semicolon
Christian Brabandt <cb@256bit.org>
parents:
13452
diff
changeset
|
2659 } while (0) |
| 7 | 2660 #else |
|
13632
cec5137d5332
patch 8.0.1688: some macros are used without a semicolon
Christian Brabandt <cb@256bit.org>
parents:
13452
diff
changeset
|
2661 # define RL_MEMSET(p, v, l) \ |
|
cec5137d5332
patch 8.0.1688: some macros are used without a semicolon
Christian Brabandt <cb@256bit.org>
parents:
13452
diff
changeset
|
2662 do { \ |
|
cec5137d5332
patch 8.0.1688: some macros are used without a semicolon
Christian Brabandt <cb@256bit.org>
parents:
13452
diff
changeset
|
2663 for (ri = 0; ri < l; ++ri) \ |
|
cec5137d5332
patch 8.0.1688: some macros are used without a semicolon
Christian Brabandt <cb@256bit.org>
parents:
13452
diff
changeset
|
2664 ScreenAttrs[off + (p) + ri] = v; \ |
|
cec5137d5332
patch 8.0.1688: some macros are used without a semicolon
Christian Brabandt <cb@256bit.org>
parents:
13452
diff
changeset
|
2665 } while (0) |
| 7 | 2666 #endif |
| 2667 | |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
2668 /* Set all attributes of the 'number' or 'relativenumber' column and the |
|
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
2669 * text */ |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
2670 RL_MEMSET(col, HL_ATTR(HLF_FL), wp->w_width - col); |
| 7 | 2671 |
| 2672 #ifdef FEAT_SIGNS | |
| 2673 /* If signs are being displayed, add two spaces. */ | |
|
9852
4eea48b76d03
commit https://github.com/vim/vim/commit/95ec9d6a6ab3117d60ff638670a803d43974ba51
Christian Brabandt <cb@256bit.org>
parents:
9848
diff
changeset
|
2674 if (signcolumn_on(wp)) |
| 7 | 2675 { |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
2676 len = wp->w_width - col; |
| 7 | 2677 if (len > 0) |
| 2678 { | |
| 2679 if (len > 2) | |
| 2680 len = 2; | |
| 2681 # ifdef FEAT_RIGHTLEFT | |
| 2682 if (wp->w_p_rl) | |
| 2683 /* the line number isn't reversed */ | |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
2684 copy_text_attr(off + wp->w_width - len - col, |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
2685 (char_u *)" ", len, HL_ATTR(HLF_FL)); |
| 7 | 2686 else |
| 2687 # endif | |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
2688 copy_text_attr(off + col, (char_u *)" ", len, HL_ATTR(HLF_FL)); |
| 7 | 2689 col += len; |
| 2690 } | |
| 2691 } | |
| 2692 #endif | |
| 2693 | |
| 2694 /* | |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
2695 * 3. Add the 'number' or 'relativenumber' column |
| 7 | 2696 */ |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
2697 if (wp->w_p_nu || wp->w_p_rnu) |
| 7 | 2698 { |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
2699 len = wp->w_width - col; |
| 7 | 2700 if (len > 0) |
| 2701 { | |
| 13 | 2702 int w = number_width(wp); |
| 5905 | 2703 long num; |
| 2704 char *fmt = "%*ld "; | |
| 13 | 2705 |
| 2706 if (len > w + 1) | |
| 2707 len = w + 1; | |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
2708 |
|
4736
3f2319a953b3
updated for version 7.3.1115
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
2709 if (wp->w_p_nu && !wp->w_p_rnu) |
|
3f2319a953b3
updated for version 7.3.1115
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
2710 /* 'number' + 'norelativenumber' */ |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
2711 num = (long)lnum; |
|
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
2712 else |
| 4065 | 2713 { |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
2714 /* 'relativenumber', don't use negative numbers */ |
| 2675 | 2715 num = labs((long)get_cursor_rel_lnum(wp, lnum)); |
|
4736
3f2319a953b3
updated for version 7.3.1115
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
2716 if (num == 0 && wp->w_p_nu && wp->w_p_rnu) |
|
3f2319a953b3
updated for version 7.3.1115
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
2717 { |
|
3f2319a953b3
updated for version 7.3.1115
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
2718 /* 'number' + 'relativenumber': cursor line shows absolute |
|
3f2319a953b3
updated for version 7.3.1115
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
2719 * line number */ |
| 4065 | 2720 num = lnum; |
| 2721 fmt = "%-*ld "; | |
| 2722 } | |
| 2723 } | |
| 2724 | |
| 2725 sprintf((char *)buf, fmt, w, num); | |
| 7 | 2726 #ifdef FEAT_RIGHTLEFT |
| 2727 if (wp->w_p_rl) | |
| 2728 /* the line number isn't reversed */ | |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
2729 copy_text_attr(off + wp->w_width - len - col, buf, len, |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
2730 HL_ATTR(HLF_FL)); |
| 7 | 2731 else |
| 2732 #endif | |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
2733 copy_text_attr(off + col, buf, len, HL_ATTR(HLF_FL)); |
| 7 | 2734 col += len; |
| 2735 } | |
| 2736 } | |
| 2737 | |
| 2738 /* | |
| 2739 * 4. Compose the folded-line string with 'foldtext', if set. | |
| 2740 */ | |
| 29 | 2741 text = get_foldtext(wp, lnum, lnume, foldinfo, buf); |
| 7 | 2742 |
| 2743 txtcol = col; /* remember where text starts */ | |
| 2744 | |
| 2745 /* | |
| 2746 * 5. move the text to current_ScreenLine. Fill up with "fill_fold". | |
| 2747 * Right-left text is put in columns 0 - number-col, normal text is put | |
| 2748 * in columns number-col - window-width. | |
| 2749 */ | |
|
12487
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2750 col = text_to_screenline(wp, text, col); |
| 7 | 2751 |
| 2752 /* Fill the rest of the line with the fold filler */ | |
| 2753 #ifdef FEAT_RIGHTLEFT | |
| 2754 if (wp->w_p_rl) | |
| 2755 col -= txtcol; | |
| 2756 #endif | |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
2757 while (col < wp->w_width |
| 7 | 2758 #ifdef FEAT_RIGHTLEFT |
| 2759 - (wp->w_p_rl ? txtcol : 0) | |
| 2760 #endif | |
| 2761 ) | |
| 2762 { | |
| 2763 if (enc_utf8) | |
| 2764 { | |
| 2765 if (fill_fold >= 0x80) | |
| 2766 { | |
| 2767 ScreenLinesUC[off + col] = fill_fold; | |
| 714 | 2768 ScreenLinesC[0][off + col] = 0; |
|
13204
a8a154cafc60
patch 8.0.1476: screen isn't always updated right away
Christian Brabandt <cb@256bit.org>
parents:
13150
diff
changeset
|
2769 ScreenLines[off + col] = 0x80; /* avoid storing zero */ |
| 7 | 2770 } |
| 2771 else | |
|
11277
f26a535d9464
patch 8.0.0524: folds messed up
Christian Brabandt <cb@256bit.org>
parents:
11269
diff
changeset
|
2772 { |
| 7 | 2773 ScreenLinesUC[off + col] = 0; |
|
11277
f26a535d9464
patch 8.0.0524: folds messed up
Christian Brabandt <cb@256bit.org>
parents:
11269
diff
changeset
|
2774 ScreenLines[off + col] = fill_fold; |
|
f26a535d9464
patch 8.0.0524: folds messed up
Christian Brabandt <cb@256bit.org>
parents:
11269
diff
changeset
|
2775 } |
|
11265
b25895ab67be
patch 8.0.0518: bad fold text when a multi-byte char has a zero byte
Christian Brabandt <cb@256bit.org>
parents:
11158
diff
changeset
|
2776 col++; |
|
b25895ab67be
patch 8.0.0518: bad fold text when a multi-byte char has a zero byte
Christian Brabandt <cb@256bit.org>
parents:
11158
diff
changeset
|
2777 } |
|
b25895ab67be
patch 8.0.0518: bad fold text when a multi-byte char has a zero byte
Christian Brabandt <cb@256bit.org>
parents:
11158
diff
changeset
|
2778 else |
|
b25895ab67be
patch 8.0.0518: bad fold text when a multi-byte char has a zero byte
Christian Brabandt <cb@256bit.org>
parents:
11158
diff
changeset
|
2779 ScreenLines[off + col++] = fill_fold; |
| 7 | 2780 } |
| 2781 | |
| 2782 if (text != buf) | |
| 2783 vim_free(text); | |
| 2784 | |
| 2785 /* | |
| 2786 * 6. set highlighting for the Visual area an other text. | |
| 2787 * If all folded lines are in the Visual area, highlight the line. | |
| 2788 */ | |
| 2789 if (VIsual_active && wp->w_buffer == curwin->w_buffer) | |
| 2790 { | |
|
11121
778c10516955
patch 8.0.0448: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11105
diff
changeset
|
2791 if (LTOREQ_POS(curwin->w_cursor, VIsual)) |
| 7 | 2792 { |
| 2793 /* Visual is after curwin->w_cursor */ | |
| 2794 top = &curwin->w_cursor; | |
| 2795 bot = &VIsual; | |
| 2796 } | |
| 2797 else | |
| 2798 { | |
| 2799 /* Visual is before curwin->w_cursor */ | |
| 2800 top = &VIsual; | |
| 2801 bot = &curwin->w_cursor; | |
| 2802 } | |
| 2803 if (lnum >= top->lnum | |
| 2804 && lnume <= bot->lnum | |
| 2805 && (VIsual_mode != 'v' | |
| 2806 || ((lnum > top->lnum | |
| 2807 || (lnum == top->lnum | |
| 2808 && top->col == 0)) | |
| 2809 && (lnume < bot->lnum | |
| 2810 || (lnume == bot->lnum | |
| 2811 && (bot->col - (*p_sel == 'e')) | |
| 1883 | 2812 >= (colnr_T)STRLEN(ml_get_buf(wp->w_buffer, lnume, FALSE))))))) |
| 7 | 2813 { |
| 2814 if (VIsual_mode == Ctrl_V) | |
| 2815 { | |
| 2816 /* Visual block mode: highlight the chars part of the block */ | |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
2817 if (wp->w_old_cursor_fcol + txtcol < (colnr_T)wp->w_width) |
| 7 | 2818 { |
| 3040 | 2819 if (wp->w_old_cursor_lcol != MAXCOL |
| 2820 && wp->w_old_cursor_lcol + txtcol | |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
2821 < (colnr_T)wp->w_width) |
| 7 | 2822 len = wp->w_old_cursor_lcol; |
| 2823 else | |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
2824 len = wp->w_width - txtcol; |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
2825 RL_MEMSET(wp->w_old_cursor_fcol + txtcol, HL_ATTR(HLF_V), |
| 230 | 2826 len - (int)wp->w_old_cursor_fcol); |
| 7 | 2827 } |
| 2828 } | |
| 2829 else | |
| 216 | 2830 { |
| 7 | 2831 /* Set all attributes of the text */ |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
2832 RL_MEMSET(txtcol, HL_ATTR(HLF_V), wp->w_width - txtcol); |
| 216 | 2833 } |
| 7 | 2834 } |
| 2835 } | |
| 2836 | |
| 743 | 2837 #ifdef FEAT_SYN_HL |
| 6685 | 2838 /* Show colorcolumn in the fold line, but let cursorcolumn override it. */ |
| 2839 if (wp->w_p_cc_cols) | |
| 2840 { | |
| 2841 int i = 0; | |
| 2842 int j = wp->w_p_cc_cols[i]; | |
| 2843 int old_txtcol = txtcol; | |
| 2844 | |
| 2845 while (j > -1) | |
| 2846 { | |
| 2847 txtcol += j; | |
| 2848 if (wp->w_p_wrap) | |
| 2849 txtcol -= wp->w_skipcol; | |
| 2850 else | |
| 2851 txtcol -= wp->w_leftcol; | |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
2852 if (txtcol >= 0 && txtcol < wp->w_width) |
| 6685 | 2853 ScreenAttrs[off + txtcol] = hl_combine_attr( |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
2854 ScreenAttrs[off + txtcol], HL_ATTR(HLF_MC)); |
| 6685 | 2855 txtcol = old_txtcol; |
| 2856 j = wp->w_p_cc_cols[++i]; | |
| 2857 } | |
| 2858 } | |
| 2859 | |
| 743 | 2860 /* Show 'cursorcolumn' in the fold line. */ |
| 1725 | 2861 if (wp->w_p_cuc) |
| 2862 { | |
| 2863 txtcol += wp->w_virtcol; | |
| 2864 if (wp->w_p_wrap) | |
| 2865 txtcol -= wp->w_skipcol; | |
| 2866 else | |
| 2867 txtcol -= wp->w_leftcol; | |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
2868 if (txtcol >= 0 && txtcol < wp->w_width) |
| 1725 | 2869 ScreenAttrs[off + txtcol] = hl_combine_attr( |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
2870 ScreenAttrs[off + txtcol], HL_ATTR(HLF_CUC)); |
| 1725 | 2871 } |
| 743 | 2872 #endif |
| 7 | 2873 |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
2874 screen_line(row + W_WINROW(wp), wp->w_wincol, (int)wp->w_width, |
|
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
2875 (int)wp->w_width, FALSE); |
| 7 | 2876 |
| 2877 /* | |
| 2878 * Update w_cline_height and w_cline_folded if the cursor line was | |
| 2879 * updated (saves a call to plines() later). | |
| 2880 */ | |
| 2881 if (wp == curwin | |
| 2882 && lnum <= curwin->w_cursor.lnum | |
| 2883 && lnume >= curwin->w_cursor.lnum) | |
| 2884 { | |
| 2885 curwin->w_cline_row = row; | |
| 2886 curwin->w_cline_height = 1; | |
| 2887 curwin->w_cline_folded = TRUE; | |
| 2888 curwin->w_valid |= (VALID_CHEIGHT|VALID_CROW); | |
| 2889 } | |
| 2890 } | |
| 2891 | |
| 2892 /* | |
| 2893 * Copy "buf[len]" to ScreenLines["off"] and set attributes to "attr". | |
| 2894 */ | |
| 2895 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2896 copy_text_attr( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2897 int off, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2898 char_u *buf, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2899 int len, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2900 int attr) |
| 7 | 2901 { |
| 216 | 2902 int i; |
| 2903 | |
| 7 | 2904 mch_memmove(ScreenLines + off, buf, (size_t)len); |
| 2905 if (enc_utf8) | |
| 2906 vim_memset(ScreenLinesUC + off, 0, sizeof(u8char_T) * (size_t)len); | |
| 216 | 2907 for (i = 0; i < len; ++i) |
| 2908 ScreenAttrs[off + i] = attr; | |
| 7 | 2909 } |
| 2910 | |
| 2911 /* | |
| 2912 * Fill the foldcolumn at "p" for window "wp". | |
| 548 | 2913 * Only to be called when 'foldcolumn' > 0. |
| 7 | 2914 */ |
| 2915 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2916 fill_foldcolumn( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2917 char_u *p, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2918 win_T *wp, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2919 int closed, /* TRUE of FALSE */ |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2920 linenr_T lnum) /* current line number */ |
| 7 | 2921 { |
| 2922 int i = 0; | |
| 2923 int level; | |
| 2924 int first_level; | |
| 519 | 2925 int empty; |
| 6553 | 2926 int fdc = compute_foldcolumn(wp, 0); |
| 7 | 2927 |
| 2928 /* Init to all spaces. */ | |
| 6929 | 2929 vim_memset(p, ' ', (size_t)fdc); |
| 7 | 2930 |
| 2931 level = win_foldinfo.fi_level; | |
| 2932 if (level > 0) | |
| 2933 { | |
| 519 | 2934 /* If there is only one column put more info in it. */ |
| 6553 | 2935 empty = (fdc == 1) ? 0 : 1; |
| 519 | 2936 |
| 7 | 2937 /* If the column is too narrow, we start at the lowest level that |
| 2938 * fits and use numbers to indicated the depth. */ | |
| 6553 | 2939 first_level = level - fdc - closed + 1 + empty; |
| 7 | 2940 if (first_level < 1) |
| 2941 first_level = 1; | |
| 2942 | |
| 6553 | 2943 for (i = 0; i + empty < fdc; ++i) |
| 7 | 2944 { |
| 2945 if (win_foldinfo.fi_lnum == lnum | |
| 2946 && first_level + i >= win_foldinfo.fi_low_level) | |
| 2947 p[i] = '-'; | |
| 2948 else if (first_level == 1) | |
| 2949 p[i] = '|'; | |
| 2950 else if (first_level + i <= 9) | |
| 2951 p[i] = '0' + first_level + i; | |
| 2952 else | |
| 2953 p[i] = '>'; | |
| 2954 if (first_level + i == level) | |
| 2955 break; | |
| 2956 } | |
| 2957 } | |
| 2958 if (closed) | |
| 6553 | 2959 p[i >= fdc ? i - 1 : i] = '+'; |
| 7 | 2960 } |
| 2961 #endif /* FEAT_FOLDING */ | |
| 2962 | |
|
15314
c4d62945d96f
patch 8.1.0665: text property display wrong when 'spell' is set
Bram Moolenaar <Bram@vim.org>
parents:
15310
diff
changeset
|
2963 #ifdef FEAT_TEXT_PROP |
|
c4d62945d96f
patch 8.1.0665: text property display wrong when 'spell' is set
Bram Moolenaar <Bram@vim.org>
parents:
15310
diff
changeset
|
2964 static textprop_T *current_text_props = NULL; |
|
c4d62945d96f
patch 8.1.0665: text property display wrong when 'spell' is set
Bram Moolenaar <Bram@vim.org>
parents:
15310
diff
changeset
|
2965 static buf_T *current_buf = NULL; |
|
c4d62945d96f
patch 8.1.0665: text property display wrong when 'spell' is set
Bram Moolenaar <Bram@vim.org>
parents:
15310
diff
changeset
|
2966 |
|
c4d62945d96f
patch 8.1.0665: text property display wrong when 'spell' is set
Bram Moolenaar <Bram@vim.org>
parents:
15310
diff
changeset
|
2967 static int |
|
c4d62945d96f
patch 8.1.0665: text property display wrong when 'spell' is set
Bram Moolenaar <Bram@vim.org>
parents:
15310
diff
changeset
|
2968 #ifdef __BORLANDC__ |
|
c4d62945d96f
patch 8.1.0665: text property display wrong when 'spell' is set
Bram Moolenaar <Bram@vim.org>
parents:
15310
diff
changeset
|
2969 _RTLENTRYF |
|
c4d62945d96f
patch 8.1.0665: text property display wrong when 'spell' is set
Bram Moolenaar <Bram@vim.org>
parents:
15310
diff
changeset
|
2970 #endif |
|
c4d62945d96f
patch 8.1.0665: text property display wrong when 'spell' is set
Bram Moolenaar <Bram@vim.org>
parents:
15310
diff
changeset
|
2971 text_prop_compare(const void *s1, const void *s2) |
|
c4d62945d96f
patch 8.1.0665: text property display wrong when 'spell' is set
Bram Moolenaar <Bram@vim.org>
parents:
15310
diff
changeset
|
2972 { |
|
c4d62945d96f
patch 8.1.0665: text property display wrong when 'spell' is set
Bram Moolenaar <Bram@vim.org>
parents:
15310
diff
changeset
|
2973 int idx1, idx2; |
|
c4d62945d96f
patch 8.1.0665: text property display wrong when 'spell' is set
Bram Moolenaar <Bram@vim.org>
parents:
15310
diff
changeset
|
2974 proptype_T *pt1, *pt2; |
|
c4d62945d96f
patch 8.1.0665: text property display wrong when 'spell' is set
Bram Moolenaar <Bram@vim.org>
parents:
15310
diff
changeset
|
2975 colnr_T col1, col2; |
|
c4d62945d96f
patch 8.1.0665: text property display wrong when 'spell' is set
Bram Moolenaar <Bram@vim.org>
parents:
15310
diff
changeset
|
2976 |
|
c4d62945d96f
patch 8.1.0665: text property display wrong when 'spell' is set
Bram Moolenaar <Bram@vim.org>
parents:
15310
diff
changeset
|
2977 idx1 = *(int *)s1; |
|
c4d62945d96f
patch 8.1.0665: text property display wrong when 'spell' is set
Bram Moolenaar <Bram@vim.org>
parents:
15310
diff
changeset
|
2978 idx2 = *(int *)s2; |
|
c4d62945d96f
patch 8.1.0665: text property display wrong when 'spell' is set
Bram Moolenaar <Bram@vim.org>
parents:
15310
diff
changeset
|
2979 pt1 = text_prop_type_by_id(current_buf, current_text_props[idx1].tp_type); |
|
c4d62945d96f
patch 8.1.0665: text property display wrong when 'spell' is set
Bram Moolenaar <Bram@vim.org>
parents:
15310
diff
changeset
|
2980 pt2 = text_prop_type_by_id(current_buf, current_text_props[idx2].tp_type); |
|
c4d62945d96f
patch 8.1.0665: text property display wrong when 'spell' is set
Bram Moolenaar <Bram@vim.org>
parents:
15310
diff
changeset
|
2981 if (pt1 == pt2) |
|
c4d62945d96f
patch 8.1.0665: text property display wrong when 'spell' is set
Bram Moolenaar <Bram@vim.org>
parents:
15310
diff
changeset
|
2982 return 0; |
|
c4d62945d96f
patch 8.1.0665: text property display wrong when 'spell' is set
Bram Moolenaar <Bram@vim.org>
parents:
15310
diff
changeset
|
2983 if (pt1 == NULL) |
|
c4d62945d96f
patch 8.1.0665: text property display wrong when 'spell' is set
Bram Moolenaar <Bram@vim.org>
parents:
15310
diff
changeset
|
2984 return -1; |
|
c4d62945d96f
patch 8.1.0665: text property display wrong when 'spell' is set
Bram Moolenaar <Bram@vim.org>
parents:
15310
diff
changeset
|
2985 if (pt2 == NULL) |
|
c4d62945d96f
patch 8.1.0665: text property display wrong when 'spell' is set
Bram Moolenaar <Bram@vim.org>
parents:
15310
diff
changeset
|
2986 return 1; |
|
c4d62945d96f
patch 8.1.0665: text property display wrong when 'spell' is set
Bram Moolenaar <Bram@vim.org>
parents:
15310
diff
changeset
|
2987 if (pt1->pt_priority != pt2->pt_priority) |
|
c4d62945d96f
patch 8.1.0665: text property display wrong when 'spell' is set
Bram Moolenaar <Bram@vim.org>
parents:
15310
diff
changeset
|
2988 return pt1->pt_priority > pt2->pt_priority ? 1 : -1; |
|
c4d62945d96f
patch 8.1.0665: text property display wrong when 'spell' is set
Bram Moolenaar <Bram@vim.org>
parents:
15310
diff
changeset
|
2989 col1 = current_text_props[idx1].tp_col; |
|
c4d62945d96f
patch 8.1.0665: text property display wrong when 'spell' is set
Bram Moolenaar <Bram@vim.org>
parents:
15310
diff
changeset
|
2990 col2 = current_text_props[idx2].tp_col; |
|
c4d62945d96f
patch 8.1.0665: text property display wrong when 'spell' is set
Bram Moolenaar <Bram@vim.org>
parents:
15310
diff
changeset
|
2991 return col1 == col2 ? 0 : col1 > col2 ? 1 : -1; |
|
c4d62945d96f
patch 8.1.0665: text property display wrong when 'spell' is set
Bram Moolenaar <Bram@vim.org>
parents:
15310
diff
changeset
|
2992 } |
|
c4d62945d96f
patch 8.1.0665: text property display wrong when 'spell' is set
Bram Moolenaar <Bram@vim.org>
parents:
15310
diff
changeset
|
2993 #endif |
|
c4d62945d96f
patch 8.1.0665: text property display wrong when 'spell' is set
Bram Moolenaar <Bram@vim.org>
parents:
15310
diff
changeset
|
2994 |
| 7 | 2995 /* |
| 2996 * Display line "lnum" of window 'wp' on the screen. | |
| 2997 * Start at row "startrow", stop when "endrow" is reached. | |
| 2998 * wp->w_virtcol needs to be valid. | |
| 2999 * | |
| 3000 * Return the number of last row the line occupies. | |
| 3001 */ | |
| 3002 static int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
3003 win_line( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
3004 win_T *wp, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
3005 linenr_T lnum, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
3006 int startrow, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
3007 int endrow, |
|
14724
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3008 int nochange UNUSED, // not updating for changed text |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3009 int number_only) // only update the number column |
| 7 | 3010 { |
|
10801
e7b8be5ecacd
patch 8.0.0290: cursor positioning wrong if wide character wraps
Christian Brabandt <cb@256bit.org>
parents:
10793
diff
changeset
|
3011 int col = 0; /* visual column on screen */ |
| 7 | 3012 unsigned off; /* offset in ScreenLines/ScreenAttrs */ |
| 3013 int c = 0; /* init for GCC */ | |
| 3014 long vcol = 0; /* virtual column (for tabs) */ | |
| 6503 | 3015 #ifdef FEAT_LINEBREAK |
| 3016 long vcol_sbr = -1; /* virtual column after showbreak */ | |
| 3017 #endif | |
| 7 | 3018 long vcol_prev = -1; /* "vcol" of previous character */ |
| 3019 char_u *line; /* current line */ | |
| 3020 char_u *ptr; /* current position in "line" */ | |
| 3021 int row; /* row in the window, excl w_winrow */ | |
| 3022 int screen_row; /* row on the screen, incl w_winrow */ | |
| 3023 | |
| 3024 char_u extra[18]; /* "%ld" and 'fdc' must fit in here */ | |
| 3025 int n_extra = 0; /* number of extra chars */ | |
| 1340 | 3026 char_u *p_extra = NULL; /* string of extra chars, plus NUL */ |
| 6026 | 3027 char_u *p_extra_free = NULL; /* p_extra needs to be freed */ |
| 7 | 3028 int c_extra = NUL; /* extra chars, all the same */ |
|
15502
bc17a9d37810
patch 8.1.0759: showing two characters for tab is limited
Bram Moolenaar <Bram@vim.org>
parents:
15436
diff
changeset
|
3029 int c_final = NUL; /* final char, mandatory if set */ |
| 7 | 3030 int extra_attr = 0; /* attributes when n_extra != 0 */ |
| 3031 static char_u *at_end_str = (char_u *)""; /* used for p_extra when | |
| 3032 displaying lcs_eol at end-of-line */ | |
| 3033 int lcs_eol_one = lcs_eol; /* lcs_eol until it's been used */ | |
| 3034 int lcs_prec_todo = lcs_prec; /* lcs_prec until it's been used */ | |
| 3035 | |
| 3036 /* saved "extra" items for when draw_state becomes WL_LINE (again) */ | |
| 3037 int saved_n_extra = 0; | |
| 3038 char_u *saved_p_extra = NULL; | |
| 3039 int saved_c_extra = 0; | |
|
15502
bc17a9d37810
patch 8.1.0759: showing two characters for tab is limited
Bram Moolenaar <Bram@vim.org>
parents:
15436
diff
changeset
|
3040 int saved_c_final = 0; |
| 7 | 3041 int saved_char_attr = 0; |
| 3042 | |
| 3043 int n_attr = 0; /* chars with special attr */ | |
| 3044 int saved_attr2 = 0; /* char_attr saved for n_attr */ | |
| 3045 int n_attr3 = 0; /* chars with overruling special attr */ | |
| 3046 int saved_attr3 = 0; /* char_attr saved for n_attr3 */ | |
| 3047 | |
| 3048 int n_skip = 0; /* nr of chars to skip for 'nowrap' */ | |
| 3049 | |
| 3050 int fromcol, tocol; /* start/end of inverting */ | |
| 3051 int fromcol_prev = -2; /* start of inverting after cursor */ | |
| 3052 int noinvcur = FALSE; /* don't invert the cursor */ | |
| 3053 pos_T *top, *bot; | |
| 1813 | 3054 int lnum_in_visual_area = FALSE; |
| 7 | 3055 pos_T pos; |
| 3056 long v; | |
| 3057 | |
| 3058 int char_attr = 0; /* attributes for next character */ | |
| 674 | 3059 int attr_pri = FALSE; /* char_attr has priority */ |
| 7 | 3060 int area_highlighting = FALSE; /* Visual or incsearch highlighting |
| 3061 in this line */ | |
| 3062 int attr = 0; /* attributes for area highlighting */ | |
| 3063 int area_attr = 0; /* attributes desired by highlighting */ | |
| 3064 int search_attr = 0; /* attributes desired by 'hlsearch' */ | |
| 3065 #ifdef FEAT_SYN_HL | |
| 743 | 3066 int vcol_save_attr = 0; /* saved attr for 'cursorcolumn' */ |
| 7 | 3067 int syntax_attr = 0; /* attributes desired by syntax */ |
| 3068 int has_syntax = FALSE; /* this buffer has syntax highl. */ | |
| 3069 int save_did_emsg; | |
| 1437 | 3070 int eol_hl_off = 0; /* 1 if highlighted char after EOL */ |
|
2314
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
3071 int draw_color_col = FALSE; /* highlight colorcolumn */ |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
3072 int *color_cols = NULL; /* pointer to according columns array */ |
| 743 | 3073 #endif |
|
15138
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
3074 #ifdef FEAT_TEXT_PROP |
|
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
3075 int text_prop_count; |
|
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
3076 int text_prop_next = 0; // next text property to use |
|
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
3077 textprop_T *text_props = NULL; |
|
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
3078 int *text_prop_idxs = NULL; |
|
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
3079 int text_props_active = 0; |
|
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
3080 proptype_T *text_prop_type = NULL; |
|
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
3081 int text_prop_attr = 0; |
|
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
3082 #endif |
| 743 | 3083 #ifdef FEAT_SPELL |
| 221 | 3084 int has_spell = FALSE; /* this buffer has spell checking */ |
| 348 | 3085 # define SPWORDLEN 150 |
| 3086 char_u nextline[SPWORDLEN * 2];/* text with start of the next line */ | |
| 353 | 3087 int nextlinecol = 0; /* column where nextline[] starts */ |
| 3088 int nextline_idx = 0; /* index in nextline[] where next line | |
| 348 | 3089 starts */ |
| 221 | 3090 int spell_attr = 0; /* attributes desired by spelling */ |
| 3091 int word_end = 0; /* last byte with same spell_attr */ | |
| 378 | 3092 static linenr_T checked_lnum = 0; /* line number for "checked_col" */ |
| 3093 static int checked_col = 0; /* column in "checked_lnum" up to which | |
| 348 | 3094 * there are no spell errors */ |
| 386 | 3095 static int cap_col = -1; /* column to check for Cap word */ |
| 3096 static linenr_T capcol_lnum = 0; /* line number where "cap_col" used */ | |
| 348 | 3097 int cur_checked_col = 0; /* checked column for current line */ |
| 7 | 3098 #endif |
|
15138
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
3099 int extra_check = 0; // has extra highlighting |
| 7 | 3100 int multi_attr = 0; /* attributes desired by multibyte */ |
| 3101 int mb_l = 1; /* multi-byte byte length */ | |
| 3102 int mb_c = 0; /* decoded multi-byte character */ | |
| 3103 int mb_utf8 = FALSE; /* screen char is UTF-8 char */ | |
| 714 | 3104 int u8cc[MAX_MCO]; /* composing UTF-8 chars */ |
| 7 | 3105 #ifdef FEAT_DIFF |
| 3106 int filler_lines; /* nr of filler lines to be drawn */ | |
| 3107 int filler_todo; /* nr of filler lines still to do + 1 */ | |
| 534 | 3108 hlf_T diff_hlf = (hlf_T)0; /* type of diff highlighting */ |
| 7 | 3109 int change_start = MAXCOL; /* first col of changed area */ |
| 3110 int change_end = -1; /* last col of changed area */ | |
| 3111 #endif | |
| 3112 colnr_T trailcol = MAXCOL; /* start of trailing spaces */ | |
| 3113 #ifdef FEAT_LINEBREAK | |
|
10392
957a1d560bda
commit https://github.com/vim/vim/commit/6c896867c4f5d759616028ef7cbfce2a9ed32600
Christian Brabandt <cb@256bit.org>
parents:
10349
diff
changeset
|
3114 int need_showbreak = FALSE; /* overlong line, skipping first x |
|
957a1d560bda
commit https://github.com/vim/vim/commit/6c896867c4f5d759616028ef7cbfce2a9ed32600
Christian Brabandt <cb@256bit.org>
parents:
10349
diff
changeset
|
3115 chars */ |
| 7 | 3116 #endif |
|
12477
68d7bc045dbe
patch 8.0.1118: FEAT_WINDOWS adds a lot of #ifdefs
Christian Brabandt <cb@256bit.org>
parents:
12441
diff
changeset
|
3117 #if defined(FEAT_SIGNS) || defined(FEAT_QUICKFIX) \ |
| 910 | 3118 || defined(FEAT_SYN_HL) || defined(FEAT_DIFF) |
| 7 | 3119 # define LINE_ATTR |
| 1536 | 3120 int line_attr = 0; /* attribute for the whole line */ |
| 7 | 3121 #endif |
| 3122 #ifdef FEAT_SEARCH_EXTRA | |
| 1326 | 3123 matchitem_T *cur; /* points to the match list */ |
| 3124 match_T *shl; /* points to search_hl or a match */ | |
| 3125 int shl_flag; /* flag to indicate whether search_hl | |
| 3126 has been processed or not */ | |
| 5979 | 3127 int pos_inprogress; /* marks that position match search is |
| 3128 in progress */ | |
| 1326 | 3129 int prevcol_hl_flag; /* flag to indicate whether prevcol |
| 3130 equals startcol of search_hl or one | |
| 3131 of the matches */ | |
| 7 | 3132 #endif |
| 3133 #ifdef FEAT_ARABIC | |
| 3134 int prev_c = 0; /* previous Arabic character */ | |
| 3135 int prev_c1 = 0; /* first composing char for prev_c */ | |
| 3136 #endif | |
| 910 | 3137 #if defined(LINE_ATTR) |
| 867 | 3138 int did_line_attr = 0; |
| 3139 #endif | |
|
11836
f080b225a2a4
patch 8.0.0798: no highlighting in a terminal window with a finished job
Christian Brabandt <cb@256bit.org>
parents:
11834
diff
changeset
|
3140 #ifdef FEAT_TERMINAL |
|
f080b225a2a4
patch 8.0.0798: no highlighting in a terminal window with a finished job
Christian Brabandt <cb@256bit.org>
parents:
11834
diff
changeset
|
3141 int get_term_attr = FALSE; |
|
12433
735b49ff8fbb
patch 8.0.1096: terminal window in Normal mode has wrong background
Christian Brabandt <cb@256bit.org>
parents:
12323
diff
changeset
|
3142 int term_attr = 0; /* background for terminal window */ |
|
11836
f080b225a2a4
patch 8.0.0798: no highlighting in a terminal window with a finished job
Christian Brabandt <cb@256bit.org>
parents:
11834
diff
changeset
|
3143 #endif |
| 7 | 3144 |
| 3145 /* draw_state: items that are drawn in sequence: */ | |
| 3146 #define WL_START 0 /* nothing done yet */ | |
| 3147 #ifdef FEAT_CMDWIN | |
| 3148 # define WL_CMDLINE WL_START + 1 /* cmdline window column */ | |
| 3149 #else | |
| 3150 # define WL_CMDLINE WL_START | |
| 3151 #endif | |
| 3152 #ifdef FEAT_FOLDING | |
| 3153 # define WL_FOLD WL_CMDLINE + 1 /* 'foldcolumn' */ | |
| 3154 #else | |
| 3155 # define WL_FOLD WL_CMDLINE | |
| 3156 #endif | |
| 3157 #ifdef FEAT_SIGNS | |
| 3158 # define WL_SIGN WL_FOLD + 1 /* column for signs */ | |
| 3159 #else | |
| 3160 # define WL_SIGN WL_FOLD /* column for signs */ | |
| 3161 #endif | |
| 3162 #define WL_NR WL_SIGN + 1 /* line number */ | |
| 5995 | 3163 #ifdef FEAT_LINEBREAK |
| 3164 # define WL_BRI WL_NR + 1 /* 'breakindent' */ | |
| 3165 #else | |
| 3166 # define WL_BRI WL_NR | |
| 3167 #endif | |
| 7 | 3168 #if defined(FEAT_LINEBREAK) || defined(FEAT_DIFF) |
| 5995 | 3169 # define WL_SBR WL_BRI + 1 /* 'showbreak' or 'diff' */ |
| 7 | 3170 #else |
| 5995 | 3171 # define WL_SBR WL_BRI |
| 7 | 3172 #endif |
| 3173 #define WL_LINE WL_SBR + 1 /* text in the line */ | |
| 3174 int draw_state = WL_START; /* what to draw next */ | |
| 574 | 3175 #if defined(FEAT_XIM) && defined(FEAT_GUI_GTK) |
| 7 | 3176 int feedback_col = 0; |
| 3177 int feedback_old_attr = -1; | |
| 3178 #endif | |
| 3179 | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
3180 #ifdef FEAT_CONCEAL |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
3181 int syntax_flags = 0; |
|
2392
0371401d9d33
Give each syntax item a sequence number, so that we know when it starts and
Bram Moolenaar <bram@vim.org>
parents:
2382
diff
changeset
|
3182 int syntax_seqnr = 0; |
|
2375
a96dd77ce213
For conceal mode: when two different syntax items follow each other, show the
Bram Moolenaar <bram@vim.org>
parents:
2364
diff
changeset
|
3183 int prev_syntax_id = 0; |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
3184 int conceal_attr = HL_ATTR(HLF_CONCEAL); |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
3185 int is_concealing = FALSE; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
3186 int boguscols = 0; /* nonexistent columns added to force |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
3187 wrapping */ |
|
2409
0ca06a92adfb
Add support for horizontal scroll wheel. (Bjorn Winckler)
Bram Moolenaar <bram@vim.org>
parents:
2400
diff
changeset
|
3188 int vcol_off = 0; /* offset for concealed characters */ |
|
2378
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
3189 int did_wcol = FALSE; |
|
8907
5deb9e8f4292
commit https://github.com/vim/vim/commit/4d585022023b96f6507e8cae5ed8fc8d926f5140
Christian Brabandt <cb@256bit.org>
parents:
8872
diff
changeset
|
3190 int match_conc = 0; /* cchar for match functions */ |
|
5deb9e8f4292
commit https://github.com/vim/vim/commit/4d585022023b96f6507e8cae5ed8fc8d926f5140
Christian Brabandt <cb@256bit.org>
parents:
8872
diff
changeset
|
3191 int has_match_conc = 0; /* match wants to conceal */ |
| 6520 | 3192 int old_boguscols = 0; |
|
2332
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
3193 # define VCOL_HLC (vcol - vcol_off) |
|
5174
42d592dbbec3
updated for version 7.4a.013
Bram Moolenaar <bram@vim.org>
parents:
5126
diff
changeset
|
3194 # define FIX_FOR_BOGUSCOLS \ |
|
42d592dbbec3
updated for version 7.4a.013
Bram Moolenaar <bram@vim.org>
parents:
5126
diff
changeset
|
3195 { \ |
|
42d592dbbec3
updated for version 7.4a.013
Bram Moolenaar <bram@vim.org>
parents:
5126
diff
changeset
|
3196 n_extra += vcol_off; \ |
|
42d592dbbec3
updated for version 7.4a.013
Bram Moolenaar <bram@vim.org>
parents:
5126
diff
changeset
|
3197 vcol -= vcol_off; \ |
|
42d592dbbec3
updated for version 7.4a.013
Bram Moolenaar <bram@vim.org>
parents:
5126
diff
changeset
|
3198 vcol_off = 0; \ |
|
42d592dbbec3
updated for version 7.4a.013
Bram Moolenaar <bram@vim.org>
parents:
5126
diff
changeset
|
3199 col -= boguscols; \ |
| 6520 | 3200 old_boguscols = boguscols; \ |
|
5174
42d592dbbec3
updated for version 7.4a.013
Bram Moolenaar <bram@vim.org>
parents:
5126
diff
changeset
|
3201 boguscols = 0; \ |
|
42d592dbbec3
updated for version 7.4a.013
Bram Moolenaar <bram@vim.org>
parents:
5126
diff
changeset
|
3202 } |
|
2332
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
3203 #else |
|
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
3204 # define VCOL_HLC (vcol) |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
3205 #endif |
| 7 | 3206 |
| 3207 if (startrow > endrow) /* past the end already! */ | |
| 3208 return startrow; | |
| 3209 | |
| 3210 row = startrow; | |
| 3211 screen_row = row + W_WINROW(wp); | |
| 3212 | |
|
14724
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3213 if (!number_only) |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3214 { |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3215 /* |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3216 * To speed up the loop below, set extra_check when there is linebreak, |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3217 * trailing white space and/or syntax processing to be done. |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3218 */ |
| 7 | 3219 #ifdef FEAT_LINEBREAK |
|
14724
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3220 extra_check = wp->w_p_lbr; |
| 7 | 3221 #endif |
| 3222 #ifdef FEAT_SYN_HL | |
|
14724
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3223 if (syntax_present(wp) && !wp->w_s->b_syn_error |
|
11529
998d2cf59caa
patch 8.0.0647: syntax highlighting can make cause a freeze
Christian Brabandt <cb@256bit.org>
parents:
11521
diff
changeset
|
3224 # ifdef SYN_TIME_LIMIT |
|
14724
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3225 && !wp->w_s->b_syn_slow |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3226 # endif |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3227 ) |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3228 { |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3229 /* Prepare for syntax highlighting in this line. When there is an |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3230 * error, stop syntax highlighting. */ |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3231 save_did_emsg = did_emsg; |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3232 did_emsg = FALSE; |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3233 syntax_start(wp, lnum); |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3234 if (did_emsg) |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3235 wp->w_s->b_syn_error = TRUE; |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3236 else |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3237 { |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3238 did_emsg = save_did_emsg; |
|
11529
998d2cf59caa
patch 8.0.0647: syntax highlighting can make cause a freeze
Christian Brabandt <cb@256bit.org>
parents:
11521
diff
changeset
|
3239 #ifdef SYN_TIME_LIMIT |
|
14724
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3240 if (!wp->w_s->b_syn_slow) |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3241 #endif |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3242 { |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3243 has_syntax = TRUE; |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3244 extra_check = TRUE; |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3245 } |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3246 } |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3247 } |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3248 |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3249 /* Check for columns to display for 'colorcolumn'. */ |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3250 color_cols = wp->w_p_cc_cols; |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3251 if (color_cols != NULL) |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3252 draw_color_col = advance_color_col(VCOL_HLC, &color_cols); |
| 743 | 3253 #endif |
| 3254 | |
|
11836
f080b225a2a4
patch 8.0.0798: no highlighting in a terminal window with a finished job
Christian Brabandt <cb@256bit.org>
parents:
11834
diff
changeset
|
3255 #ifdef FEAT_TERMINAL |
|
14724
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3256 if (term_show_buffer(wp->w_buffer)) |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3257 { |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3258 extra_check = TRUE; |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3259 get_term_attr = TRUE; |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3260 term_attr = term_get_attr(wp->w_buffer, lnum, -1); |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3261 } |
|
11836
f080b225a2a4
patch 8.0.0798: no highlighting in a terminal window with a finished job
Christian Brabandt <cb@256bit.org>
parents:
11834
diff
changeset
|
3262 #endif |
|
f080b225a2a4
patch 8.0.0798: no highlighting in a terminal window with a finished job
Christian Brabandt <cb@256bit.org>
parents:
11834
diff
changeset
|
3263 |
| 743 | 3264 #ifdef FEAT_SPELL |
|
14724
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3265 if (wp->w_p_spell |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3266 && *wp->w_s->b_p_spl != NUL |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3267 && wp->w_s->b_langp.ga_len > 0 |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3268 && *(char **)(wp->w_s->b_langp.ga_data) != NULL) |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3269 { |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3270 /* Prepare for spell checking. */ |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3271 has_spell = TRUE; |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3272 extra_check = TRUE; |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3273 |
|
14875
081f30c50300
patch 8.1.0449: when 'rnu' is set folded lines are not displayed correctly
Christian Brabandt <cb@256bit.org>
parents:
14862
diff
changeset
|
3274 /* Get the start of the next line, so that words that wrap to the |
|
081f30c50300
patch 8.1.0449: when 'rnu' is set folded lines are not displayed correctly
Christian Brabandt <cb@256bit.org>
parents:
14862
diff
changeset
|
3275 * next line are found too: "et<line-break>al.". |
|
14724
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3276 * Trick: skip a few chars for C/shell/Vim comments */ |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3277 nextline[SPWORDLEN] = NUL; |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3278 if (lnum < wp->w_buffer->b_ml.ml_line_count) |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3279 { |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3280 line = ml_get_buf(wp->w_buffer, lnum + 1, FALSE); |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3281 spell_cat_line(nextline + SPWORDLEN, line, SPWORDLEN); |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3282 } |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3283 |
|
14875
081f30c50300
patch 8.1.0449: when 'rnu' is set folded lines are not displayed correctly
Christian Brabandt <cb@256bit.org>
parents:
14862
diff
changeset
|
3284 /* When a word wrapped from the previous line the start of the |
|
081f30c50300
patch 8.1.0449: when 'rnu' is set folded lines are not displayed correctly
Christian Brabandt <cb@256bit.org>
parents:
14862
diff
changeset
|
3285 * current line is valid. */ |
|
14724
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3286 if (lnum == checked_lnum) |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3287 cur_checked_col = checked_col; |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3288 checked_lnum = 0; |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3289 |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3290 /* When there was a sentence end in the previous line may require a |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3291 * word starting with capital in this line. In line 1 always check |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3292 * the first word. */ |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3293 if (lnum != capcol_lnum) |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3294 cap_col = -1; |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3295 if (lnum == 1) |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3296 cap_col = 0; |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3297 capcol_lnum = 0; |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3298 } |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3299 #endif |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3300 |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3301 /* |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3302 * handle visual active in this window |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3303 */ |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3304 fromcol = -10; |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3305 tocol = MAXCOL; |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3306 if (VIsual_active && wp->w_buffer == curwin->w_buffer) |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3307 { |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3308 /* Visual is after curwin->w_cursor */ |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3309 if (LTOREQ_POS(curwin->w_cursor, VIsual)) |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3310 { |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3311 top = &curwin->w_cursor; |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3312 bot = &VIsual; |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3313 } |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3314 else /* Visual is before curwin->w_cursor */ |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3315 { |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3316 top = &VIsual; |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3317 bot = &curwin->w_cursor; |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3318 } |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3319 lnum_in_visual_area = (lnum >= top->lnum && lnum <= bot->lnum); |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3320 if (VIsual_mode == Ctrl_V) /* block mode */ |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3321 { |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3322 if (lnum_in_visual_area) |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3323 { |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3324 fromcol = wp->w_old_cursor_fcol; |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3325 tocol = wp->w_old_cursor_lcol; |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3326 } |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3327 } |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3328 else /* non-block mode */ |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3329 { |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3330 if (lnum > top->lnum && lnum <= bot->lnum) |
| 7 | 3331 fromcol = 0; |
|
14724
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3332 else if (lnum == top->lnum) |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3333 { |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3334 if (VIsual_mode == 'V') /* linewise */ |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3335 fromcol = 0; |
| 7 | 3336 else |
| 3337 { | |
|
14724
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3338 getvvcol(wp, top, (colnr_T *)&fromcol, NULL, NULL); |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3339 if (gchar_pos(top) == NUL) |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3340 tocol = fromcol + 1; |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3341 } |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3342 } |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3343 if (VIsual_mode != 'V' && lnum == bot->lnum) |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3344 { |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3345 if (*p_sel == 'e' && bot->col == 0 |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3346 #ifdef FEAT_VIRTUALEDIT |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3347 && bot->coladd == 0 |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3348 #endif |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3349 ) |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3350 { |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3351 fromcol = -10; |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3352 tocol = MAXCOL; |
| 7 | 3353 } |
|
14724
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3354 else if (bot->col == MAXCOL) |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3355 tocol = MAXCOL; |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3356 else |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3357 { |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3358 pos = *bot; |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3359 if (*p_sel == 'e') |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3360 getvvcol(wp, &pos, (colnr_T *)&tocol, NULL, NULL); |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3361 else |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3362 { |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3363 getvvcol(wp, &pos, NULL, NULL, (colnr_T *)&tocol); |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3364 ++tocol; |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3365 } |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3366 } |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3367 } |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3368 } |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3369 |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3370 /* Check if the character under the cursor should not be inverted */ |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3371 if (!highlight_match && lnum == curwin->w_cursor.lnum && wp == curwin |
|
8212
05b88224cea1
commit https://github.com/vim/vim/commit/48e330aff911be1c798c88a973af6437a8141fce
Christian Brabandt <cb@256bit.org>
parents:
7833
diff
changeset
|
3372 #ifdef FEAT_GUI |
|
14724
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3373 && !gui.in_use |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3374 #endif |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3375 ) |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3376 noinvcur = TRUE; |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3377 |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3378 /* if inverting in this line set area_highlighting */ |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3379 if (fromcol >= 0) |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3380 { |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3381 area_highlighting = TRUE; |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3382 attr = HL_ATTR(HLF_V); |
| 7 | 3383 #if defined(FEAT_CLIPBOARD) && defined(FEAT_X11) |
|
14724
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3384 if ((clip_star.available && !clip_star.owned |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3385 && clip_isautosel_star()) |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3386 || (clip_plus.available && !clip_plus.owned |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3387 && clip_isautosel_plus())) |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3388 attr = HL_ATTR(HLF_VNC); |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3389 #endif |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3390 } |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3391 } |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3392 |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3393 /* |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3394 * handle 'incsearch' and ":s///c" highlighting |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3395 */ |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3396 else if (highlight_match |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3397 && wp == curwin |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3398 && lnum >= curwin->w_cursor.lnum |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3399 && lnum <= curwin->w_cursor.lnum + search_match_lines) |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3400 { |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3401 if (lnum == curwin->w_cursor.lnum) |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3402 getvcol(curwin, &(curwin->w_cursor), |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3403 (colnr_T *)&fromcol, NULL, NULL); |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3404 else |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3405 fromcol = 0; |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3406 if (lnum == curwin->w_cursor.lnum + search_match_lines) |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3407 { |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3408 pos.lnum = lnum; |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3409 pos.col = search_match_endcol; |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3410 getvcol(curwin, &pos, (colnr_T *)&tocol, NULL, NULL); |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3411 } |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3412 else |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3413 tocol = MAXCOL; |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3414 /* do at least one character; happens when past end of line */ |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3415 if (fromcol == tocol) |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3416 tocol = fromcol + 1; |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3417 area_highlighting = TRUE; |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3418 attr = HL_ATTR(HLF_I); |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3419 } |
| 7 | 3420 } |
| 3421 | |
| 3422 #ifdef FEAT_DIFF | |
| 3423 filler_lines = diff_check(wp, lnum); | |
| 3424 if (filler_lines < 0) | |
| 3425 { | |
| 3426 if (filler_lines == -1) | |
| 3427 { | |
| 3428 if (diff_find_change(wp, lnum, &change_start, &change_end)) | |
| 3429 diff_hlf = HLF_ADD; /* added line */ | |
| 3430 else if (change_start == 0) | |
| 3431 diff_hlf = HLF_TXD; /* changed text */ | |
| 3432 else | |
| 3433 diff_hlf = HLF_CHD; /* changed line */ | |
| 3434 } | |
| 3435 else | |
| 3436 diff_hlf = HLF_ADD; /* added line */ | |
| 3437 filler_lines = 0; | |
| 3438 area_highlighting = TRUE; | |
| 3439 } | |
| 3440 if (lnum == wp->w_topline) | |
| 3441 filler_lines = wp->w_topfill; | |
| 3442 filler_todo = filler_lines; | |
| 3443 #endif | |
| 3444 | |
| 3445 #ifdef LINE_ATTR | |
| 3446 # ifdef FEAT_SIGNS | |
| 3447 /* If this line has a sign with line highlighting set line_attr. */ | |
| 3448 v = buf_getsigntype(wp->w_buffer, lnum, SIGN_LINEHL); | |
| 3449 if (v != 0) | |
| 3450 line_attr = sign_get_attr((int)v, TRUE); | |
| 3451 # endif | |
|
12477
68d7bc045dbe
patch 8.0.1118: FEAT_WINDOWS adds a lot of #ifdefs
Christian Brabandt <cb@256bit.org>
parents:
12441
diff
changeset
|
3452 # if defined(FEAT_QUICKFIX) |
| 7 | 3453 /* Highlight the current line in the quickfix window. */ |
| 644 | 3454 if (bt_quickfix(wp->w_buffer) && qf_current_entry(wp) == lnum) |
|
11516
80491a71c716
patch 8.0.0641: cannot set a separate highlighting for the quickfix line
Christian Brabandt <cb@256bit.org>
parents:
11420
diff
changeset
|
3455 line_attr = HL_ATTR(HLF_QFL); |
| 7 | 3456 # endif |
| 3457 if (line_attr != 0) | |
| 3458 area_highlighting = TRUE; | |
| 3459 #endif | |
| 3460 | |
| 3461 line = ml_get_buf(wp->w_buffer, lnum, FALSE); | |
| 3462 ptr = line; | |
| 3463 | |
| 743 | 3464 #ifdef FEAT_SPELL |
|
14724
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3465 if (has_spell && !number_only) |
| 348 | 3466 { |
| 386 | 3467 /* For checking first word with a capital skip white space. */ |
| 3468 if (cap_col == 0) | |
|
12323
4dba3e4f3b01
patch 8.0.1041: bogus characters when indenting during visual-block append
Christian Brabandt <cb@256bit.org>
parents:
12317
diff
changeset
|
3469 cap_col = getwhitecols(line); |
| 386 | 3470 |
| 348 | 3471 /* To be able to spell-check over line boundaries copy the end of the |
| 3472 * current line into nextline[]. Above the start of the next line was | |
| 3473 * copied to nextline[SPWORDLEN]. */ | |
| 3474 if (nextline[SPWORDLEN] == NUL) | |
| 3475 { | |
| 3476 /* No next line or it is empty. */ | |
| 3477 nextlinecol = MAXCOL; | |
| 3478 nextline_idx = 0; | |
| 3479 } | |
| 3480 else | |
| 3481 { | |
| 835 | 3482 v = (long)STRLEN(line); |
| 348 | 3483 if (v < SPWORDLEN) |
| 3484 { | |
| 3485 /* Short line, use it completely and append the start of the | |
| 3486 * next line. */ | |
| 3487 nextlinecol = 0; | |
| 3488 mch_memmove(nextline, line, (size_t)v); | |
| 1621 | 3489 STRMOVE(nextline + v, nextline + SPWORDLEN); |
| 348 | 3490 nextline_idx = v + 1; |
| 3491 } | |
| 3492 else | |
| 3493 { | |
| 3494 /* Long line, use only the last SPWORDLEN bytes. */ | |
| 3495 nextlinecol = v - SPWORDLEN; | |
| 3496 mch_memmove(nextline, line + nextlinecol, SPWORDLEN); | |
| 3497 nextline_idx = SPWORDLEN + 1; | |
| 3498 } | |
| 3499 } | |
| 3500 } | |
| 3501 #endif | |
| 3502 | |
|
7344
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
3503 if (wp->w_p_list) |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
3504 { |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
3505 if (lcs_space || lcs_trail) |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
3506 extra_check = TRUE; |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
3507 /* find start of trailing whitespace */ |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
3508 if (lcs_trail) |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
3509 { |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
3510 trailcol = (colnr_T)STRLEN(ptr); |
|
11129
f4ea50924c6d
patch 8.0.0452: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11127
diff
changeset
|
3511 while (trailcol > (colnr_T)0 && VIM_ISWHITE(ptr[trailcol - 1])) |
|
7344
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
3512 --trailcol; |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
3513 trailcol += (colnr_T) (ptr - line); |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
3514 } |
| 7 | 3515 } |
| 3516 | |
| 3517 /* | |
| 3518 * 'nowrap' or 'wrap' and a single line that doesn't fit: Advance to the | |
| 3519 * first character to be displayed. | |
| 3520 */ | |
| 3521 if (wp->w_p_wrap) | |
| 3522 v = wp->w_skipcol; | |
| 3523 else | |
| 3524 v = wp->w_leftcol; | |
|
14724
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3525 if (v > 0 && !number_only) |
| 7 | 3526 { |
| 3527 char_u *prev_ptr = ptr; | |
|
15603
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
3528 |
| 7 | 3529 while (vcol < v && *ptr != NUL) |
| 3530 { | |
| 5995 | 3531 c = win_lbr_chartabsize(wp, line, ptr, (colnr_T)vcol, NULL); |
| 7 | 3532 vcol += c; |
| 3533 prev_ptr = ptr; | |
|
11127
506f5d8b7d8b
patch 8.0.0451: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11121
diff
changeset
|
3534 MB_PTR_ADV(ptr); |
| 7 | 3535 } |
| 3536 | |
| 1984 | 3537 /* When: |
| 3538 * - 'cuc' is set, or | |
|
2314
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
3539 * - 'colorcolumn' is set, or |
| 1984 | 3540 * - 'virtualedit' is set, or |
| 3541 * - the visual mode is active, | |
| 3542 * the end of the line may be before the start of the displayed part. | |
| 3543 */ | |
| 3544 if (vcol < v && ( | |
| 5735 | 3545 #ifdef FEAT_SYN_HL |
| 3546 wp->w_p_cuc || draw_color_col || | |
| 3547 #endif | |
| 3548 #ifdef FEAT_VIRTUALEDIT | |
| 3549 virtual_active() || | |
| 3550 #endif | |
| 3551 (VIsual_active && wp->w_buffer == curwin->w_buffer))) | |
| 1984 | 3552 { |
| 7 | 3553 vcol = v; |
| 1984 | 3554 } |
| 7 | 3555 |
| 3556 /* Handle a character that's not completely on the screen: Put ptr at | |
| 3557 * that character but skip the first few screen characters. */ | |
| 3558 if (vcol > v) | |
| 3559 { | |
| 3560 vcol -= c; | |
| 3561 ptr = prev_ptr; | |
|
11010
c004e17fa36b
patch 8.0.0394: tabs are not aligned when scrolling horizontally
Christian Brabandt <cb@256bit.org>
parents:
10988
diff
changeset
|
3562 /* If the character fits on the screen, don't need to skip it. |
|
c004e17fa36b
patch 8.0.0394: tabs are not aligned when scrolling horizontally
Christian Brabandt <cb@256bit.org>
parents:
10988
diff
changeset
|
3563 * Except for a TAB. */ |
|
15603
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
3564 if (( (*mb_ptr2cells)(ptr) >= c || *ptr == TAB) && col == 0) |
|
10801
e7b8be5ecacd
patch 8.0.0290: cursor positioning wrong if wide character wraps
Christian Brabandt <cb@256bit.org>
parents:
10793
diff
changeset
|
3565 n_skip = v - vcol; |
| 7 | 3566 } |
| 3567 | |
| 3568 /* | |
| 3569 * Adjust for when the inverted text is before the screen, | |
| 3570 * and when the start of the inverted text is before the screen. | |
| 3571 */ | |
| 3572 if (tocol <= vcol) | |
| 3573 fromcol = 0; | |
| 3574 else if (fromcol >= 0 && fromcol < vcol) | |
| 3575 fromcol = vcol; | |
| 3576 | |
| 3577 #ifdef FEAT_LINEBREAK | |
| 3578 /* When w_skipcol is non-zero, first line needs 'showbreak' */ | |
| 3579 if (wp->w_p_wrap) | |
| 3580 need_showbreak = TRUE; | |
| 3581 #endif | |
| 743 | 3582 #ifdef FEAT_SPELL |
| 499 | 3583 /* When spell checking a word we need to figure out the start of the |
| 3584 * word and if it's badly spelled or not. */ | |
| 3585 if (has_spell) | |
| 3586 { | |
| 3587 int len; | |
| 1536 | 3588 colnr_T linecol = (colnr_T)(ptr - line); |
| 534 | 3589 hlf_T spell_hlf = HLF_COUNT; |
| 499 | 3590 |
| 3591 pos = wp->w_cursor; | |
| 3592 wp->w_cursor.lnum = lnum; | |
| 1536 | 3593 wp->w_cursor.col = linecol; |
| 534 | 3594 len = spell_move_to(wp, FORWARD, TRUE, TRUE, &spell_hlf); |
| 1536 | 3595 |
| 3596 /* spell_move_to() may call ml_get() and make "line" invalid */ | |
| 3597 line = ml_get_buf(wp->w_buffer, lnum, FALSE); | |
| 3598 ptr = line + linecol; | |
| 3599 | |
| 530 | 3600 if (len == 0 || (int)wp->w_cursor.col > ptr - line) |
| 499 | 3601 { |
| 3602 /* no bad word found at line start, don't check until end of a | |
| 3603 * word */ | |
| 534 | 3604 spell_hlf = HLF_COUNT; |
| 3572 | 3605 word_end = (int)(spell_to_word_end(ptr, wp) - line + 1); |
| 499 | 3606 } |
| 3607 else | |
| 534 | 3608 { |
| 499 | 3609 /* bad word found, use attributes until end of word */ |
| 3610 word_end = wp->w_cursor.col + len + 1; | |
| 3611 | |
| 534 | 3612 /* Turn index into actual attributes. */ |
| 3613 if (spell_hlf != HLF_COUNT) | |
| 3614 spell_attr = highlight_attr[spell_hlf]; | |
| 3615 } | |
| 499 | 3616 wp->w_cursor = pos; |
| 501 | 3617 |
| 743 | 3618 # ifdef FEAT_SYN_HL |
| 501 | 3619 /* Need to restart syntax highlighting for this line. */ |
| 3620 if (has_syntax) | |
|
12510
7a887dccd13a
patch 8.0.1133: syntax timeout not used correctly
Christian Brabandt <cb@256bit.org>
parents:
12487
diff
changeset
|
3621 syntax_start(wp, lnum); |
| 743 | 3622 # endif |
| 499 | 3623 } |
| 3624 #endif | |
| 7 | 3625 } |
| 3626 | |
| 3627 /* | |
| 3628 * Correct highlighting for cursor that can't be disabled. | |
| 3629 * Avoids having to check this for each character. | |
| 3630 */ | |
| 3631 if (fromcol >= 0) | |
| 3632 { | |
| 3633 if (noinvcur) | |
| 3634 { | |
| 3635 if ((colnr_T)fromcol == wp->w_virtcol) | |
| 3636 { | |
| 3637 /* highlighting starts at cursor, let it start just after the | |
| 3638 * cursor */ | |
| 3639 fromcol_prev = fromcol; | |
| 3640 fromcol = -1; | |
| 3641 } | |
| 3642 else if ((colnr_T)fromcol < wp->w_virtcol) | |
| 3643 /* restart highlighting after the cursor */ | |
| 3644 fromcol_prev = wp->w_virtcol; | |
| 3645 } | |
| 3646 if (fromcol >= tocol) | |
| 3647 fromcol = -1; | |
| 3648 } | |
| 3649 | |
| 3650 #ifdef FEAT_SEARCH_EXTRA | |
| 3651 /* | |
| 1326 | 3652 * Handle highlighting the last used search pattern and matches. |
| 3653 * Do this for both search_hl and the match list. | |
| 7 | 3654 */ |
| 1326 | 3655 cur = wp->w_match_head; |
| 3656 shl_flag = FALSE; | |
|
14724
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3657 while ((cur != NULL || shl_flag == FALSE) && !number_only) |
| 1326 | 3658 { |
| 3659 if (shl_flag == FALSE) | |
| 3660 { | |
| 3661 shl = &search_hl; | |
| 3662 shl_flag = TRUE; | |
| 3663 } | |
| 3664 else | |
| 3665 shl = &cur->hl; | |
| 36 | 3666 shl->startcol = MAXCOL; |
| 3667 shl->endcol = MAXCOL; | |
| 7 | 3668 shl->attr_cur = 0; |
|
9885
4e8b05fa12c6
commit https://github.com/vim/vim/commit/4f416e41243ca151b95d39d81ce23d00b1484755
Christian Brabandt <cb@256bit.org>
parents:
9877
diff
changeset
|
3669 shl->is_addpos = FALSE; |
| 5979 | 3670 v = (long)(ptr - line); |
| 3671 if (cur != NULL) | |
| 3672 cur->pos.cur = 0; | |
|
9992
3e3b0ce24b61
commit https://github.com/vim/vim/commit/e17bdffff78ebd6a4e3cff26754cc667557ea810
Christian Brabandt <cb@256bit.org>
parents:
9939
diff
changeset
|
3673 next_search_hl(wp, shl, lnum, (colnr_T)v, |
|
3e3b0ce24b61
commit https://github.com/vim/vim/commit/e17bdffff78ebd6a4e3cff26754cc667557ea810
Christian Brabandt <cb@256bit.org>
parents:
9939
diff
changeset
|
3674 shl == &search_hl ? NULL : cur); |
| 5979 | 3675 |
| 3676 /* Need to get the line again, a multi-line regexp may have made it | |
| 3677 * invalid. */ | |
| 3678 line = ml_get_buf(wp->w_buffer, lnum, FALSE); | |
| 3679 ptr = line + v; | |
| 3680 | |
| 3681 if (shl->lnum != 0 && shl->lnum <= lnum) | |
| 3682 { | |
| 3683 if (shl->lnum == lnum) | |
| 3684 shl->startcol = shl->rm.startpos[0].col; | |
| 3685 else | |
| 3686 shl->startcol = 0; | |
| 3687 if (lnum == shl->lnum + shl->rm.endpos[0].lnum | |
| 3688 - shl->rm.startpos[0].lnum) | |
| 3689 shl->endcol = shl->rm.endpos[0].col; | |
| 3690 else | |
| 3691 shl->endcol = MAXCOL; | |
| 3692 /* Highlight one character for an empty match. */ | |
| 3693 if (shl->startcol == shl->endcol) | |
| 3694 { | |
| 3695 if (has_mbyte && line[shl->endcol] != NUL) | |
| 3696 shl->endcol += (*mb_ptr2len)(line + shl->endcol); | |
| 7 | 3697 else |
| 5979 | 3698 ++shl->endcol; |
| 3699 } | |
| 3700 if ((long)shl->startcol < v) /* match at leftcol */ | |
| 3701 { | |
| 3702 shl->attr_cur = shl->attr; | |
| 3703 search_attr = shl->attr; | |
| 3704 } | |
| 3705 area_highlighting = TRUE; | |
| 7 | 3706 } |
| 1326 | 3707 if (shl != &search_hl && cur != NULL) |
| 3708 cur = cur->next; | |
| 7 | 3709 } |
| 3710 #endif | |
| 3711 | |
| 743 | 3712 #ifdef FEAT_SYN_HL |
|
5068
6a7ae677d6a1
updated for version 7.3.1277
Bram Moolenaar <bram@vim.org>
parents:
4916
diff
changeset
|
3713 /* Cursor line highlighting for 'cursorline' in the current window. Not |
|
6a7ae677d6a1
updated for version 7.3.1277
Bram Moolenaar <bram@vim.org>
parents:
4916
diff
changeset
|
3714 * when Visual mode is active, because it's not clear what is selected |
|
6a7ae677d6a1
updated for version 7.3.1277
Bram Moolenaar <bram@vim.org>
parents:
4916
diff
changeset
|
3715 * then. */ |
|
5078
22ac43fb6d30
updated for version 7.3.1282
Bram Moolenaar <bram@vim.org>
parents:
5068
diff
changeset
|
3716 if (wp->w_p_cul && lnum == wp->w_cursor.lnum |
| 5979 | 3717 && !(wp == curwin && VIsual_active)) |
| 743 | 3718 { |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
3719 line_attr = HL_ATTR(HLF_CUL); |
| 743 | 3720 area_highlighting = TRUE; |
| 3721 } | |
| 3722 #endif | |
| 3723 | |
|
15138
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
3724 #ifdef FEAT_TEXT_PROP |
|
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
3725 { |
|
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
3726 char_u *prop_start; |
|
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
3727 |
|
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
3728 text_prop_count = get_text_props(wp->w_buffer, lnum, |
|
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
3729 &prop_start, FALSE); |
|
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
3730 if (text_prop_count > 0) |
|
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
3731 { |
|
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
3732 // Make a copy of the properties, so that they are properly |
|
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
3733 // aligned. |
|
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
3734 text_props = (textprop_T *)alloc( |
|
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
3735 text_prop_count * sizeof(textprop_T)); |
|
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
3736 if (text_props != NULL) |
|
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
3737 mch_memmove(text_props, prop_start, |
|
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
3738 text_prop_count * sizeof(textprop_T)); |
|
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
3739 |
|
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
3740 // Allocate an array for the indexes. |
|
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
3741 text_prop_idxs = (int *)alloc(text_prop_count * sizeof(int)); |
|
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
3742 area_highlighting = TRUE; |
|
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
3743 extra_check = TRUE; |
|
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
3744 } |
|
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
3745 } |
|
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
3746 #endif |
|
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
3747 |
| 504 | 3748 off = (unsigned)(current_ScreenLine - ScreenLines); |
| 7 | 3749 col = 0; |
| 3750 #ifdef FEAT_RIGHTLEFT | |
| 3751 if (wp->w_p_rl) | |
| 3752 { | |
| 3753 /* Rightleft window: process the text in the normal direction, but put | |
| 3754 * it in current_ScreenLine[] from right to left. Start at the | |
| 3755 * rightmost column of the window. */ | |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
3756 col = wp->w_width - 1; |
| 7 | 3757 off += col; |
| 3758 } | |
| 3759 #endif | |
| 3760 | |
| 3761 /* | |
| 3762 * Repeat for the whole displayed line. | |
| 3763 */ | |
| 3764 for (;;) | |
| 3765 { | |
| 6947 | 3766 #ifdef FEAT_CONCEAL |
|
8907
5deb9e8f4292
commit https://github.com/vim/vim/commit/4d585022023b96f6507e8cae5ed8fc8d926f5140
Christian Brabandt <cb@256bit.org>
parents:
8872
diff
changeset
|
3767 has_match_conc = 0; |
| 6947 | 3768 #endif |
| 7 | 3769 /* Skip this quickly when working on the text. */ |
| 3770 if (draw_state != WL_LINE) | |
| 3771 { | |
| 3772 #ifdef FEAT_CMDWIN | |
| 3773 if (draw_state == WL_CMDLINE - 1 && n_extra == 0) | |
| 3774 { | |
| 3775 draw_state = WL_CMDLINE; | |
| 3776 if (cmdwin_type != 0 && wp == curwin) | |
| 3777 { | |
| 3778 /* Draw the cmdline character. */ | |
| 3779 n_extra = 1; | |
| 1340 | 3780 c_extra = cmdwin_type; |
|
15502
bc17a9d37810
patch 8.1.0759: showing two characters for tab is limited
Bram Moolenaar <Bram@vim.org>
parents:
15436
diff
changeset
|
3781 c_final = NUL; |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
3782 char_attr = HL_ATTR(HLF_AT); |
| 7 | 3783 } |
| 3784 } | |
| 3785 #endif | |
| 3786 | |
| 3787 #ifdef FEAT_FOLDING | |
| 3788 if (draw_state == WL_FOLD - 1 && n_extra == 0) | |
| 3789 { | |
| 6553 | 3790 int fdc = compute_foldcolumn(wp, 0); |
| 3791 | |
| 7 | 3792 draw_state = WL_FOLD; |
| 6553 | 3793 if (fdc > 0) |
| 7 | 3794 { |
|
10466
34b50194f82d
commit https://github.com/vim/vim/commit/6270660611a151c5d0f614a5f0248ccdc80ed971
Christian Brabandt <cb@256bit.org>
parents:
10392
diff
changeset
|
3795 /* Draw the 'foldcolumn'. Allocate a buffer, "extra" may |
|
10538
c7f671dfd735
patch 8.0.0159: crash on startup when updating tabline
Christian Brabandt <cb@256bit.org>
parents:
10466
diff
changeset
|
3796 * already be in use. */ |
|
10690
206ab11fa76e
patch 8.0.0235: memory leak in diff mode
Christian Brabandt <cb@256bit.org>
parents:
10538
diff
changeset
|
3797 vim_free(p_extra_free); |
|
10466
34b50194f82d
commit https://github.com/vim/vim/commit/6270660611a151c5d0f614a5f0248ccdc80ed971
Christian Brabandt <cb@256bit.org>
parents:
10392
diff
changeset
|
3798 p_extra_free = alloc(12 + 1); |
|
34b50194f82d
commit https://github.com/vim/vim/commit/6270660611a151c5d0f614a5f0248ccdc80ed971
Christian Brabandt <cb@256bit.org>
parents:
10392
diff
changeset
|
3799 |
|
34b50194f82d
commit https://github.com/vim/vim/commit/6270660611a151c5d0f614a5f0248ccdc80ed971
Christian Brabandt <cb@256bit.org>
parents:
10392
diff
changeset
|
3800 if (p_extra_free != NULL) |
|
34b50194f82d
commit https://github.com/vim/vim/commit/6270660611a151c5d0f614a5f0248ccdc80ed971
Christian Brabandt <cb@256bit.org>
parents:
10392
diff
changeset
|
3801 { |
|
34b50194f82d
commit https://github.com/vim/vim/commit/6270660611a151c5d0f614a5f0248ccdc80ed971
Christian Brabandt <cb@256bit.org>
parents:
10392
diff
changeset
|
3802 fill_foldcolumn(p_extra_free, wp, FALSE, lnum); |
|
34b50194f82d
commit https://github.com/vim/vim/commit/6270660611a151c5d0f614a5f0248ccdc80ed971
Christian Brabandt <cb@256bit.org>
parents:
10392
diff
changeset
|
3803 n_extra = fdc; |
|
34b50194f82d
commit https://github.com/vim/vim/commit/6270660611a151c5d0f614a5f0248ccdc80ed971
Christian Brabandt <cb@256bit.org>
parents:
10392
diff
changeset
|
3804 p_extra_free[n_extra] = NUL; |
|
34b50194f82d
commit https://github.com/vim/vim/commit/6270660611a151c5d0f614a5f0248ccdc80ed971
Christian Brabandt <cb@256bit.org>
parents:
10392
diff
changeset
|
3805 p_extra = p_extra_free; |
|
34b50194f82d
commit https://github.com/vim/vim/commit/6270660611a151c5d0f614a5f0248ccdc80ed971
Christian Brabandt <cb@256bit.org>
parents:
10392
diff
changeset
|
3806 c_extra = NUL; |
|
15502
bc17a9d37810
patch 8.1.0759: showing two characters for tab is limited
Bram Moolenaar <Bram@vim.org>
parents:
15436
diff
changeset
|
3807 c_final = NUL; |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
3808 char_attr = HL_ATTR(HLF_FC); |
|
10466
34b50194f82d
commit https://github.com/vim/vim/commit/6270660611a151c5d0f614a5f0248ccdc80ed971
Christian Brabandt <cb@256bit.org>
parents:
10392
diff
changeset
|
3809 } |
| 7 | 3810 } |
| 3811 } | |
| 3812 #endif | |
| 3813 | |
| 3814 #ifdef FEAT_SIGNS | |
| 3815 if (draw_state == WL_SIGN - 1 && n_extra == 0) | |
| 3816 { | |
| 3817 draw_state = WL_SIGN; | |
| 3818 /* Show the sign column when there are any signs in this | |
| 3819 * buffer or when using Netbeans. */ | |
|
9852
4eea48b76d03
commit https://github.com/vim/vim/commit/95ec9d6a6ab3117d60ff638670a803d43974ba51
Christian Brabandt <cb@256bit.org>
parents:
9848
diff
changeset
|
3820 if (signcolumn_on(wp)) |
| 7 | 3821 { |
| 2661 | 3822 int text_sign; |
| 7 | 3823 # ifdef FEAT_SIGN_ICONS |
| 2661 | 3824 int icon_sign; |
| 7 | 3825 # endif |
| 3826 | |
| 3827 /* Draw two cells with the sign value or blank. */ | |
| 3828 c_extra = ' '; | |
|
15502
bc17a9d37810
patch 8.1.0759: showing two characters for tab is limited
Bram Moolenaar <Bram@vim.org>
parents:
15436
diff
changeset
|
3829 c_final = NUL; |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
3830 char_attr = HL_ATTR(HLF_SC); |
| 7 | 3831 n_extra = 2; |
| 3832 | |
| 5921 | 3833 if (row == startrow |
| 3834 #ifdef FEAT_DIFF | |
| 3835 + filler_lines && filler_todo <= 0 | |
| 3836 #endif | |
| 3837 ) | |
| 7 | 3838 { |
| 3839 text_sign = buf_getsigntype(wp->w_buffer, lnum, | |
| 3840 SIGN_TEXT); | |
| 3841 # ifdef FEAT_SIGN_ICONS | |
| 3842 icon_sign = buf_getsigntype(wp->w_buffer, lnum, | |
| 3843 SIGN_ICON); | |
| 3844 if (gui.in_use && icon_sign != 0) | |
| 3845 { | |
| 3846 /* Use the image in this position. */ | |
| 3847 c_extra = SIGN_BYTE; | |
|
15502
bc17a9d37810
patch 8.1.0759: showing two characters for tab is limited
Bram Moolenaar <Bram@vim.org>
parents:
15436
diff
changeset
|
3848 c_final = NUL; |
| 7 | 3849 # ifdef FEAT_NETBEANS_INTG |
| 3850 if (buf_signcount(wp->w_buffer, lnum) > 1) | |
|
15502
bc17a9d37810
patch 8.1.0759: showing two characters for tab is limited
Bram Moolenaar <Bram@vim.org>
parents:
15436
diff
changeset
|
3851 { |
| 7 | 3852 c_extra = MULTISIGN_BYTE; |
|
15502
bc17a9d37810
patch 8.1.0759: showing two characters for tab is limited
Bram Moolenaar <Bram@vim.org>
parents:
15436
diff
changeset
|
3853 c_final = NUL; |
|
bc17a9d37810
patch 8.1.0759: showing two characters for tab is limited
Bram Moolenaar <Bram@vim.org>
parents:
15436
diff
changeset
|
3854 } |
| 7 | 3855 # endif |
| 3856 char_attr = icon_sign; | |
| 3857 } | |
| 3858 else | |
| 3859 # endif | |
| 3860 if (text_sign != 0) | |
| 3861 { | |
| 3862 p_extra = sign_get_text(text_sign); | |
| 3863 if (p_extra != NULL) | |
| 3864 { | |
| 3865 c_extra = NUL; | |
|
15502
bc17a9d37810
patch 8.1.0759: showing two characters for tab is limited
Bram Moolenaar <Bram@vim.org>
parents:
15436
diff
changeset
|
3866 c_final = NUL; |
| 835 | 3867 n_extra = (int)STRLEN(p_extra); |
| 7 | 3868 } |
| 3869 char_attr = sign_get_attr(text_sign, FALSE); | |
| 3870 } | |
| 3871 } | |
| 3872 } | |
| 3873 } | |
| 3874 #endif | |
| 3875 | |
| 3876 if (draw_state == WL_NR - 1 && n_extra == 0) | |
| 3877 { | |
| 3878 draw_state = WL_NR; | |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
3879 /* Display the absolute or relative line number. After the |
|
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
3880 * first fill with blanks when the 'n' flag isn't in 'cpo' */ |
|
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
3881 if ((wp->w_p_nu || wp->w_p_rnu) |
| 7 | 3882 && (row == startrow |
| 3883 #ifdef FEAT_DIFF | |
| 3884 + filler_lines | |
| 3885 #endif | |
| 3886 || vim_strchr(p_cpo, CPO_NUMCOL) == NULL)) | |
| 3887 { | |
| 3888 /* Draw the line number (empty space after wrapping). */ | |
| 3889 if (row == startrow | |
| 3890 #ifdef FEAT_DIFF | |
| 3891 + filler_lines | |
| 3892 #endif | |
| 3893 ) | |
| 3894 { | |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
3895 long num; |
| 4065 | 3896 char *fmt = "%*ld "; |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
3897 |
|
4736
3f2319a953b3
updated for version 7.3.1115
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
3898 if (wp->w_p_nu && !wp->w_p_rnu) |
|
3f2319a953b3
updated for version 7.3.1115
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
3899 /* 'number' + 'norelativenumber' */ |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
3900 num = (long)lnum; |
|
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
3901 else |
| 4065 | 3902 { |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
3903 /* 'relativenumber', don't use negative numbers */ |
| 2675 | 3904 num = labs((long)get_cursor_rel_lnum(wp, lnum)); |
|
4736
3f2319a953b3
updated for version 7.3.1115
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
3905 if (num == 0 && wp->w_p_nu && wp->w_p_rnu) |
| 4065 | 3906 { |
|
4736
3f2319a953b3
updated for version 7.3.1115
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
3907 /* 'number' + 'relativenumber' */ |
| 4065 | 3908 num = lnum; |
| 3909 fmt = "%-*ld "; | |
| 3910 } | |
| 3911 } | |
| 3912 | |
| 3913 sprintf((char *)extra, fmt, | |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
3914 number_width(wp), num); |
| 7 | 3915 if (wp->w_skipcol > 0) |
| 3916 for (p_extra = extra; *p_extra == ' '; ++p_extra) | |
| 3917 *p_extra = '-'; | |
| 3918 #ifdef FEAT_RIGHTLEFT | |
| 3919 if (wp->w_p_rl) /* reverse line numbers */ | |
| 3920 rl_mirror(extra); | |
| 3921 #endif | |
| 3922 p_extra = extra; | |
| 3923 c_extra = NUL; | |
|
15502
bc17a9d37810
patch 8.1.0759: showing two characters for tab is limited
Bram Moolenaar <Bram@vim.org>
parents:
15436
diff
changeset
|
3924 c_final = NUL; |
| 7 | 3925 } |
| 3926 else | |
|
15502
bc17a9d37810
patch 8.1.0759: showing two characters for tab is limited
Bram Moolenaar <Bram@vim.org>
parents:
15436
diff
changeset
|
3927 { |
| 7 | 3928 c_extra = ' '; |
|
15502
bc17a9d37810
patch 8.1.0759: showing two characters for tab is limited
Bram Moolenaar <Bram@vim.org>
parents:
15436
diff
changeset
|
3929 c_final = NUL; |
|
bc17a9d37810
patch 8.1.0759: showing two characters for tab is limited
Bram Moolenaar <Bram@vim.org>
parents:
15436
diff
changeset
|
3930 } |
| 13 | 3931 n_extra = number_width(wp) + 1; |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
3932 char_attr = HL_ATTR(HLF_N); |
| 743 | 3933 #ifdef FEAT_SYN_HL |
| 3934 /* When 'cursorline' is set highlight the line number of | |
| 3427 | 3935 * the current line differently. |
| 3936 * TODO: Can we use CursorLine instead of CursorLineNr | |
| 3937 * when CursorLineNr isn't set? */ | |
|
5078
22ac43fb6d30
updated for version 7.3.1282
Bram Moolenaar <bram@vim.org>
parents:
5068
diff
changeset
|
3938 if ((wp->w_p_cul || wp->w_p_rnu) |
| 4065 | 3939 && lnum == wp->w_cursor.lnum) |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
3940 char_attr = HL_ATTR(HLF_CLN); |
| 743 | 3941 #endif |
| 7 | 3942 } |
| 3943 } | |
| 3944 | |
| 5995 | 3945 #ifdef FEAT_LINEBREAK |
| 3946 if (wp->w_p_brisbr && draw_state == WL_BRI - 1 | |
| 3947 && n_extra == 0 && *p_sbr != NUL) | |
| 3948 /* draw indent after showbreak value */ | |
| 3949 draw_state = WL_BRI; | |
| 3950 else if (wp->w_p_brisbr && draw_state == WL_SBR && n_extra == 0) | |
| 3951 /* After the showbreak, draw the breakindent */ | |
| 3952 draw_state = WL_BRI - 1; | |
| 3953 | |
| 3954 /* draw 'breakindent': indent wrapped text accordingly */ | |
| 3955 if (draw_state == WL_BRI - 1 && n_extra == 0) | |
| 3956 { | |
| 3957 draw_state = WL_BRI; | |
|
10392
957a1d560bda
commit https://github.com/vim/vim/commit/6c896867c4f5d759616028ef7cbfce2a9ed32600
Christian Brabandt <cb@256bit.org>
parents:
10349
diff
changeset
|
3958 /* if need_showbreak is set, breakindent also applies */ |
|
957a1d560bda
commit https://github.com/vim/vim/commit/6c896867c4f5d759616028ef7cbfce2a9ed32600
Christian Brabandt <cb@256bit.org>
parents:
10349
diff
changeset
|
3959 if (wp->w_p_bri && n_extra == 0 |
|
957a1d560bda
commit https://github.com/vim/vim/commit/6c896867c4f5d759616028ef7cbfce2a9ed32600
Christian Brabandt <cb@256bit.org>
parents:
10349
diff
changeset
|
3960 && (row != startrow || need_showbreak) |
| 5995 | 3961 # ifdef FEAT_DIFF |
| 3962 && filler_lines == 0 | |
| 6834 | 3963 # endif |
| 5995 | 3964 ) |
| 3965 { | |
|
10392
957a1d560bda
commit https://github.com/vim/vim/commit/6c896867c4f5d759616028ef7cbfce2a9ed32600
Christian Brabandt <cb@256bit.org>
parents:
10349
diff
changeset
|
3966 char_attr = 0; |
| 6834 | 3967 # ifdef FEAT_DIFF |
| 5995 | 3968 if (diff_hlf != (hlf_T)0) |
| 6106 | 3969 { |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
3970 char_attr = HL_ATTR(diff_hlf); |
| 6834 | 3971 # ifdef FEAT_SYN_HL |
| 6106 | 3972 if (wp->w_p_cul && lnum == wp->w_cursor.lnum) |
| 3973 char_attr = hl_combine_attr(char_attr, | |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
3974 HL_ATTR(HLF_CUL)); |
| 6834 | 3975 # endif |
| 6106 | 3976 } |
| 6834 | 3977 # endif |
| 6028 | 3978 p_extra = NULL; |
| 5995 | 3979 c_extra = ' '; |
| 3980 n_extra = get_breakindent_win(wp, | |
| 3981 ml_get_buf(wp->w_buffer, lnum, FALSE)); | |
| 3982 /* Correct end of highlighted area for 'breakindent', | |
| 3983 * required when 'linebreak' is also set. */ | |
| 3984 if (tocol == vcol) | |
| 3985 tocol += n_extra; | |
| 3986 } | |
| 3987 } | |
| 3988 #endif | |
| 3989 | |
| 7 | 3990 #if defined(FEAT_LINEBREAK) || defined(FEAT_DIFF) |
| 3991 if (draw_state == WL_SBR - 1 && n_extra == 0) | |
| 3992 { | |
| 3993 draw_state = WL_SBR; | |
| 3994 # ifdef FEAT_DIFF | |
| 3995 if (filler_todo > 0) | |
| 3996 { | |
| 3997 /* Draw "deleted" diff line(s). */ | |
| 3998 if (char2cells(fill_diff) > 1) | |
|
15502
bc17a9d37810
patch 8.1.0759: showing two characters for tab is limited
Bram Moolenaar <Bram@vim.org>
parents:
15436
diff
changeset
|
3999 { |
| 7 | 4000 c_extra = '-'; |
|
15502
bc17a9d37810
patch 8.1.0759: showing two characters for tab is limited
Bram Moolenaar <Bram@vim.org>
parents:
15436
diff
changeset
|
4001 c_final = NUL; |
|
bc17a9d37810
patch 8.1.0759: showing two characters for tab is limited
Bram Moolenaar <Bram@vim.org>
parents:
15436
diff
changeset
|
4002 } |
| 7 | 4003 else |
|
15502
bc17a9d37810
patch 8.1.0759: showing two characters for tab is limited
Bram Moolenaar <Bram@vim.org>
parents:
15436
diff
changeset
|
4004 { |
| 7 | 4005 c_extra = fill_diff; |
|
15502
bc17a9d37810
patch 8.1.0759: showing two characters for tab is limited
Bram Moolenaar <Bram@vim.org>
parents:
15436
diff
changeset
|
4006 c_final = NUL; |
|
bc17a9d37810
patch 8.1.0759: showing two characters for tab is limited
Bram Moolenaar <Bram@vim.org>
parents:
15436
diff
changeset
|
4007 } |
| 7 | 4008 # ifdef FEAT_RIGHTLEFT |
| 4009 if (wp->w_p_rl) | |
| 4010 n_extra = col + 1; | |
| 4011 else | |
| 4012 # endif | |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
4013 n_extra = wp->w_width - col; |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
4014 char_attr = HL_ATTR(HLF_DED); |
| 7 | 4015 } |
| 4016 # endif | |
| 4017 # ifdef FEAT_LINEBREAK | |
| 4018 if (*p_sbr != NUL && need_showbreak) | |
| 4019 { | |
| 4020 /* Draw 'showbreak' at the start of each broken line. */ | |
| 4021 p_extra = p_sbr; | |
| 4022 c_extra = NUL; | |
|
15502
bc17a9d37810
patch 8.1.0759: showing two characters for tab is limited
Bram Moolenaar <Bram@vim.org>
parents:
15436
diff
changeset
|
4023 c_final = NUL; |
| 7 | 4024 n_extra = (int)STRLEN(p_sbr); |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
4025 char_attr = HL_ATTR(HLF_AT); |
| 7 | 4026 need_showbreak = FALSE; |
| 6503 | 4027 vcol_sbr = vcol + MB_CHARLEN(p_sbr); |
| 7 | 4028 /* Correct end of highlighted area for 'showbreak', |
| 4029 * required when 'linebreak' is also set. */ | |
| 4030 if (tocol == vcol) | |
| 4031 tocol += n_extra; | |
|
5068
6a7ae677d6a1
updated for version 7.3.1277
Bram Moolenaar <bram@vim.org>
parents:
4916
diff
changeset
|
4032 #ifdef FEAT_SYN_HL |
|
6a7ae677d6a1
updated for version 7.3.1277
Bram Moolenaar <bram@vim.org>
parents:
4916
diff
changeset
|
4033 /* combine 'showbreak' with 'cursorline' */ |
|
5078
22ac43fb6d30
updated for version 7.3.1282
Bram Moolenaar <bram@vim.org>
parents:
5068
diff
changeset
|
4034 if (wp->w_p_cul && lnum == wp->w_cursor.lnum) |
| 6106 | 4035 char_attr = hl_combine_attr(char_attr, |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
4036 HL_ATTR(HLF_CUL)); |
|
5068
6a7ae677d6a1
updated for version 7.3.1277
Bram Moolenaar <bram@vim.org>
parents:
4916
diff
changeset
|
4037 #endif |
| 7 | 4038 } |
| 4039 # endif | |
| 4040 } | |
| 4041 #endif | |
| 4042 | |
| 4043 if (draw_state == WL_LINE - 1 && n_extra == 0) | |
| 4044 { | |
| 4045 draw_state = WL_LINE; | |
| 4046 if (saved_n_extra) | |
| 4047 { | |
| 4048 /* Continue item from end of wrapped line. */ | |
| 4049 n_extra = saved_n_extra; | |
| 4050 c_extra = saved_c_extra; | |
|
15502
bc17a9d37810
patch 8.1.0759: showing two characters for tab is limited
Bram Moolenaar <Bram@vim.org>
parents:
15436
diff
changeset
|
4051 c_final = saved_c_final; |
| 7 | 4052 p_extra = saved_p_extra; |
| 4053 char_attr = saved_char_attr; | |
| 4054 } | |
| 4055 else | |
| 4056 char_attr = 0; | |
| 4057 } | |
| 4058 } | |
| 4059 | |
|
14724
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
4060 // When still displaying '$' of change command, stop at cursor. |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
4061 // When only displaying the (relative) line number and that's done, |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
4062 // stop here. |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
4063 if ((dollar_vcol >= 0 && wp == curwin |
| 819 | 4064 && lnum == wp->w_cursor.lnum && vcol >= (long)wp->w_virtcol |
| 7 | 4065 #ifdef FEAT_DIFF |
| 4066 && filler_todo <= 0 | |
| 4067 #endif | |
| 4068 ) | |
|
14724
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
4069 || (number_only && draw_state > WL_NR)) |
| 7 | 4070 { |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
4071 screen_line(screen_row, wp->w_wincol, col, -(int)wp->w_width, |
|
11672
3c6cc2f24645
patch 8.0.0719: build failure without +terminal feature
Christian Brabandt <cb@256bit.org>
parents:
11670
diff
changeset
|
4072 HAS_RIGHTLEFT(wp->w_p_rl)); |
| 819 | 4073 /* Pretend we have finished updating the window. Except when |
| 4074 * 'cursorcolumn' is set. */ | |
| 4075 #ifdef FEAT_SYN_HL | |
| 4076 if (wp->w_p_cuc) | |
| 4077 row = wp->w_cline_row + wp->w_cline_height; | |
| 4078 else | |
| 4079 #endif | |
| 4080 row = wp->w_height; | |
| 7 | 4081 break; |
| 4082 } | |
| 4083 | |
|
15351
be92862a0cb4
patch 8.1.0683: spell highlighting does not always end
Bram Moolenaar <Bram@vim.org>
parents:
15337
diff
changeset
|
4084 if (draw_state == WL_LINE && (area_highlighting |
|
be92862a0cb4
patch 8.1.0683: spell highlighting does not always end
Bram Moolenaar <Bram@vim.org>
parents:
15337
diff
changeset
|
4085 #ifdef FEAT_SPELL |
|
be92862a0cb4
patch 8.1.0683: spell highlighting does not always end
Bram Moolenaar <Bram@vim.org>
parents:
15337
diff
changeset
|
4086 || has_spell |
|
be92862a0cb4
patch 8.1.0683: spell highlighting does not always end
Bram Moolenaar <Bram@vim.org>
parents:
15337
diff
changeset
|
4087 #endif |
|
be92862a0cb4
patch 8.1.0683: spell highlighting does not always end
Bram Moolenaar <Bram@vim.org>
parents:
15337
diff
changeset
|
4088 )) |
| 7 | 4089 { |
| 4090 /* handle Visual or match highlighting in this line */ | |
| 4091 if (vcol == fromcol | |
| 4092 || (has_mbyte && vcol + 1 == fromcol && n_extra == 0 | |
| 4093 && (*mb_ptr2cells)(ptr) > 1) | |
| 4094 || ((int)vcol_prev == fromcol_prev | |
| 1814 | 4095 && vcol_prev < vcol /* not at margin */ |
| 7 | 4096 && vcol < tocol)) |
| 4097 area_attr = attr; /* start highlighting */ | |
| 4098 else if (area_attr != 0 | |
| 4099 && (vcol == tocol | |
| 4100 || (noinvcur && (colnr_T)vcol == wp->w_virtcol))) | |
| 4101 area_attr = 0; /* stop highlighting */ | |
| 4102 | |
| 4103 #ifdef FEAT_SEARCH_EXTRA | |
| 4104 if (!n_extra) | |
| 4105 { | |
| 4106 /* | |
| 4107 * Check for start/end of search pattern match. | |
| 4108 * After end, check for start/end of next match. | |
| 4109 * When another match, have to check for start again. | |
| 4110 * Watch out for matching an empty string! | |
| 1326 | 4111 * Do this for 'search_hl' and the match list (ordered by |
| 4112 * priority). | |
| 7 | 4113 */ |
| 36 | 4114 v = (long)(ptr - line); |
| 1326 | 4115 cur = wp->w_match_head; |
| 4116 shl_flag = FALSE; | |
| 4117 while (cur != NULL || shl_flag == FALSE) | |
| 4118 { | |
| 4119 if (shl_flag == FALSE | |
| 4120 && ((cur != NULL | |
| 4121 && cur->priority > SEARCH_HL_PRIORITY) | |
| 4122 || cur == NULL)) | |
| 4123 { | |
| 4124 shl = &search_hl; | |
| 4125 shl_flag = TRUE; | |
| 4126 } | |
| 4127 else | |
| 4128 shl = &cur->hl; | |
| 5979 | 4129 if (cur != NULL) |
| 4130 cur->pos.cur = 0; | |
| 4131 pos_inprogress = TRUE; | |
| 4132 while (shl->rm.regprog != NULL | |
| 4133 || (cur != NULL && pos_inprogress)) | |
| 7 | 4134 { |
| 36 | 4135 if (shl->startcol != MAXCOL |
| 4136 && v >= (long)shl->startcol | |
| 4137 && v < (long)shl->endcol) | |
| 7 | 4138 { |
| 6430 | 4139 int tmp_col = v + MB_PTR2LEN(ptr); |
| 4140 | |
| 4141 if (shl->endcol < tmp_col) | |
| 4142 shl->endcol = tmp_col; | |
| 7 | 4143 shl->attr_cur = shl->attr; |
| 6947 | 4144 #ifdef FEAT_CONCEAL |
| 4145 if (cur != NULL && syn_name2id((char_u *)"Conceal") | |
| 4146 == cur->hlg_id) | |
| 4147 { | |
|
8907
5deb9e8f4292
commit https://github.com/vim/vim/commit/4d585022023b96f6507e8cae5ed8fc8d926f5140
Christian Brabandt <cb@256bit.org>
parents:
8872
diff
changeset
|
4148 has_match_conc = |
|
5deb9e8f4292
commit https://github.com/vim/vim/commit/4d585022023b96f6507e8cae5ed8fc8d926f5140
Christian Brabandt <cb@256bit.org>
parents:
8872
diff
changeset
|
4149 v == (long)shl->startcol ? 2 : 1; |
| 6947 | 4150 match_conc = cur->conceal_char; |
| 4151 } | |
| 4152 else | |
|
8907
5deb9e8f4292
commit https://github.com/vim/vim/commit/4d585022023b96f6507e8cae5ed8fc8d926f5140
Christian Brabandt <cb@256bit.org>
parents:
8872
diff
changeset
|
4153 has_match_conc = match_conc = 0; |
| 6947 | 4154 #endif |
| 7 | 4155 } |
| 6430 | 4156 else if (v == (long)shl->endcol) |
| 7 | 4157 { |
| 4158 shl->attr_cur = 0; | |
|
9992
3e3b0ce24b61
commit https://github.com/vim/vim/commit/e17bdffff78ebd6a4e3cff26754cc667557ea810
Christian Brabandt <cb@256bit.org>
parents:
9939
diff
changeset
|
4159 next_search_hl(wp, shl, lnum, (colnr_T)v, |
|
3e3b0ce24b61
commit https://github.com/vim/vim/commit/e17bdffff78ebd6a4e3cff26754cc667557ea810
Christian Brabandt <cb@256bit.org>
parents:
9939
diff
changeset
|
4160 shl == &search_hl ? NULL : cur); |
| 5979 | 4161 pos_inprogress = cur == NULL || cur->pos.cur == 0 |
| 6947 | 4162 ? FALSE : TRUE; |
| 7 | 4163 |
| 4164 /* Need to get the line again, a multi-line regexp | |
| 4165 * may have made it invalid. */ | |
| 4166 line = ml_get_buf(wp->w_buffer, lnum, FALSE); | |
| 4167 ptr = line + v; | |
| 4168 | |
| 4169 if (shl->lnum == lnum) | |
| 4170 { | |
| 36 | 4171 shl->startcol = shl->rm.startpos[0].col; |
| 7 | 4172 if (shl->rm.endpos[0].lnum == 0) |
| 36 | 4173 shl->endcol = shl->rm.endpos[0].col; |
| 7 | 4174 else |
| 36 | 4175 shl->endcol = MAXCOL; |
| 4176 | |
| 4177 if (shl->startcol == shl->endcol) | |
| 7 | 4178 { |
| 4179 /* highlight empty match, try again after | |
| 4180 * it */ | |
| 4181 if (has_mbyte) | |
| 474 | 4182 shl->endcol += (*mb_ptr2len)(line |
| 36 | 4183 + shl->endcol); |
| 7 | 4184 else |
| 36 | 4185 ++shl->endcol; |
| 7 | 4186 } |
| 4187 | |
| 4188 /* Loop to check if the match starts at the | |
| 4189 * current position */ | |
| 4190 continue; | |
| 4191 } | |
| 4192 } | |
| 4193 break; | |
| 4194 } | |
| 1326 | 4195 if (shl != &search_hl && cur != NULL) |
| 4196 cur = cur->next; | |
| 4197 } | |
| 4198 | |
| 4199 /* Use attributes from match with highest priority among | |
| 4200 * 'search_hl' and the match list. */ | |
| 4201 search_attr = search_hl.attr_cur; | |
| 4202 cur = wp->w_match_head; | |
| 4203 shl_flag = FALSE; | |
| 4204 while (cur != NULL || shl_flag == FALSE) | |
| 4205 { | |
| 4206 if (shl_flag == FALSE | |
| 4207 && ((cur != NULL | |
| 4208 && cur->priority > SEARCH_HL_PRIORITY) | |
| 4209 || cur == NULL)) | |
| 699 | 4210 { |
| 1326 | 4211 shl = &search_hl; |
| 4212 shl_flag = TRUE; | |
| 699 | 4213 } |
| 1326 | 4214 else |
| 4215 shl = &cur->hl; | |
| 4216 if (shl->attr_cur != 0) | |
| 4217 search_attr = shl->attr_cur; | |
| 4218 if (shl != &search_hl && cur != NULL) | |
| 4219 cur = cur->next; | |
| 4220 } | |
|
12580
ba55861aa52c
patch 8.0.1168: wrong highlighting with combination of match and 'cursorline'
Christian Brabandt <cb@256bit.org>
parents:
12529
diff
changeset
|
4221 /* Only highlight one character after the last column. */ |
|
12582
97f0c74976c6
patch 8.0.1169: highlignting one char too many with 'list' and 'cul'
Christian Brabandt <cb@256bit.org>
parents:
12580
diff
changeset
|
4222 if (*ptr == NUL && (did_line_attr >= 1 |
|
97f0c74976c6
patch 8.0.1169: highlignting one char too many with 'list' and 'cul'
Christian Brabandt <cb@256bit.org>
parents:
12580
diff
changeset
|
4223 || (wp->w_p_list && lcs_eol_one == -1))) |
|
12580
ba55861aa52c
patch 8.0.1168: wrong highlighting with combination of match and 'cursorline'
Christian Brabandt <cb@256bit.org>
parents:
12529
diff
changeset
|
4224 search_attr = 0; |
| 7 | 4225 } |
| 4226 #endif | |
| 4227 | |
| 4228 #ifdef FEAT_DIFF | |
| 674 | 4229 if (diff_hlf != (hlf_T)0) |
| 7 | 4230 { |
| 1295 | 4231 if (diff_hlf == HLF_CHD && ptr - line >= change_start |
| 4232 && n_extra == 0) | |
| 7 | 4233 diff_hlf = HLF_TXD; /* changed text */ |
| 1295 | 4234 if (diff_hlf == HLF_TXD && ptr - line > change_end |
| 4235 && n_extra == 0) | |
| 7 | 4236 diff_hlf = HLF_CHD; /* changed line */ |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
4237 line_attr = HL_ATTR(diff_hlf); |
| 6106 | 4238 if (wp->w_p_cul && lnum == wp->w_cursor.lnum) |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
4239 line_attr = hl_combine_attr(line_attr, HL_ATTR(HLF_CUL)); |
| 674 | 4240 } |
| 4241 #endif | |
| 4242 | |
|
15259
b42b47c0bb80
patch 8.1.0638: text property highlighting is off by one column
Bram Moolenaar <Bram@vim.org>
parents:
15227
diff
changeset
|
4243 #ifdef FEAT_TEXT_PROP |
|
b42b47c0bb80
patch 8.1.0638: text property highlighting is off by one column
Bram Moolenaar <Bram@vim.org>
parents:
15227
diff
changeset
|
4244 if (text_props != NULL) |
|
b42b47c0bb80
patch 8.1.0638: text property highlighting is off by one column
Bram Moolenaar <Bram@vim.org>
parents:
15227
diff
changeset
|
4245 { |
|
b42b47c0bb80
patch 8.1.0638: text property highlighting is off by one column
Bram Moolenaar <Bram@vim.org>
parents:
15227
diff
changeset
|
4246 int pi; |
|
15337
5fa7af143f7f
patch 8.1.0676: textprop screendump test fails
Bram Moolenaar <Bram@vim.org>
parents:
15332
diff
changeset
|
4247 int bcol = (int)(ptr - line); |
|
15259
b42b47c0bb80
patch 8.1.0638: text property highlighting is off by one column
Bram Moolenaar <Bram@vim.org>
parents:
15227
diff
changeset
|
4248 |
|
b42b47c0bb80
patch 8.1.0638: text property highlighting is off by one column
Bram Moolenaar <Bram@vim.org>
parents:
15227
diff
changeset
|
4249 // Check if any active property ends. |
|
b42b47c0bb80
patch 8.1.0638: text property highlighting is off by one column
Bram Moolenaar <Bram@vim.org>
parents:
15227
diff
changeset
|
4250 for (pi = 0; pi < text_props_active; ++pi) |
|
b42b47c0bb80
patch 8.1.0638: text property highlighting is off by one column
Bram Moolenaar <Bram@vim.org>
parents:
15227
diff
changeset
|
4251 { |
|
b42b47c0bb80
patch 8.1.0638: text property highlighting is off by one column
Bram Moolenaar <Bram@vim.org>
parents:
15227
diff
changeset
|
4252 int tpi = text_prop_idxs[pi]; |
|
b42b47c0bb80
patch 8.1.0638: text property highlighting is off by one column
Bram Moolenaar <Bram@vim.org>
parents:
15227
diff
changeset
|
4253 |
|
15337
5fa7af143f7f
patch 8.1.0676: textprop screendump test fails
Bram Moolenaar <Bram@vim.org>
parents:
15332
diff
changeset
|
4254 if (bcol >= text_props[tpi].tp_col - 1 |
|
15259
b42b47c0bb80
patch 8.1.0638: text property highlighting is off by one column
Bram Moolenaar <Bram@vim.org>
parents:
15227
diff
changeset
|
4255 + text_props[tpi].tp_len) |
|
b42b47c0bb80
patch 8.1.0638: text property highlighting is off by one column
Bram Moolenaar <Bram@vim.org>
parents:
15227
diff
changeset
|
4256 { |
|
b42b47c0bb80
patch 8.1.0638: text property highlighting is off by one column
Bram Moolenaar <Bram@vim.org>
parents:
15227
diff
changeset
|
4257 if (pi + 1 < text_props_active) |
|
b42b47c0bb80
patch 8.1.0638: text property highlighting is off by one column
Bram Moolenaar <Bram@vim.org>
parents:
15227
diff
changeset
|
4258 mch_memmove(text_prop_idxs + pi, |
|
b42b47c0bb80
patch 8.1.0638: text property highlighting is off by one column
Bram Moolenaar <Bram@vim.org>
parents:
15227
diff
changeset
|
4259 text_prop_idxs + pi + 1, |
|
b42b47c0bb80
patch 8.1.0638: text property highlighting is off by one column
Bram Moolenaar <Bram@vim.org>
parents:
15227
diff
changeset
|
4260 sizeof(int) |
|
b42b47c0bb80
patch 8.1.0638: text property highlighting is off by one column
Bram Moolenaar <Bram@vim.org>
parents:
15227
diff
changeset
|
4261 * (text_props_active - (pi + 1))); |
|
b42b47c0bb80
patch 8.1.0638: text property highlighting is off by one column
Bram Moolenaar <Bram@vim.org>
parents:
15227
diff
changeset
|
4262 --text_props_active; |
|
b42b47c0bb80
patch 8.1.0638: text property highlighting is off by one column
Bram Moolenaar <Bram@vim.org>
parents:
15227
diff
changeset
|
4263 --pi; |
|
b42b47c0bb80
patch 8.1.0638: text property highlighting is off by one column
Bram Moolenaar <Bram@vim.org>
parents:
15227
diff
changeset
|
4264 } |
|
b42b47c0bb80
patch 8.1.0638: text property highlighting is off by one column
Bram Moolenaar <Bram@vim.org>
parents:
15227
diff
changeset
|
4265 } |
|
b42b47c0bb80
patch 8.1.0638: text property highlighting is off by one column
Bram Moolenaar <Bram@vim.org>
parents:
15227
diff
changeset
|
4266 |
|
b42b47c0bb80
patch 8.1.0638: text property highlighting is off by one column
Bram Moolenaar <Bram@vim.org>
parents:
15227
diff
changeset
|
4267 // Add any text property that starts in this column. |
|
b42b47c0bb80
patch 8.1.0638: text property highlighting is off by one column
Bram Moolenaar <Bram@vim.org>
parents:
15227
diff
changeset
|
4268 while (text_prop_next < text_prop_count |
|
15337
5fa7af143f7f
patch 8.1.0676: textprop screendump test fails
Bram Moolenaar <Bram@vim.org>
parents:
15332
diff
changeset
|
4269 && bcol >= text_props[text_prop_next].tp_col - 1) |
|
15259
b42b47c0bb80
patch 8.1.0638: text property highlighting is off by one column
Bram Moolenaar <Bram@vim.org>
parents:
15227
diff
changeset
|
4270 text_prop_idxs[text_props_active++] = text_prop_next++; |
|
b42b47c0bb80
patch 8.1.0638: text property highlighting is off by one column
Bram Moolenaar <Bram@vim.org>
parents:
15227
diff
changeset
|
4271 |
|
15314
c4d62945d96f
patch 8.1.0665: text property display wrong when 'spell' is set
Bram Moolenaar <Bram@vim.org>
parents:
15310
diff
changeset
|
4272 text_prop_attr = 0; |
|
15259
b42b47c0bb80
patch 8.1.0638: text property highlighting is off by one column
Bram Moolenaar <Bram@vim.org>
parents:
15227
diff
changeset
|
4273 if (text_props_active > 0) |
|
b42b47c0bb80
patch 8.1.0638: text property highlighting is off by one column
Bram Moolenaar <Bram@vim.org>
parents:
15227
diff
changeset
|
4274 { |
|
15314
c4d62945d96f
patch 8.1.0665: text property display wrong when 'spell' is set
Bram Moolenaar <Bram@vim.org>
parents:
15310
diff
changeset
|
4275 // Sort the properties on priority and/or starting last. |
|
c4d62945d96f
patch 8.1.0665: text property display wrong when 'spell' is set
Bram Moolenaar <Bram@vim.org>
parents:
15310
diff
changeset
|
4276 // Then combine the attributes, highest priority last. |
|
c4d62945d96f
patch 8.1.0665: text property display wrong when 'spell' is set
Bram Moolenaar <Bram@vim.org>
parents:
15310
diff
changeset
|
4277 current_text_props = text_props; |
|
c4d62945d96f
patch 8.1.0665: text property display wrong when 'spell' is set
Bram Moolenaar <Bram@vim.org>
parents:
15310
diff
changeset
|
4278 current_buf = wp->w_buffer; |
|
c4d62945d96f
patch 8.1.0665: text property display wrong when 'spell' is set
Bram Moolenaar <Bram@vim.org>
parents:
15310
diff
changeset
|
4279 qsort((void *)text_prop_idxs, (size_t)text_props_active, |
|
c4d62945d96f
patch 8.1.0665: text property display wrong when 'spell' is set
Bram Moolenaar <Bram@vim.org>
parents:
15310
diff
changeset
|
4280 sizeof(int), text_prop_compare); |
|
c4d62945d96f
patch 8.1.0665: text property display wrong when 'spell' is set
Bram Moolenaar <Bram@vim.org>
parents:
15310
diff
changeset
|
4281 |
|
15259
b42b47c0bb80
patch 8.1.0638: text property highlighting is off by one column
Bram Moolenaar <Bram@vim.org>
parents:
15227
diff
changeset
|
4282 for (pi = 0; pi < text_props_active; ++pi) |
|
b42b47c0bb80
patch 8.1.0638: text property highlighting is off by one column
Bram Moolenaar <Bram@vim.org>
parents:
15227
diff
changeset
|
4283 { |
|
15314
c4d62945d96f
patch 8.1.0665: text property display wrong when 'spell' is set
Bram Moolenaar <Bram@vim.org>
parents:
15310
diff
changeset
|
4284 int tpi = text_prop_idxs[pi]; |
|
c4d62945d96f
patch 8.1.0665: text property display wrong when 'spell' is set
Bram Moolenaar <Bram@vim.org>
parents:
15310
diff
changeset
|
4285 proptype_T *pt = text_prop_type_by_id(wp->w_buffer, text_props[tpi].tp_type); |
|
c4d62945d96f
patch 8.1.0665: text property display wrong when 'spell' is set
Bram Moolenaar <Bram@vim.org>
parents:
15310
diff
changeset
|
4286 |
|
c4d62945d96f
patch 8.1.0665: text property display wrong when 'spell' is set
Bram Moolenaar <Bram@vim.org>
parents:
15310
diff
changeset
|
4287 if (pt != NULL) |
|
15259
b42b47c0bb80
patch 8.1.0638: text property highlighting is off by one column
Bram Moolenaar <Bram@vim.org>
parents:
15227
diff
changeset
|
4288 { |
|
15314
c4d62945d96f
patch 8.1.0665: text property display wrong when 'spell' is set
Bram Moolenaar <Bram@vim.org>
parents:
15310
diff
changeset
|
4289 int pt_attr = syn_id2attr(pt->pt_hl_id); |
|
c4d62945d96f
patch 8.1.0665: text property display wrong when 'spell' is set
Bram Moolenaar <Bram@vim.org>
parents:
15310
diff
changeset
|
4290 |
|
15259
b42b47c0bb80
patch 8.1.0638: text property highlighting is off by one column
Bram Moolenaar <Bram@vim.org>
parents:
15227
diff
changeset
|
4291 text_prop_type = pt; |
|
15314
c4d62945d96f
patch 8.1.0665: text property display wrong when 'spell' is set
Bram Moolenaar <Bram@vim.org>
parents:
15310
diff
changeset
|
4292 if (text_prop_attr == 0) |
|
c4d62945d96f
patch 8.1.0665: text property display wrong when 'spell' is set
Bram Moolenaar <Bram@vim.org>
parents:
15310
diff
changeset
|
4293 text_prop_attr = pt_attr; |
|
c4d62945d96f
patch 8.1.0665: text property display wrong when 'spell' is set
Bram Moolenaar <Bram@vim.org>
parents:
15310
diff
changeset
|
4294 else |
|
c4d62945d96f
patch 8.1.0665: text property display wrong when 'spell' is set
Bram Moolenaar <Bram@vim.org>
parents:
15310
diff
changeset
|
4295 text_prop_attr = hl_combine_attr(text_prop_attr, pt_attr); |
|
15259
b42b47c0bb80
patch 8.1.0638: text property highlighting is off by one column
Bram Moolenaar <Bram@vim.org>
parents:
15227
diff
changeset
|
4296 } |
|
b42b47c0bb80
patch 8.1.0638: text property highlighting is off by one column
Bram Moolenaar <Bram@vim.org>
parents:
15227
diff
changeset
|
4297 } |
|
b42b47c0bb80
patch 8.1.0638: text property highlighting is off by one column
Bram Moolenaar <Bram@vim.org>
parents:
15227
diff
changeset
|
4298 } |
|
b42b47c0bb80
patch 8.1.0638: text property highlighting is off by one column
Bram Moolenaar <Bram@vim.org>
parents:
15227
diff
changeset
|
4299 } |
|
b42b47c0bb80
patch 8.1.0638: text property highlighting is off by one column
Bram Moolenaar <Bram@vim.org>
parents:
15227
diff
changeset
|
4300 #endif |
|
b42b47c0bb80
patch 8.1.0638: text property highlighting is off by one column
Bram Moolenaar <Bram@vim.org>
parents:
15227
diff
changeset
|
4301 |
| 674 | 4302 /* Decide which of the highlight attributes to use. */ |
| 4303 attr_pri = TRUE; | |
| 6717 | 4304 #ifdef LINE_ATTR |
| 674 | 4305 if (area_attr != 0) |
| 6717 | 4306 char_attr = hl_combine_attr(line_attr, area_attr); |
| 674 | 4307 else if (search_attr != 0) |
| 6717 | 4308 char_attr = hl_combine_attr(line_attr, search_attr); |
| 674 | 4309 /* Use line_attr when not in the Visual or 'incsearch' area |
| 4310 * (area_attr may be 0 when "noinvcur" is set). */ | |
| 4311 else if (line_attr != 0 && ((fromcol == -10 && tocol == MAXCOL) | |
| 1842 | 4312 || vcol < fromcol || vcol_prev < fromcol_prev |
| 4313 || vcol >= tocol)) | |
| 674 | 4314 char_attr = line_attr; |
| 6717 | 4315 #else |
| 4316 if (area_attr != 0) | |
| 4317 char_attr = area_attr; | |
| 4318 else if (search_attr != 0) | |
| 4319 char_attr = search_attr; | |
| 674 | 4320 #endif |
| 4321 else | |
| 4322 { | |
| 4323 attr_pri = FALSE; | |
|
15138
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
4324 #ifdef FEAT_TEXT_PROP |
|
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
4325 if (text_prop_type != NULL) |
|
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
4326 char_attr = text_prop_attr; |
|
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
4327 else |
|
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
4328 #endif |
| 674 | 4329 #ifdef FEAT_SYN_HL |
| 4330 if (has_syntax) | |
| 4331 char_attr = syntax_attr; | |
| 4332 else | |
| 4333 #endif | |
| 4334 char_attr = 0; | |
| 4335 } | |
| 7 | 4336 } |
| 4337 | |
| 4338 /* | |
| 4339 * Get the next character to put on the screen. | |
| 4340 */ | |
| 4341 /* | |
| 1340 | 4342 * The "p_extra" points to the extra stuff that is inserted to |
| 4343 * represent special characters (non-printable stuff) and other | |
| 4344 * things. When all characters are the same, c_extra is used. | |
|
15502
bc17a9d37810
patch 8.1.0759: showing two characters for tab is limited
Bram Moolenaar <Bram@vim.org>
parents:
15436
diff
changeset
|
4345 * If c_final is set, it will compulsorily be used at the end. |
| 1340 | 4346 * "p_extra" must end in a NUL to avoid mb_ptr2len() reads past |
| 4347 * "p_extra[n_extra]". | |
| 7 | 4348 * For the '$' of the 'list' option, n_extra == 1, p_extra == "". |
| 4349 */ | |
| 4350 if (n_extra > 0) | |
| 4351 { | |
|
15502
bc17a9d37810
patch 8.1.0759: showing two characters for tab is limited
Bram Moolenaar <Bram@vim.org>
parents:
15436
diff
changeset
|
4352 if (c_extra != NUL || (n_extra == 1 && c_final != NUL)) |
|
bc17a9d37810
patch 8.1.0759: showing two characters for tab is limited
Bram Moolenaar <Bram@vim.org>
parents:
15436
diff
changeset
|
4353 { |
|
bc17a9d37810
patch 8.1.0759: showing two characters for tab is limited
Bram Moolenaar <Bram@vim.org>
parents:
15436
diff
changeset
|
4354 c = (n_extra == 1 && c_final != NUL) ? c_final : c_extra; |
| 7 | 4355 mb_c = c; /* doesn't handle non-utf-8 multi-byte! */ |
|
11269
121d29004998
patch 8.0.0520: using a function pointer while the function is known
Christian Brabandt <cb@256bit.org>
parents:
11265
diff
changeset
|
4356 if (enc_utf8 && utf_char2len(c) > 1) |
| 7 | 4357 { |
| 4358 mb_utf8 = TRUE; | |
| 714 | 4359 u8cc[0] = 0; |
| 819 | 4360 c = 0xc0; |
| 7 | 4361 } |
| 4362 else | |
| 4363 mb_utf8 = FALSE; | |
| 4364 } | |
| 4365 else | |
| 4366 { | |
| 4367 c = *p_extra; | |
| 4368 if (has_mbyte) | |
| 4369 { | |
| 4370 mb_c = c; | |
| 4371 if (enc_utf8) | |
| 4372 { | |
| 4373 /* If the UTF-8 character is more than one byte: | |
| 4374 * Decode it into "mb_c". */ | |
|
11269
121d29004998
patch 8.0.0520: using a function pointer while the function is known
Christian Brabandt <cb@256bit.org>
parents:
11265
diff
changeset
|
4375 mb_l = utfc_ptr2len(p_extra); |
| 7 | 4376 mb_utf8 = FALSE; |
| 4377 if (mb_l > n_extra) | |
| 4378 mb_l = 1; | |
| 4379 else if (mb_l > 1) | |
| 4380 { | |
| 714 | 4381 mb_c = utfc_ptr2char(p_extra, u8cc); |
| 7 | 4382 mb_utf8 = TRUE; |
| 819 | 4383 c = 0xc0; |
| 7 | 4384 } |
| 4385 } | |
| 4386 else | |
| 4387 { | |
| 4388 /* if this is a DBCS character, put it in "mb_c" */ | |
| 4389 mb_l = MB_BYTE2LEN(c); | |
| 4390 if (mb_l >= n_extra) | |
| 4391 mb_l = 1; | |
| 4392 else if (mb_l > 1) | |
| 4393 mb_c = (c << 8) + p_extra[1]; | |
| 4394 } | |
| 504 | 4395 if (mb_l == 0) /* at the NUL at end-of-line */ |
| 4396 mb_l = 1; | |
| 4397 | |
| 7 | 4398 /* If a double-width char doesn't fit display a '>' in the |
| 4399 * last column. */ | |
| 504 | 4400 if (( |
| 7 | 4401 # ifdef FEAT_RIGHTLEFT |
| 4402 wp->w_p_rl ? (col <= 0) : | |
| 4403 # endif | |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
4404 (col >= wp->w_width - 1)) |
| 7 | 4405 && (*mb_char2cells)(mb_c) == 2) |
| 4406 { | |
| 4407 c = '>'; | |
| 4408 mb_c = c; | |
| 4409 mb_l = 1; | |
| 4410 mb_utf8 = FALSE; | |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
4411 multi_attr = HL_ATTR(HLF_AT); |
| 7 | 4412 /* put the pointer back to output the double-width |
| 4413 * character at the start of the next line. */ | |
| 4414 ++n_extra; | |
| 4415 --p_extra; | |
| 4416 } | |
| 4417 else | |
| 4418 { | |
| 4419 n_extra -= mb_l - 1; | |
| 4420 p_extra += mb_l - 1; | |
| 4421 } | |
| 4422 } | |
| 4423 ++p_extra; | |
| 4424 } | |
| 4425 --n_extra; | |
| 4426 } | |
| 4427 else | |
| 4428 { | |
|
10986
62bcadce6c82
patch 8.0.0382: warning in tiny build for unused variable
Christian Brabandt <cb@256bit.org>
parents:
10982
diff
changeset
|
4429 #ifdef FEAT_LINEBREAK |
|
10982
5e20c9f96cd5
patch 8.0.0380: with 'linebreak' double wide char wraps badly
Christian Brabandt <cb@256bit.org>
parents:
10928
diff
changeset
|
4430 int c0; |
|
10986
62bcadce6c82
patch 8.0.0382: warning in tiny build for unused variable
Christian Brabandt <cb@256bit.org>
parents:
10982
diff
changeset
|
4431 #endif |
|
10982
5e20c9f96cd5
patch 8.0.0380: with 'linebreak' double wide char wraps badly
Christian Brabandt <cb@256bit.org>
parents:
10928
diff
changeset
|
4432 |
| 6026 | 4433 if (p_extra_free != NULL) |
|
13244
ac42c4b11dbc
patch 8.0.1496: clearing a pointer takes two lines
Christian Brabandt <cb@256bit.org>
parents:
13204
diff
changeset
|
4434 VIM_CLEAR(p_extra_free); |
| 7 | 4435 /* |
| 4436 * Get a character from the line itself. | |
| 4437 */ | |
|
10988
b5de553d6062
patch 8.0.0383: misplaced #ifdef
Christian Brabandt <cb@256bit.org>
parents:
10986
diff
changeset
|
4438 c = *ptr; |
|
10986
62bcadce6c82
patch 8.0.0382: warning in tiny build for unused variable
Christian Brabandt <cb@256bit.org>
parents:
10982
diff
changeset
|
4439 #ifdef FEAT_LINEBREAK |
|
10988
b5de553d6062
patch 8.0.0383: misplaced #ifdef
Christian Brabandt <cb@256bit.org>
parents:
10986
diff
changeset
|
4440 c0 = *ptr; |
|
10986
62bcadce6c82
patch 8.0.0382: warning in tiny build for unused variable
Christian Brabandt <cb@256bit.org>
parents:
10982
diff
changeset
|
4441 #endif |
| 7 | 4442 if (has_mbyte) |
| 4443 { | |
| 4444 mb_c = c; | |
| 4445 if (enc_utf8) | |
| 4446 { | |
| 4447 /* If the UTF-8 character is more than one byte: Decode it | |
| 4448 * into "mb_c". */ | |
|
11269
121d29004998
patch 8.0.0520: using a function pointer while the function is known
Christian Brabandt <cb@256bit.org>
parents:
11265
diff
changeset
|
4449 mb_l = utfc_ptr2len(ptr); |
| 7 | 4450 mb_utf8 = FALSE; |
| 4451 if (mb_l > 1) | |
| 4452 { | |
| 714 | 4453 mb_c = utfc_ptr2char(ptr, u8cc); |
| 7 | 4454 /* Overlong encoded ASCII or ASCII with composing char |
| 4455 * is displayed normally, except a NUL. */ | |
| 4456 if (mb_c < 0x80) | |
|
10986
62bcadce6c82
patch 8.0.0382: warning in tiny build for unused variable
Christian Brabandt <cb@256bit.org>
parents:
10982
diff
changeset
|
4457 { |
|
62bcadce6c82
patch 8.0.0382: warning in tiny build for unused variable
Christian Brabandt <cb@256bit.org>
parents:
10982
diff
changeset
|
4458 c = mb_c; |
|
15603
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
4459 #ifdef FEAT_LINEBREAK |
|
10986
62bcadce6c82
patch 8.0.0382: warning in tiny build for unused variable
Christian Brabandt <cb@256bit.org>
parents:
10982
diff
changeset
|
4460 c0 = mb_c; |
|
15603
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
4461 #endif |
|
10986
62bcadce6c82
patch 8.0.0382: warning in tiny build for unused variable
Christian Brabandt <cb@256bit.org>
parents:
10982
diff
changeset
|
4462 } |
| 7 | 4463 mb_utf8 = TRUE; |
| 507 | 4464 |
| 4465 /* At start of the line we can have a composing char. | |
| 4466 * Draw it as a space with a composing char. */ | |
| 4467 if (utf_iscomposing(mb_c)) | |
| 4468 { | |
| 1326 | 4469 int i; |
| 4470 | |
| 714 | 4471 for (i = Screen_mco - 1; i > 0; --i) |
| 4472 u8cc[i] = u8cc[i - 1]; | |
| 4473 u8cc[0] = mb_c; | |
| 507 | 4474 mb_c = ' '; |
| 4475 } | |
| 7 | 4476 } |
| 4477 | |
| 4478 if ((mb_l == 1 && c >= 0x80) | |
| 4479 || (mb_l >= 1 && mb_c == 0) | |
|
15609
b440c7becbca
patch 8.1.0812: Unicode 16 feature is not useful
Bram Moolenaar <Bram@vim.org>
parents:
15603
diff
changeset
|
4480 || (mb_l > 1 && (!vim_isprintc(mb_c)))) |
| 7 | 4481 { |
| 4482 /* | |
| 4483 * Illegal UTF-8 byte: display as <xx>. | |
| 4484 * Non-BMP character : display as ? or fullwidth ?. | |
| 4485 */ | |
|
15609
b440c7becbca
patch 8.1.0812: Unicode 16 feature is not useful
Bram Moolenaar <Bram@vim.org>
parents:
15603
diff
changeset
|
4486 transchar_hex(extra, mb_c); |
| 714 | 4487 # ifdef FEAT_RIGHTLEFT |
|
15609
b440c7becbca
patch 8.1.0812: Unicode 16 feature is not useful
Bram Moolenaar <Bram@vim.org>
parents:
15603
diff
changeset
|
4488 if (wp->w_p_rl) /* reverse */ |
|
b440c7becbca
patch 8.1.0812: Unicode 16 feature is not useful
Bram Moolenaar <Bram@vim.org>
parents:
15603
diff
changeset
|
4489 rl_mirror(extra); |
| 714 | 4490 # endif |
| 7 | 4491 p_extra = extra; |
| 4492 c = *p_extra; | |
| 4493 mb_c = mb_ptr2char_adv(&p_extra); | |
| 4494 mb_utf8 = (c >= 0x80); | |
| 4495 n_extra = (int)STRLEN(p_extra); | |
| 4496 c_extra = NUL; | |
|
15502
bc17a9d37810
patch 8.1.0759: showing two characters for tab is limited
Bram Moolenaar <Bram@vim.org>
parents:
15436
diff
changeset
|
4497 c_final = NUL; |
| 7 | 4498 if (area_attr == 0 && search_attr == 0) |
| 4499 { | |
| 4500 n_attr = n_extra + 1; | |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
4501 extra_attr = HL_ATTR(HLF_8); |
| 7 | 4502 saved_attr2 = char_attr; /* save current attr */ |
| 4503 } | |
| 4504 } | |
| 4505 else if (mb_l == 0) /* at the NUL at end-of-line */ | |
| 4506 mb_l = 1; | |
| 4507 #ifdef FEAT_ARABIC | |
| 4508 else if (p_arshape && !p_tbidi && ARABIC_CHAR(mb_c)) | |
| 4509 { | |
| 4510 /* Do Arabic shaping. */ | |
| 714 | 4511 int pc, pc1, nc; |
| 4512 int pcc[MAX_MCO]; | |
| 7 | 4513 |
| 4514 /* The idea of what is the previous and next | |
| 4515 * character depends on 'rightleft'. */ | |
| 4516 if (wp->w_p_rl) | |
| 4517 { | |
| 4518 pc = prev_c; | |
| 4519 pc1 = prev_c1; | |
| 4520 nc = utf_ptr2char(ptr + mb_l); | |
| 714 | 4521 prev_c1 = u8cc[0]; |
| 7 | 4522 } |
| 4523 else | |
| 4524 { | |
| 714 | 4525 pc = utfc_ptr2char(ptr + mb_l, pcc); |
| 7 | 4526 nc = prev_c; |
| 714 | 4527 pc1 = pcc[0]; |
| 7 | 4528 } |
| 4529 prev_c = mb_c; | |
| 4530 | |
| 714 | 4531 mb_c = arabic_shape(mb_c, &c, &u8cc[0], pc, pc1, nc); |
| 7 | 4532 } |
| 4533 else | |
| 4534 prev_c = mb_c; | |
| 4535 #endif | |
| 4536 } | |
| 4537 else /* enc_dbcs */ | |
| 4538 { | |
| 4539 mb_l = MB_BYTE2LEN(c); | |
| 4540 if (mb_l == 0) /* at the NUL at end-of-line */ | |
| 4541 mb_l = 1; | |
| 4542 else if (mb_l > 1) | |
| 4543 { | |
| 4544 /* We assume a second byte below 32 is illegal. | |
| 4545 * Hopefully this is OK for all double-byte encodings! | |
| 4546 */ | |
| 4547 if (ptr[1] >= 32) | |
| 4548 mb_c = (c << 8) + ptr[1]; | |
| 4549 else | |
| 4550 { | |
| 4551 if (ptr[1] == NUL) | |
| 4552 { | |
| 4553 /* head byte at end of line */ | |
| 4554 mb_l = 1; | |
| 4555 transchar_nonprint(extra, c); | |
| 4556 } | |
| 4557 else | |
| 4558 { | |
| 4559 /* illegal tail byte */ | |
| 4560 mb_l = 2; | |
| 4561 STRCPY(extra, "XX"); | |
| 4562 } | |
| 4563 p_extra = extra; | |
| 4564 n_extra = (int)STRLEN(extra) - 1; | |
| 4565 c_extra = NUL; | |
|
15502
bc17a9d37810
patch 8.1.0759: showing two characters for tab is limited
Bram Moolenaar <Bram@vim.org>
parents:
15436
diff
changeset
|
4566 c_final = NUL; |
| 7 | 4567 c = *p_extra++; |
| 4568 if (area_attr == 0 && search_attr == 0) | |
| 4569 { | |
| 4570 n_attr = n_extra + 1; | |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
4571 extra_attr = HL_ATTR(HLF_8); |
| 7 | 4572 saved_attr2 = char_attr; /* save current attr */ |
| 4573 } | |
| 4574 mb_c = c; | |
| 4575 } | |
| 4576 } | |
| 4577 } | |
| 4578 /* If a double-width char doesn't fit display a '>' in the | |
| 4579 * last column; the character is displayed at the start of the | |
| 4580 * next line. */ | |
| 4581 if (( | |
| 4582 # ifdef FEAT_RIGHTLEFT | |
| 4583 wp->w_p_rl ? (col <= 0) : | |
| 4584 # endif | |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
4585 (col >= wp->w_width - 1)) |
| 7 | 4586 && (*mb_char2cells)(mb_c) == 2) |
| 4587 { | |
| 4588 c = '>'; | |
| 4589 mb_c = c; | |
| 4590 mb_utf8 = FALSE; | |
| 4591 mb_l = 1; | |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
4592 multi_attr = HL_ATTR(HLF_AT); |
| 7 | 4593 /* Put pointer back so that the character will be |
| 4594 * displayed at the start of the next line. */ | |
| 4595 --ptr; | |
| 4596 } | |
| 4597 else if (*ptr != NUL) | |
| 4598 ptr += mb_l - 1; | |
| 4599 | |
| 4600 /* If a double-width char doesn't fit at the left side display | |
|
2509
6d6378ba18cb
Fix: An unprintable multi-byte character at the start of the screen line
Bram Moolenaar <bram@vim.org>
parents:
2428
diff
changeset
|
4601 * a '<' in the first column. Don't do this for unprintable |
| 4352 | 4602 * characters. */ |
|
2509
6d6378ba18cb
Fix: An unprintable multi-byte character at the start of the screen line
Bram Moolenaar <bram@vim.org>
parents:
2428
diff
changeset
|
4603 if (n_skip > 0 && mb_l > 1 && n_extra == 0) |
| 7 | 4604 { |
| 4605 n_extra = 1; | |
| 3586 | 4606 c_extra = MB_FILLER_CHAR; |
|
15502
bc17a9d37810
patch 8.1.0759: showing two characters for tab is limited
Bram Moolenaar <Bram@vim.org>
parents:
15436
diff
changeset
|
4607 c_final = NUL; |
| 7 | 4608 c = ' '; |
| 4609 if (area_attr == 0 && search_attr == 0) | |
| 4610 { | |
| 4611 n_attr = n_extra + 1; | |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
4612 extra_attr = HL_ATTR(HLF_AT); |
| 7 | 4613 saved_attr2 = char_attr; /* save current attr */ |
| 4614 } | |
| 4615 mb_c = c; | |
| 4616 mb_utf8 = FALSE; | |
| 4617 mb_l = 1; | |
| 4618 } | |
| 4619 | |
| 4620 } | |
| 4621 ++ptr; | |
| 4622 | |
| 4623 if (extra_check) | |
| 4624 { | |
| 743 | 4625 #ifdef FEAT_SPELL |
| 221 | 4626 int can_spell = TRUE; |
| 743 | 4627 #endif |
| 4628 | |
|
11836
f080b225a2a4
patch 8.0.0798: no highlighting in a terminal window with a finished job
Christian Brabandt <cb@256bit.org>
parents:
11834
diff
changeset
|
4629 #ifdef FEAT_TERMINAL |
|
f080b225a2a4
patch 8.0.0798: no highlighting in a terminal window with a finished job
Christian Brabandt <cb@256bit.org>
parents:
11834
diff
changeset
|
4630 if (get_term_attr) |
|
f080b225a2a4
patch 8.0.0798: no highlighting in a terminal window with a finished job
Christian Brabandt <cb@256bit.org>
parents:
11834
diff
changeset
|
4631 { |
|
11864
97eb443fee5d
patch 8.0.0812: terminal window colors shift when 'number' is set
Christian Brabandt <cb@256bit.org>
parents:
11836
diff
changeset
|
4632 syntax_attr = term_get_attr(wp->w_buffer, lnum, vcol); |
|
11836
f080b225a2a4
patch 8.0.0798: no highlighting in a terminal window with a finished job
Christian Brabandt <cb@256bit.org>
parents:
11834
diff
changeset
|
4633 |
|
f080b225a2a4
patch 8.0.0798: no highlighting in a terminal window with a finished job
Christian Brabandt <cb@256bit.org>
parents:
11834
diff
changeset
|
4634 if (!attr_pri) |
|
f080b225a2a4
patch 8.0.0798: no highlighting in a terminal window with a finished job
Christian Brabandt <cb@256bit.org>
parents:
11834
diff
changeset
|
4635 char_attr = syntax_attr; |
|
f080b225a2a4
patch 8.0.0798: no highlighting in a terminal window with a finished job
Christian Brabandt <cb@256bit.org>
parents:
11834
diff
changeset
|
4636 else |
|
f080b225a2a4
patch 8.0.0798: no highlighting in a terminal window with a finished job
Christian Brabandt <cb@256bit.org>
parents:
11834
diff
changeset
|
4637 char_attr = hl_combine_attr(syntax_attr, char_attr); |
|
f080b225a2a4
patch 8.0.0798: no highlighting in a terminal window with a finished job
Christian Brabandt <cb@256bit.org>
parents:
11834
diff
changeset
|
4638 } |
|
f080b225a2a4
patch 8.0.0798: no highlighting in a terminal window with a finished job
Christian Brabandt <cb@256bit.org>
parents:
11834
diff
changeset
|
4639 #endif |
|
f080b225a2a4
patch 8.0.0798: no highlighting in a terminal window with a finished job
Christian Brabandt <cb@256bit.org>
parents:
11834
diff
changeset
|
4640 |
| 743 | 4641 #ifdef FEAT_SYN_HL |
|
15259
b42b47c0bb80
patch 8.1.0638: text property highlighting is off by one column
Bram Moolenaar <Bram@vim.org>
parents:
15227
diff
changeset
|
4642 // Get syntax attribute, unless still at the start of the line |
|
b42b47c0bb80
patch 8.1.0638: text property highlighting is off by one column
Bram Moolenaar <Bram@vim.org>
parents:
15227
diff
changeset
|
4643 // (double-wide char that doesn't fit). |
| 221 | 4644 v = (long)(ptr - line); |
| 4645 if (has_syntax && v > 0) | |
| 7 | 4646 { |
| 4647 /* Get the syntax attribute for the character. If there | |
| 4648 * is an error, disable syntax highlighting. */ | |
| 4649 save_did_emsg = did_emsg; | |
| 4650 did_emsg = FALSE; | |
| 4651 | |
| 221 | 4652 syntax_attr = get_syntax_attr((colnr_T)v - 1, |
| 743 | 4653 # ifdef FEAT_SPELL |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
4654 has_spell ? &can_spell : |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
4655 # endif |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
4656 NULL, FALSE); |
| 7 | 4657 |
| 4658 if (did_emsg) | |
| 482 | 4659 { |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
4660 wp->w_s->b_syn_error = TRUE; |
| 482 | 4661 has_syntax = FALSE; |
| 4662 } | |
| 7 | 4663 else |
| 4664 did_emsg = save_did_emsg; | |
|
11529
998d2cf59caa
patch 8.0.0647: syntax highlighting can make cause a freeze
Christian Brabandt <cb@256bit.org>
parents:
11521
diff
changeset
|
4665 #ifdef SYN_TIME_LIMIT |
|
998d2cf59caa
patch 8.0.0647: syntax highlighting can make cause a freeze
Christian Brabandt <cb@256bit.org>
parents:
11521
diff
changeset
|
4666 if (wp->w_s->b_syn_slow) |
|
998d2cf59caa
patch 8.0.0647: syntax highlighting can make cause a freeze
Christian Brabandt <cb@256bit.org>
parents:
11521
diff
changeset
|
4667 has_syntax = FALSE; |
|
998d2cf59caa
patch 8.0.0647: syntax highlighting can make cause a freeze
Christian Brabandt <cb@256bit.org>
parents:
11521
diff
changeset
|
4668 #endif |
| 7 | 4669 |
| 4670 /* Need to get the line again, a multi-line regexp may | |
| 4671 * have made it invalid. */ | |
| 4672 line = ml_get_buf(wp->w_buffer, lnum, FALSE); | |
| 4673 ptr = line + v; | |
| 4674 | |
|
15259
b42b47c0bb80
patch 8.1.0638: text property highlighting is off by one column
Bram Moolenaar <Bram@vim.org>
parents:
15227
diff
changeset
|
4675 # ifdef FEAT_TEXT_PROP |
|
b42b47c0bb80
patch 8.1.0638: text property highlighting is off by one column
Bram Moolenaar <Bram@vim.org>
parents:
15227
diff
changeset
|
4676 // Text properties overrule syntax highlighting. |
|
b42b47c0bb80
patch 8.1.0638: text property highlighting is off by one column
Bram Moolenaar <Bram@vim.org>
parents:
15227
diff
changeset
|
4677 if (text_prop_attr == 0) |
|
b42b47c0bb80
patch 8.1.0638: text property highlighting is off by one column
Bram Moolenaar <Bram@vim.org>
parents:
15227
diff
changeset
|
4678 #endif |
|
b42b47c0bb80
patch 8.1.0638: text property highlighting is off by one column
Bram Moolenaar <Bram@vim.org>
parents:
15227
diff
changeset
|
4679 { |
|
b42b47c0bb80
patch 8.1.0638: text property highlighting is off by one column
Bram Moolenaar <Bram@vim.org>
parents:
15227
diff
changeset
|
4680 if (!attr_pri) |
|
b42b47c0bb80
patch 8.1.0638: text property highlighting is off by one column
Bram Moolenaar <Bram@vim.org>
parents:
15227
diff
changeset
|
4681 char_attr = syntax_attr; |
|
b42b47c0bb80
patch 8.1.0638: text property highlighting is off by one column
Bram Moolenaar <Bram@vim.org>
parents:
15227
diff
changeset
|
4682 else |
|
b42b47c0bb80
patch 8.1.0638: text property highlighting is off by one column
Bram Moolenaar <Bram@vim.org>
parents:
15227
diff
changeset
|
4683 char_attr = hl_combine_attr(syntax_attr, char_attr); |
|
b42b47c0bb80
patch 8.1.0638: text property highlighting is off by one column
Bram Moolenaar <Bram@vim.org>
parents:
15227
diff
changeset
|
4684 } |
|
2364
151b037b7e74
Fix hang when resizing in diff mode and there are concealed items.
Bram Moolenaar <bram@vim.org>
parents:
2359
diff
changeset
|
4685 # ifdef FEAT_CONCEAL |
|
151b037b7e74
Fix hang when resizing in diff mode and there are concealed items.
Bram Moolenaar <bram@vim.org>
parents:
2359
diff
changeset
|
4686 /* no concealing past the end of the line, it interferes |
|
151b037b7e74
Fix hang when resizing in diff mode and there are concealed items.
Bram Moolenaar <bram@vim.org>
parents:
2359
diff
changeset
|
4687 * with line highlighting */ |
|
151b037b7e74
Fix hang when resizing in diff mode and there are concealed items.
Bram Moolenaar <bram@vim.org>
parents:
2359
diff
changeset
|
4688 if (c == NUL) |
|
151b037b7e74
Fix hang when resizing in diff mode and there are concealed items.
Bram Moolenaar <bram@vim.org>
parents:
2359
diff
changeset
|
4689 syntax_flags = 0; |
|
2375
a96dd77ce213
For conceal mode: when two different syntax items follow each other, show the
Bram Moolenaar <bram@vim.org>
parents:
2364
diff
changeset
|
4690 else |
|
2392
0371401d9d33
Give each syntax item a sequence number, so that we know when it starts and
Bram Moolenaar <bram@vim.org>
parents:
2382
diff
changeset
|
4691 syntax_flags = get_syntax_info(&syntax_seqnr); |
|
2364
151b037b7e74
Fix hang when resizing in diff mode and there are concealed items.
Bram Moolenaar <bram@vim.org>
parents:
2359
diff
changeset
|
4692 # endif |
| 7 | 4693 } |
| 743 | 4694 #endif |
| 4695 | |
| 4696 #ifdef FEAT_SPELL | |
| 301 | 4697 /* Check spelling (unless at the end of the line). |
| 319 | 4698 * Only do this when there is no syntax highlighting, the |
| 4699 * @Spell cluster is not used or the current syntax item | |
| 4700 * contains the @Spell cluster. */ | |
| 348 | 4701 if (has_spell && v >= word_end && v > cur_checked_col) |
| 221 | 4702 { |
| 230 | 4703 spell_attr = 0; |
| 743 | 4704 if (c != 0 && ( |
| 4705 # ifdef FEAT_SYN_HL | |
| 4706 !has_syntax || | |
| 4707 # endif | |
| 4708 can_spell)) | |
| 221 | 4709 { |
| 348 | 4710 char_u *prev_ptr, *p; |
| 4711 int len; | |
| 534 | 4712 hlf_T spell_hlf = HLF_COUNT; |
| 336 | 4713 if (has_mbyte) |
| 4714 { | |
| 4715 prev_ptr = ptr - mb_l; | |
| 4716 v -= mb_l - 1; | |
| 4717 } | |
| 4718 else | |
| 4719 prev_ptr = ptr - 1; | |
| 348 | 4720 |
| 4721 /* Use nextline[] if possible, it has the start of the | |
| 4722 * next line concatenated. */ | |
| 4723 if ((prev_ptr - line) - nextlinecol >= 0) | |
| 4724 p = nextline + (prev_ptr - line) - nextlinecol; | |
| 4725 else | |
| 4726 p = prev_ptr; | |
| 835 | 4727 cap_col -= (int)(prev_ptr - line); |
| 625 | 4728 len = spell_check(wp, p, &spell_hlf, &cap_col, |
| 4729 nochange); | |
| 348 | 4730 word_end = v + len; |
| 301 | 4731 |
| 4732 /* In Insert mode only highlight a word that | |
| 4733 * doesn't touch the cursor. */ | |
| 534 | 4734 if (spell_hlf != HLF_COUNT |
| 301 | 4735 && (State & INSERT) != 0 |
| 4736 && wp->w_cursor.lnum == lnum | |
| 4737 && wp->w_cursor.col >= | |
| 4738 (colnr_T)(prev_ptr - line) | |
| 4739 && wp->w_cursor.col < (colnr_T)word_end) | |
| 221 | 4740 { |
| 534 | 4741 spell_hlf = HLF_COUNT; |
| 301 | 4742 spell_redraw_lnum = lnum; |
| 221 | 4743 } |
| 348 | 4744 |
| 534 | 4745 if (spell_hlf == HLF_COUNT && p != prev_ptr |
| 348 | 4746 && (p - nextline) + len > nextline_idx) |
| 4747 { | |
| 4748 /* Remember that the good word continues at the | |
| 4749 * start of the next line. */ | |
| 4750 checked_lnum = lnum + 1; | |
| 835 | 4751 checked_col = (int)((p - nextline) + len - nextline_idx); |
| 348 | 4752 } |
| 386 | 4753 |
| 534 | 4754 /* Turn index into actual attributes. */ |
| 4755 if (spell_hlf != HLF_COUNT) | |
| 4756 spell_attr = highlight_attr[spell_hlf]; | |
| 4757 | |
| 386 | 4758 if (cap_col > 0) |
| 4759 { | |
| 4760 if (p != prev_ptr | |
| 4761 && (p - nextline) + cap_col >= nextline_idx) | |
| 4762 { | |
| 4763 /* Remember that the word in the next line | |
| 4764 * must start with a capital. */ | |
| 4765 capcol_lnum = lnum + 1; | |
| 835 | 4766 cap_col = (int)((p - nextline) + cap_col |
| 4767 - nextline_idx); | |
| 386 | 4768 } |
| 4769 else | |
| 4770 /* Compute the actual column. */ | |
| 835 | 4771 cap_col += (int)(prev_ptr - line); |
| 386 | 4772 } |
| 221 | 4773 } |
| 4774 } | |
| 4775 if (spell_attr != 0) | |
| 348 | 4776 { |
| 674 | 4777 if (!attr_pri) |
| 348 | 4778 char_attr = hl_combine_attr(char_attr, spell_attr); |
| 4779 else | |
| 4780 char_attr = hl_combine_attr(spell_attr, char_attr); | |
| 4781 } | |
| 7 | 4782 #endif |
| 4783 #ifdef FEAT_LINEBREAK | |
| 4784 /* | |
| 221 | 4785 * Found last space before word: check for line break. |
| 7 | 4786 */ |
|
10982
5e20c9f96cd5
patch 8.0.0380: with 'linebreak' double wide char wraps badly
Christian Brabandt <cb@256bit.org>
parents:
10928
diff
changeset
|
4787 if (wp->w_p_lbr && c0 == c |
|
11133
d8e830e32be9
patch 8.0.0454: compiler warnings for "always true" comparison
Christian Brabandt <cb@256bit.org>
parents:
11129
diff
changeset
|
4788 && VIM_ISBREAK(c) && !VIM_ISBREAK((int)*ptr)) |
| 7 | 4789 { |
| 6693 | 4790 int mb_off = has_mbyte ? (*mb_head_off)(line, ptr - 1) : 0; |
|
15603
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
4791 char_u *p = ptr - (mb_off + 1); |
| 6681 | 4792 |
| 5995 | 4793 /* TODO: is passing p for start of the line OK? */ |
| 6026 | 4794 n_extra = win_lbr_chartabsize(wp, line, p, (colnr_T)vcol, |
| 5995 | 4795 NULL) - 1; |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
4796 if (c == TAB && n_extra + col > wp->w_width) |
|
14218
539b070778b0
patch 8.1.0126: various problems with 'vartabstop'
Christian Brabandt <cb@256bit.org>
parents:
14198
diff
changeset
|
4797 # ifdef FEAT_VARTABS |
|
14198
9ca8c36869ce
patch 8.1.0116: display problem with 'vartabstop' and 'linebreak'
Christian Brabandt <cb@256bit.org>
parents:
14191
diff
changeset
|
4798 n_extra = tabstop_padding(vcol, wp->w_buffer->b_p_ts, |
|
14218
539b070778b0
patch 8.1.0126: various problems with 'vartabstop'
Christian Brabandt <cb@256bit.org>
parents:
14198
diff
changeset
|
4799 wp->w_buffer->b_p_vts_array) - 1; |
|
539b070778b0
patch 8.1.0126: various problems with 'vartabstop'
Christian Brabandt <cb@256bit.org>
parents:
14198
diff
changeset
|
4800 # else |
| 6371 | 4801 n_extra = (int)wp->w_buffer->b_p_ts |
| 4802 - vcol % (int)wp->w_buffer->b_p_ts - 1; | |
|
14218
539b070778b0
patch 8.1.0126: various problems with 'vartabstop'
Christian Brabandt <cb@256bit.org>
parents:
14198
diff
changeset
|
4803 # endif |
| 6371 | 4804 |
| 6693 | 4805 c_extra = mb_off > 0 ? MB_FILLER_CHAR : ' '; |
|
15502
bc17a9d37810
patch 8.1.0759: showing two characters for tab is limited
Bram Moolenaar <Bram@vim.org>
parents:
15436
diff
changeset
|
4806 c_final = NUL; |
|
11129
f4ea50924c6d
patch 8.0.0452: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11127
diff
changeset
|
4807 if (VIM_ISWHITE(c)) |
|
5174
42d592dbbec3
updated for version 7.4a.013
Bram Moolenaar <bram@vim.org>
parents:
5126
diff
changeset
|
4808 { |
|
42d592dbbec3
updated for version 7.4a.013
Bram Moolenaar <bram@vim.org>
parents:
5126
diff
changeset
|
4809 #ifdef FEAT_CONCEAL |
|
42d592dbbec3
updated for version 7.4a.013
Bram Moolenaar <bram@vim.org>
parents:
5126
diff
changeset
|
4810 if (c == TAB) |
|
42d592dbbec3
updated for version 7.4a.013
Bram Moolenaar <bram@vim.org>
parents:
5126
diff
changeset
|
4811 /* See "Tab alignment" below. */ |
|
42d592dbbec3
updated for version 7.4a.013
Bram Moolenaar <bram@vim.org>
parents:
5126
diff
changeset
|
4812 FIX_FOR_BOGUSCOLS; |
|
42d592dbbec3
updated for version 7.4a.013
Bram Moolenaar <bram@vim.org>
parents:
5126
diff
changeset
|
4813 #endif |
| 6026 | 4814 if (!wp->w_p_list) |
| 4815 c = ' '; | |
|
5174
42d592dbbec3
updated for version 7.4a.013
Bram Moolenaar <bram@vim.org>
parents:
5126
diff
changeset
|
4816 } |
| 7 | 4817 } |
| 4818 #endif | |
| 4819 | |
|
7344
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
4820 /* 'list': change char 160 to lcs_nbsp and space to lcs_space. |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
4821 */ |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
4822 if (wp->w_p_list |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
4823 && (((c == 160 |
|
15603
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
4824 || (mb_utf8 && (mb_c == 160 || mb_c == 0x202f))) |
|
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
4825 && lcs_nbsp) |
|
7344
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
4826 || (c == ' ' && lcs_space && ptr - line <= trailcol))) |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
4827 { |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
4828 c = (c == ' ') ? lcs_space : lcs_nbsp; |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
4829 if (area_attr == 0 && search_attr == 0) |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
4830 { |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
4831 n_attr = 1; |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
4832 extra_attr = HL_ATTR(HLF_8); |
|
7344
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
4833 saved_attr2 = char_attr; /* save current attr */ |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
4834 } |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
4835 mb_c = c; |
|
11269
121d29004998
patch 8.0.0520: using a function pointer while the function is known
Christian Brabandt <cb@256bit.org>
parents:
11265
diff
changeset
|
4836 if (enc_utf8 && utf_char2len(c) > 1) |
|
7344
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
4837 { |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
4838 mb_utf8 = TRUE; |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
4839 u8cc[0] = 0; |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
4840 c = 0xc0; |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
4841 } |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
4842 else |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
4843 mb_utf8 = FALSE; |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
4844 } |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
4845 |
| 7 | 4846 if (trailcol != MAXCOL && ptr > line + trailcol && c == ' ') |
| 4847 { | |
| 4848 c = lcs_trail; | |
| 674 | 4849 if (!attr_pri) |
| 7 | 4850 { |
| 4851 n_attr = 1; | |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
4852 extra_attr = HL_ATTR(HLF_8); |
| 7 | 4853 saved_attr2 = char_attr; /* save current attr */ |
| 4854 } | |
| 4855 mb_c = c; | |
|
11269
121d29004998
patch 8.0.0520: using a function pointer while the function is known
Christian Brabandt <cb@256bit.org>
parents:
11265
diff
changeset
|
4856 if (enc_utf8 && utf_char2len(c) > 1) |
| 7 | 4857 { |
| 4858 mb_utf8 = TRUE; | |
| 714 | 4859 u8cc[0] = 0; |
| 819 | 4860 c = 0xc0; |
| 7 | 4861 } |
| 4862 else | |
| 4863 mb_utf8 = FALSE; | |
| 4864 } | |
| 4865 } | |
| 4866 | |
| 4867 /* | |
| 4868 * Handling of non-printable characters. | |
| 4869 */ | |
|
7697
f04e2b6feea2
commit https://github.com/vim/vim/commit/88e8f9f14434a7cd538d0c159dc432bea869a5bd
Christian Brabandt <cb@256bit.org>
parents:
7603
diff
changeset
|
4870 if (!vim_isprintc(c)) |
| 7 | 4871 { |
| 4872 /* | |
| 4873 * when getting a character from the file, we may have to | |
| 4874 * turn it into something else on the way to putting it | |
| 4875 * into "ScreenLines". | |
| 4876 */ | |
| 4877 if (c == TAB && (!wp->w_p_list || lcs_tab1)) | |
| 4878 { | |
| 6026 | 4879 int tab_len = 0; |
| 6503 | 4880 long vcol_adjusted = vcol; /* removed showbreak length */ |
| 4881 #ifdef FEAT_LINEBREAK | |
| 4882 /* only adjust the tab_len, when at the first column | |
| 4883 * after the showbreak value was drawn */ | |
| 4884 if (*p_sbr != NUL && vcol == vcol_sbr && wp->w_p_wrap) | |
| 4885 vcol_adjusted = vcol - MB_CHARLEN(p_sbr); | |
| 4886 #endif | |
| 7 | 4887 /* tab amount depends on current column */ |
|
14175
2ad722003b36
patch 8.1.0105: all tab stops are the same
Christian Brabandt <cb@256bit.org>
parents:
14161
diff
changeset
|
4888 #ifdef FEAT_VARTABS |
|
2ad722003b36
patch 8.1.0105: all tab stops are the same
Christian Brabandt <cb@256bit.org>
parents:
14161
diff
changeset
|
4889 tab_len = tabstop_padding(vcol_adjusted, |
|
2ad722003b36
patch 8.1.0105: all tab stops are the same
Christian Brabandt <cb@256bit.org>
parents:
14161
diff
changeset
|
4890 wp->w_buffer->b_p_ts, |
|
2ad722003b36
patch 8.1.0105: all tab stops are the same
Christian Brabandt <cb@256bit.org>
parents:
14161
diff
changeset
|
4891 wp->w_buffer->b_p_vts_array) - 1; |
|
2ad722003b36
patch 8.1.0105: all tab stops are the same
Christian Brabandt <cb@256bit.org>
parents:
14161
diff
changeset
|
4892 #else |
| 6026 | 4893 tab_len = (int)wp->w_buffer->b_p_ts |
|
14175
2ad722003b36
patch 8.1.0105: all tab stops are the same
Christian Brabandt <cb@256bit.org>
parents:
14161
diff
changeset
|
4894 - vcol_adjusted % (int)wp->w_buffer->b_p_ts - 1; |
|
2ad722003b36
patch 8.1.0105: all tab stops are the same
Christian Brabandt <cb@256bit.org>
parents:
14161
diff
changeset
|
4895 #endif |
| 6503 | 4896 |
| 6026 | 4897 #ifdef FEAT_LINEBREAK |
| 6100 | 4898 if (!wp->w_p_lbr || !wp->w_p_list) |
| 6026 | 4899 #endif |
| 4900 /* tab amount depends on current column */ | |
| 4901 n_extra = tab_len; | |
| 4902 #ifdef FEAT_LINEBREAK | |
| 4903 else | |
| 4904 { | |
| 4905 char_u *p; | |
| 4906 int len = n_extra; | |
| 4907 int i; | |
| 4908 int saved_nextra = n_extra; | |
| 4909 | |
| 6172 | 4910 #ifdef FEAT_CONCEAL |
| 6627 | 4911 if (vcol_off > 0) |
| 6172 | 4912 /* there are characters to conceal */ |
| 4913 tab_len += vcol_off; | |
| 6520 | 4914 /* boguscols before FIX_FOR_BOGUSCOLS macro from above |
| 4915 */ | |
| 4916 if (wp->w_p_list && lcs_tab1 && old_boguscols > 0 | |
| 4917 && n_extra > tab_len) | |
| 4918 tab_len += n_extra - tab_len; | |
| 4919 #endif | |
| 4920 | |
| 6026 | 4921 /* if n_extra > 0, it gives the number of chars, to |
| 4922 * use for a tab, else we need to calculate the width | |
| 4923 * for a tab */ | |
| 4924 len = (tab_len * mb_char2len(lcs_tab2)); | |
| 4925 if (n_extra > 0) | |
| 4926 len += n_extra - tab_len; | |
| 4927 c = lcs_tab1; | |
| 4928 p = alloc((unsigned)(len + 1)); | |
| 4929 vim_memset(p, ' ', len); | |
| 4930 p[len] = NUL; | |
|
10690
206ab11fa76e
patch 8.0.0235: memory leak in diff mode
Christian Brabandt <cb@256bit.org>
parents:
10538
diff
changeset
|
4931 vim_free(p_extra_free); |
| 6026 | 4932 p_extra_free = p; |
| 4933 for (i = 0; i < tab_len; i++) | |
| 4934 { | |
|
14218
539b070778b0
patch 8.1.0126: various problems with 'vartabstop'
Christian Brabandt <cb@256bit.org>
parents:
14198
diff
changeset
|
4935 if (*p == NUL) |
|
539b070778b0
patch 8.1.0126: various problems with 'vartabstop'
Christian Brabandt <cb@256bit.org>
parents:
14198
diff
changeset
|
4936 { |
|
539b070778b0
patch 8.1.0126: various problems with 'vartabstop'
Christian Brabandt <cb@256bit.org>
parents:
14198
diff
changeset
|
4937 tab_len = i; |
|
539b070778b0
patch 8.1.0126: various problems with 'vartabstop'
Christian Brabandt <cb@256bit.org>
parents:
14198
diff
changeset
|
4938 break; |
|
539b070778b0
patch 8.1.0126: various problems with 'vartabstop'
Christian Brabandt <cb@256bit.org>
parents:
14198
diff
changeset
|
4939 } |
| 6026 | 4940 mb_char2bytes(lcs_tab2, p); |
| 4941 p += mb_char2len(lcs_tab2); | |
| 4942 n_extra += mb_char2len(lcs_tab2) | |
| 4943 - (saved_nextra > 0 ? 1 : 0); | |
| 4944 } | |
| 4945 p_extra = p_extra_free; | |
| 6172 | 4946 #ifdef FEAT_CONCEAL |
| 4947 /* n_extra will be increased by FIX_FOX_BOGUSCOLS | |
| 4948 * macro below, so need to adjust for that here */ | |
| 6627 | 4949 if (vcol_off > 0) |
| 6172 | 4950 n_extra -= vcol_off; |
| 4951 #endif | |
| 6026 | 4952 } |
| 4953 #endif | |
| 3984 | 4954 #ifdef FEAT_CONCEAL |
| 6627 | 4955 { |
| 4956 int vc_saved = vcol_off; | |
| 4957 | |
| 4958 /* Tab alignment should be identical regardless of | |
| 4959 * 'conceallevel' value. So tab compensates of all | |
| 4960 * previous concealed characters, and thus resets | |
| 4961 * vcol_off and boguscols accumulated so far in the | |
| 4962 * line. Note that the tab can be longer than | |
| 4963 * 'tabstop' when there are concealed characters. */ | |
| 4964 FIX_FOR_BOGUSCOLS; | |
| 4965 | |
| 4966 /* Make sure, the highlighting for the tab char will be | |
| 4967 * correctly set further below (effectively reverts the | |
| 4968 * FIX_FOR_BOGSUCOLS macro */ | |
| 4969 if (n_extra == tab_len + vc_saved && wp->w_p_list | |
| 6520 | 4970 && lcs_tab1) |
| 6627 | 4971 tab_len += vc_saved; |
| 4972 } | |
| 3984 | 4973 #endif |
| 7 | 4974 mb_utf8 = FALSE; /* don't draw as UTF-8 */ |
| 4975 if (wp->w_p_list) | |
| 4976 { | |
|
15502
bc17a9d37810
patch 8.1.0759: showing two characters for tab is limited
Bram Moolenaar <Bram@vim.org>
parents:
15436
diff
changeset
|
4977 c = (n_extra == 0 && lcs_tab3) ? lcs_tab3 : lcs_tab1; |
| 6026 | 4978 #ifdef FEAT_LINEBREAK |
| 4979 if (wp->w_p_lbr) | |
| 4980 c_extra = NUL; /* using p_extra from above */ | |
| 4981 else | |
| 4982 #endif | |
| 4983 c_extra = lcs_tab2; | |
|
15502
bc17a9d37810
patch 8.1.0759: showing two characters for tab is limited
Bram Moolenaar <Bram@vim.org>
parents:
15436
diff
changeset
|
4984 c_final = lcs_tab3; |
| 6026 | 4985 n_attr = tab_len + 1; |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
4986 extra_attr = HL_ATTR(HLF_8); |
| 7 | 4987 saved_attr2 = char_attr; /* save current attr */ |
| 4988 mb_c = c; | |
|
11269
121d29004998
patch 8.0.0520: using a function pointer while the function is known
Christian Brabandt <cb@256bit.org>
parents:
11265
diff
changeset
|
4989 if (enc_utf8 && utf_char2len(c) > 1) |
| 7 | 4990 { |
| 4991 mb_utf8 = TRUE; | |
| 714 | 4992 u8cc[0] = 0; |
| 819 | 4993 c = 0xc0; |
| 7 | 4994 } |
| 4995 } | |
| 4996 else | |
| 4997 { | |
|
15502
bc17a9d37810
patch 8.1.0759: showing two characters for tab is limited
Bram Moolenaar <Bram@vim.org>
parents:
15436
diff
changeset
|
4998 c_final = NUL; |
| 7 | 4999 c_extra = ' '; |
| 5000 c = ' '; | |
| 5001 } | |
| 5002 } | |
| 36 | 5003 else if (c == NUL |
| 6799 | 5004 && (wp->w_p_list |
| 36 | 5005 || ((fromcol >= 0 || fromcol_prev >= 0) |
| 5006 && tocol > vcol | |
| 5007 && VIsual_mode != Ctrl_V | |
| 5008 && ( | |
| 5009 # ifdef FEAT_RIGHTLEFT | |
| 5010 wp->w_p_rl ? (col >= 0) : | |
| 5011 # endif | |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
5012 (col < wp->w_width)) |
| 36 | 5013 && !(noinvcur |
| 1850 | 5014 && lnum == wp->w_cursor.lnum |
| 36 | 5015 && (colnr_T)vcol == wp->w_virtcol))) |
| 6815 | 5016 && lcs_eol_one > 0) |
| 7 | 5017 { |
| 36 | 5018 /* Display a '$' after the line or highlight an extra |
| 5019 * character if the line break is included. */ | |
| 7 | 5020 #if defined(FEAT_DIFF) || defined(LINE_ATTR) |
| 5021 /* For a diff line the highlighting continues after the | |
| 5022 * "$". */ | |
| 5023 if ( | |
| 5024 # ifdef FEAT_DIFF | |
| 534 | 5025 diff_hlf == (hlf_T)0 |
| 7 | 5026 # ifdef LINE_ATTR |
| 5027 && | |
| 5028 # endif | |
| 5029 # endif | |
| 5030 # ifdef LINE_ATTR | |
| 5031 line_attr == 0 | |
| 5032 # endif | |
| 5033 ) | |
| 5034 #endif | |
| 5035 { | |
| 5036 #ifdef FEAT_VIRTUALEDIT | |
| 5037 /* In virtualedit, visual selections may extend | |
| 5038 * beyond end of line. */ | |
| 5039 if (area_highlighting && virtual_active() | |
| 5040 && tocol != MAXCOL && vcol < tocol) | |
| 5041 n_extra = 0; | |
| 5042 else | |
| 5043 #endif | |
| 5044 { | |
| 5045 p_extra = at_end_str; | |
| 5046 n_extra = 1; | |
| 5047 c_extra = NUL; | |
|
15502
bc17a9d37810
patch 8.1.0759: showing two characters for tab is limited
Bram Moolenaar <Bram@vim.org>
parents:
15436
diff
changeset
|
5048 c_final = NUL; |
| 7 | 5049 } |
| 5050 } | |
| 6799 | 5051 if (wp->w_p_list && lcs_eol > 0) |
| 36 | 5052 c = lcs_eol; |
| 5053 else | |
| 5054 c = ' '; | |
| 7 | 5055 lcs_eol_one = -1; |
| 5056 --ptr; /* put it back at the NUL */ | |
| 674 | 5057 if (!attr_pri) |
| 7 | 5058 { |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
5059 extra_attr = HL_ATTR(HLF_AT); |
| 7 | 5060 n_attr = 1; |
| 5061 } | |
| 5062 mb_c = c; | |
|
11269
121d29004998
patch 8.0.0520: using a function pointer while the function is known
Christian Brabandt <cb@256bit.org>
parents:
11265
diff
changeset
|
5063 if (enc_utf8 && utf_char2len(c) > 1) |
| 7 | 5064 { |
| 5065 mb_utf8 = TRUE; | |
| 714 | 5066 u8cc[0] = 0; |
| 819 | 5067 c = 0xc0; |
| 7 | 5068 } |
| 5069 else | |
| 5070 mb_utf8 = FALSE; /* don't draw as UTF-8 */ | |
| 5071 } | |
| 5072 else if (c != NUL) | |
| 5073 { | |
| 5074 p_extra = transchar(c); | |
| 6064 | 5075 if (n_extra == 0) |
| 5076 n_extra = byte2cells(c) - 1; | |
| 7 | 5077 #ifdef FEAT_RIGHTLEFT |
| 5078 if ((dy_flags & DY_UHEX) && wp->w_p_rl) | |
| 5079 rl_mirror(p_extra); /* reverse "<12>" */ | |
| 5080 #endif | |
| 5081 c_extra = NUL; | |
|
15502
bc17a9d37810
patch 8.1.0759: showing two characters for tab is limited
Bram Moolenaar <Bram@vim.org>
parents:
15436
diff
changeset
|
5082 c_final = NUL; |
| 6026 | 5083 #ifdef FEAT_LINEBREAK |
| 5084 if (wp->w_p_lbr) | |
| 5085 { | |
| 5086 char_u *p; | |
| 5087 | |
| 5088 c = *p_extra; | |
| 5089 p = alloc((unsigned)n_extra + 1); | |
| 5090 vim_memset(p, ' ', n_extra); | |
| 5091 STRNCPY(p, p_extra + 1, STRLEN(p_extra) - 1); | |
| 5092 p[n_extra] = NUL; | |
|
10690
206ab11fa76e
patch 8.0.0235: memory leak in diff mode
Christian Brabandt <cb@256bit.org>
parents:
10538
diff
changeset
|
5093 vim_free(p_extra_free); |
| 6026 | 5094 p_extra_free = p_extra = p; |
| 5095 } | |
| 5096 else | |
| 5097 #endif | |
| 5098 { | |
| 5099 n_extra = byte2cells(c) - 1; | |
| 5100 c = *p_extra++; | |
| 5101 } | |
| 674 | 5102 if (!attr_pri) |
| 7 | 5103 { |
| 5104 n_attr = n_extra + 1; | |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
5105 extra_attr = HL_ATTR(HLF_8); |
| 7 | 5106 saved_attr2 = char_attr; /* save current attr */ |
| 5107 } | |
| 5108 mb_utf8 = FALSE; /* don't draw as UTF-8 */ | |
| 5109 } | |
| 5110 #ifdef FEAT_VIRTUALEDIT | |
| 5111 else if (VIsual_active | |
| 5112 && (VIsual_mode == Ctrl_V | |
| 5113 || VIsual_mode == 'v') | |
| 5114 && virtual_active() | |
| 5115 && tocol != MAXCOL | |
| 5116 && vcol < tocol | |
| 5117 && ( | |
| 5118 # ifdef FEAT_RIGHTLEFT | |
| 5119 wp->w_p_rl ? (col >= 0) : | |
| 5120 # endif | |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
5121 (col < wp->w_width))) |
| 7 | 5122 { |
| 5123 c = ' '; | |
| 5124 --ptr; /* put it back at the NUL */ | |
| 5125 } | |
| 5126 #endif | |
| 910 | 5127 #if defined(LINE_ATTR) |
| 7 | 5128 else if (( |
| 5129 # ifdef FEAT_DIFF | |
| 910 | 5130 diff_hlf != (hlf_T)0 || |
| 7 | 5131 # endif |
|
12433
735b49ff8fbb
patch 8.0.1096: terminal window in Normal mode has wrong background
Christian Brabandt <cb@256bit.org>
parents:
12323
diff
changeset
|
5132 # ifdef FEAT_TERMINAL |
|
735b49ff8fbb
patch 8.0.1096: terminal window in Normal mode has wrong background
Christian Brabandt <cb@256bit.org>
parents:
12323
diff
changeset
|
5133 term_attr != 0 || |
|
735b49ff8fbb
patch 8.0.1096: terminal window in Normal mode has wrong background
Christian Brabandt <cb@256bit.org>
parents:
12323
diff
changeset
|
5134 # endif |
| 7 | 5135 line_attr != 0 |
| 5136 ) && ( | |
| 5137 # ifdef FEAT_RIGHTLEFT | |
| 5138 wp->w_p_rl ? (col >= 0) : | |
| 5139 # endif | |
|
2553
37d3f90f5203
Conceal feature caused the 'cursorline' highlighting to stop early.
Bram Moolenaar <bram@vim.org>
parents:
2520
diff
changeset
|
5140 (col |
|
37d3f90f5203
Conceal feature caused the 'cursorline' highlighting to stop early.
Bram Moolenaar <bram@vim.org>
parents:
2520
diff
changeset
|
5141 # ifdef FEAT_CONCEAL |
|
37d3f90f5203
Conceal feature caused the 'cursorline' highlighting to stop early.
Bram Moolenaar <bram@vim.org>
parents:
2520
diff
changeset
|
5142 - boguscols |
|
37d3f90f5203
Conceal feature caused the 'cursorline' highlighting to stop early.
Bram Moolenaar <bram@vim.org>
parents:
2520
diff
changeset
|
5143 # endif |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
5144 < wp->w_width))) |
| 7 | 5145 { |
| 5146 /* Highlight until the right side of the window */ | |
| 5147 c = ' '; | |
| 5148 --ptr; /* put it back at the NUL */ | |
| 867 | 5149 |
| 5150 /* Remember we do the char for line highlighting. */ | |
| 5151 ++did_line_attr; | |
| 5152 | |
| 5153 /* don't do search HL for the rest of the line */ | |
|
12580
ba55861aa52c
patch 8.0.1168: wrong highlighting with combination of match and 'cursorline'
Christian Brabandt <cb@256bit.org>
parents:
12529
diff
changeset
|
5154 if (line_attr != 0 && char_attr == search_attr |
|
ba55861aa52c
patch 8.0.1168: wrong highlighting with combination of match and 'cursorline'
Christian Brabandt <cb@256bit.org>
parents:
12529
diff
changeset
|
5155 && (did_line_attr > 1 |
|
ba55861aa52c
patch 8.0.1168: wrong highlighting with combination of match and 'cursorline'
Christian Brabandt <cb@256bit.org>
parents:
12529
diff
changeset
|
5156 || (wp->w_p_list && lcs_eol > 0))) |
| 867 | 5157 char_attr = line_attr; |
| 7 | 5158 # ifdef FEAT_DIFF |
| 5159 if (diff_hlf == HLF_TXD) | |
| 5160 { | |
| 5161 diff_hlf = HLF_CHD; | |
| 5162 if (attr == 0 || char_attr != attr) | |
| 6106 | 5163 { |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
5164 char_attr = HL_ATTR(diff_hlf); |
| 6106 | 5165 if (wp->w_p_cul && lnum == wp->w_cursor.lnum) |
| 5166 char_attr = hl_combine_attr(char_attr, | |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
5167 HL_ATTR(HLF_CUL)); |
| 6106 | 5168 } |
| 7 | 5169 } |
| 5170 # endif | |
|
12433
735b49ff8fbb
patch 8.0.1096: terminal window in Normal mode has wrong background
Christian Brabandt <cb@256bit.org>
parents:
12323
diff
changeset
|
5171 # ifdef FEAT_TERMINAL |
|
735b49ff8fbb
patch 8.0.1096: terminal window in Normal mode has wrong background
Christian Brabandt <cb@256bit.org>
parents:
12323
diff
changeset
|
5172 if (term_attr != 0) |
|
735b49ff8fbb
patch 8.0.1096: terminal window in Normal mode has wrong background
Christian Brabandt <cb@256bit.org>
parents:
12323
diff
changeset
|
5173 { |
|
735b49ff8fbb
patch 8.0.1096: terminal window in Normal mode has wrong background
Christian Brabandt <cb@256bit.org>
parents:
12323
diff
changeset
|
5174 char_attr = term_attr; |
|
735b49ff8fbb
patch 8.0.1096: terminal window in Normal mode has wrong background
Christian Brabandt <cb@256bit.org>
parents:
12323
diff
changeset
|
5175 if (wp->w_p_cul && lnum == wp->w_cursor.lnum) |
|
735b49ff8fbb
patch 8.0.1096: terminal window in Normal mode has wrong background
Christian Brabandt <cb@256bit.org>
parents:
12323
diff
changeset
|
5176 char_attr = hl_combine_attr(char_attr, |
|
735b49ff8fbb
patch 8.0.1096: terminal window in Normal mode has wrong background
Christian Brabandt <cb@256bit.org>
parents:
12323
diff
changeset
|
5177 HL_ATTR(HLF_CUL)); |
|
735b49ff8fbb
patch 8.0.1096: terminal window in Normal mode has wrong background
Christian Brabandt <cb@256bit.org>
parents:
12323
diff
changeset
|
5178 } |
|
735b49ff8fbb
patch 8.0.1096: terminal window in Normal mode has wrong background
Christian Brabandt <cb@256bit.org>
parents:
12323
diff
changeset
|
5179 # endif |
| 7 | 5180 } |
| 5181 #endif | |
| 5182 } | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5183 |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5184 #ifdef FEAT_CONCEAL |
|
2378
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
5185 if ( wp->w_p_cole > 0 |
|
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
5186 && (wp != curwin || lnum != wp->w_cursor.lnum || |
| 6947 | 5187 conceal_cursor_line(wp) ) |
|
8907
5deb9e8f4292
commit https://github.com/vim/vim/commit/4d585022023b96f6507e8cae5ed8fc8d926f5140
Christian Brabandt <cb@256bit.org>
parents:
8872
diff
changeset
|
5188 && ( (syntax_flags & HL_CONCEAL) != 0 || has_match_conc > 0) |
|
2400
e6f1424dd66a
Let 'v' flag in 'concealcursor' apply to all lines in the Visual area.
Bram Moolenaar <bram@vim.org>
parents:
2393
diff
changeset
|
5189 && !(lnum_in_visual_area |
|
e6f1424dd66a
Let 'v' flag in 'concealcursor' apply to all lines in the Visual area.
Bram Moolenaar <bram@vim.org>
parents:
2393
diff
changeset
|
5190 && vim_strchr(wp->w_p_cocu, 'v') == NULL)) |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5191 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5192 char_attr = conceal_attr; |
|
8907
5deb9e8f4292
commit https://github.com/vim/vim/commit/4d585022023b96f6507e8cae5ed8fc8d926f5140
Christian Brabandt <cb@256bit.org>
parents:
8872
diff
changeset
|
5193 if ((prev_syntax_id != syntax_seqnr || has_match_conc > 1) |
| 6947 | 5194 && (syn_get_sub_char() != NUL || match_conc |
| 5195 || wp->w_p_cole == 1) | |
|
2378
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
5196 && wp->w_p_cole != 3) |
|
2375
a96dd77ce213
For conceal mode: when two different syntax items follow each other, show the
Bram Moolenaar <bram@vim.org>
parents:
2364
diff
changeset
|
5197 { |
|
a96dd77ce213
For conceal mode: when two different syntax items follow each other, show the
Bram Moolenaar <bram@vim.org>
parents:
2364
diff
changeset
|
5198 /* First time at this concealed item: display one |
|
a96dd77ce213
For conceal mode: when two different syntax items follow each other, show the
Bram Moolenaar <bram@vim.org>
parents:
2364
diff
changeset
|
5199 * character. */ |
| 6947 | 5200 if (match_conc) |
| 5201 c = match_conc; | |
| 5202 else if (syn_get_sub_char() != NUL) | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5203 c = syn_get_sub_char(); |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5204 else if (lcs_conceal != NUL) |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5205 c = lcs_conceal; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5206 else |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5207 c = ' '; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5208 |
|
2392
0371401d9d33
Give each syntax item a sequence number, so that we know when it starts and
Bram Moolenaar <bram@vim.org>
parents:
2382
diff
changeset
|
5209 prev_syntax_id = syntax_seqnr; |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5210 |
|
2332
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
5211 if (n_extra > 0) |
|
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
5212 vcol_off += n_extra; |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5213 vcol += n_extra; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5214 if (wp->w_p_wrap && n_extra > 0) |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5215 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5216 # ifdef FEAT_RIGHTLEFT |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5217 if (wp->w_p_rl) |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5218 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5219 col -= n_extra; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5220 boguscols -= n_extra; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5221 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5222 else |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5223 # endif |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5224 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5225 boguscols += n_extra; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5226 col += n_extra; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5227 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5228 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5229 n_extra = 0; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5230 n_attr = 0; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5231 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5232 else if (n_skip == 0) |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5233 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5234 is_concealing = TRUE; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5235 n_skip = 1; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5236 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5237 mb_c = c; |
|
11269
121d29004998
patch 8.0.0520: using a function pointer while the function is known
Christian Brabandt <cb@256bit.org>
parents:
11265
diff
changeset
|
5238 if (enc_utf8 && utf_char2len(c) > 1) |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5239 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5240 mb_utf8 = TRUE; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5241 u8cc[0] = 0; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5242 c = 0xc0; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5243 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5244 else |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5245 mb_utf8 = FALSE; /* don't draw as UTF-8 */ |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5246 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5247 else |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5248 { |
|
2375
a96dd77ce213
For conceal mode: when two different syntax items follow each other, show the
Bram Moolenaar <bram@vim.org>
parents:
2364
diff
changeset
|
5249 prev_syntax_id = 0; |
|
2348
8878a9f8db87
Rename w_p_conceal to w_p_conc for consistency.
Bram Moolenaar <bram@vim.org>
parents:
2346
diff
changeset
|
5250 is_concealing = FALSE; |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5251 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5252 #endif /* FEAT_CONCEAL */ |
| 7 | 5253 } |
| 5254 | |
|
2378
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
5255 #ifdef FEAT_CONCEAL |
|
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
5256 /* In the cursor line and we may be concealing characters: correct |
|
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
5257 * the cursor column when we reach its position. */ |
|
2381
17bbb52ae218
Another conceal fix: cursor in wrong column when 'number' set.
Bram Moolenaar <bram@vim.org>
parents:
2380
diff
changeset
|
5258 if (!did_wcol && draw_state == WL_LINE |
|
17bbb52ae218
Another conceal fix: cursor in wrong column when 'number' set.
Bram Moolenaar <bram@vim.org>
parents:
2380
diff
changeset
|
5259 && wp == curwin && lnum == wp->w_cursor.lnum |
|
2378
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
5260 && conceal_cursor_line(wp) |
|
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
5261 && (int)wp->w_virtcol <= vcol + n_skip) |
|
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
5262 { |
|
7603
d3892f6c917e
commit https://github.com/vim/vim/commit/e39b3d9fb4e4006684c33847d1ef6a0d742699dd
Christian Brabandt <cb@256bit.org>
parents:
7344
diff
changeset
|
5263 # ifdef FEAT_RIGHTLEFT |
|
d3892f6c917e
commit https://github.com/vim/vim/commit/e39b3d9fb4e4006684c33847d1ef6a0d742699dd
Christian Brabandt <cb@256bit.org>
parents:
7344
diff
changeset
|
5264 if (wp->w_p_rl) |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
5265 wp->w_wcol = wp->w_width - col + boguscols - 1; |
|
7603
d3892f6c917e
commit https://github.com/vim/vim/commit/e39b3d9fb4e4006684c33847d1ef6a0d742699dd
Christian Brabandt <cb@256bit.org>
parents:
7344
diff
changeset
|
5266 else |
|
d3892f6c917e
commit https://github.com/vim/vim/commit/e39b3d9fb4e4006684c33847d1ef6a0d742699dd
Christian Brabandt <cb@256bit.org>
parents:
7344
diff
changeset
|
5267 # endif |
|
d3892f6c917e
commit https://github.com/vim/vim/commit/e39b3d9fb4e4006684c33847d1ef6a0d742699dd
Christian Brabandt <cb@256bit.org>
parents:
7344
diff
changeset
|
5268 wp->w_wcol = col - boguscols; |
|
2393
210a5605e126
Fix for cursor position in wrapped line with concealed text.
Bram Moolenaar <bram@vim.org>
parents:
2392
diff
changeset
|
5269 wp->w_wrow = row; |
|
2378
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
5270 did_wcol = TRUE; |
|
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
5271 } |
|
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
5272 #endif |
|
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
5273 |
| 7 | 5274 /* Don't override visual selection highlighting. */ |
| 5275 if (n_attr > 0 | |
| 5276 && draw_state == WL_LINE | |
| 674 | 5277 && !attr_pri) |
| 7 | 5278 char_attr = extra_attr; |
| 5279 | |
| 42 | 5280 #if defined(FEAT_XIM) && defined(FEAT_GUI_GTK) |
| 7 | 5281 /* XIM don't send preedit_start and preedit_end, but they send |
| 5282 * preedit_changed and commit. Thus Vim can't set "im_is_active", use | |
| 5283 * im_is_preediting() here. */ | |
|
12293
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12244
diff
changeset
|
5284 if (p_imst == IM_ON_THE_SPOT |
|
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12244
diff
changeset
|
5285 && xic != NULL |
| 1850 | 5286 && lnum == wp->w_cursor.lnum |
| 7 | 5287 && (State & INSERT) |
| 5288 && !p_imdisable | |
| 5289 && im_is_preediting() | |
| 5290 && draw_state == WL_LINE) | |
| 5291 { | |
| 5292 colnr_T tcol; | |
| 5293 | |
| 5294 if (preedit_end_col == MAXCOL) | |
| 1850 | 5295 getvcol(curwin, &(wp->w_cursor), &tcol, NULL, NULL); |
| 7 | 5296 else |
| 5297 tcol = preedit_end_col; | |
| 5298 if ((long)preedit_start_col <= vcol && vcol < (long)tcol) | |
| 5299 { | |
| 5300 if (feedback_old_attr < 0) | |
| 5301 { | |
| 5302 feedback_col = 0; | |
| 5303 feedback_old_attr = char_attr; | |
| 5304 } | |
| 5305 char_attr = im_get_feedback_attr(feedback_col); | |
| 5306 if (char_attr < 0) | |
| 5307 char_attr = feedback_old_attr; | |
| 5308 feedback_col++; | |
| 5309 } | |
| 5310 else if (feedback_old_attr >= 0) | |
| 5311 { | |
| 5312 char_attr = feedback_old_attr; | |
| 5313 feedback_old_attr = -1; | |
| 5314 feedback_col = 0; | |
| 5315 } | |
| 5316 } | |
| 5317 #endif | |
| 5318 /* | |
| 5319 * Handle the case where we are in column 0 but not on the first | |
| 5320 * character of the line and the user wants us to show us a | |
| 5321 * special character (via 'listchars' option "precedes:<char>". | |
| 5322 */ | |
| 5323 if (lcs_prec_todo != NUL | |
| 6276 | 5324 && wp->w_p_list |
| 7 | 5325 && (wp->w_p_wrap ? wp->w_skipcol > 0 : wp->w_leftcol > 0) |
| 5326 #ifdef FEAT_DIFF | |
| 5327 && filler_todo <= 0 | |
| 5328 #endif | |
| 5329 && draw_state > WL_NR | |
| 5330 && c != NUL) | |
| 5331 { | |
| 5332 c = lcs_prec; | |
| 5333 lcs_prec_todo = NUL; | |
| 3586 | 5334 if (has_mbyte && (*mb_char2cells)(mb_c) > 1) |
| 5335 { | |
| 5336 /* Double-width character being overwritten by the "precedes" | |
| 5337 * character, need to fill up half the character. */ | |
| 5338 c_extra = MB_FILLER_CHAR; | |
|
15502
bc17a9d37810
patch 8.1.0759: showing two characters for tab is limited
Bram Moolenaar <Bram@vim.org>
parents:
15436
diff
changeset
|
5339 c_final = NUL; |
| 3586 | 5340 n_extra = 1; |
| 5341 n_attr = 2; | |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
5342 extra_attr = HL_ATTR(HLF_AT); |
| 3586 | 5343 } |
| 7 | 5344 mb_c = c; |
|
11269
121d29004998
patch 8.0.0520: using a function pointer while the function is known
Christian Brabandt <cb@256bit.org>
parents:
11265
diff
changeset
|
5345 if (enc_utf8 && utf_char2len(c) > 1) |
| 7 | 5346 { |
| 5347 mb_utf8 = TRUE; | |
| 714 | 5348 u8cc[0] = 0; |
| 819 | 5349 c = 0xc0; |
| 7 | 5350 } |
| 5351 else | |
| 5352 mb_utf8 = FALSE; /* don't draw as UTF-8 */ | |
| 674 | 5353 if (!attr_pri) |
| 7 | 5354 { |
| 5355 saved_attr3 = char_attr; /* save current attr */ | |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
5356 char_attr = HL_ATTR(HLF_AT); /* later copied to char_attr */ |
| 7 | 5357 n_attr3 = 1; |
| 5358 } | |
| 5359 } | |
| 5360 | |
| 5361 /* | |
| 867 | 5362 * At end of the text line or just after the last character. |
| 7 | 5363 */ |
| 867 | 5364 if (c == NUL |
| 910 | 5365 #if defined(LINE_ATTR) |
| 867 | 5366 || did_line_attr == 1 |
| 5367 #endif | |
| 5368 ) | |
| 5369 { | |
| 5370 #ifdef FEAT_SEARCH_EXTRA | |
| 5371 long prevcol = (long)(ptr - line) - (c == NUL); | |
| 1437 | 5372 |
| 5373 /* we're not really at that column when skipping some text */ | |
| 1439 | 5374 if ((long)(wp->w_p_wrap ? wp->w_skipcol : wp->w_leftcol) > prevcol) |
| 1437 | 5375 ++prevcol; |
| 867 | 5376 #endif |
| 5377 | |
|
2332
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
5378 /* Invert at least one char, used for Visual and empty line or |
| 7 | 5379 * highlight match at end of line. If it's beyond the last |
| 5380 * char on the screen, just overwrite that one (tricky!) Not | |
| 5381 * needed when a '$' was displayed for 'list'. */ | |
| 1326 | 5382 #ifdef FEAT_SEARCH_EXTRA |
| 5383 prevcol_hl_flag = FALSE; | |
|
9885
4e8b05fa12c6
commit https://github.com/vim/vim/commit/4f416e41243ca151b95d39d81ce23d00b1484755
Christian Brabandt <cb@256bit.org>
parents:
9877
diff
changeset
|
5384 if (!search_hl.is_addpos && prevcol == (long)search_hl.startcol) |
| 1326 | 5385 prevcol_hl_flag = TRUE; |
| 5386 else | |
| 5387 { | |
| 5388 cur = wp->w_match_head; | |
| 5389 while (cur != NULL) | |
| 5390 { | |
|
9885
4e8b05fa12c6
commit https://github.com/vim/vim/commit/4f416e41243ca151b95d39d81ce23d00b1484755
Christian Brabandt <cb@256bit.org>
parents:
9877
diff
changeset
|
5391 if (!cur->hl.is_addpos && prevcol == (long)cur->hl.startcol) |
| 1326 | 5392 { |
| 5393 prevcol_hl_flag = TRUE; | |
| 5394 break; | |
| 5395 } | |
| 5396 cur = cur->next; | |
| 5397 } | |
| 5398 } | |
| 5399 #endif | |
| 7 | 5400 if (lcs_eol == lcs_eol_one |
| 1850 | 5401 && ((area_attr != 0 && vcol == fromcol |
| 5402 && (VIsual_mode != Ctrl_V | |
| 5403 || lnum == VIsual.lnum | |
| 5404 || lnum == curwin->w_cursor.lnum) | |
| 5405 && c == NUL) | |
| 7 | 5406 #ifdef FEAT_SEARCH_EXTRA |
| 5407 /* highlight 'hlsearch' match at end of line */ | |
| 1326 | 5408 || (prevcol_hl_flag == TRUE |
|
12580
ba55861aa52c
patch 8.0.1168: wrong highlighting with combination of match and 'cursorline'
Christian Brabandt <cb@256bit.org>
parents:
12529
diff
changeset
|
5409 # ifdef FEAT_SYN_HL |
|
ba55861aa52c
patch 8.0.1168: wrong highlighting with combination of match and 'cursorline'
Christian Brabandt <cb@256bit.org>
parents:
12529
diff
changeset
|
5410 && !(wp->w_p_cul && lnum == wp->w_cursor.lnum |
|
ba55861aa52c
patch 8.0.1168: wrong highlighting with combination of match and 'cursorline'
Christian Brabandt <cb@256bit.org>
parents:
12529
diff
changeset
|
5411 && !(wp == curwin && VIsual_active)) |
|
ba55861aa52c
patch 8.0.1168: wrong highlighting with combination of match and 'cursorline'
Christian Brabandt <cb@256bit.org>
parents:
12529
diff
changeset
|
5412 # endif |
|
ba55861aa52c
patch 8.0.1168: wrong highlighting with combination of match and 'cursorline'
Christian Brabandt <cb@256bit.org>
parents:
12529
diff
changeset
|
5413 # ifdef FEAT_DIFF |
|
ba55861aa52c
patch 8.0.1168: wrong highlighting with combination of match and 'cursorline'
Christian Brabandt <cb@256bit.org>
parents:
12529
diff
changeset
|
5414 && diff_hlf == (hlf_T)0 |
|
ba55861aa52c
patch 8.0.1168: wrong highlighting with combination of match and 'cursorline'
Christian Brabandt <cb@256bit.org>
parents:
12529
diff
changeset
|
5415 # endif |
| 910 | 5416 # if defined(LINE_ATTR) |
| 867 | 5417 && did_line_attr <= 1 |
| 5418 # endif | |
| 5419 ) | |
| 7 | 5420 #endif |
| 5421 )) | |
| 5422 { | |
| 5423 int n = 0; | |
| 5424 | |
| 5425 #ifdef FEAT_RIGHTLEFT | |
| 5426 if (wp->w_p_rl) | |
| 5427 { | |
| 5428 if (col < 0) | |
| 5429 n = 1; | |
| 5430 } | |
| 5431 else | |
| 5432 #endif | |
| 5433 { | |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
5434 if (col >= wp->w_width) |
| 7 | 5435 n = -1; |
| 5436 } | |
| 5437 if (n != 0) | |
| 5438 { | |
| 5439 /* At the window boundary, highlight the last character | |
| 5440 * instead (better than nothing). */ | |
| 5441 off += n; | |
| 5442 col += n; | |
| 5443 } | |
| 5444 else | |
| 5445 { | |
| 5446 /* Add a blank character to highlight. */ | |
| 5447 ScreenLines[off] = ' '; | |
| 5448 if (enc_utf8) | |
| 5449 ScreenLinesUC[off] = 0; | |
| 5450 } | |
| 5451 #ifdef FEAT_SEARCH_EXTRA | |
| 5452 if (area_attr == 0) | |
| 5453 { | |
| 1326 | 5454 /* Use attributes from match with highest priority among |
| 5455 * 'search_hl' and the match list. */ | |
| 5456 char_attr = search_hl.attr; | |
| 5457 cur = wp->w_match_head; | |
| 5458 shl_flag = FALSE; | |
| 5459 while (cur != NULL || shl_flag == FALSE) | |
| 699 | 5460 { |
| 1326 | 5461 if (shl_flag == FALSE |
| 5462 && ((cur != NULL | |
| 5463 && cur->priority > SEARCH_HL_PRIORITY) | |
| 5464 || cur == NULL)) | |
| 699 | 5465 { |
| 1326 | 5466 shl = &search_hl; |
| 5467 shl_flag = TRUE; | |
| 699 | 5468 } |
| 1326 | 5469 else |
| 5470 shl = &cur->hl; | |
|
9885
4e8b05fa12c6
commit https://github.com/vim/vim/commit/4f416e41243ca151b95d39d81ce23d00b1484755
Christian Brabandt <cb@256bit.org>
parents:
9877
diff
changeset
|
5471 if ((ptr - line) - 1 == (long)shl->startcol |
|
4e8b05fa12c6
commit https://github.com/vim/vim/commit/4f416e41243ca151b95d39d81ce23d00b1484755
Christian Brabandt <cb@256bit.org>
parents:
9877
diff
changeset
|
5472 && (shl == &search_hl || !shl->is_addpos)) |
| 1326 | 5473 char_attr = shl->attr; |
| 5474 if (shl != &search_hl && cur != NULL) | |
| 5475 cur = cur->next; | |
| 699 | 5476 } |
| 7 | 5477 } |
| 5478 #endif | |
| 5479 ScreenAttrs[off] = char_attr; | |
| 5480 #ifdef FEAT_RIGHTLEFT | |
| 5481 if (wp->w_p_rl) | |
| 1437 | 5482 { |
| 7 | 5483 --col; |
| 1437 | 5484 --off; |
| 5485 } | |
| 7 | 5486 else |
| 5487 #endif | |
| 1437 | 5488 { |
| 7 | 5489 ++col; |
| 1437 | 5490 ++off; |
| 5491 } | |
| 743 | 5492 ++vcol; |
| 1437 | 5493 #ifdef FEAT_SYN_HL |
| 5494 eol_hl_off = 1; | |
| 5495 #endif | |
| 743 | 5496 } |
| 867 | 5497 } |
| 5498 | |
| 5499 /* | |
| 5500 * At end of the text line. | |
| 5501 */ | |
| 5502 if (c == NUL) | |
| 5503 { | |
| 743 | 5504 #ifdef FEAT_SYN_HL |
|
2314
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5505 /* Highlight 'cursorcolumn' & 'colorcolumn' past end of the line. */ |
| 758 | 5506 if (wp->w_p_wrap) |
| 5507 v = wp->w_skipcol; | |
| 5508 else | |
| 5509 v = wp->w_leftcol; | |
|
2314
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5510 |
| 820 | 5511 /* check if line ends before left margin */ |
| 5512 if (vcol < v + col - win_col_off(wp)) | |
| 5513 vcol = v + col - win_col_off(wp); | |
|
2332
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
5514 #ifdef FEAT_CONCEAL |
|
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
5515 /* Get rid of the boguscols now, we want to draw until the right |
|
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
5516 * edge for 'cursorcolumn'. */ |
|
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
5517 col -= boguscols; |
|
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
5518 boguscols = 0; |
|
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
5519 #endif |
|
2314
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5520 |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5521 if (draw_color_col) |
|
2332
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
5522 draw_color_col = advance_color_col(VCOL_HLC, &color_cols); |
|
2314
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5523 |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5524 if (((wp->w_p_cuc |
|
2332
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
5525 && (int)wp->w_virtcol >= VCOL_HLC - eol_hl_off |
|
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
5526 && (int)wp->w_virtcol < |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
5527 wp->w_width * (row - startrow + 1) + v |
|
2314
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5528 && lnum != wp->w_cursor.lnum) |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5529 || draw_color_col) |
| 743 | 5530 # ifdef FEAT_RIGHTLEFT |
| 5531 && !wp->w_p_rl | |
| 5532 # endif | |
| 5533 ) | |
| 5534 { | |
|
2314
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5535 int rightmost_vcol = 0; |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5536 int i; |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5537 |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5538 if (wp->w_p_cuc) |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5539 rightmost_vcol = wp->w_virtcol; |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5540 if (draw_color_col) |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5541 /* determine rightmost colorcolumn to possibly draw */ |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5542 for (i = 0; color_cols[i] >= 0; ++i) |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5543 if (rightmost_vcol < color_cols[i]) |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5544 rightmost_vcol = color_cols[i]; |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5545 |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
5546 while (col < wp->w_width) |
| 743 | 5547 { |
| 5548 ScreenLines[off] = ' '; | |
| 5549 if (enc_utf8) | |
| 5550 ScreenLinesUC[off] = 0; | |
| 5551 ++col; | |
|
2356
eb1f2554cac5
Fix 'colorcolumn' adjecent columns not highlighted after end of line.
Bram Moolenaar <bram@vim.org>
parents:
2349
diff
changeset
|
5552 if (draw_color_col) |
|
eb1f2554cac5
Fix 'colorcolumn' adjecent columns not highlighted after end of line.
Bram Moolenaar <bram@vim.org>
parents:
2349
diff
changeset
|
5553 draw_color_col = advance_color_col(VCOL_HLC, |
|
eb1f2554cac5
Fix 'colorcolumn' adjecent columns not highlighted after end of line.
Bram Moolenaar <bram@vim.org>
parents:
2349
diff
changeset
|
5554 &color_cols); |
|
eb1f2554cac5
Fix 'colorcolumn' adjecent columns not highlighted after end of line.
Bram Moolenaar <bram@vim.org>
parents:
2349
diff
changeset
|
5555 |
|
2332
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
5556 if (wp->w_p_cuc && VCOL_HLC == (long)wp->w_virtcol) |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
5557 ScreenAttrs[off++] = HL_ATTR(HLF_CUC); |
|
2332
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
5558 else if (draw_color_col && VCOL_HLC == *color_cols) |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
5559 ScreenAttrs[off++] = HL_ATTR(HLF_MC); |
|
2314
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5560 else |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5561 ScreenAttrs[off++] = 0; |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5562 |
|
2332
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
5563 if (VCOL_HLC >= rightmost_vcol) |
| 743 | 5564 break; |
|
2314
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5565 |
| 743 | 5566 ++vcol; |
| 5567 } | |
| 5568 } | |
| 5569 #endif | |
| 7 | 5570 |
|
12513
3ca08bf99396
patch 8.0.1135: W_WINCOL() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12510
diff
changeset
|
5571 screen_line(screen_row, wp->w_wincol, col, |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
5572 (int)wp->w_width, HAS_RIGHTLEFT(wp->w_p_rl)); |
| 7 | 5573 row++; |
| 5574 | |
| 5575 /* | |
| 5576 * Update w_cline_height and w_cline_folded if the cursor line was | |
| 5577 * updated (saves a call to plines() later). | |
| 5578 */ | |
| 5579 if (wp == curwin && lnum == curwin->w_cursor.lnum) | |
| 5580 { | |
| 5581 curwin->w_cline_row = startrow; | |
| 5582 curwin->w_cline_height = row - startrow; | |
| 5583 #ifdef FEAT_FOLDING | |
| 5584 curwin->w_cline_folded = FALSE; | |
| 5585 #endif | |
| 5586 curwin->w_valid |= (VALID_CHEIGHT|VALID_CROW); | |
| 5587 } | |
| 5588 | |
| 5589 break; | |
| 5590 } | |
| 5591 | |
| 5592 /* line continues beyond line end */ | |
| 5593 if (lcs_ext | |
| 5594 && !wp->w_p_wrap | |
| 5595 #ifdef FEAT_DIFF | |
| 5596 && filler_todo <= 0 | |
| 5597 #endif | |
| 5598 && ( | |
| 5599 #ifdef FEAT_RIGHTLEFT | |
| 5600 wp->w_p_rl ? col == 0 : | |
| 5601 #endif | |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
5602 col == wp->w_width - 1) |
| 7 | 5603 && (*ptr != NUL |
| 1555 | 5604 || (wp->w_p_list && lcs_eol_one > 0) |
| 7 | 5605 || (n_extra && (c_extra != NUL || *p_extra != NUL)))) |
| 5606 { | |
| 5607 c = lcs_ext; | |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
5608 char_attr = HL_ATTR(HLF_AT); |
| 7 | 5609 mb_c = c; |
|
11269
121d29004998
patch 8.0.0520: using a function pointer while the function is known
Christian Brabandt <cb@256bit.org>
parents:
11265
diff
changeset
|
5610 if (enc_utf8 && utf_char2len(c) > 1) |
| 7 | 5611 { |
| 5612 mb_utf8 = TRUE; | |
| 714 | 5613 u8cc[0] = 0; |
| 819 | 5614 c = 0xc0; |
| 7 | 5615 } |
| 5616 else | |
| 5617 mb_utf8 = FALSE; | |
| 5618 } | |
| 5619 | |
| 743 | 5620 #ifdef FEAT_SYN_HL |
|
2314
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5621 /* advance to the next 'colorcolumn' */ |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5622 if (draw_color_col) |
|
2332
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
5623 draw_color_col = advance_color_col(VCOL_HLC, &color_cols); |
|
2314
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5624 |
| 743 | 5625 /* Highlight the cursor column if 'cursorcolumn' is set. But don't |
|
2314
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5626 * highlight the cursor position itself. |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5627 * Also highlight the 'colorcolumn' if it is different than |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5628 * 'cursorcolumn' */ |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5629 vcol_save_attr = -1; |
|
11585
18373179040e
patch 8.0.0675: 'colorcolumn' has a higher priority than 'hlsearch'
Christian Brabandt <cb@256bit.org>
parents:
11529
diff
changeset
|
5630 if (draw_state == WL_LINE && !lnum_in_visual_area |
|
18373179040e
patch 8.0.0675: 'colorcolumn' has a higher priority than 'hlsearch'
Christian Brabandt <cb@256bit.org>
parents:
11529
diff
changeset
|
5631 && search_attr == 0 && area_attr == 0) |
|
2314
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5632 { |
|
2332
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
5633 if (wp->w_p_cuc && VCOL_HLC == (long)wp->w_virtcol |
|
2314
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5634 && lnum != wp->w_cursor.lnum) |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5635 { |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5636 vcol_save_attr = char_attr; |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
5637 char_attr = hl_combine_attr(char_attr, HL_ATTR(HLF_CUC)); |
|
2314
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5638 } |
|
2346
b38c324bdc36
Fix: 'colorcolumn' interfered with concealed text.
Bram Moolenaar <bram@vim.org>
parents:
2338
diff
changeset
|
5639 else if (draw_color_col && VCOL_HLC == *color_cols) |
|
2314
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5640 { |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5641 vcol_save_attr = char_attr; |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
5642 char_attr = hl_combine_attr(char_attr, HL_ATTR(HLF_MC)); |
|
2314
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5643 } |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5644 } |
| 743 | 5645 #endif |
| 5646 | |
| 7 | 5647 /* |
| 5648 * Store character to be displayed. | |
| 5649 * Skip characters that are left of the screen for 'nowrap'. | |
| 5650 */ | |
| 5651 vcol_prev = vcol; | |
| 5652 if (draw_state < WL_LINE || n_skip <= 0) | |
| 5653 { | |
| 5654 /* | |
| 5655 * Store the character. | |
| 5656 */ | |
|
15603
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
5657 #if defined(FEAT_RIGHTLEFT) |
| 7 | 5658 if (has_mbyte && wp->w_p_rl && (*mb_char2cells)(mb_c) > 1) |
| 5659 { | |
| 5660 /* A double-wide character is: put first halve in left cell. */ | |
| 5661 --off; | |
| 5662 --col; | |
| 5663 } | |
| 5664 #endif | |
| 5665 ScreenLines[off] = c; | |
| 5666 if (enc_dbcs == DBCS_JPNU) | |
|
2069
63613d8d7e4d
updated for version 7.2.354
Bram Moolenaar <bram@zimbu.org>
parents:
2055
diff
changeset
|
5667 { |
|
63613d8d7e4d
updated for version 7.2.354
Bram Moolenaar <bram@zimbu.org>
parents:
2055
diff
changeset
|
5668 if ((mb_c & 0xff00) == 0x8e00) |
|
63613d8d7e4d
updated for version 7.2.354
Bram Moolenaar <bram@zimbu.org>
parents:
2055
diff
changeset
|
5669 ScreenLines[off] = 0x8e; |
| 7 | 5670 ScreenLines2[off] = mb_c & 0xff; |
|
2069
63613d8d7e4d
updated for version 7.2.354
Bram Moolenaar <bram@zimbu.org>
parents:
2055
diff
changeset
|
5671 } |
| 7 | 5672 else if (enc_utf8) |
| 5673 { | |
| 5674 if (mb_utf8) | |
| 5675 { | |
| 1326 | 5676 int i; |
| 5677 | |
| 7 | 5678 ScreenLinesUC[off] = mb_c; |
| 819 | 5679 if ((c & 0xff) == 0) |
| 5680 ScreenLines[off] = 0x80; /* avoid storing zero */ | |
| 714 | 5681 for (i = 0; i < Screen_mco; ++i) |
| 5682 { | |
| 5683 ScreenLinesC[i][off] = u8cc[i]; | |
| 5684 if (u8cc[i] == 0) | |
| 5685 break; | |
| 5686 } | |
| 7 | 5687 } |
| 5688 else | |
| 5689 ScreenLinesUC[off] = 0; | |
| 5690 } | |
| 5691 if (multi_attr) | |
| 5692 { | |
| 5693 ScreenAttrs[off] = multi_attr; | |
| 5694 multi_attr = 0; | |
| 5695 } | |
| 5696 else | |
| 5697 ScreenAttrs[off] = char_attr; | |
| 5698 | |
| 5699 if (has_mbyte && (*mb_char2cells)(mb_c) > 1) | |
| 5700 { | |
| 5701 /* Need to fill two screen columns. */ | |
| 5702 ++off; | |
| 5703 ++col; | |
| 5704 if (enc_utf8) | |
| 5705 /* UTF-8: Put a 0 in the second screen char. */ | |
| 5706 ScreenLines[off] = 0; | |
| 5707 else | |
| 5708 /* DBCS: Put second byte in the second screen char. */ | |
| 5709 ScreenLines[off] = mb_c & 0xff; | |
|
7287
6fcadba9ec7a
commit https://github.com/vim/vim/commit/32a214e78df0120f92fe049eab1385c60f0cdb0b
Christian Brabandt <cb@256bit.org>
parents:
7233
diff
changeset
|
5710 if (draw_state > WL_NR |
|
6fcadba9ec7a
commit https://github.com/vim/vim/commit/32a214e78df0120f92fe049eab1385c60f0cdb0b
Christian Brabandt <cb@256bit.org>
parents:
7233
diff
changeset
|
5711 #ifdef FEAT_DIFF |
|
6fcadba9ec7a
commit https://github.com/vim/vim/commit/32a214e78df0120f92fe049eab1385c60f0cdb0b
Christian Brabandt <cb@256bit.org>
parents:
7233
diff
changeset
|
5712 && filler_todo <= 0 |
|
6fcadba9ec7a
commit https://github.com/vim/vim/commit/32a214e78df0120f92fe049eab1385c60f0cdb0b
Christian Brabandt <cb@256bit.org>
parents:
7233
diff
changeset
|
5713 #endif |
|
6fcadba9ec7a
commit https://github.com/vim/vim/commit/32a214e78df0120f92fe049eab1385c60f0cdb0b
Christian Brabandt <cb@256bit.org>
parents:
7233
diff
changeset
|
5714 ) |
|
6fcadba9ec7a
commit https://github.com/vim/vim/commit/32a214e78df0120f92fe049eab1385c60f0cdb0b
Christian Brabandt <cb@256bit.org>
parents:
7233
diff
changeset
|
5715 ++vcol; |
| 7 | 5716 /* When "tocol" is halfway a character, set it to the end of |
| 5717 * the character, otherwise highlighting won't stop. */ | |
| 5718 if (tocol == vcol) | |
| 5719 ++tocol; | |
| 5720 #ifdef FEAT_RIGHTLEFT | |
| 5721 if (wp->w_p_rl) | |
| 5722 { | |
| 5723 /* now it's time to backup one cell */ | |
| 5724 --off; | |
| 5725 --col; | |
| 5726 } | |
| 5727 #endif | |
| 5728 } | |
| 5729 #ifdef FEAT_RIGHTLEFT | |
| 5730 if (wp->w_p_rl) | |
| 5731 { | |
| 5732 --off; | |
| 5733 --col; | |
| 5734 } | |
| 5735 else | |
| 5736 #endif | |
| 5737 { | |
| 5738 ++off; | |
| 5739 ++col; | |
| 5740 } | |
| 5741 } | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5742 #ifdef FEAT_CONCEAL |
|
2378
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
5743 else if (wp->w_p_cole > 0 && is_concealing) |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5744 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5745 --n_skip; |
|
2332
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
5746 ++vcol_off; |
|
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
5747 if (n_extra > 0) |
|
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
5748 vcol_off += n_extra; |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5749 if (wp->w_p_wrap) |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5750 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5751 /* |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5752 * Special voodoo required if 'wrap' is on. |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5753 * |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5754 * Advance the column indicator to force the line |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5755 * drawing to wrap early. This will make the line |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5756 * take up the same screen space when parts are concealed, |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5757 * so that cursor line computations aren't messed up. |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5758 * |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5759 * To avoid the fictitious advance of 'col' causing |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5760 * trailing junk to be written out of the screen line |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5761 * we are building, 'boguscols' keeps track of the number |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5762 * of bad columns we have advanced. |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5763 */ |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5764 if (n_extra > 0) |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5765 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5766 vcol += n_extra; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5767 # ifdef FEAT_RIGHTLEFT |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5768 if (wp->w_p_rl) |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5769 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5770 col -= n_extra; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5771 boguscols -= n_extra; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5772 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5773 else |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5774 # endif |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5775 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5776 col += n_extra; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5777 boguscols += n_extra; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5778 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5779 n_extra = 0; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5780 n_attr = 0; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5781 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5782 |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5783 |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5784 if (has_mbyte && (*mb_char2cells)(mb_c) > 1) |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5785 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5786 /* Need to fill two screen columns. */ |
|
15603
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
5787 # ifdef FEAT_RIGHTLEFT |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5788 if (wp->w_p_rl) |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5789 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5790 --boguscols; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5791 --col; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5792 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5793 else |
|
15603
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
5794 # endif |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5795 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5796 ++boguscols; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5797 ++col; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5798 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5799 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5800 |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5801 # ifdef FEAT_RIGHTLEFT |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5802 if (wp->w_p_rl) |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5803 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5804 --boguscols; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5805 --col; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5806 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5807 else |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5808 # endif |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5809 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5810 ++boguscols; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5811 ++col; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5812 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5813 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5814 else |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5815 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5816 if (n_extra > 0) |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5817 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5818 vcol += n_extra; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5819 n_extra = 0; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5820 n_attr = 0; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5821 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5822 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5823 |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5824 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5825 #endif /* FEAT_CONCEAL */ |
| 7 | 5826 else |
| 5827 --n_skip; | |
| 5828 | |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
5829 /* Only advance the "vcol" when after the 'number' or 'relativenumber' |
|
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
5830 * column. */ |
| 1849 | 5831 if (draw_state > WL_NR |
| 7 | 5832 #ifdef FEAT_DIFF |
| 5833 && filler_todo <= 0 | |
| 5834 #endif | |
| 5835 ) | |
| 5836 ++vcol; | |
| 5837 | |
| 743 | 5838 #ifdef FEAT_SYN_HL |
| 5839 if (vcol_save_attr >= 0) | |
| 5840 char_attr = vcol_save_attr; | |
| 5841 #endif | |
| 5842 | |
| 7 | 5843 /* restore attributes after "predeces" in 'listchars' */ |
| 5844 if (draw_state > WL_NR && n_attr3 > 0 && --n_attr3 == 0) | |
| 5845 char_attr = saved_attr3; | |
| 5846 | |
| 5847 /* restore attributes after last 'listchars' or 'number' char */ | |
| 5848 if (n_attr > 0 && draw_state == WL_LINE && --n_attr == 0) | |
| 5849 char_attr = saved_attr2; | |
| 5850 | |
| 5851 /* | |
| 5852 * At end of screen line and there is more to come: Display the line | |
| 1378 | 5853 * so far. If there is no more to display it is caught above. |
| 7 | 5854 */ |
| 5855 if (( | |
| 5856 #ifdef FEAT_RIGHTLEFT | |
| 5857 wp->w_p_rl ? (col < 0) : | |
| 5858 #endif | |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
5859 (col >= wp->w_width)) |
| 7 | 5860 && (*ptr != NUL |
| 5861 #ifdef FEAT_DIFF | |
| 5862 || filler_todo > 0 | |
| 5863 #endif | |
| 2724 | 5864 || (wp->w_p_list && lcs_eol != NUL && p_extra != at_end_str) |
| 7 | 5865 || (n_extra != 0 && (c_extra != NUL || *p_extra != NUL))) |
| 5866 ) | |
| 5867 { | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5868 #ifdef FEAT_CONCEAL |
|
12513
3ca08bf99396
patch 8.0.1135: W_WINCOL() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12510
diff
changeset
|
5869 screen_line(screen_row, wp->w_wincol, col - boguscols, |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
5870 (int)wp->w_width, HAS_RIGHTLEFT(wp->w_p_rl)); |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5871 boguscols = 0; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5872 #else |
|
12513
3ca08bf99396
patch 8.0.1135: W_WINCOL() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12510
diff
changeset
|
5873 screen_line(screen_row, wp->w_wincol, col, |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
5874 (int)wp->w_width, HAS_RIGHTLEFT(wp->w_p_rl)); |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5875 #endif |
| 7 | 5876 ++row; |
| 5877 ++screen_row; | |
| 5878 | |
| 5879 /* When not wrapping and finished diff lines, or when displayed | |
| 5880 * '$' and highlighting until last column, break here. */ | |
| 5881 if ((!wp->w_p_wrap | |
| 5882 #ifdef FEAT_DIFF | |
| 5883 && filler_todo <= 0 | |
| 5884 #endif | |
| 5885 ) || lcs_eol_one == -1) | |
| 5886 break; | |
| 5887 | |
| 5888 /* When the window is too narrow draw all "@" lines. */ | |
| 5889 if (draw_state != WL_LINE | |
| 5890 #ifdef FEAT_DIFF | |
| 5891 && filler_todo <= 0 | |
| 5892 #endif | |
| 5893 ) | |
| 5894 { | |
| 5895 win_draw_end(wp, '@', ' ', row, wp->w_height, HLF_AT); | |
| 5896 draw_vsep_win(wp, row); | |
| 5897 row = endrow; | |
| 5898 } | |
| 5899 | |
| 5900 /* When line got too long for screen break here. */ | |
| 5901 if (row == endrow) | |
| 5902 { | |
| 5903 ++row; | |
| 5904 break; | |
| 5905 } | |
| 5906 | |
| 5907 if (screen_cur_row == screen_row - 1 | |
| 5908 #ifdef FEAT_DIFF | |
| 5909 && filler_todo <= 0 | |
| 5910 #endif | |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
5911 && wp->w_width == Columns) |
| 7 | 5912 { |
| 5913 /* Remember that the line wraps, used for modeless copy. */ | |
| 5914 LineWraps[screen_row - 1] = TRUE; | |
| 5915 | |
| 5916 /* | |
| 5917 * Special trick to make copy/paste of wrapped lines work with | |
| 5918 * xterm/screen: write an extra character beyond the end of | |
| 5919 * the line. This will work with all terminal types | |
| 5920 * (regardless of the xn,am settings). | |
| 5921 * Only do this on a fast tty. | |
| 5922 * Only do this if the cursor is on the current line | |
| 5923 * (something has been written in it). | |
| 5924 * Don't do this for the GUI. | |
| 5925 * Don't do this for double-width characters. | |
| 5926 * Don't do this for a window not at the right screen border. | |
| 5927 */ | |
| 5928 if (p_tf | |
| 5929 #ifdef FEAT_GUI | |
| 5930 && !gui.in_use | |
| 5931 #endif | |
| 5932 && !(has_mbyte | |
| 1378 | 5933 && ((*mb_off2cells)(LineOffset[screen_row], |
| 5934 LineOffset[screen_row] + screen_Columns) | |
| 5935 == 2 | |
| 7 | 5936 || (*mb_off2cells)(LineOffset[screen_row - 1] |
| 1378 | 5937 + (int)Columns - 2, |
| 5938 LineOffset[screen_row] + screen_Columns) | |
|
15603
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
5939 == 2))) |
| 7 | 5940 { |
| 5941 /* First make sure we are at the end of the screen line, | |
| 5942 * then output the same character again to let the | |
| 5943 * terminal know about the wrap. If the terminal doesn't | |
| 5944 * auto-wrap, we overwrite the character. */ | |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
5945 if (screen_cur_col != wp->w_width) |
| 7 | 5946 screen_char(LineOffset[screen_row - 1] |
| 5947 + (unsigned)Columns - 1, | |
| 5948 screen_row - 1, (int)(Columns - 1)); | |
| 5949 | |
| 5950 /* When there is a multi-byte character, just output a | |
| 5951 * space to keep it simple. */ | |
| 148 | 5952 if (has_mbyte && MB_BYTE2LEN(ScreenLines[LineOffset[ |
| 5953 screen_row - 1] + (Columns - 1)]) > 1) | |
| 7 | 5954 out_char(' '); |
| 5955 else | |
| 5956 out_char(ScreenLines[LineOffset[screen_row - 1] | |
| 5957 + (Columns - 1)]); | |
| 5958 /* force a redraw of the first char on the next line */ | |
| 5959 ScreenAttrs[LineOffset[screen_row]] = (sattr_T)-1; | |
| 5960 screen_start(); /* don't know where cursor is now */ | |
| 5961 } | |
| 5962 } | |
| 5963 | |
| 5964 col = 0; | |
| 5965 off = (unsigned)(current_ScreenLine - ScreenLines); | |
| 5966 #ifdef FEAT_RIGHTLEFT | |
| 5967 if (wp->w_p_rl) | |
| 5968 { | |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
5969 col = wp->w_width - 1; /* col is not used if breaking! */ |
| 7 | 5970 off += col; |
| 5971 } | |
| 5972 #endif | |
| 5973 | |
| 5974 /* reset the drawing state for the start of a wrapped line */ | |
| 5975 draw_state = WL_START; | |
| 5976 saved_n_extra = n_extra; | |
| 5977 saved_p_extra = p_extra; | |
| 5978 saved_c_extra = c_extra; | |
|
15502
bc17a9d37810
patch 8.1.0759: showing two characters for tab is limited
Bram Moolenaar <Bram@vim.org>
parents:
15436
diff
changeset
|
5979 saved_c_final = c_final; |
| 7 | 5980 saved_char_attr = char_attr; |
| 5981 n_extra = 0; | |
| 5982 lcs_prec_todo = lcs_prec; | |
| 5983 #ifdef FEAT_LINEBREAK | |
| 5984 # ifdef FEAT_DIFF | |
| 5985 if (filler_todo <= 0) | |
| 5986 # endif | |
| 5987 need_showbreak = TRUE; | |
| 5988 #endif | |
| 5989 #ifdef FEAT_DIFF | |
| 5990 --filler_todo; | |
| 5991 /* When the filler lines are actually below the last line of the | |
| 5992 * file, don't draw the line itself, break here. */ | |
| 5993 if (filler_todo == 0 && wp->w_botfill) | |
| 5994 break; | |
| 5995 #endif | |
| 5996 } | |
| 5997 | |
| 5998 } /* for every character in the line */ | |
| 5999 | |
| 743 | 6000 #ifdef FEAT_SPELL |
| 386 | 6001 /* After an empty line check first word for capital. */ |
| 6002 if (*skipwhite(line) == NUL) | |
| 6003 { | |
| 6004 capcol_lnum = lnum + 1; | |
| 6005 cap_col = 0; | |
| 6006 } | |
| 6007 #endif | |
|
15138
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
6008 #ifdef FEAT_TEXT_PROP |
|
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
6009 vim_free(text_props); |
|
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
6010 vim_free(text_prop_idxs); |
|
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
6011 #endif |
| 386 | 6012 |
|
10690
206ab11fa76e
patch 8.0.0235: memory leak in diff mode
Christian Brabandt <cb@256bit.org>
parents:
10538
diff
changeset
|
6013 vim_free(p_extra_free); |
| 7 | 6014 return row; |
| 6015 } | |
| 6016 | |
| 714 | 6017 /* |
| 6018 * Return if the composing characters at "off_from" and "off_to" differ. | |
|
2124
dc8a5699253b
updated for version 7.2.406
Bram Moolenaar <bram@zimbu.org>
parents:
2122
diff
changeset
|
6019 * Only to be used when ScreenLinesUC[off_from] != 0. |
| 714 | 6020 */ |
| 6021 static int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6022 comp_char_differs(int off_from, int off_to) |
| 714 | 6023 { |
| 6024 int i; | |
| 6025 | |
| 6026 for (i = 0; i < Screen_mco; ++i) | |
| 6027 { | |
| 6028 if (ScreenLinesC[i][off_from] != ScreenLinesC[i][off_to]) | |
| 6029 return TRUE; | |
| 6030 if (ScreenLinesC[i][off_from] == 0) | |
| 6031 break; | |
| 6032 } | |
| 6033 return FALSE; | |
| 6034 } | |
| 6035 | |
| 7 | 6036 /* |
| 6037 * Check whether the given character needs redrawing: | |
| 6038 * - the (first byte of the) character is different | |
| 6039 * - the attributes are different | |
| 6040 * - the character is multi-byte and the next byte is different | |
| 1616 | 6041 * - the character is two cells wide and the second cell differs. |
| 7 | 6042 */ |
| 6043 static int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6044 char_needs_redraw(int off_from, int off_to, int cols) |
| 7 | 6045 { |
| 6046 if (cols > 0 | |
| 6047 && ((ScreenLines[off_from] != ScreenLines[off_to] | |
| 6048 || ScreenAttrs[off_from] != ScreenAttrs[off_to]) | |
| 6049 || (enc_dbcs != 0 | |
| 6050 && MB_BYTE2LEN(ScreenLines[off_from]) > 1 | |
| 6051 && (enc_dbcs == DBCS_JPNU && ScreenLines[off_from] == 0x8e | |
| 6052 ? ScreenLines2[off_from] != ScreenLines2[off_to] | |
| 6053 : (cols > 1 && ScreenLines[off_from + 1] | |
| 6054 != ScreenLines[off_to + 1]))) | |
| 6055 || (enc_utf8 | |
| 6056 && (ScreenLinesUC[off_from] != ScreenLinesUC[off_to] | |
| 6057 || (ScreenLinesUC[off_from] != 0 | |
| 1616 | 6058 && comp_char_differs(off_from, off_to)) |
| 3759 | 6059 || ((*mb_off2cells)(off_from, off_from + cols) > 1 |
| 6060 && ScreenLines[off_from + 1] | |
|
15603
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
6061 != ScreenLines[off_to + 1]))))) |
| 7 | 6062 return TRUE; |
| 6063 return FALSE; | |
| 6064 } | |
| 6065 | |
|
11670
3b2afa2b77b3
patch 8.0.0718: output of job in terminal is not displayed
Christian Brabandt <cb@256bit.org>
parents:
11657
diff
changeset
|
6066 #if defined(FEAT_TERMINAL) || defined(PROTO) |
|
3b2afa2b77b3
patch 8.0.0718: output of job in terminal is not displayed
Christian Brabandt <cb@256bit.org>
parents:
11657
diff
changeset
|
6067 /* |
|
3b2afa2b77b3
patch 8.0.0718: output of job in terminal is not displayed
Christian Brabandt <cb@256bit.org>
parents:
11657
diff
changeset
|
6068 * Return the index in ScreenLines[] for the current screen line. |
|
3b2afa2b77b3
patch 8.0.0718: output of job in terminal is not displayed
Christian Brabandt <cb@256bit.org>
parents:
11657
diff
changeset
|
6069 */ |
|
3b2afa2b77b3
patch 8.0.0718: output of job in terminal is not displayed
Christian Brabandt <cb@256bit.org>
parents:
11657
diff
changeset
|
6070 int |
|
3b2afa2b77b3
patch 8.0.0718: output of job in terminal is not displayed
Christian Brabandt <cb@256bit.org>
parents:
11657
diff
changeset
|
6071 screen_get_current_line_off() |
|
3b2afa2b77b3
patch 8.0.0718: output of job in terminal is not displayed
Christian Brabandt <cb@256bit.org>
parents:
11657
diff
changeset
|
6072 { |
|
3b2afa2b77b3
patch 8.0.0718: output of job in terminal is not displayed
Christian Brabandt <cb@256bit.org>
parents:
11657
diff
changeset
|
6073 return (int)(current_ScreenLine - ScreenLines); |
|
3b2afa2b77b3
patch 8.0.0718: output of job in terminal is not displayed
Christian Brabandt <cb@256bit.org>
parents:
11657
diff
changeset
|
6074 } |
|
3b2afa2b77b3
patch 8.0.0718: output of job in terminal is not displayed
Christian Brabandt <cb@256bit.org>
parents:
11657
diff
changeset
|
6075 #endif |
|
3b2afa2b77b3
patch 8.0.0718: output of job in terminal is not displayed
Christian Brabandt <cb@256bit.org>
parents:
11657
diff
changeset
|
6076 |
| 7 | 6077 /* |
| 6078 * Move one "cooked" screen line to the screen, but only the characters that | |
| 6079 * have actually changed. Handle insert/delete character. | |
| 6080 * "coloff" gives the first column on the screen for this line. | |
| 6081 * "endcol" gives the columns where valid characters are. | |
| 6082 * "clear_width" is the width of the window. It's > 0 if the rest of the line | |
| 6083 * needs to be cleared, negative otherwise. | |
| 6084 * "rlflag" is TRUE in a rightleft window: | |
| 6085 * When TRUE and "clear_width" > 0, clear columns 0 to "endcol" | |
| 6086 * When FALSE and "clear_width" > 0, clear columns "endcol" to "clear_width" | |
| 6087 */ | |
|
11670
3b2afa2b77b3
patch 8.0.0718: output of job in terminal is not displayed
Christian Brabandt <cb@256bit.org>
parents:
11657
diff
changeset
|
6088 void |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6089 screen_line( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6090 int row, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6091 int coloff, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6092 int endcol, |
|
11670
3b2afa2b77b3
patch 8.0.0718: output of job in terminal is not displayed
Christian Brabandt <cb@256bit.org>
parents:
11657
diff
changeset
|
6093 int clear_width, |
|
3b2afa2b77b3
patch 8.0.0718: output of job in terminal is not displayed
Christian Brabandt <cb@256bit.org>
parents:
11657
diff
changeset
|
6094 int rlflag UNUSED) |
| 7 | 6095 { |
| 6096 unsigned off_from; | |
| 6097 unsigned off_to; | |
| 1378 | 6098 unsigned max_off_from; |
| 6099 unsigned max_off_to; | |
| 7 | 6100 int col = 0; |
| 6101 int hl; | |
| 6102 int force = FALSE; /* force update rest of the line */ | |
| 6103 int redraw_this /* bool: does character need redraw? */ | |
| 6104 #ifdef FEAT_GUI | |
| 6105 = TRUE /* For GUI when while-loop empty */ | |
| 6106 #endif | |
| 6107 ; | |
| 6108 int redraw_next; /* redraw_this for next character */ | |
| 6109 int clear_next = FALSE; | |
| 6110 int char_cells; /* 1: normal char */ | |
| 6111 /* 2: occupies two display cells */ | |
| 6112 # define CHAR_CELLS char_cells | |
| 6113 | |
| 3413 | 6114 /* Check for illegal row and col, just in case. */ |
| 6115 if (row >= Rows) | |
| 6116 row = Rows - 1; | |
| 6117 if (endcol > Columns) | |
| 6118 endcol = Columns; | |
| 6119 | |
| 7 | 6120 # ifdef FEAT_CLIPBOARD |
| 6121 clip_may_clear_selection(row, row); | |
| 6122 # endif | |
| 6123 | |
| 6124 off_from = (unsigned)(current_ScreenLine - ScreenLines); | |
| 6125 off_to = LineOffset[row] + coloff; | |
| 1378 | 6126 max_off_from = off_from + screen_Columns; |
| 6127 max_off_to = LineOffset[row] + screen_Columns; | |
| 7 | 6128 |
| 6129 #ifdef FEAT_RIGHTLEFT | |
| 6130 if (rlflag) | |
| 6131 { | |
| 6132 /* Clear rest first, because it's left of the text. */ | |
| 6133 if (clear_width > 0) | |
| 6134 { | |
| 6135 while (col <= endcol && ScreenLines[off_to] == ' ' | |
| 6136 && ScreenAttrs[off_to] == 0 | |
|
15603
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
6137 && (!enc_utf8 || ScreenLinesUC[off_to] == 0)) |
| 7 | 6138 { |
| 6139 ++off_to; | |
| 6140 ++col; | |
| 6141 } | |
| 6142 if (col <= endcol) | |
| 6143 screen_fill(row, row + 1, col + coloff, | |
| 6144 endcol + coloff + 1, ' ', ' ', 0); | |
| 6145 } | |
| 6146 col = endcol + 1; | |
| 6147 off_to = LineOffset[row] + col + coloff; | |
| 6148 off_from += col; | |
| 6149 endcol = (clear_width > 0 ? clear_width : -clear_width); | |
| 6150 } | |
| 6151 #endif /* FEAT_RIGHTLEFT */ | |
| 6152 | |
| 6153 redraw_next = char_needs_redraw(off_from, off_to, endcol - col); | |
| 6154 | |
| 6155 while (col < endcol) | |
| 6156 { | |
| 6157 if (has_mbyte && (col + 1 < endcol)) | |
| 1378 | 6158 char_cells = (*mb_off2cells)(off_from, max_off_from); |
| 7 | 6159 else |
| 6160 char_cells = 1; | |
| 6161 | |
| 6162 redraw_this = redraw_next; | |
| 6163 redraw_next = force || char_needs_redraw(off_from + CHAR_CELLS, | |
| 6164 off_to + CHAR_CELLS, endcol - col - CHAR_CELLS); | |
| 6165 | |
| 6166 #ifdef FEAT_GUI | |
| 6167 /* If the next character was bold, then redraw the current character to | |
| 6168 * remove any pixels that might have spilt over into us. This only | |
| 6169 * happens in the GUI. | |
| 6170 */ | |
| 6171 if (redraw_next && gui.in_use) | |
| 6172 { | |
| 6173 hl = ScreenAttrs[off_to + CHAR_CELLS]; | |
| 743 | 6174 if (hl > HL_ALL) |
| 6175 hl = syn_attr2attr(hl); | |
| 6176 if (hl & HL_BOLD) | |
| 7 | 6177 redraw_this = TRUE; |
| 6178 } | |
| 6179 #endif | |
| 6180 | |
| 6181 if (redraw_this) | |
| 6182 { | |
| 6183 /* | |
| 6184 * Special handling when 'xs' termcap flag set (hpterm): | |
| 6185 * Attributes for characters are stored at the position where the | |
| 6186 * cursor is when writing the highlighting code. The | |
| 6187 * start-highlighting code must be written with the cursor on the | |
| 6188 * first highlighted character. The stop-highlighting code must | |
| 6189 * be written with the cursor just after the last highlighted | |
| 6190 * character. | |
|
15034
6e4e0d43b20b
patch 8.1.0528: various typos in comments
Bram Moolenaar <Bram@vim.org>
parents:
14877
diff
changeset
|
6191 * Overwriting a character doesn't remove its highlighting. Need |
| 7 | 6192 * to clear the rest of the line, and force redrawing it |
| 6193 * completely. | |
| 6194 */ | |
| 6195 if ( p_wiv | |
| 6196 && !force | |
| 6197 #ifdef FEAT_GUI | |
| 6198 && !gui.in_use | |
| 6199 #endif | |
| 6200 && ScreenAttrs[off_to] != 0 | |
| 6201 && ScreenAttrs[off_from] != ScreenAttrs[off_to]) | |
| 6202 { | |
| 6203 /* | |
| 6204 * Need to remove highlighting attributes here. | |
| 6205 */ | |
| 6206 windgoto(row, col + coloff); | |
| 6207 out_str(T_CE); /* clear rest of this screen line */ | |
| 6208 screen_start(); /* don't know where cursor is now */ | |
| 6209 force = TRUE; /* force redraw of rest of the line */ | |
| 6210 redraw_next = TRUE; /* or else next char would miss out */ | |
| 6211 | |
| 6212 /* | |
| 6213 * If the previous character was highlighted, need to stop | |
| 6214 * highlighting at this character. | |
| 6215 */ | |
| 6216 if (col + coloff > 0 && ScreenAttrs[off_to - 1] != 0) | |
| 6217 { | |
| 6218 screen_attr = ScreenAttrs[off_to - 1]; | |
| 6219 term_windgoto(row, col + coloff); | |
| 6220 screen_stop_highlight(); | |
| 6221 } | |
| 6222 else | |
| 6223 screen_attr = 0; /* highlighting has stopped */ | |
| 6224 } | |
| 6225 if (enc_dbcs != 0) | |
| 6226 { | |
| 6227 /* Check if overwriting a double-byte with a single-byte or | |
| 6228 * the other way around requires another character to be | |
| 6229 * redrawn. For UTF-8 this isn't needed, because comparing | |
| 6230 * ScreenLinesUC[] is sufficient. */ | |
| 6231 if (char_cells == 1 | |
| 6232 && col + 1 < endcol | |
| 1378 | 6233 && (*mb_off2cells)(off_to, max_off_to) > 1) |
| 7 | 6234 { |
| 6235 /* Writing a single-cell character over a double-cell | |
| 6236 * character: need to redraw the next cell. */ | |
| 6237 ScreenLines[off_to + 1] = 0; | |
| 6238 redraw_next = TRUE; | |
| 6239 } | |
| 6240 else if (char_cells == 2 | |
| 6241 && col + 2 < endcol | |
| 1378 | 6242 && (*mb_off2cells)(off_to, max_off_to) == 1 |
| 6243 && (*mb_off2cells)(off_to + 1, max_off_to) > 1) | |
| 7 | 6244 { |
| 6245 /* Writing the second half of a double-cell character over | |
| 6246 * a double-cell character: need to redraw the second | |
| 6247 * cell. */ | |
| 6248 ScreenLines[off_to + 2] = 0; | |
| 6249 redraw_next = TRUE; | |
| 6250 } | |
| 6251 | |
| 6252 if (enc_dbcs == DBCS_JPNU) | |
| 6253 ScreenLines2[off_to] = ScreenLines2[off_from]; | |
| 6254 } | |
| 6255 /* When writing a single-width character over a double-width | |
| 6256 * character and at the end of the redrawn text, need to clear out | |
| 6257 * the right halve of the old character. | |
| 6258 * Also required when writing the right halve of a double-width | |
| 6259 * char over the left halve of an existing one. */ | |
| 6260 if (has_mbyte && col + char_cells == endcol | |
| 6261 && ((char_cells == 1 | |
| 1378 | 6262 && (*mb_off2cells)(off_to, max_off_to) > 1) |
| 7 | 6263 || (char_cells == 2 |
| 1378 | 6264 && (*mb_off2cells)(off_to, max_off_to) == 1 |
| 6265 && (*mb_off2cells)(off_to + 1, max_off_to) > 1))) | |
| 7 | 6266 clear_next = TRUE; |
| 6267 | |
| 6268 ScreenLines[off_to] = ScreenLines[off_from]; | |
| 6269 if (enc_utf8) | |
| 6270 { | |
| 6271 ScreenLinesUC[off_to] = ScreenLinesUC[off_from]; | |
| 6272 if (ScreenLinesUC[off_from] != 0) | |
| 6273 { | |
| 714 | 6274 int i; |
| 6275 | |
| 6276 for (i = 0; i < Screen_mco; ++i) | |
| 6277 ScreenLinesC[i][off_to] = ScreenLinesC[i][off_from]; | |
| 7 | 6278 } |
| 6279 } | |
| 6280 if (char_cells == 2) | |
| 6281 ScreenLines[off_to + 1] = ScreenLines[off_from + 1]; | |
| 6282 | |
| 6283 #if defined(FEAT_GUI) || defined(UNIX) | |
| 1843 | 6284 /* The bold trick makes a single column of pixels appear in the |
| 6285 * next character. When a bold character is removed, the next | |
| 7 | 6286 * character should be redrawn too. This happens for our own GUI |
| 6287 * and for some xterms. */ | |
| 6288 if ( | |
| 6289 # ifdef FEAT_GUI | |
| 6290 gui.in_use | |
| 6291 # endif | |
| 6292 # if defined(FEAT_GUI) && defined(UNIX) | |
| 6293 || | |
| 6294 # endif | |
| 6295 # ifdef UNIX | |
| 6296 term_is_xterm | |
| 6297 # endif | |
| 6298 ) | |
| 6299 { | |
| 6300 hl = ScreenAttrs[off_to]; | |
| 743 | 6301 if (hl > HL_ALL) |
| 6302 hl = syn_attr2attr(hl); | |
| 6303 if (hl & HL_BOLD) | |
| 7 | 6304 redraw_next = TRUE; |
| 6305 } | |
| 6306 #endif | |
| 6307 ScreenAttrs[off_to] = ScreenAttrs[off_from]; | |
|
15603
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
6308 |
| 819 | 6309 /* For simplicity set the attributes of second half of a |
| 6310 * double-wide character equal to the first half. */ | |
| 6311 if (char_cells == 2) | |
| 6312 ScreenAttrs[off_to + 1] = ScreenAttrs[off_from]; | |
| 6313 | |
| 7 | 6314 if (enc_dbcs != 0 && char_cells == 2) |
| 6315 screen_char_2(off_to, row, col + coloff); | |
| 6316 else | |
| 6317 screen_char(off_to, row, col + coloff); | |
| 6318 } | |
| 6319 else if ( p_wiv | |
| 6320 #ifdef FEAT_GUI | |
| 6321 && !gui.in_use | |
| 6322 #endif | |
| 6323 && col + coloff > 0) | |
| 6324 { | |
| 6325 if (ScreenAttrs[off_to] == ScreenAttrs[off_to - 1]) | |
| 6326 { | |
| 6327 /* | |
| 6328 * Don't output stop-highlight when moving the cursor, it will | |
| 6329 * stop the highlighting when it should continue. | |
| 6330 */ | |
| 6331 screen_attr = 0; | |
| 6332 } | |
| 6333 else if (screen_attr != 0) | |
| 6334 screen_stop_highlight(); | |
| 6335 } | |
| 6336 | |
| 6337 off_to += CHAR_CELLS; | |
| 6338 off_from += CHAR_CELLS; | |
| 6339 col += CHAR_CELLS; | |
| 6340 } | |
| 6341 | |
| 6342 if (clear_next) | |
| 6343 { | |
| 6344 /* Clear the second half of a double-wide character of which the left | |
| 6345 * half was overwritten with a single-wide character. */ | |
| 6346 ScreenLines[off_to] = ' '; | |
| 6347 if (enc_utf8) | |
| 6348 ScreenLinesUC[off_to] = 0; | |
| 6349 screen_char(off_to, row, col + coloff); | |
| 6350 } | |
| 6351 | |
| 6352 if (clear_width > 0 | |
| 6353 #ifdef FEAT_RIGHTLEFT | |
| 6354 && !rlflag | |
| 6355 #endif | |
| 6356 ) | |
| 6357 { | |
| 6358 #ifdef FEAT_GUI | |
| 6359 int startCol = col; | |
| 6360 #endif | |
| 6361 | |
| 6362 /* blank out the rest of the line */ | |
| 6363 while (col < clear_width && ScreenLines[off_to] == ' ' | |
| 6364 && ScreenAttrs[off_to] == 0 | |
|
15603
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
6365 && (!enc_utf8 || ScreenLinesUC[off_to] == 0)) |
| 7 | 6366 { |
| 6367 ++off_to; | |
| 6368 ++col; | |
| 6369 } | |
| 6370 if (col < clear_width) | |
| 6371 { | |
| 6372 #ifdef FEAT_GUI | |
| 6373 /* | |
| 6374 * In the GUI, clearing the rest of the line may leave pixels | |
| 6375 * behind if the first character cleared was bold. Some bold | |
| 6376 * fonts spill over the left. In this case we redraw the previous | |
| 6377 * character too. If we didn't skip any blanks above, then we | |
| 6378 * only redraw if the character wasn't already redrawn anyway. | |
| 6379 */ | |
| 996 | 6380 if (gui.in_use && (col > startCol || !redraw_this)) |
| 7 | 6381 { |
| 6382 hl = ScreenAttrs[off_to]; | |
| 6383 if (hl > HL_ALL || (hl & HL_BOLD)) | |
| 996 | 6384 { |
| 6385 int prev_cells = 1; | |
|
15603
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
6386 |
| 996 | 6387 if (enc_utf8) |
| 6388 /* for utf-8, ScreenLines[char_offset + 1] == 0 means | |
| 6389 * that its width is 2. */ | |
| 6390 prev_cells = ScreenLines[off_to - 1] == 0 ? 2 : 1; | |
| 6391 else if (enc_dbcs != 0) | |
| 6392 { | |
| 6393 /* find previous character by counting from first | |
| 6394 * column and get its width. */ | |
| 6395 unsigned off = LineOffset[row]; | |
| 1378 | 6396 unsigned max_off = LineOffset[row] + screen_Columns; |
| 996 | 6397 |
| 6398 while (off < off_to) | |
| 6399 { | |
| 1378 | 6400 prev_cells = (*mb_off2cells)(off, max_off); |
| 996 | 6401 off += prev_cells; |
| 6402 } | |
| 6403 } | |
| 6404 | |
| 6405 if (enc_dbcs != 0 && prev_cells > 1) | |
| 6406 screen_char_2(off_to - prev_cells, row, | |
| 6407 col + coloff - prev_cells); | |
| 6408 else | |
| 6409 screen_char(off_to - prev_cells, row, | |
| 6410 col + coloff - prev_cells); | |
| 6411 } | |
| 7 | 6412 } |
| 6413 #endif | |
| 6414 screen_fill(row, row + 1, col + coloff, clear_width + coloff, | |
| 6415 ' ', ' ', 0); | |
| 6416 off_to += clear_width - col; | |
| 6417 col = clear_width; | |
| 6418 } | |
| 6419 } | |
| 6420 | |
| 6421 if (clear_width > 0) | |
| 6422 { | |
| 6423 /* For a window that's left of another, draw the separator char. */ | |
| 6424 if (col + coloff < Columns) | |
| 6425 { | |
| 6426 int c; | |
| 6427 | |
| 6428 c = fillchar_vsep(&hl); | |
| 6477 | 6429 if (ScreenLines[off_to] != (schar_T)c |
| 714 | 6430 || (enc_utf8 && (int)ScreenLinesUC[off_to] |
| 6431 != (c >= 0x80 ? c : 0)) | |
| 7 | 6432 || ScreenAttrs[off_to] != hl) |
| 6433 { | |
| 6434 ScreenLines[off_to] = c; | |
| 6435 ScreenAttrs[off_to] = hl; | |
| 6436 if (enc_utf8) | |
| 6437 { | |
| 6438 if (c >= 0x80) | |
| 6439 { | |
| 6440 ScreenLinesUC[off_to] = c; | |
| 714 | 6441 ScreenLinesC[0][off_to] = 0; |
| 7 | 6442 } |
| 6443 else | |
| 6444 ScreenLinesUC[off_to] = 0; | |
| 6445 } | |
| 6446 screen_char(off_to, row, col + coloff); | |
| 6447 } | |
| 6448 } | |
| 6449 else | |
| 6450 LineWraps[row] = FALSE; | |
| 6451 } | |
| 6452 } | |
| 6453 | |
| 474 | 6454 #if defined(FEAT_RIGHTLEFT) || defined(PROTO) |
| 7 | 6455 /* |
| 474 | 6456 * Mirror text "str" for right-left displaying. |
| 6457 * Only works for single-byte characters (e.g., numbers). | |
| 7 | 6458 */ |
| 474 | 6459 void |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6460 rl_mirror(char_u *str) |
| 7 | 6461 { |
| 6462 char_u *p1, *p2; | |
| 6463 int t; | |
| 6464 | |
| 6465 for (p1 = str, p2 = str + STRLEN(str) - 1; p1 < p2; ++p1, --p2) | |
| 6466 { | |
| 6467 t = *p1; | |
| 6468 *p1 = *p2; | |
| 6469 *p2 = t; | |
| 6470 } | |
| 6471 } | |
| 6472 #endif | |
| 6473 | |
| 6474 /* | |
| 6475 * mark all status lines for redraw; used after first :cd | |
| 6476 */ | |
| 6477 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6478 status_redraw_all(void) |
| 7 | 6479 { |
| 6480 win_T *wp; | |
| 6481 | |
|
9649
fd9727ae3c49
commit https://github.com/vim/vim/commit/2932359000b2f918d5fade79ea4d124d5943cd07
Christian Brabandt <cb@256bit.org>
parents:
9645
diff
changeset
|
6482 FOR_ALL_WINDOWS(wp) |
| 7 | 6483 if (wp->w_status_height) |
| 6484 { | |
| 6485 wp->w_redr_status = TRUE; | |
| 6486 redraw_later(VALID); | |
| 6487 } | |
| 6488 } | |
| 6489 | |
| 6490 /* | |
| 6491 * mark all status lines of the current buffer for redraw | |
| 6492 */ | |
| 6493 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6494 status_redraw_curbuf(void) |
| 7 | 6495 { |
| 6496 win_T *wp; | |
| 6497 | |
|
9649
fd9727ae3c49
commit https://github.com/vim/vim/commit/2932359000b2f918d5fade79ea4d124d5943cd07
Christian Brabandt <cb@256bit.org>
parents:
9645
diff
changeset
|
6498 FOR_ALL_WINDOWS(wp) |
| 7 | 6499 if (wp->w_status_height != 0 && wp->w_buffer == curbuf) |
| 6500 { | |
| 6501 wp->w_redr_status = TRUE; | |
| 6502 redraw_later(VALID); | |
| 6503 } | |
| 6504 } | |
| 6505 | |
| 6506 /* | |
| 6507 * Redraw all status lines that need to be redrawn. | |
| 6508 */ | |
| 6509 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6510 redraw_statuslines(void) |
| 7 | 6511 { |
| 6512 win_T *wp; | |
| 6513 | |
|
9649
fd9727ae3c49
commit https://github.com/vim/vim/commit/2932359000b2f918d5fade79ea4d124d5943cd07
Christian Brabandt <cb@256bit.org>
parents:
9645
diff
changeset
|
6514 FOR_ALL_WINDOWS(wp) |
| 7 | 6515 if (wp->w_redr_status) |
|
14079
b5e43a048878
patch 8.1.0057: popup menu displayed wrong when using autocmd
Christian Brabandt <cb@256bit.org>
parents:
14004
diff
changeset
|
6516 win_redr_status(wp, FALSE); |
| 673 | 6517 if (redraw_tabline) |
| 677 | 6518 draw_tabline(); |
| 7 | 6519 } |
|
12477
68d7bc045dbe
patch 8.0.1118: FEAT_WINDOWS adds a lot of #ifdefs
Christian Brabandt <cb@256bit.org>
parents:
12441
diff
changeset
|
6520 |
|
68d7bc045dbe
patch 8.0.1118: FEAT_WINDOWS adds a lot of #ifdefs
Christian Brabandt <cb@256bit.org>
parents:
12441
diff
changeset
|
6521 #if defined(FEAT_WILDMENU) || defined(PROTO) |
| 7 | 6522 /* |
| 6523 * Redraw all status lines at the bottom of frame "frp". | |
| 6524 */ | |
| 6525 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6526 win_redraw_last_status(frame_T *frp) |
| 7 | 6527 { |
| 6528 if (frp->fr_layout == FR_LEAF) | |
| 6529 frp->fr_win->w_redr_status = TRUE; | |
| 6530 else if (frp->fr_layout == FR_ROW) | |
| 6531 { | |
|
15227
95678f27a704
patch 8.1.0623: iterating through window frames is repeated
Bram Moolenaar <Bram@vim.org>
parents:
15138
diff
changeset
|
6532 FOR_ALL_FRAMES(frp, frp->fr_child) |
| 7 | 6533 win_redraw_last_status(frp); |
| 6534 } | |
| 6535 else /* frp->fr_layout == FR_COL */ | |
| 6536 { | |
| 6537 frp = frp->fr_child; | |
| 6538 while (frp->fr_next != NULL) | |
| 6539 frp = frp->fr_next; | |
| 6540 win_redraw_last_status(frp); | |
| 6541 } | |
| 6542 } | |
| 6543 #endif | |
| 6544 | |
| 6545 /* | |
| 6546 * Draw the verticap separator right of window "wp" starting with line "row". | |
| 6547 */ | |
| 6548 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6549 draw_vsep_win(win_T *wp, int row) |
| 7 | 6550 { |
| 6551 int hl; | |
| 6552 int c; | |
| 6553 | |
| 6554 if (wp->w_vsep_width) | |
| 6555 { | |
| 6556 /* draw the vertical separator right of this window */ | |
| 6557 c = fillchar_vsep(&hl); | |
| 6558 screen_fill(W_WINROW(wp) + row, W_WINROW(wp) + wp->w_height, | |
| 6559 W_ENDCOL(wp), W_ENDCOL(wp) + 1, | |
| 6560 c, ' ', hl); | |
| 6561 } | |
| 6562 } | |
| 6563 | |
| 6564 #ifdef FEAT_WILDMENU | |
|
7805
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7697
diff
changeset
|
6565 static int skip_status_match_char(expand_T *xp, char_u *s); |
| 7 | 6566 |
| 6567 /* | |
| 1378 | 6568 * Get the length of an item as it will be shown in the status line. |
| 7 | 6569 */ |
| 6570 static int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6571 status_match_len(expand_T *xp, char_u *s) |
| 7 | 6572 { |
| 6573 int len = 0; | |
| 6574 | |
| 6575 #ifdef FEAT_MENU | |
| 6576 int emenu = (xp->xp_context == EXPAND_MENUS | |
| 6577 || xp->xp_context == EXPAND_MENUNAMES); | |
| 6578 | |
| 6579 /* Check for menu separators - replace with '|'. */ | |
| 6580 if (emenu && menu_is_separator(s)) | |
| 6581 return 1; | |
| 6582 #endif | |
| 6583 | |
| 6584 while (*s != NUL) | |
| 6585 { | |
| 1685 | 6586 s += skip_status_match_char(xp, s); |
| 42 | 6587 len += ptr2cells(s); |
|
11127
506f5d8b7d8b
patch 8.0.0451: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11121
diff
changeset
|
6588 MB_PTR_ADV(s); |
| 7 | 6589 } |
| 6590 | |
| 6591 return len; | |
| 6592 } | |
| 6593 | |
| 6594 /* | |
| 1685 | 6595 * Return the number of characters that should be skipped in a status match. |
| 277 | 6596 * These are backslashes used for escaping. Do show backslashes in help tags. |
| 6597 */ | |
| 6598 static int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6599 skip_status_match_char(expand_T *xp, char_u *s) |
| 277 | 6600 { |
| 1685 | 6601 if ((rem_backslash(s) && xp->xp_context != EXPAND_HELP) |
| 277 | 6602 #ifdef FEAT_MENU |
| 6603 || ((xp->xp_context == EXPAND_MENUS | |
| 6604 || xp->xp_context == EXPAND_MENUNAMES) | |
| 6605 && (s[0] == '\t' || (s[0] == '\\' && s[1] != NUL))) | |
| 6606 #endif | |
| 1685 | 6607 ) |
| 6608 { | |
| 6609 #ifndef BACKSLASH_IN_FILENAME | |
| 6610 if (xp->xp_shell && csh_like_shell() && s[1] == '\\' && s[2] == '!') | |
| 6611 return 2; | |
| 6612 #endif | |
| 6613 return 1; | |
| 6614 } | |
| 6615 return 0; | |
| 277 | 6616 } |
| 6617 | |
| 6618 /* | |
| 7 | 6619 * Show wildchar matches in the status line. |
| 6620 * Show at least the "match" item. | |
| 6621 * We start at item 'first_match' in the list and show all matches that fit. | |
| 6622 * | |
| 6623 * If inversion is possible we use it. Else '=' characters are used. | |
| 6624 */ | |
| 6625 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6626 win_redr_status_matches( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6627 expand_T *xp, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6628 int num_matches, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6629 char_u **matches, /* list of matches */ |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6630 int match, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6631 int showtail) |
| 7 | 6632 { |
| 6633 #define L_MATCH(m) (showtail ? sm_gettail(matches[m]) : matches[m]) | |
| 6634 int row; | |
| 6635 char_u *buf; | |
| 6636 int len; | |
| 1378 | 6637 int clen; /* length in screen cells */ |
| 7 | 6638 int fillchar; |
| 6639 int attr; | |
| 6640 int i; | |
| 6641 int highlight = TRUE; | |
| 6642 char_u *selstart = NULL; | |
| 6643 int selstart_col = 0; | |
| 6644 char_u *selend = NULL; | |
| 6645 static int first_match = 0; | |
| 6646 int add_left = FALSE; | |
| 6647 char_u *s; | |
| 6648 #ifdef FEAT_MENU | |
| 6649 int emenu; | |
| 6650 #endif | |
| 6651 int l; | |
| 6652 | |
| 6653 if (matches == NULL) /* interrupted completion? */ | |
| 6654 return; | |
| 6655 | |
| 39 | 6656 if (has_mbyte) |
| 6657 buf = alloc((unsigned)Columns * MB_MAXBYTES + 1); | |
| 6658 else | |
| 6659 buf = alloc((unsigned)Columns + 1); | |
| 7 | 6660 if (buf == NULL) |
| 6661 return; | |
| 6662 | |
| 6663 if (match == -1) /* don't show match but original text */ | |
| 6664 { | |
| 6665 match = 0; | |
| 6666 highlight = FALSE; | |
| 6667 } | |
| 6668 /* count 1 for the ending ">" */ | |
| 6669 clen = status_match_len(xp, L_MATCH(match)) + 3; | |
| 6670 if (match == 0) | |
| 6671 first_match = 0; | |
| 6672 else if (match < first_match) | |
| 6673 { | |
| 6674 /* jumping left, as far as we can go */ | |
| 6675 first_match = match; | |
| 6676 add_left = TRUE; | |
| 6677 } | |
| 6678 else | |
| 6679 { | |
| 6680 /* check if match fits on the screen */ | |
| 6681 for (i = first_match; i < match; ++i) | |
| 6682 clen += status_match_len(xp, L_MATCH(i)) + 2; | |
| 6683 if (first_match > 0) | |
| 6684 clen += 2; | |
| 6685 /* jumping right, put match at the left */ | |
| 6686 if ((long)clen > Columns) | |
| 6687 { | |
| 6688 first_match = match; | |
| 6689 /* if showing the last match, we can add some on the left */ | |
| 6690 clen = 2; | |
| 6691 for (i = match; i < num_matches; ++i) | |
| 6692 { | |
| 6693 clen += status_match_len(xp, L_MATCH(i)) + 2; | |
| 6694 if ((long)clen >= Columns) | |
| 6695 break; | |
| 6696 } | |
| 6697 if (i == num_matches) | |
| 6698 add_left = TRUE; | |
| 6699 } | |
| 6700 } | |
| 6701 if (add_left) | |
| 6702 while (first_match > 0) | |
| 6703 { | |
| 6704 clen += status_match_len(xp, L_MATCH(first_match - 1)) + 2; | |
| 6705 if ((long)clen >= Columns) | |
| 6706 break; | |
| 6707 --first_match; | |
| 6708 } | |
| 6709 | |
|
11890
318ae82d8ba4
patch 8.0.0825: not easy to see that a window is a terminal window
Christian Brabandt <cb@256bit.org>
parents:
11866
diff
changeset
|
6710 fillchar = fillchar_status(&attr, curwin); |
| 7 | 6711 |
| 6712 if (first_match == 0) | |
| 6713 { | |
| 6714 *buf = NUL; | |
| 6715 len = 0; | |
| 6716 } | |
| 6717 else | |
| 6718 { | |
| 6719 STRCPY(buf, "< "); | |
| 6720 len = 2; | |
| 6721 } | |
| 6722 clen = len; | |
| 6723 | |
| 6724 i = first_match; | |
| 6725 while ((long)(clen + status_match_len(xp, L_MATCH(i)) + 2) < Columns) | |
| 6726 { | |
| 6727 if (i == match) | |
| 6728 { | |
| 6729 selstart = buf + len; | |
| 6730 selstart_col = clen; | |
| 6731 } | |
| 6732 | |
| 6733 s = L_MATCH(i); | |
| 6734 /* Check for menu separators - replace with '|' */ | |
| 6735 #ifdef FEAT_MENU | |
| 6736 emenu = (xp->xp_context == EXPAND_MENUS | |
| 6737 || xp->xp_context == EXPAND_MENUNAMES); | |
| 6738 if (emenu && menu_is_separator(s)) | |
| 6739 { | |
| 6740 STRCPY(buf + len, transchar('|')); | |
| 6741 l = (int)STRLEN(buf + len); | |
| 6742 len += l; | |
| 6743 clen += l; | |
| 6744 } | |
| 6745 else | |
| 6746 #endif | |
| 6747 for ( ; *s != NUL; ++s) | |
| 6748 { | |
| 1685 | 6749 s += skip_status_match_char(xp, s); |
| 7 | 6750 clen += ptr2cells(s); |
| 474 | 6751 if (has_mbyte && (l = (*mb_ptr2len)(s)) > 1) |
| 7 | 6752 { |
| 6753 STRNCPY(buf + len, s, l); | |
| 6754 s += l - 1; | |
| 6755 len += l; | |
| 6756 } | |
| 6757 else | |
| 6758 { | |
| 6759 STRCPY(buf + len, transchar_byte(*s)); | |
| 6760 len += (int)STRLEN(buf + len); | |
| 6761 } | |
| 6762 } | |
| 6763 if (i == match) | |
| 6764 selend = buf + len; | |
| 6765 | |
| 6766 *(buf + len++) = ' '; | |
| 6767 *(buf + len++) = ' '; | |
| 6768 clen += 2; | |
| 6769 if (++i == num_matches) | |
| 6770 break; | |
| 6771 } | |
| 6772 | |
| 6773 if (i != num_matches) | |
| 6774 { | |
| 6775 *(buf + len++) = '>'; | |
| 6776 ++clen; | |
| 6777 } | |
| 6778 | |
| 6779 buf[len] = NUL; | |
| 6780 | |
| 6781 row = cmdline_row - 1; | |
| 6782 if (row >= 0) | |
| 6783 { | |
| 6784 if (wild_menu_showing == 0) | |
| 6785 { | |
| 6786 if (msg_scrolled > 0) | |
| 6787 { | |
| 6788 /* Put the wildmenu just above the command line. If there is | |
| 6789 * no room, scroll the screen one line up. */ | |
| 6790 if (cmdline_row == Rows - 1) | |
| 6791 { | |
|
12152
69af108df70e
patch 8.0.0956: scrolling in a terminal window has flicker
Christian Brabandt <cb@256bit.org>
parents:
12122
diff
changeset
|
6792 screen_del_lines(0, 0, 1, (int)Rows, TRUE, 0, NULL); |
| 7 | 6793 ++msg_scrolled; |
| 6794 } | |
| 6795 else | |
| 6796 { | |
| 6797 ++cmdline_row; | |
| 6798 ++row; | |
| 6799 } | |
| 6800 wild_menu_showing = WM_SCROLLED; | |
| 6801 } | |
| 6802 else | |
| 6803 { | |
| 6804 /* Create status line if needed by setting 'laststatus' to 2. | |
| 6805 * Set 'winminheight' to zero to avoid that the window is | |
| 6806 * resized. */ | |
| 6807 if (lastwin->w_status_height == 0) | |
| 6808 { | |
| 6809 save_p_ls = p_ls; | |
| 6810 save_p_wmh = p_wmh; | |
| 6811 p_ls = 2; | |
| 6812 p_wmh = 0; | |
| 6813 last_status(FALSE); | |
| 6814 } | |
| 6815 wild_menu_showing = WM_SHOWN; | |
| 6816 } | |
| 6817 } | |
| 6818 | |
| 6819 screen_puts(buf, row, 0, attr); | |
| 6820 if (selstart != NULL && highlight) | |
| 6821 { | |
| 6822 *selend = NUL; | |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
6823 screen_puts(selstart, row, selstart_col, HL_ATTR(HLF_WM)); |
| 7 | 6824 } |
| 6825 | |
| 6826 screen_fill(row, row + 1, clen, (int)Columns, fillchar, fillchar, attr); | |
| 6827 } | |
| 6828 | |
| 6829 win_redraw_last_status(topframe); | |
| 6830 vim_free(buf); | |
| 6831 } | |
| 6832 #endif | |
| 6833 | |
| 6834 /* | |
| 6835 * Redraw the status line of window wp. | |
| 6836 * | |
| 6837 * If inversion is possible we use it. Else '=' characters are used. | |
|
14079
b5e43a048878
patch 8.1.0057: popup menu displayed wrong when using autocmd
Christian Brabandt <cb@256bit.org>
parents:
14004
diff
changeset
|
6838 * If "ignore_pum" is TRUE, also redraw statusline when the popup menu is |
|
b5e43a048878
patch 8.1.0057: popup menu displayed wrong when using autocmd
Christian Brabandt <cb@256bit.org>
parents:
14004
diff
changeset
|
6839 * displayed. |
|
b5e43a048878
patch 8.1.0057: popup menu displayed wrong when using autocmd
Christian Brabandt <cb@256bit.org>
parents:
14004
diff
changeset
|
6840 */ |
|
b5e43a048878
patch 8.1.0057: popup menu displayed wrong when using autocmd
Christian Brabandt <cb@256bit.org>
parents:
14004
diff
changeset
|
6841 static void |
|
14191
ec39f281e3e8
patch 8.1.0113: compiler warning for unused variable
Christian Brabandt <cb@256bit.org>
parents:
14175
diff
changeset
|
6842 win_redr_status(win_T *wp, int ignore_pum UNUSED) |
| 7 | 6843 { |
| 6844 int row; | |
| 6845 char_u *p; | |
| 6846 int len; | |
| 6847 int fillchar; | |
| 6848 int attr; | |
| 6849 int this_ru_col; | |
| 1910 | 6850 static int busy = FALSE; |
| 6851 | |
| 6852 /* It's possible to get here recursively when 'statusline' (indirectly) | |
| 6853 * invokes ":redrawstatus". Simply ignore the call then. */ | |
| 6854 if (busy) | |
| 6855 return; | |
| 6856 busy = TRUE; | |
| 7 | 6857 |
| 6858 wp->w_redr_status = FALSE; | |
| 6859 if (wp->w_status_height == 0) | |
| 6860 { | |
| 6861 /* no status line, can only be last window */ | |
| 6862 redraw_cmdline = TRUE; | |
| 6863 } | |
| 540 | 6864 else if (!redrawing() |
| 6865 #ifdef FEAT_INS_EXPAND | |
|
14079
b5e43a048878
patch 8.1.0057: popup menu displayed wrong when using autocmd
Christian Brabandt <cb@256bit.org>
parents:
14004
diff
changeset
|
6866 // don't update status line when popup menu is visible and may be |
|
b5e43a048878
patch 8.1.0057: popup menu displayed wrong when using autocmd
Christian Brabandt <cb@256bit.org>
parents:
14004
diff
changeset
|
6867 // drawn over it, unless it will be redrawn later |
|
b5e43a048878
patch 8.1.0057: popup menu displayed wrong when using autocmd
Christian Brabandt <cb@256bit.org>
parents:
14004
diff
changeset
|
6868 || (!ignore_pum && pum_visible()) |
| 540 | 6869 #endif |
| 6870 ) | |
| 7 | 6871 { |
| 6872 /* Don't redraw right now, do it later. */ | |
| 6873 wp->w_redr_status = TRUE; | |
| 6874 } | |
| 6875 #ifdef FEAT_STL_OPT | |
| 40 | 6876 else if (*p_stl != NUL || *wp->w_p_stl != NUL) |
| 7 | 6877 { |
| 6878 /* redraw custom status line */ | |
| 1983 | 6879 redraw_custom_statusline(wp); |
| 7 | 6880 } |
| 6881 #endif | |
| 6882 else | |
| 6883 { | |
|
11890
318ae82d8ba4
patch 8.0.0825: not easy to see that a window is a terminal window
Christian Brabandt <cb@256bit.org>
parents:
11866
diff
changeset
|
6884 fillchar = fillchar_status(&attr, wp); |
| 7 | 6885 |
| 685 | 6886 get_trans_bufname(wp->w_buffer); |
| 7 | 6887 p = NameBuff; |
| 6888 len = (int)STRLEN(p); | |
| 6889 | |
|
11834
0cfe4a07c2ad
patch 8.0.0797: finished job in terminal window is not handled
Christian Brabandt <cb@256bit.org>
parents:
11698
diff
changeset
|
6890 if (bt_help(wp->w_buffer) |
| 7 | 6891 #ifdef FEAT_QUICKFIX |
| 6892 || wp->w_p_pvw | |
| 6893 #endif | |
| 6894 || bufIsChanged(wp->w_buffer) | |
| 6895 || wp->w_buffer->b_p_ro) | |
| 6896 *(p + len++) = ' '; | |
|
11834
0cfe4a07c2ad
patch 8.0.0797: finished job in terminal window is not handled
Christian Brabandt <cb@256bit.org>
parents:
11698
diff
changeset
|
6897 if (bt_help(wp->w_buffer)) |
| 7 | 6898 { |
| 809 | 6899 STRCPY(p + len, _("[Help]")); |
| 7 | 6900 len += (int)STRLEN(p + len); |
| 6901 } | |
| 6902 #ifdef FEAT_QUICKFIX | |
| 6903 if (wp->w_p_pvw) | |
| 6904 { | |
| 6905 STRCPY(p + len, _("[Preview]")); | |
| 6906 len += (int)STRLEN(p + len); | |
| 6907 } | |
| 6908 #endif | |
|
11981
cf36b424ea03
patch 8.0.0871: status line for a terminal window always has "[+]".
Christian Brabandt <cb@256bit.org>
parents:
11915
diff
changeset
|
6909 if (bufIsChanged(wp->w_buffer) |
|
cf36b424ea03
patch 8.0.0871: status line for a terminal window always has "[+]".
Christian Brabandt <cb@256bit.org>
parents:
11915
diff
changeset
|
6910 #ifdef FEAT_TERMINAL |
|
cf36b424ea03
patch 8.0.0871: status line for a terminal window always has "[+]".
Christian Brabandt <cb@256bit.org>
parents:
11915
diff
changeset
|
6911 && !bt_terminal(wp->w_buffer) |
|
cf36b424ea03
patch 8.0.0871: status line for a terminal window always has "[+]".
Christian Brabandt <cb@256bit.org>
parents:
11915
diff
changeset
|
6912 #endif |
|
cf36b424ea03
patch 8.0.0871: status line for a terminal window always has "[+]".
Christian Brabandt <cb@256bit.org>
parents:
11915
diff
changeset
|
6913 ) |
| 7 | 6914 { |
| 6915 STRCPY(p + len, "[+]"); | |
| 6916 len += 3; | |
| 6917 } | |
| 6918 if (wp->w_buffer->b_p_ro) | |
| 6919 { | |
|
4795
8360a59aa04b
updated for version 7.3.1144
Bram Moolenaar <bram@vim.org>
parents:
4736
diff
changeset
|
6920 STRCPY(p + len, _("[RO]")); |
|
10928
5b3e671ef6a2
patch 8.0.0353: if [RO] is translated it may be truncated
Christian Brabandt <cb@256bit.org>
parents:
10801
diff
changeset
|
6921 len += (int)STRLEN(p + len); |
| 7 | 6922 } |
| 6923 | |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
6924 this_ru_col = ru_col - (Columns - wp->w_width); |
|
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
6925 if (this_ru_col < (wp->w_width + 1) / 2) |
|
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
6926 this_ru_col = (wp->w_width + 1) / 2; |
| 7 | 6927 if (this_ru_col <= 1) |
| 6928 { | |
| 6929 p = (char_u *)"<"; /* No room for file name! */ | |
| 6930 len = 1; | |
| 6931 } | |
|
15603
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
6932 else if (has_mbyte) |
|
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
6933 { |
|
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
6934 int clen = 0, i; |
|
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
6935 |
|
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
6936 /* Count total number of display cells. */ |
|
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
6937 clen = mb_string2cells(p, -1); |
|
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
6938 |
|
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
6939 /* Find first character that will fit. |
|
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
6940 * Going from start to end is much faster for DBCS. */ |
|
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
6941 for (i = 0; p[i] != NUL && clen >= this_ru_col - 1; |
|
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
6942 i += (*mb_ptr2len)(p + i)) |
|
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
6943 clen -= (*mb_ptr2cells)(p + i); |
|
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
6944 len = clen; |
|
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
6945 if (i > 0) |
|
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
6946 { |
|
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
6947 p = p + i - 1; |
| 7 | 6948 *p = '<'; |
|
15603
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
6949 ++len; |
|
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
6950 } |
|
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
6951 |
|
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
6952 } |
|
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
6953 else if (len > this_ru_col - 1) |
|
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
6954 { |
|
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
6955 p += len - (this_ru_col - 1); |
|
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
6956 *p = '<'; |
|
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
6957 len = this_ru_col - 1; |
|
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
6958 } |
| 7 | 6959 |
| 6960 row = W_WINROW(wp) + wp->w_height; | |
|
12513
3ca08bf99396
patch 8.0.1135: W_WINCOL() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12510
diff
changeset
|
6961 screen_puts(p, row, wp->w_wincol, attr); |
|
3ca08bf99396
patch 8.0.1135: W_WINCOL() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12510
diff
changeset
|
6962 screen_fill(row, row + 1, len + wp->w_wincol, |
|
3ca08bf99396
patch 8.0.1135: W_WINCOL() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12510
diff
changeset
|
6963 this_ru_col + wp->w_wincol, fillchar, fillchar, attr); |
| 7 | 6964 |
|
9645
123d3c102035
commit https://github.com/vim/vim/commit/73ac0c4281a3606651604a3cbcc334bfb3859a87
Christian Brabandt <cb@256bit.org>
parents:
9489
diff
changeset
|
6965 if (get_keymap_str(wp, (char_u *)"<%s>", NameBuff, MAXPATHL) |
| 7 | 6966 && (int)(this_ru_col - len) > (int)(STRLEN(NameBuff) + 1)) |
| 6967 screen_puts(NameBuff, row, (int)(this_ru_col - STRLEN(NameBuff) | |
|
12513
3ca08bf99396
patch 8.0.1135: W_WINCOL() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12510
diff
changeset
|
6968 - 1 + wp->w_wincol), attr); |
| 7 | 6969 |
| 6970 #ifdef FEAT_CMDL_INFO | |
|
14089
ae53a9274f50
patch 8.1.0062: popup menu broken if a callback changes the window layout
Christian Brabandt <cb@256bit.org>
parents:
14081
diff
changeset
|
6971 win_redr_ruler(wp, TRUE, ignore_pum); |
| 7 | 6972 #endif |
| 6973 } | |
| 6974 | |
| 6975 /* | |
| 6976 * May need to draw the character below the vertical separator. | |
| 6977 */ | |
| 6978 if (wp->w_vsep_width != 0 && wp->w_status_height != 0 && redrawing()) | |
| 6979 { | |
| 6980 if (stl_connected(wp)) | |
|
11890
318ae82d8ba4
patch 8.0.0825: not easy to see that a window is a terminal window
Christian Brabandt <cb@256bit.org>
parents:
11866
diff
changeset
|
6981 fillchar = fillchar_status(&attr, wp); |
| 7 | 6982 else |
| 6983 fillchar = fillchar_vsep(&attr); | |
| 6984 screen_putchar(fillchar, W_WINROW(wp) + wp->w_height, W_ENDCOL(wp), | |
| 6985 attr); | |
| 6986 } | |
| 1910 | 6987 busy = FALSE; |
| 7 | 6988 } |
| 6989 | |
| 680 | 6990 #ifdef FEAT_STL_OPT |
| 6991 /* | |
| 6992 * Redraw the status line according to 'statusline' and take care of any | |
| 6993 * errors encountered. | |
| 6994 */ | |
| 6995 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6996 redraw_custom_statusline(win_T *wp) |
| 680 | 6997 { |
| 1983 | 6998 static int entered = FALSE; |
|
8847
470ea7526cc6
commit https://github.com/vim/vim/commit/a742e084b677f76c67e9e52c4f9fb9ab24002e20
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
6999 int saved_did_emsg = did_emsg; |
| 1983 | 7000 |
| 7001 /* When called recursively return. This can happen when the statusline | |
| 7002 * contains an expression that triggers a redraw. */ | |
| 7003 if (entered) | |
| 7004 return; | |
| 7005 entered = TRUE; | |
| 680 | 7006 |
|
8847
470ea7526cc6
commit https://github.com/vim/vim/commit/a742e084b677f76c67e9e52c4f9fb9ab24002e20
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
7007 did_emsg = FALSE; |
| 680 | 7008 win_redr_custom(wp, FALSE); |
|
8847
470ea7526cc6
commit https://github.com/vim/vim/commit/a742e084b677f76c67e9e52c4f9fb9ab24002e20
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
7009 if (did_emsg) |
| 1983 | 7010 { |
| 7011 /* When there is an error disable the statusline, otherwise the | |
| 7012 * display is messed up with errors and a redraw triggers the problem | |
| 7013 * again and again. */ | |
| 680 | 7014 set_string_option_direct((char_u *)"statusline", -1, |
| 7015 (char_u *)"", OPT_FREE | (*wp->w_p_stl != NUL | |
| 694 | 7016 ? OPT_LOCAL : OPT_GLOBAL), SID_ERROR); |
| 1983 | 7017 } |
|
8847
470ea7526cc6
commit https://github.com/vim/vim/commit/a742e084b677f76c67e9e52c4f9fb9ab24002e20
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
7018 did_emsg |= saved_did_emsg; |
| 1983 | 7019 entered = FALSE; |
| 680 | 7020 } |
| 7021 #endif | |
| 7022 | |
| 7 | 7023 /* |
| 7024 * Return TRUE if the status line of window "wp" is connected to the status | |
| 7025 * line of the window right of it. If not, then it's a vertical separator. | |
| 7026 * Only call if (wp->w_vsep_width != 0). | |
| 7027 */ | |
| 7028 int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7029 stl_connected(win_T *wp) |
| 7 | 7030 { |
| 7031 frame_T *fr; | |
| 7032 | |
| 7033 fr = wp->w_frame; | |
| 7034 while (fr->fr_parent != NULL) | |
| 7035 { | |
| 7036 if (fr->fr_parent->fr_layout == FR_COL) | |
| 7037 { | |
| 7038 if (fr->fr_next != NULL) | |
| 7039 break; | |
| 7040 } | |
| 7041 else | |
| 7042 { | |
| 7043 if (fr->fr_next != NULL) | |
| 7044 return TRUE; | |
| 7045 } | |
| 7046 fr = fr->fr_parent; | |
| 7047 } | |
| 7048 return FALSE; | |
| 7049 } | |
| 7050 | |
|
12477
68d7bc045dbe
patch 8.0.1118: FEAT_WINDOWS adds a lot of #ifdefs
Christian Brabandt <cb@256bit.org>
parents:
12441
diff
changeset
|
7051 |
| 7 | 7052 /* |
| 7053 * Get the value to show for the language mappings, active 'keymap'. | |
| 7054 */ | |
| 7055 int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7056 get_keymap_str( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7057 win_T *wp, |
|
9645
123d3c102035
commit https://github.com/vim/vim/commit/73ac0c4281a3606651604a3cbcc334bfb3859a87
Christian Brabandt <cb@256bit.org>
parents:
9489
diff
changeset
|
7058 char_u *fmt, /* format string containing one %s item */ |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7059 char_u *buf, /* buffer for the result */ |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7060 int len) /* length of buffer */ |
| 7 | 7061 { |
| 7062 char_u *p; | |
| 7063 | |
| 7064 if (wp->w_buffer->b_p_iminsert != B_IMODE_LMAP) | |
| 7065 return FALSE; | |
| 7066 | |
| 7067 { | |
| 7068 #ifdef FEAT_EVAL | |
| 7069 buf_T *old_curbuf = curbuf; | |
| 7070 win_T *old_curwin = curwin; | |
| 7071 char_u *s; | |
| 7072 | |
| 7073 curbuf = wp->w_buffer; | |
| 7074 curwin = wp; | |
| 7075 STRCPY(buf, "b:keymap_name"); /* must be writable */ | |
| 7076 ++emsg_skip; | |
| 714 | 7077 s = p = eval_to_string(buf, NULL, FALSE); |
| 7 | 7078 --emsg_skip; |
| 7079 curbuf = old_curbuf; | |
| 7080 curwin = old_curwin; | |
| 7081 if (p == NULL || *p == NUL) | |
| 7082 #endif | |
| 7083 { | |
| 7084 #ifdef FEAT_KEYMAP | |
| 7085 if (wp->w_buffer->b_kmap_state & KEYMAP_LOADED) | |
| 7086 p = wp->w_buffer->b_p_keymap; | |
| 7087 else | |
| 7088 #endif | |
| 7089 p = (char_u *)"lang"; | |
| 7090 } | |
|
9645
123d3c102035
commit https://github.com/vim/vim/commit/73ac0c4281a3606651604a3cbcc334bfb3859a87
Christian Brabandt <cb@256bit.org>
parents:
9489
diff
changeset
|
7091 if (vim_snprintf((char *)buf, len, (char *)fmt, p) > len - 1) |
| 7 | 7092 buf[0] = NUL; |
| 7093 #ifdef FEAT_EVAL | |
| 7094 vim_free(s); | |
| 7095 #endif | |
| 7096 } | |
| 7097 return buf[0] != NUL; | |
| 7098 } | |
| 7099 | |
| 7100 #if defined(FEAT_STL_OPT) || defined(PROTO) | |
| 7101 /* | |
| 677 | 7102 * Redraw the status line or ruler of window "wp". |
| 7103 * When "wp" is NULL redraw the tab pages line from 'tabline'. | |
| 7 | 7104 */ |
| 7105 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7106 win_redr_custom( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7107 win_T *wp, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7108 int draw_ruler) /* TRUE or FALSE */ |
| 7 | 7109 { |
| 5539 | 7110 static int entered = FALSE; |
| 7 | 7111 int attr; |
| 7112 int curattr; | |
| 7113 int row; | |
| 7114 int col = 0; | |
| 7115 int maxwidth; | |
| 7116 int width; | |
| 7117 int n; | |
| 7118 int len; | |
| 7119 int fillchar; | |
| 7120 char_u buf[MAXPATHL]; | |
| 1983 | 7121 char_u *stl; |
| 7 | 7122 char_u *p; |
| 681 | 7123 struct stl_hlrec hltab[STL_MAX_ITEM]; |
| 7124 struct stl_hlrec tabtab[STL_MAX_ITEM]; | |
| 677 | 7125 int use_sandbox = FALSE; |
| 2693 | 7126 win_T *ewp; |
| 7127 int p_crb_save; | |
| 7 | 7128 |
| 5539 | 7129 /* There is a tiny chance that this gets called recursively: When |
| 7130 * redrawing a status line triggers redrawing the ruler or tabline. | |
| 7131 * Avoid trouble by not allowing recursion. */ | |
| 7132 if (entered) | |
| 7133 return; | |
| 7134 entered = TRUE; | |
| 7135 | |
| 7 | 7136 /* setup environment for the task at hand */ |
| 677 | 7137 if (wp == NULL) |
| 7138 { | |
| 7139 /* Use 'tabline'. Always at the first line of the screen. */ | |
| 1983 | 7140 stl = p_tal; |
| 677 | 7141 row = 0; |
| 707 | 7142 fillchar = ' '; |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
7143 attr = HL_ATTR(HLF_TPF); |
| 677 | 7144 maxwidth = Columns; |
| 7145 # ifdef FEAT_EVAL | |
| 681 | 7146 use_sandbox = was_set_insecurely((char_u *)"tabline", 0); |
| 677 | 7147 # endif |
| 7148 } | |
| 40 | 7149 else |
| 677 | 7150 { |
| 7151 row = W_WINROW(wp) + wp->w_height; | |
|
11890
318ae82d8ba4
patch 8.0.0825: not easy to see that a window is a terminal window
Christian Brabandt <cb@256bit.org>
parents:
11866
diff
changeset
|
7152 fillchar = fillchar_status(&attr, wp); |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
7153 maxwidth = wp->w_width; |
| 677 | 7154 |
| 7155 if (draw_ruler) | |
| 7156 { | |
| 1983 | 7157 stl = p_ruf; |
| 677 | 7158 /* advance past any leading group spec - implicit in ru_col */ |
| 1983 | 7159 if (*stl == '%') |
| 7160 { | |
| 7161 if (*++stl == '-') | |
| 7162 stl++; | |
| 7163 if (atoi((char *)stl)) | |
| 7164 while (VIM_ISDIGIT(*stl)) | |
| 7165 stl++; | |
| 7166 if (*stl++ != '(') | |
| 7167 stl = p_ruf; | |
| 677 | 7168 } |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
7169 col = ru_col - (Columns - wp->w_width); |
|
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
7170 if (col < (wp->w_width + 1) / 2) |
|
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
7171 col = (wp->w_width + 1) / 2; |
|
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
7172 maxwidth = wp->w_width - col; |
| 677 | 7173 if (!wp->w_status_height) |
| 7174 { | |
| 7175 row = Rows - 1; | |
| 7176 --maxwidth; /* writing in last column may cause scrolling */ | |
| 7177 fillchar = ' '; | |
| 7178 attr = 0; | |
| 7179 } | |
| 7180 | |
| 7181 # ifdef FEAT_EVAL | |
| 681 | 7182 use_sandbox = was_set_insecurely((char_u *)"rulerformat", 0); |
| 677 | 7183 # endif |
| 7184 } | |
| 7185 else | |
| 7186 { | |
| 7187 if (*wp->w_p_stl != NUL) | |
| 1983 | 7188 stl = wp->w_p_stl; |
| 677 | 7189 else |
| 1983 | 7190 stl = p_stl; |
| 677 | 7191 # ifdef FEAT_EVAL |
| 681 | 7192 use_sandbox = was_set_insecurely((char_u *)"statusline", |
| 7193 *wp->w_p_stl == NUL ? 0 : OPT_LOCAL); | |
| 677 | 7194 # endif |
| 7195 } | |
| 7196 | |
|
12513
3ca08bf99396
patch 8.0.1135: W_WINCOL() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12510
diff
changeset
|
7197 col += wp->w_wincol; |
| 677 | 7198 } |
| 7199 | |
| 7 | 7200 if (maxwidth <= 0) |
| 5539 | 7201 goto theend; |
| 677 | 7202 |
| 2693 | 7203 /* Temporarily reset 'cursorbind', we don't want a side effect from moving |
| 7204 * the cursor away and back. */ | |
| 7205 ewp = wp == NULL ? curwin : wp; | |
| 7206 p_crb_save = ewp->w_p_crb; | |
| 7207 ewp->w_p_crb = FALSE; | |
| 7208 | |
| 1983 | 7209 /* Make a copy, because the statusline may include a function call that |
| 7210 * might change the option value and free the memory. */ | |
| 7211 stl = vim_strsave(stl); | |
| 2693 | 7212 width = build_stl_str_hl(ewp, buf, sizeof(buf), |
| 1983 | 7213 stl, use_sandbox, |
| 681 | 7214 fillchar, maxwidth, hltab, tabtab); |
| 1983 | 7215 vim_free(stl); |
| 2693 | 7216 ewp->w_p_crb = p_crb_save; |
| 2661 | 7217 |
| 7218 /* Make all characters printable. */ | |
| 7219 p = transstr(buf); | |
| 7220 if (p != NULL) | |
| 7221 { | |
| 7222 vim_strncpy(buf, p, sizeof(buf) - 1); | |
| 7223 vim_free(p); | |
| 7224 } | |
| 7225 | |
| 7226 /* fill up with "fillchar" */ | |
| 835 | 7227 len = (int)STRLEN(buf); |
| 1883 | 7228 while (width < maxwidth && len < (int)sizeof(buf) - 1) |
| 7 | 7229 { |
| 7230 len += (*mb_char2bytes)(fillchar, buf + len); | |
| 7231 ++width; | |
| 7232 } | |
| 7233 buf[len] = NUL; | |
| 7234 | |
| 681 | 7235 /* |
| 7236 * Draw each snippet with the specified highlighting. | |
| 7237 */ | |
| 7 | 7238 curattr = attr; |
| 7239 p = buf; | |
| 681 | 7240 for (n = 0; hltab[n].start != NULL; n++) |
| 7241 { | |
| 7242 len = (int)(hltab[n].start - p); | |
| 7 | 7243 screen_puts_len(p, len, row, col, curattr); |
| 7244 col += vim_strnsize(p, len); | |
| 681 | 7245 p = hltab[n].start; |
| 7246 | |
| 7247 if (hltab[n].userhl == 0) | |
| 7 | 7248 curattr = attr; |
| 681 | 7249 else if (hltab[n].userhl < 0) |
| 7250 curattr = syn_id2attr(-hltab[n].userhl); | |
|
12477
68d7bc045dbe
patch 8.0.1118: FEAT_WINDOWS adds a lot of #ifdefs
Christian Brabandt <cb@256bit.org>
parents:
12441
diff
changeset
|
7251 #ifdef FEAT_TERMINAL |
|
12122
68c593f649d1
patch 8.0.0941: existing color schemes don't like StatusLineTerm
Christian Brabandt <cb@256bit.org>
parents:
12114
diff
changeset
|
7252 else if (wp != NULL && wp != curwin && bt_terminal(wp->w_buffer) |
|
68c593f649d1
patch 8.0.0941: existing color schemes don't like StatusLineTerm
Christian Brabandt <cb@256bit.org>
parents:
12114
diff
changeset
|
7253 && wp->w_status_height != 0) |
|
68c593f649d1
patch 8.0.0941: existing color schemes don't like StatusLineTerm
Christian Brabandt <cb@256bit.org>
parents:
12114
diff
changeset
|
7254 curattr = highlight_stltermnc[hltab[n].userhl - 1]; |
|
12114
f306e6decaf9
patch 8.0.0937: user highlight groups not adjusted for terminal
Christian Brabandt <cb@256bit.org>
parents:
11981
diff
changeset
|
7255 else if (wp != NULL && bt_terminal(wp->w_buffer) |
|
f306e6decaf9
patch 8.0.0937: user highlight groups not adjusted for terminal
Christian Brabandt <cb@256bit.org>
parents:
11981
diff
changeset
|
7256 && wp->w_status_height != 0) |
|
f306e6decaf9
patch 8.0.0937: user highlight groups not adjusted for terminal
Christian Brabandt <cb@256bit.org>
parents:
11981
diff
changeset
|
7257 curattr = highlight_stlterm[hltab[n].userhl - 1]; |
|
12477
68d7bc045dbe
patch 8.0.1118: FEAT_WINDOWS adds a lot of #ifdefs
Christian Brabandt <cb@256bit.org>
parents:
12441
diff
changeset
|
7258 #endif |
| 680 | 7259 else if (wp != NULL && wp != curwin && wp->w_status_height != 0) |
| 681 | 7260 curattr = highlight_stlnc[hltab[n].userhl - 1]; |
| 7 | 7261 else |
| 681 | 7262 curattr = highlight_user[hltab[n].userhl - 1]; |
| 7 | 7263 } |
| 7264 screen_puts(p, row, col, curattr); | |
| 681 | 7265 |
| 7266 if (wp == NULL) | |
| 7267 { | |
| 7268 /* Fill the TabPageIdxs[] array for clicking in the tab pagesline. */ | |
| 7269 col = 0; | |
| 7270 len = 0; | |
| 7271 p = buf; | |
| 7272 fillchar = 0; | |
| 7273 for (n = 0; tabtab[n].start != NULL; n++) | |
| 7274 { | |
| 7275 len += vim_strnsize(p, (int)(tabtab[n].start - p)); | |
| 7276 while (col < len) | |
| 7277 TabPageIdxs[col++] = fillchar; | |
| 7278 p = tabtab[n].start; | |
| 7279 fillchar = tabtab[n].userhl; | |
| 7280 } | |
| 7281 while (col < Columns) | |
| 7282 TabPageIdxs[col++] = fillchar; | |
| 7283 } | |
| 5539 | 7284 |
| 7285 theend: | |
| 7286 entered = FALSE; | |
| 7 | 7287 } |
| 7288 | |
| 7289 #endif /* FEAT_STL_OPT */ | |
| 7290 | |
| 7291 /* | |
| 7292 * Output a single character directly to the screen and update ScreenLines. | |
| 7293 */ | |
| 7294 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7295 screen_putchar(int c, int row, int col, int attr) |
| 7 | 7296 { |
| 3549 | 7297 char_u buf[MB_MAXBYTES + 1]; |
| 7298 | |
| 7299 if (has_mbyte) | |
| 7300 buf[(*mb_char2bytes)(c, buf)] = NUL; | |
| 7301 else | |
| 7302 { | |
| 7303 buf[0] = c; | |
| 7304 buf[1] = NUL; | |
| 7305 } | |
| 7 | 7306 screen_puts(buf, row, col, attr); |
| 7307 } | |
| 7308 | |
| 7309 /* | |
| 7310 * Get a single character directly from ScreenLines into "bytes[]". | |
| 7311 * Also return its attribute in *attrp; | |
| 7312 */ | |
| 7313 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7314 screen_getbytes(int row, int col, char_u *bytes, int *attrp) |
| 7 | 7315 { |
| 7316 unsigned off; | |
| 7317 | |
| 7318 /* safety check */ | |
| 7319 if (ScreenLines != NULL && row < screen_Rows && col < screen_Columns) | |
| 7320 { | |
| 7321 off = LineOffset[row] + col; | |
| 7322 *attrp = ScreenAttrs[off]; | |
| 7323 bytes[0] = ScreenLines[off]; | |
| 7324 bytes[1] = NUL; | |
| 7325 | |
| 7326 if (enc_utf8 && ScreenLinesUC[off] != 0) | |
| 7327 bytes[utfc_char2bytes(off, bytes)] = NUL; | |
| 7328 else if (enc_dbcs == DBCS_JPNU && ScreenLines[off] == 0x8e) | |
| 7329 { | |
| 7330 bytes[0] = ScreenLines[off]; | |
| 7331 bytes[1] = ScreenLines2[off]; | |
| 7332 bytes[2] = NUL; | |
| 7333 } | |
| 7334 else if (enc_dbcs && MB_BYTE2LEN(bytes[0]) > 1) | |
| 7335 { | |
| 7336 bytes[1] = ScreenLines[off + 1]; | |
| 7337 bytes[2] = NUL; | |
| 7338 } | |
|
15603
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
7339 } |
|
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
7340 } |
|
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
7341 |
| 714 | 7342 /* |
| 7343 * Return TRUE if composing characters for screen posn "off" differs from | |
| 7344 * composing characters in "u8cc". | |
|
2124
dc8a5699253b
updated for version 7.2.406
Bram Moolenaar <bram@zimbu.org>
parents:
2122
diff
changeset
|
7345 * Only to be used when ScreenLinesUC[off] != 0. |
| 714 | 7346 */ |
| 7347 static int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7348 screen_comp_differs(int off, int *u8cc) |
| 714 | 7349 { |
| 7350 int i; | |
| 7351 | |
| 7352 for (i = 0; i < Screen_mco; ++i) | |
| 7353 { | |
| 7354 if (ScreenLinesC[i][off] != (u8char_T)u8cc[i]) | |
| 7355 return TRUE; | |
| 7356 if (u8cc[i] == 0) | |
| 7357 break; | |
| 7358 } | |
| 7359 return FALSE; | |
| 7360 } | |
| 7361 | |
| 7 | 7362 /* |
| 7363 * Put string '*text' on the screen at position 'row' and 'col', with | |
| 7364 * attributes 'attr', and update ScreenLines[] and ScreenAttrs[]. | |
| 7365 * Note: only outputs within one row, message is truncated at screen boundary! | |
| 7366 * Note: if ScreenLines[], row and/or col is invalid, nothing is done. | |
| 7367 */ | |
| 7368 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7369 screen_puts( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7370 char_u *text, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7371 int row, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7372 int col, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7373 int attr) |
| 7 | 7374 { |
| 7375 screen_puts_len(text, -1, row, col, attr); | |
| 7376 } | |
| 7377 | |
| 7378 /* | |
| 7379 * Like screen_puts(), but output "text[len]". When "len" is -1 output up to | |
| 7380 * a NUL. | |
| 7381 */ | |
| 7382 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7383 screen_puts_len( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7384 char_u *text, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7385 int textlen, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7386 int row, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7387 int col, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7388 int attr) |
| 7 | 7389 { |
| 7390 unsigned off; | |
| 7391 char_u *ptr = text; | |
| 5923 | 7392 int len = textlen; |
| 7 | 7393 int c; |
| 1378 | 7394 unsigned max_off; |
| 7 | 7395 int mbyte_blen = 1; |
| 7396 int mbyte_cells = 1; | |
| 7397 int u8c = 0; | |
| 714 | 7398 int u8cc[MAX_MCO]; |
| 7 | 7399 int clear_next_cell = FALSE; |
|
15603
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
7400 #ifdef FEAT_ARABIC |
| 7 | 7401 int prev_c = 0; /* previous Arabic character */ |
| 714 | 7402 int pc, nc, nc1; |
| 7403 int pcc[MAX_MCO]; | |
|
15603
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
7404 #endif |
| 1843 | 7405 int force_redraw_this; |
| 7406 int force_redraw_next = FALSE; | |
| 7407 int need_redraw; | |
| 7 | 7408 |
| 7409 if (ScreenLines == NULL || row >= screen_Rows) /* safety check */ | |
| 7410 return; | |
| 1843 | 7411 off = LineOffset[row] + col; |
| 7 | 7412 |
| 1668 | 7413 /* When drawing over the right halve of a double-wide char clear out the |
| 7414 * left halve. Only needed in a terminal. */ | |
| 1685 | 7415 if (has_mbyte && col > 0 && col < screen_Columns |
|
15603
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
7416 #ifdef FEAT_GUI |
| 1668 | 7417 && !gui.in_use |
|
15603
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
7418 #endif |
| 1668 | 7419 && mb_fix_col(col, row) != col) |
| 1843 | 7420 { |
| 7421 ScreenLines[off - 1] = ' '; | |
| 7422 ScreenAttrs[off - 1] = 0; | |
| 7423 if (enc_utf8) | |
| 7424 { | |
| 7425 ScreenLinesUC[off - 1] = 0; | |
| 7426 ScreenLinesC[0][off - 1] = 0; | |
| 7427 } | |
| 7428 /* redraw the previous cell, make it empty */ | |
| 7429 screen_char(off - 1, row, col - 1); | |
| 7430 /* force the cell at "col" to be redrawn */ | |
| 7431 force_redraw_next = TRUE; | |
| 7432 } | |
|
15603
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
7433 |
| 1378 | 7434 max_off = LineOffset[row] + screen_Columns; |
| 1340 | 7435 while (col < screen_Columns |
| 7436 && (len < 0 || (int)(ptr - text) < len) | |
| 7437 && *ptr != NUL) | |
| 7 | 7438 { |
| 7439 c = *ptr; | |
| 7440 /* check if this is the first byte of a multibyte */ | |
| 7441 if (has_mbyte) | |
| 7442 { | |
| 7443 if (enc_utf8 && len > 0) | |
| 474 | 7444 mbyte_blen = utfc_ptr2len_len(ptr, (int)((text + len) - ptr)); |
| 7 | 7445 else |
| 474 | 7446 mbyte_blen = (*mb_ptr2len)(ptr); |
| 7 | 7447 if (enc_dbcs == DBCS_JPNU && c == 0x8e) |
| 7448 mbyte_cells = 1; | |
| 7449 else if (enc_dbcs != 0) | |
| 7450 mbyte_cells = mbyte_blen; | |
| 7451 else /* enc_utf8 */ | |
| 7452 { | |
| 7453 if (len >= 0) | |
| 714 | 7454 u8c = utfc_ptr2char_len(ptr, u8cc, |
| 7 | 7455 (int)((text + len) - ptr)); |
| 7456 else | |
| 714 | 7457 u8c = utfc_ptr2char(ptr, u8cc); |
| 7 | 7458 mbyte_cells = utf_char2cells(u8c); |
|
15603
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
7459 #ifdef FEAT_ARABIC |
| 7 | 7460 if (p_arshape && !p_tbidi && ARABIC_CHAR(u8c)) |
| 7461 { | |
| 7462 /* Do Arabic shaping. */ | |
| 7463 if (len >= 0 && (int)(ptr - text) + mbyte_blen >= len) | |
| 7464 { | |
| 7465 /* Past end of string to be displayed. */ | |
| 7466 nc = NUL; | |
| 7467 nc1 = NUL; | |
| 7468 } | |
| 7469 else | |
| 714 | 7470 { |
| 1994 | 7471 nc = utfc_ptr2char_len(ptr + mbyte_blen, pcc, |
| 7472 (int)((text + len) - ptr - mbyte_blen)); | |
| 714 | 7473 nc1 = pcc[0]; |
| 7474 } | |
| 7 | 7475 pc = prev_c; |
| 7476 prev_c = u8c; | |
| 714 | 7477 u8c = arabic_shape(u8c, &c, &u8cc[0], nc, nc1, pc); |
| 7 | 7478 } |
| 7479 else | |
| 7480 prev_c = u8c; | |
|
15603
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
7481 #endif |
|
2055
4aa4510d548c
updated for version 7.2.341
Bram Moolenaar <bram@zimbu.org>
parents:
2008
diff
changeset
|
7482 if (col + mbyte_cells > screen_Columns) |
|
4aa4510d548c
updated for version 7.2.341
Bram Moolenaar <bram@zimbu.org>
parents:
2008
diff
changeset
|
7483 { |
|
4aa4510d548c
updated for version 7.2.341
Bram Moolenaar <bram@zimbu.org>
parents:
2008
diff
changeset
|
7484 /* Only 1 cell left, but character requires 2 cells: |
|
4aa4510d548c
updated for version 7.2.341
Bram Moolenaar <bram@zimbu.org>
parents:
2008
diff
changeset
|
7485 * display a '>' in the last column to avoid wrapping. */ |
|
4aa4510d548c
updated for version 7.2.341
Bram Moolenaar <bram@zimbu.org>
parents:
2008
diff
changeset
|
7486 c = '>'; |
|
4aa4510d548c
updated for version 7.2.341
Bram Moolenaar <bram@zimbu.org>
parents:
2008
diff
changeset
|
7487 mbyte_cells = 1; |
|
4aa4510d548c
updated for version 7.2.341
Bram Moolenaar <bram@zimbu.org>
parents:
2008
diff
changeset
|
7488 } |
| 7 | 7489 } |
| 7490 } | |
|
15603
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
7491 |
| 1843 | 7492 force_redraw_this = force_redraw_next; |
| 7493 force_redraw_next = FALSE; | |
| 7494 | |
| 7495 need_redraw = ScreenLines[off] != c | |
| 7 | 7496 || (mbyte_cells == 2 |
| 7497 && ScreenLines[off + 1] != (enc_dbcs ? ptr[1] : 0)) | |
| 7498 || (enc_dbcs == DBCS_JPNU | |
| 7499 && c == 0x8e | |
| 7500 && ScreenLines2[off] != ptr[1]) | |
| 7501 || (enc_utf8 | |
|
2124
dc8a5699253b
updated for version 7.2.406
Bram Moolenaar <bram@zimbu.org>
parents:
2122
diff
changeset
|
7502 && (ScreenLinesUC[off] != |
|
dc8a5699253b
updated for version 7.2.406
Bram Moolenaar <bram@zimbu.org>
parents:
2122
diff
changeset
|
7503 (u8char_T)(c < 0x80 && u8cc[0] == 0 ? 0 : u8c) |
|
dc8a5699253b
updated for version 7.2.406
Bram Moolenaar <bram@zimbu.org>
parents:
2122
diff
changeset
|
7504 || (ScreenLinesUC[off] != 0 |
|
dc8a5699253b
updated for version 7.2.406
Bram Moolenaar <bram@zimbu.org>
parents:
2122
diff
changeset
|
7505 && screen_comp_differs(off, u8cc)))) |
| 7 | 7506 || ScreenAttrs[off] != attr |
| 1843 | 7507 || exmode_active; |
| 7508 | |
|
15603
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
7509 if (need_redraw || force_redraw_this) |
| 7 | 7510 { |
| 7511 #if defined(FEAT_GUI) || defined(UNIX) | |
| 7512 /* The bold trick makes a single row of pixels appear in the next | |
| 7513 * character. When a bold character is removed, the next | |
| 7514 * character should be redrawn too. This happens for our own GUI | |
| 1843 | 7515 * and for some xterms. */ |
| 7516 if (need_redraw && ScreenLines[off] != ' ' && ( | |
| 7 | 7517 # ifdef FEAT_GUI |
| 7518 gui.in_use | |
| 7519 # endif | |
| 7520 # if defined(FEAT_GUI) && defined(UNIX) | |
| 7521 || | |
| 7522 # endif | |
| 7523 # ifdef UNIX | |
| 7524 term_is_xterm | |
| 7525 # endif | |
| 1843 | 7526 )) |
| 7527 { | |
| 7528 int n = ScreenAttrs[off]; | |
| 7529 | |
| 7530 if (n > HL_ALL) | |
| 7531 n = syn_attr2attr(n); | |
| 7532 if (n & HL_BOLD) | |
| 7533 force_redraw_next = TRUE; | |
| 7 | 7534 } |
| 7535 #endif | |
| 7536 /* When at the end of the text and overwriting a two-cell | |
| 7537 * character with a one-cell character, need to clear the next | |
| 7538 * cell. Also when overwriting the left halve of a two-cell char | |
| 7539 * with the right halve of a two-cell char. Do this only once | |
| 7540 * (mb_off2cells() may return 2 on the right halve). */ | |
| 7541 if (clear_next_cell) | |
| 7542 clear_next_cell = FALSE; | |
| 7543 else if (has_mbyte | |
| 7544 && (len < 0 ? ptr[mbyte_blen] == NUL | |
| 7545 : ptr + mbyte_blen >= text + len) | |
| 1378 | 7546 && ((mbyte_cells == 1 && (*mb_off2cells)(off, max_off) > 1) |
| 7 | 7547 || (mbyte_cells == 2 |
| 1378 | 7548 && (*mb_off2cells)(off, max_off) == 1 |
| 7549 && (*mb_off2cells)(off + 1, max_off) > 1))) | |
| 7 | 7550 clear_next_cell = TRUE; |
| 7551 | |
| 7552 /* Make sure we never leave a second byte of a double-byte behind, | |
| 7553 * it confuses mb_off2cells(). */ | |
| 7554 if (enc_dbcs | |
| 1378 | 7555 && ((mbyte_cells == 1 && (*mb_off2cells)(off, max_off) > 1) |
| 7 | 7556 || (mbyte_cells == 2 |
| 1378 | 7557 && (*mb_off2cells)(off, max_off) == 1 |
| 7558 && (*mb_off2cells)(off + 1, max_off) > 1))) | |
| 7 | 7559 ScreenLines[off + mbyte_blen] = 0; |
| 7560 ScreenLines[off] = c; | |
| 7561 ScreenAttrs[off] = attr; | |
| 7562 if (enc_utf8) | |
| 7563 { | |
| 714 | 7564 if (c < 0x80 && u8cc[0] == 0) |
| 7 | 7565 ScreenLinesUC[off] = 0; |
| 7566 else | |
| 7567 { | |
| 714 | 7568 int i; |
| 7569 | |
| 7 | 7570 ScreenLinesUC[off] = u8c; |
| 714 | 7571 for (i = 0; i < Screen_mco; ++i) |
| 7572 { | |
| 7573 ScreenLinesC[i][off] = u8cc[i]; | |
| 7574 if (u8cc[i] == 0) | |
| 7575 break; | |
| 7576 } | |
| 7 | 7577 } |
| 7578 if (mbyte_cells == 2) | |
| 7579 { | |
| 7580 ScreenLines[off + 1] = 0; | |
| 7581 ScreenAttrs[off + 1] = attr; | |
| 7582 } | |
| 7583 screen_char(off, row, col); | |
| 7584 } | |
| 7585 else if (mbyte_cells == 2) | |
| 7586 { | |
| 7587 ScreenLines[off + 1] = ptr[1]; | |
| 7588 ScreenAttrs[off + 1] = attr; | |
| 7589 screen_char_2(off, row, col); | |
| 7590 } | |
| 7591 else if (enc_dbcs == DBCS_JPNU && c == 0x8e) | |
| 7592 { | |
| 7593 ScreenLines2[off] = ptr[1]; | |
| 7594 screen_char(off, row, col); | |
| 7595 } | |
| 7596 else | |
| 7597 screen_char(off, row, col); | |
| 7598 } | |
| 7599 if (has_mbyte) | |
| 7600 { | |
| 7601 off += mbyte_cells; | |
| 7602 col += mbyte_cells; | |
| 7603 ptr += mbyte_blen; | |
| 7604 if (clear_next_cell) | |
| 5923 | 7605 { |
| 7606 /* This only happens at the end, display one space next. */ | |
| 7 | 7607 ptr = (char_u *)" "; |
| 5923 | 7608 len = -1; |
| 7609 } | |
| 7 | 7610 } |
| 7611 else | |
| 7612 { | |
| 7613 ++off; | |
| 7614 ++col; | |
| 7615 ++ptr; | |
| 7616 } | |
| 7617 } | |
| 1843 | 7618 |
| 7619 /* If we detected the next character needs to be redrawn, but the text | |
| 7620 * doesn't extend up to there, update the character here. */ | |
| 7621 if (force_redraw_next && col < screen_Columns) | |
| 7622 { | |
| 7623 if (enc_dbcs != 0 && dbcs_off2cells(off, max_off) > 1) | |
| 7624 screen_char_2(off, row, col); | |
| 7625 else | |
| 7626 screen_char(off, row, col); | |
| 7627 } | |
| 7 | 7628 } |
| 7629 | |
| 7630 #ifdef FEAT_SEARCH_EXTRA | |
| 7631 /* | |
| 1326 | 7632 * Prepare for 'hlsearch' highlighting. |
| 7 | 7633 */ |
| 7634 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7635 start_search_hl(void) |
| 7 | 7636 { |
| 7637 if (p_hls && !no_hlsearch) | |
| 7638 { | |
| 7639 last_pat_prog(&search_hl.rm); | |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
7640 search_hl.attr = HL_ATTR(HLF_L); |
| 1521 | 7641 # ifdef FEAT_RELTIME |
| 7642 /* Set the time limit to 'redrawtime'. */ | |
| 7643 profile_setlimit(p_rdt, &search_hl.tm); | |
| 7644 # endif | |
| 7 | 7645 } |
| 7646 } | |
| 7647 | |
| 7648 /* | |
| 1326 | 7649 * Clean up for 'hlsearch' highlighting. |
| 7 | 7650 */ |
| 7651 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7652 end_search_hl(void) |
| 7 | 7653 { |
| 7654 if (search_hl.rm.regprog != NULL) | |
| 7655 { | |
|
4805
66803af09906
updated for version 7.3.1149
Bram Moolenaar <bram@vim.org>
parents:
4795
diff
changeset
|
7656 vim_regfree(search_hl.rm.regprog); |
| 7 | 7657 search_hl.rm.regprog = NULL; |
| 7658 } | |
| 7659 } | |
| 7660 | |
| 7661 /* | |
|
2284
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7662 * Init for calling prepare_search_hl(). |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7663 */ |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7664 static void |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7665 init_search_hl(win_T *wp) |
|
2284
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7666 { |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7667 matchitem_T *cur; |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7668 |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7669 /* Setup for match and 'hlsearch' highlighting. Disable any previous |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7670 * match */ |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7671 cur = wp->w_match_head; |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7672 while (cur != NULL) |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7673 { |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7674 cur->hl.rm = cur->match; |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7675 if (cur->hlg_id == 0) |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7676 cur->hl.attr = 0; |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7677 else |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7678 cur->hl.attr = syn_id2attr(cur->hlg_id); |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7679 cur->hl.buf = wp->w_buffer; |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7680 cur->hl.lnum = 0; |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7681 cur->hl.first_lnum = 0; |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7682 # ifdef FEAT_RELTIME |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7683 /* Set the time limit to 'redrawtime'. */ |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7684 profile_setlimit(p_rdt, &(cur->hl.tm)); |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7685 # endif |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7686 cur = cur->next; |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7687 } |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7688 search_hl.buf = wp->w_buffer; |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7689 search_hl.lnum = 0; |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7690 search_hl.first_lnum = 0; |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7691 /* time limit is set at the toplevel, for all windows */ |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7692 } |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7693 |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7694 /* |
| 7 | 7695 * Advance to the match in window "wp" line "lnum" or past it. |
| 7696 */ | |
| 7697 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7698 prepare_search_hl(win_T *wp, linenr_T lnum) |
| 7 | 7699 { |
| 1326 | 7700 matchitem_T *cur; /* points to the match list */ |
| 7701 match_T *shl; /* points to search_hl or a match */ | |
| 7702 int shl_flag; /* flag to indicate whether search_hl | |
| 7703 has been processed or not */ | |
| 5979 | 7704 int pos_inprogress; /* marks that position match search is |
| 7705 in progress */ | |
| 7 | 7706 int n; |
| 7707 | |
| 7708 /* | |
| 7709 * When using a multi-line pattern, start searching at the top | |
| 7710 * of the window or just after a closed fold. | |
| 1326 | 7711 * Do this both for search_hl and the match list. |
| 7 | 7712 */ |
| 1326 | 7713 cur = wp->w_match_head; |
| 7714 shl_flag = FALSE; | |
| 7715 while (cur != NULL || shl_flag == FALSE) | |
| 7716 { | |
| 7717 if (shl_flag == FALSE) | |
| 7718 { | |
| 7719 shl = &search_hl; | |
| 7720 shl_flag = TRUE; | |
| 7721 } | |
| 7722 else | |
| 7723 shl = &cur->hl; | |
| 7 | 7724 if (shl->rm.regprog != NULL |
| 7725 && shl->lnum == 0 | |
| 7726 && re_multiline(shl->rm.regprog)) | |
| 7727 { | |
| 7728 if (shl->first_lnum == 0) | |
| 7729 { | |
| 7730 # ifdef FEAT_FOLDING | |
| 7731 for (shl->first_lnum = lnum; | |
| 7732 shl->first_lnum > wp->w_topline; --shl->first_lnum) | |
| 7733 if (hasFoldingWin(wp, shl->first_lnum - 1, | |
| 7734 NULL, NULL, TRUE, NULL)) | |
| 7735 break; | |
| 7736 # else | |
| 7737 shl->first_lnum = wp->w_topline; | |
| 7738 # endif | |
| 7739 } | |
| 5979 | 7740 if (cur != NULL) |
| 7741 cur->pos.cur = 0; | |
| 7742 pos_inprogress = TRUE; | |
| 7 | 7743 n = 0; |
| 5979 | 7744 while (shl->first_lnum < lnum && (shl->rm.regprog != NULL |
| 7745 || (cur != NULL && pos_inprogress))) | |
| 7746 { | |
|
9992
3e3b0ce24b61
commit https://github.com/vim/vim/commit/e17bdffff78ebd6a4e3cff26754cc667557ea810
Christian Brabandt <cb@256bit.org>
parents:
9939
diff
changeset
|
7747 next_search_hl(wp, shl, shl->first_lnum, (colnr_T)n, |
|
3e3b0ce24b61
commit https://github.com/vim/vim/commit/e17bdffff78ebd6a4e3cff26754cc667557ea810
Christian Brabandt <cb@256bit.org>
parents:
9939
diff
changeset
|
7748 shl == &search_hl ? NULL : cur); |
| 5979 | 7749 pos_inprogress = cur == NULL || cur->pos.cur == 0 |
| 7750 ? FALSE : TRUE; | |
| 7 | 7751 if (shl->lnum != 0) |
| 7752 { | |
| 7753 shl->first_lnum = shl->lnum | |
| 7754 + shl->rm.endpos[0].lnum | |
| 7755 - shl->rm.startpos[0].lnum; | |
| 7756 n = shl->rm.endpos[0].col; | |
| 7757 } | |
| 7758 else | |
| 7759 { | |
| 7760 ++shl->first_lnum; | |
| 7761 n = 0; | |
| 7762 } | |
| 7763 } | |
| 7764 } | |
| 1326 | 7765 if (shl != &search_hl && cur != NULL) |
| 7766 cur = cur->next; | |
| 7 | 7767 } |
| 7768 } | |
| 7769 | |
| 7770 /* | |
| 1326 | 7771 * Search for a next 'hlsearch' or match. |
| 7 | 7772 * Uses shl->buf. |
| 7773 * Sets shl->lnum and shl->rm contents. | |
| 7774 * Note: Assumes a previous match is always before "lnum", unless | |
| 7775 * shl->lnum is zero. | |
| 7776 * Careful: Any pointers for buffer lines will become invalid. | |
| 7777 */ | |
| 7778 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7779 next_search_hl( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7780 win_T *win, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7781 match_T *shl, /* points to search_hl or a match */ |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7782 linenr_T lnum, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7783 colnr_T mincol, /* minimal column for a match */ |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7784 matchitem_T *cur) /* to retrieve match positions if any */ |
| 7 | 7785 { |
| 7786 linenr_T l; | |
| 7787 colnr_T matchcol; | |
| 7788 long nmatched; | |
|
14161
7cac4646c552
patch 8.1.0098: segfault when pattern with z() is very slow
Christian Brabandt <cb@256bit.org>
parents:
14093
diff
changeset
|
7789 int save_called_emsg = called_emsg; |
| 7 | 7790 |
|
14515
3648e74dd523
patch 8.1.0271: 'incsearch' doesn't work for :s, :g or :v
Christian Brabandt <cb@256bit.org>
parents:
14428
diff
changeset
|
7791 // for :{range}s/pat only highlight inside the range |
|
3648e74dd523
patch 8.1.0271: 'incsearch' doesn't work for :s, :g or :v
Christian Brabandt <cb@256bit.org>
parents:
14428
diff
changeset
|
7792 if (lnum < search_first_line || lnum > search_last_line) |
|
3648e74dd523
patch 8.1.0271: 'incsearch' doesn't work for :s, :g or :v
Christian Brabandt <cb@256bit.org>
parents:
14428
diff
changeset
|
7793 { |
|
3648e74dd523
patch 8.1.0271: 'incsearch' doesn't work for :s, :g or :v
Christian Brabandt <cb@256bit.org>
parents:
14428
diff
changeset
|
7794 shl->lnum = 0; |
|
3648e74dd523
patch 8.1.0271: 'incsearch' doesn't work for :s, :g or :v
Christian Brabandt <cb@256bit.org>
parents:
14428
diff
changeset
|
7795 return; |
|
3648e74dd523
patch 8.1.0271: 'incsearch' doesn't work for :s, :g or :v
Christian Brabandt <cb@256bit.org>
parents:
14428
diff
changeset
|
7796 } |
|
3648e74dd523
patch 8.1.0271: 'incsearch' doesn't work for :s, :g or :v
Christian Brabandt <cb@256bit.org>
parents:
14428
diff
changeset
|
7797 |
| 7 | 7798 if (shl->lnum != 0) |
| 7799 { | |
| 7800 /* Check for three situations: | |
| 7801 * 1. If the "lnum" is below a previous match, start a new search. | |
| 7802 * 2. If the previous match includes "mincol", use it. | |
| 7803 * 3. Continue after the previous match. | |
| 7804 */ | |
| 7805 l = shl->lnum + shl->rm.endpos[0].lnum - shl->rm.startpos[0].lnum; | |
| 7806 if (lnum > l) | |
| 7807 shl->lnum = 0; | |
| 7808 else if (lnum < l || shl->rm.endpos[0].col > mincol) | |
| 7809 return; | |
| 7810 } | |
| 7811 | |
| 7812 /* | |
| 7813 * Repeat searching for a match until one is found that includes "mincol" | |
| 7814 * or none is found in this line. | |
| 7815 */ | |
| 7816 called_emsg = FALSE; | |
| 7817 for (;;) | |
| 7818 { | |
| 1521 | 7819 #ifdef FEAT_RELTIME |
| 7820 /* Stop searching after passing the time limit. */ | |
| 7821 if (profile_passed_limit(&(shl->tm))) | |
| 7822 { | |
| 7823 shl->lnum = 0; /* no match found in time */ | |
| 7824 break; | |
| 7825 } | |
| 7826 #endif | |
| 7 | 7827 /* Three situations: |
| 7828 * 1. No useful previous match: search from start of line. | |
| 7829 * 2. Not Vi compatible or empty match: continue at next character. | |
| 7830 * Break the loop if this is beyond the end of the line. | |
| 7831 * 3. Vi compatible searching: continue at end of previous match. | |
| 7832 */ | |
| 7833 if (shl->lnum == 0) | |
| 7834 matchcol = 0; | |
| 7835 else if (vim_strchr(p_cpo, CPO_SEARCH) == NULL | |
| 7836 || (shl->rm.endpos[0].lnum == 0 | |
| 685 | 7837 && shl->rm.endpos[0].col <= shl->rm.startpos[0].col)) |
| 7838 { | |
| 688 | 7839 char_u *ml; |
| 685 | 7840 |
| 7841 matchcol = shl->rm.startpos[0].col; | |
| 688 | 7842 ml = ml_get_buf(shl->buf, lnum, FALSE) + matchcol; |
| 685 | 7843 if (*ml == NUL) |
| 7844 { | |
| 7845 ++matchcol; | |
| 7 | 7846 shl->lnum = 0; |
| 7847 break; | |
| 7848 } | |
| 685 | 7849 if (has_mbyte) |
| 7850 matchcol += mb_ptr2len(ml); | |
| 7851 else | |
| 7852 ++matchcol; | |
| 7 | 7853 } |
| 7854 else | |
| 7855 matchcol = shl->rm.endpos[0].col; | |
| 7856 | |
| 7857 shl->lnum = lnum; | |
| 5979 | 7858 if (shl->rm.regprog != NULL) |
| 7859 { | |
| 6394 | 7860 /* Remember whether shl->rm is using a copy of the regprog in |
| 7861 * cur->match. */ | |
| 7862 int regprog_is_copy = (shl != &search_hl && cur != NULL | |
| 7863 && shl == &cur->hl | |
| 7864 && cur->match.regprog == cur->hl.rm.regprog); | |
|
11521
578df034735d
patch 8.0.0643: when a pattern search is slow Vim becomes unusable
Christian Brabandt <cb@256bit.org>
parents:
11516
diff
changeset
|
7865 int timed_out = FALSE; |
| 6394 | 7866 |
| 5979 | 7867 nmatched = vim_regexec_multi(&shl->rm, win, shl->buf, lnum, |
| 7868 matchcol, | |
| 1521 | 7869 #ifdef FEAT_RELTIME |
|
11521
578df034735d
patch 8.0.0643: when a pattern search is slow Vim becomes unusable
Christian Brabandt <cb@256bit.org>
parents:
11516
diff
changeset
|
7870 &(shl->tm), &timed_out |
| 1521 | 7871 #else |
|
11521
578df034735d
patch 8.0.0643: when a pattern search is slow Vim becomes unusable
Christian Brabandt <cb@256bit.org>
parents:
11516
diff
changeset
|
7872 NULL, NULL |
| 5979 | 7873 #endif |
| 7874 ); | |
| 6394 | 7875 /* Copy the regprog, in case it got freed and recompiled. */ |
| 7876 if (regprog_is_copy) | |
| 7877 cur->match.regprog = cur->hl.rm.regprog; | |
| 7878 | |
|
11521
578df034735d
patch 8.0.0643: when a pattern search is slow Vim becomes unusable
Christian Brabandt <cb@256bit.org>
parents:
11516
diff
changeset
|
7879 if (called_emsg || got_int || timed_out) |
| 5979 | 7880 { |
| 7881 /* Error while handling regexp: stop using this regexp. */ | |
| 7882 if (shl == &search_hl) | |
| 7883 { | |
| 7884 /* don't free regprog in the match list, it's a copy */ | |
| 7885 vim_regfree(shl->rm.regprog); | |
|
13792
0e9b2971d7c3
patch 8.0.1768: SET_NO_HLSEARCH() used in a wrong way
Christian Brabandt <cb@256bit.org>
parents:
13666
diff
changeset
|
7886 set_no_hlsearch(TRUE); |
| 5979 | 7887 } |
| 7888 shl->rm.regprog = NULL; | |
| 7889 shl->lnum = 0; | |
| 7890 got_int = FALSE; /* avoid the "Type :quit to exit Vim" | |
| 7891 message */ | |
| 7892 break; | |
| 7893 } | |
| 7894 } | |
| 7895 else if (cur != NULL) | |
| 7896 nmatched = next_search_hl_pos(shl, lnum, &(cur->pos), matchcol); | |
| 5987 | 7897 else |
| 7898 nmatched = 0; | |
| 7 | 7899 if (nmatched == 0) |
| 7900 { | |
| 7901 shl->lnum = 0; /* no match found */ | |
| 7902 break; | |
| 7903 } | |
| 7904 if (shl->rm.startpos[0].lnum > 0 | |
| 7905 || shl->rm.startpos[0].col >= mincol | |
| 7906 || nmatched > 1 | |
| 7907 || shl->rm.endpos[0].col > mincol) | |
| 7908 { | |
| 7909 shl->lnum += shl->rm.startpos[0].lnum; | |
| 7910 break; /* useful match found */ | |
| 7911 } | |
| 7912 } | |
|
14161
7cac4646c552
patch 8.1.0098: segfault when pattern with z() is very slow
Christian Brabandt <cb@256bit.org>
parents:
14093
diff
changeset
|
7913 |
|
7cac4646c552
patch 8.1.0098: segfault when pattern with z() is very slow
Christian Brabandt <cb@256bit.org>
parents:
14093
diff
changeset
|
7914 // Restore called_emsg for assert_fails(). |
|
7cac4646c552
patch 8.1.0098: segfault when pattern with z() is very slow
Christian Brabandt <cb@256bit.org>
parents:
14093
diff
changeset
|
7915 called_emsg = save_called_emsg; |
| 7 | 7916 } |
| 7917 | |
|
10287
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
7918 /* |
|
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
7919 * If there is a match fill "shl" and return one. |
|
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
7920 * Return zero otherwise. |
|
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
7921 */ |
| 5979 | 7922 static int |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7923 next_search_hl_pos( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7924 match_T *shl, /* points to a match */ |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7925 linenr_T lnum, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7926 posmatch_T *posmatch, /* match positions */ |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7927 colnr_T mincol) /* minimal column for a match */ |
| 5979 | 7928 { |
| 7929 int i; | |
|
10287
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
7930 int found = -1; |
|
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
7931 |
| 5979 | 7932 for (i = posmatch->cur; i < MAXPOSMATCH; i++) |
| 7933 { | |
|
10273
489eae19cad9
commit https://github.com/vim/vim/commit/a6c27ee6db2c328e0ab0e6d143e2a295a0bb9c9a
Christian Brabandt <cb@256bit.org>
parents:
10247
diff
changeset
|
7934 llpos_T *pos = &posmatch->pos[i]; |
|
489eae19cad9
commit https://github.com/vim/vim/commit/a6c27ee6db2c328e0ab0e6d143e2a295a0bb9c9a
Christian Brabandt <cb@256bit.org>
parents:
10247
diff
changeset
|
7935 |
|
489eae19cad9
commit https://github.com/vim/vim/commit/a6c27ee6db2c328e0ab0e6d143e2a295a0bb9c9a
Christian Brabandt <cb@256bit.org>
parents:
10247
diff
changeset
|
7936 if (pos->lnum == 0) |
| 5979 | 7937 break; |
|
10287
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
7938 if (pos->len == 0 && pos->col < mincol) |
| 5979 | 7939 continue; |
|
10273
489eae19cad9
commit https://github.com/vim/vim/commit/a6c27ee6db2c328e0ab0e6d143e2a295a0bb9c9a
Christian Brabandt <cb@256bit.org>
parents:
10247
diff
changeset
|
7940 if (pos->lnum == lnum) |
| 5979 | 7941 { |
|
10287
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
7942 if (found >= 0) |
|
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
7943 { |
|
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
7944 /* if this match comes before the one at "found" then swap |
|
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
7945 * them */ |
|
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
7946 if (pos->col < posmatch->pos[found].col) |
|
10273
489eae19cad9
commit https://github.com/vim/vim/commit/a6c27ee6db2c328e0ab0e6d143e2a295a0bb9c9a
Christian Brabandt <cb@256bit.org>
parents:
10247
diff
changeset
|
7947 { |
|
489eae19cad9
commit https://github.com/vim/vim/commit/a6c27ee6db2c328e0ab0e6d143e2a295a0bb9c9a
Christian Brabandt <cb@256bit.org>
parents:
10247
diff
changeset
|
7948 llpos_T tmp = *pos; |
|
489eae19cad9
commit https://github.com/vim/vim/commit/a6c27ee6db2c328e0ab0e6d143e2a295a0bb9c9a
Christian Brabandt <cb@256bit.org>
parents:
10247
diff
changeset
|
7949 |
|
10287
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
7950 *pos = posmatch->pos[found]; |
|
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
7951 posmatch->pos[found] = tmp; |
| 5979 | 7952 } |
| 7953 } | |
| 7954 else | |
|
10287
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
7955 found = i; |
| 5979 | 7956 } |
| 7957 } | |
| 7958 posmatch->cur = 0; | |
|
10287
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
7959 if (found >= 0) |
|
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
7960 { |
|
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
7961 colnr_T start = posmatch->pos[found].col == 0 |
|
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
7962 ? 0 : posmatch->pos[found].col - 1; |
|
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
7963 colnr_T end = posmatch->pos[found].col == 0 |
|
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
7964 ? MAXCOL : start + posmatch->pos[found].len; |
|
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
7965 |
|
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
7966 shl->lnum = lnum; |
| 5979 | 7967 shl->rm.startpos[0].lnum = 0; |
| 7968 shl->rm.startpos[0].col = start; | |
| 7969 shl->rm.endpos[0].lnum = 0; | |
| 7970 shl->rm.endpos[0].col = end; | |
|
9885
4e8b05fa12c6
commit https://github.com/vim/vim/commit/4f416e41243ca151b95d39d81ce23d00b1484755
Christian Brabandt <cb@256bit.org>
parents:
9877
diff
changeset
|
7971 shl->is_addpos = TRUE; |
|
10287
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
7972 posmatch->cur = found + 1; |
|
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
7973 return 1; |
|
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
7974 } |
|
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
7975 return 0; |
| 5979 | 7976 } |
| 5985 | 7977 #endif |
| 5979 | 7978 |
| 7 | 7979 static void |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7980 screen_start_highlight(int attr) |
| 7 | 7981 { |
| 7982 attrentry_T *aep = NULL; | |
| 7983 | |
| 7984 screen_attr = attr; | |
| 7985 if (full_screen | |
| 7986 #ifdef WIN3264 | |
| 7987 && termcap_active | |
| 7988 #endif | |
| 7989 ) | |
| 7990 { | |
| 7991 #ifdef FEAT_GUI | |
| 7992 if (gui.in_use) | |
| 7993 { | |
| 7994 char buf[20]; | |
| 7995 | |
| 681 | 7996 /* The GUI handles this internally. */ |
| 7997 sprintf(buf, IF_EB("\033|%dh", ESC_STR "|%dh"), attr); | |
| 7 | 7998 OUT_STR(buf); |
| 7999 } | |
| 8000 else | |
| 8001 #endif | |
| 8002 { | |
| 8003 if (attr > HL_ALL) /* special HL attr. */ | |
| 8004 { | |
|
8969
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8005 if (IS_CTERM) |
| 7 | 8006 aep = syn_cterm_attr2entry(attr); |
| 8007 else | |
| 8008 aep = syn_term_attr2entry(attr); | |
| 8009 if (aep == NULL) /* did ":syntax clear" */ | |
| 8010 attr = 0; | |
| 8011 else | |
| 8012 attr = aep->ae_attr; | |
| 8013 } | |
|
13094
72366f4e3264
patch 8.0.1422: no fallback to underline when undercurl is not set
Christian Brabandt <cb@256bit.org>
parents:
13024
diff
changeset
|
8014 if ((attr & HL_BOLD) && *T_MD != NUL) /* bold */ |
| 7 | 8015 out_str(T_MD); |
|
13339
da2a9e217200
patch 8.0.1544: when using 'termguicolors' SpellBad doesn't show
Christian Brabandt <cb@256bit.org>
parents:
13314
diff
changeset
|
8016 else if (aep != NULL && cterm_normal_fg_bold && ( |
|
9027
773d627cac0b
commit https://github.com/vim/vim/commit/61be73bb0f965a895bfb064ea3e55476ac175162
Christian Brabandt <cb@256bit.org>
parents:
8977
diff
changeset
|
8017 #ifdef FEAT_TERMGUICOLORS |
|
13339
da2a9e217200
patch 8.0.1544: when using 'termguicolors' SpellBad doesn't show
Christian Brabandt <cb@256bit.org>
parents:
13314
diff
changeset
|
8018 p_tgc && aep->ae_u.cterm.fg_rgb != CTERMCOLOR |
|
da2a9e217200
patch 8.0.1544: when using 'termguicolors' SpellBad doesn't show
Christian Brabandt <cb@256bit.org>
parents:
13314
diff
changeset
|
8019 ? aep->ae_u.cterm.fg_rgb != INVALCOLOR |
|
da2a9e217200
patch 8.0.1544: when using 'termguicolors' SpellBad doesn't show
Christian Brabandt <cb@256bit.org>
parents:
13314
diff
changeset
|
8020 : |
|
da2a9e217200
patch 8.0.1544: when using 'termguicolors' SpellBad doesn't show
Christian Brabandt <cb@256bit.org>
parents:
13314
diff
changeset
|
8021 #endif |
|
da2a9e217200
patch 8.0.1544: when using 'termguicolors' SpellBad doesn't show
Christian Brabandt <cb@256bit.org>
parents:
13314
diff
changeset
|
8022 t_colors > 1 && aep->ae_u.cterm.fg_color)) |
| 681 | 8023 /* If the Normal FG color has BOLD attribute and the new HL |
| 8024 * has a FG color defined, clear BOLD. */ | |
| 8025 out_str(T_ME); | |
|
13094
72366f4e3264
patch 8.0.1422: no fallback to underline when undercurl is not set
Christian Brabandt <cb@256bit.org>
parents:
13024
diff
changeset
|
8026 if ((attr & HL_STANDOUT) && *T_SO != NUL) /* standout */ |
| 7 | 8027 out_str(T_SO); |
|
13094
72366f4e3264
patch 8.0.1422: no fallback to underline when undercurl is not set
Christian Brabandt <cb@256bit.org>
parents:
13024
diff
changeset
|
8028 if ((attr & HL_UNDERCURL) && *T_UCS != NUL) /* undercurl */ |
|
12964
339681756948
patch 8.0.1358: undercurl is not used in the terminal
Christian Brabandt <cb@256bit.org>
parents:
12700
diff
changeset
|
8029 out_str(T_UCS); |
|
339681756948
patch 8.0.1358: undercurl is not used in the terminal
Christian Brabandt <cb@256bit.org>
parents:
12700
diff
changeset
|
8030 if (((attr & HL_UNDERLINE) /* underline or undercurl */ |
|
13094
72366f4e3264
patch 8.0.1422: no fallback to underline when undercurl is not set
Christian Brabandt <cb@256bit.org>
parents:
13024
diff
changeset
|
8031 || ((attr & HL_UNDERCURL) && *T_UCS == NUL)) |
|
72366f4e3264
patch 8.0.1422: no fallback to underline when undercurl is not set
Christian Brabandt <cb@256bit.org>
parents:
13024
diff
changeset
|
8032 && *T_US != NUL) |
| 7 | 8033 out_str(T_US); |
|
13094
72366f4e3264
patch 8.0.1422: no fallback to underline when undercurl is not set
Christian Brabandt <cb@256bit.org>
parents:
13024
diff
changeset
|
8034 if ((attr & HL_ITALIC) && *T_CZH != NUL) /* italic */ |
| 7 | 8035 out_str(T_CZH); |
|
13094
72366f4e3264
patch 8.0.1422: no fallback to underline when undercurl is not set
Christian Brabandt <cb@256bit.org>
parents:
13024
diff
changeset
|
8036 if ((attr & HL_INVERSE) && *T_MR != NUL) /* inverse (reverse) */ |
| 7 | 8037 out_str(T_MR); |
|
13094
72366f4e3264
patch 8.0.1422: no fallback to underline when undercurl is not set
Christian Brabandt <cb@256bit.org>
parents:
13024
diff
changeset
|
8038 if ((attr & HL_STRIKETHROUGH) && *T_STS != NUL) /* strike */ |
|
12317
2a8890b80923
patch 8.0.1038: strike-through text not supported
Christian Brabandt <cb@256bit.org>
parents:
12293
diff
changeset
|
8039 out_str(T_STS); |
| 7 | 8040 |
| 8041 /* | |
| 8042 * Output the color or start string after bold etc., in case the | |
| 8043 * bold etc. override the color setting. | |
| 8044 */ | |
| 8045 if (aep != NULL) | |
| 8046 { | |
|
9027
773d627cac0b
commit https://github.com/vim/vim/commit/61be73bb0f965a895bfb064ea3e55476ac175162
Christian Brabandt <cb@256bit.org>
parents:
8977
diff
changeset
|
8047 #ifdef FEAT_TERMGUICOLORS |
|
13339
da2a9e217200
patch 8.0.1544: when using 'termguicolors' SpellBad doesn't show
Christian Brabandt <cb@256bit.org>
parents:
13314
diff
changeset
|
8048 /* When 'termguicolors' is set but fg or bg is unset, |
|
da2a9e217200
patch 8.0.1544: when using 'termguicolors' SpellBad doesn't show
Christian Brabandt <cb@256bit.org>
parents:
13314
diff
changeset
|
8049 * fall back to the cterm colors. This helps for SpellBad, |
|
da2a9e217200
patch 8.0.1544: when using 'termguicolors' SpellBad doesn't show
Christian Brabandt <cb@256bit.org>
parents:
13314
diff
changeset
|
8050 * where the GUI uses a red undercurl. */ |
|
da2a9e217200
patch 8.0.1544: when using 'termguicolors' SpellBad doesn't show
Christian Brabandt <cb@256bit.org>
parents:
13314
diff
changeset
|
8051 if (p_tgc && aep->ae_u.cterm.fg_rgb != CTERMCOLOR) |
|
8969
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8052 { |
|
9939
ccb6461b82df
commit https://github.com/vim/vim/commit/1b58cdd160c2e0ada0f638679a2aa27e4665fc48
Christian Brabandt <cb@256bit.org>
parents:
9885
diff
changeset
|
8053 if (aep->ae_u.cterm.fg_rgb != INVALCOLOR) |
|
8969
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8054 term_fg_rgb_color(aep->ae_u.cterm.fg_rgb); |
|
13339
da2a9e217200
patch 8.0.1544: when using 'termguicolors' SpellBad doesn't show
Christian Brabandt <cb@256bit.org>
parents:
13314
diff
changeset
|
8055 } |
|
da2a9e217200
patch 8.0.1544: when using 'termguicolors' SpellBad doesn't show
Christian Brabandt <cb@256bit.org>
parents:
13314
diff
changeset
|
8056 else |
|
da2a9e217200
patch 8.0.1544: when using 'termguicolors' SpellBad doesn't show
Christian Brabandt <cb@256bit.org>
parents:
13314
diff
changeset
|
8057 #endif |
|
da2a9e217200
patch 8.0.1544: when using 'termguicolors' SpellBad doesn't show
Christian Brabandt <cb@256bit.org>
parents:
13314
diff
changeset
|
8058 if (t_colors > 1) |
|
da2a9e217200
patch 8.0.1544: when using 'termguicolors' SpellBad doesn't show
Christian Brabandt <cb@256bit.org>
parents:
13314
diff
changeset
|
8059 { |
|
da2a9e217200
patch 8.0.1544: when using 'termguicolors' SpellBad doesn't show
Christian Brabandt <cb@256bit.org>
parents:
13314
diff
changeset
|
8060 if (aep->ae_u.cterm.fg_color) |
|
da2a9e217200
patch 8.0.1544: when using 'termguicolors' SpellBad doesn't show
Christian Brabandt <cb@256bit.org>
parents:
13314
diff
changeset
|
8061 term_fg_color(aep->ae_u.cterm.fg_color - 1); |
|
da2a9e217200
patch 8.0.1544: when using 'termguicolors' SpellBad doesn't show
Christian Brabandt <cb@256bit.org>
parents:
13314
diff
changeset
|
8062 } |
|
da2a9e217200
patch 8.0.1544: when using 'termguicolors' SpellBad doesn't show
Christian Brabandt <cb@256bit.org>
parents:
13314
diff
changeset
|
8063 #ifdef FEAT_TERMGUICOLORS |
|
da2a9e217200
patch 8.0.1544: when using 'termguicolors' SpellBad doesn't show
Christian Brabandt <cb@256bit.org>
parents:
13314
diff
changeset
|
8064 if (p_tgc && aep->ae_u.cterm.bg_rgb != CTERMCOLOR) |
|
da2a9e217200
patch 8.0.1544: when using 'termguicolors' SpellBad doesn't show
Christian Brabandt <cb@256bit.org>
parents:
13314
diff
changeset
|
8065 { |
|
9939
ccb6461b82df
commit https://github.com/vim/vim/commit/1b58cdd160c2e0ada0f638679a2aa27e4665fc48
Christian Brabandt <cb@256bit.org>
parents:
9885
diff
changeset
|
8066 if (aep->ae_u.cterm.bg_rgb != INVALCOLOR) |
|
8969
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8067 term_bg_rgb_color(aep->ae_u.cterm.bg_rgb); |
| 7 | 8068 } |
| 8069 else | |
|
8969
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8070 #endif |
|
13339
da2a9e217200
patch 8.0.1544: when using 'termguicolors' SpellBad doesn't show
Christian Brabandt <cb@256bit.org>
parents:
13314
diff
changeset
|
8071 if (t_colors > 1) |
|
da2a9e217200
patch 8.0.1544: when using 'termguicolors' SpellBad doesn't show
Christian Brabandt <cb@256bit.org>
parents:
13314
diff
changeset
|
8072 { |
|
da2a9e217200
patch 8.0.1544: when using 'termguicolors' SpellBad doesn't show
Christian Brabandt <cb@256bit.org>
parents:
13314
diff
changeset
|
8073 if (aep->ae_u.cterm.bg_color) |
|
da2a9e217200
patch 8.0.1544: when using 'termguicolors' SpellBad doesn't show
Christian Brabandt <cb@256bit.org>
parents:
13314
diff
changeset
|
8074 term_bg_color(aep->ae_u.cterm.bg_color - 1); |
|
da2a9e217200
patch 8.0.1544: when using 'termguicolors' SpellBad doesn't show
Christian Brabandt <cb@256bit.org>
parents:
13314
diff
changeset
|
8075 } |
|
da2a9e217200
patch 8.0.1544: when using 'termguicolors' SpellBad doesn't show
Christian Brabandt <cb@256bit.org>
parents:
13314
diff
changeset
|
8076 |
|
13452
9b09f6e470e0
patch 8.0.1600: crash when setting t_Co to zero when 'termguicolors' is set
Christian Brabandt <cb@256bit.org>
parents:
13400
diff
changeset
|
8077 if (!IS_CTERM) |
|
13339
da2a9e217200
patch 8.0.1544: when using 'termguicolors' SpellBad doesn't show
Christian Brabandt <cb@256bit.org>
parents:
13314
diff
changeset
|
8078 { |
|
da2a9e217200
patch 8.0.1544: when using 'termguicolors' SpellBad doesn't show
Christian Brabandt <cb@256bit.org>
parents:
13314
diff
changeset
|
8079 if (aep->ae_u.term.start != NULL) |
|
da2a9e217200
patch 8.0.1544: when using 'termguicolors' SpellBad doesn't show
Christian Brabandt <cb@256bit.org>
parents:
13314
diff
changeset
|
8080 out_str(aep->ae_u.term.start); |
| 7 | 8081 } |
| 8082 } | |
| 8083 } | |
| 8084 } | |
| 8085 } | |
| 8086 | |
| 8087 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8088 screen_stop_highlight(void) |
| 7 | 8089 { |
| 8090 int do_ME = FALSE; /* output T_ME code */ | |
| 8091 | |
| 8092 if (screen_attr != 0 | |
| 8093 #ifdef WIN3264 | |
| 8094 && termcap_active | |
| 8095 #endif | |
| 8096 ) | |
| 8097 { | |
| 8098 #ifdef FEAT_GUI | |
| 8099 if (gui.in_use) | |
| 8100 { | |
| 8101 char buf[20]; | |
| 8102 | |
| 8103 /* use internal GUI code */ | |
| 8104 sprintf(buf, IF_EB("\033|%dH", ESC_STR "|%dH"), screen_attr); | |
| 8105 OUT_STR(buf); | |
| 8106 } | |
| 8107 else | |
| 8108 #endif | |
| 8109 { | |
| 8110 if (screen_attr > HL_ALL) /* special HL attr. */ | |
| 8111 { | |
| 8112 attrentry_T *aep; | |
| 8113 | |
|
8969
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8114 if (IS_CTERM) |
| 7 | 8115 { |
| 8116 /* | |
| 8117 * Assume that t_me restores the original colors! | |
| 8118 */ | |
| 8119 aep = syn_cterm_attr2entry(screen_attr); | |
|
13339
da2a9e217200
patch 8.0.1544: when using 'termguicolors' SpellBad doesn't show
Christian Brabandt <cb@256bit.org>
parents:
13314
diff
changeset
|
8120 if (aep != NULL && (( |
|
9027
773d627cac0b
commit https://github.com/vim/vim/commit/61be73bb0f965a895bfb064ea3e55476ac175162
Christian Brabandt <cb@256bit.org>
parents:
8977
diff
changeset
|
8121 #ifdef FEAT_TERMGUICOLORS |
|
13339
da2a9e217200
patch 8.0.1544: when using 'termguicolors' SpellBad doesn't show
Christian Brabandt <cb@256bit.org>
parents:
13314
diff
changeset
|
8122 p_tgc && aep->ae_u.cterm.fg_rgb != CTERMCOLOR |
|
da2a9e217200
patch 8.0.1544: when using 'termguicolors' SpellBad doesn't show
Christian Brabandt <cb@256bit.org>
parents:
13314
diff
changeset
|
8123 ? aep->ae_u.cterm.fg_rgb != INVALCOLOR |
|
da2a9e217200
patch 8.0.1544: when using 'termguicolors' SpellBad doesn't show
Christian Brabandt <cb@256bit.org>
parents:
13314
diff
changeset
|
8124 : |
|
da2a9e217200
patch 8.0.1544: when using 'termguicolors' SpellBad doesn't show
Christian Brabandt <cb@256bit.org>
parents:
13314
diff
changeset
|
8125 #endif |
|
da2a9e217200
patch 8.0.1544: when using 'termguicolors' SpellBad doesn't show
Christian Brabandt <cb@256bit.org>
parents:
13314
diff
changeset
|
8126 aep->ae_u.cterm.fg_color) || ( |
|
9027
773d627cac0b
commit https://github.com/vim/vim/commit/61be73bb0f965a895bfb064ea3e55476ac175162
Christian Brabandt <cb@256bit.org>
parents:
8977
diff
changeset
|
8127 #ifdef FEAT_TERMGUICOLORS |
|
13339
da2a9e217200
patch 8.0.1544: when using 'termguicolors' SpellBad doesn't show
Christian Brabandt <cb@256bit.org>
parents:
13314
diff
changeset
|
8128 p_tgc && aep->ae_u.cterm.bg_rgb != CTERMCOLOR |
|
da2a9e217200
patch 8.0.1544: when using 'termguicolors' SpellBad doesn't show
Christian Brabandt <cb@256bit.org>
parents:
13314
diff
changeset
|
8129 ? aep->ae_u.cterm.bg_rgb != INVALCOLOR |
|
da2a9e217200
patch 8.0.1544: when using 'termguicolors' SpellBad doesn't show
Christian Brabandt <cb@256bit.org>
parents:
13314
diff
changeset
|
8130 : |
|
da2a9e217200
patch 8.0.1544: when using 'termguicolors' SpellBad doesn't show
Christian Brabandt <cb@256bit.org>
parents:
13314
diff
changeset
|
8131 #endif |
|
da2a9e217200
patch 8.0.1544: when using 'termguicolors' SpellBad doesn't show
Christian Brabandt <cb@256bit.org>
parents:
13314
diff
changeset
|
8132 aep->ae_u.cterm.bg_color))) |
| 7 | 8133 do_ME = TRUE; |
| 8134 } | |
| 8135 else | |
| 8136 { | |
| 8137 aep = syn_term_attr2entry(screen_attr); | |
| 8138 if (aep != NULL && aep->ae_u.term.stop != NULL) | |
| 8139 { | |
| 8140 if (STRCMP(aep->ae_u.term.stop, T_ME) == 0) | |
| 8141 do_ME = TRUE; | |
| 8142 else | |
| 8143 out_str(aep->ae_u.term.stop); | |
| 8144 } | |
| 8145 } | |
| 8146 if (aep == NULL) /* did ":syntax clear" */ | |
| 8147 screen_attr = 0; | |
| 8148 else | |
| 8149 screen_attr = aep->ae_attr; | |
| 8150 } | |
| 8151 | |
| 8152 /* | |
| 8153 * Often all ending-codes are equal to T_ME. Avoid outputting the | |
| 8154 * same sequence several times. | |
| 8155 */ | |
| 8156 if (screen_attr & HL_STANDOUT) | |
| 8157 { | |
| 8158 if (STRCMP(T_SE, T_ME) == 0) | |
| 8159 do_ME = TRUE; | |
| 8160 else | |
| 8161 out_str(T_SE); | |
| 8162 } | |
|
13094
72366f4e3264
patch 8.0.1422: no fallback to underline when undercurl is not set
Christian Brabandt <cb@256bit.org>
parents:
13024
diff
changeset
|
8163 if ((screen_attr & HL_UNDERCURL) && *T_UCE != NUL) |
|
12964
339681756948
patch 8.0.1358: undercurl is not used in the terminal
Christian Brabandt <cb@256bit.org>
parents:
12700
diff
changeset
|
8164 { |
|
339681756948
patch 8.0.1358: undercurl is not used in the terminal
Christian Brabandt <cb@256bit.org>
parents:
12700
diff
changeset
|
8165 if (STRCMP(T_UCE, T_ME) == 0) |
|
339681756948
patch 8.0.1358: undercurl is not used in the terminal
Christian Brabandt <cb@256bit.org>
parents:
12700
diff
changeset
|
8166 do_ME = TRUE; |
|
339681756948
patch 8.0.1358: undercurl is not used in the terminal
Christian Brabandt <cb@256bit.org>
parents:
12700
diff
changeset
|
8167 else |
|
339681756948
patch 8.0.1358: undercurl is not used in the terminal
Christian Brabandt <cb@256bit.org>
parents:
12700
diff
changeset
|
8168 out_str(T_UCE); |
|
339681756948
patch 8.0.1358: undercurl is not used in the terminal
Christian Brabandt <cb@256bit.org>
parents:
12700
diff
changeset
|
8169 } |
|
339681756948
patch 8.0.1358: undercurl is not used in the terminal
Christian Brabandt <cb@256bit.org>
parents:
12700
diff
changeset
|
8170 if ((screen_attr & HL_UNDERLINE) |
|
13094
72366f4e3264
patch 8.0.1422: no fallback to underline when undercurl is not set
Christian Brabandt <cb@256bit.org>
parents:
13024
diff
changeset
|
8171 || ((screen_attr & HL_UNDERCURL) && *T_UCE == NUL)) |
| 7 | 8172 { |
| 8173 if (STRCMP(T_UE, T_ME) == 0) | |
| 8174 do_ME = TRUE; | |
| 8175 else | |
| 8176 out_str(T_UE); | |
| 8177 } | |
| 8178 if (screen_attr & HL_ITALIC) | |
| 8179 { | |
| 8180 if (STRCMP(T_CZR, T_ME) == 0) | |
| 8181 do_ME = TRUE; | |
| 8182 else | |
| 8183 out_str(T_CZR); | |
| 8184 } | |
|
12317
2a8890b80923
patch 8.0.1038: strike-through text not supported
Christian Brabandt <cb@256bit.org>
parents:
12293
diff
changeset
|
8185 if (screen_attr & HL_STRIKETHROUGH) |
|
2a8890b80923
patch 8.0.1038: strike-through text not supported
Christian Brabandt <cb@256bit.org>
parents:
12293
diff
changeset
|
8186 { |
|
2a8890b80923
patch 8.0.1038: strike-through text not supported
Christian Brabandt <cb@256bit.org>
parents:
12293
diff
changeset
|
8187 if (STRCMP(T_STE, T_ME) == 0) |
|
2a8890b80923
patch 8.0.1038: strike-through text not supported
Christian Brabandt <cb@256bit.org>
parents:
12293
diff
changeset
|
8188 do_ME = TRUE; |
|
2a8890b80923
patch 8.0.1038: strike-through text not supported
Christian Brabandt <cb@256bit.org>
parents:
12293
diff
changeset
|
8189 else |
|
2a8890b80923
patch 8.0.1038: strike-through text not supported
Christian Brabandt <cb@256bit.org>
parents:
12293
diff
changeset
|
8190 out_str(T_STE); |
|
2a8890b80923
patch 8.0.1038: strike-through text not supported
Christian Brabandt <cb@256bit.org>
parents:
12293
diff
changeset
|
8191 } |
| 7 | 8192 if (do_ME || (screen_attr & (HL_BOLD | HL_INVERSE))) |
| 8193 out_str(T_ME); | |
| 8194 | |
|
9027
773d627cac0b
commit https://github.com/vim/vim/commit/61be73bb0f965a895bfb064ea3e55476ac175162
Christian Brabandt <cb@256bit.org>
parents:
8977
diff
changeset
|
8195 #ifdef FEAT_TERMGUICOLORS |
|
773d627cac0b
commit https://github.com/vim/vim/commit/61be73bb0f965a895bfb064ea3e55476ac175162
Christian Brabandt <cb@256bit.org>
parents:
8977
diff
changeset
|
8196 if (p_tgc) |
|
8969
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8197 { |
|
9939
ccb6461b82df
commit https://github.com/vim/vim/commit/1b58cdd160c2e0ada0f638679a2aa27e4665fc48
Christian Brabandt <cb@256bit.org>
parents:
9885
diff
changeset
|
8198 if (cterm_normal_fg_gui_color != INVALCOLOR) |
|
8969
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8199 term_fg_rgb_color(cterm_normal_fg_gui_color); |
|
9939
ccb6461b82df
commit https://github.com/vim/vim/commit/1b58cdd160c2e0ada0f638679a2aa27e4665fc48
Christian Brabandt <cb@256bit.org>
parents:
9885
diff
changeset
|
8200 if (cterm_normal_bg_gui_color != INVALCOLOR) |
|
8969
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8201 term_bg_rgb_color(cterm_normal_bg_gui_color); |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8202 } |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8203 else |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8204 #endif |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8205 { |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8206 if (t_colors > 1) |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8207 { |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8208 /* set Normal cterm colors */ |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8209 if (cterm_normal_fg_color != 0) |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8210 term_fg_color(cterm_normal_fg_color - 1); |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8211 if (cterm_normal_bg_color != 0) |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8212 term_bg_color(cterm_normal_bg_color - 1); |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8213 if (cterm_normal_fg_bold) |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8214 out_str(T_MD); |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8215 } |
| 7 | 8216 } |
| 8217 } | |
| 8218 } | |
| 8219 screen_attr = 0; | |
| 8220 } | |
| 8221 | |
| 8222 /* | |
| 8223 * Reset the colors for a cterm. Used when leaving Vim. | |
| 8224 * The machine specific code may override this again. | |
| 8225 */ | |
| 8226 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8227 reset_cterm_colors(void) |
| 7 | 8228 { |
|
8969
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8229 if (IS_CTERM) |
| 7 | 8230 { |
| 8231 /* set Normal cterm colors */ | |
|
9027
773d627cac0b
commit https://github.com/vim/vim/commit/61be73bb0f965a895bfb064ea3e55476ac175162
Christian Brabandt <cb@256bit.org>
parents:
8977
diff
changeset
|
8232 #ifdef FEAT_TERMGUICOLORS |
|
9939
ccb6461b82df
commit https://github.com/vim/vim/commit/1b58cdd160c2e0ada0f638679a2aa27e4665fc48
Christian Brabandt <cb@256bit.org>
parents:
9885
diff
changeset
|
8233 if (p_tgc ? (cterm_normal_fg_gui_color != INVALCOLOR |
|
ccb6461b82df
commit https://github.com/vim/vim/commit/1b58cdd160c2e0ada0f638679a2aa27e4665fc48
Christian Brabandt <cb@256bit.org>
parents:
9885
diff
changeset
|
8234 || cterm_normal_bg_gui_color != INVALCOLOR) |
|
ccb6461b82df
commit https://github.com/vim/vim/commit/1b58cdd160c2e0ada0f638679a2aa27e4665fc48
Christian Brabandt <cb@256bit.org>
parents:
9885
diff
changeset
|
8235 : (cterm_normal_fg_color > 0 || cterm_normal_bg_color > 0)) |
|
8969
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8236 #else |
| 7 | 8237 if (cterm_normal_fg_color > 0 || cterm_normal_bg_color > 0) |
|
8969
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8238 #endif |
| 7 | 8239 { |
| 8240 out_str(T_OP); | |
| 8241 screen_attr = -1; | |
| 8242 } | |
| 8243 if (cterm_normal_fg_bold) | |
| 8244 { | |
| 8245 out_str(T_ME); | |
| 8246 screen_attr = -1; | |
| 8247 } | |
| 8248 } | |
| 8249 } | |
| 8250 | |
| 8251 /* | |
| 8252 * Put character ScreenLines["off"] on the screen at position "row" and "col", | |
| 8253 * using the attributes from ScreenAttrs["off"]. | |
| 8254 */ | |
| 8255 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8256 screen_char(unsigned off, int row, int col) |
| 7 | 8257 { |
| 8258 int attr; | |
| 8259 | |
| 8260 /* Check for illegal values, just in case (could happen just after | |
| 8261 * resizing). */ | |
| 8262 if (row >= screen_Rows || col >= screen_Columns) | |
| 8263 return; | |
| 8264 | |
|
15521
6d949e552e99
patch 8.1.0768: updating completions may cause the popup menu to flicker
Bram Moolenaar <Bram@vim.org>
parents:
15502
diff
changeset
|
8265 #ifdef FEAT_INS_EXPAND |
|
6d949e552e99
patch 8.1.0768: updating completions may cause the popup menu to flicker
Bram Moolenaar <Bram@vim.org>
parents:
15502
diff
changeset
|
8266 if (pum_under_menu(row, col)) |
|
6d949e552e99
patch 8.1.0768: updating completions may cause the popup menu to flicker
Bram Moolenaar <Bram@vim.org>
parents:
15502
diff
changeset
|
8267 return; |
|
6d949e552e99
patch 8.1.0768: updating completions may cause the popup menu to flicker
Bram Moolenaar <Bram@vim.org>
parents:
15502
diff
changeset
|
8268 #endif |
| 6602 | 8269 /* Outputting a character in the last cell on the screen may scroll the |
| 8270 * screen up. Only do it when the "xn" termcap property is set, otherwise | |
| 8271 * mark the character invalid (update it when scrolled up). */ | |
| 8272 if (*T_XN == NUL | |
| 8273 && row == screen_Rows - 1 && col == screen_Columns - 1 | |
| 7 | 8274 #ifdef FEAT_RIGHTLEFT |
| 8275 /* account for first command-line character in rightleft mode */ | |
| 8276 && !cmdmsg_rl | |
| 8277 #endif | |
| 8278 ) | |
| 8279 { | |
| 8280 ScreenAttrs[off] = (sattr_T)-1; | |
| 8281 return; | |
| 8282 } | |
| 8283 | |
| 8284 /* | |
| 8285 * Stop highlighting first, so it's easier to move the cursor. | |
| 8286 */ | |
| 8287 if (screen_char_attr != 0) | |
| 8288 attr = screen_char_attr; | |
| 8289 else | |
| 8290 attr = ScreenAttrs[off]; | |
| 8291 if (screen_attr != attr) | |
| 8292 screen_stop_highlight(); | |
| 8293 | |
| 8294 windgoto(row, col); | |
| 8295 | |
| 8296 if (screen_attr != attr) | |
| 8297 screen_start_highlight(attr); | |
| 8298 | |
| 8299 if (enc_utf8 && ScreenLinesUC[off] != 0) | |
| 8300 { | |
| 8301 char_u buf[MB_MAXBYTES + 1]; | |
| 8302 | |
|
8819
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8817
diff
changeset
|
8303 if (utf_ambiguous_width(ScreenLinesUC[off])) |
|
13024
27934188d7b5
patch 8.0.1388: char not overwritten with ambiguous width char
Christian Brabandt <cb@256bit.org>
parents:
12998
diff
changeset
|
8304 { |
|
27934188d7b5
patch 8.0.1388: char not overwritten with ambiguous width char
Christian Brabandt <cb@256bit.org>
parents:
12998
diff
changeset
|
8305 if (*p_ambw == 'd' |
|
15603
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
8306 #ifdef FEAT_GUI |
|
13024
27934188d7b5
patch 8.0.1388: char not overwritten with ambiguous width char
Christian Brabandt <cb@256bit.org>
parents:
12998
diff
changeset
|
8307 && !gui.in_use |
|
15603
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
8308 #endif |
|
13024
27934188d7b5
patch 8.0.1388: char not overwritten with ambiguous width char
Christian Brabandt <cb@256bit.org>
parents:
12998
diff
changeset
|
8309 ) |
|
27934188d7b5
patch 8.0.1388: char not overwritten with ambiguous width char
Christian Brabandt <cb@256bit.org>
parents:
12998
diff
changeset
|
8310 { |
|
27934188d7b5
patch 8.0.1388: char not overwritten with ambiguous width char
Christian Brabandt <cb@256bit.org>
parents:
12998
diff
changeset
|
8311 /* Clear the two screen cells. If the character is actually |
|
27934188d7b5
patch 8.0.1388: char not overwritten with ambiguous width char
Christian Brabandt <cb@256bit.org>
parents:
12998
diff
changeset
|
8312 * single width it won't change the second cell. */ |
|
27934188d7b5
patch 8.0.1388: char not overwritten with ambiguous width char
Christian Brabandt <cb@256bit.org>
parents:
12998
diff
changeset
|
8313 out_str((char_u *)" "); |
|
27934188d7b5
patch 8.0.1388: char not overwritten with ambiguous width char
Christian Brabandt <cb@256bit.org>
parents:
12998
diff
changeset
|
8314 term_windgoto(row, col); |
|
27934188d7b5
patch 8.0.1388: char not overwritten with ambiguous width char
Christian Brabandt <cb@256bit.org>
parents:
12998
diff
changeset
|
8315 } |
|
27934188d7b5
patch 8.0.1388: char not overwritten with ambiguous width char
Christian Brabandt <cb@256bit.org>
parents:
12998
diff
changeset
|
8316 /* not sure where the cursor is after drawing the ambiguous width |
|
27934188d7b5
patch 8.0.1388: char not overwritten with ambiguous width char
Christian Brabandt <cb@256bit.org>
parents:
12998
diff
changeset
|
8317 * character */ |
|
8819
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8817
diff
changeset
|
8318 screen_cur_col = 9999; |
|
13024
27934188d7b5
patch 8.0.1388: char not overwritten with ambiguous width char
Christian Brabandt <cb@256bit.org>
parents:
12998
diff
changeset
|
8319 } |
|
8819
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8817
diff
changeset
|
8320 else if (utf_char2cells(ScreenLinesUC[off]) > 1) |
| 7 | 8321 ++screen_cur_col; |
|
13024
27934188d7b5
patch 8.0.1388: char not overwritten with ambiguous width char
Christian Brabandt <cb@256bit.org>
parents:
12998
diff
changeset
|
8322 |
|
27934188d7b5
patch 8.0.1388: char not overwritten with ambiguous width char
Christian Brabandt <cb@256bit.org>
parents:
12998
diff
changeset
|
8323 /* Convert the UTF-8 character to bytes and write it. */ |
|
27934188d7b5
patch 8.0.1388: char not overwritten with ambiguous width char
Christian Brabandt <cb@256bit.org>
parents:
12998
diff
changeset
|
8324 buf[utfc_char2bytes(off, buf)] = NUL; |
|
27934188d7b5
patch 8.0.1388: char not overwritten with ambiguous width char
Christian Brabandt <cb@256bit.org>
parents:
12998
diff
changeset
|
8325 out_str(buf); |
| 7 | 8326 } |
| 8327 else | |
|
15603
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
8328 { |
| 7 | 8329 out_flush_check(); |
| 8330 out_char(ScreenLines[off]); | |
| 8331 /* double-byte character in single-width cell */ | |
| 8332 if (enc_dbcs == DBCS_JPNU && ScreenLines[off] == 0x8e) | |
| 8333 out_char(ScreenLines2[off]); | |
| 8334 } | |
| 8335 | |
| 8336 screen_cur_col++; | |
| 8337 } | |
| 8338 | |
| 8339 /* | |
| 8340 * Used for enc_dbcs only: Put one double-wide character at ScreenLines["off"] | |
| 8341 * on the screen at position 'row' and 'col'. | |
| 8342 * The attributes of the first byte is used for all. This is required to | |
| 8343 * output the two bytes of a double-byte character with nothing in between. | |
| 8344 */ | |
| 8345 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8346 screen_char_2(unsigned off, int row, int col) |
| 7 | 8347 { |
| 8348 /* Check for illegal values (could be wrong when screen was resized). */ | |
| 8349 if (off + 1 >= (unsigned)(screen_Rows * screen_Columns)) | |
| 8350 return; | |
| 8351 | |
| 8352 /* Outputting the last character on the screen may scrollup the screen. | |
| 8353 * Don't to it! Mark the character invalid (update it when scrolled up) */ | |
| 8354 if (row == screen_Rows - 1 && col >= screen_Columns - 2) | |
| 8355 { | |
| 8356 ScreenAttrs[off] = (sattr_T)-1; | |
| 8357 return; | |
| 8358 } | |
| 8359 | |
| 8360 /* Output the first byte normally (positions the cursor), then write the | |
| 8361 * second byte directly. */ | |
| 8362 screen_char(off, row, col); | |
| 8363 out_char(ScreenLines[off + 1]); | |
| 8364 ++screen_cur_col; | |
| 8365 } | |
| 8366 | |
| 8367 /* | |
| 8368 * Draw a rectangle of the screen, inverted when "invert" is TRUE. | |
| 8369 * This uses the contents of ScreenLines[] and doesn't change it. | |
| 8370 */ | |
| 8371 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8372 screen_draw_rectangle( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8373 int row, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8374 int col, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8375 int height, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8376 int width, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8377 int invert) |
| 7 | 8378 { |
| 8379 int r, c; | |
| 8380 int off; | |
| 1378 | 8381 int max_off; |
| 7 | 8382 |
| 534 | 8383 /* Can't use ScreenLines unless initialized */ |
| 8384 if (ScreenLines == NULL) | |
| 8385 return; | |
| 8386 | |
| 7 | 8387 if (invert) |
| 8388 screen_char_attr = HL_INVERSE; | |
| 8389 for (r = row; r < row + height; ++r) | |
| 8390 { | |
| 8391 off = LineOffset[r]; | |
| 1378 | 8392 max_off = off + screen_Columns; |
| 7 | 8393 for (c = col; c < col + width; ++c) |
| 8394 { | |
| 1378 | 8395 if (enc_dbcs != 0 && dbcs_off2cells(off + c, max_off) > 1) |
| 7 | 8396 { |
| 8397 screen_char_2(off + c, r, c); | |
| 8398 ++c; | |
| 8399 } | |
| 8400 else | |
| 8401 { | |
| 8402 screen_char(off + c, r, c); | |
| 1378 | 8403 if (utf_off2cells(off + c, max_off) > 1) |
| 7 | 8404 ++c; |
| 8405 } | |
| 8406 } | |
| 8407 } | |
| 8408 screen_char_attr = 0; | |
| 8409 } | |
|
12477
68d7bc045dbe
patch 8.0.1118: FEAT_WINDOWS adds a lot of #ifdefs
Christian Brabandt <cb@256bit.org>
parents:
12441
diff
changeset
|
8410 |
| 7 | 8411 /* |
| 8412 * Redraw the characters for a vertically split window. | |
| 8413 */ | |
| 8414 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8415 redraw_block(int row, int end, win_T *wp) |
| 7 | 8416 { |
| 8417 int col; | |
| 8418 int width; | |
| 8419 | |
| 8420 # ifdef FEAT_CLIPBOARD | |
| 8421 clip_may_clear_selection(row, end - 1); | |
| 8422 # endif | |
| 8423 | |
| 8424 if (wp == NULL) | |
| 8425 { | |
| 8426 col = 0; | |
| 8427 width = Columns; | |
| 8428 } | |
| 8429 else | |
| 8430 { | |
| 8431 col = wp->w_wincol; | |
| 8432 width = wp->w_width; | |
| 8433 } | |
| 8434 screen_draw_rectangle(row, col, end - row, width, FALSE); | |
| 8435 } | |
| 8436 | |
|
12487
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
8437 static void |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
8438 space_to_screenline(int off, int attr) |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
8439 { |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
8440 ScreenLines[off] = ' '; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
8441 ScreenAttrs[off] = attr; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
8442 if (enc_utf8) |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
8443 ScreenLinesUC[off] = 0; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
8444 } |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
8445 |
| 7 | 8446 /* |
| 8447 * Fill the screen from 'start_row' to 'end_row', from 'start_col' to 'end_col' | |
| 8448 * with character 'c1' in first column followed by 'c2' in the other columns. | |
| 8449 * Use attributes 'attr'. | |
| 8450 */ | |
| 8451 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8452 screen_fill( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8453 int start_row, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8454 int end_row, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8455 int start_col, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8456 int end_col, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8457 int c1, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8458 int c2, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8459 int attr) |
| 7 | 8460 { |
| 8461 int row; | |
| 8462 int col; | |
| 8463 int off; | |
| 8464 int end_off; | |
| 8465 int did_delete; | |
| 8466 int c; | |
| 8467 int norm_term; | |
| 8468 #if defined(FEAT_GUI) || defined(UNIX) | |
| 8469 int force_next = FALSE; | |
| 8470 #endif | |
| 8471 | |
| 8472 if (end_row > screen_Rows) /* safety check */ | |
| 8473 end_row = screen_Rows; | |
| 8474 if (end_col > screen_Columns) /* safety check */ | |
| 8475 end_col = screen_Columns; | |
| 8476 if (ScreenLines == NULL | |
| 8477 || start_row >= end_row | |
| 8478 || start_col >= end_col) /* nothing to do */ | |
| 8479 return; | |
| 8480 | |
| 8481 /* it's a "normal" terminal when not in a GUI or cterm */ | |
| 8482 norm_term = ( | |
| 8483 #ifdef FEAT_GUI | |
| 8484 !gui.in_use && | |
| 8485 #endif | |
|
8969
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8486 !IS_CTERM); |
| 7 | 8487 for (row = start_row; row < end_row; ++row) |
| 8488 { | |
| 1668 | 8489 if (has_mbyte |
|
15603
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
8490 #ifdef FEAT_GUI |
| 1668 | 8491 && !gui.in_use |
|
15603
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
8492 #endif |
| 1668 | 8493 ) |
| 8494 { | |
| 8495 /* When drawing over the right halve of a double-wide char clear | |
| 8496 * out the left halve. When drawing over the left halve of a | |
| 8497 * double wide-char clear out the right halve. Only needed in a | |
| 8498 * terminal. */ | |
| 1685 | 8499 if (start_col > 0 && mb_fix_col(start_col, row) != start_col) |
| 1670 | 8500 screen_puts_len((char_u *)" ", 1, row, start_col - 1, 0); |
| 1677 | 8501 if (end_col < screen_Columns && mb_fix_col(end_col, row) != end_col) |
| 1670 | 8502 screen_puts_len((char_u *)" ", 1, row, end_col, 0); |
| 1668 | 8503 } |
| 7 | 8504 /* |
| 8505 * Try to use delete-line termcap code, when no attributes or in a | |
| 8506 * "normal" terminal, where a bold/italic space is just a | |
| 8507 * space. | |
| 8508 */ | |
| 8509 did_delete = FALSE; | |
| 8510 if (c2 == ' ' | |
| 8511 && end_col == Columns | |
| 8512 && can_clear(T_CE) | |
| 8513 && (attr == 0 | |
| 8514 || (norm_term | |
| 8515 && attr <= HL_ALL | |
| 8516 && ((attr & ~(HL_BOLD | HL_ITALIC)) == 0)))) | |
| 8517 { | |
| 8518 /* | |
| 8519 * check if we really need to clear something | |
| 8520 */ | |
| 8521 col = start_col; | |
| 8522 if (c1 != ' ') /* don't clear first char */ | |
| 8523 ++col; | |
| 8524 | |
| 8525 off = LineOffset[row] + col; | |
| 8526 end_off = LineOffset[row] + end_col; | |
| 8527 | |
| 8528 /* skip blanks (used often, keep it fast!) */ | |
| 8529 if (enc_utf8) | |
| 8530 while (off < end_off && ScreenLines[off] == ' ' | |
| 8531 && ScreenAttrs[off] == 0 && ScreenLinesUC[off] == 0) | |
| 8532 ++off; | |
| 8533 else | |
| 8534 while (off < end_off && ScreenLines[off] == ' ' | |
| 8535 && ScreenAttrs[off] == 0) | |
| 8536 ++off; | |
| 8537 if (off < end_off) /* something to be cleared */ | |
| 8538 { | |
| 8539 col = off - LineOffset[row]; | |
| 8540 screen_stop_highlight(); | |
| 8541 term_windgoto(row, col);/* clear rest of this screen line */ | |
| 8542 out_str(T_CE); | |
| 8543 screen_start(); /* don't know where cursor is now */ | |
| 8544 col = end_col - col; | |
| 8545 while (col--) /* clear chars in ScreenLines */ | |
| 8546 { | |
|
12487
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
8547 space_to_screenline(off, 0); |
| 7 | 8548 ++off; |
| 8549 } | |
| 8550 } | |
| 8551 did_delete = TRUE; /* the chars are cleared now */ | |
| 8552 } | |
| 8553 | |
| 8554 off = LineOffset[row] + start_col; | |
| 8555 c = c1; | |
| 8556 for (col = start_col; col < end_col; ++col) | |
| 8557 { | |
| 8558 if (ScreenLines[off] != c | |
| 714 | 8559 || (enc_utf8 && (int)ScreenLinesUC[off] |
| 8560 != (c >= 0x80 ? c : 0)) | |
| 7 | 8561 || ScreenAttrs[off] != attr |
| 8562 #if defined(FEAT_GUI) || defined(UNIX) | |
| 8563 || force_next | |
| 8564 #endif | |
| 8565 ) | |
| 8566 { | |
| 8567 #if defined(FEAT_GUI) || defined(UNIX) | |
| 8568 /* The bold trick may make a single row of pixels appear in | |
| 8569 * the next character. When a bold character is removed, the | |
| 8570 * next character should be redrawn too. This happens for our | |
| 8571 * own GUI and for some xterms. */ | |
| 8572 if ( | |
| 8573 # ifdef FEAT_GUI | |
| 8574 gui.in_use | |
| 8575 # endif | |
| 8576 # if defined(FEAT_GUI) && defined(UNIX) | |
| 8577 || | |
| 8578 # endif | |
| 8579 # ifdef UNIX | |
| 8580 term_is_xterm | |
| 8581 # endif | |
| 8582 ) | |
| 8583 { | |
| 8584 if (ScreenLines[off] != ' ' | |
| 8585 && (ScreenAttrs[off] > HL_ALL | |
| 8586 || ScreenAttrs[off] & HL_BOLD)) | |
| 8587 force_next = TRUE; | |
| 8588 else | |
| 8589 force_next = FALSE; | |
| 8590 } | |
| 8591 #endif | |
| 8592 ScreenLines[off] = c; | |
| 8593 if (enc_utf8) | |
| 8594 { | |
| 8595 if (c >= 0x80) | |
| 8596 { | |
| 8597 ScreenLinesUC[off] = c; | |
| 714 | 8598 ScreenLinesC[0][off] = 0; |
| 7 | 8599 } |
| 8600 else | |
| 8601 ScreenLinesUC[off] = 0; | |
| 8602 } | |
| 8603 ScreenAttrs[off] = attr; | |
| 8604 if (!did_delete || c != ' ') | |
| 8605 screen_char(off, row, col); | |
| 8606 } | |
| 8607 ++off; | |
| 8608 if (col == start_col) | |
| 8609 { | |
| 8610 if (did_delete) | |
| 8611 break; | |
| 8612 c = c2; | |
| 8613 } | |
| 8614 } | |
| 8615 if (end_col == Columns) | |
| 8616 LineWraps[row] = FALSE; | |
| 8617 if (row == Rows - 1) /* overwritten the command line */ | |
| 8618 { | |
| 8619 redraw_cmdline = TRUE; | |
|
13666
57da3d873f20
patch 8.0.1705: when making a vertical split the mode message isn't updated
Christian Brabandt <cb@256bit.org>
parents:
13632
diff
changeset
|
8620 if (start_col == 0 && end_col == Columns |
|
57da3d873f20
patch 8.0.1705: when making a vertical split the mode message isn't updated
Christian Brabandt <cb@256bit.org>
parents:
13632
diff
changeset
|
8621 && c1 == ' ' && c2 == ' ' && attr == 0) |
| 7 | 8622 clear_cmdline = FALSE; /* command line has been cleared */ |
| 644 | 8623 if (start_col == 0) |
| 8624 mode_displayed = FALSE; /* mode cleared or overwritten */ | |
| 7 | 8625 } |
| 8626 } | |
| 8627 } | |
| 8628 | |
| 8629 /* | |
| 8630 * Check if there should be a delay. Used before clearing or redrawing the | |
| 8631 * screen or the command line. | |
| 8632 */ | |
| 8633 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8634 check_for_delay(int check_msg_scroll) |
| 7 | 8635 { |
| 8636 if ((emsg_on_display || (check_msg_scroll && msg_scroll)) | |
| 8637 && !did_wait_return | |
| 8638 && emsg_silent == 0) | |
| 8639 { | |
| 8640 out_flush(); | |
| 8641 ui_delay(1000L, TRUE); | |
| 8642 emsg_on_display = FALSE; | |
| 8643 if (check_msg_scroll) | |
| 8644 msg_scroll = FALSE; | |
| 8645 } | |
| 8646 } | |
| 8647 | |
| 8648 /* | |
| 8649 * screen_valid - allocate screen buffers if size changed | |
| 3263 | 8650 * If "doclear" is TRUE: clear screen if it has been resized. |
| 7 | 8651 * Returns TRUE if there is a valid screen to write to. |
| 8652 * Returns FALSE when starting up and screen not initialized yet. | |
| 8653 */ | |
| 8654 int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8655 screen_valid(int doclear) |
| 7 | 8656 { |
| 3263 | 8657 screenalloc(doclear); /* allocate screen buffers if size changed */ |
| 7 | 8658 return (ScreenLines != NULL); |
| 8659 } | |
| 8660 | |
| 8661 /* | |
| 8662 * Resize the shell to Rows and Columns. | |
| 8663 * Allocate ScreenLines[] and associated items. | |
| 8664 * | |
| 8665 * There may be some time between setting Rows and Columns and (re)allocating | |
| 8666 * ScreenLines[]. This happens when starting up and when (manually) changing | |
| 8667 * the shell size. Always use screen_Rows and screen_Columns to access items | |
| 8668 * in ScreenLines[]. Use Rows and Columns for positioning text etc. where the | |
| 8669 * final size of the shell is needed. | |
| 8670 */ | |
| 8671 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8672 screenalloc(int doclear) |
| 7 | 8673 { |
| 8674 int new_row, old_row; | |
| 8675 #ifdef FEAT_GUI | |
| 8676 int old_Rows; | |
| 8677 #endif | |
| 8678 win_T *wp; | |
| 8679 int outofmem = FALSE; | |
| 8680 int len; | |
| 8681 schar_T *new_ScreenLines; | |
| 8682 u8char_T *new_ScreenLinesUC = NULL; | |
| 714 | 8683 u8char_T *new_ScreenLinesC[MAX_MCO]; |
| 7 | 8684 schar_T *new_ScreenLines2 = NULL; |
| 714 | 8685 int i; |
| 7 | 8686 sattr_T *new_ScreenAttrs; |
| 8687 unsigned *new_LineOffset; | |
| 8688 char_u *new_LineWraps; | |
| 681 | 8689 short *new_TabPageIdxs; |
| 671 | 8690 tabpage_T *tp; |
| 7 | 8691 static int entered = FALSE; /* avoid recursiveness */ |
| 944 | 8692 static int done_outofmem_msg = FALSE; /* did outofmem message */ |
| 1824 | 8693 int retry_count = 0; |
| 8694 | |
| 8695 retry: | |
| 7 | 8696 /* |
| 8697 * Allocation of the screen buffers is done only when the size changes and | |
| 8698 * when Rows and Columns have been set and we have started doing full | |
| 8699 * screen stuff. | |
| 8700 */ | |
| 8701 if ((ScreenLines != NULL | |
| 8702 && Rows == screen_Rows | |
| 8703 && Columns == screen_Columns | |
| 8704 && enc_utf8 == (ScreenLinesUC != NULL) | |
| 8705 && (enc_dbcs == DBCS_JPNU) == (ScreenLines2 != NULL) | |
|
15603
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
8706 && p_mco == Screen_mco) |
| 7 | 8707 || Rows == 0 |
| 8708 || Columns == 0 | |
| 8709 || (!full_screen && ScreenLines == NULL)) | |
| 8710 return; | |
| 8711 | |
| 8712 /* | |
| 8713 * It's possible that we produce an out-of-memory message below, which | |
| 8714 * will cause this function to be called again. To break the loop, just | |
| 8715 * return here. | |
| 8716 */ | |
| 8717 if (entered) | |
| 8718 return; | |
| 8719 entered = TRUE; | |
| 8720 | |
| 911 | 8721 /* |
| 8722 * Note that the window sizes are updated before reallocating the arrays, | |
| 8723 * thus we must not redraw here! | |
| 8724 */ | |
| 8725 ++RedrawingDisabled; | |
| 8726 | |
| 7 | 8727 win_new_shellsize(); /* fit the windows in the new sized shell */ |
| 8728 | |
| 8729 comp_col(); /* recompute columns for shown command and ruler */ | |
| 8730 | |
| 8731 /* | |
| 8732 * We're changing the size of the screen. | |
| 8733 * - Allocate new arrays for ScreenLines and ScreenAttrs. | |
| 8734 * - Move lines from the old arrays into the new arrays, clear extra | |
| 8735 * lines (unless the screen is going to be cleared). | |
| 8736 * - Free the old arrays. | |
| 8737 * | |
| 8738 * If anything fails, make ScreenLines NULL, so we don't do anything! | |
| 8739 * Continuing with the old ScreenLines may result in a crash, because the | |
| 8740 * size is wrong. | |
| 8741 */ | |
| 671 | 8742 FOR_ALL_TAB_WINDOWS(tp, wp) |
| 7 | 8743 win_free_lsize(wp); |
| 1946 | 8744 if (aucmd_win != NULL) |
| 8745 win_free_lsize(aucmd_win); | |
| 7 | 8746 |
| 8747 new_ScreenLines = (schar_T *)lalloc((long_u)( | |
| 8748 (Rows + 1) * Columns * sizeof(schar_T)), FALSE); | |
|
2122
476336a5ae95
updated for version 7.2.404
Bram Moolenaar <bram@zimbu.org>
parents:
2069
diff
changeset
|
8749 vim_memset(new_ScreenLinesC, 0, sizeof(u8char_T *) * MAX_MCO); |
| 7 | 8750 if (enc_utf8) |
| 8751 { | |
| 8752 new_ScreenLinesUC = (u8char_T *)lalloc((long_u)( | |
| 8753 (Rows + 1) * Columns * sizeof(u8char_T)), FALSE); | |
| 714 | 8754 for (i = 0; i < p_mco; ++i) |
|
2124
dc8a5699253b
updated for version 7.2.406
Bram Moolenaar <bram@zimbu.org>
parents:
2122
diff
changeset
|
8755 new_ScreenLinesC[i] = (u8char_T *)lalloc_clear((long_u)( |
| 7 | 8756 (Rows + 1) * Columns * sizeof(u8char_T)), FALSE); |
| 8757 } | |
| 8758 if (enc_dbcs == DBCS_JPNU) | |
| 8759 new_ScreenLines2 = (schar_T *)lalloc((long_u)( | |
| 8760 (Rows + 1) * Columns * sizeof(schar_T)), FALSE); | |
| 8761 new_ScreenAttrs = (sattr_T *)lalloc((long_u)( | |
| 8762 (Rows + 1) * Columns * sizeof(sattr_T)), FALSE); | |
| 8763 new_LineOffset = (unsigned *)lalloc((long_u)( | |
| 8764 Rows * sizeof(unsigned)), FALSE); | |
| 8765 new_LineWraps = (char_u *)lalloc((long_u)(Rows * sizeof(char_u)), FALSE); | |
| 681 | 8766 new_TabPageIdxs = (short *)lalloc((long_u)(Columns * sizeof(short)), FALSE); |
| 7 | 8767 |
| 677 | 8768 FOR_ALL_TAB_WINDOWS(tp, wp) |
| 7 | 8769 { |
| 8770 if (win_alloc_lines(wp) == FAIL) | |
| 8771 { | |
| 8772 outofmem = TRUE; | |
| 1819 | 8773 goto give_up; |
| 8774 } | |
| 8775 } | |
| 1946 | 8776 if (aucmd_win != NULL && aucmd_win->w_lines == NULL |
| 8777 && win_alloc_lines(aucmd_win) == FAIL) | |
| 1906 | 8778 outofmem = TRUE; |
| 1819 | 8779 give_up: |
| 7 | 8780 |
| 714 | 8781 for (i = 0; i < p_mco; ++i) |
| 8782 if (new_ScreenLinesC[i] == NULL) | |
| 8783 break; | |
| 7 | 8784 if (new_ScreenLines == NULL |
| 714 | 8785 || (enc_utf8 && (new_ScreenLinesUC == NULL || i != p_mco)) |
| 7 | 8786 || (enc_dbcs == DBCS_JPNU && new_ScreenLines2 == NULL) |
| 8787 || new_ScreenAttrs == NULL | |
| 8788 || new_LineOffset == NULL | |
| 8789 || new_LineWraps == NULL | |
| 671 | 8790 || new_TabPageIdxs == NULL |
| 7 | 8791 || outofmem) |
| 8792 { | |
| 944 | 8793 if (ScreenLines != NULL || !done_outofmem_msg) |
| 534 | 8794 { |
| 8795 /* guess the size */ | |
| 8796 do_outofmem_msg((long_u)((Rows + 1) * Columns)); | |
| 8797 | |
| 8798 /* Remember we did this to avoid getting outofmem messages over | |
| 8799 * and over again. */ | |
| 944 | 8800 done_outofmem_msg = TRUE; |
| 534 | 8801 } |
|
13244
ac42c4b11dbc
patch 8.0.1496: clearing a pointer takes two lines
Christian Brabandt <cb@256bit.org>
parents:
13204
diff
changeset
|
8802 VIM_CLEAR(new_ScreenLines); |
|
ac42c4b11dbc
patch 8.0.1496: clearing a pointer takes two lines
Christian Brabandt <cb@256bit.org>
parents:
13204
diff
changeset
|
8803 VIM_CLEAR(new_ScreenLinesUC); |
| 714 | 8804 for (i = 0; i < p_mco; ++i) |
|
13244
ac42c4b11dbc
patch 8.0.1496: clearing a pointer takes two lines
Christian Brabandt <cb@256bit.org>
parents:
13204
diff
changeset
|
8805 VIM_CLEAR(new_ScreenLinesC[i]); |
|
ac42c4b11dbc
patch 8.0.1496: clearing a pointer takes two lines
Christian Brabandt <cb@256bit.org>
parents:
13204
diff
changeset
|
8806 VIM_CLEAR(new_ScreenLines2); |
|
ac42c4b11dbc
patch 8.0.1496: clearing a pointer takes two lines
Christian Brabandt <cb@256bit.org>
parents:
13204
diff
changeset
|
8807 VIM_CLEAR(new_ScreenAttrs); |
|
ac42c4b11dbc
patch 8.0.1496: clearing a pointer takes two lines
Christian Brabandt <cb@256bit.org>
parents:
13204
diff
changeset
|
8808 VIM_CLEAR(new_LineOffset); |
|
ac42c4b11dbc
patch 8.0.1496: clearing a pointer takes two lines
Christian Brabandt <cb@256bit.org>
parents:
13204
diff
changeset
|
8809 VIM_CLEAR(new_LineWraps); |
|
ac42c4b11dbc
patch 8.0.1496: clearing a pointer takes two lines
Christian Brabandt <cb@256bit.org>
parents:
13204
diff
changeset
|
8810 VIM_CLEAR(new_TabPageIdxs); |
| 7 | 8811 } |
| 8812 else | |
| 8813 { | |
| 944 | 8814 done_outofmem_msg = FALSE; |
| 534 | 8815 |
| 7 | 8816 for (new_row = 0; new_row < Rows; ++new_row) |
| 8817 { | |
| 8818 new_LineOffset[new_row] = new_row * Columns; | |
| 8819 new_LineWraps[new_row] = FALSE; | |
| 8820 | |
| 8821 /* | |
| 8822 * If the screen is not going to be cleared, copy as much as | |
| 8823 * possible from the old screen to the new one and clear the rest | |
| 8824 * (used when resizing the window at the "--more--" prompt or when | |
| 8825 * executing an external command, for the GUI). | |
| 8826 */ | |
| 3263 | 8827 if (!doclear) |
| 7 | 8828 { |
| 8829 (void)vim_memset(new_ScreenLines + new_row * Columns, | |
| 8830 ' ', (size_t)Columns * sizeof(schar_T)); | |
| 8831 if (enc_utf8) | |
| 8832 { | |
| 8833 (void)vim_memset(new_ScreenLinesUC + new_row * Columns, | |
| 8834 0, (size_t)Columns * sizeof(u8char_T)); | |
| 714 | 8835 for (i = 0; i < p_mco; ++i) |
| 8836 (void)vim_memset(new_ScreenLinesC[i] | |
| 8837 + new_row * Columns, | |
| 7 | 8838 0, (size_t)Columns * sizeof(u8char_T)); |
| 8839 } | |
| 8840 if (enc_dbcs == DBCS_JPNU) | |
| 8841 (void)vim_memset(new_ScreenLines2 + new_row * Columns, | |
| 8842 0, (size_t)Columns * sizeof(schar_T)); | |
| 8843 (void)vim_memset(new_ScreenAttrs + new_row * Columns, | |
| 8844 0, (size_t)Columns * sizeof(sattr_T)); | |
| 8845 old_row = new_row + (screen_Rows - Rows); | |
| 534 | 8846 if (old_row >= 0 && ScreenLines != NULL) |
| 7 | 8847 { |
| 8848 if (screen_Columns < Columns) | |
| 8849 len = screen_Columns; | |
| 8850 else | |
| 8851 len = Columns; | |
| 571 | 8852 /* When switching to utf-8 don't copy characters, they |
| 714 | 8853 * may be invalid now. Also when p_mco changes. */ |
| 8854 if (!(enc_utf8 && ScreenLinesUC == NULL) | |
| 8855 && p_mco == Screen_mco) | |
| 26 | 8856 mch_memmove(new_ScreenLines + new_LineOffset[new_row], |
| 8857 ScreenLines + LineOffset[old_row], | |
| 8858 (size_t)len * sizeof(schar_T)); | |
| 714 | 8859 if (enc_utf8 && ScreenLinesUC != NULL |
| 8860 && p_mco == Screen_mco) | |
| 7 | 8861 { |
| 8862 mch_memmove(new_ScreenLinesUC + new_LineOffset[new_row], | |
| 8863 ScreenLinesUC + LineOffset[old_row], | |
| 8864 (size_t)len * sizeof(u8char_T)); | |
| 714 | 8865 for (i = 0; i < p_mco; ++i) |
| 8866 mch_memmove(new_ScreenLinesC[i] | |
| 8867 + new_LineOffset[new_row], | |
| 8868 ScreenLinesC[i] + LineOffset[old_row], | |
| 7 | 8869 (size_t)len * sizeof(u8char_T)); |
| 8870 } | |
| 8871 if (enc_dbcs == DBCS_JPNU && ScreenLines2 != NULL) | |
| 8872 mch_memmove(new_ScreenLines2 + new_LineOffset[new_row], | |
| 8873 ScreenLines2 + LineOffset[old_row], | |
| 8874 (size_t)len * sizeof(schar_T)); | |
| 8875 mch_memmove(new_ScreenAttrs + new_LineOffset[new_row], | |
| 8876 ScreenAttrs + LineOffset[old_row], | |
| 8877 (size_t)len * sizeof(sattr_T)); | |
| 8878 } | |
| 8879 } | |
| 8880 } | |
| 8881 /* Use the last line of the screen for the current line. */ | |
| 8882 current_ScreenLine = new_ScreenLines + Rows * Columns; | |
| 8883 } | |
| 8884 | |
| 356 | 8885 free_screenlines(); |
| 8886 | |
| 7 | 8887 ScreenLines = new_ScreenLines; |
| 8888 ScreenLinesUC = new_ScreenLinesUC; | |
| 714 | 8889 for (i = 0; i < p_mco; ++i) |
| 8890 ScreenLinesC[i] = new_ScreenLinesC[i]; | |
| 8891 Screen_mco = p_mco; | |
| 7 | 8892 ScreenLines2 = new_ScreenLines2; |
| 8893 ScreenAttrs = new_ScreenAttrs; | |
| 8894 LineOffset = new_LineOffset; | |
| 8895 LineWraps = new_LineWraps; | |
| 671 | 8896 TabPageIdxs = new_TabPageIdxs; |
| 7 | 8897 |
| 8898 /* It's important that screen_Rows and screen_Columns reflect the actual | |
| 8899 * size of ScreenLines[]. Set them before calling anything. */ | |
| 8900 #ifdef FEAT_GUI | |
| 8901 old_Rows = screen_Rows; | |
| 8902 #endif | |
| 8903 screen_Rows = Rows; | |
| 8904 screen_Columns = Columns; | |
| 8905 | |
| 8906 must_redraw = CLEAR; /* need to clear the screen later */ | |
| 3263 | 8907 if (doclear) |
| 7 | 8908 screenclear2(); |
| 8909 | |
| 8910 #ifdef FEAT_GUI | |
| 8911 else if (gui.in_use | |
| 8912 && !gui.starting | |
| 8913 && ScreenLines != NULL | |
| 8914 && old_Rows != Rows) | |
| 8915 { | |
| 8916 (void)gui_redraw_block(0, 0, (int)Rows - 1, (int)Columns - 1, 0); | |
| 8917 /* | |
| 8918 * Adjust the position of the cursor, for when executing an external | |
| 8919 * command. | |
| 8920 */ | |
| 8921 if (msg_row >= Rows) /* Rows got smaller */ | |
| 8922 msg_row = Rows - 1; /* put cursor at last row */ | |
| 8923 else if (Rows > old_Rows) /* Rows got bigger */ | |
| 8924 msg_row += Rows - old_Rows; /* put cursor in same place */ | |
| 8925 if (msg_col >= Columns) /* Columns got smaller */ | |
| 8926 msg_col = Columns - 1; /* put cursor at last column */ | |
| 8927 } | |
| 8928 #endif | |
| 8929 | |
| 8930 entered = FALSE; | |
| 911 | 8931 --RedrawingDisabled; |
| 766 | 8932 |
| 1824 | 8933 /* |
| 8934 * Do not apply autocommands more than 3 times to avoid an endless loop | |
| 8935 * in case applying autocommands always changes Rows or Columns. | |
| 8936 */ | |
| 8937 if (starting == 0 && ++retry_count <= 3) | |
| 8938 { | |
| 766 | 8939 apply_autocmds(EVENT_VIMRESIZED, NULL, NULL, FALSE, curbuf); |
| 1824 | 8940 /* In rare cases, autocommands may have altered Rows or Columns, |
| 8941 * jump back to check if we need to allocate the screen again. */ | |
| 8942 goto retry; | |
| 8943 } | |
| 7 | 8944 } |
| 8945 | |
| 8946 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8947 free_screenlines(void) |
| 356 | 8948 { |
| 714 | 8949 int i; |
| 8950 | |
| 356 | 8951 vim_free(ScreenLinesUC); |
| 714 | 8952 for (i = 0; i < Screen_mco; ++i) |
| 8953 vim_free(ScreenLinesC[i]); | |
| 356 | 8954 vim_free(ScreenLines2); |
| 714 | 8955 vim_free(ScreenLines); |
| 356 | 8956 vim_free(ScreenAttrs); |
| 8957 vim_free(LineOffset); | |
| 8958 vim_free(LineWraps); | |
| 671 | 8959 vim_free(TabPageIdxs); |
| 356 | 8960 } |
| 8961 | |
| 8962 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8963 screenclear(void) |
| 7 | 8964 { |
| 8965 check_for_delay(FALSE); | |
| 8966 screenalloc(FALSE); /* allocate screen buffers if size changed */ | |
| 8967 screenclear2(); /* clear the screen */ | |
| 8968 } | |
| 8969 | |
| 8970 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8971 screenclear2(void) |
| 7 | 8972 { |
| 8973 int i; | |
| 8974 | |
| 8975 if (starting == NO_SCREEN || ScreenLines == NULL | |
| 8976 #ifdef FEAT_GUI | |
| 8977 || (gui.in_use && gui.starting) | |
| 8978 #endif | |
| 8979 ) | |
| 8980 return; | |
| 8981 | |
| 8982 #ifdef FEAT_GUI | |
| 8983 if (!gui.in_use) | |
| 8984 #endif | |
| 8985 screen_attr = -1; /* force setting the Normal colors */ | |
| 8986 screen_stop_highlight(); /* don't want highlighting here */ | |
| 8987 | |
| 8988 #ifdef FEAT_CLIPBOARD | |
| 8989 /* disable selection without redrawing it */ | |
| 8990 clip_scroll_selection(9999); | |
| 8991 #endif | |
| 8992 | |
| 8993 /* blank out ScreenLines */ | |
| 8994 for (i = 0; i < Rows; ++i) | |
| 8995 { | |
|
12152
69af108df70e
patch 8.0.0956: scrolling in a terminal window has flicker
Christian Brabandt <cb@256bit.org>
parents:
12122
diff
changeset
|
8996 lineclear(LineOffset[i], (int)Columns, 0); |
| 7 | 8997 LineWraps[i] = FALSE; |
| 8998 } | |
| 8999 | |
| 9000 if (can_clear(T_CL)) | |
| 9001 { | |
| 9002 out_str(T_CL); /* clear the display */ | |
| 9003 clear_cmdline = FALSE; | |
| 644 | 9004 mode_displayed = FALSE; |
| 7 | 9005 } |
| 9006 else | |
| 9007 { | |
| 9008 /* can't clear the screen, mark all chars with invalid attributes */ | |
| 9009 for (i = 0; i < Rows; ++i) | |
| 9010 lineinvalid(LineOffset[i], (int)Columns); | |
| 9011 clear_cmdline = TRUE; | |
| 9012 } | |
| 9013 | |
| 9014 screen_cleared = TRUE; /* can use contents of ScreenLines now */ | |
| 9015 | |
| 9016 win_rest_invalid(firstwin); | |
| 9017 redraw_cmdline = TRUE; | |
| 673 | 9018 redraw_tabline = TRUE; |
| 7 | 9019 if (must_redraw == CLEAR) /* no need to clear again */ |
| 9020 must_redraw = NOT_VALID; | |
| 9021 compute_cmdrow(); | |
| 9022 msg_row = cmdline_row; /* put cursor on last line for messages */ | |
| 9023 msg_col = 0; | |
| 9024 screen_start(); /* don't know where cursor is now */ | |
| 9025 msg_scrolled = 0; /* can't scroll back */ | |
| 9026 msg_didany = FALSE; | |
| 9027 msg_didout = FALSE; | |
| 9028 } | |
| 9029 | |
| 9030 /* | |
| 9031 * Clear one line in ScreenLines. | |
| 9032 */ | |
| 9033 static void | |
|
12152
69af108df70e
patch 8.0.0956: scrolling in a terminal window has flicker
Christian Brabandt <cb@256bit.org>
parents:
12122
diff
changeset
|
9034 lineclear(unsigned off, int width, int attr) |
| 7 | 9035 { |
| 9036 (void)vim_memset(ScreenLines + off, ' ', (size_t)width * sizeof(schar_T)); | |
| 9037 if (enc_utf8) | |
| 9038 (void)vim_memset(ScreenLinesUC + off, 0, | |
| 9039 (size_t)width * sizeof(u8char_T)); | |
|
12152
69af108df70e
patch 8.0.0956: scrolling in a terminal window has flicker
Christian Brabandt <cb@256bit.org>
parents:
12122
diff
changeset
|
9040 (void)vim_memset(ScreenAttrs + off, attr, (size_t)width * sizeof(sattr_T)); |
| 7 | 9041 } |
| 9042 | |
| 9043 /* | |
| 9044 * Mark one line in ScreenLines invalid by setting the attributes to an | |
| 9045 * invalid value. | |
| 9046 */ | |
| 9047 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9048 lineinvalid(unsigned off, int width) |
| 7 | 9049 { |
| 9050 (void)vim_memset(ScreenAttrs + off, -1, (size_t)width * sizeof(sattr_T)); | |
| 9051 } | |
| 9052 | |
| 9053 /* | |
| 9054 * Copy part of a Screenline for vertically split window "wp". | |
| 9055 */ | |
| 9056 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9057 linecopy(int to, int from, win_T *wp) |
| 7 | 9058 { |
| 9059 unsigned off_to = LineOffset[to] + wp->w_wincol; | |
| 9060 unsigned off_from = LineOffset[from] + wp->w_wincol; | |
| 9061 | |
| 9062 mch_memmove(ScreenLines + off_to, ScreenLines + off_from, | |
| 9063 wp->w_width * sizeof(schar_T)); | |
| 9064 if (enc_utf8) | |
| 9065 { | |
| 714 | 9066 int i; |
| 9067 | |
| 7 | 9068 mch_memmove(ScreenLinesUC + off_to, ScreenLinesUC + off_from, |
| 9069 wp->w_width * sizeof(u8char_T)); | |
| 714 | 9070 for (i = 0; i < p_mco; ++i) |
| 9071 mch_memmove(ScreenLinesC[i] + off_to, ScreenLinesC[i] + off_from, | |
| 9072 wp->w_width * sizeof(u8char_T)); | |
| 7 | 9073 } |
| 9074 if (enc_dbcs == DBCS_JPNU) | |
| 9075 mch_memmove(ScreenLines2 + off_to, ScreenLines2 + off_from, | |
| 9076 wp->w_width * sizeof(schar_T)); | |
| 9077 mch_memmove(ScreenAttrs + off_to, ScreenAttrs + off_from, | |
| 9078 wp->w_width * sizeof(sattr_T)); | |
| 9079 } | |
| 9080 | |
| 9081 /* | |
| 9082 * Return TRUE if clearing with term string "p" would work. | |
| 9083 * It can't work when the string is empty or it won't set the right background. | |
| 9084 */ | |
| 9085 int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9086 can_clear(char_u *p) |
| 7 | 9087 { |
| 9088 return (*p != NUL && (t_colors <= 1 | |
| 9089 #ifdef FEAT_GUI | |
| 9090 || gui.in_use | |
| 9091 #endif | |
|
9027
773d627cac0b
commit https://github.com/vim/vim/commit/61be73bb0f965a895bfb064ea3e55476ac175162
Christian Brabandt <cb@256bit.org>
parents:
8977
diff
changeset
|
9092 #ifdef FEAT_TERMGUICOLORS |
|
9939
ccb6461b82df
commit https://github.com/vim/vim/commit/1b58cdd160c2e0ada0f638679a2aa27e4665fc48
Christian Brabandt <cb@256bit.org>
parents:
9885
diff
changeset
|
9093 || (p_tgc && cterm_normal_bg_gui_color == INVALCOLOR) |
|
9320
b6472fd9f5ba
commit https://github.com/vim/vim/commit/d18f672fc9477f3c0cb7cc4ce8d9237ed825c612
Christian Brabandt <cb@256bit.org>
parents:
9282
diff
changeset
|
9094 || (!p_tgc && cterm_normal_bg_color == 0) |
|
b6472fd9f5ba
commit https://github.com/vim/vim/commit/d18f672fc9477f3c0cb7cc4ce8d9237ed825c612
Christian Brabandt <cb@256bit.org>
parents:
9282
diff
changeset
|
9095 #else |
|
b6472fd9f5ba
commit https://github.com/vim/vim/commit/d18f672fc9477f3c0cb7cc4ce8d9237ed825c612
Christian Brabandt <cb@256bit.org>
parents:
9282
diff
changeset
|
9096 || cterm_normal_bg_color == 0 |
|
b6472fd9f5ba
commit https://github.com/vim/vim/commit/d18f672fc9477f3c0cb7cc4ce8d9237ed825c612
Christian Brabandt <cb@256bit.org>
parents:
9282
diff
changeset
|
9097 #endif |
|
b6472fd9f5ba
commit https://github.com/vim/vim/commit/d18f672fc9477f3c0cb7cc4ce8d9237ed825c612
Christian Brabandt <cb@256bit.org>
parents:
9282
diff
changeset
|
9098 || *T_UT != NUL)); |
| 7 | 9099 } |
| 9100 | |
| 9101 /* | |
| 9102 * Reset cursor position. Use whenever cursor was moved because of outputting | |
| 9103 * something directly to the screen (shell commands) or a terminal control | |
| 9104 * code. | |
| 9105 */ | |
| 9106 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9107 screen_start(void) |
| 7 | 9108 { |
| 9109 screen_cur_row = screen_cur_col = 9999; | |
| 9110 } | |
| 9111 | |
| 9112 /* | |
| 9113 * Move the cursor to position "row","col" in the screen. | |
| 9114 * This tries to find the most efficient way to move, minimizing the number of | |
| 9115 * characters sent to the terminal. | |
| 9116 */ | |
| 9117 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9118 windgoto(int row, int col) |
| 7 | 9119 { |
| 205 | 9120 sattr_T *p; |
| 7 | 9121 int i; |
| 9122 int plan; | |
| 9123 int cost; | |
| 9124 int wouldbe_col; | |
| 9125 int noinvcurs; | |
| 9126 char_u *bs; | |
| 9127 int goto_cost; | |
| 9128 int attr; | |
| 9129 | |
| 1213 | 9130 #define GOTO_COST 7 /* assume a term_windgoto() takes about 7 chars */ |
| 7 | 9131 #define HIGHL_COST 5 /* assume unhighlight takes 5 chars */ |
| 9132 | |
| 9133 #define PLAN_LE 1 | |
| 9134 #define PLAN_CR 2 | |
| 9135 #define PLAN_NL 3 | |
| 9136 #define PLAN_WRITE 4 | |
| 9137 /* Can't use ScreenLines unless initialized */ | |
| 9138 if (ScreenLines == NULL) | |
| 9139 return; | |
| 9140 | |
| 9141 if (col != screen_cur_col || row != screen_cur_row) | |
| 9142 { | |
| 9143 /* Check for valid position. */ | |
| 9144 if (row < 0) /* window without text lines? */ | |
| 9145 row = 0; | |
| 9146 if (row >= screen_Rows) | |
| 9147 row = screen_Rows - 1; | |
| 9148 if (col >= screen_Columns) | |
| 9149 col = screen_Columns - 1; | |
| 9150 | |
| 9151 /* check if no cursor movement is allowed in highlight mode */ | |
| 9152 if (screen_attr && *T_MS == NUL) | |
| 9153 noinvcurs = HIGHL_COST; | |
| 9154 else | |
| 9155 noinvcurs = 0; | |
| 9156 goto_cost = GOTO_COST + noinvcurs; | |
| 9157 | |
| 9158 /* | |
| 9159 * Plan how to do the positioning: | |
| 9160 * 1. Use CR to move it to column 0, same row. | |
| 9161 * 2. Use T_LE to move it a few columns to the left. | |
| 9162 * 3. Use NL to move a few lines down, column 0. | |
| 9163 * 4. Move a few columns to the right with T_ND or by writing chars. | |
| 9164 * | |
| 9165 * Don't do this if the cursor went beyond the last column, the cursor | |
| 9166 * position is unknown then (some terminals wrap, some don't ) | |
| 9167 * | |
| 1213 | 9168 * First check if the highlighting attributes allow us to write |
| 7 | 9169 * characters to move the cursor to the right. |
| 9170 */ | |
| 9171 if (row >= screen_cur_row && screen_cur_col < Columns) | |
| 9172 { | |
| 9173 /* | |
| 9174 * If the cursor is in the same row, bigger col, we can use CR | |
| 9175 * or T_LE. | |
| 9176 */ | |
| 9177 bs = NULL; /* init for GCC */ | |
| 9178 attr = screen_attr; | |
| 9179 if (row == screen_cur_row && col < screen_cur_col) | |
| 9180 { | |
| 9181 /* "le" is preferred over "bc", because "bc" is obsolete */ | |
| 9182 if (*T_LE) | |
| 9183 bs = T_LE; /* "cursor left" */ | |
| 9184 else | |
| 9185 bs = T_BC; /* "backspace character (old) */ | |
| 9186 if (*bs) | |
| 9187 cost = (screen_cur_col - col) * (int)STRLEN(bs); | |
| 9188 else | |
| 9189 cost = 999; | |
| 9190 if (col + 1 < cost) /* using CR is less characters */ | |
| 9191 { | |
| 9192 plan = PLAN_CR; | |
| 9193 wouldbe_col = 0; | |
| 9194 cost = 1; /* CR is just one character */ | |
| 9195 } | |
| 9196 else | |
| 9197 { | |
| 9198 plan = PLAN_LE; | |
| 9199 wouldbe_col = col; | |
| 9200 } | |
| 9201 if (noinvcurs) /* will stop highlighting */ | |
| 9202 { | |
| 9203 cost += noinvcurs; | |
| 9204 attr = 0; | |
| 9205 } | |
| 9206 } | |
| 9207 | |
| 9208 /* | |
| 9209 * If the cursor is above where we want to be, we can use CR LF. | |
| 9210 */ | |
| 9211 else if (row > screen_cur_row) | |
| 9212 { | |
| 9213 plan = PLAN_NL; | |
| 9214 wouldbe_col = 0; | |
| 9215 cost = (row - screen_cur_row) * 2; /* CR LF */ | |
| 9216 if (noinvcurs) /* will stop highlighting */ | |
| 9217 { | |
| 9218 cost += noinvcurs; | |
| 9219 attr = 0; | |
| 9220 } | |
| 9221 } | |
| 9222 | |
| 9223 /* | |
| 9224 * If the cursor is in the same row, smaller col, just use write. | |
| 9225 */ | |
| 9226 else | |
| 9227 { | |
| 9228 plan = PLAN_WRITE; | |
| 9229 wouldbe_col = screen_cur_col; | |
| 9230 cost = 0; | |
| 9231 } | |
| 9232 | |
| 9233 /* | |
| 9234 * Check if any characters that need to be written have the | |
| 9235 * correct attributes. Also avoid UTF-8 characters. | |
| 9236 */ | |
| 9237 i = col - wouldbe_col; | |
| 9238 if (i > 0) | |
| 9239 cost += i; | |
| 9240 if (cost < goto_cost && i > 0) | |
| 9241 { | |
| 9242 /* | |
| 9243 * Check if the attributes are correct without additionally | |
| 9244 * stopping highlighting. | |
| 9245 */ | |
| 9246 p = ScreenAttrs + LineOffset[row] + wouldbe_col; | |
| 9247 while (i && *p++ == attr) | |
| 9248 --i; | |
| 9249 if (i != 0) | |
| 9250 { | |
| 9251 /* | |
| 9252 * Try if it works when highlighting is stopped here. | |
| 9253 */ | |
| 9254 if (*--p == 0) | |
| 9255 { | |
| 9256 cost += noinvcurs; | |
| 9257 while (i && *p++ == 0) | |
| 9258 --i; | |
| 9259 } | |
| 9260 if (i != 0) | |
| 9261 cost = 999; /* different attributes, don't do it */ | |
| 9262 } | |
| 9263 if (enc_utf8) | |
| 9264 { | |
| 9265 /* Don't use an UTF-8 char for positioning, it's slow. */ | |
| 9266 for (i = wouldbe_col; i < col; ++i) | |
| 9267 if (ScreenLinesUC[LineOffset[row] + i] != 0) | |
| 9268 { | |
| 9269 cost = 999; | |
| 9270 break; | |
| 9271 } | |
| 9272 } | |
| 9273 } | |
| 9274 | |
| 9275 /* | |
| 9276 * We can do it without term_windgoto()! | |
| 9277 */ | |
| 9278 if (cost < goto_cost) | |
| 9279 { | |
| 9280 if (plan == PLAN_LE) | |
| 9281 { | |
| 9282 if (noinvcurs) | |
| 9283 screen_stop_highlight(); | |
| 9284 while (screen_cur_col > col) | |
| 9285 { | |
| 9286 out_str(bs); | |
| 9287 --screen_cur_col; | |
| 9288 } | |
| 9289 } | |
| 9290 else if (plan == PLAN_CR) | |
| 9291 { | |
| 9292 if (noinvcurs) | |
| 9293 screen_stop_highlight(); | |
| 9294 out_char('\r'); | |
| 9295 screen_cur_col = 0; | |
| 9296 } | |
| 9297 else if (plan == PLAN_NL) | |
| 9298 { | |
| 9299 if (noinvcurs) | |
| 9300 screen_stop_highlight(); | |
| 9301 while (screen_cur_row < row) | |
| 9302 { | |
| 9303 out_char('\n'); | |
| 9304 ++screen_cur_row; | |
| 9305 } | |
| 9306 screen_cur_col = 0; | |
| 9307 } | |
| 9308 | |
| 9309 i = col - screen_cur_col; | |
| 9310 if (i > 0) | |
| 9311 { | |
| 9312 /* | |
| 9313 * Use cursor-right if it's one character only. Avoids | |
| 9314 * removing a line of pixels from the last bold char, when | |
| 9315 * using the bold trick in the GUI. | |
| 9316 */ | |
| 9317 if (T_ND[0] != NUL && T_ND[1] == NUL) | |
| 9318 { | |
| 9319 while (i-- > 0) | |
| 9320 out_char(*T_ND); | |
| 9321 } | |
| 9322 else | |
| 9323 { | |
| 9324 int off; | |
| 9325 | |
| 9326 off = LineOffset[row] + screen_cur_col; | |
| 9327 while (i-- > 0) | |
| 9328 { | |
| 9329 if (ScreenAttrs[off] != screen_attr) | |
| 9330 screen_stop_highlight(); | |
| 9331 out_flush_check(); | |
| 9332 out_char(ScreenLines[off]); | |
| 9333 if (enc_dbcs == DBCS_JPNU | |
| 9334 && ScreenLines[off] == 0x8e) | |
| 9335 out_char(ScreenLines2[off]); | |
| 9336 ++off; | |
| 9337 } | |
| 9338 } | |
| 9339 } | |
| 9340 } | |
| 9341 } | |
| 9342 else | |
| 9343 cost = 999; | |
| 9344 | |
| 9345 if (cost >= goto_cost) | |
| 9346 { | |
| 9347 if (noinvcurs) | |
| 9348 screen_stop_highlight(); | |
| 5995 | 9349 if (row == screen_cur_row && (col > screen_cur_col) |
| 9350 && *T_CRI != NUL) | |
| 7 | 9351 term_cursor_right(col - screen_cur_col); |
| 9352 else | |
| 9353 term_windgoto(row, col); | |
| 9354 } | |
| 9355 screen_cur_row = row; | |
| 9356 screen_cur_col = col; | |
| 9357 } | |
| 9358 } | |
| 9359 | |
| 9360 /* | |
| 9361 * Set cursor to its position in the current window. | |
| 9362 */ | |
| 9363 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9364 setcursor(void) |
| 7 | 9365 { |
|
13400
c415cdd49ea4
patch 8.0.1574: show cursor in wrong place when using popup menu
Christian Brabandt <cb@256bit.org>
parents:
13380
diff
changeset
|
9366 setcursor_mayforce(FALSE); |
|
c415cdd49ea4
patch 8.0.1574: show cursor in wrong place when using popup menu
Christian Brabandt <cb@256bit.org>
parents:
13380
diff
changeset
|
9367 } |
|
c415cdd49ea4
patch 8.0.1574: show cursor in wrong place when using popup menu
Christian Brabandt <cb@256bit.org>
parents:
13380
diff
changeset
|
9368 |
|
c415cdd49ea4
patch 8.0.1574: show cursor in wrong place when using popup menu
Christian Brabandt <cb@256bit.org>
parents:
13380
diff
changeset
|
9369 /* |
|
c415cdd49ea4
patch 8.0.1574: show cursor in wrong place when using popup menu
Christian Brabandt <cb@256bit.org>
parents:
13380
diff
changeset
|
9370 * Set cursor to its position in the current window. |
|
c415cdd49ea4
patch 8.0.1574: show cursor in wrong place when using popup menu
Christian Brabandt <cb@256bit.org>
parents:
13380
diff
changeset
|
9371 * When "force" is TRUE also when not redrawing. |
|
c415cdd49ea4
patch 8.0.1574: show cursor in wrong place when using popup menu
Christian Brabandt <cb@256bit.org>
parents:
13380
diff
changeset
|
9372 */ |
|
c415cdd49ea4
patch 8.0.1574: show cursor in wrong place when using popup menu
Christian Brabandt <cb@256bit.org>
parents:
13380
diff
changeset
|
9373 void |
|
c415cdd49ea4
patch 8.0.1574: show cursor in wrong place when using popup menu
Christian Brabandt <cb@256bit.org>
parents:
13380
diff
changeset
|
9374 setcursor_mayforce(int force) |
|
c415cdd49ea4
patch 8.0.1574: show cursor in wrong place when using popup menu
Christian Brabandt <cb@256bit.org>
parents:
13380
diff
changeset
|
9375 { |
|
c415cdd49ea4
patch 8.0.1574: show cursor in wrong place when using popup menu
Christian Brabandt <cb@256bit.org>
parents:
13380
diff
changeset
|
9376 if (force || redrawing()) |
| 7 | 9377 { |
| 9378 validate_cursor(); | |
| 9379 windgoto(W_WINROW(curwin) + curwin->w_wrow, | |
|
12513
3ca08bf99396
patch 8.0.1135: W_WINCOL() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12510
diff
changeset
|
9380 curwin->w_wincol + ( |
| 7 | 9381 #ifdef FEAT_RIGHTLEFT |
| 1545 | 9382 /* With 'rightleft' set and the cursor on a double-wide |
| 9383 * character, position it on the leftmost column. */ | |
|
15603
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
9384 curwin->w_p_rl ? ((int)curwin->w_width - curwin->w_wcol |
|
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
9385 - ((has_mbyte |
| 1545 | 9386 && (*mb_ptr2cells)(ml_get_cursor()) == 2 |
|
15603
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
9387 && vim_isprintc(gchar_cursor())) ? 2 : 1)) : |
| 7 | 9388 #endif |
| 9389 curwin->w_wcol)); | |
| 9390 } | |
| 9391 } | |
| 9392 | |
| 9393 | |
| 9394 /* | |
|
11655
8014350fe51a
patch 8.0.0710: a job that writes to a buffer clears completion
Christian Brabandt <cb@256bit.org>
parents:
11607
diff
changeset
|
9395 * Insert 'line_count' lines at 'row' in window 'wp'. |
|
8014350fe51a
patch 8.0.0710: a job that writes to a buffer clears completion
Christian Brabandt <cb@256bit.org>
parents:
11607
diff
changeset
|
9396 * If 'invalid' is TRUE the wp->w_lines[].wl_lnum is invalidated. |
|
8014350fe51a
patch 8.0.0710: a job that writes to a buffer clears completion
Christian Brabandt <cb@256bit.org>
parents:
11607
diff
changeset
|
9397 * If 'mayclear' is TRUE the screen will be cleared if it is faster than |
| 7 | 9398 * scrolling. |
| 9399 * Returns FAIL if the lines are not inserted, OK for success. | |
| 9400 */ | |
| 9401 int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9402 win_ins_lines( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9403 win_T *wp, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9404 int row, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9405 int line_count, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9406 int invalid, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9407 int mayclear) |
| 7 | 9408 { |
| 9409 int did_delete; | |
| 9410 int nextrow; | |
| 9411 int lastrow; | |
| 9412 int retval; | |
| 9413 | |
| 9414 if (invalid) | |
| 9415 wp->w_lines_valid = 0; | |
| 9416 | |
| 9417 if (wp->w_height < 5) | |
| 9418 return FAIL; | |
| 9419 | |
| 9420 if (line_count > wp->w_height - row) | |
| 9421 line_count = wp->w_height - row; | |
| 9422 | |
|
12152
69af108df70e
patch 8.0.0956: scrolling in a terminal window has flicker
Christian Brabandt <cb@256bit.org>
parents:
12122
diff
changeset
|
9423 retval = win_do_lines(wp, row, line_count, mayclear, FALSE, 0); |
| 7 | 9424 if (retval != MAYBE) |
| 9425 return retval; | |
| 9426 | |
| 9427 /* | |
| 9428 * If there is a next window or a status line, we first try to delete the | |
| 9429 * lines at the bottom to avoid messing what is after the window. | |
| 9430 * If this fails and there are following windows, don't do anything to avoid | |
| 9431 * messing up those windows, better just redraw. | |
| 9432 */ | |
| 9433 did_delete = FALSE; | |
| 9434 if (wp->w_next != NULL || wp->w_status_height) | |
| 9435 { | |
| 9436 if (screen_del_lines(0, W_WINROW(wp) + wp->w_height - line_count, | |
|
12152
69af108df70e
patch 8.0.0956: scrolling in a terminal window has flicker
Christian Brabandt <cb@256bit.org>
parents:
12122
diff
changeset
|
9437 line_count, (int)Rows, FALSE, 0, NULL) == OK) |
| 7 | 9438 did_delete = TRUE; |
| 9439 else if (wp->w_next) | |
| 9440 return FAIL; | |
| 9441 } | |
| 9442 /* | |
| 9443 * if no lines deleted, blank the lines that will end up below the window | |
| 9444 */ | |
| 9445 if (!did_delete) | |
| 9446 { | |
| 9447 wp->w_redr_status = TRUE; | |
| 9448 redraw_cmdline = TRUE; | |
|
12529
158917d728b4
patch 8.0.1143: macros always expand to the same thing
Christian Brabandt <cb@256bit.org>
parents:
12515
diff
changeset
|
9449 nextrow = W_WINROW(wp) + wp->w_height + wp->w_status_height; |
| 7 | 9450 lastrow = nextrow + line_count; |
| 9451 if (lastrow > Rows) | |
| 9452 lastrow = Rows; | |
| 9453 screen_fill(nextrow - line_count, lastrow - line_count, | |
|
12513
3ca08bf99396
patch 8.0.1135: W_WINCOL() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12510
diff
changeset
|
9454 wp->w_wincol, (int)W_ENDCOL(wp), |
| 7 | 9455 ' ', ' ', 0); |
| 9456 } | |
| 9457 | |
|
12152
69af108df70e
patch 8.0.0956: scrolling in a terminal window has flicker
Christian Brabandt <cb@256bit.org>
parents:
12122
diff
changeset
|
9458 if (screen_ins_lines(0, W_WINROW(wp) + row, line_count, (int)Rows, 0, NULL) |
| 7 | 9459 == FAIL) |
| 9460 { | |
| 9461 /* deletion will have messed up other windows */ | |
| 9462 if (did_delete) | |
| 9463 { | |
| 9464 wp->w_redr_status = TRUE; | |
| 9465 win_rest_invalid(W_NEXT(wp)); | |
| 9466 } | |
| 9467 return FAIL; | |
| 9468 } | |
| 9469 | |
| 9470 return OK; | |
| 9471 } | |
| 9472 | |
| 9473 /* | |
|
11655
8014350fe51a
patch 8.0.0710: a job that writes to a buffer clears completion
Christian Brabandt <cb@256bit.org>
parents:
11607
diff
changeset
|
9474 * Delete "line_count" window lines at "row" in window "wp". |
| 7 | 9475 * If "invalid" is TRUE curwin->w_lines[] is invalidated. |
| 9476 * If "mayclear" is TRUE the screen will be cleared if it is faster than | |
| 9477 * scrolling | |
| 9478 * Return OK for success, FAIL if the lines are not deleted. | |
| 9479 */ | |
| 9480 int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9481 win_del_lines( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9482 win_T *wp, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9483 int row, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9484 int line_count, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9485 int invalid, |
|
12152
69af108df70e
patch 8.0.0956: scrolling in a terminal window has flicker
Christian Brabandt <cb@256bit.org>
parents:
12122
diff
changeset
|
9486 int mayclear, |
|
69af108df70e
patch 8.0.0956: scrolling in a terminal window has flicker
Christian Brabandt <cb@256bit.org>
parents:
12122
diff
changeset
|
9487 int clear_attr) /* for clearing lines */ |
| 7 | 9488 { |
| 9489 int retval; | |
| 9490 | |
| 9491 if (invalid) | |
| 9492 wp->w_lines_valid = 0; | |
| 9493 | |
| 9494 if (line_count > wp->w_height - row) | |
| 9495 line_count = wp->w_height - row; | |
| 9496 | |
|
12152
69af108df70e
patch 8.0.0956: scrolling in a terminal window has flicker
Christian Brabandt <cb@256bit.org>
parents:
12122
diff
changeset
|
9497 retval = win_do_lines(wp, row, line_count, mayclear, TRUE, clear_attr); |
| 7 | 9498 if (retval != MAYBE) |
| 9499 return retval; | |
| 9500 | |
| 9501 if (screen_del_lines(0, W_WINROW(wp) + row, line_count, | |
|
12152
69af108df70e
patch 8.0.0956: scrolling in a terminal window has flicker
Christian Brabandt <cb@256bit.org>
parents:
12122
diff
changeset
|
9502 (int)Rows, FALSE, clear_attr, NULL) == FAIL) |
| 7 | 9503 return FAIL; |
| 9504 | |
| 9505 /* | |
| 9506 * If there are windows or status lines below, try to put them at the | |
| 9507 * correct place. If we can't do that, they have to be redrawn. | |
| 9508 */ | |
| 9509 if (wp->w_next || wp->w_status_height || cmdline_row < Rows - 1) | |
| 9510 { | |
| 9511 if (screen_ins_lines(0, W_WINROW(wp) + wp->w_height - line_count, | |
|
12152
69af108df70e
patch 8.0.0956: scrolling in a terminal window has flicker
Christian Brabandt <cb@256bit.org>
parents:
12122
diff
changeset
|
9512 line_count, (int)Rows, clear_attr, NULL) == FAIL) |
| 7 | 9513 { |
| 9514 wp->w_redr_status = TRUE; | |
| 9515 win_rest_invalid(wp->w_next); | |
| 9516 } | |
| 9517 } | |
| 9518 /* | |
| 9519 * If this is the last window and there is no status line, redraw the | |
| 9520 * command line later. | |
| 9521 */ | |
| 9522 else | |
| 9523 redraw_cmdline = TRUE; | |
| 9524 return OK; | |
| 9525 } | |
| 9526 | |
| 9527 /* | |
| 9528 * Common code for win_ins_lines() and win_del_lines(). | |
| 9529 * Returns OK or FAIL when the work has been done. | |
| 9530 * Returns MAYBE when not finished yet. | |
| 9531 */ | |
| 9532 static int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9533 win_do_lines( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9534 win_T *wp, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9535 int row, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9536 int line_count, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9537 int mayclear, |
|
12152
69af108df70e
patch 8.0.0956: scrolling in a terminal window has flicker
Christian Brabandt <cb@256bit.org>
parents:
12122
diff
changeset
|
9538 int del, |
|
69af108df70e
patch 8.0.0956: scrolling in a terminal window has flicker
Christian Brabandt <cb@256bit.org>
parents:
12122
diff
changeset
|
9539 int clear_attr) |
| 7 | 9540 { |
| 9541 int retval; | |
| 9542 | |
| 9543 if (!redrawing() || line_count <= 0) | |
| 9544 return FAIL; | |
| 9545 | |
|
11416
32aed0993813
patch 8.0.0592: if a job writes to a buffer screen is not updated
Christian Brabandt <cb@256bit.org>
parents:
11277
diff
changeset
|
9546 /* When inserting lines would result in loss of command output, just redraw |
|
32aed0993813
patch 8.0.0592: if a job writes to a buffer screen is not updated
Christian Brabandt <cb@256bit.org>
parents:
11277
diff
changeset
|
9547 * the lines. */ |
|
32aed0993813
patch 8.0.0592: if a job writes to a buffer screen is not updated
Christian Brabandt <cb@256bit.org>
parents:
11277
diff
changeset
|
9548 if (no_win_do_lines_ins && !del) |
|
32aed0993813
patch 8.0.0592: if a job writes to a buffer screen is not updated
Christian Brabandt <cb@256bit.org>
parents:
11277
diff
changeset
|
9549 return FAIL; |
|
32aed0993813
patch 8.0.0592: if a job writes to a buffer screen is not updated
Christian Brabandt <cb@256bit.org>
parents:
11277
diff
changeset
|
9550 |
| 7 | 9551 /* only a few lines left: redraw is faster */ |
|
12477
68d7bc045dbe
patch 8.0.1118: FEAT_WINDOWS adds a lot of #ifdefs
Christian Brabandt <cb@256bit.org>
parents:
12441
diff
changeset
|
9552 if (mayclear && Rows - line_count < 5 && wp->w_width == Columns) |
| 7 | 9553 { |
|
11416
32aed0993813
patch 8.0.0592: if a job writes to a buffer screen is not updated
Christian Brabandt <cb@256bit.org>
parents:
11277
diff
changeset
|
9554 if (!no_win_do_lines_ins) |
|
32aed0993813
patch 8.0.0592: if a job writes to a buffer screen is not updated
Christian Brabandt <cb@256bit.org>
parents:
11277
diff
changeset
|
9555 screenclear(); /* will set wp->w_lines_valid to 0 */ |
| 7 | 9556 return FAIL; |
| 9557 } | |
| 9558 | |
| 9559 /* | |
| 9560 * Delete all remaining lines | |
| 9561 */ | |
| 9562 if (row + line_count >= wp->w_height) | |
| 9563 { | |
| 9564 screen_fill(W_WINROW(wp) + row, W_WINROW(wp) + wp->w_height, | |
|
12513
3ca08bf99396
patch 8.0.1135: W_WINCOL() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12510
diff
changeset
|
9565 wp->w_wincol, (int)W_ENDCOL(wp), |
| 7 | 9566 ' ', ' ', 0); |
| 9567 return OK; | |
| 9568 } | |
| 9569 | |
| 9570 /* | |
|
11416
32aed0993813
patch 8.0.0592: if a job writes to a buffer screen is not updated
Christian Brabandt <cb@256bit.org>
parents:
11277
diff
changeset
|
9571 * When scrolling, the message on the command line should be cleared, |
| 7 | 9572 * otherwise it will stay there forever. |
|
11416
32aed0993813
patch 8.0.0592: if a job writes to a buffer screen is not updated
Christian Brabandt <cb@256bit.org>
parents:
11277
diff
changeset
|
9573 * Don't do this when avoiding to insert lines. |
| 7 | 9574 */ |
|
11416
32aed0993813
patch 8.0.0592: if a job writes to a buffer screen is not updated
Christian Brabandt <cb@256bit.org>
parents:
11277
diff
changeset
|
9575 if (!no_win_do_lines_ins) |
|
32aed0993813
patch 8.0.0592: if a job writes to a buffer screen is not updated
Christian Brabandt <cb@256bit.org>
parents:
11277
diff
changeset
|
9576 clear_cmdline = TRUE; |
| 7 | 9577 |
| 9578 /* | |
| 9579 * If the terminal can set a scroll region, use that. | |
| 9580 * Always do this in a vertically split window. This will redraw from | |
| 9581 * ScreenLines[] when t_CV isn't defined. That's faster than using | |
| 9582 * win_line(). | |
| 9583 * Don't use a scroll region when we are going to redraw the text, writing | |
|
8212
05b88224cea1
commit https://github.com/vim/vim/commit/48e330aff911be1c798c88a973af6437a8141fce
Christian Brabandt <cb@256bit.org>
parents:
7833
diff
changeset
|
9584 * a character in the lower right corner of the scroll region may cause a |
|
05b88224cea1
commit https://github.com/vim/vim/commit/48e330aff911be1c798c88a973af6437a8141fce
Christian Brabandt <cb@256bit.org>
parents:
7833
diff
changeset
|
9585 * scroll-up . |
| 7 | 9586 */ |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
9587 if (scroll_region || wp->w_width != Columns) |
|
12477
68d7bc045dbe
patch 8.0.1118: FEAT_WINDOWS adds a lot of #ifdefs
Christian Brabandt <cb@256bit.org>
parents:
12441
diff
changeset
|
9588 { |
| 7 | 9589 if (scroll_region && (wp->w_width == Columns || *T_CSV != NUL)) |
| 9590 scroll_region_set(wp, row); | |
| 9591 if (del) | |
| 9592 retval = screen_del_lines(W_WINROW(wp) + row, 0, line_count, | |
|
12152
69af108df70e
patch 8.0.0956: scrolling in a terminal window has flicker
Christian Brabandt <cb@256bit.org>
parents:
12122
diff
changeset
|
9593 wp->w_height - row, FALSE, clear_attr, wp); |
| 7 | 9594 else |
| 9595 retval = screen_ins_lines(W_WINROW(wp) + row, 0, line_count, | |
|
12152
69af108df70e
patch 8.0.0956: scrolling in a terminal window has flicker
Christian Brabandt <cb@256bit.org>
parents:
12122
diff
changeset
|
9596 wp->w_height - row, clear_attr, wp); |
| 7 | 9597 if (scroll_region && (wp->w_width == Columns || *T_CSV != NUL)) |
| 9598 scroll_region_reset(); | |
| 9599 return retval; | |
| 9600 } | |
| 9601 | |
| 9602 if (wp->w_next != NULL && p_tf) /* don't delete/insert on fast terminal */ | |
| 9603 return FAIL; | |
| 9604 | |
| 9605 return MAYBE; | |
| 9606 } | |
| 9607 | |
| 9608 /* | |
| 9609 * window 'wp' and everything after it is messed up, mark it for redraw | |
| 9610 */ | |
| 9611 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9612 win_rest_invalid(win_T *wp) |
| 7 | 9613 { |
| 9614 while (wp != NULL) | |
| 9615 { | |
| 9616 redraw_win_later(wp, NOT_VALID); | |
| 9617 wp->w_redr_status = TRUE; | |
| 9618 wp = wp->w_next; | |
| 9619 } | |
| 9620 redraw_cmdline = TRUE; | |
| 9621 } | |
| 9622 | |
| 9623 /* | |
| 9624 * The rest of the routines in this file perform screen manipulations. The | |
| 9625 * given operation is performed physically on the screen. The corresponding | |
| 9626 * change is also made to the internal screen image. In this way, the editor | |
| 9627 * anticipates the effect of editing changes on the appearance of the screen. | |
| 9628 * That way, when we call screenupdate a complete redraw isn't usually | |
| 9629 * necessary. Another advantage is that we can keep adding code to anticipate | |
| 9630 * screen changes, and in the meantime, everything still works. | |
| 9631 */ | |
| 9632 | |
| 9633 /* | |
| 9634 * types for inserting or deleting lines | |
| 9635 */ | |
| 9636 #define USE_T_CAL 1 | |
| 9637 #define USE_T_CDL 2 | |
| 9638 #define USE_T_AL 3 | |
| 9639 #define USE_T_CE 4 | |
| 9640 #define USE_T_DL 5 | |
| 9641 #define USE_T_SR 6 | |
| 9642 #define USE_NL 7 | |
| 9643 #define USE_T_CD 8 | |
| 9644 #define USE_REDRAW 9 | |
| 9645 | |
| 9646 /* | |
| 9647 * insert lines on the screen and update ScreenLines[] | |
| 9648 * 'end' is the line after the scrolled part. Normally it is Rows. | |
| 9649 * When scrolling region used 'off' is the offset from the top for the region. | |
| 9650 * 'row' and 'end' are relative to the start of the region. | |
| 9651 * | |
| 9652 * return FAIL for failure, OK for success. | |
| 9653 */ | |
| 446 | 9654 int |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9655 screen_ins_lines( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9656 int off, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9657 int row, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9658 int line_count, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9659 int end, |
|
12152
69af108df70e
patch 8.0.0956: scrolling in a terminal window has flicker
Christian Brabandt <cb@256bit.org>
parents:
12122
diff
changeset
|
9660 int clear_attr, |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9661 win_T *wp) /* NULL or window to use width from */ |
| 7 | 9662 { |
| 9663 int i; | |
| 9664 int j; | |
| 9665 unsigned temp; | |
| 9666 int cursor_row; | |
|
14081
45c595c0ddaf
patch 8.1.0058: display problem with margins and scrolling
Christian Brabandt <cb@256bit.org>
parents:
14079
diff
changeset
|
9667 int cursor_col = 0; |
| 7 | 9668 int type; |
| 9669 int result_empty; | |
| 9670 int can_ce = can_clear(T_CE); | |
| 9671 | |
| 9672 /* | |
| 9673 * FAIL if | |
| 9674 * - there is no valid screen | |
| 9675 * - the screen has to be redrawn completely | |
| 9676 * - the line count is less than one | |
| 9677 * - the line count is more than 'ttyscroll' | |
|
11698
4f59d2a66bf7
patch 8.0.0732: when updating a buffer modeless selection is lost
Christian Brabandt <cb@256bit.org>
parents:
11672
diff
changeset
|
9678 * - redrawing for a callback and there is a modeless selection |
| 7 | 9679 */ |
|
11698
4f59d2a66bf7
patch 8.0.0732: when updating a buffer modeless selection is lost
Christian Brabandt <cb@256bit.org>
parents:
11672
diff
changeset
|
9680 if (!screen_valid(TRUE) || line_count <= 0 || line_count > p_ttyscroll |
|
4f59d2a66bf7
patch 8.0.0732: when updating a buffer modeless selection is lost
Christian Brabandt <cb@256bit.org>
parents:
11672
diff
changeset
|
9681 #ifdef FEAT_CLIPBOARD |
|
4f59d2a66bf7
patch 8.0.0732: when updating a buffer modeless selection is lost
Christian Brabandt <cb@256bit.org>
parents:
11672
diff
changeset
|
9682 || (clip_star.state != SELECT_CLEARED |
|
4f59d2a66bf7
patch 8.0.0732: when updating a buffer modeless selection is lost
Christian Brabandt <cb@256bit.org>
parents:
11672
diff
changeset
|
9683 && redrawing_for_callback > 0) |
|
4f59d2a66bf7
patch 8.0.0732: when updating a buffer modeless selection is lost
Christian Brabandt <cb@256bit.org>
parents:
11672
diff
changeset
|
9684 #endif |
|
4f59d2a66bf7
patch 8.0.0732: when updating a buffer modeless selection is lost
Christian Brabandt <cb@256bit.org>
parents:
11672
diff
changeset
|
9685 ) |
| 7 | 9686 return FAIL; |
| 9687 | |
| 9688 /* | |
| 9689 * There are seven ways to insert lines: | |
| 9690 * 0. When in a vertically split window and t_CV isn't set, redraw the | |
| 9691 * characters from ScreenLines[]. | |
| 9692 * 1. Use T_CD (clear to end of display) if it exists and the result of | |
| 9693 * the insert is just empty lines | |
| 9694 * 2. Use T_CAL (insert multiple lines) if it exists and T_AL is not | |
| 9695 * present or line_count > 1. It looks better if we do all the inserts | |
| 9696 * at once. | |
| 9697 * 3. Use T_CDL (delete multiple lines) if it exists and the result of the | |
| 9698 * insert is just empty lines and T_CE is not present or line_count > | |
| 9699 * 1. | |
| 9700 * 4. Use T_AL (insert line) if it exists. | |
| 9701 * 5. Use T_CE (erase line) if it exists and the result of the insert is | |
| 9702 * just empty lines. | |
| 9703 * 6. Use T_DL (delete line) if it exists and the result of the insert is | |
| 9704 * just empty lines. | |
| 9705 * 7. Use T_SR (scroll reverse) if it exists and inserting at row 0 and | |
| 9706 * the 'da' flag is not set or we have clear line capability. | |
| 9707 * 8. redraw the characters from ScreenLines[]. | |
| 9708 * | |
| 9709 * Careful: In a hpterm scroll reverse doesn't work as expected, it moves | |
| 9710 * the scrollbar for the window. It does have insert line, use that if it | |
| 9711 * exists. | |
| 9712 */ | |
| 9713 result_empty = (row + line_count >= end); | |
| 9714 if (wp != NULL && wp->w_width != Columns && *T_CSV == NUL) | |
| 9715 type = USE_REDRAW; | |
|
12477
68d7bc045dbe
patch 8.0.1118: FEAT_WINDOWS adds a lot of #ifdefs
Christian Brabandt <cb@256bit.org>
parents:
12441
diff
changeset
|
9716 else if (can_clear(T_CD) && result_empty) |
| 7 | 9717 type = USE_T_CD; |
| 9718 else if (*T_CAL != NUL && (line_count > 1 || *T_AL == NUL)) | |
| 9719 type = USE_T_CAL; | |
| 9720 else if (*T_CDL != NUL && result_empty && (line_count > 1 || !can_ce)) | |
| 9721 type = USE_T_CDL; | |
| 9722 else if (*T_AL != NUL) | |
| 9723 type = USE_T_AL; | |
| 9724 else if (can_ce && result_empty) | |
| 9725 type = USE_T_CE; | |
| 9726 else if (*T_DL != NUL && result_empty) | |
| 9727 type = USE_T_DL; | |
| 9728 else if (*T_SR != NUL && row == 0 && (*T_DA == NUL || can_ce)) | |
| 9729 type = USE_T_SR; | |
| 9730 else | |
| 9731 return FAIL; | |
| 9732 | |
| 9733 /* | |
| 9734 * For clearing the lines screen_del_lines() is used. This will also take | |
| 9735 * care of t_db if necessary. | |
| 9736 */ | |
| 9737 if (type == USE_T_CD || type == USE_T_CDL || | |
| 9738 type == USE_T_CE || type == USE_T_DL) | |
|
12152
69af108df70e
patch 8.0.0956: scrolling in a terminal window has flicker
Christian Brabandt <cb@256bit.org>
parents:
12122
diff
changeset
|
9739 return screen_del_lines(off, row, line_count, end, FALSE, 0, wp); |
| 7 | 9740 |
| 9741 /* | |
| 9742 * If text is retained below the screen, first clear or delete as many | |
| 9743 * lines at the bottom of the window as are about to be inserted so that | |
| 9744 * the deleted lines won't later surface during a screen_del_lines. | |
| 9745 */ | |
| 9746 if (*T_DB) | |
|
12152
69af108df70e
patch 8.0.0956: scrolling in a terminal window has flicker
Christian Brabandt <cb@256bit.org>
parents:
12122
diff
changeset
|
9747 screen_del_lines(off, end - line_count, line_count, end, FALSE, 0, wp); |
| 7 | 9748 |
| 9749 #ifdef FEAT_CLIPBOARD | |
| 9750 /* Remove a modeless selection when inserting lines halfway the screen | |
| 9751 * or not the full width of the screen. */ | |
|
12477
68d7bc045dbe
patch 8.0.1118: FEAT_WINDOWS adds a lot of #ifdefs
Christian Brabandt <cb@256bit.org>
parents:
12441
diff
changeset
|
9752 if (off + row > 0 || (wp != NULL && wp->w_width != Columns)) |
| 3674 | 9753 clip_clear_selection(&clip_star); |
| 7 | 9754 else |
| 9755 clip_scroll_selection(-line_count); | |
| 9756 #endif | |
| 9757 | |
| 9758 #ifdef FEAT_GUI | |
| 9759 /* Don't update the GUI cursor here, ScreenLines[] is invalid until the | |
| 9760 * scrolling is actually carried out. */ | |
|
9848
664276833670
commit https://github.com/vim/vim/commit/107abd2ca53c31fd3bb40d77ff296e98eaae2975
Christian Brabandt <cb@256bit.org>
parents:
9754
diff
changeset
|
9761 gui_dont_update_cursor(row + off <= gui.cursor_row); |
| 7 | 9762 #endif |
| 9763 | |
|
14081
45c595c0ddaf
patch 8.1.0058: display problem with margins and scrolling
Christian Brabandt <cb@256bit.org>
parents:
14079
diff
changeset
|
9764 if (wp != NULL && wp->w_wincol != 0 && *T_CSV != NUL && *T_CCS == NUL) |
|
45c595c0ddaf
patch 8.1.0058: display problem with margins and scrolling
Christian Brabandt <cb@256bit.org>
parents:
14079
diff
changeset
|
9765 cursor_col = wp->w_wincol; |
|
45c595c0ddaf
patch 8.1.0058: display problem with margins and scrolling
Christian Brabandt <cb@256bit.org>
parents:
14079
diff
changeset
|
9766 |
| 7 | 9767 if (*T_CCS != NUL) /* cursor relative to region */ |
| 9768 cursor_row = row; | |
| 9769 else | |
| 9770 cursor_row = row + off; | |
| 9771 | |
| 9772 /* | |
| 9773 * Shift LineOffset[] line_count down to reflect the inserted lines. | |
| 9774 * Clear the inserted lines in ScreenLines[]. | |
| 9775 */ | |
| 9776 row += off; | |
| 9777 end += off; | |
| 9778 for (i = 0; i < line_count; ++i) | |
| 9779 { | |
| 9780 if (wp != NULL && wp->w_width != Columns) | |
| 9781 { | |
| 9782 /* need to copy part of a line */ | |
| 9783 j = end - 1 - i; | |
| 9784 while ((j -= line_count) >= row) | |
| 9785 linecopy(j + line_count, j, wp); | |
| 9786 j += line_count; | |
| 9787 if (can_clear((char_u *)" ")) | |
|
12152
69af108df70e
patch 8.0.0956: scrolling in a terminal window has flicker
Christian Brabandt <cb@256bit.org>
parents:
12122
diff
changeset
|
9788 lineclear(LineOffset[j] + wp->w_wincol, wp->w_width, |
|
69af108df70e
patch 8.0.0956: scrolling in a terminal window has flicker
Christian Brabandt <cb@256bit.org>
parents:
12122
diff
changeset
|
9789 clear_attr); |
| 7 | 9790 else |
| 9791 lineinvalid(LineOffset[j] + wp->w_wincol, wp->w_width); | |
| 9792 LineWraps[j] = FALSE; | |
| 9793 } | |
| 9794 else | |
| 9795 { | |
| 9796 j = end - 1 - i; | |
| 9797 temp = LineOffset[j]; | |
| 9798 while ((j -= line_count) >= row) | |
| 9799 { | |
| 9800 LineOffset[j + line_count] = LineOffset[j]; | |
| 9801 LineWraps[j + line_count] = LineWraps[j]; | |
| 9802 } | |
| 9803 LineOffset[j + line_count] = temp; | |
| 9804 LineWraps[j + line_count] = FALSE; | |
| 9805 if (can_clear((char_u *)" ")) | |
|
12152
69af108df70e
patch 8.0.0956: scrolling in a terminal window has flicker
Christian Brabandt <cb@256bit.org>
parents:
12122
diff
changeset
|
9806 lineclear(temp, (int)Columns, clear_attr); |
| 7 | 9807 else |
| 9808 lineinvalid(temp, (int)Columns); | |
| 9809 } | |
| 9810 } | |
| 9811 | |
| 9812 screen_stop_highlight(); | |
|
14081
45c595c0ddaf
patch 8.1.0058: display problem with margins and scrolling
Christian Brabandt <cb@256bit.org>
parents:
14079
diff
changeset
|
9813 windgoto(cursor_row, cursor_col); |
|
12152
69af108df70e
patch 8.0.0956: scrolling in a terminal window has flicker
Christian Brabandt <cb@256bit.org>
parents:
12122
diff
changeset
|
9814 if (clear_attr != 0) |
|
69af108df70e
patch 8.0.0956: scrolling in a terminal window has flicker
Christian Brabandt <cb@256bit.org>
parents:
12122
diff
changeset
|
9815 screen_start_highlight(clear_attr); |
| 7 | 9816 |
| 9817 /* redraw the characters */ | |
| 9818 if (type == USE_REDRAW) | |
| 9819 redraw_block(row, end, wp); | |
|
12477
68d7bc045dbe
patch 8.0.1118: FEAT_WINDOWS adds a lot of #ifdefs
Christian Brabandt <cb@256bit.org>
parents:
12441
diff
changeset
|
9820 else if (type == USE_T_CAL) |
| 7 | 9821 { |
| 9822 term_append_lines(line_count); | |
| 9823 screen_start(); /* don't know where cursor is now */ | |
| 9824 } | |
| 9825 else | |
| 9826 { | |
| 9827 for (i = 0; i < line_count; i++) | |
| 9828 { | |
| 9829 if (type == USE_T_AL) | |
| 9830 { | |
| 9831 if (i && cursor_row != 0) | |
|
14081
45c595c0ddaf
patch 8.1.0058: display problem with margins and scrolling
Christian Brabandt <cb@256bit.org>
parents:
14079
diff
changeset
|
9832 windgoto(cursor_row, cursor_col); |
| 7 | 9833 out_str(T_AL); |
| 9834 } | |
| 9835 else /* type == USE_T_SR */ | |
| 9836 out_str(T_SR); | |
| 9837 screen_start(); /* don't know where cursor is now */ | |
| 9838 } | |
| 9839 } | |
| 9840 | |
| 9841 /* | |
| 9842 * With scroll-reverse and 'da' flag set we need to clear the lines that | |
| 9843 * have been scrolled down into the region. | |
| 9844 */ | |
| 9845 if (type == USE_T_SR && *T_DA) | |
| 9846 { | |
| 9847 for (i = 0; i < line_count; ++i) | |
| 9848 { | |
|
14081
45c595c0ddaf
patch 8.1.0058: display problem with margins and scrolling
Christian Brabandt <cb@256bit.org>
parents:
14079
diff
changeset
|
9849 windgoto(off + i, cursor_col); |
| 7 | 9850 out_str(T_CE); |
| 9851 screen_start(); /* don't know where cursor is now */ | |
| 9852 } | |
| 9853 } | |
| 9854 | |
| 9855 #ifdef FEAT_GUI | |
| 9856 gui_can_update_cursor(); | |
| 9857 if (gui.in_use) | |
| 9858 out_flush(); /* always flush after a scroll */ | |
| 9859 #endif | |
| 9860 return OK; | |
| 9861 } | |
| 9862 | |
| 9863 /* | |
|
9848
664276833670
commit https://github.com/vim/vim/commit/107abd2ca53c31fd3bb40d77ff296e98eaae2975
Christian Brabandt <cb@256bit.org>
parents:
9754
diff
changeset
|
9864 * Delete lines on the screen and update ScreenLines[]. |
|
664276833670
commit https://github.com/vim/vim/commit/107abd2ca53c31fd3bb40d77ff296e98eaae2975
Christian Brabandt <cb@256bit.org>
parents:
9754
diff
changeset
|
9865 * "end" is the line after the scrolled part. Normally it is Rows. |
|
664276833670
commit https://github.com/vim/vim/commit/107abd2ca53c31fd3bb40d77ff296e98eaae2975
Christian Brabandt <cb@256bit.org>
parents:
9754
diff
changeset
|
9866 * When scrolling region used "off" is the offset from the top for the region. |
|
664276833670
commit https://github.com/vim/vim/commit/107abd2ca53c31fd3bb40d77ff296e98eaae2975
Christian Brabandt <cb@256bit.org>
parents:
9754
diff
changeset
|
9867 * "row" and "end" are relative to the start of the region. |
| 7 | 9868 * |
| 9869 * Return OK for success, FAIL if the lines are not deleted. | |
| 9870 */ | |
| 9871 int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9872 screen_del_lines( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9873 int off, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9874 int row, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9875 int line_count, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9876 int end, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9877 int force, /* even when line_count > p_ttyscroll */ |
|
12152
69af108df70e
patch 8.0.0956: scrolling in a terminal window has flicker
Christian Brabandt <cb@256bit.org>
parents:
12122
diff
changeset
|
9878 int clear_attr, /* used for clearing lines */ |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9879 win_T *wp UNUSED) /* NULL or window to use width from */ |
| 7 | 9880 { |
| 9881 int j; | |
| 9882 int i; | |
| 9883 unsigned temp; | |
| 9884 int cursor_row; | |
|
14081
45c595c0ddaf
patch 8.1.0058: display problem with margins and scrolling
Christian Brabandt <cb@256bit.org>
parents:
14079
diff
changeset
|
9885 int cursor_col = 0; |
| 7 | 9886 int cursor_end; |
| 9887 int result_empty; /* result is empty until end of region */ | |
| 9888 int can_delete; /* deleting line codes can be used */ | |
| 9889 int type; | |
| 9890 | |
| 9891 /* | |
| 9892 * FAIL if | |
| 9893 * - there is no valid screen | |
| 9894 * - the screen has to be redrawn completely | |
| 9895 * - the line count is less than one | |
| 9896 * - the line count is more than 'ttyscroll' | |
|
11698
4f59d2a66bf7
patch 8.0.0732: when updating a buffer modeless selection is lost
Christian Brabandt <cb@256bit.org>
parents:
11672
diff
changeset
|
9897 * - redrawing for a callback and there is a modeless selection |
| 7 | 9898 */ |
|
11698
4f59d2a66bf7
patch 8.0.0732: when updating a buffer modeless selection is lost
Christian Brabandt <cb@256bit.org>
parents:
11672
diff
changeset
|
9899 if (!screen_valid(TRUE) || line_count <= 0 |
|
4f59d2a66bf7
patch 8.0.0732: when updating a buffer modeless selection is lost
Christian Brabandt <cb@256bit.org>
parents:
11672
diff
changeset
|
9900 || (!force && line_count > p_ttyscroll) |
|
4f59d2a66bf7
patch 8.0.0732: when updating a buffer modeless selection is lost
Christian Brabandt <cb@256bit.org>
parents:
11672
diff
changeset
|
9901 #ifdef FEAT_CLIPBOARD |
|
4f59d2a66bf7
patch 8.0.0732: when updating a buffer modeless selection is lost
Christian Brabandt <cb@256bit.org>
parents:
11672
diff
changeset
|
9902 || (clip_star.state != SELECT_CLEARED |
|
4f59d2a66bf7
patch 8.0.0732: when updating a buffer modeless selection is lost
Christian Brabandt <cb@256bit.org>
parents:
11672
diff
changeset
|
9903 && redrawing_for_callback > 0) |
|
4f59d2a66bf7
patch 8.0.0732: when updating a buffer modeless selection is lost
Christian Brabandt <cb@256bit.org>
parents:
11672
diff
changeset
|
9904 #endif |
|
4f59d2a66bf7
patch 8.0.0732: when updating a buffer modeless selection is lost
Christian Brabandt <cb@256bit.org>
parents:
11672
diff
changeset
|
9905 ) |
| 7 | 9906 return FAIL; |
| 9907 | |
| 9908 /* | |
| 9909 * Check if the rest of the current region will become empty. | |
| 9910 */ | |
| 9911 result_empty = row + line_count >= end; | |
| 9912 | |
| 9913 /* | |
| 9914 * We can delete lines only when 'db' flag not set or when 'ce' option | |
| 9915 * available. | |
| 9916 */ | |
| 9917 can_delete = (*T_DB == NUL || can_clear(T_CE)); | |
| 9918 | |
| 9919 /* | |
| 9920 * There are six ways to delete lines: | |
| 9921 * 0. When in a vertically split window and t_CV isn't set, redraw the | |
| 9922 * characters from ScreenLines[]. | |
| 9923 * 1. Use T_CD if it exists and the result is empty. | |
| 9924 * 2. Use newlines if row == 0 and count == 1 or T_CDL does not exist. | |
| 9925 * 3. Use T_CDL (delete multiple lines) if it exists and line_count > 1 or | |
| 9926 * none of the other ways work. | |
| 9927 * 4. Use T_CE (erase line) if the result is empty. | |
| 9928 * 5. Use T_DL (delete line) if it exists. | |
| 9929 * 6. redraw the characters from ScreenLines[]. | |
| 9930 */ | |
| 9931 if (wp != NULL && wp->w_width != Columns && *T_CSV == NUL) | |
| 9932 type = USE_REDRAW; | |
|
12477
68d7bc045dbe
patch 8.0.1118: FEAT_WINDOWS adds a lot of #ifdefs
Christian Brabandt <cb@256bit.org>
parents:
12441
diff
changeset
|
9933 else if (can_clear(T_CD) && result_empty) |
| 7 | 9934 type = USE_T_CD; |
| 9935 #if defined(__BEOS__) && defined(BEOS_DR8) | |
| 9936 /* | |
| 9937 * USE_NL does not seem to work in Terminal of DR8 so we set T_DB="" in | |
| 9938 * its internal termcap... this works okay for tests which test *T_DB != | |
| 9939 * NUL. It has the disadvantage that the user cannot use any :set t_* | |
| 9940 * command to get T_DB (back) to empty_option, only :set term=... will do | |
| 9941 * the trick... | |
| 9942 * Anyway, this hack will hopefully go away with the next OS release. | |
| 9943 * (Olaf Seibert) | |
| 9944 */ | |
| 9945 else if (row == 0 && T_DB == empty_option | |
| 9946 && (line_count == 1 || *T_CDL == NUL)) | |
| 9947 #else | |
| 9948 else if (row == 0 && ( | |
| 9949 #ifndef AMIGA | |
| 9950 /* On the Amiga, somehow '\n' on the last line doesn't always scroll | |
| 9951 * up, so use delete-line command */ | |
| 9952 line_count == 1 || | |
| 9953 #endif | |
| 9954 *T_CDL == NUL)) | |
| 9955 #endif | |
| 9956 type = USE_NL; | |
| 9957 else if (*T_CDL != NUL && line_count > 1 && can_delete) | |
| 9958 type = USE_T_CDL; | |
| 9959 else if (can_clear(T_CE) && result_empty | |
|
12477
68d7bc045dbe
patch 8.0.1118: FEAT_WINDOWS adds a lot of #ifdefs
Christian Brabandt <cb@256bit.org>
parents:
12441
diff
changeset
|
9960 && (wp == NULL || wp->w_width == Columns)) |
| 7 | 9961 type = USE_T_CE; |
| 9962 else if (*T_DL != NUL && can_delete) | |
| 9963 type = USE_T_DL; | |
| 9964 else if (*T_CDL != NUL && can_delete) | |
| 9965 type = USE_T_CDL; | |
| 9966 else | |
| 9967 return FAIL; | |
| 9968 | |
| 9969 #ifdef FEAT_CLIPBOARD | |
| 9970 /* Remove a modeless selection when deleting lines halfway the screen or | |
| 9971 * not the full width of the screen. */ | |
|
12477
68d7bc045dbe
patch 8.0.1118: FEAT_WINDOWS adds a lot of #ifdefs
Christian Brabandt <cb@256bit.org>
parents:
12441
diff
changeset
|
9972 if (off + row > 0 || (wp != NULL && wp->w_width != Columns)) |
| 3674 | 9973 clip_clear_selection(&clip_star); |
| 7 | 9974 else |
| 9975 clip_scroll_selection(line_count); | |
| 9976 #endif | |
| 9977 | |
| 9978 #ifdef FEAT_GUI | |
| 9979 /* Don't update the GUI cursor here, ScreenLines[] is invalid until the | |
| 9980 * scrolling is actually carried out. */ | |
|
9848
664276833670
commit https://github.com/vim/vim/commit/107abd2ca53c31fd3bb40d77ff296e98eaae2975
Christian Brabandt <cb@256bit.org>
parents:
9754
diff
changeset
|
9981 gui_dont_update_cursor(gui.cursor_row >= row + off |
|
664276833670
commit https://github.com/vim/vim/commit/107abd2ca53c31fd3bb40d77ff296e98eaae2975
Christian Brabandt <cb@256bit.org>
parents:
9754
diff
changeset
|
9982 && gui.cursor_row < end + off); |
| 7 | 9983 #endif |
| 9984 | |
|
14081
45c595c0ddaf
patch 8.1.0058: display problem with margins and scrolling
Christian Brabandt <cb@256bit.org>
parents:
14079
diff
changeset
|
9985 if (wp != NULL && wp->w_wincol != 0 && *T_CSV != NUL && *T_CCS == NUL) |
|
45c595c0ddaf
patch 8.1.0058: display problem with margins and scrolling
Christian Brabandt <cb@256bit.org>
parents:
14079
diff
changeset
|
9986 cursor_col = wp->w_wincol; |
|
45c595c0ddaf
patch 8.1.0058: display problem with margins and scrolling
Christian Brabandt <cb@256bit.org>
parents:
14079
diff
changeset
|
9987 |
| 7 | 9988 if (*T_CCS != NUL) /* cursor relative to region */ |
| 9989 { | |
| 9990 cursor_row = row; | |
| 9991 cursor_end = end; | |
| 9992 } | |
| 9993 else | |
| 9994 { | |
| 9995 cursor_row = row + off; | |
| 9996 cursor_end = end + off; | |
| 9997 } | |
| 9998 | |
| 9999 /* | |
| 10000 * Now shift LineOffset[] line_count up to reflect the deleted lines. | |
| 10001 * Clear the inserted lines in ScreenLines[]. | |
| 10002 */ | |
| 10003 row += off; | |
| 10004 end += off; | |
| 10005 for (i = 0; i < line_count; ++i) | |
| 10006 { | |
| 10007 if (wp != NULL && wp->w_width != Columns) | |
| 10008 { | |
| 10009 /* need to copy part of a line */ | |
| 10010 j = row + i; | |
| 10011 while ((j += line_count) <= end - 1) | |
| 10012 linecopy(j - line_count, j, wp); | |
| 10013 j -= line_count; | |
| 10014 if (can_clear((char_u *)" ")) | |
|
12152
69af108df70e
patch 8.0.0956: scrolling in a terminal window has flicker
Christian Brabandt <cb@256bit.org>
parents:
12122
diff
changeset
|
10015 lineclear(LineOffset[j] + wp->w_wincol, wp->w_width, |
|
69af108df70e
patch 8.0.0956: scrolling in a terminal window has flicker
Christian Brabandt <cb@256bit.org>
parents:
12122
diff
changeset
|
10016 clear_attr); |
| 7 | 10017 else |
| 10018 lineinvalid(LineOffset[j] + wp->w_wincol, wp->w_width); | |
| 10019 LineWraps[j] = FALSE; | |
| 10020 } | |
| 10021 else | |
| 10022 { | |
| 10023 /* whole width, moving the line pointers is faster */ | |
| 10024 j = row + i; | |
| 10025 temp = LineOffset[j]; | |
| 10026 while ((j += line_count) <= end - 1) | |
| 10027 { | |
| 10028 LineOffset[j - line_count] = LineOffset[j]; | |
| 10029 LineWraps[j - line_count] = LineWraps[j]; | |
| 10030 } | |
| 10031 LineOffset[j - line_count] = temp; | |
| 10032 LineWraps[j - line_count] = FALSE; | |
| 10033 if (can_clear((char_u *)" ")) | |
|
12152
69af108df70e
patch 8.0.0956: scrolling in a terminal window has flicker
Christian Brabandt <cb@256bit.org>
parents:
12122
diff
changeset
|
10034 lineclear(temp, (int)Columns, clear_attr); |
| 7 | 10035 else |
| 10036 lineinvalid(temp, (int)Columns); | |
| 10037 } | |
| 10038 } | |
| 10039 | |
|
12152
69af108df70e
patch 8.0.0956: scrolling in a terminal window has flicker
Christian Brabandt <cb@256bit.org>
parents:
12122
diff
changeset
|
10040 if (screen_attr != clear_attr) |
|
69af108df70e
patch 8.0.0956: scrolling in a terminal window has flicker
Christian Brabandt <cb@256bit.org>
parents:
12122
diff
changeset
|
10041 screen_stop_highlight(); |
|
69af108df70e
patch 8.0.0956: scrolling in a terminal window has flicker
Christian Brabandt <cb@256bit.org>
parents:
12122
diff
changeset
|
10042 if (clear_attr != 0) |
|
69af108df70e
patch 8.0.0956: scrolling in a terminal window has flicker
Christian Brabandt <cb@256bit.org>
parents:
12122
diff
changeset
|
10043 screen_start_highlight(clear_attr); |
| 7 | 10044 |
| 10045 /* redraw the characters */ | |
| 10046 if (type == USE_REDRAW) | |
| 10047 redraw_block(row, end, wp); | |
|
12477
68d7bc045dbe
patch 8.0.1118: FEAT_WINDOWS adds a lot of #ifdefs
Christian Brabandt <cb@256bit.org>
parents:
12441
diff
changeset
|
10048 else if (type == USE_T_CD) /* delete the lines */ |
| 7 | 10049 { |
|
14081
45c595c0ddaf
patch 8.1.0058: display problem with margins and scrolling
Christian Brabandt <cb@256bit.org>
parents:
14079
diff
changeset
|
10050 windgoto(cursor_row, cursor_col); |
| 7 | 10051 out_str(T_CD); |
| 10052 screen_start(); /* don't know where cursor is now */ | |
| 10053 } | |
| 10054 else if (type == USE_T_CDL) | |
| 10055 { | |
|
14081
45c595c0ddaf
patch 8.1.0058: display problem with margins and scrolling
Christian Brabandt <cb@256bit.org>
parents:
14079
diff
changeset
|
10056 windgoto(cursor_row, cursor_col); |
| 7 | 10057 term_delete_lines(line_count); |
| 10058 screen_start(); /* don't know where cursor is now */ | |
| 10059 } | |
| 10060 /* | |
| 10061 * Deleting lines at top of the screen or scroll region: Just scroll | |
| 10062 * the whole screen (scroll region) up by outputting newlines on the | |
| 10063 * last line. | |
| 10064 */ | |
| 10065 else if (type == USE_NL) | |
| 10066 { | |
|
14081
45c595c0ddaf
patch 8.1.0058: display problem with margins and scrolling
Christian Brabandt <cb@256bit.org>
parents:
14079
diff
changeset
|
10067 windgoto(cursor_end - 1, cursor_col); |
| 7 | 10068 for (i = line_count; --i >= 0; ) |
| 10069 out_char('\n'); /* cursor will remain on same line */ | |
| 10070 } | |
| 10071 else | |
| 10072 { | |
| 10073 for (i = line_count; --i >= 0; ) | |
| 10074 { | |
| 10075 if (type == USE_T_DL) | |
| 10076 { | |
|
14081
45c595c0ddaf
patch 8.1.0058: display problem with margins and scrolling
Christian Brabandt <cb@256bit.org>
parents:
14079
diff
changeset
|
10077 windgoto(cursor_row, cursor_col); |
| 7 | 10078 out_str(T_DL); /* delete a line */ |
| 10079 } | |
| 10080 else /* type == USE_T_CE */ | |
| 10081 { | |
|
14081
45c595c0ddaf
patch 8.1.0058: display problem with margins and scrolling
Christian Brabandt <cb@256bit.org>
parents:
14079
diff
changeset
|
10082 windgoto(cursor_row + i, cursor_col); |
| 7 | 10083 out_str(T_CE); /* erase a line */ |
| 10084 } | |
| 10085 screen_start(); /* don't know where cursor is now */ | |
| 10086 } | |
| 10087 } | |
| 10088 | |
| 10089 /* | |
| 10090 * If the 'db' flag is set, we need to clear the lines that have been | |
| 10091 * scrolled up at the bottom of the region. | |
| 10092 */ | |
| 10093 if (*T_DB && (type == USE_T_DL || type == USE_T_CDL)) | |
| 10094 { | |
| 10095 for (i = line_count; i > 0; --i) | |
| 10096 { | |
|
14081
45c595c0ddaf
patch 8.1.0058: display problem with margins and scrolling
Christian Brabandt <cb@256bit.org>
parents:
14079
diff
changeset
|
10097 windgoto(cursor_end - i, cursor_col); |
| 7 | 10098 out_str(T_CE); /* erase a line */ |
| 10099 screen_start(); /* don't know where cursor is now */ | |
| 10100 } | |
| 10101 } | |
| 10102 | |
| 10103 #ifdef FEAT_GUI | |
| 10104 gui_can_update_cursor(); | |
| 10105 if (gui.in_use) | |
| 10106 out_flush(); /* always flush after a scroll */ | |
| 10107 #endif | |
| 10108 | |
| 10109 return OK; | |
| 10110 } | |
| 10111 | |
| 10112 /* | |
|
15629
dd2e0b83a660
patch 8.1.0822: peeking and flushing output slows down execution
Bram Moolenaar <Bram@vim.org>
parents:
15609
diff
changeset
|
10113 * Return TRUE when postponing displaying the mode message: when not redrawing |
|
dd2e0b83a660
patch 8.1.0822: peeking and flushing output slows down execution
Bram Moolenaar <Bram@vim.org>
parents:
15609
diff
changeset
|
10114 * or inside a mapping. |
|
dd2e0b83a660
patch 8.1.0822: peeking and flushing output slows down execution
Bram Moolenaar <Bram@vim.org>
parents:
15609
diff
changeset
|
10115 */ |
|
dd2e0b83a660
patch 8.1.0822: peeking and flushing output slows down execution
Bram Moolenaar <Bram@vim.org>
parents:
15609
diff
changeset
|
10116 int |
|
dd2e0b83a660
patch 8.1.0822: peeking and flushing output slows down execution
Bram Moolenaar <Bram@vim.org>
parents:
15609
diff
changeset
|
10117 skip_showmode() |
|
dd2e0b83a660
patch 8.1.0822: peeking and flushing output slows down execution
Bram Moolenaar <Bram@vim.org>
parents:
15609
diff
changeset
|
10118 { |
|
dd2e0b83a660
patch 8.1.0822: peeking and flushing output slows down execution
Bram Moolenaar <Bram@vim.org>
parents:
15609
diff
changeset
|
10119 // Call char_avail() only when we are going to show something, because it |
|
dd2e0b83a660
patch 8.1.0822: peeking and flushing output slows down execution
Bram Moolenaar <Bram@vim.org>
parents:
15609
diff
changeset
|
10120 // takes a bit of time. redrawing() may also call char_avail_avail(). |
|
dd2e0b83a660
patch 8.1.0822: peeking and flushing output slows down execution
Bram Moolenaar <Bram@vim.org>
parents:
15609
diff
changeset
|
10121 if (global_busy |
|
dd2e0b83a660
patch 8.1.0822: peeking and flushing output slows down execution
Bram Moolenaar <Bram@vim.org>
parents:
15609
diff
changeset
|
10122 || msg_silent != 0 |
|
dd2e0b83a660
patch 8.1.0822: peeking and flushing output slows down execution
Bram Moolenaar <Bram@vim.org>
parents:
15609
diff
changeset
|
10123 || !redrawing() |
|
dd2e0b83a660
patch 8.1.0822: peeking and flushing output slows down execution
Bram Moolenaar <Bram@vim.org>
parents:
15609
diff
changeset
|
10124 || (char_avail() && !KeyTyped)) |
|
dd2e0b83a660
patch 8.1.0822: peeking and flushing output slows down execution
Bram Moolenaar <Bram@vim.org>
parents:
15609
diff
changeset
|
10125 { |
|
dd2e0b83a660
patch 8.1.0822: peeking and flushing output slows down execution
Bram Moolenaar <Bram@vim.org>
parents:
15609
diff
changeset
|
10126 redraw_cmdline = TRUE; // show mode later |
|
dd2e0b83a660
patch 8.1.0822: peeking and flushing output slows down execution
Bram Moolenaar <Bram@vim.org>
parents:
15609
diff
changeset
|
10127 return TRUE; |
|
dd2e0b83a660
patch 8.1.0822: peeking and flushing output slows down execution
Bram Moolenaar <Bram@vim.org>
parents:
15609
diff
changeset
|
10128 } |
|
dd2e0b83a660
patch 8.1.0822: peeking and flushing output slows down execution
Bram Moolenaar <Bram@vim.org>
parents:
15609
diff
changeset
|
10129 return FALSE; |
|
dd2e0b83a660
patch 8.1.0822: peeking and flushing output slows down execution
Bram Moolenaar <Bram@vim.org>
parents:
15609
diff
changeset
|
10130 } |
|
dd2e0b83a660
patch 8.1.0822: peeking and flushing output slows down execution
Bram Moolenaar <Bram@vim.org>
parents:
15609
diff
changeset
|
10131 |
|
dd2e0b83a660
patch 8.1.0822: peeking and flushing output slows down execution
Bram Moolenaar <Bram@vim.org>
parents:
15609
diff
changeset
|
10132 /* |
|
13308
ae312df8d0ab
patch 8.0.1528: dead code found
Christian Brabandt <cb@256bit.org>
parents:
13292
diff
changeset
|
10133 * Show the current mode and ruler. |
| 7 | 10134 * |
| 10135 * If clear_cmdline is TRUE, clear the rest of the cmdline. | |
| 10136 * If clear_cmdline is FALSE there may be a message there that needs to be | |
| 10137 * cleared only if a mode is shown. | |
| 10138 * Return the length of the message (0 if no message). | |
| 10139 */ | |
| 10140 int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
10141 showmode(void) |
| 7 | 10142 { |
| 10143 int need_clear; | |
| 10144 int length = 0; | |
| 10145 int do_mode; | |
| 10146 int attr; | |
| 10147 int nwr_save; | |
| 10148 #ifdef FEAT_INS_EXPAND | |
| 10149 int sub_attr; | |
| 10150 #endif | |
| 10151 | |
| 642 | 10152 do_mode = ((p_smd && msg_silent == 0) |
| 10153 && ((State & INSERT) | |
|
14093
a9d94f10ecef
patch 8.1.0064: typing CTRL-W in a prompt buffer shows mode "-- --"
Christian Brabandt <cb@256bit.org>
parents:
14089
diff
changeset
|
10154 || restart_edit != NUL |
| 5735 | 10155 || VIsual_active)); |
|
14004
e124262d435e
patch 8.1.0020: cannot tell whether a register is executing or recording
Christian Brabandt <cb@256bit.org>
parents:
13968
diff
changeset
|
10156 if (do_mode || reg_recording != 0) |
| 7 | 10157 { |
|
15629
dd2e0b83a660
patch 8.1.0822: peeking and flushing output slows down execution
Bram Moolenaar <Bram@vim.org>
parents:
15609
diff
changeset
|
10158 if (skip_showmode()) |
|
dd2e0b83a660
patch 8.1.0822: peeking and flushing output slows down execution
Bram Moolenaar <Bram@vim.org>
parents:
15609
diff
changeset
|
10159 return 0; // show mode later |
| 7 | 10160 |
| 10161 nwr_save = need_wait_return; | |
| 10162 | |
| 10163 /* wait a bit before overwriting an important message */ | |
| 10164 check_for_delay(FALSE); | |
| 10165 | |
| 10166 /* if the cmdline is more than one line high, erase top lines */ | |
| 10167 need_clear = clear_cmdline; | |
| 10168 if (clear_cmdline && cmdline_row < Rows - 1) | |
| 10169 msg_clr_cmdline(); /* will reset clear_cmdline */ | |
| 10170 | |
| 10171 /* Position on the last line in the window, column 0 */ | |
| 10172 msg_pos_mode(); | |
| 10173 cursor_off(); | |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
10174 attr = HL_ATTR(HLF_CM); /* Highlight mode */ |
| 7 | 10175 if (do_mode) |
| 10176 { | |
|
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15521
diff
changeset
|
10177 msg_puts_attr("--", attr); |
| 7 | 10178 #if defined(FEAT_XIM) |
| 2520 | 10179 if ( |
| 10180 # ifdef FEAT_GUI_GTK | |
| 10181 preedit_get_status() | |
| 1668 | 10182 # else |
| 10183 im_get_status() | |
| 2520 | 10184 # endif |
| 1668 | 10185 ) |
|
2277
f42e0b5ff9e9
Change remaining HAVE_GTK2 to FEAT_GUI_GTK.
Bram Moolenaar <bram@vim.org>
parents:
2269
diff
changeset
|
10186 # ifdef FEAT_GUI_GTK /* most of the time, it's not XIM being used */ |
|
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15521
diff
changeset
|
10187 msg_puts_attr(" IM", attr); |
| 7 | 10188 # else |
|
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15521
diff
changeset
|
10189 msg_puts_attr(" XIM", attr); |
| 7 | 10190 # endif |
| 10191 #endif | |
| 10192 #if defined(FEAT_HANGULIN) && defined(FEAT_GUI) | |
| 10193 if (gui.in_use) | |
| 10194 { | |
| 10195 if (hangul_input_state_get()) | |
|
7208
2c00f6b312bf
commit https://github.com/vim/vim/commit/72f4cc4a987d123c0ed909c85b9a05f65cef7202
Christian Brabandt <cb@256bit.org>
parents:
7007
diff
changeset
|
10196 { |
|
2c00f6b312bf
commit https://github.com/vim/vim/commit/72f4cc4a987d123c0ed909c85b9a05f65cef7202
Christian Brabandt <cb@256bit.org>
parents:
7007
diff
changeset
|
10197 /* HANGUL */ |
|
2c00f6b312bf
commit https://github.com/vim/vim/commit/72f4cc4a987d123c0ed909c85b9a05f65cef7202
Christian Brabandt <cb@256bit.org>
parents:
7007
diff
changeset
|
10198 if (enc_utf8) |
|
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15521
diff
changeset
|
10199 msg_puts_attr(" \355\225\234\352\270\200", attr); |
|
7208
2c00f6b312bf
commit https://github.com/vim/vim/commit/72f4cc4a987d123c0ed909c85b9a05f65cef7202
Christian Brabandt <cb@256bit.org>
parents:
7007
diff
changeset
|
10200 else |
|
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15521
diff
changeset
|
10201 msg_puts_attr(" \307\321\261\333", attr); |
|
7208
2c00f6b312bf
commit https://github.com/vim/vim/commit/72f4cc4a987d123c0ed909c85b9a05f65cef7202
Christian Brabandt <cb@256bit.org>
parents:
7007
diff
changeset
|
10202 } |
| 7 | 10203 } |
| 10204 #endif | |
| 10205 #ifdef FEAT_INS_EXPAND | |
| 5946 | 10206 /* CTRL-X in Insert mode */ |
| 10207 if (edit_submode != NULL && !shortmess(SHM_COMPLETIONMENU)) | |
| 7 | 10208 { |
| 10209 /* These messages can get long, avoid a wrap in a narrow | |
| 10210 * window. Prefer showing edit_submode_extra. */ | |
| 10211 length = (Rows - msg_row) * Columns - 3; | |
| 10212 if (edit_submode_extra != NULL) | |
| 10213 length -= vim_strsize(edit_submode_extra); | |
| 10214 if (length > 0) | |
| 10215 { | |
| 10216 if (edit_submode_pre != NULL) | |
| 10217 length -= vim_strsize(edit_submode_pre); | |
| 10218 if (length - vim_strsize(edit_submode) > 0) | |
| 10219 { | |
| 10220 if (edit_submode_pre != NULL) | |
|
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15521
diff
changeset
|
10221 msg_puts_attr((char *)edit_submode_pre, attr); |
|
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15521
diff
changeset
|
10222 msg_puts_attr((char *)edit_submode, attr); |
| 7 | 10223 } |
| 10224 if (edit_submode_extra != NULL) | |
| 10225 { | |
|
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15521
diff
changeset
|
10226 msg_puts_attr(" ", attr); /* add a space in between */ |
| 7 | 10227 if ((int)edit_submode_highl < (int)HLF_COUNT) |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
10228 sub_attr = HL_ATTR(edit_submode_highl); |
| 7 | 10229 else |
| 10230 sub_attr = attr; | |
|
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15521
diff
changeset
|
10231 msg_puts_attr((char *)edit_submode_extra, sub_attr); |
| 7 | 10232 } |
| 10233 } | |
| 10234 } | |
| 10235 else | |
| 10236 #endif | |
| 10237 { | |
| 10238 if (State & VREPLACE_FLAG) | |
|
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15521
diff
changeset
|
10239 msg_puts_attr(_(" VREPLACE"), attr); |
|
14424
0a69e6e708f9
patch 8.1.0226: too many #ifdefs
Christian Brabandt <cb@256bit.org>
parents:
14218
diff
changeset
|
10240 else if (State & REPLACE_FLAG) |
|
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15521
diff
changeset
|
10241 msg_puts_attr(_(" REPLACE"), attr); |
| 7 | 10242 else if (State & INSERT) |
| 10243 { | |
| 10244 #ifdef FEAT_RIGHTLEFT | |
| 10245 if (p_ri) | |
|
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15521
diff
changeset
|
10246 msg_puts_attr(_(" REVERSE"), attr); |
|
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15521
diff
changeset
|
10247 #endif |
|
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15521
diff
changeset
|
10248 msg_puts_attr(_(" INSERT"), attr); |
| 7 | 10249 } |
|
14093
a9d94f10ecef
patch 8.1.0064: typing CTRL-W in a prompt buffer shows mode "-- --"
Christian Brabandt <cb@256bit.org>
parents:
14089
diff
changeset
|
10250 else if (restart_edit == 'I' || restart_edit == 'A') |
|
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15521
diff
changeset
|
10251 msg_puts_attr(_(" (insert)"), attr); |
| 7 | 10252 else if (restart_edit == 'R') |
|
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15521
diff
changeset
|
10253 msg_puts_attr(_(" (replace)"), attr); |
| 7 | 10254 else if (restart_edit == 'V') |
|
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15521
diff
changeset
|
10255 msg_puts_attr(_(" (vreplace)"), attr); |
| 7 | 10256 #ifdef FEAT_RIGHTLEFT |
| 10257 if (p_hkmap) | |
|
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15521
diff
changeset
|
10258 msg_puts_attr(_(" Hebrew"), attr); |
| 7 | 10259 # ifdef FEAT_FKMAP |
| 10260 if (p_fkmap) | |
|
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15521
diff
changeset
|
10261 msg_puts_attr(farsi_text_5, attr); |
| 7 | 10262 # endif |
| 10263 #endif | |
| 10264 #ifdef FEAT_KEYMAP | |
| 10265 if (State & LANGMAP) | |
| 10266 { | |
| 10267 # ifdef FEAT_ARABIC | |
| 10268 if (curwin->w_p_arab) | |
|
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15521
diff
changeset
|
10269 msg_puts_attr(_(" Arabic"), attr); |
| 7 | 10270 else |
| 10271 # endif | |
|
9645
123d3c102035
commit https://github.com/vim/vim/commit/73ac0c4281a3606651604a3cbcc334bfb3859a87
Christian Brabandt <cb@256bit.org>
parents:
9489
diff
changeset
|
10272 if (get_keymap_str(curwin, (char_u *)" (%s)", |
|
123d3c102035
commit https://github.com/vim/vim/commit/73ac0c4281a3606651604a3cbcc334bfb3859a87
Christian Brabandt <cb@256bit.org>
parents:
9489
diff
changeset
|
10273 NameBuff, MAXPATHL)) |
|
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15521
diff
changeset
|
10274 msg_puts_attr((char *)NameBuff, attr); |
| 7 | 10275 } |
| 10276 #endif | |
| 10277 if ((State & INSERT) && p_paste) | |
|
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15521
diff
changeset
|
10278 msg_puts_attr(_(" (paste)"), attr); |
| 7 | 10279 |
| 10280 if (VIsual_active) | |
| 10281 { | |
| 10282 char *p; | |
| 10283 | |
| 10284 /* Don't concatenate separate words to avoid translation | |
| 10285 * problems. */ | |
| 10286 switch ((VIsual_select ? 4 : 0) | |
| 10287 + (VIsual_mode == Ctrl_V) * 2 | |
| 10288 + (VIsual_mode == 'V')) | |
| 10289 { | |
| 10290 case 0: p = N_(" VISUAL"); break; | |
| 10291 case 1: p = N_(" VISUAL LINE"); break; | |
| 10292 case 2: p = N_(" VISUAL BLOCK"); break; | |
| 10293 case 4: p = N_(" SELECT"); break; | |
| 10294 case 5: p = N_(" SELECT LINE"); break; | |
| 10295 default: p = N_(" SELECT BLOCK"); break; | |
| 10296 } | |
|
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15521
diff
changeset
|
10297 msg_puts_attr(_(p), attr); |
|
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15521
diff
changeset
|
10298 } |
|
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15521
diff
changeset
|
10299 msg_puts_attr(" --", attr); |
| 7 | 10300 } |
| 644 | 10301 |
| 7 | 10302 need_clear = TRUE; |
| 10303 } | |
|
14004
e124262d435e
patch 8.1.0020: cannot tell whether a register is executing or recording
Christian Brabandt <cb@256bit.org>
parents:
13968
diff
changeset
|
10304 if (reg_recording != 0 |
| 7 | 10305 #ifdef FEAT_INS_EXPAND |
| 10306 && edit_submode == NULL /* otherwise it gets too long */ | |
| 10307 #endif | |
| 10308 ) | |
| 10309 { | |
|
7233
9487ea110214
commit https://github.com/vim/vim/commit/a0ed84a26897c994512873a895b9fc54e90c6845
Christian Brabandt <cb@256bit.org>
parents:
7208
diff
changeset
|
10310 recording_mode(attr); |
| 7 | 10311 need_clear = TRUE; |
| 10312 } | |
| 644 | 10313 |
| 10314 mode_displayed = TRUE; | |
| 7 | 10315 if (need_clear || clear_cmdline) |
| 10316 msg_clr_eos(); | |
| 10317 msg_didout = FALSE; /* overwrite this message */ | |
| 10318 length = msg_col; | |
| 10319 msg_col = 0; | |
| 10320 need_wait_return = nwr_save; /* never ask for hit-return for this */ | |
| 10321 } | |
| 10322 else if (clear_cmdline && msg_silent == 0) | |
| 10323 /* Clear the whole command line. Will reset "clear_cmdline". */ | |
| 10324 msg_clr_cmdline(); | |
| 10325 | |
| 10326 #ifdef FEAT_CMDL_INFO | |
| 10327 /* In Visual mode the size of the selected area must be redrawn. */ | |
| 10328 if (VIsual_active) | |
| 10329 clear_showcmd(); | |
| 10330 | |
| 10331 /* If the last window has no status line, the ruler is after the mode | |
| 10332 * message and must be redrawn */ | |
|
12477
68d7bc045dbe
patch 8.0.1118: FEAT_WINDOWS adds a lot of #ifdefs
Christian Brabandt <cb@256bit.org>
parents:
12441
diff
changeset
|
10333 if (redrawing() && lastwin->w_status_height == 0) |
|
14089
ae53a9274f50
patch 8.1.0062: popup menu broken if a callback changes the window layout
Christian Brabandt <cb@256bit.org>
parents:
14081
diff
changeset
|
10334 win_redr_ruler(lastwin, TRUE, FALSE); |
| 7 | 10335 #endif |
| 10336 redraw_cmdline = FALSE; | |
| 10337 clear_cmdline = FALSE; | |
| 10338 | |
| 10339 return length; | |
| 10340 } | |
| 10341 | |
| 10342 /* | |
| 10343 * Position for a mode message. | |
| 10344 */ | |
| 10345 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
10346 msg_pos_mode(void) |
| 7 | 10347 { |
| 10348 msg_col = 0; | |
| 10349 msg_row = Rows - 1; | |
| 10350 } | |
| 10351 | |
| 10352 /* | |
| 10353 * Delete mode message. Used when ESC is typed which is expected to end | |
| 10354 * Insert mode (but Insert mode didn't end yet!). | |
| 644 | 10355 * Caller should check "mode_displayed". |
| 7 | 10356 */ |
| 10357 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
10358 unshowmode(int force) |
| 7 | 10359 { |
| 10360 /* | |
|
2055
4aa4510d548c
updated for version 7.2.341
Bram Moolenaar <bram@zimbu.org>
parents:
2008
diff
changeset
|
10361 * Don't delete it right now, when not redrawing or inside a mapping. |
| 7 | 10362 */ |
| 10363 if (!redrawing() || (!force && char_avail() && !KeyTyped)) | |
| 10364 redraw_cmdline = TRUE; /* delete mode later */ | |
| 10365 else | |
|
8817
b7eb7bbd71d0
commit https://github.com/vim/vim/commit/fd773e9e88add7d1ffef890fb9f3a00d613b4326
Christian Brabandt <cb@256bit.org>
parents:
8643
diff
changeset
|
10366 clearmode(); |
|
b7eb7bbd71d0
commit https://github.com/vim/vim/commit/fd773e9e88add7d1ffef890fb9f3a00d613b4326
Christian Brabandt <cb@256bit.org>
parents:
8643
diff
changeset
|
10367 } |
|
b7eb7bbd71d0
commit https://github.com/vim/vim/commit/fd773e9e88add7d1ffef890fb9f3a00d613b4326
Christian Brabandt <cb@256bit.org>
parents:
8643
diff
changeset
|
10368 |
|
b7eb7bbd71d0
commit https://github.com/vim/vim/commit/fd773e9e88add7d1ffef890fb9f3a00d613b4326
Christian Brabandt <cb@256bit.org>
parents:
8643
diff
changeset
|
10369 /* |
|
b7eb7bbd71d0
commit https://github.com/vim/vim/commit/fd773e9e88add7d1ffef890fb9f3a00d613b4326
Christian Brabandt <cb@256bit.org>
parents:
8643
diff
changeset
|
10370 * Clear the mode message. |
|
b7eb7bbd71d0
commit https://github.com/vim/vim/commit/fd773e9e88add7d1ffef890fb9f3a00d613b4326
Christian Brabandt <cb@256bit.org>
parents:
8643
diff
changeset
|
10371 */ |
|
b7eb7bbd71d0
commit https://github.com/vim/vim/commit/fd773e9e88add7d1ffef890fb9f3a00d613b4326
Christian Brabandt <cb@256bit.org>
parents:
8643
diff
changeset
|
10372 void |
|
9282
9f97a6290c63
commit https://github.com/vim/vim/commit/cf089463492fab53b2a5d81517829d22f882f82e
Christian Brabandt <cb@256bit.org>
parents:
9213
diff
changeset
|
10373 clearmode(void) |
|
8817
b7eb7bbd71d0
commit https://github.com/vim/vim/commit/fd773e9e88add7d1ffef890fb9f3a00d613b4326
Christian Brabandt <cb@256bit.org>
parents:
8643
diff
changeset
|
10374 { |
|
13968
d111462e0173
patch 8.1.0002: :stopinsert changes the message position
Christian Brabandt <cb@256bit.org>
parents:
13888
diff
changeset
|
10375 int save_msg_row = msg_row; |
|
d111462e0173
patch 8.1.0002: :stopinsert changes the message position
Christian Brabandt <cb@256bit.org>
parents:
13888
diff
changeset
|
10376 int save_msg_col = msg_col; |
|
d111462e0173
patch 8.1.0002: :stopinsert changes the message position
Christian Brabandt <cb@256bit.org>
parents:
13888
diff
changeset
|
10377 |
|
8817
b7eb7bbd71d0
commit https://github.com/vim/vim/commit/fd773e9e88add7d1ffef890fb9f3a00d613b4326
Christian Brabandt <cb@256bit.org>
parents:
8643
diff
changeset
|
10378 msg_pos_mode(); |
|
14004
e124262d435e
patch 8.1.0020: cannot tell whether a register is executing or recording
Christian Brabandt <cb@256bit.org>
parents:
13968
diff
changeset
|
10379 if (reg_recording != 0) |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
10380 recording_mode(HL_ATTR(HLF_CM)); |
|
8817
b7eb7bbd71d0
commit https://github.com/vim/vim/commit/fd773e9e88add7d1ffef890fb9f3a00d613b4326
Christian Brabandt <cb@256bit.org>
parents:
8643
diff
changeset
|
10381 msg_clr_eos(); |
|
13968
d111462e0173
patch 8.1.0002: :stopinsert changes the message position
Christian Brabandt <cb@256bit.org>
parents:
13888
diff
changeset
|
10382 |
|
d111462e0173
patch 8.1.0002: :stopinsert changes the message position
Christian Brabandt <cb@256bit.org>
parents:
13888
diff
changeset
|
10383 msg_col = save_msg_col; |
|
d111462e0173
patch 8.1.0002: :stopinsert changes the message position
Christian Brabandt <cb@256bit.org>
parents:
13888
diff
changeset
|
10384 msg_row = save_msg_row; |
| 7 | 10385 } |
| 10386 | |
|
7233
9487ea110214
commit https://github.com/vim/vim/commit/a0ed84a26897c994512873a895b9fc54e90c6845
Christian Brabandt <cb@256bit.org>
parents:
7208
diff
changeset
|
10387 static void |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
10388 recording_mode(int attr) |
|
7233
9487ea110214
commit https://github.com/vim/vim/commit/a0ed84a26897c994512873a895b9fc54e90c6845
Christian Brabandt <cb@256bit.org>
parents:
7208
diff
changeset
|
10389 { |
|
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15521
diff
changeset
|
10390 msg_puts_attr(_("recording"), attr); |
|
7233
9487ea110214
commit https://github.com/vim/vim/commit/a0ed84a26897c994512873a895b9fc54e90c6845
Christian Brabandt <cb@256bit.org>
parents:
7208
diff
changeset
|
10391 if (!shortmess(SHM_RECORDING)) |
|
9487ea110214
commit https://github.com/vim/vim/commit/a0ed84a26897c994512873a895b9fc54e90c6845
Christian Brabandt <cb@256bit.org>
parents:
7208
diff
changeset
|
10392 { |
|
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15521
diff
changeset
|
10393 char s[4]; |
|
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15521
diff
changeset
|
10394 |
|
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15521
diff
changeset
|
10395 sprintf(s, " @%c", reg_recording); |
|
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15521
diff
changeset
|
10396 msg_puts_attr(s, attr); |
|
7233
9487ea110214
commit https://github.com/vim/vim/commit/a0ed84a26897c994512873a895b9fc54e90c6845
Christian Brabandt <cb@256bit.org>
parents:
7208
diff
changeset
|
10397 } |
|
9487ea110214
commit https://github.com/vim/vim/commit/a0ed84a26897c994512873a895b9fc54e90c6845
Christian Brabandt <cb@256bit.org>
parents:
7208
diff
changeset
|
10398 } |
|
9487ea110214
commit https://github.com/vim/vim/commit/a0ed84a26897c994512873a895b9fc54e90c6845
Christian Brabandt <cb@256bit.org>
parents:
7208
diff
changeset
|
10399 |
| 667 | 10400 /* |
| 10401 * Draw the tab pages line at the top of the Vim window. | |
| 10402 */ | |
|
15396
325e4a8ba1b6
patch 8.1.0706: tabline is not always redrawn
Bram Moolenaar <Bram@vim.org>
parents:
15384
diff
changeset
|
10403 void |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
10404 draw_tabline(void) |
| 667 | 10405 { |
| 10406 int tabcount = 0; | |
| 10407 tabpage_T *tp; | |
| 10408 int tabwidth; | |
| 10409 int col = 0; | |
| 673 | 10410 int scol = 0; |
| 667 | 10411 int attr; |
| 10412 win_T *wp; | |
| 671 | 10413 win_T *cwp; |
| 10414 int wincount; | |
| 10415 int modified; | |
| 667 | 10416 int c; |
| 10417 int len; | |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
10418 int attr_sel = HL_ATTR(HLF_TPS); |
|
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
10419 int attr_nosel = HL_ATTR(HLF_TP); |
|
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
10420 int attr_fill = HL_ATTR(HLF_TPF); |
| 673 | 10421 char_u *p; |
| 677 | 10422 int room; |
| 10423 int use_sep_chars = (t_colors < 8 | |
| 10424 #ifdef FEAT_GUI | |
| 10425 && !gui.in_use | |
| 10426 #endif | |
|
9027
773d627cac0b
commit https://github.com/vim/vim/commit/61be73bb0f965a895bfb064ea3e55476ac175162
Christian Brabandt <cb@256bit.org>
parents:
8977
diff
changeset
|
10427 #ifdef FEAT_TERMGUICOLORS |
|
773d627cac0b
commit https://github.com/vim/vim/commit/61be73bb0f965a895bfb064ea3e55476ac175162
Christian Brabandt <cb@256bit.org>
parents:
8977
diff
changeset
|
10428 && !p_tgc |
|
8969
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
10429 #endif |
| 677 | 10430 ); |
| 673 | 10431 |
|
10538
c7f671dfd735
patch 8.0.0159: crash on startup when updating tabline
Christian Brabandt <cb@256bit.org>
parents:
10466
diff
changeset
|
10432 if (ScreenLines == NULL) |
|
c7f671dfd735
patch 8.0.0159: crash on startup when updating tabline
Christian Brabandt <cb@256bit.org>
parents:
10466
diff
changeset
|
10433 return; |
| 673 | 10434 redraw_tabline = FALSE; |
| 667 | 10435 |
| 685 | 10436 #ifdef FEAT_GUI_TABLINE |
| 798 | 10437 /* Take care of a GUI tabline. */ |
| 685 | 10438 if (gui_use_tabline()) |
| 10439 { | |
| 10440 gui_update_tabline(); | |
| 10441 return; | |
| 10442 } | |
| 10443 #endif | |
| 10444 | |
| 10445 if (tabline_height() < 1) | |
| 667 | 10446 return; |
| 10447 | |
| 677 | 10448 #if defined(FEAT_STL_OPT) |
| 681 | 10449 |
| 10450 /* Init TabPageIdxs[] to zero: Clicking outside of tabs has no effect. */ | |
| 10451 for (scol = 0; scol < Columns; ++scol) | |
| 10452 TabPageIdxs[scol] = 0; | |
| 10453 | |
| 677 | 10454 /* Use the 'tabline' option if it's set. */ |
| 10455 if (*p_tal != NUL) | |
| 10456 { | |
|
8872
4d4de770f970
commit https://github.com/vim/vim/commit/f73d3bc253fa79ad220f52f04b93e782e95a9d43
Christian Brabandt <cb@256bit.org>
parents:
8847
diff
changeset
|
10457 int saved_did_emsg = did_emsg; |
| 680 | 10458 |
| 10459 /* Check for an error. If there is one we would loop in redrawing the | |
| 10460 * screen. Avoid that by making 'tabline' empty. */ | |
|
8872
4d4de770f970
commit https://github.com/vim/vim/commit/f73d3bc253fa79ad220f52f04b93e782e95a9d43
Christian Brabandt <cb@256bit.org>
parents:
8847
diff
changeset
|
10461 did_emsg = FALSE; |
| 677 | 10462 win_redr_custom(NULL, FALSE); |
|
8872
4d4de770f970
commit https://github.com/vim/vim/commit/f73d3bc253fa79ad220f52f04b93e782e95a9d43
Christian Brabandt <cb@256bit.org>
parents:
8847
diff
changeset
|
10463 if (did_emsg) |
| 680 | 10464 set_string_option_direct((char_u *)"tabline", -1, |
| 694 | 10465 (char_u *)"", OPT_FREE, SID_ERROR); |
|
8872
4d4de770f970
commit https://github.com/vim/vim/commit/f73d3bc253fa79ad220f52f04b93e782e95a9d43
Christian Brabandt <cb@256bit.org>
parents:
8847
diff
changeset
|
10466 did_emsg |= saved_did_emsg; |
| 680 | 10467 } |
| 10468 else | |
| 10469 #endif | |
| 10470 { | |
|
9649
fd9727ae3c49
commit https://github.com/vim/vim/commit/2932359000b2f918d5fade79ea4d124d5943cd07
Christian Brabandt <cb@256bit.org>
parents:
9645
diff
changeset
|
10471 FOR_ALL_TABPAGES(tp) |
| 680 | 10472 ++tabcount; |
| 10473 | |
| 10474 tabwidth = (Columns - 1 + tabcount / 2) / tabcount; | |
| 10475 if (tabwidth < 6) | |
| 10476 tabwidth = 6; | |
| 10477 | |
| 10478 attr = attr_nosel; | |
| 10479 tabcount = 0; | |
| 681 | 10480 scol = 0; |
| 699 | 10481 for (tp = first_tabpage; tp != NULL && col < Columns - 4; |
| 10482 tp = tp->tp_next) | |
| 680 | 10483 { |
| 10484 scol = col; | |
| 10485 | |
| 10486 if (tp->tp_topframe == topframe) | |
| 10487 attr = attr_sel; | |
| 10488 if (use_sep_chars && col > 0) | |
| 10489 screen_putchar('|', 0, col++, attr); | |
| 10490 | |
| 10491 if (tp->tp_topframe != topframe) | |
| 10492 attr = attr_nosel; | |
| 10493 | |
| 10494 screen_putchar(' ', 0, col++, attr); | |
| 10495 | |
| 10496 if (tp == curtab) | |
| 10497 { | |
| 10498 cwp = curwin; | |
| 10499 wp = firstwin; | |
| 10500 } | |
| 10501 else | |
| 10502 { | |
| 10503 cwp = tp->tp_curwin; | |
| 10504 wp = tp->tp_firstwin; | |
| 10505 } | |
| 10506 | |
| 10507 modified = FALSE; | |
| 10508 for (wincount = 0; wp != NULL; wp = wp->w_next, ++wincount) | |
| 10509 if (bufIsChanged(wp->w_buffer)) | |
| 10510 modified = TRUE; | |
| 10511 if (modified || wincount > 1) | |
| 10512 { | |
| 10513 if (wincount > 1) | |
| 10514 { | |
| 10515 vim_snprintf((char *)NameBuff, MAXPATHL, "%d", wincount); | |
| 835 | 10516 len = (int)STRLEN(NameBuff); |
| 699 | 10517 if (col + len >= Columns - 3) |
| 10518 break; | |
| 680 | 10519 screen_puts_len(NameBuff, len, 0, col, |
| 677 | 10520 #if defined(FEAT_SYN_HL) |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
10521 hl_combine_attr(attr, HL_ATTR(HLF_T)) |
| 677 | 10522 #else |
| 6106 | 10523 attr |
| 680 | 10524 #endif |
| 10525 ); | |
| 10526 col += len; | |
| 10527 } | |
| 10528 if (modified) | |
| 10529 screen_puts_len((char_u *)"+", 1, 0, col++, attr); | |
| 10530 screen_putchar(' ', 0, col++, attr); | |
| 10531 } | |
| 10532 | |
| 10533 room = scol - col + tabwidth - 1; | |
| 10534 if (room > 0) | |
| 10535 { | |
| 685 | 10536 /* Get buffer name in NameBuff[] */ |
| 10537 get_trans_bufname(cwp->w_buffer); | |
| 819 | 10538 shorten_dir(NameBuff); |
| 680 | 10539 len = vim_strsize(NameBuff); |
| 10540 p = NameBuff; | |
| 10541 if (has_mbyte) | |
| 10542 while (len > room) | |
| 10543 { | |
| 10544 len -= ptr2cells(p); | |
|
11127
506f5d8b7d8b
patch 8.0.0451: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11121
diff
changeset
|
10545 MB_PTR_ADV(p); |
| 680 | 10546 } |
|
15603
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
10547 else if (len > room) |
| 677 | 10548 { |
| 680 | 10549 p += len - room; |
| 10550 len = room; | |
| 677 | 10551 } |
| 699 | 10552 if (len > Columns - col - 1) |
| 10553 len = Columns - col - 1; | |
| 680 | 10554 |
| 835 | 10555 screen_puts_len(p, (int)STRLEN(p), 0, col, attr); |
| 680 | 10556 col += len; |
| 10557 } | |
| 10558 screen_putchar(' ', 0, col++, attr); | |
| 10559 | |
| 10560 /* Store the tab page number in TabPageIdxs[], so that | |
| 10561 * jump_to_mouse() knows where each one is. */ | |
| 10562 ++tabcount; | |
| 10563 while (scol < col) | |
| 10564 TabPageIdxs[scol++] = tabcount; | |
| 10565 } | |
| 10566 | |
| 10567 if (use_sep_chars) | |
| 10568 c = '_'; | |
| 10569 else | |
| 10570 c = ' '; | |
| 10571 screen_fill(0, 1, col, (int)Columns, c, c, attr_fill); | |
| 681 | 10572 |
| 10573 /* Put an "X" for closing the current tab if there are several. */ | |
| 10574 if (first_tabpage->tp_next != NULL) | |
| 10575 { | |
| 10576 screen_putchar('X', 0, (int)Columns - 1, attr_nosel); | |
| 10577 TabPageIdxs[Columns - 1] = -999; | |
| 10578 } | |
| 10579 } | |
| 834 | 10580 |
| 10581 /* Reset the flag here again, in case evaluating 'tabline' causes it to be | |
| 10582 * set. */ | |
| 10583 redraw_tabline = FALSE; | |
| 667 | 10584 } |
| 685 | 10585 |
| 10586 /* | |
| 10587 * Get buffer name for "buf" into NameBuff[]. | |
| 10588 * Takes care of special buffer names and translates special characters. | |
| 10589 */ | |
| 10590 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
10591 get_trans_bufname(buf_T *buf) |
| 685 | 10592 { |
| 10593 if (buf_spname(buf) != NULL) | |
| 3839 | 10594 vim_strncpy(NameBuff, buf_spname(buf), MAXPATHL - 1); |
| 685 | 10595 else |
| 10596 home_replace(buf, buf->b_fname, NameBuff, MAXPATHL, TRUE); | |
| 10597 trans_characters(NameBuff, MAXPATHL); | |
| 10598 } | |
|
12477
68d7bc045dbe
patch 8.0.1118: FEAT_WINDOWS adds a lot of #ifdefs
Christian Brabandt <cb@256bit.org>
parents:
12441
diff
changeset
|
10599 |
| 7 | 10600 /* |
| 10601 * Get the character to use in a status line. Get its attributes in "*attr". | |
| 10602 */ | |
| 10603 static int | |
|
11890
318ae82d8ba4
patch 8.0.0825: not easy to see that a window is a terminal window
Christian Brabandt <cb@256bit.org>
parents:
11866
diff
changeset
|
10604 fillchar_status(int *attr, win_T *wp) |
| 7 | 10605 { |
| 10606 int fill; | |
|
11890
318ae82d8ba4
patch 8.0.0825: not easy to see that a window is a terminal window
Christian Brabandt <cb@256bit.org>
parents:
11866
diff
changeset
|
10607 |
|
318ae82d8ba4
patch 8.0.0825: not easy to see that a window is a terminal window
Christian Brabandt <cb@256bit.org>
parents:
11866
diff
changeset
|
10608 #ifdef FEAT_TERMINAL |
|
318ae82d8ba4
patch 8.0.0825: not easy to see that a window is a terminal window
Christian Brabandt <cb@256bit.org>
parents:
11866
diff
changeset
|
10609 if (bt_terminal(wp->w_buffer)) |
|
318ae82d8ba4
patch 8.0.0825: not easy to see that a window is a terminal window
Christian Brabandt <cb@256bit.org>
parents:
11866
diff
changeset
|
10610 { |
|
318ae82d8ba4
patch 8.0.0825: not easy to see that a window is a terminal window
Christian Brabandt <cb@256bit.org>
parents:
11866
diff
changeset
|
10611 if (wp == curwin) |
|
12122
68c593f649d1
patch 8.0.0941: existing color schemes don't like StatusLineTerm
Christian Brabandt <cb@256bit.org>
parents:
12114
diff
changeset
|
10612 { |
|
68c593f649d1
patch 8.0.0941: existing color schemes don't like StatusLineTerm
Christian Brabandt <cb@256bit.org>
parents:
12114
diff
changeset
|
10613 *attr = HL_ATTR(HLF_ST); |
|
11890
318ae82d8ba4
patch 8.0.0825: not easy to see that a window is a terminal window
Christian Brabandt <cb@256bit.org>
parents:
11866
diff
changeset
|
10614 fill = fill_stl; |
|
12122
68c593f649d1
patch 8.0.0941: existing color schemes don't like StatusLineTerm
Christian Brabandt <cb@256bit.org>
parents:
12114
diff
changeset
|
10615 } |
|
11890
318ae82d8ba4
patch 8.0.0825: not easy to see that a window is a terminal window
Christian Brabandt <cb@256bit.org>
parents:
11866
diff
changeset
|
10616 else |
|
12122
68c593f649d1
patch 8.0.0941: existing color schemes don't like StatusLineTerm
Christian Brabandt <cb@256bit.org>
parents:
12114
diff
changeset
|
10617 { |
|
68c593f649d1
patch 8.0.0941: existing color schemes don't like StatusLineTerm
Christian Brabandt <cb@256bit.org>
parents:
12114
diff
changeset
|
10618 *attr = HL_ATTR(HLF_STNC); |
|
11890
318ae82d8ba4
patch 8.0.0825: not easy to see that a window is a terminal window
Christian Brabandt <cb@256bit.org>
parents:
11866
diff
changeset
|
10619 fill = fill_stlnc; |
|
12122
68c593f649d1
patch 8.0.0941: existing color schemes don't like StatusLineTerm
Christian Brabandt <cb@256bit.org>
parents:
12114
diff
changeset
|
10620 } |
|
11890
318ae82d8ba4
patch 8.0.0825: not easy to see that a window is a terminal window
Christian Brabandt <cb@256bit.org>
parents:
11866
diff
changeset
|
10621 } |
|
318ae82d8ba4
patch 8.0.0825: not easy to see that a window is a terminal window
Christian Brabandt <cb@256bit.org>
parents:
11866
diff
changeset
|
10622 else |
|
318ae82d8ba4
patch 8.0.0825: not easy to see that a window is a terminal window
Christian Brabandt <cb@256bit.org>
parents:
11866
diff
changeset
|
10623 #endif |
|
318ae82d8ba4
patch 8.0.0825: not easy to see that a window is a terminal window
Christian Brabandt <cb@256bit.org>
parents:
11866
diff
changeset
|
10624 if (wp == curwin) |
| 7 | 10625 { |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
10626 *attr = HL_ATTR(HLF_S); |
| 7 | 10627 fill = fill_stl; |
| 10628 } | |
| 10629 else | |
| 10630 { | |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
10631 *attr = HL_ATTR(HLF_SNC); |
| 7 | 10632 fill = fill_stlnc; |
| 10633 } | |
| 10634 /* Use fill when there is highlighting, and highlighting of current | |
| 10635 * window differs, or the fillchars differ, or this is not the | |
| 10636 * current window */ | |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
10637 if (*attr != 0 && ((HL_ATTR(HLF_S) != HL_ATTR(HLF_SNC) |
|
11890
318ae82d8ba4
patch 8.0.0825: not easy to see that a window is a terminal window
Christian Brabandt <cb@256bit.org>
parents:
11866
diff
changeset
|
10638 || wp != curwin || ONE_WINDOW) |
| 7 | 10639 || (fill_stl != fill_stlnc))) |
| 10640 return fill; | |
|
11890
318ae82d8ba4
patch 8.0.0825: not easy to see that a window is a terminal window
Christian Brabandt <cb@256bit.org>
parents:
11866
diff
changeset
|
10641 if (wp == curwin) |
| 7 | 10642 return '^'; |
| 10643 return '='; | |
| 10644 } | |
|
12477
68d7bc045dbe
patch 8.0.1118: FEAT_WINDOWS adds a lot of #ifdefs
Christian Brabandt <cb@256bit.org>
parents:
12441
diff
changeset
|
10645 |
| 7 | 10646 /* |
| 10647 * Get the character to use in a separator between vertically split windows. | |
| 10648 * Get its attributes in "*attr". | |
| 10649 */ | |
| 10650 static int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
10651 fillchar_vsep(int *attr) |
| 7 | 10652 { |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
10653 *attr = HL_ATTR(HLF_C); |
| 7 | 10654 if (*attr == 0 && fill_vert == ' ') |
| 10655 return '|'; | |
| 10656 else | |
| 10657 return fill_vert; | |
| 10658 } | |
| 10659 | |
| 10660 /* | |
| 10661 * Return TRUE if redrawing should currently be done. | |
| 10662 */ | |
| 10663 int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
10664 redrawing(void) |
| 7 | 10665 { |
|
11105
7c7e496e625d
patch 8.0.0440: not enough test coverage in Insert mode
Christian Brabandt <cb@256bit.org>
parents:
11010
diff
changeset
|
10666 #ifdef FEAT_EVAL |
|
7c7e496e625d
patch 8.0.0440: not enough test coverage in Insert mode
Christian Brabandt <cb@256bit.org>
parents:
11010
diff
changeset
|
10667 if (disable_redraw_for_testing) |
|
7c7e496e625d
patch 8.0.0440: not enough test coverage in Insert mode
Christian Brabandt <cb@256bit.org>
parents:
11010
diff
changeset
|
10668 return 0; |
|
7c7e496e625d
patch 8.0.0440: not enough test coverage in Insert mode
Christian Brabandt <cb@256bit.org>
parents:
11010
diff
changeset
|
10669 else |
|
7c7e496e625d
patch 8.0.0440: not enough test coverage in Insert mode
Christian Brabandt <cb@256bit.org>
parents:
11010
diff
changeset
|
10670 #endif |
|
14673
f1b7d308de2f
patch 8.1.0349: crash when wiping buffer in a callback
Christian Brabandt <cb@256bit.org>
parents:
14662
diff
changeset
|
10671 return ((!RedrawingDisabled |
|
f1b7d308de2f
patch 8.1.0349: crash when wiping buffer in a callback
Christian Brabandt <cb@256bit.org>
parents:
14662
diff
changeset
|
10672 #ifdef FEAT_EVAL |
|
f1b7d308de2f
patch 8.1.0349: crash when wiping buffer in a callback
Christian Brabandt <cb@256bit.org>
parents:
14662
diff
changeset
|
10673 || ignore_redraw_flag_for_testing |
|
f1b7d308de2f
patch 8.1.0349: crash when wiping buffer in a callback
Christian Brabandt <cb@256bit.org>
parents:
14662
diff
changeset
|
10674 #endif |
|
f1b7d308de2f
patch 8.1.0349: crash when wiping buffer in a callback
Christian Brabandt <cb@256bit.org>
parents:
14662
diff
changeset
|
10675 ) && !(p_lz && char_avail() && !KeyTyped && !do_redraw)); |
| 7 | 10676 } |
| 10677 | |
| 10678 /* | |
| 10679 * Return TRUE if printing messages should currently be done. | |
| 10680 */ | |
| 10681 int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
10682 messaging(void) |
| 7 | 10683 { |
| 10684 return (!(p_lz && char_avail() && !KeyTyped)); | |
| 10685 } | |
| 10686 | |
|
12487
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10687 #ifdef FEAT_MENU |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10688 /* |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10689 * Draw the window toolbar. |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10690 */ |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10691 static void |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10692 redraw_win_toolbar(win_T *wp) |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10693 { |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10694 vimmenu_T *menu; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10695 int item_idx = 0; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10696 int item_count = 0; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10697 int col = 0; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10698 int next_col; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10699 int off = (int)(current_ScreenLine - ScreenLines); |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10700 int fill_attr = syn_name2attr((char_u *)"ToolbarLine"); |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10701 int button_attr = syn_name2attr((char_u *)"ToolbarButton"); |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10702 |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10703 vim_free(wp->w_winbar_items); |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10704 for (menu = wp->w_winbar->children; menu != NULL; menu = menu->next) |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10705 ++item_count; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10706 wp->w_winbar_items = (winbar_item_T *)alloc_clear( |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10707 (unsigned)sizeof(winbar_item_T) * (item_count + 1)); |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10708 |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10709 /* TODO: use fewer spaces if there is not enough room */ |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10710 for (menu = wp->w_winbar->children; |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
10711 menu != NULL && col < wp->w_width; menu = menu->next) |
|
12487
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10712 { |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10713 space_to_screenline(off + col, fill_attr); |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
10714 if (++col >= wp->w_width) |
|
12487
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10715 break; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10716 if (col > 1) |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10717 { |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10718 space_to_screenline(off + col, fill_attr); |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
10719 if (++col >= wp->w_width) |
|
12487
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10720 break; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10721 } |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10722 |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10723 wp->w_winbar_items[item_idx].wb_startcol = col; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10724 space_to_screenline(off + col, button_attr); |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
10725 if (++col >= wp->w_width) |
|
12487
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10726 break; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10727 |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10728 next_col = text_to_screenline(wp, menu->name, col); |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10729 while (col < next_col) |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10730 { |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10731 ScreenAttrs[off + col] = button_attr; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10732 ++col; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10733 } |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10734 wp->w_winbar_items[item_idx].wb_endcol = col; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10735 wp->w_winbar_items[item_idx].wb_menu = menu; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10736 ++item_idx; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10737 |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
10738 if (col >= wp->w_width) |
|
12487
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10739 break; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10740 space_to_screenline(off + col, button_attr); |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10741 ++col; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10742 } |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
10743 while (col < wp->w_width) |
|
12487
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10744 { |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10745 space_to_screenline(off + col, fill_attr); |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10746 ++col; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10747 } |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10748 wp->w_winbar_items[item_idx].wb_menu = NULL; /* end marker */ |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10749 |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
10750 screen_line(wp->w_winrow, wp->w_wincol, (int)wp->w_width, |
|
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
10751 (int)wp->w_width, FALSE); |
|
12487
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10752 } |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10753 #endif |
|
14089
ae53a9274f50
patch 8.1.0062: popup menu broken if a callback changes the window layout
Christian Brabandt <cb@256bit.org>
parents:
14081
diff
changeset
|
10754 |
| 7 | 10755 /* |
| 10756 * Show current status info in ruler and various other places | |
| 10757 * If always is FALSE, only show ruler if position has changed. | |
| 10758 */ | |
| 10759 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
10760 showruler(int always) |
| 7 | 10761 { |
| 10762 if (!always && !redrawing()) | |
| 10763 return; | |
| 574 | 10764 #ifdef FEAT_INS_EXPAND |
| 10765 if (pum_visible()) | |
| 10766 { | |
| 10767 /* Don't redraw right now, do it later. */ | |
| 10768 curwin->w_redr_status = TRUE; | |
| 10769 return; | |
| 10770 } | |
| 10771 #endif | |
|
12477
68d7bc045dbe
patch 8.0.1118: FEAT_WINDOWS adds a lot of #ifdefs
Christian Brabandt <cb@256bit.org>
parents:
12441
diff
changeset
|
10772 #if defined(FEAT_STL_OPT) |
| 40 | 10773 if ((*p_stl != NUL || *curwin->w_p_stl != NUL) && curwin->w_status_height) |
| 680 | 10774 { |
| 1983 | 10775 redraw_custom_statusline(curwin); |
| 680 | 10776 } |
| 7 | 10777 else |
| 10778 #endif | |
| 10779 #ifdef FEAT_CMDL_INFO | |
|
14089
ae53a9274f50
patch 8.1.0062: popup menu broken if a callback changes the window layout
Christian Brabandt <cb@256bit.org>
parents:
14081
diff
changeset
|
10780 win_redr_ruler(curwin, always, FALSE); |
| 7 | 10781 #endif |
| 10782 | |
| 10783 #ifdef FEAT_TITLE | |
| 10784 if (need_maketitle | |
| 10785 # ifdef FEAT_STL_OPT | |
| 10786 || (p_icon && (stl_syntax & STL_IN_ICON)) | |
| 10787 || (p_title && (stl_syntax & STL_IN_TITLE)) | |
| 10788 # endif | |
| 10789 ) | |
| 10790 maketitle(); | |
| 10791 #endif | |
| 1588 | 10792 /* Redraw the tab pages line if needed. */ |
| 10793 if (redraw_tabline) | |
| 10794 draw_tabline(); | |
| 7 | 10795 } |
| 10796 | |
| 10797 #ifdef FEAT_CMDL_INFO | |
| 10798 static void | |
|
14089
ae53a9274f50
patch 8.1.0062: popup menu broken if a callback changes the window layout
Christian Brabandt <cb@256bit.org>
parents:
14081
diff
changeset
|
10799 win_redr_ruler(win_T *wp, int always, int ignore_pum) |
| 7 | 10800 { |
| 1869 | 10801 #define RULER_BUF_LEN 70 |
| 10802 char_u buffer[RULER_BUF_LEN]; | |
| 7 | 10803 int row; |
| 10804 int fillchar; | |
| 10805 int attr; | |
| 10806 int empty_line = FALSE; | |
| 10807 colnr_T virtcol; | |
| 10808 int i; | |
| 1869 | 10809 size_t len; |
| 7 | 10810 int o; |
| 10811 int this_ru_col; | |
| 10812 int off = 0; | |
| 10813 int width = Columns; | |
| 10814 | |
| 10815 /* If 'ruler' off or redrawing disabled, don't do anything */ | |
| 10816 if (!p_ru) | |
| 10817 return; | |
| 10818 | |
| 10819 /* | |
| 10820 * Check if cursor.lnum is valid, since win_redr_ruler() may be called | |
| 10821 * after deleting lines, before cursor.lnum is corrected. | |
| 10822 */ | |
| 10823 if (wp->w_cursor.lnum > wp->w_buffer->b_ml.ml_line_count) | |
| 10824 return; | |
| 10825 | |
| 10826 #ifdef FEAT_INS_EXPAND | |
| 10827 /* Don't draw the ruler while doing insert-completion, it might overwrite | |
| 10828 * the (long) mode message. */ | |
| 10829 if (wp == lastwin && lastwin->w_status_height == 0) | |
| 10830 if (edit_submode != NULL) | |
| 10831 return; | |
|
14089
ae53a9274f50
patch 8.1.0062: popup menu broken if a callback changes the window layout
Christian Brabandt <cb@256bit.org>
parents:
14081
diff
changeset
|
10832 // Don't draw the ruler when the popup menu is visible, it may overlap. |
|
ae53a9274f50
patch 8.1.0062: popup menu broken if a callback changes the window layout
Christian Brabandt <cb@256bit.org>
parents:
14081
diff
changeset
|
10833 // Except when the popup menu will be redrawn anyway. |
|
ae53a9274f50
patch 8.1.0062: popup menu broken if a callback changes the window layout
Christian Brabandt <cb@256bit.org>
parents:
14081
diff
changeset
|
10834 if (!ignore_pum && pum_visible()) |
| 540 | 10835 return; |
| 7 | 10836 #endif |
| 10837 | |
| 10838 #ifdef FEAT_STL_OPT | |
| 10839 if (*p_ruf) | |
| 10840 { | |
| 680 | 10841 int save_called_emsg = called_emsg; |
| 10842 | |
| 10843 called_emsg = FALSE; | |
| 7 | 10844 win_redr_custom(wp, TRUE); |
| 680 | 10845 if (called_emsg) |
| 10846 set_string_option_direct((char_u *)"rulerformat", -1, | |
| 694 | 10847 (char_u *)"", OPT_FREE, SID_ERROR); |
| 680 | 10848 called_emsg |= save_called_emsg; |
| 7 | 10849 return; |
| 10850 } | |
| 10851 #endif | |
| 10852 | |
| 10853 /* | |
| 10854 * Check if not in Insert mode and the line is empty (will show "0-1"). | |
| 10855 */ | |
| 10856 if (!(State & INSERT) | |
| 10857 && *ml_get_buf(wp->w_buffer, wp->w_cursor.lnum, FALSE) == NUL) | |
| 10858 empty_line = TRUE; | |
| 10859 | |
| 10860 /* | |
| 10861 * Only draw the ruler when something changed. | |
| 10862 */ | |
| 10863 validate_virtcol_win(wp); | |
| 10864 if ( redraw_cmdline | |
| 10865 || always | |
| 10866 || wp->w_cursor.lnum != wp->w_ru_cursor.lnum | |
| 10867 || wp->w_cursor.col != wp->w_ru_cursor.col | |
| 10868 || wp->w_virtcol != wp->w_ru_virtcol | |
| 10869 #ifdef FEAT_VIRTUALEDIT | |
| 10870 || wp->w_cursor.coladd != wp->w_ru_cursor.coladd | |
| 10871 #endif | |
| 10872 || wp->w_topline != wp->w_ru_topline | |
| 10873 || wp->w_buffer->b_ml.ml_line_count != wp->w_ru_line_count | |
| 10874 #ifdef FEAT_DIFF | |
| 10875 || wp->w_topfill != wp->w_ru_topfill | |
| 10876 #endif | |
| 10877 || empty_line != wp->w_ru_empty) | |
| 10878 { | |
| 10879 cursor_off(); | |
| 10880 if (wp->w_status_height) | |
| 10881 { | |
| 10882 row = W_WINROW(wp) + wp->w_height; | |
|
11890
318ae82d8ba4
patch 8.0.0825: not easy to see that a window is a terminal window
Christian Brabandt <cb@256bit.org>
parents:
11866
diff
changeset
|
10883 fillchar = fillchar_status(&attr, wp); |
|
12513
3ca08bf99396
patch 8.0.1135: W_WINCOL() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12510
diff
changeset
|
10884 off = wp->w_wincol; |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
10885 width = wp->w_width; |
| 7 | 10886 } |
| 10887 else | |
| 10888 { | |
| 10889 row = Rows - 1; | |
| 10890 fillchar = ' '; | |
| 10891 attr = 0; | |
| 10892 width = Columns; | |
| 10893 off = 0; | |
| 10894 } | |
| 10895 | |
| 10896 /* In list mode virtcol needs to be recomputed */ | |
| 10897 virtcol = wp->w_virtcol; | |
| 10898 if (wp->w_p_list && lcs_tab1 == NUL) | |
| 10899 { | |
| 10900 wp->w_p_list = FALSE; | |
| 10901 getvvcol(wp, &wp->w_cursor, NULL, &virtcol, NULL); | |
| 10902 wp->w_p_list = TRUE; | |
| 10903 } | |
| 10904 | |
| 10905 /* | |
| 10906 * Some sprintfs return the length, some return a pointer. | |
| 10907 * To avoid portability problems we use strlen() here. | |
| 10908 */ | |
| 1869 | 10909 vim_snprintf((char *)buffer, RULER_BUF_LEN, "%ld,", |
| 7 | 10910 (wp->w_buffer->b_ml.ml_flags & ML_EMPTY) |
| 10911 ? 0L | |
| 10912 : (long)(wp->w_cursor.lnum)); | |
| 1869 | 10913 len = STRLEN(buffer); |
| 10914 col_print(buffer + len, RULER_BUF_LEN - len, | |
| 7 | 10915 empty_line ? 0 : (int)wp->w_cursor.col + 1, |
| 10916 (int)virtcol + 1); | |
| 10917 | |
| 10918 /* | |
| 10919 * Add a "50%" if there is room for it. | |
| 10920 * On the last line, don't print in the last column (scrolls the | |
| 10921 * screen up on some terminals). | |
| 10922 */ | |
| 10923 i = (int)STRLEN(buffer); | |
| 1869 | 10924 get_rel_pos(wp, buffer + i + 1, RULER_BUF_LEN - i - 1); |
| 7 | 10925 o = i + vim_strsize(buffer + i + 1); |
| 10926 if (wp->w_status_height == 0) /* can't use last char of screen */ | |
| 10927 ++o; | |
| 10928 this_ru_col = ru_col - (Columns - width); | |
| 10929 if (this_ru_col < 0) | |
| 10930 this_ru_col = 0; | |
| 10931 /* Never use more than half the window/screen width, leave the other | |
| 10932 * half for the filename. */ | |
|
12477
68d7bc045dbe
patch 8.0.1118: FEAT_WINDOWS adds a lot of #ifdefs
Christian Brabandt <cb@256bit.org>
parents:
12441
diff
changeset
|
10933 if (this_ru_col < (width + 1) / 2) |
|
68d7bc045dbe
patch 8.0.1118: FEAT_WINDOWS adds a lot of #ifdefs
Christian Brabandt <cb@256bit.org>
parents:
12441
diff
changeset
|
10934 this_ru_col = (width + 1) / 2; |
|
68d7bc045dbe
patch 8.0.1118: FEAT_WINDOWS adds a lot of #ifdefs
Christian Brabandt <cb@256bit.org>
parents:
12441
diff
changeset
|
10935 if (this_ru_col + o < width) |
| 7 | 10936 { |
| 6466 | 10937 /* need at least 3 chars left for get_rel_pos() + NUL */ |
|
12477
68d7bc045dbe
patch 8.0.1118: FEAT_WINDOWS adds a lot of #ifdefs
Christian Brabandt <cb@256bit.org>
parents:
12441
diff
changeset
|
10938 while (this_ru_col + o < width && RULER_BUF_LEN > i + 4) |
| 7 | 10939 { |
| 10940 if (has_mbyte) | |
| 10941 i += (*mb_char2bytes)(fillchar, buffer + i); | |
| 10942 else | |
| 10943 buffer[i++] = fillchar; | |
| 10944 ++o; | |
| 10945 } | |
| 1869 | 10946 get_rel_pos(wp, buffer + i, RULER_BUF_LEN - i); |
| 7 | 10947 } |
| 10948 /* Truncate at window boundary. */ | |
| 10949 if (has_mbyte) | |
| 10950 { | |
| 10951 o = 0; | |
| 474 | 10952 for (i = 0; buffer[i] != NUL; i += (*mb_ptr2len)(buffer + i)) |
| 7 | 10953 { |
| 10954 o += (*mb_ptr2cells)(buffer + i); | |
|
12477
68d7bc045dbe
patch 8.0.1118: FEAT_WINDOWS adds a lot of #ifdefs
Christian Brabandt <cb@256bit.org>
parents:
12441
diff
changeset
|
10955 if (this_ru_col + o > width) |
| 7 | 10956 { |
| 10957 buffer[i] = NUL; | |
| 10958 break; | |
| 10959 } | |
| 10960 } | |
| 10961 } | |
|
15603
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
10962 else if (this_ru_col + (int)STRLEN(buffer) > width) |
|
12477
68d7bc045dbe
patch 8.0.1118: FEAT_WINDOWS adds a lot of #ifdefs
Christian Brabandt <cb@256bit.org>
parents:
12441
diff
changeset
|
10963 buffer[width - this_ru_col] = NUL; |
|
68d7bc045dbe
patch 8.0.1118: FEAT_WINDOWS adds a lot of #ifdefs
Christian Brabandt <cb@256bit.org>
parents:
12441
diff
changeset
|
10964 |
|
68d7bc045dbe
patch 8.0.1118: FEAT_WINDOWS adds a lot of #ifdefs
Christian Brabandt <cb@256bit.org>
parents:
12441
diff
changeset
|
10965 screen_puts(buffer, row, this_ru_col + off, attr); |
| 7 | 10966 i = redraw_cmdline; |
| 10967 screen_fill(row, row + 1, | |
|
12477
68d7bc045dbe
patch 8.0.1118: FEAT_WINDOWS adds a lot of #ifdefs
Christian Brabandt <cb@256bit.org>
parents:
12441
diff
changeset
|
10968 this_ru_col + off + (int)STRLEN(buffer), |
|
68d7bc045dbe
patch 8.0.1118: FEAT_WINDOWS adds a lot of #ifdefs
Christian Brabandt <cb@256bit.org>
parents:
12441
diff
changeset
|
10969 (int)(off + width), |
| 7 | 10970 fillchar, fillchar, attr); |
| 10971 /* don't redraw the cmdline because of showing the ruler */ | |
| 10972 redraw_cmdline = i; | |
| 10973 wp->w_ru_cursor = wp->w_cursor; | |
| 10974 wp->w_ru_virtcol = wp->w_virtcol; | |
| 10975 wp->w_ru_empty = empty_line; | |
| 10976 wp->w_ru_topline = wp->w_topline; | |
| 10977 wp->w_ru_line_count = wp->w_buffer->b_ml.ml_line_count; | |
| 10978 #ifdef FEAT_DIFF | |
| 10979 wp->w_ru_topfill = wp->w_topfill; | |
| 10980 #endif | |
| 10981 } | |
| 10982 } | |
| 10983 #endif | |
| 13 | 10984 |
| 10985 #if defined(FEAT_LINEBREAK) || defined(PROTO) | |
| 10986 /* | |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
10987 * Return the width of the 'number' and 'relativenumber' column. |
|
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
10988 * Caller may need to check if 'number' or 'relativenumber' is set. |
| 13 | 10989 * Otherwise it depends on 'numberwidth' and the line count. |
| 10990 */ | |
| 10991 int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
10992 number_width(win_T *wp) |
| 13 | 10993 { |
| 10994 int n; | |
| 10995 linenr_T lnum; | |
| 10996 | |
|
4736
3f2319a953b3
updated for version 7.3.1115
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
10997 if (wp->w_p_rnu && !wp->w_p_nu) |
|
3f2319a953b3
updated for version 7.3.1115
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
10998 /* cursor line shows "0" */ |
|
3f2319a953b3
updated for version 7.3.1115
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
10999 lnum = wp->w_height; |
|
3f2319a953b3
updated for version 7.3.1115
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
11000 else |
|
3f2319a953b3
updated for version 7.3.1115
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
11001 /* cursor line shows absolute line number */ |
|
3f2319a953b3
updated for version 7.3.1115
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
11002 lnum = wp->w_buffer->b_ml.ml_line_count; |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
11003 |
| 6679 | 11004 if (lnum == wp->w_nrwidth_line_count && wp->w_nuw_cached == wp->w_p_nuw) |
| 13 | 11005 return wp->w_nrwidth_width; |
| 11006 wp->w_nrwidth_line_count = lnum; | |
| 11007 | |
| 11008 n = 0; | |
| 11009 do | |
| 11010 { | |
| 856 | 11011 lnum /= 10; |
| 11012 ++n; | |
| 13 | 11013 } while (lnum > 0); |
| 11014 | |
| 11015 /* 'numberwidth' gives the minimal width plus one */ | |
| 11016 if (n < wp->w_p_nuw - 1) | |
| 11017 n = wp->w_p_nuw - 1; | |
| 11018 | |
| 11019 wp->w_nrwidth_width = n; | |
| 6679 | 11020 wp->w_nuw_cached = wp->w_p_nuw; |
| 13 | 11021 return n; |
| 11022 } | |
| 11023 #endif | |
| 3986 | 11024 |
|
15555
d89c5b339c2a
patch 8.1.0785: depending on the configuration some functions are unused
Bram Moolenaar <Bram@vim.org>
parents:
15543
diff
changeset
|
11025 #if defined(FEAT_EVAL) || defined(PROTO) |
| 3986 | 11026 /* |
| 11027 * Return the current cursor column. This is the actual position on the | |
| 11028 * screen. First column is 0. | |
| 11029 */ | |
| 11030 int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
11031 screen_screencol(void) |
| 3986 | 11032 { |
| 11033 return screen_cur_col; | |
| 11034 } | |
| 11035 | |
| 11036 /* | |
| 11037 * Return the current cursor row. This is the actual position on the screen. | |
| 11038 * First row is 0. | |
| 11039 */ | |
| 11040 int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
11041 screen_screenrow(void) |
| 3986 | 11042 { |
| 11043 return screen_cur_row; | |
| 11044 } | |
|
15555
d89c5b339c2a
patch 8.1.0785: depending on the configuration some functions are unused
Bram Moolenaar <Bram@vim.org>
parents:
15543
diff
changeset
|
11045 #endif |