Mercurial > vim
annotate src/screen.c @ 12244:d0b039e2ed56 v8.0.1002
patch 8.0.1002: unnecessarily updating screen after timer callback
commit https://github.com/vim/vim/commit/02e177d3e85e089ebdfba1a7d937150cffcb287a
Author: Bram Moolenaar <Bram@vim.org>
Date: Sat Aug 26 23:43:28 2017 +0200
patch 8.0.1002: unnecessarily updating screen after timer callback
Problem: Unnecessarily updating screen after timer callback.
Solution: Check if calling the timer sets must_redraw.
| author | Christian Brabandt <cb@256bit.org> |
|---|---|
| date | Sat, 26 Aug 2017 23:45:04 +0200 |
| parents | 69af108df70e |
| children | 1ff5e5dfa9b0 |
| 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); |
|
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7697
diff
changeset
|
125 static void win_draw_end(win_T *wp, int c1, int c2, int row, int endrow, hlf_T hl); |
| 7 | 126 #ifdef FEAT_FOLDING |
|
7805
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7697
diff
changeset
|
127 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
|
128 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
|
129 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
|
130 #endif |
|
11529
998d2cf59caa
patch 8.0.0647: syntax highlighting can make cause a freeze
Christian Brabandt <cb@256bit.org>
parents:
11521
diff
changeset
|
131 static int win_line(win_T *, linenr_T, int, int, int nochange, proftime_T *syntax_tm); |
|
7805
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7697
diff
changeset
|
132 static int char_needs_redraw(int off_from, int off_to, int cols); |
|
8643
24b43dd167eb
commit https://github.com/vim/vim/commit/44a2f923c00f1384c9ecde12fb5b4711bc20702e
Christian Brabandt <cb@256bit.org>
parents:
8627
diff
changeset
|
133 #ifdef FEAT_WINDOWS |
|
7805
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7697
diff
changeset
|
134 static void draw_vsep_win(win_T *wp, int row); |
| 7 | 135 #endif |
| 680 | 136 #ifdef FEAT_STL_OPT |
|
7805
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7697
diff
changeset
|
137 static void redraw_custom_statusline(win_T *wp); |
| 680 | 138 #endif |
| 7 | 139 #ifdef FEAT_SEARCH_EXTRA |
| 5985 | 140 # define SEARCH_HL_PRIORITY 0 |
|
7805
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7697
diff
changeset
|
141 static void start_search_hl(void); |
|
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7697
diff
changeset
|
142 static void end_search_hl(void); |
|
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7697
diff
changeset
|
143 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
|
144 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
|
145 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
|
146 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
|
147 #endif |
|
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7697
diff
changeset
|
148 static void screen_start_highlight(int attr); |
|
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7697
diff
changeset
|
149 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
|
150 #ifdef FEAT_MBYTE |
|
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7697
diff
changeset
|
151 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
|
152 #endif |
|
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7697
diff
changeset
|
153 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
|
154 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
|
155 static void lineinvalid(unsigned off, int width); |
|
8643
24b43dd167eb
commit https://github.com/vim/vim/commit/44a2f923c00f1384c9ecde12fb5b4711bc20702e
Christian Brabandt <cb@256bit.org>
parents:
8627
diff
changeset
|
156 #ifdef FEAT_WINDOWS |
|
7805
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7697
diff
changeset
|
157 static void linecopy(int to, int from, win_T *wp); |
|
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7697
diff
changeset
|
158 static void redraw_block(int row, int end, win_T *wp); |
|
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7697
diff
changeset
|
159 #endif |
|
12152
69af108df70e
patch 8.0.0956: scrolling in a terminal window has flicker
Christian Brabandt <cb@256bit.org>
parents:
12122
diff
changeset
|
160 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
|
161 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
|
162 static void msg_pos_mode(void); |
|
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7697
diff
changeset
|
163 static void recording_mode(int attr); |
| 667 | 164 #if defined(FEAT_WINDOWS) |
|
7805
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7697
diff
changeset
|
165 static void draw_tabline(void); |
| 667 | 166 #endif |
| 7 | 167 #if defined(FEAT_WINDOWS) || defined(FEAT_WILDMENU) || defined(FEAT_STL_OPT) |
|
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
|
168 static int fillchar_status(int *attr, win_T *wp); |
| 7 | 169 #endif |
|
8643
24b43dd167eb
commit https://github.com/vim/vim/commit/44a2f923c00f1384c9ecde12fb5b4711bc20702e
Christian Brabandt <cb@256bit.org>
parents:
8627
diff
changeset
|
170 #ifdef FEAT_WINDOWS |
|
7805
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7697
diff
changeset
|
171 static int fillchar_vsep(int *attr); |
| 7 | 172 #endif |
| 173 #ifdef FEAT_STL_OPT | |
|
7805
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7697
diff
changeset
|
174 static void win_redr_custom(win_T *wp, int draw_ruler); |
| 7 | 175 #endif |
| 176 #ifdef FEAT_CMDL_INFO | |
|
7805
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7697
diff
changeset
|
177 static void win_redr_ruler(win_T *wp, int always); |
| 7 | 178 #endif |
| 179 | |
|
8643
24b43dd167eb
commit https://github.com/vim/vim/commit/44a2f923c00f1384c9ecde12fb5b4711bc20702e
Christian Brabandt <cb@256bit.org>
parents:
8627
diff
changeset
|
180 #if defined(FEAT_CLIPBOARD) || defined(FEAT_WINDOWS) |
| 7 | 181 /* Ugly global: overrule attribute used by screen_char() */ |
| 182 static int screen_char_attr = 0; | |
| 183 #endif | |
| 184 | |
|
11529
998d2cf59caa
patch 8.0.0647: syntax highlighting can make cause a freeze
Christian Brabandt <cb@256bit.org>
parents:
11521
diff
changeset
|
185 #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
|
186 /* 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
|
187 # 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
|
188 #endif |
|
998d2cf59caa
patch 8.0.0647: syntax highlighting can make cause a freeze
Christian Brabandt <cb@256bit.org>
parents:
11521
diff
changeset
|
189 |
|
11672
3c6cc2f24645
patch 8.0.0719: build failure without +terminal feature
Christian Brabandt <cb@256bit.org>
parents:
11670
diff
changeset
|
190 #ifdef FEAT_RIGHTLEFT |
|
3c6cc2f24645
patch 8.0.0719: build failure without +terminal feature
Christian Brabandt <cb@256bit.org>
parents:
11670
diff
changeset
|
191 # define HAS_RIGHTLEFT(x) x |
|
3c6cc2f24645
patch 8.0.0719: build failure without +terminal feature
Christian Brabandt <cb@256bit.org>
parents:
11670
diff
changeset
|
192 #else |
|
3c6cc2f24645
patch 8.0.0719: build failure without +terminal feature
Christian Brabandt <cb@256bit.org>
parents:
11670
diff
changeset
|
193 # define HAS_RIGHTLEFT(x) FALSE |
|
3c6cc2f24645
patch 8.0.0719: build failure without +terminal feature
Christian Brabandt <cb@256bit.org>
parents:
11670
diff
changeset
|
194 #endif |
|
3c6cc2f24645
patch 8.0.0719: build failure without +terminal feature
Christian Brabandt <cb@256bit.org>
parents:
11670
diff
changeset
|
195 |
| 7 | 196 /* |
| 197 * Redraw the current window later, with update_screen(type). | |
| 198 * Set must_redraw only if not already set to a higher value. | |
| 199 * e.g. if must_redraw is CLEAR, type NOT_VALID will do nothing. | |
| 200 */ | |
| 201 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
202 redraw_later(int type) |
| 7 | 203 { |
| 204 redraw_win_later(curwin, type); | |
| 205 } | |
| 206 | |
| 207 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
208 redraw_win_later( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
209 win_T *wp, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
210 int type) |
| 7 | 211 { |
| 212 if (wp->w_redr_type < type) | |
| 213 { | |
| 214 wp->w_redr_type = type; | |
| 215 if (type >= NOT_VALID) | |
| 216 wp->w_lines_valid = 0; | |
| 217 if (must_redraw < type) /* must_redraw is the maximum of all windows */ | |
| 218 must_redraw = type; | |
| 219 } | |
| 220 } | |
| 221 | |
| 222 /* | |
| 223 * Force a complete redraw later. Also resets the highlighting. To be used | |
| 224 * after executing a shell command that messes up the screen. | |
| 225 */ | |
| 226 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
227 redraw_later_clear(void) |
| 7 | 228 { |
| 229 redraw_all_later(CLEAR); | |
| 826 | 230 #ifdef FEAT_GUI |
| 231 if (gui.in_use) | |
| 232 /* Use a code that will reset gui.highlight_mask in | |
| 233 * gui_stop_highlight(). */ | |
| 234 screen_attr = HL_ALL + 1; | |
| 235 else | |
| 236 #endif | |
| 237 /* Use attributes that is very unlikely to appear in text. */ | |
| 238 screen_attr = HL_BOLD | HL_UNDERLINE | HL_INVERSE; | |
| 7 | 239 } |
| 240 | |
| 241 /* | |
| 242 * Mark all windows to be redrawn later. | |
| 243 */ | |
| 244 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
245 redraw_all_later(int type) |
| 7 | 246 { |
| 247 win_T *wp; | |
| 248 | |
| 249 FOR_ALL_WINDOWS(wp) | |
| 250 { | |
| 251 redraw_win_later(wp, type); | |
| 252 } | |
| 253 } | |
| 254 | |
| 255 /* | |
| 301 | 256 * Mark all windows that are editing the current buffer to be updated later. |
| 7 | 257 */ |
| 258 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
259 redraw_curbuf_later(int type) |
| 7 | 260 { |
| 261 redraw_buf_later(curbuf, type); | |
| 262 } | |
| 263 | |
| 264 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
265 redraw_buf_later(buf_T *buf, int type) |
| 7 | 266 { |
| 267 win_T *wp; | |
| 268 | |
| 269 FOR_ALL_WINDOWS(wp) | |
| 270 { | |
| 271 if (wp->w_buffer == buf) | |
| 272 redraw_win_later(wp, type); | |
| 273 } | |
| 274 } | |
| 275 | |
|
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
|
276 void |
|
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
|
277 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
|
278 { |
|
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 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
|
280 |
|
11657
a7cd2a53590c
patch 8.0.0711: cannot build without the wildmenu feature
Christian Brabandt <cb@256bit.org>
parents:
11655
diff
changeset
|
281 #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
|
282 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
|
283 /* 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
|
284 * 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
|
285 return; |
|
11657
a7cd2a53590c
patch 8.0.0711: cannot build without the wildmenu feature
Christian Brabandt <cb@256bit.org>
parents:
11655
diff
changeset
|
286 #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
|
287 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
|
288 { |
|
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 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
|
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 redraw_win_later(wp, type); |
|
11420
d1b6cf96882a
patch 8.0.0594: build failure when windows feature is missing
Christian Brabandt <cb@256bit.org>
parents:
11416
diff
changeset
|
292 #ifdef FEAT_WINDOWS |
|
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
|
293 wp->w_redr_status = TRUE; |
|
11420
d1b6cf96882a
patch 8.0.0594: build failure when windows feature is missing
Christian Brabandt <cb@256bit.org>
parents:
11416
diff
changeset
|
294 #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
|
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 } |
|
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
|
298 |
| 7 | 299 /* |
|
5090
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
300 * 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
|
301 * 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
|
302 * Return a code indicating what happened. |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
303 */ |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
304 int |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
305 redraw_asap(int type) |
|
5090
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
306 { |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
307 int rows; |
| 6959 | 308 int cols = screen_Columns; |
|
5090
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
309 int r; |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
310 int ret = 0; |
|
5096
a6ddcab6a240
updated for version 7.3.1291
Bram Moolenaar <bram@vim.org>
parents:
5090
diff
changeset
|
311 schar_T *screenline; /* copy from ScreenLines[] */ |
|
a6ddcab6a240
updated for version 7.3.1291
Bram Moolenaar <bram@vim.org>
parents:
5090
diff
changeset
|
312 sattr_T *screenattr; /* copy from ScreenAttrs[] */ |
|
5090
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
313 #ifdef FEAT_MBYTE |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
314 int i; |
|
5096
a6ddcab6a240
updated for version 7.3.1291
Bram Moolenaar <bram@vim.org>
parents:
5090
diff
changeset
|
315 u8char_T *screenlineUC = NULL; /* copy from ScreenLinesUC[] */ |
|
5090
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
316 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
|
317 schar_T *screenline2 = NULL; /* copy from ScreenLines2[] */ |
|
5090
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
318 #endif |
|
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 #ifdef FEAT_MBYTE |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
333 if (enc_utf8) |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
334 { |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
335 screenlineUC = (u8char_T *)lalloc( |
| 6959 | 336 (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
|
337 if (screenlineUC == NULL) |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
338 ret = 2; |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
339 for (i = 0; i < p_mco; ++i) |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
340 { |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
341 screenlineC[i] = (u8char_T *)lalloc( |
| 6959 | 342 (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
|
343 if (screenlineC[i] == NULL) |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
344 ret = 2; |
|
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 } |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
347 if (enc_dbcs == DBCS_JPNU) |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
348 { |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
349 screenline2 = (schar_T *)lalloc( |
| 6959 | 350 (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
|
351 if (screenline2 == NULL) |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
352 ret = 2; |
|
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 #endif |
|
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 if (ret != 2) |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
357 { |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
358 /* 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
|
359 for (r = 0; r < rows; ++r) |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
360 { |
| 6959 | 361 mch_memmove(screenline + r * cols, |
|
5090
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
362 ScreenLines + LineOffset[cmdline_row + r], |
| 6959 | 363 (size_t)cols * sizeof(schar_T)); |
| 364 mch_memmove(screenattr + r * cols, | |
|
5090
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
365 ScreenAttrs + LineOffset[cmdline_row + r], |
| 6959 | 366 (size_t)cols * sizeof(sattr_T)); |
|
5090
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
367 #ifdef FEAT_MBYTE |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
368 if (enc_utf8) |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
369 { |
| 6959 | 370 mch_memmove(screenlineUC + r * cols, |
|
5090
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
371 ScreenLinesUC + LineOffset[cmdline_row + r], |
| 6959 | 372 (size_t)cols * sizeof(u8char_T)); |
|
5090
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
373 for (i = 0; i < p_mco; ++i) |
| 6959 | 374 mch_memmove(screenlineC[i] + r * cols, |
| 375 ScreenLinesC[i] + LineOffset[cmdline_row + r], | |
| 376 (size_t)cols * sizeof(u8char_T)); | |
|
5090
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
377 } |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
378 if (enc_dbcs == DBCS_JPNU) |
| 6959 | 379 mch_memmove(screenline2 + r * cols, |
|
5090
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
380 ScreenLines2 + LineOffset[cmdline_row + r], |
| 6959 | 381 (size_t)cols * sizeof(schar_T)); |
|
5090
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
382 #endif |
|
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 |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
385 update_screen(0); |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
386 ret = 3; |
|
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 if (must_redraw == 0) |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
389 { |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
390 int off = (int)(current_ScreenLine - ScreenLines); |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
391 |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
392 /* 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
|
393 for (r = 0; r < rows; ++r) |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
394 { |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
395 mch_memmove(current_ScreenLine, |
| 6959 | 396 screenline + r * cols, |
| 397 (size_t)cols * sizeof(schar_T)); | |
|
5090
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
398 mch_memmove(ScreenAttrs + off, |
| 6959 | 399 screenattr + r * cols, |
| 400 (size_t)cols * sizeof(sattr_T)); | |
|
5090
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
401 #ifdef FEAT_MBYTE |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
402 if (enc_utf8) |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
403 { |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
404 mch_memmove(ScreenLinesUC + off, |
| 6959 | 405 screenlineUC + r * cols, |
| 406 (size_t)cols * sizeof(u8char_T)); | |
|
5090
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
407 for (i = 0; i < p_mco; ++i) |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
408 mch_memmove(ScreenLinesC[i] + off, |
| 6959 | 409 screenlineC[i] + r * cols, |
| 410 (size_t)cols * sizeof(u8char_T)); | |
|
5090
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
411 } |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
412 if (enc_dbcs == DBCS_JPNU) |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
413 mch_memmove(ScreenLines2 + off, |
| 6959 | 414 screenline2 + r * cols, |
| 415 (size_t)cols * sizeof(schar_T)); | |
| 416 #endif | |
|
11670
3b2afa2b77b3
patch 8.0.0718: output of job in terminal is not displayed
Christian Brabandt <cb@256bit.org>
parents:
11657
diff
changeset
|
417 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
|
418 } |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
419 ret = 4; |
|
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 } |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
422 |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
423 vim_free(screenline); |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
424 vim_free(screenattr); |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
425 #ifdef FEAT_MBYTE |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
426 if (enc_utf8) |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
427 { |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
428 vim_free(screenlineUC); |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
429 for (i = 0; i < p_mco; ++i) |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
430 vim_free(screenlineC[i]); |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
431 } |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
432 if (enc_dbcs == DBCS_JPNU) |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
433 vim_free(screenline2); |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
434 #endif |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
435 |
|
5126
71859e71b1f9
updated for version 7.3.1306
Bram Moolenaar <bram@vim.org>
parents:
5096
diff
changeset
|
436 /* Show the intro message when appropriate. */ |
|
71859e71b1f9
updated for version 7.3.1306
Bram Moolenaar <bram@vim.org>
parents:
5096
diff
changeset
|
437 maybe_intro_message(); |
|
71859e71b1f9
updated for version 7.3.1306
Bram Moolenaar <bram@vim.org>
parents:
5096
diff
changeset
|
438 |
|
71859e71b1f9
updated for version 7.3.1306
Bram Moolenaar <bram@vim.org>
parents:
5096
diff
changeset
|
439 setcursor(); |
|
71859e71b1f9
updated for version 7.3.1306
Bram Moolenaar <bram@vim.org>
parents:
5096
diff
changeset
|
440 |
|
5090
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
441 return ret; |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
442 } |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
443 |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
444 /* |
|
8577
63dc856bd13d
commit https://github.com/vim/vim/commit/975b5271eed4fa0500c24a8f37be0b1797cb9db7
Christian Brabandt <cb@256bit.org>
parents:
8212
diff
changeset
|
445 * 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
|
446 * 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
|
447 * 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
|
448 * 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
|
449 * command line. |
|
8577
63dc856bd13d
commit https://github.com/vim/vim/commit/975b5271eed4fa0500c24a8f37be0b1797cb9db7
Christian Brabandt <cb@256bit.org>
parents:
8212
diff
changeset
|
450 */ |
|
63dc856bd13d
commit https://github.com/vim/vim/commit/975b5271eed4fa0500c24a8f37be0b1797cb9db7
Christian Brabandt <cb@256bit.org>
parents:
8212
diff
changeset
|
451 void |
|
12244
d0b039e2ed56
patch 8.0.1002: unnecessarily updating screen after timer callback
Christian Brabandt <cb@256bit.org>
parents:
12152
diff
changeset
|
452 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
|
453 { |
|
11698
4f59d2a66bf7
patch 8.0.0732: when updating a buffer modeless selection is lost
Christian Brabandt <cb@256bit.org>
parents:
11672
diff
changeset
|
454 ++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
|
455 |
|
8627
7c98c5d0298c
commit https://github.com/vim/vim/commit/bfb96c047b79b2aab5fd57a2472871508819f3ef
Christian Brabandt <cb@256bit.org>
parents:
8577
diff
changeset
|
456 if (State == HITRETURN || State == ASKMORE) |
|
7c98c5d0298c
commit https://github.com/vim/vim/commit/bfb96c047b79b2aab5fd57a2472871508819f3ef
Christian Brabandt <cb@256bit.org>
parents:
8577
diff
changeset
|
457 ; /* do nothing */ |
|
7c98c5d0298c
commit https://github.com/vim/vim/commit/bfb96c047b79b2aab5fd57a2472871508819f3ef
Christian Brabandt <cb@256bit.org>
parents:
8577
diff
changeset
|
458 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
|
459 { |
|
11655
8014350fe51a
patch 8.0.0710: a job that writes to a buffer clears completion
Christian Brabandt <cb@256bit.org>
parents:
11607
diff
changeset
|
460 /* Redrawing only works when the screen didn't scroll. Don't clear |
|
8014350fe51a
patch 8.0.0710: a job that writes to a buffer clears completion
Christian Brabandt <cb@256bit.org>
parents:
11607
diff
changeset
|
461 * wildmenu entries. */ |
|
11657
a7cd2a53590c
patch 8.0.0711: cannot build without the wildmenu feature
Christian Brabandt <cb@256bit.org>
parents:
11655
diff
changeset
|
462 if (msg_scrolled == 0 |
|
a7cd2a53590c
patch 8.0.0711: cannot build without the wildmenu feature
Christian Brabandt <cb@256bit.org>
parents:
11655
diff
changeset
|
463 #ifdef FEAT_WILDMENU |
|
a7cd2a53590c
patch 8.0.0711: cannot build without the wildmenu feature
Christian Brabandt <cb@256bit.org>
parents:
11655
diff
changeset
|
464 && wild_menu_showing == 0 |
|
a7cd2a53590c
patch 8.0.0711: cannot build without the wildmenu feature
Christian Brabandt <cb@256bit.org>
parents:
11655
diff
changeset
|
465 #endif |
|
12244
d0b039e2ed56
patch 8.0.1002: unnecessarily updating screen after timer callback
Christian Brabandt <cb@256bit.org>
parents:
12152
diff
changeset
|
466 && call_update_screen) |
|
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
|
467 update_screen(0); |
|
11655
8014350fe51a
patch 8.0.0710: a job that writes to a buffer clears completion
Christian Brabandt <cb@256bit.org>
parents:
11607
diff
changeset
|
468 /* Redraw in the same position, so that the user can continue |
|
8014350fe51a
patch 8.0.0710: a job that writes to a buffer clears completion
Christian Brabandt <cb@256bit.org>
parents:
11607
diff
changeset
|
469 * editing the command. */ |
|
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
|
470 redrawcmdline_ex(FALSE); |
|
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
|
471 } |
|
9444
e08c8502d7ce
commit https://github.com/vim/vim/commit/144445d15f2369a58b94b6fee2fe162fc81c8abe
Christian Brabandt <cb@256bit.org>
parents:
9428
diff
changeset
|
472 else if (State & (NORMAL | INSERT)) |
|
8627
7c98c5d0298c
commit https://github.com/vim/vim/commit/bfb96c047b79b2aab5fd57a2472871508819f3ef
Christian Brabandt <cb@256bit.org>
parents:
8577
diff
changeset
|
473 { |
|
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
|
474 /* keep the command line if possible */ |
|
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
|
475 update_screen(VALID_NO_UPDATE); |
|
8627
7c98c5d0298c
commit https://github.com/vim/vim/commit/bfb96c047b79b2aab5fd57a2472871508819f3ef
Christian Brabandt <cb@256bit.org>
parents:
8577
diff
changeset
|
476 setcursor(); |
|
7c98c5d0298c
commit https://github.com/vim/vim/commit/bfb96c047b79b2aab5fd57a2472871508819f3ef
Christian Brabandt <cb@256bit.org>
parents:
8577
diff
changeset
|
477 } |
|
8577
63dc856bd13d
commit https://github.com/vim/vim/commit/975b5271eed4fa0500c24a8f37be0b1797cb9db7
Christian Brabandt <cb@256bit.org>
parents:
8212
diff
changeset
|
478 cursor_on(); |
|
63dc856bd13d
commit https://github.com/vim/vim/commit/975b5271eed4fa0500c24a8f37be0b1797cb9db7
Christian Brabandt <cb@256bit.org>
parents:
8212
diff
changeset
|
479 out_flush(); |
|
63dc856bd13d
commit https://github.com/vim/vim/commit/975b5271eed4fa0500c24a8f37be0b1797cb9db7
Christian Brabandt <cb@256bit.org>
parents:
8212
diff
changeset
|
480 #ifdef FEAT_GUI |
|
63dc856bd13d
commit https://github.com/vim/vim/commit/975b5271eed4fa0500c24a8f37be0b1797cb9db7
Christian Brabandt <cb@256bit.org>
parents:
8212
diff
changeset
|
481 if (gui.in_use) |
|
63dc856bd13d
commit https://github.com/vim/vim/commit/975b5271eed4fa0500c24a8f37be0b1797cb9db7
Christian Brabandt <cb@256bit.org>
parents:
8212
diff
changeset
|
482 { |
|
9428
0c7f47088e55
commit https://github.com/vim/vim/commit/9d5d3c9c4468ad76f16b50eabd3d9e7eab2ed44d
Christian Brabandt <cb@256bit.org>
parents:
9320
diff
changeset
|
483 /* Don't update the cursor when it is blinking and off to avoid |
|
0c7f47088e55
commit https://github.com/vim/vim/commit/9d5d3c9c4468ad76f16b50eabd3d9e7eab2ed44d
Christian Brabandt <cb@256bit.org>
parents:
9320
diff
changeset
|
484 * flicker. */ |
|
0c7f47088e55
commit https://github.com/vim/vim/commit/9d5d3c9c4468ad76f16b50eabd3d9e7eab2ed44d
Christian Brabandt <cb@256bit.org>
parents:
9320
diff
changeset
|
485 if (!gui_mch_is_blink_off()) |
|
9213
bb86514cad15
commit https://github.com/vim/vim/commit/703a8044b5393d37d355b0b1054a9a5a13912a3f
Christian Brabandt <cb@256bit.org>
parents:
9100
diff
changeset
|
486 gui_update_cursor(FALSE, FALSE); |
|
8577
63dc856bd13d
commit https://github.com/vim/vim/commit/975b5271eed4fa0500c24a8f37be0b1797cb9db7
Christian Brabandt <cb@256bit.org>
parents:
8212
diff
changeset
|
487 gui_mch_flush(); |
|
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 #endif |
|
11698
4f59d2a66bf7
patch 8.0.0732: when updating a buffer modeless selection is lost
Christian Brabandt <cb@256bit.org>
parents:
11672
diff
changeset
|
490 |
|
4f59d2a66bf7
patch 8.0.0732: when updating a buffer modeless selection is lost
Christian Brabandt <cb@256bit.org>
parents:
11672
diff
changeset
|
491 --redrawing_for_callback; |
|
8577
63dc856bd13d
commit https://github.com/vim/vim/commit/975b5271eed4fa0500c24a8f37be0b1797cb9db7
Christian Brabandt <cb@256bit.org>
parents:
8212
diff
changeset
|
492 } |
|
63dc856bd13d
commit https://github.com/vim/vim/commit/975b5271eed4fa0500c24a8f37be0b1797cb9db7
Christian Brabandt <cb@256bit.org>
parents:
8212
diff
changeset
|
493 |
|
63dc856bd13d
commit https://github.com/vim/vim/commit/975b5271eed4fa0500c24a8f37be0b1797cb9db7
Christian Brabandt <cb@256bit.org>
parents:
8212
diff
changeset
|
494 /* |
| 7 | 495 * Changed something in the current window, at buffer line "lnum", that |
| 496 * requires that line and possibly other lines to be redrawn. | |
| 497 * Used when entering/leaving Insert mode with the cursor on a folded line. | |
| 498 * Used to remove the "$" from a change command. | |
| 499 * Note that when also inserting/deleting lines w_redraw_top and w_redraw_bot | |
| 500 * may become invalid and the whole window will have to be redrawn. | |
| 501 */ | |
| 502 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
503 redrawWinline( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
504 linenr_T lnum, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
505 int invalid UNUSED) /* window line height is invalid now */ |
| 7 | 506 { |
| 507 #ifdef FEAT_FOLDING | |
| 508 int i; | |
| 509 #endif | |
| 510 | |
| 511 if (curwin->w_redraw_top == 0 || curwin->w_redraw_top > lnum) | |
| 512 curwin->w_redraw_top = lnum; | |
| 513 if (curwin->w_redraw_bot == 0 || curwin->w_redraw_bot < lnum) | |
| 514 curwin->w_redraw_bot = lnum; | |
| 515 redraw_later(VALID); | |
| 516 | |
| 517 #ifdef FEAT_FOLDING | |
| 518 if (invalid) | |
| 519 { | |
| 520 /* A w_lines[] entry for this lnum has become invalid. */ | |
| 521 i = find_wl_entry(curwin, lnum); | |
| 522 if (i >= 0) | |
| 523 curwin->w_lines[i].wl_valid = FALSE; | |
| 524 } | |
| 525 #endif | |
| 526 } | |
| 527 | |
| 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. | |
| 541 */ | |
| 542 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
|
543 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
|
544 { |
|
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 int type = type_arg; |
| 7 | 546 win_T *wp; |
| 547 static int did_intro = FALSE; | |
| 548 #if defined(FEAT_SEARCH_EXTRA) || defined(FEAT_CLIPBOARD) | |
| 549 int did_one; | |
| 550 #endif | |
|
9444
e08c8502d7ce
commit https://github.com/vim/vim/commit/144445d15f2369a58b94b6fee2fe162fc81c8abe
Christian Brabandt <cb@256bit.org>
parents:
9428
diff
changeset
|
551 #ifdef FEAT_GUI |
|
9848
664276833670
commit https://github.com/vim/vim/commit/107abd2ca53c31fd3bb40d77ff296e98eaae2975
Christian Brabandt <cb@256bit.org>
parents:
9754
diff
changeset
|
552 int did_undraw = FALSE; |
|
9444
e08c8502d7ce
commit https://github.com/vim/vim/commit/144445d15f2369a58b94b6fee2fe162fc81c8abe
Christian Brabandt <cb@256bit.org>
parents:
9428
diff
changeset
|
553 int gui_cursor_col; |
|
e08c8502d7ce
commit https://github.com/vim/vim/commit/144445d15f2369a58b94b6fee2fe162fc81c8abe
Christian Brabandt <cb@256bit.org>
parents:
9428
diff
changeset
|
554 int gui_cursor_row; |
|
e08c8502d7ce
commit https://github.com/vim/vim/commit/144445d15f2369a58b94b6fee2fe162fc81c8abe
Christian Brabandt <cb@256bit.org>
parents:
9428
diff
changeset
|
555 #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
|
556 int no_update = FALSE; |
| 7 | 557 |
| 2008 | 558 /* Don't do anything if the screen structures are (not yet) valid. */ |
| 7 | 559 if (!screen_valid(TRUE)) |
| 560 return; | |
| 561 | |
|
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
|
562 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
|
563 { |
|
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 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
|
565 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
|
566 } |
|
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 |
| 7 | 568 if (must_redraw) |
| 569 { | |
| 570 if (type < must_redraw) /* use maximal type */ | |
| 571 type = must_redraw; | |
| 1331 | 572 |
| 573 /* must_redraw is reset here, so that when we run into some weird | |
| 574 * reason to redraw while busy redrawing (e.g., asynchronous | |
| 575 * scrolling), or update_topline() in win_update() will cause a | |
| 576 * scroll, the screen will be redrawn later or in win_update(). */ | |
| 7 | 577 must_redraw = 0; |
| 578 } | |
| 579 | |
| 580 /* Need to update w_lines[]. */ | |
| 581 if (curwin->w_lines_valid == 0 && type < NOT_VALID) | |
| 582 type = NOT_VALID; | |
| 583 | |
| 2008 | 584 /* Postpone the redrawing when it's not needed and when being called |
| 585 * recursively. */ | |
| 586 if (!redrawing() || updating_screen) | |
| 7 | 587 { |
| 588 redraw_later(type); /* remember type for next time */ | |
| 589 must_redraw = type; | |
| 590 if (type > INVERTED_ALL) | |
| 591 curwin->w_lines_valid = 0; /* don't use w_lines[].wl_size now */ | |
| 592 return; | |
| 593 } | |
| 594 | |
| 595 updating_screen = TRUE; | |
| 596 #ifdef FEAT_SYN_HL | |
| 597 ++display_tick; /* let syntax code know we're in a next round of | |
| 598 * display updating */ | |
| 599 #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
|
600 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
|
601 ++no_win_do_lines_ins; |
| 7 | 602 |
| 603 /* | |
| 604 * if the screen was scrolled up when displaying a message, scroll it down | |
| 605 */ | |
| 606 if (msg_scrolled) | |
| 607 { | |
| 608 clear_cmdline = TRUE; | |
| 609 if (msg_scrolled > Rows - 5) /* clearing is faster */ | |
| 610 type = CLEAR; | |
| 611 else if (type != CLEAR) | |
| 612 { | |
| 613 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
|
614 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
|
615 == FAIL) |
| 7 | 616 type = CLEAR; |
| 617 FOR_ALL_WINDOWS(wp) | |
| 618 { | |
| 619 if (W_WINROW(wp) < msg_scrolled) | |
| 620 { | |
| 621 if (W_WINROW(wp) + wp->w_height > msg_scrolled | |
| 622 && wp->w_redr_type < REDRAW_TOP | |
| 623 && wp->w_lines_valid > 0 | |
| 624 && wp->w_topline == wp->w_lines[0].wl_lnum) | |
| 625 { | |
| 626 wp->w_upd_rows = msg_scrolled - W_WINROW(wp); | |
| 627 wp->w_redr_type = REDRAW_TOP; | |
| 628 } | |
| 629 else | |
| 630 { | |
| 631 wp->w_redr_type = NOT_VALID; | |
| 632 #ifdef FEAT_WINDOWS | |
| 633 if (W_WINROW(wp) + wp->w_height + W_STATUS_HEIGHT(wp) | |
| 634 <= msg_scrolled) | |
| 635 wp->w_redr_status = TRUE; | |
| 636 #endif | |
| 637 } | |
| 638 } | |
| 639 } | |
|
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
|
640 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
|
641 redraw_cmdline = TRUE; |
| 667 | 642 #ifdef FEAT_WINDOWS |
| 673 | 643 redraw_tabline = TRUE; |
| 667 | 644 #endif |
| 7 | 645 } |
| 646 msg_scrolled = 0; | |
| 647 need_wait_return = FALSE; | |
| 648 } | |
| 649 | |
| 650 /* reset cmdline_row now (may have been changed temporarily) */ | |
| 651 compute_cmdrow(); | |
| 652 | |
| 653 /* Check for changed highlighting */ | |
| 654 if (need_highlight_changed) | |
| 655 highlight_changed(); | |
| 656 | |
| 657 if (type == CLEAR) /* first clear screen */ | |
| 658 { | |
| 659 screenclear(); /* will reset clear_cmdline */ | |
| 660 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
|
661 /* 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
|
662 must_redraw = 0; |
| 7 | 663 } |
| 664 | |
| 665 if (clear_cmdline) /* going to clear cmdline (done below) */ | |
| 666 check_for_delay(FALSE); | |
| 667 | |
| 13 | 668 #ifdef FEAT_LINEBREAK |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
669 /* 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
|
670 * changes. */ |
| 13 | 671 if (curwin->w_redr_type < NOT_VALID |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
672 && 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
|
673 ? number_width(curwin) : 0)) |
| 13 | 674 curwin->w_redr_type = NOT_VALID; |
| 675 #endif | |
| 676 | |
| 7 | 677 /* |
| 678 * Only start redrawing if there is really something to do. | |
| 679 */ | |
| 680 if (type == INVERTED) | |
| 681 update_curswant(); | |
| 682 if (curwin->w_redr_type < type | |
| 683 && !((type == VALID | |
| 684 && curwin->w_lines[0].wl_valid | |
| 685 #ifdef FEAT_DIFF | |
| 686 && curwin->w_topfill == curwin->w_old_topfill | |
| 687 && curwin->w_botfill == curwin->w_old_botfill | |
| 688 #endif | |
| 689 && curwin->w_topline == curwin->w_lines[0].wl_lnum) | |
| 690 || (type == INVERTED | |
| 1043 | 691 && VIsual_active |
| 7 | 692 && curwin->w_old_cursor_lnum == curwin->w_cursor.lnum |
| 693 && curwin->w_old_visual_mode == VIsual_mode | |
| 694 && (curwin->w_valid & VALID_VIRTCOL) | |
| 695 && curwin->w_old_curswant == curwin->w_curswant) | |
| 696 )) | |
| 697 curwin->w_redr_type = type; | |
| 698 | |
| 849 | 699 #ifdef FEAT_WINDOWS |
| 700 /* Redraw the tab pages line if needed. */ | |
| 701 if (redraw_tabline || type >= NOT_VALID) | |
| 702 draw_tabline(); | |
| 703 #endif | |
| 704 | |
| 7 | 705 #ifdef FEAT_SYN_HL |
| 706 /* | |
| 707 * Correct stored syntax highlighting info for changes in each displayed | |
| 708 * buffer. Each buffer must only be done once. | |
| 709 */ | |
| 710 FOR_ALL_WINDOWS(wp) | |
| 711 { | |
| 712 if (wp->w_buffer->b_mod_set) | |
| 713 { | |
| 714 # ifdef FEAT_WINDOWS | |
| 715 win_T *wwp; | |
| 716 | |
| 717 /* Check if we already did this buffer. */ | |
| 718 for (wwp = firstwin; wwp != wp; wwp = wwp->w_next) | |
| 719 if (wwp->w_buffer == wp->w_buffer) | |
| 720 break; | |
| 721 # endif | |
| 722 if ( | |
| 723 # ifdef FEAT_WINDOWS | |
| 724 wwp == wp && | |
| 725 # endif | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
726 syntax_present(wp)) |
| 7 | 727 syn_stack_apply_changes(wp->w_buffer); |
| 728 } | |
| 729 } | |
| 730 #endif | |
| 731 | |
| 732 /* | |
| 733 * Go from top to bottom through the windows, redrawing the ones that need | |
| 734 * it. | |
| 735 */ | |
| 736 #if defined(FEAT_SEARCH_EXTRA) || defined(FEAT_CLIPBOARD) | |
| 737 did_one = FALSE; | |
| 738 #endif | |
| 739 #ifdef FEAT_SEARCH_EXTRA | |
| 740 search_hl.rm.regprog = NULL; | |
| 741 #endif | |
| 742 FOR_ALL_WINDOWS(wp) | |
| 743 { | |
| 744 if (wp->w_redr_type != 0) | |
| 745 { | |
| 746 cursor_off(); | |
| 747 #if defined(FEAT_SEARCH_EXTRA) || defined(FEAT_CLIPBOARD) | |
| 748 if (!did_one) | |
| 749 { | |
| 750 did_one = TRUE; | |
| 751 # ifdef FEAT_SEARCH_EXTRA | |
| 752 start_search_hl(); | |
| 753 # endif | |
| 754 # ifdef FEAT_CLIPBOARD | |
| 755 /* When Visual area changed, may have to update selection. */ | |
| 3674 | 756 if (clip_star.available && clip_isautosel_star()) |
| 757 clip_update_selection(&clip_star); | |
| 758 if (clip_plus.available && clip_isautosel_plus()) | |
| 759 clip_update_selection(&clip_plus); | |
| 7 | 760 # endif |
| 761 #ifdef FEAT_GUI | |
| 762 /* Remove the cursor before starting to do anything, because | |
| 763 * scrolling may make it difficult to redraw the text under | |
| 764 * it. */ | |
|
9848
664276833670
commit https://github.com/vim/vim/commit/107abd2ca53c31fd3bb40d77ff296e98eaae2975
Christian Brabandt <cb@256bit.org>
parents:
9754
diff
changeset
|
765 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
|
766 { |
|
e08c8502d7ce
commit https://github.com/vim/vim/commit/144445d15f2369a58b94b6fee2fe162fc81c8abe
Christian Brabandt <cb@256bit.org>
parents:
9428
diff
changeset
|
767 gui_cursor_col = gui.cursor_col; |
|
e08c8502d7ce
commit https://github.com/vim/vim/commit/144445d15f2369a58b94b6fee2fe162fc81c8abe
Christian Brabandt <cb@256bit.org>
parents:
9428
diff
changeset
|
768 gui_cursor_row = gui.cursor_row; |
| 7 | 769 gui_undraw_cursor(); |
|
9848
664276833670
commit https://github.com/vim/vim/commit/107abd2ca53c31fd3bb40d77ff296e98eaae2975
Christian Brabandt <cb@256bit.org>
parents:
9754
diff
changeset
|
770 did_undraw = TRUE; |
|
9444
e08c8502d7ce
commit https://github.com/vim/vim/commit/144445d15f2369a58b94b6fee2fe162fc81c8abe
Christian Brabandt <cb@256bit.org>
parents:
9428
diff
changeset
|
771 } |
| 7 | 772 #endif |
| 773 } | |
| 774 #endif | |
| 775 win_update(wp); | |
| 776 } | |
| 777 | |
| 778 #ifdef FEAT_WINDOWS | |
| 779 /* redraw status line after the window to minimize cursor movement */ | |
| 780 if (wp->w_redr_status) | |
| 781 { | |
| 782 cursor_off(); | |
| 783 win_redr_status(wp); | |
| 784 } | |
| 785 #endif | |
| 786 } | |
| 787 #if defined(FEAT_SEARCH_EXTRA) | |
| 788 end_search_hl(); | |
| 789 #endif | |
| 4107 | 790 #ifdef FEAT_INS_EXPAND |
| 791 /* May need to redraw the popup menu. */ | |
| 792 if (pum_visible()) | |
| 793 pum_redraw(); | |
| 794 #endif | |
| 7 | 795 |
| 796 #ifdef FEAT_WINDOWS | |
| 797 /* Reset b_mod_set flags. Going through all windows is probably faster | |
| 798 * 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
|
799 FOR_ALL_WINDOWS(wp) |
| 7 | 800 wp->w_buffer->b_mod_set = FALSE; |
| 801 #else | |
| 802 curbuf->b_mod_set = FALSE; | |
| 803 #endif | |
| 804 | |
| 805 updating_screen = FALSE; | |
| 806 #ifdef FEAT_GUI | |
| 807 gui_may_resize_shell(); | |
| 808 #endif | |
| 809 | |
| 810 /* Clear or redraw the command line. Done last, because scrolling may | |
| 811 * mess up the command line. */ | |
| 812 if (clear_cmdline || redraw_cmdline) | |
| 813 showmode(); | |
| 814 | |
|
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
|
815 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
|
816 --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
|
817 |
| 7 | 818 /* 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
|
819 if (!did_intro) |
|
71859e71b1f9
updated for version 7.3.1306
Bram Moolenaar <bram@vim.org>
parents:
5096
diff
changeset
|
820 maybe_intro_message(); |
| 7 | 821 did_intro = TRUE; |
| 822 | |
| 823 #ifdef FEAT_GUI | |
| 824 /* Redraw the cursor and update the scrollbars when all screen updating is | |
| 825 * done. */ | |
| 826 if (gui.in_use) | |
| 827 { | |
| 828 out_flush(); /* required before updating the cursor */ | |
|
9848
664276833670
commit https://github.com/vim/vim/commit/107abd2ca53c31fd3bb40d77ff296e98eaae2975
Christian Brabandt <cb@256bit.org>
parents:
9754
diff
changeset
|
829 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
|
830 { |
|
e08c8502d7ce
commit https://github.com/vim/vim/commit/144445d15f2369a58b94b6fee2fe162fc81c8abe
Christian Brabandt <cb@256bit.org>
parents:
9428
diff
changeset
|
831 /* 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
|
832 * uses that. */ |
|
e08c8502d7ce
commit https://github.com/vim/vim/commit/144445d15f2369a58b94b6fee2fe162fc81c8abe
Christian Brabandt <cb@256bit.org>
parents:
9428
diff
changeset
|
833 gui.col = gui_cursor_col; |
|
e08c8502d7ce
commit https://github.com/vim/vim/commit/144445d15f2369a58b94b6fee2fe162fc81c8abe
Christian Brabandt <cb@256bit.org>
parents:
9428
diff
changeset
|
834 gui.row = gui_cursor_row; |
|
10247
d54d4a258b96
commit https://github.com/vim/vim/commit/84dbd494dca599ecff05b2c2279d402c12e6d197
Christian Brabandt <cb@256bit.org>
parents:
10042
diff
changeset
|
835 # ifdef FEAT_MBYTE |
|
d54d4a258b96
commit https://github.com/vim/vim/commit/84dbd494dca599ecff05b2c2279d402c12e6d197
Christian Brabandt <cb@256bit.org>
parents:
10042
diff
changeset
|
836 gui.col = mb_fix_col(gui.col, gui.row); |
|
d54d4a258b96
commit https://github.com/vim/vim/commit/84dbd494dca599ecff05b2c2279d402c12e6d197
Christian Brabandt <cb@256bit.org>
parents:
10042
diff
changeset
|
837 # endif |
| 7 | 838 gui_update_cursor(FALSE, FALSE); |
|
9446
aaa6639b6f14
commit https://github.com/vim/vim/commit/65549bdef5805ba5a18a3d2d3909998dd7d9ed46
Christian Brabandt <cb@256bit.org>
parents:
9444
diff
changeset
|
839 screen_cur_col = gui.col; |
|
aaa6639b6f14
commit https://github.com/vim/vim/commit/65549bdef5805ba5a18a3d2d3909998dd7d9ed46
Christian Brabandt <cb@256bit.org>
parents:
9444
diff
changeset
|
840 screen_cur_row = gui.row; |
|
9444
e08c8502d7ce
commit https://github.com/vim/vim/commit/144445d15f2369a58b94b6fee2fe162fc81c8abe
Christian Brabandt <cb@256bit.org>
parents:
9428
diff
changeset
|
841 } |
| 7 | 842 gui_update_scrollbars(FALSE); |
| 843 } | |
| 844 #endif | |
| 845 } | |
| 846 | |
|
10793
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
847 #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
|
848 /* |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
849 * 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
|
850 * 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
|
851 */ |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
852 static void |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
853 update_prepare(void) |
|
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 cursor_off(); |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
856 updating_screen = TRUE; |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
857 #ifdef FEAT_GUI |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
858 /* 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
|
859 * 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
|
860 if (gui.in_use) |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
861 gui_undraw_cursor(); |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
862 #endif |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
863 #ifdef FEAT_SEARCH_EXTRA |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
864 start_search_hl(); |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
865 #endif |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
866 } |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
867 |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
868 /* |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
869 * 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
|
870 */ |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
871 static void |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
872 update_finish(void) |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
873 { |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
874 if (redraw_cmdline) |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
875 showmode(); |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
876 |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
877 # ifdef FEAT_SEARCH_EXTRA |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
878 end_search_hl(); |
|
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 updating_screen = FALSE; |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
882 |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
883 # ifdef FEAT_GUI |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
884 gui_may_resize_shell(); |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
885 |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
886 /* 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
|
887 * done. */ |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
888 if (gui.in_use) |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
889 { |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
890 out_flush(); /* required before updating the cursor */ |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
891 gui_update_cursor(FALSE, FALSE); |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
892 gui_update_scrollbars(FALSE); |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
893 } |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
894 # endif |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
895 } |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
896 #endif |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
897 |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
898 #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
|
899 /* |
|
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
900 * 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
|
901 * 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
|
902 */ |
|
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
903 int |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
904 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
|
905 { |
|
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
906 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
|
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 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
|
909 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
|
910 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
|
911 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
|
912 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
|
913 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
|
914 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
|
915 c = 'n'; |
|
2382
3a5ededa240a
Add the 'c' flag to 'concealcursor'.
Bram Moolenaar <bram@vim.org>
parents:
2381
diff
changeset
|
916 else if (State & CMDLINE) |
|
3a5ededa240a
Add the 'c' flag to 'concealcursor'.
Bram Moolenaar <bram@vim.org>
parents:
2381
diff
changeset
|
917 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
|
918 else |
|
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
919 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
|
920 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
|
921 } |
|
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
922 |
|
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
923 /* |
|
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
924 * 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
|
925 */ |
|
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
926 void |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
927 conceal_check_cursur_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
|
928 { |
|
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
929 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
|
930 { |
|
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
931 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
|
932 /* 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
|
933 * 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
|
934 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
|
935 } |
|
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
936 } |
|
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
937 |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
938 void |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
939 update_single_line(win_T *wp, linenr_T lnum) |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
940 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
941 int row; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
942 int j; |
|
11529
998d2cf59caa
patch 8.0.0647: syntax highlighting can make cause a freeze
Christian Brabandt <cb@256bit.org>
parents:
11521
diff
changeset
|
943 #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
|
944 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
|
945 #endif |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
946 |
|
9100
ddccff0480d2
commit https://github.com/vim/vim/commit/908be438794619f10ef7fa25e24e5893b2ae0189
Christian Brabandt <cb@256bit.org>
parents:
9027
diff
changeset
|
947 /* Don't do anything if the screen structures are (not yet) valid. */ |
|
10769
dd93e5439ffd
patch 8.0.0274: possible recursive screen updating causes trouble
Christian Brabandt <cb@256bit.org>
parents:
10690
diff
changeset
|
948 if (!screen_valid(TRUE) || updating_screen) |
|
9100
ddccff0480d2
commit https://github.com/vim/vim/commit/908be438794619f10ef7fa25e24e5893b2ae0189
Christian Brabandt <cb@256bit.org>
parents:
9027
diff
changeset
|
949 return; |
|
ddccff0480d2
commit https://github.com/vim/vim/commit/908be438794619f10ef7fa25e24e5893b2ae0189
Christian Brabandt <cb@256bit.org>
parents:
9027
diff
changeset
|
950 |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
951 if (lnum >= wp->w_topline && lnum < wp->w_botline |
|
2269
fb627e94e6c6
Couple of small fixes for conceal feature. (Dominique Pelle)
Bram Moolenaar <bram@vim.org>
parents:
2255
diff
changeset
|
952 && foldedCount(wp, lnum, &win_foldinfo) == 0) |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
953 { |
|
11529
998d2cf59caa
patch 8.0.0647: syntax highlighting can make cause a freeze
Christian Brabandt <cb@256bit.org>
parents:
11521
diff
changeset
|
954 #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
|
955 /* 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
|
956 profile_setlimit(p_rdt, &syntax_tm); |
|
998d2cf59caa
patch 8.0.0647: syntax highlighting can make cause a freeze
Christian Brabandt <cb@256bit.org>
parents:
11521
diff
changeset
|
957 #endif |
|
10793
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
958 update_prepare(); |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
959 |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
960 row = 0; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
961 for (j = 0; j < wp->w_lines_valid; ++j) |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
962 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
963 if (lnum == wp->w_lines[j].wl_lnum) |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
964 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
965 screen_start(); /* not sure of screen cursor */ |
|
2284
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
966 # ifdef FEAT_SEARCH_EXTRA |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
967 init_search_hl(wp); |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
968 start_search_hl(); |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
969 prepare_search_hl(wp, lnum); |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
970 # endif |
|
11529
998d2cf59caa
patch 8.0.0647: syntax highlighting can make cause a freeze
Christian Brabandt <cb@256bit.org>
parents:
11521
diff
changeset
|
971 win_line(wp, lnum, row, row + wp->w_lines[j].wl_size, FALSE, |
|
998d2cf59caa
patch 8.0.0647: syntax highlighting can make cause a freeze
Christian Brabandt <cb@256bit.org>
parents:
11521
diff
changeset
|
972 #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
|
973 &syntax_tm |
|
998d2cf59caa
patch 8.0.0647: syntax highlighting can make cause a freeze
Christian Brabandt <cb@256bit.org>
parents:
11521
diff
changeset
|
974 #else |
|
998d2cf59caa
patch 8.0.0647: syntax highlighting can make cause a freeze
Christian Brabandt <cb@256bit.org>
parents:
11521
diff
changeset
|
975 NULL |
|
998d2cf59caa
patch 8.0.0647: syntax highlighting can make cause a freeze
Christian Brabandt <cb@256bit.org>
parents:
11521
diff
changeset
|
976 #endif |
|
998d2cf59caa
patch 8.0.0647: syntax highlighting can make cause a freeze
Christian Brabandt <cb@256bit.org>
parents:
11521
diff
changeset
|
977 ); |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
978 # if defined(FEAT_SEARCH_EXTRA) |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
979 end_search_hl(); |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
980 # endif |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
981 break; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
982 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
983 row += wp->w_lines[j].wl_size; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
984 } |
|
10793
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
985 |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
986 update_finish(); |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
987 } |
|
2378
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
988 need_cursor_line_redraw = FALSE; |
| 7 | 989 } |
| 990 #endif | |
| 991 | |
| 992 #if defined(FEAT_SIGNS) || defined(PROTO) | |
| 993 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
994 update_debug_sign(buf_T *buf, linenr_T lnum) |
| 7 | 995 { |
| 996 win_T *wp; | |
| 997 int doit = FALSE; | |
| 998 | |
| 999 # ifdef FEAT_FOLDING | |
| 1000 win_foldinfo.fi_level = 0; | |
| 1001 # endif | |
| 1002 | |
| 1003 /* update/delete a specific mark */ | |
| 1004 FOR_ALL_WINDOWS(wp) | |
| 1005 { | |
| 1006 if (buf != NULL && lnum > 0) | |
| 1007 { | |
| 1008 if (wp->w_buffer == buf && lnum >= wp->w_topline | |
| 1009 && lnum < wp->w_botline) | |
| 1010 { | |
| 1011 if (wp->w_redraw_top == 0 || wp->w_redraw_top > lnum) | |
| 1012 wp->w_redraw_top = lnum; | |
| 1013 if (wp->w_redraw_bot == 0 || wp->w_redraw_bot < lnum) | |
| 1014 wp->w_redraw_bot = lnum; | |
| 1015 redraw_win_later(wp, VALID); | |
| 1016 } | |
| 1017 } | |
| 1018 else | |
| 1019 redraw_win_later(wp, VALID); | |
| 1020 if (wp->w_redr_type != 0) | |
| 1021 doit = TRUE; | |
| 1022 } | |
| 1023 | |
| 3250 | 1024 /* 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
|
1025 * 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
|
1026 */ |
| 3250 | 1027 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
|
1028 || 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
|
1029 || msg_scrolled |
| 3250 | 1030 #ifdef FEAT_GUI |
| 1031 || gui.starting | |
| 1032 #endif | |
| 1033 || starting) | |
| 7 | 1034 return; |
| 1035 | |
| 1036 /* update all windows that need updating */ | |
| 1037 update_prepare(); | |
| 1038 | |
| 1039 # ifdef FEAT_WINDOWS | |
|
9649
fd9727ae3c49
commit https://github.com/vim/vim/commit/2932359000b2f918d5fade79ea4d124d5943cd07
Christian Brabandt <cb@256bit.org>
parents:
9645
diff
changeset
|
1040 FOR_ALL_WINDOWS(wp) |
| 7 | 1041 { |
| 1042 if (wp->w_redr_type != 0) | |
| 1043 win_update(wp); | |
| 1044 if (wp->w_redr_status) | |
| 1045 win_redr_status(wp); | |
| 1046 } | |
| 1047 # else | |
| 1048 if (curwin->w_redr_type != 0) | |
| 1049 win_update(curwin); | |
| 1050 # endif | |
| 1051 | |
| 1052 update_finish(); | |
| 1053 } | |
| 1054 #endif | |
| 1055 | |
| 1056 | |
| 1057 #if defined(FEAT_GUI) || defined(PROTO) | |
| 1058 /* | |
| 1059 * Update a single window, its status line and maybe the command line msg. | |
| 1060 * Used for the GUI scrollbar. | |
| 1061 */ | |
| 1062 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1063 updateWindow(win_T *wp) |
| 7 | 1064 { |
| 2008 | 1065 /* return if already busy updating */ |
| 1066 if (updating_screen) | |
| 1067 return; | |
| 1068 | |
| 7 | 1069 update_prepare(); |
| 1070 | |
| 1071 #ifdef FEAT_CLIPBOARD | |
| 1072 /* When Visual area changed, may have to update selection. */ | |
| 3674 | 1073 if (clip_star.available && clip_isautosel_star()) |
| 1074 clip_update_selection(&clip_star); | |
| 1075 if (clip_plus.available && clip_isautosel_plus()) | |
| 1076 clip_update_selection(&clip_plus); | |
| 7 | 1077 #endif |
| 670 | 1078 |
| 7 | 1079 win_update(wp); |
| 670 | 1080 |
| 7 | 1081 #ifdef FEAT_WINDOWS |
| 670 | 1082 /* When the screen was cleared redraw the tab pages line. */ |
| 673 | 1083 if (redraw_tabline) |
| 677 | 1084 draw_tabline(); |
| 670 | 1085 |
| 7 | 1086 if (wp->w_redr_status |
| 1087 # ifdef FEAT_CMDL_INFO | |
| 1088 || p_ru | |
| 1089 # endif | |
| 1090 # ifdef FEAT_STL_OPT | |
| 40 | 1091 || *p_stl != NUL || *wp->w_p_stl != NUL |
| 7 | 1092 # endif |
| 1093 ) | |
| 1094 win_redr_status(wp); | |
| 1095 #endif | |
| 1096 | |
| 1097 update_finish(); | |
| 1098 } | |
| 1099 #endif | |
| 1100 | |
| 1101 /* | |
| 1102 * Update a single window. | |
| 1103 * | |
| 1104 * This may cause the windows below it also to be redrawn (when clearing the | |
| 1105 * screen or scrolling lines). | |
| 1106 * | |
| 1107 * How the window is redrawn depends on wp->w_redr_type. Each type also | |
| 1108 * implies the one below it. | |
| 1109 * NOT_VALID redraw the whole window | |
| 743 | 1110 * SOME_VALID redraw the whole window but do scroll when possible |
| 7 | 1111 * REDRAW_TOP redraw the top w_upd_rows window lines, otherwise like VALID |
| 1112 * INVERTED redraw the changed part of the Visual area | |
| 1113 * INVERTED_ALL redraw the whole Visual area | |
| 1114 * VALID 1. scroll up/down to adjust for a changed w_topline | |
| 1115 * 2. update lines at the top when scrolled down | |
| 1116 * 3. redraw changed text: | |
| 301 | 1117 * - if wp->w_buffer->b_mod_set set, update lines between |
| 7 | 1118 * b_mod_top and b_mod_bot. |
| 1119 * - if wp->w_redraw_top non-zero, redraw lines between | |
| 1120 * wp->w_redraw_top and wp->w_redr_bot. | |
| 1121 * - continue redrawing when syntax status is invalid. | |
| 1122 * 4. if scrolled up, update lines at the bottom. | |
| 1123 * This results in three areas that may need updating: | |
| 1124 * top: from first row to top_end (when scrolled down) | |
| 1125 * mid: from mid_start to mid_end (update inversion or changed text) | |
| 1126 * bot: from bot_start to last row (when scrolled up) | |
| 1127 */ | |
| 1128 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1129 win_update(win_T *wp) |
| 7 | 1130 { |
| 1131 buf_T *buf = wp->w_buffer; | |
| 1132 int type; | |
| 1133 int top_end = 0; /* Below last row of the top area that needs | |
| 1134 updating. 0 when no top area updating. */ | |
| 1135 int mid_start = 999;/* first row of the mid area that needs | |
| 1136 updating. 999 when no mid area updating. */ | |
| 1137 int mid_end = 0; /* Below last row of the mid area that needs | |
| 1138 updating. 0 when no mid area updating. */ | |
| 1139 int bot_start = 999;/* first row of the bot area that needs | |
| 1140 updating. 999 when no bot area updating */ | |
| 1141 int scrolled_down = FALSE; /* TRUE when scrolled down when | |
| 1142 w_topline got smaller a bit */ | |
| 1143 #ifdef FEAT_SEARCH_EXTRA | |
| 1326 | 1144 matchitem_T *cur; /* points to the match list */ |
| 7 | 1145 int top_to_mod = FALSE; /* redraw above mod_top */ |
| 1146 #endif | |
| 1147 | |
| 1148 int row; /* current window row to display */ | |
| 1149 linenr_T lnum; /* current buffer lnum to display */ | |
| 1150 int idx; /* current index in w_lines[] */ | |
| 1151 int srow; /* starting row of the current line */ | |
| 1152 | |
| 1153 int eof = FALSE; /* if TRUE, we hit the end of the file */ | |
| 1154 int didline = FALSE; /* if TRUE, we finished the last line */ | |
| 1155 int i; | |
| 1156 long j; | |
| 1157 static int recursive = FALSE; /* being called recursively */ | |
| 1158 int old_botline = wp->w_botline; | |
| 1159 #ifdef FEAT_FOLDING | |
| 1160 long fold_count; | |
| 1161 #endif | |
| 1162 #ifdef FEAT_SYN_HL | |
| 1163 /* remember what happened to the previous line, to know if | |
| 1164 * check_visual_highlight() can be used */ | |
| 1165 #define DID_NONE 1 /* didn't update a line */ | |
| 1166 #define DID_LINE 2 /* updated a normal line */ | |
| 1167 #define DID_FOLD 3 /* updated a folded line */ | |
| 1168 int did_update = DID_NONE; | |
| 1169 linenr_T syntax_last_parsed = 0; /* last parsed text line */ | |
| 1170 #endif | |
| 1171 linenr_T mod_top = 0; | |
| 1172 linenr_T mod_bot = 0; | |
| 1173 #if defined(FEAT_SYN_HL) || defined(FEAT_SEARCH_EXTRA) | |
| 1174 int save_got_int; | |
| 1175 #endif | |
|
11529
998d2cf59caa
patch 8.0.0647: syntax highlighting can make cause a freeze
Christian Brabandt <cb@256bit.org>
parents:
11521
diff
changeset
|
1176 #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
|
1177 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
|
1178 #endif |
| 7 | 1179 |
| 1180 type = wp->w_redr_type; | |
| 1181 | |
| 1182 if (type == NOT_VALID) | |
| 1183 { | |
| 1184 #ifdef FEAT_WINDOWS | |
| 1185 wp->w_redr_status = TRUE; | |
| 1186 #endif | |
| 1187 wp->w_lines_valid = 0; | |
| 1188 } | |
| 1189 | |
| 1190 /* Window is zero-height: nothing to draw. */ | |
| 1191 if (wp->w_height == 0) | |
| 1192 { | |
| 1193 wp->w_redr_type = 0; | |
| 1194 return; | |
| 1195 } | |
| 1196 | |
|
8643
24b43dd167eb
commit https://github.com/vim/vim/commit/44a2f923c00f1384c9ecde12fb5b4711bc20702e
Christian Brabandt <cb@256bit.org>
parents:
8627
diff
changeset
|
1197 #ifdef FEAT_WINDOWS |
| 7 | 1198 /* Window is zero-width: Only need to draw the separator. */ |
| 1199 if (wp->w_width == 0) | |
| 1200 { | |
| 1201 /* draw the vertical separator right of this window */ | |
| 1202 draw_vsep_win(wp, 0); | |
| 1203 wp->w_redr_type = 0; | |
| 1204 return; | |
| 1205 } | |
| 1206 #endif | |
| 1207 | |
|
11670
3b2afa2b77b3
patch 8.0.0718: output of job in terminal is not displayed
Christian Brabandt <cb@256bit.org>
parents:
11657
diff
changeset
|
1208 #ifdef FEAT_TERMINAL |
|
11834
0cfe4a07c2ad
patch 8.0.0797: finished job in terminal window is not handled
Christian Brabandt <cb@256bit.org>
parents:
11698
diff
changeset
|
1209 /* If this window contains a terminal, redraw works completely differently. |
|
0cfe4a07c2ad
patch 8.0.0797: finished job in terminal window is not handled
Christian Brabandt <cb@256bit.org>
parents:
11698
diff
changeset
|
1210 */ |
|
0cfe4a07c2ad
patch 8.0.0797: finished job in terminal window is not handled
Christian Brabandt <cb@256bit.org>
parents:
11698
diff
changeset
|
1211 if (term_update_window(wp) == OK) |
|
0cfe4a07c2ad
patch 8.0.0797: finished job in terminal window is not handled
Christian Brabandt <cb@256bit.org>
parents:
11698
diff
changeset
|
1212 { |
|
11670
3b2afa2b77b3
patch 8.0.0718: output of job in terminal is not displayed
Christian Brabandt <cb@256bit.org>
parents:
11657
diff
changeset
|
1213 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
|
1214 return; |
|
3b2afa2b77b3
patch 8.0.0718: output of job in terminal is not displayed
Christian Brabandt <cb@256bit.org>
parents:
11657
diff
changeset
|
1215 } |
|
3b2afa2b77b3
patch 8.0.0718: output of job in terminal is not displayed
Christian Brabandt <cb@256bit.org>
parents:
11657
diff
changeset
|
1216 #endif |
|
3b2afa2b77b3
patch 8.0.0718: output of job in terminal is not displayed
Christian Brabandt <cb@256bit.org>
parents:
11657
diff
changeset
|
1217 |
| 7 | 1218 #ifdef FEAT_SEARCH_EXTRA |
|
2284
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
1219 init_search_hl(wp); |
| 7 | 1220 #endif |
| 1221 | |
| 13 | 1222 #ifdef FEAT_LINEBREAK |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
1223 /* 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
|
1224 * changes. */ |
|
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
1225 i = (wp->w_p_nu || wp->w_p_rnu) ? number_width(wp) : 0; |
| 677 | 1226 if (wp->w_nrwidth != i) |
| 13 | 1227 { |
| 1228 type = NOT_VALID; | |
| 677 | 1229 wp->w_nrwidth = i; |
| 13 | 1230 } |
| 1231 else | |
| 1232 #endif | |
| 1233 | |
| 7 | 1234 if (buf->b_mod_set && buf->b_mod_xlines != 0 && wp->w_redraw_top != 0) |
| 1235 { | |
| 1236 /* | |
| 1237 * When there are both inserted/deleted lines and specific lines to be | |
| 1238 * redrawn, w_redraw_top and w_redraw_bot may be invalid, just redraw | |
| 1239 * everything (only happens when redrawing is off for while). | |
| 1240 */ | |
| 1241 type = NOT_VALID; | |
| 1242 } | |
| 1243 else | |
| 1244 { | |
| 1245 /* | |
| 1246 * Set mod_top to the first line that needs displaying because of | |
| 1247 * changes. Set mod_bot to the first line after the changes. | |
| 1248 */ | |
| 1249 mod_top = wp->w_redraw_top; | |
| 1250 if (wp->w_redraw_bot != 0) | |
| 1251 mod_bot = wp->w_redraw_bot + 1; | |
| 1252 else | |
| 1253 mod_bot = 0; | |
| 1254 wp->w_redraw_top = 0; /* reset for next time */ | |
| 1255 wp->w_redraw_bot = 0; | |
| 1256 if (buf->b_mod_set) | |
| 1257 { | |
| 1258 if (mod_top == 0 || mod_top > buf->b_mod_top) | |
| 1259 { | |
| 1260 mod_top = buf->b_mod_top; | |
| 1261 #ifdef FEAT_SYN_HL | |
| 1262 /* Need to redraw lines above the change that may be included | |
| 1263 * in a pattern match. */ | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
1264 if (syntax_present(wp)) |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
1265 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
1266 mod_top -= buf->b_s.b_syn_sync_linebreaks; |
| 7 | 1267 if (mod_top < 1) |
| 1268 mod_top = 1; | |
| 1269 } | |
| 1270 #endif | |
| 1271 } | |
| 1272 if (mod_bot == 0 || mod_bot < buf->b_mod_bot) | |
| 1273 mod_bot = buf->b_mod_bot; | |
| 1274 | |
| 1275 #ifdef FEAT_SEARCH_EXTRA | |
| 1276 /* When 'hlsearch' is on and using a multi-line search pattern, a | |
| 1277 * change in one line may make the Search highlighting in a | |
| 1278 * previous line invalid. Simple solution: redraw all visible | |
| 1279 * lines above the change. | |
| 1326 | 1280 * Same for a match pattern. |
| 7 | 1281 */ |
| 699 | 1282 if (search_hl.rm.regprog != NULL |
| 1283 && re_multiline(search_hl.rm.regprog)) | |
| 7 | 1284 top_to_mod = TRUE; |
| 699 | 1285 else |
| 1326 | 1286 { |
| 1287 cur = wp->w_match_head; | |
| 1288 while (cur != NULL) | |
| 1289 { | |
| 1290 if (cur->match.regprog != NULL | |
| 1291 && re_multiline(cur->match.regprog)) | |
| 699 | 1292 { |
| 1293 top_to_mod = TRUE; | |
| 1294 break; | |
| 1295 } | |
| 1326 | 1296 cur = cur->next; |
| 1297 } | |
| 1298 } | |
| 7 | 1299 #endif |
| 1300 } | |
| 1301 #ifdef FEAT_FOLDING | |
| 1302 if (mod_top != 0 && hasAnyFolding(wp)) | |
| 1303 { | |
| 1304 linenr_T lnumt, lnumb; | |
| 1305 | |
| 1306 /* | |
| 1307 * A change in a line can cause lines above it to become folded or | |
| 1308 * unfolded. Find the top most buffer line that may be affected. | |
| 1309 * If the line was previously folded and displayed, get the first | |
| 1310 * line of that fold. If the line is folded now, get the first | |
| 1311 * folded line. Use the minimum of these two. | |
| 1312 */ | |
| 1313 | |
| 1314 /* Find last valid w_lines[] entry above mod_top. Set lnumt to | |
| 1315 * the line below it. If there is no valid entry, use w_topline. | |
| 1316 * Find the first valid w_lines[] entry below mod_bot. Set lnumb | |
| 1317 * to this line. If there is no valid entry, use MAXLNUM. */ | |
| 1318 lnumt = wp->w_topline; | |
| 1319 lnumb = MAXLNUM; | |
| 1320 for (i = 0; i < wp->w_lines_valid; ++i) | |
| 1321 if (wp->w_lines[i].wl_valid) | |
| 1322 { | |
| 1323 if (wp->w_lines[i].wl_lastlnum < mod_top) | |
| 1324 lnumt = wp->w_lines[i].wl_lastlnum + 1; | |
| 1325 if (lnumb == MAXLNUM && wp->w_lines[i].wl_lnum >= mod_bot) | |
| 1326 { | |
| 1327 lnumb = wp->w_lines[i].wl_lnum; | |
| 1328 /* When there is a fold column it might need updating | |
| 1329 * in the next line ("J" just above an open fold). */ | |
| 6553 | 1330 if (compute_foldcolumn(wp, 0) > 0) |
| 7 | 1331 ++lnumb; |
| 1332 } | |
| 1333 } | |
| 1334 | |
| 1335 (void)hasFoldingWin(wp, mod_top, &mod_top, NULL, TRUE, NULL); | |
| 1336 if (mod_top > lnumt) | |
| 1337 mod_top = lnumt; | |
| 1338 | |
| 1339 /* Now do the same for the bottom line (one above mod_bot). */ | |
| 1340 --mod_bot; | |
| 1341 (void)hasFoldingWin(wp, mod_bot, NULL, &mod_bot, TRUE, NULL); | |
| 1342 ++mod_bot; | |
| 1343 if (mod_bot < lnumb) | |
| 1344 mod_bot = lnumb; | |
| 1345 } | |
| 1346 #endif | |
| 1347 | |
| 1348 /* When a change starts above w_topline and the end is below | |
| 1349 * w_topline, start redrawing at w_topline. | |
| 36 | 1350 * If the end of the change is above w_topline: do like no change was |
| 1351 * made, but redraw the first line to find changes in syntax. */ | |
| 7 | 1352 if (mod_top != 0 && mod_top < wp->w_topline) |
| 1353 { | |
| 1354 if (mod_bot > wp->w_topline) | |
| 1355 mod_top = wp->w_topline; | |
| 1356 #ifdef FEAT_SYN_HL | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
1357 else if (syntax_present(wp)) |
| 7 | 1358 top_end = 1; |
| 1359 #endif | |
| 1360 } | |
| 36 | 1361 |
| 1362 /* When line numbers are displayed need to redraw all lines below | |
| 1363 * inserted/deleted lines. */ | |
| 1364 if (mod_top != 0 && buf->b_mod_xlines != 0 && wp->w_p_nu) | |
| 1365 mod_bot = MAXLNUM; | |
| 7 | 1366 } |
| 1367 | |
| 1368 /* | |
| 1369 * When only displaying the lines at the top, set top_end. Used when | |
| 1370 * window has scrolled down for msg_scrolled. | |
| 1371 */ | |
| 1372 if (type == REDRAW_TOP) | |
| 1373 { | |
| 1374 j = 0; | |
| 1375 for (i = 0; i < wp->w_lines_valid; ++i) | |
| 1376 { | |
| 1377 j += wp->w_lines[i].wl_size; | |
| 1378 if (j >= wp->w_upd_rows) | |
| 1379 { | |
| 1380 top_end = j; | |
| 1381 break; | |
| 1382 } | |
| 1383 } | |
| 1384 if (top_end == 0) | |
| 1385 /* not found (cannot happen?): redraw everything */ | |
| 1386 type = NOT_VALID; | |
| 1387 else | |
| 1388 /* top area defined, the rest is VALID */ | |
| 1389 type = VALID; | |
| 1390 } | |
| 1391 | |
| 1378 | 1392 /* Trick: we want to avoid clearing the screen twice. screenclear() will |
| 1331 | 1393 * set "screen_cleared" to TRUE. The special value MAYBE (which is still |
| 1394 * non-zero and thus not FALSE) will indicate that screenclear() was not | |
| 1395 * called. */ | |
| 1396 if (screen_cleared) | |
| 1397 screen_cleared = MAYBE; | |
| 1398 | |
| 7 | 1399 /* |
| 1400 * If there are no changes on the screen that require a complete redraw, | |
| 1401 * handle three cases: | |
| 1402 * 1: we are off the top of the screen by a few lines: scroll down | |
| 1403 * 2: wp->w_topline is below wp->w_lines[0].wl_lnum: may scroll up | |
| 1404 * 3: wp->w_topline is wp->w_lines[0].wl_lnum: find first entry in | |
| 1405 * w_lines[] that needs updating. | |
| 1406 */ | |
| 743 | 1407 if ((type == VALID || type == SOME_VALID |
| 1408 || type == INVERTED || type == INVERTED_ALL) | |
| 7 | 1409 #ifdef FEAT_DIFF |
| 1410 && !wp->w_botfill && !wp->w_old_botfill | |
| 1411 #endif | |
| 1412 ) | |
| 1413 { | |
| 1414 if (mod_top != 0 && wp->w_topline == mod_top) | |
| 1415 { | |
| 1416 /* | |
| 1417 * w_topline is the first changed line, the scrolling will be done | |
| 1418 * further down. | |
| 1419 */ | |
| 1420 } | |
| 1421 else if (wp->w_lines[0].wl_valid | |
| 1422 && (wp->w_topline < wp->w_lines[0].wl_lnum | |
| 1423 #ifdef FEAT_DIFF | |
| 1424 || (wp->w_topline == wp->w_lines[0].wl_lnum | |
| 1425 && wp->w_topfill > wp->w_old_topfill) | |
| 1426 #endif | |
| 1427 )) | |
| 1428 { | |
| 1429 /* | |
| 1430 * New topline is above old topline: May scroll down. | |
| 1431 */ | |
| 1432 #ifdef FEAT_FOLDING | |
| 1433 if (hasAnyFolding(wp)) | |
| 1434 { | |
| 1435 linenr_T ln; | |
| 1436 | |
| 1437 /* count the number of lines we are off, counting a sequence | |
| 1438 * of folded lines as one */ | |
| 1439 j = 0; | |
| 1440 for (ln = wp->w_topline; ln < wp->w_lines[0].wl_lnum; ++ln) | |
| 1441 { | |
| 1442 ++j; | |
| 1443 if (j >= wp->w_height - 2) | |
| 1444 break; | |
| 1445 (void)hasFoldingWin(wp, ln, NULL, &ln, TRUE, NULL); | |
| 1446 } | |
| 1447 } | |
| 1448 else | |
| 1449 #endif | |
| 1450 j = wp->w_lines[0].wl_lnum - wp->w_topline; | |
| 1451 if (j < wp->w_height - 2) /* not too far off */ | |
| 1452 { | |
| 1453 i = plines_m_win(wp, wp->w_topline, wp->w_lines[0].wl_lnum - 1); | |
| 1454 #ifdef FEAT_DIFF | |
| 1455 /* insert extra lines for previously invisible filler lines */ | |
| 1456 if (wp->w_lines[0].wl_lnum != wp->w_topline) | |
| 1457 i += diff_check_fill(wp, wp->w_lines[0].wl_lnum) | |
| 1458 - wp->w_old_topfill; | |
| 1459 #endif | |
| 1460 if (i < wp->w_height - 2) /* less than a screen off */ | |
| 1461 { | |
| 1462 /* | |
| 1463 * Try to insert the correct number of lines. | |
| 1464 * If not the last window, delete the lines at the bottom. | |
| 1465 * win_ins_lines may fail when the terminal can't do it. | |
| 1466 */ | |
| 1467 if (i > 0) | |
| 1468 check_for_delay(FALSE); | |
| 1469 if (win_ins_lines(wp, 0, i, FALSE, wp == firstwin) == OK) | |
| 1470 { | |
| 1471 if (wp->w_lines_valid != 0) | |
| 1472 { | |
| 1473 /* Need to update rows that are new, stop at the | |
| 1474 * first one that scrolled down. */ | |
| 1475 top_end = i; | |
| 1476 scrolled_down = TRUE; | |
| 1477 | |
| 1478 /* Move the entries that were scrolled, disable | |
| 1479 * the entries for the lines to be redrawn. */ | |
| 1480 if ((wp->w_lines_valid += j) > wp->w_height) | |
| 1481 wp->w_lines_valid = wp->w_height; | |
| 1482 for (idx = wp->w_lines_valid; idx - j >= 0; idx--) | |
| 1483 wp->w_lines[idx] = wp->w_lines[idx - j]; | |
| 1484 while (idx >= 0) | |
| 1485 wp->w_lines[idx--].wl_valid = FALSE; | |
| 1486 } | |
| 1487 } | |
| 1488 else | |
| 1489 mid_start = 0; /* redraw all lines */ | |
| 1490 } | |
| 1491 else | |
| 1492 mid_start = 0; /* redraw all lines */ | |
| 1493 } | |
| 1494 else | |
| 1495 mid_start = 0; /* redraw all lines */ | |
| 1496 } | |
| 1497 else | |
| 1498 { | |
| 1499 /* | |
| 1500 * New topline is at or below old topline: May scroll up. | |
| 1501 * When topline didn't change, find first entry in w_lines[] that | |
| 1502 * needs updating. | |
| 1503 */ | |
| 1504 | |
| 1505 /* try to find wp->w_topline in wp->w_lines[].wl_lnum */ | |
| 1506 j = -1; | |
| 1507 row = 0; | |
| 1508 for (i = 0; i < wp->w_lines_valid; i++) | |
| 1509 { | |
| 1510 if (wp->w_lines[i].wl_valid | |
| 1511 && wp->w_lines[i].wl_lnum == wp->w_topline) | |
| 1512 { | |
| 1513 j = i; | |
| 1514 break; | |
| 1515 } | |
| 1516 row += wp->w_lines[i].wl_size; | |
| 1517 } | |
| 1518 if (j == -1) | |
| 1519 { | |
| 1520 /* if wp->w_topline is not in wp->w_lines[].wl_lnum redraw all | |
| 1521 * lines */ | |
| 1522 mid_start = 0; | |
| 1523 } | |
| 1524 else | |
| 1525 { | |
| 1526 /* | |
| 1527 * Try to delete the correct number of lines. | |
| 1528 * wp->w_topline is at wp->w_lines[i].wl_lnum. | |
| 1529 */ | |
| 1530 #ifdef FEAT_DIFF | |
| 1531 /* If the topline didn't change, delete old filler lines, | |
| 1532 * otherwise delete filler lines of the new topline... */ | |
| 1533 if (wp->w_lines[0].wl_lnum == wp->w_topline) | |
| 1534 row += wp->w_old_topfill; | |
| 1535 else | |
| 1536 row += diff_check_fill(wp, wp->w_topline); | |
| 1537 /* ... but don't delete new filler lines. */ | |
| 1538 row -= wp->w_topfill; | |
| 1539 #endif | |
| 1540 if (row > 0) | |
| 1541 { | |
| 1542 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
|
1543 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
|
1544 == OK) |
| 7 | 1545 bot_start = wp->w_height - row; |
| 1546 else | |
| 1547 mid_start = 0; /* redraw all lines */ | |
| 1548 } | |
| 1549 if ((row == 0 || bot_start < 999) && wp->w_lines_valid != 0) | |
| 1550 { | |
| 1551 /* | |
| 1552 * Skip the lines (below the deleted lines) that are still | |
| 1553 * valid and don't need redrawing. Copy their info | |
| 1554 * upwards, to compensate for the deleted lines. Set | |
| 1555 * bot_start to the first row that needs redrawing. | |
| 1556 */ | |
| 1557 bot_start = 0; | |
| 1558 idx = 0; | |
| 1559 for (;;) | |
| 1560 { | |
| 1561 wp->w_lines[idx] = wp->w_lines[j]; | |
| 1562 /* stop at line that didn't fit, unless it is still | |
| 1563 * valid (no lines deleted) */ | |
| 1564 if (row > 0 && bot_start + row | |
| 1565 + (int)wp->w_lines[j].wl_size > wp->w_height) | |
| 1566 { | |
| 1567 wp->w_lines_valid = idx + 1; | |
| 1568 break; | |
| 1569 } | |
| 1570 bot_start += wp->w_lines[idx++].wl_size; | |
| 1571 | |
| 1572 /* stop at the last valid entry in w_lines[].wl_size */ | |
| 1573 if (++j >= wp->w_lines_valid) | |
| 1574 { | |
| 1575 wp->w_lines_valid = idx; | |
| 1576 break; | |
| 1577 } | |
| 1578 } | |
| 1579 #ifdef FEAT_DIFF | |
| 1580 /* Correct the first entry for filler lines at the top | |
| 1581 * when it won't get updated below. */ | |
| 1582 if (wp->w_p_diff && bot_start > 0) | |
| 1583 wp->w_lines[0].wl_size = | |
| 1584 plines_win_nofill(wp, wp->w_topline, TRUE) | |
| 1585 + wp->w_topfill; | |
| 1586 #endif | |
| 1587 } | |
| 1588 } | |
| 1589 } | |
| 1590 | |
| 1591 /* When starting redraw in the first line, redraw all lines. When | |
| 1592 * there is only one window it's probably faster to clear the screen | |
| 1593 * first. */ | |
| 1594 if (mid_start == 0) | |
| 1595 { | |
| 1596 mid_end = wp->w_height; | |
|
10349
cf988222b150
commit https://github.com/vim/vim/commit/a1f4cb93ba50ea9e40cd4b1f5592b8a6d1398660
Christian Brabandt <cb@256bit.org>
parents:
10307
diff
changeset
|
1597 if (ONE_WINDOW) |
| 981 | 1598 { |
| 1331 | 1599 /* Clear the screen when it was not done by win_del_lines() or |
| 1600 * win_ins_lines() above, "screen_cleared" is FALSE or MAYBE | |
| 1601 * then. */ | |
| 1602 if (screen_cleared != TRUE) | |
| 1603 screenclear(); | |
| 981 | 1604 #ifdef FEAT_WINDOWS |
| 1605 /* The screen was cleared, redraw the tab pages line. */ | |
| 1606 if (redraw_tabline) | |
| 1607 draw_tabline(); | |
| 1608 #endif | |
| 1609 } | |
| 7 | 1610 } |
| 1331 | 1611 |
| 1612 /* When win_del_lines() or win_ins_lines() caused the screen to be | |
| 1613 * cleared (only happens for the first window) or when screenclear() | |
| 1614 * was called directly above, "must_redraw" will have been set to | |
| 1615 * NOT_VALID, need to reset it here to avoid redrawing twice. */ | |
| 1616 if (screen_cleared == TRUE) | |
| 1617 must_redraw = 0; | |
| 7 | 1618 } |
| 1619 else | |
| 1620 { | |
| 1621 /* Not VALID or INVERTED: redraw all lines. */ | |
| 1622 mid_start = 0; | |
| 1623 mid_end = wp->w_height; | |
| 1624 } | |
| 1625 | |
| 743 | 1626 if (type == SOME_VALID) |
| 1627 { | |
| 1628 /* SOME_VALID: redraw all lines. */ | |
| 1629 mid_start = 0; | |
| 1630 mid_end = wp->w_height; | |
| 1631 type = NOT_VALID; | |
| 1632 } | |
| 1633 | |
| 7 | 1634 /* check if we are updating or removing the inverted part */ |
| 1635 if ((VIsual_active && buf == curwin->w_buffer) | |
| 1636 || (wp->w_old_cursor_lnum != 0 && type != NOT_VALID)) | |
| 1637 { | |
| 1638 linenr_T from, to; | |
| 1639 | |
| 1640 if (VIsual_active) | |
| 1641 { | |
| 1642 if (VIsual_active | |
| 1643 && (VIsual_mode != wp->w_old_visual_mode | |
| 1644 || type == INVERTED_ALL)) | |
| 1645 { | |
| 1646 /* | |
| 1647 * If the type of Visual selection changed, redraw the whole | |
| 1648 * selection. Also when the ownership of the X selection is | |
| 1649 * gained or lost. | |
| 1650 */ | |
| 1651 if (curwin->w_cursor.lnum < VIsual.lnum) | |
| 1652 { | |
| 1653 from = curwin->w_cursor.lnum; | |
| 1654 to = VIsual.lnum; | |
| 1655 } | |
| 1656 else | |
| 1657 { | |
| 1658 from = VIsual.lnum; | |
| 1659 to = curwin->w_cursor.lnum; | |
| 1660 } | |
| 1661 /* redraw more when the cursor moved as well */ | |
| 1662 if (wp->w_old_cursor_lnum < from) | |
| 1663 from = wp->w_old_cursor_lnum; | |
| 1664 if (wp->w_old_cursor_lnum > to) | |
| 1665 to = wp->w_old_cursor_lnum; | |
| 1666 if (wp->w_old_visual_lnum < from) | |
| 1667 from = wp->w_old_visual_lnum; | |
| 1668 if (wp->w_old_visual_lnum > to) | |
| 1669 to = wp->w_old_visual_lnum; | |
| 1670 } | |
| 1671 else | |
| 1672 { | |
| 1673 /* | |
| 1674 * Find the line numbers that need to be updated: The lines | |
| 1675 * between the old cursor position and the current cursor | |
| 1676 * position. Also check if the Visual position changed. | |
| 1677 */ | |
| 1678 if (curwin->w_cursor.lnum < wp->w_old_cursor_lnum) | |
| 1679 { | |
| 1680 from = curwin->w_cursor.lnum; | |
| 1681 to = wp->w_old_cursor_lnum; | |
| 1682 } | |
| 1683 else | |
| 1684 { | |
| 1685 from = wp->w_old_cursor_lnum; | |
| 1686 to = curwin->w_cursor.lnum; | |
| 1687 if (from == 0) /* Visual mode just started */ | |
| 1688 from = to; | |
| 1689 } | |
| 1690 | |
| 422 | 1691 if (VIsual.lnum != wp->w_old_visual_lnum |
| 1692 || VIsual.col != wp->w_old_visual_col) | |
| 7 | 1693 { |
| 1694 if (wp->w_old_visual_lnum < from | |
| 1695 && wp->w_old_visual_lnum != 0) | |
| 1696 from = wp->w_old_visual_lnum; | |
| 1697 if (wp->w_old_visual_lnum > to) | |
| 1698 to = wp->w_old_visual_lnum; | |
| 1699 if (VIsual.lnum < from) | |
| 1700 from = VIsual.lnum; | |
| 1701 if (VIsual.lnum > to) | |
| 1702 to = VIsual.lnum; | |
| 1703 } | |
| 1704 } | |
| 1705 | |
| 1706 /* | |
| 1707 * If in block mode and changed column or curwin->w_curswant: | |
| 1708 * update all lines. | |
| 1709 * First compute the actual start and end column. | |
| 1710 */ | |
| 1711 if (VIsual_mode == Ctrl_V) | |
| 1712 { | |
| 6266 | 1713 colnr_T fromc, toc; |
| 1714 #if defined(FEAT_VIRTUALEDIT) && defined(FEAT_LINEBREAK) | |
| 1715 int save_ve_flags = ve_flags; | |
| 1716 | |
| 1717 if (curwin->w_p_lbr) | |
| 1718 ve_flags = VE_ALL; | |
| 1719 #endif | |
| 7 | 1720 getvcols(wp, &VIsual, &curwin->w_cursor, &fromc, &toc); |
| 6266 | 1721 #if defined(FEAT_VIRTUALEDIT) && defined(FEAT_LINEBREAK) |
| 1722 ve_flags = save_ve_flags; | |
| 1723 #endif | |
| 7 | 1724 ++toc; |
| 1725 if (curwin->w_curswant == MAXCOL) | |
| 1726 toc = MAXCOL; | |
| 1727 | |
| 1728 if (fromc != wp->w_old_cursor_fcol | |
| 1729 || toc != wp->w_old_cursor_lcol) | |
| 1730 { | |
| 1731 if (from > VIsual.lnum) | |
| 1732 from = VIsual.lnum; | |
| 1733 if (to < VIsual.lnum) | |
| 1734 to = VIsual.lnum; | |
| 1735 } | |
| 1736 wp->w_old_cursor_fcol = fromc; | |
| 1737 wp->w_old_cursor_lcol = toc; | |
| 1738 } | |
| 1739 } | |
| 1740 else | |
| 1741 { | |
| 1742 /* Use the line numbers of the old Visual area. */ | |
| 1743 if (wp->w_old_cursor_lnum < wp->w_old_visual_lnum) | |
| 1744 { | |
| 1745 from = wp->w_old_cursor_lnum; | |
| 1746 to = wp->w_old_visual_lnum; | |
| 1747 } | |
| 1748 else | |
| 1749 { | |
| 1750 from = wp->w_old_visual_lnum; | |
| 1751 to = wp->w_old_cursor_lnum; | |
| 1752 } | |
| 1753 } | |
| 1754 | |
| 1755 /* | |
| 1756 * There is no need to update lines above the top of the window. | |
| 1757 */ | |
| 1758 if (from < wp->w_topline) | |
| 1759 from = wp->w_topline; | |
| 1760 | |
| 1761 /* | |
| 1762 * If we know the value of w_botline, use it to restrict the update to | |
| 1763 * the lines that are visible in the window. | |
| 1764 */ | |
| 1765 if (wp->w_valid & VALID_BOTLINE) | |
| 1766 { | |
| 1767 if (from >= wp->w_botline) | |
| 1768 from = wp->w_botline - 1; | |
| 1769 if (to >= wp->w_botline) | |
| 1770 to = wp->w_botline - 1; | |
| 1771 } | |
| 1772 | |
| 1773 /* | |
| 1774 * Find the minimal part to be updated. | |
| 1775 * Watch out for scrolling that made entries in w_lines[] invalid. | |
| 1776 * E.g., CTRL-U makes the first half of w_lines[] invalid and sets | |
| 1777 * top_end; need to redraw from top_end to the "to" line. | |
| 1778 * A middle mouse click with a Visual selection may change the text | |
| 1779 * above the Visual area and reset wl_valid, do count these for | |
| 1780 * mid_end (in srow). | |
| 1781 */ | |
| 1782 if (mid_start > 0) | |
| 1783 { | |
| 1784 lnum = wp->w_topline; | |
| 1785 idx = 0; | |
| 1786 srow = 0; | |
| 1787 if (scrolled_down) | |
| 1788 mid_start = top_end; | |
| 1789 else | |
| 1790 mid_start = 0; | |
| 1791 while (lnum < from && idx < wp->w_lines_valid) /* find start */ | |
| 1792 { | |
| 1793 if (wp->w_lines[idx].wl_valid) | |
| 1794 mid_start += wp->w_lines[idx].wl_size; | |
| 1795 else if (!scrolled_down) | |
| 1796 srow += wp->w_lines[idx].wl_size; | |
| 1797 ++idx; | |
| 1798 # ifdef FEAT_FOLDING | |
| 1799 if (idx < wp->w_lines_valid && wp->w_lines[idx].wl_valid) | |
| 1800 lnum = wp->w_lines[idx].wl_lnum; | |
| 1801 else | |
| 1802 # endif | |
| 1803 ++lnum; | |
| 1804 } | |
| 1805 srow += mid_start; | |
| 1806 mid_end = wp->w_height; | |
| 1807 for ( ; idx < wp->w_lines_valid; ++idx) /* find end */ | |
| 1808 { | |
| 1809 if (wp->w_lines[idx].wl_valid | |
| 1810 && wp->w_lines[idx].wl_lnum >= to + 1) | |
| 1811 { | |
| 1812 /* Only update until first row of this line */ | |
| 1813 mid_end = srow; | |
| 1814 break; | |
| 1815 } | |
| 1816 srow += wp->w_lines[idx].wl_size; | |
| 1817 } | |
| 1818 } | |
| 1819 } | |
| 1820 | |
| 1821 if (VIsual_active && buf == curwin->w_buffer) | |
| 1822 { | |
| 1823 wp->w_old_visual_mode = VIsual_mode; | |
| 1824 wp->w_old_cursor_lnum = curwin->w_cursor.lnum; | |
| 1825 wp->w_old_visual_lnum = VIsual.lnum; | |
| 422 | 1826 wp->w_old_visual_col = VIsual.col; |
| 7 | 1827 wp->w_old_curswant = curwin->w_curswant; |
| 1828 } | |
| 1829 else | |
| 1830 { | |
| 1831 wp->w_old_visual_mode = 0; | |
| 1832 wp->w_old_cursor_lnum = 0; | |
| 1833 wp->w_old_visual_lnum = 0; | |
| 422 | 1834 wp->w_old_visual_col = 0; |
| 7 | 1835 } |
| 1836 | |
| 1837 #if defined(FEAT_SYN_HL) || defined(FEAT_SEARCH_EXTRA) | |
| 1838 /* reset got_int, otherwise regexp won't work */ | |
| 1839 save_got_int = got_int; | |
| 1840 got_int = 0; | |
| 1841 #endif | |
|
11529
998d2cf59caa
patch 8.0.0647: syntax highlighting can make cause a freeze
Christian Brabandt <cb@256bit.org>
parents:
11521
diff
changeset
|
1842 #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
|
1843 /* 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
|
1844 profile_setlimit(p_rdt, &syntax_tm); |
|
998d2cf59caa
patch 8.0.0647: syntax highlighting can make cause a freeze
Christian Brabandt <cb@256bit.org>
parents:
11521
diff
changeset
|
1845 #endif |
| 7 | 1846 #ifdef FEAT_FOLDING |
| 1847 win_foldinfo.fi_level = 0; | |
| 1848 #endif | |
| 1849 | |
| 1850 /* | |
| 1851 * Update all the window rows. | |
| 1852 */ | |
| 1853 idx = 0; /* first entry in w_lines[].wl_size */ | |
| 1854 row = 0; | |
| 1855 srow = 0; | |
| 1856 lnum = wp->w_topline; /* first line shown in window */ | |
| 1857 for (;;) | |
| 1858 { | |
| 1859 /* stop updating when reached the end of the window (check for _past_ | |
| 1860 * the end of the window is at the end of the loop) */ | |
| 1861 if (row == wp->w_height) | |
| 1862 { | |
| 1863 didline = TRUE; | |
| 1864 break; | |
| 1865 } | |
| 1866 | |
| 1867 /* stop updating when hit the end of the file */ | |
| 1868 if (lnum > buf->b_ml.ml_line_count) | |
| 1869 { | |
| 1870 eof = TRUE; | |
| 1871 break; | |
| 1872 } | |
| 1873 | |
| 1874 /* Remember the starting row of the line that is going to be dealt | |
| 1875 * with. It is used further down when the line doesn't fit. */ | |
| 1876 srow = row; | |
| 1877 | |
| 1878 /* | |
| 1879 * Update a line when it is in an area that needs updating, when it | |
| 1880 * has changes or w_lines[idx] is invalid. | |
| 1881 * bot_start may be halfway a wrapped line after using | |
| 1882 * win_del_lines(), check if the current line includes it. | |
| 1883 * When syntax folding is being used, the saved syntax states will | |
| 1884 * already have been updated, we can't see where the syntax state is | |
| 1885 * the same again, just update until the end of the window. | |
| 1886 */ | |
| 1887 if (row < top_end | |
| 1888 || (row >= mid_start && row < mid_end) | |
| 1889 #ifdef FEAT_SEARCH_EXTRA | |
| 1890 || top_to_mod | |
| 1891 #endif | |
| 1892 || idx >= wp->w_lines_valid | |
| 1893 || (row + wp->w_lines[idx].wl_size > bot_start) | |
| 1894 || (mod_top != 0 | |
| 1895 && (lnum == mod_top | |
| 1896 || (lnum >= mod_top | |
| 1897 && (lnum < mod_bot | |
| 1898 #ifdef FEAT_SYN_HL | |
| 1899 || did_update == DID_FOLD | |
| 1900 || (did_update == DID_LINE | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
1901 && syntax_present(wp) |
| 7 | 1902 && ( |
| 1903 # ifdef FEAT_FOLDING | |
| 1904 (foldmethodIsSyntax(wp) | |
| 1905 && hasAnyFolding(wp)) || | |
| 1906 # endif | |
| 1907 syntax_check_changed(lnum))) | |
| 1908 #endif | |
|
4916
ba328b4a990e
updated for version 7.3.1203
Bram Moolenaar <bram@vim.org>
parents:
4805
diff
changeset
|
1909 #ifdef FEAT_SEARCH_EXTRA |
| 6018 | 1910 /* match in fixed position might need redraw |
| 1911 * if lines were inserted or deleted */ | |
| 1912 || (wp->w_match_head != NULL | |
| 1913 && buf->b_mod_xlines != 0) | |
|
4916
ba328b4a990e
updated for version 7.3.1203
Bram Moolenaar <bram@vim.org>
parents:
4805
diff
changeset
|
1914 #endif |
| 7 | 1915 ))))) |
| 1916 { | |
| 1917 #ifdef FEAT_SEARCH_EXTRA | |
| 1918 if (lnum == mod_top) | |
| 1919 top_to_mod = FALSE; | |
| 1920 #endif | |
| 1921 | |
| 1922 /* | |
| 1923 * When at start of changed lines: May scroll following lines | |
| 1924 * up or down to minimize redrawing. | |
| 1925 * Don't do this when the change continues until the end. | |
| 3318 | 1926 * Don't scroll when dollar_vcol >= 0, keep the "$". |
| 7 | 1927 */ |
| 1928 if (lnum == mod_top | |
| 1929 && mod_bot != MAXLNUM | |
| 3318 | 1930 && !(dollar_vcol >= 0 && mod_bot == mod_top + 1)) |
| 7 | 1931 { |
| 1932 int old_rows = 0; | |
| 1933 int new_rows = 0; | |
| 1934 int xtra_rows; | |
| 1935 linenr_T l; | |
| 1936 | |
| 1937 /* Count the old number of window rows, using w_lines[], which | |
| 1938 * should still contain the sizes for the lines as they are | |
| 1939 * currently displayed. */ | |
| 1940 for (i = idx; i < wp->w_lines_valid; ++i) | |
| 1941 { | |
| 1942 /* Only valid lines have a meaningful wl_lnum. Invalid | |
| 1943 * lines are part of the changed area. */ | |
| 1944 if (wp->w_lines[i].wl_valid | |
| 1945 && wp->w_lines[i].wl_lnum == mod_bot) | |
| 1946 break; | |
| 1947 old_rows += wp->w_lines[i].wl_size; | |
| 1948 #ifdef FEAT_FOLDING | |
| 1949 if (wp->w_lines[i].wl_valid | |
| 1950 && wp->w_lines[i].wl_lastlnum + 1 == mod_bot) | |
| 1951 { | |
| 1952 /* Must have found the last valid entry above mod_bot. | |
| 1953 * Add following invalid entries. */ | |
| 1954 ++i; | |
| 1955 while (i < wp->w_lines_valid | |
| 1956 && !wp->w_lines[i].wl_valid) | |
| 1957 old_rows += wp->w_lines[i++].wl_size; | |
| 1958 break; | |
| 1959 } | |
| 1960 #endif | |
| 1961 } | |
| 1962 | |
| 1963 if (i >= wp->w_lines_valid) | |
| 1964 { | |
| 1965 /* We can't find a valid line below the changed lines, | |
| 1966 * need to redraw until the end of the window. | |
| 1967 * Inserting/deleting lines has no use. */ | |
| 1968 bot_start = 0; | |
| 1969 } | |
| 1970 else | |
| 1971 { | |
| 1972 /* Able to count old number of rows: Count new window | |
| 1973 * rows, and may insert/delete lines */ | |
| 1974 j = idx; | |
| 1975 for (l = lnum; l < mod_bot; ++l) | |
| 1976 { | |
| 1977 #ifdef FEAT_FOLDING | |
| 1978 if (hasFoldingWin(wp, l, NULL, &l, TRUE, NULL)) | |
| 1979 ++new_rows; | |
| 1980 else | |
| 1981 #endif | |
| 1982 #ifdef FEAT_DIFF | |
| 1983 if (l == wp->w_topline) | |
| 1984 new_rows += plines_win_nofill(wp, l, TRUE) | |
| 1985 + wp->w_topfill; | |
| 1986 else | |
| 1987 #endif | |
| 1988 new_rows += plines_win(wp, l, TRUE); | |
| 1989 ++j; | |
| 1990 if (new_rows > wp->w_height - row - 2) | |
| 1991 { | |
| 1992 /* it's getting too much, must redraw the rest */ | |
| 1993 new_rows = 9999; | |
| 1994 break; | |
| 1995 } | |
| 1996 } | |
| 1997 xtra_rows = new_rows - old_rows; | |
| 1998 if (xtra_rows < 0) | |
| 1999 { | |
| 2000 /* May scroll text up. If there is not enough | |
| 2001 * remaining text or scrolling fails, must redraw the | |
| 2002 * rest. If scrolling works, must redraw the text | |
| 2003 * below the scrolled text. */ | |
| 2004 if (row - xtra_rows >= wp->w_height - 2) | |
| 2005 mod_bot = MAXLNUM; | |
| 2006 else | |
| 2007 { | |
| 2008 check_for_delay(FALSE); | |
| 2009 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
|
2010 -xtra_rows, FALSE, FALSE, 0) == FAIL) |
| 7 | 2011 mod_bot = MAXLNUM; |
| 2012 else | |
| 2013 bot_start = wp->w_height + xtra_rows; | |
| 2014 } | |
| 2015 } | |
| 2016 else if (xtra_rows > 0) | |
| 2017 { | |
| 2018 /* May scroll text down. If there is not enough | |
| 2019 * remaining text of scrolling fails, must redraw the | |
| 2020 * rest. */ | |
| 2021 if (row + xtra_rows >= wp->w_height - 2) | |
| 2022 mod_bot = MAXLNUM; | |
| 2023 else | |
| 2024 { | |
| 2025 check_for_delay(FALSE); | |
| 2026 if (win_ins_lines(wp, row + old_rows, | |
| 2027 xtra_rows, FALSE, FALSE) == FAIL) | |
| 2028 mod_bot = MAXLNUM; | |
| 2029 else if (top_end > row + old_rows) | |
| 2030 /* Scrolled the part at the top that requires | |
| 2031 * updating down. */ | |
| 2032 top_end += xtra_rows; | |
| 2033 } | |
| 2034 } | |
| 2035 | |
| 2036 /* When not updating the rest, may need to move w_lines[] | |
| 2037 * entries. */ | |
| 2038 if (mod_bot != MAXLNUM && i != j) | |
| 2039 { | |
| 2040 if (j < i) | |
| 2041 { | |
| 2042 int x = row + new_rows; | |
| 2043 | |
| 2044 /* move entries in w_lines[] upwards */ | |
| 2045 for (;;) | |
| 2046 { | |
| 2047 /* stop at last valid entry in w_lines[] */ | |
| 2048 if (i >= wp->w_lines_valid) | |
| 2049 { | |
| 2050 wp->w_lines_valid = j; | |
| 2051 break; | |
| 2052 } | |
| 2053 wp->w_lines[j] = wp->w_lines[i]; | |
| 2054 /* stop at a line that won't fit */ | |
| 2055 if (x + (int)wp->w_lines[j].wl_size | |
| 2056 > wp->w_height) | |
| 2057 { | |
| 2058 wp->w_lines_valid = j + 1; | |
| 2059 break; | |
| 2060 } | |
| 2061 x += wp->w_lines[j++].wl_size; | |
| 2062 ++i; | |
| 2063 } | |
| 2064 if (bot_start > x) | |
| 2065 bot_start = x; | |
| 2066 } | |
| 2067 else /* j > i */ | |
| 2068 { | |
| 2069 /* move entries in w_lines[] downwards */ | |
| 2070 j -= i; | |
| 2071 wp->w_lines_valid += j; | |
| 2072 if (wp->w_lines_valid > wp->w_height) | |
| 2073 wp->w_lines_valid = wp->w_height; | |
| 2074 for (i = wp->w_lines_valid; i - j >= idx; --i) | |
| 2075 wp->w_lines[i] = wp->w_lines[i - j]; | |
| 2076 | |
| 2077 /* The w_lines[] entries for inserted lines are | |
| 2078 * now invalid, but wl_size may be used above. | |
| 2079 * Reset to zero. */ | |
| 2080 while (i >= idx) | |
| 2081 { | |
| 2082 wp->w_lines[i].wl_size = 0; | |
| 2083 wp->w_lines[i--].wl_valid = FALSE; | |
| 2084 } | |
| 2085 } | |
| 2086 } | |
| 2087 } | |
| 2088 } | |
| 2089 | |
| 2090 #ifdef FEAT_FOLDING | |
| 2091 /* | |
| 2092 * When lines are folded, display one line for all of them. | |
| 2093 * Otherwise, display normally (can be several display lines when | |
| 2094 * 'wrap' is on). | |
| 2095 */ | |
| 2096 fold_count = foldedCount(wp, lnum, &win_foldinfo); | |
| 2097 if (fold_count != 0) | |
| 2098 { | |
| 2099 fold_line(wp, fold_count, &win_foldinfo, lnum, row); | |
| 2100 ++row; | |
| 2101 --fold_count; | |
| 2102 wp->w_lines[idx].wl_folded = TRUE; | |
| 2103 wp->w_lines[idx].wl_lastlnum = lnum + fold_count; | |
| 2104 # ifdef FEAT_SYN_HL | |
| 2105 did_update = DID_FOLD; | |
| 2106 # endif | |
| 2107 } | |
| 2108 else | |
| 2109 #endif | |
| 2110 if (idx < wp->w_lines_valid | |
| 2111 && wp->w_lines[idx].wl_valid | |
| 2112 && wp->w_lines[idx].wl_lnum == lnum | |
| 2113 && lnum > wp->w_topline | |
|
9665
b193bdb6ea25
commit https://github.com/vim/vim/commit/ad9c2a08f0509294269a2f11a59a438b944bdd5a
Christian Brabandt <cb@256bit.org>
parents:
9649
diff
changeset
|
2114 && !(dy_flags & (DY_LASTLINE | DY_TRUNCATE)) |
| 7 | 2115 && srow + wp->w_lines[idx].wl_size > wp->w_height |
| 2116 #ifdef FEAT_DIFF | |
| 2117 && diff_check_fill(wp, lnum) == 0 | |
| 2118 #endif | |
| 2119 ) | |
| 2120 { | |
| 2121 /* This line is not going to fit. Don't draw anything here, | |
| 2122 * will draw "@ " lines below. */ | |
| 2123 row = wp->w_height + 1; | |
| 2124 } | |
| 2125 else | |
| 2126 { | |
| 2127 #ifdef FEAT_SEARCH_EXTRA | |
| 2128 prepare_search_hl(wp, lnum); | |
| 2129 #endif | |
| 2130 #ifdef FEAT_SYN_HL | |
| 2131 /* Let the syntax stuff know we skipped a few lines. */ | |
| 2132 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
|
2133 && syntax_present(wp)) |
| 7 | 2134 syntax_end_parsing(syntax_last_parsed + 1); |
| 2135 #endif | |
| 2136 | |
| 2137 /* | |
| 2138 * Display one line. | |
| 2139 */ | |
|
11529
998d2cf59caa
patch 8.0.0647: syntax highlighting can make cause a freeze
Christian Brabandt <cb@256bit.org>
parents:
11521
diff
changeset
|
2140 row = win_line(wp, lnum, srow, wp->w_height, mod_top == 0, |
|
998d2cf59caa
patch 8.0.0647: syntax highlighting can make cause a freeze
Christian Brabandt <cb@256bit.org>
parents:
11521
diff
changeset
|
2141 #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
|
2142 &syntax_tm |
|
998d2cf59caa
patch 8.0.0647: syntax highlighting can make cause a freeze
Christian Brabandt <cb@256bit.org>
parents:
11521
diff
changeset
|
2143 #else |
|
998d2cf59caa
patch 8.0.0647: syntax highlighting can make cause a freeze
Christian Brabandt <cb@256bit.org>
parents:
11521
diff
changeset
|
2144 NULL |
|
998d2cf59caa
patch 8.0.0647: syntax highlighting can make cause a freeze
Christian Brabandt <cb@256bit.org>
parents:
11521
diff
changeset
|
2145 #endif |
|
998d2cf59caa
patch 8.0.0647: syntax highlighting can make cause a freeze
Christian Brabandt <cb@256bit.org>
parents:
11521
diff
changeset
|
2146 ); |
| 7 | 2147 |
| 2148 #ifdef FEAT_FOLDING | |
| 2149 wp->w_lines[idx].wl_folded = FALSE; | |
| 2150 wp->w_lines[idx].wl_lastlnum = lnum; | |
| 2151 #endif | |
| 2152 #ifdef FEAT_SYN_HL | |
| 2153 did_update = DID_LINE; | |
| 2154 syntax_last_parsed = lnum; | |
| 2155 #endif | |
| 2156 } | |
| 2157 | |
| 2158 wp->w_lines[idx].wl_lnum = lnum; | |
| 2159 wp->w_lines[idx].wl_valid = TRUE; | |
| 2160 if (row > wp->w_height) /* past end of screen */ | |
| 2161 { | |
| 2162 /* we may need the size of that too long line later on */ | |
| 3318 | 2163 if (dollar_vcol == -1) |
| 7 | 2164 wp->w_lines[idx].wl_size = plines_win(wp, lnum, TRUE); |
| 2165 ++idx; | |
| 2166 break; | |
| 2167 } | |
| 3318 | 2168 if (dollar_vcol == -1) |
| 7 | 2169 wp->w_lines[idx].wl_size = row - srow; |
| 2170 ++idx; | |
| 2171 #ifdef FEAT_FOLDING | |
| 2172 lnum += fold_count + 1; | |
| 2173 #else | |
| 2174 ++lnum; | |
| 2175 #endif | |
| 2176 } | |
| 2177 else | |
| 2178 { | |
| 2179 /* This line does not need updating, advance to the next one */ | |
| 2180 row += wp->w_lines[idx++].wl_size; | |
| 2181 if (row > wp->w_height) /* past end of screen */ | |
| 2182 break; | |
| 2183 #ifdef FEAT_FOLDING | |
| 2184 lnum = wp->w_lines[idx - 1].wl_lastlnum + 1; | |
| 2185 #else | |
| 2186 ++lnum; | |
| 2187 #endif | |
| 2188 #ifdef FEAT_SYN_HL | |
| 2189 did_update = DID_NONE; | |
| 2190 #endif | |
| 2191 } | |
| 2192 | |
| 2193 if (lnum > buf->b_ml.ml_line_count) | |
| 2194 { | |
| 2195 eof = TRUE; | |
| 2196 break; | |
| 2197 } | |
| 2198 } | |
| 2199 /* | |
| 2200 * End of loop over all window lines. | |
| 2201 */ | |
| 2202 | |
| 2203 | |
| 2204 if (idx > wp->w_lines_valid) | |
| 2205 wp->w_lines_valid = idx; | |
| 2206 | |
| 2207 #ifdef FEAT_SYN_HL | |
| 2208 /* | |
| 2209 * Let the syntax stuff know we stop parsing here. | |
| 2210 */ | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
2211 if (syntax_last_parsed != 0 && syntax_present(wp)) |
| 7 | 2212 syntax_end_parsing(syntax_last_parsed + 1); |
| 2213 #endif | |
| 2214 | |
| 2215 /* | |
| 2216 * If we didn't hit the end of the file, and we didn't finish the last | |
| 2217 * line we were working on, then the line didn't fit. | |
| 2218 */ | |
| 2219 wp->w_empty_rows = 0; | |
| 2220 #ifdef FEAT_DIFF | |
| 2221 wp->w_filler_rows = 0; | |
| 2222 #endif | |
| 2223 if (!eof && !didline) | |
| 2224 { | |
| 2225 if (lnum == wp->w_topline) | |
| 2226 { | |
| 2227 /* | |
| 2228 * Single line that does not fit! | |
| 2229 * Don't overwrite it, it can be edited. | |
| 2230 */ | |
| 2231 wp->w_botline = lnum + 1; | |
| 2232 } | |
| 2233 #ifdef FEAT_DIFF | |
| 2234 else if (diff_check_fill(wp, lnum) >= wp->w_height - srow) | |
| 2235 { | |
| 2236 /* Window ends in filler lines. */ | |
| 2237 wp->w_botline = lnum; | |
| 2238 wp->w_filler_rows = wp->w_height - srow; | |
| 2239 } | |
| 2240 #endif | |
|
9665
b193bdb6ea25
commit https://github.com/vim/vim/commit/ad9c2a08f0509294269a2f11a59a438b944bdd5a
Christian Brabandt <cb@256bit.org>
parents:
9649
diff
changeset
|
2241 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
|
2242 { |
|
b193bdb6ea25
commit https://github.com/vim/vim/commit/ad9c2a08f0509294269a2f11a59a438b944bdd5a
Christian Brabandt <cb@256bit.org>
parents:
9649
diff
changeset
|
2243 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
|
2244 |
|
b193bdb6ea25
commit https://github.com/vim/vim/commit/ad9c2a08f0509294269a2f11a59a438b944bdd5a
Christian Brabandt <cb@256bit.org>
parents:
9649
diff
changeset
|
2245 /* |
|
b193bdb6ea25
commit https://github.com/vim/vim/commit/ad9c2a08f0509294269a2f11a59a438b944bdd5a
Christian Brabandt <cb@256bit.org>
parents:
9649
diff
changeset
|
2246 * 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
|
2247 */ |
|
b193bdb6ea25
commit https://github.com/vim/vim/commit/ad9c2a08f0509294269a2f11a59a438b944bdd5a
Christian Brabandt <cb@256bit.org>
parents:
9649
diff
changeset
|
2248 screen_puts_len((char_u *)"@@", 2, scr_row, W_WINCOL(wp), |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
2249 HL_ATTR(HLF_AT)); |
|
9665
b193bdb6ea25
commit https://github.com/vim/vim/commit/ad9c2a08f0509294269a2f11a59a438b944bdd5a
Christian Brabandt <cb@256bit.org>
parents:
9649
diff
changeset
|
2250 screen_fill(scr_row, scr_row + 1, |
|
b193bdb6ea25
commit https://github.com/vim/vim/commit/ad9c2a08f0509294269a2f11a59a438b944bdd5a
Christian Brabandt <cb@256bit.org>
parents:
9649
diff
changeset
|
2251 (int)W_WINCOL(wp) + 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
|
2252 '@', ' ', HL_ATTR(HLF_AT)); |
|
9665
b193bdb6ea25
commit https://github.com/vim/vim/commit/ad9c2a08f0509294269a2f11a59a438b944bdd5a
Christian Brabandt <cb@256bit.org>
parents:
9649
diff
changeset
|
2253 set_empty_rows(wp, srow); |
|
b193bdb6ea25
commit https://github.com/vim/vim/commit/ad9c2a08f0509294269a2f11a59a438b944bdd5a
Christian Brabandt <cb@256bit.org>
parents:
9649
diff
changeset
|
2254 wp->w_botline = lnum; |
|
b193bdb6ea25
commit https://github.com/vim/vim/commit/ad9c2a08f0509294269a2f11a59a438b944bdd5a
Christian Brabandt <cb@256bit.org>
parents:
9649
diff
changeset
|
2255 } |
| 7 | 2256 else if (dy_flags & DY_LASTLINE) /* 'display' has "lastline" */ |
| 2257 { | |
| 2258 /* | |
| 2259 * Last line isn't finished: Display "@@@" at the end. | |
| 2260 */ | |
| 2261 screen_fill(W_WINROW(wp) + wp->w_height - 1, | |
| 2262 W_WINROW(wp) + wp->w_height, | |
| 2263 (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
|
2264 '@', '@', HL_ATTR(HLF_AT)); |
| 7 | 2265 set_empty_rows(wp, srow); |
| 2266 wp->w_botline = lnum; | |
| 2267 } | |
| 2268 else | |
| 2269 { | |
| 2270 win_draw_end(wp, '@', ' ', srow, wp->w_height, HLF_AT); | |
| 2271 wp->w_botline = lnum; | |
| 2272 } | |
| 2273 } | |
| 2274 else | |
| 2275 { | |
|
8643
24b43dd167eb
commit https://github.com/vim/vim/commit/44a2f923c00f1384c9ecde12fb5b4711bc20702e
Christian Brabandt <cb@256bit.org>
parents:
8627
diff
changeset
|
2276 #ifdef FEAT_WINDOWS |
| 7 | 2277 draw_vsep_win(wp, row); |
| 2278 #endif | |
| 2279 if (eof) /* we hit the end of the file */ | |
| 2280 { | |
| 2281 wp->w_botline = buf->b_ml.ml_line_count + 1; | |
| 2282 #ifdef FEAT_DIFF | |
| 2283 j = diff_check_fill(wp, wp->w_botline); | |
| 2284 if (j > 0 && !wp->w_botfill) | |
| 2285 { | |
| 2286 /* | |
| 2287 * Display filler lines at the end of the file | |
| 2288 */ | |
| 2289 if (char2cells(fill_diff) > 1) | |
| 2290 i = '-'; | |
| 2291 else | |
| 2292 i = fill_diff; | |
| 2293 if (row + j > wp->w_height) | |
| 2294 j = wp->w_height - row; | |
| 2295 win_draw_end(wp, i, i, row, row + (int)j, HLF_DED); | |
| 2296 row += j; | |
| 2297 } | |
| 2298 #endif | |
| 2299 } | |
| 3318 | 2300 else if (dollar_vcol == -1) |
| 7 | 2301 wp->w_botline = lnum; |
| 2302 | |
| 2303 /* make sure the rest of the screen is blank */ | |
| 2304 /* 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
|
2305 win_draw_end(wp, '~', ' ', row, wp->w_height, HLF_EOB); |
| 7 | 2306 } |
| 2307 | |
| 2308 /* Reset the type of redrawing required, the window has been updated. */ | |
| 2309 wp->w_redr_type = 0; | |
| 2310 #ifdef FEAT_DIFF | |
| 2311 wp->w_old_topfill = wp->w_topfill; | |
| 2312 wp->w_old_botfill = wp->w_botfill; | |
| 2313 #endif | |
| 2314 | |
| 3318 | 2315 if (dollar_vcol == -1) |
| 7 | 2316 { |
| 2317 /* | |
| 2318 * There is a trick with w_botline. If we invalidate it on each | |
| 2319 * change that might modify it, this will cause a lot of expensive | |
| 2320 * calls to plines() in update_topline() each time. Therefore the | |
| 2321 * value of w_botline is often approximated, and this value is used to | |
| 2322 * compute the value of w_topline. If the value of w_botline was | |
| 2323 * wrong, check that the value of w_topline is correct (cursor is on | |
| 2324 * the visible part of the text). If it's not, we need to redraw | |
| 2325 * again. Mostly this just means scrolling up a few lines, so it | |
| 2326 * doesn't look too bad. Only do this for the current window (where | |
| 2327 * changes are relevant). | |
| 2328 */ | |
| 2329 wp->w_valid |= VALID_BOTLINE; | |
| 2330 if (wp == curwin && wp->w_botline != old_botline && !recursive) | |
| 2331 { | |
| 2332 recursive = TRUE; | |
| 2333 curwin->w_valid &= ~VALID_TOPLINE; | |
| 2334 update_topline(); /* may invalidate w_botline again */ | |
| 2335 if (must_redraw != 0) | |
| 2336 { | |
| 2337 /* Don't update for changes in buffer again. */ | |
| 2338 i = curbuf->b_mod_set; | |
| 2339 curbuf->b_mod_set = FALSE; | |
| 2340 win_update(curwin); | |
| 2341 must_redraw = 0; | |
| 2342 curbuf->b_mod_set = i; | |
| 2343 } | |
| 2344 recursive = FALSE; | |
| 2345 } | |
| 2346 } | |
| 2347 | |
| 2348 #if defined(FEAT_SYN_HL) || defined(FEAT_SEARCH_EXTRA) | |
| 2349 /* restore got_int, unless CTRL-C was hit while redrawing */ | |
| 2350 if (!got_int) | |
| 2351 got_int = save_got_int; | |
| 2352 #endif | |
| 2353 } | |
| 2354 | |
| 2355 /* | |
| 2356 * Clear the rest of the window and mark the unused lines with "c1". use "c2" | |
| 2357 * as the filler character. | |
| 2358 */ | |
| 2359 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2360 win_draw_end( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2361 win_T *wp, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2362 int c1, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2363 int c2, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2364 int row, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2365 int endrow, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2366 hlf_T hl) |
| 7 | 2367 { |
| 2368 #if defined(FEAT_FOLDING) || defined(FEAT_SIGNS) || defined(FEAT_CMDWIN) | |
| 2369 int n = 0; | |
| 2370 # define FDC_OFF n | |
| 2371 #else | |
| 2372 # define FDC_OFF 0 | |
| 2373 #endif | |
| 6553 | 2374 #ifdef FEAT_FOLDING |
| 2375 int fdc = compute_foldcolumn(wp, 0); | |
| 2376 #endif | |
| 7 | 2377 |
| 2378 #ifdef FEAT_RIGHTLEFT | |
| 2379 if (wp->w_p_rl) | |
| 2380 { | |
| 2381 /* No check for cmdline window: should never be right-left. */ | |
| 2382 # ifdef FEAT_FOLDING | |
| 6553 | 2383 n = fdc; |
| 7 | 2384 |
| 2385 if (n > 0) | |
| 2386 { | |
| 2387 /* draw the fold column at the right */ | |
| 119 | 2388 if (n > W_WIDTH(wp)) |
| 2389 n = W_WIDTH(wp); | |
| 7 | 2390 screen_fill(W_WINROW(wp) + row, W_WINROW(wp) + endrow, |
| 2391 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
|
2392 ' ', ' ', HL_ATTR(HLF_FC)); |
| 7 | 2393 } |
| 2394 # endif | |
| 2395 # ifdef FEAT_SIGNS | |
|
9852
4eea48b76d03
commit https://github.com/vim/vim/commit/95ec9d6a6ab3117d60ff638670a803d43974ba51
Christian Brabandt <cb@256bit.org>
parents:
9848
diff
changeset
|
2396 if (signcolumn_on(wp)) |
| 7 | 2397 { |
| 2398 int nn = n + 2; | |
| 2399 | |
| 2400 /* draw the sign column left of the fold column */ | |
| 119 | 2401 if (nn > W_WIDTH(wp)) |
| 2402 nn = W_WIDTH(wp); | |
| 7 | 2403 screen_fill(W_WINROW(wp) + row, W_WINROW(wp) + endrow, |
| 2404 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
|
2405 ' ', ' ', HL_ATTR(HLF_SC)); |
| 7 | 2406 n = nn; |
| 2407 } | |
| 2408 # endif | |
| 2409 screen_fill(W_WINROW(wp) + row, W_WINROW(wp) + endrow, | |
| 2410 W_WINCOL(wp), 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
|
2411 c2, c2, HL_ATTR(hl)); |
| 7 | 2412 screen_fill(W_WINROW(wp) + row, W_WINROW(wp) + endrow, |
| 2413 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
|
2414 c1, c2, HL_ATTR(hl)); |
| 7 | 2415 } |
| 2416 else | |
| 2417 #endif | |
| 2418 { | |
| 2419 #ifdef FEAT_CMDWIN | |
| 2420 if (cmdwin_type != 0 && wp == curwin) | |
| 2421 { | |
| 2422 /* draw the cmdline character in the leftmost column */ | |
| 2423 n = 1; | |
| 2424 if (n > wp->w_width) | |
| 2425 n = wp->w_width; | |
| 2426 screen_fill(W_WINROW(wp) + row, W_WINROW(wp) + endrow, | |
| 2427 W_WINCOL(wp), (int)W_WINCOL(wp) + n, | |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
2428 cmdwin_type, ' ', HL_ATTR(HLF_AT)); |
| 7 | 2429 } |
| 2430 #endif | |
| 2431 #ifdef FEAT_FOLDING | |
| 6553 | 2432 if (fdc > 0) |
| 2433 { | |
| 2434 int nn = n + fdc; | |
| 7 | 2435 |
| 2436 /* draw the fold column at the left */ | |
| 2437 if (nn > W_WIDTH(wp)) | |
| 2438 nn = W_WIDTH(wp); | |
| 2439 screen_fill(W_WINROW(wp) + row, W_WINROW(wp) + endrow, | |
| 2440 W_WINCOL(wp) + n, (int)W_WINCOL(wp) + nn, | |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
2441 ' ', ' ', HL_ATTR(HLF_FC)); |
| 7 | 2442 n = nn; |
| 2443 } | |
| 2444 #endif | |
| 2445 #ifdef FEAT_SIGNS | |
|
9852
4eea48b76d03
commit https://github.com/vim/vim/commit/95ec9d6a6ab3117d60ff638670a803d43974ba51
Christian Brabandt <cb@256bit.org>
parents:
9848
diff
changeset
|
2446 if (signcolumn_on(wp)) |
| 7 | 2447 { |
| 2448 int nn = n + 2; | |
| 2449 | |
| 2450 /* draw the sign column after the fold column */ | |
| 2451 if (nn > W_WIDTH(wp)) | |
| 2452 nn = W_WIDTH(wp); | |
| 2453 screen_fill(W_WINROW(wp) + row, W_WINROW(wp) + endrow, | |
| 2454 W_WINCOL(wp) + n, (int)W_WINCOL(wp) + nn, | |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
2455 ' ', ' ', HL_ATTR(HLF_SC)); |
| 7 | 2456 n = nn; |
| 2457 } | |
| 2458 #endif | |
| 2459 screen_fill(W_WINROW(wp) + row, W_WINROW(wp) + endrow, | |
| 2460 W_WINCOL(wp) + 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
|
2461 c1, c2, HL_ATTR(hl)); |
| 7 | 2462 } |
| 2463 set_empty_rows(wp, row); | |
| 2464 } | |
| 2465 | |
|
2314
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
2466 #ifdef FEAT_SYN_HL |
|
7805
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7697
diff
changeset
|
2467 static int 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
|
2468 |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
2469 /* |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
2470 * 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
|
2471 */ |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
2472 static int |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2473 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
|
2474 { |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
2475 while (**color_cols >= 0 && vcol > **color_cols) |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
2476 ++*color_cols; |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
2477 return (**color_cols >= 0); |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
2478 } |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
2479 #endif |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
2480 |
| 7 | 2481 #ifdef FEAT_FOLDING |
| 2482 /* | |
| 6553 | 2483 * Compute the width of the foldcolumn. Based on 'foldcolumn' and how much |
| 2484 * space is available for window "wp", minus "col". | |
| 2485 */ | |
| 2486 static int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2487 compute_foldcolumn(win_T *wp, int col) |
| 6553 | 2488 { |
| 2489 int fdc = wp->w_p_fdc; | |
| 2490 int wmw = wp == curwin && p_wmw == 0 ? 1 : p_wmw; | |
| 2491 int wwidth = W_WIDTH(wp); | |
| 2492 | |
| 2493 if (fdc > wwidth - (col + wmw)) | |
| 2494 fdc = wwidth - (col + wmw); | |
| 2495 return fdc; | |
| 2496 } | |
| 2497 | |
| 2498 /* | |
| 7 | 2499 * Display one folded line. |
| 2500 */ | |
| 2501 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2502 fold_line( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2503 win_T *wp, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2504 long fold_count, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2505 foldinfo_T *foldinfo, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2506 linenr_T lnum, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2507 int row) |
| 7 | 2508 { |
|
9754
a990e7ed260b
commit https://github.com/vim/vim/commit/ee695f787ade7fd88fc5f5497553d95c0c3645b5
Christian Brabandt <cb@256bit.org>
parents:
9665
diff
changeset
|
2509 char_u buf[FOLD_TEXT_LEN]; |
| 7 | 2510 pos_T *top, *bot; |
| 2511 linenr_T lnume = lnum + fold_count - 1; | |
| 2512 int len; | |
| 29 | 2513 char_u *text; |
| 7 | 2514 int fdc; |
| 2515 int col; | |
| 2516 int txtcol; | |
| 2517 int off = (int)(current_ScreenLine - ScreenLines); | |
| 216 | 2518 int ri; |
| 7 | 2519 |
| 2520 /* Build the fold line: | |
| 2521 * 1. Add the cmdwin_type for the command-line window | |
| 2522 * 2. Add the 'foldcolumn' | |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
2523 * 3. Add the 'number' or 'relativenumber' column |
| 7 | 2524 * 4. Compose the text |
| 2525 * 5. Add the text | |
| 2526 * 6. set highlighting for the Visual area an other text | |
| 2527 */ | |
| 2528 col = 0; | |
| 2529 | |
| 2530 /* | |
| 2531 * 1. Add the cmdwin_type for the command-line window | |
| 2532 * Ignores 'rightleft', this window is never right-left. | |
| 2533 */ | |
| 2534 #ifdef FEAT_CMDWIN | |
| 2535 if (cmdwin_type != 0 && wp == curwin) | |
| 2536 { | |
| 2537 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
|
2538 ScreenAttrs[off] = HL_ATTR(HLF_AT); |
| 7 | 2539 #ifdef FEAT_MBYTE |
| 2540 if (enc_utf8) | |
| 2541 ScreenLinesUC[off] = 0; | |
| 2542 #endif | |
| 2543 ++col; | |
| 2544 } | |
| 2545 #endif | |
| 2546 | |
| 2547 /* | |
| 2548 * 2. Add the 'foldcolumn' | |
| 6553 | 2549 * Reduce the width when there is not enough space. |
| 7 | 2550 */ |
| 6553 | 2551 fdc = compute_foldcolumn(wp, col); |
| 7 | 2552 if (fdc > 0) |
| 2553 { | |
| 2554 fill_foldcolumn(buf, wp, TRUE, lnum); | |
| 2555 #ifdef FEAT_RIGHTLEFT | |
| 2556 if (wp->w_p_rl) | |
| 2557 { | |
| 2558 int i; | |
| 2559 | |
| 2560 copy_text_attr(off + W_WIDTH(wp) - 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
|
2561 HL_ATTR(HLF_FC)); |
| 7 | 2562 /* reverse the fold column */ |
| 2563 for (i = 0; i < fdc; ++i) | |
| 2564 ScreenLines[off + W_WIDTH(wp) - i - 1 - col] = buf[i]; | |
| 2565 } | |
| 2566 else | |
| 2567 #endif | |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
2568 copy_text_attr(off + col, buf, fdc, HL_ATTR(HLF_FC)); |
| 7 | 2569 col += fdc; |
| 2570 } | |
| 2571 | |
| 2572 #ifdef FEAT_RIGHTLEFT | |
| 216 | 2573 # define RL_MEMSET(p, v, l) if (wp->w_p_rl) \ |
| 2574 for (ri = 0; ri < l; ++ri) \ | |
| 2575 ScreenAttrs[off + (W_WIDTH(wp) - (p) - (l)) + ri] = v; \ | |
| 2576 else \ | |
| 2577 for (ri = 0; ri < l; ++ri) \ | |
| 2578 ScreenAttrs[off + (p) + ri] = v | |
| 7 | 2579 #else |
| 216 | 2580 # define RL_MEMSET(p, v, l) for (ri = 0; ri < l; ++ri) \ |
| 2581 ScreenAttrs[off + (p) + ri] = v | |
| 7 | 2582 #endif |
| 2583 | |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
2584 /* 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
|
2585 * text */ |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
2586 RL_MEMSET(col, HL_ATTR(HLF_FL), W_WIDTH(wp) - col); |
| 7 | 2587 |
| 2588 #ifdef FEAT_SIGNS | |
| 2589 /* 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
|
2590 if (signcolumn_on(wp)) |
| 7 | 2591 { |
| 2592 len = W_WIDTH(wp) - col; | |
| 2593 if (len > 0) | |
| 2594 { | |
| 2595 if (len > 2) | |
| 2596 len = 2; | |
| 2597 # ifdef FEAT_RIGHTLEFT | |
| 2598 if (wp->w_p_rl) | |
| 2599 /* the line number isn't reversed */ | |
| 2600 copy_text_attr(off + W_WIDTH(wp) - len - col, | |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
2601 (char_u *)" ", len, HL_ATTR(HLF_FL)); |
| 7 | 2602 else |
| 2603 # endif | |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
2604 copy_text_attr(off + col, (char_u *)" ", len, HL_ATTR(HLF_FL)); |
| 7 | 2605 col += len; |
| 2606 } | |
| 2607 } | |
| 2608 #endif | |
| 2609 | |
| 2610 /* | |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
2611 * 3. Add the 'number' or 'relativenumber' column |
| 7 | 2612 */ |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
2613 if (wp->w_p_nu || wp->w_p_rnu) |
| 7 | 2614 { |
| 2615 len = W_WIDTH(wp) - col; | |
| 2616 if (len > 0) | |
| 2617 { | |
| 13 | 2618 int w = number_width(wp); |
| 5905 | 2619 long num; |
| 2620 char *fmt = "%*ld "; | |
| 13 | 2621 |
| 2622 if (len > w + 1) | |
| 2623 len = w + 1; | |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
2624 |
|
4736
3f2319a953b3
updated for version 7.3.1115
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
2625 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
|
2626 /* 'number' + 'norelativenumber' */ |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
2627 num = (long)lnum; |
|
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
2628 else |
| 4065 | 2629 { |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
2630 /* 'relativenumber', don't use negative numbers */ |
| 2675 | 2631 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
|
2632 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
|
2633 { |
|
3f2319a953b3
updated for version 7.3.1115
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
2634 /* 'number' + 'relativenumber': cursor line shows absolute |
|
3f2319a953b3
updated for version 7.3.1115
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
2635 * line number */ |
| 4065 | 2636 num = lnum; |
| 2637 fmt = "%-*ld "; | |
| 2638 } | |
| 2639 } | |
| 2640 | |
| 2641 sprintf((char *)buf, fmt, w, num); | |
| 7 | 2642 #ifdef FEAT_RIGHTLEFT |
| 2643 if (wp->w_p_rl) | |
| 2644 /* the line number isn't reversed */ | |
| 2645 copy_text_attr(off + W_WIDTH(wp) - 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
|
2646 HL_ATTR(HLF_FL)); |
| 7 | 2647 else |
| 2648 #endif | |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
2649 copy_text_attr(off + col, buf, len, HL_ATTR(HLF_FL)); |
| 7 | 2650 col += len; |
| 2651 } | |
| 2652 } | |
| 2653 | |
| 2654 /* | |
| 2655 * 4. Compose the folded-line string with 'foldtext', if set. | |
| 2656 */ | |
| 29 | 2657 text = get_foldtext(wp, lnum, lnume, foldinfo, buf); |
| 7 | 2658 |
| 2659 txtcol = col; /* remember where text starts */ | |
| 2660 | |
| 2661 /* | |
| 2662 * 5. move the text to current_ScreenLine. Fill up with "fill_fold". | |
| 2663 * Right-left text is put in columns 0 - number-col, normal text is put | |
| 2664 * in columns number-col - window-width. | |
| 2665 */ | |
| 2666 #ifdef FEAT_MBYTE | |
| 2667 if (has_mbyte) | |
| 2668 { | |
| 2669 int cells; | |
| 714 | 2670 int u8c, u8cc[MAX_MCO]; |
| 2671 int i; | |
| 7 | 2672 int idx; |
| 2673 int c_len; | |
| 33 | 2674 char_u *p; |
| 7 | 2675 # ifdef FEAT_ARABIC |
| 2676 int prev_c = 0; /* previous Arabic character */ | |
| 2677 int prev_c1 = 0; /* first composing char for prev_c */ | |
| 2678 # endif | |
| 2679 | |
| 2680 # ifdef FEAT_RIGHTLEFT | |
| 2681 if (wp->w_p_rl) | |
| 2682 idx = off; | |
| 2683 else | |
| 2684 # endif | |
| 2685 idx = off + col; | |
| 2686 | |
| 2687 /* Store multibyte characters in ScreenLines[] et al. correctly. */ | |
| 2688 for (p = text; *p != NUL; ) | |
| 2689 { | |
| 2690 cells = (*mb_ptr2cells)(p); | |
| 474 | 2691 c_len = (*mb_ptr2len)(p); |
| 7 | 2692 if (col + cells > W_WIDTH(wp) |
| 2693 # ifdef FEAT_RIGHTLEFT | |
| 2694 - (wp->w_p_rl ? col : 0) | |
| 2695 # endif | |
| 2696 ) | |
| 2697 break; | |
| 2698 ScreenLines[idx] = *p; | |
| 2699 if (enc_utf8) | |
| 2700 { | |
| 714 | 2701 u8c = utfc_ptr2char(p, u8cc); |
| 2702 if (*p < 0x80 && u8cc[0] == 0) | |
| 7 | 2703 { |
| 2704 ScreenLinesUC[idx] = 0; | |
| 2705 #ifdef FEAT_ARABIC | |
| 2706 prev_c = u8c; | |
| 2707 #endif | |
| 2708 } | |
| 2709 else | |
| 2710 { | |
| 2711 #ifdef FEAT_ARABIC | |
| 2712 if (p_arshape && !p_tbidi && ARABIC_CHAR(u8c)) | |
| 2713 { | |
| 2714 /* Do Arabic shaping. */ | |
| 714 | 2715 int pc, pc1, nc; |
| 2716 int pcc[MAX_MCO]; | |
| 7 | 2717 int firstbyte = *p; |
| 2718 | |
| 2719 /* The idea of what is the previous and next | |
| 2720 * character depends on 'rightleft'. */ | |
| 2721 if (wp->w_p_rl) | |
| 2722 { | |
| 2723 pc = prev_c; | |
| 2724 pc1 = prev_c1; | |
| 2725 nc = utf_ptr2char(p + c_len); | |
| 714 | 2726 prev_c1 = u8cc[0]; |
| 7 | 2727 } |
| 2728 else | |
| 2729 { | |
| 714 | 2730 pc = utfc_ptr2char(p + c_len, pcc); |
| 7 | 2731 nc = prev_c; |
| 714 | 2732 pc1 = pcc[0]; |
| 7 | 2733 } |
| 2734 prev_c = u8c; | |
| 2735 | |
| 714 | 2736 u8c = arabic_shape(u8c, &firstbyte, &u8cc[0], |
| 7 | 2737 pc, pc1, nc); |
| 2738 ScreenLines[idx] = firstbyte; | |
| 2739 } | |
| 2740 else | |
| 2741 prev_c = u8c; | |
| 2742 #endif | |
| 2743 /* Non-BMP character: display as ? or fullwidth ?. */ | |
| 1401 | 2744 #ifdef UNICODE16 |
| 7 | 2745 if (u8c >= 0x10000) |
| 2746 ScreenLinesUC[idx] = (cells == 2) ? 0xff1f : (int)'?'; | |
| 2747 else | |
| 1401 | 2748 #endif |
| 7 | 2749 ScreenLinesUC[idx] = u8c; |
| 714 | 2750 for (i = 0; i < Screen_mco; ++i) |
| 2751 { | |
| 2752 ScreenLinesC[i][idx] = u8cc[i]; | |
| 2753 if (u8cc[i] == 0) | |
| 2754 break; | |
| 2755 } | |
| 7 | 2756 } |
| 2757 if (cells > 1) | |
| 2758 ScreenLines[idx + 1] = 0; | |
| 2759 } | |
|
2069
63613d8d7e4d
updated for version 7.2.354
Bram Moolenaar <bram@zimbu.org>
parents:
2055
diff
changeset
|
2760 else if (enc_dbcs == DBCS_JPNU && *p == 0x8e) |
|
63613d8d7e4d
updated for version 7.2.354
Bram Moolenaar <bram@zimbu.org>
parents:
2055
diff
changeset
|
2761 /* double-byte single width character */ |
|
63613d8d7e4d
updated for version 7.2.354
Bram Moolenaar <bram@zimbu.org>
parents:
2055
diff
changeset
|
2762 ScreenLines2[idx] = p[1]; |
|
63613d8d7e4d
updated for version 7.2.354
Bram Moolenaar <bram@zimbu.org>
parents:
2055
diff
changeset
|
2763 else if (cells > 1) |
|
63613d8d7e4d
updated for version 7.2.354
Bram Moolenaar <bram@zimbu.org>
parents:
2055
diff
changeset
|
2764 /* double-width character */ |
|
63613d8d7e4d
updated for version 7.2.354
Bram Moolenaar <bram@zimbu.org>
parents:
2055
diff
changeset
|
2765 ScreenLines[idx + 1] = p[1]; |
| 7 | 2766 col += cells; |
| 2767 idx += cells; | |
| 2768 p += c_len; | |
| 2769 } | |
| 2770 } | |
| 2771 else | |
| 2772 #endif | |
| 2773 { | |
| 2774 len = (int)STRLEN(text); | |
| 2775 if (len > W_WIDTH(wp) - col) | |
| 2776 len = W_WIDTH(wp) - col; | |
| 2777 if (len > 0) | |
| 2778 { | |
| 2779 #ifdef FEAT_RIGHTLEFT | |
| 2780 if (wp->w_p_rl) | |
| 2781 STRNCPY(current_ScreenLine, text, len); | |
| 2782 else | |
| 2783 #endif | |
| 2784 STRNCPY(current_ScreenLine + col, text, len); | |
| 2785 col += len; | |
| 2786 } | |
| 2787 } | |
| 2788 | |
| 2789 /* Fill the rest of the line with the fold filler */ | |
| 2790 #ifdef FEAT_RIGHTLEFT | |
| 2791 if (wp->w_p_rl) | |
| 2792 col -= txtcol; | |
| 2793 #endif | |
| 2794 while (col < W_WIDTH(wp) | |
| 2795 #ifdef FEAT_RIGHTLEFT | |
| 2796 - (wp->w_p_rl ? txtcol : 0) | |
| 2797 #endif | |
| 2798 ) | |
| 2799 { | |
| 2800 #ifdef FEAT_MBYTE | |
| 2801 if (enc_utf8) | |
| 2802 { | |
| 2803 if (fill_fold >= 0x80) | |
| 2804 { | |
| 2805 ScreenLinesUC[off + col] = fill_fold; | |
| 714 | 2806 ScreenLinesC[0][off + col] = 0; |
|
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
|
2807 ScreenLines[off + col] = 0x80; /* avoid storing zero */ |
| 7 | 2808 } |
| 2809 else | |
|
11277
f26a535d9464
patch 8.0.0524: folds messed up
Christian Brabandt <cb@256bit.org>
parents:
11269
diff
changeset
|
2810 { |
| 7 | 2811 ScreenLinesUC[off + col] = 0; |
|
11277
f26a535d9464
patch 8.0.0524: folds messed up
Christian Brabandt <cb@256bit.org>
parents:
11269
diff
changeset
|
2812 ScreenLines[off + col] = fill_fold; |
|
f26a535d9464
patch 8.0.0524: folds messed up
Christian Brabandt <cb@256bit.org>
parents:
11269
diff
changeset
|
2813 } |
|
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
|
2814 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
|
2815 } |
|
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
|
2816 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
|
2817 #endif |
|
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
|
2818 ScreenLines[off + col++] = fill_fold; |
| 7 | 2819 } |
| 2820 | |
| 2821 if (text != buf) | |
| 2822 vim_free(text); | |
| 2823 | |
| 2824 /* | |
| 2825 * 6. set highlighting for the Visual area an other text. | |
| 2826 * If all folded lines are in the Visual area, highlight the line. | |
| 2827 */ | |
| 2828 if (VIsual_active && wp->w_buffer == curwin->w_buffer) | |
| 2829 { | |
|
11121
778c10516955
patch 8.0.0448: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11105
diff
changeset
|
2830 if (LTOREQ_POS(curwin->w_cursor, VIsual)) |
| 7 | 2831 { |
| 2832 /* Visual is after curwin->w_cursor */ | |
| 2833 top = &curwin->w_cursor; | |
| 2834 bot = &VIsual; | |
| 2835 } | |
| 2836 else | |
| 2837 { | |
| 2838 /* Visual is before curwin->w_cursor */ | |
| 2839 top = &VIsual; | |
| 2840 bot = &curwin->w_cursor; | |
| 2841 } | |
| 2842 if (lnum >= top->lnum | |
| 2843 && lnume <= bot->lnum | |
| 2844 && (VIsual_mode != 'v' | |
| 2845 || ((lnum > top->lnum | |
| 2846 || (lnum == top->lnum | |
| 2847 && top->col == 0)) | |
| 2848 && (lnume < bot->lnum | |
| 2849 || (lnume == bot->lnum | |
| 2850 && (bot->col - (*p_sel == 'e')) | |
| 1883 | 2851 >= (colnr_T)STRLEN(ml_get_buf(wp->w_buffer, lnume, FALSE))))))) |
| 7 | 2852 { |
| 2853 if (VIsual_mode == Ctrl_V) | |
| 2854 { | |
| 2855 /* Visual block mode: highlight the chars part of the block */ | |
| 2856 if (wp->w_old_cursor_fcol + txtcol < (colnr_T)W_WIDTH(wp)) | |
| 2857 { | |
| 3040 | 2858 if (wp->w_old_cursor_lcol != MAXCOL |
| 2859 && wp->w_old_cursor_lcol + txtcol | |
| 2860 < (colnr_T)W_WIDTH(wp)) | |
| 7 | 2861 len = wp->w_old_cursor_lcol; |
| 2862 else | |
| 2863 len = W_WIDTH(wp) - txtcol; | |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
2864 RL_MEMSET(wp->w_old_cursor_fcol + txtcol, HL_ATTR(HLF_V), |
| 230 | 2865 len - (int)wp->w_old_cursor_fcol); |
| 7 | 2866 } |
| 2867 } | |
| 2868 else | |
| 216 | 2869 { |
| 7 | 2870 /* Set all attributes of the text */ |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
2871 RL_MEMSET(txtcol, HL_ATTR(HLF_V), W_WIDTH(wp) - txtcol); |
| 216 | 2872 } |
| 7 | 2873 } |
| 2874 } | |
| 2875 | |
| 743 | 2876 #ifdef FEAT_SYN_HL |
| 6685 | 2877 /* Show colorcolumn in the fold line, but let cursorcolumn override it. */ |
| 2878 if (wp->w_p_cc_cols) | |
| 2879 { | |
| 2880 int i = 0; | |
| 2881 int j = wp->w_p_cc_cols[i]; | |
| 2882 int old_txtcol = txtcol; | |
| 2883 | |
| 2884 while (j > -1) | |
| 2885 { | |
| 2886 txtcol += j; | |
| 2887 if (wp->w_p_wrap) | |
| 2888 txtcol -= wp->w_skipcol; | |
| 2889 else | |
| 2890 txtcol -= wp->w_leftcol; | |
| 2891 if (txtcol >= 0 && txtcol < W_WIDTH(wp)) | |
| 2892 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
|
2893 ScreenAttrs[off + txtcol], HL_ATTR(HLF_MC)); |
| 6685 | 2894 txtcol = old_txtcol; |
| 2895 j = wp->w_p_cc_cols[++i]; | |
| 2896 } | |
| 2897 } | |
| 2898 | |
| 743 | 2899 /* Show 'cursorcolumn' in the fold line. */ |
| 1725 | 2900 if (wp->w_p_cuc) |
| 2901 { | |
| 2902 txtcol += wp->w_virtcol; | |
| 2903 if (wp->w_p_wrap) | |
| 2904 txtcol -= wp->w_skipcol; | |
| 2905 else | |
| 2906 txtcol -= wp->w_leftcol; | |
| 2907 if (txtcol >= 0 && txtcol < W_WIDTH(wp)) | |
| 2908 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
|
2909 ScreenAttrs[off + txtcol], HL_ATTR(HLF_CUC)); |
| 1725 | 2910 } |
| 743 | 2911 #endif |
| 7 | 2912 |
|
11670
3b2afa2b77b3
patch 8.0.0718: output of job in terminal is not displayed
Christian Brabandt <cb@256bit.org>
parents:
11657
diff
changeset
|
2913 screen_line(row + W_WINROW(wp), W_WINCOL(wp), (int)W_WIDTH(wp), |
| 7 | 2914 (int)W_WIDTH(wp), FALSE); |
| 2915 | |
| 2916 /* | |
| 2917 * Update w_cline_height and w_cline_folded if the cursor line was | |
| 2918 * updated (saves a call to plines() later). | |
| 2919 */ | |
| 2920 if (wp == curwin | |
| 2921 && lnum <= curwin->w_cursor.lnum | |
| 2922 && lnume >= curwin->w_cursor.lnum) | |
| 2923 { | |
| 2924 curwin->w_cline_row = row; | |
| 2925 curwin->w_cline_height = 1; | |
| 2926 curwin->w_cline_folded = TRUE; | |
| 2927 curwin->w_valid |= (VALID_CHEIGHT|VALID_CROW); | |
| 2928 } | |
| 2929 } | |
| 2930 | |
| 2931 /* | |
| 2932 * Copy "buf[len]" to ScreenLines["off"] and set attributes to "attr". | |
| 2933 */ | |
| 2934 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2935 copy_text_attr( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2936 int off, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2937 char_u *buf, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2938 int len, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2939 int attr) |
| 7 | 2940 { |
| 216 | 2941 int i; |
| 2942 | |
| 7 | 2943 mch_memmove(ScreenLines + off, buf, (size_t)len); |
| 2944 # ifdef FEAT_MBYTE | |
| 2945 if (enc_utf8) | |
| 2946 vim_memset(ScreenLinesUC + off, 0, sizeof(u8char_T) * (size_t)len); | |
| 2947 # endif | |
| 216 | 2948 for (i = 0; i < len; ++i) |
| 2949 ScreenAttrs[off + i] = attr; | |
| 7 | 2950 } |
| 2951 | |
| 2952 /* | |
| 2953 * Fill the foldcolumn at "p" for window "wp". | |
| 548 | 2954 * Only to be called when 'foldcolumn' > 0. |
| 7 | 2955 */ |
| 2956 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2957 fill_foldcolumn( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2958 char_u *p, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2959 win_T *wp, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2960 int closed, /* TRUE of FALSE */ |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2961 linenr_T lnum) /* current line number */ |
| 7 | 2962 { |
| 2963 int i = 0; | |
| 2964 int level; | |
| 2965 int first_level; | |
| 519 | 2966 int empty; |
| 6553 | 2967 int fdc = compute_foldcolumn(wp, 0); |
| 7 | 2968 |
| 2969 /* Init to all spaces. */ | |
| 6929 | 2970 vim_memset(p, ' ', (size_t)fdc); |
| 7 | 2971 |
| 2972 level = win_foldinfo.fi_level; | |
| 2973 if (level > 0) | |
| 2974 { | |
| 519 | 2975 /* If there is only one column put more info in it. */ |
| 6553 | 2976 empty = (fdc == 1) ? 0 : 1; |
| 519 | 2977 |
| 7 | 2978 /* If the column is too narrow, we start at the lowest level that |
| 2979 * fits and use numbers to indicated the depth. */ | |
| 6553 | 2980 first_level = level - fdc - closed + 1 + empty; |
| 7 | 2981 if (first_level < 1) |
| 2982 first_level = 1; | |
| 2983 | |
| 6553 | 2984 for (i = 0; i + empty < fdc; ++i) |
| 7 | 2985 { |
| 2986 if (win_foldinfo.fi_lnum == lnum | |
| 2987 && first_level + i >= win_foldinfo.fi_low_level) | |
| 2988 p[i] = '-'; | |
| 2989 else if (first_level == 1) | |
| 2990 p[i] = '|'; | |
| 2991 else if (first_level + i <= 9) | |
| 2992 p[i] = '0' + first_level + i; | |
| 2993 else | |
| 2994 p[i] = '>'; | |
| 2995 if (first_level + i == level) | |
| 2996 break; | |
| 2997 } | |
| 2998 } | |
| 2999 if (closed) | |
| 6553 | 3000 p[i >= fdc ? i - 1 : i] = '+'; |
| 7 | 3001 } |
| 3002 #endif /* FEAT_FOLDING */ | |
| 3003 | |
| 3004 /* | |
| 3005 * Display line "lnum" of window 'wp' on the screen. | |
| 3006 * Start at row "startrow", stop when "endrow" is reached. | |
| 3007 * wp->w_virtcol needs to be valid. | |
| 3008 * | |
| 3009 * Return the number of last row the line occupies. | |
| 3010 */ | |
| 3011 static int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
3012 win_line( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
3013 win_T *wp, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
3014 linenr_T lnum, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
3015 int startrow, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
3016 int endrow, |
|
11529
998d2cf59caa
patch 8.0.0647: syntax highlighting can make cause a freeze
Christian Brabandt <cb@256bit.org>
parents:
11521
diff
changeset
|
3017 int nochange UNUSED, /* not updating for changed text */ |
|
12244
d0b039e2ed56
patch 8.0.1002: unnecessarily updating screen after timer callback
Christian Brabandt <cb@256bit.org>
parents:
12152
diff
changeset
|
3018 proftime_T *syntax_tm UNUSED) |
| 7 | 3019 { |
|
10801
e7b8be5ecacd
patch 8.0.0290: cursor positioning wrong if wide character wraps
Christian Brabandt <cb@256bit.org>
parents:
10793
diff
changeset
|
3020 int col = 0; /* visual column on screen */ |
| 7 | 3021 unsigned off; /* offset in ScreenLines/ScreenAttrs */ |
| 3022 int c = 0; /* init for GCC */ | |
| 3023 long vcol = 0; /* virtual column (for tabs) */ | |
| 6503 | 3024 #ifdef FEAT_LINEBREAK |
| 3025 long vcol_sbr = -1; /* virtual column after showbreak */ | |
| 3026 #endif | |
| 7 | 3027 long vcol_prev = -1; /* "vcol" of previous character */ |
| 3028 char_u *line; /* current line */ | |
| 3029 char_u *ptr; /* current position in "line" */ | |
| 3030 int row; /* row in the window, excl w_winrow */ | |
| 3031 int screen_row; /* row on the screen, incl w_winrow */ | |
| 3032 | |
| 3033 char_u extra[18]; /* "%ld" and 'fdc' must fit in here */ | |
| 3034 int n_extra = 0; /* number of extra chars */ | |
| 1340 | 3035 char_u *p_extra = NULL; /* string of extra chars, plus NUL */ |
| 6026 | 3036 char_u *p_extra_free = NULL; /* p_extra needs to be freed */ |
| 7 | 3037 int c_extra = NUL; /* extra chars, all the same */ |
| 3038 int extra_attr = 0; /* attributes when n_extra != 0 */ | |
| 3039 static char_u *at_end_str = (char_u *)""; /* used for p_extra when | |
| 3040 displaying lcs_eol at end-of-line */ | |
| 3041 int lcs_eol_one = lcs_eol; /* lcs_eol until it's been used */ | |
| 3042 int lcs_prec_todo = lcs_prec; /* lcs_prec until it's been used */ | |
| 3043 | |
| 3044 /* saved "extra" items for when draw_state becomes WL_LINE (again) */ | |
| 3045 int saved_n_extra = 0; | |
| 3046 char_u *saved_p_extra = NULL; | |
| 3047 int saved_c_extra = 0; | |
| 3048 int saved_char_attr = 0; | |
| 3049 | |
| 3050 int n_attr = 0; /* chars with special attr */ | |
| 3051 int saved_attr2 = 0; /* char_attr saved for n_attr */ | |
| 3052 int n_attr3 = 0; /* chars with overruling special attr */ | |
| 3053 int saved_attr3 = 0; /* char_attr saved for n_attr3 */ | |
| 3054 | |
| 3055 int n_skip = 0; /* nr of chars to skip for 'nowrap' */ | |
| 3056 | |
| 3057 int fromcol, tocol; /* start/end of inverting */ | |
| 3058 int fromcol_prev = -2; /* start of inverting after cursor */ | |
| 3059 int noinvcur = FALSE; /* don't invert the cursor */ | |
| 3060 pos_T *top, *bot; | |
| 1813 | 3061 int lnum_in_visual_area = FALSE; |
| 7 | 3062 pos_T pos; |
| 3063 long v; | |
| 3064 | |
| 3065 int char_attr = 0; /* attributes for next character */ | |
| 674 | 3066 int attr_pri = FALSE; /* char_attr has priority */ |
| 7 | 3067 int area_highlighting = FALSE; /* Visual or incsearch highlighting |
| 3068 in this line */ | |
| 3069 int attr = 0; /* attributes for area highlighting */ | |
| 3070 int area_attr = 0; /* attributes desired by highlighting */ | |
| 3071 int search_attr = 0; /* attributes desired by 'hlsearch' */ | |
| 3072 #ifdef FEAT_SYN_HL | |
| 743 | 3073 int vcol_save_attr = 0; /* saved attr for 'cursorcolumn' */ |
| 7 | 3074 int syntax_attr = 0; /* attributes desired by syntax */ |
| 3075 int has_syntax = FALSE; /* this buffer has syntax highl. */ | |
| 3076 int save_did_emsg; | |
| 1437 | 3077 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
|
3078 int draw_color_col = FALSE; /* highlight colorcolumn */ |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
3079 int *color_cols = NULL; /* pointer to according columns array */ |
| 743 | 3080 #endif |
| 3081 #ifdef FEAT_SPELL | |
| 221 | 3082 int has_spell = FALSE; /* this buffer has spell checking */ |
| 348 | 3083 # define SPWORDLEN 150 |
| 3084 char_u nextline[SPWORDLEN * 2];/* text with start of the next line */ | |
| 353 | 3085 int nextlinecol = 0; /* column where nextline[] starts */ |
| 3086 int nextline_idx = 0; /* index in nextline[] where next line | |
| 348 | 3087 starts */ |
| 221 | 3088 int spell_attr = 0; /* attributes desired by spelling */ |
| 3089 int word_end = 0; /* last byte with same spell_attr */ | |
| 378 | 3090 static linenr_T checked_lnum = 0; /* line number for "checked_col" */ |
| 3091 static int checked_col = 0; /* column in "checked_lnum" up to which | |
| 348 | 3092 * there are no spell errors */ |
| 386 | 3093 static int cap_col = -1; /* column to check for Cap word */ |
| 3094 static linenr_T capcol_lnum = 0; /* line number where "cap_col" used */ | |
| 348 | 3095 int cur_checked_col = 0; /* checked column for current line */ |
| 7 | 3096 #endif |
| 3097 int extra_check; /* has syntax or linebreak */ | |
| 3098 #ifdef FEAT_MBYTE | |
| 3099 int multi_attr = 0; /* attributes desired by multibyte */ | |
| 3100 int mb_l = 1; /* multi-byte byte length */ | |
| 3101 int mb_c = 0; /* decoded multi-byte character */ | |
| 3102 int mb_utf8 = FALSE; /* screen char is UTF-8 char */ | |
| 714 | 3103 int u8cc[MAX_MCO]; /* composing UTF-8 chars */ |
| 7 | 3104 #endif |
| 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 |
| 910 | 3117 #if defined(FEAT_SIGNS) || (defined(FEAT_QUICKFIX) && defined(FEAT_WINDOWS)) \ |
| 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; |
|
f080b225a2a4
patch 8.0.0798: no highlighting in a terminal window with a finished job
Christian Brabandt <cb@256bit.org>
parents:
11834
diff
changeset
|
3142 #endif |
| 7 | 3143 |
| 3144 /* draw_state: items that are drawn in sequence: */ | |
| 3145 #define WL_START 0 /* nothing done yet */ | |
| 3146 #ifdef FEAT_CMDWIN | |
| 3147 # define WL_CMDLINE WL_START + 1 /* cmdline window column */ | |
| 3148 #else | |
| 3149 # define WL_CMDLINE WL_START | |
| 3150 #endif | |
| 3151 #ifdef FEAT_FOLDING | |
| 3152 # define WL_FOLD WL_CMDLINE + 1 /* 'foldcolumn' */ | |
| 3153 #else | |
| 3154 # define WL_FOLD WL_CMDLINE | |
| 3155 #endif | |
| 3156 #ifdef FEAT_SIGNS | |
| 3157 # define WL_SIGN WL_FOLD + 1 /* column for signs */ | |
| 3158 #else | |
| 3159 # define WL_SIGN WL_FOLD /* column for signs */ | |
| 3160 #endif | |
| 3161 #define WL_NR WL_SIGN + 1 /* line number */ | |
| 5995 | 3162 #ifdef FEAT_LINEBREAK |
| 3163 # define WL_BRI WL_NR + 1 /* 'breakindent' */ | |
| 3164 #else | |
| 3165 # define WL_BRI WL_NR | |
| 3166 #endif | |
| 7 | 3167 #if defined(FEAT_LINEBREAK) || defined(FEAT_DIFF) |
| 5995 | 3168 # define WL_SBR WL_BRI + 1 /* 'showbreak' or 'diff' */ |
| 7 | 3169 #else |
| 5995 | 3170 # define WL_SBR WL_BRI |
| 7 | 3171 #endif |
| 3172 #define WL_LINE WL_SBR + 1 /* text in the line */ | |
| 3173 int draw_state = WL_START; /* what to draw next */ | |
| 574 | 3174 #if defined(FEAT_XIM) && defined(FEAT_GUI_GTK) |
| 7 | 3175 int feedback_col = 0; |
| 3176 int feedback_old_attr = -1; | |
| 3177 #endif | |
| 3178 | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
3179 #ifdef FEAT_CONCEAL |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
3180 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
|
3181 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
|
3182 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
|
3183 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
|
3184 int is_concealing = FALSE; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
3185 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
|
3186 wrapping */ |
|
2409
0ca06a92adfb
Add support for horizontal scroll wheel. (Bjorn Winckler)
Bram Moolenaar <bram@vim.org>
parents:
2400
diff
changeset
|
3187 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
|
3188 int did_wcol = FALSE; |
|
8907
5deb9e8f4292
commit https://github.com/vim/vim/commit/4d585022023b96f6507e8cae5ed8fc8d926f5140
Christian Brabandt <cb@256bit.org>
parents:
8872
diff
changeset
|
3189 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
|
3190 int has_match_conc = 0; /* match wants to conceal */ |
| 6520 | 3191 int old_boguscols = 0; |
|
2332
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
3192 # define VCOL_HLC (vcol - vcol_off) |
|
5174
42d592dbbec3
updated for version 7.4a.013
Bram Moolenaar <bram@vim.org>
parents:
5126
diff
changeset
|
3193 # define FIX_FOR_BOGUSCOLS \ |
|
42d592dbbec3
updated for version 7.4a.013
Bram Moolenaar <bram@vim.org>
parents:
5126
diff
changeset
|
3194 { \ |
|
42d592dbbec3
updated for version 7.4a.013
Bram Moolenaar <bram@vim.org>
parents:
5126
diff
changeset
|
3195 n_extra += vcol_off; \ |
|
42d592dbbec3
updated for version 7.4a.013
Bram Moolenaar <bram@vim.org>
parents:
5126
diff
changeset
|
3196 vcol -= vcol_off; \ |
|
42d592dbbec3
updated for version 7.4a.013
Bram Moolenaar <bram@vim.org>
parents:
5126
diff
changeset
|
3197 vcol_off = 0; \ |
|
42d592dbbec3
updated for version 7.4a.013
Bram Moolenaar <bram@vim.org>
parents:
5126
diff
changeset
|
3198 col -= boguscols; \ |
| 6520 | 3199 old_boguscols = boguscols; \ |
|
5174
42d592dbbec3
updated for version 7.4a.013
Bram Moolenaar <bram@vim.org>
parents:
5126
diff
changeset
|
3200 boguscols = 0; \ |
|
42d592dbbec3
updated for version 7.4a.013
Bram Moolenaar <bram@vim.org>
parents:
5126
diff
changeset
|
3201 } |
|
2332
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
3202 #else |
|
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
3203 # define VCOL_HLC (vcol) |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
3204 #endif |
| 7 | 3205 |
| 3206 if (startrow > endrow) /* past the end already! */ | |
| 3207 return startrow; | |
| 3208 | |
| 3209 row = startrow; | |
| 3210 screen_row = row + W_WINROW(wp); | |
| 3211 | |
| 3212 /* | |
| 3213 * To speed up the loop below, set extra_check when there is linebreak, | |
| 3214 * trailing white space and/or syntax processing to be done. | |
| 3215 */ | |
| 3216 #ifdef FEAT_LINEBREAK | |
| 3217 extra_check = wp->w_p_lbr; | |
| 3218 #else | |
| 3219 extra_check = 0; | |
| 3220 #endif | |
| 3221 #ifdef FEAT_SYN_HL | |
|
11529
998d2cf59caa
patch 8.0.0647: syntax highlighting can make cause a freeze
Christian Brabandt <cb@256bit.org>
parents:
11521
diff
changeset
|
3222 if (syntax_present(wp) && !wp->w_s->b_syn_error |
|
998d2cf59caa
patch 8.0.0647: syntax highlighting can make cause a freeze
Christian Brabandt <cb@256bit.org>
parents:
11521
diff
changeset
|
3223 # 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
|
3224 && !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
|
3225 # endif |
|
998d2cf59caa
patch 8.0.0647: syntax highlighting can make cause a freeze
Christian Brabandt <cb@256bit.org>
parents:
11521
diff
changeset
|
3226 ) |
| 7 | 3227 { |
| 3228 /* Prepare for syntax highlighting in this line. When there is an | |
| 3229 * error, stop syntax highlighting. */ | |
| 3230 save_did_emsg = did_emsg; | |
| 3231 did_emsg = FALSE; | |
|
11529
998d2cf59caa
patch 8.0.0647: syntax highlighting can make cause a freeze
Christian Brabandt <cb@256bit.org>
parents:
11521
diff
changeset
|
3232 syntax_start(wp, lnum, syntax_tm); |
| 7 | 3233 if (did_emsg) |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
3234 wp->w_s->b_syn_error = TRUE; |
| 7 | 3235 else |
| 3236 { | |
| 3237 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
|
3238 #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
|
3239 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
|
3240 #endif |
|
998d2cf59caa
patch 8.0.0647: syntax highlighting can make cause a freeze
Christian Brabandt <cb@256bit.org>
parents:
11521
diff
changeset
|
3241 { |
|
998d2cf59caa
patch 8.0.0647: syntax highlighting can make cause a freeze
Christian Brabandt <cb@256bit.org>
parents:
11521
diff
changeset
|
3242 has_syntax = TRUE; |
|
998d2cf59caa
patch 8.0.0647: syntax highlighting can make cause a freeze
Christian Brabandt <cb@256bit.org>
parents:
11521
diff
changeset
|
3243 extra_check = TRUE; |
|
998d2cf59caa
patch 8.0.0647: syntax highlighting can make cause a freeze
Christian Brabandt <cb@256bit.org>
parents:
11521
diff
changeset
|
3244 } |
| 7 | 3245 } |
| 3246 } | |
|
2314
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
3247 |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
3248 /* Check for columns to display for 'colorcolumn'. */ |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
3249 color_cols = wp->w_p_cc_cols; |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
3250 if (color_cols != NULL) |
|
2332
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
3251 draw_color_col = advance_color_col(VCOL_HLC, &color_cols); |
| 743 | 3252 #endif |
| 3253 | |
|
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
|
3254 #ifdef FEAT_TERMINAL |
|
11866
be40c8a9240d
patch 8.0.0813: cannot use a terminal window while the job is running
Christian Brabandt <cb@256bit.org>
parents:
11864
diff
changeset
|
3255 if (term_show_buffer(wp->w_buffer)) |
|
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
|
3256 { |
|
f080b225a2a4
patch 8.0.0798: no highlighting in a terminal window with a finished job
Christian Brabandt <cb@256bit.org>
parents:
11834
diff
changeset
|
3257 extra_check = TRUE; |
|
f080b225a2a4
patch 8.0.0798: no highlighting in a terminal window with a finished job
Christian Brabandt <cb@256bit.org>
parents:
11834
diff
changeset
|
3258 get_term_attr = TRUE; |
|
f080b225a2a4
patch 8.0.0798: no highlighting in a terminal window with a finished job
Christian Brabandt <cb@256bit.org>
parents:
11834
diff
changeset
|
3259 } |
|
f080b225a2a4
patch 8.0.0798: no highlighting in a terminal window with a finished job
Christian Brabandt <cb@256bit.org>
parents:
11834
diff
changeset
|
3260 #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
|
3261 |
| 743 | 3262 #ifdef FEAT_SPELL |
| 258 | 3263 if (wp->w_p_spell |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
3264 && *wp->w_s->b_p_spl != NUL |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
3265 && wp->w_s->b_langp.ga_len > 0 |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
3266 && *(char **)(wp->w_s->b_langp.ga_data) != NULL) |
| 221 | 3267 { |
| 3268 /* Prepare for spell checking. */ | |
| 3269 has_spell = TRUE; | |
| 3270 extra_check = TRUE; | |
| 348 | 3271 |
| 3272 /* Get the start of the next line, so that words that wrap to the next | |
| 3273 * line are found too: "et<line-break>al.". | |
| 3274 * Trick: skip a few chars for C/shell/Vim comments */ | |
| 3275 nextline[SPWORDLEN] = NUL; | |
| 3276 if (lnum < wp->w_buffer->b_ml.ml_line_count) | |
| 3277 { | |
| 3278 line = ml_get_buf(wp->w_buffer, lnum + 1, FALSE); | |
| 3279 spell_cat_line(nextline + SPWORDLEN, line, SPWORDLEN); | |
| 3280 } | |
| 3281 | |
| 3282 /* When a word wrapped from the previous line the start of the current | |
| 3283 * line is valid. */ | |
| 3284 if (lnum == checked_lnum) | |
| 3285 cur_checked_col = checked_col; | |
| 3286 checked_lnum = 0; | |
| 386 | 3287 |
| 3288 /* When there was a sentence end in the previous line may require a | |
| 3289 * word starting with capital in this line. In line 1 always check | |
| 3290 * the first word. */ | |
| 3291 if (lnum != capcol_lnum) | |
| 3292 cap_col = -1; | |
| 3293 if (lnum == 1) | |
| 3294 cap_col = 0; | |
| 3295 capcol_lnum = 0; | |
| 221 | 3296 } |
| 7 | 3297 #endif |
| 3298 | |
| 3299 /* | |
| 3300 * handle visual active in this window | |
| 3301 */ | |
| 3302 fromcol = -10; | |
| 3303 tocol = MAXCOL; | |
| 3304 if (VIsual_active && wp->w_buffer == curwin->w_buffer) | |
| 3305 { | |
| 3306 /* Visual is after curwin->w_cursor */ | |
|
11121
778c10516955
patch 8.0.0448: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11105
diff
changeset
|
3307 if (LTOREQ_POS(curwin->w_cursor, VIsual)) |
| 7 | 3308 { |
| 3309 top = &curwin->w_cursor; | |
| 3310 bot = &VIsual; | |
| 3311 } | |
| 3312 else /* Visual is before curwin->w_cursor */ | |
| 3313 { | |
| 3314 top = &VIsual; | |
| 3315 bot = &curwin->w_cursor; | |
| 3316 } | |
| 1813 | 3317 lnum_in_visual_area = (lnum >= top->lnum && lnum <= bot->lnum); |
| 7 | 3318 if (VIsual_mode == Ctrl_V) /* block mode */ |
| 3319 { | |
| 1813 | 3320 if (lnum_in_visual_area) |
| 7 | 3321 { |
| 3322 fromcol = wp->w_old_cursor_fcol; | |
| 3323 tocol = wp->w_old_cursor_lcol; | |
| 3324 } | |
| 3325 } | |
| 3326 else /* non-block mode */ | |
| 3327 { | |
| 3328 if (lnum > top->lnum && lnum <= bot->lnum) | |
| 3329 fromcol = 0; | |
| 3330 else if (lnum == top->lnum) | |
| 3331 { | |
| 3332 if (VIsual_mode == 'V') /* linewise */ | |
| 3333 fromcol = 0; | |
| 3334 else | |
| 3335 { | |
| 3336 getvvcol(wp, top, (colnr_T *)&fromcol, NULL, NULL); | |
| 3337 if (gchar_pos(top) == NUL) | |
| 3338 tocol = fromcol + 1; | |
| 3339 } | |
| 3340 } | |
| 3341 if (VIsual_mode != 'V' && lnum == bot->lnum) | |
| 3342 { | |
| 3343 if (*p_sel == 'e' && bot->col == 0 | |
| 3344 #ifdef FEAT_VIRTUALEDIT | |
| 3345 && bot->coladd == 0 | |
| 3346 #endif | |
| 3347 ) | |
| 3348 { | |
| 3349 fromcol = -10; | |
| 3350 tocol = MAXCOL; | |
| 3351 } | |
| 36 | 3352 else if (bot->col == MAXCOL) |
| 3353 tocol = MAXCOL; | |
| 7 | 3354 else |
| 3355 { | |
| 3356 pos = *bot; | |
| 3357 if (*p_sel == 'e') | |
| 3358 getvvcol(wp, &pos, (colnr_T *)&tocol, NULL, NULL); | |
| 3359 else | |
| 3360 { | |
| 3361 getvvcol(wp, &pos, NULL, NULL, (colnr_T *)&tocol); | |
| 3362 ++tocol; | |
| 3363 } | |
| 3364 } | |
| 3365 } | |
| 3366 } | |
| 3367 | |
| 3368 /* Check if the character under the cursor should not be inverted */ | |
| 3369 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
|
3370 #ifdef FEAT_GUI |
| 7 | 3371 && !gui.in_use |
|
8212
05b88224cea1
commit https://github.com/vim/vim/commit/48e330aff911be1c798c88a973af6437a8141fce
Christian Brabandt <cb@256bit.org>
parents:
7833
diff
changeset
|
3372 #endif |
| 7 | 3373 ) |
| 3374 noinvcur = TRUE; | |
| 3375 | |
| 3376 /* if inverting in this line set area_highlighting */ | |
| 3377 if (fromcol >= 0) | |
| 3378 { | |
| 3379 area_highlighting = TRUE; | |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
3380 attr = HL_ATTR(HLF_V); |
| 7 | 3381 #if defined(FEAT_CLIPBOARD) && defined(FEAT_X11) |
| 3674 | 3382 if ((clip_star.available && !clip_star.owned |
| 3383 && clip_isautosel_star()) | |
| 3384 || (clip_plus.available && !clip_plus.owned | |
| 3385 && clip_isautosel_plus())) | |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
3386 attr = HL_ATTR(HLF_VNC); |
| 7 | 3387 #endif |
| 3388 } | |
| 3389 } | |
| 3390 | |
| 3391 /* | |
| 674 | 3392 * handle 'incsearch' and ":s///c" highlighting |
| 7 | 3393 */ |
| 5735 | 3394 else if (highlight_match |
| 7 | 3395 && wp == curwin |
| 3396 && lnum >= curwin->w_cursor.lnum | |
| 3397 && lnum <= curwin->w_cursor.lnum + search_match_lines) | |
| 3398 { | |
| 3399 if (lnum == curwin->w_cursor.lnum) | |
| 3400 getvcol(curwin, &(curwin->w_cursor), | |
| 3401 (colnr_T *)&fromcol, NULL, NULL); | |
| 3402 else | |
| 3403 fromcol = 0; | |
| 3404 if (lnum == curwin->w_cursor.lnum + search_match_lines) | |
| 3405 { | |
| 3406 pos.lnum = lnum; | |
| 3407 pos.col = search_match_endcol; | |
| 3408 getvcol(curwin, &pos, (colnr_T *)&tocol, NULL, NULL); | |
| 3409 } | |
| 3410 else | |
| 3411 tocol = MAXCOL; | |
| 1850 | 3412 /* do at least one character; happens when past end of line */ |
| 3413 if (fromcol == tocol) | |
| 3414 tocol = fromcol + 1; | |
| 7 | 3415 area_highlighting = TRUE; |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
3416 attr = HL_ATTR(HLF_I); |
| 7 | 3417 } |
| 3418 | |
| 3419 #ifdef FEAT_DIFF | |
| 3420 filler_lines = diff_check(wp, lnum); | |
| 3421 if (filler_lines < 0) | |
| 3422 { | |
| 3423 if (filler_lines == -1) | |
| 3424 { | |
| 3425 if (diff_find_change(wp, lnum, &change_start, &change_end)) | |
| 3426 diff_hlf = HLF_ADD; /* added line */ | |
| 3427 else if (change_start == 0) | |
| 3428 diff_hlf = HLF_TXD; /* changed text */ | |
| 3429 else | |
| 3430 diff_hlf = HLF_CHD; /* changed line */ | |
| 3431 } | |
| 3432 else | |
| 3433 diff_hlf = HLF_ADD; /* added line */ | |
| 3434 filler_lines = 0; | |
| 3435 area_highlighting = TRUE; | |
| 3436 } | |
| 3437 if (lnum == wp->w_topline) | |
| 3438 filler_lines = wp->w_topfill; | |
| 3439 filler_todo = filler_lines; | |
| 3440 #endif | |
| 3441 | |
| 3442 #ifdef LINE_ATTR | |
| 3443 # ifdef FEAT_SIGNS | |
| 3444 /* If this line has a sign with line highlighting set line_attr. */ | |
| 3445 v = buf_getsigntype(wp->w_buffer, lnum, SIGN_LINEHL); | |
| 3446 if (v != 0) | |
| 3447 line_attr = sign_get_attr((int)v, TRUE); | |
| 3448 # endif | |
| 3449 # if defined(FEAT_QUICKFIX) && defined(FEAT_WINDOWS) | |
| 3450 /* Highlight the current line in the quickfix window. */ | |
| 644 | 3451 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
|
3452 line_attr = HL_ATTR(HLF_QFL); |
| 7 | 3453 # endif |
| 3454 if (line_attr != 0) | |
| 3455 area_highlighting = TRUE; | |
| 3456 #endif | |
| 3457 | |
| 3458 line = ml_get_buf(wp->w_buffer, lnum, FALSE); | |
| 3459 ptr = line; | |
| 3460 | |
| 743 | 3461 #ifdef FEAT_SPELL |
| 348 | 3462 if (has_spell) |
| 3463 { | |
| 386 | 3464 /* For checking first word with a capital skip white space. */ |
| 3465 if (cap_col == 0) | |
| 835 | 3466 cap_col = (int)(skipwhite(line) - line); |
| 386 | 3467 |
| 348 | 3468 /* To be able to spell-check over line boundaries copy the end of the |
| 3469 * current line into nextline[]. Above the start of the next line was | |
| 3470 * copied to nextline[SPWORDLEN]. */ | |
| 3471 if (nextline[SPWORDLEN] == NUL) | |
| 3472 { | |
| 3473 /* No next line or it is empty. */ | |
| 3474 nextlinecol = MAXCOL; | |
| 3475 nextline_idx = 0; | |
| 3476 } | |
| 3477 else | |
| 3478 { | |
| 835 | 3479 v = (long)STRLEN(line); |
| 348 | 3480 if (v < SPWORDLEN) |
| 3481 { | |
| 3482 /* Short line, use it completely and append the start of the | |
| 3483 * next line. */ | |
| 3484 nextlinecol = 0; | |
| 3485 mch_memmove(nextline, line, (size_t)v); | |
| 1621 | 3486 STRMOVE(nextline + v, nextline + SPWORDLEN); |
| 348 | 3487 nextline_idx = v + 1; |
| 3488 } | |
| 3489 else | |
| 3490 { | |
| 3491 /* Long line, use only the last SPWORDLEN bytes. */ | |
| 3492 nextlinecol = v - SPWORDLEN; | |
| 3493 mch_memmove(nextline, line + nextlinecol, SPWORDLEN); | |
| 3494 nextline_idx = SPWORDLEN + 1; | |
| 3495 } | |
| 3496 } | |
| 3497 } | |
| 3498 #endif | |
| 3499 | |
|
7344
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
3500 if (wp->w_p_list) |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
3501 { |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
3502 if (lcs_space || lcs_trail) |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
3503 extra_check = TRUE; |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
3504 /* find start of trailing whitespace */ |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
3505 if (lcs_trail) |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
3506 { |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
3507 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
|
3508 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
|
3509 --trailcol; |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
3510 trailcol += (colnr_T) (ptr - line); |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
3511 } |
| 7 | 3512 } |
| 3513 | |
| 3514 /* | |
| 3515 * 'nowrap' or 'wrap' and a single line that doesn't fit: Advance to the | |
| 3516 * first character to be displayed. | |
| 3517 */ | |
| 3518 if (wp->w_p_wrap) | |
| 3519 v = wp->w_skipcol; | |
| 3520 else | |
| 3521 v = wp->w_leftcol; | |
| 3522 if (v > 0) | |
| 3523 { | |
| 3524 #ifdef FEAT_MBYTE | |
| 3525 char_u *prev_ptr = ptr; | |
| 3526 #endif | |
| 3527 while (vcol < v && *ptr != NUL) | |
| 3528 { | |
| 5995 | 3529 c = win_lbr_chartabsize(wp, line, ptr, (colnr_T)vcol, NULL); |
| 7 | 3530 vcol += c; |
| 3531 #ifdef FEAT_MBYTE | |
| 3532 prev_ptr = ptr; | |
| 39 | 3533 #endif |
|
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 #ifdef FEAT_MBYTE | |
| 3562 ptr = prev_ptr; | |
| 3563 #else | |
| 3564 --ptr; | |
| 3565 #endif | |
|
11010
c004e17fa36b
patch 8.0.0394: tabs are not aligned when scrolling horizontally
Christian Brabandt <cb@256bit.org>
parents:
10988
diff
changeset
|
3566 /* 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
|
3567 * Except for a TAB. */ |
|
c004e17fa36b
patch 8.0.0394: tabs are not aligned when scrolling horizontally
Christian Brabandt <cb@256bit.org>
parents:
10988
diff
changeset
|
3568 if (( |
|
c004e17fa36b
patch 8.0.0394: tabs are not aligned when scrolling horizontally
Christian Brabandt <cb@256bit.org>
parents:
10988
diff
changeset
|
3569 #ifdef FEAT_MBYTE |
|
c004e17fa36b
patch 8.0.0394: tabs are not aligned when scrolling horizontally
Christian Brabandt <cb@256bit.org>
parents:
10988
diff
changeset
|
3570 (*mb_ptr2cells)(ptr) >= c || |
|
c004e17fa36b
patch 8.0.0394: tabs are not aligned when scrolling horizontally
Christian Brabandt <cb@256bit.org>
parents:
10988
diff
changeset
|
3571 #endif |
|
c004e17fa36b
patch 8.0.0394: tabs are not aligned when scrolling horizontally
Christian Brabandt <cb@256bit.org>
parents:
10988
diff
changeset
|
3572 *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
|
3573 n_skip = v - vcol; |
| 7 | 3574 } |
| 3575 | |
| 3576 /* | |
| 3577 * Adjust for when the inverted text is before the screen, | |
| 3578 * and when the start of the inverted text is before the screen. | |
| 3579 */ | |
| 3580 if (tocol <= vcol) | |
| 3581 fromcol = 0; | |
| 3582 else if (fromcol >= 0 && fromcol < vcol) | |
| 3583 fromcol = vcol; | |
| 3584 | |
| 3585 #ifdef FEAT_LINEBREAK | |
| 3586 /* When w_skipcol is non-zero, first line needs 'showbreak' */ | |
| 3587 if (wp->w_p_wrap) | |
| 3588 need_showbreak = TRUE; | |
| 3589 #endif | |
| 743 | 3590 #ifdef FEAT_SPELL |
| 499 | 3591 /* When spell checking a word we need to figure out the start of the |
| 3592 * word and if it's badly spelled or not. */ | |
| 3593 if (has_spell) | |
| 3594 { | |
| 3595 int len; | |
| 1536 | 3596 colnr_T linecol = (colnr_T)(ptr - line); |
| 534 | 3597 hlf_T spell_hlf = HLF_COUNT; |
| 499 | 3598 |
| 3599 pos = wp->w_cursor; | |
| 3600 wp->w_cursor.lnum = lnum; | |
| 1536 | 3601 wp->w_cursor.col = linecol; |
| 534 | 3602 len = spell_move_to(wp, FORWARD, TRUE, TRUE, &spell_hlf); |
| 1536 | 3603 |
| 3604 /* spell_move_to() may call ml_get() and make "line" invalid */ | |
| 3605 line = ml_get_buf(wp->w_buffer, lnum, FALSE); | |
| 3606 ptr = line + linecol; | |
| 3607 | |
| 530 | 3608 if (len == 0 || (int)wp->w_cursor.col > ptr - line) |
| 499 | 3609 { |
| 3610 /* no bad word found at line start, don't check until end of a | |
| 3611 * word */ | |
| 534 | 3612 spell_hlf = HLF_COUNT; |
| 3572 | 3613 word_end = (int)(spell_to_word_end(ptr, wp) - line + 1); |
| 499 | 3614 } |
| 3615 else | |
| 534 | 3616 { |
| 499 | 3617 /* bad word found, use attributes until end of word */ |
| 3618 word_end = wp->w_cursor.col + len + 1; | |
| 3619 | |
| 534 | 3620 /* Turn index into actual attributes. */ |
| 3621 if (spell_hlf != HLF_COUNT) | |
| 3622 spell_attr = highlight_attr[spell_hlf]; | |
| 3623 } | |
| 499 | 3624 wp->w_cursor = pos; |
| 501 | 3625 |
| 743 | 3626 # ifdef FEAT_SYN_HL |
| 501 | 3627 /* Need to restart syntax highlighting for this line. */ |
| 3628 if (has_syntax) | |
|
11529
998d2cf59caa
patch 8.0.0647: syntax highlighting can make cause a freeze
Christian Brabandt <cb@256bit.org>
parents:
11521
diff
changeset
|
3629 syntax_start(wp, lnum, syntax_tm); |
| 743 | 3630 # endif |
| 499 | 3631 } |
| 3632 #endif | |
| 7 | 3633 } |
| 3634 | |
| 3635 /* | |
| 3636 * Correct highlighting for cursor that can't be disabled. | |
| 3637 * Avoids having to check this for each character. | |
| 3638 */ | |
| 3639 if (fromcol >= 0) | |
| 3640 { | |
| 3641 if (noinvcur) | |
| 3642 { | |
| 3643 if ((colnr_T)fromcol == wp->w_virtcol) | |
| 3644 { | |
| 3645 /* highlighting starts at cursor, let it start just after the | |
| 3646 * cursor */ | |
| 3647 fromcol_prev = fromcol; | |
| 3648 fromcol = -1; | |
| 3649 } | |
| 3650 else if ((colnr_T)fromcol < wp->w_virtcol) | |
| 3651 /* restart highlighting after the cursor */ | |
| 3652 fromcol_prev = wp->w_virtcol; | |
| 3653 } | |
| 3654 if (fromcol >= tocol) | |
| 3655 fromcol = -1; | |
| 3656 } | |
| 3657 | |
| 3658 #ifdef FEAT_SEARCH_EXTRA | |
| 3659 /* | |
| 1326 | 3660 * Handle highlighting the last used search pattern and matches. |
| 3661 * Do this for both search_hl and the match list. | |
| 7 | 3662 */ |
| 1326 | 3663 cur = wp->w_match_head; |
| 3664 shl_flag = FALSE; | |
| 3665 while (cur != NULL || shl_flag == FALSE) | |
| 3666 { | |
| 3667 if (shl_flag == FALSE) | |
| 3668 { | |
| 3669 shl = &search_hl; | |
| 3670 shl_flag = TRUE; | |
| 3671 } | |
| 3672 else | |
| 3673 shl = &cur->hl; | |
| 36 | 3674 shl->startcol = MAXCOL; |
| 3675 shl->endcol = MAXCOL; | |
| 7 | 3676 shl->attr_cur = 0; |
|
9885
4e8b05fa12c6
commit https://github.com/vim/vim/commit/4f416e41243ca151b95d39d81ce23d00b1484755
Christian Brabandt <cb@256bit.org>
parents:
9877
diff
changeset
|
3677 shl->is_addpos = FALSE; |
| 5979 | 3678 v = (long)(ptr - line); |
| 3679 if (cur != NULL) | |
| 3680 cur->pos.cur = 0; | |
|
9992
3e3b0ce24b61
commit https://github.com/vim/vim/commit/e17bdffff78ebd6a4e3cff26754cc667557ea810
Christian Brabandt <cb@256bit.org>
parents:
9939
diff
changeset
|
3681 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
|
3682 shl == &search_hl ? NULL : cur); |
| 5979 | 3683 |
| 3684 /* Need to get the line again, a multi-line regexp may have made it | |
| 3685 * invalid. */ | |
| 3686 line = ml_get_buf(wp->w_buffer, lnum, FALSE); | |
| 3687 ptr = line + v; | |
| 3688 | |
| 3689 if (shl->lnum != 0 && shl->lnum <= lnum) | |
| 3690 { | |
| 3691 if (shl->lnum == lnum) | |
| 3692 shl->startcol = shl->rm.startpos[0].col; | |
| 3693 else | |
| 3694 shl->startcol = 0; | |
| 3695 if (lnum == shl->lnum + shl->rm.endpos[0].lnum | |
| 3696 - shl->rm.startpos[0].lnum) | |
| 3697 shl->endcol = shl->rm.endpos[0].col; | |
| 3698 else | |
| 3699 shl->endcol = MAXCOL; | |
| 3700 /* Highlight one character for an empty match. */ | |
| 3701 if (shl->startcol == shl->endcol) | |
| 3702 { | |
| 3703 #ifdef FEAT_MBYTE | |
| 3704 if (has_mbyte && line[shl->endcol] != NUL) | |
| 3705 shl->endcol += (*mb_ptr2len)(line + shl->endcol); | |
| 7 | 3706 else |
| 5979 | 3707 #endif |
| 3708 ++shl->endcol; | |
| 3709 } | |
| 3710 if ((long)shl->startcol < v) /* match at leftcol */ | |
| 3711 { | |
| 3712 shl->attr_cur = shl->attr; | |
| 3713 search_attr = shl->attr; | |
| 3714 } | |
| 3715 area_highlighting = TRUE; | |
| 7 | 3716 } |
| 1326 | 3717 if (shl != &search_hl && cur != NULL) |
| 3718 cur = cur->next; | |
| 7 | 3719 } |
| 3720 #endif | |
| 3721 | |
| 743 | 3722 #ifdef FEAT_SYN_HL |
|
5068
6a7ae677d6a1
updated for version 7.3.1277
Bram Moolenaar <bram@vim.org>
parents:
4916
diff
changeset
|
3723 /* 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
|
3724 * 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
|
3725 * then. */ |
|
5078
22ac43fb6d30
updated for version 7.3.1282
Bram Moolenaar <bram@vim.org>
parents:
5068
diff
changeset
|
3726 if (wp->w_p_cul && lnum == wp->w_cursor.lnum |
| 5979 | 3727 && !(wp == curwin && VIsual_active)) |
| 743 | 3728 { |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
3729 line_attr = HL_ATTR(HLF_CUL); |
| 743 | 3730 area_highlighting = TRUE; |
| 3731 } | |
| 3732 #endif | |
| 3733 | |
| 504 | 3734 off = (unsigned)(current_ScreenLine - ScreenLines); |
| 7 | 3735 col = 0; |
| 3736 #ifdef FEAT_RIGHTLEFT | |
| 3737 if (wp->w_p_rl) | |
| 3738 { | |
| 3739 /* Rightleft window: process the text in the normal direction, but put | |
| 3740 * it in current_ScreenLine[] from right to left. Start at the | |
| 3741 * rightmost column of the window. */ | |
| 3742 col = W_WIDTH(wp) - 1; | |
| 3743 off += col; | |
| 3744 } | |
| 3745 #endif | |
| 3746 | |
| 3747 /* | |
| 3748 * Repeat for the whole displayed line. | |
| 3749 */ | |
| 3750 for (;;) | |
| 3751 { | |
| 6947 | 3752 #ifdef FEAT_CONCEAL |
|
8907
5deb9e8f4292
commit https://github.com/vim/vim/commit/4d585022023b96f6507e8cae5ed8fc8d926f5140
Christian Brabandt <cb@256bit.org>
parents:
8872
diff
changeset
|
3753 has_match_conc = 0; |
| 6947 | 3754 #endif |
| 7 | 3755 /* Skip this quickly when working on the text. */ |
| 3756 if (draw_state != WL_LINE) | |
| 3757 { | |
| 3758 #ifdef FEAT_CMDWIN | |
| 3759 if (draw_state == WL_CMDLINE - 1 && n_extra == 0) | |
| 3760 { | |
| 3761 draw_state = WL_CMDLINE; | |
| 3762 if (cmdwin_type != 0 && wp == curwin) | |
| 3763 { | |
| 3764 /* Draw the cmdline character. */ | |
| 3765 n_extra = 1; | |
| 1340 | 3766 c_extra = cmdwin_type; |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
3767 char_attr = HL_ATTR(HLF_AT); |
| 7 | 3768 } |
| 3769 } | |
| 3770 #endif | |
| 3771 | |
| 3772 #ifdef FEAT_FOLDING | |
| 3773 if (draw_state == WL_FOLD - 1 && n_extra == 0) | |
| 3774 { | |
| 6553 | 3775 int fdc = compute_foldcolumn(wp, 0); |
| 3776 | |
| 7 | 3777 draw_state = WL_FOLD; |
| 6553 | 3778 if (fdc > 0) |
| 7 | 3779 { |
|
10466
34b50194f82d
commit https://github.com/vim/vim/commit/6270660611a151c5d0f614a5f0248ccdc80ed971
Christian Brabandt <cb@256bit.org>
parents:
10392
diff
changeset
|
3780 /* 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
|
3781 * already be in use. */ |
|
10690
206ab11fa76e
patch 8.0.0235: memory leak in diff mode
Christian Brabandt <cb@256bit.org>
parents:
10538
diff
changeset
|
3782 vim_free(p_extra_free); |
|
10466
34b50194f82d
commit https://github.com/vim/vim/commit/6270660611a151c5d0f614a5f0248ccdc80ed971
Christian Brabandt <cb@256bit.org>
parents:
10392
diff
changeset
|
3783 p_extra_free = alloc(12 + 1); |
|
34b50194f82d
commit https://github.com/vim/vim/commit/6270660611a151c5d0f614a5f0248ccdc80ed971
Christian Brabandt <cb@256bit.org>
parents:
10392
diff
changeset
|
3784 |
|
34b50194f82d
commit https://github.com/vim/vim/commit/6270660611a151c5d0f614a5f0248ccdc80ed971
Christian Brabandt <cb@256bit.org>
parents:
10392
diff
changeset
|
3785 if (p_extra_free != NULL) |
|
34b50194f82d
commit https://github.com/vim/vim/commit/6270660611a151c5d0f614a5f0248ccdc80ed971
Christian Brabandt <cb@256bit.org>
parents:
10392
diff
changeset
|
3786 { |
|
34b50194f82d
commit https://github.com/vim/vim/commit/6270660611a151c5d0f614a5f0248ccdc80ed971
Christian Brabandt <cb@256bit.org>
parents:
10392
diff
changeset
|
3787 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
|
3788 n_extra = fdc; |
|
34b50194f82d
commit https://github.com/vim/vim/commit/6270660611a151c5d0f614a5f0248ccdc80ed971
Christian Brabandt <cb@256bit.org>
parents:
10392
diff
changeset
|
3789 p_extra_free[n_extra] = NUL; |
|
34b50194f82d
commit https://github.com/vim/vim/commit/6270660611a151c5d0f614a5f0248ccdc80ed971
Christian Brabandt <cb@256bit.org>
parents:
10392
diff
changeset
|
3790 p_extra = p_extra_free; |
|
34b50194f82d
commit https://github.com/vim/vim/commit/6270660611a151c5d0f614a5f0248ccdc80ed971
Christian Brabandt <cb@256bit.org>
parents:
10392
diff
changeset
|
3791 c_extra = NUL; |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
3792 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
|
3793 } |
| 7 | 3794 } |
| 3795 } | |
| 3796 #endif | |
| 3797 | |
| 3798 #ifdef FEAT_SIGNS | |
| 3799 if (draw_state == WL_SIGN - 1 && n_extra == 0) | |
| 3800 { | |
| 3801 draw_state = WL_SIGN; | |
| 3802 /* Show the sign column when there are any signs in this | |
| 3803 * buffer or when using Netbeans. */ | |
|
9852
4eea48b76d03
commit https://github.com/vim/vim/commit/95ec9d6a6ab3117d60ff638670a803d43974ba51
Christian Brabandt <cb@256bit.org>
parents:
9848
diff
changeset
|
3804 if (signcolumn_on(wp)) |
| 7 | 3805 { |
| 2661 | 3806 int text_sign; |
| 7 | 3807 # ifdef FEAT_SIGN_ICONS |
| 2661 | 3808 int icon_sign; |
| 7 | 3809 # endif |
| 3810 | |
| 3811 /* Draw two cells with the sign value or blank. */ | |
| 3812 c_extra = ' '; | |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
3813 char_attr = HL_ATTR(HLF_SC); |
| 7 | 3814 n_extra = 2; |
| 3815 | |
| 5921 | 3816 if (row == startrow |
| 3817 #ifdef FEAT_DIFF | |
| 3818 + filler_lines && filler_todo <= 0 | |
| 3819 #endif | |
| 3820 ) | |
| 7 | 3821 { |
| 3822 text_sign = buf_getsigntype(wp->w_buffer, lnum, | |
| 3823 SIGN_TEXT); | |
| 3824 # ifdef FEAT_SIGN_ICONS | |
| 3825 icon_sign = buf_getsigntype(wp->w_buffer, lnum, | |
| 3826 SIGN_ICON); | |
| 3827 if (gui.in_use && icon_sign != 0) | |
| 3828 { | |
| 3829 /* Use the image in this position. */ | |
| 3830 c_extra = SIGN_BYTE; | |
| 3831 # ifdef FEAT_NETBEANS_INTG | |
| 3832 if (buf_signcount(wp->w_buffer, lnum) > 1) | |
| 3833 c_extra = MULTISIGN_BYTE; | |
| 3834 # endif | |
| 3835 char_attr = icon_sign; | |
| 3836 } | |
| 3837 else | |
| 3838 # endif | |
| 3839 if (text_sign != 0) | |
| 3840 { | |
| 3841 p_extra = sign_get_text(text_sign); | |
| 3842 if (p_extra != NULL) | |
| 3843 { | |
| 3844 c_extra = NUL; | |
| 835 | 3845 n_extra = (int)STRLEN(p_extra); |
| 7 | 3846 } |
| 3847 char_attr = sign_get_attr(text_sign, FALSE); | |
| 3848 } | |
| 3849 } | |
| 3850 } | |
| 3851 } | |
| 3852 #endif | |
| 3853 | |
| 3854 if (draw_state == WL_NR - 1 && n_extra == 0) | |
| 3855 { | |
| 3856 draw_state = WL_NR; | |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
3857 /* 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
|
3858 * 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
|
3859 if ((wp->w_p_nu || wp->w_p_rnu) |
| 7 | 3860 && (row == startrow |
| 3861 #ifdef FEAT_DIFF | |
| 3862 + filler_lines | |
| 3863 #endif | |
| 3864 || vim_strchr(p_cpo, CPO_NUMCOL) == NULL)) | |
| 3865 { | |
| 3866 /* Draw the line number (empty space after wrapping). */ | |
| 3867 if (row == startrow | |
| 3868 #ifdef FEAT_DIFF | |
| 3869 + filler_lines | |
| 3870 #endif | |
| 3871 ) | |
| 3872 { | |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
3873 long num; |
| 4065 | 3874 char *fmt = "%*ld "; |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
3875 |
|
4736
3f2319a953b3
updated for version 7.3.1115
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
3876 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
|
3877 /* 'number' + 'norelativenumber' */ |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
3878 num = (long)lnum; |
|
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
3879 else |
| 4065 | 3880 { |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
3881 /* 'relativenumber', don't use negative numbers */ |
| 2675 | 3882 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
|
3883 if (num == 0 && wp->w_p_nu && wp->w_p_rnu) |
| 4065 | 3884 { |
|
4736
3f2319a953b3
updated for version 7.3.1115
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
3885 /* 'number' + 'relativenumber' */ |
| 4065 | 3886 num = lnum; |
| 3887 fmt = "%-*ld "; | |
| 3888 } | |
| 3889 } | |
| 3890 | |
| 3891 sprintf((char *)extra, fmt, | |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
3892 number_width(wp), num); |
| 7 | 3893 if (wp->w_skipcol > 0) |
| 3894 for (p_extra = extra; *p_extra == ' '; ++p_extra) | |
| 3895 *p_extra = '-'; | |
| 3896 #ifdef FEAT_RIGHTLEFT | |
| 3897 if (wp->w_p_rl) /* reverse line numbers */ | |
| 3898 rl_mirror(extra); | |
| 3899 #endif | |
| 3900 p_extra = extra; | |
| 3901 c_extra = NUL; | |
| 3902 } | |
| 3903 else | |
| 3904 c_extra = ' '; | |
| 13 | 3905 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
|
3906 char_attr = HL_ATTR(HLF_N); |
| 743 | 3907 #ifdef FEAT_SYN_HL |
| 3908 /* When 'cursorline' is set highlight the line number of | |
| 3427 | 3909 * the current line differently. |
| 3910 * TODO: Can we use CursorLine instead of CursorLineNr | |
| 3911 * when CursorLineNr isn't set? */ | |
|
5078
22ac43fb6d30
updated for version 7.3.1282
Bram Moolenaar <bram@vim.org>
parents:
5068
diff
changeset
|
3912 if ((wp->w_p_cul || wp->w_p_rnu) |
| 4065 | 3913 && 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
|
3914 char_attr = HL_ATTR(HLF_CLN); |
| 743 | 3915 #endif |
| 7 | 3916 } |
| 3917 } | |
| 3918 | |
| 5995 | 3919 #ifdef FEAT_LINEBREAK |
| 3920 if (wp->w_p_brisbr && draw_state == WL_BRI - 1 | |
| 3921 && n_extra == 0 && *p_sbr != NUL) | |
| 3922 /* draw indent after showbreak value */ | |
| 3923 draw_state = WL_BRI; | |
| 3924 else if (wp->w_p_brisbr && draw_state == WL_SBR && n_extra == 0) | |
| 3925 /* After the showbreak, draw the breakindent */ | |
| 3926 draw_state = WL_BRI - 1; | |
| 3927 | |
| 3928 /* draw 'breakindent': indent wrapped text accordingly */ | |
| 3929 if (draw_state == WL_BRI - 1 && n_extra == 0) | |
| 3930 { | |
| 3931 draw_state = WL_BRI; | |
|
10392
957a1d560bda
commit https://github.com/vim/vim/commit/6c896867c4f5d759616028ef7cbfce2a9ed32600
Christian Brabandt <cb@256bit.org>
parents:
10349
diff
changeset
|
3932 /* 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
|
3933 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
|
3934 && (row != startrow || need_showbreak) |
| 5995 | 3935 # ifdef FEAT_DIFF |
| 3936 && filler_lines == 0 | |
| 6834 | 3937 # endif |
| 5995 | 3938 ) |
| 3939 { | |
|
10392
957a1d560bda
commit https://github.com/vim/vim/commit/6c896867c4f5d759616028ef7cbfce2a9ed32600
Christian Brabandt <cb@256bit.org>
parents:
10349
diff
changeset
|
3940 char_attr = 0; |
| 6834 | 3941 # ifdef FEAT_DIFF |
| 5995 | 3942 if (diff_hlf != (hlf_T)0) |
| 6106 | 3943 { |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
3944 char_attr = HL_ATTR(diff_hlf); |
| 6834 | 3945 # ifdef FEAT_SYN_HL |
| 6106 | 3946 if (wp->w_p_cul && lnum == wp->w_cursor.lnum) |
| 3947 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
|
3948 HL_ATTR(HLF_CUL)); |
| 6834 | 3949 # endif |
| 6106 | 3950 } |
| 6834 | 3951 # endif |
| 6028 | 3952 p_extra = NULL; |
| 5995 | 3953 c_extra = ' '; |
| 3954 n_extra = get_breakindent_win(wp, | |
| 3955 ml_get_buf(wp->w_buffer, lnum, FALSE)); | |
| 3956 /* Correct end of highlighted area for 'breakindent', | |
| 3957 * required when 'linebreak' is also set. */ | |
| 3958 if (tocol == vcol) | |
| 3959 tocol += n_extra; | |
| 3960 } | |
| 3961 } | |
| 3962 #endif | |
| 3963 | |
| 7 | 3964 #if defined(FEAT_LINEBREAK) || defined(FEAT_DIFF) |
| 3965 if (draw_state == WL_SBR - 1 && n_extra == 0) | |
| 3966 { | |
| 3967 draw_state = WL_SBR; | |
| 3968 # ifdef FEAT_DIFF | |
| 3969 if (filler_todo > 0) | |
| 3970 { | |
| 3971 /* Draw "deleted" diff line(s). */ | |
| 3972 if (char2cells(fill_diff) > 1) | |
| 3973 c_extra = '-'; | |
| 3974 else | |
| 3975 c_extra = fill_diff; | |
| 3976 # ifdef FEAT_RIGHTLEFT | |
| 3977 if (wp->w_p_rl) | |
| 3978 n_extra = col + 1; | |
| 3979 else | |
| 3980 # endif | |
| 3981 n_extra = W_WIDTH(wp) - col; | |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
3982 char_attr = HL_ATTR(HLF_DED); |
| 7 | 3983 } |
| 3984 # endif | |
| 3985 # ifdef FEAT_LINEBREAK | |
| 3986 if (*p_sbr != NUL && need_showbreak) | |
| 3987 { | |
| 3988 /* Draw 'showbreak' at the start of each broken line. */ | |
| 3989 p_extra = p_sbr; | |
| 3990 c_extra = NUL; | |
| 3991 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
|
3992 char_attr = HL_ATTR(HLF_AT); |
| 7 | 3993 need_showbreak = FALSE; |
| 6503 | 3994 vcol_sbr = vcol + MB_CHARLEN(p_sbr); |
| 7 | 3995 /* Correct end of highlighted area for 'showbreak', |
| 3996 * required when 'linebreak' is also set. */ | |
| 3997 if (tocol == vcol) | |
| 3998 tocol += n_extra; | |
|
5068
6a7ae677d6a1
updated for version 7.3.1277
Bram Moolenaar <bram@vim.org>
parents:
4916
diff
changeset
|
3999 #ifdef FEAT_SYN_HL |
|
6a7ae677d6a1
updated for version 7.3.1277
Bram Moolenaar <bram@vim.org>
parents:
4916
diff
changeset
|
4000 /* combine 'showbreak' with 'cursorline' */ |
|
5078
22ac43fb6d30
updated for version 7.3.1282
Bram Moolenaar <bram@vim.org>
parents:
5068
diff
changeset
|
4001 if (wp->w_p_cul && lnum == wp->w_cursor.lnum) |
| 6106 | 4002 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
|
4003 HL_ATTR(HLF_CUL)); |
|
5068
6a7ae677d6a1
updated for version 7.3.1277
Bram Moolenaar <bram@vim.org>
parents:
4916
diff
changeset
|
4004 #endif |
| 7 | 4005 } |
| 4006 # endif | |
| 4007 } | |
| 4008 #endif | |
| 4009 | |
| 4010 if (draw_state == WL_LINE - 1 && n_extra == 0) | |
| 4011 { | |
| 4012 draw_state = WL_LINE; | |
| 4013 if (saved_n_extra) | |
| 4014 { | |
| 4015 /* Continue item from end of wrapped line. */ | |
| 4016 n_extra = saved_n_extra; | |
| 4017 c_extra = saved_c_extra; | |
| 4018 p_extra = saved_p_extra; | |
| 4019 char_attr = saved_char_attr; | |
| 4020 } | |
| 4021 else | |
| 4022 char_attr = 0; | |
| 4023 } | |
| 4024 } | |
| 4025 | |
| 4026 /* When still displaying '$' of change command, stop at cursor */ | |
| 3318 | 4027 if (dollar_vcol >= 0 && wp == curwin |
| 819 | 4028 && lnum == wp->w_cursor.lnum && vcol >= (long)wp->w_virtcol |
| 7 | 4029 #ifdef FEAT_DIFF |
| 4030 && filler_todo <= 0 | |
| 4031 #endif | |
| 4032 ) | |
| 4033 { | |
|
11670
3b2afa2b77b3
patch 8.0.0718: output of job in terminal is not displayed
Christian Brabandt <cb@256bit.org>
parents:
11657
diff
changeset
|
4034 screen_line(screen_row, W_WINCOL(wp), col, -(int)W_WIDTH(wp), |
|
11672
3c6cc2f24645
patch 8.0.0719: build failure without +terminal feature
Christian Brabandt <cb@256bit.org>
parents:
11670
diff
changeset
|
4035 HAS_RIGHTLEFT(wp->w_p_rl)); |
| 819 | 4036 /* Pretend we have finished updating the window. Except when |
| 4037 * 'cursorcolumn' is set. */ | |
| 4038 #ifdef FEAT_SYN_HL | |
| 4039 if (wp->w_p_cuc) | |
| 4040 row = wp->w_cline_row + wp->w_cline_height; | |
| 4041 else | |
| 4042 #endif | |
| 4043 row = wp->w_height; | |
| 7 | 4044 break; |
| 4045 } | |
| 4046 | |
| 4047 if (draw_state == WL_LINE && area_highlighting) | |
| 4048 { | |
| 4049 /* handle Visual or match highlighting in this line */ | |
| 4050 if (vcol == fromcol | |
| 4051 #ifdef FEAT_MBYTE | |
| 4052 || (has_mbyte && vcol + 1 == fromcol && n_extra == 0 | |
| 4053 && (*mb_ptr2cells)(ptr) > 1) | |
| 4054 #endif | |
| 4055 || ((int)vcol_prev == fromcol_prev | |
| 1814 | 4056 && vcol_prev < vcol /* not at margin */ |
| 7 | 4057 && vcol < tocol)) |
| 4058 area_attr = attr; /* start highlighting */ | |
| 4059 else if (area_attr != 0 | |
| 4060 && (vcol == tocol | |
| 4061 || (noinvcur && (colnr_T)vcol == wp->w_virtcol))) | |
| 4062 area_attr = 0; /* stop highlighting */ | |
| 4063 | |
| 4064 #ifdef FEAT_SEARCH_EXTRA | |
| 4065 if (!n_extra) | |
| 4066 { | |
| 4067 /* | |
| 4068 * Check for start/end of search pattern match. | |
| 4069 * After end, check for start/end of next match. | |
| 4070 * When another match, have to check for start again. | |
| 4071 * Watch out for matching an empty string! | |
| 1326 | 4072 * Do this for 'search_hl' and the match list (ordered by |
| 4073 * priority). | |
| 7 | 4074 */ |
| 36 | 4075 v = (long)(ptr - line); |
| 1326 | 4076 cur = wp->w_match_head; |
| 4077 shl_flag = FALSE; | |
| 4078 while (cur != NULL || shl_flag == FALSE) | |
| 4079 { | |
| 4080 if (shl_flag == FALSE | |
| 4081 && ((cur != NULL | |
| 4082 && cur->priority > SEARCH_HL_PRIORITY) | |
| 4083 || cur == NULL)) | |
| 4084 { | |
| 4085 shl = &search_hl; | |
| 4086 shl_flag = TRUE; | |
| 4087 } | |
| 4088 else | |
| 4089 shl = &cur->hl; | |
| 5979 | 4090 if (cur != NULL) |
| 4091 cur->pos.cur = 0; | |
| 4092 pos_inprogress = TRUE; | |
| 4093 while (shl->rm.regprog != NULL | |
| 4094 || (cur != NULL && pos_inprogress)) | |
| 7 | 4095 { |
| 36 | 4096 if (shl->startcol != MAXCOL |
| 4097 && v >= (long)shl->startcol | |
| 4098 && v < (long)shl->endcol) | |
| 7 | 4099 { |
| 6430 | 4100 #ifdef FEAT_MBYTE |
| 4101 int tmp_col = v + MB_PTR2LEN(ptr); | |
| 4102 | |
| 4103 if (shl->endcol < tmp_col) | |
| 4104 shl->endcol = tmp_col; | |
| 4105 #endif | |
| 7 | 4106 shl->attr_cur = shl->attr; |
| 6947 | 4107 #ifdef FEAT_CONCEAL |
| 4108 if (cur != NULL && syn_name2id((char_u *)"Conceal") | |
| 4109 == cur->hlg_id) | |
| 4110 { | |
|
8907
5deb9e8f4292
commit https://github.com/vim/vim/commit/4d585022023b96f6507e8cae5ed8fc8d926f5140
Christian Brabandt <cb@256bit.org>
parents:
8872
diff
changeset
|
4111 has_match_conc = |
|
5deb9e8f4292
commit https://github.com/vim/vim/commit/4d585022023b96f6507e8cae5ed8fc8d926f5140
Christian Brabandt <cb@256bit.org>
parents:
8872
diff
changeset
|
4112 v == (long)shl->startcol ? 2 : 1; |
| 6947 | 4113 match_conc = cur->conceal_char; |
| 4114 } | |
| 4115 else | |
|
8907
5deb9e8f4292
commit https://github.com/vim/vim/commit/4d585022023b96f6507e8cae5ed8fc8d926f5140
Christian Brabandt <cb@256bit.org>
parents:
8872
diff
changeset
|
4116 has_match_conc = match_conc = 0; |
| 6947 | 4117 #endif |
| 7 | 4118 } |
| 6430 | 4119 else if (v == (long)shl->endcol) |
| 7 | 4120 { |
| 4121 shl->attr_cur = 0; | |
|
9992
3e3b0ce24b61
commit https://github.com/vim/vim/commit/e17bdffff78ebd6a4e3cff26754cc667557ea810
Christian Brabandt <cb@256bit.org>
parents:
9939
diff
changeset
|
4122 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
|
4123 shl == &search_hl ? NULL : cur); |
| 5979 | 4124 pos_inprogress = cur == NULL || cur->pos.cur == 0 |
| 6947 | 4125 ? FALSE : TRUE; |
| 7 | 4126 |
| 4127 /* Need to get the line again, a multi-line regexp | |
| 4128 * may have made it invalid. */ | |
| 4129 line = ml_get_buf(wp->w_buffer, lnum, FALSE); | |
| 4130 ptr = line + v; | |
| 4131 | |
| 4132 if (shl->lnum == lnum) | |
| 4133 { | |
| 36 | 4134 shl->startcol = shl->rm.startpos[0].col; |
| 7 | 4135 if (shl->rm.endpos[0].lnum == 0) |
| 36 | 4136 shl->endcol = shl->rm.endpos[0].col; |
| 7 | 4137 else |
| 36 | 4138 shl->endcol = MAXCOL; |
| 4139 | |
| 4140 if (shl->startcol == shl->endcol) | |
| 7 | 4141 { |
| 4142 /* highlight empty match, try again after | |
| 4143 * it */ | |
| 4144 #ifdef FEAT_MBYTE | |
| 4145 if (has_mbyte) | |
| 474 | 4146 shl->endcol += (*mb_ptr2len)(line |
| 36 | 4147 + shl->endcol); |
| 7 | 4148 else |
| 4149 #endif | |
| 36 | 4150 ++shl->endcol; |
| 7 | 4151 } |
| 4152 | |
| 4153 /* Loop to check if the match starts at the | |
| 4154 * current position */ | |
| 4155 continue; | |
| 4156 } | |
| 4157 } | |
| 4158 break; | |
| 4159 } | |
| 1326 | 4160 if (shl != &search_hl && cur != NULL) |
| 4161 cur = cur->next; | |
| 4162 } | |
| 4163 | |
| 4164 /* Use attributes from match with highest priority among | |
| 4165 * 'search_hl' and the match list. */ | |
| 4166 search_attr = search_hl.attr_cur; | |
| 4167 cur = wp->w_match_head; | |
| 4168 shl_flag = FALSE; | |
| 4169 while (cur != NULL || shl_flag == FALSE) | |
| 4170 { | |
| 4171 if (shl_flag == FALSE | |
| 4172 && ((cur != NULL | |
| 4173 && cur->priority > SEARCH_HL_PRIORITY) | |
| 4174 || cur == NULL)) | |
| 699 | 4175 { |
| 1326 | 4176 shl = &search_hl; |
| 4177 shl_flag = TRUE; | |
| 699 | 4178 } |
| 1326 | 4179 else |
| 4180 shl = &cur->hl; | |
| 4181 if (shl->attr_cur != 0) | |
| 4182 search_attr = shl->attr_cur; | |
| 4183 if (shl != &search_hl && cur != NULL) | |
| 4184 cur = cur->next; | |
| 4185 } | |
| 7 | 4186 } |
| 4187 #endif | |
| 4188 | |
| 4189 #ifdef FEAT_DIFF | |
| 674 | 4190 if (diff_hlf != (hlf_T)0) |
| 7 | 4191 { |
| 1295 | 4192 if (diff_hlf == HLF_CHD && ptr - line >= change_start |
| 4193 && n_extra == 0) | |
| 7 | 4194 diff_hlf = HLF_TXD; /* changed text */ |
| 1295 | 4195 if (diff_hlf == HLF_TXD && ptr - line > change_end |
| 4196 && n_extra == 0) | |
| 7 | 4197 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
|
4198 line_attr = HL_ATTR(diff_hlf); |
| 6106 | 4199 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
|
4200 line_attr = hl_combine_attr(line_attr, HL_ATTR(HLF_CUL)); |
| 674 | 4201 } |
| 4202 #endif | |
| 4203 | |
| 4204 /* Decide which of the highlight attributes to use. */ | |
| 4205 attr_pri = TRUE; | |
| 6717 | 4206 #ifdef LINE_ATTR |
| 674 | 4207 if (area_attr != 0) |
| 6717 | 4208 char_attr = hl_combine_attr(line_attr, area_attr); |
| 674 | 4209 else if (search_attr != 0) |
| 6717 | 4210 char_attr = hl_combine_attr(line_attr, search_attr); |
| 674 | 4211 /* Use line_attr when not in the Visual or 'incsearch' area |
| 4212 * (area_attr may be 0 when "noinvcur" is set). */ | |
| 4213 else if (line_attr != 0 && ((fromcol == -10 && tocol == MAXCOL) | |
| 1842 | 4214 || vcol < fromcol || vcol_prev < fromcol_prev |
| 4215 || vcol >= tocol)) | |
| 674 | 4216 char_attr = line_attr; |
| 6717 | 4217 #else |
| 4218 if (area_attr != 0) | |
| 4219 char_attr = area_attr; | |
| 4220 else if (search_attr != 0) | |
| 4221 char_attr = search_attr; | |
| 674 | 4222 #endif |
| 4223 else | |
| 4224 { | |
| 4225 attr_pri = FALSE; | |
| 4226 #ifdef FEAT_SYN_HL | |
| 4227 if (has_syntax) | |
| 4228 char_attr = syntax_attr; | |
| 4229 else | |
| 4230 #endif | |
| 4231 char_attr = 0; | |
| 4232 } | |
| 7 | 4233 } |
| 4234 | |
| 4235 /* | |
| 4236 * Get the next character to put on the screen. | |
| 4237 */ | |
| 4238 /* | |
| 1340 | 4239 * The "p_extra" points to the extra stuff that is inserted to |
| 4240 * represent special characters (non-printable stuff) and other | |
| 4241 * things. When all characters are the same, c_extra is used. | |
| 4242 * "p_extra" must end in a NUL to avoid mb_ptr2len() reads past | |
| 4243 * "p_extra[n_extra]". | |
| 7 | 4244 * For the '$' of the 'list' option, n_extra == 1, p_extra == "". |
| 4245 */ | |
| 4246 if (n_extra > 0) | |
| 4247 { | |
| 4248 if (c_extra != NUL) | |
| 4249 { | |
| 4250 c = c_extra; | |
| 4251 #ifdef FEAT_MBYTE | |
| 4252 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
|
4253 if (enc_utf8 && utf_char2len(c) > 1) |
| 7 | 4254 { |
| 4255 mb_utf8 = TRUE; | |
| 714 | 4256 u8cc[0] = 0; |
| 819 | 4257 c = 0xc0; |
| 7 | 4258 } |
| 4259 else | |
| 4260 mb_utf8 = FALSE; | |
| 4261 #endif | |
| 4262 } | |
| 4263 else | |
| 4264 { | |
| 4265 c = *p_extra; | |
| 4266 #ifdef FEAT_MBYTE | |
| 4267 if (has_mbyte) | |
| 4268 { | |
| 4269 mb_c = c; | |
| 4270 if (enc_utf8) | |
| 4271 { | |
| 4272 /* If the UTF-8 character is more than one byte: | |
| 4273 * 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
|
4274 mb_l = utfc_ptr2len(p_extra); |
| 7 | 4275 mb_utf8 = FALSE; |
| 4276 if (mb_l > n_extra) | |
| 4277 mb_l = 1; | |
| 4278 else if (mb_l > 1) | |
| 4279 { | |
| 714 | 4280 mb_c = utfc_ptr2char(p_extra, u8cc); |
| 7 | 4281 mb_utf8 = TRUE; |
| 819 | 4282 c = 0xc0; |
| 7 | 4283 } |
| 4284 } | |
| 4285 else | |
| 4286 { | |
| 4287 /* if this is a DBCS character, put it in "mb_c" */ | |
| 4288 mb_l = MB_BYTE2LEN(c); | |
| 4289 if (mb_l >= n_extra) | |
| 4290 mb_l = 1; | |
| 4291 else if (mb_l > 1) | |
| 4292 mb_c = (c << 8) + p_extra[1]; | |
| 4293 } | |
| 504 | 4294 if (mb_l == 0) /* at the NUL at end-of-line */ |
| 4295 mb_l = 1; | |
| 4296 | |
| 7 | 4297 /* If a double-width char doesn't fit display a '>' in the |
| 4298 * last column. */ | |
| 504 | 4299 if (( |
| 7 | 4300 # ifdef FEAT_RIGHTLEFT |
| 4301 wp->w_p_rl ? (col <= 0) : | |
| 4302 # endif | |
| 504 | 4303 (col >= W_WIDTH(wp) - 1)) |
| 7 | 4304 && (*mb_char2cells)(mb_c) == 2) |
| 4305 { | |
| 4306 c = '>'; | |
| 4307 mb_c = c; | |
| 4308 mb_l = 1; | |
| 4309 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
|
4310 multi_attr = HL_ATTR(HLF_AT); |
| 7 | 4311 /* put the pointer back to output the double-width |
| 4312 * character at the start of the next line. */ | |
| 4313 ++n_extra; | |
| 4314 --p_extra; | |
| 4315 } | |
| 4316 else | |
| 4317 { | |
| 4318 n_extra -= mb_l - 1; | |
| 4319 p_extra += mb_l - 1; | |
| 4320 } | |
| 4321 } | |
| 4322 #endif | |
| 4323 ++p_extra; | |
| 4324 } | |
| 4325 --n_extra; | |
| 4326 } | |
| 4327 else | |
| 4328 { | |
|
10986
62bcadce6c82
patch 8.0.0382: warning in tiny build for unused variable
Christian Brabandt <cb@256bit.org>
parents:
10982
diff
changeset
|
4329 #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
|
4330 int c0; |
|
10986
62bcadce6c82
patch 8.0.0382: warning in tiny build for unused variable
Christian Brabandt <cb@256bit.org>
parents:
10982
diff
changeset
|
4331 #endif |
|
10982
5e20c9f96cd5
patch 8.0.0380: with 'linebreak' double wide char wraps badly
Christian Brabandt <cb@256bit.org>
parents:
10928
diff
changeset
|
4332 |
| 6026 | 4333 if (p_extra_free != NULL) |
| 4334 { | |
| 4335 vim_free(p_extra_free); | |
| 4336 p_extra_free = NULL; | |
| 4337 } | |
| 7 | 4338 /* |
| 4339 * Get a character from the line itself. | |
| 4340 */ | |
|
10988
b5de553d6062
patch 8.0.0383: misplaced #ifdef
Christian Brabandt <cb@256bit.org>
parents:
10986
diff
changeset
|
4341 c = *ptr; |
|
10986
62bcadce6c82
patch 8.0.0382: warning in tiny build for unused variable
Christian Brabandt <cb@256bit.org>
parents:
10982
diff
changeset
|
4342 #ifdef FEAT_LINEBREAK |
|
10988
b5de553d6062
patch 8.0.0383: misplaced #ifdef
Christian Brabandt <cb@256bit.org>
parents:
10986
diff
changeset
|
4343 c0 = *ptr; |
|
10986
62bcadce6c82
patch 8.0.0382: warning in tiny build for unused variable
Christian Brabandt <cb@256bit.org>
parents:
10982
diff
changeset
|
4344 #endif |
| 7 | 4345 #ifdef FEAT_MBYTE |
| 4346 if (has_mbyte) | |
| 4347 { | |
| 4348 mb_c = c; | |
| 4349 if (enc_utf8) | |
| 4350 { | |
| 4351 /* If the UTF-8 character is more than one byte: Decode it | |
| 4352 * 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
|
4353 mb_l = utfc_ptr2len(ptr); |
| 7 | 4354 mb_utf8 = FALSE; |
| 4355 if (mb_l > 1) | |
| 4356 { | |
| 714 | 4357 mb_c = utfc_ptr2char(ptr, u8cc); |
| 7 | 4358 /* Overlong encoded ASCII or ASCII with composing char |
| 4359 * is displayed normally, except a NUL. */ | |
| 4360 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
|
4361 { |
|
62bcadce6c82
patch 8.0.0382: warning in tiny build for unused variable
Christian Brabandt <cb@256bit.org>
parents:
10982
diff
changeset
|
4362 c = mb_c; |
|
62bcadce6c82
patch 8.0.0382: warning in tiny build for unused variable
Christian Brabandt <cb@256bit.org>
parents:
10982
diff
changeset
|
4363 # ifdef FEAT_LINEBREAK |
|
62bcadce6c82
patch 8.0.0382: warning in tiny build for unused variable
Christian Brabandt <cb@256bit.org>
parents:
10982
diff
changeset
|
4364 c0 = mb_c; |
|
62bcadce6c82
patch 8.0.0382: warning in tiny build for unused variable
Christian Brabandt <cb@256bit.org>
parents:
10982
diff
changeset
|
4365 # endif |
|
62bcadce6c82
patch 8.0.0382: warning in tiny build for unused variable
Christian Brabandt <cb@256bit.org>
parents:
10982
diff
changeset
|
4366 } |
| 7 | 4367 mb_utf8 = TRUE; |
| 507 | 4368 |
| 4369 /* At start of the line we can have a composing char. | |
| 4370 * Draw it as a space with a composing char. */ | |
| 4371 if (utf_iscomposing(mb_c)) | |
| 4372 { | |
| 1326 | 4373 int i; |
| 4374 | |
| 714 | 4375 for (i = Screen_mco - 1; i > 0; --i) |
| 4376 u8cc[i] = u8cc[i - 1]; | |
| 4377 u8cc[0] = mb_c; | |
| 507 | 4378 mb_c = ' '; |
| 4379 } | |
| 7 | 4380 } |
| 4381 | |
| 4382 if ((mb_l == 1 && c >= 0x80) | |
| 4383 || (mb_l >= 1 && mb_c == 0) | |
| 4384 || (mb_l > 1 && (!vim_isprintc(mb_c) | |
| 1401 | 4385 # ifdef UNICODE16 |
| 4386 || mb_c >= 0x10000 | |
| 4387 # endif | |
| 4388 ))) | |
| 7 | 4389 { |
| 4390 /* | |
| 4391 * Illegal UTF-8 byte: display as <xx>. | |
| 4392 * Non-BMP character : display as ? or fullwidth ?. | |
| 4393 */ | |
| 1401 | 4394 # ifdef UNICODE16 |
| 7 | 4395 if (mb_c < 0x10000) |
| 1401 | 4396 # endif |
| 7 | 4397 { |
| 4398 transchar_hex(extra, mb_c); | |
| 714 | 4399 # ifdef FEAT_RIGHTLEFT |
| 7 | 4400 if (wp->w_p_rl) /* reverse */ |
| 4401 rl_mirror(extra); | |
| 714 | 4402 # endif |
| 7 | 4403 } |
| 1401 | 4404 # ifdef UNICODE16 |
| 7 | 4405 else if (utf_char2cells(mb_c) != 2) |
| 4406 STRCPY(extra, "?"); | |
| 4407 else | |
| 4408 /* 0xff1f in UTF-8: full-width '?' */ | |
| 4409 STRCPY(extra, "\357\274\237"); | |
| 1401 | 4410 # endif |
| 7 | 4411 |
| 4412 p_extra = extra; | |
| 4413 c = *p_extra; | |
| 4414 mb_c = mb_ptr2char_adv(&p_extra); | |
| 4415 mb_utf8 = (c >= 0x80); | |
| 4416 n_extra = (int)STRLEN(p_extra); | |
| 4417 c_extra = NUL; | |
| 4418 if (area_attr == 0 && search_attr == 0) | |
| 4419 { | |
| 4420 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
|
4421 extra_attr = HL_ATTR(HLF_8); |
| 7 | 4422 saved_attr2 = char_attr; /* save current attr */ |
| 4423 } | |
| 4424 } | |
| 4425 else if (mb_l == 0) /* at the NUL at end-of-line */ | |
| 4426 mb_l = 1; | |
| 4427 #ifdef FEAT_ARABIC | |
| 4428 else if (p_arshape && !p_tbidi && ARABIC_CHAR(mb_c)) | |
| 4429 { | |
| 4430 /* Do Arabic shaping. */ | |
| 714 | 4431 int pc, pc1, nc; |
| 4432 int pcc[MAX_MCO]; | |
| 7 | 4433 |
| 4434 /* The idea of what is the previous and next | |
| 4435 * character depends on 'rightleft'. */ | |
| 4436 if (wp->w_p_rl) | |
| 4437 { | |
| 4438 pc = prev_c; | |
| 4439 pc1 = prev_c1; | |
| 4440 nc = utf_ptr2char(ptr + mb_l); | |
| 714 | 4441 prev_c1 = u8cc[0]; |
| 7 | 4442 } |
| 4443 else | |
| 4444 { | |
| 714 | 4445 pc = utfc_ptr2char(ptr + mb_l, pcc); |
| 7 | 4446 nc = prev_c; |
| 714 | 4447 pc1 = pcc[0]; |
| 7 | 4448 } |
| 4449 prev_c = mb_c; | |
| 4450 | |
| 714 | 4451 mb_c = arabic_shape(mb_c, &c, &u8cc[0], pc, pc1, nc); |
| 7 | 4452 } |
| 4453 else | |
| 4454 prev_c = mb_c; | |
| 4455 #endif | |
| 4456 } | |
| 4457 else /* enc_dbcs */ | |
| 4458 { | |
| 4459 mb_l = MB_BYTE2LEN(c); | |
| 4460 if (mb_l == 0) /* at the NUL at end-of-line */ | |
| 4461 mb_l = 1; | |
| 4462 else if (mb_l > 1) | |
| 4463 { | |
| 4464 /* We assume a second byte below 32 is illegal. | |
| 4465 * Hopefully this is OK for all double-byte encodings! | |
| 4466 */ | |
| 4467 if (ptr[1] >= 32) | |
| 4468 mb_c = (c << 8) + ptr[1]; | |
| 4469 else | |
| 4470 { | |
| 4471 if (ptr[1] == NUL) | |
| 4472 { | |
| 4473 /* head byte at end of line */ | |
| 4474 mb_l = 1; | |
| 4475 transchar_nonprint(extra, c); | |
| 4476 } | |
| 4477 else | |
| 4478 { | |
| 4479 /* illegal tail byte */ | |
| 4480 mb_l = 2; | |
| 4481 STRCPY(extra, "XX"); | |
| 4482 } | |
| 4483 p_extra = extra; | |
| 4484 n_extra = (int)STRLEN(extra) - 1; | |
| 4485 c_extra = NUL; | |
| 4486 c = *p_extra++; | |
| 4487 if (area_attr == 0 && search_attr == 0) | |
| 4488 { | |
| 4489 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
|
4490 extra_attr = HL_ATTR(HLF_8); |
| 7 | 4491 saved_attr2 = char_attr; /* save current attr */ |
| 4492 } | |
| 4493 mb_c = c; | |
| 4494 } | |
| 4495 } | |
| 4496 } | |
| 4497 /* If a double-width char doesn't fit display a '>' in the | |
| 4498 * last column; the character is displayed at the start of the | |
| 4499 * next line. */ | |
| 4500 if (( | |
| 4501 # ifdef FEAT_RIGHTLEFT | |
| 4502 wp->w_p_rl ? (col <= 0) : | |
| 4503 # endif | |
| 4504 (col >= W_WIDTH(wp) - 1)) | |
| 4505 && (*mb_char2cells)(mb_c) == 2) | |
| 4506 { | |
| 4507 c = '>'; | |
| 4508 mb_c = c; | |
| 4509 mb_utf8 = FALSE; | |
| 4510 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
|
4511 multi_attr = HL_ATTR(HLF_AT); |
| 7 | 4512 /* Put pointer back so that the character will be |
| 4513 * displayed at the start of the next line. */ | |
| 4514 --ptr; | |
| 4515 } | |
| 4516 else if (*ptr != NUL) | |
| 4517 ptr += mb_l - 1; | |
| 4518 | |
| 4519 /* 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
|
4520 * a '<' in the first column. Don't do this for unprintable |
| 4352 | 4521 * 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
|
4522 if (n_skip > 0 && mb_l > 1 && n_extra == 0) |
| 7 | 4523 { |
| 4524 n_extra = 1; | |
| 3586 | 4525 c_extra = MB_FILLER_CHAR; |
| 7 | 4526 c = ' '; |
| 4527 if (area_attr == 0 && search_attr == 0) | |
| 4528 { | |
| 4529 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
|
4530 extra_attr = HL_ATTR(HLF_AT); |
| 7 | 4531 saved_attr2 = char_attr; /* save current attr */ |
| 4532 } | |
| 4533 mb_c = c; | |
| 4534 mb_utf8 = FALSE; | |
| 4535 mb_l = 1; | |
| 4536 } | |
| 4537 | |
| 4538 } | |
| 4539 #endif | |
| 4540 ++ptr; | |
| 4541 | |
| 4542 if (extra_check) | |
| 4543 { | |
| 743 | 4544 #ifdef FEAT_SPELL |
| 221 | 4545 int can_spell = TRUE; |
| 743 | 4546 #endif |
| 4547 | |
|
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
|
4548 #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
|
4549 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
|
4550 { |
|
11864
97eb443fee5d
patch 8.0.0812: terminal window colors shift when 'number' is set
Christian Brabandt <cb@256bit.org>
parents:
11836
diff
changeset
|
4551 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
|
4552 |
|
f080b225a2a4
patch 8.0.0798: no highlighting in a terminal window with a finished job
Christian Brabandt <cb@256bit.org>
parents:
11834
diff
changeset
|
4553 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
|
4554 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
|
4555 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
|
4556 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
|
4557 } |
|
f080b225a2a4
patch 8.0.0798: no highlighting in a terminal window with a finished job
Christian Brabandt <cb@256bit.org>
parents:
11834
diff
changeset
|
4558 #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
|
4559 |
| 743 | 4560 #ifdef FEAT_SYN_HL |
| 7 | 4561 /* Get syntax attribute, unless still at the start of the line |
| 4562 * (double-wide char that doesn't fit). */ | |
| 221 | 4563 v = (long)(ptr - line); |
| 4564 if (has_syntax && v > 0) | |
| 7 | 4565 { |
| 4566 /* Get the syntax attribute for the character. If there | |
| 4567 * is an error, disable syntax highlighting. */ | |
| 4568 save_did_emsg = did_emsg; | |
| 4569 did_emsg = FALSE; | |
| 4570 | |
| 221 | 4571 syntax_attr = get_syntax_attr((colnr_T)v - 1, |
| 743 | 4572 # ifdef FEAT_SPELL |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
4573 has_spell ? &can_spell : |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
4574 # endif |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
4575 NULL, FALSE); |
| 7 | 4576 |
| 4577 if (did_emsg) | |
| 482 | 4578 { |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
4579 wp->w_s->b_syn_error = TRUE; |
| 482 | 4580 has_syntax = FALSE; |
| 4581 } | |
| 7 | 4582 else |
| 4583 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
|
4584 #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
|
4585 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
|
4586 has_syntax = FALSE; |
|
998d2cf59caa
patch 8.0.0647: syntax highlighting can make cause a freeze
Christian Brabandt <cb@256bit.org>
parents:
11521
diff
changeset
|
4587 #endif |
| 7 | 4588 |
| 4589 /* Need to get the line again, a multi-line regexp may | |
| 4590 * have made it invalid. */ | |
| 4591 line = ml_get_buf(wp->w_buffer, lnum, FALSE); | |
| 4592 ptr = line + v; | |
| 4593 | |
| 674 | 4594 if (!attr_pri) |
| 7 | 4595 char_attr = syntax_attr; |
| 301 | 4596 else |
| 303 | 4597 char_attr = hl_combine_attr(syntax_attr, char_attr); |
|
2364
151b037b7e74
Fix hang when resizing in diff mode and there are concealed items.
Bram Moolenaar <bram@vim.org>
parents:
2359
diff
changeset
|
4598 # 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
|
4599 /* 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
|
4600 * 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
|
4601 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
|
4602 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
|
4603 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
|
4604 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
|
4605 # endif |
| 7 | 4606 } |
| 743 | 4607 #endif |
| 4608 | |
| 4609 #ifdef FEAT_SPELL | |
| 301 | 4610 /* Check spelling (unless at the end of the line). |
| 319 | 4611 * Only do this when there is no syntax highlighting, the |
| 4612 * @Spell cluster is not used or the current syntax item | |
| 4613 * contains the @Spell cluster. */ | |
| 348 | 4614 if (has_spell && v >= word_end && v > cur_checked_col) |
| 221 | 4615 { |
| 230 | 4616 spell_attr = 0; |
| 743 | 4617 # ifdef FEAT_SYN_HL |
| 674 | 4618 if (!attr_pri) |
| 230 | 4619 char_attr = syntax_attr; |
| 743 | 4620 # endif |
| 4621 if (c != 0 && ( | |
| 4622 # ifdef FEAT_SYN_HL | |
| 4623 !has_syntax || | |
| 4624 # endif | |
| 4625 can_spell)) | |
| 221 | 4626 { |
| 348 | 4627 char_u *prev_ptr, *p; |
| 4628 int len; | |
| 534 | 4629 hlf_T spell_hlf = HLF_COUNT; |
| 221 | 4630 # ifdef FEAT_MBYTE |
| 336 | 4631 if (has_mbyte) |
| 4632 { | |
| 4633 prev_ptr = ptr - mb_l; | |
| 4634 v -= mb_l - 1; | |
| 4635 } | |
| 4636 else | |
| 221 | 4637 # endif |
| 336 | 4638 prev_ptr = ptr - 1; |
| 348 | 4639 |
| 4640 /* Use nextline[] if possible, it has the start of the | |
| 4641 * next line concatenated. */ | |
| 4642 if ((prev_ptr - line) - nextlinecol >= 0) | |
| 4643 p = nextline + (prev_ptr - line) - nextlinecol; | |
| 4644 else | |
| 4645 p = prev_ptr; | |
| 835 | 4646 cap_col -= (int)(prev_ptr - line); |
| 625 | 4647 len = spell_check(wp, p, &spell_hlf, &cap_col, |
| 4648 nochange); | |
| 348 | 4649 word_end = v + len; |
| 301 | 4650 |
| 4651 /* In Insert mode only highlight a word that | |
| 4652 * doesn't touch the cursor. */ | |
| 534 | 4653 if (spell_hlf != HLF_COUNT |
| 301 | 4654 && (State & INSERT) != 0 |
| 4655 && wp->w_cursor.lnum == lnum | |
| 4656 && wp->w_cursor.col >= | |
| 4657 (colnr_T)(prev_ptr - line) | |
| 4658 && wp->w_cursor.col < (colnr_T)word_end) | |
| 221 | 4659 { |
| 534 | 4660 spell_hlf = HLF_COUNT; |
| 301 | 4661 spell_redraw_lnum = lnum; |
| 221 | 4662 } |
| 348 | 4663 |
| 534 | 4664 if (spell_hlf == HLF_COUNT && p != prev_ptr |
| 348 | 4665 && (p - nextline) + len > nextline_idx) |
| 4666 { | |
| 4667 /* Remember that the good word continues at the | |
| 4668 * start of the next line. */ | |
| 4669 checked_lnum = lnum + 1; | |
| 835 | 4670 checked_col = (int)((p - nextline) + len - nextline_idx); |
| 348 | 4671 } |
| 386 | 4672 |
| 534 | 4673 /* Turn index into actual attributes. */ |
| 4674 if (spell_hlf != HLF_COUNT) | |
| 4675 spell_attr = highlight_attr[spell_hlf]; | |
| 4676 | |
| 386 | 4677 if (cap_col > 0) |
| 4678 { | |
| 4679 if (p != prev_ptr | |
| 4680 && (p - nextline) + cap_col >= nextline_idx) | |
| 4681 { | |
| 4682 /* Remember that the word in the next line | |
| 4683 * must start with a capital. */ | |
| 4684 capcol_lnum = lnum + 1; | |
| 835 | 4685 cap_col = (int)((p - nextline) + cap_col |
| 4686 - nextline_idx); | |
| 386 | 4687 } |
| 4688 else | |
| 4689 /* Compute the actual column. */ | |
| 835 | 4690 cap_col += (int)(prev_ptr - line); |
| 386 | 4691 } |
| 221 | 4692 } |
| 4693 } | |
| 4694 if (spell_attr != 0) | |
| 348 | 4695 { |
| 674 | 4696 if (!attr_pri) |
| 348 | 4697 char_attr = hl_combine_attr(char_attr, spell_attr); |
| 4698 else | |
| 4699 char_attr = hl_combine_attr(spell_attr, char_attr); | |
| 4700 } | |
| 7 | 4701 #endif |
| 4702 #ifdef FEAT_LINEBREAK | |
| 4703 /* | |
| 221 | 4704 * Found last space before word: check for line break. |
| 7 | 4705 */ |
|
10982
5e20c9f96cd5
patch 8.0.0380: with 'linebreak' double wide char wraps badly
Christian Brabandt <cb@256bit.org>
parents:
10928
diff
changeset
|
4706 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
|
4707 && VIM_ISBREAK(c) && !VIM_ISBREAK((int)*ptr)) |
| 7 | 4708 { |
| 6681 | 4709 # ifdef FEAT_MBYTE |
| 6693 | 4710 int mb_off = has_mbyte ? (*mb_head_off)(line, ptr - 1) : 0; |
| 6681 | 4711 # endif |
| 5995 | 4712 char_u *p = ptr - ( |
| 7 | 4713 # ifdef FEAT_MBYTE |
| 6693 | 4714 mb_off + |
| 7 | 4715 # endif |
| 5995 | 4716 1); |
| 6681 | 4717 |
| 5995 | 4718 /* TODO: is passing p for start of the line OK? */ |
| 6026 | 4719 n_extra = win_lbr_chartabsize(wp, line, p, (colnr_T)vcol, |
| 5995 | 4720 NULL) - 1; |
| 6371 | 4721 if (c == TAB && n_extra + col > W_WIDTH(wp)) |
| 4722 n_extra = (int)wp->w_buffer->b_p_ts | |
| 4723 - vcol % (int)wp->w_buffer->b_p_ts - 1; | |
| 4724 | |
| 6681 | 4725 # ifdef FEAT_MBYTE |
| 6693 | 4726 c_extra = mb_off > 0 ? MB_FILLER_CHAR : ' '; |
| 6681 | 4727 # else |
| 7 | 4728 c_extra = ' '; |
| 6681 | 4729 # endif |
|
11129
f4ea50924c6d
patch 8.0.0452: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11127
diff
changeset
|
4730 if (VIM_ISWHITE(c)) |
|
5174
42d592dbbec3
updated for version 7.4a.013
Bram Moolenaar <bram@vim.org>
parents:
5126
diff
changeset
|
4731 { |
|
42d592dbbec3
updated for version 7.4a.013
Bram Moolenaar <bram@vim.org>
parents:
5126
diff
changeset
|
4732 #ifdef FEAT_CONCEAL |
|
42d592dbbec3
updated for version 7.4a.013
Bram Moolenaar <bram@vim.org>
parents:
5126
diff
changeset
|
4733 if (c == TAB) |
|
42d592dbbec3
updated for version 7.4a.013
Bram Moolenaar <bram@vim.org>
parents:
5126
diff
changeset
|
4734 /* See "Tab alignment" below. */ |
|
42d592dbbec3
updated for version 7.4a.013
Bram Moolenaar <bram@vim.org>
parents:
5126
diff
changeset
|
4735 FIX_FOR_BOGUSCOLS; |
|
42d592dbbec3
updated for version 7.4a.013
Bram Moolenaar <bram@vim.org>
parents:
5126
diff
changeset
|
4736 #endif |
| 6026 | 4737 if (!wp->w_p_list) |
| 4738 c = ' '; | |
|
5174
42d592dbbec3
updated for version 7.4a.013
Bram Moolenaar <bram@vim.org>
parents:
5126
diff
changeset
|
4739 } |
| 7 | 4740 } |
| 4741 #endif | |
| 4742 | |
|
7344
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
4743 /* '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
|
4744 */ |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
4745 if (wp->w_p_list |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
4746 && (((c == 160 |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
4747 #ifdef FEAT_MBYTE |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
4748 || (mb_utf8 && (mb_c == 160 || mb_c == 0x202f)) |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
4749 #endif |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
4750 ) && lcs_nbsp) |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
4751 || (c == ' ' && lcs_space && ptr - line <= trailcol))) |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
4752 { |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
4753 c = (c == ' ') ? lcs_space : lcs_nbsp; |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
4754 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
|
4755 { |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
4756 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
|
4757 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
|
4758 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
|
4759 } |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
4760 #ifdef FEAT_MBYTE |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
4761 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
|
4762 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
|
4763 { |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
4764 mb_utf8 = TRUE; |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
4765 u8cc[0] = 0; |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
4766 c = 0xc0; |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
4767 } |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
4768 else |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
4769 mb_utf8 = FALSE; |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
4770 #endif |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
4771 } |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
4772 |
| 7 | 4773 if (trailcol != MAXCOL && ptr > line + trailcol && c == ' ') |
| 4774 { | |
| 4775 c = lcs_trail; | |
| 674 | 4776 if (!attr_pri) |
| 7 | 4777 { |
| 4778 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
|
4779 extra_attr = HL_ATTR(HLF_8); |
| 7 | 4780 saved_attr2 = char_attr; /* save current attr */ |
| 4781 } | |
| 4782 #ifdef FEAT_MBYTE | |
| 4783 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
|
4784 if (enc_utf8 && utf_char2len(c) > 1) |
| 7 | 4785 { |
| 4786 mb_utf8 = TRUE; | |
| 714 | 4787 u8cc[0] = 0; |
| 819 | 4788 c = 0xc0; |
| 7 | 4789 } |
| 4790 else | |
| 4791 mb_utf8 = FALSE; | |
| 4792 #endif | |
| 4793 } | |
| 4794 } | |
| 4795 | |
| 4796 /* | |
| 4797 * Handling of non-printable characters. | |
| 4798 */ | |
|
7697
f04e2b6feea2
commit https://github.com/vim/vim/commit/88e8f9f14434a7cd538d0c159dc432bea869a5bd
Christian Brabandt <cb@256bit.org>
parents:
7603
diff
changeset
|
4799 if (!vim_isprintc(c)) |
| 7 | 4800 { |
| 4801 /* | |
| 4802 * when getting a character from the file, we may have to | |
| 4803 * turn it into something else on the way to putting it | |
| 4804 * into "ScreenLines". | |
| 4805 */ | |
| 4806 if (c == TAB && (!wp->w_p_list || lcs_tab1)) | |
| 4807 { | |
| 6026 | 4808 int tab_len = 0; |
| 6503 | 4809 long vcol_adjusted = vcol; /* removed showbreak length */ |
| 4810 #ifdef FEAT_LINEBREAK | |
| 4811 /* only adjust the tab_len, when at the first column | |
| 4812 * after the showbreak value was drawn */ | |
| 4813 if (*p_sbr != NUL && vcol == vcol_sbr && wp->w_p_wrap) | |
| 4814 vcol_adjusted = vcol - MB_CHARLEN(p_sbr); | |
| 4815 #endif | |
| 7 | 4816 /* tab amount depends on current column */ |
| 6026 | 4817 tab_len = (int)wp->w_buffer->b_p_ts |
| 6503 | 4818 - vcol_adjusted % (int)wp->w_buffer->b_p_ts - 1; |
| 4819 | |
| 6026 | 4820 #ifdef FEAT_LINEBREAK |
| 6100 | 4821 if (!wp->w_p_lbr || !wp->w_p_list) |
| 6026 | 4822 #endif |
| 4823 /* tab amount depends on current column */ | |
| 4824 n_extra = tab_len; | |
| 4825 #ifdef FEAT_LINEBREAK | |
| 4826 else | |
| 4827 { | |
| 4828 char_u *p; | |
| 4829 int len = n_extra; | |
| 4830 int i; | |
| 4831 int saved_nextra = n_extra; | |
| 4832 | |
| 6172 | 4833 #ifdef FEAT_CONCEAL |
| 6627 | 4834 if (vcol_off > 0) |
| 6172 | 4835 /* there are characters to conceal */ |
| 4836 tab_len += vcol_off; | |
| 6520 | 4837 /* boguscols before FIX_FOR_BOGUSCOLS macro from above |
| 4838 */ | |
| 4839 if (wp->w_p_list && lcs_tab1 && old_boguscols > 0 | |
| 4840 && n_extra > tab_len) | |
| 4841 tab_len += n_extra - tab_len; | |
| 4842 #endif | |
| 4843 | |
| 6026 | 4844 /* if n_extra > 0, it gives the number of chars, to |
| 4845 * use for a tab, else we need to calculate the width | |
| 4846 * for a tab */ | |
| 4847 #ifdef FEAT_MBYTE | |
| 4848 len = (tab_len * mb_char2len(lcs_tab2)); | |
| 4849 if (n_extra > 0) | |
| 4850 len += n_extra - tab_len; | |
| 4851 #endif | |
| 4852 c = lcs_tab1; | |
| 4853 p = alloc((unsigned)(len + 1)); | |
| 4854 vim_memset(p, ' ', len); | |
| 4855 p[len] = NUL; | |
|
10690
206ab11fa76e
patch 8.0.0235: memory leak in diff mode
Christian Brabandt <cb@256bit.org>
parents:
10538
diff
changeset
|
4856 vim_free(p_extra_free); |
| 6026 | 4857 p_extra_free = p; |
| 4858 for (i = 0; i < tab_len; i++) | |
| 4859 { | |
| 4860 #ifdef FEAT_MBYTE | |
| 4861 mb_char2bytes(lcs_tab2, p); | |
| 4862 p += mb_char2len(lcs_tab2); | |
| 4863 n_extra += mb_char2len(lcs_tab2) | |
| 4864 - (saved_nextra > 0 ? 1 : 0); | |
| 4865 #else | |
| 4866 p[i] = lcs_tab2; | |
| 4867 #endif | |
| 4868 } | |
| 4869 p_extra = p_extra_free; | |
| 6172 | 4870 #ifdef FEAT_CONCEAL |
| 4871 /* n_extra will be increased by FIX_FOX_BOGUSCOLS | |
| 4872 * macro below, so need to adjust for that here */ | |
| 6627 | 4873 if (vcol_off > 0) |
| 6172 | 4874 n_extra -= vcol_off; |
| 4875 #endif | |
| 6026 | 4876 } |
| 4877 #endif | |
| 3984 | 4878 #ifdef FEAT_CONCEAL |
| 6627 | 4879 { |
| 4880 int vc_saved = vcol_off; | |
| 4881 | |
| 4882 /* Tab alignment should be identical regardless of | |
| 4883 * 'conceallevel' value. So tab compensates of all | |
| 4884 * previous concealed characters, and thus resets | |
| 4885 * vcol_off and boguscols accumulated so far in the | |
| 4886 * line. Note that the tab can be longer than | |
| 4887 * 'tabstop' when there are concealed characters. */ | |
| 4888 FIX_FOR_BOGUSCOLS; | |
| 4889 | |
| 4890 /* Make sure, the highlighting for the tab char will be | |
| 4891 * correctly set further below (effectively reverts the | |
| 4892 * FIX_FOR_BOGSUCOLS macro */ | |
| 4893 if (n_extra == tab_len + vc_saved && wp->w_p_list | |
| 6520 | 4894 && lcs_tab1) |
| 6627 | 4895 tab_len += vc_saved; |
| 4896 } | |
| 3984 | 4897 #endif |
| 7 | 4898 #ifdef FEAT_MBYTE |
| 4899 mb_utf8 = FALSE; /* don't draw as UTF-8 */ | |
| 4900 #endif | |
| 4901 if (wp->w_p_list) | |
| 4902 { | |
| 4903 c = lcs_tab1; | |
| 6026 | 4904 #ifdef FEAT_LINEBREAK |
| 4905 if (wp->w_p_lbr) | |
| 4906 c_extra = NUL; /* using p_extra from above */ | |
| 4907 else | |
| 4908 #endif | |
| 4909 c_extra = lcs_tab2; | |
| 4910 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
|
4911 extra_attr = HL_ATTR(HLF_8); |
| 7 | 4912 saved_attr2 = char_attr; /* save current attr */ |
| 4913 #ifdef FEAT_MBYTE | |
| 4914 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
|
4915 if (enc_utf8 && utf_char2len(c) > 1) |
| 7 | 4916 { |
| 4917 mb_utf8 = TRUE; | |
| 714 | 4918 u8cc[0] = 0; |
| 819 | 4919 c = 0xc0; |
| 7 | 4920 } |
| 4921 #endif | |
| 4922 } | |
| 4923 else | |
| 4924 { | |
| 4925 c_extra = ' '; | |
| 4926 c = ' '; | |
| 4927 } | |
| 4928 } | |
| 36 | 4929 else if (c == NUL |
| 6799 | 4930 && (wp->w_p_list |
| 36 | 4931 || ((fromcol >= 0 || fromcol_prev >= 0) |
| 4932 && tocol > vcol | |
| 4933 && VIsual_mode != Ctrl_V | |
| 4934 && ( | |
| 4935 # ifdef FEAT_RIGHTLEFT | |
| 4936 wp->w_p_rl ? (col >= 0) : | |
| 4937 # endif | |
| 4938 (col < W_WIDTH(wp))) | |
| 4939 && !(noinvcur | |
| 1850 | 4940 && lnum == wp->w_cursor.lnum |
| 36 | 4941 && (colnr_T)vcol == wp->w_virtcol))) |
| 6815 | 4942 && lcs_eol_one > 0) |
| 7 | 4943 { |
| 36 | 4944 /* Display a '$' after the line or highlight an extra |
| 4945 * character if the line break is included. */ | |
| 7 | 4946 #if defined(FEAT_DIFF) || defined(LINE_ATTR) |
| 4947 /* For a diff line the highlighting continues after the | |
| 4948 * "$". */ | |
| 4949 if ( | |
| 4950 # ifdef FEAT_DIFF | |
| 534 | 4951 diff_hlf == (hlf_T)0 |
| 7 | 4952 # ifdef LINE_ATTR |
| 4953 && | |
| 4954 # endif | |
| 4955 # endif | |
| 4956 # ifdef LINE_ATTR | |
| 4957 line_attr == 0 | |
| 4958 # endif | |
| 4959 ) | |
| 4960 #endif | |
| 4961 { | |
| 4962 #ifdef FEAT_VIRTUALEDIT | |
| 4963 /* In virtualedit, visual selections may extend | |
| 4964 * beyond end of line. */ | |
| 4965 if (area_highlighting && virtual_active() | |
| 4966 && tocol != MAXCOL && vcol < tocol) | |
| 4967 n_extra = 0; | |
| 4968 else | |
| 4969 #endif | |
| 4970 { | |
| 4971 p_extra = at_end_str; | |
| 4972 n_extra = 1; | |
| 4973 c_extra = NUL; | |
| 4974 } | |
| 4975 } | |
| 6799 | 4976 if (wp->w_p_list && lcs_eol > 0) |
| 36 | 4977 c = lcs_eol; |
| 4978 else | |
| 4979 c = ' '; | |
| 7 | 4980 lcs_eol_one = -1; |
| 4981 --ptr; /* put it back at the NUL */ | |
| 674 | 4982 if (!attr_pri) |
| 7 | 4983 { |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
4984 extra_attr = HL_ATTR(HLF_AT); |
| 7 | 4985 n_attr = 1; |
| 4986 } | |
| 4987 #ifdef FEAT_MBYTE | |
| 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 else | |
| 4996 mb_utf8 = FALSE; /* don't draw as UTF-8 */ | |
| 4997 #endif | |
| 4998 } | |
| 4999 else if (c != NUL) | |
| 5000 { | |
| 5001 p_extra = transchar(c); | |
| 6064 | 5002 if (n_extra == 0) |
| 5003 n_extra = byte2cells(c) - 1; | |
| 7 | 5004 #ifdef FEAT_RIGHTLEFT |
| 5005 if ((dy_flags & DY_UHEX) && wp->w_p_rl) | |
| 5006 rl_mirror(p_extra); /* reverse "<12>" */ | |
| 5007 #endif | |
| 5008 c_extra = NUL; | |
| 6026 | 5009 #ifdef FEAT_LINEBREAK |
| 5010 if (wp->w_p_lbr) | |
| 5011 { | |
| 5012 char_u *p; | |
| 5013 | |
| 5014 c = *p_extra; | |
| 5015 p = alloc((unsigned)n_extra + 1); | |
| 5016 vim_memset(p, ' ', n_extra); | |
| 5017 STRNCPY(p, p_extra + 1, STRLEN(p_extra) - 1); | |
| 5018 p[n_extra] = NUL; | |
|
10690
206ab11fa76e
patch 8.0.0235: memory leak in diff mode
Christian Brabandt <cb@256bit.org>
parents:
10538
diff
changeset
|
5019 vim_free(p_extra_free); |
| 6026 | 5020 p_extra_free = p_extra = p; |
| 5021 } | |
| 5022 else | |
| 5023 #endif | |
| 5024 { | |
| 5025 n_extra = byte2cells(c) - 1; | |
| 5026 c = *p_extra++; | |
| 5027 } | |
| 674 | 5028 if (!attr_pri) |
| 7 | 5029 { |
| 5030 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
|
5031 extra_attr = HL_ATTR(HLF_8); |
| 7 | 5032 saved_attr2 = char_attr; /* save current attr */ |
| 5033 } | |
| 5034 #ifdef FEAT_MBYTE | |
| 5035 mb_utf8 = FALSE; /* don't draw as UTF-8 */ | |
| 5036 #endif | |
| 5037 } | |
| 5038 #ifdef FEAT_VIRTUALEDIT | |
| 5039 else if (VIsual_active | |
| 5040 && (VIsual_mode == Ctrl_V | |
| 5041 || VIsual_mode == 'v') | |
| 5042 && virtual_active() | |
| 5043 && tocol != MAXCOL | |
| 5044 && vcol < tocol | |
| 5045 && ( | |
| 5046 # ifdef FEAT_RIGHTLEFT | |
| 5047 wp->w_p_rl ? (col >= 0) : | |
| 5048 # endif | |
| 5049 (col < W_WIDTH(wp)))) | |
| 5050 { | |
| 5051 c = ' '; | |
| 5052 --ptr; /* put it back at the NUL */ | |
| 5053 } | |
| 5054 #endif | |
| 910 | 5055 #if defined(LINE_ATTR) |
| 7 | 5056 else if (( |
| 5057 # ifdef FEAT_DIFF | |
| 910 | 5058 diff_hlf != (hlf_T)0 || |
| 7 | 5059 # endif |
| 5060 line_attr != 0 | |
| 5061 ) && ( | |
| 5062 # ifdef FEAT_RIGHTLEFT | |
| 5063 wp->w_p_rl ? (col >= 0) : | |
| 5064 # endif | |
|
2553
37d3f90f5203
Conceal feature caused the 'cursorline' highlighting to stop early.
Bram Moolenaar <bram@vim.org>
parents:
2520
diff
changeset
|
5065 (col |
|
37d3f90f5203
Conceal feature caused the 'cursorline' highlighting to stop early.
Bram Moolenaar <bram@vim.org>
parents:
2520
diff
changeset
|
5066 # ifdef FEAT_CONCEAL |
|
37d3f90f5203
Conceal feature caused the 'cursorline' highlighting to stop early.
Bram Moolenaar <bram@vim.org>
parents:
2520
diff
changeset
|
5067 - boguscols |
|
37d3f90f5203
Conceal feature caused the 'cursorline' highlighting to stop early.
Bram Moolenaar <bram@vim.org>
parents:
2520
diff
changeset
|
5068 # endif |
|
37d3f90f5203
Conceal feature caused the 'cursorline' highlighting to stop early.
Bram Moolenaar <bram@vim.org>
parents:
2520
diff
changeset
|
5069 < W_WIDTH(wp)))) |
| 7 | 5070 { |
| 5071 /* Highlight until the right side of the window */ | |
| 5072 c = ' '; | |
| 5073 --ptr; /* put it back at the NUL */ | |
| 867 | 5074 |
| 5075 /* Remember we do the char for line highlighting. */ | |
| 5076 ++did_line_attr; | |
| 5077 | |
| 5078 /* don't do search HL for the rest of the line */ | |
| 5079 if (line_attr != 0 && char_attr == search_attr && col > 0) | |
| 5080 char_attr = line_attr; | |
| 7 | 5081 # ifdef FEAT_DIFF |
| 5082 if (diff_hlf == HLF_TXD) | |
| 5083 { | |
| 5084 diff_hlf = HLF_CHD; | |
| 5085 if (attr == 0 || char_attr != attr) | |
| 6106 | 5086 { |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
5087 char_attr = HL_ATTR(diff_hlf); |
| 6106 | 5088 if (wp->w_p_cul && lnum == wp->w_cursor.lnum) |
| 5089 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
|
5090 HL_ATTR(HLF_CUL)); |
| 6106 | 5091 } |
| 7 | 5092 } |
| 5093 # endif | |
| 5094 } | |
| 5095 #endif | |
| 5096 } | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5097 |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5098 #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
|
5099 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
|
5100 && (wp != curwin || lnum != wp->w_cursor.lnum || |
| 6947 | 5101 conceal_cursor_line(wp) ) |
|
8907
5deb9e8f4292
commit https://github.com/vim/vim/commit/4d585022023b96f6507e8cae5ed8fc8d926f5140
Christian Brabandt <cb@256bit.org>
parents:
8872
diff
changeset
|
5102 && ( (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
|
5103 && !(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
|
5104 && 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
|
5105 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5106 char_attr = conceal_attr; |
|
8907
5deb9e8f4292
commit https://github.com/vim/vim/commit/4d585022023b96f6507e8cae5ed8fc8d926f5140
Christian Brabandt <cb@256bit.org>
parents:
8872
diff
changeset
|
5107 if ((prev_syntax_id != syntax_seqnr || has_match_conc > 1) |
| 6947 | 5108 && (syn_get_sub_char() != NUL || match_conc |
| 5109 || 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
|
5110 && 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
|
5111 { |
|
a96dd77ce213
For conceal mode: when two different syntax items follow each other, show the
Bram Moolenaar <bram@vim.org>
parents:
2364
diff
changeset
|
5112 /* 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
|
5113 * character. */ |
| 6947 | 5114 if (match_conc) |
| 5115 c = match_conc; | |
| 5116 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
|
5117 c = syn_get_sub_char(); |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5118 else if (lcs_conceal != NUL) |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5119 c = lcs_conceal; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5120 else |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5121 c = ' '; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5122 |
|
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
|
5123 prev_syntax_id = syntax_seqnr; |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5124 |
|
2332
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
5125 if (n_extra > 0) |
|
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
5126 vcol_off += n_extra; |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5127 vcol += n_extra; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5128 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
|
5129 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5130 # ifdef FEAT_RIGHTLEFT |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5131 if (wp->w_p_rl) |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5132 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5133 col -= n_extra; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5134 boguscols -= n_extra; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5135 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5136 else |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5137 # endif |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5138 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5139 boguscols += n_extra; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5140 col += n_extra; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5141 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5142 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5143 n_extra = 0; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5144 n_attr = 0; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5145 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5146 else if (n_skip == 0) |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5147 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5148 is_concealing = TRUE; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5149 n_skip = 1; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5150 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5151 # ifdef FEAT_MBYTE |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5152 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
|
5153 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
|
5154 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5155 mb_utf8 = TRUE; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5156 u8cc[0] = 0; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5157 c = 0xc0; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5158 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5159 else |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5160 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
|
5161 # endif |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5162 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5163 else |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5164 { |
|
2375
a96dd77ce213
For conceal mode: when two different syntax items follow each other, show the
Bram Moolenaar <bram@vim.org>
parents:
2364
diff
changeset
|
5165 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
|
5166 is_concealing = FALSE; |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5167 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5168 #endif /* FEAT_CONCEAL */ |
| 7 | 5169 } |
| 5170 | |
|
2378
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
5171 #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
|
5172 /* 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
|
5173 * 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
|
5174 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
|
5175 && 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
|
5176 && 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
|
5177 && (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
|
5178 { |
|
7603
d3892f6c917e
commit https://github.com/vim/vim/commit/e39b3d9fb4e4006684c33847d1ef6a0d742699dd
Christian Brabandt <cb@256bit.org>
parents:
7344
diff
changeset
|
5179 # ifdef FEAT_RIGHTLEFT |
|
d3892f6c917e
commit https://github.com/vim/vim/commit/e39b3d9fb4e4006684c33847d1ef6a0d742699dd
Christian Brabandt <cb@256bit.org>
parents:
7344
diff
changeset
|
5180 if (wp->w_p_rl) |
|
d3892f6c917e
commit https://github.com/vim/vim/commit/e39b3d9fb4e4006684c33847d1ef6a0d742699dd
Christian Brabandt <cb@256bit.org>
parents:
7344
diff
changeset
|
5181 wp->w_wcol = W_WIDTH(wp) - col + boguscols - 1; |
|
d3892f6c917e
commit https://github.com/vim/vim/commit/e39b3d9fb4e4006684c33847d1ef6a0d742699dd
Christian Brabandt <cb@256bit.org>
parents:
7344
diff
changeset
|
5182 else |
|
d3892f6c917e
commit https://github.com/vim/vim/commit/e39b3d9fb4e4006684c33847d1ef6a0d742699dd
Christian Brabandt <cb@256bit.org>
parents:
7344
diff
changeset
|
5183 # endif |
|
d3892f6c917e
commit https://github.com/vim/vim/commit/e39b3d9fb4e4006684c33847d1ef6a0d742699dd
Christian Brabandt <cb@256bit.org>
parents:
7344
diff
changeset
|
5184 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
|
5185 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
|
5186 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
|
5187 } |
|
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
5188 #endif |
|
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
5189 |
| 7 | 5190 /* Don't override visual selection highlighting. */ |
| 5191 if (n_attr > 0 | |
| 5192 && draw_state == WL_LINE | |
| 674 | 5193 && !attr_pri) |
| 7 | 5194 char_attr = extra_attr; |
| 5195 | |
| 42 | 5196 #if defined(FEAT_XIM) && defined(FEAT_GUI_GTK) |
| 7 | 5197 /* XIM don't send preedit_start and preedit_end, but they send |
| 5198 * preedit_changed and commit. Thus Vim can't set "im_is_active", use | |
| 5199 * im_is_preediting() here. */ | |
| 5200 if (xic != NULL | |
| 1850 | 5201 && lnum == wp->w_cursor.lnum |
| 7 | 5202 && (State & INSERT) |
| 5203 && !p_imdisable | |
| 5204 && im_is_preediting() | |
| 5205 && draw_state == WL_LINE) | |
| 5206 { | |
| 5207 colnr_T tcol; | |
| 5208 | |
| 5209 if (preedit_end_col == MAXCOL) | |
| 1850 | 5210 getvcol(curwin, &(wp->w_cursor), &tcol, NULL, NULL); |
| 7 | 5211 else |
| 5212 tcol = preedit_end_col; | |
| 5213 if ((long)preedit_start_col <= vcol && vcol < (long)tcol) | |
| 5214 { | |
| 5215 if (feedback_old_attr < 0) | |
| 5216 { | |
| 5217 feedback_col = 0; | |
| 5218 feedback_old_attr = char_attr; | |
| 5219 } | |
| 5220 char_attr = im_get_feedback_attr(feedback_col); | |
| 5221 if (char_attr < 0) | |
| 5222 char_attr = feedback_old_attr; | |
| 5223 feedback_col++; | |
| 5224 } | |
| 5225 else if (feedback_old_attr >= 0) | |
| 5226 { | |
| 5227 char_attr = feedback_old_attr; | |
| 5228 feedback_old_attr = -1; | |
| 5229 feedback_col = 0; | |
| 5230 } | |
| 5231 } | |
| 5232 #endif | |
| 5233 /* | |
| 5234 * Handle the case where we are in column 0 but not on the first | |
| 5235 * character of the line and the user wants us to show us a | |
| 5236 * special character (via 'listchars' option "precedes:<char>". | |
| 5237 */ | |
| 5238 if (lcs_prec_todo != NUL | |
| 6276 | 5239 && wp->w_p_list |
| 7 | 5240 && (wp->w_p_wrap ? wp->w_skipcol > 0 : wp->w_leftcol > 0) |
| 5241 #ifdef FEAT_DIFF | |
| 5242 && filler_todo <= 0 | |
| 5243 #endif | |
| 5244 && draw_state > WL_NR | |
| 5245 && c != NUL) | |
| 5246 { | |
| 5247 c = lcs_prec; | |
| 5248 lcs_prec_todo = NUL; | |
| 5249 #ifdef FEAT_MBYTE | |
| 3586 | 5250 if (has_mbyte && (*mb_char2cells)(mb_c) > 1) |
| 5251 { | |
| 5252 /* Double-width character being overwritten by the "precedes" | |
| 5253 * character, need to fill up half the character. */ | |
| 5254 c_extra = MB_FILLER_CHAR; | |
| 5255 n_extra = 1; | |
| 5256 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
|
5257 extra_attr = HL_ATTR(HLF_AT); |
| 3586 | 5258 } |
| 7 | 5259 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
|
5260 if (enc_utf8 && utf_char2len(c) > 1) |
| 7 | 5261 { |
| 5262 mb_utf8 = TRUE; | |
| 714 | 5263 u8cc[0] = 0; |
| 819 | 5264 c = 0xc0; |
| 7 | 5265 } |
| 5266 else | |
| 5267 mb_utf8 = FALSE; /* don't draw as UTF-8 */ | |
| 5268 #endif | |
| 674 | 5269 if (!attr_pri) |
| 7 | 5270 { |
| 5271 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
|
5272 char_attr = HL_ATTR(HLF_AT); /* later copied to char_attr */ |
| 7 | 5273 n_attr3 = 1; |
| 5274 } | |
| 5275 } | |
| 5276 | |
| 5277 /* | |
| 867 | 5278 * At end of the text line or just after the last character. |
| 7 | 5279 */ |
| 867 | 5280 if (c == NUL |
| 910 | 5281 #if defined(LINE_ATTR) |
| 867 | 5282 || did_line_attr == 1 |
| 5283 #endif | |
| 5284 ) | |
| 5285 { | |
| 5286 #ifdef FEAT_SEARCH_EXTRA | |
| 5287 long prevcol = (long)(ptr - line) - (c == NUL); | |
| 1437 | 5288 |
| 5289 /* we're not really at that column when skipping some text */ | |
| 1439 | 5290 if ((long)(wp->w_p_wrap ? wp->w_skipcol : wp->w_leftcol) > prevcol) |
| 1437 | 5291 ++prevcol; |
| 867 | 5292 #endif |
| 5293 | |
|
2332
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
5294 /* Invert at least one char, used for Visual and empty line or |
| 7 | 5295 * highlight match at end of line. If it's beyond the last |
| 5296 * char on the screen, just overwrite that one (tricky!) Not | |
| 5297 * needed when a '$' was displayed for 'list'. */ | |
| 1326 | 5298 #ifdef FEAT_SEARCH_EXTRA |
| 5299 prevcol_hl_flag = FALSE; | |
|
9885
4e8b05fa12c6
commit https://github.com/vim/vim/commit/4f416e41243ca151b95d39d81ce23d00b1484755
Christian Brabandt <cb@256bit.org>
parents:
9877
diff
changeset
|
5300 if (!search_hl.is_addpos && prevcol == (long)search_hl.startcol) |
| 1326 | 5301 prevcol_hl_flag = TRUE; |
| 5302 else | |
| 5303 { | |
| 5304 cur = wp->w_match_head; | |
| 5305 while (cur != NULL) | |
| 5306 { | |
|
9885
4e8b05fa12c6
commit https://github.com/vim/vim/commit/4f416e41243ca151b95d39d81ce23d00b1484755
Christian Brabandt <cb@256bit.org>
parents:
9877
diff
changeset
|
5307 if (!cur->hl.is_addpos && prevcol == (long)cur->hl.startcol) |
| 1326 | 5308 { |
| 5309 prevcol_hl_flag = TRUE; | |
| 5310 break; | |
| 5311 } | |
| 5312 cur = cur->next; | |
| 5313 } | |
| 5314 } | |
| 5315 #endif | |
| 7 | 5316 if (lcs_eol == lcs_eol_one |
| 1850 | 5317 && ((area_attr != 0 && vcol == fromcol |
| 5318 && (VIsual_mode != Ctrl_V | |
| 5319 || lnum == VIsual.lnum | |
| 5320 || lnum == curwin->w_cursor.lnum) | |
| 5321 && c == NUL) | |
| 7 | 5322 #ifdef FEAT_SEARCH_EXTRA |
| 5323 /* highlight 'hlsearch' match at end of line */ | |
| 1326 | 5324 || (prevcol_hl_flag == TRUE |
| 910 | 5325 # if defined(LINE_ATTR) |
| 867 | 5326 && did_line_attr <= 1 |
| 5327 # endif | |
| 5328 ) | |
| 7 | 5329 #endif |
| 5330 )) | |
| 5331 { | |
| 5332 int n = 0; | |
| 5333 | |
| 5334 #ifdef FEAT_RIGHTLEFT | |
| 5335 if (wp->w_p_rl) | |
| 5336 { | |
| 5337 if (col < 0) | |
| 5338 n = 1; | |
| 5339 } | |
| 5340 else | |
| 5341 #endif | |
| 5342 { | |
| 5343 if (col >= W_WIDTH(wp)) | |
| 5344 n = -1; | |
| 5345 } | |
| 5346 if (n != 0) | |
| 5347 { | |
| 5348 /* At the window boundary, highlight the last character | |
| 5349 * instead (better than nothing). */ | |
| 5350 off += n; | |
| 5351 col += n; | |
| 5352 } | |
| 5353 else | |
| 5354 { | |
| 5355 /* Add a blank character to highlight. */ | |
| 5356 ScreenLines[off] = ' '; | |
| 5357 #ifdef FEAT_MBYTE | |
| 5358 if (enc_utf8) | |
| 5359 ScreenLinesUC[off] = 0; | |
| 5360 #endif | |
| 5361 } | |
| 5362 #ifdef FEAT_SEARCH_EXTRA | |
| 5363 if (area_attr == 0) | |
| 5364 { | |
| 1326 | 5365 /* Use attributes from match with highest priority among |
| 5366 * 'search_hl' and the match list. */ | |
| 5367 char_attr = search_hl.attr; | |
| 5368 cur = wp->w_match_head; | |
| 5369 shl_flag = FALSE; | |
| 5370 while (cur != NULL || shl_flag == FALSE) | |
| 699 | 5371 { |
| 1326 | 5372 if (shl_flag == FALSE |
| 5373 && ((cur != NULL | |
| 5374 && cur->priority > SEARCH_HL_PRIORITY) | |
| 5375 || cur == NULL)) | |
| 699 | 5376 { |
| 1326 | 5377 shl = &search_hl; |
| 5378 shl_flag = TRUE; | |
| 699 | 5379 } |
| 1326 | 5380 else |
| 5381 shl = &cur->hl; | |
|
9885
4e8b05fa12c6
commit https://github.com/vim/vim/commit/4f416e41243ca151b95d39d81ce23d00b1484755
Christian Brabandt <cb@256bit.org>
parents:
9877
diff
changeset
|
5382 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
|
5383 && (shl == &search_hl || !shl->is_addpos)) |
| 1326 | 5384 char_attr = shl->attr; |
| 5385 if (shl != &search_hl && cur != NULL) | |
| 5386 cur = cur->next; | |
| 699 | 5387 } |
| 7 | 5388 } |
| 5389 #endif | |
| 5390 ScreenAttrs[off] = char_attr; | |
| 5391 #ifdef FEAT_RIGHTLEFT | |
| 5392 if (wp->w_p_rl) | |
| 1437 | 5393 { |
| 7 | 5394 --col; |
| 1437 | 5395 --off; |
| 5396 } | |
| 7 | 5397 else |
| 5398 #endif | |
| 1437 | 5399 { |
| 7 | 5400 ++col; |
| 1437 | 5401 ++off; |
| 5402 } | |
| 743 | 5403 ++vcol; |
| 1437 | 5404 #ifdef FEAT_SYN_HL |
| 5405 eol_hl_off = 1; | |
| 5406 #endif | |
| 743 | 5407 } |
| 867 | 5408 } |
| 5409 | |
| 5410 /* | |
| 5411 * At end of the text line. | |
| 5412 */ | |
| 5413 if (c == NUL) | |
| 5414 { | |
| 743 | 5415 #ifdef FEAT_SYN_HL |
| 1850 | 5416 if (eol_hl_off > 0 && vcol - eol_hl_off == (long)wp->w_virtcol |
| 5417 && lnum == wp->w_cursor.lnum) | |
| 1437 | 5418 { |
| 5419 /* highlight last char after line */ | |
| 5420 --col; | |
| 5421 --off; | |
| 5422 --vcol; | |
| 5423 } | |
| 5424 | |
|
2314
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5425 /* Highlight 'cursorcolumn' & 'colorcolumn' past end of the line. */ |
| 758 | 5426 if (wp->w_p_wrap) |
| 5427 v = wp->w_skipcol; | |
| 5428 else | |
| 5429 v = wp->w_leftcol; | |
|
2314
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5430 |
| 820 | 5431 /* check if line ends before left margin */ |
| 5432 if (vcol < v + col - win_col_off(wp)) | |
| 5433 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
|
5434 #ifdef FEAT_CONCEAL |
|
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
5435 /* 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
|
5436 * edge for 'cursorcolumn'. */ |
|
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
5437 col -= boguscols; |
|
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
5438 boguscols = 0; |
|
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
5439 #endif |
|
2314
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5440 |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5441 if (draw_color_col) |
|
2332
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
5442 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
|
5443 |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5444 if (((wp->w_p_cuc |
|
2332
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
5445 && (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
|
5446 && (int)wp->w_virtcol < |
|
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
5447 W_WIDTH(wp) * (row - startrow + 1) + v |
|
2314
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5448 && lnum != wp->w_cursor.lnum) |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5449 || draw_color_col) |
| 743 | 5450 # ifdef FEAT_RIGHTLEFT |
| 5451 && !wp->w_p_rl | |
| 5452 # endif | |
| 5453 ) | |
| 5454 { | |
|
2314
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5455 int rightmost_vcol = 0; |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5456 int i; |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5457 |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5458 if (wp->w_p_cuc) |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5459 rightmost_vcol = wp->w_virtcol; |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5460 if (draw_color_col) |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5461 /* determine rightmost colorcolumn to possibly draw */ |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5462 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
|
5463 if (rightmost_vcol < color_cols[i]) |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5464 rightmost_vcol = color_cols[i]; |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5465 |
| 743 | 5466 while (col < W_WIDTH(wp)) |
| 5467 { | |
| 5468 ScreenLines[off] = ' '; | |
| 5469 #ifdef FEAT_MBYTE | |
| 5470 if (enc_utf8) | |
| 5471 ScreenLinesUC[off] = 0; | |
| 5472 #endif | |
| 5473 ++col; | |
|
2356
eb1f2554cac5
Fix 'colorcolumn' adjecent columns not highlighted after end of line.
Bram Moolenaar <bram@vim.org>
parents:
2349
diff
changeset
|
5474 if (draw_color_col) |
|
eb1f2554cac5
Fix 'colorcolumn' adjecent columns not highlighted after end of line.
Bram Moolenaar <bram@vim.org>
parents:
2349
diff
changeset
|
5475 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
|
5476 &color_cols); |
|
eb1f2554cac5
Fix 'colorcolumn' adjecent columns not highlighted after end of line.
Bram Moolenaar <bram@vim.org>
parents:
2349
diff
changeset
|
5477 |
|
2332
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
5478 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
|
5479 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
|
5480 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
|
5481 ScreenAttrs[off++] = HL_ATTR(HLF_MC); |
|
2314
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5482 else |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5483 ScreenAttrs[off++] = 0; |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5484 |
|
2332
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
5485 if (VCOL_HLC >= rightmost_vcol) |
| 743 | 5486 break; |
|
2314
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5487 |
| 743 | 5488 ++vcol; |
| 5489 } | |
| 5490 } | |
| 5491 #endif | |
| 7 | 5492 |
|
11670
3b2afa2b77b3
patch 8.0.0718: output of job in terminal is not displayed
Christian Brabandt <cb@256bit.org>
parents:
11657
diff
changeset
|
5493 screen_line(screen_row, W_WINCOL(wp), col, |
|
11672
3c6cc2f24645
patch 8.0.0719: build failure without +terminal feature
Christian Brabandt <cb@256bit.org>
parents:
11670
diff
changeset
|
5494 (int)W_WIDTH(wp), HAS_RIGHTLEFT(wp->w_p_rl)); |
| 7 | 5495 row++; |
| 5496 | |
| 5497 /* | |
| 5498 * Update w_cline_height and w_cline_folded if the cursor line was | |
| 5499 * updated (saves a call to plines() later). | |
| 5500 */ | |
| 5501 if (wp == curwin && lnum == curwin->w_cursor.lnum) | |
| 5502 { | |
| 5503 curwin->w_cline_row = startrow; | |
| 5504 curwin->w_cline_height = row - startrow; | |
| 5505 #ifdef FEAT_FOLDING | |
| 5506 curwin->w_cline_folded = FALSE; | |
| 5507 #endif | |
| 5508 curwin->w_valid |= (VALID_CHEIGHT|VALID_CROW); | |
| 5509 } | |
| 5510 | |
| 5511 break; | |
| 5512 } | |
| 5513 | |
| 5514 /* line continues beyond line end */ | |
| 5515 if (lcs_ext | |
| 5516 && !wp->w_p_wrap | |
| 5517 #ifdef FEAT_DIFF | |
| 5518 && filler_todo <= 0 | |
| 5519 #endif | |
| 5520 && ( | |
| 5521 #ifdef FEAT_RIGHTLEFT | |
| 5522 wp->w_p_rl ? col == 0 : | |
| 5523 #endif | |
| 5524 col == W_WIDTH(wp) - 1) | |
| 5525 && (*ptr != NUL | |
| 1555 | 5526 || (wp->w_p_list && lcs_eol_one > 0) |
| 7 | 5527 || (n_extra && (c_extra != NUL || *p_extra != NUL)))) |
| 5528 { | |
| 5529 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
|
5530 char_attr = HL_ATTR(HLF_AT); |
| 7 | 5531 #ifdef FEAT_MBYTE |
| 5532 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
|
5533 if (enc_utf8 && utf_char2len(c) > 1) |
| 7 | 5534 { |
| 5535 mb_utf8 = TRUE; | |
| 714 | 5536 u8cc[0] = 0; |
| 819 | 5537 c = 0xc0; |
| 7 | 5538 } |
| 5539 else | |
| 5540 mb_utf8 = FALSE; | |
| 5541 #endif | |
| 5542 } | |
| 5543 | |
| 743 | 5544 #ifdef FEAT_SYN_HL |
|
2314
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5545 /* advance to the next 'colorcolumn' */ |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5546 if (draw_color_col) |
|
2332
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
5547 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
|
5548 |
| 743 | 5549 /* 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
|
5550 * highlight the cursor position itself. |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5551 * 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
|
5552 * 'cursorcolumn' */ |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5553 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
|
5554 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
|
5555 && search_attr == 0 && area_attr == 0) |
|
2314
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5556 { |
|
2332
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
5557 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
|
5558 && lnum != wp->w_cursor.lnum) |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5559 { |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5560 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
|
5561 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
|
5562 } |
|
2346
b38c324bdc36
Fix: 'colorcolumn' interfered with concealed text.
Bram Moolenaar <bram@vim.org>
parents:
2338
diff
changeset
|
5563 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
|
5564 { |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5565 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
|
5566 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
|
5567 } |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5568 } |
| 743 | 5569 #endif |
| 5570 | |
| 7 | 5571 /* |
| 5572 * Store character to be displayed. | |
| 5573 * Skip characters that are left of the screen for 'nowrap'. | |
| 5574 */ | |
| 5575 vcol_prev = vcol; | |
| 5576 if (draw_state < WL_LINE || n_skip <= 0) | |
| 5577 { | |
| 5578 /* | |
| 5579 * Store the character. | |
| 5580 */ | |
| 5581 #if defined(FEAT_RIGHTLEFT) && defined(FEAT_MBYTE) | |
| 5582 if (has_mbyte && wp->w_p_rl && (*mb_char2cells)(mb_c) > 1) | |
| 5583 { | |
| 5584 /* A double-wide character is: put first halve in left cell. */ | |
| 5585 --off; | |
| 5586 --col; | |
| 5587 } | |
| 5588 #endif | |
| 5589 ScreenLines[off] = c; | |
| 5590 #ifdef FEAT_MBYTE | |
| 5591 if (enc_dbcs == DBCS_JPNU) | |
|
2069
63613d8d7e4d
updated for version 7.2.354
Bram Moolenaar <bram@zimbu.org>
parents:
2055
diff
changeset
|
5592 { |
|
63613d8d7e4d
updated for version 7.2.354
Bram Moolenaar <bram@zimbu.org>
parents:
2055
diff
changeset
|
5593 if ((mb_c & 0xff00) == 0x8e00) |
|
63613d8d7e4d
updated for version 7.2.354
Bram Moolenaar <bram@zimbu.org>
parents:
2055
diff
changeset
|
5594 ScreenLines[off] = 0x8e; |
| 7 | 5595 ScreenLines2[off] = mb_c & 0xff; |
|
2069
63613d8d7e4d
updated for version 7.2.354
Bram Moolenaar <bram@zimbu.org>
parents:
2055
diff
changeset
|
5596 } |
| 7 | 5597 else if (enc_utf8) |
| 5598 { | |
| 5599 if (mb_utf8) | |
| 5600 { | |
| 1326 | 5601 int i; |
| 5602 | |
| 7 | 5603 ScreenLinesUC[off] = mb_c; |
| 819 | 5604 if ((c & 0xff) == 0) |
| 5605 ScreenLines[off] = 0x80; /* avoid storing zero */ | |
| 714 | 5606 for (i = 0; i < Screen_mco; ++i) |
| 5607 { | |
| 5608 ScreenLinesC[i][off] = u8cc[i]; | |
| 5609 if (u8cc[i] == 0) | |
| 5610 break; | |
| 5611 } | |
| 7 | 5612 } |
| 5613 else | |
| 5614 ScreenLinesUC[off] = 0; | |
| 5615 } | |
| 5616 if (multi_attr) | |
| 5617 { | |
| 5618 ScreenAttrs[off] = multi_attr; | |
| 5619 multi_attr = 0; | |
| 5620 } | |
| 5621 else | |
| 5622 #endif | |
| 5623 ScreenAttrs[off] = char_attr; | |
| 5624 | |
| 5625 #ifdef FEAT_MBYTE | |
| 5626 if (has_mbyte && (*mb_char2cells)(mb_c) > 1) | |
| 5627 { | |
| 5628 /* Need to fill two screen columns. */ | |
| 5629 ++off; | |
| 5630 ++col; | |
| 5631 if (enc_utf8) | |
| 5632 /* UTF-8: Put a 0 in the second screen char. */ | |
| 5633 ScreenLines[off] = 0; | |
| 5634 else | |
| 5635 /* DBCS: Put second byte in the second screen char. */ | |
| 5636 ScreenLines[off] = mb_c & 0xff; | |
|
7287
6fcadba9ec7a
commit https://github.com/vim/vim/commit/32a214e78df0120f92fe049eab1385c60f0cdb0b
Christian Brabandt <cb@256bit.org>
parents:
7233
diff
changeset
|
5637 if (draw_state > WL_NR |
|
6fcadba9ec7a
commit https://github.com/vim/vim/commit/32a214e78df0120f92fe049eab1385c60f0cdb0b
Christian Brabandt <cb@256bit.org>
parents:
7233
diff
changeset
|
5638 #ifdef FEAT_DIFF |
|
6fcadba9ec7a
commit https://github.com/vim/vim/commit/32a214e78df0120f92fe049eab1385c60f0cdb0b
Christian Brabandt <cb@256bit.org>
parents:
7233
diff
changeset
|
5639 && filler_todo <= 0 |
|
6fcadba9ec7a
commit https://github.com/vim/vim/commit/32a214e78df0120f92fe049eab1385c60f0cdb0b
Christian Brabandt <cb@256bit.org>
parents:
7233
diff
changeset
|
5640 #endif |
|
6fcadba9ec7a
commit https://github.com/vim/vim/commit/32a214e78df0120f92fe049eab1385c60f0cdb0b
Christian Brabandt <cb@256bit.org>
parents:
7233
diff
changeset
|
5641 ) |
|
6fcadba9ec7a
commit https://github.com/vim/vim/commit/32a214e78df0120f92fe049eab1385c60f0cdb0b
Christian Brabandt <cb@256bit.org>
parents:
7233
diff
changeset
|
5642 ++vcol; |
| 7 | 5643 /* When "tocol" is halfway a character, set it to the end of |
| 5644 * the character, otherwise highlighting won't stop. */ | |
| 5645 if (tocol == vcol) | |
| 5646 ++tocol; | |
| 5647 #ifdef FEAT_RIGHTLEFT | |
| 5648 if (wp->w_p_rl) | |
| 5649 { | |
| 5650 /* now it's time to backup one cell */ | |
| 5651 --off; | |
| 5652 --col; | |
| 5653 } | |
| 5654 #endif | |
| 5655 } | |
| 5656 #endif | |
| 5657 #ifdef FEAT_RIGHTLEFT | |
| 5658 if (wp->w_p_rl) | |
| 5659 { | |
| 5660 --off; | |
| 5661 --col; | |
| 5662 } | |
| 5663 else | |
| 5664 #endif | |
| 5665 { | |
| 5666 ++off; | |
| 5667 ++col; | |
| 5668 } | |
| 5669 } | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5670 #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
|
5671 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
|
5672 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5673 --n_skip; |
|
2332
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
5674 ++vcol_off; |
|
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
5675 if (n_extra > 0) |
|
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
5676 vcol_off += n_extra; |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5677 if (wp->w_p_wrap) |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5678 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5679 /* |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5680 * Special voodoo required if 'wrap' is on. |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5681 * |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5682 * 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
|
5683 * 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
|
5684 * 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
|
5685 * 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
|
5686 * |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5687 * 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
|
5688 * 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
|
5689 * 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
|
5690 * of bad columns we have advanced. |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5691 */ |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5692 if (n_extra > 0) |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5693 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5694 vcol += n_extra; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5695 # ifdef FEAT_RIGHTLEFT |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5696 if (wp->w_p_rl) |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5697 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5698 col -= n_extra; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5699 boguscols -= n_extra; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5700 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5701 else |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5702 # endif |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5703 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5704 col += n_extra; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5705 boguscols += n_extra; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5706 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5707 n_extra = 0; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5708 n_attr = 0; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5709 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5710 |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5711 |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5712 # ifdef FEAT_MBYTE |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5713 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
|
5714 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5715 /* Need to fill two screen columns. */ |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5716 # ifdef FEAT_RIGHTLEFT |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5717 if (wp->w_p_rl) |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5718 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5719 --boguscols; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5720 --col; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5721 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5722 else |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5723 # endif |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5724 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5725 ++boguscols; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5726 ++col; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5727 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5728 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5729 # endif |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5730 |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5731 # ifdef FEAT_RIGHTLEFT |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5732 if (wp->w_p_rl) |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5733 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5734 --boguscols; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5735 --col; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5736 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5737 else |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5738 # endif |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5739 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5740 ++boguscols; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5741 ++col; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5742 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5743 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5744 else |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5745 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5746 if (n_extra > 0) |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5747 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5748 vcol += n_extra; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5749 n_extra = 0; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5750 n_attr = 0; |
|
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 } |
|
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 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5755 #endif /* FEAT_CONCEAL */ |
| 7 | 5756 else |
| 5757 --n_skip; | |
| 5758 | |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
5759 /* 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
|
5760 * column. */ |
| 1849 | 5761 if (draw_state > WL_NR |
| 7 | 5762 #ifdef FEAT_DIFF |
| 5763 && filler_todo <= 0 | |
| 5764 #endif | |
| 5765 ) | |
| 5766 ++vcol; | |
| 5767 | |
| 743 | 5768 #ifdef FEAT_SYN_HL |
| 5769 if (vcol_save_attr >= 0) | |
| 5770 char_attr = vcol_save_attr; | |
| 5771 #endif | |
| 5772 | |
| 7 | 5773 /* restore attributes after "predeces" in 'listchars' */ |
| 5774 if (draw_state > WL_NR && n_attr3 > 0 && --n_attr3 == 0) | |
| 5775 char_attr = saved_attr3; | |
| 5776 | |
| 5777 /* restore attributes after last 'listchars' or 'number' char */ | |
| 5778 if (n_attr > 0 && draw_state == WL_LINE && --n_attr == 0) | |
| 5779 char_attr = saved_attr2; | |
| 5780 | |
| 5781 /* | |
| 5782 * At end of screen line and there is more to come: Display the line | |
| 1378 | 5783 * so far. If there is no more to display it is caught above. |
| 7 | 5784 */ |
| 5785 if (( | |
| 5786 #ifdef FEAT_RIGHTLEFT | |
| 5787 wp->w_p_rl ? (col < 0) : | |
| 5788 #endif | |
| 5789 (col >= W_WIDTH(wp))) | |
| 5790 && (*ptr != NUL | |
| 5791 #ifdef FEAT_DIFF | |
| 5792 || filler_todo > 0 | |
| 5793 #endif | |
| 2724 | 5794 || (wp->w_p_list && lcs_eol != NUL && p_extra != at_end_str) |
| 7 | 5795 || (n_extra != 0 && (c_extra != NUL || *p_extra != NUL))) |
| 5796 ) | |
| 5797 { | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5798 #ifdef FEAT_CONCEAL |
|
11670
3b2afa2b77b3
patch 8.0.0718: output of job in terminal is not displayed
Christian Brabandt <cb@256bit.org>
parents:
11657
diff
changeset
|
5799 screen_line(screen_row, W_WINCOL(wp), col - boguscols, |
|
11672
3c6cc2f24645
patch 8.0.0719: build failure without +terminal feature
Christian Brabandt <cb@256bit.org>
parents:
11670
diff
changeset
|
5800 (int)W_WIDTH(wp), HAS_RIGHTLEFT(wp->w_p_rl)); |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5801 boguscols = 0; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5802 #else |
|
11670
3b2afa2b77b3
patch 8.0.0718: output of job in terminal is not displayed
Christian Brabandt <cb@256bit.org>
parents:
11657
diff
changeset
|
5803 screen_line(screen_row, W_WINCOL(wp), col, |
|
11672
3c6cc2f24645
patch 8.0.0719: build failure without +terminal feature
Christian Brabandt <cb@256bit.org>
parents:
11670
diff
changeset
|
5804 (int)W_WIDTH(wp), HAS_RIGHTLEFT(wp->w_p_rl)); |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5805 #endif |
| 7 | 5806 ++row; |
| 5807 ++screen_row; | |
| 5808 | |
| 5809 /* When not wrapping and finished diff lines, or when displayed | |
| 5810 * '$' and highlighting until last column, break here. */ | |
| 5811 if ((!wp->w_p_wrap | |
| 5812 #ifdef FEAT_DIFF | |
| 5813 && filler_todo <= 0 | |
| 5814 #endif | |
| 5815 ) || lcs_eol_one == -1) | |
| 5816 break; | |
| 5817 | |
| 5818 /* When the window is too narrow draw all "@" lines. */ | |
| 5819 if (draw_state != WL_LINE | |
| 5820 #ifdef FEAT_DIFF | |
| 5821 && filler_todo <= 0 | |
| 5822 #endif | |
| 5823 ) | |
| 5824 { | |
| 5825 win_draw_end(wp, '@', ' ', row, wp->w_height, HLF_AT); | |
|
8643
24b43dd167eb
commit https://github.com/vim/vim/commit/44a2f923c00f1384c9ecde12fb5b4711bc20702e
Christian Brabandt <cb@256bit.org>
parents:
8627
diff
changeset
|
5826 #ifdef FEAT_WINDOWS |
| 7 | 5827 draw_vsep_win(wp, row); |
| 5828 #endif | |
| 5829 row = endrow; | |
| 5830 } | |
| 5831 | |
| 5832 /* When line got too long for screen break here. */ | |
| 5833 if (row == endrow) | |
| 5834 { | |
| 5835 ++row; | |
| 5836 break; | |
| 5837 } | |
| 5838 | |
| 5839 if (screen_cur_row == screen_row - 1 | |
| 5840 #ifdef FEAT_DIFF | |
| 5841 && filler_todo <= 0 | |
| 5842 #endif | |
|
10349
cf988222b150
commit https://github.com/vim/vim/commit/a1f4cb93ba50ea9e40cd4b1f5592b8a6d1398660
Christian Brabandt <cb@256bit.org>
parents:
10307
diff
changeset
|
5843 #ifdef FEAT_WINDOWS |
|
cf988222b150
commit https://github.com/vim/vim/commit/a1f4cb93ba50ea9e40cd4b1f5592b8a6d1398660
Christian Brabandt <cb@256bit.org>
parents:
10307
diff
changeset
|
5844 && W_WIDTH(wp) == Columns |
|
cf988222b150
commit https://github.com/vim/vim/commit/a1f4cb93ba50ea9e40cd4b1f5592b8a6d1398660
Christian Brabandt <cb@256bit.org>
parents:
10307
diff
changeset
|
5845 #endif |
|
cf988222b150
commit https://github.com/vim/vim/commit/a1f4cb93ba50ea9e40cd4b1f5592b8a6d1398660
Christian Brabandt <cb@256bit.org>
parents:
10307
diff
changeset
|
5846 ) |
| 7 | 5847 { |
| 5848 /* Remember that the line wraps, used for modeless copy. */ | |
| 5849 LineWraps[screen_row - 1] = TRUE; | |
| 5850 | |
| 5851 /* | |
| 5852 * Special trick to make copy/paste of wrapped lines work with | |
| 5853 * xterm/screen: write an extra character beyond the end of | |
| 5854 * the line. This will work with all terminal types | |
| 5855 * (regardless of the xn,am settings). | |
| 5856 * Only do this on a fast tty. | |
| 5857 * Only do this if the cursor is on the current line | |
| 5858 * (something has been written in it). | |
| 5859 * Don't do this for the GUI. | |
| 5860 * Don't do this for double-width characters. | |
| 5861 * Don't do this for a window not at the right screen border. | |
| 5862 */ | |
| 5863 if (p_tf | |
| 5864 #ifdef FEAT_GUI | |
| 5865 && !gui.in_use | |
| 5866 #endif | |
| 5867 #ifdef FEAT_MBYTE | |
| 5868 && !(has_mbyte | |
| 1378 | 5869 && ((*mb_off2cells)(LineOffset[screen_row], |
| 5870 LineOffset[screen_row] + screen_Columns) | |
| 5871 == 2 | |
| 7 | 5872 || (*mb_off2cells)(LineOffset[screen_row - 1] |
| 1378 | 5873 + (int)Columns - 2, |
| 5874 LineOffset[screen_row] + screen_Columns) | |
| 5875 == 2)) | |
| 7 | 5876 #endif |
| 5877 ) | |
| 5878 { | |
| 5879 /* First make sure we are at the end of the screen line, | |
| 5880 * then output the same character again to let the | |
| 5881 * terminal know about the wrap. If the terminal doesn't | |
| 5882 * auto-wrap, we overwrite the character. */ | |
| 5883 if (screen_cur_col != W_WIDTH(wp)) | |
| 5884 screen_char(LineOffset[screen_row - 1] | |
| 5885 + (unsigned)Columns - 1, | |
| 5886 screen_row - 1, (int)(Columns - 1)); | |
| 5887 | |
| 5888 #ifdef FEAT_MBYTE | |
| 5889 /* When there is a multi-byte character, just output a | |
| 5890 * space to keep it simple. */ | |
| 148 | 5891 if (has_mbyte && MB_BYTE2LEN(ScreenLines[LineOffset[ |
| 5892 screen_row - 1] + (Columns - 1)]) > 1) | |
| 7 | 5893 out_char(' '); |
| 5894 else | |
| 5895 #endif | |
| 5896 out_char(ScreenLines[LineOffset[screen_row - 1] | |
| 5897 + (Columns - 1)]); | |
| 5898 /* force a redraw of the first char on the next line */ | |
| 5899 ScreenAttrs[LineOffset[screen_row]] = (sattr_T)-1; | |
| 5900 screen_start(); /* don't know where cursor is now */ | |
| 5901 } | |
| 5902 } | |
| 5903 | |
| 5904 col = 0; | |
| 5905 off = (unsigned)(current_ScreenLine - ScreenLines); | |
| 5906 #ifdef FEAT_RIGHTLEFT | |
| 5907 if (wp->w_p_rl) | |
| 5908 { | |
| 5909 col = W_WIDTH(wp) - 1; /* col is not used if breaking! */ | |
| 5910 off += col; | |
| 5911 } | |
| 5912 #endif | |
| 5913 | |
| 5914 /* reset the drawing state for the start of a wrapped line */ | |
| 5915 draw_state = WL_START; | |
| 5916 saved_n_extra = n_extra; | |
| 5917 saved_p_extra = p_extra; | |
| 5918 saved_c_extra = c_extra; | |
| 5919 saved_char_attr = char_attr; | |
| 5920 n_extra = 0; | |
| 5921 lcs_prec_todo = lcs_prec; | |
| 5922 #ifdef FEAT_LINEBREAK | |
| 5923 # ifdef FEAT_DIFF | |
| 5924 if (filler_todo <= 0) | |
| 5925 # endif | |
| 5926 need_showbreak = TRUE; | |
| 5927 #endif | |
| 5928 #ifdef FEAT_DIFF | |
| 5929 --filler_todo; | |
| 5930 /* When the filler lines are actually below the last line of the | |
| 5931 * file, don't draw the line itself, break here. */ | |
| 5932 if (filler_todo == 0 && wp->w_botfill) | |
| 5933 break; | |
| 5934 #endif | |
| 5935 } | |
| 5936 | |
| 5937 } /* for every character in the line */ | |
| 5938 | |
| 743 | 5939 #ifdef FEAT_SPELL |
| 386 | 5940 /* After an empty line check first word for capital. */ |
| 5941 if (*skipwhite(line) == NUL) | |
| 5942 { | |
| 5943 capcol_lnum = lnum + 1; | |
| 5944 cap_col = 0; | |
| 5945 } | |
| 5946 #endif | |
| 5947 | |
|
10690
206ab11fa76e
patch 8.0.0235: memory leak in diff mode
Christian Brabandt <cb@256bit.org>
parents:
10538
diff
changeset
|
5948 vim_free(p_extra_free); |
| 7 | 5949 return row; |
| 5950 } | |
| 5951 | |
| 714 | 5952 #ifdef FEAT_MBYTE |
|
7805
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7697
diff
changeset
|
5953 static int comp_char_differs(int, int); |
| 714 | 5954 |
| 5955 /* | |
| 5956 * 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
|
5957 * Only to be used when ScreenLinesUC[off_from] != 0. |
| 714 | 5958 */ |
| 5959 static int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
5960 comp_char_differs(int off_from, int off_to) |
| 714 | 5961 { |
| 5962 int i; | |
| 5963 | |
| 5964 for (i = 0; i < Screen_mco; ++i) | |
| 5965 { | |
| 5966 if (ScreenLinesC[i][off_from] != ScreenLinesC[i][off_to]) | |
| 5967 return TRUE; | |
| 5968 if (ScreenLinesC[i][off_from] == 0) | |
| 5969 break; | |
| 5970 } | |
| 5971 return FALSE; | |
| 5972 } | |
| 5973 #endif | |
| 5974 | |
| 7 | 5975 /* |
| 5976 * Check whether the given character needs redrawing: | |
| 5977 * - the (first byte of the) character is different | |
| 5978 * - the attributes are different | |
| 5979 * - the character is multi-byte and the next byte is different | |
| 1616 | 5980 * - the character is two cells wide and the second cell differs. |
| 7 | 5981 */ |
| 5982 static int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
5983 char_needs_redraw(int off_from, int off_to, int cols) |
| 7 | 5984 { |
| 5985 if (cols > 0 | |
| 5986 && ((ScreenLines[off_from] != ScreenLines[off_to] | |
| 5987 || ScreenAttrs[off_from] != ScreenAttrs[off_to]) | |
| 5988 | |
| 5989 #ifdef FEAT_MBYTE | |
| 5990 || (enc_dbcs != 0 | |
| 5991 && MB_BYTE2LEN(ScreenLines[off_from]) > 1 | |
| 5992 && (enc_dbcs == DBCS_JPNU && ScreenLines[off_from] == 0x8e | |
| 5993 ? ScreenLines2[off_from] != ScreenLines2[off_to] | |
| 5994 : (cols > 1 && ScreenLines[off_from + 1] | |
| 5995 != ScreenLines[off_to + 1]))) | |
| 5996 || (enc_utf8 | |
| 5997 && (ScreenLinesUC[off_from] != ScreenLinesUC[off_to] | |
| 5998 || (ScreenLinesUC[off_from] != 0 | |
| 1616 | 5999 && comp_char_differs(off_from, off_to)) |
| 3759 | 6000 || ((*mb_off2cells)(off_from, off_from + cols) > 1 |
| 6001 && ScreenLines[off_from + 1] | |
| 6002 != ScreenLines[off_to + 1]))) | |
| 7 | 6003 #endif |
| 6004 )) | |
| 6005 return TRUE; | |
| 6006 return FALSE; | |
| 6007 } | |
| 6008 | |
|
11670
3b2afa2b77b3
patch 8.0.0718: output of job in terminal is not displayed
Christian Brabandt <cb@256bit.org>
parents:
11657
diff
changeset
|
6009 #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
|
6010 /* |
|
3b2afa2b77b3
patch 8.0.0718: output of job in terminal is not displayed
Christian Brabandt <cb@256bit.org>
parents:
11657
diff
changeset
|
6011 * 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
|
6012 */ |
|
3b2afa2b77b3
patch 8.0.0718: output of job in terminal is not displayed
Christian Brabandt <cb@256bit.org>
parents:
11657
diff
changeset
|
6013 int |
|
3b2afa2b77b3
patch 8.0.0718: output of job in terminal is not displayed
Christian Brabandt <cb@256bit.org>
parents:
11657
diff
changeset
|
6014 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
|
6015 { |
|
3b2afa2b77b3
patch 8.0.0718: output of job in terminal is not displayed
Christian Brabandt <cb@256bit.org>
parents:
11657
diff
changeset
|
6016 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
|
6017 } |
|
3b2afa2b77b3
patch 8.0.0718: output of job in terminal is not displayed
Christian Brabandt <cb@256bit.org>
parents:
11657
diff
changeset
|
6018 #endif |
|
3b2afa2b77b3
patch 8.0.0718: output of job in terminal is not displayed
Christian Brabandt <cb@256bit.org>
parents:
11657
diff
changeset
|
6019 |
| 7 | 6020 /* |
| 6021 * Move one "cooked" screen line to the screen, but only the characters that | |
| 6022 * have actually changed. Handle insert/delete character. | |
| 6023 * "coloff" gives the first column on the screen for this line. | |
| 6024 * "endcol" gives the columns where valid characters are. | |
| 6025 * "clear_width" is the width of the window. It's > 0 if the rest of the line | |
| 6026 * needs to be cleared, negative otherwise. | |
| 6027 * "rlflag" is TRUE in a rightleft window: | |
| 6028 * When TRUE and "clear_width" > 0, clear columns 0 to "endcol" | |
| 6029 * When FALSE and "clear_width" > 0, clear columns "endcol" to "clear_width" | |
| 6030 */ | |
|
11670
3b2afa2b77b3
patch 8.0.0718: output of job in terminal is not displayed
Christian Brabandt <cb@256bit.org>
parents:
11657
diff
changeset
|
6031 void |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6032 screen_line( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6033 int row, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6034 int coloff, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6035 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
|
6036 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
|
6037 int rlflag UNUSED) |
| 7 | 6038 { |
| 6039 unsigned off_from; | |
| 6040 unsigned off_to; | |
| 1378 | 6041 #ifdef FEAT_MBYTE |
| 6042 unsigned max_off_from; | |
| 6043 unsigned max_off_to; | |
| 6044 #endif | |
| 7 | 6045 int col = 0; |
|
8643
24b43dd167eb
commit https://github.com/vim/vim/commit/44a2f923c00f1384c9ecde12fb5b4711bc20702e
Christian Brabandt <cb@256bit.org>
parents:
8627
diff
changeset
|
6046 #if defined(FEAT_GUI) || defined(UNIX) || defined(FEAT_WINDOWS) |
| 7 | 6047 int hl; |
| 6048 #endif | |
| 6049 int force = FALSE; /* force update rest of the line */ | |
| 6050 int redraw_this /* bool: does character need redraw? */ | |
| 6051 #ifdef FEAT_GUI | |
| 6052 = TRUE /* For GUI when while-loop empty */ | |
| 6053 #endif | |
| 6054 ; | |
| 6055 int redraw_next; /* redraw_this for next character */ | |
| 6056 #ifdef FEAT_MBYTE | |
| 6057 int clear_next = FALSE; | |
| 6058 int char_cells; /* 1: normal char */ | |
| 6059 /* 2: occupies two display cells */ | |
| 6060 # define CHAR_CELLS char_cells | |
| 6061 #else | |
| 6062 # define CHAR_CELLS 1 | |
| 6063 #endif | |
| 6064 | |
| 3413 | 6065 /* Check for illegal row and col, just in case. */ |
| 6066 if (row >= Rows) | |
| 6067 row = Rows - 1; | |
| 6068 if (endcol > Columns) | |
| 6069 endcol = Columns; | |
| 6070 | |
| 7 | 6071 # ifdef FEAT_CLIPBOARD |
| 6072 clip_may_clear_selection(row, row); | |
| 6073 # endif | |
| 6074 | |
| 6075 off_from = (unsigned)(current_ScreenLine - ScreenLines); | |
| 6076 off_to = LineOffset[row] + coloff; | |
| 1378 | 6077 #ifdef FEAT_MBYTE |
| 6078 max_off_from = off_from + screen_Columns; | |
| 6079 max_off_to = LineOffset[row] + screen_Columns; | |
| 6080 #endif | |
| 7 | 6081 |
| 6082 #ifdef FEAT_RIGHTLEFT | |
| 6083 if (rlflag) | |
| 6084 { | |
| 6085 /* Clear rest first, because it's left of the text. */ | |
| 6086 if (clear_width > 0) | |
| 6087 { | |
| 6088 while (col <= endcol && ScreenLines[off_to] == ' ' | |
| 6089 && ScreenAttrs[off_to] == 0 | |
| 6090 # ifdef FEAT_MBYTE | |
| 6091 && (!enc_utf8 || ScreenLinesUC[off_to] == 0) | |
| 6092 # endif | |
| 6093 ) | |
| 6094 { | |
| 6095 ++off_to; | |
| 6096 ++col; | |
| 6097 } | |
| 6098 if (col <= endcol) | |
| 6099 screen_fill(row, row + 1, col + coloff, | |
| 6100 endcol + coloff + 1, ' ', ' ', 0); | |
| 6101 } | |
| 6102 col = endcol + 1; | |
| 6103 off_to = LineOffset[row] + col + coloff; | |
| 6104 off_from += col; | |
| 6105 endcol = (clear_width > 0 ? clear_width : -clear_width); | |
| 6106 } | |
| 6107 #endif /* FEAT_RIGHTLEFT */ | |
| 6108 | |
| 6109 redraw_next = char_needs_redraw(off_from, off_to, endcol - col); | |
| 6110 | |
| 6111 while (col < endcol) | |
| 6112 { | |
| 6113 #ifdef FEAT_MBYTE | |
| 6114 if (has_mbyte && (col + 1 < endcol)) | |
| 1378 | 6115 char_cells = (*mb_off2cells)(off_from, max_off_from); |
| 7 | 6116 else |
| 6117 char_cells = 1; | |
| 6118 #endif | |
| 6119 | |
| 6120 redraw_this = redraw_next; | |
| 6121 redraw_next = force || char_needs_redraw(off_from + CHAR_CELLS, | |
| 6122 off_to + CHAR_CELLS, endcol - col - CHAR_CELLS); | |
| 6123 | |
| 6124 #ifdef FEAT_GUI | |
| 6125 /* If the next character was bold, then redraw the current character to | |
| 6126 * remove any pixels that might have spilt over into us. This only | |
| 6127 * happens in the GUI. | |
| 6128 */ | |
| 6129 if (redraw_next && gui.in_use) | |
| 6130 { | |
| 6131 hl = ScreenAttrs[off_to + CHAR_CELLS]; | |
| 743 | 6132 if (hl > HL_ALL) |
| 6133 hl = syn_attr2attr(hl); | |
| 6134 if (hl & HL_BOLD) | |
| 7 | 6135 redraw_this = TRUE; |
| 6136 } | |
| 6137 #endif | |
| 6138 | |
| 6139 if (redraw_this) | |
| 6140 { | |
| 6141 /* | |
| 6142 * Special handling when 'xs' termcap flag set (hpterm): | |
| 6143 * Attributes for characters are stored at the position where the | |
| 6144 * cursor is when writing the highlighting code. The | |
| 6145 * start-highlighting code must be written with the cursor on the | |
| 6146 * first highlighted character. The stop-highlighting code must | |
| 6147 * be written with the cursor just after the last highlighted | |
| 6148 * character. | |
| 6149 * Overwriting a character doesn't remove it's highlighting. Need | |
| 6150 * to clear the rest of the line, and force redrawing it | |
| 6151 * completely. | |
| 6152 */ | |
| 6153 if ( p_wiv | |
| 6154 && !force | |
| 6155 #ifdef FEAT_GUI | |
| 6156 && !gui.in_use | |
| 6157 #endif | |
| 6158 && ScreenAttrs[off_to] != 0 | |
| 6159 && ScreenAttrs[off_from] != ScreenAttrs[off_to]) | |
| 6160 { | |
| 6161 /* | |
| 6162 * Need to remove highlighting attributes here. | |
| 6163 */ | |
| 6164 windgoto(row, col + coloff); | |
| 6165 out_str(T_CE); /* clear rest of this screen line */ | |
| 6166 screen_start(); /* don't know where cursor is now */ | |
| 6167 force = TRUE; /* force redraw of rest of the line */ | |
| 6168 redraw_next = TRUE; /* or else next char would miss out */ | |
| 6169 | |
| 6170 /* | |
| 6171 * If the previous character was highlighted, need to stop | |
| 6172 * highlighting at this character. | |
| 6173 */ | |
| 6174 if (col + coloff > 0 && ScreenAttrs[off_to - 1] != 0) | |
| 6175 { | |
| 6176 screen_attr = ScreenAttrs[off_to - 1]; | |
| 6177 term_windgoto(row, col + coloff); | |
| 6178 screen_stop_highlight(); | |
| 6179 } | |
| 6180 else | |
| 6181 screen_attr = 0; /* highlighting has stopped */ | |
| 6182 } | |
| 6183 #ifdef FEAT_MBYTE | |
| 6184 if (enc_dbcs != 0) | |
| 6185 { | |
| 6186 /* Check if overwriting a double-byte with a single-byte or | |
| 6187 * the other way around requires another character to be | |
| 6188 * redrawn. For UTF-8 this isn't needed, because comparing | |
| 6189 * ScreenLinesUC[] is sufficient. */ | |
| 6190 if (char_cells == 1 | |
| 6191 && col + 1 < endcol | |
| 1378 | 6192 && (*mb_off2cells)(off_to, max_off_to) > 1) |
| 7 | 6193 { |
| 6194 /* Writing a single-cell character over a double-cell | |
| 6195 * character: need to redraw the next cell. */ | |
| 6196 ScreenLines[off_to + 1] = 0; | |
| 6197 redraw_next = TRUE; | |
| 6198 } | |
| 6199 else if (char_cells == 2 | |
| 6200 && col + 2 < endcol | |
| 1378 | 6201 && (*mb_off2cells)(off_to, max_off_to) == 1 |
| 6202 && (*mb_off2cells)(off_to + 1, max_off_to) > 1) | |
| 7 | 6203 { |
| 6204 /* Writing the second half of a double-cell character over | |
| 6205 * a double-cell character: need to redraw the second | |
| 6206 * cell. */ | |
| 6207 ScreenLines[off_to + 2] = 0; | |
| 6208 redraw_next = TRUE; | |
| 6209 } | |
| 6210 | |
| 6211 if (enc_dbcs == DBCS_JPNU) | |
| 6212 ScreenLines2[off_to] = ScreenLines2[off_from]; | |
| 6213 } | |
| 6214 /* When writing a single-width character over a double-width | |
| 6215 * character and at the end of the redrawn text, need to clear out | |
| 6216 * the right halve of the old character. | |
| 6217 * Also required when writing the right halve of a double-width | |
| 6218 * char over the left halve of an existing one. */ | |
| 6219 if (has_mbyte && col + char_cells == endcol | |
| 6220 && ((char_cells == 1 | |
| 1378 | 6221 && (*mb_off2cells)(off_to, max_off_to) > 1) |
| 7 | 6222 || (char_cells == 2 |
| 1378 | 6223 && (*mb_off2cells)(off_to, max_off_to) == 1 |
| 6224 && (*mb_off2cells)(off_to + 1, max_off_to) > 1))) | |
| 7 | 6225 clear_next = TRUE; |
| 6226 #endif | |
| 6227 | |
| 6228 ScreenLines[off_to] = ScreenLines[off_from]; | |
| 6229 #ifdef FEAT_MBYTE | |
| 6230 if (enc_utf8) | |
| 6231 { | |
| 6232 ScreenLinesUC[off_to] = ScreenLinesUC[off_from]; | |
| 6233 if (ScreenLinesUC[off_from] != 0) | |
| 6234 { | |
| 714 | 6235 int i; |
| 6236 | |
| 6237 for (i = 0; i < Screen_mco; ++i) | |
| 6238 ScreenLinesC[i][off_to] = ScreenLinesC[i][off_from]; | |
| 7 | 6239 } |
| 6240 } | |
| 6241 if (char_cells == 2) | |
| 6242 ScreenLines[off_to + 1] = ScreenLines[off_from + 1]; | |
| 6243 #endif | |
| 6244 | |
| 6245 #if defined(FEAT_GUI) || defined(UNIX) | |
| 1843 | 6246 /* The bold trick makes a single column of pixels appear in the |
| 6247 * next character. When a bold character is removed, the next | |
| 7 | 6248 * character should be redrawn too. This happens for our own GUI |
| 6249 * and for some xterms. */ | |
| 6250 if ( | |
| 6251 # ifdef FEAT_GUI | |
| 6252 gui.in_use | |
| 6253 # endif | |
| 6254 # if defined(FEAT_GUI) && defined(UNIX) | |
| 6255 || | |
| 6256 # endif | |
| 6257 # ifdef UNIX | |
| 6258 term_is_xterm | |
| 6259 # endif | |
| 6260 ) | |
| 6261 { | |
| 6262 hl = ScreenAttrs[off_to]; | |
| 743 | 6263 if (hl > HL_ALL) |
| 6264 hl = syn_attr2attr(hl); | |
| 6265 if (hl & HL_BOLD) | |
| 7 | 6266 redraw_next = TRUE; |
| 6267 } | |
| 6268 #endif | |
| 6269 ScreenAttrs[off_to] = ScreenAttrs[off_from]; | |
| 6270 #ifdef FEAT_MBYTE | |
| 819 | 6271 /* For simplicity set the attributes of second half of a |
| 6272 * double-wide character equal to the first half. */ | |
| 6273 if (char_cells == 2) | |
| 6274 ScreenAttrs[off_to + 1] = ScreenAttrs[off_from]; | |
| 6275 | |
| 7 | 6276 if (enc_dbcs != 0 && char_cells == 2) |
| 6277 screen_char_2(off_to, row, col + coloff); | |
| 6278 else | |
| 6279 #endif | |
| 6280 screen_char(off_to, row, col + coloff); | |
| 6281 } | |
| 6282 else if ( p_wiv | |
| 6283 #ifdef FEAT_GUI | |
| 6284 && !gui.in_use | |
| 6285 #endif | |
| 6286 && col + coloff > 0) | |
| 6287 { | |
| 6288 if (ScreenAttrs[off_to] == ScreenAttrs[off_to - 1]) | |
| 6289 { | |
| 6290 /* | |
| 6291 * Don't output stop-highlight when moving the cursor, it will | |
| 6292 * stop the highlighting when it should continue. | |
| 6293 */ | |
| 6294 screen_attr = 0; | |
| 6295 } | |
| 6296 else if (screen_attr != 0) | |
| 6297 screen_stop_highlight(); | |
| 6298 } | |
| 6299 | |
| 6300 off_to += CHAR_CELLS; | |
| 6301 off_from += CHAR_CELLS; | |
| 6302 col += CHAR_CELLS; | |
| 6303 } | |
| 6304 | |
| 6305 #ifdef FEAT_MBYTE | |
| 6306 if (clear_next) | |
| 6307 { | |
| 6308 /* Clear the second half of a double-wide character of which the left | |
| 6309 * half was overwritten with a single-wide character. */ | |
| 6310 ScreenLines[off_to] = ' '; | |
| 6311 if (enc_utf8) | |
| 6312 ScreenLinesUC[off_to] = 0; | |
| 6313 screen_char(off_to, row, col + coloff); | |
| 6314 } | |
| 6315 #endif | |
| 6316 | |
| 6317 if (clear_width > 0 | |
| 6318 #ifdef FEAT_RIGHTLEFT | |
| 6319 && !rlflag | |
| 6320 #endif | |
| 6321 ) | |
| 6322 { | |
| 6323 #ifdef FEAT_GUI | |
| 6324 int startCol = col; | |
| 6325 #endif | |
| 6326 | |
| 6327 /* blank out the rest of the line */ | |
| 6328 while (col < clear_width && ScreenLines[off_to] == ' ' | |
| 6329 && ScreenAttrs[off_to] == 0 | |
| 6330 #ifdef FEAT_MBYTE | |
| 6331 && (!enc_utf8 || ScreenLinesUC[off_to] == 0) | |
| 6332 #endif | |
| 6333 ) | |
| 6334 { | |
| 6335 ++off_to; | |
| 6336 ++col; | |
| 6337 } | |
| 6338 if (col < clear_width) | |
| 6339 { | |
| 6340 #ifdef FEAT_GUI | |
| 6341 /* | |
| 6342 * In the GUI, clearing the rest of the line may leave pixels | |
| 6343 * behind if the first character cleared was bold. Some bold | |
| 6344 * fonts spill over the left. In this case we redraw the previous | |
| 6345 * character too. If we didn't skip any blanks above, then we | |
| 6346 * only redraw if the character wasn't already redrawn anyway. | |
| 6347 */ | |
| 996 | 6348 if (gui.in_use && (col > startCol || !redraw_this)) |
| 7 | 6349 { |
| 6350 hl = ScreenAttrs[off_to]; | |
| 6351 if (hl > HL_ALL || (hl & HL_BOLD)) | |
| 996 | 6352 { |
| 6353 int prev_cells = 1; | |
| 6354 # ifdef FEAT_MBYTE | |
| 6355 if (enc_utf8) | |
| 6356 /* for utf-8, ScreenLines[char_offset + 1] == 0 means | |
| 6357 * that its width is 2. */ | |
| 6358 prev_cells = ScreenLines[off_to - 1] == 0 ? 2 : 1; | |
| 6359 else if (enc_dbcs != 0) | |
| 6360 { | |
| 6361 /* find previous character by counting from first | |
| 6362 * column and get its width. */ | |
| 6363 unsigned off = LineOffset[row]; | |
| 1378 | 6364 unsigned max_off = LineOffset[row] + screen_Columns; |
| 996 | 6365 |
| 6366 while (off < off_to) | |
| 6367 { | |
| 1378 | 6368 prev_cells = (*mb_off2cells)(off, max_off); |
| 996 | 6369 off += prev_cells; |
| 6370 } | |
| 6371 } | |
| 6372 | |
| 6373 if (enc_dbcs != 0 && prev_cells > 1) | |
| 6374 screen_char_2(off_to - prev_cells, row, | |
| 6375 col + coloff - prev_cells); | |
| 6376 else | |
| 6377 # endif | |
| 6378 screen_char(off_to - prev_cells, row, | |
| 6379 col + coloff - prev_cells); | |
| 6380 } | |
| 7 | 6381 } |
| 6382 #endif | |
| 6383 screen_fill(row, row + 1, col + coloff, clear_width + coloff, | |
| 6384 ' ', ' ', 0); | |
|
8643
24b43dd167eb
commit https://github.com/vim/vim/commit/44a2f923c00f1384c9ecde12fb5b4711bc20702e
Christian Brabandt <cb@256bit.org>
parents:
8627
diff
changeset
|
6385 #ifdef FEAT_WINDOWS |
| 7 | 6386 off_to += clear_width - col; |
| 6387 col = clear_width; | |
| 6388 #endif | |
| 6389 } | |
| 6390 } | |
| 6391 | |
| 6392 if (clear_width > 0) | |
| 6393 { | |
|
8643
24b43dd167eb
commit https://github.com/vim/vim/commit/44a2f923c00f1384c9ecde12fb5b4711bc20702e
Christian Brabandt <cb@256bit.org>
parents:
8627
diff
changeset
|
6394 #ifdef FEAT_WINDOWS |
| 7 | 6395 /* For a window that's left of another, draw the separator char. */ |
| 6396 if (col + coloff < Columns) | |
| 6397 { | |
| 6398 int c; | |
| 6399 | |
| 6400 c = fillchar_vsep(&hl); | |
| 6477 | 6401 if (ScreenLines[off_to] != (schar_T)c |
| 7 | 6402 # ifdef FEAT_MBYTE |
| 714 | 6403 || (enc_utf8 && (int)ScreenLinesUC[off_to] |
| 6404 != (c >= 0x80 ? c : 0)) | |
| 7 | 6405 # endif |
| 6406 || ScreenAttrs[off_to] != hl) | |
| 6407 { | |
| 6408 ScreenLines[off_to] = c; | |
| 6409 ScreenAttrs[off_to] = hl; | |
| 6410 # ifdef FEAT_MBYTE | |
| 6411 if (enc_utf8) | |
| 6412 { | |
| 6413 if (c >= 0x80) | |
| 6414 { | |
| 6415 ScreenLinesUC[off_to] = c; | |
| 714 | 6416 ScreenLinesC[0][off_to] = 0; |
| 7 | 6417 } |
| 6418 else | |
| 6419 ScreenLinesUC[off_to] = 0; | |
| 6420 } | |
| 6421 # endif | |
| 6422 screen_char(off_to, row, col + coloff); | |
| 6423 } | |
| 6424 } | |
| 6425 else | |
| 6426 #endif | |
| 6427 LineWraps[row] = FALSE; | |
| 6428 } | |
| 6429 } | |
| 6430 | |
| 474 | 6431 #if defined(FEAT_RIGHTLEFT) || defined(PROTO) |
| 7 | 6432 /* |
| 474 | 6433 * Mirror text "str" for right-left displaying. |
| 6434 * Only works for single-byte characters (e.g., numbers). | |
| 7 | 6435 */ |
| 474 | 6436 void |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6437 rl_mirror(char_u *str) |
| 7 | 6438 { |
| 6439 char_u *p1, *p2; | |
| 6440 int t; | |
| 6441 | |
| 6442 for (p1 = str, p2 = str + STRLEN(str) - 1; p1 < p2; ++p1, --p2) | |
| 6443 { | |
| 6444 t = *p1; | |
| 6445 *p1 = *p2; | |
| 6446 *p2 = t; | |
| 6447 } | |
| 6448 } | |
| 6449 #endif | |
| 6450 | |
| 6451 #if defined(FEAT_WINDOWS) || defined(PROTO) | |
| 6452 /* | |
| 6453 * mark all status lines for redraw; used after first :cd | |
| 6454 */ | |
| 6455 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6456 status_redraw_all(void) |
| 7 | 6457 { |
| 6458 win_T *wp; | |
| 6459 | |
|
9649
fd9727ae3c49
commit https://github.com/vim/vim/commit/2932359000b2f918d5fade79ea4d124d5943cd07
Christian Brabandt <cb@256bit.org>
parents:
9645
diff
changeset
|
6460 FOR_ALL_WINDOWS(wp) |
| 7 | 6461 if (wp->w_status_height) |
| 6462 { | |
| 6463 wp->w_redr_status = TRUE; | |
| 6464 redraw_later(VALID); | |
| 6465 } | |
| 6466 } | |
| 6467 | |
| 6468 /* | |
| 6469 * mark all status lines of the current buffer for redraw | |
| 6470 */ | |
| 6471 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6472 status_redraw_curbuf(void) |
| 7 | 6473 { |
| 6474 win_T *wp; | |
| 6475 | |
|
9649
fd9727ae3c49
commit https://github.com/vim/vim/commit/2932359000b2f918d5fade79ea4d124d5943cd07
Christian Brabandt <cb@256bit.org>
parents:
9645
diff
changeset
|
6476 FOR_ALL_WINDOWS(wp) |
| 7 | 6477 if (wp->w_status_height != 0 && wp->w_buffer == curbuf) |
| 6478 { | |
| 6479 wp->w_redr_status = TRUE; | |
| 6480 redraw_later(VALID); | |
| 6481 } | |
| 6482 } | |
| 6483 | |
| 6484 /* | |
| 6485 * Redraw all status lines that need to be redrawn. | |
| 6486 */ | |
| 6487 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6488 redraw_statuslines(void) |
| 7 | 6489 { |
| 6490 win_T *wp; | |
| 6491 | |
|
9649
fd9727ae3c49
commit https://github.com/vim/vim/commit/2932359000b2f918d5fade79ea4d124d5943cd07
Christian Brabandt <cb@256bit.org>
parents:
9645
diff
changeset
|
6492 FOR_ALL_WINDOWS(wp) |
| 7 | 6493 if (wp->w_redr_status) |
| 6494 win_redr_status(wp); | |
| 673 | 6495 if (redraw_tabline) |
| 677 | 6496 draw_tabline(); |
| 7 | 6497 } |
| 6498 #endif | |
| 6499 | |
|
8643
24b43dd167eb
commit https://github.com/vim/vim/commit/44a2f923c00f1384c9ecde12fb5b4711bc20702e
Christian Brabandt <cb@256bit.org>
parents:
8627
diff
changeset
|
6500 #if (defined(FEAT_WILDMENU) && defined(FEAT_WINDOWS)) || defined(PROTO) |
| 7 | 6501 /* |
| 6502 * Redraw all status lines at the bottom of frame "frp". | |
| 6503 */ | |
| 6504 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6505 win_redraw_last_status(frame_T *frp) |
| 7 | 6506 { |
| 6507 if (frp->fr_layout == FR_LEAF) | |
| 6508 frp->fr_win->w_redr_status = TRUE; | |
| 6509 else if (frp->fr_layout == FR_ROW) | |
| 6510 { | |
| 6511 for (frp = frp->fr_child; frp != NULL; frp = frp->fr_next) | |
| 6512 win_redraw_last_status(frp); | |
| 6513 } | |
| 6514 else /* frp->fr_layout == FR_COL */ | |
| 6515 { | |
| 6516 frp = frp->fr_child; | |
| 6517 while (frp->fr_next != NULL) | |
| 6518 frp = frp->fr_next; | |
| 6519 win_redraw_last_status(frp); | |
| 6520 } | |
| 6521 } | |
| 6522 #endif | |
| 6523 | |
|
8643
24b43dd167eb
commit https://github.com/vim/vim/commit/44a2f923c00f1384c9ecde12fb5b4711bc20702e
Christian Brabandt <cb@256bit.org>
parents:
8627
diff
changeset
|
6524 #ifdef FEAT_WINDOWS |
| 7 | 6525 /* |
| 6526 * Draw the verticap separator right of window "wp" starting with line "row". | |
| 6527 */ | |
| 6528 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6529 draw_vsep_win(win_T *wp, int row) |
| 7 | 6530 { |
| 6531 int hl; | |
| 6532 int c; | |
| 6533 | |
| 6534 if (wp->w_vsep_width) | |
| 6535 { | |
| 6536 /* draw the vertical separator right of this window */ | |
| 6537 c = fillchar_vsep(&hl); | |
| 6538 screen_fill(W_WINROW(wp) + row, W_WINROW(wp) + wp->w_height, | |
| 6539 W_ENDCOL(wp), W_ENDCOL(wp) + 1, | |
| 6540 c, ' ', hl); | |
| 6541 } | |
| 6542 } | |
| 6543 #endif | |
| 6544 | |
| 6545 #ifdef FEAT_WILDMENU | |
|
7805
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7697
diff
changeset
|
6546 static int status_match_len(expand_T *xp, char_u *s); |
|
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7697
diff
changeset
|
6547 static int skip_status_match_char(expand_T *xp, char_u *s); |
| 7 | 6548 |
| 6549 /* | |
| 1378 | 6550 * Get the length of an item as it will be shown in the status line. |
| 7 | 6551 */ |
| 6552 static int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6553 status_match_len(expand_T *xp, char_u *s) |
| 7 | 6554 { |
| 6555 int len = 0; | |
| 6556 | |
| 6557 #ifdef FEAT_MENU | |
| 6558 int emenu = (xp->xp_context == EXPAND_MENUS | |
| 6559 || xp->xp_context == EXPAND_MENUNAMES); | |
| 6560 | |
| 6561 /* Check for menu separators - replace with '|'. */ | |
| 6562 if (emenu && menu_is_separator(s)) | |
| 6563 return 1; | |
| 6564 #endif | |
| 6565 | |
| 6566 while (*s != NUL) | |
| 6567 { | |
| 1685 | 6568 s += skip_status_match_char(xp, s); |
| 42 | 6569 len += ptr2cells(s); |
|
11127
506f5d8b7d8b
patch 8.0.0451: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11121
diff
changeset
|
6570 MB_PTR_ADV(s); |
| 7 | 6571 } |
| 6572 | |
| 6573 return len; | |
| 6574 } | |
| 6575 | |
| 6576 /* | |
| 1685 | 6577 * Return the number of characters that should be skipped in a status match. |
| 277 | 6578 * These are backslashes used for escaping. Do show backslashes in help tags. |
| 6579 */ | |
| 6580 static int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6581 skip_status_match_char(expand_T *xp, char_u *s) |
| 277 | 6582 { |
| 1685 | 6583 if ((rem_backslash(s) && xp->xp_context != EXPAND_HELP) |
| 277 | 6584 #ifdef FEAT_MENU |
| 6585 || ((xp->xp_context == EXPAND_MENUS | |
| 6586 || xp->xp_context == EXPAND_MENUNAMES) | |
| 6587 && (s[0] == '\t' || (s[0] == '\\' && s[1] != NUL))) | |
| 6588 #endif | |
| 1685 | 6589 ) |
| 6590 { | |
| 6591 #ifndef BACKSLASH_IN_FILENAME | |
| 6592 if (xp->xp_shell && csh_like_shell() && s[1] == '\\' && s[2] == '!') | |
| 6593 return 2; | |
| 6594 #endif | |
| 6595 return 1; | |
| 6596 } | |
| 6597 return 0; | |
| 277 | 6598 } |
| 6599 | |
| 6600 /* | |
| 7 | 6601 * Show wildchar matches in the status line. |
| 6602 * Show at least the "match" item. | |
| 6603 * We start at item 'first_match' in the list and show all matches that fit. | |
| 6604 * | |
| 6605 * If inversion is possible we use it. Else '=' characters are used. | |
| 6606 */ | |
| 6607 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6608 win_redr_status_matches( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6609 expand_T *xp, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6610 int num_matches, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6611 char_u **matches, /* list of matches */ |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6612 int match, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6613 int showtail) |
| 7 | 6614 { |
| 6615 #define L_MATCH(m) (showtail ? sm_gettail(matches[m]) : matches[m]) | |
| 6616 int row; | |
| 6617 char_u *buf; | |
| 6618 int len; | |
| 1378 | 6619 int clen; /* length in screen cells */ |
| 7 | 6620 int fillchar; |
| 6621 int attr; | |
| 6622 int i; | |
| 6623 int highlight = TRUE; | |
| 6624 char_u *selstart = NULL; | |
| 6625 int selstart_col = 0; | |
| 6626 char_u *selend = NULL; | |
| 6627 static int first_match = 0; | |
| 6628 int add_left = FALSE; | |
| 6629 char_u *s; | |
| 6630 #ifdef FEAT_MENU | |
| 6631 int emenu; | |
| 6632 #endif | |
| 6633 #if defined(FEAT_MBYTE) || defined(FEAT_MENU) | |
| 6634 int l; | |
| 6635 #endif | |
| 6636 | |
| 6637 if (matches == NULL) /* interrupted completion? */ | |
| 6638 return; | |
| 6639 | |
| 39 | 6640 #ifdef FEAT_MBYTE |
| 6641 if (has_mbyte) | |
| 6642 buf = alloc((unsigned)Columns * MB_MAXBYTES + 1); | |
| 6643 else | |
| 6644 #endif | |
| 6645 buf = alloc((unsigned)Columns + 1); | |
| 7 | 6646 if (buf == NULL) |
| 6647 return; | |
| 6648 | |
| 6649 if (match == -1) /* don't show match but original text */ | |
| 6650 { | |
| 6651 match = 0; | |
| 6652 highlight = FALSE; | |
| 6653 } | |
| 6654 /* count 1 for the ending ">" */ | |
| 6655 clen = status_match_len(xp, L_MATCH(match)) + 3; | |
| 6656 if (match == 0) | |
| 6657 first_match = 0; | |
| 6658 else if (match < first_match) | |
| 6659 { | |
| 6660 /* jumping left, as far as we can go */ | |
| 6661 first_match = match; | |
| 6662 add_left = TRUE; | |
| 6663 } | |
| 6664 else | |
| 6665 { | |
| 6666 /* check if match fits on the screen */ | |
| 6667 for (i = first_match; i < match; ++i) | |
| 6668 clen += status_match_len(xp, L_MATCH(i)) + 2; | |
| 6669 if (first_match > 0) | |
| 6670 clen += 2; | |
| 6671 /* jumping right, put match at the left */ | |
| 6672 if ((long)clen > Columns) | |
| 6673 { | |
| 6674 first_match = match; | |
| 6675 /* if showing the last match, we can add some on the left */ | |
| 6676 clen = 2; | |
| 6677 for (i = match; i < num_matches; ++i) | |
| 6678 { | |
| 6679 clen += status_match_len(xp, L_MATCH(i)) + 2; | |
| 6680 if ((long)clen >= Columns) | |
| 6681 break; | |
| 6682 } | |
| 6683 if (i == num_matches) | |
| 6684 add_left = TRUE; | |
| 6685 } | |
| 6686 } | |
| 6687 if (add_left) | |
| 6688 while (first_match > 0) | |
| 6689 { | |
| 6690 clen += status_match_len(xp, L_MATCH(first_match - 1)) + 2; | |
| 6691 if ((long)clen >= Columns) | |
| 6692 break; | |
| 6693 --first_match; | |
| 6694 } | |
| 6695 | |
|
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
|
6696 fillchar = fillchar_status(&attr, curwin); |
| 7 | 6697 |
| 6698 if (first_match == 0) | |
| 6699 { | |
| 6700 *buf = NUL; | |
| 6701 len = 0; | |
| 6702 } | |
| 6703 else | |
| 6704 { | |
| 6705 STRCPY(buf, "< "); | |
| 6706 len = 2; | |
| 6707 } | |
| 6708 clen = len; | |
| 6709 | |
| 6710 i = first_match; | |
| 6711 while ((long)(clen + status_match_len(xp, L_MATCH(i)) + 2) < Columns) | |
| 6712 { | |
| 6713 if (i == match) | |
| 6714 { | |
| 6715 selstart = buf + len; | |
| 6716 selstart_col = clen; | |
| 6717 } | |
| 6718 | |
| 6719 s = L_MATCH(i); | |
| 6720 /* Check for menu separators - replace with '|' */ | |
| 6721 #ifdef FEAT_MENU | |
| 6722 emenu = (xp->xp_context == EXPAND_MENUS | |
| 6723 || xp->xp_context == EXPAND_MENUNAMES); | |
| 6724 if (emenu && menu_is_separator(s)) | |
| 6725 { | |
| 6726 STRCPY(buf + len, transchar('|')); | |
| 6727 l = (int)STRLEN(buf + len); | |
| 6728 len += l; | |
| 6729 clen += l; | |
| 6730 } | |
| 6731 else | |
| 6732 #endif | |
| 6733 for ( ; *s != NUL; ++s) | |
| 6734 { | |
| 1685 | 6735 s += skip_status_match_char(xp, s); |
| 7 | 6736 clen += ptr2cells(s); |
| 6737 #ifdef FEAT_MBYTE | |
| 474 | 6738 if (has_mbyte && (l = (*mb_ptr2len)(s)) > 1) |
| 7 | 6739 { |
| 6740 STRNCPY(buf + len, s, l); | |
| 6741 s += l - 1; | |
| 6742 len += l; | |
| 6743 } | |
| 6744 else | |
| 6745 #endif | |
| 6746 { | |
| 6747 STRCPY(buf + len, transchar_byte(*s)); | |
| 6748 len += (int)STRLEN(buf + len); | |
| 6749 } | |
| 6750 } | |
| 6751 if (i == match) | |
| 6752 selend = buf + len; | |
| 6753 | |
| 6754 *(buf + len++) = ' '; | |
| 6755 *(buf + len++) = ' '; | |
| 6756 clen += 2; | |
| 6757 if (++i == num_matches) | |
| 6758 break; | |
| 6759 } | |
| 6760 | |
| 6761 if (i != num_matches) | |
| 6762 { | |
| 6763 *(buf + len++) = '>'; | |
| 6764 ++clen; | |
| 6765 } | |
| 6766 | |
| 6767 buf[len] = NUL; | |
| 6768 | |
| 6769 row = cmdline_row - 1; | |
| 6770 if (row >= 0) | |
| 6771 { | |
| 6772 if (wild_menu_showing == 0) | |
| 6773 { | |
| 6774 if (msg_scrolled > 0) | |
| 6775 { | |
| 6776 /* Put the wildmenu just above the command line. If there is | |
| 6777 * no room, scroll the screen one line up. */ | |
| 6778 if (cmdline_row == Rows - 1) | |
| 6779 { | |
|
12152
69af108df70e
patch 8.0.0956: scrolling in a terminal window has flicker
Christian Brabandt <cb@256bit.org>
parents:
12122
diff
changeset
|
6780 screen_del_lines(0, 0, 1, (int)Rows, TRUE, 0, NULL); |
| 7 | 6781 ++msg_scrolled; |
| 6782 } | |
| 6783 else | |
| 6784 { | |
| 6785 ++cmdline_row; | |
| 6786 ++row; | |
| 6787 } | |
| 6788 wild_menu_showing = WM_SCROLLED; | |
| 6789 } | |
| 6790 else | |
| 6791 { | |
| 6792 /* Create status line if needed by setting 'laststatus' to 2. | |
| 6793 * Set 'winminheight' to zero to avoid that the window is | |
| 6794 * resized. */ | |
| 6795 if (lastwin->w_status_height == 0) | |
| 6796 { | |
| 6797 save_p_ls = p_ls; | |
| 6798 save_p_wmh = p_wmh; | |
| 6799 p_ls = 2; | |
| 6800 p_wmh = 0; | |
| 6801 last_status(FALSE); | |
| 6802 } | |
| 6803 wild_menu_showing = WM_SHOWN; | |
| 6804 } | |
| 6805 } | |
| 6806 | |
| 6807 screen_puts(buf, row, 0, attr); | |
| 6808 if (selstart != NULL && highlight) | |
| 6809 { | |
| 6810 *selend = NUL; | |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
6811 screen_puts(selstart, row, selstart_col, HL_ATTR(HLF_WM)); |
| 7 | 6812 } |
| 6813 | |
| 6814 screen_fill(row, row + 1, clen, (int)Columns, fillchar, fillchar, attr); | |
| 6815 } | |
| 6816 | |
|
8643
24b43dd167eb
commit https://github.com/vim/vim/commit/44a2f923c00f1384c9ecde12fb5b4711bc20702e
Christian Brabandt <cb@256bit.org>
parents:
8627
diff
changeset
|
6817 #ifdef FEAT_WINDOWS |
| 7 | 6818 win_redraw_last_status(topframe); |
| 6819 #else | |
| 6820 lastwin->w_redr_status = TRUE; | |
| 6821 #endif | |
| 6822 vim_free(buf); | |
| 6823 } | |
| 6824 #endif | |
| 6825 | |
| 6826 #if defined(FEAT_WINDOWS) || defined(PROTO) | |
| 6827 /* | |
| 6828 * Redraw the status line of window wp. | |
| 6829 * | |
| 6830 * If inversion is possible we use it. Else '=' characters are used. | |
| 6831 */ | |
| 6832 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6833 win_redr_status(win_T *wp) |
| 7 | 6834 { |
| 6835 int row; | |
| 6836 char_u *p; | |
| 6837 int len; | |
| 6838 int fillchar; | |
| 6839 int attr; | |
| 6840 int this_ru_col; | |
| 1910 | 6841 static int busy = FALSE; |
| 6842 | |
| 6843 /* It's possible to get here recursively when 'statusline' (indirectly) | |
| 6844 * invokes ":redrawstatus". Simply ignore the call then. */ | |
| 6845 if (busy) | |
| 6846 return; | |
| 6847 busy = TRUE; | |
| 7 | 6848 |
| 6849 wp->w_redr_status = FALSE; | |
| 6850 if (wp->w_status_height == 0) | |
| 6851 { | |
| 6852 /* no status line, can only be last window */ | |
| 6853 redraw_cmdline = TRUE; | |
| 6854 } | |
| 540 | 6855 else if (!redrawing() |
| 6856 #ifdef FEAT_INS_EXPAND | |
| 6857 /* don't update status line when popup menu is visible and may be | |
| 6858 * drawn over it */ | |
| 6859 || pum_visible() | |
| 6860 #endif | |
| 6861 ) | |
| 7 | 6862 { |
| 6863 /* Don't redraw right now, do it later. */ | |
| 6864 wp->w_redr_status = TRUE; | |
| 6865 } | |
| 6866 #ifdef FEAT_STL_OPT | |
| 40 | 6867 else if (*p_stl != NUL || *wp->w_p_stl != NUL) |
| 7 | 6868 { |
| 6869 /* redraw custom status line */ | |
| 1983 | 6870 redraw_custom_statusline(wp); |
| 7 | 6871 } |
| 6872 #endif | |
| 6873 else | |
| 6874 { | |
|
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
|
6875 fillchar = fillchar_status(&attr, wp); |
| 7 | 6876 |
| 685 | 6877 get_trans_bufname(wp->w_buffer); |
| 7 | 6878 p = NameBuff; |
| 6879 len = (int)STRLEN(p); | |
| 6880 | |
|
11834
0cfe4a07c2ad
patch 8.0.0797: finished job in terminal window is not handled
Christian Brabandt <cb@256bit.org>
parents:
11698
diff
changeset
|
6881 if (bt_help(wp->w_buffer) |
| 7 | 6882 #ifdef FEAT_QUICKFIX |
| 6883 || wp->w_p_pvw | |
| 6884 #endif | |
| 6885 || bufIsChanged(wp->w_buffer) | |
| 6886 || wp->w_buffer->b_p_ro) | |
| 6887 *(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
|
6888 if (bt_help(wp->w_buffer)) |
| 7 | 6889 { |
| 809 | 6890 STRCPY(p + len, _("[Help]")); |
| 7 | 6891 len += (int)STRLEN(p + len); |
| 6892 } | |
| 6893 #ifdef FEAT_QUICKFIX | |
| 6894 if (wp->w_p_pvw) | |
| 6895 { | |
| 6896 STRCPY(p + len, _("[Preview]")); | |
| 6897 len += (int)STRLEN(p + len); | |
| 6898 } | |
| 6899 #endif | |
|
11981
cf36b424ea03
patch 8.0.0871: status line for a terminal window always has "[+]".
Christian Brabandt <cb@256bit.org>
parents:
11915
diff
changeset
|
6900 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
|
6901 #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
|
6902 && !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
|
6903 #endif |
|
cf36b424ea03
patch 8.0.0871: status line for a terminal window always has "[+]".
Christian Brabandt <cb@256bit.org>
parents:
11915
diff
changeset
|
6904 ) |
| 7 | 6905 { |
| 6906 STRCPY(p + len, "[+]"); | |
| 6907 len += 3; | |
| 6908 } | |
| 6909 if (wp->w_buffer->b_p_ro) | |
| 6910 { | |
|
4795
8360a59aa04b
updated for version 7.3.1144
Bram Moolenaar <bram@vim.org>
parents:
4736
diff
changeset
|
6911 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
|
6912 len += (int)STRLEN(p + len); |
| 7 | 6913 } |
| 6914 | |
| 6915 this_ru_col = ru_col - (Columns - W_WIDTH(wp)); | |
| 6916 if (this_ru_col < (W_WIDTH(wp) + 1) / 2) | |
| 6917 this_ru_col = (W_WIDTH(wp) + 1) / 2; | |
| 6918 if (this_ru_col <= 1) | |
| 6919 { | |
| 6920 p = (char_u *)"<"; /* No room for file name! */ | |
| 6921 len = 1; | |
| 6922 } | |
| 6923 else | |
| 6924 #ifdef FEAT_MBYTE | |
| 6925 if (has_mbyte) | |
| 6926 { | |
| 6927 int clen = 0, i; | |
| 6928 | |
| 6929 /* Count total number of display cells. */ | |
|
2338
da6ec32d8d8f
Added strwidth() and strchars() functions.
Bram Moolenaar <bram@vim.org>
parents:
2332
diff
changeset
|
6930 clen = mb_string2cells(p, -1); |
|
da6ec32d8d8f
Added strwidth() and strchars() functions.
Bram Moolenaar <bram@vim.org>
parents:
2332
diff
changeset
|
6931 |
| 7 | 6932 /* Find first character that will fit. |
| 6933 * Going from start to end is much faster for DBCS. */ | |
| 6934 for (i = 0; p[i] != NUL && clen >= this_ru_col - 1; | |
| 474 | 6935 i += (*mb_ptr2len)(p + i)) |
| 7 | 6936 clen -= (*mb_ptr2cells)(p + i); |
| 6937 len = clen; | |
| 6938 if (i > 0) | |
| 6939 { | |
| 6940 p = p + i - 1; | |
| 6941 *p = '<'; | |
| 6942 ++len; | |
| 6943 } | |
| 6944 | |
| 6945 } | |
| 6946 else | |
| 6947 #endif | |
| 6948 if (len > this_ru_col - 1) | |
| 6949 { | |
| 6950 p += len - (this_ru_col - 1); | |
| 6951 *p = '<'; | |
| 6952 len = this_ru_col - 1; | |
| 6953 } | |
| 6954 | |
| 6955 row = W_WINROW(wp) + wp->w_height; | |
| 6956 screen_puts(p, row, W_WINCOL(wp), attr); | |
| 6957 screen_fill(row, row + 1, len + W_WINCOL(wp), | |
| 6958 this_ru_col + W_WINCOL(wp), fillchar, fillchar, attr); | |
| 6959 | |
|
9645
123d3c102035
commit https://github.com/vim/vim/commit/73ac0c4281a3606651604a3cbcc334bfb3859a87
Christian Brabandt <cb@256bit.org>
parents:
9489
diff
changeset
|
6960 if (get_keymap_str(wp, (char_u *)"<%s>", NameBuff, MAXPATHL) |
| 7 | 6961 && (int)(this_ru_col - len) > (int)(STRLEN(NameBuff) + 1)) |
| 6962 screen_puts(NameBuff, row, (int)(this_ru_col - STRLEN(NameBuff) | |
| 6963 - 1 + W_WINCOL(wp)), attr); | |
| 6964 | |
| 6965 #ifdef FEAT_CMDL_INFO | |
| 6966 win_redr_ruler(wp, TRUE); | |
| 6967 #endif | |
| 6968 } | |
| 6969 | |
| 6970 /* | |
| 6971 * May need to draw the character below the vertical separator. | |
| 6972 */ | |
| 6973 if (wp->w_vsep_width != 0 && wp->w_status_height != 0 && redrawing()) | |
| 6974 { | |
| 6975 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
|
6976 fillchar = fillchar_status(&attr, wp); |
| 7 | 6977 else |
| 6978 fillchar = fillchar_vsep(&attr); | |
| 6979 screen_putchar(fillchar, W_WINROW(wp) + wp->w_height, W_ENDCOL(wp), | |
| 6980 attr); | |
| 6981 } | |
| 1910 | 6982 busy = FALSE; |
| 7 | 6983 } |
| 6984 | |
| 680 | 6985 #ifdef FEAT_STL_OPT |
| 6986 /* | |
| 6987 * Redraw the status line according to 'statusline' and take care of any | |
| 6988 * errors encountered. | |
| 6989 */ | |
| 6990 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6991 redraw_custom_statusline(win_T *wp) |
| 680 | 6992 { |
| 1983 | 6993 static int entered = FALSE; |
|
8847
470ea7526cc6
commit https://github.com/vim/vim/commit/a742e084b677f76c67e9e52c4f9fb9ab24002e20
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
6994 int saved_did_emsg = did_emsg; |
| 1983 | 6995 |
| 6996 /* When called recursively return. This can happen when the statusline | |
| 6997 * contains an expression that triggers a redraw. */ | |
| 6998 if (entered) | |
| 6999 return; | |
| 7000 entered = TRUE; | |
| 680 | 7001 |
|
8847
470ea7526cc6
commit https://github.com/vim/vim/commit/a742e084b677f76c67e9e52c4f9fb9ab24002e20
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
7002 did_emsg = FALSE; |
| 680 | 7003 win_redr_custom(wp, FALSE); |
|
8847
470ea7526cc6
commit https://github.com/vim/vim/commit/a742e084b677f76c67e9e52c4f9fb9ab24002e20
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
7004 if (did_emsg) |
| 1983 | 7005 { |
| 7006 /* When there is an error disable the statusline, otherwise the | |
| 7007 * display is messed up with errors and a redraw triggers the problem | |
| 7008 * again and again. */ | |
| 680 | 7009 set_string_option_direct((char_u *)"statusline", -1, |
| 7010 (char_u *)"", OPT_FREE | (*wp->w_p_stl != NUL | |
| 694 | 7011 ? OPT_LOCAL : OPT_GLOBAL), SID_ERROR); |
| 1983 | 7012 } |
|
8847
470ea7526cc6
commit https://github.com/vim/vim/commit/a742e084b677f76c67e9e52c4f9fb9ab24002e20
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
7013 did_emsg |= saved_did_emsg; |
| 1983 | 7014 entered = FALSE; |
| 680 | 7015 } |
| 7016 #endif | |
| 7017 | |
| 7 | 7018 /* |
| 7019 * Return TRUE if the status line of window "wp" is connected to the status | |
| 7020 * line of the window right of it. If not, then it's a vertical separator. | |
| 7021 * Only call if (wp->w_vsep_width != 0). | |
| 7022 */ | |
| 7023 int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7024 stl_connected(win_T *wp) |
| 7 | 7025 { |
| 7026 frame_T *fr; | |
| 7027 | |
| 7028 fr = wp->w_frame; | |
| 7029 while (fr->fr_parent != NULL) | |
| 7030 { | |
| 7031 if (fr->fr_parent->fr_layout == FR_COL) | |
| 7032 { | |
| 7033 if (fr->fr_next != NULL) | |
| 7034 break; | |
| 7035 } | |
| 7036 else | |
| 7037 { | |
| 7038 if (fr->fr_next != NULL) | |
| 7039 return TRUE; | |
| 7040 } | |
| 7041 fr = fr->fr_parent; | |
| 7042 } | |
| 7043 return FALSE; | |
| 7044 } | |
| 7045 | |
| 7046 #endif /* FEAT_WINDOWS */ | |
| 7047 | |
| 7048 #if defined(FEAT_WINDOWS) || defined(FEAT_STL_OPT) || defined(PROTO) | |
| 7049 /* | |
| 7050 * Get the value to show for the language mappings, active 'keymap'. | |
| 7051 */ | |
| 7052 int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7053 get_keymap_str( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7054 win_T *wp, |
|
9645
123d3c102035
commit https://github.com/vim/vim/commit/73ac0c4281a3606651604a3cbcc334bfb3859a87
Christian Brabandt <cb@256bit.org>
parents:
9489
diff
changeset
|
7055 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
|
7056 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
|
7057 int len) /* length of buffer */ |
| 7 | 7058 { |
| 7059 char_u *p; | |
| 7060 | |
| 7061 if (wp->w_buffer->b_p_iminsert != B_IMODE_LMAP) | |
| 7062 return FALSE; | |
| 7063 | |
| 7064 { | |
| 7065 #ifdef FEAT_EVAL | |
| 7066 buf_T *old_curbuf = curbuf; | |
| 7067 win_T *old_curwin = curwin; | |
| 7068 char_u *s; | |
| 7069 | |
| 7070 curbuf = wp->w_buffer; | |
| 7071 curwin = wp; | |
| 7072 STRCPY(buf, "b:keymap_name"); /* must be writable */ | |
| 7073 ++emsg_skip; | |
| 714 | 7074 s = p = eval_to_string(buf, NULL, FALSE); |
| 7 | 7075 --emsg_skip; |
| 7076 curbuf = old_curbuf; | |
| 7077 curwin = old_curwin; | |
| 7078 if (p == NULL || *p == NUL) | |
| 7079 #endif | |
| 7080 { | |
| 7081 #ifdef FEAT_KEYMAP | |
| 7082 if (wp->w_buffer->b_kmap_state & KEYMAP_LOADED) | |
| 7083 p = wp->w_buffer->b_p_keymap; | |
| 7084 else | |
| 7085 #endif | |
| 7086 p = (char_u *)"lang"; | |
| 7087 } | |
|
9645
123d3c102035
commit https://github.com/vim/vim/commit/73ac0c4281a3606651604a3cbcc334bfb3859a87
Christian Brabandt <cb@256bit.org>
parents:
9489
diff
changeset
|
7088 if (vim_snprintf((char *)buf, len, (char *)fmt, p) > len - 1) |
| 7 | 7089 buf[0] = NUL; |
| 7090 #ifdef FEAT_EVAL | |
| 7091 vim_free(s); | |
| 7092 #endif | |
| 7093 } | |
| 7094 return buf[0] != NUL; | |
| 7095 } | |
| 7096 #endif | |
| 7097 | |
| 7098 #if defined(FEAT_STL_OPT) || defined(PROTO) | |
| 7099 /* | |
| 677 | 7100 * Redraw the status line or ruler of window "wp". |
| 7101 * When "wp" is NULL redraw the tab pages line from 'tabline'. | |
| 7 | 7102 */ |
| 7103 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7104 win_redr_custom( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7105 win_T *wp, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7106 int draw_ruler) /* TRUE or FALSE */ |
| 7 | 7107 { |
| 5539 | 7108 static int entered = FALSE; |
| 7 | 7109 int attr; |
| 7110 int curattr; | |
| 7111 int row; | |
| 7112 int col = 0; | |
| 7113 int maxwidth; | |
| 7114 int width; | |
| 7115 int n; | |
| 7116 int len; | |
| 7117 int fillchar; | |
| 7118 char_u buf[MAXPATHL]; | |
| 1983 | 7119 char_u *stl; |
| 7 | 7120 char_u *p; |
| 681 | 7121 struct stl_hlrec hltab[STL_MAX_ITEM]; |
| 7122 struct stl_hlrec tabtab[STL_MAX_ITEM]; | |
| 677 | 7123 int use_sandbox = FALSE; |
| 2693 | 7124 win_T *ewp; |
| 7125 int p_crb_save; | |
| 7 | 7126 |
| 5539 | 7127 /* There is a tiny chance that this gets called recursively: When |
| 7128 * redrawing a status line triggers redrawing the ruler or tabline. | |
| 7129 * Avoid trouble by not allowing recursion. */ | |
| 7130 if (entered) | |
| 7131 return; | |
| 7132 entered = TRUE; | |
| 7133 | |
| 7 | 7134 /* setup environment for the task at hand */ |
| 677 | 7135 if (wp == NULL) |
| 7136 { | |
| 7137 /* Use 'tabline'. Always at the first line of the screen. */ | |
| 1983 | 7138 stl = p_tal; |
| 677 | 7139 row = 0; |
| 707 | 7140 fillchar = ' '; |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
7141 attr = HL_ATTR(HLF_TPF); |
| 677 | 7142 maxwidth = Columns; |
| 7143 # ifdef FEAT_EVAL | |
| 681 | 7144 use_sandbox = was_set_insecurely((char_u *)"tabline", 0); |
| 677 | 7145 # endif |
| 7146 } | |
| 40 | 7147 else |
| 677 | 7148 { |
| 7149 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
|
7150 fillchar = fillchar_status(&attr, wp); |
| 677 | 7151 maxwidth = W_WIDTH(wp); |
| 7152 | |
| 7153 if (draw_ruler) | |
| 7154 { | |
| 1983 | 7155 stl = p_ruf; |
| 677 | 7156 /* advance past any leading group spec - implicit in ru_col */ |
| 1983 | 7157 if (*stl == '%') |
| 7158 { | |
| 7159 if (*++stl == '-') | |
| 7160 stl++; | |
| 7161 if (atoi((char *)stl)) | |
| 7162 while (VIM_ISDIGIT(*stl)) | |
| 7163 stl++; | |
| 7164 if (*stl++ != '(') | |
| 7165 stl = p_ruf; | |
| 677 | 7166 } |
|
8643
24b43dd167eb
commit https://github.com/vim/vim/commit/44a2f923c00f1384c9ecde12fb5b4711bc20702e
Christian Brabandt <cb@256bit.org>
parents:
8627
diff
changeset
|
7167 #ifdef FEAT_WINDOWS |
| 677 | 7168 col = ru_col - (Columns - W_WIDTH(wp)); |
| 7169 if (col < (W_WIDTH(wp) + 1) / 2) | |
| 7170 col = (W_WIDTH(wp) + 1) / 2; | |
| 7 | 7171 #else |
| 677 | 7172 col = ru_col; |
| 7173 if (col > (Columns + 1) / 2) | |
| 7174 col = (Columns + 1) / 2; | |
| 7175 #endif | |
| 7176 maxwidth = W_WIDTH(wp) - col; | |
| 7 | 7177 #ifdef FEAT_WINDOWS |
| 677 | 7178 if (!wp->w_status_height) |
| 7179 #endif | |
| 7180 { | |
| 7181 row = Rows - 1; | |
| 7182 --maxwidth; /* writing in last column may cause scrolling */ | |
| 7183 fillchar = ' '; | |
| 7184 attr = 0; | |
| 7185 } | |
| 7186 | |
| 7187 # ifdef FEAT_EVAL | |
| 681 | 7188 use_sandbox = was_set_insecurely((char_u *)"rulerformat", 0); |
| 677 | 7189 # endif |
| 7190 } | |
| 7191 else | |
| 7192 { | |
| 7193 if (*wp->w_p_stl != NUL) | |
| 1983 | 7194 stl = wp->w_p_stl; |
| 677 | 7195 else |
| 1983 | 7196 stl = p_stl; |
| 677 | 7197 # ifdef FEAT_EVAL |
| 681 | 7198 use_sandbox = was_set_insecurely((char_u *)"statusline", |
| 7199 *wp->w_p_stl == NUL ? 0 : OPT_LOCAL); | |
| 677 | 7200 # endif |
| 7201 } | |
| 7202 | |
|
8643
24b43dd167eb
commit https://github.com/vim/vim/commit/44a2f923c00f1384c9ecde12fb5b4711bc20702e
Christian Brabandt <cb@256bit.org>
parents:
8627
diff
changeset
|
7203 #ifdef FEAT_WINDOWS |
| 677 | 7204 col += W_WINCOL(wp); |
| 7205 #endif | |
| 7206 } | |
| 7207 | |
| 7 | 7208 if (maxwidth <= 0) |
| 5539 | 7209 goto theend; |
| 677 | 7210 |
| 2693 | 7211 /* Temporarily reset 'cursorbind', we don't want a side effect from moving |
| 7212 * the cursor away and back. */ | |
| 7213 ewp = wp == NULL ? curwin : wp; | |
| 7214 p_crb_save = ewp->w_p_crb; | |
| 7215 ewp->w_p_crb = FALSE; | |
| 7216 | |
| 1983 | 7217 /* Make a copy, because the statusline may include a function call that |
| 7218 * might change the option value and free the memory. */ | |
| 7219 stl = vim_strsave(stl); | |
| 2693 | 7220 width = build_stl_str_hl(ewp, buf, sizeof(buf), |
| 1983 | 7221 stl, use_sandbox, |
| 681 | 7222 fillchar, maxwidth, hltab, tabtab); |
| 1983 | 7223 vim_free(stl); |
| 2693 | 7224 ewp->w_p_crb = p_crb_save; |
| 2661 | 7225 |
| 7226 /* Make all characters printable. */ | |
| 7227 p = transstr(buf); | |
| 7228 if (p != NULL) | |
| 7229 { | |
| 7230 vim_strncpy(buf, p, sizeof(buf) - 1); | |
| 7231 vim_free(p); | |
| 7232 } | |
| 7233 | |
| 7234 /* fill up with "fillchar" */ | |
| 835 | 7235 len = (int)STRLEN(buf); |
| 1883 | 7236 while (width < maxwidth && len < (int)sizeof(buf) - 1) |
| 7 | 7237 { |
| 7238 #ifdef FEAT_MBYTE | |
| 7239 len += (*mb_char2bytes)(fillchar, buf + len); | |
| 7240 #else | |
| 7241 buf[len++] = fillchar; | |
| 7242 #endif | |
| 7243 ++width; | |
| 7244 } | |
| 7245 buf[len] = NUL; | |
| 7246 | |
| 681 | 7247 /* |
| 7248 * Draw each snippet with the specified highlighting. | |
| 7249 */ | |
| 7 | 7250 curattr = attr; |
| 7251 p = buf; | |
| 681 | 7252 for (n = 0; hltab[n].start != NULL; n++) |
| 7253 { | |
| 7254 len = (int)(hltab[n].start - p); | |
| 7 | 7255 screen_puts_len(p, len, row, col, curattr); |
| 7256 col += vim_strnsize(p, len); | |
| 681 | 7257 p = hltab[n].start; |
| 7258 | |
| 7259 if (hltab[n].userhl == 0) | |
| 7 | 7260 curattr = attr; |
| 681 | 7261 else if (hltab[n].userhl < 0) |
| 7262 curattr = syn_id2attr(-hltab[n].userhl); | |
| 7 | 7263 #ifdef FEAT_WINDOWS |
|
12114
f306e6decaf9
patch 8.0.0937: user highlight groups not adjusted for terminal
Christian Brabandt <cb@256bit.org>
parents:
11981
diff
changeset
|
7264 # 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
|
7265 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
|
7266 && 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
|
7267 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
|
7268 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
|
7269 && 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
|
7270 curattr = highlight_stlterm[hltab[n].userhl - 1]; |
|
f306e6decaf9
patch 8.0.0937: user highlight groups not adjusted for terminal
Christian Brabandt <cb@256bit.org>
parents:
11981
diff
changeset
|
7271 # endif |
| 680 | 7272 else if (wp != NULL && wp != curwin && wp->w_status_height != 0) |
| 681 | 7273 curattr = highlight_stlnc[hltab[n].userhl - 1]; |
| 7 | 7274 #endif |
| 7275 else | |
| 681 | 7276 curattr = highlight_user[hltab[n].userhl - 1]; |
| 7 | 7277 } |
| 7278 screen_puts(p, row, col, curattr); | |
| 681 | 7279 |
| 7280 if (wp == NULL) | |
| 7281 { | |
| 7282 /* Fill the TabPageIdxs[] array for clicking in the tab pagesline. */ | |
| 7283 col = 0; | |
| 7284 len = 0; | |
| 7285 p = buf; | |
| 7286 fillchar = 0; | |
| 7287 for (n = 0; tabtab[n].start != NULL; n++) | |
| 7288 { | |
| 7289 len += vim_strnsize(p, (int)(tabtab[n].start - p)); | |
| 7290 while (col < len) | |
| 7291 TabPageIdxs[col++] = fillchar; | |
| 7292 p = tabtab[n].start; | |
| 7293 fillchar = tabtab[n].userhl; | |
| 7294 } | |
| 7295 while (col < Columns) | |
| 7296 TabPageIdxs[col++] = fillchar; | |
| 7297 } | |
| 5539 | 7298 |
| 7299 theend: | |
| 7300 entered = FALSE; | |
| 7 | 7301 } |
| 7302 | |
| 7303 #endif /* FEAT_STL_OPT */ | |
| 7304 | |
| 7305 /* | |
| 7306 * Output a single character directly to the screen and update ScreenLines. | |
| 7307 */ | |
| 7308 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7309 screen_putchar(int c, int row, int col, int attr) |
| 7 | 7310 { |
| 3549 | 7311 char_u buf[MB_MAXBYTES + 1]; |
| 7312 | |
| 7 | 7313 #ifdef FEAT_MBYTE |
| 3549 | 7314 if (has_mbyte) |
| 7315 buf[(*mb_char2bytes)(c, buf)] = NUL; | |
| 7316 else | |
| 7317 #endif | |
| 7318 { | |
| 7319 buf[0] = c; | |
| 7320 buf[1] = NUL; | |
| 7321 } | |
| 7 | 7322 screen_puts(buf, row, col, attr); |
| 7323 } | |
| 7324 | |
| 7325 /* | |
| 7326 * Get a single character directly from ScreenLines into "bytes[]". | |
| 7327 * Also return its attribute in *attrp; | |
| 7328 */ | |
| 7329 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7330 screen_getbytes(int row, int col, char_u *bytes, int *attrp) |
| 7 | 7331 { |
| 7332 unsigned off; | |
| 7333 | |
| 7334 /* safety check */ | |
| 7335 if (ScreenLines != NULL && row < screen_Rows && col < screen_Columns) | |
| 7336 { | |
| 7337 off = LineOffset[row] + col; | |
| 7338 *attrp = ScreenAttrs[off]; | |
| 7339 bytes[0] = ScreenLines[off]; | |
| 7340 bytes[1] = NUL; | |
| 7341 | |
| 7342 #ifdef FEAT_MBYTE | |
| 7343 if (enc_utf8 && ScreenLinesUC[off] != 0) | |
| 7344 bytes[utfc_char2bytes(off, bytes)] = NUL; | |
| 7345 else if (enc_dbcs == DBCS_JPNU && ScreenLines[off] == 0x8e) | |
| 7346 { | |
| 7347 bytes[0] = ScreenLines[off]; | |
| 7348 bytes[1] = ScreenLines2[off]; | |
| 7349 bytes[2] = NUL; | |
| 7350 } | |
| 7351 else if (enc_dbcs && MB_BYTE2LEN(bytes[0]) > 1) | |
| 7352 { | |
| 7353 bytes[1] = ScreenLines[off + 1]; | |
| 7354 bytes[2] = NUL; | |
| 7355 } | |
| 7356 #endif | |
| 7357 } | |
| 7358 } | |
| 7359 | |
| 714 | 7360 #ifdef FEAT_MBYTE |
|
7805
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7697
diff
changeset
|
7361 static int screen_comp_differs(int, int*); |
| 714 | 7362 |
| 7363 /* | |
| 7364 * Return TRUE if composing characters for screen posn "off" differs from | |
| 7365 * composing characters in "u8cc". | |
|
2124
dc8a5699253b
updated for version 7.2.406
Bram Moolenaar <bram@zimbu.org>
parents:
2122
diff
changeset
|
7366 * Only to be used when ScreenLinesUC[off] != 0. |
| 714 | 7367 */ |
| 7368 static int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7369 screen_comp_differs(int off, int *u8cc) |
| 714 | 7370 { |
| 7371 int i; | |
| 7372 | |
| 7373 for (i = 0; i < Screen_mco; ++i) | |
| 7374 { | |
| 7375 if (ScreenLinesC[i][off] != (u8char_T)u8cc[i]) | |
| 7376 return TRUE; | |
| 7377 if (u8cc[i] == 0) | |
| 7378 break; | |
| 7379 } | |
| 7380 return FALSE; | |
| 7381 } | |
| 7382 #endif | |
| 7383 | |
| 7 | 7384 /* |
| 7385 * Put string '*text' on the screen at position 'row' and 'col', with | |
| 7386 * attributes 'attr', and update ScreenLines[] and ScreenAttrs[]. | |
| 7387 * Note: only outputs within one row, message is truncated at screen boundary! | |
| 7388 * Note: if ScreenLines[], row and/or col is invalid, nothing is done. | |
| 7389 */ | |
| 7390 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7391 screen_puts( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7392 char_u *text, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7393 int row, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7394 int col, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7395 int attr) |
| 7 | 7396 { |
| 7397 screen_puts_len(text, -1, row, col, attr); | |
| 7398 } | |
| 7399 | |
| 7400 /* | |
| 7401 * Like screen_puts(), but output "text[len]". When "len" is -1 output up to | |
| 7402 * a NUL. | |
| 7403 */ | |
| 7404 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7405 screen_puts_len( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7406 char_u *text, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7407 int textlen, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7408 int row, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7409 int col, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7410 int attr) |
| 7 | 7411 { |
| 7412 unsigned off; | |
| 7413 char_u *ptr = text; | |
| 5923 | 7414 int len = textlen; |
| 7 | 7415 int c; |
| 7416 #ifdef FEAT_MBYTE | |
| 1378 | 7417 unsigned max_off; |
| 7 | 7418 int mbyte_blen = 1; |
| 7419 int mbyte_cells = 1; | |
| 7420 int u8c = 0; | |
| 714 | 7421 int u8cc[MAX_MCO]; |
| 7 | 7422 int clear_next_cell = FALSE; |
| 7423 # ifdef FEAT_ARABIC | |
| 7424 int prev_c = 0; /* previous Arabic character */ | |
| 714 | 7425 int pc, nc, nc1; |
| 7426 int pcc[MAX_MCO]; | |
| 7 | 7427 # endif |
| 7428 #endif | |
| 1843 | 7429 #if defined(FEAT_MBYTE) || defined(FEAT_GUI) || defined(UNIX) |
| 7430 int force_redraw_this; | |
| 7431 int force_redraw_next = FALSE; | |
| 7432 #endif | |
| 7433 int need_redraw; | |
| 7 | 7434 |
| 7435 if (ScreenLines == NULL || row >= screen_Rows) /* safety check */ | |
| 7436 return; | |
| 1843 | 7437 off = LineOffset[row] + col; |
| 7 | 7438 |
| 1668 | 7439 #ifdef FEAT_MBYTE |
| 7440 /* When drawing over the right halve of a double-wide char clear out the | |
| 7441 * left halve. Only needed in a terminal. */ | |
| 1685 | 7442 if (has_mbyte && col > 0 && col < screen_Columns |
| 1668 | 7443 # ifdef FEAT_GUI |
| 7444 && !gui.in_use | |
| 7445 # endif | |
| 7446 && mb_fix_col(col, row) != col) | |
| 1843 | 7447 { |
| 7448 ScreenLines[off - 1] = ' '; | |
| 7449 ScreenAttrs[off - 1] = 0; | |
| 7450 if (enc_utf8) | |
| 7451 { | |
| 7452 ScreenLinesUC[off - 1] = 0; | |
| 7453 ScreenLinesC[0][off - 1] = 0; | |
| 7454 } | |
| 7455 /* redraw the previous cell, make it empty */ | |
| 7456 screen_char(off - 1, row, col - 1); | |
| 7457 /* force the cell at "col" to be redrawn */ | |
| 7458 force_redraw_next = TRUE; | |
| 7459 } | |
| 7460 #endif | |
| 7461 | |
| 1378 | 7462 #ifdef FEAT_MBYTE |
| 7463 max_off = LineOffset[row] + screen_Columns; | |
| 7464 #endif | |
| 1340 | 7465 while (col < screen_Columns |
| 7466 && (len < 0 || (int)(ptr - text) < len) | |
| 7467 && *ptr != NUL) | |
| 7 | 7468 { |
| 7469 c = *ptr; | |
| 7470 #ifdef FEAT_MBYTE | |
| 7471 /* check if this is the first byte of a multibyte */ | |
| 7472 if (has_mbyte) | |
| 7473 { | |
| 7474 if (enc_utf8 && len > 0) | |
| 474 | 7475 mbyte_blen = utfc_ptr2len_len(ptr, (int)((text + len) - ptr)); |
| 7 | 7476 else |
| 474 | 7477 mbyte_blen = (*mb_ptr2len)(ptr); |
| 7 | 7478 if (enc_dbcs == DBCS_JPNU && c == 0x8e) |
| 7479 mbyte_cells = 1; | |
| 7480 else if (enc_dbcs != 0) | |
| 7481 mbyte_cells = mbyte_blen; | |
| 7482 else /* enc_utf8 */ | |
| 7483 { | |
| 7484 if (len >= 0) | |
| 714 | 7485 u8c = utfc_ptr2char_len(ptr, u8cc, |
| 7 | 7486 (int)((text + len) - ptr)); |
| 7487 else | |
| 714 | 7488 u8c = utfc_ptr2char(ptr, u8cc); |
| 7 | 7489 mbyte_cells = utf_char2cells(u8c); |
| 1401 | 7490 # ifdef UNICODE16 |
| 7 | 7491 /* Non-BMP character: display as ? or fullwidth ?. */ |
| 7492 if (u8c >= 0x10000) | |
| 7493 { | |
| 7494 u8c = (mbyte_cells == 2) ? 0xff1f : (int)'?'; | |
| 7495 if (attr == 0) | |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
7496 attr = HL_ATTR(HLF_8); |
| 7 | 7497 } |
| 1401 | 7498 # endif |
| 7 | 7499 # ifdef FEAT_ARABIC |
| 7500 if (p_arshape && !p_tbidi && ARABIC_CHAR(u8c)) | |
| 7501 { | |
| 7502 /* Do Arabic shaping. */ | |
| 7503 if (len >= 0 && (int)(ptr - text) + mbyte_blen >= len) | |
| 7504 { | |
| 7505 /* Past end of string to be displayed. */ | |
| 7506 nc = NUL; | |
| 7507 nc1 = NUL; | |
| 7508 } | |
| 7509 else | |
| 714 | 7510 { |
| 1994 | 7511 nc = utfc_ptr2char_len(ptr + mbyte_blen, pcc, |
| 7512 (int)((text + len) - ptr - mbyte_blen)); | |
| 714 | 7513 nc1 = pcc[0]; |
| 7514 } | |
| 7 | 7515 pc = prev_c; |
| 7516 prev_c = u8c; | |
| 714 | 7517 u8c = arabic_shape(u8c, &c, &u8cc[0], nc, nc1, pc); |
| 7 | 7518 } |
| 7519 else | |
| 7520 prev_c = u8c; | |
| 7521 # endif | |
|
2055
4aa4510d548c
updated for version 7.2.341
Bram Moolenaar <bram@zimbu.org>
parents:
2008
diff
changeset
|
7522 if (col + mbyte_cells > screen_Columns) |
|
4aa4510d548c
updated for version 7.2.341
Bram Moolenaar <bram@zimbu.org>
parents:
2008
diff
changeset
|
7523 { |
|
4aa4510d548c
updated for version 7.2.341
Bram Moolenaar <bram@zimbu.org>
parents:
2008
diff
changeset
|
7524 /* 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
|
7525 * 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
|
7526 c = '>'; |
|
4aa4510d548c
updated for version 7.2.341
Bram Moolenaar <bram@zimbu.org>
parents:
2008
diff
changeset
|
7527 mbyte_cells = 1; |
|
4aa4510d548c
updated for version 7.2.341
Bram Moolenaar <bram@zimbu.org>
parents:
2008
diff
changeset
|
7528 } |
| 7 | 7529 } |
| 7530 } | |
| 7531 #endif | |
| 7532 | |
| 1843 | 7533 #if defined(FEAT_MBYTE) || defined(FEAT_GUI) || defined(UNIX) |
| 7534 force_redraw_this = force_redraw_next; | |
| 7535 force_redraw_next = FALSE; | |
| 7536 #endif | |
| 7537 | |
| 7538 need_redraw = ScreenLines[off] != c | |
| 7 | 7539 #ifdef FEAT_MBYTE |
| 7540 || (mbyte_cells == 2 | |
| 7541 && ScreenLines[off + 1] != (enc_dbcs ? ptr[1] : 0)) | |
| 7542 || (enc_dbcs == DBCS_JPNU | |
| 7543 && c == 0x8e | |
| 7544 && ScreenLines2[off] != ptr[1]) | |
| 7545 || (enc_utf8 | |
|
2124
dc8a5699253b
updated for version 7.2.406
Bram Moolenaar <bram@zimbu.org>
parents:
2122
diff
changeset
|
7546 && (ScreenLinesUC[off] != |
|
dc8a5699253b
updated for version 7.2.406
Bram Moolenaar <bram@zimbu.org>
parents:
2122
diff
changeset
|
7547 (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
|
7548 || (ScreenLinesUC[off] != 0 |
|
dc8a5699253b
updated for version 7.2.406
Bram Moolenaar <bram@zimbu.org>
parents:
2122
diff
changeset
|
7549 && screen_comp_differs(off, u8cc)))) |
| 7 | 7550 #endif |
| 7551 || ScreenAttrs[off] != attr | |
| 1843 | 7552 || exmode_active; |
| 7553 | |
| 7554 if (need_redraw | |
| 7555 #if defined(FEAT_MBYTE) || defined(FEAT_GUI) || defined(UNIX) | |
| 7556 || force_redraw_this | |
| 7557 #endif | |
| 7 | 7558 ) |
| 7559 { | |
| 7560 #if defined(FEAT_GUI) || defined(UNIX) | |
| 7561 /* The bold trick makes a single row of pixels appear in the next | |
| 7562 * character. When a bold character is removed, the next | |
| 7563 * character should be redrawn too. This happens for our own GUI | |
| 1843 | 7564 * and for some xterms. */ |
| 7565 if (need_redraw && ScreenLines[off] != ' ' && ( | |
| 7 | 7566 # ifdef FEAT_GUI |
| 7567 gui.in_use | |
| 7568 # endif | |
| 7569 # if defined(FEAT_GUI) && defined(UNIX) | |
| 7570 || | |
| 7571 # endif | |
| 7572 # ifdef UNIX | |
| 7573 term_is_xterm | |
| 7574 # endif | |
| 1843 | 7575 )) |
| 7576 { | |
| 7577 int n = ScreenAttrs[off]; | |
| 7578 | |
| 7579 if (n > HL_ALL) | |
| 7580 n = syn_attr2attr(n); | |
| 7581 if (n & HL_BOLD) | |
| 7582 force_redraw_next = TRUE; | |
| 7 | 7583 } |
| 7584 #endif | |
| 7585 #ifdef FEAT_MBYTE | |
| 7586 /* When at the end of the text and overwriting a two-cell | |
| 7587 * character with a one-cell character, need to clear the next | |
| 7588 * cell. Also when overwriting the left halve of a two-cell char | |
| 7589 * with the right halve of a two-cell char. Do this only once | |
| 7590 * (mb_off2cells() may return 2 on the right halve). */ | |
| 7591 if (clear_next_cell) | |
| 7592 clear_next_cell = FALSE; | |
| 7593 else if (has_mbyte | |
| 7594 && (len < 0 ? ptr[mbyte_blen] == NUL | |
| 7595 : ptr + mbyte_blen >= text + len) | |
| 1378 | 7596 && ((mbyte_cells == 1 && (*mb_off2cells)(off, max_off) > 1) |
| 7 | 7597 || (mbyte_cells == 2 |
| 1378 | 7598 && (*mb_off2cells)(off, max_off) == 1 |
| 7599 && (*mb_off2cells)(off + 1, max_off) > 1))) | |
| 7 | 7600 clear_next_cell = TRUE; |
| 7601 | |
| 7602 /* Make sure we never leave a second byte of a double-byte behind, | |
| 7603 * it confuses mb_off2cells(). */ | |
| 7604 if (enc_dbcs | |
| 1378 | 7605 && ((mbyte_cells == 1 && (*mb_off2cells)(off, max_off) > 1) |
| 7 | 7606 || (mbyte_cells == 2 |
| 1378 | 7607 && (*mb_off2cells)(off, max_off) == 1 |
| 7608 && (*mb_off2cells)(off + 1, max_off) > 1))) | |
| 7 | 7609 ScreenLines[off + mbyte_blen] = 0; |
| 7610 #endif | |
| 7611 ScreenLines[off] = c; | |
| 7612 ScreenAttrs[off] = attr; | |
| 7613 #ifdef FEAT_MBYTE | |
| 7614 if (enc_utf8) | |
| 7615 { | |
| 714 | 7616 if (c < 0x80 && u8cc[0] == 0) |
| 7 | 7617 ScreenLinesUC[off] = 0; |
| 7618 else | |
| 7619 { | |
| 714 | 7620 int i; |
| 7621 | |
| 7 | 7622 ScreenLinesUC[off] = u8c; |
| 714 | 7623 for (i = 0; i < Screen_mco; ++i) |
| 7624 { | |
| 7625 ScreenLinesC[i][off] = u8cc[i]; | |
| 7626 if (u8cc[i] == 0) | |
| 7627 break; | |
| 7628 } | |
| 7 | 7629 } |
| 7630 if (mbyte_cells == 2) | |
| 7631 { | |
| 7632 ScreenLines[off + 1] = 0; | |
| 7633 ScreenAttrs[off + 1] = attr; | |
| 7634 } | |
| 7635 screen_char(off, row, col); | |
| 7636 } | |
| 7637 else if (mbyte_cells == 2) | |
| 7638 { | |
| 7639 ScreenLines[off + 1] = ptr[1]; | |
| 7640 ScreenAttrs[off + 1] = attr; | |
| 7641 screen_char_2(off, row, col); | |
| 7642 } | |
| 7643 else if (enc_dbcs == DBCS_JPNU && c == 0x8e) | |
| 7644 { | |
| 7645 ScreenLines2[off] = ptr[1]; | |
| 7646 screen_char(off, row, col); | |
| 7647 } | |
| 7648 else | |
| 7649 #endif | |
| 7650 screen_char(off, row, col); | |
| 7651 } | |
| 7652 #ifdef FEAT_MBYTE | |
| 7653 if (has_mbyte) | |
| 7654 { | |
| 7655 off += mbyte_cells; | |
| 7656 col += mbyte_cells; | |
| 7657 ptr += mbyte_blen; | |
| 7658 if (clear_next_cell) | |
| 5923 | 7659 { |
| 7660 /* This only happens at the end, display one space next. */ | |
| 7 | 7661 ptr = (char_u *)" "; |
| 5923 | 7662 len = -1; |
| 7663 } | |
| 7 | 7664 } |
| 7665 else | |
| 7666 #endif | |
| 7667 { | |
| 7668 ++off; | |
| 7669 ++col; | |
| 7670 ++ptr; | |
| 7671 } | |
| 7672 } | |
| 1843 | 7673 |
| 7674 #if defined(FEAT_MBYTE) || defined(FEAT_GUI) || defined(UNIX) | |
| 7675 /* If we detected the next character needs to be redrawn, but the text | |
| 7676 * doesn't extend up to there, update the character here. */ | |
| 7677 if (force_redraw_next && col < screen_Columns) | |
| 7678 { | |
| 7679 # ifdef FEAT_MBYTE | |
| 7680 if (enc_dbcs != 0 && dbcs_off2cells(off, max_off) > 1) | |
| 7681 screen_char_2(off, row, col); | |
| 7682 else | |
| 7683 # endif | |
| 7684 screen_char(off, row, col); | |
| 7685 } | |
| 7686 #endif | |
| 7 | 7687 } |
| 7688 | |
| 7689 #ifdef FEAT_SEARCH_EXTRA | |
| 7690 /* | |
| 1326 | 7691 * Prepare for 'hlsearch' highlighting. |
| 7 | 7692 */ |
| 7693 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7694 start_search_hl(void) |
| 7 | 7695 { |
| 7696 if (p_hls && !no_hlsearch) | |
| 7697 { | |
| 7698 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
|
7699 search_hl.attr = HL_ATTR(HLF_L); |
| 1521 | 7700 # ifdef FEAT_RELTIME |
| 7701 /* Set the time limit to 'redrawtime'. */ | |
| 7702 profile_setlimit(p_rdt, &search_hl.tm); | |
| 7703 # endif | |
| 7 | 7704 } |
| 7705 } | |
| 7706 | |
| 7707 /* | |
| 1326 | 7708 * Clean up for 'hlsearch' highlighting. |
| 7 | 7709 */ |
| 7710 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7711 end_search_hl(void) |
| 7 | 7712 { |
| 7713 if (search_hl.rm.regprog != NULL) | |
| 7714 { | |
|
4805
66803af09906
updated for version 7.3.1149
Bram Moolenaar <bram@vim.org>
parents:
4795
diff
changeset
|
7715 vim_regfree(search_hl.rm.regprog); |
| 7 | 7716 search_hl.rm.regprog = NULL; |
| 7717 } | |
| 7718 } | |
| 7719 | |
| 7720 /* | |
|
2284
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7721 * 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
|
7722 */ |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7723 static void |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7724 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
|
7725 { |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7726 matchitem_T *cur; |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7727 |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7728 /* 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
|
7729 * match */ |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7730 cur = wp->w_match_head; |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7731 while (cur != NULL) |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7732 { |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7733 cur->hl.rm = cur->match; |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7734 if (cur->hlg_id == 0) |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7735 cur->hl.attr = 0; |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7736 else |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7737 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
|
7738 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
|
7739 cur->hl.lnum = 0; |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7740 cur->hl.first_lnum = 0; |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7741 # ifdef FEAT_RELTIME |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7742 /* 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
|
7743 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
|
7744 # endif |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7745 cur = cur->next; |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7746 } |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7747 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
|
7748 search_hl.lnum = 0; |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7749 search_hl.first_lnum = 0; |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7750 /* 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
|
7751 } |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7752 |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7753 /* |
| 7 | 7754 * Advance to the match in window "wp" line "lnum" or past it. |
| 7755 */ | |
| 7756 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7757 prepare_search_hl(win_T *wp, linenr_T lnum) |
| 7 | 7758 { |
| 1326 | 7759 matchitem_T *cur; /* points to the match list */ |
| 7760 match_T *shl; /* points to search_hl or a match */ | |
| 7761 int shl_flag; /* flag to indicate whether search_hl | |
| 7762 has been processed or not */ | |
| 5979 | 7763 int pos_inprogress; /* marks that position match search is |
| 7764 in progress */ | |
| 7 | 7765 int n; |
| 7766 | |
| 7767 /* | |
| 7768 * When using a multi-line pattern, start searching at the top | |
| 7769 * of the window or just after a closed fold. | |
| 1326 | 7770 * Do this both for search_hl and the match list. |
| 7 | 7771 */ |
| 1326 | 7772 cur = wp->w_match_head; |
| 7773 shl_flag = FALSE; | |
| 7774 while (cur != NULL || shl_flag == FALSE) | |
| 7775 { | |
| 7776 if (shl_flag == FALSE) | |
| 7777 { | |
| 7778 shl = &search_hl; | |
| 7779 shl_flag = TRUE; | |
| 7780 } | |
| 7781 else | |
| 7782 shl = &cur->hl; | |
| 7 | 7783 if (shl->rm.regprog != NULL |
| 7784 && shl->lnum == 0 | |
| 7785 && re_multiline(shl->rm.regprog)) | |
| 7786 { | |
| 7787 if (shl->first_lnum == 0) | |
| 7788 { | |
| 7789 # ifdef FEAT_FOLDING | |
| 7790 for (shl->first_lnum = lnum; | |
| 7791 shl->first_lnum > wp->w_topline; --shl->first_lnum) | |
| 7792 if (hasFoldingWin(wp, shl->first_lnum - 1, | |
| 7793 NULL, NULL, TRUE, NULL)) | |
| 7794 break; | |
| 7795 # else | |
| 7796 shl->first_lnum = wp->w_topline; | |
| 7797 # endif | |
| 7798 } | |
| 5979 | 7799 if (cur != NULL) |
| 7800 cur->pos.cur = 0; | |
| 7801 pos_inprogress = TRUE; | |
| 7 | 7802 n = 0; |
| 5979 | 7803 while (shl->first_lnum < lnum && (shl->rm.regprog != NULL |
| 7804 || (cur != NULL && pos_inprogress))) | |
| 7805 { | |
|
9992
3e3b0ce24b61
commit https://github.com/vim/vim/commit/e17bdffff78ebd6a4e3cff26754cc667557ea810
Christian Brabandt <cb@256bit.org>
parents:
9939
diff
changeset
|
7806 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
|
7807 shl == &search_hl ? NULL : cur); |
| 5979 | 7808 pos_inprogress = cur == NULL || cur->pos.cur == 0 |
| 7809 ? FALSE : TRUE; | |
| 7 | 7810 if (shl->lnum != 0) |
| 7811 { | |
| 7812 shl->first_lnum = shl->lnum | |
| 7813 + shl->rm.endpos[0].lnum | |
| 7814 - shl->rm.startpos[0].lnum; | |
| 7815 n = shl->rm.endpos[0].col; | |
| 7816 } | |
| 7817 else | |
| 7818 { | |
| 7819 ++shl->first_lnum; | |
| 7820 n = 0; | |
| 7821 } | |
| 7822 } | |
| 7823 } | |
| 1326 | 7824 if (shl != &search_hl && cur != NULL) |
| 7825 cur = cur->next; | |
| 7 | 7826 } |
| 7827 } | |
| 7828 | |
| 7829 /* | |
| 1326 | 7830 * Search for a next 'hlsearch' or match. |
| 7 | 7831 * Uses shl->buf. |
| 7832 * Sets shl->lnum and shl->rm contents. | |
| 7833 * Note: Assumes a previous match is always before "lnum", unless | |
| 7834 * shl->lnum is zero. | |
| 7835 * Careful: Any pointers for buffer lines will become invalid. | |
| 7836 */ | |
| 7837 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7838 next_search_hl( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7839 win_T *win, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7840 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
|
7841 linenr_T lnum, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7842 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
|
7843 matchitem_T *cur) /* to retrieve match positions if any */ |
| 7 | 7844 { |
| 7845 linenr_T l; | |
| 7846 colnr_T matchcol; | |
| 7847 long nmatched; | |
| 7848 | |
| 7849 if (shl->lnum != 0) | |
| 7850 { | |
| 7851 /* Check for three situations: | |
| 7852 * 1. If the "lnum" is below a previous match, start a new search. | |
| 7853 * 2. If the previous match includes "mincol", use it. | |
| 7854 * 3. Continue after the previous match. | |
| 7855 */ | |
| 7856 l = shl->lnum + shl->rm.endpos[0].lnum - shl->rm.startpos[0].lnum; | |
| 7857 if (lnum > l) | |
| 7858 shl->lnum = 0; | |
| 7859 else if (lnum < l || shl->rm.endpos[0].col > mincol) | |
| 7860 return; | |
| 7861 } | |
| 7862 | |
| 7863 /* | |
| 7864 * Repeat searching for a match until one is found that includes "mincol" | |
| 7865 * or none is found in this line. | |
| 7866 */ | |
| 7867 called_emsg = FALSE; | |
| 7868 for (;;) | |
| 7869 { | |
| 1521 | 7870 #ifdef FEAT_RELTIME |
| 7871 /* Stop searching after passing the time limit. */ | |
| 7872 if (profile_passed_limit(&(shl->tm))) | |
| 7873 { | |
| 7874 shl->lnum = 0; /* no match found in time */ | |
| 7875 break; | |
| 7876 } | |
| 7877 #endif | |
| 7 | 7878 /* Three situations: |
| 7879 * 1. No useful previous match: search from start of line. | |
| 7880 * 2. Not Vi compatible or empty match: continue at next character. | |
| 7881 * Break the loop if this is beyond the end of the line. | |
| 7882 * 3. Vi compatible searching: continue at end of previous match. | |
| 7883 */ | |
| 7884 if (shl->lnum == 0) | |
| 7885 matchcol = 0; | |
| 7886 else if (vim_strchr(p_cpo, CPO_SEARCH) == NULL | |
| 7887 || (shl->rm.endpos[0].lnum == 0 | |
| 685 | 7888 && shl->rm.endpos[0].col <= shl->rm.startpos[0].col)) |
| 7889 { | |
| 688 | 7890 char_u *ml; |
| 685 | 7891 |
| 7892 matchcol = shl->rm.startpos[0].col; | |
| 688 | 7893 ml = ml_get_buf(shl->buf, lnum, FALSE) + matchcol; |
| 685 | 7894 if (*ml == NUL) |
| 7895 { | |
| 7896 ++matchcol; | |
| 7 | 7897 shl->lnum = 0; |
| 7898 break; | |
| 7899 } | |
| 685 | 7900 #ifdef FEAT_MBYTE |
| 7901 if (has_mbyte) | |
| 7902 matchcol += mb_ptr2len(ml); | |
| 7903 else | |
| 7904 #endif | |
| 7905 ++matchcol; | |
| 7 | 7906 } |
| 7907 else | |
| 7908 matchcol = shl->rm.endpos[0].col; | |
| 7909 | |
| 7910 shl->lnum = lnum; | |
| 5979 | 7911 if (shl->rm.regprog != NULL) |
| 7912 { | |
| 6394 | 7913 /* Remember whether shl->rm is using a copy of the regprog in |
| 7914 * cur->match. */ | |
| 7915 int regprog_is_copy = (shl != &search_hl && cur != NULL | |
| 7916 && shl == &cur->hl | |
| 7917 && 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
|
7918 int timed_out = FALSE; |
| 6394 | 7919 |
| 5979 | 7920 nmatched = vim_regexec_multi(&shl->rm, win, shl->buf, lnum, |
| 7921 matchcol, | |
| 1521 | 7922 #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
|
7923 &(shl->tm), &timed_out |
| 1521 | 7924 #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
|
7925 NULL, NULL |
| 5979 | 7926 #endif |
| 7927 ); | |
| 6394 | 7928 /* Copy the regprog, in case it got freed and recompiled. */ |
| 7929 if (regprog_is_copy) | |
| 7930 cur->match.regprog = cur->hl.rm.regprog; | |
| 7931 | |
|
11521
578df034735d
patch 8.0.0643: when a pattern search is slow Vim becomes unusable
Christian Brabandt <cb@256bit.org>
parents:
11516
diff
changeset
|
7932 if (called_emsg || got_int || timed_out) |
| 5979 | 7933 { |
| 7934 /* Error while handling regexp: stop using this regexp. */ | |
| 7935 if (shl == &search_hl) | |
| 7936 { | |
| 7937 /* don't free regprog in the match list, it's a copy */ | |
| 7938 vim_regfree(shl->rm.regprog); | |
| 7939 SET_NO_HLSEARCH(TRUE); | |
| 7940 } | |
| 7941 shl->rm.regprog = NULL; | |
| 7942 shl->lnum = 0; | |
| 7943 got_int = FALSE; /* avoid the "Type :quit to exit Vim" | |
| 7944 message */ | |
| 7945 break; | |
| 7946 } | |
| 7947 } | |
| 7948 else if (cur != NULL) | |
| 7949 nmatched = next_search_hl_pos(shl, lnum, &(cur->pos), matchcol); | |
| 5987 | 7950 else |
| 7951 nmatched = 0; | |
| 7 | 7952 if (nmatched == 0) |
| 7953 { | |
| 7954 shl->lnum = 0; /* no match found */ | |
| 7955 break; | |
| 7956 } | |
| 7957 if (shl->rm.startpos[0].lnum > 0 | |
| 7958 || shl->rm.startpos[0].col >= mincol | |
| 7959 || nmatched > 1 | |
| 7960 || shl->rm.endpos[0].col > mincol) | |
| 7961 { | |
| 7962 shl->lnum += shl->rm.startpos[0].lnum; | |
| 7963 break; /* useful match found */ | |
| 7964 } | |
| 7965 } | |
| 7966 } | |
| 7967 | |
|
10287
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
7968 /* |
|
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
7969 * 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
|
7970 * Return zero otherwise. |
|
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
7971 */ |
| 5979 | 7972 static int |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7973 next_search_hl_pos( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7974 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
|
7975 linenr_T lnum, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7976 posmatch_T *posmatch, /* match positions */ |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7977 colnr_T mincol) /* minimal column for a match */ |
| 5979 | 7978 { |
| 7979 int i; | |
|
10287
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
7980 int found = -1; |
|
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
7981 |
| 5979 | 7982 for (i = posmatch->cur; i < MAXPOSMATCH; i++) |
| 7983 { | |
|
10273
489eae19cad9
commit https://github.com/vim/vim/commit/a6c27ee6db2c328e0ab0e6d143e2a295a0bb9c9a
Christian Brabandt <cb@256bit.org>
parents:
10247
diff
changeset
|
7984 llpos_T *pos = &posmatch->pos[i]; |
|
489eae19cad9
commit https://github.com/vim/vim/commit/a6c27ee6db2c328e0ab0e6d143e2a295a0bb9c9a
Christian Brabandt <cb@256bit.org>
parents:
10247
diff
changeset
|
7985 |
|
489eae19cad9
commit https://github.com/vim/vim/commit/a6c27ee6db2c328e0ab0e6d143e2a295a0bb9c9a
Christian Brabandt <cb@256bit.org>
parents:
10247
diff
changeset
|
7986 if (pos->lnum == 0) |
| 5979 | 7987 break; |
|
10287
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
7988 if (pos->len == 0 && pos->col < mincol) |
| 5979 | 7989 continue; |
|
10273
489eae19cad9
commit https://github.com/vim/vim/commit/a6c27ee6db2c328e0ab0e6d143e2a295a0bb9c9a
Christian Brabandt <cb@256bit.org>
parents:
10247
diff
changeset
|
7990 if (pos->lnum == lnum) |
| 5979 | 7991 { |
|
10287
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
7992 if (found >= 0) |
|
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
7993 { |
|
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
7994 /* 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
|
7995 * them */ |
|
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
7996 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
|
7997 { |
|
489eae19cad9
commit https://github.com/vim/vim/commit/a6c27ee6db2c328e0ab0e6d143e2a295a0bb9c9a
Christian Brabandt <cb@256bit.org>
parents:
10247
diff
changeset
|
7998 llpos_T tmp = *pos; |
|
489eae19cad9
commit https://github.com/vim/vim/commit/a6c27ee6db2c328e0ab0e6d143e2a295a0bb9c9a
Christian Brabandt <cb@256bit.org>
parents:
10247
diff
changeset
|
7999 |
|
10287
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
8000 *pos = posmatch->pos[found]; |
|
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
8001 posmatch->pos[found] = tmp; |
| 5979 | 8002 } |
| 8003 } | |
| 8004 else | |
|
10287
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
8005 found = i; |
| 5979 | 8006 } |
| 8007 } | |
| 8008 posmatch->cur = 0; | |
|
10287
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
8009 if (found >= 0) |
|
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
8010 { |
|
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
8011 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
|
8012 ? 0 : posmatch->pos[found].col - 1; |
|
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
8013 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
|
8014 ? MAXCOL : start + posmatch->pos[found].len; |
|
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
8015 |
|
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
8016 shl->lnum = lnum; |
| 5979 | 8017 shl->rm.startpos[0].lnum = 0; |
| 8018 shl->rm.startpos[0].col = start; | |
| 8019 shl->rm.endpos[0].lnum = 0; | |
| 8020 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
|
8021 shl->is_addpos = TRUE; |
|
10287
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
8022 posmatch->cur = found + 1; |
|
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
8023 return 1; |
|
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
8024 } |
|
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
8025 return 0; |
| 5979 | 8026 } |
| 5985 | 8027 #endif |
| 5979 | 8028 |
| 7 | 8029 static void |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8030 screen_start_highlight(int attr) |
| 7 | 8031 { |
| 8032 attrentry_T *aep = NULL; | |
| 8033 | |
| 8034 screen_attr = attr; | |
| 8035 if (full_screen | |
| 8036 #ifdef WIN3264 | |
| 8037 && termcap_active | |
| 8038 #endif | |
| 8039 ) | |
| 8040 { | |
| 8041 #ifdef FEAT_GUI | |
| 8042 if (gui.in_use) | |
| 8043 { | |
| 8044 char buf[20]; | |
| 8045 | |
| 681 | 8046 /* The GUI handles this internally. */ |
| 8047 sprintf(buf, IF_EB("\033|%dh", ESC_STR "|%dh"), attr); | |
| 7 | 8048 OUT_STR(buf); |
| 8049 } | |
| 8050 else | |
| 8051 #endif | |
| 8052 { | |
| 8053 if (attr > HL_ALL) /* special HL attr. */ | |
| 8054 { | |
|
8969
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8055 if (IS_CTERM) |
| 7 | 8056 aep = syn_cterm_attr2entry(attr); |
| 8057 else | |
| 8058 aep = syn_term_attr2entry(attr); | |
| 8059 if (aep == NULL) /* did ":syntax clear" */ | |
| 8060 attr = 0; | |
| 8061 else | |
| 8062 attr = aep->ae_attr; | |
| 8063 } | |
| 8064 if ((attr & HL_BOLD) && T_MD != NULL) /* bold */ | |
| 8065 out_str(T_MD); | |
|
8969
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8066 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
|
8067 #ifdef FEAT_TERMGUICOLORS |
|
773d627cac0b
commit https://github.com/vim/vim/commit/61be73bb0f965a895bfb064ea3e55476ac175162
Christian Brabandt <cb@256bit.org>
parents:
8977
diff
changeset
|
8068 (p_tgc ? |
|
9939
ccb6461b82df
commit https://github.com/vim/vim/commit/1b58cdd160c2e0ada0f638679a2aa27e4665fc48
Christian Brabandt <cb@256bit.org>
parents:
9885
diff
changeset
|
8069 (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
|
8070 #endif |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8071 (t_colors > 1 && 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
|
8072 #ifdef FEAT_TERMGUICOLORS |
|
8969
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8073 ) |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8074 #endif |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8075 ) |
| 681 | 8076 /* If the Normal FG color has BOLD attribute and the new HL |
| 8077 * has a FG color defined, clear BOLD. */ | |
| 8078 out_str(T_ME); | |
| 7 | 8079 if ((attr & HL_STANDOUT) && T_SO != NULL) /* standout */ |
| 8080 out_str(T_SO); | |
| 205 | 8081 if ((attr & (HL_UNDERLINE | HL_UNDERCURL)) && T_US != NULL) |
| 8082 /* underline or undercurl */ | |
| 7 | 8083 out_str(T_US); |
| 8084 if ((attr & HL_ITALIC) && T_CZH != NULL) /* italic */ | |
| 8085 out_str(T_CZH); | |
| 8086 if ((attr & HL_INVERSE) && T_MR != NULL) /* inverse (reverse) */ | |
| 8087 out_str(T_MR); | |
| 8088 | |
| 8089 /* | |
| 8090 * Output the color or start string after bold etc., in case the | |
| 8091 * bold etc. override the color setting. | |
| 8092 */ | |
| 8093 if (aep != NULL) | |
| 8094 { | |
|
9027
773d627cac0b
commit https://github.com/vim/vim/commit/61be73bb0f965a895bfb064ea3e55476ac175162
Christian Brabandt <cb@256bit.org>
parents:
8977
diff
changeset
|
8095 #ifdef FEAT_TERMGUICOLORS |
|
773d627cac0b
commit https://github.com/vim/vim/commit/61be73bb0f965a895bfb064ea3e55476ac175162
Christian Brabandt <cb@256bit.org>
parents:
8977
diff
changeset
|
8096 if (p_tgc) |
|
8969
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8097 { |
|
9939
ccb6461b82df
commit https://github.com/vim/vim/commit/1b58cdd160c2e0ada0f638679a2aa27e4665fc48
Christian Brabandt <cb@256bit.org>
parents:
9885
diff
changeset
|
8098 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
|
8099 term_fg_rgb_color(aep->ae_u.cterm.fg_rgb); |
|
9939
ccb6461b82df
commit https://github.com/vim/vim/commit/1b58cdd160c2e0ada0f638679a2aa27e4665fc48
Christian Brabandt <cb@256bit.org>
parents:
9885
diff
changeset
|
8100 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
|
8101 term_bg_rgb_color(aep->ae_u.cterm.bg_rgb); |
| 7 | 8102 } |
| 8103 else | |
|
8969
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8104 #endif |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8105 { |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8106 if (t_colors > 1) |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8107 { |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8108 if (aep->ae_u.cterm.fg_color) |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8109 term_fg_color(aep->ae_u.cterm.fg_color - 1); |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8110 if (aep->ae_u.cterm.bg_color) |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8111 term_bg_color(aep->ae_u.cterm.bg_color - 1); |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8112 } |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8113 else |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8114 { |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8115 if (aep->ae_u.term.start != NULL) |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8116 out_str(aep->ae_u.term.start); |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8117 } |
| 7 | 8118 } |
| 8119 } | |
| 8120 } | |
| 8121 } | |
| 8122 } | |
| 8123 | |
| 8124 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8125 screen_stop_highlight(void) |
| 7 | 8126 { |
| 8127 int do_ME = FALSE; /* output T_ME code */ | |
| 8128 | |
| 8129 if (screen_attr != 0 | |
| 8130 #ifdef WIN3264 | |
| 8131 && termcap_active | |
| 8132 #endif | |
| 8133 ) | |
| 8134 { | |
| 8135 #ifdef FEAT_GUI | |
| 8136 if (gui.in_use) | |
| 8137 { | |
| 8138 char buf[20]; | |
| 8139 | |
| 8140 /* use internal GUI code */ | |
| 8141 sprintf(buf, IF_EB("\033|%dH", ESC_STR "|%dH"), screen_attr); | |
| 8142 OUT_STR(buf); | |
| 8143 } | |
| 8144 else | |
| 8145 #endif | |
| 8146 { | |
| 8147 if (screen_attr > HL_ALL) /* special HL attr. */ | |
| 8148 { | |
| 8149 attrentry_T *aep; | |
| 8150 | |
|
8969
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8151 if (IS_CTERM) |
| 7 | 8152 { |
| 8153 /* | |
| 8154 * Assume that t_me restores the original colors! | |
| 8155 */ | |
| 8156 aep = syn_cterm_attr2entry(screen_attr); | |
|
8969
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8157 if (aep != NULL && |
|
9027
773d627cac0b
commit https://github.com/vim/vim/commit/61be73bb0f965a895bfb064ea3e55476ac175162
Christian Brabandt <cb@256bit.org>
parents:
8977
diff
changeset
|
8158 #ifdef FEAT_TERMGUICOLORS |
|
773d627cac0b
commit https://github.com/vim/vim/commit/61be73bb0f965a895bfb064ea3e55476ac175162
Christian Brabandt <cb@256bit.org>
parents:
8977
diff
changeset
|
8159 (p_tgc ? |
|
9939
ccb6461b82df
commit https://github.com/vim/vim/commit/1b58cdd160c2e0ada0f638679a2aa27e4665fc48
Christian Brabandt <cb@256bit.org>
parents:
9885
diff
changeset
|
8160 (aep->ae_u.cterm.fg_rgb != INVALCOLOR |
|
ccb6461b82df
commit https://github.com/vim/vim/commit/1b58cdd160c2e0ada0f638679a2aa27e4665fc48
Christian Brabandt <cb@256bit.org>
parents:
9885
diff
changeset
|
8161 || 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
|
8162 #endif |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8163 (aep->ae_u.cterm.fg_color || aep->ae_u.cterm.bg_color) |
|
9027
773d627cac0b
commit https://github.com/vim/vim/commit/61be73bb0f965a895bfb064ea3e55476ac175162
Christian Brabandt <cb@256bit.org>
parents:
8977
diff
changeset
|
8164 #ifdef FEAT_TERMGUICOLORS |
|
8969
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8165 ) |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8166 #endif |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8167 ) |
| 7 | 8168 do_ME = TRUE; |
| 8169 } | |
| 8170 else | |
| 8171 { | |
| 8172 aep = syn_term_attr2entry(screen_attr); | |
| 8173 if (aep != NULL && aep->ae_u.term.stop != NULL) | |
| 8174 { | |
| 8175 if (STRCMP(aep->ae_u.term.stop, T_ME) == 0) | |
| 8176 do_ME = TRUE; | |
| 8177 else | |
| 8178 out_str(aep->ae_u.term.stop); | |
| 8179 } | |
| 8180 } | |
| 8181 if (aep == NULL) /* did ":syntax clear" */ | |
| 8182 screen_attr = 0; | |
| 8183 else | |
| 8184 screen_attr = aep->ae_attr; | |
| 8185 } | |
| 8186 | |
| 8187 /* | |
| 8188 * Often all ending-codes are equal to T_ME. Avoid outputting the | |
| 8189 * same sequence several times. | |
| 8190 */ | |
| 8191 if (screen_attr & HL_STANDOUT) | |
| 8192 { | |
| 8193 if (STRCMP(T_SE, T_ME) == 0) | |
| 8194 do_ME = TRUE; | |
| 8195 else | |
| 8196 out_str(T_SE); | |
| 8197 } | |
| 205 | 8198 if (screen_attr & (HL_UNDERLINE | HL_UNDERCURL)) |
| 7 | 8199 { |
| 8200 if (STRCMP(T_UE, T_ME) == 0) | |
| 8201 do_ME = TRUE; | |
| 8202 else | |
| 8203 out_str(T_UE); | |
| 8204 } | |
| 8205 if (screen_attr & HL_ITALIC) | |
| 8206 { | |
| 8207 if (STRCMP(T_CZR, T_ME) == 0) | |
| 8208 do_ME = TRUE; | |
| 8209 else | |
| 8210 out_str(T_CZR); | |
| 8211 } | |
| 8212 if (do_ME || (screen_attr & (HL_BOLD | HL_INVERSE))) | |
| 8213 out_str(T_ME); | |
| 8214 | |
|
9027
773d627cac0b
commit https://github.com/vim/vim/commit/61be73bb0f965a895bfb064ea3e55476ac175162
Christian Brabandt <cb@256bit.org>
parents:
8977
diff
changeset
|
8215 #ifdef FEAT_TERMGUICOLORS |
|
773d627cac0b
commit https://github.com/vim/vim/commit/61be73bb0f965a895bfb064ea3e55476ac175162
Christian Brabandt <cb@256bit.org>
parents:
8977
diff
changeset
|
8216 if (p_tgc) |
|
8969
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8217 { |
|
9939
ccb6461b82df
commit https://github.com/vim/vim/commit/1b58cdd160c2e0ada0f638679a2aa27e4665fc48
Christian Brabandt <cb@256bit.org>
parents:
9885
diff
changeset
|
8218 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
|
8219 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
|
8220 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
|
8221 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
|
8222 } |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8223 else |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8224 #endif |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8225 { |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8226 if (t_colors > 1) |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8227 { |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8228 /* set Normal cterm colors */ |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8229 if (cterm_normal_fg_color != 0) |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8230 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
|
8231 if (cterm_normal_bg_color != 0) |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8232 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
|
8233 if (cterm_normal_fg_bold) |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8234 out_str(T_MD); |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8235 } |
| 7 | 8236 } |
| 8237 } | |
| 8238 } | |
| 8239 screen_attr = 0; | |
| 8240 } | |
| 8241 | |
| 8242 /* | |
| 8243 * Reset the colors for a cterm. Used when leaving Vim. | |
| 8244 * The machine specific code may override this again. | |
| 8245 */ | |
| 8246 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8247 reset_cterm_colors(void) |
| 7 | 8248 { |
|
8969
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8249 if (IS_CTERM) |
| 7 | 8250 { |
| 8251 /* set Normal cterm colors */ | |
|
9027
773d627cac0b
commit https://github.com/vim/vim/commit/61be73bb0f965a895bfb064ea3e55476ac175162
Christian Brabandt <cb@256bit.org>
parents:
8977
diff
changeset
|
8252 #ifdef FEAT_TERMGUICOLORS |
|
9939
ccb6461b82df
commit https://github.com/vim/vim/commit/1b58cdd160c2e0ada0f638679a2aa27e4665fc48
Christian Brabandt <cb@256bit.org>
parents:
9885
diff
changeset
|
8253 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
|
8254 || cterm_normal_bg_gui_color != INVALCOLOR) |
|
ccb6461b82df
commit https://github.com/vim/vim/commit/1b58cdd160c2e0ada0f638679a2aa27e4665fc48
Christian Brabandt <cb@256bit.org>
parents:
9885
diff
changeset
|
8255 : (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
|
8256 #else |
| 7 | 8257 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
|
8258 #endif |
| 7 | 8259 { |
| 8260 out_str(T_OP); | |
| 8261 screen_attr = -1; | |
| 8262 } | |
| 8263 if (cterm_normal_fg_bold) | |
| 8264 { | |
| 8265 out_str(T_ME); | |
| 8266 screen_attr = -1; | |
| 8267 } | |
| 8268 } | |
| 8269 } | |
| 8270 | |
| 8271 /* | |
| 8272 * Put character ScreenLines["off"] on the screen at position "row" and "col", | |
| 8273 * using the attributes from ScreenAttrs["off"]. | |
| 8274 */ | |
| 8275 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8276 screen_char(unsigned off, int row, int col) |
| 7 | 8277 { |
| 8278 int attr; | |
| 8279 | |
| 8280 /* Check for illegal values, just in case (could happen just after | |
| 8281 * resizing). */ | |
| 8282 if (row >= screen_Rows || col >= screen_Columns) | |
| 8283 return; | |
| 8284 | |
| 6602 | 8285 /* Outputting a character in the last cell on the screen may scroll the |
| 8286 * screen up. Only do it when the "xn" termcap property is set, otherwise | |
| 8287 * mark the character invalid (update it when scrolled up). */ | |
| 8288 if (*T_XN == NUL | |
| 8289 && row == screen_Rows - 1 && col == screen_Columns - 1 | |
| 7 | 8290 #ifdef FEAT_RIGHTLEFT |
| 8291 /* account for first command-line character in rightleft mode */ | |
| 8292 && !cmdmsg_rl | |
| 8293 #endif | |
| 8294 ) | |
| 8295 { | |
| 8296 ScreenAttrs[off] = (sattr_T)-1; | |
| 8297 return; | |
| 8298 } | |
| 8299 | |
| 8300 /* | |
| 8301 * Stop highlighting first, so it's easier to move the cursor. | |
| 8302 */ | |
|
8643
24b43dd167eb
commit https://github.com/vim/vim/commit/44a2f923c00f1384c9ecde12fb5b4711bc20702e
Christian Brabandt <cb@256bit.org>
parents:
8627
diff
changeset
|
8303 #if defined(FEAT_CLIPBOARD) || defined(FEAT_WINDOWS) |
| 7 | 8304 if (screen_char_attr != 0) |
| 8305 attr = screen_char_attr; | |
| 8306 else | |
| 8307 #endif | |
| 8308 attr = ScreenAttrs[off]; | |
| 8309 if (screen_attr != attr) | |
| 8310 screen_stop_highlight(); | |
| 8311 | |
| 8312 windgoto(row, col); | |
| 8313 | |
| 8314 if (screen_attr != attr) | |
| 8315 screen_start_highlight(attr); | |
| 8316 | |
| 8317 #ifdef FEAT_MBYTE | |
| 8318 if (enc_utf8 && ScreenLinesUC[off] != 0) | |
| 8319 { | |
| 8320 char_u buf[MB_MAXBYTES + 1]; | |
| 8321 | |
| 8322 /* Convert UTF-8 character to bytes and write it. */ | |
| 8323 | |
| 8324 buf[utfc_char2bytes(off, buf)] = NUL; | |
| 8325 | |
| 8326 out_str(buf); | |
|
8819
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8817
diff
changeset
|
8327 if (utf_ambiguous_width(ScreenLinesUC[off])) |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8817
diff
changeset
|
8328 screen_cur_col = 9999; |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8817
diff
changeset
|
8329 else if (utf_char2cells(ScreenLinesUC[off]) > 1) |
| 7 | 8330 ++screen_cur_col; |
| 8331 } | |
| 8332 else | |
| 8333 #endif | |
| 8334 { | |
| 8335 #ifdef FEAT_MBYTE | |
| 8336 out_flush_check(); | |
| 8337 #endif | |
| 8338 out_char(ScreenLines[off]); | |
| 8339 #ifdef FEAT_MBYTE | |
| 8340 /* double-byte character in single-width cell */ | |
| 8341 if (enc_dbcs == DBCS_JPNU && ScreenLines[off] == 0x8e) | |
| 8342 out_char(ScreenLines2[off]); | |
| 8343 #endif | |
| 8344 } | |
| 8345 | |
| 8346 screen_cur_col++; | |
| 8347 } | |
| 8348 | |
| 8349 #ifdef FEAT_MBYTE | |
| 8350 | |
| 8351 /* | |
| 8352 * Used for enc_dbcs only: Put one double-wide character at ScreenLines["off"] | |
| 8353 * on the screen at position 'row' and 'col'. | |
| 8354 * The attributes of the first byte is used for all. This is required to | |
| 8355 * output the two bytes of a double-byte character with nothing in between. | |
| 8356 */ | |
| 8357 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8358 screen_char_2(unsigned off, int row, int col) |
| 7 | 8359 { |
| 8360 /* Check for illegal values (could be wrong when screen was resized). */ | |
| 8361 if (off + 1 >= (unsigned)(screen_Rows * screen_Columns)) | |
| 8362 return; | |
| 8363 | |
| 8364 /* Outputting the last character on the screen may scrollup the screen. | |
| 8365 * Don't to it! Mark the character invalid (update it when scrolled up) */ | |
| 8366 if (row == screen_Rows - 1 && col >= screen_Columns - 2) | |
| 8367 { | |
| 8368 ScreenAttrs[off] = (sattr_T)-1; | |
| 8369 return; | |
| 8370 } | |
| 8371 | |
| 8372 /* Output the first byte normally (positions the cursor), then write the | |
| 8373 * second byte directly. */ | |
| 8374 screen_char(off, row, col); | |
| 8375 out_char(ScreenLines[off + 1]); | |
| 8376 ++screen_cur_col; | |
| 8377 } | |
| 8378 #endif | |
| 8379 | |
|
8643
24b43dd167eb
commit https://github.com/vim/vim/commit/44a2f923c00f1384c9ecde12fb5b4711bc20702e
Christian Brabandt <cb@256bit.org>
parents:
8627
diff
changeset
|
8380 #if defined(FEAT_CLIPBOARD) || defined(FEAT_WINDOWS) || defined(PROTO) |
| 7 | 8381 /* |
| 8382 * Draw a rectangle of the screen, inverted when "invert" is TRUE. | |
| 8383 * This uses the contents of ScreenLines[] and doesn't change it. | |
| 8384 */ | |
| 8385 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8386 screen_draw_rectangle( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8387 int row, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8388 int col, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8389 int height, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8390 int width, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8391 int invert) |
| 7 | 8392 { |
| 8393 int r, c; | |
| 8394 int off; | |
| 1378 | 8395 #ifdef FEAT_MBYTE |
| 8396 int max_off; | |
| 8397 #endif | |
| 7 | 8398 |
| 534 | 8399 /* Can't use ScreenLines unless initialized */ |
| 8400 if (ScreenLines == NULL) | |
| 8401 return; | |
| 8402 | |
| 7 | 8403 if (invert) |
| 8404 screen_char_attr = HL_INVERSE; | |
| 8405 for (r = row; r < row + height; ++r) | |
| 8406 { | |
| 8407 off = LineOffset[r]; | |
| 1378 | 8408 #ifdef FEAT_MBYTE |
| 8409 max_off = off + screen_Columns; | |
| 8410 #endif | |
| 7 | 8411 for (c = col; c < col + width; ++c) |
| 8412 { | |
| 8413 #ifdef FEAT_MBYTE | |
| 1378 | 8414 if (enc_dbcs != 0 && dbcs_off2cells(off + c, max_off) > 1) |
| 7 | 8415 { |
| 8416 screen_char_2(off + c, r, c); | |
| 8417 ++c; | |
| 8418 } | |
| 8419 else | |
| 8420 #endif | |
| 8421 { | |
| 8422 screen_char(off + c, r, c); | |
| 8423 #ifdef FEAT_MBYTE | |
| 1378 | 8424 if (utf_off2cells(off + c, max_off) > 1) |
| 7 | 8425 ++c; |
| 8426 #endif | |
| 8427 } | |
| 8428 } | |
| 8429 } | |
| 8430 screen_char_attr = 0; | |
| 8431 } | |
| 8432 #endif | |
| 8433 | |
|
8643
24b43dd167eb
commit https://github.com/vim/vim/commit/44a2f923c00f1384c9ecde12fb5b4711bc20702e
Christian Brabandt <cb@256bit.org>
parents:
8627
diff
changeset
|
8434 #ifdef FEAT_WINDOWS |
| 7 | 8435 /* |
| 8436 * Redraw the characters for a vertically split window. | |
| 8437 */ | |
| 8438 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8439 redraw_block(int row, int end, win_T *wp) |
| 7 | 8440 { |
| 8441 int col; | |
| 8442 int width; | |
| 8443 | |
| 8444 # ifdef FEAT_CLIPBOARD | |
| 8445 clip_may_clear_selection(row, end - 1); | |
| 8446 # endif | |
| 8447 | |
| 8448 if (wp == NULL) | |
| 8449 { | |
| 8450 col = 0; | |
| 8451 width = Columns; | |
| 8452 } | |
| 8453 else | |
| 8454 { | |
| 8455 col = wp->w_wincol; | |
| 8456 width = wp->w_width; | |
| 8457 } | |
| 8458 screen_draw_rectangle(row, col, end - row, width, FALSE); | |
| 8459 } | |
| 8460 #endif | |
| 8461 | |
| 8462 /* | |
| 8463 * Fill the screen from 'start_row' to 'end_row', from 'start_col' to 'end_col' | |
| 8464 * with character 'c1' in first column followed by 'c2' in the other columns. | |
| 8465 * Use attributes 'attr'. | |
| 8466 */ | |
| 8467 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8468 screen_fill( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8469 int start_row, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8470 int end_row, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8471 int start_col, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8472 int end_col, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8473 int c1, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8474 int c2, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8475 int attr) |
| 7 | 8476 { |
| 8477 int row; | |
| 8478 int col; | |
| 8479 int off; | |
| 8480 int end_off; | |
| 8481 int did_delete; | |
| 8482 int c; | |
| 8483 int norm_term; | |
| 8484 #if defined(FEAT_GUI) || defined(UNIX) | |
| 8485 int force_next = FALSE; | |
| 8486 #endif | |
| 8487 | |
| 8488 if (end_row > screen_Rows) /* safety check */ | |
| 8489 end_row = screen_Rows; | |
| 8490 if (end_col > screen_Columns) /* safety check */ | |
| 8491 end_col = screen_Columns; | |
| 8492 if (ScreenLines == NULL | |
| 8493 || start_row >= end_row | |
| 8494 || start_col >= end_col) /* nothing to do */ | |
| 8495 return; | |
| 8496 | |
| 8497 /* it's a "normal" terminal when not in a GUI or cterm */ | |
| 8498 norm_term = ( | |
| 8499 #ifdef FEAT_GUI | |
| 8500 !gui.in_use && | |
| 8501 #endif | |
|
8969
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8502 !IS_CTERM); |
| 7 | 8503 for (row = start_row; row < end_row; ++row) |
| 8504 { | |
| 1668 | 8505 #ifdef FEAT_MBYTE |
| 8506 if (has_mbyte | |
| 8507 # ifdef FEAT_GUI | |
| 8508 && !gui.in_use | |
| 8509 # endif | |
| 8510 ) | |
| 8511 { | |
| 8512 /* When drawing over the right halve of a double-wide char clear | |
| 8513 * out the left halve. When drawing over the left halve of a | |
| 8514 * double wide-char clear out the right halve. Only needed in a | |
| 8515 * terminal. */ | |
| 1685 | 8516 if (start_col > 0 && mb_fix_col(start_col, row) != start_col) |
| 1670 | 8517 screen_puts_len((char_u *)" ", 1, row, start_col - 1, 0); |
| 1677 | 8518 if (end_col < screen_Columns && mb_fix_col(end_col, row) != end_col) |
| 1670 | 8519 screen_puts_len((char_u *)" ", 1, row, end_col, 0); |
| 1668 | 8520 } |
| 8521 #endif | |
| 7 | 8522 /* |
| 8523 * Try to use delete-line termcap code, when no attributes or in a | |
| 8524 * "normal" terminal, where a bold/italic space is just a | |
| 8525 * space. | |
| 8526 */ | |
| 8527 did_delete = FALSE; | |
| 8528 if (c2 == ' ' | |
| 8529 && end_col == Columns | |
| 8530 && can_clear(T_CE) | |
| 8531 && (attr == 0 | |
| 8532 || (norm_term | |
| 8533 && attr <= HL_ALL | |
| 8534 && ((attr & ~(HL_BOLD | HL_ITALIC)) == 0)))) | |
| 8535 { | |
| 8536 /* | |
| 8537 * check if we really need to clear something | |
| 8538 */ | |
| 8539 col = start_col; | |
| 8540 if (c1 != ' ') /* don't clear first char */ | |
| 8541 ++col; | |
| 8542 | |
| 8543 off = LineOffset[row] + col; | |
| 8544 end_off = LineOffset[row] + end_col; | |
| 8545 | |
| 8546 /* skip blanks (used often, keep it fast!) */ | |
| 8547 #ifdef FEAT_MBYTE | |
| 8548 if (enc_utf8) | |
| 8549 while (off < end_off && ScreenLines[off] == ' ' | |
| 8550 && ScreenAttrs[off] == 0 && ScreenLinesUC[off] == 0) | |
| 8551 ++off; | |
| 8552 else | |
| 8553 #endif | |
| 8554 while (off < end_off && ScreenLines[off] == ' ' | |
| 8555 && ScreenAttrs[off] == 0) | |
| 8556 ++off; | |
| 8557 if (off < end_off) /* something to be cleared */ | |
| 8558 { | |
| 8559 col = off - LineOffset[row]; | |
| 8560 screen_stop_highlight(); | |
| 8561 term_windgoto(row, col);/* clear rest of this screen line */ | |
| 8562 out_str(T_CE); | |
| 8563 screen_start(); /* don't know where cursor is now */ | |
| 8564 col = end_col - col; | |
| 8565 while (col--) /* clear chars in ScreenLines */ | |
| 8566 { | |
| 8567 ScreenLines[off] = ' '; | |
| 8568 #ifdef FEAT_MBYTE | |
| 8569 if (enc_utf8) | |
| 8570 ScreenLinesUC[off] = 0; | |
| 8571 #endif | |
| 8572 ScreenAttrs[off] = 0; | |
| 8573 ++off; | |
| 8574 } | |
| 8575 } | |
| 8576 did_delete = TRUE; /* the chars are cleared now */ | |
| 8577 } | |
| 8578 | |
| 8579 off = LineOffset[row] + start_col; | |
| 8580 c = c1; | |
| 8581 for (col = start_col; col < end_col; ++col) | |
| 8582 { | |
| 8583 if (ScreenLines[off] != c | |
| 8584 #ifdef FEAT_MBYTE | |
| 714 | 8585 || (enc_utf8 && (int)ScreenLinesUC[off] |
| 8586 != (c >= 0x80 ? c : 0)) | |
| 7 | 8587 #endif |
| 8588 || ScreenAttrs[off] != attr | |
| 8589 #if defined(FEAT_GUI) || defined(UNIX) | |
| 8590 || force_next | |
| 8591 #endif | |
| 8592 ) | |
| 8593 { | |
| 8594 #if defined(FEAT_GUI) || defined(UNIX) | |
| 8595 /* The bold trick may make a single row of pixels appear in | |
| 8596 * the next character. When a bold character is removed, the | |
| 8597 * next character should be redrawn too. This happens for our | |
| 8598 * own GUI and for some xterms. */ | |
| 8599 if ( | |
| 8600 # ifdef FEAT_GUI | |
| 8601 gui.in_use | |
| 8602 # endif | |
| 8603 # if defined(FEAT_GUI) && defined(UNIX) | |
| 8604 || | |
| 8605 # endif | |
| 8606 # ifdef UNIX | |
| 8607 term_is_xterm | |
| 8608 # endif | |
| 8609 ) | |
| 8610 { | |
| 8611 if (ScreenLines[off] != ' ' | |
| 8612 && (ScreenAttrs[off] > HL_ALL | |
| 8613 || ScreenAttrs[off] & HL_BOLD)) | |
| 8614 force_next = TRUE; | |
| 8615 else | |
| 8616 force_next = FALSE; | |
| 8617 } | |
| 8618 #endif | |
| 8619 ScreenLines[off] = c; | |
| 8620 #ifdef FEAT_MBYTE | |
| 8621 if (enc_utf8) | |
| 8622 { | |
| 8623 if (c >= 0x80) | |
| 8624 { | |
| 8625 ScreenLinesUC[off] = c; | |
| 714 | 8626 ScreenLinesC[0][off] = 0; |
| 7 | 8627 } |
| 8628 else | |
| 8629 ScreenLinesUC[off] = 0; | |
| 8630 } | |
| 8631 #endif | |
| 8632 ScreenAttrs[off] = attr; | |
| 8633 if (!did_delete || c != ' ') | |
| 8634 screen_char(off, row, col); | |
| 8635 } | |
| 8636 ++off; | |
| 8637 if (col == start_col) | |
| 8638 { | |
| 8639 if (did_delete) | |
| 8640 break; | |
| 8641 c = c2; | |
| 8642 } | |
| 8643 } | |
| 8644 if (end_col == Columns) | |
| 8645 LineWraps[row] = FALSE; | |
| 8646 if (row == Rows - 1) /* overwritten the command line */ | |
| 8647 { | |
| 8648 redraw_cmdline = TRUE; | |
| 8649 if (c1 == ' ' && c2 == ' ') | |
| 8650 clear_cmdline = FALSE; /* command line has been cleared */ | |
| 644 | 8651 if (start_col == 0) |
| 8652 mode_displayed = FALSE; /* mode cleared or overwritten */ | |
| 7 | 8653 } |
| 8654 } | |
| 8655 } | |
| 8656 | |
| 8657 /* | |
| 8658 * Check if there should be a delay. Used before clearing or redrawing the | |
| 8659 * screen or the command line. | |
| 8660 */ | |
| 8661 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8662 check_for_delay(int check_msg_scroll) |
| 7 | 8663 { |
| 8664 if ((emsg_on_display || (check_msg_scroll && msg_scroll)) | |
| 8665 && !did_wait_return | |
| 8666 && emsg_silent == 0) | |
| 8667 { | |
| 8668 out_flush(); | |
| 8669 ui_delay(1000L, TRUE); | |
| 8670 emsg_on_display = FALSE; | |
| 8671 if (check_msg_scroll) | |
| 8672 msg_scroll = FALSE; | |
| 8673 } | |
| 8674 } | |
| 8675 | |
| 8676 /* | |
| 8677 * screen_valid - allocate screen buffers if size changed | |
| 3263 | 8678 * If "doclear" is TRUE: clear screen if it has been resized. |
| 7 | 8679 * Returns TRUE if there is a valid screen to write to. |
| 8680 * Returns FALSE when starting up and screen not initialized yet. | |
| 8681 */ | |
| 8682 int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8683 screen_valid(int doclear) |
| 7 | 8684 { |
| 3263 | 8685 screenalloc(doclear); /* allocate screen buffers if size changed */ |
| 7 | 8686 return (ScreenLines != NULL); |
| 8687 } | |
| 8688 | |
| 8689 /* | |
| 8690 * Resize the shell to Rows and Columns. | |
| 8691 * Allocate ScreenLines[] and associated items. | |
| 8692 * | |
| 8693 * There may be some time between setting Rows and Columns and (re)allocating | |
| 8694 * ScreenLines[]. This happens when starting up and when (manually) changing | |
| 8695 * the shell size. Always use screen_Rows and screen_Columns to access items | |
| 8696 * in ScreenLines[]. Use Rows and Columns for positioning text etc. where the | |
| 8697 * final size of the shell is needed. | |
| 8698 */ | |
| 8699 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8700 screenalloc(int doclear) |
| 7 | 8701 { |
| 8702 int new_row, old_row; | |
| 8703 #ifdef FEAT_GUI | |
| 8704 int old_Rows; | |
| 8705 #endif | |
| 8706 win_T *wp; | |
| 8707 int outofmem = FALSE; | |
| 8708 int len; | |
| 8709 schar_T *new_ScreenLines; | |
| 8710 #ifdef FEAT_MBYTE | |
| 8711 u8char_T *new_ScreenLinesUC = NULL; | |
| 714 | 8712 u8char_T *new_ScreenLinesC[MAX_MCO]; |
| 7 | 8713 schar_T *new_ScreenLines2 = NULL; |
| 714 | 8714 int i; |
| 7 | 8715 #endif |
| 8716 sattr_T *new_ScreenAttrs; | |
| 8717 unsigned *new_LineOffset; | |
| 8718 char_u *new_LineWraps; | |
| 671 | 8719 #ifdef FEAT_WINDOWS |
| 681 | 8720 short *new_TabPageIdxs; |
| 671 | 8721 tabpage_T *tp; |
| 8722 #endif | |
| 7 | 8723 static int entered = FALSE; /* avoid recursiveness */ |
| 944 | 8724 static int done_outofmem_msg = FALSE; /* did outofmem message */ |
| 1824 | 8725 #ifdef FEAT_AUTOCMD |
| 8726 int retry_count = 0; | |
| 8727 | |
| 8728 retry: | |
| 8729 #endif | |
| 7 | 8730 /* |
| 8731 * Allocation of the screen buffers is done only when the size changes and | |
| 8732 * when Rows and Columns have been set and we have started doing full | |
| 8733 * screen stuff. | |
| 8734 */ | |
| 8735 if ((ScreenLines != NULL | |
| 8736 && Rows == screen_Rows | |
| 8737 && Columns == screen_Columns | |
| 8738 #ifdef FEAT_MBYTE | |
| 8739 && enc_utf8 == (ScreenLinesUC != NULL) | |
| 8740 && (enc_dbcs == DBCS_JPNU) == (ScreenLines2 != NULL) | |
| 714 | 8741 && p_mco == Screen_mco |
| 7 | 8742 #endif |
| 8743 ) | |
| 8744 || Rows == 0 | |
| 8745 || Columns == 0 | |
| 8746 || (!full_screen && ScreenLines == NULL)) | |
| 8747 return; | |
| 8748 | |
| 8749 /* | |
| 8750 * It's possible that we produce an out-of-memory message below, which | |
| 8751 * will cause this function to be called again. To break the loop, just | |
| 8752 * return here. | |
| 8753 */ | |
| 8754 if (entered) | |
| 8755 return; | |
| 8756 entered = TRUE; | |
| 8757 | |
| 911 | 8758 /* |
| 8759 * Note that the window sizes are updated before reallocating the arrays, | |
| 8760 * thus we must not redraw here! | |
| 8761 */ | |
| 8762 ++RedrawingDisabled; | |
| 8763 | |
| 7 | 8764 win_new_shellsize(); /* fit the windows in the new sized shell */ |
| 8765 | |
| 8766 comp_col(); /* recompute columns for shown command and ruler */ | |
| 8767 | |
| 8768 /* | |
| 8769 * We're changing the size of the screen. | |
| 8770 * - Allocate new arrays for ScreenLines and ScreenAttrs. | |
| 8771 * - Move lines from the old arrays into the new arrays, clear extra | |
| 8772 * lines (unless the screen is going to be cleared). | |
| 8773 * - Free the old arrays. | |
| 8774 * | |
| 8775 * If anything fails, make ScreenLines NULL, so we don't do anything! | |
| 8776 * Continuing with the old ScreenLines may result in a crash, because the | |
| 8777 * size is wrong. | |
| 8778 */ | |
| 671 | 8779 FOR_ALL_TAB_WINDOWS(tp, wp) |
| 7 | 8780 win_free_lsize(wp); |
| 1946 | 8781 #ifdef FEAT_AUTOCMD |
| 8782 if (aucmd_win != NULL) | |
| 8783 win_free_lsize(aucmd_win); | |
| 8784 #endif | |
| 7 | 8785 |
| 8786 new_ScreenLines = (schar_T *)lalloc((long_u)( | |
| 8787 (Rows + 1) * Columns * sizeof(schar_T)), FALSE); | |
| 8788 #ifdef FEAT_MBYTE | |
|
2122
476336a5ae95
updated for version 7.2.404
Bram Moolenaar <bram@zimbu.org>
parents:
2069
diff
changeset
|
8789 vim_memset(new_ScreenLinesC, 0, sizeof(u8char_T *) * MAX_MCO); |
| 7 | 8790 if (enc_utf8) |
| 8791 { | |
| 8792 new_ScreenLinesUC = (u8char_T *)lalloc((long_u)( | |
| 8793 (Rows + 1) * Columns * sizeof(u8char_T)), FALSE); | |
| 714 | 8794 for (i = 0; i < p_mco; ++i) |
|
2124
dc8a5699253b
updated for version 7.2.406
Bram Moolenaar <bram@zimbu.org>
parents:
2122
diff
changeset
|
8795 new_ScreenLinesC[i] = (u8char_T *)lalloc_clear((long_u)( |
| 7 | 8796 (Rows + 1) * Columns * sizeof(u8char_T)), FALSE); |
| 8797 } | |
| 8798 if (enc_dbcs == DBCS_JPNU) | |
| 8799 new_ScreenLines2 = (schar_T *)lalloc((long_u)( | |
| 8800 (Rows + 1) * Columns * sizeof(schar_T)), FALSE); | |
| 8801 #endif | |
| 8802 new_ScreenAttrs = (sattr_T *)lalloc((long_u)( | |
| 8803 (Rows + 1) * Columns * sizeof(sattr_T)), FALSE); | |
| 8804 new_LineOffset = (unsigned *)lalloc((long_u)( | |
| 8805 Rows * sizeof(unsigned)), FALSE); | |
| 8806 new_LineWraps = (char_u *)lalloc((long_u)(Rows * sizeof(char_u)), FALSE); | |
| 671 | 8807 #ifdef FEAT_WINDOWS |
| 681 | 8808 new_TabPageIdxs = (short *)lalloc((long_u)(Columns * sizeof(short)), FALSE); |
| 671 | 8809 #endif |
| 7 | 8810 |
| 677 | 8811 FOR_ALL_TAB_WINDOWS(tp, wp) |
| 7 | 8812 { |
| 8813 if (win_alloc_lines(wp) == FAIL) | |
| 8814 { | |
| 8815 outofmem = TRUE; | |
| 8816 #ifdef FEAT_WINDOWS | |
| 1819 | 8817 goto give_up; |
| 8818 #endif | |
| 8819 } | |
| 8820 } | |
| 1906 | 8821 #ifdef FEAT_AUTOCMD |
| 1946 | 8822 if (aucmd_win != NULL && aucmd_win->w_lines == NULL |
| 8823 && win_alloc_lines(aucmd_win) == FAIL) | |
| 1906 | 8824 outofmem = TRUE; |
| 8825 #endif | |
| 1819 | 8826 #ifdef FEAT_WINDOWS |
| 8827 give_up: | |
| 8828 #endif | |
| 7 | 8829 |
| 714 | 8830 #ifdef FEAT_MBYTE |
| 8831 for (i = 0; i < p_mco; ++i) | |
| 8832 if (new_ScreenLinesC[i] == NULL) | |
| 8833 break; | |
| 8834 #endif | |
| 7 | 8835 if (new_ScreenLines == NULL |
| 8836 #ifdef FEAT_MBYTE | |
| 714 | 8837 || (enc_utf8 && (new_ScreenLinesUC == NULL || i != p_mco)) |
| 7 | 8838 || (enc_dbcs == DBCS_JPNU && new_ScreenLines2 == NULL) |
| 8839 #endif | |
| 8840 || new_ScreenAttrs == NULL | |
| 8841 || new_LineOffset == NULL | |
| 8842 || new_LineWraps == NULL | |
| 671 | 8843 #ifdef FEAT_WINDOWS |
| 8844 || new_TabPageIdxs == NULL | |
| 8845 #endif | |
| 7 | 8846 || outofmem) |
| 8847 { | |
| 944 | 8848 if (ScreenLines != NULL || !done_outofmem_msg) |
| 534 | 8849 { |
| 8850 /* guess the size */ | |
| 8851 do_outofmem_msg((long_u)((Rows + 1) * Columns)); | |
| 8852 | |
| 8853 /* Remember we did this to avoid getting outofmem messages over | |
| 8854 * and over again. */ | |
| 944 | 8855 done_outofmem_msg = TRUE; |
| 534 | 8856 } |
| 7 | 8857 vim_free(new_ScreenLines); |
| 8858 new_ScreenLines = NULL; | |
| 8859 #ifdef FEAT_MBYTE | |
| 8860 vim_free(new_ScreenLinesUC); | |
| 8861 new_ScreenLinesUC = NULL; | |
| 714 | 8862 for (i = 0; i < p_mco; ++i) |
| 8863 { | |
| 8864 vim_free(new_ScreenLinesC[i]); | |
| 8865 new_ScreenLinesC[i] = NULL; | |
| 8866 } | |
| 7 | 8867 vim_free(new_ScreenLines2); |
| 8868 new_ScreenLines2 = NULL; | |
| 8869 #endif | |
| 8870 vim_free(new_ScreenAttrs); | |
| 8871 new_ScreenAttrs = NULL; | |
| 8872 vim_free(new_LineOffset); | |
| 8873 new_LineOffset = NULL; | |
| 8874 vim_free(new_LineWraps); | |
| 8875 new_LineWraps = NULL; | |
| 671 | 8876 #ifdef FEAT_WINDOWS |
| 8877 vim_free(new_TabPageIdxs); | |
| 8878 new_TabPageIdxs = NULL; | |
| 8879 #endif | |
| 7 | 8880 } |
| 8881 else | |
| 8882 { | |
| 944 | 8883 done_outofmem_msg = FALSE; |
| 534 | 8884 |
| 7 | 8885 for (new_row = 0; new_row < Rows; ++new_row) |
| 8886 { | |
| 8887 new_LineOffset[new_row] = new_row * Columns; | |
| 8888 new_LineWraps[new_row] = FALSE; | |
| 8889 | |
| 8890 /* | |
| 8891 * If the screen is not going to be cleared, copy as much as | |
| 8892 * possible from the old screen to the new one and clear the rest | |
| 8893 * (used when resizing the window at the "--more--" prompt or when | |
| 8894 * executing an external command, for the GUI). | |
| 8895 */ | |
| 3263 | 8896 if (!doclear) |
| 7 | 8897 { |
| 8898 (void)vim_memset(new_ScreenLines + new_row * Columns, | |
| 8899 ' ', (size_t)Columns * sizeof(schar_T)); | |
| 8900 #ifdef FEAT_MBYTE | |
| 8901 if (enc_utf8) | |
| 8902 { | |
| 8903 (void)vim_memset(new_ScreenLinesUC + new_row * Columns, | |
| 8904 0, (size_t)Columns * sizeof(u8char_T)); | |
| 714 | 8905 for (i = 0; i < p_mco; ++i) |
| 8906 (void)vim_memset(new_ScreenLinesC[i] | |
| 8907 + new_row * Columns, | |
| 7 | 8908 0, (size_t)Columns * sizeof(u8char_T)); |
| 8909 } | |
| 8910 if (enc_dbcs == DBCS_JPNU) | |
| 8911 (void)vim_memset(new_ScreenLines2 + new_row * Columns, | |
| 8912 0, (size_t)Columns * sizeof(schar_T)); | |
| 8913 #endif | |
| 8914 (void)vim_memset(new_ScreenAttrs + new_row * Columns, | |
| 8915 0, (size_t)Columns * sizeof(sattr_T)); | |
| 8916 old_row = new_row + (screen_Rows - Rows); | |
| 534 | 8917 if (old_row >= 0 && ScreenLines != NULL) |
| 7 | 8918 { |
| 8919 if (screen_Columns < Columns) | |
| 8920 len = screen_Columns; | |
| 8921 else | |
| 8922 len = Columns; | |
| 26 | 8923 #ifdef FEAT_MBYTE |
| 571 | 8924 /* When switching to utf-8 don't copy characters, they |
| 714 | 8925 * may be invalid now. Also when p_mco changes. */ |
| 8926 if (!(enc_utf8 && ScreenLinesUC == NULL) | |
| 8927 && p_mco == Screen_mco) | |
| 26 | 8928 #endif |
| 8929 mch_memmove(new_ScreenLines + new_LineOffset[new_row], | |
| 8930 ScreenLines + LineOffset[old_row], | |
| 8931 (size_t)len * sizeof(schar_T)); | |
| 7 | 8932 #ifdef FEAT_MBYTE |
| 714 | 8933 if (enc_utf8 && ScreenLinesUC != NULL |
| 8934 && p_mco == Screen_mco) | |
| 7 | 8935 { |
| 8936 mch_memmove(new_ScreenLinesUC + new_LineOffset[new_row], | |
| 8937 ScreenLinesUC + LineOffset[old_row], | |
| 8938 (size_t)len * sizeof(u8char_T)); | |
| 714 | 8939 for (i = 0; i < p_mco; ++i) |
| 8940 mch_memmove(new_ScreenLinesC[i] | |
| 8941 + new_LineOffset[new_row], | |
| 8942 ScreenLinesC[i] + LineOffset[old_row], | |
| 7 | 8943 (size_t)len * sizeof(u8char_T)); |
| 8944 } | |
| 8945 if (enc_dbcs == DBCS_JPNU && ScreenLines2 != NULL) | |
| 8946 mch_memmove(new_ScreenLines2 + new_LineOffset[new_row], | |
| 8947 ScreenLines2 + LineOffset[old_row], | |
| 8948 (size_t)len * sizeof(schar_T)); | |
| 8949 #endif | |
| 8950 mch_memmove(new_ScreenAttrs + new_LineOffset[new_row], | |
| 8951 ScreenAttrs + LineOffset[old_row], | |
| 8952 (size_t)len * sizeof(sattr_T)); | |
| 8953 } | |
| 8954 } | |
| 8955 } | |
| 8956 /* Use the last line of the screen for the current line. */ | |
| 8957 current_ScreenLine = new_ScreenLines + Rows * Columns; | |
| 8958 } | |
| 8959 | |
| 356 | 8960 free_screenlines(); |
| 8961 | |
| 7 | 8962 ScreenLines = new_ScreenLines; |
| 8963 #ifdef FEAT_MBYTE | |
| 8964 ScreenLinesUC = new_ScreenLinesUC; | |
| 714 | 8965 for (i = 0; i < p_mco; ++i) |
| 8966 ScreenLinesC[i] = new_ScreenLinesC[i]; | |
| 8967 Screen_mco = p_mco; | |
| 7 | 8968 ScreenLines2 = new_ScreenLines2; |
| 8969 #endif | |
| 8970 ScreenAttrs = new_ScreenAttrs; | |
| 8971 LineOffset = new_LineOffset; | |
| 8972 LineWraps = new_LineWraps; | |
| 671 | 8973 #ifdef FEAT_WINDOWS |
| 8974 TabPageIdxs = new_TabPageIdxs; | |
| 8975 #endif | |
| 7 | 8976 |
| 8977 /* It's important that screen_Rows and screen_Columns reflect the actual | |
| 8978 * size of ScreenLines[]. Set them before calling anything. */ | |
| 8979 #ifdef FEAT_GUI | |
| 8980 old_Rows = screen_Rows; | |
| 8981 #endif | |
| 8982 screen_Rows = Rows; | |
| 8983 screen_Columns = Columns; | |
| 8984 | |
| 8985 must_redraw = CLEAR; /* need to clear the screen later */ | |
| 3263 | 8986 if (doclear) |
| 7 | 8987 screenclear2(); |
| 8988 | |
| 8989 #ifdef FEAT_GUI | |
| 8990 else if (gui.in_use | |
| 8991 && !gui.starting | |
| 8992 && ScreenLines != NULL | |
| 8993 && old_Rows != Rows) | |
| 8994 { | |
| 8995 (void)gui_redraw_block(0, 0, (int)Rows - 1, (int)Columns - 1, 0); | |
| 8996 /* | |
| 8997 * Adjust the position of the cursor, for when executing an external | |
| 8998 * command. | |
| 8999 */ | |
| 9000 if (msg_row >= Rows) /* Rows got smaller */ | |
| 9001 msg_row = Rows - 1; /* put cursor at last row */ | |
| 9002 else if (Rows > old_Rows) /* Rows got bigger */ | |
| 9003 msg_row += Rows - old_Rows; /* put cursor in same place */ | |
| 9004 if (msg_col >= Columns) /* Columns got smaller */ | |
| 9005 msg_col = Columns - 1; /* put cursor at last column */ | |
| 9006 } | |
| 9007 #endif | |
| 9008 | |
| 9009 entered = FALSE; | |
| 911 | 9010 --RedrawingDisabled; |
| 766 | 9011 |
| 9012 #ifdef FEAT_AUTOCMD | |
| 1824 | 9013 /* |
| 9014 * Do not apply autocommands more than 3 times to avoid an endless loop | |
| 9015 * in case applying autocommands always changes Rows or Columns. | |
| 9016 */ | |
| 9017 if (starting == 0 && ++retry_count <= 3) | |
| 9018 { | |
| 766 | 9019 apply_autocmds(EVENT_VIMRESIZED, NULL, NULL, FALSE, curbuf); |
| 1824 | 9020 /* In rare cases, autocommands may have altered Rows or Columns, |
| 9021 * jump back to check if we need to allocate the screen again. */ | |
| 9022 goto retry; | |
| 9023 } | |
| 766 | 9024 #endif |
| 7 | 9025 } |
| 9026 | |
| 9027 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9028 free_screenlines(void) |
| 356 | 9029 { |
| 9030 #ifdef FEAT_MBYTE | |
| 714 | 9031 int i; |
| 9032 | |
| 356 | 9033 vim_free(ScreenLinesUC); |
| 714 | 9034 for (i = 0; i < Screen_mco; ++i) |
| 9035 vim_free(ScreenLinesC[i]); | |
| 356 | 9036 vim_free(ScreenLines2); |
| 9037 #endif | |
| 714 | 9038 vim_free(ScreenLines); |
| 356 | 9039 vim_free(ScreenAttrs); |
| 9040 vim_free(LineOffset); | |
| 9041 vim_free(LineWraps); | |
| 671 | 9042 #ifdef FEAT_WINDOWS |
| 9043 vim_free(TabPageIdxs); | |
| 9044 #endif | |
| 356 | 9045 } |
| 9046 | |
| 9047 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9048 screenclear(void) |
| 7 | 9049 { |
| 9050 check_for_delay(FALSE); | |
| 9051 screenalloc(FALSE); /* allocate screen buffers if size changed */ | |
| 9052 screenclear2(); /* clear the screen */ | |
| 9053 } | |
| 9054 | |
| 9055 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9056 screenclear2(void) |
| 7 | 9057 { |
| 9058 int i; | |
| 9059 | |
| 9060 if (starting == NO_SCREEN || ScreenLines == NULL | |
| 9061 #ifdef FEAT_GUI | |
| 9062 || (gui.in_use && gui.starting) | |
| 9063 #endif | |
| 9064 ) | |
| 9065 return; | |
| 9066 | |
| 9067 #ifdef FEAT_GUI | |
| 9068 if (!gui.in_use) | |
| 9069 #endif | |
| 9070 screen_attr = -1; /* force setting the Normal colors */ | |
| 9071 screen_stop_highlight(); /* don't want highlighting here */ | |
| 9072 | |
| 9073 #ifdef FEAT_CLIPBOARD | |
| 9074 /* disable selection without redrawing it */ | |
| 9075 clip_scroll_selection(9999); | |
| 9076 #endif | |
| 9077 | |
| 9078 /* blank out ScreenLines */ | |
| 9079 for (i = 0; i < Rows; ++i) | |
| 9080 { | |
|
12152
69af108df70e
patch 8.0.0956: scrolling in a terminal window has flicker
Christian Brabandt <cb@256bit.org>
parents:
12122
diff
changeset
|
9081 lineclear(LineOffset[i], (int)Columns, 0); |
| 7 | 9082 LineWraps[i] = FALSE; |
| 9083 } | |
| 9084 | |
| 9085 if (can_clear(T_CL)) | |
| 9086 { | |
| 9087 out_str(T_CL); /* clear the display */ | |
| 9088 clear_cmdline = FALSE; | |
| 644 | 9089 mode_displayed = FALSE; |
| 7 | 9090 } |
| 9091 else | |
| 9092 { | |
| 9093 /* can't clear the screen, mark all chars with invalid attributes */ | |
| 9094 for (i = 0; i < Rows; ++i) | |
| 9095 lineinvalid(LineOffset[i], (int)Columns); | |
| 9096 clear_cmdline = TRUE; | |
| 9097 } | |
| 9098 | |
| 9099 screen_cleared = TRUE; /* can use contents of ScreenLines now */ | |
| 9100 | |
| 9101 win_rest_invalid(firstwin); | |
| 9102 redraw_cmdline = TRUE; | |
| 670 | 9103 #ifdef FEAT_WINDOWS |
| 673 | 9104 redraw_tabline = TRUE; |
| 670 | 9105 #endif |
| 7 | 9106 if (must_redraw == CLEAR) /* no need to clear again */ |
| 9107 must_redraw = NOT_VALID; | |
| 9108 compute_cmdrow(); | |
| 9109 msg_row = cmdline_row; /* put cursor on last line for messages */ | |
| 9110 msg_col = 0; | |
| 9111 screen_start(); /* don't know where cursor is now */ | |
| 9112 msg_scrolled = 0; /* can't scroll back */ | |
| 9113 msg_didany = FALSE; | |
| 9114 msg_didout = FALSE; | |
| 9115 } | |
| 9116 | |
| 9117 /* | |
| 9118 * Clear one line in ScreenLines. | |
| 9119 */ | |
| 9120 static void | |
|
12152
69af108df70e
patch 8.0.0956: scrolling in a terminal window has flicker
Christian Brabandt <cb@256bit.org>
parents:
12122
diff
changeset
|
9121 lineclear(unsigned off, int width, int attr) |
| 7 | 9122 { |
| 9123 (void)vim_memset(ScreenLines + off, ' ', (size_t)width * sizeof(schar_T)); | |
| 9124 #ifdef FEAT_MBYTE | |
| 9125 if (enc_utf8) | |
| 9126 (void)vim_memset(ScreenLinesUC + off, 0, | |
| 9127 (size_t)width * sizeof(u8char_T)); | |
| 9128 #endif | |
|
12152
69af108df70e
patch 8.0.0956: scrolling in a terminal window has flicker
Christian Brabandt <cb@256bit.org>
parents:
12122
diff
changeset
|
9129 (void)vim_memset(ScreenAttrs + off, attr, (size_t)width * sizeof(sattr_T)); |
| 7 | 9130 } |
| 9131 | |
| 9132 /* | |
| 9133 * Mark one line in ScreenLines invalid by setting the attributes to an | |
| 9134 * invalid value. | |
| 9135 */ | |
| 9136 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9137 lineinvalid(unsigned off, int width) |
| 7 | 9138 { |
| 9139 (void)vim_memset(ScreenAttrs + off, -1, (size_t)width * sizeof(sattr_T)); | |
| 9140 } | |
| 9141 | |
|
8643
24b43dd167eb
commit https://github.com/vim/vim/commit/44a2f923c00f1384c9ecde12fb5b4711bc20702e
Christian Brabandt <cb@256bit.org>
parents:
8627
diff
changeset
|
9142 #ifdef FEAT_WINDOWS |
| 7 | 9143 /* |
| 9144 * Copy part of a Screenline for vertically split window "wp". | |
| 9145 */ | |
| 9146 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9147 linecopy(int to, int from, win_T *wp) |
| 7 | 9148 { |
| 9149 unsigned off_to = LineOffset[to] + wp->w_wincol; | |
| 9150 unsigned off_from = LineOffset[from] + wp->w_wincol; | |
| 9151 | |
| 9152 mch_memmove(ScreenLines + off_to, ScreenLines + off_from, | |
| 9153 wp->w_width * sizeof(schar_T)); | |
| 9154 # ifdef FEAT_MBYTE | |
| 9155 if (enc_utf8) | |
| 9156 { | |
| 714 | 9157 int i; |
| 9158 | |
| 7 | 9159 mch_memmove(ScreenLinesUC + off_to, ScreenLinesUC + off_from, |
| 9160 wp->w_width * sizeof(u8char_T)); | |
| 714 | 9161 for (i = 0; i < p_mco; ++i) |
| 9162 mch_memmove(ScreenLinesC[i] + off_to, ScreenLinesC[i] + off_from, | |
| 9163 wp->w_width * sizeof(u8char_T)); | |
| 7 | 9164 } |
| 9165 if (enc_dbcs == DBCS_JPNU) | |
| 9166 mch_memmove(ScreenLines2 + off_to, ScreenLines2 + off_from, | |
| 9167 wp->w_width * sizeof(schar_T)); | |
| 9168 # endif | |
| 9169 mch_memmove(ScreenAttrs + off_to, ScreenAttrs + off_from, | |
| 9170 wp->w_width * sizeof(sattr_T)); | |
| 9171 } | |
| 9172 #endif | |
| 9173 | |
| 9174 /* | |
| 9175 * Return TRUE if clearing with term string "p" would work. | |
| 9176 * It can't work when the string is empty or it won't set the right background. | |
| 9177 */ | |
| 9178 int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9179 can_clear(char_u *p) |
| 7 | 9180 { |
| 9181 return (*p != NUL && (t_colors <= 1 | |
| 9182 #ifdef FEAT_GUI | |
| 9183 || gui.in_use | |
| 9184 #endif | |
|
9027
773d627cac0b
commit https://github.com/vim/vim/commit/61be73bb0f965a895bfb064ea3e55476ac175162
Christian Brabandt <cb@256bit.org>
parents:
8977
diff
changeset
|
9185 #ifdef FEAT_TERMGUICOLORS |
|
9939
ccb6461b82df
commit https://github.com/vim/vim/commit/1b58cdd160c2e0ada0f638679a2aa27e4665fc48
Christian Brabandt <cb@256bit.org>
parents:
9885
diff
changeset
|
9186 || (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
|
9187 || (!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
|
9188 #else |
|
b6472fd9f5ba
commit https://github.com/vim/vim/commit/d18f672fc9477f3c0cb7cc4ce8d9237ed825c612
Christian Brabandt <cb@256bit.org>
parents:
9282
diff
changeset
|
9189 || cterm_normal_bg_color == 0 |
|
b6472fd9f5ba
commit https://github.com/vim/vim/commit/d18f672fc9477f3c0cb7cc4ce8d9237ed825c612
Christian Brabandt <cb@256bit.org>
parents:
9282
diff
changeset
|
9190 #endif |
|
b6472fd9f5ba
commit https://github.com/vim/vim/commit/d18f672fc9477f3c0cb7cc4ce8d9237ed825c612
Christian Brabandt <cb@256bit.org>
parents:
9282
diff
changeset
|
9191 || *T_UT != NUL)); |
| 7 | 9192 } |
| 9193 | |
| 9194 /* | |
| 9195 * Reset cursor position. Use whenever cursor was moved because of outputting | |
| 9196 * something directly to the screen (shell commands) or a terminal control | |
| 9197 * code. | |
| 9198 */ | |
| 9199 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9200 screen_start(void) |
| 7 | 9201 { |
| 9202 screen_cur_row = screen_cur_col = 9999; | |
| 9203 } | |
| 9204 | |
| 9205 /* | |
| 9206 * Move the cursor to position "row","col" in the screen. | |
| 9207 * This tries to find the most efficient way to move, minimizing the number of | |
| 9208 * characters sent to the terminal. | |
| 9209 */ | |
| 9210 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9211 windgoto(int row, int col) |
| 7 | 9212 { |
| 205 | 9213 sattr_T *p; |
| 7 | 9214 int i; |
| 9215 int plan; | |
| 9216 int cost; | |
| 9217 int wouldbe_col; | |
| 9218 int noinvcurs; | |
| 9219 char_u *bs; | |
| 9220 int goto_cost; | |
| 9221 int attr; | |
| 9222 | |
| 1213 | 9223 #define GOTO_COST 7 /* assume a term_windgoto() takes about 7 chars */ |
| 7 | 9224 #define HIGHL_COST 5 /* assume unhighlight takes 5 chars */ |
| 9225 | |
| 9226 #define PLAN_LE 1 | |
| 9227 #define PLAN_CR 2 | |
| 9228 #define PLAN_NL 3 | |
| 9229 #define PLAN_WRITE 4 | |
| 9230 /* Can't use ScreenLines unless initialized */ | |
| 9231 if (ScreenLines == NULL) | |
| 9232 return; | |
| 9233 | |
| 9234 if (col != screen_cur_col || row != screen_cur_row) | |
| 9235 { | |
| 9236 /* Check for valid position. */ | |
| 9237 if (row < 0) /* window without text lines? */ | |
| 9238 row = 0; | |
| 9239 if (row >= screen_Rows) | |
| 9240 row = screen_Rows - 1; | |
| 9241 if (col >= screen_Columns) | |
| 9242 col = screen_Columns - 1; | |
| 9243 | |
| 9244 /* check if no cursor movement is allowed in highlight mode */ | |
| 9245 if (screen_attr && *T_MS == NUL) | |
| 9246 noinvcurs = HIGHL_COST; | |
| 9247 else | |
| 9248 noinvcurs = 0; | |
| 9249 goto_cost = GOTO_COST + noinvcurs; | |
| 9250 | |
| 9251 /* | |
| 9252 * Plan how to do the positioning: | |
| 9253 * 1. Use CR to move it to column 0, same row. | |
| 9254 * 2. Use T_LE to move it a few columns to the left. | |
| 9255 * 3. Use NL to move a few lines down, column 0. | |
| 9256 * 4. Move a few columns to the right with T_ND or by writing chars. | |
| 9257 * | |
| 9258 * Don't do this if the cursor went beyond the last column, the cursor | |
| 9259 * position is unknown then (some terminals wrap, some don't ) | |
| 9260 * | |
| 1213 | 9261 * First check if the highlighting attributes allow us to write |
| 7 | 9262 * characters to move the cursor to the right. |
| 9263 */ | |
| 9264 if (row >= screen_cur_row && screen_cur_col < Columns) | |
| 9265 { | |
| 9266 /* | |
| 9267 * If the cursor is in the same row, bigger col, we can use CR | |
| 9268 * or T_LE. | |
| 9269 */ | |
| 9270 bs = NULL; /* init for GCC */ | |
| 9271 attr = screen_attr; | |
| 9272 if (row == screen_cur_row && col < screen_cur_col) | |
| 9273 { | |
| 9274 /* "le" is preferred over "bc", because "bc" is obsolete */ | |
| 9275 if (*T_LE) | |
| 9276 bs = T_LE; /* "cursor left" */ | |
| 9277 else | |
| 9278 bs = T_BC; /* "backspace character (old) */ | |
| 9279 if (*bs) | |
| 9280 cost = (screen_cur_col - col) * (int)STRLEN(bs); | |
| 9281 else | |
| 9282 cost = 999; | |
| 9283 if (col + 1 < cost) /* using CR is less characters */ | |
| 9284 { | |
| 9285 plan = PLAN_CR; | |
| 9286 wouldbe_col = 0; | |
| 9287 cost = 1; /* CR is just one character */ | |
| 9288 } | |
| 9289 else | |
| 9290 { | |
| 9291 plan = PLAN_LE; | |
| 9292 wouldbe_col = col; | |
| 9293 } | |
| 9294 if (noinvcurs) /* will stop highlighting */ | |
| 9295 { | |
| 9296 cost += noinvcurs; | |
| 9297 attr = 0; | |
| 9298 } | |
| 9299 } | |
| 9300 | |
| 9301 /* | |
| 9302 * If the cursor is above where we want to be, we can use CR LF. | |
| 9303 */ | |
| 9304 else if (row > screen_cur_row) | |
| 9305 { | |
| 9306 plan = PLAN_NL; | |
| 9307 wouldbe_col = 0; | |
| 9308 cost = (row - screen_cur_row) * 2; /* CR LF */ | |
| 9309 if (noinvcurs) /* will stop highlighting */ | |
| 9310 { | |
| 9311 cost += noinvcurs; | |
| 9312 attr = 0; | |
| 9313 } | |
| 9314 } | |
| 9315 | |
| 9316 /* | |
| 9317 * If the cursor is in the same row, smaller col, just use write. | |
| 9318 */ | |
| 9319 else | |
| 9320 { | |
| 9321 plan = PLAN_WRITE; | |
| 9322 wouldbe_col = screen_cur_col; | |
| 9323 cost = 0; | |
| 9324 } | |
| 9325 | |
| 9326 /* | |
| 9327 * Check if any characters that need to be written have the | |
| 9328 * correct attributes. Also avoid UTF-8 characters. | |
| 9329 */ | |
| 9330 i = col - wouldbe_col; | |
| 9331 if (i > 0) | |
| 9332 cost += i; | |
| 9333 if (cost < goto_cost && i > 0) | |
| 9334 { | |
| 9335 /* | |
| 9336 * Check if the attributes are correct without additionally | |
| 9337 * stopping highlighting. | |
| 9338 */ | |
| 9339 p = ScreenAttrs + LineOffset[row] + wouldbe_col; | |
| 9340 while (i && *p++ == attr) | |
| 9341 --i; | |
| 9342 if (i != 0) | |
| 9343 { | |
| 9344 /* | |
| 9345 * Try if it works when highlighting is stopped here. | |
| 9346 */ | |
| 9347 if (*--p == 0) | |
| 9348 { | |
| 9349 cost += noinvcurs; | |
| 9350 while (i && *p++ == 0) | |
| 9351 --i; | |
| 9352 } | |
| 9353 if (i != 0) | |
| 9354 cost = 999; /* different attributes, don't do it */ | |
| 9355 } | |
| 9356 #ifdef FEAT_MBYTE | |
| 9357 if (enc_utf8) | |
| 9358 { | |
| 9359 /* Don't use an UTF-8 char for positioning, it's slow. */ | |
| 9360 for (i = wouldbe_col; i < col; ++i) | |
| 9361 if (ScreenLinesUC[LineOffset[row] + i] != 0) | |
| 9362 { | |
| 9363 cost = 999; | |
| 9364 break; | |
| 9365 } | |
| 9366 } | |
| 9367 #endif | |
| 9368 } | |
| 9369 | |
| 9370 /* | |
| 9371 * We can do it without term_windgoto()! | |
| 9372 */ | |
| 9373 if (cost < goto_cost) | |
| 9374 { | |
| 9375 if (plan == PLAN_LE) | |
| 9376 { | |
| 9377 if (noinvcurs) | |
| 9378 screen_stop_highlight(); | |
| 9379 while (screen_cur_col > col) | |
| 9380 { | |
| 9381 out_str(bs); | |
| 9382 --screen_cur_col; | |
| 9383 } | |
| 9384 } | |
| 9385 else if (plan == PLAN_CR) | |
| 9386 { | |
| 9387 if (noinvcurs) | |
| 9388 screen_stop_highlight(); | |
| 9389 out_char('\r'); | |
| 9390 screen_cur_col = 0; | |
| 9391 } | |
| 9392 else if (plan == PLAN_NL) | |
| 9393 { | |
| 9394 if (noinvcurs) | |
| 9395 screen_stop_highlight(); | |
| 9396 while (screen_cur_row < row) | |
| 9397 { | |
| 9398 out_char('\n'); | |
| 9399 ++screen_cur_row; | |
| 9400 } | |
| 9401 screen_cur_col = 0; | |
| 9402 } | |
| 9403 | |
| 9404 i = col - screen_cur_col; | |
| 9405 if (i > 0) | |
| 9406 { | |
| 9407 /* | |
| 9408 * Use cursor-right if it's one character only. Avoids | |
| 9409 * removing a line of pixels from the last bold char, when | |
| 9410 * using the bold trick in the GUI. | |
| 9411 */ | |
| 9412 if (T_ND[0] != NUL && T_ND[1] == NUL) | |
| 9413 { | |
| 9414 while (i-- > 0) | |
| 9415 out_char(*T_ND); | |
| 9416 } | |
| 9417 else | |
| 9418 { | |
| 9419 int off; | |
| 9420 | |
| 9421 off = LineOffset[row] + screen_cur_col; | |
| 9422 while (i-- > 0) | |
| 9423 { | |
| 9424 if (ScreenAttrs[off] != screen_attr) | |
| 9425 screen_stop_highlight(); | |
| 9426 #ifdef FEAT_MBYTE | |
| 9427 out_flush_check(); | |
| 9428 #endif | |
| 9429 out_char(ScreenLines[off]); | |
| 9430 #ifdef FEAT_MBYTE | |
| 9431 if (enc_dbcs == DBCS_JPNU | |
| 9432 && ScreenLines[off] == 0x8e) | |
| 9433 out_char(ScreenLines2[off]); | |
| 9434 #endif | |
| 9435 ++off; | |
| 9436 } | |
| 9437 } | |
| 9438 } | |
| 9439 } | |
| 9440 } | |
| 9441 else | |
| 9442 cost = 999; | |
| 9443 | |
| 9444 if (cost >= goto_cost) | |
| 9445 { | |
| 9446 if (noinvcurs) | |
| 9447 screen_stop_highlight(); | |
| 5995 | 9448 if (row == screen_cur_row && (col > screen_cur_col) |
| 9449 && *T_CRI != NUL) | |
| 7 | 9450 term_cursor_right(col - screen_cur_col); |
| 9451 else | |
| 9452 term_windgoto(row, col); | |
| 9453 } | |
| 9454 screen_cur_row = row; | |
| 9455 screen_cur_col = col; | |
| 9456 } | |
| 9457 } | |
| 9458 | |
| 9459 /* | |
| 9460 * Set cursor to its position in the current window. | |
| 9461 */ | |
| 9462 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9463 setcursor(void) |
| 7 | 9464 { |
| 9465 if (redrawing()) | |
| 9466 { | |
| 9467 validate_cursor(); | |
| 9468 windgoto(W_WINROW(curwin) + curwin->w_wrow, | |
| 9469 W_WINCOL(curwin) + ( | |
| 9470 #ifdef FEAT_RIGHTLEFT | |
| 1545 | 9471 /* With 'rightleft' set and the cursor on a double-wide |
| 9472 * character, position it on the leftmost column. */ | |
| 7 | 9473 curwin->w_p_rl ? ((int)W_WIDTH(curwin) - curwin->w_wcol - ( |
| 9474 # ifdef FEAT_MBYTE | |
| 1545 | 9475 (has_mbyte |
| 9476 && (*mb_ptr2cells)(ml_get_cursor()) == 2 | |
| 9477 && vim_isprintc(gchar_cursor())) ? 2 : | |
| 7 | 9478 # endif |
| 9479 1)) : | |
| 9480 #endif | |
| 9481 curwin->w_wcol)); | |
| 9482 } | |
| 9483 } | |
| 9484 | |
| 9485 | |
| 9486 /* | |
|
11655
8014350fe51a
patch 8.0.0710: a job that writes to a buffer clears completion
Christian Brabandt <cb@256bit.org>
parents:
11607
diff
changeset
|
9487 * 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
|
9488 * 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
|
9489 * If 'mayclear' is TRUE the screen will be cleared if it is faster than |
| 7 | 9490 * scrolling. |
| 9491 * Returns FAIL if the lines are not inserted, OK for success. | |
| 9492 */ | |
| 9493 int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9494 win_ins_lines( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9495 win_T *wp, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9496 int row, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9497 int line_count, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9498 int invalid, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9499 int mayclear) |
| 7 | 9500 { |
| 9501 int did_delete; | |
| 9502 int nextrow; | |
| 9503 int lastrow; | |
| 9504 int retval; | |
| 9505 | |
| 9506 if (invalid) | |
| 9507 wp->w_lines_valid = 0; | |
| 9508 | |
| 9509 if (wp->w_height < 5) | |
| 9510 return FAIL; | |
| 9511 | |
| 9512 if (line_count > wp->w_height - row) | |
| 9513 line_count = wp->w_height - row; | |
| 9514 | |
|
12152
69af108df70e
patch 8.0.0956: scrolling in a terminal window has flicker
Christian Brabandt <cb@256bit.org>
parents:
12122
diff
changeset
|
9515 retval = win_do_lines(wp, row, line_count, mayclear, FALSE, 0); |
| 7 | 9516 if (retval != MAYBE) |
| 9517 return retval; | |
| 9518 | |
| 9519 /* | |
| 9520 * If there is a next window or a status line, we first try to delete the | |
| 9521 * lines at the bottom to avoid messing what is after the window. | |
| 9522 * If this fails and there are following windows, don't do anything to avoid | |
| 9523 * messing up those windows, better just redraw. | |
| 9524 */ | |
| 9525 did_delete = FALSE; | |
| 9526 #ifdef FEAT_WINDOWS | |
| 9527 if (wp->w_next != NULL || wp->w_status_height) | |
| 9528 { | |
| 9529 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
|
9530 line_count, (int)Rows, FALSE, 0, NULL) == OK) |
| 7 | 9531 did_delete = TRUE; |
| 9532 else if (wp->w_next) | |
| 9533 return FAIL; | |
| 9534 } | |
| 9535 #endif | |
| 9536 /* | |
| 9537 * if no lines deleted, blank the lines that will end up below the window | |
| 9538 */ | |
| 9539 if (!did_delete) | |
| 9540 { | |
| 9541 #ifdef FEAT_WINDOWS | |
| 9542 wp->w_redr_status = TRUE; | |
| 9543 #endif | |
| 9544 redraw_cmdline = TRUE; | |
| 9545 nextrow = W_WINROW(wp) + wp->w_height + W_STATUS_HEIGHT(wp); | |
| 9546 lastrow = nextrow + line_count; | |
| 9547 if (lastrow > Rows) | |
| 9548 lastrow = Rows; | |
| 9549 screen_fill(nextrow - line_count, lastrow - line_count, | |
| 9550 W_WINCOL(wp), (int)W_ENDCOL(wp), | |
| 9551 ' ', ' ', 0); | |
| 9552 } | |
| 9553 | |
|
12152
69af108df70e
patch 8.0.0956: scrolling in a terminal window has flicker
Christian Brabandt <cb@256bit.org>
parents:
12122
diff
changeset
|
9554 if (screen_ins_lines(0, W_WINROW(wp) + row, line_count, (int)Rows, 0, NULL) |
| 7 | 9555 == FAIL) |
| 9556 { | |
| 9557 /* deletion will have messed up other windows */ | |
| 9558 if (did_delete) | |
| 9559 { | |
| 9560 #ifdef FEAT_WINDOWS | |
| 9561 wp->w_redr_status = TRUE; | |
| 9562 #endif | |
| 9563 win_rest_invalid(W_NEXT(wp)); | |
| 9564 } | |
| 9565 return FAIL; | |
| 9566 } | |
| 9567 | |
| 9568 return OK; | |
| 9569 } | |
| 9570 | |
| 9571 /* | |
|
11655
8014350fe51a
patch 8.0.0710: a job that writes to a buffer clears completion
Christian Brabandt <cb@256bit.org>
parents:
11607
diff
changeset
|
9572 * Delete "line_count" window lines at "row" in window "wp". |
| 7 | 9573 * If "invalid" is TRUE curwin->w_lines[] is invalidated. |
| 9574 * If "mayclear" is TRUE the screen will be cleared if it is faster than | |
| 9575 * scrolling | |
| 9576 * Return OK for success, FAIL if the lines are not deleted. | |
| 9577 */ | |
| 9578 int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9579 win_del_lines( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9580 win_T *wp, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9581 int row, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9582 int line_count, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9583 int invalid, |
|
12152
69af108df70e
patch 8.0.0956: scrolling in a terminal window has flicker
Christian Brabandt <cb@256bit.org>
parents:
12122
diff
changeset
|
9584 int mayclear, |
|
69af108df70e
patch 8.0.0956: scrolling in a terminal window has flicker
Christian Brabandt <cb@256bit.org>
parents:
12122
diff
changeset
|
9585 int clear_attr) /* for clearing lines */ |
| 7 | 9586 { |
| 9587 int retval; | |
| 9588 | |
| 9589 if (invalid) | |
| 9590 wp->w_lines_valid = 0; | |
| 9591 | |
| 9592 if (line_count > wp->w_height - row) | |
| 9593 line_count = wp->w_height - row; | |
| 9594 | |
|
12152
69af108df70e
patch 8.0.0956: scrolling in a terminal window has flicker
Christian Brabandt <cb@256bit.org>
parents:
12122
diff
changeset
|
9595 retval = win_do_lines(wp, row, line_count, mayclear, TRUE, clear_attr); |
| 7 | 9596 if (retval != MAYBE) |
| 9597 return retval; | |
| 9598 | |
| 9599 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
|
9600 (int)Rows, FALSE, clear_attr, NULL) == FAIL) |
| 7 | 9601 return FAIL; |
| 9602 | |
| 9603 #ifdef FEAT_WINDOWS | |
| 9604 /* | |
| 9605 * If there are windows or status lines below, try to put them at the | |
| 9606 * correct place. If we can't do that, they have to be redrawn. | |
| 9607 */ | |
| 9608 if (wp->w_next || wp->w_status_height || cmdline_row < Rows - 1) | |
| 9609 { | |
| 9610 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
|
9611 line_count, (int)Rows, clear_attr, NULL) == FAIL) |
| 7 | 9612 { |
| 9613 wp->w_redr_status = TRUE; | |
| 9614 win_rest_invalid(wp->w_next); | |
| 9615 } | |
| 9616 } | |
| 9617 /* | |
| 9618 * If this is the last window and there is no status line, redraw the | |
| 9619 * command line later. | |
| 9620 */ | |
| 9621 else | |
| 9622 #endif | |
| 9623 redraw_cmdline = TRUE; | |
| 9624 return OK; | |
| 9625 } | |
| 9626 | |
| 9627 /* | |
| 9628 * Common code for win_ins_lines() and win_del_lines(). | |
| 9629 * Returns OK or FAIL when the work has been done. | |
| 9630 * Returns MAYBE when not finished yet. | |
| 9631 */ | |
| 9632 static int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9633 win_do_lines( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9634 win_T *wp, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9635 int row, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9636 int line_count, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9637 int mayclear, |
|
12152
69af108df70e
patch 8.0.0956: scrolling in a terminal window has flicker
Christian Brabandt <cb@256bit.org>
parents:
12122
diff
changeset
|
9638 int del, |
|
69af108df70e
patch 8.0.0956: scrolling in a terminal window has flicker
Christian Brabandt <cb@256bit.org>
parents:
12122
diff
changeset
|
9639 int clear_attr) |
| 7 | 9640 { |
| 9641 int retval; | |
| 9642 | |
| 9643 if (!redrawing() || line_count <= 0) | |
| 9644 return FAIL; | |
| 9645 | |
|
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
|
9646 /* 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
|
9647 * 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
|
9648 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
|
9649 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
|
9650 |
| 7 | 9651 /* only a few lines left: redraw is faster */ |
| 9652 if (mayclear && Rows - line_count < 5 | |
|
8643
24b43dd167eb
commit https://github.com/vim/vim/commit/44a2f923c00f1384c9ecde12fb5b4711bc20702e
Christian Brabandt <cb@256bit.org>
parents:
8627
diff
changeset
|
9653 #ifdef FEAT_WINDOWS |
| 7 | 9654 && wp->w_width == Columns |
| 9655 #endif | |
| 9656 ) | |
| 9657 { | |
|
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
|
9658 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
|
9659 screenclear(); /* will set wp->w_lines_valid to 0 */ |
| 7 | 9660 return FAIL; |
| 9661 } | |
| 9662 | |
| 9663 /* | |
| 9664 * Delete all remaining lines | |
| 9665 */ | |
| 9666 if (row + line_count >= wp->w_height) | |
| 9667 { | |
| 9668 screen_fill(W_WINROW(wp) + row, W_WINROW(wp) + wp->w_height, | |
| 9669 W_WINCOL(wp), (int)W_ENDCOL(wp), | |
| 9670 ' ', ' ', 0); | |
| 9671 return OK; | |
| 9672 } | |
| 9673 | |
| 9674 /* | |
|
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
|
9675 * When scrolling, the message on the command line should be cleared, |
| 7 | 9676 * 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
|
9677 * Don't do this when avoiding to insert lines. |
| 7 | 9678 */ |
|
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
|
9679 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
|
9680 clear_cmdline = TRUE; |
| 7 | 9681 |
| 9682 /* | |
| 9683 * If the terminal can set a scroll region, use that. | |
| 9684 * Always do this in a vertically split window. This will redraw from | |
| 9685 * ScreenLines[] when t_CV isn't defined. That's faster than using | |
| 9686 * win_line(). | |
| 9687 * 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
|
9688 * 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
|
9689 * scroll-up . |
| 7 | 9690 */ |
| 9691 if (scroll_region | |
|
8643
24b43dd167eb
commit https://github.com/vim/vim/commit/44a2f923c00f1384c9ecde12fb5b4711bc20702e
Christian Brabandt <cb@256bit.org>
parents:
8627
diff
changeset
|
9692 #ifdef FEAT_WINDOWS |
| 7 | 9693 || W_WIDTH(wp) != Columns |
| 9694 #endif | |
| 9695 ) | |
| 9696 { | |
|
8643
24b43dd167eb
commit https://github.com/vim/vim/commit/44a2f923c00f1384c9ecde12fb5b4711bc20702e
Christian Brabandt <cb@256bit.org>
parents:
8627
diff
changeset
|
9697 #ifdef FEAT_WINDOWS |
| 7 | 9698 if (scroll_region && (wp->w_width == Columns || *T_CSV != NUL)) |
| 9699 #endif | |
| 9700 scroll_region_set(wp, row); | |
| 9701 if (del) | |
| 9702 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
|
9703 wp->w_height - row, FALSE, clear_attr, wp); |
| 7 | 9704 else |
| 9705 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
|
9706 wp->w_height - row, clear_attr, wp); |
|
8643
24b43dd167eb
commit https://github.com/vim/vim/commit/44a2f923c00f1384c9ecde12fb5b4711bc20702e
Christian Brabandt <cb@256bit.org>
parents:
8627
diff
changeset
|
9707 #ifdef FEAT_WINDOWS |
| 7 | 9708 if (scroll_region && (wp->w_width == Columns || *T_CSV != NUL)) |
| 9709 #endif | |
| 9710 scroll_region_reset(); | |
| 9711 return retval; | |
| 9712 } | |
| 9713 | |
| 9714 #ifdef FEAT_WINDOWS | |
| 9715 if (wp->w_next != NULL && p_tf) /* don't delete/insert on fast terminal */ | |
| 9716 return FAIL; | |
| 9717 #endif | |
| 9718 | |
| 9719 return MAYBE; | |
| 9720 } | |
| 9721 | |
| 9722 /* | |
| 9723 * window 'wp' and everything after it is messed up, mark it for redraw | |
| 9724 */ | |
| 9725 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9726 win_rest_invalid(win_T *wp) |
| 7 | 9727 { |
| 9728 #ifdef FEAT_WINDOWS | |
| 9729 while (wp != NULL) | |
| 9730 #else | |
| 9731 if (wp != NULL) | |
| 9732 #endif | |
| 9733 { | |
| 9734 redraw_win_later(wp, NOT_VALID); | |
| 9735 #ifdef FEAT_WINDOWS | |
| 9736 wp->w_redr_status = TRUE; | |
| 9737 wp = wp->w_next; | |
| 9738 #endif | |
| 9739 } | |
| 9740 redraw_cmdline = TRUE; | |
| 9741 } | |
| 9742 | |
| 9743 /* | |
| 9744 * The rest of the routines in this file perform screen manipulations. The | |
| 9745 * given operation is performed physically on the screen. The corresponding | |
| 9746 * change is also made to the internal screen image. In this way, the editor | |
| 9747 * anticipates the effect of editing changes on the appearance of the screen. | |
| 9748 * That way, when we call screenupdate a complete redraw isn't usually | |
| 9749 * necessary. Another advantage is that we can keep adding code to anticipate | |
| 9750 * screen changes, and in the meantime, everything still works. | |
| 9751 */ | |
| 9752 | |
| 9753 /* | |
| 9754 * types for inserting or deleting lines | |
| 9755 */ | |
| 9756 #define USE_T_CAL 1 | |
| 9757 #define USE_T_CDL 2 | |
| 9758 #define USE_T_AL 3 | |
| 9759 #define USE_T_CE 4 | |
| 9760 #define USE_T_DL 5 | |
| 9761 #define USE_T_SR 6 | |
| 9762 #define USE_NL 7 | |
| 9763 #define USE_T_CD 8 | |
| 9764 #define USE_REDRAW 9 | |
| 9765 | |
| 9766 /* | |
| 9767 * insert lines on the screen and update ScreenLines[] | |
| 9768 * 'end' is the line after the scrolled part. Normally it is Rows. | |
| 9769 * When scrolling region used 'off' is the offset from the top for the region. | |
| 9770 * 'row' and 'end' are relative to the start of the region. | |
| 9771 * | |
| 9772 * return FAIL for failure, OK for success. | |
| 9773 */ | |
| 446 | 9774 int |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9775 screen_ins_lines( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9776 int off, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9777 int row, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9778 int line_count, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9779 int end, |
|
12152
69af108df70e
patch 8.0.0956: scrolling in a terminal window has flicker
Christian Brabandt <cb@256bit.org>
parents:
12122
diff
changeset
|
9780 int clear_attr, |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9781 win_T *wp) /* NULL or window to use width from */ |
| 7 | 9782 { |
| 9783 int i; | |
| 9784 int j; | |
| 9785 unsigned temp; | |
| 9786 int cursor_row; | |
| 9787 int type; | |
| 9788 int result_empty; | |
| 9789 int can_ce = can_clear(T_CE); | |
| 9790 | |
| 9791 /* | |
| 9792 * FAIL if | |
| 9793 * - there is no valid screen | |
| 9794 * - the screen has to be redrawn completely | |
| 9795 * - the line count is less than one | |
| 9796 * - 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
|
9797 * - redrawing for a callback and there is a modeless selection |
| 7 | 9798 */ |
|
11698
4f59d2a66bf7
patch 8.0.0732: when updating a buffer modeless selection is lost
Christian Brabandt <cb@256bit.org>
parents:
11672
diff
changeset
|
9799 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
|
9800 #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
|
9801 || (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
|
9802 && 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
|
9803 #endif |
|
4f59d2a66bf7
patch 8.0.0732: when updating a buffer modeless selection is lost
Christian Brabandt <cb@256bit.org>
parents:
11672
diff
changeset
|
9804 ) |
| 7 | 9805 return FAIL; |
| 9806 | |
| 9807 /* | |
| 9808 * There are seven ways to insert lines: | |
| 9809 * 0. When in a vertically split window and t_CV isn't set, redraw the | |
| 9810 * characters from ScreenLines[]. | |
| 9811 * 1. Use T_CD (clear to end of display) if it exists and the result of | |
| 9812 * the insert is just empty lines | |
| 9813 * 2. Use T_CAL (insert multiple lines) if it exists and T_AL is not | |
| 9814 * present or line_count > 1. It looks better if we do all the inserts | |
| 9815 * at once. | |
| 9816 * 3. Use T_CDL (delete multiple lines) if it exists and the result of the | |
| 9817 * insert is just empty lines and T_CE is not present or line_count > | |
| 9818 * 1. | |
| 9819 * 4. Use T_AL (insert line) if it exists. | |
| 9820 * 5. Use T_CE (erase line) if it exists and the result of the insert is | |
| 9821 * just empty lines. | |
| 9822 * 6. Use T_DL (delete line) if it exists and the result of the insert is | |
| 9823 * just empty lines. | |
| 9824 * 7. Use T_SR (scroll reverse) if it exists and inserting at row 0 and | |
| 9825 * the 'da' flag is not set or we have clear line capability. | |
| 9826 * 8. redraw the characters from ScreenLines[]. | |
| 9827 * | |
| 9828 * Careful: In a hpterm scroll reverse doesn't work as expected, it moves | |
| 9829 * the scrollbar for the window. It does have insert line, use that if it | |
| 9830 * exists. | |
| 9831 */ | |
| 9832 result_empty = (row + line_count >= end); | |
|
8643
24b43dd167eb
commit https://github.com/vim/vim/commit/44a2f923c00f1384c9ecde12fb5b4711bc20702e
Christian Brabandt <cb@256bit.org>
parents:
8627
diff
changeset
|
9833 #ifdef FEAT_WINDOWS |
| 7 | 9834 if (wp != NULL && wp->w_width != Columns && *T_CSV == NUL) |
| 9835 type = USE_REDRAW; | |
| 9836 else | |
| 9837 #endif | |
| 9838 if (can_clear(T_CD) && result_empty) | |
| 9839 type = USE_T_CD; | |
| 9840 else if (*T_CAL != NUL && (line_count > 1 || *T_AL == NUL)) | |
| 9841 type = USE_T_CAL; | |
| 9842 else if (*T_CDL != NUL && result_empty && (line_count > 1 || !can_ce)) | |
| 9843 type = USE_T_CDL; | |
| 9844 else if (*T_AL != NUL) | |
| 9845 type = USE_T_AL; | |
| 9846 else if (can_ce && result_empty) | |
| 9847 type = USE_T_CE; | |
| 9848 else if (*T_DL != NUL && result_empty) | |
| 9849 type = USE_T_DL; | |
| 9850 else if (*T_SR != NUL && row == 0 && (*T_DA == NUL || can_ce)) | |
| 9851 type = USE_T_SR; | |
| 9852 else | |
| 9853 return FAIL; | |
| 9854 | |
| 9855 /* | |
| 9856 * For clearing the lines screen_del_lines() is used. This will also take | |
| 9857 * care of t_db if necessary. | |
| 9858 */ | |
| 9859 if (type == USE_T_CD || type == USE_T_CDL || | |
| 9860 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
|
9861 return screen_del_lines(off, row, line_count, end, FALSE, 0, wp); |
| 7 | 9862 |
| 9863 /* | |
| 9864 * If text is retained below the screen, first clear or delete as many | |
| 9865 * lines at the bottom of the window as are about to be inserted so that | |
| 9866 * the deleted lines won't later surface during a screen_del_lines. | |
| 9867 */ | |
| 9868 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
|
9869 screen_del_lines(off, end - line_count, line_count, end, FALSE, 0, wp); |
| 7 | 9870 |
| 9871 #ifdef FEAT_CLIPBOARD | |
| 9872 /* Remove a modeless selection when inserting lines halfway the screen | |
| 9873 * or not the full width of the screen. */ | |
| 9874 if (off + row > 0 | |
|
8643
24b43dd167eb
commit https://github.com/vim/vim/commit/44a2f923c00f1384c9ecde12fb5b4711bc20702e
Christian Brabandt <cb@256bit.org>
parents:
8627
diff
changeset
|
9875 # ifdef FEAT_WINDOWS |
| 7 | 9876 || (wp != NULL && wp->w_width != Columns) |
| 9877 # endif | |
| 9878 ) | |
| 3674 | 9879 clip_clear_selection(&clip_star); |
| 7 | 9880 else |
| 9881 clip_scroll_selection(-line_count); | |
| 9882 #endif | |
| 9883 | |
| 9884 #ifdef FEAT_GUI | |
| 9885 /* Don't update the GUI cursor here, ScreenLines[] is invalid until the | |
| 9886 * scrolling is actually carried out. */ | |
|
9848
664276833670
commit https://github.com/vim/vim/commit/107abd2ca53c31fd3bb40d77ff296e98eaae2975
Christian Brabandt <cb@256bit.org>
parents:
9754
diff
changeset
|
9887 gui_dont_update_cursor(row + off <= gui.cursor_row); |
| 7 | 9888 #endif |
| 9889 | |
| 9890 if (*T_CCS != NUL) /* cursor relative to region */ | |
| 9891 cursor_row = row; | |
| 9892 else | |
| 9893 cursor_row = row + off; | |
| 9894 | |
| 9895 /* | |
| 9896 * Shift LineOffset[] line_count down to reflect the inserted lines. | |
| 9897 * Clear the inserted lines in ScreenLines[]. | |
| 9898 */ | |
| 9899 row += off; | |
| 9900 end += off; | |
| 9901 for (i = 0; i < line_count; ++i) | |
| 9902 { | |
|
8643
24b43dd167eb
commit https://github.com/vim/vim/commit/44a2f923c00f1384c9ecde12fb5b4711bc20702e
Christian Brabandt <cb@256bit.org>
parents:
8627
diff
changeset
|
9903 #ifdef FEAT_WINDOWS |
| 7 | 9904 if (wp != NULL && wp->w_width != Columns) |
| 9905 { | |
| 9906 /* need to copy part of a line */ | |
| 9907 j = end - 1 - i; | |
| 9908 while ((j -= line_count) >= row) | |
| 9909 linecopy(j + line_count, j, wp); | |
| 9910 j += line_count; | |
| 9911 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
|
9912 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
|
9913 clear_attr); |
| 7 | 9914 else |
| 9915 lineinvalid(LineOffset[j] + wp->w_wincol, wp->w_width); | |
| 9916 LineWraps[j] = FALSE; | |
| 9917 } | |
| 9918 else | |
| 9919 #endif | |
| 9920 { | |
| 9921 j = end - 1 - i; | |
| 9922 temp = LineOffset[j]; | |
| 9923 while ((j -= line_count) >= row) | |
| 9924 { | |
| 9925 LineOffset[j + line_count] = LineOffset[j]; | |
| 9926 LineWraps[j + line_count] = LineWraps[j]; | |
| 9927 } | |
| 9928 LineOffset[j + line_count] = temp; | |
| 9929 LineWraps[j + line_count] = FALSE; | |
| 9930 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
|
9931 lineclear(temp, (int)Columns, clear_attr); |
| 7 | 9932 else |
| 9933 lineinvalid(temp, (int)Columns); | |
| 9934 } | |
| 9935 } | |
| 9936 | |
| 9937 screen_stop_highlight(); | |
| 9938 windgoto(cursor_row, 0); | |
|
12152
69af108df70e
patch 8.0.0956: scrolling in a terminal window has flicker
Christian Brabandt <cb@256bit.org>
parents:
12122
diff
changeset
|
9939 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
|
9940 screen_start_highlight(clear_attr); |
| 7 | 9941 |
|
8643
24b43dd167eb
commit https://github.com/vim/vim/commit/44a2f923c00f1384c9ecde12fb5b4711bc20702e
Christian Brabandt <cb@256bit.org>
parents:
8627
diff
changeset
|
9942 #ifdef FEAT_WINDOWS |
| 7 | 9943 /* redraw the characters */ |
| 9944 if (type == USE_REDRAW) | |
| 9945 redraw_block(row, end, wp); | |
| 9946 else | |
| 9947 #endif | |
| 9948 if (type == USE_T_CAL) | |
| 9949 { | |
| 9950 term_append_lines(line_count); | |
| 9951 screen_start(); /* don't know where cursor is now */ | |
| 9952 } | |
| 9953 else | |
| 9954 { | |
| 9955 for (i = 0; i < line_count; i++) | |
| 9956 { | |
| 9957 if (type == USE_T_AL) | |
| 9958 { | |
| 9959 if (i && cursor_row != 0) | |
| 9960 windgoto(cursor_row, 0); | |
| 9961 out_str(T_AL); | |
| 9962 } | |
| 9963 else /* type == USE_T_SR */ | |
| 9964 out_str(T_SR); | |
| 9965 screen_start(); /* don't know where cursor is now */ | |
| 9966 } | |
| 9967 } | |
| 9968 | |
| 9969 /* | |
| 9970 * With scroll-reverse and 'da' flag set we need to clear the lines that | |
| 9971 * have been scrolled down into the region. | |
| 9972 */ | |
| 9973 if (type == USE_T_SR && *T_DA) | |
| 9974 { | |
| 9975 for (i = 0; i < line_count; ++i) | |
| 9976 { | |
| 9977 windgoto(off + i, 0); | |
| 9978 out_str(T_CE); | |
| 9979 screen_start(); /* don't know where cursor is now */ | |
| 9980 } | |
| 9981 } | |
| 9982 | |
| 9983 #ifdef FEAT_GUI | |
| 9984 gui_can_update_cursor(); | |
| 9985 if (gui.in_use) | |
| 9986 out_flush(); /* always flush after a scroll */ | |
| 9987 #endif | |
| 9988 return OK; | |
| 9989 } | |
| 9990 | |
| 9991 /* | |
|
9848
664276833670
commit https://github.com/vim/vim/commit/107abd2ca53c31fd3bb40d77ff296e98eaae2975
Christian Brabandt <cb@256bit.org>
parents:
9754
diff
changeset
|
9992 * 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
|
9993 * "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
|
9994 * 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
|
9995 * "row" and "end" are relative to the start of the region. |
| 7 | 9996 * |
| 9997 * Return OK for success, FAIL if the lines are not deleted. | |
| 9998 */ | |
| 9999 int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
10000 screen_del_lines( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
10001 int off, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
10002 int row, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
10003 int line_count, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
10004 int end, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
10005 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
|
10006 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
|
10007 win_T *wp UNUSED) /* NULL or window to use width from */ |
| 7 | 10008 { |
| 10009 int j; | |
| 10010 int i; | |
| 10011 unsigned temp; | |
| 10012 int cursor_row; | |
| 10013 int cursor_end; | |
| 10014 int result_empty; /* result is empty until end of region */ | |
| 10015 int can_delete; /* deleting line codes can be used */ | |
| 10016 int type; | |
| 10017 | |
| 10018 /* | |
| 10019 * FAIL if | |
| 10020 * - there is no valid screen | |
| 10021 * - the screen has to be redrawn completely | |
| 10022 * - the line count is less than one | |
| 10023 * - 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
|
10024 * - redrawing for a callback and there is a modeless selection |
| 7 | 10025 */ |
|
11698
4f59d2a66bf7
patch 8.0.0732: when updating a buffer modeless selection is lost
Christian Brabandt <cb@256bit.org>
parents:
11672
diff
changeset
|
10026 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
|
10027 || (!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
|
10028 #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
|
10029 || (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
|
10030 && 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
|
10031 #endif |
|
4f59d2a66bf7
patch 8.0.0732: when updating a buffer modeless selection is lost
Christian Brabandt <cb@256bit.org>
parents:
11672
diff
changeset
|
10032 ) |
| 7 | 10033 return FAIL; |
| 10034 | |
| 10035 /* | |
| 10036 * Check if the rest of the current region will become empty. | |
| 10037 */ | |
| 10038 result_empty = row + line_count >= end; | |
| 10039 | |
| 10040 /* | |
| 10041 * We can delete lines only when 'db' flag not set or when 'ce' option | |
| 10042 * available. | |
| 10043 */ | |
| 10044 can_delete = (*T_DB == NUL || can_clear(T_CE)); | |
| 10045 | |
| 10046 /* | |
| 10047 * There are six ways to delete lines: | |
| 10048 * 0. When in a vertically split window and t_CV isn't set, redraw the | |
| 10049 * characters from ScreenLines[]. | |
| 10050 * 1. Use T_CD if it exists and the result is empty. | |
| 10051 * 2. Use newlines if row == 0 and count == 1 or T_CDL does not exist. | |
| 10052 * 3. Use T_CDL (delete multiple lines) if it exists and line_count > 1 or | |
| 10053 * none of the other ways work. | |
| 10054 * 4. Use T_CE (erase line) if the result is empty. | |
| 10055 * 5. Use T_DL (delete line) if it exists. | |
| 10056 * 6. redraw the characters from ScreenLines[]. | |
| 10057 */ | |
|
8643
24b43dd167eb
commit https://github.com/vim/vim/commit/44a2f923c00f1384c9ecde12fb5b4711bc20702e
Christian Brabandt <cb@256bit.org>
parents:
8627
diff
changeset
|
10058 #ifdef FEAT_WINDOWS |
| 7 | 10059 if (wp != NULL && wp->w_width != Columns && *T_CSV == NUL) |
| 10060 type = USE_REDRAW; | |
| 10061 else | |
| 10062 #endif | |
| 10063 if (can_clear(T_CD) && result_empty) | |
| 10064 type = USE_T_CD; | |
| 10065 #if defined(__BEOS__) && defined(BEOS_DR8) | |
| 10066 /* | |
| 10067 * USE_NL does not seem to work in Terminal of DR8 so we set T_DB="" in | |
| 10068 * its internal termcap... this works okay for tests which test *T_DB != | |
| 10069 * NUL. It has the disadvantage that the user cannot use any :set t_* | |
| 10070 * command to get T_DB (back) to empty_option, only :set term=... will do | |
| 10071 * the trick... | |
| 10072 * Anyway, this hack will hopefully go away with the next OS release. | |
| 10073 * (Olaf Seibert) | |
| 10074 */ | |
| 10075 else if (row == 0 && T_DB == empty_option | |
| 10076 && (line_count == 1 || *T_CDL == NUL)) | |
| 10077 #else | |
| 10078 else if (row == 0 && ( | |
| 10079 #ifndef AMIGA | |
| 10080 /* On the Amiga, somehow '\n' on the last line doesn't always scroll | |
| 10081 * up, so use delete-line command */ | |
| 10082 line_count == 1 || | |
| 10083 #endif | |
| 10084 *T_CDL == NUL)) | |
| 10085 #endif | |
| 10086 type = USE_NL; | |
| 10087 else if (*T_CDL != NUL && line_count > 1 && can_delete) | |
| 10088 type = USE_T_CDL; | |
| 10089 else if (can_clear(T_CE) && result_empty | |
|
8643
24b43dd167eb
commit https://github.com/vim/vim/commit/44a2f923c00f1384c9ecde12fb5b4711bc20702e
Christian Brabandt <cb@256bit.org>
parents:
8627
diff
changeset
|
10090 #ifdef FEAT_WINDOWS |
| 7 | 10091 && (wp == NULL || wp->w_width == Columns) |
| 10092 #endif | |
| 10093 ) | |
| 10094 type = USE_T_CE; | |
| 10095 else if (*T_DL != NUL && can_delete) | |
| 10096 type = USE_T_DL; | |
| 10097 else if (*T_CDL != NUL && can_delete) | |
| 10098 type = USE_T_CDL; | |
| 10099 else | |
| 10100 return FAIL; | |
| 10101 | |
| 10102 #ifdef FEAT_CLIPBOARD | |
| 10103 /* Remove a modeless selection when deleting lines halfway the screen or | |
| 10104 * not the full width of the screen. */ | |
| 10105 if (off + row > 0 | |
|
8643
24b43dd167eb
commit https://github.com/vim/vim/commit/44a2f923c00f1384c9ecde12fb5b4711bc20702e
Christian Brabandt <cb@256bit.org>
parents:
8627
diff
changeset
|
10106 # ifdef FEAT_WINDOWS |
| 7 | 10107 || (wp != NULL && wp->w_width != Columns) |
| 10108 # endif | |
| 10109 ) | |
| 3674 | 10110 clip_clear_selection(&clip_star); |
| 7 | 10111 else |
| 10112 clip_scroll_selection(line_count); | |
| 10113 #endif | |
| 10114 | |
| 10115 #ifdef FEAT_GUI | |
| 10116 /* Don't update the GUI cursor here, ScreenLines[] is invalid until the | |
| 10117 * scrolling is actually carried out. */ | |
|
9848
664276833670
commit https://github.com/vim/vim/commit/107abd2ca53c31fd3bb40d77ff296e98eaae2975
Christian Brabandt <cb@256bit.org>
parents:
9754
diff
changeset
|
10118 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
|
10119 && gui.cursor_row < end + off); |
| 7 | 10120 #endif |
| 10121 | |
| 10122 if (*T_CCS != NUL) /* cursor relative to region */ | |
| 10123 { | |
| 10124 cursor_row = row; | |
| 10125 cursor_end = end; | |
| 10126 } | |
| 10127 else | |
| 10128 { | |
| 10129 cursor_row = row + off; | |
| 10130 cursor_end = end + off; | |
| 10131 } | |
| 10132 | |
| 10133 /* | |
| 10134 * Now shift LineOffset[] line_count up to reflect the deleted lines. | |
| 10135 * Clear the inserted lines in ScreenLines[]. | |
| 10136 */ | |
| 10137 row += off; | |
| 10138 end += off; | |
| 10139 for (i = 0; i < line_count; ++i) | |
| 10140 { | |
|
8643
24b43dd167eb
commit https://github.com/vim/vim/commit/44a2f923c00f1384c9ecde12fb5b4711bc20702e
Christian Brabandt <cb@256bit.org>
parents:
8627
diff
changeset
|
10141 #ifdef FEAT_WINDOWS |
| 7 | 10142 if (wp != NULL && wp->w_width != Columns) |
| 10143 { | |
| 10144 /* need to copy part of a line */ | |
| 10145 j = row + i; | |
| 10146 while ((j += line_count) <= end - 1) | |
| 10147 linecopy(j - line_count, j, wp); | |
| 10148 j -= line_count; | |
| 10149 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
|
10150 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
|
10151 clear_attr); |
| 7 | 10152 else |
| 10153 lineinvalid(LineOffset[j] + wp->w_wincol, wp->w_width); | |
| 10154 LineWraps[j] = FALSE; | |
| 10155 } | |
| 10156 else | |
| 10157 #endif | |
| 10158 { | |
| 10159 /* whole width, moving the line pointers is faster */ | |
| 10160 j = row + i; | |
| 10161 temp = LineOffset[j]; | |
| 10162 while ((j += line_count) <= end - 1) | |
| 10163 { | |
| 10164 LineOffset[j - line_count] = LineOffset[j]; | |
| 10165 LineWraps[j - line_count] = LineWraps[j]; | |
| 10166 } | |
| 10167 LineOffset[j - line_count] = temp; | |
| 10168 LineWraps[j - line_count] = FALSE; | |
| 10169 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
|
10170 lineclear(temp, (int)Columns, clear_attr); |
| 7 | 10171 else |
| 10172 lineinvalid(temp, (int)Columns); | |
| 10173 } | |
| 10174 } | |
| 10175 | |
|
12152
69af108df70e
patch 8.0.0956: scrolling in a terminal window has flicker
Christian Brabandt <cb@256bit.org>
parents:
12122
diff
changeset
|
10176 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
|
10177 screen_stop_highlight(); |
|
69af108df70e
patch 8.0.0956: scrolling in a terminal window has flicker
Christian Brabandt <cb@256bit.org>
parents:
12122
diff
changeset
|
10178 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
|
10179 screen_start_highlight(clear_attr); |
| 7 | 10180 |
|
8643
24b43dd167eb
commit https://github.com/vim/vim/commit/44a2f923c00f1384c9ecde12fb5b4711bc20702e
Christian Brabandt <cb@256bit.org>
parents:
8627
diff
changeset
|
10181 #ifdef FEAT_WINDOWS |
| 7 | 10182 /* redraw the characters */ |
| 10183 if (type == USE_REDRAW) | |
| 10184 redraw_block(row, end, wp); | |
| 10185 else | |
| 10186 #endif | |
| 10187 if (type == USE_T_CD) /* delete the lines */ | |
| 10188 { | |
| 10189 windgoto(cursor_row, 0); | |
| 10190 out_str(T_CD); | |
| 10191 screen_start(); /* don't know where cursor is now */ | |
| 10192 } | |
| 10193 else if (type == USE_T_CDL) | |
| 10194 { | |
| 10195 windgoto(cursor_row, 0); | |
| 10196 term_delete_lines(line_count); | |
| 10197 screen_start(); /* don't know where cursor is now */ | |
| 10198 } | |
| 10199 /* | |
| 10200 * Deleting lines at top of the screen or scroll region: Just scroll | |
| 10201 * the whole screen (scroll region) up by outputting newlines on the | |
| 10202 * last line. | |
| 10203 */ | |
| 10204 else if (type == USE_NL) | |
| 10205 { | |
| 10206 windgoto(cursor_end - 1, 0); | |
| 10207 for (i = line_count; --i >= 0; ) | |
| 10208 out_char('\n'); /* cursor will remain on same line */ | |
| 10209 } | |
| 10210 else | |
| 10211 { | |
| 10212 for (i = line_count; --i >= 0; ) | |
| 10213 { | |
| 10214 if (type == USE_T_DL) | |
| 10215 { | |
| 10216 windgoto(cursor_row, 0); | |
| 10217 out_str(T_DL); /* delete a line */ | |
| 10218 } | |
| 10219 else /* type == USE_T_CE */ | |
| 10220 { | |
| 10221 windgoto(cursor_row + i, 0); | |
| 10222 out_str(T_CE); /* erase a line */ | |
| 10223 } | |
| 10224 screen_start(); /* don't know where cursor is now */ | |
| 10225 } | |
| 10226 } | |
| 10227 | |
| 10228 /* | |
| 10229 * If the 'db' flag is set, we need to clear the lines that have been | |
| 10230 * scrolled up at the bottom of the region. | |
| 10231 */ | |
| 10232 if (*T_DB && (type == USE_T_DL || type == USE_T_CDL)) | |
| 10233 { | |
| 10234 for (i = line_count; i > 0; --i) | |
| 10235 { | |
| 10236 windgoto(cursor_end - i, 0); | |
| 10237 out_str(T_CE); /* erase a line */ | |
| 10238 screen_start(); /* don't know where cursor is now */ | |
| 10239 } | |
| 10240 } | |
| 10241 | |
| 10242 #ifdef FEAT_GUI | |
| 10243 gui_can_update_cursor(); | |
| 10244 if (gui.in_use) | |
| 10245 out_flush(); /* always flush after a scroll */ | |
| 10246 #endif | |
| 10247 | |
| 10248 return OK; | |
| 10249 } | |
| 10250 | |
| 10251 /* | |
| 10252 * show the current mode and ruler | |
| 10253 * | |
| 10254 * If clear_cmdline is TRUE, clear the rest of the cmdline. | |
| 10255 * If clear_cmdline is FALSE there may be a message there that needs to be | |
| 10256 * cleared only if a mode is shown. | |
| 10257 * Return the length of the message (0 if no message). | |
| 10258 */ | |
| 10259 int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
10260 showmode(void) |
| 7 | 10261 { |
| 10262 int need_clear; | |
| 10263 int length = 0; | |
| 10264 int do_mode; | |
| 10265 int attr; | |
| 10266 int nwr_save; | |
| 10267 #ifdef FEAT_INS_EXPAND | |
| 10268 int sub_attr; | |
| 10269 #endif | |
| 10270 | |
| 642 | 10271 do_mode = ((p_smd && msg_silent == 0) |
| 10272 && ((State & INSERT) | |
| 10273 || restart_edit | |
| 5735 | 10274 || VIsual_active)); |
| 7 | 10275 if (do_mode || Recording) |
| 10276 { | |
| 10277 /* | |
| 10278 * Don't show mode right now, when not redrawing or inside a mapping. | |
| 10279 * Call char_avail() only when we are going to show something, because | |
| 10280 * it takes a bit of time. | |
| 10281 */ | |
| 10282 if (!redrawing() || (char_avail() && !KeyTyped) || msg_silent != 0) | |
| 10283 { | |
| 10284 redraw_cmdline = TRUE; /* show mode later */ | |
| 10285 return 0; | |
| 10286 } | |
| 10287 | |
| 10288 nwr_save = need_wait_return; | |
| 10289 | |
| 10290 /* wait a bit before overwriting an important message */ | |
| 10291 check_for_delay(FALSE); | |
| 10292 | |
| 10293 /* if the cmdline is more than one line high, erase top lines */ | |
| 10294 need_clear = clear_cmdline; | |
| 10295 if (clear_cmdline && cmdline_row < Rows - 1) | |
| 10296 msg_clr_cmdline(); /* will reset clear_cmdline */ | |
| 10297 | |
| 10298 /* Position on the last line in the window, column 0 */ | |
| 10299 msg_pos_mode(); | |
| 10300 cursor_off(); | |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
10301 attr = HL_ATTR(HLF_CM); /* Highlight mode */ |
| 7 | 10302 if (do_mode) |
| 10303 { | |
| 10304 MSG_PUTS_ATTR("--", attr); | |
| 10305 #if defined(FEAT_XIM) | |
| 2520 | 10306 if ( |
| 10307 # ifdef FEAT_GUI_GTK | |
| 10308 preedit_get_status() | |
| 1668 | 10309 # else |
| 10310 im_get_status() | |
| 2520 | 10311 # endif |
| 1668 | 10312 ) |
|
2277
f42e0b5ff9e9
Change remaining HAVE_GTK2 to FEAT_GUI_GTK.
Bram Moolenaar <bram@vim.org>
parents:
2269
diff
changeset
|
10313 # ifdef FEAT_GUI_GTK /* most of the time, it's not XIM being used */ |
| 7 | 10314 MSG_PUTS_ATTR(" IM", attr); |
| 10315 # else | |
| 10316 MSG_PUTS_ATTR(" XIM", attr); | |
| 10317 # endif | |
| 10318 #endif | |
| 10319 #if defined(FEAT_HANGULIN) && defined(FEAT_GUI) | |
| 10320 if (gui.in_use) | |
| 10321 { | |
| 10322 if (hangul_input_state_get()) | |
|
7208
2c00f6b312bf
commit https://github.com/vim/vim/commit/72f4cc4a987d123c0ed909c85b9a05f65cef7202
Christian Brabandt <cb@256bit.org>
parents:
7007
diff
changeset
|
10323 { |
|
2c00f6b312bf
commit https://github.com/vim/vim/commit/72f4cc4a987d123c0ed909c85b9a05f65cef7202
Christian Brabandt <cb@256bit.org>
parents:
7007
diff
changeset
|
10324 /* HANGUL */ |
|
2c00f6b312bf
commit https://github.com/vim/vim/commit/72f4cc4a987d123c0ed909c85b9a05f65cef7202
Christian Brabandt <cb@256bit.org>
parents:
7007
diff
changeset
|
10325 if (enc_utf8) |
|
2c00f6b312bf
commit https://github.com/vim/vim/commit/72f4cc4a987d123c0ed909c85b9a05f65cef7202
Christian Brabandt <cb@256bit.org>
parents:
7007
diff
changeset
|
10326 MSG_PUTS_ATTR(" \355\225\234\352\270\200", attr); |
|
2c00f6b312bf
commit https://github.com/vim/vim/commit/72f4cc4a987d123c0ed909c85b9a05f65cef7202
Christian Brabandt <cb@256bit.org>
parents:
7007
diff
changeset
|
10327 else |
|
2c00f6b312bf
commit https://github.com/vim/vim/commit/72f4cc4a987d123c0ed909c85b9a05f65cef7202
Christian Brabandt <cb@256bit.org>
parents:
7007
diff
changeset
|
10328 MSG_PUTS_ATTR(" \307\321\261\333", attr); |
|
2c00f6b312bf
commit https://github.com/vim/vim/commit/72f4cc4a987d123c0ed909c85b9a05f65cef7202
Christian Brabandt <cb@256bit.org>
parents:
7007
diff
changeset
|
10329 } |
| 7 | 10330 } |
| 10331 #endif | |
| 10332 #ifdef FEAT_INS_EXPAND | |
| 5946 | 10333 /* CTRL-X in Insert mode */ |
| 10334 if (edit_submode != NULL && !shortmess(SHM_COMPLETIONMENU)) | |
| 7 | 10335 { |
| 10336 /* These messages can get long, avoid a wrap in a narrow | |
| 10337 * window. Prefer showing edit_submode_extra. */ | |
| 10338 length = (Rows - msg_row) * Columns - 3; | |
| 10339 if (edit_submode_extra != NULL) | |
| 10340 length -= vim_strsize(edit_submode_extra); | |
| 10341 if (length > 0) | |
| 10342 { | |
| 10343 if (edit_submode_pre != NULL) | |
| 10344 length -= vim_strsize(edit_submode_pre); | |
| 10345 if (length - vim_strsize(edit_submode) > 0) | |
| 10346 { | |
| 10347 if (edit_submode_pre != NULL) | |
| 10348 msg_puts_attr(edit_submode_pre, attr); | |
| 10349 msg_puts_attr(edit_submode, attr); | |
| 10350 } | |
| 10351 if (edit_submode_extra != NULL) | |
| 10352 { | |
| 10353 MSG_PUTS_ATTR(" ", attr); /* add a space in between */ | |
| 10354 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
|
10355 sub_attr = HL_ATTR(edit_submode_highl); |
| 7 | 10356 else |
| 10357 sub_attr = attr; | |
| 10358 msg_puts_attr(edit_submode_extra, sub_attr); | |
| 10359 } | |
| 10360 } | |
| 10361 length = 0; | |
| 10362 } | |
| 10363 else | |
| 10364 #endif | |
| 10365 { | |
| 10366 #ifdef FEAT_VREPLACE | |
| 10367 if (State & VREPLACE_FLAG) | |
| 10368 MSG_PUTS_ATTR(_(" VREPLACE"), attr); | |
| 10369 else | |
| 10370 #endif | |
| 10371 if (State & REPLACE_FLAG) | |
| 10372 MSG_PUTS_ATTR(_(" REPLACE"), attr); | |
| 10373 else if (State & INSERT) | |
| 10374 { | |
| 10375 #ifdef FEAT_RIGHTLEFT | |
| 10376 if (p_ri) | |
| 10377 MSG_PUTS_ATTR(_(" REVERSE"), attr); | |
| 10378 #endif | |
| 10379 MSG_PUTS_ATTR(_(" INSERT"), attr); | |
| 10380 } | |
| 10381 else if (restart_edit == 'I') | |
| 10382 MSG_PUTS_ATTR(_(" (insert)"), attr); | |
| 10383 else if (restart_edit == 'R') | |
| 10384 MSG_PUTS_ATTR(_(" (replace)"), attr); | |
| 10385 else if (restart_edit == 'V') | |
| 10386 MSG_PUTS_ATTR(_(" (vreplace)"), attr); | |
| 10387 #ifdef FEAT_RIGHTLEFT | |
| 10388 if (p_hkmap) | |
| 10389 MSG_PUTS_ATTR(_(" Hebrew"), attr); | |
| 10390 # ifdef FEAT_FKMAP | |
| 10391 if (p_fkmap) | |
| 10392 MSG_PUTS_ATTR(farsi_text_5, attr); | |
| 10393 # endif | |
| 10394 #endif | |
| 10395 #ifdef FEAT_KEYMAP | |
| 10396 if (State & LANGMAP) | |
| 10397 { | |
| 10398 # ifdef FEAT_ARABIC | |
| 10399 if (curwin->w_p_arab) | |
| 10400 MSG_PUTS_ATTR(_(" Arabic"), attr); | |
| 10401 else | |
| 10402 # endif | |
|
9645
123d3c102035
commit https://github.com/vim/vim/commit/73ac0c4281a3606651604a3cbcc334bfb3859a87
Christian Brabandt <cb@256bit.org>
parents:
9489
diff
changeset
|
10403 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
|
10404 NameBuff, MAXPATHL)) |
|
123d3c102035
commit https://github.com/vim/vim/commit/73ac0c4281a3606651604a3cbcc334bfb3859a87
Christian Brabandt <cb@256bit.org>
parents:
9489
diff
changeset
|
10405 MSG_PUTS_ATTR(NameBuff, attr); |
| 7 | 10406 } |
| 10407 #endif | |
| 10408 if ((State & INSERT) && p_paste) | |
| 10409 MSG_PUTS_ATTR(_(" (paste)"), attr); | |
| 10410 | |
| 10411 if (VIsual_active) | |
| 10412 { | |
| 10413 char *p; | |
| 10414 | |
| 10415 /* Don't concatenate separate words to avoid translation | |
| 10416 * problems. */ | |
| 10417 switch ((VIsual_select ? 4 : 0) | |
| 10418 + (VIsual_mode == Ctrl_V) * 2 | |
| 10419 + (VIsual_mode == 'V')) | |
| 10420 { | |
| 10421 case 0: p = N_(" VISUAL"); break; | |
| 10422 case 1: p = N_(" VISUAL LINE"); break; | |
| 10423 case 2: p = N_(" VISUAL BLOCK"); break; | |
| 10424 case 4: p = N_(" SELECT"); break; | |
| 10425 case 5: p = N_(" SELECT LINE"); break; | |
| 10426 default: p = N_(" SELECT BLOCK"); break; | |
| 10427 } | |
| 10428 MSG_PUTS_ATTR(_(p), attr); | |
| 10429 } | |
| 10430 MSG_PUTS_ATTR(" --", attr); | |
| 10431 } | |
| 644 | 10432 |
| 7 | 10433 need_clear = TRUE; |
| 10434 } | |
| 10435 if (Recording | |
| 10436 #ifdef FEAT_INS_EXPAND | |
| 10437 && edit_submode == NULL /* otherwise it gets too long */ | |
| 10438 #endif | |
| 10439 ) | |
| 10440 { | |
|
7233
9487ea110214
commit https://github.com/vim/vim/commit/a0ed84a26897c994512873a895b9fc54e90c6845
Christian Brabandt <cb@256bit.org>
parents:
7208
diff
changeset
|
10441 recording_mode(attr); |
| 7 | 10442 need_clear = TRUE; |
| 10443 } | |
| 644 | 10444 |
| 10445 mode_displayed = TRUE; | |
| 7 | 10446 if (need_clear || clear_cmdline) |
| 10447 msg_clr_eos(); | |
| 10448 msg_didout = FALSE; /* overwrite this message */ | |
| 10449 length = msg_col; | |
| 10450 msg_col = 0; | |
| 10451 need_wait_return = nwr_save; /* never ask for hit-return for this */ | |
| 10452 } | |
| 10453 else if (clear_cmdline && msg_silent == 0) | |
| 10454 /* Clear the whole command line. Will reset "clear_cmdline". */ | |
| 10455 msg_clr_cmdline(); | |
| 10456 | |
| 10457 #ifdef FEAT_CMDL_INFO | |
| 10458 /* In Visual mode the size of the selected area must be redrawn. */ | |
| 10459 if (VIsual_active) | |
| 10460 clear_showcmd(); | |
| 10461 | |
| 10462 /* If the last window has no status line, the ruler is after the mode | |
| 10463 * message and must be redrawn */ | |
| 10464 if (redrawing() | |
| 10465 # ifdef FEAT_WINDOWS | |
| 10466 && lastwin->w_status_height == 0 | |
| 10467 # endif | |
| 10468 ) | |
| 10469 win_redr_ruler(lastwin, TRUE); | |
| 10470 #endif | |
| 10471 redraw_cmdline = FALSE; | |
| 10472 clear_cmdline = FALSE; | |
| 10473 | |
| 10474 return length; | |
| 10475 } | |
| 10476 | |
| 10477 /* | |
| 10478 * Position for a mode message. | |
| 10479 */ | |
| 10480 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
10481 msg_pos_mode(void) |
| 7 | 10482 { |
| 10483 msg_col = 0; | |
| 10484 msg_row = Rows - 1; | |
| 10485 } | |
| 10486 | |
| 10487 /* | |
| 10488 * Delete mode message. Used when ESC is typed which is expected to end | |
| 10489 * Insert mode (but Insert mode didn't end yet!). | |
| 644 | 10490 * Caller should check "mode_displayed". |
| 7 | 10491 */ |
| 10492 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
10493 unshowmode(int force) |
| 7 | 10494 { |
| 10495 /* | |
|
2055
4aa4510d548c
updated for version 7.2.341
Bram Moolenaar <bram@zimbu.org>
parents:
2008
diff
changeset
|
10496 * Don't delete it right now, when not redrawing or inside a mapping. |
| 7 | 10497 */ |
| 10498 if (!redrawing() || (!force && char_avail() && !KeyTyped)) | |
| 10499 redraw_cmdline = TRUE; /* delete mode later */ | |
| 10500 else | |
|
8817
b7eb7bbd71d0
commit https://github.com/vim/vim/commit/fd773e9e88add7d1ffef890fb9f3a00d613b4326
Christian Brabandt <cb@256bit.org>
parents:
8643
diff
changeset
|
10501 clearmode(); |
|
b7eb7bbd71d0
commit https://github.com/vim/vim/commit/fd773e9e88add7d1ffef890fb9f3a00d613b4326
Christian Brabandt <cb@256bit.org>
parents:
8643
diff
changeset
|
10502 } |
|
b7eb7bbd71d0
commit https://github.com/vim/vim/commit/fd773e9e88add7d1ffef890fb9f3a00d613b4326
Christian Brabandt <cb@256bit.org>
parents:
8643
diff
changeset
|
10503 |
|
b7eb7bbd71d0
commit https://github.com/vim/vim/commit/fd773e9e88add7d1ffef890fb9f3a00d613b4326
Christian Brabandt <cb@256bit.org>
parents:
8643
diff
changeset
|
10504 /* |
|
b7eb7bbd71d0
commit https://github.com/vim/vim/commit/fd773e9e88add7d1ffef890fb9f3a00d613b4326
Christian Brabandt <cb@256bit.org>
parents:
8643
diff
changeset
|
10505 * Clear the mode message. |
|
b7eb7bbd71d0
commit https://github.com/vim/vim/commit/fd773e9e88add7d1ffef890fb9f3a00d613b4326
Christian Brabandt <cb@256bit.org>
parents:
8643
diff
changeset
|
10506 */ |
|
b7eb7bbd71d0
commit https://github.com/vim/vim/commit/fd773e9e88add7d1ffef890fb9f3a00d613b4326
Christian Brabandt <cb@256bit.org>
parents:
8643
diff
changeset
|
10507 void |
|
9282
9f97a6290c63
commit https://github.com/vim/vim/commit/cf089463492fab53b2a5d81517829d22f882f82e
Christian Brabandt <cb@256bit.org>
parents:
9213
diff
changeset
|
10508 clearmode(void) |
|
8817
b7eb7bbd71d0
commit https://github.com/vim/vim/commit/fd773e9e88add7d1ffef890fb9f3a00d613b4326
Christian Brabandt <cb@256bit.org>
parents:
8643
diff
changeset
|
10509 { |
|
b7eb7bbd71d0
commit https://github.com/vim/vim/commit/fd773e9e88add7d1ffef890fb9f3a00d613b4326
Christian Brabandt <cb@256bit.org>
parents:
8643
diff
changeset
|
10510 msg_pos_mode(); |
|
b7eb7bbd71d0
commit https://github.com/vim/vim/commit/fd773e9e88add7d1ffef890fb9f3a00d613b4326
Christian Brabandt <cb@256bit.org>
parents:
8643
diff
changeset
|
10511 if (Recording) |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
10512 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
|
10513 msg_clr_eos(); |
| 7 | 10514 } |
| 10515 | |
|
7233
9487ea110214
commit https://github.com/vim/vim/commit/a0ed84a26897c994512873a895b9fc54e90c6845
Christian Brabandt <cb@256bit.org>
parents:
7208
diff
changeset
|
10516 static void |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
10517 recording_mode(int attr) |
|
7233
9487ea110214
commit https://github.com/vim/vim/commit/a0ed84a26897c994512873a895b9fc54e90c6845
Christian Brabandt <cb@256bit.org>
parents:
7208
diff
changeset
|
10518 { |
|
9487ea110214
commit https://github.com/vim/vim/commit/a0ed84a26897c994512873a895b9fc54e90c6845
Christian Brabandt <cb@256bit.org>
parents:
7208
diff
changeset
|
10519 MSG_PUTS_ATTR(_("recording"), attr); |
|
9487ea110214
commit https://github.com/vim/vim/commit/a0ed84a26897c994512873a895b9fc54e90c6845
Christian Brabandt <cb@256bit.org>
parents:
7208
diff
changeset
|
10520 if (!shortmess(SHM_RECORDING)) |
|
9487ea110214
commit https://github.com/vim/vim/commit/a0ed84a26897c994512873a895b9fc54e90c6845
Christian Brabandt <cb@256bit.org>
parents:
7208
diff
changeset
|
10521 { |
|
9487ea110214
commit https://github.com/vim/vim/commit/a0ed84a26897c994512873a895b9fc54e90c6845
Christian Brabandt <cb@256bit.org>
parents:
7208
diff
changeset
|
10522 char_u s[4]; |
|
9487ea110214
commit https://github.com/vim/vim/commit/a0ed84a26897c994512873a895b9fc54e90c6845
Christian Brabandt <cb@256bit.org>
parents:
7208
diff
changeset
|
10523 sprintf((char *)s, " @%c", Recording); |
|
9487ea110214
commit https://github.com/vim/vim/commit/a0ed84a26897c994512873a895b9fc54e90c6845
Christian Brabandt <cb@256bit.org>
parents:
7208
diff
changeset
|
10524 MSG_PUTS_ATTR(s, attr); |
|
9487ea110214
commit https://github.com/vim/vim/commit/a0ed84a26897c994512873a895b9fc54e90c6845
Christian Brabandt <cb@256bit.org>
parents:
7208
diff
changeset
|
10525 } |
|
9487ea110214
commit https://github.com/vim/vim/commit/a0ed84a26897c994512873a895b9fc54e90c6845
Christian Brabandt <cb@256bit.org>
parents:
7208
diff
changeset
|
10526 } |
|
9487ea110214
commit https://github.com/vim/vim/commit/a0ed84a26897c994512873a895b9fc54e90c6845
Christian Brabandt <cb@256bit.org>
parents:
7208
diff
changeset
|
10527 |
| 667 | 10528 #if defined(FEAT_WINDOWS) |
| 10529 /* | |
| 10530 * Draw the tab pages line at the top of the Vim window. | |
| 10531 */ | |
| 10532 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
10533 draw_tabline(void) |
| 667 | 10534 { |
| 10535 int tabcount = 0; | |
| 10536 tabpage_T *tp; | |
| 10537 int tabwidth; | |
| 10538 int col = 0; | |
| 673 | 10539 int scol = 0; |
| 667 | 10540 int attr; |
| 10541 win_T *wp; | |
| 671 | 10542 win_T *cwp; |
| 10543 int wincount; | |
| 10544 int modified; | |
| 667 | 10545 int c; |
| 10546 int len; | |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
10547 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
|
10548 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
|
10549 int attr_fill = HL_ATTR(HLF_TPF); |
| 673 | 10550 char_u *p; |
| 677 | 10551 int room; |
| 10552 int use_sep_chars = (t_colors < 8 | |
| 10553 #ifdef FEAT_GUI | |
| 10554 && !gui.in_use | |
| 10555 #endif | |
|
9027
773d627cac0b
commit https://github.com/vim/vim/commit/61be73bb0f965a895bfb064ea3e55476ac175162
Christian Brabandt <cb@256bit.org>
parents:
8977
diff
changeset
|
10556 #ifdef FEAT_TERMGUICOLORS |
|
773d627cac0b
commit https://github.com/vim/vim/commit/61be73bb0f965a895bfb064ea3e55476ac175162
Christian Brabandt <cb@256bit.org>
parents:
8977
diff
changeset
|
10557 && !p_tgc |
|
8969
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
10558 #endif |
| 677 | 10559 ); |
| 673 | 10560 |
|
10538
c7f671dfd735
patch 8.0.0159: crash on startup when updating tabline
Christian Brabandt <cb@256bit.org>
parents:
10466
diff
changeset
|
10561 if (ScreenLines == NULL) |
|
c7f671dfd735
patch 8.0.0159: crash on startup when updating tabline
Christian Brabandt <cb@256bit.org>
parents:
10466
diff
changeset
|
10562 return; |
| 673 | 10563 redraw_tabline = FALSE; |
| 667 | 10564 |
| 685 | 10565 #ifdef FEAT_GUI_TABLINE |
| 798 | 10566 /* Take care of a GUI tabline. */ |
| 685 | 10567 if (gui_use_tabline()) |
| 10568 { | |
| 10569 gui_update_tabline(); | |
| 10570 return; | |
| 10571 } | |
| 10572 #endif | |
| 10573 | |
| 10574 if (tabline_height() < 1) | |
| 667 | 10575 return; |
| 10576 | |
| 677 | 10577 #if defined(FEAT_STL_OPT) |
| 681 | 10578 |
| 10579 /* Init TabPageIdxs[] to zero: Clicking outside of tabs has no effect. */ | |
| 10580 for (scol = 0; scol < Columns; ++scol) | |
| 10581 TabPageIdxs[scol] = 0; | |
| 10582 | |
| 677 | 10583 /* Use the 'tabline' option if it's set. */ |
| 10584 if (*p_tal != NUL) | |
| 10585 { | |
|
8872
4d4de770f970
commit https://github.com/vim/vim/commit/f73d3bc253fa79ad220f52f04b93e782e95a9d43
Christian Brabandt <cb@256bit.org>
parents:
8847
diff
changeset
|
10586 int saved_did_emsg = did_emsg; |
| 680 | 10587 |
| 10588 /* Check for an error. If there is one we would loop in redrawing the | |
| 10589 * 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
|
10590 did_emsg = FALSE; |
| 677 | 10591 win_redr_custom(NULL, FALSE); |
|
8872
4d4de770f970
commit https://github.com/vim/vim/commit/f73d3bc253fa79ad220f52f04b93e782e95a9d43
Christian Brabandt <cb@256bit.org>
parents:
8847
diff
changeset
|
10592 if (did_emsg) |
| 680 | 10593 set_string_option_direct((char_u *)"tabline", -1, |
| 694 | 10594 (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
|
10595 did_emsg |= saved_did_emsg; |
| 680 | 10596 } |
| 10597 else | |
| 10598 #endif | |
| 10599 { | |
|
9649
fd9727ae3c49
commit https://github.com/vim/vim/commit/2932359000b2f918d5fade79ea4d124d5943cd07
Christian Brabandt <cb@256bit.org>
parents:
9645
diff
changeset
|
10600 FOR_ALL_TABPAGES(tp) |
| 680 | 10601 ++tabcount; |
| 10602 | |
| 10603 tabwidth = (Columns - 1 + tabcount / 2) / tabcount; | |
| 10604 if (tabwidth < 6) | |
| 10605 tabwidth = 6; | |
| 10606 | |
| 10607 attr = attr_nosel; | |
| 10608 tabcount = 0; | |
| 681 | 10609 scol = 0; |
| 699 | 10610 for (tp = first_tabpage; tp != NULL && col < Columns - 4; |
| 10611 tp = tp->tp_next) | |
| 680 | 10612 { |
| 10613 scol = col; | |
| 10614 | |
| 10615 if (tp->tp_topframe == topframe) | |
| 10616 attr = attr_sel; | |
| 10617 if (use_sep_chars && col > 0) | |
| 10618 screen_putchar('|', 0, col++, attr); | |
| 10619 | |
| 10620 if (tp->tp_topframe != topframe) | |
| 10621 attr = attr_nosel; | |
| 10622 | |
| 10623 screen_putchar(' ', 0, col++, attr); | |
| 10624 | |
| 10625 if (tp == curtab) | |
| 10626 { | |
| 10627 cwp = curwin; | |
| 10628 wp = firstwin; | |
| 10629 } | |
| 10630 else | |
| 10631 { | |
| 10632 cwp = tp->tp_curwin; | |
| 10633 wp = tp->tp_firstwin; | |
| 10634 } | |
| 10635 | |
| 10636 modified = FALSE; | |
| 10637 for (wincount = 0; wp != NULL; wp = wp->w_next, ++wincount) | |
| 10638 if (bufIsChanged(wp->w_buffer)) | |
| 10639 modified = TRUE; | |
| 10640 if (modified || wincount > 1) | |
| 10641 { | |
| 10642 if (wincount > 1) | |
| 10643 { | |
| 10644 vim_snprintf((char *)NameBuff, MAXPATHL, "%d", wincount); | |
| 835 | 10645 len = (int)STRLEN(NameBuff); |
| 699 | 10646 if (col + len >= Columns - 3) |
| 10647 break; | |
| 680 | 10648 screen_puts_len(NameBuff, len, 0, col, |
| 677 | 10649 #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
|
10650 hl_combine_attr(attr, HL_ATTR(HLF_T)) |
| 677 | 10651 #else |
| 6106 | 10652 attr |
| 680 | 10653 #endif |
| 10654 ); | |
| 10655 col += len; | |
| 10656 } | |
| 10657 if (modified) | |
| 10658 screen_puts_len((char_u *)"+", 1, 0, col++, attr); | |
| 10659 screen_putchar(' ', 0, col++, attr); | |
| 10660 } | |
| 10661 | |
| 10662 room = scol - col + tabwidth - 1; | |
| 10663 if (room > 0) | |
| 10664 { | |
| 685 | 10665 /* Get buffer name in NameBuff[] */ |
| 10666 get_trans_bufname(cwp->w_buffer); | |
| 819 | 10667 shorten_dir(NameBuff); |
| 680 | 10668 len = vim_strsize(NameBuff); |
| 10669 p = NameBuff; | |
| 677 | 10670 #ifdef FEAT_MBYTE |
| 680 | 10671 if (has_mbyte) |
| 10672 while (len > room) | |
| 10673 { | |
| 10674 len -= ptr2cells(p); | |
|
11127
506f5d8b7d8b
patch 8.0.0451: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11121
diff
changeset
|
10675 MB_PTR_ADV(p); |
| 680 | 10676 } |
| 10677 else | |
| 10678 #endif | |
| 10679 if (len > room) | |
| 677 | 10680 { |
| 680 | 10681 p += len - room; |
| 10682 len = room; | |
| 677 | 10683 } |
| 699 | 10684 if (len > Columns - col - 1) |
| 10685 len = Columns - col - 1; | |
| 680 | 10686 |
| 835 | 10687 screen_puts_len(p, (int)STRLEN(p), 0, col, attr); |
| 680 | 10688 col += len; |
| 10689 } | |
| 10690 screen_putchar(' ', 0, col++, attr); | |
| 10691 | |
| 10692 /* Store the tab page number in TabPageIdxs[], so that | |
| 10693 * jump_to_mouse() knows where each one is. */ | |
| 10694 ++tabcount; | |
| 10695 while (scol < col) | |
| 10696 TabPageIdxs[scol++] = tabcount; | |
| 10697 } | |
| 10698 | |
| 10699 if (use_sep_chars) | |
| 10700 c = '_'; | |
| 10701 else | |
| 10702 c = ' '; | |
| 10703 screen_fill(0, 1, col, (int)Columns, c, c, attr_fill); | |
| 681 | 10704 |
| 10705 /* Put an "X" for closing the current tab if there are several. */ | |
| 10706 if (first_tabpage->tp_next != NULL) | |
| 10707 { | |
| 10708 screen_putchar('X', 0, (int)Columns - 1, attr_nosel); | |
| 10709 TabPageIdxs[Columns - 1] = -999; | |
| 10710 } | |
| 10711 } | |
| 834 | 10712 |
| 10713 /* Reset the flag here again, in case evaluating 'tabline' causes it to be | |
| 10714 * set. */ | |
| 10715 redraw_tabline = FALSE; | |
| 667 | 10716 } |
| 685 | 10717 |
| 10718 /* | |
| 10719 * Get buffer name for "buf" into NameBuff[]. | |
| 10720 * Takes care of special buffer names and translates special characters. | |
| 10721 */ | |
| 10722 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
10723 get_trans_bufname(buf_T *buf) |
| 685 | 10724 { |
| 10725 if (buf_spname(buf) != NULL) | |
| 3839 | 10726 vim_strncpy(NameBuff, buf_spname(buf), MAXPATHL - 1); |
| 685 | 10727 else |
| 10728 home_replace(buf, buf->b_fname, NameBuff, MAXPATHL, TRUE); | |
| 10729 trans_characters(NameBuff, MAXPATHL); | |
| 10730 } | |
| 667 | 10731 #endif |
| 10732 | |
| 7 | 10733 #if defined(FEAT_WINDOWS) || defined(FEAT_WILDMENU) || defined(FEAT_STL_OPT) |
| 10734 /* | |
| 10735 * Get the character to use in a status line. Get its attributes in "*attr". | |
| 10736 */ | |
| 10737 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
|
10738 fillchar_status(int *attr, win_T *wp) |
| 7 | 10739 { |
| 10740 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
|
10741 |
|
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
|
10742 #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
|
10743 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
|
10744 { |
|
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
|
10745 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
|
10746 { |
|
68c593f649d1
patch 8.0.0941: existing color schemes don't like StatusLineTerm
Christian Brabandt <cb@256bit.org>
parents:
12114
diff
changeset
|
10747 *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
|
10748 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
|
10749 } |
|
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
|
10750 else |
|
12122
68c593f649d1
patch 8.0.0941: existing color schemes don't like StatusLineTerm
Christian Brabandt <cb@256bit.org>
parents:
12114
diff
changeset
|
10751 { |
|
68c593f649d1
patch 8.0.0941: existing color schemes don't like StatusLineTerm
Christian Brabandt <cb@256bit.org>
parents:
12114
diff
changeset
|
10752 *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
|
10753 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
|
10754 } |
|
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
|
10755 } |
|
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
|
10756 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
|
10757 #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
|
10758 if (wp == curwin) |
| 7 | 10759 { |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
10760 *attr = HL_ATTR(HLF_S); |
| 7 | 10761 fill = fill_stl; |
| 10762 } | |
| 10763 else | |
| 10764 { | |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
10765 *attr = HL_ATTR(HLF_SNC); |
| 7 | 10766 fill = fill_stlnc; |
| 10767 } | |
| 10768 /* Use fill when there is highlighting, and highlighting of current | |
| 10769 * window differs, or the fillchars differ, or this is not the | |
| 10770 * current window */ | |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
10771 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
|
10772 || wp != curwin || ONE_WINDOW) |
| 7 | 10773 || (fill_stl != fill_stlnc))) |
| 10774 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
|
10775 if (wp == curwin) |
| 7 | 10776 return '^'; |
| 10777 return '='; | |
| 10778 } | |
| 10779 #endif | |
| 10780 | |
|
8643
24b43dd167eb
commit https://github.com/vim/vim/commit/44a2f923c00f1384c9ecde12fb5b4711bc20702e
Christian Brabandt <cb@256bit.org>
parents:
8627
diff
changeset
|
10781 #ifdef FEAT_WINDOWS |
| 7 | 10782 /* |
| 10783 * Get the character to use in a separator between vertically split windows. | |
| 10784 * Get its attributes in "*attr". | |
| 10785 */ | |
| 10786 static int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
10787 fillchar_vsep(int *attr) |
| 7 | 10788 { |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
10789 *attr = HL_ATTR(HLF_C); |
| 7 | 10790 if (*attr == 0 && fill_vert == ' ') |
| 10791 return '|'; | |
| 10792 else | |
| 10793 return fill_vert; | |
| 10794 } | |
| 10795 #endif | |
| 10796 | |
| 10797 /* | |
| 10798 * Return TRUE if redrawing should currently be done. | |
| 10799 */ | |
| 10800 int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
10801 redrawing(void) |
| 7 | 10802 { |
|
11105
7c7e496e625d
patch 8.0.0440: not enough test coverage in Insert mode
Christian Brabandt <cb@256bit.org>
parents:
11010
diff
changeset
|
10803 #ifdef FEAT_EVAL |
|
7c7e496e625d
patch 8.0.0440: not enough test coverage in Insert mode
Christian Brabandt <cb@256bit.org>
parents:
11010
diff
changeset
|
10804 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
|
10805 return 0; |
|
7c7e496e625d
patch 8.0.0440: not enough test coverage in Insert mode
Christian Brabandt <cb@256bit.org>
parents:
11010
diff
changeset
|
10806 else |
|
7c7e496e625d
patch 8.0.0440: not enough test coverage in Insert mode
Christian Brabandt <cb@256bit.org>
parents:
11010
diff
changeset
|
10807 #endif |
|
7c7e496e625d
patch 8.0.0440: not enough test coverage in Insert mode
Christian Brabandt <cb@256bit.org>
parents:
11010
diff
changeset
|
10808 return (!RedrawingDisabled |
| 7 | 10809 && !(p_lz && char_avail() && !KeyTyped && !do_redraw)); |
| 10810 } | |
| 10811 | |
| 10812 /* | |
| 10813 * Return TRUE if printing messages should currently be done. | |
| 10814 */ | |
| 10815 int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
10816 messaging(void) |
| 7 | 10817 { |
| 10818 return (!(p_lz && char_avail() && !KeyTyped)); | |
| 10819 } | |
| 10820 | |
| 10821 /* | |
| 10822 * Show current status info in ruler and various other places | |
| 10823 * If always is FALSE, only show ruler if position has changed. | |
| 10824 */ | |
| 10825 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
10826 showruler(int always) |
| 7 | 10827 { |
| 10828 if (!always && !redrawing()) | |
| 10829 return; | |
| 574 | 10830 #ifdef FEAT_INS_EXPAND |
| 10831 if (pum_visible()) | |
| 10832 { | |
| 639 | 10833 # ifdef FEAT_WINDOWS |
| 574 | 10834 /* Don't redraw right now, do it later. */ |
| 10835 curwin->w_redr_status = TRUE; | |
| 639 | 10836 # endif |
| 574 | 10837 return; |
| 10838 } | |
| 10839 #endif | |
| 7 | 10840 #if defined(FEAT_STL_OPT) && defined(FEAT_WINDOWS) |
| 40 | 10841 if ((*p_stl != NUL || *curwin->w_p_stl != NUL) && curwin->w_status_height) |
| 680 | 10842 { |
| 1983 | 10843 redraw_custom_statusline(curwin); |
| 680 | 10844 } |
| 7 | 10845 else |
| 10846 #endif | |
| 10847 #ifdef FEAT_CMDL_INFO | |
| 10848 win_redr_ruler(curwin, always); | |
| 10849 #endif | |
| 10850 | |
| 10851 #ifdef FEAT_TITLE | |
| 10852 if (need_maketitle | |
| 10853 # ifdef FEAT_STL_OPT | |
| 10854 || (p_icon && (stl_syntax & STL_IN_ICON)) | |
| 10855 || (p_title && (stl_syntax & STL_IN_TITLE)) | |
| 10856 # endif | |
| 10857 ) | |
| 10858 maketitle(); | |
| 10859 #endif | |
| 1588 | 10860 #ifdef FEAT_WINDOWS |
| 10861 /* Redraw the tab pages line if needed. */ | |
| 10862 if (redraw_tabline) | |
| 10863 draw_tabline(); | |
| 10864 #endif | |
| 7 | 10865 } |
| 10866 | |
| 10867 #ifdef FEAT_CMDL_INFO | |
| 10868 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
10869 win_redr_ruler(win_T *wp, int always) |
| 7 | 10870 { |
| 1869 | 10871 #define RULER_BUF_LEN 70 |
| 10872 char_u buffer[RULER_BUF_LEN]; | |
| 7 | 10873 int row; |
| 10874 int fillchar; | |
| 10875 int attr; | |
| 10876 int empty_line = FALSE; | |
| 10877 colnr_T virtcol; | |
| 10878 int i; | |
| 1869 | 10879 size_t len; |
| 7 | 10880 int o; |
|
8643
24b43dd167eb
commit https://github.com/vim/vim/commit/44a2f923c00f1384c9ecde12fb5b4711bc20702e
Christian Brabandt <cb@256bit.org>
parents:
8627
diff
changeset
|
10881 #ifdef FEAT_WINDOWS |
| 7 | 10882 int this_ru_col; |
| 10883 int off = 0; | |
| 10884 int width = Columns; | |
| 10885 # define WITH_OFF(x) x | |
| 10886 # define WITH_WIDTH(x) x | |
| 10887 #else | |
| 10888 # define WITH_OFF(x) 0 | |
| 10889 # define WITH_WIDTH(x) Columns | |
| 10890 # define this_ru_col ru_col | |
| 10891 #endif | |
| 10892 | |
| 10893 /* If 'ruler' off or redrawing disabled, don't do anything */ | |
| 10894 if (!p_ru) | |
| 10895 return; | |
| 10896 | |
| 10897 /* | |
| 10898 * Check if cursor.lnum is valid, since win_redr_ruler() may be called | |
| 10899 * after deleting lines, before cursor.lnum is corrected. | |
| 10900 */ | |
| 10901 if (wp->w_cursor.lnum > wp->w_buffer->b_ml.ml_line_count) | |
| 10902 return; | |
| 10903 | |
| 10904 #ifdef FEAT_INS_EXPAND | |
| 10905 /* Don't draw the ruler while doing insert-completion, it might overwrite | |
| 10906 * the (long) mode message. */ | |
| 10907 # ifdef FEAT_WINDOWS | |
| 10908 if (wp == lastwin && lastwin->w_status_height == 0) | |
| 10909 # endif | |
| 10910 if (edit_submode != NULL) | |
| 10911 return; | |
| 540 | 10912 /* Don't draw the ruler when the popup menu is visible, it may overlap. */ |
| 10913 if (pum_visible()) | |
| 10914 return; | |
| 7 | 10915 #endif |
| 10916 | |
| 10917 #ifdef FEAT_STL_OPT | |
| 10918 if (*p_ruf) | |
| 10919 { | |
| 680 | 10920 int save_called_emsg = called_emsg; |
| 10921 | |
| 10922 called_emsg = FALSE; | |
| 7 | 10923 win_redr_custom(wp, TRUE); |
| 680 | 10924 if (called_emsg) |
| 10925 set_string_option_direct((char_u *)"rulerformat", -1, | |
| 694 | 10926 (char_u *)"", OPT_FREE, SID_ERROR); |
| 680 | 10927 called_emsg |= save_called_emsg; |
| 7 | 10928 return; |
| 10929 } | |
| 10930 #endif | |
| 10931 | |
| 10932 /* | |
| 10933 * Check if not in Insert mode and the line is empty (will show "0-1"). | |
| 10934 */ | |
| 10935 if (!(State & INSERT) | |
| 10936 && *ml_get_buf(wp->w_buffer, wp->w_cursor.lnum, FALSE) == NUL) | |
| 10937 empty_line = TRUE; | |
| 10938 | |
| 10939 /* | |
| 10940 * Only draw the ruler when something changed. | |
| 10941 */ | |
| 10942 validate_virtcol_win(wp); | |
| 10943 if ( redraw_cmdline | |
| 10944 || always | |
| 10945 || wp->w_cursor.lnum != wp->w_ru_cursor.lnum | |
| 10946 || wp->w_cursor.col != wp->w_ru_cursor.col | |
| 10947 || wp->w_virtcol != wp->w_ru_virtcol | |
| 10948 #ifdef FEAT_VIRTUALEDIT | |
| 10949 || wp->w_cursor.coladd != wp->w_ru_cursor.coladd | |
| 10950 #endif | |
| 10951 || wp->w_topline != wp->w_ru_topline | |
| 10952 || wp->w_buffer->b_ml.ml_line_count != wp->w_ru_line_count | |
| 10953 #ifdef FEAT_DIFF | |
| 10954 || wp->w_topfill != wp->w_ru_topfill | |
| 10955 #endif | |
| 10956 || empty_line != wp->w_ru_empty) | |
| 10957 { | |
| 10958 cursor_off(); | |
| 10959 #ifdef FEAT_WINDOWS | |
| 10960 if (wp->w_status_height) | |
| 10961 { | |
| 10962 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
|
10963 fillchar = fillchar_status(&attr, wp); |
| 7 | 10964 off = W_WINCOL(wp); |
| 10965 width = W_WIDTH(wp); | |
| 10966 } | |
| 10967 else | |
| 10968 #endif | |
| 10969 { | |
| 10970 row = Rows - 1; | |
| 10971 fillchar = ' '; | |
| 10972 attr = 0; | |
|
8643
24b43dd167eb
commit https://github.com/vim/vim/commit/44a2f923c00f1384c9ecde12fb5b4711bc20702e
Christian Brabandt <cb@256bit.org>
parents:
8627
diff
changeset
|
10973 #ifdef FEAT_WINDOWS |
| 7 | 10974 width = Columns; |
| 10975 off = 0; | |
| 10976 #endif | |
| 10977 } | |
| 10978 | |
| 10979 /* In list mode virtcol needs to be recomputed */ | |
| 10980 virtcol = wp->w_virtcol; | |
| 10981 if (wp->w_p_list && lcs_tab1 == NUL) | |
| 10982 { | |
| 10983 wp->w_p_list = FALSE; | |
| 10984 getvvcol(wp, &wp->w_cursor, NULL, &virtcol, NULL); | |
| 10985 wp->w_p_list = TRUE; | |
| 10986 } | |
| 10987 | |
| 10988 /* | |
| 10989 * Some sprintfs return the length, some return a pointer. | |
| 10990 * To avoid portability problems we use strlen() here. | |
| 10991 */ | |
| 1869 | 10992 vim_snprintf((char *)buffer, RULER_BUF_LEN, "%ld,", |
| 7 | 10993 (wp->w_buffer->b_ml.ml_flags & ML_EMPTY) |
| 10994 ? 0L | |
| 10995 : (long)(wp->w_cursor.lnum)); | |
| 1869 | 10996 len = STRLEN(buffer); |
| 10997 col_print(buffer + len, RULER_BUF_LEN - len, | |
| 7 | 10998 empty_line ? 0 : (int)wp->w_cursor.col + 1, |
| 10999 (int)virtcol + 1); | |
| 11000 | |
| 11001 /* | |
| 11002 * Add a "50%" if there is room for it. | |
| 11003 * On the last line, don't print in the last column (scrolls the | |
| 11004 * screen up on some terminals). | |
| 11005 */ | |
| 11006 i = (int)STRLEN(buffer); | |
| 1869 | 11007 get_rel_pos(wp, buffer + i + 1, RULER_BUF_LEN - i - 1); |
| 7 | 11008 o = i + vim_strsize(buffer + i + 1); |
| 11009 #ifdef FEAT_WINDOWS | |
| 11010 if (wp->w_status_height == 0) /* can't use last char of screen */ | |
| 11011 #endif | |
| 11012 ++o; | |
|
8643
24b43dd167eb
commit https://github.com/vim/vim/commit/44a2f923c00f1384c9ecde12fb5b4711bc20702e
Christian Brabandt <cb@256bit.org>
parents:
8627
diff
changeset
|
11013 #ifdef FEAT_WINDOWS |
| 7 | 11014 this_ru_col = ru_col - (Columns - width); |
| 11015 if (this_ru_col < 0) | |
| 11016 this_ru_col = 0; | |
| 11017 #endif | |
| 11018 /* Never use more than half the window/screen width, leave the other | |
| 11019 * half for the filename. */ | |
| 11020 if (this_ru_col < (WITH_WIDTH(width) + 1) / 2) | |
| 11021 this_ru_col = (WITH_WIDTH(width) + 1) / 2; | |
| 11022 if (this_ru_col + o < WITH_WIDTH(width)) | |
| 11023 { | |
| 6466 | 11024 /* need at least 3 chars left for get_rel_pos() + NUL */ |
| 11025 while (this_ru_col + o < WITH_WIDTH(width) && RULER_BUF_LEN > i + 4) | |
| 7 | 11026 { |
| 11027 #ifdef FEAT_MBYTE | |
| 11028 if (has_mbyte) | |
| 11029 i += (*mb_char2bytes)(fillchar, buffer + i); | |
| 11030 else | |
| 11031 #endif | |
| 11032 buffer[i++] = fillchar; | |
| 11033 ++o; | |
| 11034 } | |
| 1869 | 11035 get_rel_pos(wp, buffer + i, RULER_BUF_LEN - i); |
| 7 | 11036 } |
| 11037 /* Truncate at window boundary. */ | |
| 11038 #ifdef FEAT_MBYTE | |
| 11039 if (has_mbyte) | |
| 11040 { | |
| 11041 o = 0; | |
| 474 | 11042 for (i = 0; buffer[i] != NUL; i += (*mb_ptr2len)(buffer + i)) |
| 7 | 11043 { |
| 11044 o += (*mb_ptr2cells)(buffer + i); | |
| 11045 if (this_ru_col + o > WITH_WIDTH(width)) | |
| 11046 { | |
| 11047 buffer[i] = NUL; | |
| 11048 break; | |
| 11049 } | |
| 11050 } | |
| 11051 } | |
| 11052 else | |
| 11053 #endif | |
| 11054 if (this_ru_col + (int)STRLEN(buffer) > WITH_WIDTH(width)) | |
| 11055 buffer[WITH_WIDTH(width) - this_ru_col] = NUL; | |
| 11056 | |
| 11057 screen_puts(buffer, row, this_ru_col + WITH_OFF(off), attr); | |
| 11058 i = redraw_cmdline; | |
| 11059 screen_fill(row, row + 1, | |
| 11060 this_ru_col + WITH_OFF(off) + (int)STRLEN(buffer), | |
| 11061 (int)(WITH_OFF(off) + WITH_WIDTH(width)), | |
| 11062 fillchar, fillchar, attr); | |
| 11063 /* don't redraw the cmdline because of showing the ruler */ | |
| 11064 redraw_cmdline = i; | |
| 11065 wp->w_ru_cursor = wp->w_cursor; | |
| 11066 wp->w_ru_virtcol = wp->w_virtcol; | |
| 11067 wp->w_ru_empty = empty_line; | |
| 11068 wp->w_ru_topline = wp->w_topline; | |
| 11069 wp->w_ru_line_count = wp->w_buffer->b_ml.ml_line_count; | |
| 11070 #ifdef FEAT_DIFF | |
| 11071 wp->w_ru_topfill = wp->w_topfill; | |
| 11072 #endif | |
| 11073 } | |
| 11074 } | |
| 11075 #endif | |
| 13 | 11076 |
| 11077 #if defined(FEAT_LINEBREAK) || defined(PROTO) | |
| 11078 /* | |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
11079 * 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
|
11080 * Caller may need to check if 'number' or 'relativenumber' is set. |
| 13 | 11081 * Otherwise it depends on 'numberwidth' and the line count. |
| 11082 */ | |
| 11083 int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
11084 number_width(win_T *wp) |
| 13 | 11085 { |
| 11086 int n; | |
| 11087 linenr_T lnum; | |
| 11088 | |
|
4736
3f2319a953b3
updated for version 7.3.1115
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
11089 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
|
11090 /* cursor line shows "0" */ |
|
3f2319a953b3
updated for version 7.3.1115
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
11091 lnum = wp->w_height; |
|
3f2319a953b3
updated for version 7.3.1115
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
11092 else |
|
3f2319a953b3
updated for version 7.3.1115
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
11093 /* cursor line shows absolute line number */ |
|
3f2319a953b3
updated for version 7.3.1115
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
11094 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
|
11095 |
| 6679 | 11096 if (lnum == wp->w_nrwidth_line_count && wp->w_nuw_cached == wp->w_p_nuw) |
| 13 | 11097 return wp->w_nrwidth_width; |
| 11098 wp->w_nrwidth_line_count = lnum; | |
| 11099 | |
| 11100 n = 0; | |
| 11101 do | |
| 11102 { | |
| 856 | 11103 lnum /= 10; |
| 11104 ++n; | |
| 13 | 11105 } while (lnum > 0); |
| 11106 | |
| 11107 /* 'numberwidth' gives the minimal width plus one */ | |
| 11108 if (n < wp->w_p_nuw - 1) | |
| 11109 n = wp->w_p_nuw - 1; | |
| 11110 | |
| 11111 wp->w_nrwidth_width = n; | |
| 6679 | 11112 wp->w_nuw_cached = wp->w_p_nuw; |
| 13 | 11113 return n; |
| 11114 } | |
| 11115 #endif | |
| 3986 | 11116 |
| 11117 /* | |
| 11118 * Return the current cursor column. This is the actual position on the | |
| 11119 * screen. First column is 0. | |
| 11120 */ | |
| 11121 int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
11122 screen_screencol(void) |
| 3986 | 11123 { |
| 11124 return screen_cur_col; | |
| 11125 } | |
| 11126 | |
| 11127 /* | |
| 11128 * Return the current cursor row. This is the actual position on the screen. | |
| 11129 * First row is 0. | |
| 11130 */ | |
| 11131 int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
11132 screen_screenrow(void) |
| 3986 | 11133 { |
| 11134 return screen_cur_row; | |
| 11135 } |