Mercurial > vim
annotate src/screen.c @ 12122:68c593f649d1 v8.0.0941
patch 8.0.0941: existing color schemes don't like StatusLineTerm
commit https://github.com/vim/vim/commit/05fbfdcda48a564e7a778c67251f732481f3ceaa
Author: Bram Moolenaar <Bram@vim.org>
Date: Mon Aug 14 22:35:08 2017 +0200
patch 8.0.0941: existing color schemes don't like StatusLineTerm
Problem: Existing color schemes don't work well with StatusLineTerm.
Solution: Don't use "reverse", use fg and bg colors. Also add
StatusLineTermNC.
| author | Christian Brabandt <cb@256bit.org> |
|---|---|
| date | Mon, 14 Aug 2017 22:45:04 +0200 |
| parents | f306e6decaf9 |
| children | 69af108df70e |
| 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); |
|
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7697
diff
changeset
|
154 static void lineclear(unsigned off, int width); |
|
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 |
|
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7697
diff
changeset
|
160 static int win_do_lines(win_T *wp, int row, int line_count, int mayclear, int del); |
|
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. |
|
63dc856bd13d
commit https://github.com/vim/vim/commit/975b5271eed4fa0500c24a8f37be0b1797cb9db7
Christian Brabandt <cb@256bit.org>
parents:
8212
diff
changeset
|
448 */ |
|
63dc856bd13d
commit https://github.com/vim/vim/commit/975b5271eed4fa0500c24a8f37be0b1797cb9db7
Christian Brabandt <cb@256bit.org>
parents:
8212
diff
changeset
|
449 void |
|
9282
9f97a6290c63
commit https://github.com/vim/vim/commit/cf089463492fab53b2a5d81517829d22f882f82e
Christian Brabandt <cb@256bit.org>
parents:
9213
diff
changeset
|
450 redraw_after_callback(void) |
|
8577
63dc856bd13d
commit https://github.com/vim/vim/commit/975b5271eed4fa0500c24a8f37be0b1797cb9db7
Christian Brabandt <cb@256bit.org>
parents:
8212
diff
changeset
|
451 { |
|
11698
4f59d2a66bf7
patch 8.0.0732: when updating a buffer modeless selection is lost
Christian Brabandt <cb@256bit.org>
parents:
11672
diff
changeset
|
452 ++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
|
453 |
|
8627
7c98c5d0298c
commit https://github.com/vim/vim/commit/bfb96c047b79b2aab5fd57a2472871508819f3ef
Christian Brabandt <cb@256bit.org>
parents:
8577
diff
changeset
|
454 if (State == HITRETURN || State == ASKMORE) |
|
7c98c5d0298c
commit https://github.com/vim/vim/commit/bfb96c047b79b2aab5fd57a2472871508819f3ef
Christian Brabandt <cb@256bit.org>
parents:
8577
diff
changeset
|
455 ; /* do nothing */ |
|
7c98c5d0298c
commit https://github.com/vim/vim/commit/bfb96c047b79b2aab5fd57a2472871508819f3ef
Christian Brabandt <cb@256bit.org>
parents:
8577
diff
changeset
|
456 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
|
457 { |
|
11655
8014350fe51a
patch 8.0.0710: a job that writes to a buffer clears completion
Christian Brabandt <cb@256bit.org>
parents:
11607
diff
changeset
|
458 /* 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
|
459 * wildmenu entries. */ |
|
11657
a7cd2a53590c
patch 8.0.0711: cannot build without the wildmenu feature
Christian Brabandt <cb@256bit.org>
parents:
11655
diff
changeset
|
460 if (msg_scrolled == 0 |
|
a7cd2a53590c
patch 8.0.0711: cannot build without the wildmenu feature
Christian Brabandt <cb@256bit.org>
parents:
11655
diff
changeset
|
461 #ifdef FEAT_WILDMENU |
|
a7cd2a53590c
patch 8.0.0711: cannot build without the wildmenu feature
Christian Brabandt <cb@256bit.org>
parents:
11655
diff
changeset
|
462 && wild_menu_showing == 0 |
|
a7cd2a53590c
patch 8.0.0711: cannot build without the wildmenu feature
Christian Brabandt <cb@256bit.org>
parents:
11655
diff
changeset
|
463 #endif |
|
a7cd2a53590c
patch 8.0.0711: cannot build without the wildmenu feature
Christian Brabandt <cb@256bit.org>
parents:
11655
diff
changeset
|
464 ) |
|
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
|
465 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
|
466 /* 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
|
467 * 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
|
468 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
|
469 } |
|
9444
e08c8502d7ce
commit https://github.com/vim/vim/commit/144445d15f2369a58b94b6fee2fe162fc81c8abe
Christian Brabandt <cb@256bit.org>
parents:
9428
diff
changeset
|
470 else if (State & (NORMAL | INSERT)) |
|
8627
7c98c5d0298c
commit https://github.com/vim/vim/commit/bfb96c047b79b2aab5fd57a2472871508819f3ef
Christian Brabandt <cb@256bit.org>
parents:
8577
diff
changeset
|
471 { |
|
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
|
472 /* 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
|
473 update_screen(VALID_NO_UPDATE); |
|
8627
7c98c5d0298c
commit https://github.com/vim/vim/commit/bfb96c047b79b2aab5fd57a2472871508819f3ef
Christian Brabandt <cb@256bit.org>
parents:
8577
diff
changeset
|
474 setcursor(); |
|
7c98c5d0298c
commit https://github.com/vim/vim/commit/bfb96c047b79b2aab5fd57a2472871508819f3ef
Christian Brabandt <cb@256bit.org>
parents:
8577
diff
changeset
|
475 } |
|
8577
63dc856bd13d
commit https://github.com/vim/vim/commit/975b5271eed4fa0500c24a8f37be0b1797cb9db7
Christian Brabandt <cb@256bit.org>
parents:
8212
diff
changeset
|
476 cursor_on(); |
|
63dc856bd13d
commit https://github.com/vim/vim/commit/975b5271eed4fa0500c24a8f37be0b1797cb9db7
Christian Brabandt <cb@256bit.org>
parents:
8212
diff
changeset
|
477 out_flush(); |
|
63dc856bd13d
commit https://github.com/vim/vim/commit/975b5271eed4fa0500c24a8f37be0b1797cb9db7
Christian Brabandt <cb@256bit.org>
parents:
8212
diff
changeset
|
478 #ifdef FEAT_GUI |
|
63dc856bd13d
commit https://github.com/vim/vim/commit/975b5271eed4fa0500c24a8f37be0b1797cb9db7
Christian Brabandt <cb@256bit.org>
parents:
8212
diff
changeset
|
479 if (gui.in_use) |
|
63dc856bd13d
commit https://github.com/vim/vim/commit/975b5271eed4fa0500c24a8f37be0b1797cb9db7
Christian Brabandt <cb@256bit.org>
parents:
8212
diff
changeset
|
480 { |
|
9428
0c7f47088e55
commit https://github.com/vim/vim/commit/9d5d3c9c4468ad76f16b50eabd3d9e7eab2ed44d
Christian Brabandt <cb@256bit.org>
parents:
9320
diff
changeset
|
481 /* 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
|
482 * flicker. */ |
|
0c7f47088e55
commit https://github.com/vim/vim/commit/9d5d3c9c4468ad76f16b50eabd3d9e7eab2ed44d
Christian Brabandt <cb@256bit.org>
parents:
9320
diff
changeset
|
483 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
|
484 gui_update_cursor(FALSE, FALSE); |
|
8577
63dc856bd13d
commit https://github.com/vim/vim/commit/975b5271eed4fa0500c24a8f37be0b1797cb9db7
Christian Brabandt <cb@256bit.org>
parents:
8212
diff
changeset
|
485 gui_mch_flush(); |
|
63dc856bd13d
commit https://github.com/vim/vim/commit/975b5271eed4fa0500c24a8f37be0b1797cb9db7
Christian Brabandt <cb@256bit.org>
parents:
8212
diff
changeset
|
486 } |
|
63dc856bd13d
commit https://github.com/vim/vim/commit/975b5271eed4fa0500c24a8f37be0b1797cb9db7
Christian Brabandt <cb@256bit.org>
parents:
8212
diff
changeset
|
487 #endif |
|
11698
4f59d2a66bf7
patch 8.0.0732: when updating a buffer modeless selection is lost
Christian Brabandt <cb@256bit.org>
parents:
11672
diff
changeset
|
488 |
|
4f59d2a66bf7
patch 8.0.0732: when updating a buffer modeless selection is lost
Christian Brabandt <cb@256bit.org>
parents:
11672
diff
changeset
|
489 --redrawing_for_callback; |
|
8577
63dc856bd13d
commit https://github.com/vim/vim/commit/975b5271eed4fa0500c24a8f37be0b1797cb9db7
Christian Brabandt <cb@256bit.org>
parents:
8212
diff
changeset
|
490 } |
|
63dc856bd13d
commit https://github.com/vim/vim/commit/975b5271eed4fa0500c24a8f37be0b1797cb9db7
Christian Brabandt <cb@256bit.org>
parents:
8212
diff
changeset
|
491 |
|
63dc856bd13d
commit https://github.com/vim/vim/commit/975b5271eed4fa0500c24a8f37be0b1797cb9db7
Christian Brabandt <cb@256bit.org>
parents:
8212
diff
changeset
|
492 /* |
| 7 | 493 * Changed something in the current window, at buffer line "lnum", that |
| 494 * requires that line and possibly other lines to be redrawn. | |
| 495 * Used when entering/leaving Insert mode with the cursor on a folded line. | |
| 496 * Used to remove the "$" from a change command. | |
| 497 * Note that when also inserting/deleting lines w_redraw_top and w_redraw_bot | |
| 498 * may become invalid and the whole window will have to be redrawn. | |
| 499 */ | |
| 500 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
501 redrawWinline( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
502 linenr_T lnum, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
503 int invalid UNUSED) /* window line height is invalid now */ |
| 7 | 504 { |
| 505 #ifdef FEAT_FOLDING | |
| 506 int i; | |
| 507 #endif | |
| 508 | |
| 509 if (curwin->w_redraw_top == 0 || curwin->w_redraw_top > lnum) | |
| 510 curwin->w_redraw_top = lnum; | |
| 511 if (curwin->w_redraw_bot == 0 || curwin->w_redraw_bot < lnum) | |
| 512 curwin->w_redraw_bot = lnum; | |
| 513 redraw_later(VALID); | |
| 514 | |
| 515 #ifdef FEAT_FOLDING | |
| 516 if (invalid) | |
| 517 { | |
| 518 /* A w_lines[] entry for this lnum has become invalid. */ | |
| 519 i = find_wl_entry(curwin, lnum); | |
| 520 if (i >= 0) | |
| 521 curwin->w_lines[i].wl_valid = FALSE; | |
| 522 } | |
| 523 #endif | |
| 524 } | |
| 525 | |
| 526 /* | |
|
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
|
527 * Update all windows that are editing the current buffer. |
| 7 | 528 */ |
| 529 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
530 update_curbuf(int type) |
| 7 | 531 { |
| 532 redraw_curbuf_later(type); | |
| 533 update_screen(type); | |
| 534 } | |
| 535 | |
| 536 /* | |
| 537 * Based on the current value of curwin->w_topline, transfer a screenfull | |
| 538 * of stuff from Filemem to ScreenLines[], and update curwin->w_botline. | |
| 539 */ | |
| 540 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
|
541 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
|
542 { |
|
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 int type = type_arg; |
| 7 | 544 win_T *wp; |
| 545 static int did_intro = FALSE; | |
| 546 #if defined(FEAT_SEARCH_EXTRA) || defined(FEAT_CLIPBOARD) | |
| 547 int did_one; | |
| 548 #endif | |
|
9444
e08c8502d7ce
commit https://github.com/vim/vim/commit/144445d15f2369a58b94b6fee2fe162fc81c8abe
Christian Brabandt <cb@256bit.org>
parents:
9428
diff
changeset
|
549 #ifdef FEAT_GUI |
|
9848
664276833670
commit https://github.com/vim/vim/commit/107abd2ca53c31fd3bb40d77ff296e98eaae2975
Christian Brabandt <cb@256bit.org>
parents:
9754
diff
changeset
|
550 int did_undraw = FALSE; |
|
9444
e08c8502d7ce
commit https://github.com/vim/vim/commit/144445d15f2369a58b94b6fee2fe162fc81c8abe
Christian Brabandt <cb@256bit.org>
parents:
9428
diff
changeset
|
551 int gui_cursor_col; |
|
e08c8502d7ce
commit https://github.com/vim/vim/commit/144445d15f2369a58b94b6fee2fe162fc81c8abe
Christian Brabandt <cb@256bit.org>
parents:
9428
diff
changeset
|
552 int gui_cursor_row; |
|
e08c8502d7ce
commit https://github.com/vim/vim/commit/144445d15f2369a58b94b6fee2fe162fc81c8abe
Christian Brabandt <cb@256bit.org>
parents:
9428
diff
changeset
|
553 #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
|
554 int no_update = FALSE; |
| 7 | 555 |
| 2008 | 556 /* Don't do anything if the screen structures are (not yet) valid. */ |
| 7 | 557 if (!screen_valid(TRUE)) |
| 558 return; | |
| 559 | |
|
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
|
560 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
|
561 { |
|
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 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
|
563 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
|
564 } |
|
32aed0993813
patch 8.0.0592: if a job writes to a buffer screen is not updated
Christian Brabandt <cb@256bit.org>
parents:
11277
diff
changeset
|
565 |
| 7 | 566 if (must_redraw) |
| 567 { | |
| 568 if (type < must_redraw) /* use maximal type */ | |
| 569 type = must_redraw; | |
| 1331 | 570 |
| 571 /* must_redraw is reset here, so that when we run into some weird | |
| 572 * reason to redraw while busy redrawing (e.g., asynchronous | |
| 573 * scrolling), or update_topline() in win_update() will cause a | |
| 574 * scroll, the screen will be redrawn later or in win_update(). */ | |
| 7 | 575 must_redraw = 0; |
| 576 } | |
| 577 | |
| 578 /* Need to update w_lines[]. */ | |
| 579 if (curwin->w_lines_valid == 0 && type < NOT_VALID) | |
| 580 type = NOT_VALID; | |
| 581 | |
| 2008 | 582 /* Postpone the redrawing when it's not needed and when being called |
| 583 * recursively. */ | |
| 584 if (!redrawing() || updating_screen) | |
| 7 | 585 { |
| 586 redraw_later(type); /* remember type for next time */ | |
| 587 must_redraw = type; | |
| 588 if (type > INVERTED_ALL) | |
| 589 curwin->w_lines_valid = 0; /* don't use w_lines[].wl_size now */ | |
| 590 return; | |
| 591 } | |
| 592 | |
| 593 updating_screen = TRUE; | |
| 594 #ifdef FEAT_SYN_HL | |
| 595 ++display_tick; /* let syntax code know we're in a next round of | |
| 596 * display updating */ | |
| 597 #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
|
598 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
|
599 ++no_win_do_lines_ins; |
| 7 | 600 |
| 601 /* | |
| 602 * if the screen was scrolled up when displaying a message, scroll it down | |
| 603 */ | |
| 604 if (msg_scrolled) | |
| 605 { | |
| 606 clear_cmdline = TRUE; | |
| 607 if (msg_scrolled > Rows - 5) /* clearing is faster */ | |
| 608 type = CLEAR; | |
| 609 else if (type != CLEAR) | |
| 610 { | |
| 611 check_for_delay(FALSE); | |
| 612 if (screen_ins_lines(0, 0, msg_scrolled, (int)Rows, NULL) == FAIL) | |
| 613 type = CLEAR; | |
| 614 FOR_ALL_WINDOWS(wp) | |
| 615 { | |
| 616 if (W_WINROW(wp) < msg_scrolled) | |
| 617 { | |
| 618 if (W_WINROW(wp) + wp->w_height > msg_scrolled | |
| 619 && wp->w_redr_type < REDRAW_TOP | |
| 620 && wp->w_lines_valid > 0 | |
| 621 && wp->w_topline == wp->w_lines[0].wl_lnum) | |
| 622 { | |
| 623 wp->w_upd_rows = msg_scrolled - W_WINROW(wp); | |
| 624 wp->w_redr_type = REDRAW_TOP; | |
| 625 } | |
| 626 else | |
| 627 { | |
| 628 wp->w_redr_type = NOT_VALID; | |
| 629 #ifdef FEAT_WINDOWS | |
| 630 if (W_WINROW(wp) + wp->w_height + W_STATUS_HEIGHT(wp) | |
| 631 <= msg_scrolled) | |
| 632 wp->w_redr_status = TRUE; | |
| 633 #endif | |
| 634 } | |
| 635 } | |
| 636 } | |
|
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
|
637 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
|
638 redraw_cmdline = TRUE; |
| 667 | 639 #ifdef FEAT_WINDOWS |
| 673 | 640 redraw_tabline = TRUE; |
| 667 | 641 #endif |
| 7 | 642 } |
| 643 msg_scrolled = 0; | |
| 644 need_wait_return = FALSE; | |
| 645 } | |
| 646 | |
| 647 /* reset cmdline_row now (may have been changed temporarily) */ | |
| 648 compute_cmdrow(); | |
| 649 | |
| 650 /* Check for changed highlighting */ | |
| 651 if (need_highlight_changed) | |
| 652 highlight_changed(); | |
| 653 | |
| 654 if (type == CLEAR) /* first clear screen */ | |
| 655 { | |
| 656 screenclear(); /* will reset clear_cmdline */ | |
| 657 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
|
658 /* 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
|
659 must_redraw = 0; |
| 7 | 660 } |
| 661 | |
| 662 if (clear_cmdline) /* going to clear cmdline (done below) */ | |
| 663 check_for_delay(FALSE); | |
| 664 | |
| 13 | 665 #ifdef FEAT_LINEBREAK |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
666 /* 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
|
667 * changes. */ |
| 13 | 668 if (curwin->w_redr_type < NOT_VALID |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
669 && 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
|
670 ? number_width(curwin) : 0)) |
| 13 | 671 curwin->w_redr_type = NOT_VALID; |
| 672 #endif | |
| 673 | |
| 7 | 674 /* |
| 675 * Only start redrawing if there is really something to do. | |
| 676 */ | |
| 677 if (type == INVERTED) | |
| 678 update_curswant(); | |
| 679 if (curwin->w_redr_type < type | |
| 680 && !((type == VALID | |
| 681 && curwin->w_lines[0].wl_valid | |
| 682 #ifdef FEAT_DIFF | |
| 683 && curwin->w_topfill == curwin->w_old_topfill | |
| 684 && curwin->w_botfill == curwin->w_old_botfill | |
| 685 #endif | |
| 686 && curwin->w_topline == curwin->w_lines[0].wl_lnum) | |
| 687 || (type == INVERTED | |
| 1043 | 688 && VIsual_active |
| 7 | 689 && curwin->w_old_cursor_lnum == curwin->w_cursor.lnum |
| 690 && curwin->w_old_visual_mode == VIsual_mode | |
| 691 && (curwin->w_valid & VALID_VIRTCOL) | |
| 692 && curwin->w_old_curswant == curwin->w_curswant) | |
| 693 )) | |
| 694 curwin->w_redr_type = type; | |
| 695 | |
| 849 | 696 #ifdef FEAT_WINDOWS |
| 697 /* Redraw the tab pages line if needed. */ | |
| 698 if (redraw_tabline || type >= NOT_VALID) | |
| 699 draw_tabline(); | |
| 700 #endif | |
| 701 | |
| 7 | 702 #ifdef FEAT_SYN_HL |
| 703 /* | |
| 704 * Correct stored syntax highlighting info for changes in each displayed | |
| 705 * buffer. Each buffer must only be done once. | |
| 706 */ | |
| 707 FOR_ALL_WINDOWS(wp) | |
| 708 { | |
| 709 if (wp->w_buffer->b_mod_set) | |
| 710 { | |
| 711 # ifdef FEAT_WINDOWS | |
| 712 win_T *wwp; | |
| 713 | |
| 714 /* Check if we already did this buffer. */ | |
| 715 for (wwp = firstwin; wwp != wp; wwp = wwp->w_next) | |
| 716 if (wwp->w_buffer == wp->w_buffer) | |
| 717 break; | |
| 718 # endif | |
| 719 if ( | |
| 720 # ifdef FEAT_WINDOWS | |
| 721 wwp == wp && | |
| 722 # endif | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
723 syntax_present(wp)) |
| 7 | 724 syn_stack_apply_changes(wp->w_buffer); |
| 725 } | |
| 726 } | |
| 727 #endif | |
| 728 | |
| 729 /* | |
| 730 * Go from top to bottom through the windows, redrawing the ones that need | |
| 731 * it. | |
| 732 */ | |
| 733 #if defined(FEAT_SEARCH_EXTRA) || defined(FEAT_CLIPBOARD) | |
| 734 did_one = FALSE; | |
| 735 #endif | |
| 736 #ifdef FEAT_SEARCH_EXTRA | |
| 737 search_hl.rm.regprog = NULL; | |
| 738 #endif | |
| 739 FOR_ALL_WINDOWS(wp) | |
| 740 { | |
| 741 if (wp->w_redr_type != 0) | |
| 742 { | |
| 743 cursor_off(); | |
| 744 #if defined(FEAT_SEARCH_EXTRA) || defined(FEAT_CLIPBOARD) | |
| 745 if (!did_one) | |
| 746 { | |
| 747 did_one = TRUE; | |
| 748 # ifdef FEAT_SEARCH_EXTRA | |
| 749 start_search_hl(); | |
| 750 # endif | |
| 751 # ifdef FEAT_CLIPBOARD | |
| 752 /* When Visual area changed, may have to update selection. */ | |
| 3674 | 753 if (clip_star.available && clip_isautosel_star()) |
| 754 clip_update_selection(&clip_star); | |
| 755 if (clip_plus.available && clip_isautosel_plus()) | |
| 756 clip_update_selection(&clip_plus); | |
| 7 | 757 # endif |
| 758 #ifdef FEAT_GUI | |
| 759 /* Remove the cursor before starting to do anything, because | |
| 760 * scrolling may make it difficult to redraw the text under | |
| 761 * it. */ | |
|
9848
664276833670
commit https://github.com/vim/vim/commit/107abd2ca53c31fd3bb40d77ff296e98eaae2975
Christian Brabandt <cb@256bit.org>
parents:
9754
diff
changeset
|
762 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
|
763 { |
|
e08c8502d7ce
commit https://github.com/vim/vim/commit/144445d15f2369a58b94b6fee2fe162fc81c8abe
Christian Brabandt <cb@256bit.org>
parents:
9428
diff
changeset
|
764 gui_cursor_col = gui.cursor_col; |
|
e08c8502d7ce
commit https://github.com/vim/vim/commit/144445d15f2369a58b94b6fee2fe162fc81c8abe
Christian Brabandt <cb@256bit.org>
parents:
9428
diff
changeset
|
765 gui_cursor_row = gui.cursor_row; |
| 7 | 766 gui_undraw_cursor(); |
|
9848
664276833670
commit https://github.com/vim/vim/commit/107abd2ca53c31fd3bb40d77ff296e98eaae2975
Christian Brabandt <cb@256bit.org>
parents:
9754
diff
changeset
|
767 did_undraw = TRUE; |
|
9444
e08c8502d7ce
commit https://github.com/vim/vim/commit/144445d15f2369a58b94b6fee2fe162fc81c8abe
Christian Brabandt <cb@256bit.org>
parents:
9428
diff
changeset
|
768 } |
| 7 | 769 #endif |
| 770 } | |
| 771 #endif | |
| 772 win_update(wp); | |
| 773 } | |
| 774 | |
| 775 #ifdef FEAT_WINDOWS | |
| 776 /* redraw status line after the window to minimize cursor movement */ | |
| 777 if (wp->w_redr_status) | |
| 778 { | |
| 779 cursor_off(); | |
| 780 win_redr_status(wp); | |
| 781 } | |
| 782 #endif | |
| 783 } | |
| 784 #if defined(FEAT_SEARCH_EXTRA) | |
| 785 end_search_hl(); | |
| 786 #endif | |
| 4107 | 787 #ifdef FEAT_INS_EXPAND |
| 788 /* May need to redraw the popup menu. */ | |
| 789 if (pum_visible()) | |
| 790 pum_redraw(); | |
| 791 #endif | |
| 7 | 792 |
| 793 #ifdef FEAT_WINDOWS | |
| 794 /* Reset b_mod_set flags. Going through all windows is probably faster | |
| 795 * 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
|
796 FOR_ALL_WINDOWS(wp) |
| 7 | 797 wp->w_buffer->b_mod_set = FALSE; |
| 798 #else | |
| 799 curbuf->b_mod_set = FALSE; | |
| 800 #endif | |
| 801 | |
| 802 updating_screen = FALSE; | |
| 803 #ifdef FEAT_GUI | |
| 804 gui_may_resize_shell(); | |
| 805 #endif | |
| 806 | |
| 807 /* Clear or redraw the command line. Done last, because scrolling may | |
| 808 * mess up the command line. */ | |
| 809 if (clear_cmdline || redraw_cmdline) | |
| 810 showmode(); | |
| 811 | |
|
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
|
812 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
|
813 --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
|
814 |
| 7 | 815 /* 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
|
816 if (!did_intro) |
|
71859e71b1f9
updated for version 7.3.1306
Bram Moolenaar <bram@vim.org>
parents:
5096
diff
changeset
|
817 maybe_intro_message(); |
| 7 | 818 did_intro = TRUE; |
| 819 | |
| 820 #ifdef FEAT_GUI | |
| 821 /* Redraw the cursor and update the scrollbars when all screen updating is | |
| 822 * done. */ | |
| 823 if (gui.in_use) | |
| 824 { | |
| 825 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
|
826 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
|
827 { |
|
e08c8502d7ce
commit https://github.com/vim/vim/commit/144445d15f2369a58b94b6fee2fe162fc81c8abe
Christian Brabandt <cb@256bit.org>
parents:
9428
diff
changeset
|
828 /* 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
|
829 * uses that. */ |
|
e08c8502d7ce
commit https://github.com/vim/vim/commit/144445d15f2369a58b94b6fee2fe162fc81c8abe
Christian Brabandt <cb@256bit.org>
parents:
9428
diff
changeset
|
830 gui.col = gui_cursor_col; |
|
e08c8502d7ce
commit https://github.com/vim/vim/commit/144445d15f2369a58b94b6fee2fe162fc81c8abe
Christian Brabandt <cb@256bit.org>
parents:
9428
diff
changeset
|
831 gui.row = gui_cursor_row; |
|
10247
d54d4a258b96
commit https://github.com/vim/vim/commit/84dbd494dca599ecff05b2c2279d402c12e6d197
Christian Brabandt <cb@256bit.org>
parents:
10042
diff
changeset
|
832 # ifdef FEAT_MBYTE |
|
d54d4a258b96
commit https://github.com/vim/vim/commit/84dbd494dca599ecff05b2c2279d402c12e6d197
Christian Brabandt <cb@256bit.org>
parents:
10042
diff
changeset
|
833 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
|
834 # endif |
| 7 | 835 gui_update_cursor(FALSE, FALSE); |
|
9446
aaa6639b6f14
commit https://github.com/vim/vim/commit/65549bdef5805ba5a18a3d2d3909998dd7d9ed46
Christian Brabandt <cb@256bit.org>
parents:
9444
diff
changeset
|
836 screen_cur_col = gui.col; |
|
aaa6639b6f14
commit https://github.com/vim/vim/commit/65549bdef5805ba5a18a3d2d3909998dd7d9ed46
Christian Brabandt <cb@256bit.org>
parents:
9444
diff
changeset
|
837 screen_cur_row = gui.row; |
|
9444
e08c8502d7ce
commit https://github.com/vim/vim/commit/144445d15f2369a58b94b6fee2fe162fc81c8abe
Christian Brabandt <cb@256bit.org>
parents:
9428
diff
changeset
|
838 } |
| 7 | 839 gui_update_scrollbars(FALSE); |
| 840 } | |
| 841 #endif | |
| 842 } | |
| 843 | |
|
10793
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
844 #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
|
845 /* |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
846 * 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
|
847 * 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
|
848 */ |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
849 static void |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
850 update_prepare(void) |
|
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 cursor_off(); |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
853 updating_screen = TRUE; |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
854 #ifdef FEAT_GUI |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
855 /* 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
|
856 * 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
|
857 if (gui.in_use) |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
858 gui_undraw_cursor(); |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
859 #endif |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
860 #ifdef FEAT_SEARCH_EXTRA |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
861 start_search_hl(); |
|
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 } |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
864 |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
865 /* |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
866 * 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
|
867 */ |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
868 static void |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
869 update_finish(void) |
|
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 if (redraw_cmdline) |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
872 showmode(); |
|
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 # ifdef FEAT_SEARCH_EXTRA |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
875 end_search_hl(); |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
876 # endif |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
877 |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
878 updating_screen = FALSE; |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
879 |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
880 # ifdef FEAT_GUI |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
881 gui_may_resize_shell(); |
|
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 /* 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
|
884 * done. */ |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
885 if (gui.in_use) |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
886 { |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
887 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
|
888 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
|
889 gui_update_scrollbars(FALSE); |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
890 } |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
891 # endif |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
892 } |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
893 #endif |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
894 |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
895 #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
|
896 /* |
|
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
897 * 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
|
898 * 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
|
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 int |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
901 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
|
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 c; |
|
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
904 |
|
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
905 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
|
906 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
|
907 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
|
908 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
|
909 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
|
910 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
|
911 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
|
912 c = 'n'; |
|
2382
3a5ededa240a
Add the 'c' flag to 'concealcursor'.
Bram Moolenaar <bram@vim.org>
parents:
2381
diff
changeset
|
913 else if (State & CMDLINE) |
|
3a5ededa240a
Add the 'c' flag to 'concealcursor'.
Bram Moolenaar <bram@vim.org>
parents:
2381
diff
changeset
|
914 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
|
915 else |
|
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
916 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
|
917 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
|
918 } |
|
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
919 |
|
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
920 /* |
|
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
921 * 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
|
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 void |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
924 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
|
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 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
|
927 { |
|
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
928 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
|
929 /* 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
|
930 * 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
|
931 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
|
932 } |
|
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
933 } |
|
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
934 |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
935 void |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
936 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
|
937 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
938 int row; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
939 int j; |
|
11529
998d2cf59caa
patch 8.0.0647: syntax highlighting can make cause a freeze
Christian Brabandt <cb@256bit.org>
parents:
11521
diff
changeset
|
940 #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
|
941 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
|
942 #endif |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
943 |
|
9100
ddccff0480d2
commit https://github.com/vim/vim/commit/908be438794619f10ef7fa25e24e5893b2ae0189
Christian Brabandt <cb@256bit.org>
parents:
9027
diff
changeset
|
944 /* 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
|
945 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
|
946 return; |
|
ddccff0480d2
commit https://github.com/vim/vim/commit/908be438794619f10ef7fa25e24e5893b2ae0189
Christian Brabandt <cb@256bit.org>
parents:
9027
diff
changeset
|
947 |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
948 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
|
949 && foldedCount(wp, lnum, &win_foldinfo) == 0) |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
950 { |
|
11529
998d2cf59caa
patch 8.0.0647: syntax highlighting can make cause a freeze
Christian Brabandt <cb@256bit.org>
parents:
11521
diff
changeset
|
951 #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
|
952 /* 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
|
953 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
|
954 #endif |
|
10793
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
955 update_prepare(); |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
956 |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
957 row = 0; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
958 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
|
959 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
960 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
|
961 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
962 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
|
963 # ifdef FEAT_SEARCH_EXTRA |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
964 init_search_hl(wp); |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
965 start_search_hl(); |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
966 prepare_search_hl(wp, lnum); |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
967 # endif |
|
11529
998d2cf59caa
patch 8.0.0647: syntax highlighting can make cause a freeze
Christian Brabandt <cb@256bit.org>
parents:
11521
diff
changeset
|
968 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
|
969 #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
|
970 &syntax_tm |
|
998d2cf59caa
patch 8.0.0647: syntax highlighting can make cause a freeze
Christian Brabandt <cb@256bit.org>
parents:
11521
diff
changeset
|
971 #else |
|
998d2cf59caa
patch 8.0.0647: syntax highlighting can make cause a freeze
Christian Brabandt <cb@256bit.org>
parents:
11521
diff
changeset
|
972 NULL |
|
998d2cf59caa
patch 8.0.0647: syntax highlighting can make cause a freeze
Christian Brabandt <cb@256bit.org>
parents:
11521
diff
changeset
|
973 #endif |
|
998d2cf59caa
patch 8.0.0647: syntax highlighting can make cause a freeze
Christian Brabandt <cb@256bit.org>
parents:
11521
diff
changeset
|
974 ); |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
975 # if defined(FEAT_SEARCH_EXTRA) |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
976 end_search_hl(); |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
977 # endif |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
978 break; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
979 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
980 row += wp->w_lines[j].wl_size; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
981 } |
|
10793
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
982 |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
983 update_finish(); |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
984 } |
|
2378
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
985 need_cursor_line_redraw = FALSE; |
| 7 | 986 } |
| 987 #endif | |
| 988 | |
| 989 #if defined(FEAT_SIGNS) || defined(PROTO) | |
| 990 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
991 update_debug_sign(buf_T *buf, linenr_T lnum) |
| 7 | 992 { |
| 993 win_T *wp; | |
| 994 int doit = FALSE; | |
| 995 | |
| 996 # ifdef FEAT_FOLDING | |
| 997 win_foldinfo.fi_level = 0; | |
| 998 # endif | |
| 999 | |
| 1000 /* update/delete a specific mark */ | |
| 1001 FOR_ALL_WINDOWS(wp) | |
| 1002 { | |
| 1003 if (buf != NULL && lnum > 0) | |
| 1004 { | |
| 1005 if (wp->w_buffer == buf && lnum >= wp->w_topline | |
| 1006 && lnum < wp->w_botline) | |
| 1007 { | |
| 1008 if (wp->w_redraw_top == 0 || wp->w_redraw_top > lnum) | |
| 1009 wp->w_redraw_top = lnum; | |
| 1010 if (wp->w_redraw_bot == 0 || wp->w_redraw_bot < lnum) | |
| 1011 wp->w_redraw_bot = lnum; | |
| 1012 redraw_win_later(wp, VALID); | |
| 1013 } | |
| 1014 } | |
| 1015 else | |
| 1016 redraw_win_later(wp, VALID); | |
| 1017 if (wp->w_redr_type != 0) | |
| 1018 doit = TRUE; | |
| 1019 } | |
| 1020 | |
| 3250 | 1021 /* 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
|
1022 * 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
|
1023 */ |
| 3250 | 1024 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
|
1025 || 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
|
1026 || msg_scrolled |
| 3250 | 1027 #ifdef FEAT_GUI |
| 1028 || gui.starting | |
| 1029 #endif | |
| 1030 || starting) | |
| 7 | 1031 return; |
| 1032 | |
| 1033 /* update all windows that need updating */ | |
| 1034 update_prepare(); | |
| 1035 | |
| 1036 # ifdef FEAT_WINDOWS | |
|
9649
fd9727ae3c49
commit https://github.com/vim/vim/commit/2932359000b2f918d5fade79ea4d124d5943cd07
Christian Brabandt <cb@256bit.org>
parents:
9645
diff
changeset
|
1037 FOR_ALL_WINDOWS(wp) |
| 7 | 1038 { |
| 1039 if (wp->w_redr_type != 0) | |
| 1040 win_update(wp); | |
| 1041 if (wp->w_redr_status) | |
| 1042 win_redr_status(wp); | |
| 1043 } | |
| 1044 # else | |
| 1045 if (curwin->w_redr_type != 0) | |
| 1046 win_update(curwin); | |
| 1047 # endif | |
| 1048 | |
| 1049 update_finish(); | |
| 1050 } | |
| 1051 #endif | |
| 1052 | |
| 1053 | |
| 1054 #if defined(FEAT_GUI) || defined(PROTO) | |
| 1055 /* | |
| 1056 * Update a single window, its status line and maybe the command line msg. | |
| 1057 * Used for the GUI scrollbar. | |
| 1058 */ | |
| 1059 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1060 updateWindow(win_T *wp) |
| 7 | 1061 { |
| 2008 | 1062 /* return if already busy updating */ |
| 1063 if (updating_screen) | |
| 1064 return; | |
| 1065 | |
| 7 | 1066 update_prepare(); |
| 1067 | |
| 1068 #ifdef FEAT_CLIPBOARD | |
| 1069 /* When Visual area changed, may have to update selection. */ | |
| 3674 | 1070 if (clip_star.available && clip_isautosel_star()) |
| 1071 clip_update_selection(&clip_star); | |
| 1072 if (clip_plus.available && clip_isautosel_plus()) | |
| 1073 clip_update_selection(&clip_plus); | |
| 7 | 1074 #endif |
| 670 | 1075 |
| 7 | 1076 win_update(wp); |
| 670 | 1077 |
| 7 | 1078 #ifdef FEAT_WINDOWS |
| 670 | 1079 /* When the screen was cleared redraw the tab pages line. */ |
| 673 | 1080 if (redraw_tabline) |
| 677 | 1081 draw_tabline(); |
| 670 | 1082 |
| 7 | 1083 if (wp->w_redr_status |
| 1084 # ifdef FEAT_CMDL_INFO | |
| 1085 || p_ru | |
| 1086 # endif | |
| 1087 # ifdef FEAT_STL_OPT | |
| 40 | 1088 || *p_stl != NUL || *wp->w_p_stl != NUL |
| 7 | 1089 # endif |
| 1090 ) | |
| 1091 win_redr_status(wp); | |
| 1092 #endif | |
| 1093 | |
| 1094 update_finish(); | |
| 1095 } | |
| 1096 #endif | |
| 1097 | |
| 1098 /* | |
| 1099 * Update a single window. | |
| 1100 * | |
| 1101 * This may cause the windows below it also to be redrawn (when clearing the | |
| 1102 * screen or scrolling lines). | |
| 1103 * | |
| 1104 * How the window is redrawn depends on wp->w_redr_type. Each type also | |
| 1105 * implies the one below it. | |
| 1106 * NOT_VALID redraw the whole window | |
| 743 | 1107 * SOME_VALID redraw the whole window but do scroll when possible |
| 7 | 1108 * REDRAW_TOP redraw the top w_upd_rows window lines, otherwise like VALID |
| 1109 * INVERTED redraw the changed part of the Visual area | |
| 1110 * INVERTED_ALL redraw the whole Visual area | |
| 1111 * VALID 1. scroll up/down to adjust for a changed w_topline | |
| 1112 * 2. update lines at the top when scrolled down | |
| 1113 * 3. redraw changed text: | |
| 301 | 1114 * - if wp->w_buffer->b_mod_set set, update lines between |
| 7 | 1115 * b_mod_top and b_mod_bot. |
| 1116 * - if wp->w_redraw_top non-zero, redraw lines between | |
| 1117 * wp->w_redraw_top and wp->w_redr_bot. | |
| 1118 * - continue redrawing when syntax status is invalid. | |
| 1119 * 4. if scrolled up, update lines at the bottom. | |
| 1120 * This results in three areas that may need updating: | |
| 1121 * top: from first row to top_end (when scrolled down) | |
| 1122 * mid: from mid_start to mid_end (update inversion or changed text) | |
| 1123 * bot: from bot_start to last row (when scrolled up) | |
| 1124 */ | |
| 1125 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1126 win_update(win_T *wp) |
| 7 | 1127 { |
| 1128 buf_T *buf = wp->w_buffer; | |
| 1129 int type; | |
| 1130 int top_end = 0; /* Below last row of the top area that needs | |
| 1131 updating. 0 when no top area updating. */ | |
| 1132 int mid_start = 999;/* first row of the mid area that needs | |
| 1133 updating. 999 when no mid area updating. */ | |
| 1134 int mid_end = 0; /* Below last row of the mid area that needs | |
| 1135 updating. 0 when no mid area updating. */ | |
| 1136 int bot_start = 999;/* first row of the bot area that needs | |
| 1137 updating. 999 when no bot area updating */ | |
| 1138 int scrolled_down = FALSE; /* TRUE when scrolled down when | |
| 1139 w_topline got smaller a bit */ | |
| 1140 #ifdef FEAT_SEARCH_EXTRA | |
| 1326 | 1141 matchitem_T *cur; /* points to the match list */ |
| 7 | 1142 int top_to_mod = FALSE; /* redraw above mod_top */ |
| 1143 #endif | |
| 1144 | |
| 1145 int row; /* current window row to display */ | |
| 1146 linenr_T lnum; /* current buffer lnum to display */ | |
| 1147 int idx; /* current index in w_lines[] */ | |
| 1148 int srow; /* starting row of the current line */ | |
| 1149 | |
| 1150 int eof = FALSE; /* if TRUE, we hit the end of the file */ | |
| 1151 int didline = FALSE; /* if TRUE, we finished the last line */ | |
| 1152 int i; | |
| 1153 long j; | |
| 1154 static int recursive = FALSE; /* being called recursively */ | |
| 1155 int old_botline = wp->w_botline; | |
| 1156 #ifdef FEAT_FOLDING | |
| 1157 long fold_count; | |
| 1158 #endif | |
| 1159 #ifdef FEAT_SYN_HL | |
| 1160 /* remember what happened to the previous line, to know if | |
| 1161 * check_visual_highlight() can be used */ | |
| 1162 #define DID_NONE 1 /* didn't update a line */ | |
| 1163 #define DID_LINE 2 /* updated a normal line */ | |
| 1164 #define DID_FOLD 3 /* updated a folded line */ | |
| 1165 int did_update = DID_NONE; | |
| 1166 linenr_T syntax_last_parsed = 0; /* last parsed text line */ | |
| 1167 #endif | |
| 1168 linenr_T mod_top = 0; | |
| 1169 linenr_T mod_bot = 0; | |
| 1170 #if defined(FEAT_SYN_HL) || defined(FEAT_SEARCH_EXTRA) | |
| 1171 int save_got_int; | |
| 1172 #endif | |
|
11529
998d2cf59caa
patch 8.0.0647: syntax highlighting can make cause a freeze
Christian Brabandt <cb@256bit.org>
parents:
11521
diff
changeset
|
1173 #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
|
1174 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
|
1175 #endif |
| 7 | 1176 |
| 1177 type = wp->w_redr_type; | |
| 1178 | |
| 1179 if (type == NOT_VALID) | |
| 1180 { | |
| 1181 #ifdef FEAT_WINDOWS | |
| 1182 wp->w_redr_status = TRUE; | |
| 1183 #endif | |
| 1184 wp->w_lines_valid = 0; | |
| 1185 } | |
| 1186 | |
| 1187 /* Window is zero-height: nothing to draw. */ | |
| 1188 if (wp->w_height == 0) | |
| 1189 { | |
| 1190 wp->w_redr_type = 0; | |
| 1191 return; | |
| 1192 } | |
| 1193 | |
|
8643
24b43dd167eb
commit https://github.com/vim/vim/commit/44a2f923c00f1384c9ecde12fb5b4711bc20702e
Christian Brabandt <cb@256bit.org>
parents:
8627
diff
changeset
|
1194 #ifdef FEAT_WINDOWS |
| 7 | 1195 /* Window is zero-width: Only need to draw the separator. */ |
| 1196 if (wp->w_width == 0) | |
| 1197 { | |
| 1198 /* draw the vertical separator right of this window */ | |
| 1199 draw_vsep_win(wp, 0); | |
| 1200 wp->w_redr_type = 0; | |
| 1201 return; | |
| 1202 } | |
| 1203 #endif | |
| 1204 | |
|
11670
3b2afa2b77b3
patch 8.0.0718: output of job in terminal is not displayed
Christian Brabandt <cb@256bit.org>
parents:
11657
diff
changeset
|
1205 #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
|
1206 /* 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
|
1207 */ |
|
0cfe4a07c2ad
patch 8.0.0797: finished job in terminal window is not handled
Christian Brabandt <cb@256bit.org>
parents:
11698
diff
changeset
|
1208 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
|
1209 { |
|
11670
3b2afa2b77b3
patch 8.0.0718: output of job in terminal is not displayed
Christian Brabandt <cb@256bit.org>
parents:
11657
diff
changeset
|
1210 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
|
1211 return; |
|
3b2afa2b77b3
patch 8.0.0718: output of job in terminal is not displayed
Christian Brabandt <cb@256bit.org>
parents:
11657
diff
changeset
|
1212 } |
|
3b2afa2b77b3
patch 8.0.0718: output of job in terminal is not displayed
Christian Brabandt <cb@256bit.org>
parents:
11657
diff
changeset
|
1213 #endif |
|
3b2afa2b77b3
patch 8.0.0718: output of job in terminal is not displayed
Christian Brabandt <cb@256bit.org>
parents:
11657
diff
changeset
|
1214 |
| 7 | 1215 #ifdef FEAT_SEARCH_EXTRA |
|
2284
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
1216 init_search_hl(wp); |
| 7 | 1217 #endif |
| 1218 | |
| 13 | 1219 #ifdef FEAT_LINEBREAK |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
1220 /* 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
|
1221 * changes. */ |
|
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
1222 i = (wp->w_p_nu || wp->w_p_rnu) ? number_width(wp) : 0; |
| 677 | 1223 if (wp->w_nrwidth != i) |
| 13 | 1224 { |
| 1225 type = NOT_VALID; | |
| 677 | 1226 wp->w_nrwidth = i; |
| 13 | 1227 } |
| 1228 else | |
| 1229 #endif | |
| 1230 | |
| 7 | 1231 if (buf->b_mod_set && buf->b_mod_xlines != 0 && wp->w_redraw_top != 0) |
| 1232 { | |
| 1233 /* | |
| 1234 * When there are both inserted/deleted lines and specific lines to be | |
| 1235 * redrawn, w_redraw_top and w_redraw_bot may be invalid, just redraw | |
| 1236 * everything (only happens when redrawing is off for while). | |
| 1237 */ | |
| 1238 type = NOT_VALID; | |
| 1239 } | |
| 1240 else | |
| 1241 { | |
| 1242 /* | |
| 1243 * Set mod_top to the first line that needs displaying because of | |
| 1244 * changes. Set mod_bot to the first line after the changes. | |
| 1245 */ | |
| 1246 mod_top = wp->w_redraw_top; | |
| 1247 if (wp->w_redraw_bot != 0) | |
| 1248 mod_bot = wp->w_redraw_bot + 1; | |
| 1249 else | |
| 1250 mod_bot = 0; | |
| 1251 wp->w_redraw_top = 0; /* reset for next time */ | |
| 1252 wp->w_redraw_bot = 0; | |
| 1253 if (buf->b_mod_set) | |
| 1254 { | |
| 1255 if (mod_top == 0 || mod_top > buf->b_mod_top) | |
| 1256 { | |
| 1257 mod_top = buf->b_mod_top; | |
| 1258 #ifdef FEAT_SYN_HL | |
| 1259 /* Need to redraw lines above the change that may be included | |
| 1260 * in a pattern match. */ | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
1261 if (syntax_present(wp)) |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
1262 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
1263 mod_top -= buf->b_s.b_syn_sync_linebreaks; |
| 7 | 1264 if (mod_top < 1) |
| 1265 mod_top = 1; | |
| 1266 } | |
| 1267 #endif | |
| 1268 } | |
| 1269 if (mod_bot == 0 || mod_bot < buf->b_mod_bot) | |
| 1270 mod_bot = buf->b_mod_bot; | |
| 1271 | |
| 1272 #ifdef FEAT_SEARCH_EXTRA | |
| 1273 /* When 'hlsearch' is on and using a multi-line search pattern, a | |
| 1274 * change in one line may make the Search highlighting in a | |
| 1275 * previous line invalid. Simple solution: redraw all visible | |
| 1276 * lines above the change. | |
| 1326 | 1277 * Same for a match pattern. |
| 7 | 1278 */ |
| 699 | 1279 if (search_hl.rm.regprog != NULL |
| 1280 && re_multiline(search_hl.rm.regprog)) | |
| 7 | 1281 top_to_mod = TRUE; |
| 699 | 1282 else |
| 1326 | 1283 { |
| 1284 cur = wp->w_match_head; | |
| 1285 while (cur != NULL) | |
| 1286 { | |
| 1287 if (cur->match.regprog != NULL | |
| 1288 && re_multiline(cur->match.regprog)) | |
| 699 | 1289 { |
| 1290 top_to_mod = TRUE; | |
| 1291 break; | |
| 1292 } | |
| 1326 | 1293 cur = cur->next; |
| 1294 } | |
| 1295 } | |
| 7 | 1296 #endif |
| 1297 } | |
| 1298 #ifdef FEAT_FOLDING | |
| 1299 if (mod_top != 0 && hasAnyFolding(wp)) | |
| 1300 { | |
| 1301 linenr_T lnumt, lnumb; | |
| 1302 | |
| 1303 /* | |
| 1304 * A change in a line can cause lines above it to become folded or | |
| 1305 * unfolded. Find the top most buffer line that may be affected. | |
| 1306 * If the line was previously folded and displayed, get the first | |
| 1307 * line of that fold. If the line is folded now, get the first | |
| 1308 * folded line. Use the minimum of these two. | |
| 1309 */ | |
| 1310 | |
| 1311 /* Find last valid w_lines[] entry above mod_top. Set lnumt to | |
| 1312 * the line below it. If there is no valid entry, use w_topline. | |
| 1313 * Find the first valid w_lines[] entry below mod_bot. Set lnumb | |
| 1314 * to this line. If there is no valid entry, use MAXLNUM. */ | |
| 1315 lnumt = wp->w_topline; | |
| 1316 lnumb = MAXLNUM; | |
| 1317 for (i = 0; i < wp->w_lines_valid; ++i) | |
| 1318 if (wp->w_lines[i].wl_valid) | |
| 1319 { | |
| 1320 if (wp->w_lines[i].wl_lastlnum < mod_top) | |
| 1321 lnumt = wp->w_lines[i].wl_lastlnum + 1; | |
| 1322 if (lnumb == MAXLNUM && wp->w_lines[i].wl_lnum >= mod_bot) | |
| 1323 { | |
| 1324 lnumb = wp->w_lines[i].wl_lnum; | |
| 1325 /* When there is a fold column it might need updating | |
| 1326 * in the next line ("J" just above an open fold). */ | |
| 6553 | 1327 if (compute_foldcolumn(wp, 0) > 0) |
| 7 | 1328 ++lnumb; |
| 1329 } | |
| 1330 } | |
| 1331 | |
| 1332 (void)hasFoldingWin(wp, mod_top, &mod_top, NULL, TRUE, NULL); | |
| 1333 if (mod_top > lnumt) | |
| 1334 mod_top = lnumt; | |
| 1335 | |
| 1336 /* Now do the same for the bottom line (one above mod_bot). */ | |
| 1337 --mod_bot; | |
| 1338 (void)hasFoldingWin(wp, mod_bot, NULL, &mod_bot, TRUE, NULL); | |
| 1339 ++mod_bot; | |
| 1340 if (mod_bot < lnumb) | |
| 1341 mod_bot = lnumb; | |
| 1342 } | |
| 1343 #endif | |
| 1344 | |
| 1345 /* When a change starts above w_topline and the end is below | |
| 1346 * w_topline, start redrawing at w_topline. | |
| 36 | 1347 * If the end of the change is above w_topline: do like no change was |
| 1348 * made, but redraw the first line to find changes in syntax. */ | |
| 7 | 1349 if (mod_top != 0 && mod_top < wp->w_topline) |
| 1350 { | |
| 1351 if (mod_bot > wp->w_topline) | |
| 1352 mod_top = wp->w_topline; | |
| 1353 #ifdef FEAT_SYN_HL | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
1354 else if (syntax_present(wp)) |
| 7 | 1355 top_end = 1; |
| 1356 #endif | |
| 1357 } | |
| 36 | 1358 |
| 1359 /* When line numbers are displayed need to redraw all lines below | |
| 1360 * inserted/deleted lines. */ | |
| 1361 if (mod_top != 0 && buf->b_mod_xlines != 0 && wp->w_p_nu) | |
| 1362 mod_bot = MAXLNUM; | |
| 7 | 1363 } |
| 1364 | |
| 1365 /* | |
| 1366 * When only displaying the lines at the top, set top_end. Used when | |
| 1367 * window has scrolled down for msg_scrolled. | |
| 1368 */ | |
| 1369 if (type == REDRAW_TOP) | |
| 1370 { | |
| 1371 j = 0; | |
| 1372 for (i = 0; i < wp->w_lines_valid; ++i) | |
| 1373 { | |
| 1374 j += wp->w_lines[i].wl_size; | |
| 1375 if (j >= wp->w_upd_rows) | |
| 1376 { | |
| 1377 top_end = j; | |
| 1378 break; | |
| 1379 } | |
| 1380 } | |
| 1381 if (top_end == 0) | |
| 1382 /* not found (cannot happen?): redraw everything */ | |
| 1383 type = NOT_VALID; | |
| 1384 else | |
| 1385 /* top area defined, the rest is VALID */ | |
| 1386 type = VALID; | |
| 1387 } | |
| 1388 | |
| 1378 | 1389 /* Trick: we want to avoid clearing the screen twice. screenclear() will |
| 1331 | 1390 * set "screen_cleared" to TRUE. The special value MAYBE (which is still |
| 1391 * non-zero and thus not FALSE) will indicate that screenclear() was not | |
| 1392 * called. */ | |
| 1393 if (screen_cleared) | |
| 1394 screen_cleared = MAYBE; | |
| 1395 | |
| 7 | 1396 /* |
| 1397 * If there are no changes on the screen that require a complete redraw, | |
| 1398 * handle three cases: | |
| 1399 * 1: we are off the top of the screen by a few lines: scroll down | |
| 1400 * 2: wp->w_topline is below wp->w_lines[0].wl_lnum: may scroll up | |
| 1401 * 3: wp->w_topline is wp->w_lines[0].wl_lnum: find first entry in | |
| 1402 * w_lines[] that needs updating. | |
| 1403 */ | |
| 743 | 1404 if ((type == VALID || type == SOME_VALID |
| 1405 || type == INVERTED || type == INVERTED_ALL) | |
| 7 | 1406 #ifdef FEAT_DIFF |
| 1407 && !wp->w_botfill && !wp->w_old_botfill | |
| 1408 #endif | |
| 1409 ) | |
| 1410 { | |
| 1411 if (mod_top != 0 && wp->w_topline == mod_top) | |
| 1412 { | |
| 1413 /* | |
| 1414 * w_topline is the first changed line, the scrolling will be done | |
| 1415 * further down. | |
| 1416 */ | |
| 1417 } | |
| 1418 else if (wp->w_lines[0].wl_valid | |
| 1419 && (wp->w_topline < wp->w_lines[0].wl_lnum | |
| 1420 #ifdef FEAT_DIFF | |
| 1421 || (wp->w_topline == wp->w_lines[0].wl_lnum | |
| 1422 && wp->w_topfill > wp->w_old_topfill) | |
| 1423 #endif | |
| 1424 )) | |
| 1425 { | |
| 1426 /* | |
| 1427 * New topline is above old topline: May scroll down. | |
| 1428 */ | |
| 1429 #ifdef FEAT_FOLDING | |
| 1430 if (hasAnyFolding(wp)) | |
| 1431 { | |
| 1432 linenr_T ln; | |
| 1433 | |
| 1434 /* count the number of lines we are off, counting a sequence | |
| 1435 * of folded lines as one */ | |
| 1436 j = 0; | |
| 1437 for (ln = wp->w_topline; ln < wp->w_lines[0].wl_lnum; ++ln) | |
| 1438 { | |
| 1439 ++j; | |
| 1440 if (j >= wp->w_height - 2) | |
| 1441 break; | |
| 1442 (void)hasFoldingWin(wp, ln, NULL, &ln, TRUE, NULL); | |
| 1443 } | |
| 1444 } | |
| 1445 else | |
| 1446 #endif | |
| 1447 j = wp->w_lines[0].wl_lnum - wp->w_topline; | |
| 1448 if (j < wp->w_height - 2) /* not too far off */ | |
| 1449 { | |
| 1450 i = plines_m_win(wp, wp->w_topline, wp->w_lines[0].wl_lnum - 1); | |
| 1451 #ifdef FEAT_DIFF | |
| 1452 /* insert extra lines for previously invisible filler lines */ | |
| 1453 if (wp->w_lines[0].wl_lnum != wp->w_topline) | |
| 1454 i += diff_check_fill(wp, wp->w_lines[0].wl_lnum) | |
| 1455 - wp->w_old_topfill; | |
| 1456 #endif | |
| 1457 if (i < wp->w_height - 2) /* less than a screen off */ | |
| 1458 { | |
| 1459 /* | |
| 1460 * Try to insert the correct number of lines. | |
| 1461 * If not the last window, delete the lines at the bottom. | |
| 1462 * win_ins_lines may fail when the terminal can't do it. | |
| 1463 */ | |
| 1464 if (i > 0) | |
| 1465 check_for_delay(FALSE); | |
| 1466 if (win_ins_lines(wp, 0, i, FALSE, wp == firstwin) == OK) | |
| 1467 { | |
| 1468 if (wp->w_lines_valid != 0) | |
| 1469 { | |
| 1470 /* Need to update rows that are new, stop at the | |
| 1471 * first one that scrolled down. */ | |
| 1472 top_end = i; | |
| 1473 scrolled_down = TRUE; | |
| 1474 | |
| 1475 /* Move the entries that were scrolled, disable | |
| 1476 * the entries for the lines to be redrawn. */ | |
| 1477 if ((wp->w_lines_valid += j) > wp->w_height) | |
| 1478 wp->w_lines_valid = wp->w_height; | |
| 1479 for (idx = wp->w_lines_valid; idx - j >= 0; idx--) | |
| 1480 wp->w_lines[idx] = wp->w_lines[idx - j]; | |
| 1481 while (idx >= 0) | |
| 1482 wp->w_lines[idx--].wl_valid = FALSE; | |
| 1483 } | |
| 1484 } | |
| 1485 else | |
| 1486 mid_start = 0; /* redraw all lines */ | |
| 1487 } | |
| 1488 else | |
| 1489 mid_start = 0; /* redraw all lines */ | |
| 1490 } | |
| 1491 else | |
| 1492 mid_start = 0; /* redraw all lines */ | |
| 1493 } | |
| 1494 else | |
| 1495 { | |
| 1496 /* | |
| 1497 * New topline is at or below old topline: May scroll up. | |
| 1498 * When topline didn't change, find first entry in w_lines[] that | |
| 1499 * needs updating. | |
| 1500 */ | |
| 1501 | |
| 1502 /* try to find wp->w_topline in wp->w_lines[].wl_lnum */ | |
| 1503 j = -1; | |
| 1504 row = 0; | |
| 1505 for (i = 0; i < wp->w_lines_valid; i++) | |
| 1506 { | |
| 1507 if (wp->w_lines[i].wl_valid | |
| 1508 && wp->w_lines[i].wl_lnum == wp->w_topline) | |
| 1509 { | |
| 1510 j = i; | |
| 1511 break; | |
| 1512 } | |
| 1513 row += wp->w_lines[i].wl_size; | |
| 1514 } | |
| 1515 if (j == -1) | |
| 1516 { | |
| 1517 /* if wp->w_topline is not in wp->w_lines[].wl_lnum redraw all | |
| 1518 * lines */ | |
| 1519 mid_start = 0; | |
| 1520 } | |
| 1521 else | |
| 1522 { | |
| 1523 /* | |
| 1524 * Try to delete the correct number of lines. | |
| 1525 * wp->w_topline is at wp->w_lines[i].wl_lnum. | |
| 1526 */ | |
| 1527 #ifdef FEAT_DIFF | |
| 1528 /* If the topline didn't change, delete old filler lines, | |
| 1529 * otherwise delete filler lines of the new topline... */ | |
| 1530 if (wp->w_lines[0].wl_lnum == wp->w_topline) | |
| 1531 row += wp->w_old_topfill; | |
| 1532 else | |
| 1533 row += diff_check_fill(wp, wp->w_topline); | |
| 1534 /* ... but don't delete new filler lines. */ | |
| 1535 row -= wp->w_topfill; | |
| 1536 #endif | |
| 1537 if (row > 0) | |
| 1538 { | |
| 1539 check_for_delay(FALSE); | |
| 1540 if (win_del_lines(wp, 0, row, FALSE, wp == firstwin) == OK) | |
| 1541 bot_start = wp->w_height - row; | |
| 1542 else | |
| 1543 mid_start = 0; /* redraw all lines */ | |
| 1544 } | |
| 1545 if ((row == 0 || bot_start < 999) && wp->w_lines_valid != 0) | |
| 1546 { | |
| 1547 /* | |
| 1548 * Skip the lines (below the deleted lines) that are still | |
| 1549 * valid and don't need redrawing. Copy their info | |
| 1550 * upwards, to compensate for the deleted lines. Set | |
| 1551 * bot_start to the first row that needs redrawing. | |
| 1552 */ | |
| 1553 bot_start = 0; | |
| 1554 idx = 0; | |
| 1555 for (;;) | |
| 1556 { | |
| 1557 wp->w_lines[idx] = wp->w_lines[j]; | |
| 1558 /* stop at line that didn't fit, unless it is still | |
| 1559 * valid (no lines deleted) */ | |
| 1560 if (row > 0 && bot_start + row | |
| 1561 + (int)wp->w_lines[j].wl_size > wp->w_height) | |
| 1562 { | |
| 1563 wp->w_lines_valid = idx + 1; | |
| 1564 break; | |
| 1565 } | |
| 1566 bot_start += wp->w_lines[idx++].wl_size; | |
| 1567 | |
| 1568 /* stop at the last valid entry in w_lines[].wl_size */ | |
| 1569 if (++j >= wp->w_lines_valid) | |
| 1570 { | |
| 1571 wp->w_lines_valid = idx; | |
| 1572 break; | |
| 1573 } | |
| 1574 } | |
| 1575 #ifdef FEAT_DIFF | |
| 1576 /* Correct the first entry for filler lines at the top | |
| 1577 * when it won't get updated below. */ | |
| 1578 if (wp->w_p_diff && bot_start > 0) | |
| 1579 wp->w_lines[0].wl_size = | |
| 1580 plines_win_nofill(wp, wp->w_topline, TRUE) | |
| 1581 + wp->w_topfill; | |
| 1582 #endif | |
| 1583 } | |
| 1584 } | |
| 1585 } | |
| 1586 | |
| 1587 /* When starting redraw in the first line, redraw all lines. When | |
| 1588 * there is only one window it's probably faster to clear the screen | |
| 1589 * first. */ | |
| 1590 if (mid_start == 0) | |
| 1591 { | |
| 1592 mid_end = wp->w_height; | |
|
10349
cf988222b150
commit https://github.com/vim/vim/commit/a1f4cb93ba50ea9e40cd4b1f5592b8a6d1398660
Christian Brabandt <cb@256bit.org>
parents:
10307
diff
changeset
|
1593 if (ONE_WINDOW) |
| 981 | 1594 { |
| 1331 | 1595 /* Clear the screen when it was not done by win_del_lines() or |
| 1596 * win_ins_lines() above, "screen_cleared" is FALSE or MAYBE | |
| 1597 * then. */ | |
| 1598 if (screen_cleared != TRUE) | |
| 1599 screenclear(); | |
| 981 | 1600 #ifdef FEAT_WINDOWS |
| 1601 /* The screen was cleared, redraw the tab pages line. */ | |
| 1602 if (redraw_tabline) | |
| 1603 draw_tabline(); | |
| 1604 #endif | |
| 1605 } | |
| 7 | 1606 } |
| 1331 | 1607 |
| 1608 /* When win_del_lines() or win_ins_lines() caused the screen to be | |
| 1609 * cleared (only happens for the first window) or when screenclear() | |
| 1610 * was called directly above, "must_redraw" will have been set to | |
| 1611 * NOT_VALID, need to reset it here to avoid redrawing twice. */ | |
| 1612 if (screen_cleared == TRUE) | |
| 1613 must_redraw = 0; | |
| 7 | 1614 } |
| 1615 else | |
| 1616 { | |
| 1617 /* Not VALID or INVERTED: redraw all lines. */ | |
| 1618 mid_start = 0; | |
| 1619 mid_end = wp->w_height; | |
| 1620 } | |
| 1621 | |
| 743 | 1622 if (type == SOME_VALID) |
| 1623 { | |
| 1624 /* SOME_VALID: redraw all lines. */ | |
| 1625 mid_start = 0; | |
| 1626 mid_end = wp->w_height; | |
| 1627 type = NOT_VALID; | |
| 1628 } | |
| 1629 | |
| 7 | 1630 /* check if we are updating or removing the inverted part */ |
| 1631 if ((VIsual_active && buf == curwin->w_buffer) | |
| 1632 || (wp->w_old_cursor_lnum != 0 && type != NOT_VALID)) | |
| 1633 { | |
| 1634 linenr_T from, to; | |
| 1635 | |
| 1636 if (VIsual_active) | |
| 1637 { | |
| 1638 if (VIsual_active | |
| 1639 && (VIsual_mode != wp->w_old_visual_mode | |
| 1640 || type == INVERTED_ALL)) | |
| 1641 { | |
| 1642 /* | |
| 1643 * If the type of Visual selection changed, redraw the whole | |
| 1644 * selection. Also when the ownership of the X selection is | |
| 1645 * gained or lost. | |
| 1646 */ | |
| 1647 if (curwin->w_cursor.lnum < VIsual.lnum) | |
| 1648 { | |
| 1649 from = curwin->w_cursor.lnum; | |
| 1650 to = VIsual.lnum; | |
| 1651 } | |
| 1652 else | |
| 1653 { | |
| 1654 from = VIsual.lnum; | |
| 1655 to = curwin->w_cursor.lnum; | |
| 1656 } | |
| 1657 /* redraw more when the cursor moved as well */ | |
| 1658 if (wp->w_old_cursor_lnum < from) | |
| 1659 from = wp->w_old_cursor_lnum; | |
| 1660 if (wp->w_old_cursor_lnum > to) | |
| 1661 to = wp->w_old_cursor_lnum; | |
| 1662 if (wp->w_old_visual_lnum < from) | |
| 1663 from = wp->w_old_visual_lnum; | |
| 1664 if (wp->w_old_visual_lnum > to) | |
| 1665 to = wp->w_old_visual_lnum; | |
| 1666 } | |
| 1667 else | |
| 1668 { | |
| 1669 /* | |
| 1670 * Find the line numbers that need to be updated: The lines | |
| 1671 * between the old cursor position and the current cursor | |
| 1672 * position. Also check if the Visual position changed. | |
| 1673 */ | |
| 1674 if (curwin->w_cursor.lnum < wp->w_old_cursor_lnum) | |
| 1675 { | |
| 1676 from = curwin->w_cursor.lnum; | |
| 1677 to = wp->w_old_cursor_lnum; | |
| 1678 } | |
| 1679 else | |
| 1680 { | |
| 1681 from = wp->w_old_cursor_lnum; | |
| 1682 to = curwin->w_cursor.lnum; | |
| 1683 if (from == 0) /* Visual mode just started */ | |
| 1684 from = to; | |
| 1685 } | |
| 1686 | |
| 422 | 1687 if (VIsual.lnum != wp->w_old_visual_lnum |
| 1688 || VIsual.col != wp->w_old_visual_col) | |
| 7 | 1689 { |
| 1690 if (wp->w_old_visual_lnum < from | |
| 1691 && wp->w_old_visual_lnum != 0) | |
| 1692 from = wp->w_old_visual_lnum; | |
| 1693 if (wp->w_old_visual_lnum > to) | |
| 1694 to = wp->w_old_visual_lnum; | |
| 1695 if (VIsual.lnum < from) | |
| 1696 from = VIsual.lnum; | |
| 1697 if (VIsual.lnum > to) | |
| 1698 to = VIsual.lnum; | |
| 1699 } | |
| 1700 } | |
| 1701 | |
| 1702 /* | |
| 1703 * If in block mode and changed column or curwin->w_curswant: | |
| 1704 * update all lines. | |
| 1705 * First compute the actual start and end column. | |
| 1706 */ | |
| 1707 if (VIsual_mode == Ctrl_V) | |
| 1708 { | |
| 6266 | 1709 colnr_T fromc, toc; |
| 1710 #if defined(FEAT_VIRTUALEDIT) && defined(FEAT_LINEBREAK) | |
| 1711 int save_ve_flags = ve_flags; | |
| 1712 | |
| 1713 if (curwin->w_p_lbr) | |
| 1714 ve_flags = VE_ALL; | |
| 1715 #endif | |
| 7 | 1716 getvcols(wp, &VIsual, &curwin->w_cursor, &fromc, &toc); |
| 6266 | 1717 #if defined(FEAT_VIRTUALEDIT) && defined(FEAT_LINEBREAK) |
| 1718 ve_flags = save_ve_flags; | |
| 1719 #endif | |
| 7 | 1720 ++toc; |
| 1721 if (curwin->w_curswant == MAXCOL) | |
| 1722 toc = MAXCOL; | |
| 1723 | |
| 1724 if (fromc != wp->w_old_cursor_fcol | |
| 1725 || toc != wp->w_old_cursor_lcol) | |
| 1726 { | |
| 1727 if (from > VIsual.lnum) | |
| 1728 from = VIsual.lnum; | |
| 1729 if (to < VIsual.lnum) | |
| 1730 to = VIsual.lnum; | |
| 1731 } | |
| 1732 wp->w_old_cursor_fcol = fromc; | |
| 1733 wp->w_old_cursor_lcol = toc; | |
| 1734 } | |
| 1735 } | |
| 1736 else | |
| 1737 { | |
| 1738 /* Use the line numbers of the old Visual area. */ | |
| 1739 if (wp->w_old_cursor_lnum < wp->w_old_visual_lnum) | |
| 1740 { | |
| 1741 from = wp->w_old_cursor_lnum; | |
| 1742 to = wp->w_old_visual_lnum; | |
| 1743 } | |
| 1744 else | |
| 1745 { | |
| 1746 from = wp->w_old_visual_lnum; | |
| 1747 to = wp->w_old_cursor_lnum; | |
| 1748 } | |
| 1749 } | |
| 1750 | |
| 1751 /* | |
| 1752 * There is no need to update lines above the top of the window. | |
| 1753 */ | |
| 1754 if (from < wp->w_topline) | |
| 1755 from = wp->w_topline; | |
| 1756 | |
| 1757 /* | |
| 1758 * If we know the value of w_botline, use it to restrict the update to | |
| 1759 * the lines that are visible in the window. | |
| 1760 */ | |
| 1761 if (wp->w_valid & VALID_BOTLINE) | |
| 1762 { | |
| 1763 if (from >= wp->w_botline) | |
| 1764 from = wp->w_botline - 1; | |
| 1765 if (to >= wp->w_botline) | |
| 1766 to = wp->w_botline - 1; | |
| 1767 } | |
| 1768 | |
| 1769 /* | |
| 1770 * Find the minimal part to be updated. | |
| 1771 * Watch out for scrolling that made entries in w_lines[] invalid. | |
| 1772 * E.g., CTRL-U makes the first half of w_lines[] invalid and sets | |
| 1773 * top_end; need to redraw from top_end to the "to" line. | |
| 1774 * A middle mouse click with a Visual selection may change the text | |
| 1775 * above the Visual area and reset wl_valid, do count these for | |
| 1776 * mid_end (in srow). | |
| 1777 */ | |
| 1778 if (mid_start > 0) | |
| 1779 { | |
| 1780 lnum = wp->w_topline; | |
| 1781 idx = 0; | |
| 1782 srow = 0; | |
| 1783 if (scrolled_down) | |
| 1784 mid_start = top_end; | |
| 1785 else | |
| 1786 mid_start = 0; | |
| 1787 while (lnum < from && idx < wp->w_lines_valid) /* find start */ | |
| 1788 { | |
| 1789 if (wp->w_lines[idx].wl_valid) | |
| 1790 mid_start += wp->w_lines[idx].wl_size; | |
| 1791 else if (!scrolled_down) | |
| 1792 srow += wp->w_lines[idx].wl_size; | |
| 1793 ++idx; | |
| 1794 # ifdef FEAT_FOLDING | |
| 1795 if (idx < wp->w_lines_valid && wp->w_lines[idx].wl_valid) | |
| 1796 lnum = wp->w_lines[idx].wl_lnum; | |
| 1797 else | |
| 1798 # endif | |
| 1799 ++lnum; | |
| 1800 } | |
| 1801 srow += mid_start; | |
| 1802 mid_end = wp->w_height; | |
| 1803 for ( ; idx < wp->w_lines_valid; ++idx) /* find end */ | |
| 1804 { | |
| 1805 if (wp->w_lines[idx].wl_valid | |
| 1806 && wp->w_lines[idx].wl_lnum >= to + 1) | |
| 1807 { | |
| 1808 /* Only update until first row of this line */ | |
| 1809 mid_end = srow; | |
| 1810 break; | |
| 1811 } | |
| 1812 srow += wp->w_lines[idx].wl_size; | |
| 1813 } | |
| 1814 } | |
| 1815 } | |
| 1816 | |
| 1817 if (VIsual_active && buf == curwin->w_buffer) | |
| 1818 { | |
| 1819 wp->w_old_visual_mode = VIsual_mode; | |
| 1820 wp->w_old_cursor_lnum = curwin->w_cursor.lnum; | |
| 1821 wp->w_old_visual_lnum = VIsual.lnum; | |
| 422 | 1822 wp->w_old_visual_col = VIsual.col; |
| 7 | 1823 wp->w_old_curswant = curwin->w_curswant; |
| 1824 } | |
| 1825 else | |
| 1826 { | |
| 1827 wp->w_old_visual_mode = 0; | |
| 1828 wp->w_old_cursor_lnum = 0; | |
| 1829 wp->w_old_visual_lnum = 0; | |
| 422 | 1830 wp->w_old_visual_col = 0; |
| 7 | 1831 } |
| 1832 | |
| 1833 #if defined(FEAT_SYN_HL) || defined(FEAT_SEARCH_EXTRA) | |
| 1834 /* reset got_int, otherwise regexp won't work */ | |
| 1835 save_got_int = got_int; | |
| 1836 got_int = 0; | |
| 1837 #endif | |
|
11529
998d2cf59caa
patch 8.0.0647: syntax highlighting can make cause a freeze
Christian Brabandt <cb@256bit.org>
parents:
11521
diff
changeset
|
1838 #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
|
1839 /* 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
|
1840 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
|
1841 #endif |
| 7 | 1842 #ifdef FEAT_FOLDING |
| 1843 win_foldinfo.fi_level = 0; | |
| 1844 #endif | |
| 1845 | |
| 1846 /* | |
| 1847 * Update all the window rows. | |
| 1848 */ | |
| 1849 idx = 0; /* first entry in w_lines[].wl_size */ | |
| 1850 row = 0; | |
| 1851 srow = 0; | |
| 1852 lnum = wp->w_topline; /* first line shown in window */ | |
| 1853 for (;;) | |
| 1854 { | |
| 1855 /* stop updating when reached the end of the window (check for _past_ | |
| 1856 * the end of the window is at the end of the loop) */ | |
| 1857 if (row == wp->w_height) | |
| 1858 { | |
| 1859 didline = TRUE; | |
| 1860 break; | |
| 1861 } | |
| 1862 | |
| 1863 /* stop updating when hit the end of the file */ | |
| 1864 if (lnum > buf->b_ml.ml_line_count) | |
| 1865 { | |
| 1866 eof = TRUE; | |
| 1867 break; | |
| 1868 } | |
| 1869 | |
| 1870 /* Remember the starting row of the line that is going to be dealt | |
| 1871 * with. It is used further down when the line doesn't fit. */ | |
| 1872 srow = row; | |
| 1873 | |
| 1874 /* | |
| 1875 * Update a line when it is in an area that needs updating, when it | |
| 1876 * has changes or w_lines[idx] is invalid. | |
| 1877 * bot_start may be halfway a wrapped line after using | |
| 1878 * win_del_lines(), check if the current line includes it. | |
| 1879 * When syntax folding is being used, the saved syntax states will | |
| 1880 * already have been updated, we can't see where the syntax state is | |
| 1881 * the same again, just update until the end of the window. | |
| 1882 */ | |
| 1883 if (row < top_end | |
| 1884 || (row >= mid_start && row < mid_end) | |
| 1885 #ifdef FEAT_SEARCH_EXTRA | |
| 1886 || top_to_mod | |
| 1887 #endif | |
| 1888 || idx >= wp->w_lines_valid | |
| 1889 || (row + wp->w_lines[idx].wl_size > bot_start) | |
| 1890 || (mod_top != 0 | |
| 1891 && (lnum == mod_top | |
| 1892 || (lnum >= mod_top | |
| 1893 && (lnum < mod_bot | |
| 1894 #ifdef FEAT_SYN_HL | |
| 1895 || did_update == DID_FOLD | |
| 1896 || (did_update == DID_LINE | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
1897 && syntax_present(wp) |
| 7 | 1898 && ( |
| 1899 # ifdef FEAT_FOLDING | |
| 1900 (foldmethodIsSyntax(wp) | |
| 1901 && hasAnyFolding(wp)) || | |
| 1902 # endif | |
| 1903 syntax_check_changed(lnum))) | |
| 1904 #endif | |
|
4916
ba328b4a990e
updated for version 7.3.1203
Bram Moolenaar <bram@vim.org>
parents:
4805
diff
changeset
|
1905 #ifdef FEAT_SEARCH_EXTRA |
| 6018 | 1906 /* match in fixed position might need redraw |
| 1907 * if lines were inserted or deleted */ | |
| 1908 || (wp->w_match_head != NULL | |
| 1909 && buf->b_mod_xlines != 0) | |
|
4916
ba328b4a990e
updated for version 7.3.1203
Bram Moolenaar <bram@vim.org>
parents:
4805
diff
changeset
|
1910 #endif |
| 7 | 1911 ))))) |
| 1912 { | |
| 1913 #ifdef FEAT_SEARCH_EXTRA | |
| 1914 if (lnum == mod_top) | |
| 1915 top_to_mod = FALSE; | |
| 1916 #endif | |
| 1917 | |
| 1918 /* | |
| 1919 * When at start of changed lines: May scroll following lines | |
| 1920 * up or down to minimize redrawing. | |
| 1921 * Don't do this when the change continues until the end. | |
| 3318 | 1922 * Don't scroll when dollar_vcol >= 0, keep the "$". |
| 7 | 1923 */ |
| 1924 if (lnum == mod_top | |
| 1925 && mod_bot != MAXLNUM | |
| 3318 | 1926 && !(dollar_vcol >= 0 && mod_bot == mod_top + 1)) |
| 7 | 1927 { |
| 1928 int old_rows = 0; | |
| 1929 int new_rows = 0; | |
| 1930 int xtra_rows; | |
| 1931 linenr_T l; | |
| 1932 | |
| 1933 /* Count the old number of window rows, using w_lines[], which | |
| 1934 * should still contain the sizes for the lines as they are | |
| 1935 * currently displayed. */ | |
| 1936 for (i = idx; i < wp->w_lines_valid; ++i) | |
| 1937 { | |
| 1938 /* Only valid lines have a meaningful wl_lnum. Invalid | |
| 1939 * lines are part of the changed area. */ | |
| 1940 if (wp->w_lines[i].wl_valid | |
| 1941 && wp->w_lines[i].wl_lnum == mod_bot) | |
| 1942 break; | |
| 1943 old_rows += wp->w_lines[i].wl_size; | |
| 1944 #ifdef FEAT_FOLDING | |
| 1945 if (wp->w_lines[i].wl_valid | |
| 1946 && wp->w_lines[i].wl_lastlnum + 1 == mod_bot) | |
| 1947 { | |
| 1948 /* Must have found the last valid entry above mod_bot. | |
| 1949 * Add following invalid entries. */ | |
| 1950 ++i; | |
| 1951 while (i < wp->w_lines_valid | |
| 1952 && !wp->w_lines[i].wl_valid) | |
| 1953 old_rows += wp->w_lines[i++].wl_size; | |
| 1954 break; | |
| 1955 } | |
| 1956 #endif | |
| 1957 } | |
| 1958 | |
| 1959 if (i >= wp->w_lines_valid) | |
| 1960 { | |
| 1961 /* We can't find a valid line below the changed lines, | |
| 1962 * need to redraw until the end of the window. | |
| 1963 * Inserting/deleting lines has no use. */ | |
| 1964 bot_start = 0; | |
| 1965 } | |
| 1966 else | |
| 1967 { | |
| 1968 /* Able to count old number of rows: Count new window | |
| 1969 * rows, and may insert/delete lines */ | |
| 1970 j = idx; | |
| 1971 for (l = lnum; l < mod_bot; ++l) | |
| 1972 { | |
| 1973 #ifdef FEAT_FOLDING | |
| 1974 if (hasFoldingWin(wp, l, NULL, &l, TRUE, NULL)) | |
| 1975 ++new_rows; | |
| 1976 else | |
| 1977 #endif | |
| 1978 #ifdef FEAT_DIFF | |
| 1979 if (l == wp->w_topline) | |
| 1980 new_rows += plines_win_nofill(wp, l, TRUE) | |
| 1981 + wp->w_topfill; | |
| 1982 else | |
| 1983 #endif | |
| 1984 new_rows += plines_win(wp, l, TRUE); | |
| 1985 ++j; | |
| 1986 if (new_rows > wp->w_height - row - 2) | |
| 1987 { | |
| 1988 /* it's getting too much, must redraw the rest */ | |
| 1989 new_rows = 9999; | |
| 1990 break; | |
| 1991 } | |
| 1992 } | |
| 1993 xtra_rows = new_rows - old_rows; | |
| 1994 if (xtra_rows < 0) | |
| 1995 { | |
| 1996 /* May scroll text up. If there is not enough | |
| 1997 * remaining text or scrolling fails, must redraw the | |
| 1998 * rest. If scrolling works, must redraw the text | |
| 1999 * below the scrolled text. */ | |
| 2000 if (row - xtra_rows >= wp->w_height - 2) | |
| 2001 mod_bot = MAXLNUM; | |
| 2002 else | |
| 2003 { | |
| 2004 check_for_delay(FALSE); | |
| 2005 if (win_del_lines(wp, row, | |
| 2006 -xtra_rows, FALSE, FALSE) == FAIL) | |
| 2007 mod_bot = MAXLNUM; | |
| 2008 else | |
| 2009 bot_start = wp->w_height + xtra_rows; | |
| 2010 } | |
| 2011 } | |
| 2012 else if (xtra_rows > 0) | |
| 2013 { | |
| 2014 /* May scroll text down. If there is not enough | |
| 2015 * remaining text of scrolling fails, must redraw the | |
| 2016 * rest. */ | |
| 2017 if (row + xtra_rows >= wp->w_height - 2) | |
| 2018 mod_bot = MAXLNUM; | |
| 2019 else | |
| 2020 { | |
| 2021 check_for_delay(FALSE); | |
| 2022 if (win_ins_lines(wp, row + old_rows, | |
| 2023 xtra_rows, FALSE, FALSE) == FAIL) | |
| 2024 mod_bot = MAXLNUM; | |
| 2025 else if (top_end > row + old_rows) | |
| 2026 /* Scrolled the part at the top that requires | |
| 2027 * updating down. */ | |
| 2028 top_end += xtra_rows; | |
| 2029 } | |
| 2030 } | |
| 2031 | |
| 2032 /* When not updating the rest, may need to move w_lines[] | |
| 2033 * entries. */ | |
| 2034 if (mod_bot != MAXLNUM && i != j) | |
| 2035 { | |
| 2036 if (j < i) | |
| 2037 { | |
| 2038 int x = row + new_rows; | |
| 2039 | |
| 2040 /* move entries in w_lines[] upwards */ | |
| 2041 for (;;) | |
| 2042 { | |
| 2043 /* stop at last valid entry in w_lines[] */ | |
| 2044 if (i >= wp->w_lines_valid) | |
| 2045 { | |
| 2046 wp->w_lines_valid = j; | |
| 2047 break; | |
| 2048 } | |
| 2049 wp->w_lines[j] = wp->w_lines[i]; | |
| 2050 /* stop at a line that won't fit */ | |
| 2051 if (x + (int)wp->w_lines[j].wl_size | |
| 2052 > wp->w_height) | |
| 2053 { | |
| 2054 wp->w_lines_valid = j + 1; | |
| 2055 break; | |
| 2056 } | |
| 2057 x += wp->w_lines[j++].wl_size; | |
| 2058 ++i; | |
| 2059 } | |
| 2060 if (bot_start > x) | |
| 2061 bot_start = x; | |
| 2062 } | |
| 2063 else /* j > i */ | |
| 2064 { | |
| 2065 /* move entries in w_lines[] downwards */ | |
| 2066 j -= i; | |
| 2067 wp->w_lines_valid += j; | |
| 2068 if (wp->w_lines_valid > wp->w_height) | |
| 2069 wp->w_lines_valid = wp->w_height; | |
| 2070 for (i = wp->w_lines_valid; i - j >= idx; --i) | |
| 2071 wp->w_lines[i] = wp->w_lines[i - j]; | |
| 2072 | |
| 2073 /* The w_lines[] entries for inserted lines are | |
| 2074 * now invalid, but wl_size may be used above. | |
| 2075 * Reset to zero. */ | |
| 2076 while (i >= idx) | |
| 2077 { | |
| 2078 wp->w_lines[i].wl_size = 0; | |
| 2079 wp->w_lines[i--].wl_valid = FALSE; | |
| 2080 } | |
| 2081 } | |
| 2082 } | |
| 2083 } | |
| 2084 } | |
| 2085 | |
| 2086 #ifdef FEAT_FOLDING | |
| 2087 /* | |
| 2088 * When lines are folded, display one line for all of them. | |
| 2089 * Otherwise, display normally (can be several display lines when | |
| 2090 * 'wrap' is on). | |
| 2091 */ | |
| 2092 fold_count = foldedCount(wp, lnum, &win_foldinfo); | |
| 2093 if (fold_count != 0) | |
| 2094 { | |
| 2095 fold_line(wp, fold_count, &win_foldinfo, lnum, row); | |
| 2096 ++row; | |
| 2097 --fold_count; | |
| 2098 wp->w_lines[idx].wl_folded = TRUE; | |
| 2099 wp->w_lines[idx].wl_lastlnum = lnum + fold_count; | |
| 2100 # ifdef FEAT_SYN_HL | |
| 2101 did_update = DID_FOLD; | |
| 2102 # endif | |
| 2103 } | |
| 2104 else | |
| 2105 #endif | |
| 2106 if (idx < wp->w_lines_valid | |
| 2107 && wp->w_lines[idx].wl_valid | |
| 2108 && wp->w_lines[idx].wl_lnum == lnum | |
| 2109 && lnum > wp->w_topline | |
|
9665
b193bdb6ea25
commit https://github.com/vim/vim/commit/ad9c2a08f0509294269a2f11a59a438b944bdd5a
Christian Brabandt <cb@256bit.org>
parents:
9649
diff
changeset
|
2110 && !(dy_flags & (DY_LASTLINE | DY_TRUNCATE)) |
| 7 | 2111 && srow + wp->w_lines[idx].wl_size > wp->w_height |
| 2112 #ifdef FEAT_DIFF | |
| 2113 && diff_check_fill(wp, lnum) == 0 | |
| 2114 #endif | |
| 2115 ) | |
| 2116 { | |
| 2117 /* This line is not going to fit. Don't draw anything here, | |
| 2118 * will draw "@ " lines below. */ | |
| 2119 row = wp->w_height + 1; | |
| 2120 } | |
| 2121 else | |
| 2122 { | |
| 2123 #ifdef FEAT_SEARCH_EXTRA | |
| 2124 prepare_search_hl(wp, lnum); | |
| 2125 #endif | |
| 2126 #ifdef FEAT_SYN_HL | |
| 2127 /* Let the syntax stuff know we skipped a few lines. */ | |
| 2128 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
|
2129 && syntax_present(wp)) |
| 7 | 2130 syntax_end_parsing(syntax_last_parsed + 1); |
| 2131 #endif | |
| 2132 | |
| 2133 /* | |
| 2134 * Display one line. | |
| 2135 */ | |
|
11529
998d2cf59caa
patch 8.0.0647: syntax highlighting can make cause a freeze
Christian Brabandt <cb@256bit.org>
parents:
11521
diff
changeset
|
2136 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
|
2137 #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
|
2138 &syntax_tm |
|
998d2cf59caa
patch 8.0.0647: syntax highlighting can make cause a freeze
Christian Brabandt <cb@256bit.org>
parents:
11521
diff
changeset
|
2139 #else |
|
998d2cf59caa
patch 8.0.0647: syntax highlighting can make cause a freeze
Christian Brabandt <cb@256bit.org>
parents:
11521
diff
changeset
|
2140 NULL |
|
998d2cf59caa
patch 8.0.0647: syntax highlighting can make cause a freeze
Christian Brabandt <cb@256bit.org>
parents:
11521
diff
changeset
|
2141 #endif |
|
998d2cf59caa
patch 8.0.0647: syntax highlighting can make cause a freeze
Christian Brabandt <cb@256bit.org>
parents:
11521
diff
changeset
|
2142 ); |
| 7 | 2143 |
| 2144 #ifdef FEAT_FOLDING | |
| 2145 wp->w_lines[idx].wl_folded = FALSE; | |
| 2146 wp->w_lines[idx].wl_lastlnum = lnum; | |
| 2147 #endif | |
| 2148 #ifdef FEAT_SYN_HL | |
| 2149 did_update = DID_LINE; | |
| 2150 syntax_last_parsed = lnum; | |
| 2151 #endif | |
| 2152 } | |
| 2153 | |
| 2154 wp->w_lines[idx].wl_lnum = lnum; | |
| 2155 wp->w_lines[idx].wl_valid = TRUE; | |
| 2156 if (row > wp->w_height) /* past end of screen */ | |
| 2157 { | |
| 2158 /* we may need the size of that too long line later on */ | |
| 3318 | 2159 if (dollar_vcol == -1) |
| 7 | 2160 wp->w_lines[idx].wl_size = plines_win(wp, lnum, TRUE); |
| 2161 ++idx; | |
| 2162 break; | |
| 2163 } | |
| 3318 | 2164 if (dollar_vcol == -1) |
| 7 | 2165 wp->w_lines[idx].wl_size = row - srow; |
| 2166 ++idx; | |
| 2167 #ifdef FEAT_FOLDING | |
| 2168 lnum += fold_count + 1; | |
| 2169 #else | |
| 2170 ++lnum; | |
| 2171 #endif | |
| 2172 } | |
| 2173 else | |
| 2174 { | |
| 2175 /* This line does not need updating, advance to the next one */ | |
| 2176 row += wp->w_lines[idx++].wl_size; | |
| 2177 if (row > wp->w_height) /* past end of screen */ | |
| 2178 break; | |
| 2179 #ifdef FEAT_FOLDING | |
| 2180 lnum = wp->w_lines[idx - 1].wl_lastlnum + 1; | |
| 2181 #else | |
| 2182 ++lnum; | |
| 2183 #endif | |
| 2184 #ifdef FEAT_SYN_HL | |
| 2185 did_update = DID_NONE; | |
| 2186 #endif | |
| 2187 } | |
| 2188 | |
| 2189 if (lnum > buf->b_ml.ml_line_count) | |
| 2190 { | |
| 2191 eof = TRUE; | |
| 2192 break; | |
| 2193 } | |
| 2194 } | |
| 2195 /* | |
| 2196 * End of loop over all window lines. | |
| 2197 */ | |
| 2198 | |
| 2199 | |
| 2200 if (idx > wp->w_lines_valid) | |
| 2201 wp->w_lines_valid = idx; | |
| 2202 | |
| 2203 #ifdef FEAT_SYN_HL | |
| 2204 /* | |
| 2205 * Let the syntax stuff know we stop parsing here. | |
| 2206 */ | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
2207 if (syntax_last_parsed != 0 && syntax_present(wp)) |
| 7 | 2208 syntax_end_parsing(syntax_last_parsed + 1); |
| 2209 #endif | |
| 2210 | |
| 2211 /* | |
| 2212 * If we didn't hit the end of the file, and we didn't finish the last | |
| 2213 * line we were working on, then the line didn't fit. | |
| 2214 */ | |
| 2215 wp->w_empty_rows = 0; | |
| 2216 #ifdef FEAT_DIFF | |
| 2217 wp->w_filler_rows = 0; | |
| 2218 #endif | |
| 2219 if (!eof && !didline) | |
| 2220 { | |
| 2221 if (lnum == wp->w_topline) | |
| 2222 { | |
| 2223 /* | |
| 2224 * Single line that does not fit! | |
| 2225 * Don't overwrite it, it can be edited. | |
| 2226 */ | |
| 2227 wp->w_botline = lnum + 1; | |
| 2228 } | |
| 2229 #ifdef FEAT_DIFF | |
| 2230 else if (diff_check_fill(wp, lnum) >= wp->w_height - srow) | |
| 2231 { | |
| 2232 /* Window ends in filler lines. */ | |
| 2233 wp->w_botline = lnum; | |
| 2234 wp->w_filler_rows = wp->w_height - srow; | |
| 2235 } | |
| 2236 #endif | |
|
9665
b193bdb6ea25
commit https://github.com/vim/vim/commit/ad9c2a08f0509294269a2f11a59a438b944bdd5a
Christian Brabandt <cb@256bit.org>
parents:
9649
diff
changeset
|
2237 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
|
2238 { |
|
b193bdb6ea25
commit https://github.com/vim/vim/commit/ad9c2a08f0509294269a2f11a59a438b944bdd5a
Christian Brabandt <cb@256bit.org>
parents:
9649
diff
changeset
|
2239 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
|
2240 |
|
b193bdb6ea25
commit https://github.com/vim/vim/commit/ad9c2a08f0509294269a2f11a59a438b944bdd5a
Christian Brabandt <cb@256bit.org>
parents:
9649
diff
changeset
|
2241 /* |
|
b193bdb6ea25
commit https://github.com/vim/vim/commit/ad9c2a08f0509294269a2f11a59a438b944bdd5a
Christian Brabandt <cb@256bit.org>
parents:
9649
diff
changeset
|
2242 * 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
|
2243 */ |
|
b193bdb6ea25
commit https://github.com/vim/vim/commit/ad9c2a08f0509294269a2f11a59a438b944bdd5a
Christian Brabandt <cb@256bit.org>
parents:
9649
diff
changeset
|
2244 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
|
2245 HL_ATTR(HLF_AT)); |
|
9665
b193bdb6ea25
commit https://github.com/vim/vim/commit/ad9c2a08f0509294269a2f11a59a438b944bdd5a
Christian Brabandt <cb@256bit.org>
parents:
9649
diff
changeset
|
2246 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
|
2247 (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
|
2248 '@', ' ', HL_ATTR(HLF_AT)); |
|
9665
b193bdb6ea25
commit https://github.com/vim/vim/commit/ad9c2a08f0509294269a2f11a59a438b944bdd5a
Christian Brabandt <cb@256bit.org>
parents:
9649
diff
changeset
|
2249 set_empty_rows(wp, srow); |
|
b193bdb6ea25
commit https://github.com/vim/vim/commit/ad9c2a08f0509294269a2f11a59a438b944bdd5a
Christian Brabandt <cb@256bit.org>
parents:
9649
diff
changeset
|
2250 wp->w_botline = lnum; |
|
b193bdb6ea25
commit https://github.com/vim/vim/commit/ad9c2a08f0509294269a2f11a59a438b944bdd5a
Christian Brabandt <cb@256bit.org>
parents:
9649
diff
changeset
|
2251 } |
| 7 | 2252 else if (dy_flags & DY_LASTLINE) /* 'display' has "lastline" */ |
| 2253 { | |
| 2254 /* | |
| 2255 * Last line isn't finished: Display "@@@" at the end. | |
| 2256 */ | |
| 2257 screen_fill(W_WINROW(wp) + wp->w_height - 1, | |
| 2258 W_WINROW(wp) + wp->w_height, | |
| 2259 (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
|
2260 '@', '@', HL_ATTR(HLF_AT)); |
| 7 | 2261 set_empty_rows(wp, srow); |
| 2262 wp->w_botline = lnum; | |
| 2263 } | |
| 2264 else | |
| 2265 { | |
| 2266 win_draw_end(wp, '@', ' ', srow, wp->w_height, HLF_AT); | |
| 2267 wp->w_botline = lnum; | |
| 2268 } | |
| 2269 } | |
| 2270 else | |
| 2271 { | |
|
8643
24b43dd167eb
commit https://github.com/vim/vim/commit/44a2f923c00f1384c9ecde12fb5b4711bc20702e
Christian Brabandt <cb@256bit.org>
parents:
8627
diff
changeset
|
2272 #ifdef FEAT_WINDOWS |
| 7 | 2273 draw_vsep_win(wp, row); |
| 2274 #endif | |
| 2275 if (eof) /* we hit the end of the file */ | |
| 2276 { | |
| 2277 wp->w_botline = buf->b_ml.ml_line_count + 1; | |
| 2278 #ifdef FEAT_DIFF | |
| 2279 j = diff_check_fill(wp, wp->w_botline); | |
| 2280 if (j > 0 && !wp->w_botfill) | |
| 2281 { | |
| 2282 /* | |
| 2283 * Display filler lines at the end of the file | |
| 2284 */ | |
| 2285 if (char2cells(fill_diff) > 1) | |
| 2286 i = '-'; | |
| 2287 else | |
| 2288 i = fill_diff; | |
| 2289 if (row + j > wp->w_height) | |
| 2290 j = wp->w_height - row; | |
| 2291 win_draw_end(wp, i, i, row, row + (int)j, HLF_DED); | |
| 2292 row += j; | |
| 2293 } | |
| 2294 #endif | |
| 2295 } | |
| 3318 | 2296 else if (dollar_vcol == -1) |
| 7 | 2297 wp->w_botline = lnum; |
| 2298 | |
| 2299 /* make sure the rest of the screen is blank */ | |
| 2300 /* 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
|
2301 win_draw_end(wp, '~', ' ', row, wp->w_height, HLF_EOB); |
| 7 | 2302 } |
| 2303 | |
| 2304 /* Reset the type of redrawing required, the window has been updated. */ | |
| 2305 wp->w_redr_type = 0; | |
| 2306 #ifdef FEAT_DIFF | |
| 2307 wp->w_old_topfill = wp->w_topfill; | |
| 2308 wp->w_old_botfill = wp->w_botfill; | |
| 2309 #endif | |
| 2310 | |
| 3318 | 2311 if (dollar_vcol == -1) |
| 7 | 2312 { |
| 2313 /* | |
| 2314 * There is a trick with w_botline. If we invalidate it on each | |
| 2315 * change that might modify it, this will cause a lot of expensive | |
| 2316 * calls to plines() in update_topline() each time. Therefore the | |
| 2317 * value of w_botline is often approximated, and this value is used to | |
| 2318 * compute the value of w_topline. If the value of w_botline was | |
| 2319 * wrong, check that the value of w_topline is correct (cursor is on | |
| 2320 * the visible part of the text). If it's not, we need to redraw | |
| 2321 * again. Mostly this just means scrolling up a few lines, so it | |
| 2322 * doesn't look too bad. Only do this for the current window (where | |
| 2323 * changes are relevant). | |
| 2324 */ | |
| 2325 wp->w_valid |= VALID_BOTLINE; | |
| 2326 if (wp == curwin && wp->w_botline != old_botline && !recursive) | |
| 2327 { | |
| 2328 recursive = TRUE; | |
| 2329 curwin->w_valid &= ~VALID_TOPLINE; | |
| 2330 update_topline(); /* may invalidate w_botline again */ | |
| 2331 if (must_redraw != 0) | |
| 2332 { | |
| 2333 /* Don't update for changes in buffer again. */ | |
| 2334 i = curbuf->b_mod_set; | |
| 2335 curbuf->b_mod_set = FALSE; | |
| 2336 win_update(curwin); | |
| 2337 must_redraw = 0; | |
| 2338 curbuf->b_mod_set = i; | |
| 2339 } | |
| 2340 recursive = FALSE; | |
| 2341 } | |
| 2342 } | |
| 2343 | |
| 2344 #if defined(FEAT_SYN_HL) || defined(FEAT_SEARCH_EXTRA) | |
| 2345 /* restore got_int, unless CTRL-C was hit while redrawing */ | |
| 2346 if (!got_int) | |
| 2347 got_int = save_got_int; | |
| 2348 #endif | |
| 2349 } | |
| 2350 | |
| 2351 /* | |
| 2352 * Clear the rest of the window and mark the unused lines with "c1". use "c2" | |
| 2353 * as the filler character. | |
| 2354 */ | |
| 2355 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2356 win_draw_end( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2357 win_T *wp, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2358 int c1, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2359 int c2, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2360 int row, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2361 int endrow, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2362 hlf_T hl) |
| 7 | 2363 { |
| 2364 #if defined(FEAT_FOLDING) || defined(FEAT_SIGNS) || defined(FEAT_CMDWIN) | |
| 2365 int n = 0; | |
| 2366 # define FDC_OFF n | |
| 2367 #else | |
| 2368 # define FDC_OFF 0 | |
| 2369 #endif | |
| 6553 | 2370 #ifdef FEAT_FOLDING |
| 2371 int fdc = compute_foldcolumn(wp, 0); | |
| 2372 #endif | |
| 7 | 2373 |
| 2374 #ifdef FEAT_RIGHTLEFT | |
| 2375 if (wp->w_p_rl) | |
| 2376 { | |
| 2377 /* No check for cmdline window: should never be right-left. */ | |
| 2378 # ifdef FEAT_FOLDING | |
| 6553 | 2379 n = fdc; |
| 7 | 2380 |
| 2381 if (n > 0) | |
| 2382 { | |
| 2383 /* draw the fold column at the right */ | |
| 119 | 2384 if (n > W_WIDTH(wp)) |
| 2385 n = W_WIDTH(wp); | |
| 7 | 2386 screen_fill(W_WINROW(wp) + row, W_WINROW(wp) + endrow, |
| 2387 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
|
2388 ' ', ' ', HL_ATTR(HLF_FC)); |
| 7 | 2389 } |
| 2390 # endif | |
| 2391 # ifdef FEAT_SIGNS | |
|
9852
4eea48b76d03
commit https://github.com/vim/vim/commit/95ec9d6a6ab3117d60ff638670a803d43974ba51
Christian Brabandt <cb@256bit.org>
parents:
9848
diff
changeset
|
2392 if (signcolumn_on(wp)) |
| 7 | 2393 { |
| 2394 int nn = n + 2; | |
| 2395 | |
| 2396 /* draw the sign column left of the fold column */ | |
| 119 | 2397 if (nn > W_WIDTH(wp)) |
| 2398 nn = W_WIDTH(wp); | |
| 7 | 2399 screen_fill(W_WINROW(wp) + row, W_WINROW(wp) + endrow, |
| 2400 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
|
2401 ' ', ' ', HL_ATTR(HLF_SC)); |
| 7 | 2402 n = nn; |
| 2403 } | |
| 2404 # endif | |
| 2405 screen_fill(W_WINROW(wp) + row, W_WINROW(wp) + endrow, | |
| 2406 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
|
2407 c2, c2, HL_ATTR(hl)); |
| 7 | 2408 screen_fill(W_WINROW(wp) + row, W_WINROW(wp) + endrow, |
| 2409 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
|
2410 c1, c2, HL_ATTR(hl)); |
| 7 | 2411 } |
| 2412 else | |
| 2413 #endif | |
| 2414 { | |
| 2415 #ifdef FEAT_CMDWIN | |
| 2416 if (cmdwin_type != 0 && wp == curwin) | |
| 2417 { | |
| 2418 /* draw the cmdline character in the leftmost column */ | |
| 2419 n = 1; | |
| 2420 if (n > wp->w_width) | |
| 2421 n = wp->w_width; | |
| 2422 screen_fill(W_WINROW(wp) + row, W_WINROW(wp) + endrow, | |
| 2423 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
|
2424 cmdwin_type, ' ', HL_ATTR(HLF_AT)); |
| 7 | 2425 } |
| 2426 #endif | |
| 2427 #ifdef FEAT_FOLDING | |
| 6553 | 2428 if (fdc > 0) |
| 2429 { | |
| 2430 int nn = n + fdc; | |
| 7 | 2431 |
| 2432 /* draw the fold column at the left */ | |
| 2433 if (nn > W_WIDTH(wp)) | |
| 2434 nn = W_WIDTH(wp); | |
| 2435 screen_fill(W_WINROW(wp) + row, W_WINROW(wp) + endrow, | |
| 2436 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
|
2437 ' ', ' ', HL_ATTR(HLF_FC)); |
| 7 | 2438 n = nn; |
| 2439 } | |
| 2440 #endif | |
| 2441 #ifdef FEAT_SIGNS | |
|
9852
4eea48b76d03
commit https://github.com/vim/vim/commit/95ec9d6a6ab3117d60ff638670a803d43974ba51
Christian Brabandt <cb@256bit.org>
parents:
9848
diff
changeset
|
2442 if (signcolumn_on(wp)) |
| 7 | 2443 { |
| 2444 int nn = n + 2; | |
| 2445 | |
| 2446 /* draw the sign column after the fold column */ | |
| 2447 if (nn > W_WIDTH(wp)) | |
| 2448 nn = W_WIDTH(wp); | |
| 2449 screen_fill(W_WINROW(wp) + row, W_WINROW(wp) + endrow, | |
| 2450 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
|
2451 ' ', ' ', HL_ATTR(HLF_SC)); |
| 7 | 2452 n = nn; |
| 2453 } | |
| 2454 #endif | |
| 2455 screen_fill(W_WINROW(wp) + row, W_WINROW(wp) + endrow, | |
| 2456 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
|
2457 c1, c2, HL_ATTR(hl)); |
| 7 | 2458 } |
| 2459 set_empty_rows(wp, row); | |
| 2460 } | |
| 2461 | |
|
2314
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
2462 #ifdef FEAT_SYN_HL |
|
7805
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7697
diff
changeset
|
2463 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
|
2464 |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
2465 /* |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
2466 * 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
|
2467 */ |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
2468 static int |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2469 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
|
2470 { |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
2471 while (**color_cols >= 0 && vcol > **color_cols) |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
2472 ++*color_cols; |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
2473 return (**color_cols >= 0); |
|
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 #endif |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
2476 |
| 7 | 2477 #ifdef FEAT_FOLDING |
| 2478 /* | |
| 6553 | 2479 * Compute the width of the foldcolumn. Based on 'foldcolumn' and how much |
| 2480 * space is available for window "wp", minus "col". | |
| 2481 */ | |
| 2482 static int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2483 compute_foldcolumn(win_T *wp, int col) |
| 6553 | 2484 { |
| 2485 int fdc = wp->w_p_fdc; | |
| 2486 int wmw = wp == curwin && p_wmw == 0 ? 1 : p_wmw; | |
| 2487 int wwidth = W_WIDTH(wp); | |
| 2488 | |
| 2489 if (fdc > wwidth - (col + wmw)) | |
| 2490 fdc = wwidth - (col + wmw); | |
| 2491 return fdc; | |
| 2492 } | |
| 2493 | |
| 2494 /* | |
| 7 | 2495 * Display one folded line. |
| 2496 */ | |
| 2497 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2498 fold_line( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2499 win_T *wp, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2500 long fold_count, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2501 foldinfo_T *foldinfo, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2502 linenr_T lnum, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2503 int row) |
| 7 | 2504 { |
|
9754
a990e7ed260b
commit https://github.com/vim/vim/commit/ee695f787ade7fd88fc5f5497553d95c0c3645b5
Christian Brabandt <cb@256bit.org>
parents:
9665
diff
changeset
|
2505 char_u buf[FOLD_TEXT_LEN]; |
| 7 | 2506 pos_T *top, *bot; |
| 2507 linenr_T lnume = lnum + fold_count - 1; | |
| 2508 int len; | |
| 29 | 2509 char_u *text; |
| 7 | 2510 int fdc; |
| 2511 int col; | |
| 2512 int txtcol; | |
| 2513 int off = (int)(current_ScreenLine - ScreenLines); | |
| 216 | 2514 int ri; |
| 7 | 2515 |
| 2516 /* Build the fold line: | |
| 2517 * 1. Add the cmdwin_type for the command-line window | |
| 2518 * 2. Add the 'foldcolumn' | |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
2519 * 3. Add the 'number' or 'relativenumber' column |
| 7 | 2520 * 4. Compose the text |
| 2521 * 5. Add the text | |
| 2522 * 6. set highlighting for the Visual area an other text | |
| 2523 */ | |
| 2524 col = 0; | |
| 2525 | |
| 2526 /* | |
| 2527 * 1. Add the cmdwin_type for the command-line window | |
| 2528 * Ignores 'rightleft', this window is never right-left. | |
| 2529 */ | |
| 2530 #ifdef FEAT_CMDWIN | |
| 2531 if (cmdwin_type != 0 && wp == curwin) | |
| 2532 { | |
| 2533 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
|
2534 ScreenAttrs[off] = HL_ATTR(HLF_AT); |
| 7 | 2535 #ifdef FEAT_MBYTE |
| 2536 if (enc_utf8) | |
| 2537 ScreenLinesUC[off] = 0; | |
| 2538 #endif | |
| 2539 ++col; | |
| 2540 } | |
| 2541 #endif | |
| 2542 | |
| 2543 /* | |
| 2544 * 2. Add the 'foldcolumn' | |
| 6553 | 2545 * Reduce the width when there is not enough space. |
| 7 | 2546 */ |
| 6553 | 2547 fdc = compute_foldcolumn(wp, col); |
| 7 | 2548 if (fdc > 0) |
| 2549 { | |
| 2550 fill_foldcolumn(buf, wp, TRUE, lnum); | |
| 2551 #ifdef FEAT_RIGHTLEFT | |
| 2552 if (wp->w_p_rl) | |
| 2553 { | |
| 2554 int i; | |
| 2555 | |
| 2556 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
|
2557 HL_ATTR(HLF_FC)); |
| 7 | 2558 /* reverse the fold column */ |
| 2559 for (i = 0; i < fdc; ++i) | |
| 2560 ScreenLines[off + W_WIDTH(wp) - i - 1 - col] = buf[i]; | |
| 2561 } | |
| 2562 else | |
| 2563 #endif | |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
2564 copy_text_attr(off + col, buf, fdc, HL_ATTR(HLF_FC)); |
| 7 | 2565 col += fdc; |
| 2566 } | |
| 2567 | |
| 2568 #ifdef FEAT_RIGHTLEFT | |
| 216 | 2569 # define RL_MEMSET(p, v, l) if (wp->w_p_rl) \ |
| 2570 for (ri = 0; ri < l; ++ri) \ | |
| 2571 ScreenAttrs[off + (W_WIDTH(wp) - (p) - (l)) + ri] = v; \ | |
| 2572 else \ | |
| 2573 for (ri = 0; ri < l; ++ri) \ | |
| 2574 ScreenAttrs[off + (p) + ri] = v | |
| 7 | 2575 #else |
| 216 | 2576 # define RL_MEMSET(p, v, l) for (ri = 0; ri < l; ++ri) \ |
| 2577 ScreenAttrs[off + (p) + ri] = v | |
| 7 | 2578 #endif |
| 2579 | |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
2580 /* 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
|
2581 * text */ |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
2582 RL_MEMSET(col, HL_ATTR(HLF_FL), W_WIDTH(wp) - col); |
| 7 | 2583 |
| 2584 #ifdef FEAT_SIGNS | |
| 2585 /* 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
|
2586 if (signcolumn_on(wp)) |
| 7 | 2587 { |
| 2588 len = W_WIDTH(wp) - col; | |
| 2589 if (len > 0) | |
| 2590 { | |
| 2591 if (len > 2) | |
| 2592 len = 2; | |
| 2593 # ifdef FEAT_RIGHTLEFT | |
| 2594 if (wp->w_p_rl) | |
| 2595 /* the line number isn't reversed */ | |
| 2596 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
|
2597 (char_u *)" ", len, HL_ATTR(HLF_FL)); |
| 7 | 2598 else |
| 2599 # endif | |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
2600 copy_text_attr(off + col, (char_u *)" ", len, HL_ATTR(HLF_FL)); |
| 7 | 2601 col += len; |
| 2602 } | |
| 2603 } | |
| 2604 #endif | |
| 2605 | |
| 2606 /* | |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
2607 * 3. Add the 'number' or 'relativenumber' column |
| 7 | 2608 */ |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
2609 if (wp->w_p_nu || wp->w_p_rnu) |
| 7 | 2610 { |
| 2611 len = W_WIDTH(wp) - col; | |
| 2612 if (len > 0) | |
| 2613 { | |
| 13 | 2614 int w = number_width(wp); |
| 5905 | 2615 long num; |
| 2616 char *fmt = "%*ld "; | |
| 13 | 2617 |
| 2618 if (len > w + 1) | |
| 2619 len = w + 1; | |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
2620 |
|
4736
3f2319a953b3
updated for version 7.3.1115
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
2621 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
|
2622 /* 'number' + 'norelativenumber' */ |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
2623 num = (long)lnum; |
|
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
2624 else |
| 4065 | 2625 { |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
2626 /* 'relativenumber', don't use negative numbers */ |
| 2675 | 2627 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
|
2628 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
|
2629 { |
|
3f2319a953b3
updated for version 7.3.1115
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
2630 /* 'number' + 'relativenumber': cursor line shows absolute |
|
3f2319a953b3
updated for version 7.3.1115
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
2631 * line number */ |
| 4065 | 2632 num = lnum; |
| 2633 fmt = "%-*ld "; | |
| 2634 } | |
| 2635 } | |
| 2636 | |
| 2637 sprintf((char *)buf, fmt, w, num); | |
| 7 | 2638 #ifdef FEAT_RIGHTLEFT |
| 2639 if (wp->w_p_rl) | |
| 2640 /* the line number isn't reversed */ | |
| 2641 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
|
2642 HL_ATTR(HLF_FL)); |
| 7 | 2643 else |
| 2644 #endif | |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
2645 copy_text_attr(off + col, buf, len, HL_ATTR(HLF_FL)); |
| 7 | 2646 col += len; |
| 2647 } | |
| 2648 } | |
| 2649 | |
| 2650 /* | |
| 2651 * 4. Compose the folded-line string with 'foldtext', if set. | |
| 2652 */ | |
| 29 | 2653 text = get_foldtext(wp, lnum, lnume, foldinfo, buf); |
| 7 | 2654 |
| 2655 txtcol = col; /* remember where text starts */ | |
| 2656 | |
| 2657 /* | |
| 2658 * 5. move the text to current_ScreenLine. Fill up with "fill_fold". | |
| 2659 * Right-left text is put in columns 0 - number-col, normal text is put | |
| 2660 * in columns number-col - window-width. | |
| 2661 */ | |
| 2662 #ifdef FEAT_MBYTE | |
| 2663 if (has_mbyte) | |
| 2664 { | |
| 2665 int cells; | |
| 714 | 2666 int u8c, u8cc[MAX_MCO]; |
| 2667 int i; | |
| 7 | 2668 int idx; |
| 2669 int c_len; | |
| 33 | 2670 char_u *p; |
| 7 | 2671 # ifdef FEAT_ARABIC |
| 2672 int prev_c = 0; /* previous Arabic character */ | |
| 2673 int prev_c1 = 0; /* first composing char for prev_c */ | |
| 2674 # endif | |
| 2675 | |
| 2676 # ifdef FEAT_RIGHTLEFT | |
| 2677 if (wp->w_p_rl) | |
| 2678 idx = off; | |
| 2679 else | |
| 2680 # endif | |
| 2681 idx = off + col; | |
| 2682 | |
| 2683 /* Store multibyte characters in ScreenLines[] et al. correctly. */ | |
| 2684 for (p = text; *p != NUL; ) | |
| 2685 { | |
| 2686 cells = (*mb_ptr2cells)(p); | |
| 474 | 2687 c_len = (*mb_ptr2len)(p); |
| 7 | 2688 if (col + cells > W_WIDTH(wp) |
| 2689 # ifdef FEAT_RIGHTLEFT | |
| 2690 - (wp->w_p_rl ? col : 0) | |
| 2691 # endif | |
| 2692 ) | |
| 2693 break; | |
| 2694 ScreenLines[idx] = *p; | |
| 2695 if (enc_utf8) | |
| 2696 { | |
| 714 | 2697 u8c = utfc_ptr2char(p, u8cc); |
| 2698 if (*p < 0x80 && u8cc[0] == 0) | |
| 7 | 2699 { |
| 2700 ScreenLinesUC[idx] = 0; | |
| 2701 #ifdef FEAT_ARABIC | |
| 2702 prev_c = u8c; | |
| 2703 #endif | |
| 2704 } | |
| 2705 else | |
| 2706 { | |
| 2707 #ifdef FEAT_ARABIC | |
| 2708 if (p_arshape && !p_tbidi && ARABIC_CHAR(u8c)) | |
| 2709 { | |
| 2710 /* Do Arabic shaping. */ | |
| 714 | 2711 int pc, pc1, nc; |
| 2712 int pcc[MAX_MCO]; | |
| 7 | 2713 int firstbyte = *p; |
| 2714 | |
| 2715 /* The idea of what is the previous and next | |
| 2716 * character depends on 'rightleft'. */ | |
| 2717 if (wp->w_p_rl) | |
| 2718 { | |
| 2719 pc = prev_c; | |
| 2720 pc1 = prev_c1; | |
| 2721 nc = utf_ptr2char(p + c_len); | |
| 714 | 2722 prev_c1 = u8cc[0]; |
| 7 | 2723 } |
| 2724 else | |
| 2725 { | |
| 714 | 2726 pc = utfc_ptr2char(p + c_len, pcc); |
| 7 | 2727 nc = prev_c; |
| 714 | 2728 pc1 = pcc[0]; |
| 7 | 2729 } |
| 2730 prev_c = u8c; | |
| 2731 | |
| 714 | 2732 u8c = arabic_shape(u8c, &firstbyte, &u8cc[0], |
| 7 | 2733 pc, pc1, nc); |
| 2734 ScreenLines[idx] = firstbyte; | |
| 2735 } | |
| 2736 else | |
| 2737 prev_c = u8c; | |
| 2738 #endif | |
| 2739 /* Non-BMP character: display as ? or fullwidth ?. */ | |
| 1401 | 2740 #ifdef UNICODE16 |
| 7 | 2741 if (u8c >= 0x10000) |
| 2742 ScreenLinesUC[idx] = (cells == 2) ? 0xff1f : (int)'?'; | |
| 2743 else | |
| 1401 | 2744 #endif |
| 7 | 2745 ScreenLinesUC[idx] = u8c; |
| 714 | 2746 for (i = 0; i < Screen_mco; ++i) |
| 2747 { | |
| 2748 ScreenLinesC[i][idx] = u8cc[i]; | |
| 2749 if (u8cc[i] == 0) | |
| 2750 break; | |
| 2751 } | |
| 7 | 2752 } |
| 2753 if (cells > 1) | |
| 2754 ScreenLines[idx + 1] = 0; | |
| 2755 } | |
|
2069
63613d8d7e4d
updated for version 7.2.354
Bram Moolenaar <bram@zimbu.org>
parents:
2055
diff
changeset
|
2756 else if (enc_dbcs == DBCS_JPNU && *p == 0x8e) |
|
63613d8d7e4d
updated for version 7.2.354
Bram Moolenaar <bram@zimbu.org>
parents:
2055
diff
changeset
|
2757 /* double-byte single width character */ |
|
63613d8d7e4d
updated for version 7.2.354
Bram Moolenaar <bram@zimbu.org>
parents:
2055
diff
changeset
|
2758 ScreenLines2[idx] = p[1]; |
|
63613d8d7e4d
updated for version 7.2.354
Bram Moolenaar <bram@zimbu.org>
parents:
2055
diff
changeset
|
2759 else if (cells > 1) |
|
63613d8d7e4d
updated for version 7.2.354
Bram Moolenaar <bram@zimbu.org>
parents:
2055
diff
changeset
|
2760 /* double-width character */ |
|
63613d8d7e4d
updated for version 7.2.354
Bram Moolenaar <bram@zimbu.org>
parents:
2055
diff
changeset
|
2761 ScreenLines[idx + 1] = p[1]; |
| 7 | 2762 col += cells; |
| 2763 idx += cells; | |
| 2764 p += c_len; | |
| 2765 } | |
| 2766 } | |
| 2767 else | |
| 2768 #endif | |
| 2769 { | |
| 2770 len = (int)STRLEN(text); | |
| 2771 if (len > W_WIDTH(wp) - col) | |
| 2772 len = W_WIDTH(wp) - col; | |
| 2773 if (len > 0) | |
| 2774 { | |
| 2775 #ifdef FEAT_RIGHTLEFT | |
| 2776 if (wp->w_p_rl) | |
| 2777 STRNCPY(current_ScreenLine, text, len); | |
| 2778 else | |
| 2779 #endif | |
| 2780 STRNCPY(current_ScreenLine + col, text, len); | |
| 2781 col += len; | |
| 2782 } | |
| 2783 } | |
| 2784 | |
| 2785 /* Fill the rest of the line with the fold filler */ | |
| 2786 #ifdef FEAT_RIGHTLEFT | |
| 2787 if (wp->w_p_rl) | |
| 2788 col -= txtcol; | |
| 2789 #endif | |
| 2790 while (col < W_WIDTH(wp) | |
| 2791 #ifdef FEAT_RIGHTLEFT | |
| 2792 - (wp->w_p_rl ? txtcol : 0) | |
| 2793 #endif | |
| 2794 ) | |
| 2795 { | |
| 2796 #ifdef FEAT_MBYTE | |
| 2797 if (enc_utf8) | |
| 2798 { | |
| 2799 if (fill_fold >= 0x80) | |
| 2800 { | |
| 2801 ScreenLinesUC[off + col] = fill_fold; | |
| 714 | 2802 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
|
2803 ScreenLines[off + col] = 0x80; /* avoid storing zero */ |
| 7 | 2804 } |
| 2805 else | |
|
11277
f26a535d9464
patch 8.0.0524: folds messed up
Christian Brabandt <cb@256bit.org>
parents:
11269
diff
changeset
|
2806 { |
| 7 | 2807 ScreenLinesUC[off + col] = 0; |
|
11277
f26a535d9464
patch 8.0.0524: folds messed up
Christian Brabandt <cb@256bit.org>
parents:
11269
diff
changeset
|
2808 ScreenLines[off + col] = fill_fold; |
|
f26a535d9464
patch 8.0.0524: folds messed up
Christian Brabandt <cb@256bit.org>
parents:
11269
diff
changeset
|
2809 } |
|
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
|
2810 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
|
2811 } |
|
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
|
2812 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
|
2813 #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
|
2814 ScreenLines[off + col++] = fill_fold; |
| 7 | 2815 } |
| 2816 | |
| 2817 if (text != buf) | |
| 2818 vim_free(text); | |
| 2819 | |
| 2820 /* | |
| 2821 * 6. set highlighting for the Visual area an other text. | |
| 2822 * If all folded lines are in the Visual area, highlight the line. | |
| 2823 */ | |
| 2824 if (VIsual_active && wp->w_buffer == curwin->w_buffer) | |
| 2825 { | |
|
11121
778c10516955
patch 8.0.0448: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11105
diff
changeset
|
2826 if (LTOREQ_POS(curwin->w_cursor, VIsual)) |
| 7 | 2827 { |
| 2828 /* Visual is after curwin->w_cursor */ | |
| 2829 top = &curwin->w_cursor; | |
| 2830 bot = &VIsual; | |
| 2831 } | |
| 2832 else | |
| 2833 { | |
| 2834 /* Visual is before curwin->w_cursor */ | |
| 2835 top = &VIsual; | |
| 2836 bot = &curwin->w_cursor; | |
| 2837 } | |
| 2838 if (lnum >= top->lnum | |
| 2839 && lnume <= bot->lnum | |
| 2840 && (VIsual_mode != 'v' | |
| 2841 || ((lnum > top->lnum | |
| 2842 || (lnum == top->lnum | |
| 2843 && top->col == 0)) | |
| 2844 && (lnume < bot->lnum | |
| 2845 || (lnume == bot->lnum | |
| 2846 && (bot->col - (*p_sel == 'e')) | |
| 1883 | 2847 >= (colnr_T)STRLEN(ml_get_buf(wp->w_buffer, lnume, FALSE))))))) |
| 7 | 2848 { |
| 2849 if (VIsual_mode == Ctrl_V) | |
| 2850 { | |
| 2851 /* Visual block mode: highlight the chars part of the block */ | |
| 2852 if (wp->w_old_cursor_fcol + txtcol < (colnr_T)W_WIDTH(wp)) | |
| 2853 { | |
| 3040 | 2854 if (wp->w_old_cursor_lcol != MAXCOL |
| 2855 && wp->w_old_cursor_lcol + txtcol | |
| 2856 < (colnr_T)W_WIDTH(wp)) | |
| 7 | 2857 len = wp->w_old_cursor_lcol; |
| 2858 else | |
| 2859 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
|
2860 RL_MEMSET(wp->w_old_cursor_fcol + txtcol, HL_ATTR(HLF_V), |
| 230 | 2861 len - (int)wp->w_old_cursor_fcol); |
| 7 | 2862 } |
| 2863 } | |
| 2864 else | |
| 216 | 2865 { |
| 7 | 2866 /* 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
|
2867 RL_MEMSET(txtcol, HL_ATTR(HLF_V), W_WIDTH(wp) - txtcol); |
| 216 | 2868 } |
| 7 | 2869 } |
| 2870 } | |
| 2871 | |
| 743 | 2872 #ifdef FEAT_SYN_HL |
| 6685 | 2873 /* Show colorcolumn in the fold line, but let cursorcolumn override it. */ |
| 2874 if (wp->w_p_cc_cols) | |
| 2875 { | |
| 2876 int i = 0; | |
| 2877 int j = wp->w_p_cc_cols[i]; | |
| 2878 int old_txtcol = txtcol; | |
| 2879 | |
| 2880 while (j > -1) | |
| 2881 { | |
| 2882 txtcol += j; | |
| 2883 if (wp->w_p_wrap) | |
| 2884 txtcol -= wp->w_skipcol; | |
| 2885 else | |
| 2886 txtcol -= wp->w_leftcol; | |
| 2887 if (txtcol >= 0 && txtcol < W_WIDTH(wp)) | |
| 2888 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
|
2889 ScreenAttrs[off + txtcol], HL_ATTR(HLF_MC)); |
| 6685 | 2890 txtcol = old_txtcol; |
| 2891 j = wp->w_p_cc_cols[++i]; | |
| 2892 } | |
| 2893 } | |
| 2894 | |
| 743 | 2895 /* Show 'cursorcolumn' in the fold line. */ |
| 1725 | 2896 if (wp->w_p_cuc) |
| 2897 { | |
| 2898 txtcol += wp->w_virtcol; | |
| 2899 if (wp->w_p_wrap) | |
| 2900 txtcol -= wp->w_skipcol; | |
| 2901 else | |
| 2902 txtcol -= wp->w_leftcol; | |
| 2903 if (txtcol >= 0 && txtcol < W_WIDTH(wp)) | |
| 2904 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
|
2905 ScreenAttrs[off + txtcol], HL_ATTR(HLF_CUC)); |
| 1725 | 2906 } |
| 743 | 2907 #endif |
| 7 | 2908 |
|
11670
3b2afa2b77b3
patch 8.0.0718: output of job in terminal is not displayed
Christian Brabandt <cb@256bit.org>
parents:
11657
diff
changeset
|
2909 screen_line(row + W_WINROW(wp), W_WINCOL(wp), (int)W_WIDTH(wp), |
| 7 | 2910 (int)W_WIDTH(wp), FALSE); |
| 2911 | |
| 2912 /* | |
| 2913 * Update w_cline_height and w_cline_folded if the cursor line was | |
| 2914 * updated (saves a call to plines() later). | |
| 2915 */ | |
| 2916 if (wp == curwin | |
| 2917 && lnum <= curwin->w_cursor.lnum | |
| 2918 && lnume >= curwin->w_cursor.lnum) | |
| 2919 { | |
| 2920 curwin->w_cline_row = row; | |
| 2921 curwin->w_cline_height = 1; | |
| 2922 curwin->w_cline_folded = TRUE; | |
| 2923 curwin->w_valid |= (VALID_CHEIGHT|VALID_CROW); | |
| 2924 } | |
| 2925 } | |
| 2926 | |
| 2927 /* | |
| 2928 * Copy "buf[len]" to ScreenLines["off"] and set attributes to "attr". | |
| 2929 */ | |
| 2930 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2931 copy_text_attr( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2932 int off, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2933 char_u *buf, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2934 int len, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2935 int attr) |
| 7 | 2936 { |
| 216 | 2937 int i; |
| 2938 | |
| 7 | 2939 mch_memmove(ScreenLines + off, buf, (size_t)len); |
| 2940 # ifdef FEAT_MBYTE | |
| 2941 if (enc_utf8) | |
| 2942 vim_memset(ScreenLinesUC + off, 0, sizeof(u8char_T) * (size_t)len); | |
| 2943 # endif | |
| 216 | 2944 for (i = 0; i < len; ++i) |
| 2945 ScreenAttrs[off + i] = attr; | |
| 7 | 2946 } |
| 2947 | |
| 2948 /* | |
| 2949 * Fill the foldcolumn at "p" for window "wp". | |
| 548 | 2950 * Only to be called when 'foldcolumn' > 0. |
| 7 | 2951 */ |
| 2952 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2953 fill_foldcolumn( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2954 char_u *p, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2955 win_T *wp, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2956 int closed, /* TRUE of FALSE */ |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2957 linenr_T lnum) /* current line number */ |
| 7 | 2958 { |
| 2959 int i = 0; | |
| 2960 int level; | |
| 2961 int first_level; | |
| 519 | 2962 int empty; |
| 6553 | 2963 int fdc = compute_foldcolumn(wp, 0); |
| 7 | 2964 |
| 2965 /* Init to all spaces. */ | |
| 6929 | 2966 vim_memset(p, ' ', (size_t)fdc); |
| 7 | 2967 |
| 2968 level = win_foldinfo.fi_level; | |
| 2969 if (level > 0) | |
| 2970 { | |
| 519 | 2971 /* If there is only one column put more info in it. */ |
| 6553 | 2972 empty = (fdc == 1) ? 0 : 1; |
| 519 | 2973 |
| 7 | 2974 /* If the column is too narrow, we start at the lowest level that |
| 2975 * fits and use numbers to indicated the depth. */ | |
| 6553 | 2976 first_level = level - fdc - closed + 1 + empty; |
| 7 | 2977 if (first_level < 1) |
| 2978 first_level = 1; | |
| 2979 | |
| 6553 | 2980 for (i = 0; i + empty < fdc; ++i) |
| 7 | 2981 { |
| 2982 if (win_foldinfo.fi_lnum == lnum | |
| 2983 && first_level + i >= win_foldinfo.fi_low_level) | |
| 2984 p[i] = '-'; | |
| 2985 else if (first_level == 1) | |
| 2986 p[i] = '|'; | |
| 2987 else if (first_level + i <= 9) | |
| 2988 p[i] = '0' + first_level + i; | |
| 2989 else | |
| 2990 p[i] = '>'; | |
| 2991 if (first_level + i == level) | |
| 2992 break; | |
| 2993 } | |
| 2994 } | |
| 2995 if (closed) | |
| 6553 | 2996 p[i >= fdc ? i - 1 : i] = '+'; |
| 7 | 2997 } |
| 2998 #endif /* FEAT_FOLDING */ | |
| 2999 | |
| 3000 /* | |
| 3001 * Display line "lnum" of window 'wp' on the screen. | |
| 3002 * Start at row "startrow", stop when "endrow" is reached. | |
| 3003 * wp->w_virtcol needs to be valid. | |
| 3004 * | |
| 3005 * Return the number of last row the line occupies. | |
| 3006 */ | |
| 3007 static int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
3008 win_line( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
3009 win_T *wp, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
3010 linenr_T lnum, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
3011 int startrow, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
3012 int endrow, |
|
11529
998d2cf59caa
patch 8.0.0647: syntax highlighting can make cause a freeze
Christian Brabandt <cb@256bit.org>
parents:
11521
diff
changeset
|
3013 int nochange UNUSED, /* not updating for changed text */ |
|
998d2cf59caa
patch 8.0.0647: syntax highlighting can make cause a freeze
Christian Brabandt <cb@256bit.org>
parents:
11521
diff
changeset
|
3014 proftime_T *syntax_tm) |
| 7 | 3015 { |
|
10801
e7b8be5ecacd
patch 8.0.0290: cursor positioning wrong if wide character wraps
Christian Brabandt <cb@256bit.org>
parents:
10793
diff
changeset
|
3016 int col = 0; /* visual column on screen */ |
| 7 | 3017 unsigned off; /* offset in ScreenLines/ScreenAttrs */ |
| 3018 int c = 0; /* init for GCC */ | |
| 3019 long vcol = 0; /* virtual column (for tabs) */ | |
| 6503 | 3020 #ifdef FEAT_LINEBREAK |
| 3021 long vcol_sbr = -1; /* virtual column after showbreak */ | |
| 3022 #endif | |
| 7 | 3023 long vcol_prev = -1; /* "vcol" of previous character */ |
| 3024 char_u *line; /* current line */ | |
| 3025 char_u *ptr; /* current position in "line" */ | |
| 3026 int row; /* row in the window, excl w_winrow */ | |
| 3027 int screen_row; /* row on the screen, incl w_winrow */ | |
| 3028 | |
| 3029 char_u extra[18]; /* "%ld" and 'fdc' must fit in here */ | |
| 3030 int n_extra = 0; /* number of extra chars */ | |
| 1340 | 3031 char_u *p_extra = NULL; /* string of extra chars, plus NUL */ |
| 6026 | 3032 char_u *p_extra_free = NULL; /* p_extra needs to be freed */ |
| 7 | 3033 int c_extra = NUL; /* extra chars, all the same */ |
| 3034 int extra_attr = 0; /* attributes when n_extra != 0 */ | |
| 3035 static char_u *at_end_str = (char_u *)""; /* used for p_extra when | |
| 3036 displaying lcs_eol at end-of-line */ | |
| 3037 int lcs_eol_one = lcs_eol; /* lcs_eol until it's been used */ | |
| 3038 int lcs_prec_todo = lcs_prec; /* lcs_prec until it's been used */ | |
| 3039 | |
| 3040 /* saved "extra" items for when draw_state becomes WL_LINE (again) */ | |
| 3041 int saved_n_extra = 0; | |
| 3042 char_u *saved_p_extra = NULL; | |
| 3043 int saved_c_extra = 0; | |
| 3044 int saved_char_attr = 0; | |
| 3045 | |
| 3046 int n_attr = 0; /* chars with special attr */ | |
| 3047 int saved_attr2 = 0; /* char_attr saved for n_attr */ | |
| 3048 int n_attr3 = 0; /* chars with overruling special attr */ | |
| 3049 int saved_attr3 = 0; /* char_attr saved for n_attr3 */ | |
| 3050 | |
| 3051 int n_skip = 0; /* nr of chars to skip for 'nowrap' */ | |
| 3052 | |
| 3053 int fromcol, tocol; /* start/end of inverting */ | |
| 3054 int fromcol_prev = -2; /* start of inverting after cursor */ | |
| 3055 int noinvcur = FALSE; /* don't invert the cursor */ | |
| 3056 pos_T *top, *bot; | |
| 1813 | 3057 int lnum_in_visual_area = FALSE; |
| 7 | 3058 pos_T pos; |
| 3059 long v; | |
| 3060 | |
| 3061 int char_attr = 0; /* attributes for next character */ | |
| 674 | 3062 int attr_pri = FALSE; /* char_attr has priority */ |
| 7 | 3063 int area_highlighting = FALSE; /* Visual or incsearch highlighting |
| 3064 in this line */ | |
| 3065 int attr = 0; /* attributes for area highlighting */ | |
| 3066 int area_attr = 0; /* attributes desired by highlighting */ | |
| 3067 int search_attr = 0; /* attributes desired by 'hlsearch' */ | |
| 3068 #ifdef FEAT_SYN_HL | |
| 743 | 3069 int vcol_save_attr = 0; /* saved attr for 'cursorcolumn' */ |
| 7 | 3070 int syntax_attr = 0; /* attributes desired by syntax */ |
| 3071 int has_syntax = FALSE; /* this buffer has syntax highl. */ | |
| 3072 int save_did_emsg; | |
| 1437 | 3073 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
|
3074 int draw_color_col = FALSE; /* highlight colorcolumn */ |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
3075 int *color_cols = NULL; /* pointer to according columns array */ |
| 743 | 3076 #endif |
| 3077 #ifdef FEAT_SPELL | |
| 221 | 3078 int has_spell = FALSE; /* this buffer has spell checking */ |
| 348 | 3079 # define SPWORDLEN 150 |
| 3080 char_u nextline[SPWORDLEN * 2];/* text with start of the next line */ | |
| 353 | 3081 int nextlinecol = 0; /* column where nextline[] starts */ |
| 3082 int nextline_idx = 0; /* index in nextline[] where next line | |
| 348 | 3083 starts */ |
| 221 | 3084 int spell_attr = 0; /* attributes desired by spelling */ |
| 3085 int word_end = 0; /* last byte with same spell_attr */ | |
| 378 | 3086 static linenr_T checked_lnum = 0; /* line number for "checked_col" */ |
| 3087 static int checked_col = 0; /* column in "checked_lnum" up to which | |
| 348 | 3088 * there are no spell errors */ |
| 386 | 3089 static int cap_col = -1; /* column to check for Cap word */ |
| 3090 static linenr_T capcol_lnum = 0; /* line number where "cap_col" used */ | |
| 348 | 3091 int cur_checked_col = 0; /* checked column for current line */ |
| 7 | 3092 #endif |
| 3093 int extra_check; /* has syntax or linebreak */ | |
| 3094 #ifdef FEAT_MBYTE | |
| 3095 int multi_attr = 0; /* attributes desired by multibyte */ | |
| 3096 int mb_l = 1; /* multi-byte byte length */ | |
| 3097 int mb_c = 0; /* decoded multi-byte character */ | |
| 3098 int mb_utf8 = FALSE; /* screen char is UTF-8 char */ | |
| 714 | 3099 int u8cc[MAX_MCO]; /* composing UTF-8 chars */ |
| 7 | 3100 #endif |
| 3101 #ifdef FEAT_DIFF | |
| 3102 int filler_lines; /* nr of filler lines to be drawn */ | |
| 3103 int filler_todo; /* nr of filler lines still to do + 1 */ | |
| 534 | 3104 hlf_T diff_hlf = (hlf_T)0; /* type of diff highlighting */ |
| 7 | 3105 int change_start = MAXCOL; /* first col of changed area */ |
| 3106 int change_end = -1; /* last col of changed area */ | |
| 3107 #endif | |
| 3108 colnr_T trailcol = MAXCOL; /* start of trailing spaces */ | |
| 3109 #ifdef FEAT_LINEBREAK | |
|
10392
957a1d560bda
commit https://github.com/vim/vim/commit/6c896867c4f5d759616028ef7cbfce2a9ed32600
Christian Brabandt <cb@256bit.org>
parents:
10349
diff
changeset
|
3110 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
|
3111 chars */ |
| 7 | 3112 #endif |
| 910 | 3113 #if defined(FEAT_SIGNS) || (defined(FEAT_QUICKFIX) && defined(FEAT_WINDOWS)) \ |
| 3114 || defined(FEAT_SYN_HL) || defined(FEAT_DIFF) | |
| 7 | 3115 # define LINE_ATTR |
| 1536 | 3116 int line_attr = 0; /* attribute for the whole line */ |
| 7 | 3117 #endif |
| 3118 #ifdef FEAT_SEARCH_EXTRA | |
| 1326 | 3119 matchitem_T *cur; /* points to the match list */ |
| 3120 match_T *shl; /* points to search_hl or a match */ | |
| 3121 int shl_flag; /* flag to indicate whether search_hl | |
| 3122 has been processed or not */ | |
| 5979 | 3123 int pos_inprogress; /* marks that position match search is |
| 3124 in progress */ | |
| 1326 | 3125 int prevcol_hl_flag; /* flag to indicate whether prevcol |
| 3126 equals startcol of search_hl or one | |
| 3127 of the matches */ | |
| 7 | 3128 #endif |
| 3129 #ifdef FEAT_ARABIC | |
| 3130 int prev_c = 0; /* previous Arabic character */ | |
| 3131 int prev_c1 = 0; /* first composing char for prev_c */ | |
| 3132 #endif | |
| 910 | 3133 #if defined(LINE_ATTR) |
| 867 | 3134 int did_line_attr = 0; |
| 3135 #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
|
3136 #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
|
3137 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
|
3138 #endif |
| 7 | 3139 |
| 3140 /* draw_state: items that are drawn in sequence: */ | |
| 3141 #define WL_START 0 /* nothing done yet */ | |
| 3142 #ifdef FEAT_CMDWIN | |
| 3143 # define WL_CMDLINE WL_START + 1 /* cmdline window column */ | |
| 3144 #else | |
| 3145 # define WL_CMDLINE WL_START | |
| 3146 #endif | |
| 3147 #ifdef FEAT_FOLDING | |
| 3148 # define WL_FOLD WL_CMDLINE + 1 /* 'foldcolumn' */ | |
| 3149 #else | |
| 3150 # define WL_FOLD WL_CMDLINE | |
| 3151 #endif | |
| 3152 #ifdef FEAT_SIGNS | |
| 3153 # define WL_SIGN WL_FOLD + 1 /* column for signs */ | |
| 3154 #else | |
| 3155 # define WL_SIGN WL_FOLD /* column for signs */ | |
| 3156 #endif | |
| 3157 #define WL_NR WL_SIGN + 1 /* line number */ | |
| 5995 | 3158 #ifdef FEAT_LINEBREAK |
| 3159 # define WL_BRI WL_NR + 1 /* 'breakindent' */ | |
| 3160 #else | |
| 3161 # define WL_BRI WL_NR | |
| 3162 #endif | |
| 7 | 3163 #if defined(FEAT_LINEBREAK) || defined(FEAT_DIFF) |
| 5995 | 3164 # define WL_SBR WL_BRI + 1 /* 'showbreak' or 'diff' */ |
| 7 | 3165 #else |
| 5995 | 3166 # define WL_SBR WL_BRI |
| 7 | 3167 #endif |
| 3168 #define WL_LINE WL_SBR + 1 /* text in the line */ | |
| 3169 int draw_state = WL_START; /* what to draw next */ | |
| 574 | 3170 #if defined(FEAT_XIM) && defined(FEAT_GUI_GTK) |
| 7 | 3171 int feedback_col = 0; |
| 3172 int feedback_old_attr = -1; | |
| 3173 #endif | |
| 3174 | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
3175 #ifdef FEAT_CONCEAL |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
3176 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
|
3177 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
|
3178 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
|
3179 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
|
3180 int is_concealing = FALSE; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
3181 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
|
3182 wrapping */ |
|
2409
0ca06a92adfb
Add support for horizontal scroll wheel. (Bjorn Winckler)
Bram Moolenaar <bram@vim.org>
parents:
2400
diff
changeset
|
3183 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
|
3184 int did_wcol = FALSE; |
|
8907
5deb9e8f4292
commit https://github.com/vim/vim/commit/4d585022023b96f6507e8cae5ed8fc8d926f5140
Christian Brabandt <cb@256bit.org>
parents:
8872
diff
changeset
|
3185 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
|
3186 int has_match_conc = 0; /* match wants to conceal */ |
| 6520 | 3187 int old_boguscols = 0; |
|
2332
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
3188 # define VCOL_HLC (vcol - vcol_off) |
|
5174
42d592dbbec3
updated for version 7.4a.013
Bram Moolenaar <bram@vim.org>
parents:
5126
diff
changeset
|
3189 # define FIX_FOR_BOGUSCOLS \ |
|
42d592dbbec3
updated for version 7.4a.013
Bram Moolenaar <bram@vim.org>
parents:
5126
diff
changeset
|
3190 { \ |
|
42d592dbbec3
updated for version 7.4a.013
Bram Moolenaar <bram@vim.org>
parents:
5126
diff
changeset
|
3191 n_extra += vcol_off; \ |
|
42d592dbbec3
updated for version 7.4a.013
Bram Moolenaar <bram@vim.org>
parents:
5126
diff
changeset
|
3192 vcol -= vcol_off; \ |
|
42d592dbbec3
updated for version 7.4a.013
Bram Moolenaar <bram@vim.org>
parents:
5126
diff
changeset
|
3193 vcol_off = 0; \ |
|
42d592dbbec3
updated for version 7.4a.013
Bram Moolenaar <bram@vim.org>
parents:
5126
diff
changeset
|
3194 col -= boguscols; \ |
| 6520 | 3195 old_boguscols = boguscols; \ |
|
5174
42d592dbbec3
updated for version 7.4a.013
Bram Moolenaar <bram@vim.org>
parents:
5126
diff
changeset
|
3196 boguscols = 0; \ |
|
42d592dbbec3
updated for version 7.4a.013
Bram Moolenaar <bram@vim.org>
parents:
5126
diff
changeset
|
3197 } |
|
2332
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
3198 #else |
|
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
3199 # define VCOL_HLC (vcol) |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
3200 #endif |
| 7 | 3201 |
| 3202 if (startrow > endrow) /* past the end already! */ | |
| 3203 return startrow; | |
| 3204 | |
| 3205 row = startrow; | |
| 3206 screen_row = row + W_WINROW(wp); | |
| 3207 | |
| 3208 /* | |
| 3209 * To speed up the loop below, set extra_check when there is linebreak, | |
| 3210 * trailing white space and/or syntax processing to be done. | |
| 3211 */ | |
| 3212 #ifdef FEAT_LINEBREAK | |
| 3213 extra_check = wp->w_p_lbr; | |
| 3214 #else | |
| 3215 extra_check = 0; | |
| 3216 #endif | |
| 3217 #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
|
3218 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
|
3219 # 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
|
3220 && !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
|
3221 # endif |
|
998d2cf59caa
patch 8.0.0647: syntax highlighting can make cause a freeze
Christian Brabandt <cb@256bit.org>
parents:
11521
diff
changeset
|
3222 ) |
| 7 | 3223 { |
| 3224 /* Prepare for syntax highlighting in this line. When there is an | |
| 3225 * error, stop syntax highlighting. */ | |
| 3226 save_did_emsg = did_emsg; | |
| 3227 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
|
3228 syntax_start(wp, lnum, syntax_tm); |
| 7 | 3229 if (did_emsg) |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
3230 wp->w_s->b_syn_error = TRUE; |
| 7 | 3231 else |
| 3232 { | |
| 3233 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
|
3234 #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
|
3235 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
|
3236 #endif |
|
998d2cf59caa
patch 8.0.0647: syntax highlighting can make cause a freeze
Christian Brabandt <cb@256bit.org>
parents:
11521
diff
changeset
|
3237 { |
|
998d2cf59caa
patch 8.0.0647: syntax highlighting can make cause a freeze
Christian Brabandt <cb@256bit.org>
parents:
11521
diff
changeset
|
3238 has_syntax = TRUE; |
|
998d2cf59caa
patch 8.0.0647: syntax highlighting can make cause a freeze
Christian Brabandt <cb@256bit.org>
parents:
11521
diff
changeset
|
3239 extra_check = TRUE; |
|
998d2cf59caa
patch 8.0.0647: syntax highlighting can make cause a freeze
Christian Brabandt <cb@256bit.org>
parents:
11521
diff
changeset
|
3240 } |
| 7 | 3241 } |
| 3242 } | |
|
2314
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
3243 |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
3244 /* Check for columns to display for 'colorcolumn'. */ |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
3245 color_cols = wp->w_p_cc_cols; |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
3246 if (color_cols != NULL) |
|
2332
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
3247 draw_color_col = advance_color_col(VCOL_HLC, &color_cols); |
| 743 | 3248 #endif |
| 3249 | |
|
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
|
3250 #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
|
3251 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
|
3252 { |
|
f080b225a2a4
patch 8.0.0798: no highlighting in a terminal window with a finished job
Christian Brabandt <cb@256bit.org>
parents:
11834
diff
changeset
|
3253 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
|
3254 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
|
3255 } |
|
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 #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
|
3257 |
| 743 | 3258 #ifdef FEAT_SPELL |
| 258 | 3259 if (wp->w_p_spell |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
3260 && *wp->w_s->b_p_spl != NUL |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
3261 && 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
|
3262 && *(char **)(wp->w_s->b_langp.ga_data) != NULL) |
| 221 | 3263 { |
| 3264 /* Prepare for spell checking. */ | |
| 3265 has_spell = TRUE; | |
| 3266 extra_check = TRUE; | |
| 348 | 3267 |
| 3268 /* Get the start of the next line, so that words that wrap to the next | |
| 3269 * line are found too: "et<line-break>al.". | |
| 3270 * Trick: skip a few chars for C/shell/Vim comments */ | |
| 3271 nextline[SPWORDLEN] = NUL; | |
| 3272 if (lnum < wp->w_buffer->b_ml.ml_line_count) | |
| 3273 { | |
| 3274 line = ml_get_buf(wp->w_buffer, lnum + 1, FALSE); | |
| 3275 spell_cat_line(nextline + SPWORDLEN, line, SPWORDLEN); | |
| 3276 } | |
| 3277 | |
| 3278 /* When a word wrapped from the previous line the start of the current | |
| 3279 * line is valid. */ | |
| 3280 if (lnum == checked_lnum) | |
| 3281 cur_checked_col = checked_col; | |
| 3282 checked_lnum = 0; | |
| 386 | 3283 |
| 3284 /* When there was a sentence end in the previous line may require a | |
| 3285 * word starting with capital in this line. In line 1 always check | |
| 3286 * the first word. */ | |
| 3287 if (lnum != capcol_lnum) | |
| 3288 cap_col = -1; | |
| 3289 if (lnum == 1) | |
| 3290 cap_col = 0; | |
| 3291 capcol_lnum = 0; | |
| 221 | 3292 } |
| 7 | 3293 #endif |
| 3294 | |
| 3295 /* | |
| 3296 * handle visual active in this window | |
| 3297 */ | |
| 3298 fromcol = -10; | |
| 3299 tocol = MAXCOL; | |
| 3300 if (VIsual_active && wp->w_buffer == curwin->w_buffer) | |
| 3301 { | |
| 3302 /* 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
|
3303 if (LTOREQ_POS(curwin->w_cursor, VIsual)) |
| 7 | 3304 { |
| 3305 top = &curwin->w_cursor; | |
| 3306 bot = &VIsual; | |
| 3307 } | |
| 3308 else /* Visual is before curwin->w_cursor */ | |
| 3309 { | |
| 3310 top = &VIsual; | |
| 3311 bot = &curwin->w_cursor; | |
| 3312 } | |
| 1813 | 3313 lnum_in_visual_area = (lnum >= top->lnum && lnum <= bot->lnum); |
| 7 | 3314 if (VIsual_mode == Ctrl_V) /* block mode */ |
| 3315 { | |
| 1813 | 3316 if (lnum_in_visual_area) |
| 7 | 3317 { |
| 3318 fromcol = wp->w_old_cursor_fcol; | |
| 3319 tocol = wp->w_old_cursor_lcol; | |
| 3320 } | |
| 3321 } | |
| 3322 else /* non-block mode */ | |
| 3323 { | |
| 3324 if (lnum > top->lnum && lnum <= bot->lnum) | |
| 3325 fromcol = 0; | |
| 3326 else if (lnum == top->lnum) | |
| 3327 { | |
| 3328 if (VIsual_mode == 'V') /* linewise */ | |
| 3329 fromcol = 0; | |
| 3330 else | |
| 3331 { | |
| 3332 getvvcol(wp, top, (colnr_T *)&fromcol, NULL, NULL); | |
| 3333 if (gchar_pos(top) == NUL) | |
| 3334 tocol = fromcol + 1; | |
| 3335 } | |
| 3336 } | |
| 3337 if (VIsual_mode != 'V' && lnum == bot->lnum) | |
| 3338 { | |
| 3339 if (*p_sel == 'e' && bot->col == 0 | |
| 3340 #ifdef FEAT_VIRTUALEDIT | |
| 3341 && bot->coladd == 0 | |
| 3342 #endif | |
| 3343 ) | |
| 3344 { | |
| 3345 fromcol = -10; | |
| 3346 tocol = MAXCOL; | |
| 3347 } | |
| 36 | 3348 else if (bot->col == MAXCOL) |
| 3349 tocol = MAXCOL; | |
| 7 | 3350 else |
| 3351 { | |
| 3352 pos = *bot; | |
| 3353 if (*p_sel == 'e') | |
| 3354 getvvcol(wp, &pos, (colnr_T *)&tocol, NULL, NULL); | |
| 3355 else | |
| 3356 { | |
| 3357 getvvcol(wp, &pos, NULL, NULL, (colnr_T *)&tocol); | |
| 3358 ++tocol; | |
| 3359 } | |
| 3360 } | |
| 3361 } | |
| 3362 } | |
| 3363 | |
| 3364 /* Check if the character under the cursor should not be inverted */ | |
| 3365 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
|
3366 #ifdef FEAT_GUI |
| 7 | 3367 && !gui.in_use |
|
8212
05b88224cea1
commit https://github.com/vim/vim/commit/48e330aff911be1c798c88a973af6437a8141fce
Christian Brabandt <cb@256bit.org>
parents:
7833
diff
changeset
|
3368 #endif |
| 7 | 3369 ) |
| 3370 noinvcur = TRUE; | |
| 3371 | |
| 3372 /* if inverting in this line set area_highlighting */ | |
| 3373 if (fromcol >= 0) | |
| 3374 { | |
| 3375 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
|
3376 attr = HL_ATTR(HLF_V); |
| 7 | 3377 #if defined(FEAT_CLIPBOARD) && defined(FEAT_X11) |
| 3674 | 3378 if ((clip_star.available && !clip_star.owned |
| 3379 && clip_isautosel_star()) | |
| 3380 || (clip_plus.available && !clip_plus.owned | |
| 3381 && 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
|
3382 attr = HL_ATTR(HLF_VNC); |
| 7 | 3383 #endif |
| 3384 } | |
| 3385 } | |
| 3386 | |
| 3387 /* | |
| 674 | 3388 * handle 'incsearch' and ":s///c" highlighting |
| 7 | 3389 */ |
| 5735 | 3390 else if (highlight_match |
| 7 | 3391 && wp == curwin |
| 3392 && lnum >= curwin->w_cursor.lnum | |
| 3393 && lnum <= curwin->w_cursor.lnum + search_match_lines) | |
| 3394 { | |
| 3395 if (lnum == curwin->w_cursor.lnum) | |
| 3396 getvcol(curwin, &(curwin->w_cursor), | |
| 3397 (colnr_T *)&fromcol, NULL, NULL); | |
| 3398 else | |
| 3399 fromcol = 0; | |
| 3400 if (lnum == curwin->w_cursor.lnum + search_match_lines) | |
| 3401 { | |
| 3402 pos.lnum = lnum; | |
| 3403 pos.col = search_match_endcol; | |
| 3404 getvcol(curwin, &pos, (colnr_T *)&tocol, NULL, NULL); | |
| 3405 } | |
| 3406 else | |
| 3407 tocol = MAXCOL; | |
| 1850 | 3408 /* do at least one character; happens when past end of line */ |
| 3409 if (fromcol == tocol) | |
| 3410 tocol = fromcol + 1; | |
| 7 | 3411 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
|
3412 attr = HL_ATTR(HLF_I); |
| 7 | 3413 } |
| 3414 | |
| 3415 #ifdef FEAT_DIFF | |
| 3416 filler_lines = diff_check(wp, lnum); | |
| 3417 if (filler_lines < 0) | |
| 3418 { | |
| 3419 if (filler_lines == -1) | |
| 3420 { | |
| 3421 if (diff_find_change(wp, lnum, &change_start, &change_end)) | |
| 3422 diff_hlf = HLF_ADD; /* added line */ | |
| 3423 else if (change_start == 0) | |
| 3424 diff_hlf = HLF_TXD; /* changed text */ | |
| 3425 else | |
| 3426 diff_hlf = HLF_CHD; /* changed line */ | |
| 3427 } | |
| 3428 else | |
| 3429 diff_hlf = HLF_ADD; /* added line */ | |
| 3430 filler_lines = 0; | |
| 3431 area_highlighting = TRUE; | |
| 3432 } | |
| 3433 if (lnum == wp->w_topline) | |
| 3434 filler_lines = wp->w_topfill; | |
| 3435 filler_todo = filler_lines; | |
| 3436 #endif | |
| 3437 | |
| 3438 #ifdef LINE_ATTR | |
| 3439 # ifdef FEAT_SIGNS | |
| 3440 /* If this line has a sign with line highlighting set line_attr. */ | |
| 3441 v = buf_getsigntype(wp->w_buffer, lnum, SIGN_LINEHL); | |
| 3442 if (v != 0) | |
| 3443 line_attr = sign_get_attr((int)v, TRUE); | |
| 3444 # endif | |
| 3445 # if defined(FEAT_QUICKFIX) && defined(FEAT_WINDOWS) | |
| 3446 /* Highlight the current line in the quickfix window. */ | |
| 644 | 3447 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
|
3448 line_attr = HL_ATTR(HLF_QFL); |
| 7 | 3449 # endif |
| 3450 if (line_attr != 0) | |
| 3451 area_highlighting = TRUE; | |
| 3452 #endif | |
| 3453 | |
| 3454 line = ml_get_buf(wp->w_buffer, lnum, FALSE); | |
| 3455 ptr = line; | |
| 3456 | |
| 743 | 3457 #ifdef FEAT_SPELL |
| 348 | 3458 if (has_spell) |
| 3459 { | |
| 386 | 3460 /* For checking first word with a capital skip white space. */ |
| 3461 if (cap_col == 0) | |
| 835 | 3462 cap_col = (int)(skipwhite(line) - line); |
| 386 | 3463 |
| 348 | 3464 /* To be able to spell-check over line boundaries copy the end of the |
| 3465 * current line into nextline[]. Above the start of the next line was | |
| 3466 * copied to nextline[SPWORDLEN]. */ | |
| 3467 if (nextline[SPWORDLEN] == NUL) | |
| 3468 { | |
| 3469 /* No next line or it is empty. */ | |
| 3470 nextlinecol = MAXCOL; | |
| 3471 nextline_idx = 0; | |
| 3472 } | |
| 3473 else | |
| 3474 { | |
| 835 | 3475 v = (long)STRLEN(line); |
| 348 | 3476 if (v < SPWORDLEN) |
| 3477 { | |
| 3478 /* Short line, use it completely and append the start of the | |
| 3479 * next line. */ | |
| 3480 nextlinecol = 0; | |
| 3481 mch_memmove(nextline, line, (size_t)v); | |
| 1621 | 3482 STRMOVE(nextline + v, nextline + SPWORDLEN); |
| 348 | 3483 nextline_idx = v + 1; |
| 3484 } | |
| 3485 else | |
| 3486 { | |
| 3487 /* Long line, use only the last SPWORDLEN bytes. */ | |
| 3488 nextlinecol = v - SPWORDLEN; | |
| 3489 mch_memmove(nextline, line + nextlinecol, SPWORDLEN); | |
| 3490 nextline_idx = SPWORDLEN + 1; | |
| 3491 } | |
| 3492 } | |
| 3493 } | |
| 3494 #endif | |
| 3495 | |
|
7344
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
3496 if (wp->w_p_list) |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
3497 { |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
3498 if (lcs_space || lcs_trail) |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
3499 extra_check = TRUE; |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
3500 /* find start of trailing whitespace */ |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
3501 if (lcs_trail) |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
3502 { |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
3503 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
|
3504 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
|
3505 --trailcol; |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
3506 trailcol += (colnr_T) (ptr - line); |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
3507 } |
| 7 | 3508 } |
| 3509 | |
| 3510 /* | |
| 3511 * 'nowrap' or 'wrap' and a single line that doesn't fit: Advance to the | |
| 3512 * first character to be displayed. | |
| 3513 */ | |
| 3514 if (wp->w_p_wrap) | |
| 3515 v = wp->w_skipcol; | |
| 3516 else | |
| 3517 v = wp->w_leftcol; | |
| 3518 if (v > 0) | |
| 3519 { | |
| 3520 #ifdef FEAT_MBYTE | |
| 3521 char_u *prev_ptr = ptr; | |
| 3522 #endif | |
| 3523 while (vcol < v && *ptr != NUL) | |
| 3524 { | |
| 5995 | 3525 c = win_lbr_chartabsize(wp, line, ptr, (colnr_T)vcol, NULL); |
| 7 | 3526 vcol += c; |
| 3527 #ifdef FEAT_MBYTE | |
| 3528 prev_ptr = ptr; | |
| 39 | 3529 #endif |
|
11127
506f5d8b7d8b
patch 8.0.0451: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11121
diff
changeset
|
3530 MB_PTR_ADV(ptr); |
| 7 | 3531 } |
| 3532 | |
| 1984 | 3533 /* When: |
| 3534 * - 'cuc' is set, or | |
|
2314
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
3535 * - 'colorcolumn' is set, or |
| 1984 | 3536 * - 'virtualedit' is set, or |
| 3537 * - the visual mode is active, | |
| 3538 * the end of the line may be before the start of the displayed part. | |
| 3539 */ | |
| 3540 if (vcol < v && ( | |
| 5735 | 3541 #ifdef FEAT_SYN_HL |
| 3542 wp->w_p_cuc || draw_color_col || | |
| 3543 #endif | |
| 3544 #ifdef FEAT_VIRTUALEDIT | |
| 3545 virtual_active() || | |
| 3546 #endif | |
| 3547 (VIsual_active && wp->w_buffer == curwin->w_buffer))) | |
| 1984 | 3548 { |
| 7 | 3549 vcol = v; |
| 1984 | 3550 } |
| 7 | 3551 |
| 3552 /* Handle a character that's not completely on the screen: Put ptr at | |
| 3553 * that character but skip the first few screen characters. */ | |
| 3554 if (vcol > v) | |
| 3555 { | |
| 3556 vcol -= c; | |
| 3557 #ifdef FEAT_MBYTE | |
| 3558 ptr = prev_ptr; | |
| 3559 #else | |
| 3560 --ptr; | |
| 3561 #endif | |
|
11010
c004e17fa36b
patch 8.0.0394: tabs are not aligned when scrolling horizontally
Christian Brabandt <cb@256bit.org>
parents:
10988
diff
changeset
|
3562 /* If the character fits on the screen, don't need to skip it. |
|
c004e17fa36b
patch 8.0.0394: tabs are not aligned when scrolling horizontally
Christian Brabandt <cb@256bit.org>
parents:
10988
diff
changeset
|
3563 * Except for a TAB. */ |
|
c004e17fa36b
patch 8.0.0394: tabs are not aligned when scrolling horizontally
Christian Brabandt <cb@256bit.org>
parents:
10988
diff
changeset
|
3564 if (( |
|
c004e17fa36b
patch 8.0.0394: tabs are not aligned when scrolling horizontally
Christian Brabandt <cb@256bit.org>
parents:
10988
diff
changeset
|
3565 #ifdef FEAT_MBYTE |
|
c004e17fa36b
patch 8.0.0394: tabs are not aligned when scrolling horizontally
Christian Brabandt <cb@256bit.org>
parents:
10988
diff
changeset
|
3566 (*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
|
3567 #endif |
|
c004e17fa36b
patch 8.0.0394: tabs are not aligned when scrolling horizontally
Christian Brabandt <cb@256bit.org>
parents:
10988
diff
changeset
|
3568 *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
|
3569 n_skip = v - vcol; |
| 7 | 3570 } |
| 3571 | |
| 3572 /* | |
| 3573 * Adjust for when the inverted text is before the screen, | |
| 3574 * and when the start of the inverted text is before the screen. | |
| 3575 */ | |
| 3576 if (tocol <= vcol) | |
| 3577 fromcol = 0; | |
| 3578 else if (fromcol >= 0 && fromcol < vcol) | |
| 3579 fromcol = vcol; | |
| 3580 | |
| 3581 #ifdef FEAT_LINEBREAK | |
| 3582 /* When w_skipcol is non-zero, first line needs 'showbreak' */ | |
| 3583 if (wp->w_p_wrap) | |
| 3584 need_showbreak = TRUE; | |
| 3585 #endif | |
| 743 | 3586 #ifdef FEAT_SPELL |
| 499 | 3587 /* When spell checking a word we need to figure out the start of the |
| 3588 * word and if it's badly spelled or not. */ | |
| 3589 if (has_spell) | |
| 3590 { | |
| 3591 int len; | |
| 1536 | 3592 colnr_T linecol = (colnr_T)(ptr - line); |
| 534 | 3593 hlf_T spell_hlf = HLF_COUNT; |
| 499 | 3594 |
| 3595 pos = wp->w_cursor; | |
| 3596 wp->w_cursor.lnum = lnum; | |
| 1536 | 3597 wp->w_cursor.col = linecol; |
| 534 | 3598 len = spell_move_to(wp, FORWARD, TRUE, TRUE, &spell_hlf); |
| 1536 | 3599 |
| 3600 /* spell_move_to() may call ml_get() and make "line" invalid */ | |
| 3601 line = ml_get_buf(wp->w_buffer, lnum, FALSE); | |
| 3602 ptr = line + linecol; | |
| 3603 | |
| 530 | 3604 if (len == 0 || (int)wp->w_cursor.col > ptr - line) |
| 499 | 3605 { |
| 3606 /* no bad word found at line start, don't check until end of a | |
| 3607 * word */ | |
| 534 | 3608 spell_hlf = HLF_COUNT; |
| 3572 | 3609 word_end = (int)(spell_to_word_end(ptr, wp) - line + 1); |
| 499 | 3610 } |
| 3611 else | |
| 534 | 3612 { |
| 499 | 3613 /* bad word found, use attributes until end of word */ |
| 3614 word_end = wp->w_cursor.col + len + 1; | |
| 3615 | |
| 534 | 3616 /* Turn index into actual attributes. */ |
| 3617 if (spell_hlf != HLF_COUNT) | |
| 3618 spell_attr = highlight_attr[spell_hlf]; | |
| 3619 } | |
| 499 | 3620 wp->w_cursor = pos; |
| 501 | 3621 |
| 743 | 3622 # ifdef FEAT_SYN_HL |
| 501 | 3623 /* Need to restart syntax highlighting for this line. */ |
| 3624 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
|
3625 syntax_start(wp, lnum, syntax_tm); |
| 743 | 3626 # endif |
| 499 | 3627 } |
| 3628 #endif | |
| 7 | 3629 } |
| 3630 | |
| 3631 /* | |
| 3632 * Correct highlighting for cursor that can't be disabled. | |
| 3633 * Avoids having to check this for each character. | |
| 3634 */ | |
| 3635 if (fromcol >= 0) | |
| 3636 { | |
| 3637 if (noinvcur) | |
| 3638 { | |
| 3639 if ((colnr_T)fromcol == wp->w_virtcol) | |
| 3640 { | |
| 3641 /* highlighting starts at cursor, let it start just after the | |
| 3642 * cursor */ | |
| 3643 fromcol_prev = fromcol; | |
| 3644 fromcol = -1; | |
| 3645 } | |
| 3646 else if ((colnr_T)fromcol < wp->w_virtcol) | |
| 3647 /* restart highlighting after the cursor */ | |
| 3648 fromcol_prev = wp->w_virtcol; | |
| 3649 } | |
| 3650 if (fromcol >= tocol) | |
| 3651 fromcol = -1; | |
| 3652 } | |
| 3653 | |
| 3654 #ifdef FEAT_SEARCH_EXTRA | |
| 3655 /* | |
| 1326 | 3656 * Handle highlighting the last used search pattern and matches. |
| 3657 * Do this for both search_hl and the match list. | |
| 7 | 3658 */ |
| 1326 | 3659 cur = wp->w_match_head; |
| 3660 shl_flag = FALSE; | |
| 3661 while (cur != NULL || shl_flag == FALSE) | |
| 3662 { | |
| 3663 if (shl_flag == FALSE) | |
| 3664 { | |
| 3665 shl = &search_hl; | |
| 3666 shl_flag = TRUE; | |
| 3667 } | |
| 3668 else | |
| 3669 shl = &cur->hl; | |
| 36 | 3670 shl->startcol = MAXCOL; |
| 3671 shl->endcol = MAXCOL; | |
| 7 | 3672 shl->attr_cur = 0; |
|
9885
4e8b05fa12c6
commit https://github.com/vim/vim/commit/4f416e41243ca151b95d39d81ce23d00b1484755
Christian Brabandt <cb@256bit.org>
parents:
9877
diff
changeset
|
3673 shl->is_addpos = FALSE; |
| 5979 | 3674 v = (long)(ptr - line); |
| 3675 if (cur != NULL) | |
| 3676 cur->pos.cur = 0; | |
|
9992
3e3b0ce24b61
commit https://github.com/vim/vim/commit/e17bdffff78ebd6a4e3cff26754cc667557ea810
Christian Brabandt <cb@256bit.org>
parents:
9939
diff
changeset
|
3677 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
|
3678 shl == &search_hl ? NULL : cur); |
| 5979 | 3679 |
| 3680 /* Need to get the line again, a multi-line regexp may have made it | |
| 3681 * invalid. */ | |
| 3682 line = ml_get_buf(wp->w_buffer, lnum, FALSE); | |
| 3683 ptr = line + v; | |
| 3684 | |
| 3685 if (shl->lnum != 0 && shl->lnum <= lnum) | |
| 3686 { | |
| 3687 if (shl->lnum == lnum) | |
| 3688 shl->startcol = shl->rm.startpos[0].col; | |
| 3689 else | |
| 3690 shl->startcol = 0; | |
| 3691 if (lnum == shl->lnum + shl->rm.endpos[0].lnum | |
| 3692 - shl->rm.startpos[0].lnum) | |
| 3693 shl->endcol = shl->rm.endpos[0].col; | |
| 3694 else | |
| 3695 shl->endcol = MAXCOL; | |
| 3696 /* Highlight one character for an empty match. */ | |
| 3697 if (shl->startcol == shl->endcol) | |
| 3698 { | |
| 3699 #ifdef FEAT_MBYTE | |
| 3700 if (has_mbyte && line[shl->endcol] != NUL) | |
| 3701 shl->endcol += (*mb_ptr2len)(line + shl->endcol); | |
| 7 | 3702 else |
| 5979 | 3703 #endif |
| 3704 ++shl->endcol; | |
| 3705 } | |
| 3706 if ((long)shl->startcol < v) /* match at leftcol */ | |
| 3707 { | |
| 3708 shl->attr_cur = shl->attr; | |
| 3709 search_attr = shl->attr; | |
| 3710 } | |
| 3711 area_highlighting = TRUE; | |
| 7 | 3712 } |
| 1326 | 3713 if (shl != &search_hl && cur != NULL) |
| 3714 cur = cur->next; | |
| 7 | 3715 } |
| 3716 #endif | |
| 3717 | |
| 743 | 3718 #ifdef FEAT_SYN_HL |
|
5068
6a7ae677d6a1
updated for version 7.3.1277
Bram Moolenaar <bram@vim.org>
parents:
4916
diff
changeset
|
3719 /* 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
|
3720 * 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
|
3721 * then. */ |
|
5078
22ac43fb6d30
updated for version 7.3.1282
Bram Moolenaar <bram@vim.org>
parents:
5068
diff
changeset
|
3722 if (wp->w_p_cul && lnum == wp->w_cursor.lnum |
| 5979 | 3723 && !(wp == curwin && VIsual_active)) |
| 743 | 3724 { |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
3725 line_attr = HL_ATTR(HLF_CUL); |
| 743 | 3726 area_highlighting = TRUE; |
| 3727 } | |
| 3728 #endif | |
| 3729 | |
| 504 | 3730 off = (unsigned)(current_ScreenLine - ScreenLines); |
| 7 | 3731 col = 0; |
| 3732 #ifdef FEAT_RIGHTLEFT | |
| 3733 if (wp->w_p_rl) | |
| 3734 { | |
| 3735 /* Rightleft window: process the text in the normal direction, but put | |
| 3736 * it in current_ScreenLine[] from right to left. Start at the | |
| 3737 * rightmost column of the window. */ | |
| 3738 col = W_WIDTH(wp) - 1; | |
| 3739 off += col; | |
| 3740 } | |
| 3741 #endif | |
| 3742 | |
| 3743 /* | |
| 3744 * Repeat for the whole displayed line. | |
| 3745 */ | |
| 3746 for (;;) | |
| 3747 { | |
| 6947 | 3748 #ifdef FEAT_CONCEAL |
|
8907
5deb9e8f4292
commit https://github.com/vim/vim/commit/4d585022023b96f6507e8cae5ed8fc8d926f5140
Christian Brabandt <cb@256bit.org>
parents:
8872
diff
changeset
|
3749 has_match_conc = 0; |
| 6947 | 3750 #endif |
| 7 | 3751 /* Skip this quickly when working on the text. */ |
| 3752 if (draw_state != WL_LINE) | |
| 3753 { | |
| 3754 #ifdef FEAT_CMDWIN | |
| 3755 if (draw_state == WL_CMDLINE - 1 && n_extra == 0) | |
| 3756 { | |
| 3757 draw_state = WL_CMDLINE; | |
| 3758 if (cmdwin_type != 0 && wp == curwin) | |
| 3759 { | |
| 3760 /* Draw the cmdline character. */ | |
| 3761 n_extra = 1; | |
| 1340 | 3762 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
|
3763 char_attr = HL_ATTR(HLF_AT); |
| 7 | 3764 } |
| 3765 } | |
| 3766 #endif | |
| 3767 | |
| 3768 #ifdef FEAT_FOLDING | |
| 3769 if (draw_state == WL_FOLD - 1 && n_extra == 0) | |
| 3770 { | |
| 6553 | 3771 int fdc = compute_foldcolumn(wp, 0); |
| 3772 | |
| 7 | 3773 draw_state = WL_FOLD; |
| 6553 | 3774 if (fdc > 0) |
| 7 | 3775 { |
|
10466
34b50194f82d
commit https://github.com/vim/vim/commit/6270660611a151c5d0f614a5f0248ccdc80ed971
Christian Brabandt <cb@256bit.org>
parents:
10392
diff
changeset
|
3776 /* 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
|
3777 * already be in use. */ |
|
10690
206ab11fa76e
patch 8.0.0235: memory leak in diff mode
Christian Brabandt <cb@256bit.org>
parents:
10538
diff
changeset
|
3778 vim_free(p_extra_free); |
|
10466
34b50194f82d
commit https://github.com/vim/vim/commit/6270660611a151c5d0f614a5f0248ccdc80ed971
Christian Brabandt <cb@256bit.org>
parents:
10392
diff
changeset
|
3779 p_extra_free = alloc(12 + 1); |
|
34b50194f82d
commit https://github.com/vim/vim/commit/6270660611a151c5d0f614a5f0248ccdc80ed971
Christian Brabandt <cb@256bit.org>
parents:
10392
diff
changeset
|
3780 |
|
34b50194f82d
commit https://github.com/vim/vim/commit/6270660611a151c5d0f614a5f0248ccdc80ed971
Christian Brabandt <cb@256bit.org>
parents:
10392
diff
changeset
|
3781 if (p_extra_free != NULL) |
|
34b50194f82d
commit https://github.com/vim/vim/commit/6270660611a151c5d0f614a5f0248ccdc80ed971
Christian Brabandt <cb@256bit.org>
parents:
10392
diff
changeset
|
3782 { |
|
34b50194f82d
commit https://github.com/vim/vim/commit/6270660611a151c5d0f614a5f0248ccdc80ed971
Christian Brabandt <cb@256bit.org>
parents:
10392
diff
changeset
|
3783 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
|
3784 n_extra = fdc; |
|
34b50194f82d
commit https://github.com/vim/vim/commit/6270660611a151c5d0f614a5f0248ccdc80ed971
Christian Brabandt <cb@256bit.org>
parents:
10392
diff
changeset
|
3785 p_extra_free[n_extra] = NUL; |
|
34b50194f82d
commit https://github.com/vim/vim/commit/6270660611a151c5d0f614a5f0248ccdc80ed971
Christian Brabandt <cb@256bit.org>
parents:
10392
diff
changeset
|
3786 p_extra = p_extra_free; |
|
34b50194f82d
commit https://github.com/vim/vim/commit/6270660611a151c5d0f614a5f0248ccdc80ed971
Christian Brabandt <cb@256bit.org>
parents:
10392
diff
changeset
|
3787 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
|
3788 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
|
3789 } |
| 7 | 3790 } |
| 3791 } | |
| 3792 #endif | |
| 3793 | |
| 3794 #ifdef FEAT_SIGNS | |
| 3795 if (draw_state == WL_SIGN - 1 && n_extra == 0) | |
| 3796 { | |
| 3797 draw_state = WL_SIGN; | |
| 3798 /* Show the sign column when there are any signs in this | |
| 3799 * buffer or when using Netbeans. */ | |
|
9852
4eea48b76d03
commit https://github.com/vim/vim/commit/95ec9d6a6ab3117d60ff638670a803d43974ba51
Christian Brabandt <cb@256bit.org>
parents:
9848
diff
changeset
|
3800 if (signcolumn_on(wp)) |
| 7 | 3801 { |
| 2661 | 3802 int text_sign; |
| 7 | 3803 # ifdef FEAT_SIGN_ICONS |
| 2661 | 3804 int icon_sign; |
| 7 | 3805 # endif |
| 3806 | |
| 3807 /* Draw two cells with the sign value or blank. */ | |
| 3808 c_extra = ' '; | |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
3809 char_attr = HL_ATTR(HLF_SC); |
| 7 | 3810 n_extra = 2; |
| 3811 | |
| 5921 | 3812 if (row == startrow |
| 3813 #ifdef FEAT_DIFF | |
| 3814 + filler_lines && filler_todo <= 0 | |
| 3815 #endif | |
| 3816 ) | |
| 7 | 3817 { |
| 3818 text_sign = buf_getsigntype(wp->w_buffer, lnum, | |
| 3819 SIGN_TEXT); | |
| 3820 # ifdef FEAT_SIGN_ICONS | |
| 3821 icon_sign = buf_getsigntype(wp->w_buffer, lnum, | |
| 3822 SIGN_ICON); | |
| 3823 if (gui.in_use && icon_sign != 0) | |
| 3824 { | |
| 3825 /* Use the image in this position. */ | |
| 3826 c_extra = SIGN_BYTE; | |
| 3827 # ifdef FEAT_NETBEANS_INTG | |
| 3828 if (buf_signcount(wp->w_buffer, lnum) > 1) | |
| 3829 c_extra = MULTISIGN_BYTE; | |
| 3830 # endif | |
| 3831 char_attr = icon_sign; | |
| 3832 } | |
| 3833 else | |
| 3834 # endif | |
| 3835 if (text_sign != 0) | |
| 3836 { | |
| 3837 p_extra = sign_get_text(text_sign); | |
| 3838 if (p_extra != NULL) | |
| 3839 { | |
| 3840 c_extra = NUL; | |
| 835 | 3841 n_extra = (int)STRLEN(p_extra); |
| 7 | 3842 } |
| 3843 char_attr = sign_get_attr(text_sign, FALSE); | |
| 3844 } | |
| 3845 } | |
| 3846 } | |
| 3847 } | |
| 3848 #endif | |
| 3849 | |
| 3850 if (draw_state == WL_NR - 1 && n_extra == 0) | |
| 3851 { | |
| 3852 draw_state = WL_NR; | |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
3853 /* 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
|
3854 * 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
|
3855 if ((wp->w_p_nu || wp->w_p_rnu) |
| 7 | 3856 && (row == startrow |
| 3857 #ifdef FEAT_DIFF | |
| 3858 + filler_lines | |
| 3859 #endif | |
| 3860 || vim_strchr(p_cpo, CPO_NUMCOL) == NULL)) | |
| 3861 { | |
| 3862 /* Draw the line number (empty space after wrapping). */ | |
| 3863 if (row == startrow | |
| 3864 #ifdef FEAT_DIFF | |
| 3865 + filler_lines | |
| 3866 #endif | |
| 3867 ) | |
| 3868 { | |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
3869 long num; |
| 4065 | 3870 char *fmt = "%*ld "; |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
3871 |
|
4736
3f2319a953b3
updated for version 7.3.1115
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
3872 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
|
3873 /* 'number' + 'norelativenumber' */ |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
3874 num = (long)lnum; |
|
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
3875 else |
| 4065 | 3876 { |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
3877 /* 'relativenumber', don't use negative numbers */ |
| 2675 | 3878 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
|
3879 if (num == 0 && wp->w_p_nu && wp->w_p_rnu) |
| 4065 | 3880 { |
|
4736
3f2319a953b3
updated for version 7.3.1115
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
3881 /* 'number' + 'relativenumber' */ |
| 4065 | 3882 num = lnum; |
| 3883 fmt = "%-*ld "; | |
| 3884 } | |
| 3885 } | |
| 3886 | |
| 3887 sprintf((char *)extra, fmt, | |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
3888 number_width(wp), num); |
| 7 | 3889 if (wp->w_skipcol > 0) |
| 3890 for (p_extra = extra; *p_extra == ' '; ++p_extra) | |
| 3891 *p_extra = '-'; | |
| 3892 #ifdef FEAT_RIGHTLEFT | |
| 3893 if (wp->w_p_rl) /* reverse line numbers */ | |
| 3894 rl_mirror(extra); | |
| 3895 #endif | |
| 3896 p_extra = extra; | |
| 3897 c_extra = NUL; | |
| 3898 } | |
| 3899 else | |
| 3900 c_extra = ' '; | |
| 13 | 3901 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
|
3902 char_attr = HL_ATTR(HLF_N); |
| 743 | 3903 #ifdef FEAT_SYN_HL |
| 3904 /* When 'cursorline' is set highlight the line number of | |
| 3427 | 3905 * the current line differently. |
| 3906 * TODO: Can we use CursorLine instead of CursorLineNr | |
| 3907 * when CursorLineNr isn't set? */ | |
|
5078
22ac43fb6d30
updated for version 7.3.1282
Bram Moolenaar <bram@vim.org>
parents:
5068
diff
changeset
|
3908 if ((wp->w_p_cul || wp->w_p_rnu) |
| 4065 | 3909 && 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
|
3910 char_attr = HL_ATTR(HLF_CLN); |
| 743 | 3911 #endif |
| 7 | 3912 } |
| 3913 } | |
| 3914 | |
| 5995 | 3915 #ifdef FEAT_LINEBREAK |
| 3916 if (wp->w_p_brisbr && draw_state == WL_BRI - 1 | |
| 3917 && n_extra == 0 && *p_sbr != NUL) | |
| 3918 /* draw indent after showbreak value */ | |
| 3919 draw_state = WL_BRI; | |
| 3920 else if (wp->w_p_brisbr && draw_state == WL_SBR && n_extra == 0) | |
| 3921 /* After the showbreak, draw the breakindent */ | |
| 3922 draw_state = WL_BRI - 1; | |
| 3923 | |
| 3924 /* draw 'breakindent': indent wrapped text accordingly */ | |
| 3925 if (draw_state == WL_BRI - 1 && n_extra == 0) | |
| 3926 { | |
| 3927 draw_state = WL_BRI; | |
|
10392
957a1d560bda
commit https://github.com/vim/vim/commit/6c896867c4f5d759616028ef7cbfce2a9ed32600
Christian Brabandt <cb@256bit.org>
parents:
10349
diff
changeset
|
3928 /* 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
|
3929 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
|
3930 && (row != startrow || need_showbreak) |
| 5995 | 3931 # ifdef FEAT_DIFF |
| 3932 && filler_lines == 0 | |
| 6834 | 3933 # endif |
| 5995 | 3934 ) |
| 3935 { | |
|
10392
957a1d560bda
commit https://github.com/vim/vim/commit/6c896867c4f5d759616028ef7cbfce2a9ed32600
Christian Brabandt <cb@256bit.org>
parents:
10349
diff
changeset
|
3936 char_attr = 0; |
| 6834 | 3937 # ifdef FEAT_DIFF |
| 5995 | 3938 if (diff_hlf != (hlf_T)0) |
| 6106 | 3939 { |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
3940 char_attr = HL_ATTR(diff_hlf); |
| 6834 | 3941 # ifdef FEAT_SYN_HL |
| 6106 | 3942 if (wp->w_p_cul && lnum == wp->w_cursor.lnum) |
| 3943 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
|
3944 HL_ATTR(HLF_CUL)); |
| 6834 | 3945 # endif |
| 6106 | 3946 } |
| 6834 | 3947 # endif |
| 6028 | 3948 p_extra = NULL; |
| 5995 | 3949 c_extra = ' '; |
| 3950 n_extra = get_breakindent_win(wp, | |
| 3951 ml_get_buf(wp->w_buffer, lnum, FALSE)); | |
| 3952 /* Correct end of highlighted area for 'breakindent', | |
| 3953 * required when 'linebreak' is also set. */ | |
| 3954 if (tocol == vcol) | |
| 3955 tocol += n_extra; | |
| 3956 } | |
| 3957 } | |
| 3958 #endif | |
| 3959 | |
| 7 | 3960 #if defined(FEAT_LINEBREAK) || defined(FEAT_DIFF) |
| 3961 if (draw_state == WL_SBR - 1 && n_extra == 0) | |
| 3962 { | |
| 3963 draw_state = WL_SBR; | |
| 3964 # ifdef FEAT_DIFF | |
| 3965 if (filler_todo > 0) | |
| 3966 { | |
| 3967 /* Draw "deleted" diff line(s). */ | |
| 3968 if (char2cells(fill_diff) > 1) | |
| 3969 c_extra = '-'; | |
| 3970 else | |
| 3971 c_extra = fill_diff; | |
| 3972 # ifdef FEAT_RIGHTLEFT | |
| 3973 if (wp->w_p_rl) | |
| 3974 n_extra = col + 1; | |
| 3975 else | |
| 3976 # endif | |
| 3977 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
|
3978 char_attr = HL_ATTR(HLF_DED); |
| 7 | 3979 } |
| 3980 # endif | |
| 3981 # ifdef FEAT_LINEBREAK | |
| 3982 if (*p_sbr != NUL && need_showbreak) | |
| 3983 { | |
| 3984 /* Draw 'showbreak' at the start of each broken line. */ | |
| 3985 p_extra = p_sbr; | |
| 3986 c_extra = NUL; | |
| 3987 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
|
3988 char_attr = HL_ATTR(HLF_AT); |
| 7 | 3989 need_showbreak = FALSE; |
| 6503 | 3990 vcol_sbr = vcol + MB_CHARLEN(p_sbr); |
| 7 | 3991 /* Correct end of highlighted area for 'showbreak', |
| 3992 * required when 'linebreak' is also set. */ | |
| 3993 if (tocol == vcol) | |
| 3994 tocol += n_extra; | |
|
5068
6a7ae677d6a1
updated for version 7.3.1277
Bram Moolenaar <bram@vim.org>
parents:
4916
diff
changeset
|
3995 #ifdef FEAT_SYN_HL |
|
6a7ae677d6a1
updated for version 7.3.1277
Bram Moolenaar <bram@vim.org>
parents:
4916
diff
changeset
|
3996 /* combine 'showbreak' with 'cursorline' */ |
|
5078
22ac43fb6d30
updated for version 7.3.1282
Bram Moolenaar <bram@vim.org>
parents:
5068
diff
changeset
|
3997 if (wp->w_p_cul && lnum == wp->w_cursor.lnum) |
| 6106 | 3998 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
|
3999 HL_ATTR(HLF_CUL)); |
|
5068
6a7ae677d6a1
updated for version 7.3.1277
Bram Moolenaar <bram@vim.org>
parents:
4916
diff
changeset
|
4000 #endif |
| 7 | 4001 } |
| 4002 # endif | |
| 4003 } | |
| 4004 #endif | |
| 4005 | |
| 4006 if (draw_state == WL_LINE - 1 && n_extra == 0) | |
| 4007 { | |
| 4008 draw_state = WL_LINE; | |
| 4009 if (saved_n_extra) | |
| 4010 { | |
| 4011 /* Continue item from end of wrapped line. */ | |
| 4012 n_extra = saved_n_extra; | |
| 4013 c_extra = saved_c_extra; | |
| 4014 p_extra = saved_p_extra; | |
| 4015 char_attr = saved_char_attr; | |
| 4016 } | |
| 4017 else | |
| 4018 char_attr = 0; | |
| 4019 } | |
| 4020 } | |
| 4021 | |
| 4022 /* When still displaying '$' of change command, stop at cursor */ | |
| 3318 | 4023 if (dollar_vcol >= 0 && wp == curwin |
| 819 | 4024 && lnum == wp->w_cursor.lnum && vcol >= (long)wp->w_virtcol |
| 7 | 4025 #ifdef FEAT_DIFF |
| 4026 && filler_todo <= 0 | |
| 4027 #endif | |
| 4028 ) | |
| 4029 { | |
|
11670
3b2afa2b77b3
patch 8.0.0718: output of job in terminal is not displayed
Christian Brabandt <cb@256bit.org>
parents:
11657
diff
changeset
|
4030 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
|
4031 HAS_RIGHTLEFT(wp->w_p_rl)); |
| 819 | 4032 /* Pretend we have finished updating the window. Except when |
| 4033 * 'cursorcolumn' is set. */ | |
| 4034 #ifdef FEAT_SYN_HL | |
| 4035 if (wp->w_p_cuc) | |
| 4036 row = wp->w_cline_row + wp->w_cline_height; | |
| 4037 else | |
| 4038 #endif | |
| 4039 row = wp->w_height; | |
| 7 | 4040 break; |
| 4041 } | |
| 4042 | |
| 4043 if (draw_state == WL_LINE && area_highlighting) | |
| 4044 { | |
| 4045 /* handle Visual or match highlighting in this line */ | |
| 4046 if (vcol == fromcol | |
| 4047 #ifdef FEAT_MBYTE | |
| 4048 || (has_mbyte && vcol + 1 == fromcol && n_extra == 0 | |
| 4049 && (*mb_ptr2cells)(ptr) > 1) | |
| 4050 #endif | |
| 4051 || ((int)vcol_prev == fromcol_prev | |
| 1814 | 4052 && vcol_prev < vcol /* not at margin */ |
| 7 | 4053 && vcol < tocol)) |
| 4054 area_attr = attr; /* start highlighting */ | |
| 4055 else if (area_attr != 0 | |
| 4056 && (vcol == tocol | |
| 4057 || (noinvcur && (colnr_T)vcol == wp->w_virtcol))) | |
| 4058 area_attr = 0; /* stop highlighting */ | |
| 4059 | |
| 4060 #ifdef FEAT_SEARCH_EXTRA | |
| 4061 if (!n_extra) | |
| 4062 { | |
| 4063 /* | |
| 4064 * Check for start/end of search pattern match. | |
| 4065 * After end, check for start/end of next match. | |
| 4066 * When another match, have to check for start again. | |
| 4067 * Watch out for matching an empty string! | |
| 1326 | 4068 * Do this for 'search_hl' and the match list (ordered by |
| 4069 * priority). | |
| 7 | 4070 */ |
| 36 | 4071 v = (long)(ptr - line); |
| 1326 | 4072 cur = wp->w_match_head; |
| 4073 shl_flag = FALSE; | |
| 4074 while (cur != NULL || shl_flag == FALSE) | |
| 4075 { | |
| 4076 if (shl_flag == FALSE | |
| 4077 && ((cur != NULL | |
| 4078 && cur->priority > SEARCH_HL_PRIORITY) | |
| 4079 || cur == NULL)) | |
| 4080 { | |
| 4081 shl = &search_hl; | |
| 4082 shl_flag = TRUE; | |
| 4083 } | |
| 4084 else | |
| 4085 shl = &cur->hl; | |
| 5979 | 4086 if (cur != NULL) |
| 4087 cur->pos.cur = 0; | |
| 4088 pos_inprogress = TRUE; | |
| 4089 while (shl->rm.regprog != NULL | |
| 4090 || (cur != NULL && pos_inprogress)) | |
| 7 | 4091 { |
| 36 | 4092 if (shl->startcol != MAXCOL |
| 4093 && v >= (long)shl->startcol | |
| 4094 && v < (long)shl->endcol) | |
| 7 | 4095 { |
| 6430 | 4096 #ifdef FEAT_MBYTE |
| 4097 int tmp_col = v + MB_PTR2LEN(ptr); | |
| 4098 | |
| 4099 if (shl->endcol < tmp_col) | |
| 4100 shl->endcol = tmp_col; | |
| 4101 #endif | |
| 7 | 4102 shl->attr_cur = shl->attr; |
| 6947 | 4103 #ifdef FEAT_CONCEAL |
| 4104 if (cur != NULL && syn_name2id((char_u *)"Conceal") | |
| 4105 == cur->hlg_id) | |
| 4106 { | |
|
8907
5deb9e8f4292
commit https://github.com/vim/vim/commit/4d585022023b96f6507e8cae5ed8fc8d926f5140
Christian Brabandt <cb@256bit.org>
parents:
8872
diff
changeset
|
4107 has_match_conc = |
|
5deb9e8f4292
commit https://github.com/vim/vim/commit/4d585022023b96f6507e8cae5ed8fc8d926f5140
Christian Brabandt <cb@256bit.org>
parents:
8872
diff
changeset
|
4108 v == (long)shl->startcol ? 2 : 1; |
| 6947 | 4109 match_conc = cur->conceal_char; |
| 4110 } | |
| 4111 else | |
|
8907
5deb9e8f4292
commit https://github.com/vim/vim/commit/4d585022023b96f6507e8cae5ed8fc8d926f5140
Christian Brabandt <cb@256bit.org>
parents:
8872
diff
changeset
|
4112 has_match_conc = match_conc = 0; |
| 6947 | 4113 #endif |
| 7 | 4114 } |
| 6430 | 4115 else if (v == (long)shl->endcol) |
| 7 | 4116 { |
| 4117 shl->attr_cur = 0; | |
|
9992
3e3b0ce24b61
commit https://github.com/vim/vim/commit/e17bdffff78ebd6a4e3cff26754cc667557ea810
Christian Brabandt <cb@256bit.org>
parents:
9939
diff
changeset
|
4118 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
|
4119 shl == &search_hl ? NULL : cur); |
| 5979 | 4120 pos_inprogress = cur == NULL || cur->pos.cur == 0 |
| 6947 | 4121 ? FALSE : TRUE; |
| 7 | 4122 |
| 4123 /* Need to get the line again, a multi-line regexp | |
| 4124 * may have made it invalid. */ | |
| 4125 line = ml_get_buf(wp->w_buffer, lnum, FALSE); | |
| 4126 ptr = line + v; | |
| 4127 | |
| 4128 if (shl->lnum == lnum) | |
| 4129 { | |
| 36 | 4130 shl->startcol = shl->rm.startpos[0].col; |
| 7 | 4131 if (shl->rm.endpos[0].lnum == 0) |
| 36 | 4132 shl->endcol = shl->rm.endpos[0].col; |
| 7 | 4133 else |
| 36 | 4134 shl->endcol = MAXCOL; |
| 4135 | |
| 4136 if (shl->startcol == shl->endcol) | |
| 7 | 4137 { |
| 4138 /* highlight empty match, try again after | |
| 4139 * it */ | |
| 4140 #ifdef FEAT_MBYTE | |
| 4141 if (has_mbyte) | |
| 474 | 4142 shl->endcol += (*mb_ptr2len)(line |
| 36 | 4143 + shl->endcol); |
| 7 | 4144 else |
| 4145 #endif | |
| 36 | 4146 ++shl->endcol; |
| 7 | 4147 } |
| 4148 | |
| 4149 /* Loop to check if the match starts at the | |
| 4150 * current position */ | |
| 4151 continue; | |
| 4152 } | |
| 4153 } | |
| 4154 break; | |
| 4155 } | |
| 1326 | 4156 if (shl != &search_hl && cur != NULL) |
| 4157 cur = cur->next; | |
| 4158 } | |
| 4159 | |
| 4160 /* Use attributes from match with highest priority among | |
| 4161 * 'search_hl' and the match list. */ | |
| 4162 search_attr = search_hl.attr_cur; | |
| 4163 cur = wp->w_match_head; | |
| 4164 shl_flag = FALSE; | |
| 4165 while (cur != NULL || shl_flag == FALSE) | |
| 4166 { | |
| 4167 if (shl_flag == FALSE | |
| 4168 && ((cur != NULL | |
| 4169 && cur->priority > SEARCH_HL_PRIORITY) | |
| 4170 || cur == NULL)) | |
| 699 | 4171 { |
| 1326 | 4172 shl = &search_hl; |
| 4173 shl_flag = TRUE; | |
| 699 | 4174 } |
| 1326 | 4175 else |
| 4176 shl = &cur->hl; | |
| 4177 if (shl->attr_cur != 0) | |
| 4178 search_attr = shl->attr_cur; | |
| 4179 if (shl != &search_hl && cur != NULL) | |
| 4180 cur = cur->next; | |
| 4181 } | |
| 7 | 4182 } |
| 4183 #endif | |
| 4184 | |
| 4185 #ifdef FEAT_DIFF | |
| 674 | 4186 if (diff_hlf != (hlf_T)0) |
| 7 | 4187 { |
| 1295 | 4188 if (diff_hlf == HLF_CHD && ptr - line >= change_start |
| 4189 && n_extra == 0) | |
| 7 | 4190 diff_hlf = HLF_TXD; /* changed text */ |
| 1295 | 4191 if (diff_hlf == HLF_TXD && ptr - line > change_end |
| 4192 && n_extra == 0) | |
| 7 | 4193 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
|
4194 line_attr = HL_ATTR(diff_hlf); |
| 6106 | 4195 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
|
4196 line_attr = hl_combine_attr(line_attr, HL_ATTR(HLF_CUL)); |
| 674 | 4197 } |
| 4198 #endif | |
| 4199 | |
| 4200 /* Decide which of the highlight attributes to use. */ | |
| 4201 attr_pri = TRUE; | |
| 6717 | 4202 #ifdef LINE_ATTR |
| 674 | 4203 if (area_attr != 0) |
| 6717 | 4204 char_attr = hl_combine_attr(line_attr, area_attr); |
| 674 | 4205 else if (search_attr != 0) |
| 6717 | 4206 char_attr = hl_combine_attr(line_attr, search_attr); |
| 674 | 4207 /* Use line_attr when not in the Visual or 'incsearch' area |
| 4208 * (area_attr may be 0 when "noinvcur" is set). */ | |
| 4209 else if (line_attr != 0 && ((fromcol == -10 && tocol == MAXCOL) | |
| 1842 | 4210 || vcol < fromcol || vcol_prev < fromcol_prev |
| 4211 || vcol >= tocol)) | |
| 674 | 4212 char_attr = line_attr; |
| 6717 | 4213 #else |
| 4214 if (area_attr != 0) | |
| 4215 char_attr = area_attr; | |
| 4216 else if (search_attr != 0) | |
| 4217 char_attr = search_attr; | |
| 674 | 4218 #endif |
| 4219 else | |
| 4220 { | |
| 4221 attr_pri = FALSE; | |
| 4222 #ifdef FEAT_SYN_HL | |
| 4223 if (has_syntax) | |
| 4224 char_attr = syntax_attr; | |
| 4225 else | |
| 4226 #endif | |
| 4227 char_attr = 0; | |
| 4228 } | |
| 7 | 4229 } |
| 4230 | |
| 4231 /* | |
| 4232 * Get the next character to put on the screen. | |
| 4233 */ | |
| 4234 /* | |
| 1340 | 4235 * The "p_extra" points to the extra stuff that is inserted to |
| 4236 * represent special characters (non-printable stuff) and other | |
| 4237 * things. When all characters are the same, c_extra is used. | |
| 4238 * "p_extra" must end in a NUL to avoid mb_ptr2len() reads past | |
| 4239 * "p_extra[n_extra]". | |
| 7 | 4240 * For the '$' of the 'list' option, n_extra == 1, p_extra == "". |
| 4241 */ | |
| 4242 if (n_extra > 0) | |
| 4243 { | |
| 4244 if (c_extra != NUL) | |
| 4245 { | |
| 4246 c = c_extra; | |
| 4247 #ifdef FEAT_MBYTE | |
| 4248 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
|
4249 if (enc_utf8 && utf_char2len(c) > 1) |
| 7 | 4250 { |
| 4251 mb_utf8 = TRUE; | |
| 714 | 4252 u8cc[0] = 0; |
| 819 | 4253 c = 0xc0; |
| 7 | 4254 } |
| 4255 else | |
| 4256 mb_utf8 = FALSE; | |
| 4257 #endif | |
| 4258 } | |
| 4259 else | |
| 4260 { | |
| 4261 c = *p_extra; | |
| 4262 #ifdef FEAT_MBYTE | |
| 4263 if (has_mbyte) | |
| 4264 { | |
| 4265 mb_c = c; | |
| 4266 if (enc_utf8) | |
| 4267 { | |
| 4268 /* If the UTF-8 character is more than one byte: | |
| 4269 * 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
|
4270 mb_l = utfc_ptr2len(p_extra); |
| 7 | 4271 mb_utf8 = FALSE; |
| 4272 if (mb_l > n_extra) | |
| 4273 mb_l = 1; | |
| 4274 else if (mb_l > 1) | |
| 4275 { | |
| 714 | 4276 mb_c = utfc_ptr2char(p_extra, u8cc); |
| 7 | 4277 mb_utf8 = TRUE; |
| 819 | 4278 c = 0xc0; |
| 7 | 4279 } |
| 4280 } | |
| 4281 else | |
| 4282 { | |
| 4283 /* if this is a DBCS character, put it in "mb_c" */ | |
| 4284 mb_l = MB_BYTE2LEN(c); | |
| 4285 if (mb_l >= n_extra) | |
| 4286 mb_l = 1; | |
| 4287 else if (mb_l > 1) | |
| 4288 mb_c = (c << 8) + p_extra[1]; | |
| 4289 } | |
| 504 | 4290 if (mb_l == 0) /* at the NUL at end-of-line */ |
| 4291 mb_l = 1; | |
| 4292 | |
| 7 | 4293 /* If a double-width char doesn't fit display a '>' in the |
| 4294 * last column. */ | |
| 504 | 4295 if (( |
| 7 | 4296 # ifdef FEAT_RIGHTLEFT |
| 4297 wp->w_p_rl ? (col <= 0) : | |
| 4298 # endif | |
| 504 | 4299 (col >= W_WIDTH(wp) - 1)) |
| 7 | 4300 && (*mb_char2cells)(mb_c) == 2) |
| 4301 { | |
| 4302 c = '>'; | |
| 4303 mb_c = c; | |
| 4304 mb_l = 1; | |
| 4305 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
|
4306 multi_attr = HL_ATTR(HLF_AT); |
| 7 | 4307 /* put the pointer back to output the double-width |
| 4308 * character at the start of the next line. */ | |
| 4309 ++n_extra; | |
| 4310 --p_extra; | |
| 4311 } | |
| 4312 else | |
| 4313 { | |
| 4314 n_extra -= mb_l - 1; | |
| 4315 p_extra += mb_l - 1; | |
| 4316 } | |
| 4317 } | |
| 4318 #endif | |
| 4319 ++p_extra; | |
| 4320 } | |
| 4321 --n_extra; | |
| 4322 } | |
| 4323 else | |
| 4324 { | |
|
10986
62bcadce6c82
patch 8.0.0382: warning in tiny build for unused variable
Christian Brabandt <cb@256bit.org>
parents:
10982
diff
changeset
|
4325 #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
|
4326 int c0; |
|
10986
62bcadce6c82
patch 8.0.0382: warning in tiny build for unused variable
Christian Brabandt <cb@256bit.org>
parents:
10982
diff
changeset
|
4327 #endif |
|
10982
5e20c9f96cd5
patch 8.0.0380: with 'linebreak' double wide char wraps badly
Christian Brabandt <cb@256bit.org>
parents:
10928
diff
changeset
|
4328 |
| 6026 | 4329 if (p_extra_free != NULL) |
| 4330 { | |
| 4331 vim_free(p_extra_free); | |
| 4332 p_extra_free = NULL; | |
| 4333 } | |
| 7 | 4334 /* |
| 4335 * Get a character from the line itself. | |
| 4336 */ | |
|
10988
b5de553d6062
patch 8.0.0383: misplaced #ifdef
Christian Brabandt <cb@256bit.org>
parents:
10986
diff
changeset
|
4337 c = *ptr; |
|
10986
62bcadce6c82
patch 8.0.0382: warning in tiny build for unused variable
Christian Brabandt <cb@256bit.org>
parents:
10982
diff
changeset
|
4338 #ifdef FEAT_LINEBREAK |
|
10988
b5de553d6062
patch 8.0.0383: misplaced #ifdef
Christian Brabandt <cb@256bit.org>
parents:
10986
diff
changeset
|
4339 c0 = *ptr; |
|
10986
62bcadce6c82
patch 8.0.0382: warning in tiny build for unused variable
Christian Brabandt <cb@256bit.org>
parents:
10982
diff
changeset
|
4340 #endif |
| 7 | 4341 #ifdef FEAT_MBYTE |
| 4342 if (has_mbyte) | |
| 4343 { | |
| 4344 mb_c = c; | |
| 4345 if (enc_utf8) | |
| 4346 { | |
| 4347 /* If the UTF-8 character is more than one byte: Decode it | |
| 4348 * 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
|
4349 mb_l = utfc_ptr2len(ptr); |
| 7 | 4350 mb_utf8 = FALSE; |
| 4351 if (mb_l > 1) | |
| 4352 { | |
| 714 | 4353 mb_c = utfc_ptr2char(ptr, u8cc); |
| 7 | 4354 /* Overlong encoded ASCII or ASCII with composing char |
| 4355 * is displayed normally, except a NUL. */ | |
| 4356 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
|
4357 { |
|
62bcadce6c82
patch 8.0.0382: warning in tiny build for unused variable
Christian Brabandt <cb@256bit.org>
parents:
10982
diff
changeset
|
4358 c = mb_c; |
|
62bcadce6c82
patch 8.0.0382: warning in tiny build for unused variable
Christian Brabandt <cb@256bit.org>
parents:
10982
diff
changeset
|
4359 # ifdef FEAT_LINEBREAK |
|
62bcadce6c82
patch 8.0.0382: warning in tiny build for unused variable
Christian Brabandt <cb@256bit.org>
parents:
10982
diff
changeset
|
4360 c0 = mb_c; |
|
62bcadce6c82
patch 8.0.0382: warning in tiny build for unused variable
Christian Brabandt <cb@256bit.org>
parents:
10982
diff
changeset
|
4361 # endif |
|
62bcadce6c82
patch 8.0.0382: warning in tiny build for unused variable
Christian Brabandt <cb@256bit.org>
parents:
10982
diff
changeset
|
4362 } |
| 7 | 4363 mb_utf8 = TRUE; |
| 507 | 4364 |
| 4365 /* At start of the line we can have a composing char. | |
| 4366 * Draw it as a space with a composing char. */ | |
| 4367 if (utf_iscomposing(mb_c)) | |
| 4368 { | |
| 1326 | 4369 int i; |
| 4370 | |
| 714 | 4371 for (i = Screen_mco - 1; i > 0; --i) |
| 4372 u8cc[i] = u8cc[i - 1]; | |
| 4373 u8cc[0] = mb_c; | |
| 507 | 4374 mb_c = ' '; |
| 4375 } | |
| 7 | 4376 } |
| 4377 | |
| 4378 if ((mb_l == 1 && c >= 0x80) | |
| 4379 || (mb_l >= 1 && mb_c == 0) | |
| 4380 || (mb_l > 1 && (!vim_isprintc(mb_c) | |
| 1401 | 4381 # ifdef UNICODE16 |
| 4382 || mb_c >= 0x10000 | |
| 4383 # endif | |
| 4384 ))) | |
| 7 | 4385 { |
| 4386 /* | |
| 4387 * Illegal UTF-8 byte: display as <xx>. | |
| 4388 * Non-BMP character : display as ? or fullwidth ?. | |
| 4389 */ | |
| 1401 | 4390 # ifdef UNICODE16 |
| 7 | 4391 if (mb_c < 0x10000) |
| 1401 | 4392 # endif |
| 7 | 4393 { |
| 4394 transchar_hex(extra, mb_c); | |
| 714 | 4395 # ifdef FEAT_RIGHTLEFT |
| 7 | 4396 if (wp->w_p_rl) /* reverse */ |
| 4397 rl_mirror(extra); | |
| 714 | 4398 # endif |
| 7 | 4399 } |
| 1401 | 4400 # ifdef UNICODE16 |
| 7 | 4401 else if (utf_char2cells(mb_c) != 2) |
| 4402 STRCPY(extra, "?"); | |
| 4403 else | |
| 4404 /* 0xff1f in UTF-8: full-width '?' */ | |
| 4405 STRCPY(extra, "\357\274\237"); | |
| 1401 | 4406 # endif |
| 7 | 4407 |
| 4408 p_extra = extra; | |
| 4409 c = *p_extra; | |
| 4410 mb_c = mb_ptr2char_adv(&p_extra); | |
| 4411 mb_utf8 = (c >= 0x80); | |
| 4412 n_extra = (int)STRLEN(p_extra); | |
| 4413 c_extra = NUL; | |
| 4414 if (area_attr == 0 && search_attr == 0) | |
| 4415 { | |
| 4416 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
|
4417 extra_attr = HL_ATTR(HLF_8); |
| 7 | 4418 saved_attr2 = char_attr; /* save current attr */ |
| 4419 } | |
| 4420 } | |
| 4421 else if (mb_l == 0) /* at the NUL at end-of-line */ | |
| 4422 mb_l = 1; | |
| 4423 #ifdef FEAT_ARABIC | |
| 4424 else if (p_arshape && !p_tbidi && ARABIC_CHAR(mb_c)) | |
| 4425 { | |
| 4426 /* Do Arabic shaping. */ | |
| 714 | 4427 int pc, pc1, nc; |
| 4428 int pcc[MAX_MCO]; | |
| 7 | 4429 |
| 4430 /* The idea of what is the previous and next | |
| 4431 * character depends on 'rightleft'. */ | |
| 4432 if (wp->w_p_rl) | |
| 4433 { | |
| 4434 pc = prev_c; | |
| 4435 pc1 = prev_c1; | |
| 4436 nc = utf_ptr2char(ptr + mb_l); | |
| 714 | 4437 prev_c1 = u8cc[0]; |
| 7 | 4438 } |
| 4439 else | |
| 4440 { | |
| 714 | 4441 pc = utfc_ptr2char(ptr + mb_l, pcc); |
| 7 | 4442 nc = prev_c; |
| 714 | 4443 pc1 = pcc[0]; |
| 7 | 4444 } |
| 4445 prev_c = mb_c; | |
| 4446 | |
| 714 | 4447 mb_c = arabic_shape(mb_c, &c, &u8cc[0], pc, pc1, nc); |
| 7 | 4448 } |
| 4449 else | |
| 4450 prev_c = mb_c; | |
| 4451 #endif | |
| 4452 } | |
| 4453 else /* enc_dbcs */ | |
| 4454 { | |
| 4455 mb_l = MB_BYTE2LEN(c); | |
| 4456 if (mb_l == 0) /* at the NUL at end-of-line */ | |
| 4457 mb_l = 1; | |
| 4458 else if (mb_l > 1) | |
| 4459 { | |
| 4460 /* We assume a second byte below 32 is illegal. | |
| 4461 * Hopefully this is OK for all double-byte encodings! | |
| 4462 */ | |
| 4463 if (ptr[1] >= 32) | |
| 4464 mb_c = (c << 8) + ptr[1]; | |
| 4465 else | |
| 4466 { | |
| 4467 if (ptr[1] == NUL) | |
| 4468 { | |
| 4469 /* head byte at end of line */ | |
| 4470 mb_l = 1; | |
| 4471 transchar_nonprint(extra, c); | |
| 4472 } | |
| 4473 else | |
| 4474 { | |
| 4475 /* illegal tail byte */ | |
| 4476 mb_l = 2; | |
| 4477 STRCPY(extra, "XX"); | |
| 4478 } | |
| 4479 p_extra = extra; | |
| 4480 n_extra = (int)STRLEN(extra) - 1; | |
| 4481 c_extra = NUL; | |
| 4482 c = *p_extra++; | |
| 4483 if (area_attr == 0 && search_attr == 0) | |
| 4484 { | |
| 4485 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
|
4486 extra_attr = HL_ATTR(HLF_8); |
| 7 | 4487 saved_attr2 = char_attr; /* save current attr */ |
| 4488 } | |
| 4489 mb_c = c; | |
| 4490 } | |
| 4491 } | |
| 4492 } | |
| 4493 /* If a double-width char doesn't fit display a '>' in the | |
| 4494 * last column; the character is displayed at the start of the | |
| 4495 * next line. */ | |
| 4496 if (( | |
| 4497 # ifdef FEAT_RIGHTLEFT | |
| 4498 wp->w_p_rl ? (col <= 0) : | |
| 4499 # endif | |
| 4500 (col >= W_WIDTH(wp) - 1)) | |
| 4501 && (*mb_char2cells)(mb_c) == 2) | |
| 4502 { | |
| 4503 c = '>'; | |
| 4504 mb_c = c; | |
| 4505 mb_utf8 = FALSE; | |
| 4506 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
|
4507 multi_attr = HL_ATTR(HLF_AT); |
| 7 | 4508 /* Put pointer back so that the character will be |
| 4509 * displayed at the start of the next line. */ | |
| 4510 --ptr; | |
| 4511 } | |
| 4512 else if (*ptr != NUL) | |
| 4513 ptr += mb_l - 1; | |
| 4514 | |
| 4515 /* 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
|
4516 * a '<' in the first column. Don't do this for unprintable |
| 4352 | 4517 * 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
|
4518 if (n_skip > 0 && mb_l > 1 && n_extra == 0) |
| 7 | 4519 { |
| 4520 n_extra = 1; | |
| 3586 | 4521 c_extra = MB_FILLER_CHAR; |
| 7 | 4522 c = ' '; |
| 4523 if (area_attr == 0 && search_attr == 0) | |
| 4524 { | |
| 4525 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
|
4526 extra_attr = HL_ATTR(HLF_AT); |
| 7 | 4527 saved_attr2 = char_attr; /* save current attr */ |
| 4528 } | |
| 4529 mb_c = c; | |
| 4530 mb_utf8 = FALSE; | |
| 4531 mb_l = 1; | |
| 4532 } | |
| 4533 | |
| 4534 } | |
| 4535 #endif | |
| 4536 ++ptr; | |
| 4537 | |
| 4538 if (extra_check) | |
| 4539 { | |
| 743 | 4540 #ifdef FEAT_SPELL |
| 221 | 4541 int can_spell = TRUE; |
| 743 | 4542 #endif |
| 4543 | |
|
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
|
4544 #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
|
4545 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
|
4546 { |
|
11864
97eb443fee5d
patch 8.0.0812: terminal window colors shift when 'number' is set
Christian Brabandt <cb@256bit.org>
parents:
11836
diff
changeset
|
4547 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
|
4548 |
|
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 (!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
|
4550 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
|
4551 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
|
4552 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
|
4553 } |
|
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 #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
|
4555 |
| 743 | 4556 #ifdef FEAT_SYN_HL |
| 7 | 4557 /* Get syntax attribute, unless still at the start of the line |
| 4558 * (double-wide char that doesn't fit). */ | |
| 221 | 4559 v = (long)(ptr - line); |
| 4560 if (has_syntax && v > 0) | |
| 7 | 4561 { |
| 4562 /* Get the syntax attribute for the character. If there | |
| 4563 * is an error, disable syntax highlighting. */ | |
| 4564 save_did_emsg = did_emsg; | |
| 4565 did_emsg = FALSE; | |
| 4566 | |
| 221 | 4567 syntax_attr = get_syntax_attr((colnr_T)v - 1, |
| 743 | 4568 # ifdef FEAT_SPELL |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
4569 has_spell ? &can_spell : |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
4570 # endif |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
4571 NULL, FALSE); |
| 7 | 4572 |
| 4573 if (did_emsg) | |
| 482 | 4574 { |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
4575 wp->w_s->b_syn_error = TRUE; |
| 482 | 4576 has_syntax = FALSE; |
| 4577 } | |
| 7 | 4578 else |
| 4579 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
|
4580 #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
|
4581 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
|
4582 has_syntax = FALSE; |
|
998d2cf59caa
patch 8.0.0647: syntax highlighting can make cause a freeze
Christian Brabandt <cb@256bit.org>
parents:
11521
diff
changeset
|
4583 #endif |
| 7 | 4584 |
| 4585 /* Need to get the line again, a multi-line regexp may | |
| 4586 * have made it invalid. */ | |
| 4587 line = ml_get_buf(wp->w_buffer, lnum, FALSE); | |
| 4588 ptr = line + v; | |
| 4589 | |
| 674 | 4590 if (!attr_pri) |
| 7 | 4591 char_attr = syntax_attr; |
| 301 | 4592 else |
| 303 | 4593 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
|
4594 # 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
|
4595 /* 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
|
4596 * 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
|
4597 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
|
4598 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
|
4599 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
|
4600 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
|
4601 # endif |
| 7 | 4602 } |
| 743 | 4603 #endif |
| 4604 | |
| 4605 #ifdef FEAT_SPELL | |
| 301 | 4606 /* Check spelling (unless at the end of the line). |
| 319 | 4607 * Only do this when there is no syntax highlighting, the |
| 4608 * @Spell cluster is not used or the current syntax item | |
| 4609 * contains the @Spell cluster. */ | |
| 348 | 4610 if (has_spell && v >= word_end && v > cur_checked_col) |
| 221 | 4611 { |
| 230 | 4612 spell_attr = 0; |
| 743 | 4613 # ifdef FEAT_SYN_HL |
| 674 | 4614 if (!attr_pri) |
| 230 | 4615 char_attr = syntax_attr; |
| 743 | 4616 # endif |
| 4617 if (c != 0 && ( | |
| 4618 # ifdef FEAT_SYN_HL | |
| 4619 !has_syntax || | |
| 4620 # endif | |
| 4621 can_spell)) | |
| 221 | 4622 { |
| 348 | 4623 char_u *prev_ptr, *p; |
| 4624 int len; | |
| 534 | 4625 hlf_T spell_hlf = HLF_COUNT; |
| 221 | 4626 # ifdef FEAT_MBYTE |
| 336 | 4627 if (has_mbyte) |
| 4628 { | |
| 4629 prev_ptr = ptr - mb_l; | |
| 4630 v -= mb_l - 1; | |
| 4631 } | |
| 4632 else | |
| 221 | 4633 # endif |
| 336 | 4634 prev_ptr = ptr - 1; |
| 348 | 4635 |
| 4636 /* Use nextline[] if possible, it has the start of the | |
| 4637 * next line concatenated. */ | |
| 4638 if ((prev_ptr - line) - nextlinecol >= 0) | |
| 4639 p = nextline + (prev_ptr - line) - nextlinecol; | |
| 4640 else | |
| 4641 p = prev_ptr; | |
| 835 | 4642 cap_col -= (int)(prev_ptr - line); |
| 625 | 4643 len = spell_check(wp, p, &spell_hlf, &cap_col, |
| 4644 nochange); | |
| 348 | 4645 word_end = v + len; |
| 301 | 4646 |
| 4647 /* In Insert mode only highlight a word that | |
| 4648 * doesn't touch the cursor. */ | |
| 534 | 4649 if (spell_hlf != HLF_COUNT |
| 301 | 4650 && (State & INSERT) != 0 |
| 4651 && wp->w_cursor.lnum == lnum | |
| 4652 && wp->w_cursor.col >= | |
| 4653 (colnr_T)(prev_ptr - line) | |
| 4654 && wp->w_cursor.col < (colnr_T)word_end) | |
| 221 | 4655 { |
| 534 | 4656 spell_hlf = HLF_COUNT; |
| 301 | 4657 spell_redraw_lnum = lnum; |
| 221 | 4658 } |
| 348 | 4659 |
| 534 | 4660 if (spell_hlf == HLF_COUNT && p != prev_ptr |
| 348 | 4661 && (p - nextline) + len > nextline_idx) |
| 4662 { | |
| 4663 /* Remember that the good word continues at the | |
| 4664 * start of the next line. */ | |
| 4665 checked_lnum = lnum + 1; | |
| 835 | 4666 checked_col = (int)((p - nextline) + len - nextline_idx); |
| 348 | 4667 } |
| 386 | 4668 |
| 534 | 4669 /* Turn index into actual attributes. */ |
| 4670 if (spell_hlf != HLF_COUNT) | |
| 4671 spell_attr = highlight_attr[spell_hlf]; | |
| 4672 | |
| 386 | 4673 if (cap_col > 0) |
| 4674 { | |
| 4675 if (p != prev_ptr | |
| 4676 && (p - nextline) + cap_col >= nextline_idx) | |
| 4677 { | |
| 4678 /* Remember that the word in the next line | |
| 4679 * must start with a capital. */ | |
| 4680 capcol_lnum = lnum + 1; | |
| 835 | 4681 cap_col = (int)((p - nextline) + cap_col |
| 4682 - nextline_idx); | |
| 386 | 4683 } |
| 4684 else | |
| 4685 /* Compute the actual column. */ | |
| 835 | 4686 cap_col += (int)(prev_ptr - line); |
| 386 | 4687 } |
| 221 | 4688 } |
| 4689 } | |
| 4690 if (spell_attr != 0) | |
| 348 | 4691 { |
| 674 | 4692 if (!attr_pri) |
| 348 | 4693 char_attr = hl_combine_attr(char_attr, spell_attr); |
| 4694 else | |
| 4695 char_attr = hl_combine_attr(spell_attr, char_attr); | |
| 4696 } | |
| 7 | 4697 #endif |
| 4698 #ifdef FEAT_LINEBREAK | |
| 4699 /* | |
| 221 | 4700 * Found last space before word: check for line break. |
| 7 | 4701 */ |
|
10982
5e20c9f96cd5
patch 8.0.0380: with 'linebreak' double wide char wraps badly
Christian Brabandt <cb@256bit.org>
parents:
10928
diff
changeset
|
4702 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
|
4703 && VIM_ISBREAK(c) && !VIM_ISBREAK((int)*ptr)) |
| 7 | 4704 { |
| 6681 | 4705 # ifdef FEAT_MBYTE |
| 6693 | 4706 int mb_off = has_mbyte ? (*mb_head_off)(line, ptr - 1) : 0; |
| 6681 | 4707 # endif |
| 5995 | 4708 char_u *p = ptr - ( |
| 7 | 4709 # ifdef FEAT_MBYTE |
| 6693 | 4710 mb_off + |
| 7 | 4711 # endif |
| 5995 | 4712 1); |
| 6681 | 4713 |
| 5995 | 4714 /* TODO: is passing p for start of the line OK? */ |
| 6026 | 4715 n_extra = win_lbr_chartabsize(wp, line, p, (colnr_T)vcol, |
| 5995 | 4716 NULL) - 1; |
| 6371 | 4717 if (c == TAB && n_extra + col > W_WIDTH(wp)) |
| 4718 n_extra = (int)wp->w_buffer->b_p_ts | |
| 4719 - vcol % (int)wp->w_buffer->b_p_ts - 1; | |
| 4720 | |
| 6681 | 4721 # ifdef FEAT_MBYTE |
| 6693 | 4722 c_extra = mb_off > 0 ? MB_FILLER_CHAR : ' '; |
| 6681 | 4723 # else |
| 7 | 4724 c_extra = ' '; |
| 6681 | 4725 # endif |
|
11129
f4ea50924c6d
patch 8.0.0452: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11127
diff
changeset
|
4726 if (VIM_ISWHITE(c)) |
|
5174
42d592dbbec3
updated for version 7.4a.013
Bram Moolenaar <bram@vim.org>
parents:
5126
diff
changeset
|
4727 { |
|
42d592dbbec3
updated for version 7.4a.013
Bram Moolenaar <bram@vim.org>
parents:
5126
diff
changeset
|
4728 #ifdef FEAT_CONCEAL |
|
42d592dbbec3
updated for version 7.4a.013
Bram Moolenaar <bram@vim.org>
parents:
5126
diff
changeset
|
4729 if (c == TAB) |
|
42d592dbbec3
updated for version 7.4a.013
Bram Moolenaar <bram@vim.org>
parents:
5126
diff
changeset
|
4730 /* See "Tab alignment" below. */ |
|
42d592dbbec3
updated for version 7.4a.013
Bram Moolenaar <bram@vim.org>
parents:
5126
diff
changeset
|
4731 FIX_FOR_BOGUSCOLS; |
|
42d592dbbec3
updated for version 7.4a.013
Bram Moolenaar <bram@vim.org>
parents:
5126
diff
changeset
|
4732 #endif |
| 6026 | 4733 if (!wp->w_p_list) |
| 4734 c = ' '; | |
|
5174
42d592dbbec3
updated for version 7.4a.013
Bram Moolenaar <bram@vim.org>
parents:
5126
diff
changeset
|
4735 } |
| 7 | 4736 } |
| 4737 #endif | |
| 4738 | |
|
7344
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
4739 /* '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
|
4740 */ |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
4741 if (wp->w_p_list |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
4742 && (((c == 160 |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
4743 #ifdef FEAT_MBYTE |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
4744 || (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
|
4745 #endif |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
4746 ) && lcs_nbsp) |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
4747 || (c == ' ' && lcs_space && ptr - line <= trailcol))) |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
4748 { |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
4749 c = (c == ' ') ? lcs_space : lcs_nbsp; |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
4750 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
|
4751 { |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
4752 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
|
4753 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
|
4754 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
|
4755 } |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
4756 #ifdef FEAT_MBYTE |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
4757 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
|
4758 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
|
4759 { |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
4760 mb_utf8 = TRUE; |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
4761 u8cc[0] = 0; |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
4762 c = 0xc0; |
|
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 else |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
4765 mb_utf8 = FALSE; |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
4766 #endif |
|
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 |
| 7 | 4769 if (trailcol != MAXCOL && ptr > line + trailcol && c == ' ') |
| 4770 { | |
| 4771 c = lcs_trail; | |
| 674 | 4772 if (!attr_pri) |
| 7 | 4773 { |
| 4774 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
|
4775 extra_attr = HL_ATTR(HLF_8); |
| 7 | 4776 saved_attr2 = char_attr; /* save current attr */ |
| 4777 } | |
| 4778 #ifdef FEAT_MBYTE | |
| 4779 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
|
4780 if (enc_utf8 && utf_char2len(c) > 1) |
| 7 | 4781 { |
| 4782 mb_utf8 = TRUE; | |
| 714 | 4783 u8cc[0] = 0; |
| 819 | 4784 c = 0xc0; |
| 7 | 4785 } |
| 4786 else | |
| 4787 mb_utf8 = FALSE; | |
| 4788 #endif | |
| 4789 } | |
| 4790 } | |
| 4791 | |
| 4792 /* | |
| 4793 * Handling of non-printable characters. | |
| 4794 */ | |
|
7697
f04e2b6feea2
commit https://github.com/vim/vim/commit/88e8f9f14434a7cd538d0c159dc432bea869a5bd
Christian Brabandt <cb@256bit.org>
parents:
7603
diff
changeset
|
4795 if (!vim_isprintc(c)) |
| 7 | 4796 { |
| 4797 /* | |
| 4798 * when getting a character from the file, we may have to | |
| 4799 * turn it into something else on the way to putting it | |
| 4800 * into "ScreenLines". | |
| 4801 */ | |
| 4802 if (c == TAB && (!wp->w_p_list || lcs_tab1)) | |
| 4803 { | |
| 6026 | 4804 int tab_len = 0; |
| 6503 | 4805 long vcol_adjusted = vcol; /* removed showbreak length */ |
| 4806 #ifdef FEAT_LINEBREAK | |
| 4807 /* only adjust the tab_len, when at the first column | |
| 4808 * after the showbreak value was drawn */ | |
| 4809 if (*p_sbr != NUL && vcol == vcol_sbr && wp->w_p_wrap) | |
| 4810 vcol_adjusted = vcol - MB_CHARLEN(p_sbr); | |
| 4811 #endif | |
| 7 | 4812 /* tab amount depends on current column */ |
| 6026 | 4813 tab_len = (int)wp->w_buffer->b_p_ts |
| 6503 | 4814 - vcol_adjusted % (int)wp->w_buffer->b_p_ts - 1; |
| 4815 | |
| 6026 | 4816 #ifdef FEAT_LINEBREAK |
| 6100 | 4817 if (!wp->w_p_lbr || !wp->w_p_list) |
| 6026 | 4818 #endif |
| 4819 /* tab amount depends on current column */ | |
| 4820 n_extra = tab_len; | |
| 4821 #ifdef FEAT_LINEBREAK | |
| 4822 else | |
| 4823 { | |
| 4824 char_u *p; | |
| 4825 int len = n_extra; | |
| 4826 int i; | |
| 4827 int saved_nextra = n_extra; | |
| 4828 | |
| 6172 | 4829 #ifdef FEAT_CONCEAL |
| 6627 | 4830 if (vcol_off > 0) |
| 6172 | 4831 /* there are characters to conceal */ |
| 4832 tab_len += vcol_off; | |
| 6520 | 4833 /* boguscols before FIX_FOR_BOGUSCOLS macro from above |
| 4834 */ | |
| 4835 if (wp->w_p_list && lcs_tab1 && old_boguscols > 0 | |
| 4836 && n_extra > tab_len) | |
| 4837 tab_len += n_extra - tab_len; | |
| 4838 #endif | |
| 4839 | |
| 6026 | 4840 /* if n_extra > 0, it gives the number of chars, to |
| 4841 * use for a tab, else we need to calculate the width | |
| 4842 * for a tab */ | |
| 4843 #ifdef FEAT_MBYTE | |
| 4844 len = (tab_len * mb_char2len(lcs_tab2)); | |
| 4845 if (n_extra > 0) | |
| 4846 len += n_extra - tab_len; | |
| 4847 #endif | |
| 4848 c = lcs_tab1; | |
| 4849 p = alloc((unsigned)(len + 1)); | |
| 4850 vim_memset(p, ' ', len); | |
| 4851 p[len] = NUL; | |
|
10690
206ab11fa76e
patch 8.0.0235: memory leak in diff mode
Christian Brabandt <cb@256bit.org>
parents:
10538
diff
changeset
|
4852 vim_free(p_extra_free); |
| 6026 | 4853 p_extra_free = p; |
| 4854 for (i = 0; i < tab_len; i++) | |
| 4855 { | |
| 4856 #ifdef FEAT_MBYTE | |
| 4857 mb_char2bytes(lcs_tab2, p); | |
| 4858 p += mb_char2len(lcs_tab2); | |
| 4859 n_extra += mb_char2len(lcs_tab2) | |
| 4860 - (saved_nextra > 0 ? 1 : 0); | |
| 4861 #else | |
| 4862 p[i] = lcs_tab2; | |
| 4863 #endif | |
| 4864 } | |
| 4865 p_extra = p_extra_free; | |
| 6172 | 4866 #ifdef FEAT_CONCEAL |
| 4867 /* n_extra will be increased by FIX_FOX_BOGUSCOLS | |
| 4868 * macro below, so need to adjust for that here */ | |
| 6627 | 4869 if (vcol_off > 0) |
| 6172 | 4870 n_extra -= vcol_off; |
| 4871 #endif | |
| 6026 | 4872 } |
| 4873 #endif | |
| 3984 | 4874 #ifdef FEAT_CONCEAL |
| 6627 | 4875 { |
| 4876 int vc_saved = vcol_off; | |
| 4877 | |
| 4878 /* Tab alignment should be identical regardless of | |
| 4879 * 'conceallevel' value. So tab compensates of all | |
| 4880 * previous concealed characters, and thus resets | |
| 4881 * vcol_off and boguscols accumulated so far in the | |
| 4882 * line. Note that the tab can be longer than | |
| 4883 * 'tabstop' when there are concealed characters. */ | |
| 4884 FIX_FOR_BOGUSCOLS; | |
| 4885 | |
| 4886 /* Make sure, the highlighting for the tab char will be | |
| 4887 * correctly set further below (effectively reverts the | |
| 4888 * FIX_FOR_BOGSUCOLS macro */ | |
| 4889 if (n_extra == tab_len + vc_saved && wp->w_p_list | |
| 6520 | 4890 && lcs_tab1) |
| 6627 | 4891 tab_len += vc_saved; |
| 4892 } | |
| 3984 | 4893 #endif |
| 7 | 4894 #ifdef FEAT_MBYTE |
| 4895 mb_utf8 = FALSE; /* don't draw as UTF-8 */ | |
| 4896 #endif | |
| 4897 if (wp->w_p_list) | |
| 4898 { | |
| 4899 c = lcs_tab1; | |
| 6026 | 4900 #ifdef FEAT_LINEBREAK |
| 4901 if (wp->w_p_lbr) | |
| 4902 c_extra = NUL; /* using p_extra from above */ | |
| 4903 else | |
| 4904 #endif | |
| 4905 c_extra = lcs_tab2; | |
| 4906 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
|
4907 extra_attr = HL_ATTR(HLF_8); |
| 7 | 4908 saved_attr2 = char_attr; /* save current attr */ |
| 4909 #ifdef FEAT_MBYTE | |
| 4910 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
|
4911 if (enc_utf8 && utf_char2len(c) > 1) |
| 7 | 4912 { |
| 4913 mb_utf8 = TRUE; | |
| 714 | 4914 u8cc[0] = 0; |
| 819 | 4915 c = 0xc0; |
| 7 | 4916 } |
| 4917 #endif | |
| 4918 } | |
| 4919 else | |
| 4920 { | |
| 4921 c_extra = ' '; | |
| 4922 c = ' '; | |
| 4923 } | |
| 4924 } | |
| 36 | 4925 else if (c == NUL |
| 6799 | 4926 && (wp->w_p_list |
| 36 | 4927 || ((fromcol >= 0 || fromcol_prev >= 0) |
| 4928 && tocol > vcol | |
| 4929 && VIsual_mode != Ctrl_V | |
| 4930 && ( | |
| 4931 # ifdef FEAT_RIGHTLEFT | |
| 4932 wp->w_p_rl ? (col >= 0) : | |
| 4933 # endif | |
| 4934 (col < W_WIDTH(wp))) | |
| 4935 && !(noinvcur | |
| 1850 | 4936 && lnum == wp->w_cursor.lnum |
| 36 | 4937 && (colnr_T)vcol == wp->w_virtcol))) |
| 6815 | 4938 && lcs_eol_one > 0) |
| 7 | 4939 { |
| 36 | 4940 /* Display a '$' after the line or highlight an extra |
| 4941 * character if the line break is included. */ | |
| 7 | 4942 #if defined(FEAT_DIFF) || defined(LINE_ATTR) |
| 4943 /* For a diff line the highlighting continues after the | |
| 4944 * "$". */ | |
| 4945 if ( | |
| 4946 # ifdef FEAT_DIFF | |
| 534 | 4947 diff_hlf == (hlf_T)0 |
| 7 | 4948 # ifdef LINE_ATTR |
| 4949 && | |
| 4950 # endif | |
| 4951 # endif | |
| 4952 # ifdef LINE_ATTR | |
| 4953 line_attr == 0 | |
| 4954 # endif | |
| 4955 ) | |
| 4956 #endif | |
| 4957 { | |
| 4958 #ifdef FEAT_VIRTUALEDIT | |
| 4959 /* In virtualedit, visual selections may extend | |
| 4960 * beyond end of line. */ | |
| 4961 if (area_highlighting && virtual_active() | |
| 4962 && tocol != MAXCOL && vcol < tocol) | |
| 4963 n_extra = 0; | |
| 4964 else | |
| 4965 #endif | |
| 4966 { | |
| 4967 p_extra = at_end_str; | |
| 4968 n_extra = 1; | |
| 4969 c_extra = NUL; | |
| 4970 } | |
| 4971 } | |
| 6799 | 4972 if (wp->w_p_list && lcs_eol > 0) |
| 36 | 4973 c = lcs_eol; |
| 4974 else | |
| 4975 c = ' '; | |
| 7 | 4976 lcs_eol_one = -1; |
| 4977 --ptr; /* put it back at the NUL */ | |
| 674 | 4978 if (!attr_pri) |
| 7 | 4979 { |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
4980 extra_attr = HL_ATTR(HLF_AT); |
| 7 | 4981 n_attr = 1; |
| 4982 } | |
| 4983 #ifdef FEAT_MBYTE | |
| 4984 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
|
4985 if (enc_utf8 && utf_char2len(c) > 1) |
| 7 | 4986 { |
| 4987 mb_utf8 = TRUE; | |
| 714 | 4988 u8cc[0] = 0; |
| 819 | 4989 c = 0xc0; |
| 7 | 4990 } |
| 4991 else | |
| 4992 mb_utf8 = FALSE; /* don't draw as UTF-8 */ | |
| 4993 #endif | |
| 4994 } | |
| 4995 else if (c != NUL) | |
| 4996 { | |
| 4997 p_extra = transchar(c); | |
| 6064 | 4998 if (n_extra == 0) |
| 4999 n_extra = byte2cells(c) - 1; | |
| 7 | 5000 #ifdef FEAT_RIGHTLEFT |
| 5001 if ((dy_flags & DY_UHEX) && wp->w_p_rl) | |
| 5002 rl_mirror(p_extra); /* reverse "<12>" */ | |
| 5003 #endif | |
| 5004 c_extra = NUL; | |
| 6026 | 5005 #ifdef FEAT_LINEBREAK |
| 5006 if (wp->w_p_lbr) | |
| 5007 { | |
| 5008 char_u *p; | |
| 5009 | |
| 5010 c = *p_extra; | |
| 5011 p = alloc((unsigned)n_extra + 1); | |
| 5012 vim_memset(p, ' ', n_extra); | |
| 5013 STRNCPY(p, p_extra + 1, STRLEN(p_extra) - 1); | |
| 5014 p[n_extra] = NUL; | |
|
10690
206ab11fa76e
patch 8.0.0235: memory leak in diff mode
Christian Brabandt <cb@256bit.org>
parents:
10538
diff
changeset
|
5015 vim_free(p_extra_free); |
| 6026 | 5016 p_extra_free = p_extra = p; |
| 5017 } | |
| 5018 else | |
| 5019 #endif | |
| 5020 { | |
| 5021 n_extra = byte2cells(c) - 1; | |
| 5022 c = *p_extra++; | |
| 5023 } | |
| 674 | 5024 if (!attr_pri) |
| 7 | 5025 { |
| 5026 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
|
5027 extra_attr = HL_ATTR(HLF_8); |
| 7 | 5028 saved_attr2 = char_attr; /* save current attr */ |
| 5029 } | |
| 5030 #ifdef FEAT_MBYTE | |
| 5031 mb_utf8 = FALSE; /* don't draw as UTF-8 */ | |
| 5032 #endif | |
| 5033 } | |
| 5034 #ifdef FEAT_VIRTUALEDIT | |
| 5035 else if (VIsual_active | |
| 5036 && (VIsual_mode == Ctrl_V | |
| 5037 || VIsual_mode == 'v') | |
| 5038 && virtual_active() | |
| 5039 && tocol != MAXCOL | |
| 5040 && vcol < tocol | |
| 5041 && ( | |
| 5042 # ifdef FEAT_RIGHTLEFT | |
| 5043 wp->w_p_rl ? (col >= 0) : | |
| 5044 # endif | |
| 5045 (col < W_WIDTH(wp)))) | |
| 5046 { | |
| 5047 c = ' '; | |
| 5048 --ptr; /* put it back at the NUL */ | |
| 5049 } | |
| 5050 #endif | |
| 910 | 5051 #if defined(LINE_ATTR) |
| 7 | 5052 else if (( |
| 5053 # ifdef FEAT_DIFF | |
| 910 | 5054 diff_hlf != (hlf_T)0 || |
| 7 | 5055 # endif |
| 5056 line_attr != 0 | |
| 5057 ) && ( | |
| 5058 # ifdef FEAT_RIGHTLEFT | |
| 5059 wp->w_p_rl ? (col >= 0) : | |
| 5060 # endif | |
|
2553
37d3f90f5203
Conceal feature caused the 'cursorline' highlighting to stop early.
Bram Moolenaar <bram@vim.org>
parents:
2520
diff
changeset
|
5061 (col |
|
37d3f90f5203
Conceal feature caused the 'cursorline' highlighting to stop early.
Bram Moolenaar <bram@vim.org>
parents:
2520
diff
changeset
|
5062 # ifdef FEAT_CONCEAL |
|
37d3f90f5203
Conceal feature caused the 'cursorline' highlighting to stop early.
Bram Moolenaar <bram@vim.org>
parents:
2520
diff
changeset
|
5063 - boguscols |
|
37d3f90f5203
Conceal feature caused the 'cursorline' highlighting to stop early.
Bram Moolenaar <bram@vim.org>
parents:
2520
diff
changeset
|
5064 # endif |
|
37d3f90f5203
Conceal feature caused the 'cursorline' highlighting to stop early.
Bram Moolenaar <bram@vim.org>
parents:
2520
diff
changeset
|
5065 < W_WIDTH(wp)))) |
| 7 | 5066 { |
| 5067 /* Highlight until the right side of the window */ | |
| 5068 c = ' '; | |
| 5069 --ptr; /* put it back at the NUL */ | |
| 867 | 5070 |
| 5071 /* Remember we do the char for line highlighting. */ | |
| 5072 ++did_line_attr; | |
| 5073 | |
| 5074 /* don't do search HL for the rest of the line */ | |
| 5075 if (line_attr != 0 && char_attr == search_attr && col > 0) | |
| 5076 char_attr = line_attr; | |
| 7 | 5077 # ifdef FEAT_DIFF |
| 5078 if (diff_hlf == HLF_TXD) | |
| 5079 { | |
| 5080 diff_hlf = HLF_CHD; | |
| 5081 if (attr == 0 || char_attr != attr) | |
| 6106 | 5082 { |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
5083 char_attr = HL_ATTR(diff_hlf); |
| 6106 | 5084 if (wp->w_p_cul && lnum == wp->w_cursor.lnum) |
| 5085 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
|
5086 HL_ATTR(HLF_CUL)); |
| 6106 | 5087 } |
| 7 | 5088 } |
| 5089 # endif | |
| 5090 } | |
| 5091 #endif | |
| 5092 } | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5093 |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5094 #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
|
5095 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
|
5096 && (wp != curwin || lnum != wp->w_cursor.lnum || |
| 6947 | 5097 conceal_cursor_line(wp) ) |
|
8907
5deb9e8f4292
commit https://github.com/vim/vim/commit/4d585022023b96f6507e8cae5ed8fc8d926f5140
Christian Brabandt <cb@256bit.org>
parents:
8872
diff
changeset
|
5098 && ( (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
|
5099 && !(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
|
5100 && 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
|
5101 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5102 char_attr = conceal_attr; |
|
8907
5deb9e8f4292
commit https://github.com/vim/vim/commit/4d585022023b96f6507e8cae5ed8fc8d926f5140
Christian Brabandt <cb@256bit.org>
parents:
8872
diff
changeset
|
5103 if ((prev_syntax_id != syntax_seqnr || has_match_conc > 1) |
| 6947 | 5104 && (syn_get_sub_char() != NUL || match_conc |
| 5105 || 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
|
5106 && 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
|
5107 { |
|
a96dd77ce213
For conceal mode: when two different syntax items follow each other, show the
Bram Moolenaar <bram@vim.org>
parents:
2364
diff
changeset
|
5108 /* 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
|
5109 * character. */ |
| 6947 | 5110 if (match_conc) |
| 5111 c = match_conc; | |
| 5112 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
|
5113 c = syn_get_sub_char(); |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5114 else if (lcs_conceal != NUL) |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5115 c = lcs_conceal; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5116 else |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5117 c = ' '; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5118 |
|
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
|
5119 prev_syntax_id = syntax_seqnr; |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5120 |
|
2332
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
5121 if (n_extra > 0) |
|
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
5122 vcol_off += n_extra; |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5123 vcol += n_extra; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5124 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
|
5125 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5126 # ifdef FEAT_RIGHTLEFT |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5127 if (wp->w_p_rl) |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5128 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5129 col -= n_extra; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5130 boguscols -= n_extra; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5131 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5132 else |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5133 # endif |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5134 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5135 boguscols += n_extra; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5136 col += n_extra; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5137 } |
|
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 n_extra = 0; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5140 n_attr = 0; |
|
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 else if (n_skip == 0) |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5143 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5144 is_concealing = TRUE; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5145 n_skip = 1; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5146 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5147 # ifdef FEAT_MBYTE |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5148 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
|
5149 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
|
5150 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5151 mb_utf8 = TRUE; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5152 u8cc[0] = 0; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5153 c = 0xc0; |
|
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 else |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5156 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
|
5157 # endif |
|
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 { |
|
2375
a96dd77ce213
For conceal mode: when two different syntax items follow each other, show the
Bram Moolenaar <bram@vim.org>
parents:
2364
diff
changeset
|
5161 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
|
5162 is_concealing = FALSE; |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5163 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5164 #endif /* FEAT_CONCEAL */ |
| 7 | 5165 } |
| 5166 | |
|
2378
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
5167 #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
|
5168 /* 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
|
5169 * 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
|
5170 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
|
5171 && 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
|
5172 && 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
|
5173 && (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
|
5174 { |
|
7603
d3892f6c917e
commit https://github.com/vim/vim/commit/e39b3d9fb4e4006684c33847d1ef6a0d742699dd
Christian Brabandt <cb@256bit.org>
parents:
7344
diff
changeset
|
5175 # ifdef FEAT_RIGHTLEFT |
|
d3892f6c917e
commit https://github.com/vim/vim/commit/e39b3d9fb4e4006684c33847d1ef6a0d742699dd
Christian Brabandt <cb@256bit.org>
parents:
7344
diff
changeset
|
5176 if (wp->w_p_rl) |
|
d3892f6c917e
commit https://github.com/vim/vim/commit/e39b3d9fb4e4006684c33847d1ef6a0d742699dd
Christian Brabandt <cb@256bit.org>
parents:
7344
diff
changeset
|
5177 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
|
5178 else |
|
d3892f6c917e
commit https://github.com/vim/vim/commit/e39b3d9fb4e4006684c33847d1ef6a0d742699dd
Christian Brabandt <cb@256bit.org>
parents:
7344
diff
changeset
|
5179 # endif |
|
d3892f6c917e
commit https://github.com/vim/vim/commit/e39b3d9fb4e4006684c33847d1ef6a0d742699dd
Christian Brabandt <cb@256bit.org>
parents:
7344
diff
changeset
|
5180 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
|
5181 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
|
5182 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
|
5183 } |
|
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
5184 #endif |
|
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
5185 |
| 7 | 5186 /* Don't override visual selection highlighting. */ |
| 5187 if (n_attr > 0 | |
| 5188 && draw_state == WL_LINE | |
| 674 | 5189 && !attr_pri) |
| 7 | 5190 char_attr = extra_attr; |
| 5191 | |
| 42 | 5192 #if defined(FEAT_XIM) && defined(FEAT_GUI_GTK) |
| 7 | 5193 /* XIM don't send preedit_start and preedit_end, but they send |
| 5194 * preedit_changed and commit. Thus Vim can't set "im_is_active", use | |
| 5195 * im_is_preediting() here. */ | |
| 5196 if (xic != NULL | |
| 1850 | 5197 && lnum == wp->w_cursor.lnum |
| 7 | 5198 && (State & INSERT) |
| 5199 && !p_imdisable | |
| 5200 && im_is_preediting() | |
| 5201 && draw_state == WL_LINE) | |
| 5202 { | |
| 5203 colnr_T tcol; | |
| 5204 | |
| 5205 if (preedit_end_col == MAXCOL) | |
| 1850 | 5206 getvcol(curwin, &(wp->w_cursor), &tcol, NULL, NULL); |
| 7 | 5207 else |
| 5208 tcol = preedit_end_col; | |
| 5209 if ((long)preedit_start_col <= vcol && vcol < (long)tcol) | |
| 5210 { | |
| 5211 if (feedback_old_attr < 0) | |
| 5212 { | |
| 5213 feedback_col = 0; | |
| 5214 feedback_old_attr = char_attr; | |
| 5215 } | |
| 5216 char_attr = im_get_feedback_attr(feedback_col); | |
| 5217 if (char_attr < 0) | |
| 5218 char_attr = feedback_old_attr; | |
| 5219 feedback_col++; | |
| 5220 } | |
| 5221 else if (feedback_old_attr >= 0) | |
| 5222 { | |
| 5223 char_attr = feedback_old_attr; | |
| 5224 feedback_old_attr = -1; | |
| 5225 feedback_col = 0; | |
| 5226 } | |
| 5227 } | |
| 5228 #endif | |
| 5229 /* | |
| 5230 * Handle the case where we are in column 0 but not on the first | |
| 5231 * character of the line and the user wants us to show us a | |
| 5232 * special character (via 'listchars' option "precedes:<char>". | |
| 5233 */ | |
| 5234 if (lcs_prec_todo != NUL | |
| 6276 | 5235 && wp->w_p_list |
| 7 | 5236 && (wp->w_p_wrap ? wp->w_skipcol > 0 : wp->w_leftcol > 0) |
| 5237 #ifdef FEAT_DIFF | |
| 5238 && filler_todo <= 0 | |
| 5239 #endif | |
| 5240 && draw_state > WL_NR | |
| 5241 && c != NUL) | |
| 5242 { | |
| 5243 c = lcs_prec; | |
| 5244 lcs_prec_todo = NUL; | |
| 5245 #ifdef FEAT_MBYTE | |
| 3586 | 5246 if (has_mbyte && (*mb_char2cells)(mb_c) > 1) |
| 5247 { | |
| 5248 /* Double-width character being overwritten by the "precedes" | |
| 5249 * character, need to fill up half the character. */ | |
| 5250 c_extra = MB_FILLER_CHAR; | |
| 5251 n_extra = 1; | |
| 5252 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
|
5253 extra_attr = HL_ATTR(HLF_AT); |
| 3586 | 5254 } |
| 7 | 5255 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
|
5256 if (enc_utf8 && utf_char2len(c) > 1) |
| 7 | 5257 { |
| 5258 mb_utf8 = TRUE; | |
| 714 | 5259 u8cc[0] = 0; |
| 819 | 5260 c = 0xc0; |
| 7 | 5261 } |
| 5262 else | |
| 5263 mb_utf8 = FALSE; /* don't draw as UTF-8 */ | |
| 5264 #endif | |
| 674 | 5265 if (!attr_pri) |
| 7 | 5266 { |
| 5267 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
|
5268 char_attr = HL_ATTR(HLF_AT); /* later copied to char_attr */ |
| 7 | 5269 n_attr3 = 1; |
| 5270 } | |
| 5271 } | |
| 5272 | |
| 5273 /* | |
| 867 | 5274 * At end of the text line or just after the last character. |
| 7 | 5275 */ |
| 867 | 5276 if (c == NUL |
| 910 | 5277 #if defined(LINE_ATTR) |
| 867 | 5278 || did_line_attr == 1 |
| 5279 #endif | |
| 5280 ) | |
| 5281 { | |
| 5282 #ifdef FEAT_SEARCH_EXTRA | |
| 5283 long prevcol = (long)(ptr - line) - (c == NUL); | |
| 1437 | 5284 |
| 5285 /* we're not really at that column when skipping some text */ | |
| 1439 | 5286 if ((long)(wp->w_p_wrap ? wp->w_skipcol : wp->w_leftcol) > prevcol) |
| 1437 | 5287 ++prevcol; |
| 867 | 5288 #endif |
| 5289 | |
|
2332
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
5290 /* Invert at least one char, used for Visual and empty line or |
| 7 | 5291 * highlight match at end of line. If it's beyond the last |
| 5292 * char on the screen, just overwrite that one (tricky!) Not | |
| 5293 * needed when a '$' was displayed for 'list'. */ | |
| 1326 | 5294 #ifdef FEAT_SEARCH_EXTRA |
| 5295 prevcol_hl_flag = FALSE; | |
|
9885
4e8b05fa12c6
commit https://github.com/vim/vim/commit/4f416e41243ca151b95d39d81ce23d00b1484755
Christian Brabandt <cb@256bit.org>
parents:
9877
diff
changeset
|
5296 if (!search_hl.is_addpos && prevcol == (long)search_hl.startcol) |
| 1326 | 5297 prevcol_hl_flag = TRUE; |
| 5298 else | |
| 5299 { | |
| 5300 cur = wp->w_match_head; | |
| 5301 while (cur != NULL) | |
| 5302 { | |
|
9885
4e8b05fa12c6
commit https://github.com/vim/vim/commit/4f416e41243ca151b95d39d81ce23d00b1484755
Christian Brabandt <cb@256bit.org>
parents:
9877
diff
changeset
|
5303 if (!cur->hl.is_addpos && prevcol == (long)cur->hl.startcol) |
| 1326 | 5304 { |
| 5305 prevcol_hl_flag = TRUE; | |
| 5306 break; | |
| 5307 } | |
| 5308 cur = cur->next; | |
| 5309 } | |
| 5310 } | |
| 5311 #endif | |
| 7 | 5312 if (lcs_eol == lcs_eol_one |
| 1850 | 5313 && ((area_attr != 0 && vcol == fromcol |
| 5314 && (VIsual_mode != Ctrl_V | |
| 5315 || lnum == VIsual.lnum | |
| 5316 || lnum == curwin->w_cursor.lnum) | |
| 5317 && c == NUL) | |
| 7 | 5318 #ifdef FEAT_SEARCH_EXTRA |
| 5319 /* highlight 'hlsearch' match at end of line */ | |
| 1326 | 5320 || (prevcol_hl_flag == TRUE |
| 910 | 5321 # if defined(LINE_ATTR) |
| 867 | 5322 && did_line_attr <= 1 |
| 5323 # endif | |
| 5324 ) | |
| 7 | 5325 #endif |
| 5326 )) | |
| 5327 { | |
| 5328 int n = 0; | |
| 5329 | |
| 5330 #ifdef FEAT_RIGHTLEFT | |
| 5331 if (wp->w_p_rl) | |
| 5332 { | |
| 5333 if (col < 0) | |
| 5334 n = 1; | |
| 5335 } | |
| 5336 else | |
| 5337 #endif | |
| 5338 { | |
| 5339 if (col >= W_WIDTH(wp)) | |
| 5340 n = -1; | |
| 5341 } | |
| 5342 if (n != 0) | |
| 5343 { | |
| 5344 /* At the window boundary, highlight the last character | |
| 5345 * instead (better than nothing). */ | |
| 5346 off += n; | |
| 5347 col += n; | |
| 5348 } | |
| 5349 else | |
| 5350 { | |
| 5351 /* Add a blank character to highlight. */ | |
| 5352 ScreenLines[off] = ' '; | |
| 5353 #ifdef FEAT_MBYTE | |
| 5354 if (enc_utf8) | |
| 5355 ScreenLinesUC[off] = 0; | |
| 5356 #endif | |
| 5357 } | |
| 5358 #ifdef FEAT_SEARCH_EXTRA | |
| 5359 if (area_attr == 0) | |
| 5360 { | |
| 1326 | 5361 /* Use attributes from match with highest priority among |
| 5362 * 'search_hl' and the match list. */ | |
| 5363 char_attr = search_hl.attr; | |
| 5364 cur = wp->w_match_head; | |
| 5365 shl_flag = FALSE; | |
| 5366 while (cur != NULL || shl_flag == FALSE) | |
| 699 | 5367 { |
| 1326 | 5368 if (shl_flag == FALSE |
| 5369 && ((cur != NULL | |
| 5370 && cur->priority > SEARCH_HL_PRIORITY) | |
| 5371 || cur == NULL)) | |
| 699 | 5372 { |
| 1326 | 5373 shl = &search_hl; |
| 5374 shl_flag = TRUE; | |
| 699 | 5375 } |
| 1326 | 5376 else |
| 5377 shl = &cur->hl; | |
|
9885
4e8b05fa12c6
commit https://github.com/vim/vim/commit/4f416e41243ca151b95d39d81ce23d00b1484755
Christian Brabandt <cb@256bit.org>
parents:
9877
diff
changeset
|
5378 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
|
5379 && (shl == &search_hl || !shl->is_addpos)) |
| 1326 | 5380 char_attr = shl->attr; |
| 5381 if (shl != &search_hl && cur != NULL) | |
| 5382 cur = cur->next; | |
| 699 | 5383 } |
| 7 | 5384 } |
| 5385 #endif | |
| 5386 ScreenAttrs[off] = char_attr; | |
| 5387 #ifdef FEAT_RIGHTLEFT | |
| 5388 if (wp->w_p_rl) | |
| 1437 | 5389 { |
| 7 | 5390 --col; |
| 1437 | 5391 --off; |
| 5392 } | |
| 7 | 5393 else |
| 5394 #endif | |
| 1437 | 5395 { |
| 7 | 5396 ++col; |
| 1437 | 5397 ++off; |
| 5398 } | |
| 743 | 5399 ++vcol; |
| 1437 | 5400 #ifdef FEAT_SYN_HL |
| 5401 eol_hl_off = 1; | |
| 5402 #endif | |
| 743 | 5403 } |
| 867 | 5404 } |
| 5405 | |
| 5406 /* | |
| 5407 * At end of the text line. | |
| 5408 */ | |
| 5409 if (c == NUL) | |
| 5410 { | |
| 743 | 5411 #ifdef FEAT_SYN_HL |
| 1850 | 5412 if (eol_hl_off > 0 && vcol - eol_hl_off == (long)wp->w_virtcol |
| 5413 && lnum == wp->w_cursor.lnum) | |
| 1437 | 5414 { |
| 5415 /* highlight last char after line */ | |
| 5416 --col; | |
| 5417 --off; | |
| 5418 --vcol; | |
| 5419 } | |
| 5420 | |
|
2314
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5421 /* Highlight 'cursorcolumn' & 'colorcolumn' past end of the line. */ |
| 758 | 5422 if (wp->w_p_wrap) |
| 5423 v = wp->w_skipcol; | |
| 5424 else | |
| 5425 v = wp->w_leftcol; | |
|
2314
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5426 |
| 820 | 5427 /* check if line ends before left margin */ |
| 5428 if (vcol < v + col - win_col_off(wp)) | |
| 5429 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
|
5430 #ifdef FEAT_CONCEAL |
|
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
5431 /* 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
|
5432 * edge for 'cursorcolumn'. */ |
|
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
5433 col -= boguscols; |
|
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
5434 boguscols = 0; |
|
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
5435 #endif |
|
2314
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5436 |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5437 if (draw_color_col) |
|
2332
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
5438 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
|
5439 |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5440 if (((wp->w_p_cuc |
|
2332
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
5441 && (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
|
5442 && (int)wp->w_virtcol < |
|
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
5443 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
|
5444 && lnum != wp->w_cursor.lnum) |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5445 || draw_color_col) |
| 743 | 5446 # ifdef FEAT_RIGHTLEFT |
| 5447 && !wp->w_p_rl | |
| 5448 # endif | |
| 5449 ) | |
| 5450 { | |
|
2314
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5451 int rightmost_vcol = 0; |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5452 int i; |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5453 |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5454 if (wp->w_p_cuc) |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5455 rightmost_vcol = wp->w_virtcol; |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5456 if (draw_color_col) |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5457 /* determine rightmost colorcolumn to possibly draw */ |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5458 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
|
5459 if (rightmost_vcol < color_cols[i]) |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5460 rightmost_vcol = color_cols[i]; |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5461 |
| 743 | 5462 while (col < W_WIDTH(wp)) |
| 5463 { | |
| 5464 ScreenLines[off] = ' '; | |
| 5465 #ifdef FEAT_MBYTE | |
| 5466 if (enc_utf8) | |
| 5467 ScreenLinesUC[off] = 0; | |
| 5468 #endif | |
| 5469 ++col; | |
|
2356
eb1f2554cac5
Fix 'colorcolumn' adjecent columns not highlighted after end of line.
Bram Moolenaar <bram@vim.org>
parents:
2349
diff
changeset
|
5470 if (draw_color_col) |
|
eb1f2554cac5
Fix 'colorcolumn' adjecent columns not highlighted after end of line.
Bram Moolenaar <bram@vim.org>
parents:
2349
diff
changeset
|
5471 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
|
5472 &color_cols); |
|
eb1f2554cac5
Fix 'colorcolumn' adjecent columns not highlighted after end of line.
Bram Moolenaar <bram@vim.org>
parents:
2349
diff
changeset
|
5473 |
|
2332
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
5474 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
|
5475 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
|
5476 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
|
5477 ScreenAttrs[off++] = HL_ATTR(HLF_MC); |
|
2314
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5478 else |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5479 ScreenAttrs[off++] = 0; |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5480 |
|
2332
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
5481 if (VCOL_HLC >= rightmost_vcol) |
| 743 | 5482 break; |
|
2314
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5483 |
| 743 | 5484 ++vcol; |
| 5485 } | |
| 5486 } | |
| 5487 #endif | |
| 7 | 5488 |
|
11670
3b2afa2b77b3
patch 8.0.0718: output of job in terminal is not displayed
Christian Brabandt <cb@256bit.org>
parents:
11657
diff
changeset
|
5489 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
|
5490 (int)W_WIDTH(wp), HAS_RIGHTLEFT(wp->w_p_rl)); |
| 7 | 5491 row++; |
| 5492 | |
| 5493 /* | |
| 5494 * Update w_cline_height and w_cline_folded if the cursor line was | |
| 5495 * updated (saves a call to plines() later). | |
| 5496 */ | |
| 5497 if (wp == curwin && lnum == curwin->w_cursor.lnum) | |
| 5498 { | |
| 5499 curwin->w_cline_row = startrow; | |
| 5500 curwin->w_cline_height = row - startrow; | |
| 5501 #ifdef FEAT_FOLDING | |
| 5502 curwin->w_cline_folded = FALSE; | |
| 5503 #endif | |
| 5504 curwin->w_valid |= (VALID_CHEIGHT|VALID_CROW); | |
| 5505 } | |
| 5506 | |
| 5507 break; | |
| 5508 } | |
| 5509 | |
| 5510 /* line continues beyond line end */ | |
| 5511 if (lcs_ext | |
| 5512 && !wp->w_p_wrap | |
| 5513 #ifdef FEAT_DIFF | |
| 5514 && filler_todo <= 0 | |
| 5515 #endif | |
| 5516 && ( | |
| 5517 #ifdef FEAT_RIGHTLEFT | |
| 5518 wp->w_p_rl ? col == 0 : | |
| 5519 #endif | |
| 5520 col == W_WIDTH(wp) - 1) | |
| 5521 && (*ptr != NUL | |
| 1555 | 5522 || (wp->w_p_list && lcs_eol_one > 0) |
| 7 | 5523 || (n_extra && (c_extra != NUL || *p_extra != NUL)))) |
| 5524 { | |
| 5525 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
|
5526 char_attr = HL_ATTR(HLF_AT); |
| 7 | 5527 #ifdef FEAT_MBYTE |
| 5528 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
|
5529 if (enc_utf8 && utf_char2len(c) > 1) |
| 7 | 5530 { |
| 5531 mb_utf8 = TRUE; | |
| 714 | 5532 u8cc[0] = 0; |
| 819 | 5533 c = 0xc0; |
| 7 | 5534 } |
| 5535 else | |
| 5536 mb_utf8 = FALSE; | |
| 5537 #endif | |
| 5538 } | |
| 5539 | |
| 743 | 5540 #ifdef FEAT_SYN_HL |
|
2314
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5541 /* advance to the next 'colorcolumn' */ |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5542 if (draw_color_col) |
|
2332
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
5543 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
|
5544 |
| 743 | 5545 /* 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
|
5546 * highlight the cursor position itself. |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5547 * 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
|
5548 * 'cursorcolumn' */ |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5549 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
|
5550 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
|
5551 && search_attr == 0 && area_attr == 0) |
|
2314
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5552 { |
|
2332
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
5553 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
|
5554 && lnum != wp->w_cursor.lnum) |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5555 { |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5556 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
|
5557 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
|
5558 } |
|
2346
b38c324bdc36
Fix: 'colorcolumn' interfered with concealed text.
Bram Moolenaar <bram@vim.org>
parents:
2338
diff
changeset
|
5559 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
|
5560 { |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5561 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
|
5562 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
|
5563 } |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5564 } |
| 743 | 5565 #endif |
| 5566 | |
| 7 | 5567 /* |
| 5568 * Store character to be displayed. | |
| 5569 * Skip characters that are left of the screen for 'nowrap'. | |
| 5570 */ | |
| 5571 vcol_prev = vcol; | |
| 5572 if (draw_state < WL_LINE || n_skip <= 0) | |
| 5573 { | |
| 5574 /* | |
| 5575 * Store the character. | |
| 5576 */ | |
| 5577 #if defined(FEAT_RIGHTLEFT) && defined(FEAT_MBYTE) | |
| 5578 if (has_mbyte && wp->w_p_rl && (*mb_char2cells)(mb_c) > 1) | |
| 5579 { | |
| 5580 /* A double-wide character is: put first halve in left cell. */ | |
| 5581 --off; | |
| 5582 --col; | |
| 5583 } | |
| 5584 #endif | |
| 5585 ScreenLines[off] = c; | |
| 5586 #ifdef FEAT_MBYTE | |
| 5587 if (enc_dbcs == DBCS_JPNU) | |
|
2069
63613d8d7e4d
updated for version 7.2.354
Bram Moolenaar <bram@zimbu.org>
parents:
2055
diff
changeset
|
5588 { |
|
63613d8d7e4d
updated for version 7.2.354
Bram Moolenaar <bram@zimbu.org>
parents:
2055
diff
changeset
|
5589 if ((mb_c & 0xff00) == 0x8e00) |
|
63613d8d7e4d
updated for version 7.2.354
Bram Moolenaar <bram@zimbu.org>
parents:
2055
diff
changeset
|
5590 ScreenLines[off] = 0x8e; |
| 7 | 5591 ScreenLines2[off] = mb_c & 0xff; |
|
2069
63613d8d7e4d
updated for version 7.2.354
Bram Moolenaar <bram@zimbu.org>
parents:
2055
diff
changeset
|
5592 } |
| 7 | 5593 else if (enc_utf8) |
| 5594 { | |
| 5595 if (mb_utf8) | |
| 5596 { | |
| 1326 | 5597 int i; |
| 5598 | |
| 7 | 5599 ScreenLinesUC[off] = mb_c; |
| 819 | 5600 if ((c & 0xff) == 0) |
| 5601 ScreenLines[off] = 0x80; /* avoid storing zero */ | |
| 714 | 5602 for (i = 0; i < Screen_mco; ++i) |
| 5603 { | |
| 5604 ScreenLinesC[i][off] = u8cc[i]; | |
| 5605 if (u8cc[i] == 0) | |
| 5606 break; | |
| 5607 } | |
| 7 | 5608 } |
| 5609 else | |
| 5610 ScreenLinesUC[off] = 0; | |
| 5611 } | |
| 5612 if (multi_attr) | |
| 5613 { | |
| 5614 ScreenAttrs[off] = multi_attr; | |
| 5615 multi_attr = 0; | |
| 5616 } | |
| 5617 else | |
| 5618 #endif | |
| 5619 ScreenAttrs[off] = char_attr; | |
| 5620 | |
| 5621 #ifdef FEAT_MBYTE | |
| 5622 if (has_mbyte && (*mb_char2cells)(mb_c) > 1) | |
| 5623 { | |
| 5624 /* Need to fill two screen columns. */ | |
| 5625 ++off; | |
| 5626 ++col; | |
| 5627 if (enc_utf8) | |
| 5628 /* UTF-8: Put a 0 in the second screen char. */ | |
| 5629 ScreenLines[off] = 0; | |
| 5630 else | |
| 5631 /* DBCS: Put second byte in the second screen char. */ | |
| 5632 ScreenLines[off] = mb_c & 0xff; | |
|
7287
6fcadba9ec7a
commit https://github.com/vim/vim/commit/32a214e78df0120f92fe049eab1385c60f0cdb0b
Christian Brabandt <cb@256bit.org>
parents:
7233
diff
changeset
|
5633 if (draw_state > WL_NR |
|
6fcadba9ec7a
commit https://github.com/vim/vim/commit/32a214e78df0120f92fe049eab1385c60f0cdb0b
Christian Brabandt <cb@256bit.org>
parents:
7233
diff
changeset
|
5634 #ifdef FEAT_DIFF |
|
6fcadba9ec7a
commit https://github.com/vim/vim/commit/32a214e78df0120f92fe049eab1385c60f0cdb0b
Christian Brabandt <cb@256bit.org>
parents:
7233
diff
changeset
|
5635 && filler_todo <= 0 |
|
6fcadba9ec7a
commit https://github.com/vim/vim/commit/32a214e78df0120f92fe049eab1385c60f0cdb0b
Christian Brabandt <cb@256bit.org>
parents:
7233
diff
changeset
|
5636 #endif |
|
6fcadba9ec7a
commit https://github.com/vim/vim/commit/32a214e78df0120f92fe049eab1385c60f0cdb0b
Christian Brabandt <cb@256bit.org>
parents:
7233
diff
changeset
|
5637 ) |
|
6fcadba9ec7a
commit https://github.com/vim/vim/commit/32a214e78df0120f92fe049eab1385c60f0cdb0b
Christian Brabandt <cb@256bit.org>
parents:
7233
diff
changeset
|
5638 ++vcol; |
| 7 | 5639 /* When "tocol" is halfway a character, set it to the end of |
| 5640 * the character, otherwise highlighting won't stop. */ | |
| 5641 if (tocol == vcol) | |
| 5642 ++tocol; | |
| 5643 #ifdef FEAT_RIGHTLEFT | |
| 5644 if (wp->w_p_rl) | |
| 5645 { | |
| 5646 /* now it's time to backup one cell */ | |
| 5647 --off; | |
| 5648 --col; | |
| 5649 } | |
| 5650 #endif | |
| 5651 } | |
| 5652 #endif | |
| 5653 #ifdef FEAT_RIGHTLEFT | |
| 5654 if (wp->w_p_rl) | |
| 5655 { | |
| 5656 --off; | |
| 5657 --col; | |
| 5658 } | |
| 5659 else | |
| 5660 #endif | |
| 5661 { | |
| 5662 ++off; | |
| 5663 ++col; | |
| 5664 } | |
| 5665 } | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5666 #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
|
5667 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
|
5668 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5669 --n_skip; |
|
2332
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
5670 ++vcol_off; |
|
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
5671 if (n_extra > 0) |
|
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
5672 vcol_off += n_extra; |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5673 if (wp->w_p_wrap) |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5674 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5675 /* |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5676 * Special voodoo required if 'wrap' is on. |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5677 * |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5678 * 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
|
5679 * 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
|
5680 * 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
|
5681 * 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
|
5682 * |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5683 * 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
|
5684 * 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
|
5685 * 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
|
5686 * of bad columns we have advanced. |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5687 */ |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5688 if (n_extra > 0) |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5689 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5690 vcol += n_extra; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5691 # ifdef FEAT_RIGHTLEFT |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5692 if (wp->w_p_rl) |
|
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 col -= n_extra; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5695 boguscols -= n_extra; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5696 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5697 else |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5698 # endif |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5699 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5700 col += n_extra; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5701 boguscols += n_extra; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5702 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5703 n_extra = 0; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5704 n_attr = 0; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5705 } |
|
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 |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5708 # ifdef FEAT_MBYTE |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5709 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
|
5710 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5711 /* Need to fill two screen columns. */ |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5712 # ifdef FEAT_RIGHTLEFT |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5713 if (wp->w_p_rl) |
|
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 --boguscols; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5716 --col; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5717 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5718 else |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5719 # endif |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5720 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5721 ++boguscols; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5722 ++col; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5723 } |
|
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 # endif |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5726 |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5727 # ifdef FEAT_RIGHTLEFT |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5728 if (wp->w_p_rl) |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5729 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5730 --boguscols; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5731 --col; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5732 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5733 else |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5734 # endif |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5735 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5736 ++boguscols; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5737 ++col; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5738 } |
|
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 else |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5741 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5742 if (n_extra > 0) |
|
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 vcol += n_extra; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5745 n_extra = 0; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5746 n_attr = 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 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5749 |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5750 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5751 #endif /* FEAT_CONCEAL */ |
| 7 | 5752 else |
| 5753 --n_skip; | |
| 5754 | |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
5755 /* 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
|
5756 * column. */ |
| 1849 | 5757 if (draw_state > WL_NR |
| 7 | 5758 #ifdef FEAT_DIFF |
| 5759 && filler_todo <= 0 | |
| 5760 #endif | |
| 5761 ) | |
| 5762 ++vcol; | |
| 5763 | |
| 743 | 5764 #ifdef FEAT_SYN_HL |
| 5765 if (vcol_save_attr >= 0) | |
| 5766 char_attr = vcol_save_attr; | |
| 5767 #endif | |
| 5768 | |
| 7 | 5769 /* restore attributes after "predeces" in 'listchars' */ |
| 5770 if (draw_state > WL_NR && n_attr3 > 0 && --n_attr3 == 0) | |
| 5771 char_attr = saved_attr3; | |
| 5772 | |
| 5773 /* restore attributes after last 'listchars' or 'number' char */ | |
| 5774 if (n_attr > 0 && draw_state == WL_LINE && --n_attr == 0) | |
| 5775 char_attr = saved_attr2; | |
| 5776 | |
| 5777 /* | |
| 5778 * At end of screen line and there is more to come: Display the line | |
| 1378 | 5779 * so far. If there is no more to display it is caught above. |
| 7 | 5780 */ |
| 5781 if (( | |
| 5782 #ifdef FEAT_RIGHTLEFT | |
| 5783 wp->w_p_rl ? (col < 0) : | |
| 5784 #endif | |
| 5785 (col >= W_WIDTH(wp))) | |
| 5786 && (*ptr != NUL | |
| 5787 #ifdef FEAT_DIFF | |
| 5788 || filler_todo > 0 | |
| 5789 #endif | |
| 2724 | 5790 || (wp->w_p_list && lcs_eol != NUL && p_extra != at_end_str) |
| 7 | 5791 || (n_extra != 0 && (c_extra != NUL || *p_extra != NUL))) |
| 5792 ) | |
| 5793 { | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5794 #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
|
5795 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
|
5796 (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
|
5797 boguscols = 0; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5798 #else |
|
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, |
|
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 #endif |
| 7 | 5802 ++row; |
| 5803 ++screen_row; | |
| 5804 | |
| 5805 /* When not wrapping and finished diff lines, or when displayed | |
| 5806 * '$' and highlighting until last column, break here. */ | |
| 5807 if ((!wp->w_p_wrap | |
| 5808 #ifdef FEAT_DIFF | |
| 5809 && filler_todo <= 0 | |
| 5810 #endif | |
| 5811 ) || lcs_eol_one == -1) | |
| 5812 break; | |
| 5813 | |
| 5814 /* When the window is too narrow draw all "@" lines. */ | |
| 5815 if (draw_state != WL_LINE | |
| 5816 #ifdef FEAT_DIFF | |
| 5817 && filler_todo <= 0 | |
| 5818 #endif | |
| 5819 ) | |
| 5820 { | |
| 5821 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
|
5822 #ifdef FEAT_WINDOWS |
| 7 | 5823 draw_vsep_win(wp, row); |
| 5824 #endif | |
| 5825 row = endrow; | |
| 5826 } | |
| 5827 | |
| 5828 /* When line got too long for screen break here. */ | |
| 5829 if (row == endrow) | |
| 5830 { | |
| 5831 ++row; | |
| 5832 break; | |
| 5833 } | |
| 5834 | |
| 5835 if (screen_cur_row == screen_row - 1 | |
| 5836 #ifdef FEAT_DIFF | |
| 5837 && filler_todo <= 0 | |
| 5838 #endif | |
|
10349
cf988222b150
commit https://github.com/vim/vim/commit/a1f4cb93ba50ea9e40cd4b1f5592b8a6d1398660
Christian Brabandt <cb@256bit.org>
parents:
10307
diff
changeset
|
5839 #ifdef FEAT_WINDOWS |
|
cf988222b150
commit https://github.com/vim/vim/commit/a1f4cb93ba50ea9e40cd4b1f5592b8a6d1398660
Christian Brabandt <cb@256bit.org>
parents:
10307
diff
changeset
|
5840 && W_WIDTH(wp) == Columns |
|
cf988222b150
commit https://github.com/vim/vim/commit/a1f4cb93ba50ea9e40cd4b1f5592b8a6d1398660
Christian Brabandt <cb@256bit.org>
parents:
10307
diff
changeset
|
5841 #endif |
|
cf988222b150
commit https://github.com/vim/vim/commit/a1f4cb93ba50ea9e40cd4b1f5592b8a6d1398660
Christian Brabandt <cb@256bit.org>
parents:
10307
diff
changeset
|
5842 ) |
| 7 | 5843 { |
| 5844 /* Remember that the line wraps, used for modeless copy. */ | |
| 5845 LineWraps[screen_row - 1] = TRUE; | |
| 5846 | |
| 5847 /* | |
| 5848 * Special trick to make copy/paste of wrapped lines work with | |
| 5849 * xterm/screen: write an extra character beyond the end of | |
| 5850 * the line. This will work with all terminal types | |
| 5851 * (regardless of the xn,am settings). | |
| 5852 * Only do this on a fast tty. | |
| 5853 * Only do this if the cursor is on the current line | |
| 5854 * (something has been written in it). | |
| 5855 * Don't do this for the GUI. | |
| 5856 * Don't do this for double-width characters. | |
| 5857 * Don't do this for a window not at the right screen border. | |
| 5858 */ | |
| 5859 if (p_tf | |
| 5860 #ifdef FEAT_GUI | |
| 5861 && !gui.in_use | |
| 5862 #endif | |
| 5863 #ifdef FEAT_MBYTE | |
| 5864 && !(has_mbyte | |
| 1378 | 5865 && ((*mb_off2cells)(LineOffset[screen_row], |
| 5866 LineOffset[screen_row] + screen_Columns) | |
| 5867 == 2 | |
| 7 | 5868 || (*mb_off2cells)(LineOffset[screen_row - 1] |
| 1378 | 5869 + (int)Columns - 2, |
| 5870 LineOffset[screen_row] + screen_Columns) | |
| 5871 == 2)) | |
| 7 | 5872 #endif |
| 5873 ) | |
| 5874 { | |
| 5875 /* First make sure we are at the end of the screen line, | |
| 5876 * then output the same character again to let the | |
| 5877 * terminal know about the wrap. If the terminal doesn't | |
| 5878 * auto-wrap, we overwrite the character. */ | |
| 5879 if (screen_cur_col != W_WIDTH(wp)) | |
| 5880 screen_char(LineOffset[screen_row - 1] | |
| 5881 + (unsigned)Columns - 1, | |
| 5882 screen_row - 1, (int)(Columns - 1)); | |
| 5883 | |
| 5884 #ifdef FEAT_MBYTE | |
| 5885 /* When there is a multi-byte character, just output a | |
| 5886 * space to keep it simple. */ | |
| 148 | 5887 if (has_mbyte && MB_BYTE2LEN(ScreenLines[LineOffset[ |
| 5888 screen_row - 1] + (Columns - 1)]) > 1) | |
| 7 | 5889 out_char(' '); |
| 5890 else | |
| 5891 #endif | |
| 5892 out_char(ScreenLines[LineOffset[screen_row - 1] | |
| 5893 + (Columns - 1)]); | |
| 5894 /* force a redraw of the first char on the next line */ | |
| 5895 ScreenAttrs[LineOffset[screen_row]] = (sattr_T)-1; | |
| 5896 screen_start(); /* don't know where cursor is now */ | |
| 5897 } | |
| 5898 } | |
| 5899 | |
| 5900 col = 0; | |
| 5901 off = (unsigned)(current_ScreenLine - ScreenLines); | |
| 5902 #ifdef FEAT_RIGHTLEFT | |
| 5903 if (wp->w_p_rl) | |
| 5904 { | |
| 5905 col = W_WIDTH(wp) - 1; /* col is not used if breaking! */ | |
| 5906 off += col; | |
| 5907 } | |
| 5908 #endif | |
| 5909 | |
| 5910 /* reset the drawing state for the start of a wrapped line */ | |
| 5911 draw_state = WL_START; | |
| 5912 saved_n_extra = n_extra; | |
| 5913 saved_p_extra = p_extra; | |
| 5914 saved_c_extra = c_extra; | |
| 5915 saved_char_attr = char_attr; | |
| 5916 n_extra = 0; | |
| 5917 lcs_prec_todo = lcs_prec; | |
| 5918 #ifdef FEAT_LINEBREAK | |
| 5919 # ifdef FEAT_DIFF | |
| 5920 if (filler_todo <= 0) | |
| 5921 # endif | |
| 5922 need_showbreak = TRUE; | |
| 5923 #endif | |
| 5924 #ifdef FEAT_DIFF | |
| 5925 --filler_todo; | |
| 5926 /* When the filler lines are actually below the last line of the | |
| 5927 * file, don't draw the line itself, break here. */ | |
| 5928 if (filler_todo == 0 && wp->w_botfill) | |
| 5929 break; | |
| 5930 #endif | |
| 5931 } | |
| 5932 | |
| 5933 } /* for every character in the line */ | |
| 5934 | |
| 743 | 5935 #ifdef FEAT_SPELL |
| 386 | 5936 /* After an empty line check first word for capital. */ |
| 5937 if (*skipwhite(line) == NUL) | |
| 5938 { | |
| 5939 capcol_lnum = lnum + 1; | |
| 5940 cap_col = 0; | |
| 5941 } | |
| 5942 #endif | |
| 5943 | |
|
10690
206ab11fa76e
patch 8.0.0235: memory leak in diff mode
Christian Brabandt <cb@256bit.org>
parents:
10538
diff
changeset
|
5944 vim_free(p_extra_free); |
| 7 | 5945 return row; |
| 5946 } | |
| 5947 | |
| 714 | 5948 #ifdef FEAT_MBYTE |
|
7805
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7697
diff
changeset
|
5949 static int comp_char_differs(int, int); |
| 714 | 5950 |
| 5951 /* | |
| 5952 * 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
|
5953 * Only to be used when ScreenLinesUC[off_from] != 0. |
| 714 | 5954 */ |
| 5955 static int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
5956 comp_char_differs(int off_from, int off_to) |
| 714 | 5957 { |
| 5958 int i; | |
| 5959 | |
| 5960 for (i = 0; i < Screen_mco; ++i) | |
| 5961 { | |
| 5962 if (ScreenLinesC[i][off_from] != ScreenLinesC[i][off_to]) | |
| 5963 return TRUE; | |
| 5964 if (ScreenLinesC[i][off_from] == 0) | |
| 5965 break; | |
| 5966 } | |
| 5967 return FALSE; | |
| 5968 } | |
| 5969 #endif | |
| 5970 | |
| 7 | 5971 /* |
| 5972 * Check whether the given character needs redrawing: | |
| 5973 * - the (first byte of the) character is different | |
| 5974 * - the attributes are different | |
| 5975 * - the character is multi-byte and the next byte is different | |
| 1616 | 5976 * - the character is two cells wide and the second cell differs. |
| 7 | 5977 */ |
| 5978 static int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
5979 char_needs_redraw(int off_from, int off_to, int cols) |
| 7 | 5980 { |
| 5981 if (cols > 0 | |
| 5982 && ((ScreenLines[off_from] != ScreenLines[off_to] | |
| 5983 || ScreenAttrs[off_from] != ScreenAttrs[off_to]) | |
| 5984 | |
| 5985 #ifdef FEAT_MBYTE | |
| 5986 || (enc_dbcs != 0 | |
| 5987 && MB_BYTE2LEN(ScreenLines[off_from]) > 1 | |
| 5988 && (enc_dbcs == DBCS_JPNU && ScreenLines[off_from] == 0x8e | |
| 5989 ? ScreenLines2[off_from] != ScreenLines2[off_to] | |
| 5990 : (cols > 1 && ScreenLines[off_from + 1] | |
| 5991 != ScreenLines[off_to + 1]))) | |
| 5992 || (enc_utf8 | |
| 5993 && (ScreenLinesUC[off_from] != ScreenLinesUC[off_to] | |
| 5994 || (ScreenLinesUC[off_from] != 0 | |
| 1616 | 5995 && comp_char_differs(off_from, off_to)) |
| 3759 | 5996 || ((*mb_off2cells)(off_from, off_from + cols) > 1 |
| 5997 && ScreenLines[off_from + 1] | |
| 5998 != ScreenLines[off_to + 1]))) | |
| 7 | 5999 #endif |
| 6000 )) | |
| 6001 return TRUE; | |
| 6002 return FALSE; | |
| 6003 } | |
| 6004 | |
|
11670
3b2afa2b77b3
patch 8.0.0718: output of job in terminal is not displayed
Christian Brabandt <cb@256bit.org>
parents:
11657
diff
changeset
|
6005 #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
|
6006 /* |
|
3b2afa2b77b3
patch 8.0.0718: output of job in terminal is not displayed
Christian Brabandt <cb@256bit.org>
parents:
11657
diff
changeset
|
6007 * 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
|
6008 */ |
|
3b2afa2b77b3
patch 8.0.0718: output of job in terminal is not displayed
Christian Brabandt <cb@256bit.org>
parents:
11657
diff
changeset
|
6009 int |
|
3b2afa2b77b3
patch 8.0.0718: output of job in terminal is not displayed
Christian Brabandt <cb@256bit.org>
parents:
11657
diff
changeset
|
6010 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
|
6011 { |
|
3b2afa2b77b3
patch 8.0.0718: output of job in terminal is not displayed
Christian Brabandt <cb@256bit.org>
parents:
11657
diff
changeset
|
6012 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
|
6013 } |
|
3b2afa2b77b3
patch 8.0.0718: output of job in terminal is not displayed
Christian Brabandt <cb@256bit.org>
parents:
11657
diff
changeset
|
6014 #endif |
|
3b2afa2b77b3
patch 8.0.0718: output of job in terminal is not displayed
Christian Brabandt <cb@256bit.org>
parents:
11657
diff
changeset
|
6015 |
| 7 | 6016 /* |
| 6017 * Move one "cooked" screen line to the screen, but only the characters that | |
| 6018 * have actually changed. Handle insert/delete character. | |
| 6019 * "coloff" gives the first column on the screen for this line. | |
| 6020 * "endcol" gives the columns where valid characters are. | |
| 6021 * "clear_width" is the width of the window. It's > 0 if the rest of the line | |
| 6022 * needs to be cleared, negative otherwise. | |
| 6023 * "rlflag" is TRUE in a rightleft window: | |
| 6024 * When TRUE and "clear_width" > 0, clear columns 0 to "endcol" | |
| 6025 * When FALSE and "clear_width" > 0, clear columns "endcol" to "clear_width" | |
| 6026 */ | |
|
11670
3b2afa2b77b3
patch 8.0.0718: output of job in terminal is not displayed
Christian Brabandt <cb@256bit.org>
parents:
11657
diff
changeset
|
6027 void |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6028 screen_line( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6029 int row, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6030 int coloff, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6031 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
|
6032 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
|
6033 int rlflag UNUSED) |
| 7 | 6034 { |
| 6035 unsigned off_from; | |
| 6036 unsigned off_to; | |
| 1378 | 6037 #ifdef FEAT_MBYTE |
| 6038 unsigned max_off_from; | |
| 6039 unsigned max_off_to; | |
| 6040 #endif | |
| 7 | 6041 int col = 0; |
|
8643
24b43dd167eb
commit https://github.com/vim/vim/commit/44a2f923c00f1384c9ecde12fb5b4711bc20702e
Christian Brabandt <cb@256bit.org>
parents:
8627
diff
changeset
|
6042 #if defined(FEAT_GUI) || defined(UNIX) || defined(FEAT_WINDOWS) |
| 7 | 6043 int hl; |
| 6044 #endif | |
| 6045 int force = FALSE; /* force update rest of the line */ | |
| 6046 int redraw_this /* bool: does character need redraw? */ | |
| 6047 #ifdef FEAT_GUI | |
| 6048 = TRUE /* For GUI when while-loop empty */ | |
| 6049 #endif | |
| 6050 ; | |
| 6051 int redraw_next; /* redraw_this for next character */ | |
| 6052 #ifdef FEAT_MBYTE | |
| 6053 int clear_next = FALSE; | |
| 6054 int char_cells; /* 1: normal char */ | |
| 6055 /* 2: occupies two display cells */ | |
| 6056 # define CHAR_CELLS char_cells | |
| 6057 #else | |
| 6058 # define CHAR_CELLS 1 | |
| 6059 #endif | |
| 6060 | |
| 3413 | 6061 /* Check for illegal row and col, just in case. */ |
| 6062 if (row >= Rows) | |
| 6063 row = Rows - 1; | |
| 6064 if (endcol > Columns) | |
| 6065 endcol = Columns; | |
| 6066 | |
| 7 | 6067 # ifdef FEAT_CLIPBOARD |
| 6068 clip_may_clear_selection(row, row); | |
| 6069 # endif | |
| 6070 | |
| 6071 off_from = (unsigned)(current_ScreenLine - ScreenLines); | |
| 6072 off_to = LineOffset[row] + coloff; | |
| 1378 | 6073 #ifdef FEAT_MBYTE |
| 6074 max_off_from = off_from + screen_Columns; | |
| 6075 max_off_to = LineOffset[row] + screen_Columns; | |
| 6076 #endif | |
| 7 | 6077 |
| 6078 #ifdef FEAT_RIGHTLEFT | |
| 6079 if (rlflag) | |
| 6080 { | |
| 6081 /* Clear rest first, because it's left of the text. */ | |
| 6082 if (clear_width > 0) | |
| 6083 { | |
| 6084 while (col <= endcol && ScreenLines[off_to] == ' ' | |
| 6085 && ScreenAttrs[off_to] == 0 | |
| 6086 # ifdef FEAT_MBYTE | |
| 6087 && (!enc_utf8 || ScreenLinesUC[off_to] == 0) | |
| 6088 # endif | |
| 6089 ) | |
| 6090 { | |
| 6091 ++off_to; | |
| 6092 ++col; | |
| 6093 } | |
| 6094 if (col <= endcol) | |
| 6095 screen_fill(row, row + 1, col + coloff, | |
| 6096 endcol + coloff + 1, ' ', ' ', 0); | |
| 6097 } | |
| 6098 col = endcol + 1; | |
| 6099 off_to = LineOffset[row] + col + coloff; | |
| 6100 off_from += col; | |
| 6101 endcol = (clear_width > 0 ? clear_width : -clear_width); | |
| 6102 } | |
| 6103 #endif /* FEAT_RIGHTLEFT */ | |
| 6104 | |
| 6105 redraw_next = char_needs_redraw(off_from, off_to, endcol - col); | |
| 6106 | |
| 6107 while (col < endcol) | |
| 6108 { | |
| 6109 #ifdef FEAT_MBYTE | |
| 6110 if (has_mbyte && (col + 1 < endcol)) | |
| 1378 | 6111 char_cells = (*mb_off2cells)(off_from, max_off_from); |
| 7 | 6112 else |
| 6113 char_cells = 1; | |
| 6114 #endif | |
| 6115 | |
| 6116 redraw_this = redraw_next; | |
| 6117 redraw_next = force || char_needs_redraw(off_from + CHAR_CELLS, | |
| 6118 off_to + CHAR_CELLS, endcol - col - CHAR_CELLS); | |
| 6119 | |
| 6120 #ifdef FEAT_GUI | |
| 6121 /* If the next character was bold, then redraw the current character to | |
| 6122 * remove any pixels that might have spilt over into us. This only | |
| 6123 * happens in the GUI. | |
| 6124 */ | |
| 6125 if (redraw_next && gui.in_use) | |
| 6126 { | |
| 6127 hl = ScreenAttrs[off_to + CHAR_CELLS]; | |
| 743 | 6128 if (hl > HL_ALL) |
| 6129 hl = syn_attr2attr(hl); | |
| 6130 if (hl & HL_BOLD) | |
| 7 | 6131 redraw_this = TRUE; |
| 6132 } | |
| 6133 #endif | |
| 6134 | |
| 6135 if (redraw_this) | |
| 6136 { | |
| 6137 /* | |
| 6138 * Special handling when 'xs' termcap flag set (hpterm): | |
| 6139 * Attributes for characters are stored at the position where the | |
| 6140 * cursor is when writing the highlighting code. The | |
| 6141 * start-highlighting code must be written with the cursor on the | |
| 6142 * first highlighted character. The stop-highlighting code must | |
| 6143 * be written with the cursor just after the last highlighted | |
| 6144 * character. | |
| 6145 * Overwriting a character doesn't remove it's highlighting. Need | |
| 6146 * to clear the rest of the line, and force redrawing it | |
| 6147 * completely. | |
| 6148 */ | |
| 6149 if ( p_wiv | |
| 6150 && !force | |
| 6151 #ifdef FEAT_GUI | |
| 6152 && !gui.in_use | |
| 6153 #endif | |
| 6154 && ScreenAttrs[off_to] != 0 | |
| 6155 && ScreenAttrs[off_from] != ScreenAttrs[off_to]) | |
| 6156 { | |
| 6157 /* | |
| 6158 * Need to remove highlighting attributes here. | |
| 6159 */ | |
| 6160 windgoto(row, col + coloff); | |
| 6161 out_str(T_CE); /* clear rest of this screen line */ | |
| 6162 screen_start(); /* don't know where cursor is now */ | |
| 6163 force = TRUE; /* force redraw of rest of the line */ | |
| 6164 redraw_next = TRUE; /* or else next char would miss out */ | |
| 6165 | |
| 6166 /* | |
| 6167 * If the previous character was highlighted, need to stop | |
| 6168 * highlighting at this character. | |
| 6169 */ | |
| 6170 if (col + coloff > 0 && ScreenAttrs[off_to - 1] != 0) | |
| 6171 { | |
| 6172 screen_attr = ScreenAttrs[off_to - 1]; | |
| 6173 term_windgoto(row, col + coloff); | |
| 6174 screen_stop_highlight(); | |
| 6175 } | |
| 6176 else | |
| 6177 screen_attr = 0; /* highlighting has stopped */ | |
| 6178 } | |
| 6179 #ifdef FEAT_MBYTE | |
| 6180 if (enc_dbcs != 0) | |
| 6181 { | |
| 6182 /* Check if overwriting a double-byte with a single-byte or | |
| 6183 * the other way around requires another character to be | |
| 6184 * redrawn. For UTF-8 this isn't needed, because comparing | |
| 6185 * ScreenLinesUC[] is sufficient. */ | |
| 6186 if (char_cells == 1 | |
| 6187 && col + 1 < endcol | |
| 1378 | 6188 && (*mb_off2cells)(off_to, max_off_to) > 1) |
| 7 | 6189 { |
| 6190 /* Writing a single-cell character over a double-cell | |
| 6191 * character: need to redraw the next cell. */ | |
| 6192 ScreenLines[off_to + 1] = 0; | |
| 6193 redraw_next = TRUE; | |
| 6194 } | |
| 6195 else if (char_cells == 2 | |
| 6196 && col + 2 < endcol | |
| 1378 | 6197 && (*mb_off2cells)(off_to, max_off_to) == 1 |
| 6198 && (*mb_off2cells)(off_to + 1, max_off_to) > 1) | |
| 7 | 6199 { |
| 6200 /* Writing the second half of a double-cell character over | |
| 6201 * a double-cell character: need to redraw the second | |
| 6202 * cell. */ | |
| 6203 ScreenLines[off_to + 2] = 0; | |
| 6204 redraw_next = TRUE; | |
| 6205 } | |
| 6206 | |
| 6207 if (enc_dbcs == DBCS_JPNU) | |
| 6208 ScreenLines2[off_to] = ScreenLines2[off_from]; | |
| 6209 } | |
| 6210 /* When writing a single-width character over a double-width | |
| 6211 * character and at the end of the redrawn text, need to clear out | |
| 6212 * the right halve of the old character. | |
| 6213 * Also required when writing the right halve of a double-width | |
| 6214 * char over the left halve of an existing one. */ | |
| 6215 if (has_mbyte && col + char_cells == endcol | |
| 6216 && ((char_cells == 1 | |
| 1378 | 6217 && (*mb_off2cells)(off_to, max_off_to) > 1) |
| 7 | 6218 || (char_cells == 2 |
| 1378 | 6219 && (*mb_off2cells)(off_to, max_off_to) == 1 |
| 6220 && (*mb_off2cells)(off_to + 1, max_off_to) > 1))) | |
| 7 | 6221 clear_next = TRUE; |
| 6222 #endif | |
| 6223 | |
| 6224 ScreenLines[off_to] = ScreenLines[off_from]; | |
| 6225 #ifdef FEAT_MBYTE | |
| 6226 if (enc_utf8) | |
| 6227 { | |
| 6228 ScreenLinesUC[off_to] = ScreenLinesUC[off_from]; | |
| 6229 if (ScreenLinesUC[off_from] != 0) | |
| 6230 { | |
| 714 | 6231 int i; |
| 6232 | |
| 6233 for (i = 0; i < Screen_mco; ++i) | |
| 6234 ScreenLinesC[i][off_to] = ScreenLinesC[i][off_from]; | |
| 7 | 6235 } |
| 6236 } | |
| 6237 if (char_cells == 2) | |
| 6238 ScreenLines[off_to + 1] = ScreenLines[off_from + 1]; | |
| 6239 #endif | |
| 6240 | |
| 6241 #if defined(FEAT_GUI) || defined(UNIX) | |
| 1843 | 6242 /* The bold trick makes a single column of pixels appear in the |
| 6243 * next character. When a bold character is removed, the next | |
| 7 | 6244 * character should be redrawn too. This happens for our own GUI |
| 6245 * and for some xterms. */ | |
| 6246 if ( | |
| 6247 # ifdef FEAT_GUI | |
| 6248 gui.in_use | |
| 6249 # endif | |
| 6250 # if defined(FEAT_GUI) && defined(UNIX) | |
| 6251 || | |
| 6252 # endif | |
| 6253 # ifdef UNIX | |
| 6254 term_is_xterm | |
| 6255 # endif | |
| 6256 ) | |
| 6257 { | |
| 6258 hl = ScreenAttrs[off_to]; | |
| 743 | 6259 if (hl > HL_ALL) |
| 6260 hl = syn_attr2attr(hl); | |
| 6261 if (hl & HL_BOLD) | |
| 7 | 6262 redraw_next = TRUE; |
| 6263 } | |
| 6264 #endif | |
| 6265 ScreenAttrs[off_to] = ScreenAttrs[off_from]; | |
| 6266 #ifdef FEAT_MBYTE | |
| 819 | 6267 /* For simplicity set the attributes of second half of a |
| 6268 * double-wide character equal to the first half. */ | |
| 6269 if (char_cells == 2) | |
| 6270 ScreenAttrs[off_to + 1] = ScreenAttrs[off_from]; | |
| 6271 | |
| 7 | 6272 if (enc_dbcs != 0 && char_cells == 2) |
| 6273 screen_char_2(off_to, row, col + coloff); | |
| 6274 else | |
| 6275 #endif | |
| 6276 screen_char(off_to, row, col + coloff); | |
| 6277 } | |
| 6278 else if ( p_wiv | |
| 6279 #ifdef FEAT_GUI | |
| 6280 && !gui.in_use | |
| 6281 #endif | |
| 6282 && col + coloff > 0) | |
| 6283 { | |
| 6284 if (ScreenAttrs[off_to] == ScreenAttrs[off_to - 1]) | |
| 6285 { | |
| 6286 /* | |
| 6287 * Don't output stop-highlight when moving the cursor, it will | |
| 6288 * stop the highlighting when it should continue. | |
| 6289 */ | |
| 6290 screen_attr = 0; | |
| 6291 } | |
| 6292 else if (screen_attr != 0) | |
| 6293 screen_stop_highlight(); | |
| 6294 } | |
| 6295 | |
| 6296 off_to += CHAR_CELLS; | |
| 6297 off_from += CHAR_CELLS; | |
| 6298 col += CHAR_CELLS; | |
| 6299 } | |
| 6300 | |
| 6301 #ifdef FEAT_MBYTE | |
| 6302 if (clear_next) | |
| 6303 { | |
| 6304 /* Clear the second half of a double-wide character of which the left | |
| 6305 * half was overwritten with a single-wide character. */ | |
| 6306 ScreenLines[off_to] = ' '; | |
| 6307 if (enc_utf8) | |
| 6308 ScreenLinesUC[off_to] = 0; | |
| 6309 screen_char(off_to, row, col + coloff); | |
| 6310 } | |
| 6311 #endif | |
| 6312 | |
| 6313 if (clear_width > 0 | |
| 6314 #ifdef FEAT_RIGHTLEFT | |
| 6315 && !rlflag | |
| 6316 #endif | |
| 6317 ) | |
| 6318 { | |
| 6319 #ifdef FEAT_GUI | |
| 6320 int startCol = col; | |
| 6321 #endif | |
| 6322 | |
| 6323 /* blank out the rest of the line */ | |
| 6324 while (col < clear_width && ScreenLines[off_to] == ' ' | |
| 6325 && ScreenAttrs[off_to] == 0 | |
| 6326 #ifdef FEAT_MBYTE | |
| 6327 && (!enc_utf8 || ScreenLinesUC[off_to] == 0) | |
| 6328 #endif | |
| 6329 ) | |
| 6330 { | |
| 6331 ++off_to; | |
| 6332 ++col; | |
| 6333 } | |
| 6334 if (col < clear_width) | |
| 6335 { | |
| 6336 #ifdef FEAT_GUI | |
| 6337 /* | |
| 6338 * In the GUI, clearing the rest of the line may leave pixels | |
| 6339 * behind if the first character cleared was bold. Some bold | |
| 6340 * fonts spill over the left. In this case we redraw the previous | |
| 6341 * character too. If we didn't skip any blanks above, then we | |
| 6342 * only redraw if the character wasn't already redrawn anyway. | |
| 6343 */ | |
| 996 | 6344 if (gui.in_use && (col > startCol || !redraw_this)) |
| 7 | 6345 { |
| 6346 hl = ScreenAttrs[off_to]; | |
| 6347 if (hl > HL_ALL || (hl & HL_BOLD)) | |
| 996 | 6348 { |
| 6349 int prev_cells = 1; | |
| 6350 # ifdef FEAT_MBYTE | |
| 6351 if (enc_utf8) | |
| 6352 /* for utf-8, ScreenLines[char_offset + 1] == 0 means | |
| 6353 * that its width is 2. */ | |
| 6354 prev_cells = ScreenLines[off_to - 1] == 0 ? 2 : 1; | |
| 6355 else if (enc_dbcs != 0) | |
| 6356 { | |
| 6357 /* find previous character by counting from first | |
| 6358 * column and get its width. */ | |
| 6359 unsigned off = LineOffset[row]; | |
| 1378 | 6360 unsigned max_off = LineOffset[row] + screen_Columns; |
| 996 | 6361 |
| 6362 while (off < off_to) | |
| 6363 { | |
| 1378 | 6364 prev_cells = (*mb_off2cells)(off, max_off); |
| 996 | 6365 off += prev_cells; |
| 6366 } | |
| 6367 } | |
| 6368 | |
| 6369 if (enc_dbcs != 0 && prev_cells > 1) | |
| 6370 screen_char_2(off_to - prev_cells, row, | |
| 6371 col + coloff - prev_cells); | |
| 6372 else | |
| 6373 # endif | |
| 6374 screen_char(off_to - prev_cells, row, | |
| 6375 col + coloff - prev_cells); | |
| 6376 } | |
| 7 | 6377 } |
| 6378 #endif | |
| 6379 screen_fill(row, row + 1, col + coloff, clear_width + coloff, | |
| 6380 ' ', ' ', 0); | |
|
8643
24b43dd167eb
commit https://github.com/vim/vim/commit/44a2f923c00f1384c9ecde12fb5b4711bc20702e
Christian Brabandt <cb@256bit.org>
parents:
8627
diff
changeset
|
6381 #ifdef FEAT_WINDOWS |
| 7 | 6382 off_to += clear_width - col; |
| 6383 col = clear_width; | |
| 6384 #endif | |
| 6385 } | |
| 6386 } | |
| 6387 | |
| 6388 if (clear_width > 0) | |
| 6389 { | |
|
8643
24b43dd167eb
commit https://github.com/vim/vim/commit/44a2f923c00f1384c9ecde12fb5b4711bc20702e
Christian Brabandt <cb@256bit.org>
parents:
8627
diff
changeset
|
6390 #ifdef FEAT_WINDOWS |
| 7 | 6391 /* For a window that's left of another, draw the separator char. */ |
| 6392 if (col + coloff < Columns) | |
| 6393 { | |
| 6394 int c; | |
| 6395 | |
| 6396 c = fillchar_vsep(&hl); | |
| 6477 | 6397 if (ScreenLines[off_to] != (schar_T)c |
| 7 | 6398 # ifdef FEAT_MBYTE |
| 714 | 6399 || (enc_utf8 && (int)ScreenLinesUC[off_to] |
| 6400 != (c >= 0x80 ? c : 0)) | |
| 7 | 6401 # endif |
| 6402 || ScreenAttrs[off_to] != hl) | |
| 6403 { | |
| 6404 ScreenLines[off_to] = c; | |
| 6405 ScreenAttrs[off_to] = hl; | |
| 6406 # ifdef FEAT_MBYTE | |
| 6407 if (enc_utf8) | |
| 6408 { | |
| 6409 if (c >= 0x80) | |
| 6410 { | |
| 6411 ScreenLinesUC[off_to] = c; | |
| 714 | 6412 ScreenLinesC[0][off_to] = 0; |
| 7 | 6413 } |
| 6414 else | |
| 6415 ScreenLinesUC[off_to] = 0; | |
| 6416 } | |
| 6417 # endif | |
| 6418 screen_char(off_to, row, col + coloff); | |
| 6419 } | |
| 6420 } | |
| 6421 else | |
| 6422 #endif | |
| 6423 LineWraps[row] = FALSE; | |
| 6424 } | |
| 6425 } | |
| 6426 | |
| 474 | 6427 #if defined(FEAT_RIGHTLEFT) || defined(PROTO) |
| 7 | 6428 /* |
| 474 | 6429 * Mirror text "str" for right-left displaying. |
| 6430 * Only works for single-byte characters (e.g., numbers). | |
| 7 | 6431 */ |
| 474 | 6432 void |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6433 rl_mirror(char_u *str) |
| 7 | 6434 { |
| 6435 char_u *p1, *p2; | |
| 6436 int t; | |
| 6437 | |
| 6438 for (p1 = str, p2 = str + STRLEN(str) - 1; p1 < p2; ++p1, --p2) | |
| 6439 { | |
| 6440 t = *p1; | |
| 6441 *p1 = *p2; | |
| 6442 *p2 = t; | |
| 6443 } | |
| 6444 } | |
| 6445 #endif | |
| 6446 | |
| 6447 #if defined(FEAT_WINDOWS) || defined(PROTO) | |
| 6448 /* | |
| 6449 * mark all status lines for redraw; used after first :cd | |
| 6450 */ | |
| 6451 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6452 status_redraw_all(void) |
| 7 | 6453 { |
| 6454 win_T *wp; | |
| 6455 | |
|
9649
fd9727ae3c49
commit https://github.com/vim/vim/commit/2932359000b2f918d5fade79ea4d124d5943cd07
Christian Brabandt <cb@256bit.org>
parents:
9645
diff
changeset
|
6456 FOR_ALL_WINDOWS(wp) |
| 7 | 6457 if (wp->w_status_height) |
| 6458 { | |
| 6459 wp->w_redr_status = TRUE; | |
| 6460 redraw_later(VALID); | |
| 6461 } | |
| 6462 } | |
| 6463 | |
| 6464 /* | |
| 6465 * mark all status lines of the current buffer for redraw | |
| 6466 */ | |
| 6467 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6468 status_redraw_curbuf(void) |
| 7 | 6469 { |
| 6470 win_T *wp; | |
| 6471 | |
|
9649
fd9727ae3c49
commit https://github.com/vim/vim/commit/2932359000b2f918d5fade79ea4d124d5943cd07
Christian Brabandt <cb@256bit.org>
parents:
9645
diff
changeset
|
6472 FOR_ALL_WINDOWS(wp) |
| 7 | 6473 if (wp->w_status_height != 0 && wp->w_buffer == curbuf) |
| 6474 { | |
| 6475 wp->w_redr_status = TRUE; | |
| 6476 redraw_later(VALID); | |
| 6477 } | |
| 6478 } | |
| 6479 | |
| 6480 /* | |
| 6481 * Redraw all status lines that need to be redrawn. | |
| 6482 */ | |
| 6483 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6484 redraw_statuslines(void) |
| 7 | 6485 { |
| 6486 win_T *wp; | |
| 6487 | |
|
9649
fd9727ae3c49
commit https://github.com/vim/vim/commit/2932359000b2f918d5fade79ea4d124d5943cd07
Christian Brabandt <cb@256bit.org>
parents:
9645
diff
changeset
|
6488 FOR_ALL_WINDOWS(wp) |
| 7 | 6489 if (wp->w_redr_status) |
| 6490 win_redr_status(wp); | |
| 673 | 6491 if (redraw_tabline) |
| 677 | 6492 draw_tabline(); |
| 7 | 6493 } |
| 6494 #endif | |
| 6495 | |
|
8643
24b43dd167eb
commit https://github.com/vim/vim/commit/44a2f923c00f1384c9ecde12fb5b4711bc20702e
Christian Brabandt <cb@256bit.org>
parents:
8627
diff
changeset
|
6496 #if (defined(FEAT_WILDMENU) && defined(FEAT_WINDOWS)) || defined(PROTO) |
| 7 | 6497 /* |
| 6498 * Redraw all status lines at the bottom of frame "frp". | |
| 6499 */ | |
| 6500 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6501 win_redraw_last_status(frame_T *frp) |
| 7 | 6502 { |
| 6503 if (frp->fr_layout == FR_LEAF) | |
| 6504 frp->fr_win->w_redr_status = TRUE; | |
| 6505 else if (frp->fr_layout == FR_ROW) | |
| 6506 { | |
| 6507 for (frp = frp->fr_child; frp != NULL; frp = frp->fr_next) | |
| 6508 win_redraw_last_status(frp); | |
| 6509 } | |
| 6510 else /* frp->fr_layout == FR_COL */ | |
| 6511 { | |
| 6512 frp = frp->fr_child; | |
| 6513 while (frp->fr_next != NULL) | |
| 6514 frp = frp->fr_next; | |
| 6515 win_redraw_last_status(frp); | |
| 6516 } | |
| 6517 } | |
| 6518 #endif | |
| 6519 | |
|
8643
24b43dd167eb
commit https://github.com/vim/vim/commit/44a2f923c00f1384c9ecde12fb5b4711bc20702e
Christian Brabandt <cb@256bit.org>
parents:
8627
diff
changeset
|
6520 #ifdef FEAT_WINDOWS |
| 7 | 6521 /* |
| 6522 * Draw the verticap separator right of window "wp" starting with line "row". | |
| 6523 */ | |
| 6524 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6525 draw_vsep_win(win_T *wp, int row) |
| 7 | 6526 { |
| 6527 int hl; | |
| 6528 int c; | |
| 6529 | |
| 6530 if (wp->w_vsep_width) | |
| 6531 { | |
| 6532 /* draw the vertical separator right of this window */ | |
| 6533 c = fillchar_vsep(&hl); | |
| 6534 screen_fill(W_WINROW(wp) + row, W_WINROW(wp) + wp->w_height, | |
| 6535 W_ENDCOL(wp), W_ENDCOL(wp) + 1, | |
| 6536 c, ' ', hl); | |
| 6537 } | |
| 6538 } | |
| 6539 #endif | |
| 6540 | |
| 6541 #ifdef FEAT_WILDMENU | |
|
7805
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7697
diff
changeset
|
6542 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
|
6543 static int skip_status_match_char(expand_T *xp, char_u *s); |
| 7 | 6544 |
| 6545 /* | |
| 1378 | 6546 * Get the length of an item as it will be shown in the status line. |
| 7 | 6547 */ |
| 6548 static int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6549 status_match_len(expand_T *xp, char_u *s) |
| 7 | 6550 { |
| 6551 int len = 0; | |
| 6552 | |
| 6553 #ifdef FEAT_MENU | |
| 6554 int emenu = (xp->xp_context == EXPAND_MENUS | |
| 6555 || xp->xp_context == EXPAND_MENUNAMES); | |
| 6556 | |
| 6557 /* Check for menu separators - replace with '|'. */ | |
| 6558 if (emenu && menu_is_separator(s)) | |
| 6559 return 1; | |
| 6560 #endif | |
| 6561 | |
| 6562 while (*s != NUL) | |
| 6563 { | |
| 1685 | 6564 s += skip_status_match_char(xp, s); |
| 42 | 6565 len += ptr2cells(s); |
|
11127
506f5d8b7d8b
patch 8.0.0451: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11121
diff
changeset
|
6566 MB_PTR_ADV(s); |
| 7 | 6567 } |
| 6568 | |
| 6569 return len; | |
| 6570 } | |
| 6571 | |
| 6572 /* | |
| 1685 | 6573 * Return the number of characters that should be skipped in a status match. |
| 277 | 6574 * These are backslashes used for escaping. Do show backslashes in help tags. |
| 6575 */ | |
| 6576 static int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6577 skip_status_match_char(expand_T *xp, char_u *s) |
| 277 | 6578 { |
| 1685 | 6579 if ((rem_backslash(s) && xp->xp_context != EXPAND_HELP) |
| 277 | 6580 #ifdef FEAT_MENU |
| 6581 || ((xp->xp_context == EXPAND_MENUS | |
| 6582 || xp->xp_context == EXPAND_MENUNAMES) | |
| 6583 && (s[0] == '\t' || (s[0] == '\\' && s[1] != NUL))) | |
| 6584 #endif | |
| 1685 | 6585 ) |
| 6586 { | |
| 6587 #ifndef BACKSLASH_IN_FILENAME | |
| 6588 if (xp->xp_shell && csh_like_shell() && s[1] == '\\' && s[2] == '!') | |
| 6589 return 2; | |
| 6590 #endif | |
| 6591 return 1; | |
| 6592 } | |
| 6593 return 0; | |
| 277 | 6594 } |
| 6595 | |
| 6596 /* | |
| 7 | 6597 * Show wildchar matches in the status line. |
| 6598 * Show at least the "match" item. | |
| 6599 * We start at item 'first_match' in the list and show all matches that fit. | |
| 6600 * | |
| 6601 * If inversion is possible we use it. Else '=' characters are used. | |
| 6602 */ | |
| 6603 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6604 win_redr_status_matches( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6605 expand_T *xp, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6606 int num_matches, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6607 char_u **matches, /* list of matches */ |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6608 int match, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6609 int showtail) |
| 7 | 6610 { |
| 6611 #define L_MATCH(m) (showtail ? sm_gettail(matches[m]) : matches[m]) | |
| 6612 int row; | |
| 6613 char_u *buf; | |
| 6614 int len; | |
| 1378 | 6615 int clen; /* length in screen cells */ |
| 7 | 6616 int fillchar; |
| 6617 int attr; | |
| 6618 int i; | |
| 6619 int highlight = TRUE; | |
| 6620 char_u *selstart = NULL; | |
| 6621 int selstart_col = 0; | |
| 6622 char_u *selend = NULL; | |
| 6623 static int first_match = 0; | |
| 6624 int add_left = FALSE; | |
| 6625 char_u *s; | |
| 6626 #ifdef FEAT_MENU | |
| 6627 int emenu; | |
| 6628 #endif | |
| 6629 #if defined(FEAT_MBYTE) || defined(FEAT_MENU) | |
| 6630 int l; | |
| 6631 #endif | |
| 6632 | |
| 6633 if (matches == NULL) /* interrupted completion? */ | |
| 6634 return; | |
| 6635 | |
| 39 | 6636 #ifdef FEAT_MBYTE |
| 6637 if (has_mbyte) | |
| 6638 buf = alloc((unsigned)Columns * MB_MAXBYTES + 1); | |
| 6639 else | |
| 6640 #endif | |
| 6641 buf = alloc((unsigned)Columns + 1); | |
| 7 | 6642 if (buf == NULL) |
| 6643 return; | |
| 6644 | |
| 6645 if (match == -1) /* don't show match but original text */ | |
| 6646 { | |
| 6647 match = 0; | |
| 6648 highlight = FALSE; | |
| 6649 } | |
| 6650 /* count 1 for the ending ">" */ | |
| 6651 clen = status_match_len(xp, L_MATCH(match)) + 3; | |
| 6652 if (match == 0) | |
| 6653 first_match = 0; | |
| 6654 else if (match < first_match) | |
| 6655 { | |
| 6656 /* jumping left, as far as we can go */ | |
| 6657 first_match = match; | |
| 6658 add_left = TRUE; | |
| 6659 } | |
| 6660 else | |
| 6661 { | |
| 6662 /* check if match fits on the screen */ | |
| 6663 for (i = first_match; i < match; ++i) | |
| 6664 clen += status_match_len(xp, L_MATCH(i)) + 2; | |
| 6665 if (first_match > 0) | |
| 6666 clen += 2; | |
| 6667 /* jumping right, put match at the left */ | |
| 6668 if ((long)clen > Columns) | |
| 6669 { | |
| 6670 first_match = match; | |
| 6671 /* if showing the last match, we can add some on the left */ | |
| 6672 clen = 2; | |
| 6673 for (i = match; i < num_matches; ++i) | |
| 6674 { | |
| 6675 clen += status_match_len(xp, L_MATCH(i)) + 2; | |
| 6676 if ((long)clen >= Columns) | |
| 6677 break; | |
| 6678 } | |
| 6679 if (i == num_matches) | |
| 6680 add_left = TRUE; | |
| 6681 } | |
| 6682 } | |
| 6683 if (add_left) | |
| 6684 while (first_match > 0) | |
| 6685 { | |
| 6686 clen += status_match_len(xp, L_MATCH(first_match - 1)) + 2; | |
| 6687 if ((long)clen >= Columns) | |
| 6688 break; | |
| 6689 --first_match; | |
| 6690 } | |
| 6691 | |
|
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
|
6692 fillchar = fillchar_status(&attr, curwin); |
| 7 | 6693 |
| 6694 if (first_match == 0) | |
| 6695 { | |
| 6696 *buf = NUL; | |
| 6697 len = 0; | |
| 6698 } | |
| 6699 else | |
| 6700 { | |
| 6701 STRCPY(buf, "< "); | |
| 6702 len = 2; | |
| 6703 } | |
| 6704 clen = len; | |
| 6705 | |
| 6706 i = first_match; | |
| 6707 while ((long)(clen + status_match_len(xp, L_MATCH(i)) + 2) < Columns) | |
| 6708 { | |
| 6709 if (i == match) | |
| 6710 { | |
| 6711 selstart = buf + len; | |
| 6712 selstart_col = clen; | |
| 6713 } | |
| 6714 | |
| 6715 s = L_MATCH(i); | |
| 6716 /* Check for menu separators - replace with '|' */ | |
| 6717 #ifdef FEAT_MENU | |
| 6718 emenu = (xp->xp_context == EXPAND_MENUS | |
| 6719 || xp->xp_context == EXPAND_MENUNAMES); | |
| 6720 if (emenu && menu_is_separator(s)) | |
| 6721 { | |
| 6722 STRCPY(buf + len, transchar('|')); | |
| 6723 l = (int)STRLEN(buf + len); | |
| 6724 len += l; | |
| 6725 clen += l; | |
| 6726 } | |
| 6727 else | |
| 6728 #endif | |
| 6729 for ( ; *s != NUL; ++s) | |
| 6730 { | |
| 1685 | 6731 s += skip_status_match_char(xp, s); |
| 7 | 6732 clen += ptr2cells(s); |
| 6733 #ifdef FEAT_MBYTE | |
| 474 | 6734 if (has_mbyte && (l = (*mb_ptr2len)(s)) > 1) |
| 7 | 6735 { |
| 6736 STRNCPY(buf + len, s, l); | |
| 6737 s += l - 1; | |
| 6738 len += l; | |
| 6739 } | |
| 6740 else | |
| 6741 #endif | |
| 6742 { | |
| 6743 STRCPY(buf + len, transchar_byte(*s)); | |
| 6744 len += (int)STRLEN(buf + len); | |
| 6745 } | |
| 6746 } | |
| 6747 if (i == match) | |
| 6748 selend = buf + len; | |
| 6749 | |
| 6750 *(buf + len++) = ' '; | |
| 6751 *(buf + len++) = ' '; | |
| 6752 clen += 2; | |
| 6753 if (++i == num_matches) | |
| 6754 break; | |
| 6755 } | |
| 6756 | |
| 6757 if (i != num_matches) | |
| 6758 { | |
| 6759 *(buf + len++) = '>'; | |
| 6760 ++clen; | |
| 6761 } | |
| 6762 | |
| 6763 buf[len] = NUL; | |
| 6764 | |
| 6765 row = cmdline_row - 1; | |
| 6766 if (row >= 0) | |
| 6767 { | |
| 6768 if (wild_menu_showing == 0) | |
| 6769 { | |
| 6770 if (msg_scrolled > 0) | |
| 6771 { | |
| 6772 /* Put the wildmenu just above the command line. If there is | |
| 6773 * no room, scroll the screen one line up. */ | |
| 6774 if (cmdline_row == Rows - 1) | |
| 6775 { | |
| 6776 screen_del_lines(0, 0, 1, (int)Rows, TRUE, NULL); | |
| 6777 ++msg_scrolled; | |
| 6778 } | |
| 6779 else | |
| 6780 { | |
| 6781 ++cmdline_row; | |
| 6782 ++row; | |
| 6783 } | |
| 6784 wild_menu_showing = WM_SCROLLED; | |
| 6785 } | |
| 6786 else | |
| 6787 { | |
| 6788 /* Create status line if needed by setting 'laststatus' to 2. | |
| 6789 * Set 'winminheight' to zero to avoid that the window is | |
| 6790 * resized. */ | |
| 6791 if (lastwin->w_status_height == 0) | |
| 6792 { | |
| 6793 save_p_ls = p_ls; | |
| 6794 save_p_wmh = p_wmh; | |
| 6795 p_ls = 2; | |
| 6796 p_wmh = 0; | |
| 6797 last_status(FALSE); | |
| 6798 } | |
| 6799 wild_menu_showing = WM_SHOWN; | |
| 6800 } | |
| 6801 } | |
| 6802 | |
| 6803 screen_puts(buf, row, 0, attr); | |
| 6804 if (selstart != NULL && highlight) | |
| 6805 { | |
| 6806 *selend = NUL; | |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
6807 screen_puts(selstart, row, selstart_col, HL_ATTR(HLF_WM)); |
| 7 | 6808 } |
| 6809 | |
| 6810 screen_fill(row, row + 1, clen, (int)Columns, fillchar, fillchar, attr); | |
| 6811 } | |
| 6812 | |
|
8643
24b43dd167eb
commit https://github.com/vim/vim/commit/44a2f923c00f1384c9ecde12fb5b4711bc20702e
Christian Brabandt <cb@256bit.org>
parents:
8627
diff
changeset
|
6813 #ifdef FEAT_WINDOWS |
| 7 | 6814 win_redraw_last_status(topframe); |
| 6815 #else | |
| 6816 lastwin->w_redr_status = TRUE; | |
| 6817 #endif | |
| 6818 vim_free(buf); | |
| 6819 } | |
| 6820 #endif | |
| 6821 | |
| 6822 #if defined(FEAT_WINDOWS) || defined(PROTO) | |
| 6823 /* | |
| 6824 * Redraw the status line of window wp. | |
| 6825 * | |
| 6826 * If inversion is possible we use it. Else '=' characters are used. | |
| 6827 */ | |
| 6828 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6829 win_redr_status(win_T *wp) |
| 7 | 6830 { |
| 6831 int row; | |
| 6832 char_u *p; | |
| 6833 int len; | |
| 6834 int fillchar; | |
| 6835 int attr; | |
| 6836 int this_ru_col; | |
| 1910 | 6837 static int busy = FALSE; |
| 6838 | |
| 6839 /* It's possible to get here recursively when 'statusline' (indirectly) | |
| 6840 * invokes ":redrawstatus". Simply ignore the call then. */ | |
| 6841 if (busy) | |
| 6842 return; | |
| 6843 busy = TRUE; | |
| 7 | 6844 |
| 6845 wp->w_redr_status = FALSE; | |
| 6846 if (wp->w_status_height == 0) | |
| 6847 { | |
| 6848 /* no status line, can only be last window */ | |
| 6849 redraw_cmdline = TRUE; | |
| 6850 } | |
| 540 | 6851 else if (!redrawing() |
| 6852 #ifdef FEAT_INS_EXPAND | |
| 6853 /* don't update status line when popup menu is visible and may be | |
| 6854 * drawn over it */ | |
| 6855 || pum_visible() | |
| 6856 #endif | |
| 6857 ) | |
| 7 | 6858 { |
| 6859 /* Don't redraw right now, do it later. */ | |
| 6860 wp->w_redr_status = TRUE; | |
| 6861 } | |
| 6862 #ifdef FEAT_STL_OPT | |
| 40 | 6863 else if (*p_stl != NUL || *wp->w_p_stl != NUL) |
| 7 | 6864 { |
| 6865 /* redraw custom status line */ | |
| 1983 | 6866 redraw_custom_statusline(wp); |
| 7 | 6867 } |
| 6868 #endif | |
| 6869 else | |
| 6870 { | |
|
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
|
6871 fillchar = fillchar_status(&attr, wp); |
| 7 | 6872 |
| 685 | 6873 get_trans_bufname(wp->w_buffer); |
| 7 | 6874 p = NameBuff; |
| 6875 len = (int)STRLEN(p); | |
| 6876 | |
|
11834
0cfe4a07c2ad
patch 8.0.0797: finished job in terminal window is not handled
Christian Brabandt <cb@256bit.org>
parents:
11698
diff
changeset
|
6877 if (bt_help(wp->w_buffer) |
| 7 | 6878 #ifdef FEAT_QUICKFIX |
| 6879 || wp->w_p_pvw | |
| 6880 #endif | |
| 6881 || bufIsChanged(wp->w_buffer) | |
| 6882 || wp->w_buffer->b_p_ro) | |
| 6883 *(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
|
6884 if (bt_help(wp->w_buffer)) |
| 7 | 6885 { |
| 809 | 6886 STRCPY(p + len, _("[Help]")); |
| 7 | 6887 len += (int)STRLEN(p + len); |
| 6888 } | |
| 6889 #ifdef FEAT_QUICKFIX | |
| 6890 if (wp->w_p_pvw) | |
| 6891 { | |
| 6892 STRCPY(p + len, _("[Preview]")); | |
| 6893 len += (int)STRLEN(p + len); | |
| 6894 } | |
| 6895 #endif | |
|
11981
cf36b424ea03
patch 8.0.0871: status line for a terminal window always has "[+]".
Christian Brabandt <cb@256bit.org>
parents:
11915
diff
changeset
|
6896 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
|
6897 #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
|
6898 && !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
|
6899 #endif |
|
cf36b424ea03
patch 8.0.0871: status line for a terminal window always has "[+]".
Christian Brabandt <cb@256bit.org>
parents:
11915
diff
changeset
|
6900 ) |
| 7 | 6901 { |
| 6902 STRCPY(p + len, "[+]"); | |
| 6903 len += 3; | |
| 6904 } | |
| 6905 if (wp->w_buffer->b_p_ro) | |
| 6906 { | |
|
4795
8360a59aa04b
updated for version 7.3.1144
Bram Moolenaar <bram@vim.org>
parents:
4736
diff
changeset
|
6907 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
|
6908 len += (int)STRLEN(p + len); |
| 7 | 6909 } |
| 6910 | |
| 6911 this_ru_col = ru_col - (Columns - W_WIDTH(wp)); | |
| 6912 if (this_ru_col < (W_WIDTH(wp) + 1) / 2) | |
| 6913 this_ru_col = (W_WIDTH(wp) + 1) / 2; | |
| 6914 if (this_ru_col <= 1) | |
| 6915 { | |
| 6916 p = (char_u *)"<"; /* No room for file name! */ | |
| 6917 len = 1; | |
| 6918 } | |
| 6919 else | |
| 6920 #ifdef FEAT_MBYTE | |
| 6921 if (has_mbyte) | |
| 6922 { | |
| 6923 int clen = 0, i; | |
| 6924 | |
| 6925 /* Count total number of display cells. */ | |
|
2338
da6ec32d8d8f
Added strwidth() and strchars() functions.
Bram Moolenaar <bram@vim.org>
parents:
2332
diff
changeset
|
6926 clen = mb_string2cells(p, -1); |
|
da6ec32d8d8f
Added strwidth() and strchars() functions.
Bram Moolenaar <bram@vim.org>
parents:
2332
diff
changeset
|
6927 |
| 7 | 6928 /* Find first character that will fit. |
| 6929 * Going from start to end is much faster for DBCS. */ | |
| 6930 for (i = 0; p[i] != NUL && clen >= this_ru_col - 1; | |
| 474 | 6931 i += (*mb_ptr2len)(p + i)) |
| 7 | 6932 clen -= (*mb_ptr2cells)(p + i); |
| 6933 len = clen; | |
| 6934 if (i > 0) | |
| 6935 { | |
| 6936 p = p + i - 1; | |
| 6937 *p = '<'; | |
| 6938 ++len; | |
| 6939 } | |
| 6940 | |
| 6941 } | |
| 6942 else | |
| 6943 #endif | |
| 6944 if (len > this_ru_col - 1) | |
| 6945 { | |
| 6946 p += len - (this_ru_col - 1); | |
| 6947 *p = '<'; | |
| 6948 len = this_ru_col - 1; | |
| 6949 } | |
| 6950 | |
| 6951 row = W_WINROW(wp) + wp->w_height; | |
| 6952 screen_puts(p, row, W_WINCOL(wp), attr); | |
| 6953 screen_fill(row, row + 1, len + W_WINCOL(wp), | |
| 6954 this_ru_col + W_WINCOL(wp), fillchar, fillchar, attr); | |
| 6955 | |
|
9645
123d3c102035
commit https://github.com/vim/vim/commit/73ac0c4281a3606651604a3cbcc334bfb3859a87
Christian Brabandt <cb@256bit.org>
parents:
9489
diff
changeset
|
6956 if (get_keymap_str(wp, (char_u *)"<%s>", NameBuff, MAXPATHL) |
| 7 | 6957 && (int)(this_ru_col - len) > (int)(STRLEN(NameBuff) + 1)) |
| 6958 screen_puts(NameBuff, row, (int)(this_ru_col - STRLEN(NameBuff) | |
| 6959 - 1 + W_WINCOL(wp)), attr); | |
| 6960 | |
| 6961 #ifdef FEAT_CMDL_INFO | |
| 6962 win_redr_ruler(wp, TRUE); | |
| 6963 #endif | |
| 6964 } | |
| 6965 | |
| 6966 /* | |
| 6967 * May need to draw the character below the vertical separator. | |
| 6968 */ | |
| 6969 if (wp->w_vsep_width != 0 && wp->w_status_height != 0 && redrawing()) | |
| 6970 { | |
| 6971 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
|
6972 fillchar = fillchar_status(&attr, wp); |
| 7 | 6973 else |
| 6974 fillchar = fillchar_vsep(&attr); | |
| 6975 screen_putchar(fillchar, W_WINROW(wp) + wp->w_height, W_ENDCOL(wp), | |
| 6976 attr); | |
| 6977 } | |
| 1910 | 6978 busy = FALSE; |
| 7 | 6979 } |
| 6980 | |
| 680 | 6981 #ifdef FEAT_STL_OPT |
| 6982 /* | |
| 6983 * Redraw the status line according to 'statusline' and take care of any | |
| 6984 * errors encountered. | |
| 6985 */ | |
| 6986 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6987 redraw_custom_statusline(win_T *wp) |
| 680 | 6988 { |
| 1983 | 6989 static int entered = FALSE; |
|
8847
470ea7526cc6
commit https://github.com/vim/vim/commit/a742e084b677f76c67e9e52c4f9fb9ab24002e20
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
6990 int saved_did_emsg = did_emsg; |
| 1983 | 6991 |
| 6992 /* When called recursively return. This can happen when the statusline | |
| 6993 * contains an expression that triggers a redraw. */ | |
| 6994 if (entered) | |
| 6995 return; | |
| 6996 entered = TRUE; | |
| 680 | 6997 |
|
8847
470ea7526cc6
commit https://github.com/vim/vim/commit/a742e084b677f76c67e9e52c4f9fb9ab24002e20
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
6998 did_emsg = FALSE; |
| 680 | 6999 win_redr_custom(wp, FALSE); |
|
8847
470ea7526cc6
commit https://github.com/vim/vim/commit/a742e084b677f76c67e9e52c4f9fb9ab24002e20
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
7000 if (did_emsg) |
| 1983 | 7001 { |
| 7002 /* When there is an error disable the statusline, otherwise the | |
| 7003 * display is messed up with errors and a redraw triggers the problem | |
| 7004 * again and again. */ | |
| 680 | 7005 set_string_option_direct((char_u *)"statusline", -1, |
| 7006 (char_u *)"", OPT_FREE | (*wp->w_p_stl != NUL | |
| 694 | 7007 ? OPT_LOCAL : OPT_GLOBAL), SID_ERROR); |
| 1983 | 7008 } |
|
8847
470ea7526cc6
commit https://github.com/vim/vim/commit/a742e084b677f76c67e9e52c4f9fb9ab24002e20
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
7009 did_emsg |= saved_did_emsg; |
| 1983 | 7010 entered = FALSE; |
| 680 | 7011 } |
| 7012 #endif | |
| 7013 | |
| 7 | 7014 /* |
| 7015 * Return TRUE if the status line of window "wp" is connected to the status | |
| 7016 * line of the window right of it. If not, then it's a vertical separator. | |
| 7017 * Only call if (wp->w_vsep_width != 0). | |
| 7018 */ | |
| 7019 int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7020 stl_connected(win_T *wp) |
| 7 | 7021 { |
| 7022 frame_T *fr; | |
| 7023 | |
| 7024 fr = wp->w_frame; | |
| 7025 while (fr->fr_parent != NULL) | |
| 7026 { | |
| 7027 if (fr->fr_parent->fr_layout == FR_COL) | |
| 7028 { | |
| 7029 if (fr->fr_next != NULL) | |
| 7030 break; | |
| 7031 } | |
| 7032 else | |
| 7033 { | |
| 7034 if (fr->fr_next != NULL) | |
| 7035 return TRUE; | |
| 7036 } | |
| 7037 fr = fr->fr_parent; | |
| 7038 } | |
| 7039 return FALSE; | |
| 7040 } | |
| 7041 | |
| 7042 #endif /* FEAT_WINDOWS */ | |
| 7043 | |
| 7044 #if defined(FEAT_WINDOWS) || defined(FEAT_STL_OPT) || defined(PROTO) | |
| 7045 /* | |
| 7046 * Get the value to show for the language mappings, active 'keymap'. | |
| 7047 */ | |
| 7048 int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7049 get_keymap_str( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7050 win_T *wp, |
|
9645
123d3c102035
commit https://github.com/vim/vim/commit/73ac0c4281a3606651604a3cbcc334bfb3859a87
Christian Brabandt <cb@256bit.org>
parents:
9489
diff
changeset
|
7051 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
|
7052 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
|
7053 int len) /* length of buffer */ |
| 7 | 7054 { |
| 7055 char_u *p; | |
| 7056 | |
| 7057 if (wp->w_buffer->b_p_iminsert != B_IMODE_LMAP) | |
| 7058 return FALSE; | |
| 7059 | |
| 7060 { | |
| 7061 #ifdef FEAT_EVAL | |
| 7062 buf_T *old_curbuf = curbuf; | |
| 7063 win_T *old_curwin = curwin; | |
| 7064 char_u *s; | |
| 7065 | |
| 7066 curbuf = wp->w_buffer; | |
| 7067 curwin = wp; | |
| 7068 STRCPY(buf, "b:keymap_name"); /* must be writable */ | |
| 7069 ++emsg_skip; | |
| 714 | 7070 s = p = eval_to_string(buf, NULL, FALSE); |
| 7 | 7071 --emsg_skip; |
| 7072 curbuf = old_curbuf; | |
| 7073 curwin = old_curwin; | |
| 7074 if (p == NULL || *p == NUL) | |
| 7075 #endif | |
| 7076 { | |
| 7077 #ifdef FEAT_KEYMAP | |
| 7078 if (wp->w_buffer->b_kmap_state & KEYMAP_LOADED) | |
| 7079 p = wp->w_buffer->b_p_keymap; | |
| 7080 else | |
| 7081 #endif | |
| 7082 p = (char_u *)"lang"; | |
| 7083 } | |
|
9645
123d3c102035
commit https://github.com/vim/vim/commit/73ac0c4281a3606651604a3cbcc334bfb3859a87
Christian Brabandt <cb@256bit.org>
parents:
9489
diff
changeset
|
7084 if (vim_snprintf((char *)buf, len, (char *)fmt, p) > len - 1) |
| 7 | 7085 buf[0] = NUL; |
| 7086 #ifdef FEAT_EVAL | |
| 7087 vim_free(s); | |
| 7088 #endif | |
| 7089 } | |
| 7090 return buf[0] != NUL; | |
| 7091 } | |
| 7092 #endif | |
| 7093 | |
| 7094 #if defined(FEAT_STL_OPT) || defined(PROTO) | |
| 7095 /* | |
| 677 | 7096 * Redraw the status line or ruler of window "wp". |
| 7097 * When "wp" is NULL redraw the tab pages line from 'tabline'. | |
| 7 | 7098 */ |
| 7099 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7100 win_redr_custom( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7101 win_T *wp, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7102 int draw_ruler) /* TRUE or FALSE */ |
| 7 | 7103 { |
| 5539 | 7104 static int entered = FALSE; |
| 7 | 7105 int attr; |
| 7106 int curattr; | |
| 7107 int row; | |
| 7108 int col = 0; | |
| 7109 int maxwidth; | |
| 7110 int width; | |
| 7111 int n; | |
| 7112 int len; | |
| 7113 int fillchar; | |
| 7114 char_u buf[MAXPATHL]; | |
| 1983 | 7115 char_u *stl; |
| 7 | 7116 char_u *p; |
| 681 | 7117 struct stl_hlrec hltab[STL_MAX_ITEM]; |
| 7118 struct stl_hlrec tabtab[STL_MAX_ITEM]; | |
| 677 | 7119 int use_sandbox = FALSE; |
| 2693 | 7120 win_T *ewp; |
| 7121 int p_crb_save; | |
| 7 | 7122 |
| 5539 | 7123 /* There is a tiny chance that this gets called recursively: When |
| 7124 * redrawing a status line triggers redrawing the ruler or tabline. | |
| 7125 * Avoid trouble by not allowing recursion. */ | |
| 7126 if (entered) | |
| 7127 return; | |
| 7128 entered = TRUE; | |
| 7129 | |
| 7 | 7130 /* setup environment for the task at hand */ |
| 677 | 7131 if (wp == NULL) |
| 7132 { | |
| 7133 /* Use 'tabline'. Always at the first line of the screen. */ | |
| 1983 | 7134 stl = p_tal; |
| 677 | 7135 row = 0; |
| 707 | 7136 fillchar = ' '; |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
7137 attr = HL_ATTR(HLF_TPF); |
| 677 | 7138 maxwidth = Columns; |
| 7139 # ifdef FEAT_EVAL | |
| 681 | 7140 use_sandbox = was_set_insecurely((char_u *)"tabline", 0); |
| 677 | 7141 # endif |
| 7142 } | |
| 40 | 7143 else |
| 677 | 7144 { |
| 7145 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
|
7146 fillchar = fillchar_status(&attr, wp); |
| 677 | 7147 maxwidth = W_WIDTH(wp); |
| 7148 | |
| 7149 if (draw_ruler) | |
| 7150 { | |
| 1983 | 7151 stl = p_ruf; |
| 677 | 7152 /* advance past any leading group spec - implicit in ru_col */ |
| 1983 | 7153 if (*stl == '%') |
| 7154 { | |
| 7155 if (*++stl == '-') | |
| 7156 stl++; | |
| 7157 if (atoi((char *)stl)) | |
| 7158 while (VIM_ISDIGIT(*stl)) | |
| 7159 stl++; | |
| 7160 if (*stl++ != '(') | |
| 7161 stl = p_ruf; | |
| 677 | 7162 } |
|
8643
24b43dd167eb
commit https://github.com/vim/vim/commit/44a2f923c00f1384c9ecde12fb5b4711bc20702e
Christian Brabandt <cb@256bit.org>
parents:
8627
diff
changeset
|
7163 #ifdef FEAT_WINDOWS |
| 677 | 7164 col = ru_col - (Columns - W_WIDTH(wp)); |
| 7165 if (col < (W_WIDTH(wp) + 1) / 2) | |
| 7166 col = (W_WIDTH(wp) + 1) / 2; | |
| 7 | 7167 #else |
| 677 | 7168 col = ru_col; |
| 7169 if (col > (Columns + 1) / 2) | |
| 7170 col = (Columns + 1) / 2; | |
| 7171 #endif | |
| 7172 maxwidth = W_WIDTH(wp) - col; | |
| 7 | 7173 #ifdef FEAT_WINDOWS |
| 677 | 7174 if (!wp->w_status_height) |
| 7175 #endif | |
| 7176 { | |
| 7177 row = Rows - 1; | |
| 7178 --maxwidth; /* writing in last column may cause scrolling */ | |
| 7179 fillchar = ' '; | |
| 7180 attr = 0; | |
| 7181 } | |
| 7182 | |
| 7183 # ifdef FEAT_EVAL | |
| 681 | 7184 use_sandbox = was_set_insecurely((char_u *)"rulerformat", 0); |
| 677 | 7185 # endif |
| 7186 } | |
| 7187 else | |
| 7188 { | |
| 7189 if (*wp->w_p_stl != NUL) | |
| 1983 | 7190 stl = wp->w_p_stl; |
| 677 | 7191 else |
| 1983 | 7192 stl = p_stl; |
| 677 | 7193 # ifdef FEAT_EVAL |
| 681 | 7194 use_sandbox = was_set_insecurely((char_u *)"statusline", |
| 7195 *wp->w_p_stl == NUL ? 0 : OPT_LOCAL); | |
| 677 | 7196 # endif |
| 7197 } | |
| 7198 | |
|
8643
24b43dd167eb
commit https://github.com/vim/vim/commit/44a2f923c00f1384c9ecde12fb5b4711bc20702e
Christian Brabandt <cb@256bit.org>
parents:
8627
diff
changeset
|
7199 #ifdef FEAT_WINDOWS |
| 677 | 7200 col += W_WINCOL(wp); |
| 7201 #endif | |
| 7202 } | |
| 7203 | |
| 7 | 7204 if (maxwidth <= 0) |
| 5539 | 7205 goto theend; |
| 677 | 7206 |
| 2693 | 7207 /* Temporarily reset 'cursorbind', we don't want a side effect from moving |
| 7208 * the cursor away and back. */ | |
| 7209 ewp = wp == NULL ? curwin : wp; | |
| 7210 p_crb_save = ewp->w_p_crb; | |
| 7211 ewp->w_p_crb = FALSE; | |
| 7212 | |
| 1983 | 7213 /* Make a copy, because the statusline may include a function call that |
| 7214 * might change the option value and free the memory. */ | |
| 7215 stl = vim_strsave(stl); | |
| 2693 | 7216 width = build_stl_str_hl(ewp, buf, sizeof(buf), |
| 1983 | 7217 stl, use_sandbox, |
| 681 | 7218 fillchar, maxwidth, hltab, tabtab); |
| 1983 | 7219 vim_free(stl); |
| 2693 | 7220 ewp->w_p_crb = p_crb_save; |
| 2661 | 7221 |
| 7222 /* Make all characters printable. */ | |
| 7223 p = transstr(buf); | |
| 7224 if (p != NULL) | |
| 7225 { | |
| 7226 vim_strncpy(buf, p, sizeof(buf) - 1); | |
| 7227 vim_free(p); | |
| 7228 } | |
| 7229 | |
| 7230 /* fill up with "fillchar" */ | |
| 835 | 7231 len = (int)STRLEN(buf); |
| 1883 | 7232 while (width < maxwidth && len < (int)sizeof(buf) - 1) |
| 7 | 7233 { |
| 7234 #ifdef FEAT_MBYTE | |
| 7235 len += (*mb_char2bytes)(fillchar, buf + len); | |
| 7236 #else | |
| 7237 buf[len++] = fillchar; | |
| 7238 #endif | |
| 7239 ++width; | |
| 7240 } | |
| 7241 buf[len] = NUL; | |
| 7242 | |
| 681 | 7243 /* |
| 7244 * Draw each snippet with the specified highlighting. | |
| 7245 */ | |
| 7 | 7246 curattr = attr; |
| 7247 p = buf; | |
| 681 | 7248 for (n = 0; hltab[n].start != NULL; n++) |
| 7249 { | |
| 7250 len = (int)(hltab[n].start - p); | |
| 7 | 7251 screen_puts_len(p, len, row, col, curattr); |
| 7252 col += vim_strnsize(p, len); | |
| 681 | 7253 p = hltab[n].start; |
| 7254 | |
| 7255 if (hltab[n].userhl == 0) | |
| 7 | 7256 curattr = attr; |
| 681 | 7257 else if (hltab[n].userhl < 0) |
| 7258 curattr = syn_id2attr(-hltab[n].userhl); | |
| 7 | 7259 #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
|
7260 # 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
|
7261 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
|
7262 && 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
|
7263 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
|
7264 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
|
7265 && 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
|
7266 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
|
7267 # endif |
| 680 | 7268 else if (wp != NULL && wp != curwin && wp->w_status_height != 0) |
| 681 | 7269 curattr = highlight_stlnc[hltab[n].userhl - 1]; |
| 7 | 7270 #endif |
| 7271 else | |
| 681 | 7272 curattr = highlight_user[hltab[n].userhl - 1]; |
| 7 | 7273 } |
| 7274 screen_puts(p, row, col, curattr); | |
| 681 | 7275 |
| 7276 if (wp == NULL) | |
| 7277 { | |
| 7278 /* Fill the TabPageIdxs[] array for clicking in the tab pagesline. */ | |
| 7279 col = 0; | |
| 7280 len = 0; | |
| 7281 p = buf; | |
| 7282 fillchar = 0; | |
| 7283 for (n = 0; tabtab[n].start != NULL; n++) | |
| 7284 { | |
| 7285 len += vim_strnsize(p, (int)(tabtab[n].start - p)); | |
| 7286 while (col < len) | |
| 7287 TabPageIdxs[col++] = fillchar; | |
| 7288 p = tabtab[n].start; | |
| 7289 fillchar = tabtab[n].userhl; | |
| 7290 } | |
| 7291 while (col < Columns) | |
| 7292 TabPageIdxs[col++] = fillchar; | |
| 7293 } | |
| 5539 | 7294 |
| 7295 theend: | |
| 7296 entered = FALSE; | |
| 7 | 7297 } |
| 7298 | |
| 7299 #endif /* FEAT_STL_OPT */ | |
| 7300 | |
| 7301 /* | |
| 7302 * Output a single character directly to the screen and update ScreenLines. | |
| 7303 */ | |
| 7304 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7305 screen_putchar(int c, int row, int col, int attr) |
| 7 | 7306 { |
| 3549 | 7307 char_u buf[MB_MAXBYTES + 1]; |
| 7308 | |
| 7 | 7309 #ifdef FEAT_MBYTE |
| 3549 | 7310 if (has_mbyte) |
| 7311 buf[(*mb_char2bytes)(c, buf)] = NUL; | |
| 7312 else | |
| 7313 #endif | |
| 7314 { | |
| 7315 buf[0] = c; | |
| 7316 buf[1] = NUL; | |
| 7317 } | |
| 7 | 7318 screen_puts(buf, row, col, attr); |
| 7319 } | |
| 7320 | |
| 7321 /* | |
| 7322 * Get a single character directly from ScreenLines into "bytes[]". | |
| 7323 * Also return its attribute in *attrp; | |
| 7324 */ | |
| 7325 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7326 screen_getbytes(int row, int col, char_u *bytes, int *attrp) |
| 7 | 7327 { |
| 7328 unsigned off; | |
| 7329 | |
| 7330 /* safety check */ | |
| 7331 if (ScreenLines != NULL && row < screen_Rows && col < screen_Columns) | |
| 7332 { | |
| 7333 off = LineOffset[row] + col; | |
| 7334 *attrp = ScreenAttrs[off]; | |
| 7335 bytes[0] = ScreenLines[off]; | |
| 7336 bytes[1] = NUL; | |
| 7337 | |
| 7338 #ifdef FEAT_MBYTE | |
| 7339 if (enc_utf8 && ScreenLinesUC[off] != 0) | |
| 7340 bytes[utfc_char2bytes(off, bytes)] = NUL; | |
| 7341 else if (enc_dbcs == DBCS_JPNU && ScreenLines[off] == 0x8e) | |
| 7342 { | |
| 7343 bytes[0] = ScreenLines[off]; | |
| 7344 bytes[1] = ScreenLines2[off]; | |
| 7345 bytes[2] = NUL; | |
| 7346 } | |
| 7347 else if (enc_dbcs && MB_BYTE2LEN(bytes[0]) > 1) | |
| 7348 { | |
| 7349 bytes[1] = ScreenLines[off + 1]; | |
| 7350 bytes[2] = NUL; | |
| 7351 } | |
| 7352 #endif | |
| 7353 } | |
| 7354 } | |
| 7355 | |
| 714 | 7356 #ifdef FEAT_MBYTE |
|
7805
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7697
diff
changeset
|
7357 static int screen_comp_differs(int, int*); |
| 714 | 7358 |
| 7359 /* | |
| 7360 * Return TRUE if composing characters for screen posn "off" differs from | |
| 7361 * composing characters in "u8cc". | |
|
2124
dc8a5699253b
updated for version 7.2.406
Bram Moolenaar <bram@zimbu.org>
parents:
2122
diff
changeset
|
7362 * Only to be used when ScreenLinesUC[off] != 0. |
| 714 | 7363 */ |
| 7364 static int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7365 screen_comp_differs(int off, int *u8cc) |
| 714 | 7366 { |
| 7367 int i; | |
| 7368 | |
| 7369 for (i = 0; i < Screen_mco; ++i) | |
| 7370 { | |
| 7371 if (ScreenLinesC[i][off] != (u8char_T)u8cc[i]) | |
| 7372 return TRUE; | |
| 7373 if (u8cc[i] == 0) | |
| 7374 break; | |
| 7375 } | |
| 7376 return FALSE; | |
| 7377 } | |
| 7378 #endif | |
| 7379 | |
| 7 | 7380 /* |
| 7381 * Put string '*text' on the screen at position 'row' and 'col', with | |
| 7382 * attributes 'attr', and update ScreenLines[] and ScreenAttrs[]. | |
| 7383 * Note: only outputs within one row, message is truncated at screen boundary! | |
| 7384 * Note: if ScreenLines[], row and/or col is invalid, nothing is done. | |
| 7385 */ | |
| 7386 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7387 screen_puts( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7388 char_u *text, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7389 int row, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7390 int col, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7391 int attr) |
| 7 | 7392 { |
| 7393 screen_puts_len(text, -1, row, col, attr); | |
| 7394 } | |
| 7395 | |
| 7396 /* | |
| 7397 * Like screen_puts(), but output "text[len]". When "len" is -1 output up to | |
| 7398 * a NUL. | |
| 7399 */ | |
| 7400 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7401 screen_puts_len( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7402 char_u *text, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7403 int textlen, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7404 int row, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7405 int col, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7406 int attr) |
| 7 | 7407 { |
| 7408 unsigned off; | |
| 7409 char_u *ptr = text; | |
| 5923 | 7410 int len = textlen; |
| 7 | 7411 int c; |
| 7412 #ifdef FEAT_MBYTE | |
| 1378 | 7413 unsigned max_off; |
| 7 | 7414 int mbyte_blen = 1; |
| 7415 int mbyte_cells = 1; | |
| 7416 int u8c = 0; | |
| 714 | 7417 int u8cc[MAX_MCO]; |
| 7 | 7418 int clear_next_cell = FALSE; |
| 7419 # ifdef FEAT_ARABIC | |
| 7420 int prev_c = 0; /* previous Arabic character */ | |
| 714 | 7421 int pc, nc, nc1; |
| 7422 int pcc[MAX_MCO]; | |
| 7 | 7423 # endif |
| 7424 #endif | |
| 1843 | 7425 #if defined(FEAT_MBYTE) || defined(FEAT_GUI) || defined(UNIX) |
| 7426 int force_redraw_this; | |
| 7427 int force_redraw_next = FALSE; | |
| 7428 #endif | |
| 7429 int need_redraw; | |
| 7 | 7430 |
| 7431 if (ScreenLines == NULL || row >= screen_Rows) /* safety check */ | |
| 7432 return; | |
| 1843 | 7433 off = LineOffset[row] + col; |
| 7 | 7434 |
| 1668 | 7435 #ifdef FEAT_MBYTE |
| 7436 /* When drawing over the right halve of a double-wide char clear out the | |
| 7437 * left halve. Only needed in a terminal. */ | |
| 1685 | 7438 if (has_mbyte && col > 0 && col < screen_Columns |
| 1668 | 7439 # ifdef FEAT_GUI |
| 7440 && !gui.in_use | |
| 7441 # endif | |
| 7442 && mb_fix_col(col, row) != col) | |
| 1843 | 7443 { |
| 7444 ScreenLines[off - 1] = ' '; | |
| 7445 ScreenAttrs[off - 1] = 0; | |
| 7446 if (enc_utf8) | |
| 7447 { | |
| 7448 ScreenLinesUC[off - 1] = 0; | |
| 7449 ScreenLinesC[0][off - 1] = 0; | |
| 7450 } | |
| 7451 /* redraw the previous cell, make it empty */ | |
| 7452 screen_char(off - 1, row, col - 1); | |
| 7453 /* force the cell at "col" to be redrawn */ | |
| 7454 force_redraw_next = TRUE; | |
| 7455 } | |
| 7456 #endif | |
| 7457 | |
| 1378 | 7458 #ifdef FEAT_MBYTE |
| 7459 max_off = LineOffset[row] + screen_Columns; | |
| 7460 #endif | |
| 1340 | 7461 while (col < screen_Columns |
| 7462 && (len < 0 || (int)(ptr - text) < len) | |
| 7463 && *ptr != NUL) | |
| 7 | 7464 { |
| 7465 c = *ptr; | |
| 7466 #ifdef FEAT_MBYTE | |
| 7467 /* check if this is the first byte of a multibyte */ | |
| 7468 if (has_mbyte) | |
| 7469 { | |
| 7470 if (enc_utf8 && len > 0) | |
| 474 | 7471 mbyte_blen = utfc_ptr2len_len(ptr, (int)((text + len) - ptr)); |
| 7 | 7472 else |
| 474 | 7473 mbyte_blen = (*mb_ptr2len)(ptr); |
| 7 | 7474 if (enc_dbcs == DBCS_JPNU && c == 0x8e) |
| 7475 mbyte_cells = 1; | |
| 7476 else if (enc_dbcs != 0) | |
| 7477 mbyte_cells = mbyte_blen; | |
| 7478 else /* enc_utf8 */ | |
| 7479 { | |
| 7480 if (len >= 0) | |
| 714 | 7481 u8c = utfc_ptr2char_len(ptr, u8cc, |
| 7 | 7482 (int)((text + len) - ptr)); |
| 7483 else | |
| 714 | 7484 u8c = utfc_ptr2char(ptr, u8cc); |
| 7 | 7485 mbyte_cells = utf_char2cells(u8c); |
| 1401 | 7486 # ifdef UNICODE16 |
| 7 | 7487 /* Non-BMP character: display as ? or fullwidth ?. */ |
| 7488 if (u8c >= 0x10000) | |
| 7489 { | |
| 7490 u8c = (mbyte_cells == 2) ? 0xff1f : (int)'?'; | |
| 7491 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
|
7492 attr = HL_ATTR(HLF_8); |
| 7 | 7493 } |
| 1401 | 7494 # endif |
| 7 | 7495 # ifdef FEAT_ARABIC |
| 7496 if (p_arshape && !p_tbidi && ARABIC_CHAR(u8c)) | |
| 7497 { | |
| 7498 /* Do Arabic shaping. */ | |
| 7499 if (len >= 0 && (int)(ptr - text) + mbyte_blen >= len) | |
| 7500 { | |
| 7501 /* Past end of string to be displayed. */ | |
| 7502 nc = NUL; | |
| 7503 nc1 = NUL; | |
| 7504 } | |
| 7505 else | |
| 714 | 7506 { |
| 1994 | 7507 nc = utfc_ptr2char_len(ptr + mbyte_blen, pcc, |
| 7508 (int)((text + len) - ptr - mbyte_blen)); | |
| 714 | 7509 nc1 = pcc[0]; |
| 7510 } | |
| 7 | 7511 pc = prev_c; |
| 7512 prev_c = u8c; | |
| 714 | 7513 u8c = arabic_shape(u8c, &c, &u8cc[0], nc, nc1, pc); |
| 7 | 7514 } |
| 7515 else | |
| 7516 prev_c = u8c; | |
| 7517 # endif | |
|
2055
4aa4510d548c
updated for version 7.2.341
Bram Moolenaar <bram@zimbu.org>
parents:
2008
diff
changeset
|
7518 if (col + mbyte_cells > screen_Columns) |
|
4aa4510d548c
updated for version 7.2.341
Bram Moolenaar <bram@zimbu.org>
parents:
2008
diff
changeset
|
7519 { |
|
4aa4510d548c
updated for version 7.2.341
Bram Moolenaar <bram@zimbu.org>
parents:
2008
diff
changeset
|
7520 /* 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
|
7521 * 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
|
7522 c = '>'; |
|
4aa4510d548c
updated for version 7.2.341
Bram Moolenaar <bram@zimbu.org>
parents:
2008
diff
changeset
|
7523 mbyte_cells = 1; |
|
4aa4510d548c
updated for version 7.2.341
Bram Moolenaar <bram@zimbu.org>
parents:
2008
diff
changeset
|
7524 } |
| 7 | 7525 } |
| 7526 } | |
| 7527 #endif | |
| 7528 | |
| 1843 | 7529 #if defined(FEAT_MBYTE) || defined(FEAT_GUI) || defined(UNIX) |
| 7530 force_redraw_this = force_redraw_next; | |
| 7531 force_redraw_next = FALSE; | |
| 7532 #endif | |
| 7533 | |
| 7534 need_redraw = ScreenLines[off] != c | |
| 7 | 7535 #ifdef FEAT_MBYTE |
| 7536 || (mbyte_cells == 2 | |
| 7537 && ScreenLines[off + 1] != (enc_dbcs ? ptr[1] : 0)) | |
| 7538 || (enc_dbcs == DBCS_JPNU | |
| 7539 && c == 0x8e | |
| 7540 && ScreenLines2[off] != ptr[1]) | |
| 7541 || (enc_utf8 | |
|
2124
dc8a5699253b
updated for version 7.2.406
Bram Moolenaar <bram@zimbu.org>
parents:
2122
diff
changeset
|
7542 && (ScreenLinesUC[off] != |
|
dc8a5699253b
updated for version 7.2.406
Bram Moolenaar <bram@zimbu.org>
parents:
2122
diff
changeset
|
7543 (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
|
7544 || (ScreenLinesUC[off] != 0 |
|
dc8a5699253b
updated for version 7.2.406
Bram Moolenaar <bram@zimbu.org>
parents:
2122
diff
changeset
|
7545 && screen_comp_differs(off, u8cc)))) |
| 7 | 7546 #endif |
| 7547 || ScreenAttrs[off] != attr | |
| 1843 | 7548 || exmode_active; |
| 7549 | |
| 7550 if (need_redraw | |
| 7551 #if defined(FEAT_MBYTE) || defined(FEAT_GUI) || defined(UNIX) | |
| 7552 || force_redraw_this | |
| 7553 #endif | |
| 7 | 7554 ) |
| 7555 { | |
| 7556 #if defined(FEAT_GUI) || defined(UNIX) | |
| 7557 /* The bold trick makes a single row of pixels appear in the next | |
| 7558 * character. When a bold character is removed, the next | |
| 7559 * character should be redrawn too. This happens for our own GUI | |
| 1843 | 7560 * and for some xterms. */ |
| 7561 if (need_redraw && ScreenLines[off] != ' ' && ( | |
| 7 | 7562 # ifdef FEAT_GUI |
| 7563 gui.in_use | |
| 7564 # endif | |
| 7565 # if defined(FEAT_GUI) && defined(UNIX) | |
| 7566 || | |
| 7567 # endif | |
| 7568 # ifdef UNIX | |
| 7569 term_is_xterm | |
| 7570 # endif | |
| 1843 | 7571 )) |
| 7572 { | |
| 7573 int n = ScreenAttrs[off]; | |
| 7574 | |
| 7575 if (n > HL_ALL) | |
| 7576 n = syn_attr2attr(n); | |
| 7577 if (n & HL_BOLD) | |
| 7578 force_redraw_next = TRUE; | |
| 7 | 7579 } |
| 7580 #endif | |
| 7581 #ifdef FEAT_MBYTE | |
| 7582 /* When at the end of the text and overwriting a two-cell | |
| 7583 * character with a one-cell character, need to clear the next | |
| 7584 * cell. Also when overwriting the left halve of a two-cell char | |
| 7585 * with the right halve of a two-cell char. Do this only once | |
| 7586 * (mb_off2cells() may return 2 on the right halve). */ | |
| 7587 if (clear_next_cell) | |
| 7588 clear_next_cell = FALSE; | |
| 7589 else if (has_mbyte | |
| 7590 && (len < 0 ? ptr[mbyte_blen] == NUL | |
| 7591 : ptr + mbyte_blen >= text + len) | |
| 1378 | 7592 && ((mbyte_cells == 1 && (*mb_off2cells)(off, max_off) > 1) |
| 7 | 7593 || (mbyte_cells == 2 |
| 1378 | 7594 && (*mb_off2cells)(off, max_off) == 1 |
| 7595 && (*mb_off2cells)(off + 1, max_off) > 1))) | |
| 7 | 7596 clear_next_cell = TRUE; |
| 7597 | |
| 7598 /* Make sure we never leave a second byte of a double-byte behind, | |
| 7599 * it confuses mb_off2cells(). */ | |
| 7600 if (enc_dbcs | |
| 1378 | 7601 && ((mbyte_cells == 1 && (*mb_off2cells)(off, max_off) > 1) |
| 7 | 7602 || (mbyte_cells == 2 |
| 1378 | 7603 && (*mb_off2cells)(off, max_off) == 1 |
| 7604 && (*mb_off2cells)(off + 1, max_off) > 1))) | |
| 7 | 7605 ScreenLines[off + mbyte_blen] = 0; |
| 7606 #endif | |
| 7607 ScreenLines[off] = c; | |
| 7608 ScreenAttrs[off] = attr; | |
| 7609 #ifdef FEAT_MBYTE | |
| 7610 if (enc_utf8) | |
| 7611 { | |
| 714 | 7612 if (c < 0x80 && u8cc[0] == 0) |
| 7 | 7613 ScreenLinesUC[off] = 0; |
| 7614 else | |
| 7615 { | |
| 714 | 7616 int i; |
| 7617 | |
| 7 | 7618 ScreenLinesUC[off] = u8c; |
| 714 | 7619 for (i = 0; i < Screen_mco; ++i) |
| 7620 { | |
| 7621 ScreenLinesC[i][off] = u8cc[i]; | |
| 7622 if (u8cc[i] == 0) | |
| 7623 break; | |
| 7624 } | |
| 7 | 7625 } |
| 7626 if (mbyte_cells == 2) | |
| 7627 { | |
| 7628 ScreenLines[off + 1] = 0; | |
| 7629 ScreenAttrs[off + 1] = attr; | |
| 7630 } | |
| 7631 screen_char(off, row, col); | |
| 7632 } | |
| 7633 else if (mbyte_cells == 2) | |
| 7634 { | |
| 7635 ScreenLines[off + 1] = ptr[1]; | |
| 7636 ScreenAttrs[off + 1] = attr; | |
| 7637 screen_char_2(off, row, col); | |
| 7638 } | |
| 7639 else if (enc_dbcs == DBCS_JPNU && c == 0x8e) | |
| 7640 { | |
| 7641 ScreenLines2[off] = ptr[1]; | |
| 7642 screen_char(off, row, col); | |
| 7643 } | |
| 7644 else | |
| 7645 #endif | |
| 7646 screen_char(off, row, col); | |
| 7647 } | |
| 7648 #ifdef FEAT_MBYTE | |
| 7649 if (has_mbyte) | |
| 7650 { | |
| 7651 off += mbyte_cells; | |
| 7652 col += mbyte_cells; | |
| 7653 ptr += mbyte_blen; | |
| 7654 if (clear_next_cell) | |
| 5923 | 7655 { |
| 7656 /* This only happens at the end, display one space next. */ | |
| 7 | 7657 ptr = (char_u *)" "; |
| 5923 | 7658 len = -1; |
| 7659 } | |
| 7 | 7660 } |
| 7661 else | |
| 7662 #endif | |
| 7663 { | |
| 7664 ++off; | |
| 7665 ++col; | |
| 7666 ++ptr; | |
| 7667 } | |
| 7668 } | |
| 1843 | 7669 |
| 7670 #if defined(FEAT_MBYTE) || defined(FEAT_GUI) || defined(UNIX) | |
| 7671 /* If we detected the next character needs to be redrawn, but the text | |
| 7672 * doesn't extend up to there, update the character here. */ | |
| 7673 if (force_redraw_next && col < screen_Columns) | |
| 7674 { | |
| 7675 # ifdef FEAT_MBYTE | |
| 7676 if (enc_dbcs != 0 && dbcs_off2cells(off, max_off) > 1) | |
| 7677 screen_char_2(off, row, col); | |
| 7678 else | |
| 7679 # endif | |
| 7680 screen_char(off, row, col); | |
| 7681 } | |
| 7682 #endif | |
| 7 | 7683 } |
| 7684 | |
| 7685 #ifdef FEAT_SEARCH_EXTRA | |
| 7686 /* | |
| 1326 | 7687 * Prepare for 'hlsearch' highlighting. |
| 7 | 7688 */ |
| 7689 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7690 start_search_hl(void) |
| 7 | 7691 { |
| 7692 if (p_hls && !no_hlsearch) | |
| 7693 { | |
| 7694 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
|
7695 search_hl.attr = HL_ATTR(HLF_L); |
| 1521 | 7696 # ifdef FEAT_RELTIME |
| 7697 /* Set the time limit to 'redrawtime'. */ | |
| 7698 profile_setlimit(p_rdt, &search_hl.tm); | |
| 7699 # endif | |
| 7 | 7700 } |
| 7701 } | |
| 7702 | |
| 7703 /* | |
| 1326 | 7704 * Clean up for 'hlsearch' highlighting. |
| 7 | 7705 */ |
| 7706 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7707 end_search_hl(void) |
| 7 | 7708 { |
| 7709 if (search_hl.rm.regprog != NULL) | |
| 7710 { | |
|
4805
66803af09906
updated for version 7.3.1149
Bram Moolenaar <bram@vim.org>
parents:
4795
diff
changeset
|
7711 vim_regfree(search_hl.rm.regprog); |
| 7 | 7712 search_hl.rm.regprog = NULL; |
| 7713 } | |
| 7714 } | |
| 7715 | |
| 7716 /* | |
|
2284
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7717 * 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
|
7718 */ |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7719 static void |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7720 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
|
7721 { |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7722 matchitem_T *cur; |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7723 |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7724 /* 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
|
7725 * match */ |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7726 cur = wp->w_match_head; |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7727 while (cur != NULL) |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7728 { |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7729 cur->hl.rm = cur->match; |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7730 if (cur->hlg_id == 0) |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7731 cur->hl.attr = 0; |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7732 else |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7733 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
|
7734 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
|
7735 cur->hl.lnum = 0; |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7736 cur->hl.first_lnum = 0; |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7737 # ifdef FEAT_RELTIME |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7738 /* 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
|
7739 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
|
7740 # endif |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7741 cur = cur->next; |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7742 } |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7743 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
|
7744 search_hl.lnum = 0; |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7745 search_hl.first_lnum = 0; |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7746 /* 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
|
7747 } |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7748 |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7749 /* |
| 7 | 7750 * Advance to the match in window "wp" line "lnum" or past it. |
| 7751 */ | |
| 7752 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7753 prepare_search_hl(win_T *wp, linenr_T lnum) |
| 7 | 7754 { |
| 1326 | 7755 matchitem_T *cur; /* points to the match list */ |
| 7756 match_T *shl; /* points to search_hl or a match */ | |
| 7757 int shl_flag; /* flag to indicate whether search_hl | |
| 7758 has been processed or not */ | |
| 5979 | 7759 int pos_inprogress; /* marks that position match search is |
| 7760 in progress */ | |
| 7 | 7761 int n; |
| 7762 | |
| 7763 /* | |
| 7764 * When using a multi-line pattern, start searching at the top | |
| 7765 * of the window or just after a closed fold. | |
| 1326 | 7766 * Do this both for search_hl and the match list. |
| 7 | 7767 */ |
| 1326 | 7768 cur = wp->w_match_head; |
| 7769 shl_flag = FALSE; | |
| 7770 while (cur != NULL || shl_flag == FALSE) | |
| 7771 { | |
| 7772 if (shl_flag == FALSE) | |
| 7773 { | |
| 7774 shl = &search_hl; | |
| 7775 shl_flag = TRUE; | |
| 7776 } | |
| 7777 else | |
| 7778 shl = &cur->hl; | |
| 7 | 7779 if (shl->rm.regprog != NULL |
| 7780 && shl->lnum == 0 | |
| 7781 && re_multiline(shl->rm.regprog)) | |
| 7782 { | |
| 7783 if (shl->first_lnum == 0) | |
| 7784 { | |
| 7785 # ifdef FEAT_FOLDING | |
| 7786 for (shl->first_lnum = lnum; | |
| 7787 shl->first_lnum > wp->w_topline; --shl->first_lnum) | |
| 7788 if (hasFoldingWin(wp, shl->first_lnum - 1, | |
| 7789 NULL, NULL, TRUE, NULL)) | |
| 7790 break; | |
| 7791 # else | |
| 7792 shl->first_lnum = wp->w_topline; | |
| 7793 # endif | |
| 7794 } | |
| 5979 | 7795 if (cur != NULL) |
| 7796 cur->pos.cur = 0; | |
| 7797 pos_inprogress = TRUE; | |
| 7 | 7798 n = 0; |
| 5979 | 7799 while (shl->first_lnum < lnum && (shl->rm.regprog != NULL |
| 7800 || (cur != NULL && pos_inprogress))) | |
| 7801 { | |
|
9992
3e3b0ce24b61
commit https://github.com/vim/vim/commit/e17bdffff78ebd6a4e3cff26754cc667557ea810
Christian Brabandt <cb@256bit.org>
parents:
9939
diff
changeset
|
7802 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
|
7803 shl == &search_hl ? NULL : cur); |
| 5979 | 7804 pos_inprogress = cur == NULL || cur->pos.cur == 0 |
| 7805 ? FALSE : TRUE; | |
| 7 | 7806 if (shl->lnum != 0) |
| 7807 { | |
| 7808 shl->first_lnum = shl->lnum | |
| 7809 + shl->rm.endpos[0].lnum | |
| 7810 - shl->rm.startpos[0].lnum; | |
| 7811 n = shl->rm.endpos[0].col; | |
| 7812 } | |
| 7813 else | |
| 7814 { | |
| 7815 ++shl->first_lnum; | |
| 7816 n = 0; | |
| 7817 } | |
| 7818 } | |
| 7819 } | |
| 1326 | 7820 if (shl != &search_hl && cur != NULL) |
| 7821 cur = cur->next; | |
| 7 | 7822 } |
| 7823 } | |
| 7824 | |
| 7825 /* | |
| 1326 | 7826 * Search for a next 'hlsearch' or match. |
| 7 | 7827 * Uses shl->buf. |
| 7828 * Sets shl->lnum and shl->rm contents. | |
| 7829 * Note: Assumes a previous match is always before "lnum", unless | |
| 7830 * shl->lnum is zero. | |
| 7831 * Careful: Any pointers for buffer lines will become invalid. | |
| 7832 */ | |
| 7833 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7834 next_search_hl( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7835 win_T *win, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7836 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
|
7837 linenr_T lnum, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7838 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
|
7839 matchitem_T *cur) /* to retrieve match positions if any */ |
| 7 | 7840 { |
| 7841 linenr_T l; | |
| 7842 colnr_T matchcol; | |
| 7843 long nmatched; | |
| 7844 | |
| 7845 if (shl->lnum != 0) | |
| 7846 { | |
| 7847 /* Check for three situations: | |
| 7848 * 1. If the "lnum" is below a previous match, start a new search. | |
| 7849 * 2. If the previous match includes "mincol", use it. | |
| 7850 * 3. Continue after the previous match. | |
| 7851 */ | |
| 7852 l = shl->lnum + shl->rm.endpos[0].lnum - shl->rm.startpos[0].lnum; | |
| 7853 if (lnum > l) | |
| 7854 shl->lnum = 0; | |
| 7855 else if (lnum < l || shl->rm.endpos[0].col > mincol) | |
| 7856 return; | |
| 7857 } | |
| 7858 | |
| 7859 /* | |
| 7860 * Repeat searching for a match until one is found that includes "mincol" | |
| 7861 * or none is found in this line. | |
| 7862 */ | |
| 7863 called_emsg = FALSE; | |
| 7864 for (;;) | |
| 7865 { | |
| 1521 | 7866 #ifdef FEAT_RELTIME |
| 7867 /* Stop searching after passing the time limit. */ | |
| 7868 if (profile_passed_limit(&(shl->tm))) | |
| 7869 { | |
| 7870 shl->lnum = 0; /* no match found in time */ | |
| 7871 break; | |
| 7872 } | |
| 7873 #endif | |
| 7 | 7874 /* Three situations: |
| 7875 * 1. No useful previous match: search from start of line. | |
| 7876 * 2. Not Vi compatible or empty match: continue at next character. | |
| 7877 * Break the loop if this is beyond the end of the line. | |
| 7878 * 3. Vi compatible searching: continue at end of previous match. | |
| 7879 */ | |
| 7880 if (shl->lnum == 0) | |
| 7881 matchcol = 0; | |
| 7882 else if (vim_strchr(p_cpo, CPO_SEARCH) == NULL | |
| 7883 || (shl->rm.endpos[0].lnum == 0 | |
| 685 | 7884 && shl->rm.endpos[0].col <= shl->rm.startpos[0].col)) |
| 7885 { | |
| 688 | 7886 char_u *ml; |
| 685 | 7887 |
| 7888 matchcol = shl->rm.startpos[0].col; | |
| 688 | 7889 ml = ml_get_buf(shl->buf, lnum, FALSE) + matchcol; |
| 685 | 7890 if (*ml == NUL) |
| 7891 { | |
| 7892 ++matchcol; | |
| 7 | 7893 shl->lnum = 0; |
| 7894 break; | |
| 7895 } | |
| 685 | 7896 #ifdef FEAT_MBYTE |
| 7897 if (has_mbyte) | |
| 7898 matchcol += mb_ptr2len(ml); | |
| 7899 else | |
| 7900 #endif | |
| 7901 ++matchcol; | |
| 7 | 7902 } |
| 7903 else | |
| 7904 matchcol = shl->rm.endpos[0].col; | |
| 7905 | |
| 7906 shl->lnum = lnum; | |
| 5979 | 7907 if (shl->rm.regprog != NULL) |
| 7908 { | |
| 6394 | 7909 /* Remember whether shl->rm is using a copy of the regprog in |
| 7910 * cur->match. */ | |
| 7911 int regprog_is_copy = (shl != &search_hl && cur != NULL | |
| 7912 && shl == &cur->hl | |
| 7913 && 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
|
7914 int timed_out = FALSE; |
| 6394 | 7915 |
| 5979 | 7916 nmatched = vim_regexec_multi(&shl->rm, win, shl->buf, lnum, |
| 7917 matchcol, | |
| 1521 | 7918 #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
|
7919 &(shl->tm), &timed_out |
| 1521 | 7920 #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
|
7921 NULL, NULL |
| 5979 | 7922 #endif |
| 7923 ); | |
| 6394 | 7924 /* Copy the regprog, in case it got freed and recompiled. */ |
| 7925 if (regprog_is_copy) | |
| 7926 cur->match.regprog = cur->hl.rm.regprog; | |
| 7927 | |
|
11521
578df034735d
patch 8.0.0643: when a pattern search is slow Vim becomes unusable
Christian Brabandt <cb@256bit.org>
parents:
11516
diff
changeset
|
7928 if (called_emsg || got_int || timed_out) |
| 5979 | 7929 { |
| 7930 /* Error while handling regexp: stop using this regexp. */ | |
| 7931 if (shl == &search_hl) | |
| 7932 { | |
| 7933 /* don't free regprog in the match list, it's a copy */ | |
| 7934 vim_regfree(shl->rm.regprog); | |
| 7935 SET_NO_HLSEARCH(TRUE); | |
| 7936 } | |
| 7937 shl->rm.regprog = NULL; | |
| 7938 shl->lnum = 0; | |
| 7939 got_int = FALSE; /* avoid the "Type :quit to exit Vim" | |
| 7940 message */ | |
| 7941 break; | |
| 7942 } | |
| 7943 } | |
| 7944 else if (cur != NULL) | |
| 7945 nmatched = next_search_hl_pos(shl, lnum, &(cur->pos), matchcol); | |
| 5987 | 7946 else |
| 7947 nmatched = 0; | |
| 7 | 7948 if (nmatched == 0) |
| 7949 { | |
| 7950 shl->lnum = 0; /* no match found */ | |
| 7951 break; | |
| 7952 } | |
| 7953 if (shl->rm.startpos[0].lnum > 0 | |
| 7954 || shl->rm.startpos[0].col >= mincol | |
| 7955 || nmatched > 1 | |
| 7956 || shl->rm.endpos[0].col > mincol) | |
| 7957 { | |
| 7958 shl->lnum += shl->rm.startpos[0].lnum; | |
| 7959 break; /* useful match found */ | |
| 7960 } | |
| 7961 } | |
| 7962 } | |
| 7963 | |
|
10287
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
7964 /* |
|
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
7965 * 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
|
7966 * Return zero otherwise. |
|
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
7967 */ |
| 5979 | 7968 static int |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7969 next_search_hl_pos( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7970 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
|
7971 linenr_T lnum, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7972 posmatch_T *posmatch, /* match positions */ |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7973 colnr_T mincol) /* minimal column for a match */ |
| 5979 | 7974 { |
| 7975 int i; | |
|
10287
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
7976 int found = -1; |
|
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
7977 |
| 5979 | 7978 for (i = posmatch->cur; i < MAXPOSMATCH; i++) |
| 7979 { | |
|
10273
489eae19cad9
commit https://github.com/vim/vim/commit/a6c27ee6db2c328e0ab0e6d143e2a295a0bb9c9a
Christian Brabandt <cb@256bit.org>
parents:
10247
diff
changeset
|
7980 llpos_T *pos = &posmatch->pos[i]; |
|
489eae19cad9
commit https://github.com/vim/vim/commit/a6c27ee6db2c328e0ab0e6d143e2a295a0bb9c9a
Christian Brabandt <cb@256bit.org>
parents:
10247
diff
changeset
|
7981 |
|
489eae19cad9
commit https://github.com/vim/vim/commit/a6c27ee6db2c328e0ab0e6d143e2a295a0bb9c9a
Christian Brabandt <cb@256bit.org>
parents:
10247
diff
changeset
|
7982 if (pos->lnum == 0) |
| 5979 | 7983 break; |
|
10287
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
7984 if (pos->len == 0 && pos->col < mincol) |
| 5979 | 7985 continue; |
|
10273
489eae19cad9
commit https://github.com/vim/vim/commit/a6c27ee6db2c328e0ab0e6d143e2a295a0bb9c9a
Christian Brabandt <cb@256bit.org>
parents:
10247
diff
changeset
|
7986 if (pos->lnum == lnum) |
| 5979 | 7987 { |
|
10287
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
7988 if (found >= 0) |
|
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
7989 { |
|
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
7990 /* 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
|
7991 * them */ |
|
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
7992 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
|
7993 { |
|
489eae19cad9
commit https://github.com/vim/vim/commit/a6c27ee6db2c328e0ab0e6d143e2a295a0bb9c9a
Christian Brabandt <cb@256bit.org>
parents:
10247
diff
changeset
|
7994 llpos_T tmp = *pos; |
|
489eae19cad9
commit https://github.com/vim/vim/commit/a6c27ee6db2c328e0ab0e6d143e2a295a0bb9c9a
Christian Brabandt <cb@256bit.org>
parents:
10247
diff
changeset
|
7995 |
|
10287
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
7996 *pos = posmatch->pos[found]; |
|
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
7997 posmatch->pos[found] = tmp; |
| 5979 | 7998 } |
| 7999 } | |
| 8000 else | |
|
10287
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
8001 found = i; |
| 5979 | 8002 } |
| 8003 } | |
| 8004 posmatch->cur = 0; | |
|
10287
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
8005 if (found >= 0) |
|
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
8006 { |
|
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
8007 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
|
8008 ? 0 : posmatch->pos[found].col - 1; |
|
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
8009 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
|
8010 ? MAXCOL : start + posmatch->pos[found].len; |
|
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
8011 |
|
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
8012 shl->lnum = lnum; |
| 5979 | 8013 shl->rm.startpos[0].lnum = 0; |
| 8014 shl->rm.startpos[0].col = start; | |
| 8015 shl->rm.endpos[0].lnum = 0; | |
| 8016 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
|
8017 shl->is_addpos = TRUE; |
|
10287
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
8018 posmatch->cur = found + 1; |
|
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
8019 return 1; |
|
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
8020 } |
|
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
8021 return 0; |
| 5979 | 8022 } |
| 5985 | 8023 #endif |
| 5979 | 8024 |
| 7 | 8025 static void |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8026 screen_start_highlight(int attr) |
| 7 | 8027 { |
| 8028 attrentry_T *aep = NULL; | |
| 8029 | |
| 8030 screen_attr = attr; | |
| 8031 if (full_screen | |
| 8032 #ifdef WIN3264 | |
| 8033 && termcap_active | |
| 8034 #endif | |
| 8035 ) | |
| 8036 { | |
| 8037 #ifdef FEAT_GUI | |
| 8038 if (gui.in_use) | |
| 8039 { | |
| 8040 char buf[20]; | |
| 8041 | |
| 681 | 8042 /* The GUI handles this internally. */ |
| 8043 sprintf(buf, IF_EB("\033|%dh", ESC_STR "|%dh"), attr); | |
| 7 | 8044 OUT_STR(buf); |
| 8045 } | |
| 8046 else | |
| 8047 #endif | |
| 8048 { | |
| 8049 if (attr > HL_ALL) /* special HL attr. */ | |
| 8050 { | |
|
8969
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8051 if (IS_CTERM) |
| 7 | 8052 aep = syn_cterm_attr2entry(attr); |
| 8053 else | |
| 8054 aep = syn_term_attr2entry(attr); | |
| 8055 if (aep == NULL) /* did ":syntax clear" */ | |
| 8056 attr = 0; | |
| 8057 else | |
| 8058 attr = aep->ae_attr; | |
| 8059 } | |
| 8060 if ((attr & HL_BOLD) && T_MD != NULL) /* bold */ | |
| 8061 out_str(T_MD); | |
|
8969
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8062 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
|
8063 #ifdef FEAT_TERMGUICOLORS |
|
773d627cac0b
commit https://github.com/vim/vim/commit/61be73bb0f965a895bfb064ea3e55476ac175162
Christian Brabandt <cb@256bit.org>
parents:
8977
diff
changeset
|
8064 (p_tgc ? |
|
9939
ccb6461b82df
commit https://github.com/vim/vim/commit/1b58cdd160c2e0ada0f638679a2aa27e4665fc48
Christian Brabandt <cb@256bit.org>
parents:
9885
diff
changeset
|
8065 (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
|
8066 #endif |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8067 (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
|
8068 #ifdef FEAT_TERMGUICOLORS |
|
8969
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8069 ) |
|
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 ) |
| 681 | 8072 /* If the Normal FG color has BOLD attribute and the new HL |
| 8073 * has a FG color defined, clear BOLD. */ | |
| 8074 out_str(T_ME); | |
| 7 | 8075 if ((attr & HL_STANDOUT) && T_SO != NULL) /* standout */ |
| 8076 out_str(T_SO); | |
| 205 | 8077 if ((attr & (HL_UNDERLINE | HL_UNDERCURL)) && T_US != NULL) |
| 8078 /* underline or undercurl */ | |
| 7 | 8079 out_str(T_US); |
| 8080 if ((attr & HL_ITALIC) && T_CZH != NULL) /* italic */ | |
| 8081 out_str(T_CZH); | |
| 8082 if ((attr & HL_INVERSE) && T_MR != NULL) /* inverse (reverse) */ | |
| 8083 out_str(T_MR); | |
| 8084 | |
| 8085 /* | |
| 8086 * Output the color or start string after bold etc., in case the | |
| 8087 * bold etc. override the color setting. | |
| 8088 */ | |
| 8089 if (aep != NULL) | |
| 8090 { | |
|
9027
773d627cac0b
commit https://github.com/vim/vim/commit/61be73bb0f965a895bfb064ea3e55476ac175162
Christian Brabandt <cb@256bit.org>
parents:
8977
diff
changeset
|
8091 #ifdef FEAT_TERMGUICOLORS |
|
773d627cac0b
commit https://github.com/vim/vim/commit/61be73bb0f965a895bfb064ea3e55476ac175162
Christian Brabandt <cb@256bit.org>
parents:
8977
diff
changeset
|
8092 if (p_tgc) |
|
8969
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8093 { |
|
9939
ccb6461b82df
commit https://github.com/vim/vim/commit/1b58cdd160c2e0ada0f638679a2aa27e4665fc48
Christian Brabandt <cb@256bit.org>
parents:
9885
diff
changeset
|
8094 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
|
8095 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
|
8096 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
|
8097 term_bg_rgb_color(aep->ae_u.cterm.bg_rgb); |
| 7 | 8098 } |
| 8099 else | |
|
8969
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8100 #endif |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8101 { |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8102 if (t_colors > 1) |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8103 { |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8104 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
|
8105 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
|
8106 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
|
8107 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
|
8108 } |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8109 else |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8110 { |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8111 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
|
8112 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
|
8113 } |
| 7 | 8114 } |
| 8115 } | |
| 8116 } | |
| 8117 } | |
| 8118 } | |
| 8119 | |
| 8120 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8121 screen_stop_highlight(void) |
| 7 | 8122 { |
| 8123 int do_ME = FALSE; /* output T_ME code */ | |
| 8124 | |
| 8125 if (screen_attr != 0 | |
| 8126 #ifdef WIN3264 | |
| 8127 && termcap_active | |
| 8128 #endif | |
| 8129 ) | |
| 8130 { | |
| 8131 #ifdef FEAT_GUI | |
| 8132 if (gui.in_use) | |
| 8133 { | |
| 8134 char buf[20]; | |
| 8135 | |
| 8136 /* use internal GUI code */ | |
| 8137 sprintf(buf, IF_EB("\033|%dH", ESC_STR "|%dH"), screen_attr); | |
| 8138 OUT_STR(buf); | |
| 8139 } | |
| 8140 else | |
| 8141 #endif | |
| 8142 { | |
| 8143 if (screen_attr > HL_ALL) /* special HL attr. */ | |
| 8144 { | |
| 8145 attrentry_T *aep; | |
| 8146 | |
|
8969
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8147 if (IS_CTERM) |
| 7 | 8148 { |
| 8149 /* | |
| 8150 * Assume that t_me restores the original colors! | |
| 8151 */ | |
| 8152 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
|
8153 if (aep != NULL && |
|
9027
773d627cac0b
commit https://github.com/vim/vim/commit/61be73bb0f965a895bfb064ea3e55476ac175162
Christian Brabandt <cb@256bit.org>
parents:
8977
diff
changeset
|
8154 #ifdef FEAT_TERMGUICOLORS |
|
773d627cac0b
commit https://github.com/vim/vim/commit/61be73bb0f965a895bfb064ea3e55476ac175162
Christian Brabandt <cb@256bit.org>
parents:
8977
diff
changeset
|
8155 (p_tgc ? |
|
9939
ccb6461b82df
commit https://github.com/vim/vim/commit/1b58cdd160c2e0ada0f638679a2aa27e4665fc48
Christian Brabandt <cb@256bit.org>
parents:
9885
diff
changeset
|
8156 (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
|
8157 || 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
|
8158 #endif |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8159 (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
|
8160 #ifdef FEAT_TERMGUICOLORS |
|
8969
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8161 ) |
|
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 ) |
| 7 | 8164 do_ME = TRUE; |
| 8165 } | |
| 8166 else | |
| 8167 { | |
| 8168 aep = syn_term_attr2entry(screen_attr); | |
| 8169 if (aep != NULL && aep->ae_u.term.stop != NULL) | |
| 8170 { | |
| 8171 if (STRCMP(aep->ae_u.term.stop, T_ME) == 0) | |
| 8172 do_ME = TRUE; | |
| 8173 else | |
| 8174 out_str(aep->ae_u.term.stop); | |
| 8175 } | |
| 8176 } | |
| 8177 if (aep == NULL) /* did ":syntax clear" */ | |
| 8178 screen_attr = 0; | |
| 8179 else | |
| 8180 screen_attr = aep->ae_attr; | |
| 8181 } | |
| 8182 | |
| 8183 /* | |
| 8184 * Often all ending-codes are equal to T_ME. Avoid outputting the | |
| 8185 * same sequence several times. | |
| 8186 */ | |
| 8187 if (screen_attr & HL_STANDOUT) | |
| 8188 { | |
| 8189 if (STRCMP(T_SE, T_ME) == 0) | |
| 8190 do_ME = TRUE; | |
| 8191 else | |
| 8192 out_str(T_SE); | |
| 8193 } | |
| 205 | 8194 if (screen_attr & (HL_UNDERLINE | HL_UNDERCURL)) |
| 7 | 8195 { |
| 8196 if (STRCMP(T_UE, T_ME) == 0) | |
| 8197 do_ME = TRUE; | |
| 8198 else | |
| 8199 out_str(T_UE); | |
| 8200 } | |
| 8201 if (screen_attr & HL_ITALIC) | |
| 8202 { | |
| 8203 if (STRCMP(T_CZR, T_ME) == 0) | |
| 8204 do_ME = TRUE; | |
| 8205 else | |
| 8206 out_str(T_CZR); | |
| 8207 } | |
| 8208 if (do_ME || (screen_attr & (HL_BOLD | HL_INVERSE))) | |
| 8209 out_str(T_ME); | |
| 8210 | |
|
9027
773d627cac0b
commit https://github.com/vim/vim/commit/61be73bb0f965a895bfb064ea3e55476ac175162
Christian Brabandt <cb@256bit.org>
parents:
8977
diff
changeset
|
8211 #ifdef FEAT_TERMGUICOLORS |
|
773d627cac0b
commit https://github.com/vim/vim/commit/61be73bb0f965a895bfb064ea3e55476ac175162
Christian Brabandt <cb@256bit.org>
parents:
8977
diff
changeset
|
8212 if (p_tgc) |
|
8969
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8213 { |
|
9939
ccb6461b82df
commit https://github.com/vim/vim/commit/1b58cdd160c2e0ada0f638679a2aa27e4665fc48
Christian Brabandt <cb@256bit.org>
parents:
9885
diff
changeset
|
8214 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
|
8215 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
|
8216 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
|
8217 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
|
8218 } |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8219 else |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8220 #endif |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8221 { |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8222 if (t_colors > 1) |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8223 { |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8224 /* set Normal cterm colors */ |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8225 if (cterm_normal_fg_color != 0) |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8226 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
|
8227 if (cterm_normal_bg_color != 0) |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8228 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
|
8229 if (cterm_normal_fg_bold) |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8230 out_str(T_MD); |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8231 } |
| 7 | 8232 } |
| 8233 } | |
| 8234 } | |
| 8235 screen_attr = 0; | |
| 8236 } | |
| 8237 | |
| 8238 /* | |
| 8239 * Reset the colors for a cterm. Used when leaving Vim. | |
| 8240 * The machine specific code may override this again. | |
| 8241 */ | |
| 8242 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8243 reset_cterm_colors(void) |
| 7 | 8244 { |
|
8969
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8245 if (IS_CTERM) |
| 7 | 8246 { |
| 8247 /* set Normal cterm colors */ | |
|
9027
773d627cac0b
commit https://github.com/vim/vim/commit/61be73bb0f965a895bfb064ea3e55476ac175162
Christian Brabandt <cb@256bit.org>
parents:
8977
diff
changeset
|
8248 #ifdef FEAT_TERMGUICOLORS |
|
9939
ccb6461b82df
commit https://github.com/vim/vim/commit/1b58cdd160c2e0ada0f638679a2aa27e4665fc48
Christian Brabandt <cb@256bit.org>
parents:
9885
diff
changeset
|
8249 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
|
8250 || cterm_normal_bg_gui_color != INVALCOLOR) |
|
ccb6461b82df
commit https://github.com/vim/vim/commit/1b58cdd160c2e0ada0f638679a2aa27e4665fc48
Christian Brabandt <cb@256bit.org>
parents:
9885
diff
changeset
|
8251 : (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
|
8252 #else |
| 7 | 8253 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
|
8254 #endif |
| 7 | 8255 { |
| 8256 out_str(T_OP); | |
| 8257 screen_attr = -1; | |
| 8258 } | |
| 8259 if (cterm_normal_fg_bold) | |
| 8260 { | |
| 8261 out_str(T_ME); | |
| 8262 screen_attr = -1; | |
| 8263 } | |
| 8264 } | |
| 8265 } | |
| 8266 | |
| 8267 /* | |
| 8268 * Put character ScreenLines["off"] on the screen at position "row" and "col", | |
| 8269 * using the attributes from ScreenAttrs["off"]. | |
| 8270 */ | |
| 8271 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8272 screen_char(unsigned off, int row, int col) |
| 7 | 8273 { |
| 8274 int attr; | |
| 8275 | |
| 8276 /* Check for illegal values, just in case (could happen just after | |
| 8277 * resizing). */ | |
| 8278 if (row >= screen_Rows || col >= screen_Columns) | |
| 8279 return; | |
| 8280 | |
| 6602 | 8281 /* Outputting a character in the last cell on the screen may scroll the |
| 8282 * screen up. Only do it when the "xn" termcap property is set, otherwise | |
| 8283 * mark the character invalid (update it when scrolled up). */ | |
| 8284 if (*T_XN == NUL | |
| 8285 && row == screen_Rows - 1 && col == screen_Columns - 1 | |
| 7 | 8286 #ifdef FEAT_RIGHTLEFT |
| 8287 /* account for first command-line character in rightleft mode */ | |
| 8288 && !cmdmsg_rl | |
| 8289 #endif | |
| 8290 ) | |
| 8291 { | |
| 8292 ScreenAttrs[off] = (sattr_T)-1; | |
| 8293 return; | |
| 8294 } | |
| 8295 | |
| 8296 /* | |
| 8297 * Stop highlighting first, so it's easier to move the cursor. | |
| 8298 */ | |
|
8643
24b43dd167eb
commit https://github.com/vim/vim/commit/44a2f923c00f1384c9ecde12fb5b4711bc20702e
Christian Brabandt <cb@256bit.org>
parents:
8627
diff
changeset
|
8299 #if defined(FEAT_CLIPBOARD) || defined(FEAT_WINDOWS) |
| 7 | 8300 if (screen_char_attr != 0) |
| 8301 attr = screen_char_attr; | |
| 8302 else | |
| 8303 #endif | |
| 8304 attr = ScreenAttrs[off]; | |
| 8305 if (screen_attr != attr) | |
| 8306 screen_stop_highlight(); | |
| 8307 | |
| 8308 windgoto(row, col); | |
| 8309 | |
| 8310 if (screen_attr != attr) | |
| 8311 screen_start_highlight(attr); | |
| 8312 | |
| 8313 #ifdef FEAT_MBYTE | |
| 8314 if (enc_utf8 && ScreenLinesUC[off] != 0) | |
| 8315 { | |
| 8316 char_u buf[MB_MAXBYTES + 1]; | |
| 8317 | |
| 8318 /* Convert UTF-8 character to bytes and write it. */ | |
| 8319 | |
| 8320 buf[utfc_char2bytes(off, buf)] = NUL; | |
| 8321 | |
| 8322 out_str(buf); | |
|
8819
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8817
diff
changeset
|
8323 if (utf_ambiguous_width(ScreenLinesUC[off])) |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8817
diff
changeset
|
8324 screen_cur_col = 9999; |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8817
diff
changeset
|
8325 else if (utf_char2cells(ScreenLinesUC[off]) > 1) |
| 7 | 8326 ++screen_cur_col; |
| 8327 } | |
| 8328 else | |
| 8329 #endif | |
| 8330 { | |
| 8331 #ifdef FEAT_MBYTE | |
| 8332 out_flush_check(); | |
| 8333 #endif | |
| 8334 out_char(ScreenLines[off]); | |
| 8335 #ifdef FEAT_MBYTE | |
| 8336 /* double-byte character in single-width cell */ | |
| 8337 if (enc_dbcs == DBCS_JPNU && ScreenLines[off] == 0x8e) | |
| 8338 out_char(ScreenLines2[off]); | |
| 8339 #endif | |
| 8340 } | |
| 8341 | |
| 8342 screen_cur_col++; | |
| 8343 } | |
| 8344 | |
| 8345 #ifdef FEAT_MBYTE | |
| 8346 | |
| 8347 /* | |
| 8348 * Used for enc_dbcs only: Put one double-wide character at ScreenLines["off"] | |
| 8349 * on the screen at position 'row' and 'col'. | |
| 8350 * The attributes of the first byte is used for all. This is required to | |
| 8351 * output the two bytes of a double-byte character with nothing in between. | |
| 8352 */ | |
| 8353 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8354 screen_char_2(unsigned off, int row, int col) |
| 7 | 8355 { |
| 8356 /* Check for illegal values (could be wrong when screen was resized). */ | |
| 8357 if (off + 1 >= (unsigned)(screen_Rows * screen_Columns)) | |
| 8358 return; | |
| 8359 | |
| 8360 /* Outputting the last character on the screen may scrollup the screen. | |
| 8361 * Don't to it! Mark the character invalid (update it when scrolled up) */ | |
| 8362 if (row == screen_Rows - 1 && col >= screen_Columns - 2) | |
| 8363 { | |
| 8364 ScreenAttrs[off] = (sattr_T)-1; | |
| 8365 return; | |
| 8366 } | |
| 8367 | |
| 8368 /* Output the first byte normally (positions the cursor), then write the | |
| 8369 * second byte directly. */ | |
| 8370 screen_char(off, row, col); | |
| 8371 out_char(ScreenLines[off + 1]); | |
| 8372 ++screen_cur_col; | |
| 8373 } | |
| 8374 #endif | |
| 8375 | |
|
8643
24b43dd167eb
commit https://github.com/vim/vim/commit/44a2f923c00f1384c9ecde12fb5b4711bc20702e
Christian Brabandt <cb@256bit.org>
parents:
8627
diff
changeset
|
8376 #if defined(FEAT_CLIPBOARD) || defined(FEAT_WINDOWS) || defined(PROTO) |
| 7 | 8377 /* |
| 8378 * Draw a rectangle of the screen, inverted when "invert" is TRUE. | |
| 8379 * This uses the contents of ScreenLines[] and doesn't change it. | |
| 8380 */ | |
| 8381 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8382 screen_draw_rectangle( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8383 int row, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8384 int col, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8385 int height, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8386 int width, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8387 int invert) |
| 7 | 8388 { |
| 8389 int r, c; | |
| 8390 int off; | |
| 1378 | 8391 #ifdef FEAT_MBYTE |
| 8392 int max_off; | |
| 8393 #endif | |
| 7 | 8394 |
| 534 | 8395 /* Can't use ScreenLines unless initialized */ |
| 8396 if (ScreenLines == NULL) | |
| 8397 return; | |
| 8398 | |
| 7 | 8399 if (invert) |
| 8400 screen_char_attr = HL_INVERSE; | |
| 8401 for (r = row; r < row + height; ++r) | |
| 8402 { | |
| 8403 off = LineOffset[r]; | |
| 1378 | 8404 #ifdef FEAT_MBYTE |
| 8405 max_off = off + screen_Columns; | |
| 8406 #endif | |
| 7 | 8407 for (c = col; c < col + width; ++c) |
| 8408 { | |
| 8409 #ifdef FEAT_MBYTE | |
| 1378 | 8410 if (enc_dbcs != 0 && dbcs_off2cells(off + c, max_off) > 1) |
| 7 | 8411 { |
| 8412 screen_char_2(off + c, r, c); | |
| 8413 ++c; | |
| 8414 } | |
| 8415 else | |
| 8416 #endif | |
| 8417 { | |
| 8418 screen_char(off + c, r, c); | |
| 8419 #ifdef FEAT_MBYTE | |
| 1378 | 8420 if (utf_off2cells(off + c, max_off) > 1) |
| 7 | 8421 ++c; |
| 8422 #endif | |
| 8423 } | |
| 8424 } | |
| 8425 } | |
| 8426 screen_char_attr = 0; | |
| 8427 } | |
| 8428 #endif | |
| 8429 | |
|
8643
24b43dd167eb
commit https://github.com/vim/vim/commit/44a2f923c00f1384c9ecde12fb5b4711bc20702e
Christian Brabandt <cb@256bit.org>
parents:
8627
diff
changeset
|
8430 #ifdef FEAT_WINDOWS |
| 7 | 8431 /* |
| 8432 * Redraw the characters for a vertically split window. | |
| 8433 */ | |
| 8434 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8435 redraw_block(int row, int end, win_T *wp) |
| 7 | 8436 { |
| 8437 int col; | |
| 8438 int width; | |
| 8439 | |
| 8440 # ifdef FEAT_CLIPBOARD | |
| 8441 clip_may_clear_selection(row, end - 1); | |
| 8442 # endif | |
| 8443 | |
| 8444 if (wp == NULL) | |
| 8445 { | |
| 8446 col = 0; | |
| 8447 width = Columns; | |
| 8448 } | |
| 8449 else | |
| 8450 { | |
| 8451 col = wp->w_wincol; | |
| 8452 width = wp->w_width; | |
| 8453 } | |
| 8454 screen_draw_rectangle(row, col, end - row, width, FALSE); | |
| 8455 } | |
| 8456 #endif | |
| 8457 | |
| 8458 /* | |
| 8459 * Fill the screen from 'start_row' to 'end_row', from 'start_col' to 'end_col' | |
| 8460 * with character 'c1' in first column followed by 'c2' in the other columns. | |
| 8461 * Use attributes 'attr'. | |
| 8462 */ | |
| 8463 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8464 screen_fill( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8465 int start_row, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8466 int end_row, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8467 int start_col, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8468 int end_col, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8469 int c1, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8470 int c2, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8471 int attr) |
| 7 | 8472 { |
| 8473 int row; | |
| 8474 int col; | |
| 8475 int off; | |
| 8476 int end_off; | |
| 8477 int did_delete; | |
| 8478 int c; | |
| 8479 int norm_term; | |
| 8480 #if defined(FEAT_GUI) || defined(UNIX) | |
| 8481 int force_next = FALSE; | |
| 8482 #endif | |
| 8483 | |
| 8484 if (end_row > screen_Rows) /* safety check */ | |
| 8485 end_row = screen_Rows; | |
| 8486 if (end_col > screen_Columns) /* safety check */ | |
| 8487 end_col = screen_Columns; | |
| 8488 if (ScreenLines == NULL | |
| 8489 || start_row >= end_row | |
| 8490 || start_col >= end_col) /* nothing to do */ | |
| 8491 return; | |
| 8492 | |
| 8493 /* it's a "normal" terminal when not in a GUI or cterm */ | |
| 8494 norm_term = ( | |
| 8495 #ifdef FEAT_GUI | |
| 8496 !gui.in_use && | |
| 8497 #endif | |
|
8969
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8498 !IS_CTERM); |
| 7 | 8499 for (row = start_row; row < end_row; ++row) |
| 8500 { | |
| 1668 | 8501 #ifdef FEAT_MBYTE |
| 8502 if (has_mbyte | |
| 8503 # ifdef FEAT_GUI | |
| 8504 && !gui.in_use | |
| 8505 # endif | |
| 8506 ) | |
| 8507 { | |
| 8508 /* When drawing over the right halve of a double-wide char clear | |
| 8509 * out the left halve. When drawing over the left halve of a | |
| 8510 * double wide-char clear out the right halve. Only needed in a | |
| 8511 * terminal. */ | |
| 1685 | 8512 if (start_col > 0 && mb_fix_col(start_col, row) != start_col) |
| 1670 | 8513 screen_puts_len((char_u *)" ", 1, row, start_col - 1, 0); |
| 1677 | 8514 if (end_col < screen_Columns && mb_fix_col(end_col, row) != end_col) |
| 1670 | 8515 screen_puts_len((char_u *)" ", 1, row, end_col, 0); |
| 1668 | 8516 } |
| 8517 #endif | |
| 7 | 8518 /* |
| 8519 * Try to use delete-line termcap code, when no attributes or in a | |
| 8520 * "normal" terminal, where a bold/italic space is just a | |
| 8521 * space. | |
| 8522 */ | |
| 8523 did_delete = FALSE; | |
| 8524 if (c2 == ' ' | |
| 8525 && end_col == Columns | |
| 8526 && can_clear(T_CE) | |
| 8527 && (attr == 0 | |
| 8528 || (norm_term | |
| 8529 && attr <= HL_ALL | |
| 8530 && ((attr & ~(HL_BOLD | HL_ITALIC)) == 0)))) | |
| 8531 { | |
| 8532 /* | |
| 8533 * check if we really need to clear something | |
| 8534 */ | |
| 8535 col = start_col; | |
| 8536 if (c1 != ' ') /* don't clear first char */ | |
| 8537 ++col; | |
| 8538 | |
| 8539 off = LineOffset[row] + col; | |
| 8540 end_off = LineOffset[row] + end_col; | |
| 8541 | |
| 8542 /* skip blanks (used often, keep it fast!) */ | |
| 8543 #ifdef FEAT_MBYTE | |
| 8544 if (enc_utf8) | |
| 8545 while (off < end_off && ScreenLines[off] == ' ' | |
| 8546 && ScreenAttrs[off] == 0 && ScreenLinesUC[off] == 0) | |
| 8547 ++off; | |
| 8548 else | |
| 8549 #endif | |
| 8550 while (off < end_off && ScreenLines[off] == ' ' | |
| 8551 && ScreenAttrs[off] == 0) | |
| 8552 ++off; | |
| 8553 if (off < end_off) /* something to be cleared */ | |
| 8554 { | |
| 8555 col = off - LineOffset[row]; | |
| 8556 screen_stop_highlight(); | |
| 8557 term_windgoto(row, col);/* clear rest of this screen line */ | |
| 8558 out_str(T_CE); | |
| 8559 screen_start(); /* don't know where cursor is now */ | |
| 8560 col = end_col - col; | |
| 8561 while (col--) /* clear chars in ScreenLines */ | |
| 8562 { | |
| 8563 ScreenLines[off] = ' '; | |
| 8564 #ifdef FEAT_MBYTE | |
| 8565 if (enc_utf8) | |
| 8566 ScreenLinesUC[off] = 0; | |
| 8567 #endif | |
| 8568 ScreenAttrs[off] = 0; | |
| 8569 ++off; | |
| 8570 } | |
| 8571 } | |
| 8572 did_delete = TRUE; /* the chars are cleared now */ | |
| 8573 } | |
| 8574 | |
| 8575 off = LineOffset[row] + start_col; | |
| 8576 c = c1; | |
| 8577 for (col = start_col; col < end_col; ++col) | |
| 8578 { | |
| 8579 if (ScreenLines[off] != c | |
| 8580 #ifdef FEAT_MBYTE | |
| 714 | 8581 || (enc_utf8 && (int)ScreenLinesUC[off] |
| 8582 != (c >= 0x80 ? c : 0)) | |
| 7 | 8583 #endif |
| 8584 || ScreenAttrs[off] != attr | |
| 8585 #if defined(FEAT_GUI) || defined(UNIX) | |
| 8586 || force_next | |
| 8587 #endif | |
| 8588 ) | |
| 8589 { | |
| 8590 #if defined(FEAT_GUI) || defined(UNIX) | |
| 8591 /* The bold trick may make a single row of pixels appear in | |
| 8592 * the next character. When a bold character is removed, the | |
| 8593 * next character should be redrawn too. This happens for our | |
| 8594 * own GUI and for some xterms. */ | |
| 8595 if ( | |
| 8596 # ifdef FEAT_GUI | |
| 8597 gui.in_use | |
| 8598 # endif | |
| 8599 # if defined(FEAT_GUI) && defined(UNIX) | |
| 8600 || | |
| 8601 # endif | |
| 8602 # ifdef UNIX | |
| 8603 term_is_xterm | |
| 8604 # endif | |
| 8605 ) | |
| 8606 { | |
| 8607 if (ScreenLines[off] != ' ' | |
| 8608 && (ScreenAttrs[off] > HL_ALL | |
| 8609 || ScreenAttrs[off] & HL_BOLD)) | |
| 8610 force_next = TRUE; | |
| 8611 else | |
| 8612 force_next = FALSE; | |
| 8613 } | |
| 8614 #endif | |
| 8615 ScreenLines[off] = c; | |
| 8616 #ifdef FEAT_MBYTE | |
| 8617 if (enc_utf8) | |
| 8618 { | |
| 8619 if (c >= 0x80) | |
| 8620 { | |
| 8621 ScreenLinesUC[off] = c; | |
| 714 | 8622 ScreenLinesC[0][off] = 0; |
| 7 | 8623 } |
| 8624 else | |
| 8625 ScreenLinesUC[off] = 0; | |
| 8626 } | |
| 8627 #endif | |
| 8628 ScreenAttrs[off] = attr; | |
| 8629 if (!did_delete || c != ' ') | |
| 8630 screen_char(off, row, col); | |
| 8631 } | |
| 8632 ++off; | |
| 8633 if (col == start_col) | |
| 8634 { | |
| 8635 if (did_delete) | |
| 8636 break; | |
| 8637 c = c2; | |
| 8638 } | |
| 8639 } | |
| 8640 if (end_col == Columns) | |
| 8641 LineWraps[row] = FALSE; | |
| 8642 if (row == Rows - 1) /* overwritten the command line */ | |
| 8643 { | |
| 8644 redraw_cmdline = TRUE; | |
| 8645 if (c1 == ' ' && c2 == ' ') | |
| 8646 clear_cmdline = FALSE; /* command line has been cleared */ | |
| 644 | 8647 if (start_col == 0) |
| 8648 mode_displayed = FALSE; /* mode cleared or overwritten */ | |
| 7 | 8649 } |
| 8650 } | |
| 8651 } | |
| 8652 | |
| 8653 /* | |
| 8654 * Check if there should be a delay. Used before clearing or redrawing the | |
| 8655 * screen or the command line. | |
| 8656 */ | |
| 8657 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8658 check_for_delay(int check_msg_scroll) |
| 7 | 8659 { |
| 8660 if ((emsg_on_display || (check_msg_scroll && msg_scroll)) | |
| 8661 && !did_wait_return | |
| 8662 && emsg_silent == 0) | |
| 8663 { | |
| 8664 out_flush(); | |
| 8665 ui_delay(1000L, TRUE); | |
| 8666 emsg_on_display = FALSE; | |
| 8667 if (check_msg_scroll) | |
| 8668 msg_scroll = FALSE; | |
| 8669 } | |
| 8670 } | |
| 8671 | |
| 8672 /* | |
| 8673 * screen_valid - allocate screen buffers if size changed | |
| 3263 | 8674 * If "doclear" is TRUE: clear screen if it has been resized. |
| 7 | 8675 * Returns TRUE if there is a valid screen to write to. |
| 8676 * Returns FALSE when starting up and screen not initialized yet. | |
| 8677 */ | |
| 8678 int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8679 screen_valid(int doclear) |
| 7 | 8680 { |
| 3263 | 8681 screenalloc(doclear); /* allocate screen buffers if size changed */ |
| 7 | 8682 return (ScreenLines != NULL); |
| 8683 } | |
| 8684 | |
| 8685 /* | |
| 8686 * Resize the shell to Rows and Columns. | |
| 8687 * Allocate ScreenLines[] and associated items. | |
| 8688 * | |
| 8689 * There may be some time between setting Rows and Columns and (re)allocating | |
| 8690 * ScreenLines[]. This happens when starting up and when (manually) changing | |
| 8691 * the shell size. Always use screen_Rows and screen_Columns to access items | |
| 8692 * in ScreenLines[]. Use Rows and Columns for positioning text etc. where the | |
| 8693 * final size of the shell is needed. | |
| 8694 */ | |
| 8695 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8696 screenalloc(int doclear) |
| 7 | 8697 { |
| 8698 int new_row, old_row; | |
| 8699 #ifdef FEAT_GUI | |
| 8700 int old_Rows; | |
| 8701 #endif | |
| 8702 win_T *wp; | |
| 8703 int outofmem = FALSE; | |
| 8704 int len; | |
| 8705 schar_T *new_ScreenLines; | |
| 8706 #ifdef FEAT_MBYTE | |
| 8707 u8char_T *new_ScreenLinesUC = NULL; | |
| 714 | 8708 u8char_T *new_ScreenLinesC[MAX_MCO]; |
| 7 | 8709 schar_T *new_ScreenLines2 = NULL; |
| 714 | 8710 int i; |
| 7 | 8711 #endif |
| 8712 sattr_T *new_ScreenAttrs; | |
| 8713 unsigned *new_LineOffset; | |
| 8714 char_u *new_LineWraps; | |
| 671 | 8715 #ifdef FEAT_WINDOWS |
| 681 | 8716 short *new_TabPageIdxs; |
| 671 | 8717 tabpage_T *tp; |
| 8718 #endif | |
| 7 | 8719 static int entered = FALSE; /* avoid recursiveness */ |
| 944 | 8720 static int done_outofmem_msg = FALSE; /* did outofmem message */ |
| 1824 | 8721 #ifdef FEAT_AUTOCMD |
| 8722 int retry_count = 0; | |
| 8723 | |
| 8724 retry: | |
| 8725 #endif | |
| 7 | 8726 /* |
| 8727 * Allocation of the screen buffers is done only when the size changes and | |
| 8728 * when Rows and Columns have been set and we have started doing full | |
| 8729 * screen stuff. | |
| 8730 */ | |
| 8731 if ((ScreenLines != NULL | |
| 8732 && Rows == screen_Rows | |
| 8733 && Columns == screen_Columns | |
| 8734 #ifdef FEAT_MBYTE | |
| 8735 && enc_utf8 == (ScreenLinesUC != NULL) | |
| 8736 && (enc_dbcs == DBCS_JPNU) == (ScreenLines2 != NULL) | |
| 714 | 8737 && p_mco == Screen_mco |
| 7 | 8738 #endif |
| 8739 ) | |
| 8740 || Rows == 0 | |
| 8741 || Columns == 0 | |
| 8742 || (!full_screen && ScreenLines == NULL)) | |
| 8743 return; | |
| 8744 | |
| 8745 /* | |
| 8746 * It's possible that we produce an out-of-memory message below, which | |
| 8747 * will cause this function to be called again. To break the loop, just | |
| 8748 * return here. | |
| 8749 */ | |
| 8750 if (entered) | |
| 8751 return; | |
| 8752 entered = TRUE; | |
| 8753 | |
| 911 | 8754 /* |
| 8755 * Note that the window sizes are updated before reallocating the arrays, | |
| 8756 * thus we must not redraw here! | |
| 8757 */ | |
| 8758 ++RedrawingDisabled; | |
| 8759 | |
| 7 | 8760 win_new_shellsize(); /* fit the windows in the new sized shell */ |
| 8761 | |
| 8762 comp_col(); /* recompute columns for shown command and ruler */ | |
| 8763 | |
| 8764 /* | |
| 8765 * We're changing the size of the screen. | |
| 8766 * - Allocate new arrays for ScreenLines and ScreenAttrs. | |
| 8767 * - Move lines from the old arrays into the new arrays, clear extra | |
| 8768 * lines (unless the screen is going to be cleared). | |
| 8769 * - Free the old arrays. | |
| 8770 * | |
| 8771 * If anything fails, make ScreenLines NULL, so we don't do anything! | |
| 8772 * Continuing with the old ScreenLines may result in a crash, because the | |
| 8773 * size is wrong. | |
| 8774 */ | |
| 671 | 8775 FOR_ALL_TAB_WINDOWS(tp, wp) |
| 7 | 8776 win_free_lsize(wp); |
| 1946 | 8777 #ifdef FEAT_AUTOCMD |
| 8778 if (aucmd_win != NULL) | |
| 8779 win_free_lsize(aucmd_win); | |
| 8780 #endif | |
| 7 | 8781 |
| 8782 new_ScreenLines = (schar_T *)lalloc((long_u)( | |
| 8783 (Rows + 1) * Columns * sizeof(schar_T)), FALSE); | |
| 8784 #ifdef FEAT_MBYTE | |
|
2122
476336a5ae95
updated for version 7.2.404
Bram Moolenaar <bram@zimbu.org>
parents:
2069
diff
changeset
|
8785 vim_memset(new_ScreenLinesC, 0, sizeof(u8char_T *) * MAX_MCO); |
| 7 | 8786 if (enc_utf8) |
| 8787 { | |
| 8788 new_ScreenLinesUC = (u8char_T *)lalloc((long_u)( | |
| 8789 (Rows + 1) * Columns * sizeof(u8char_T)), FALSE); | |
| 714 | 8790 for (i = 0; i < p_mco; ++i) |
|
2124
dc8a5699253b
updated for version 7.2.406
Bram Moolenaar <bram@zimbu.org>
parents:
2122
diff
changeset
|
8791 new_ScreenLinesC[i] = (u8char_T *)lalloc_clear((long_u)( |
| 7 | 8792 (Rows + 1) * Columns * sizeof(u8char_T)), FALSE); |
| 8793 } | |
| 8794 if (enc_dbcs == DBCS_JPNU) | |
| 8795 new_ScreenLines2 = (schar_T *)lalloc((long_u)( | |
| 8796 (Rows + 1) * Columns * sizeof(schar_T)), FALSE); | |
| 8797 #endif | |
| 8798 new_ScreenAttrs = (sattr_T *)lalloc((long_u)( | |
| 8799 (Rows + 1) * Columns * sizeof(sattr_T)), FALSE); | |
| 8800 new_LineOffset = (unsigned *)lalloc((long_u)( | |
| 8801 Rows * sizeof(unsigned)), FALSE); | |
| 8802 new_LineWraps = (char_u *)lalloc((long_u)(Rows * sizeof(char_u)), FALSE); | |
| 671 | 8803 #ifdef FEAT_WINDOWS |
| 681 | 8804 new_TabPageIdxs = (short *)lalloc((long_u)(Columns * sizeof(short)), FALSE); |
| 671 | 8805 #endif |
| 7 | 8806 |
| 677 | 8807 FOR_ALL_TAB_WINDOWS(tp, wp) |
| 7 | 8808 { |
| 8809 if (win_alloc_lines(wp) == FAIL) | |
| 8810 { | |
| 8811 outofmem = TRUE; | |
| 8812 #ifdef FEAT_WINDOWS | |
| 1819 | 8813 goto give_up; |
| 8814 #endif | |
| 8815 } | |
| 8816 } | |
| 1906 | 8817 #ifdef FEAT_AUTOCMD |
| 1946 | 8818 if (aucmd_win != NULL && aucmd_win->w_lines == NULL |
| 8819 && win_alloc_lines(aucmd_win) == FAIL) | |
| 1906 | 8820 outofmem = TRUE; |
| 8821 #endif | |
| 1819 | 8822 #ifdef FEAT_WINDOWS |
| 8823 give_up: | |
| 8824 #endif | |
| 7 | 8825 |
| 714 | 8826 #ifdef FEAT_MBYTE |
| 8827 for (i = 0; i < p_mco; ++i) | |
| 8828 if (new_ScreenLinesC[i] == NULL) | |
| 8829 break; | |
| 8830 #endif | |
| 7 | 8831 if (new_ScreenLines == NULL |
| 8832 #ifdef FEAT_MBYTE | |
| 714 | 8833 || (enc_utf8 && (new_ScreenLinesUC == NULL || i != p_mco)) |
| 7 | 8834 || (enc_dbcs == DBCS_JPNU && new_ScreenLines2 == NULL) |
| 8835 #endif | |
| 8836 || new_ScreenAttrs == NULL | |
| 8837 || new_LineOffset == NULL | |
| 8838 || new_LineWraps == NULL | |
| 671 | 8839 #ifdef FEAT_WINDOWS |
| 8840 || new_TabPageIdxs == NULL | |
| 8841 #endif | |
| 7 | 8842 || outofmem) |
| 8843 { | |
| 944 | 8844 if (ScreenLines != NULL || !done_outofmem_msg) |
| 534 | 8845 { |
| 8846 /* guess the size */ | |
| 8847 do_outofmem_msg((long_u)((Rows + 1) * Columns)); | |
| 8848 | |
| 8849 /* Remember we did this to avoid getting outofmem messages over | |
| 8850 * and over again. */ | |
| 944 | 8851 done_outofmem_msg = TRUE; |
| 534 | 8852 } |
| 7 | 8853 vim_free(new_ScreenLines); |
| 8854 new_ScreenLines = NULL; | |
| 8855 #ifdef FEAT_MBYTE | |
| 8856 vim_free(new_ScreenLinesUC); | |
| 8857 new_ScreenLinesUC = NULL; | |
| 714 | 8858 for (i = 0; i < p_mco; ++i) |
| 8859 { | |
| 8860 vim_free(new_ScreenLinesC[i]); | |
| 8861 new_ScreenLinesC[i] = NULL; | |
| 8862 } | |
| 7 | 8863 vim_free(new_ScreenLines2); |
| 8864 new_ScreenLines2 = NULL; | |
| 8865 #endif | |
| 8866 vim_free(new_ScreenAttrs); | |
| 8867 new_ScreenAttrs = NULL; | |
| 8868 vim_free(new_LineOffset); | |
| 8869 new_LineOffset = NULL; | |
| 8870 vim_free(new_LineWraps); | |
| 8871 new_LineWraps = NULL; | |
| 671 | 8872 #ifdef FEAT_WINDOWS |
| 8873 vim_free(new_TabPageIdxs); | |
| 8874 new_TabPageIdxs = NULL; | |
| 8875 #endif | |
| 7 | 8876 } |
| 8877 else | |
| 8878 { | |
| 944 | 8879 done_outofmem_msg = FALSE; |
| 534 | 8880 |
| 7 | 8881 for (new_row = 0; new_row < Rows; ++new_row) |
| 8882 { | |
| 8883 new_LineOffset[new_row] = new_row * Columns; | |
| 8884 new_LineWraps[new_row] = FALSE; | |
| 8885 | |
| 8886 /* | |
| 8887 * If the screen is not going to be cleared, copy as much as | |
| 8888 * possible from the old screen to the new one and clear the rest | |
| 8889 * (used when resizing the window at the "--more--" prompt or when | |
| 8890 * executing an external command, for the GUI). | |
| 8891 */ | |
| 3263 | 8892 if (!doclear) |
| 7 | 8893 { |
| 8894 (void)vim_memset(new_ScreenLines + new_row * Columns, | |
| 8895 ' ', (size_t)Columns * sizeof(schar_T)); | |
| 8896 #ifdef FEAT_MBYTE | |
| 8897 if (enc_utf8) | |
| 8898 { | |
| 8899 (void)vim_memset(new_ScreenLinesUC + new_row * Columns, | |
| 8900 0, (size_t)Columns * sizeof(u8char_T)); | |
| 714 | 8901 for (i = 0; i < p_mco; ++i) |
| 8902 (void)vim_memset(new_ScreenLinesC[i] | |
| 8903 + new_row * Columns, | |
| 7 | 8904 0, (size_t)Columns * sizeof(u8char_T)); |
| 8905 } | |
| 8906 if (enc_dbcs == DBCS_JPNU) | |
| 8907 (void)vim_memset(new_ScreenLines2 + new_row * Columns, | |
| 8908 0, (size_t)Columns * sizeof(schar_T)); | |
| 8909 #endif | |
| 8910 (void)vim_memset(new_ScreenAttrs + new_row * Columns, | |
| 8911 0, (size_t)Columns * sizeof(sattr_T)); | |
| 8912 old_row = new_row + (screen_Rows - Rows); | |
| 534 | 8913 if (old_row >= 0 && ScreenLines != NULL) |
| 7 | 8914 { |
| 8915 if (screen_Columns < Columns) | |
| 8916 len = screen_Columns; | |
| 8917 else | |
| 8918 len = Columns; | |
| 26 | 8919 #ifdef FEAT_MBYTE |
| 571 | 8920 /* When switching to utf-8 don't copy characters, they |
| 714 | 8921 * may be invalid now. Also when p_mco changes. */ |
| 8922 if (!(enc_utf8 && ScreenLinesUC == NULL) | |
| 8923 && p_mco == Screen_mco) | |
| 26 | 8924 #endif |
| 8925 mch_memmove(new_ScreenLines + new_LineOffset[new_row], | |
| 8926 ScreenLines + LineOffset[old_row], | |
| 8927 (size_t)len * sizeof(schar_T)); | |
| 7 | 8928 #ifdef FEAT_MBYTE |
| 714 | 8929 if (enc_utf8 && ScreenLinesUC != NULL |
| 8930 && p_mco == Screen_mco) | |
| 7 | 8931 { |
| 8932 mch_memmove(new_ScreenLinesUC + new_LineOffset[new_row], | |
| 8933 ScreenLinesUC + LineOffset[old_row], | |
| 8934 (size_t)len * sizeof(u8char_T)); | |
| 714 | 8935 for (i = 0; i < p_mco; ++i) |
| 8936 mch_memmove(new_ScreenLinesC[i] | |
| 8937 + new_LineOffset[new_row], | |
| 8938 ScreenLinesC[i] + LineOffset[old_row], | |
| 7 | 8939 (size_t)len * sizeof(u8char_T)); |
| 8940 } | |
| 8941 if (enc_dbcs == DBCS_JPNU && ScreenLines2 != NULL) | |
| 8942 mch_memmove(new_ScreenLines2 + new_LineOffset[new_row], | |
| 8943 ScreenLines2 + LineOffset[old_row], | |
| 8944 (size_t)len * sizeof(schar_T)); | |
| 8945 #endif | |
| 8946 mch_memmove(new_ScreenAttrs + new_LineOffset[new_row], | |
| 8947 ScreenAttrs + LineOffset[old_row], | |
| 8948 (size_t)len * sizeof(sattr_T)); | |
| 8949 } | |
| 8950 } | |
| 8951 } | |
| 8952 /* Use the last line of the screen for the current line. */ | |
| 8953 current_ScreenLine = new_ScreenLines + Rows * Columns; | |
| 8954 } | |
| 8955 | |
| 356 | 8956 free_screenlines(); |
| 8957 | |
| 7 | 8958 ScreenLines = new_ScreenLines; |
| 8959 #ifdef FEAT_MBYTE | |
| 8960 ScreenLinesUC = new_ScreenLinesUC; | |
| 714 | 8961 for (i = 0; i < p_mco; ++i) |
| 8962 ScreenLinesC[i] = new_ScreenLinesC[i]; | |
| 8963 Screen_mco = p_mco; | |
| 7 | 8964 ScreenLines2 = new_ScreenLines2; |
| 8965 #endif | |
| 8966 ScreenAttrs = new_ScreenAttrs; | |
| 8967 LineOffset = new_LineOffset; | |
| 8968 LineWraps = new_LineWraps; | |
| 671 | 8969 #ifdef FEAT_WINDOWS |
| 8970 TabPageIdxs = new_TabPageIdxs; | |
| 8971 #endif | |
| 7 | 8972 |
| 8973 /* It's important that screen_Rows and screen_Columns reflect the actual | |
| 8974 * size of ScreenLines[]. Set them before calling anything. */ | |
| 8975 #ifdef FEAT_GUI | |
| 8976 old_Rows = screen_Rows; | |
| 8977 #endif | |
| 8978 screen_Rows = Rows; | |
| 8979 screen_Columns = Columns; | |
| 8980 | |
| 8981 must_redraw = CLEAR; /* need to clear the screen later */ | |
| 3263 | 8982 if (doclear) |
| 7 | 8983 screenclear2(); |
| 8984 | |
| 8985 #ifdef FEAT_GUI | |
| 8986 else if (gui.in_use | |
| 8987 && !gui.starting | |
| 8988 && ScreenLines != NULL | |
| 8989 && old_Rows != Rows) | |
| 8990 { | |
| 8991 (void)gui_redraw_block(0, 0, (int)Rows - 1, (int)Columns - 1, 0); | |
| 8992 /* | |
| 8993 * Adjust the position of the cursor, for when executing an external | |
| 8994 * command. | |
| 8995 */ | |
| 8996 if (msg_row >= Rows) /* Rows got smaller */ | |
| 8997 msg_row = Rows - 1; /* put cursor at last row */ | |
| 8998 else if (Rows > old_Rows) /* Rows got bigger */ | |
| 8999 msg_row += Rows - old_Rows; /* put cursor in same place */ | |
| 9000 if (msg_col >= Columns) /* Columns got smaller */ | |
| 9001 msg_col = Columns - 1; /* put cursor at last column */ | |
| 9002 } | |
| 9003 #endif | |
| 9004 | |
| 9005 entered = FALSE; | |
| 911 | 9006 --RedrawingDisabled; |
| 766 | 9007 |
| 9008 #ifdef FEAT_AUTOCMD | |
| 1824 | 9009 /* |
| 9010 * Do not apply autocommands more than 3 times to avoid an endless loop | |
| 9011 * in case applying autocommands always changes Rows or Columns. | |
| 9012 */ | |
| 9013 if (starting == 0 && ++retry_count <= 3) | |
| 9014 { | |
| 766 | 9015 apply_autocmds(EVENT_VIMRESIZED, NULL, NULL, FALSE, curbuf); |
| 1824 | 9016 /* In rare cases, autocommands may have altered Rows or Columns, |
| 9017 * jump back to check if we need to allocate the screen again. */ | |
| 9018 goto retry; | |
| 9019 } | |
| 766 | 9020 #endif |
| 7 | 9021 } |
| 9022 | |
| 9023 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9024 free_screenlines(void) |
| 356 | 9025 { |
| 9026 #ifdef FEAT_MBYTE | |
| 714 | 9027 int i; |
| 9028 | |
| 356 | 9029 vim_free(ScreenLinesUC); |
| 714 | 9030 for (i = 0; i < Screen_mco; ++i) |
| 9031 vim_free(ScreenLinesC[i]); | |
| 356 | 9032 vim_free(ScreenLines2); |
| 9033 #endif | |
| 714 | 9034 vim_free(ScreenLines); |
| 356 | 9035 vim_free(ScreenAttrs); |
| 9036 vim_free(LineOffset); | |
| 9037 vim_free(LineWraps); | |
| 671 | 9038 #ifdef FEAT_WINDOWS |
| 9039 vim_free(TabPageIdxs); | |
| 9040 #endif | |
| 356 | 9041 } |
| 9042 | |
| 9043 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9044 screenclear(void) |
| 7 | 9045 { |
| 9046 check_for_delay(FALSE); | |
| 9047 screenalloc(FALSE); /* allocate screen buffers if size changed */ | |
| 9048 screenclear2(); /* clear the screen */ | |
| 9049 } | |
| 9050 | |
| 9051 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9052 screenclear2(void) |
| 7 | 9053 { |
| 9054 int i; | |
| 9055 | |
| 9056 if (starting == NO_SCREEN || ScreenLines == NULL | |
| 9057 #ifdef FEAT_GUI | |
| 9058 || (gui.in_use && gui.starting) | |
| 9059 #endif | |
| 9060 ) | |
| 9061 return; | |
| 9062 | |
| 9063 #ifdef FEAT_GUI | |
| 9064 if (!gui.in_use) | |
| 9065 #endif | |
| 9066 screen_attr = -1; /* force setting the Normal colors */ | |
| 9067 screen_stop_highlight(); /* don't want highlighting here */ | |
| 9068 | |
| 9069 #ifdef FEAT_CLIPBOARD | |
| 9070 /* disable selection without redrawing it */ | |
| 9071 clip_scroll_selection(9999); | |
| 9072 #endif | |
| 9073 | |
| 9074 /* blank out ScreenLines */ | |
| 9075 for (i = 0; i < Rows; ++i) | |
| 9076 { | |
| 9077 lineclear(LineOffset[i], (int)Columns); | |
| 9078 LineWraps[i] = FALSE; | |
| 9079 } | |
| 9080 | |
| 9081 if (can_clear(T_CL)) | |
| 9082 { | |
| 9083 out_str(T_CL); /* clear the display */ | |
| 9084 clear_cmdline = FALSE; | |
| 644 | 9085 mode_displayed = FALSE; |
| 7 | 9086 } |
| 9087 else | |
| 9088 { | |
| 9089 /* can't clear the screen, mark all chars with invalid attributes */ | |
| 9090 for (i = 0; i < Rows; ++i) | |
| 9091 lineinvalid(LineOffset[i], (int)Columns); | |
| 9092 clear_cmdline = TRUE; | |
| 9093 } | |
| 9094 | |
| 9095 screen_cleared = TRUE; /* can use contents of ScreenLines now */ | |
| 9096 | |
| 9097 win_rest_invalid(firstwin); | |
| 9098 redraw_cmdline = TRUE; | |
| 670 | 9099 #ifdef FEAT_WINDOWS |
| 673 | 9100 redraw_tabline = TRUE; |
| 670 | 9101 #endif |
| 7 | 9102 if (must_redraw == CLEAR) /* no need to clear again */ |
| 9103 must_redraw = NOT_VALID; | |
| 9104 compute_cmdrow(); | |
| 9105 msg_row = cmdline_row; /* put cursor on last line for messages */ | |
| 9106 msg_col = 0; | |
| 9107 screen_start(); /* don't know where cursor is now */ | |
| 9108 msg_scrolled = 0; /* can't scroll back */ | |
| 9109 msg_didany = FALSE; | |
| 9110 msg_didout = FALSE; | |
| 9111 } | |
| 9112 | |
| 9113 /* | |
| 9114 * Clear one line in ScreenLines. | |
| 9115 */ | |
| 9116 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9117 lineclear(unsigned off, int width) |
| 7 | 9118 { |
| 9119 (void)vim_memset(ScreenLines + off, ' ', (size_t)width * sizeof(schar_T)); | |
| 9120 #ifdef FEAT_MBYTE | |
| 9121 if (enc_utf8) | |
| 9122 (void)vim_memset(ScreenLinesUC + off, 0, | |
| 9123 (size_t)width * sizeof(u8char_T)); | |
| 9124 #endif | |
| 9125 (void)vim_memset(ScreenAttrs + off, 0, (size_t)width * sizeof(sattr_T)); | |
| 9126 } | |
| 9127 | |
| 9128 /* | |
| 9129 * Mark one line in ScreenLines invalid by setting the attributes to an | |
| 9130 * invalid value. | |
| 9131 */ | |
| 9132 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9133 lineinvalid(unsigned off, int width) |
| 7 | 9134 { |
| 9135 (void)vim_memset(ScreenAttrs + off, -1, (size_t)width * sizeof(sattr_T)); | |
| 9136 } | |
| 9137 | |
|
8643
24b43dd167eb
commit https://github.com/vim/vim/commit/44a2f923c00f1384c9ecde12fb5b4711bc20702e
Christian Brabandt <cb@256bit.org>
parents:
8627
diff
changeset
|
9138 #ifdef FEAT_WINDOWS |
| 7 | 9139 /* |
| 9140 * Copy part of a Screenline for vertically split window "wp". | |
| 9141 */ | |
| 9142 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9143 linecopy(int to, int from, win_T *wp) |
| 7 | 9144 { |
| 9145 unsigned off_to = LineOffset[to] + wp->w_wincol; | |
| 9146 unsigned off_from = LineOffset[from] + wp->w_wincol; | |
| 9147 | |
| 9148 mch_memmove(ScreenLines + off_to, ScreenLines + off_from, | |
| 9149 wp->w_width * sizeof(schar_T)); | |
| 9150 # ifdef FEAT_MBYTE | |
| 9151 if (enc_utf8) | |
| 9152 { | |
| 714 | 9153 int i; |
| 9154 | |
| 7 | 9155 mch_memmove(ScreenLinesUC + off_to, ScreenLinesUC + off_from, |
| 9156 wp->w_width * sizeof(u8char_T)); | |
| 714 | 9157 for (i = 0; i < p_mco; ++i) |
| 9158 mch_memmove(ScreenLinesC[i] + off_to, ScreenLinesC[i] + off_from, | |
| 9159 wp->w_width * sizeof(u8char_T)); | |
| 7 | 9160 } |
| 9161 if (enc_dbcs == DBCS_JPNU) | |
| 9162 mch_memmove(ScreenLines2 + off_to, ScreenLines2 + off_from, | |
| 9163 wp->w_width * sizeof(schar_T)); | |
| 9164 # endif | |
| 9165 mch_memmove(ScreenAttrs + off_to, ScreenAttrs + off_from, | |
| 9166 wp->w_width * sizeof(sattr_T)); | |
| 9167 } | |
| 9168 #endif | |
| 9169 | |
| 9170 /* | |
| 9171 * Return TRUE if clearing with term string "p" would work. | |
| 9172 * It can't work when the string is empty or it won't set the right background. | |
| 9173 */ | |
| 9174 int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9175 can_clear(char_u *p) |
| 7 | 9176 { |
| 9177 return (*p != NUL && (t_colors <= 1 | |
| 9178 #ifdef FEAT_GUI | |
| 9179 || gui.in_use | |
| 9180 #endif | |
|
9027
773d627cac0b
commit https://github.com/vim/vim/commit/61be73bb0f965a895bfb064ea3e55476ac175162
Christian Brabandt <cb@256bit.org>
parents:
8977
diff
changeset
|
9181 #ifdef FEAT_TERMGUICOLORS |
|
9939
ccb6461b82df
commit https://github.com/vim/vim/commit/1b58cdd160c2e0ada0f638679a2aa27e4665fc48
Christian Brabandt <cb@256bit.org>
parents:
9885
diff
changeset
|
9182 || (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
|
9183 || (!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
|
9184 #else |
|
b6472fd9f5ba
commit https://github.com/vim/vim/commit/d18f672fc9477f3c0cb7cc4ce8d9237ed825c612
Christian Brabandt <cb@256bit.org>
parents:
9282
diff
changeset
|
9185 || cterm_normal_bg_color == 0 |
|
b6472fd9f5ba
commit https://github.com/vim/vim/commit/d18f672fc9477f3c0cb7cc4ce8d9237ed825c612
Christian Brabandt <cb@256bit.org>
parents:
9282
diff
changeset
|
9186 #endif |
|
b6472fd9f5ba
commit https://github.com/vim/vim/commit/d18f672fc9477f3c0cb7cc4ce8d9237ed825c612
Christian Brabandt <cb@256bit.org>
parents:
9282
diff
changeset
|
9187 || *T_UT != NUL)); |
| 7 | 9188 } |
| 9189 | |
| 9190 /* | |
| 9191 * Reset cursor position. Use whenever cursor was moved because of outputting | |
| 9192 * something directly to the screen (shell commands) or a terminal control | |
| 9193 * code. | |
| 9194 */ | |
| 9195 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9196 screen_start(void) |
| 7 | 9197 { |
| 9198 screen_cur_row = screen_cur_col = 9999; | |
| 9199 } | |
| 9200 | |
| 9201 /* | |
| 9202 * Move the cursor to position "row","col" in the screen. | |
| 9203 * This tries to find the most efficient way to move, minimizing the number of | |
| 9204 * characters sent to the terminal. | |
| 9205 */ | |
| 9206 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9207 windgoto(int row, int col) |
| 7 | 9208 { |
| 205 | 9209 sattr_T *p; |
| 7 | 9210 int i; |
| 9211 int plan; | |
| 9212 int cost; | |
| 9213 int wouldbe_col; | |
| 9214 int noinvcurs; | |
| 9215 char_u *bs; | |
| 9216 int goto_cost; | |
| 9217 int attr; | |
| 9218 | |
| 1213 | 9219 #define GOTO_COST 7 /* assume a term_windgoto() takes about 7 chars */ |
| 7 | 9220 #define HIGHL_COST 5 /* assume unhighlight takes 5 chars */ |
| 9221 | |
| 9222 #define PLAN_LE 1 | |
| 9223 #define PLAN_CR 2 | |
| 9224 #define PLAN_NL 3 | |
| 9225 #define PLAN_WRITE 4 | |
| 9226 /* Can't use ScreenLines unless initialized */ | |
| 9227 if (ScreenLines == NULL) | |
| 9228 return; | |
| 9229 | |
| 9230 if (col != screen_cur_col || row != screen_cur_row) | |
| 9231 { | |
| 9232 /* Check for valid position. */ | |
| 9233 if (row < 0) /* window without text lines? */ | |
| 9234 row = 0; | |
| 9235 if (row >= screen_Rows) | |
| 9236 row = screen_Rows - 1; | |
| 9237 if (col >= screen_Columns) | |
| 9238 col = screen_Columns - 1; | |
| 9239 | |
| 9240 /* check if no cursor movement is allowed in highlight mode */ | |
| 9241 if (screen_attr && *T_MS == NUL) | |
| 9242 noinvcurs = HIGHL_COST; | |
| 9243 else | |
| 9244 noinvcurs = 0; | |
| 9245 goto_cost = GOTO_COST + noinvcurs; | |
| 9246 | |
| 9247 /* | |
| 9248 * Plan how to do the positioning: | |
| 9249 * 1. Use CR to move it to column 0, same row. | |
| 9250 * 2. Use T_LE to move it a few columns to the left. | |
| 9251 * 3. Use NL to move a few lines down, column 0. | |
| 9252 * 4. Move a few columns to the right with T_ND or by writing chars. | |
| 9253 * | |
| 9254 * Don't do this if the cursor went beyond the last column, the cursor | |
| 9255 * position is unknown then (some terminals wrap, some don't ) | |
| 9256 * | |
| 1213 | 9257 * First check if the highlighting attributes allow us to write |
| 7 | 9258 * characters to move the cursor to the right. |
| 9259 */ | |
| 9260 if (row >= screen_cur_row && screen_cur_col < Columns) | |
| 9261 { | |
| 9262 /* | |
| 9263 * If the cursor is in the same row, bigger col, we can use CR | |
| 9264 * or T_LE. | |
| 9265 */ | |
| 9266 bs = NULL; /* init for GCC */ | |
| 9267 attr = screen_attr; | |
| 9268 if (row == screen_cur_row && col < screen_cur_col) | |
| 9269 { | |
| 9270 /* "le" is preferred over "bc", because "bc" is obsolete */ | |
| 9271 if (*T_LE) | |
| 9272 bs = T_LE; /* "cursor left" */ | |
| 9273 else | |
| 9274 bs = T_BC; /* "backspace character (old) */ | |
| 9275 if (*bs) | |
| 9276 cost = (screen_cur_col - col) * (int)STRLEN(bs); | |
| 9277 else | |
| 9278 cost = 999; | |
| 9279 if (col + 1 < cost) /* using CR is less characters */ | |
| 9280 { | |
| 9281 plan = PLAN_CR; | |
| 9282 wouldbe_col = 0; | |
| 9283 cost = 1; /* CR is just one character */ | |
| 9284 } | |
| 9285 else | |
| 9286 { | |
| 9287 plan = PLAN_LE; | |
| 9288 wouldbe_col = col; | |
| 9289 } | |
| 9290 if (noinvcurs) /* will stop highlighting */ | |
| 9291 { | |
| 9292 cost += noinvcurs; | |
| 9293 attr = 0; | |
| 9294 } | |
| 9295 } | |
| 9296 | |
| 9297 /* | |
| 9298 * If the cursor is above where we want to be, we can use CR LF. | |
| 9299 */ | |
| 9300 else if (row > screen_cur_row) | |
| 9301 { | |
| 9302 plan = PLAN_NL; | |
| 9303 wouldbe_col = 0; | |
| 9304 cost = (row - screen_cur_row) * 2; /* CR LF */ | |
| 9305 if (noinvcurs) /* will stop highlighting */ | |
| 9306 { | |
| 9307 cost += noinvcurs; | |
| 9308 attr = 0; | |
| 9309 } | |
| 9310 } | |
| 9311 | |
| 9312 /* | |
| 9313 * If the cursor is in the same row, smaller col, just use write. | |
| 9314 */ | |
| 9315 else | |
| 9316 { | |
| 9317 plan = PLAN_WRITE; | |
| 9318 wouldbe_col = screen_cur_col; | |
| 9319 cost = 0; | |
| 9320 } | |
| 9321 | |
| 9322 /* | |
| 9323 * Check if any characters that need to be written have the | |
| 9324 * correct attributes. Also avoid UTF-8 characters. | |
| 9325 */ | |
| 9326 i = col - wouldbe_col; | |
| 9327 if (i > 0) | |
| 9328 cost += i; | |
| 9329 if (cost < goto_cost && i > 0) | |
| 9330 { | |
| 9331 /* | |
| 9332 * Check if the attributes are correct without additionally | |
| 9333 * stopping highlighting. | |
| 9334 */ | |
| 9335 p = ScreenAttrs + LineOffset[row] + wouldbe_col; | |
| 9336 while (i && *p++ == attr) | |
| 9337 --i; | |
| 9338 if (i != 0) | |
| 9339 { | |
| 9340 /* | |
| 9341 * Try if it works when highlighting is stopped here. | |
| 9342 */ | |
| 9343 if (*--p == 0) | |
| 9344 { | |
| 9345 cost += noinvcurs; | |
| 9346 while (i && *p++ == 0) | |
| 9347 --i; | |
| 9348 } | |
| 9349 if (i != 0) | |
| 9350 cost = 999; /* different attributes, don't do it */ | |
| 9351 } | |
| 9352 #ifdef FEAT_MBYTE | |
| 9353 if (enc_utf8) | |
| 9354 { | |
| 9355 /* Don't use an UTF-8 char for positioning, it's slow. */ | |
| 9356 for (i = wouldbe_col; i < col; ++i) | |
| 9357 if (ScreenLinesUC[LineOffset[row] + i] != 0) | |
| 9358 { | |
| 9359 cost = 999; | |
| 9360 break; | |
| 9361 } | |
| 9362 } | |
| 9363 #endif | |
| 9364 } | |
| 9365 | |
| 9366 /* | |
| 9367 * We can do it without term_windgoto()! | |
| 9368 */ | |
| 9369 if (cost < goto_cost) | |
| 9370 { | |
| 9371 if (plan == PLAN_LE) | |
| 9372 { | |
| 9373 if (noinvcurs) | |
| 9374 screen_stop_highlight(); | |
| 9375 while (screen_cur_col > col) | |
| 9376 { | |
| 9377 out_str(bs); | |
| 9378 --screen_cur_col; | |
| 9379 } | |
| 9380 } | |
| 9381 else if (plan == PLAN_CR) | |
| 9382 { | |
| 9383 if (noinvcurs) | |
| 9384 screen_stop_highlight(); | |
| 9385 out_char('\r'); | |
| 9386 screen_cur_col = 0; | |
| 9387 } | |
| 9388 else if (plan == PLAN_NL) | |
| 9389 { | |
| 9390 if (noinvcurs) | |
| 9391 screen_stop_highlight(); | |
| 9392 while (screen_cur_row < row) | |
| 9393 { | |
| 9394 out_char('\n'); | |
| 9395 ++screen_cur_row; | |
| 9396 } | |
| 9397 screen_cur_col = 0; | |
| 9398 } | |
| 9399 | |
| 9400 i = col - screen_cur_col; | |
| 9401 if (i > 0) | |
| 9402 { | |
| 9403 /* | |
| 9404 * Use cursor-right if it's one character only. Avoids | |
| 9405 * removing a line of pixels from the last bold char, when | |
| 9406 * using the bold trick in the GUI. | |
| 9407 */ | |
| 9408 if (T_ND[0] != NUL && T_ND[1] == NUL) | |
| 9409 { | |
| 9410 while (i-- > 0) | |
| 9411 out_char(*T_ND); | |
| 9412 } | |
| 9413 else | |
| 9414 { | |
| 9415 int off; | |
| 9416 | |
| 9417 off = LineOffset[row] + screen_cur_col; | |
| 9418 while (i-- > 0) | |
| 9419 { | |
| 9420 if (ScreenAttrs[off] != screen_attr) | |
| 9421 screen_stop_highlight(); | |
| 9422 #ifdef FEAT_MBYTE | |
| 9423 out_flush_check(); | |
| 9424 #endif | |
| 9425 out_char(ScreenLines[off]); | |
| 9426 #ifdef FEAT_MBYTE | |
| 9427 if (enc_dbcs == DBCS_JPNU | |
| 9428 && ScreenLines[off] == 0x8e) | |
| 9429 out_char(ScreenLines2[off]); | |
| 9430 #endif | |
| 9431 ++off; | |
| 9432 } | |
| 9433 } | |
| 9434 } | |
| 9435 } | |
| 9436 } | |
| 9437 else | |
| 9438 cost = 999; | |
| 9439 | |
| 9440 if (cost >= goto_cost) | |
| 9441 { | |
| 9442 if (noinvcurs) | |
| 9443 screen_stop_highlight(); | |
| 5995 | 9444 if (row == screen_cur_row && (col > screen_cur_col) |
| 9445 && *T_CRI != NUL) | |
| 7 | 9446 term_cursor_right(col - screen_cur_col); |
| 9447 else | |
| 9448 term_windgoto(row, col); | |
| 9449 } | |
| 9450 screen_cur_row = row; | |
| 9451 screen_cur_col = col; | |
| 9452 } | |
| 9453 } | |
| 9454 | |
| 9455 /* | |
| 9456 * Set cursor to its position in the current window. | |
| 9457 */ | |
| 9458 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9459 setcursor(void) |
| 7 | 9460 { |
| 9461 if (redrawing()) | |
| 9462 { | |
| 9463 validate_cursor(); | |
| 9464 windgoto(W_WINROW(curwin) + curwin->w_wrow, | |
| 9465 W_WINCOL(curwin) + ( | |
| 9466 #ifdef FEAT_RIGHTLEFT | |
| 1545 | 9467 /* With 'rightleft' set and the cursor on a double-wide |
| 9468 * character, position it on the leftmost column. */ | |
| 7 | 9469 curwin->w_p_rl ? ((int)W_WIDTH(curwin) - curwin->w_wcol - ( |
| 9470 # ifdef FEAT_MBYTE | |
| 1545 | 9471 (has_mbyte |
| 9472 && (*mb_ptr2cells)(ml_get_cursor()) == 2 | |
| 9473 && vim_isprintc(gchar_cursor())) ? 2 : | |
| 7 | 9474 # endif |
| 9475 1)) : | |
| 9476 #endif | |
| 9477 curwin->w_wcol)); | |
| 9478 } | |
| 9479 } | |
| 9480 | |
| 9481 | |
| 9482 /* | |
|
11655
8014350fe51a
patch 8.0.0710: a job that writes to a buffer clears completion
Christian Brabandt <cb@256bit.org>
parents:
11607
diff
changeset
|
9483 * 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
|
9484 * 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
|
9485 * If 'mayclear' is TRUE the screen will be cleared if it is faster than |
| 7 | 9486 * scrolling. |
| 9487 * Returns FAIL if the lines are not inserted, OK for success. | |
| 9488 */ | |
| 9489 int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9490 win_ins_lines( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9491 win_T *wp, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9492 int row, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9493 int line_count, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9494 int invalid, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9495 int mayclear) |
| 7 | 9496 { |
| 9497 int did_delete; | |
| 9498 int nextrow; | |
| 9499 int lastrow; | |
| 9500 int retval; | |
| 9501 | |
| 9502 if (invalid) | |
| 9503 wp->w_lines_valid = 0; | |
| 9504 | |
| 9505 if (wp->w_height < 5) | |
| 9506 return FAIL; | |
| 9507 | |
| 9508 if (line_count > wp->w_height - row) | |
| 9509 line_count = wp->w_height - row; | |
| 9510 | |
| 9511 retval = win_do_lines(wp, row, line_count, mayclear, FALSE); | |
| 9512 if (retval != MAYBE) | |
| 9513 return retval; | |
| 9514 | |
| 9515 /* | |
| 9516 * If there is a next window or a status line, we first try to delete the | |
| 9517 * lines at the bottom to avoid messing what is after the window. | |
| 9518 * If this fails and there are following windows, don't do anything to avoid | |
| 9519 * messing up those windows, better just redraw. | |
| 9520 */ | |
| 9521 did_delete = FALSE; | |
| 9522 #ifdef FEAT_WINDOWS | |
| 9523 if (wp->w_next != NULL || wp->w_status_height) | |
| 9524 { | |
| 9525 if (screen_del_lines(0, W_WINROW(wp) + wp->w_height - line_count, | |
| 9526 line_count, (int)Rows, FALSE, NULL) == OK) | |
| 9527 did_delete = TRUE; | |
| 9528 else if (wp->w_next) | |
| 9529 return FAIL; | |
| 9530 } | |
| 9531 #endif | |
| 9532 /* | |
| 9533 * if no lines deleted, blank the lines that will end up below the window | |
| 9534 */ | |
| 9535 if (!did_delete) | |
| 9536 { | |
| 9537 #ifdef FEAT_WINDOWS | |
| 9538 wp->w_redr_status = TRUE; | |
| 9539 #endif | |
| 9540 redraw_cmdline = TRUE; | |
| 9541 nextrow = W_WINROW(wp) + wp->w_height + W_STATUS_HEIGHT(wp); | |
| 9542 lastrow = nextrow + line_count; | |
| 9543 if (lastrow > Rows) | |
| 9544 lastrow = Rows; | |
| 9545 screen_fill(nextrow - line_count, lastrow - line_count, | |
| 9546 W_WINCOL(wp), (int)W_ENDCOL(wp), | |
| 9547 ' ', ' ', 0); | |
| 9548 } | |
| 9549 | |
| 9550 if (screen_ins_lines(0, W_WINROW(wp) + row, line_count, (int)Rows, NULL) | |
| 9551 == FAIL) | |
| 9552 { | |
| 9553 /* deletion will have messed up other windows */ | |
| 9554 if (did_delete) | |
| 9555 { | |
| 9556 #ifdef FEAT_WINDOWS | |
| 9557 wp->w_redr_status = TRUE; | |
| 9558 #endif | |
| 9559 win_rest_invalid(W_NEXT(wp)); | |
| 9560 } | |
| 9561 return FAIL; | |
| 9562 } | |
| 9563 | |
| 9564 return OK; | |
| 9565 } | |
| 9566 | |
| 9567 /* | |
|
11655
8014350fe51a
patch 8.0.0710: a job that writes to a buffer clears completion
Christian Brabandt <cb@256bit.org>
parents:
11607
diff
changeset
|
9568 * Delete "line_count" window lines at "row" in window "wp". |
| 7 | 9569 * If "invalid" is TRUE curwin->w_lines[] is invalidated. |
| 9570 * If "mayclear" is TRUE the screen will be cleared if it is faster than | |
| 9571 * scrolling | |
| 9572 * Return OK for success, FAIL if the lines are not deleted. | |
| 9573 */ | |
| 9574 int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9575 win_del_lines( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9576 win_T *wp, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9577 int row, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9578 int line_count, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9579 int invalid, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9580 int mayclear) |
| 7 | 9581 { |
| 9582 int retval; | |
| 9583 | |
| 9584 if (invalid) | |
| 9585 wp->w_lines_valid = 0; | |
| 9586 | |
| 9587 if (line_count > wp->w_height - row) | |
| 9588 line_count = wp->w_height - row; | |
| 9589 | |
| 9590 retval = win_do_lines(wp, row, line_count, mayclear, TRUE); | |
| 9591 if (retval != MAYBE) | |
| 9592 return retval; | |
| 9593 | |
| 9594 if (screen_del_lines(0, W_WINROW(wp) + row, line_count, | |
| 9595 (int)Rows, FALSE, NULL) == FAIL) | |
| 9596 return FAIL; | |
| 9597 | |
| 9598 #ifdef FEAT_WINDOWS | |
| 9599 /* | |
| 9600 * If there are windows or status lines below, try to put them at the | |
| 9601 * correct place. If we can't do that, they have to be redrawn. | |
| 9602 */ | |
| 9603 if (wp->w_next || wp->w_status_height || cmdline_row < Rows - 1) | |
| 9604 { | |
| 9605 if (screen_ins_lines(0, W_WINROW(wp) + wp->w_height - line_count, | |
| 9606 line_count, (int)Rows, NULL) == FAIL) | |
| 9607 { | |
| 9608 wp->w_redr_status = TRUE; | |
| 9609 win_rest_invalid(wp->w_next); | |
| 9610 } | |
| 9611 } | |
| 9612 /* | |
| 9613 * If this is the last window and there is no status line, redraw the | |
| 9614 * command line later. | |
| 9615 */ | |
| 9616 else | |
| 9617 #endif | |
| 9618 redraw_cmdline = TRUE; | |
| 9619 return OK; | |
| 9620 } | |
| 9621 | |
| 9622 /* | |
| 9623 * Common code for win_ins_lines() and win_del_lines(). | |
| 9624 * Returns OK or FAIL when the work has been done. | |
| 9625 * Returns MAYBE when not finished yet. | |
| 9626 */ | |
| 9627 static int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9628 win_do_lines( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9629 win_T *wp, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9630 int row, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9631 int line_count, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9632 int mayclear, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9633 int del) |
| 7 | 9634 { |
| 9635 int retval; | |
| 9636 | |
| 9637 if (!redrawing() || line_count <= 0) | |
| 9638 return FAIL; | |
| 9639 | |
|
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
|
9640 /* 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
|
9641 * 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
|
9642 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
|
9643 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
|
9644 |
| 7 | 9645 /* only a few lines left: redraw is faster */ |
| 9646 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
|
9647 #ifdef FEAT_WINDOWS |
| 7 | 9648 && wp->w_width == Columns |
| 9649 #endif | |
| 9650 ) | |
| 9651 { | |
|
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
|
9652 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
|
9653 screenclear(); /* will set wp->w_lines_valid to 0 */ |
| 7 | 9654 return FAIL; |
| 9655 } | |
| 9656 | |
| 9657 /* | |
| 9658 * Delete all remaining lines | |
| 9659 */ | |
| 9660 if (row + line_count >= wp->w_height) | |
| 9661 { | |
| 9662 screen_fill(W_WINROW(wp) + row, W_WINROW(wp) + wp->w_height, | |
| 9663 W_WINCOL(wp), (int)W_ENDCOL(wp), | |
| 9664 ' ', ' ', 0); | |
| 9665 return OK; | |
| 9666 } | |
| 9667 | |
| 9668 /* | |
|
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
|
9669 * When scrolling, the message on the command line should be cleared, |
| 7 | 9670 * 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
|
9671 * Don't do this when avoiding to insert lines. |
| 7 | 9672 */ |
|
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
|
9673 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
|
9674 clear_cmdline = TRUE; |
| 7 | 9675 |
| 9676 /* | |
| 9677 * If the terminal can set a scroll region, use that. | |
| 9678 * Always do this in a vertically split window. This will redraw from | |
| 9679 * ScreenLines[] when t_CV isn't defined. That's faster than using | |
| 9680 * win_line(). | |
| 9681 * 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
|
9682 * 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
|
9683 * scroll-up . |
| 7 | 9684 */ |
| 9685 if (scroll_region | |
|
8643
24b43dd167eb
commit https://github.com/vim/vim/commit/44a2f923c00f1384c9ecde12fb5b4711bc20702e
Christian Brabandt <cb@256bit.org>
parents:
8627
diff
changeset
|
9686 #ifdef FEAT_WINDOWS |
| 7 | 9687 || W_WIDTH(wp) != Columns |
| 9688 #endif | |
| 9689 ) | |
| 9690 { | |
|
8643
24b43dd167eb
commit https://github.com/vim/vim/commit/44a2f923c00f1384c9ecde12fb5b4711bc20702e
Christian Brabandt <cb@256bit.org>
parents:
8627
diff
changeset
|
9691 #ifdef FEAT_WINDOWS |
| 7 | 9692 if (scroll_region && (wp->w_width == Columns || *T_CSV != NUL)) |
| 9693 #endif | |
| 9694 scroll_region_set(wp, row); | |
| 9695 if (del) | |
| 9696 retval = screen_del_lines(W_WINROW(wp) + row, 0, line_count, | |
| 9697 wp->w_height - row, FALSE, wp); | |
| 9698 else | |
| 9699 retval = screen_ins_lines(W_WINROW(wp) + row, 0, line_count, | |
| 9700 wp->w_height - row, wp); | |
|
8643
24b43dd167eb
commit https://github.com/vim/vim/commit/44a2f923c00f1384c9ecde12fb5b4711bc20702e
Christian Brabandt <cb@256bit.org>
parents:
8627
diff
changeset
|
9701 #ifdef FEAT_WINDOWS |
| 7 | 9702 if (scroll_region && (wp->w_width == Columns || *T_CSV != NUL)) |
| 9703 #endif | |
| 9704 scroll_region_reset(); | |
| 9705 return retval; | |
| 9706 } | |
| 9707 | |
| 9708 #ifdef FEAT_WINDOWS | |
| 9709 if (wp->w_next != NULL && p_tf) /* don't delete/insert on fast terminal */ | |
| 9710 return FAIL; | |
| 9711 #endif | |
| 9712 | |
| 9713 return MAYBE; | |
| 9714 } | |
| 9715 | |
| 9716 /* | |
| 9717 * window 'wp' and everything after it is messed up, mark it for redraw | |
| 9718 */ | |
| 9719 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9720 win_rest_invalid(win_T *wp) |
| 7 | 9721 { |
| 9722 #ifdef FEAT_WINDOWS | |
| 9723 while (wp != NULL) | |
| 9724 #else | |
| 9725 if (wp != NULL) | |
| 9726 #endif | |
| 9727 { | |
| 9728 redraw_win_later(wp, NOT_VALID); | |
| 9729 #ifdef FEAT_WINDOWS | |
| 9730 wp->w_redr_status = TRUE; | |
| 9731 wp = wp->w_next; | |
| 9732 #endif | |
| 9733 } | |
| 9734 redraw_cmdline = TRUE; | |
| 9735 } | |
| 9736 | |
| 9737 /* | |
| 9738 * The rest of the routines in this file perform screen manipulations. The | |
| 9739 * given operation is performed physically on the screen. The corresponding | |
| 9740 * change is also made to the internal screen image. In this way, the editor | |
| 9741 * anticipates the effect of editing changes on the appearance of the screen. | |
| 9742 * That way, when we call screenupdate a complete redraw isn't usually | |
| 9743 * necessary. Another advantage is that we can keep adding code to anticipate | |
| 9744 * screen changes, and in the meantime, everything still works. | |
| 9745 */ | |
| 9746 | |
| 9747 /* | |
| 9748 * types for inserting or deleting lines | |
| 9749 */ | |
| 9750 #define USE_T_CAL 1 | |
| 9751 #define USE_T_CDL 2 | |
| 9752 #define USE_T_AL 3 | |
| 9753 #define USE_T_CE 4 | |
| 9754 #define USE_T_DL 5 | |
| 9755 #define USE_T_SR 6 | |
| 9756 #define USE_NL 7 | |
| 9757 #define USE_T_CD 8 | |
| 9758 #define USE_REDRAW 9 | |
| 9759 | |
| 9760 /* | |
| 9761 * insert lines on the screen and update ScreenLines[] | |
| 9762 * 'end' is the line after the scrolled part. Normally it is Rows. | |
| 9763 * When scrolling region used 'off' is the offset from the top for the region. | |
| 9764 * 'row' and 'end' are relative to the start of the region. | |
| 9765 * | |
| 9766 * return FAIL for failure, OK for success. | |
| 9767 */ | |
| 446 | 9768 int |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9769 screen_ins_lines( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9770 int off, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9771 int row, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9772 int line_count, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9773 int end, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9774 win_T *wp) /* NULL or window to use width from */ |
| 7 | 9775 { |
| 9776 int i; | |
| 9777 int j; | |
| 9778 unsigned temp; | |
| 9779 int cursor_row; | |
| 9780 int type; | |
| 9781 int result_empty; | |
| 9782 int can_ce = can_clear(T_CE); | |
| 9783 | |
| 9784 /* | |
| 9785 * FAIL if | |
| 9786 * - there is no valid screen | |
| 9787 * - the screen has to be redrawn completely | |
| 9788 * - the line count is less than one | |
| 9789 * - 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
|
9790 * - redrawing for a callback and there is a modeless selection |
| 7 | 9791 */ |
|
11698
4f59d2a66bf7
patch 8.0.0732: when updating a buffer modeless selection is lost
Christian Brabandt <cb@256bit.org>
parents:
11672
diff
changeset
|
9792 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
|
9793 #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
|
9794 || (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
|
9795 && 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
|
9796 #endif |
|
4f59d2a66bf7
patch 8.0.0732: when updating a buffer modeless selection is lost
Christian Brabandt <cb@256bit.org>
parents:
11672
diff
changeset
|
9797 ) |
| 7 | 9798 return FAIL; |
| 9799 | |
| 9800 /* | |
| 9801 * There are seven ways to insert lines: | |
| 9802 * 0. When in a vertically split window and t_CV isn't set, redraw the | |
| 9803 * characters from ScreenLines[]. | |
| 9804 * 1. Use T_CD (clear to end of display) if it exists and the result of | |
| 9805 * the insert is just empty lines | |
| 9806 * 2. Use T_CAL (insert multiple lines) if it exists and T_AL is not | |
| 9807 * present or line_count > 1. It looks better if we do all the inserts | |
| 9808 * at once. | |
| 9809 * 3. Use T_CDL (delete multiple lines) if it exists and the result of the | |
| 9810 * insert is just empty lines and T_CE is not present or line_count > | |
| 9811 * 1. | |
| 9812 * 4. Use T_AL (insert line) if it exists. | |
| 9813 * 5. Use T_CE (erase line) if it exists and the result of the insert is | |
| 9814 * just empty lines. | |
| 9815 * 6. Use T_DL (delete line) if it exists and the result of the insert is | |
| 9816 * just empty lines. | |
| 9817 * 7. Use T_SR (scroll reverse) if it exists and inserting at row 0 and | |
| 9818 * the 'da' flag is not set or we have clear line capability. | |
| 9819 * 8. redraw the characters from ScreenLines[]. | |
| 9820 * | |
| 9821 * Careful: In a hpterm scroll reverse doesn't work as expected, it moves | |
| 9822 * the scrollbar for the window. It does have insert line, use that if it | |
| 9823 * exists. | |
| 9824 */ | |
| 9825 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
|
9826 #ifdef FEAT_WINDOWS |
| 7 | 9827 if (wp != NULL && wp->w_width != Columns && *T_CSV == NUL) |
| 9828 type = USE_REDRAW; | |
| 9829 else | |
| 9830 #endif | |
| 9831 if (can_clear(T_CD) && result_empty) | |
| 9832 type = USE_T_CD; | |
| 9833 else if (*T_CAL != NUL && (line_count > 1 || *T_AL == NUL)) | |
| 9834 type = USE_T_CAL; | |
| 9835 else if (*T_CDL != NUL && result_empty && (line_count > 1 || !can_ce)) | |
| 9836 type = USE_T_CDL; | |
| 9837 else if (*T_AL != NUL) | |
| 9838 type = USE_T_AL; | |
| 9839 else if (can_ce && result_empty) | |
| 9840 type = USE_T_CE; | |
| 9841 else if (*T_DL != NUL && result_empty) | |
| 9842 type = USE_T_DL; | |
| 9843 else if (*T_SR != NUL && row == 0 && (*T_DA == NUL || can_ce)) | |
| 9844 type = USE_T_SR; | |
| 9845 else | |
| 9846 return FAIL; | |
| 9847 | |
| 9848 /* | |
| 9849 * For clearing the lines screen_del_lines() is used. This will also take | |
| 9850 * care of t_db if necessary. | |
| 9851 */ | |
| 9852 if (type == USE_T_CD || type == USE_T_CDL || | |
| 9853 type == USE_T_CE || type == USE_T_DL) | |
| 9854 return screen_del_lines(off, row, line_count, end, FALSE, wp); | |
| 9855 | |
| 9856 /* | |
| 9857 * If text is retained below the screen, first clear or delete as many | |
| 9858 * lines at the bottom of the window as are about to be inserted so that | |
| 9859 * the deleted lines won't later surface during a screen_del_lines. | |
| 9860 */ | |
| 9861 if (*T_DB) | |
| 9862 screen_del_lines(off, end - line_count, line_count, end, FALSE, wp); | |
| 9863 | |
| 9864 #ifdef FEAT_CLIPBOARD | |
| 9865 /* Remove a modeless selection when inserting lines halfway the screen | |
| 9866 * or not the full width of the screen. */ | |
| 9867 if (off + row > 0 | |
|
8643
24b43dd167eb
commit https://github.com/vim/vim/commit/44a2f923c00f1384c9ecde12fb5b4711bc20702e
Christian Brabandt <cb@256bit.org>
parents:
8627
diff
changeset
|
9868 # ifdef FEAT_WINDOWS |
| 7 | 9869 || (wp != NULL && wp->w_width != Columns) |
| 9870 # endif | |
| 9871 ) | |
| 3674 | 9872 clip_clear_selection(&clip_star); |
| 7 | 9873 else |
| 9874 clip_scroll_selection(-line_count); | |
| 9875 #endif | |
| 9876 | |
| 9877 #ifdef FEAT_GUI | |
| 9878 /* Don't update the GUI cursor here, ScreenLines[] is invalid until the | |
| 9879 * scrolling is actually carried out. */ | |
|
9848
664276833670
commit https://github.com/vim/vim/commit/107abd2ca53c31fd3bb40d77ff296e98eaae2975
Christian Brabandt <cb@256bit.org>
parents:
9754
diff
changeset
|
9880 gui_dont_update_cursor(row + off <= gui.cursor_row); |
| 7 | 9881 #endif |
| 9882 | |
| 9883 if (*T_CCS != NUL) /* cursor relative to region */ | |
| 9884 cursor_row = row; | |
| 9885 else | |
| 9886 cursor_row = row + off; | |
| 9887 | |
| 9888 /* | |
| 9889 * Shift LineOffset[] line_count down to reflect the inserted lines. | |
| 9890 * Clear the inserted lines in ScreenLines[]. | |
| 9891 */ | |
| 9892 row += off; | |
| 9893 end += off; | |
| 9894 for (i = 0; i < line_count; ++i) | |
| 9895 { | |
|
8643
24b43dd167eb
commit https://github.com/vim/vim/commit/44a2f923c00f1384c9ecde12fb5b4711bc20702e
Christian Brabandt <cb@256bit.org>
parents:
8627
diff
changeset
|
9896 #ifdef FEAT_WINDOWS |
| 7 | 9897 if (wp != NULL && wp->w_width != Columns) |
| 9898 { | |
| 9899 /* need to copy part of a line */ | |
| 9900 j = end - 1 - i; | |
| 9901 while ((j -= line_count) >= row) | |
| 9902 linecopy(j + line_count, j, wp); | |
| 9903 j += line_count; | |
| 9904 if (can_clear((char_u *)" ")) | |
| 9905 lineclear(LineOffset[j] + wp->w_wincol, wp->w_width); | |
| 9906 else | |
| 9907 lineinvalid(LineOffset[j] + wp->w_wincol, wp->w_width); | |
| 9908 LineWraps[j] = FALSE; | |
| 9909 } | |
| 9910 else | |
| 9911 #endif | |
| 9912 { | |
| 9913 j = end - 1 - i; | |
| 9914 temp = LineOffset[j]; | |
| 9915 while ((j -= line_count) >= row) | |
| 9916 { | |
| 9917 LineOffset[j + line_count] = LineOffset[j]; | |
| 9918 LineWraps[j + line_count] = LineWraps[j]; | |
| 9919 } | |
| 9920 LineOffset[j + line_count] = temp; | |
| 9921 LineWraps[j + line_count] = FALSE; | |
| 9922 if (can_clear((char_u *)" ")) | |
| 9923 lineclear(temp, (int)Columns); | |
| 9924 else | |
| 9925 lineinvalid(temp, (int)Columns); | |
| 9926 } | |
| 9927 } | |
| 9928 | |
| 9929 screen_stop_highlight(); | |
| 9930 windgoto(cursor_row, 0); | |
| 9931 | |
|
8643
24b43dd167eb
commit https://github.com/vim/vim/commit/44a2f923c00f1384c9ecde12fb5b4711bc20702e
Christian Brabandt <cb@256bit.org>
parents:
8627
diff
changeset
|
9932 #ifdef FEAT_WINDOWS |
| 7 | 9933 /* redraw the characters */ |
| 9934 if (type == USE_REDRAW) | |
| 9935 redraw_block(row, end, wp); | |
| 9936 else | |
| 9937 #endif | |
| 9938 if (type == USE_T_CAL) | |
| 9939 { | |
| 9940 term_append_lines(line_count); | |
| 9941 screen_start(); /* don't know where cursor is now */ | |
| 9942 } | |
| 9943 else | |
| 9944 { | |
| 9945 for (i = 0; i < line_count; i++) | |
| 9946 { | |
| 9947 if (type == USE_T_AL) | |
| 9948 { | |
| 9949 if (i && cursor_row != 0) | |
| 9950 windgoto(cursor_row, 0); | |
| 9951 out_str(T_AL); | |
| 9952 } | |
| 9953 else /* type == USE_T_SR */ | |
| 9954 out_str(T_SR); | |
| 9955 screen_start(); /* don't know where cursor is now */ | |
| 9956 } | |
| 9957 } | |
| 9958 | |
| 9959 /* | |
| 9960 * With scroll-reverse and 'da' flag set we need to clear the lines that | |
| 9961 * have been scrolled down into the region. | |
| 9962 */ | |
| 9963 if (type == USE_T_SR && *T_DA) | |
| 9964 { | |
| 9965 for (i = 0; i < line_count; ++i) | |
| 9966 { | |
| 9967 windgoto(off + i, 0); | |
| 9968 out_str(T_CE); | |
| 9969 screen_start(); /* don't know where cursor is now */ | |
| 9970 } | |
| 9971 } | |
| 9972 | |
| 9973 #ifdef FEAT_GUI | |
| 9974 gui_can_update_cursor(); | |
| 9975 if (gui.in_use) | |
| 9976 out_flush(); /* always flush after a scroll */ | |
| 9977 #endif | |
| 9978 return OK; | |
| 9979 } | |
| 9980 | |
| 9981 /* | |
|
9848
664276833670
commit https://github.com/vim/vim/commit/107abd2ca53c31fd3bb40d77ff296e98eaae2975
Christian Brabandt <cb@256bit.org>
parents:
9754
diff
changeset
|
9982 * 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
|
9983 * "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
|
9984 * 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
|
9985 * "row" and "end" are relative to the start of the region. |
| 7 | 9986 * |
| 9987 * Return OK for success, FAIL if the lines are not deleted. | |
| 9988 */ | |
| 9989 int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9990 screen_del_lines( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9991 int off, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9992 int row, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9993 int line_count, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9994 int end, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9995 int force, /* even when line_count > p_ttyscroll */ |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9996 win_T *wp UNUSED) /* NULL or window to use width from */ |
| 7 | 9997 { |
| 9998 int j; | |
| 9999 int i; | |
| 10000 unsigned temp; | |
| 10001 int cursor_row; | |
| 10002 int cursor_end; | |
| 10003 int result_empty; /* result is empty until end of region */ | |
| 10004 int can_delete; /* deleting line codes can be used */ | |
| 10005 int type; | |
| 10006 | |
| 10007 /* | |
| 10008 * FAIL if | |
| 10009 * - there is no valid screen | |
| 10010 * - the screen has to be redrawn completely | |
| 10011 * - the line count is less than one | |
| 10012 * - 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
|
10013 * - redrawing for a callback and there is a modeless selection |
| 7 | 10014 */ |
|
11698
4f59d2a66bf7
patch 8.0.0732: when updating a buffer modeless selection is lost
Christian Brabandt <cb@256bit.org>
parents:
11672
diff
changeset
|
10015 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
|
10016 || (!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
|
10017 #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
|
10018 || (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
|
10019 && 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
|
10020 #endif |
|
4f59d2a66bf7
patch 8.0.0732: when updating a buffer modeless selection is lost
Christian Brabandt <cb@256bit.org>
parents:
11672
diff
changeset
|
10021 ) |
| 7 | 10022 return FAIL; |
| 10023 | |
| 10024 /* | |
| 10025 * Check if the rest of the current region will become empty. | |
| 10026 */ | |
| 10027 result_empty = row + line_count >= end; | |
| 10028 | |
| 10029 /* | |
| 10030 * We can delete lines only when 'db' flag not set or when 'ce' option | |
| 10031 * available. | |
| 10032 */ | |
| 10033 can_delete = (*T_DB == NUL || can_clear(T_CE)); | |
| 10034 | |
| 10035 /* | |
| 10036 * There are six ways to delete lines: | |
| 10037 * 0. When in a vertically split window and t_CV isn't set, redraw the | |
| 10038 * characters from ScreenLines[]. | |
| 10039 * 1. Use T_CD if it exists and the result is empty. | |
| 10040 * 2. Use newlines if row == 0 and count == 1 or T_CDL does not exist. | |
| 10041 * 3. Use T_CDL (delete multiple lines) if it exists and line_count > 1 or | |
| 10042 * none of the other ways work. | |
| 10043 * 4. Use T_CE (erase line) if the result is empty. | |
| 10044 * 5. Use T_DL (delete line) if it exists. | |
| 10045 * 6. redraw the characters from ScreenLines[]. | |
| 10046 */ | |
|
8643
24b43dd167eb
commit https://github.com/vim/vim/commit/44a2f923c00f1384c9ecde12fb5b4711bc20702e
Christian Brabandt <cb@256bit.org>
parents:
8627
diff
changeset
|
10047 #ifdef FEAT_WINDOWS |
| 7 | 10048 if (wp != NULL && wp->w_width != Columns && *T_CSV == NUL) |
| 10049 type = USE_REDRAW; | |
| 10050 else | |
| 10051 #endif | |
| 10052 if (can_clear(T_CD) && result_empty) | |
| 10053 type = USE_T_CD; | |
| 10054 #if defined(__BEOS__) && defined(BEOS_DR8) | |
| 10055 /* | |
| 10056 * USE_NL does not seem to work in Terminal of DR8 so we set T_DB="" in | |
| 10057 * its internal termcap... this works okay for tests which test *T_DB != | |
| 10058 * NUL. It has the disadvantage that the user cannot use any :set t_* | |
| 10059 * command to get T_DB (back) to empty_option, only :set term=... will do | |
| 10060 * the trick... | |
| 10061 * Anyway, this hack will hopefully go away with the next OS release. | |
| 10062 * (Olaf Seibert) | |
| 10063 */ | |
| 10064 else if (row == 0 && T_DB == empty_option | |
| 10065 && (line_count == 1 || *T_CDL == NUL)) | |
| 10066 #else | |
| 10067 else if (row == 0 && ( | |
| 10068 #ifndef AMIGA | |
| 10069 /* On the Amiga, somehow '\n' on the last line doesn't always scroll | |
| 10070 * up, so use delete-line command */ | |
| 10071 line_count == 1 || | |
| 10072 #endif | |
| 10073 *T_CDL == NUL)) | |
| 10074 #endif | |
| 10075 type = USE_NL; | |
| 10076 else if (*T_CDL != NUL && line_count > 1 && can_delete) | |
| 10077 type = USE_T_CDL; | |
| 10078 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
|
10079 #ifdef FEAT_WINDOWS |
| 7 | 10080 && (wp == NULL || wp->w_width == Columns) |
| 10081 #endif | |
| 10082 ) | |
| 10083 type = USE_T_CE; | |
| 10084 else if (*T_DL != NUL && can_delete) | |
| 10085 type = USE_T_DL; | |
| 10086 else if (*T_CDL != NUL && can_delete) | |
| 10087 type = USE_T_CDL; | |
| 10088 else | |
| 10089 return FAIL; | |
| 10090 | |
| 10091 #ifdef FEAT_CLIPBOARD | |
| 10092 /* Remove a modeless selection when deleting lines halfway the screen or | |
| 10093 * not the full width of the screen. */ | |
| 10094 if (off + row > 0 | |
|
8643
24b43dd167eb
commit https://github.com/vim/vim/commit/44a2f923c00f1384c9ecde12fb5b4711bc20702e
Christian Brabandt <cb@256bit.org>
parents:
8627
diff
changeset
|
10095 # ifdef FEAT_WINDOWS |
| 7 | 10096 || (wp != NULL && wp->w_width != Columns) |
| 10097 # endif | |
| 10098 ) | |
| 3674 | 10099 clip_clear_selection(&clip_star); |
| 7 | 10100 else |
| 10101 clip_scroll_selection(line_count); | |
| 10102 #endif | |
| 10103 | |
| 10104 #ifdef FEAT_GUI | |
| 10105 /* Don't update the GUI cursor here, ScreenLines[] is invalid until the | |
| 10106 * scrolling is actually carried out. */ | |
|
9848
664276833670
commit https://github.com/vim/vim/commit/107abd2ca53c31fd3bb40d77ff296e98eaae2975
Christian Brabandt <cb@256bit.org>
parents:
9754
diff
changeset
|
10107 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
|
10108 && gui.cursor_row < end + off); |
| 7 | 10109 #endif |
| 10110 | |
| 10111 if (*T_CCS != NUL) /* cursor relative to region */ | |
| 10112 { | |
| 10113 cursor_row = row; | |
| 10114 cursor_end = end; | |
| 10115 } | |
| 10116 else | |
| 10117 { | |
| 10118 cursor_row = row + off; | |
| 10119 cursor_end = end + off; | |
| 10120 } | |
| 10121 | |
| 10122 /* | |
| 10123 * Now shift LineOffset[] line_count up to reflect the deleted lines. | |
| 10124 * Clear the inserted lines in ScreenLines[]. | |
| 10125 */ | |
| 10126 row += off; | |
| 10127 end += off; | |
| 10128 for (i = 0; i < line_count; ++i) | |
| 10129 { | |
|
8643
24b43dd167eb
commit https://github.com/vim/vim/commit/44a2f923c00f1384c9ecde12fb5b4711bc20702e
Christian Brabandt <cb@256bit.org>
parents:
8627
diff
changeset
|
10130 #ifdef FEAT_WINDOWS |
| 7 | 10131 if (wp != NULL && wp->w_width != Columns) |
| 10132 { | |
| 10133 /* need to copy part of a line */ | |
| 10134 j = row + i; | |
| 10135 while ((j += line_count) <= end - 1) | |
| 10136 linecopy(j - line_count, j, wp); | |
| 10137 j -= line_count; | |
| 10138 if (can_clear((char_u *)" ")) | |
| 10139 lineclear(LineOffset[j] + wp->w_wincol, wp->w_width); | |
| 10140 else | |
| 10141 lineinvalid(LineOffset[j] + wp->w_wincol, wp->w_width); | |
| 10142 LineWraps[j] = FALSE; | |
| 10143 } | |
| 10144 else | |
| 10145 #endif | |
| 10146 { | |
| 10147 /* whole width, moving the line pointers is faster */ | |
| 10148 j = row + i; | |
| 10149 temp = LineOffset[j]; | |
| 10150 while ((j += line_count) <= end - 1) | |
| 10151 { | |
| 10152 LineOffset[j - line_count] = LineOffset[j]; | |
| 10153 LineWraps[j - line_count] = LineWraps[j]; | |
| 10154 } | |
| 10155 LineOffset[j - line_count] = temp; | |
| 10156 LineWraps[j - line_count] = FALSE; | |
| 10157 if (can_clear((char_u *)" ")) | |
| 10158 lineclear(temp, (int)Columns); | |
| 10159 else | |
| 10160 lineinvalid(temp, (int)Columns); | |
| 10161 } | |
| 10162 } | |
| 10163 | |
| 10164 screen_stop_highlight(); | |
| 10165 | |
|
8643
24b43dd167eb
commit https://github.com/vim/vim/commit/44a2f923c00f1384c9ecde12fb5b4711bc20702e
Christian Brabandt <cb@256bit.org>
parents:
8627
diff
changeset
|
10166 #ifdef FEAT_WINDOWS |
| 7 | 10167 /* redraw the characters */ |
| 10168 if (type == USE_REDRAW) | |
| 10169 redraw_block(row, end, wp); | |
| 10170 else | |
| 10171 #endif | |
| 10172 if (type == USE_T_CD) /* delete the lines */ | |
| 10173 { | |
| 10174 windgoto(cursor_row, 0); | |
| 10175 out_str(T_CD); | |
| 10176 screen_start(); /* don't know where cursor is now */ | |
| 10177 } | |
| 10178 else if (type == USE_T_CDL) | |
| 10179 { | |
| 10180 windgoto(cursor_row, 0); | |
| 10181 term_delete_lines(line_count); | |
| 10182 screen_start(); /* don't know where cursor is now */ | |
| 10183 } | |
| 10184 /* | |
| 10185 * Deleting lines at top of the screen or scroll region: Just scroll | |
| 10186 * the whole screen (scroll region) up by outputting newlines on the | |
| 10187 * last line. | |
| 10188 */ | |
| 10189 else if (type == USE_NL) | |
| 10190 { | |
| 10191 windgoto(cursor_end - 1, 0); | |
| 10192 for (i = line_count; --i >= 0; ) | |
| 10193 out_char('\n'); /* cursor will remain on same line */ | |
| 10194 } | |
| 10195 else | |
| 10196 { | |
| 10197 for (i = line_count; --i >= 0; ) | |
| 10198 { | |
| 10199 if (type == USE_T_DL) | |
| 10200 { | |
| 10201 windgoto(cursor_row, 0); | |
| 10202 out_str(T_DL); /* delete a line */ | |
| 10203 } | |
| 10204 else /* type == USE_T_CE */ | |
| 10205 { | |
| 10206 windgoto(cursor_row + i, 0); | |
| 10207 out_str(T_CE); /* erase a line */ | |
| 10208 } | |
| 10209 screen_start(); /* don't know where cursor is now */ | |
| 10210 } | |
| 10211 } | |
| 10212 | |
| 10213 /* | |
| 10214 * If the 'db' flag is set, we need to clear the lines that have been | |
| 10215 * scrolled up at the bottom of the region. | |
| 10216 */ | |
| 10217 if (*T_DB && (type == USE_T_DL || type == USE_T_CDL)) | |
| 10218 { | |
| 10219 for (i = line_count; i > 0; --i) | |
| 10220 { | |
| 10221 windgoto(cursor_end - i, 0); | |
| 10222 out_str(T_CE); /* erase a line */ | |
| 10223 screen_start(); /* don't know where cursor is now */ | |
| 10224 } | |
| 10225 } | |
| 10226 | |
| 10227 #ifdef FEAT_GUI | |
| 10228 gui_can_update_cursor(); | |
| 10229 if (gui.in_use) | |
| 10230 out_flush(); /* always flush after a scroll */ | |
| 10231 #endif | |
| 10232 | |
| 10233 return OK; | |
| 10234 } | |
| 10235 | |
| 10236 /* | |
| 10237 * show the current mode and ruler | |
| 10238 * | |
| 10239 * If clear_cmdline is TRUE, clear the rest of the cmdline. | |
| 10240 * If clear_cmdline is FALSE there may be a message there that needs to be | |
| 10241 * cleared only if a mode is shown. | |
| 10242 * Return the length of the message (0 if no message). | |
| 10243 */ | |
| 10244 int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
10245 showmode(void) |
| 7 | 10246 { |
| 10247 int need_clear; | |
| 10248 int length = 0; | |
| 10249 int do_mode; | |
| 10250 int attr; | |
| 10251 int nwr_save; | |
| 10252 #ifdef FEAT_INS_EXPAND | |
| 10253 int sub_attr; | |
| 10254 #endif | |
| 10255 | |
| 642 | 10256 do_mode = ((p_smd && msg_silent == 0) |
| 10257 && ((State & INSERT) | |
| 10258 || restart_edit | |
| 5735 | 10259 || VIsual_active)); |
| 7 | 10260 if (do_mode || Recording) |
| 10261 { | |
| 10262 /* | |
| 10263 * Don't show mode right now, when not redrawing or inside a mapping. | |
| 10264 * Call char_avail() only when we are going to show something, because | |
| 10265 * it takes a bit of time. | |
| 10266 */ | |
| 10267 if (!redrawing() || (char_avail() && !KeyTyped) || msg_silent != 0) | |
| 10268 { | |
| 10269 redraw_cmdline = TRUE; /* show mode later */ | |
| 10270 return 0; | |
| 10271 } | |
| 10272 | |
| 10273 nwr_save = need_wait_return; | |
| 10274 | |
| 10275 /* wait a bit before overwriting an important message */ | |
| 10276 check_for_delay(FALSE); | |
| 10277 | |
| 10278 /* if the cmdline is more than one line high, erase top lines */ | |
| 10279 need_clear = clear_cmdline; | |
| 10280 if (clear_cmdline && cmdline_row < Rows - 1) | |
| 10281 msg_clr_cmdline(); /* will reset clear_cmdline */ | |
| 10282 | |
| 10283 /* Position on the last line in the window, column 0 */ | |
| 10284 msg_pos_mode(); | |
| 10285 cursor_off(); | |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
10286 attr = HL_ATTR(HLF_CM); /* Highlight mode */ |
| 7 | 10287 if (do_mode) |
| 10288 { | |
| 10289 MSG_PUTS_ATTR("--", attr); | |
| 10290 #if defined(FEAT_XIM) | |
| 2520 | 10291 if ( |
| 10292 # ifdef FEAT_GUI_GTK | |
| 10293 preedit_get_status() | |
| 1668 | 10294 # else |
| 10295 im_get_status() | |
| 2520 | 10296 # endif |
| 1668 | 10297 ) |
|
2277
f42e0b5ff9e9
Change remaining HAVE_GTK2 to FEAT_GUI_GTK.
Bram Moolenaar <bram@vim.org>
parents:
2269
diff
changeset
|
10298 # ifdef FEAT_GUI_GTK /* most of the time, it's not XIM being used */ |
| 7 | 10299 MSG_PUTS_ATTR(" IM", attr); |
| 10300 # else | |
| 10301 MSG_PUTS_ATTR(" XIM", attr); | |
| 10302 # endif | |
| 10303 #endif | |
| 10304 #if defined(FEAT_HANGULIN) && defined(FEAT_GUI) | |
| 10305 if (gui.in_use) | |
| 10306 { | |
| 10307 if (hangul_input_state_get()) | |
|
7208
2c00f6b312bf
commit https://github.com/vim/vim/commit/72f4cc4a987d123c0ed909c85b9a05f65cef7202
Christian Brabandt <cb@256bit.org>
parents:
7007
diff
changeset
|
10308 { |
|
2c00f6b312bf
commit https://github.com/vim/vim/commit/72f4cc4a987d123c0ed909c85b9a05f65cef7202
Christian Brabandt <cb@256bit.org>
parents:
7007
diff
changeset
|
10309 /* HANGUL */ |
|
2c00f6b312bf
commit https://github.com/vim/vim/commit/72f4cc4a987d123c0ed909c85b9a05f65cef7202
Christian Brabandt <cb@256bit.org>
parents:
7007
diff
changeset
|
10310 if (enc_utf8) |
|
2c00f6b312bf
commit https://github.com/vim/vim/commit/72f4cc4a987d123c0ed909c85b9a05f65cef7202
Christian Brabandt <cb@256bit.org>
parents:
7007
diff
changeset
|
10311 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
|
10312 else |
|
2c00f6b312bf
commit https://github.com/vim/vim/commit/72f4cc4a987d123c0ed909c85b9a05f65cef7202
Christian Brabandt <cb@256bit.org>
parents:
7007
diff
changeset
|
10313 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
|
10314 } |
| 7 | 10315 } |
| 10316 #endif | |
| 10317 #ifdef FEAT_INS_EXPAND | |
| 5946 | 10318 /* CTRL-X in Insert mode */ |
| 10319 if (edit_submode != NULL && !shortmess(SHM_COMPLETIONMENU)) | |
| 7 | 10320 { |
| 10321 /* These messages can get long, avoid a wrap in a narrow | |
| 10322 * window. Prefer showing edit_submode_extra. */ | |
| 10323 length = (Rows - msg_row) * Columns - 3; | |
| 10324 if (edit_submode_extra != NULL) | |
| 10325 length -= vim_strsize(edit_submode_extra); | |
| 10326 if (length > 0) | |
| 10327 { | |
| 10328 if (edit_submode_pre != NULL) | |
| 10329 length -= vim_strsize(edit_submode_pre); | |
| 10330 if (length - vim_strsize(edit_submode) > 0) | |
| 10331 { | |
| 10332 if (edit_submode_pre != NULL) | |
| 10333 msg_puts_attr(edit_submode_pre, attr); | |
| 10334 msg_puts_attr(edit_submode, attr); | |
| 10335 } | |
| 10336 if (edit_submode_extra != NULL) | |
| 10337 { | |
| 10338 MSG_PUTS_ATTR(" ", attr); /* add a space in between */ | |
| 10339 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
|
10340 sub_attr = HL_ATTR(edit_submode_highl); |
| 7 | 10341 else |
| 10342 sub_attr = attr; | |
| 10343 msg_puts_attr(edit_submode_extra, sub_attr); | |
| 10344 } | |
| 10345 } | |
| 10346 length = 0; | |
| 10347 } | |
| 10348 else | |
| 10349 #endif | |
| 10350 { | |
| 10351 #ifdef FEAT_VREPLACE | |
| 10352 if (State & VREPLACE_FLAG) | |
| 10353 MSG_PUTS_ATTR(_(" VREPLACE"), attr); | |
| 10354 else | |
| 10355 #endif | |
| 10356 if (State & REPLACE_FLAG) | |
| 10357 MSG_PUTS_ATTR(_(" REPLACE"), attr); | |
| 10358 else if (State & INSERT) | |
| 10359 { | |
| 10360 #ifdef FEAT_RIGHTLEFT | |
| 10361 if (p_ri) | |
| 10362 MSG_PUTS_ATTR(_(" REVERSE"), attr); | |
| 10363 #endif | |
| 10364 MSG_PUTS_ATTR(_(" INSERT"), attr); | |
| 10365 } | |
| 10366 else if (restart_edit == 'I') | |
| 10367 MSG_PUTS_ATTR(_(" (insert)"), attr); | |
| 10368 else if (restart_edit == 'R') | |
| 10369 MSG_PUTS_ATTR(_(" (replace)"), attr); | |
| 10370 else if (restart_edit == 'V') | |
| 10371 MSG_PUTS_ATTR(_(" (vreplace)"), attr); | |
| 10372 #ifdef FEAT_RIGHTLEFT | |
| 10373 if (p_hkmap) | |
| 10374 MSG_PUTS_ATTR(_(" Hebrew"), attr); | |
| 10375 # ifdef FEAT_FKMAP | |
| 10376 if (p_fkmap) | |
| 10377 MSG_PUTS_ATTR(farsi_text_5, attr); | |
| 10378 # endif | |
| 10379 #endif | |
| 10380 #ifdef FEAT_KEYMAP | |
| 10381 if (State & LANGMAP) | |
| 10382 { | |
| 10383 # ifdef FEAT_ARABIC | |
| 10384 if (curwin->w_p_arab) | |
| 10385 MSG_PUTS_ATTR(_(" Arabic"), attr); | |
| 10386 else | |
| 10387 # endif | |
|
9645
123d3c102035
commit https://github.com/vim/vim/commit/73ac0c4281a3606651604a3cbcc334bfb3859a87
Christian Brabandt <cb@256bit.org>
parents:
9489
diff
changeset
|
10388 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
|
10389 NameBuff, MAXPATHL)) |
|
123d3c102035
commit https://github.com/vim/vim/commit/73ac0c4281a3606651604a3cbcc334bfb3859a87
Christian Brabandt <cb@256bit.org>
parents:
9489
diff
changeset
|
10390 MSG_PUTS_ATTR(NameBuff, attr); |
| 7 | 10391 } |
| 10392 #endif | |
| 10393 if ((State & INSERT) && p_paste) | |
| 10394 MSG_PUTS_ATTR(_(" (paste)"), attr); | |
| 10395 | |
| 10396 if (VIsual_active) | |
| 10397 { | |
| 10398 char *p; | |
| 10399 | |
| 10400 /* Don't concatenate separate words to avoid translation | |
| 10401 * problems. */ | |
| 10402 switch ((VIsual_select ? 4 : 0) | |
| 10403 + (VIsual_mode == Ctrl_V) * 2 | |
| 10404 + (VIsual_mode == 'V')) | |
| 10405 { | |
| 10406 case 0: p = N_(" VISUAL"); break; | |
| 10407 case 1: p = N_(" VISUAL LINE"); break; | |
| 10408 case 2: p = N_(" VISUAL BLOCK"); break; | |
| 10409 case 4: p = N_(" SELECT"); break; | |
| 10410 case 5: p = N_(" SELECT LINE"); break; | |
| 10411 default: p = N_(" SELECT BLOCK"); break; | |
| 10412 } | |
| 10413 MSG_PUTS_ATTR(_(p), attr); | |
| 10414 } | |
| 10415 MSG_PUTS_ATTR(" --", attr); | |
| 10416 } | |
| 644 | 10417 |
| 7 | 10418 need_clear = TRUE; |
| 10419 } | |
| 10420 if (Recording | |
| 10421 #ifdef FEAT_INS_EXPAND | |
| 10422 && edit_submode == NULL /* otherwise it gets too long */ | |
| 10423 #endif | |
| 10424 ) | |
| 10425 { | |
|
7233
9487ea110214
commit https://github.com/vim/vim/commit/a0ed84a26897c994512873a895b9fc54e90c6845
Christian Brabandt <cb@256bit.org>
parents:
7208
diff
changeset
|
10426 recording_mode(attr); |
| 7 | 10427 need_clear = TRUE; |
| 10428 } | |
| 644 | 10429 |
| 10430 mode_displayed = TRUE; | |
| 7 | 10431 if (need_clear || clear_cmdline) |
| 10432 msg_clr_eos(); | |
| 10433 msg_didout = FALSE; /* overwrite this message */ | |
| 10434 length = msg_col; | |
| 10435 msg_col = 0; | |
| 10436 need_wait_return = nwr_save; /* never ask for hit-return for this */ | |
| 10437 } | |
| 10438 else if (clear_cmdline && msg_silent == 0) | |
| 10439 /* Clear the whole command line. Will reset "clear_cmdline". */ | |
| 10440 msg_clr_cmdline(); | |
| 10441 | |
| 10442 #ifdef FEAT_CMDL_INFO | |
| 10443 /* In Visual mode the size of the selected area must be redrawn. */ | |
| 10444 if (VIsual_active) | |
| 10445 clear_showcmd(); | |
| 10446 | |
| 10447 /* If the last window has no status line, the ruler is after the mode | |
| 10448 * message and must be redrawn */ | |
| 10449 if (redrawing() | |
| 10450 # ifdef FEAT_WINDOWS | |
| 10451 && lastwin->w_status_height == 0 | |
| 10452 # endif | |
| 10453 ) | |
| 10454 win_redr_ruler(lastwin, TRUE); | |
| 10455 #endif | |
| 10456 redraw_cmdline = FALSE; | |
| 10457 clear_cmdline = FALSE; | |
| 10458 | |
| 10459 return length; | |
| 10460 } | |
| 10461 | |
| 10462 /* | |
| 10463 * Position for a mode message. | |
| 10464 */ | |
| 10465 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
10466 msg_pos_mode(void) |
| 7 | 10467 { |
| 10468 msg_col = 0; | |
| 10469 msg_row = Rows - 1; | |
| 10470 } | |
| 10471 | |
| 10472 /* | |
| 10473 * Delete mode message. Used when ESC is typed which is expected to end | |
| 10474 * Insert mode (but Insert mode didn't end yet!). | |
| 644 | 10475 * Caller should check "mode_displayed". |
| 7 | 10476 */ |
| 10477 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
10478 unshowmode(int force) |
| 7 | 10479 { |
| 10480 /* | |
|
2055
4aa4510d548c
updated for version 7.2.341
Bram Moolenaar <bram@zimbu.org>
parents:
2008
diff
changeset
|
10481 * Don't delete it right now, when not redrawing or inside a mapping. |
| 7 | 10482 */ |
| 10483 if (!redrawing() || (!force && char_avail() && !KeyTyped)) | |
| 10484 redraw_cmdline = TRUE; /* delete mode later */ | |
| 10485 else | |
|
8817
b7eb7bbd71d0
commit https://github.com/vim/vim/commit/fd773e9e88add7d1ffef890fb9f3a00d613b4326
Christian Brabandt <cb@256bit.org>
parents:
8643
diff
changeset
|
10486 clearmode(); |
|
b7eb7bbd71d0
commit https://github.com/vim/vim/commit/fd773e9e88add7d1ffef890fb9f3a00d613b4326
Christian Brabandt <cb@256bit.org>
parents:
8643
diff
changeset
|
10487 } |
|
b7eb7bbd71d0
commit https://github.com/vim/vim/commit/fd773e9e88add7d1ffef890fb9f3a00d613b4326
Christian Brabandt <cb@256bit.org>
parents:
8643
diff
changeset
|
10488 |
|
b7eb7bbd71d0
commit https://github.com/vim/vim/commit/fd773e9e88add7d1ffef890fb9f3a00d613b4326
Christian Brabandt <cb@256bit.org>
parents:
8643
diff
changeset
|
10489 /* |
|
b7eb7bbd71d0
commit https://github.com/vim/vim/commit/fd773e9e88add7d1ffef890fb9f3a00d613b4326
Christian Brabandt <cb@256bit.org>
parents:
8643
diff
changeset
|
10490 * Clear the mode message. |
|
b7eb7bbd71d0
commit https://github.com/vim/vim/commit/fd773e9e88add7d1ffef890fb9f3a00d613b4326
Christian Brabandt <cb@256bit.org>
parents:
8643
diff
changeset
|
10491 */ |
|
b7eb7bbd71d0
commit https://github.com/vim/vim/commit/fd773e9e88add7d1ffef890fb9f3a00d613b4326
Christian Brabandt <cb@256bit.org>
parents:
8643
diff
changeset
|
10492 void |
|
9282
9f97a6290c63
commit https://github.com/vim/vim/commit/cf089463492fab53b2a5d81517829d22f882f82e
Christian Brabandt <cb@256bit.org>
parents:
9213
diff
changeset
|
10493 clearmode(void) |
|
8817
b7eb7bbd71d0
commit https://github.com/vim/vim/commit/fd773e9e88add7d1ffef890fb9f3a00d613b4326
Christian Brabandt <cb@256bit.org>
parents:
8643
diff
changeset
|
10494 { |
|
b7eb7bbd71d0
commit https://github.com/vim/vim/commit/fd773e9e88add7d1ffef890fb9f3a00d613b4326
Christian Brabandt <cb@256bit.org>
parents:
8643
diff
changeset
|
10495 msg_pos_mode(); |
|
b7eb7bbd71d0
commit https://github.com/vim/vim/commit/fd773e9e88add7d1ffef890fb9f3a00d613b4326
Christian Brabandt <cb@256bit.org>
parents:
8643
diff
changeset
|
10496 if (Recording) |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
10497 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
|
10498 msg_clr_eos(); |
| 7 | 10499 } |
| 10500 | |
|
7233
9487ea110214
commit https://github.com/vim/vim/commit/a0ed84a26897c994512873a895b9fc54e90c6845
Christian Brabandt <cb@256bit.org>
parents:
7208
diff
changeset
|
10501 static void |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
10502 recording_mode(int attr) |
|
7233
9487ea110214
commit https://github.com/vim/vim/commit/a0ed84a26897c994512873a895b9fc54e90c6845
Christian Brabandt <cb@256bit.org>
parents:
7208
diff
changeset
|
10503 { |
|
9487ea110214
commit https://github.com/vim/vim/commit/a0ed84a26897c994512873a895b9fc54e90c6845
Christian Brabandt <cb@256bit.org>
parents:
7208
diff
changeset
|
10504 MSG_PUTS_ATTR(_("recording"), attr); |
|
9487ea110214
commit https://github.com/vim/vim/commit/a0ed84a26897c994512873a895b9fc54e90c6845
Christian Brabandt <cb@256bit.org>
parents:
7208
diff
changeset
|
10505 if (!shortmess(SHM_RECORDING)) |
|
9487ea110214
commit https://github.com/vim/vim/commit/a0ed84a26897c994512873a895b9fc54e90c6845
Christian Brabandt <cb@256bit.org>
parents:
7208
diff
changeset
|
10506 { |
|
9487ea110214
commit https://github.com/vim/vim/commit/a0ed84a26897c994512873a895b9fc54e90c6845
Christian Brabandt <cb@256bit.org>
parents:
7208
diff
changeset
|
10507 char_u s[4]; |
|
9487ea110214
commit https://github.com/vim/vim/commit/a0ed84a26897c994512873a895b9fc54e90c6845
Christian Brabandt <cb@256bit.org>
parents:
7208
diff
changeset
|
10508 sprintf((char *)s, " @%c", Recording); |
|
9487ea110214
commit https://github.com/vim/vim/commit/a0ed84a26897c994512873a895b9fc54e90c6845
Christian Brabandt <cb@256bit.org>
parents:
7208
diff
changeset
|
10509 MSG_PUTS_ATTR(s, attr); |
|
9487ea110214
commit https://github.com/vim/vim/commit/a0ed84a26897c994512873a895b9fc54e90c6845
Christian Brabandt <cb@256bit.org>
parents:
7208
diff
changeset
|
10510 } |
|
9487ea110214
commit https://github.com/vim/vim/commit/a0ed84a26897c994512873a895b9fc54e90c6845
Christian Brabandt <cb@256bit.org>
parents:
7208
diff
changeset
|
10511 } |
|
9487ea110214
commit https://github.com/vim/vim/commit/a0ed84a26897c994512873a895b9fc54e90c6845
Christian Brabandt <cb@256bit.org>
parents:
7208
diff
changeset
|
10512 |
| 667 | 10513 #if defined(FEAT_WINDOWS) |
| 10514 /* | |
| 10515 * Draw the tab pages line at the top of the Vim window. | |
| 10516 */ | |
| 10517 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
10518 draw_tabline(void) |
| 667 | 10519 { |
| 10520 int tabcount = 0; | |
| 10521 tabpage_T *tp; | |
| 10522 int tabwidth; | |
| 10523 int col = 0; | |
| 673 | 10524 int scol = 0; |
| 667 | 10525 int attr; |
| 10526 win_T *wp; | |
| 671 | 10527 win_T *cwp; |
| 10528 int wincount; | |
| 10529 int modified; | |
| 667 | 10530 int c; |
| 10531 int len; | |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
10532 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
|
10533 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
|
10534 int attr_fill = HL_ATTR(HLF_TPF); |
| 673 | 10535 char_u *p; |
| 677 | 10536 int room; |
| 10537 int use_sep_chars = (t_colors < 8 | |
| 10538 #ifdef FEAT_GUI | |
| 10539 && !gui.in_use | |
| 10540 #endif | |
|
9027
773d627cac0b
commit https://github.com/vim/vim/commit/61be73bb0f965a895bfb064ea3e55476ac175162
Christian Brabandt <cb@256bit.org>
parents:
8977
diff
changeset
|
10541 #ifdef FEAT_TERMGUICOLORS |
|
773d627cac0b
commit https://github.com/vim/vim/commit/61be73bb0f965a895bfb064ea3e55476ac175162
Christian Brabandt <cb@256bit.org>
parents:
8977
diff
changeset
|
10542 && !p_tgc |
|
8969
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
10543 #endif |
| 677 | 10544 ); |
| 673 | 10545 |
|
10538
c7f671dfd735
patch 8.0.0159: crash on startup when updating tabline
Christian Brabandt <cb@256bit.org>
parents:
10466
diff
changeset
|
10546 if (ScreenLines == NULL) |
|
c7f671dfd735
patch 8.0.0159: crash on startup when updating tabline
Christian Brabandt <cb@256bit.org>
parents:
10466
diff
changeset
|
10547 return; |
| 673 | 10548 redraw_tabline = FALSE; |
| 667 | 10549 |
| 685 | 10550 #ifdef FEAT_GUI_TABLINE |
| 798 | 10551 /* Take care of a GUI tabline. */ |
| 685 | 10552 if (gui_use_tabline()) |
| 10553 { | |
| 10554 gui_update_tabline(); | |
| 10555 return; | |
| 10556 } | |
| 10557 #endif | |
| 10558 | |
| 10559 if (tabline_height() < 1) | |
| 667 | 10560 return; |
| 10561 | |
| 677 | 10562 #if defined(FEAT_STL_OPT) |
| 681 | 10563 |
| 10564 /* Init TabPageIdxs[] to zero: Clicking outside of tabs has no effect. */ | |
| 10565 for (scol = 0; scol < Columns; ++scol) | |
| 10566 TabPageIdxs[scol] = 0; | |
| 10567 | |
| 677 | 10568 /* Use the 'tabline' option if it's set. */ |
| 10569 if (*p_tal != NUL) | |
| 10570 { | |
|
8872
4d4de770f970
commit https://github.com/vim/vim/commit/f73d3bc253fa79ad220f52f04b93e782e95a9d43
Christian Brabandt <cb@256bit.org>
parents:
8847
diff
changeset
|
10571 int saved_did_emsg = did_emsg; |
| 680 | 10572 |
| 10573 /* Check for an error. If there is one we would loop in redrawing the | |
| 10574 * 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
|
10575 did_emsg = FALSE; |
| 677 | 10576 win_redr_custom(NULL, FALSE); |
|
8872
4d4de770f970
commit https://github.com/vim/vim/commit/f73d3bc253fa79ad220f52f04b93e782e95a9d43
Christian Brabandt <cb@256bit.org>
parents:
8847
diff
changeset
|
10577 if (did_emsg) |
| 680 | 10578 set_string_option_direct((char_u *)"tabline", -1, |
| 694 | 10579 (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
|
10580 did_emsg |= saved_did_emsg; |
| 680 | 10581 } |
| 10582 else | |
| 10583 #endif | |
| 10584 { | |
|
9649
fd9727ae3c49
commit https://github.com/vim/vim/commit/2932359000b2f918d5fade79ea4d124d5943cd07
Christian Brabandt <cb@256bit.org>
parents:
9645
diff
changeset
|
10585 FOR_ALL_TABPAGES(tp) |
| 680 | 10586 ++tabcount; |
| 10587 | |
| 10588 tabwidth = (Columns - 1 + tabcount / 2) / tabcount; | |
| 10589 if (tabwidth < 6) | |
| 10590 tabwidth = 6; | |
| 10591 | |
| 10592 attr = attr_nosel; | |
| 10593 tabcount = 0; | |
| 681 | 10594 scol = 0; |
| 699 | 10595 for (tp = first_tabpage; tp != NULL && col < Columns - 4; |
| 10596 tp = tp->tp_next) | |
| 680 | 10597 { |
| 10598 scol = col; | |
| 10599 | |
| 10600 if (tp->tp_topframe == topframe) | |
| 10601 attr = attr_sel; | |
| 10602 if (use_sep_chars && col > 0) | |
| 10603 screen_putchar('|', 0, col++, attr); | |
| 10604 | |
| 10605 if (tp->tp_topframe != topframe) | |
| 10606 attr = attr_nosel; | |
| 10607 | |
| 10608 screen_putchar(' ', 0, col++, attr); | |
| 10609 | |
| 10610 if (tp == curtab) | |
| 10611 { | |
| 10612 cwp = curwin; | |
| 10613 wp = firstwin; | |
| 10614 } | |
| 10615 else | |
| 10616 { | |
| 10617 cwp = tp->tp_curwin; | |
| 10618 wp = tp->tp_firstwin; | |
| 10619 } | |
| 10620 | |
| 10621 modified = FALSE; | |
| 10622 for (wincount = 0; wp != NULL; wp = wp->w_next, ++wincount) | |
| 10623 if (bufIsChanged(wp->w_buffer)) | |
| 10624 modified = TRUE; | |
| 10625 if (modified || wincount > 1) | |
| 10626 { | |
| 10627 if (wincount > 1) | |
| 10628 { | |
| 10629 vim_snprintf((char *)NameBuff, MAXPATHL, "%d", wincount); | |
| 835 | 10630 len = (int)STRLEN(NameBuff); |
| 699 | 10631 if (col + len >= Columns - 3) |
| 10632 break; | |
| 680 | 10633 screen_puts_len(NameBuff, len, 0, col, |
| 677 | 10634 #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
|
10635 hl_combine_attr(attr, HL_ATTR(HLF_T)) |
| 677 | 10636 #else |
| 6106 | 10637 attr |
| 680 | 10638 #endif |
| 10639 ); | |
| 10640 col += len; | |
| 10641 } | |
| 10642 if (modified) | |
| 10643 screen_puts_len((char_u *)"+", 1, 0, col++, attr); | |
| 10644 screen_putchar(' ', 0, col++, attr); | |
| 10645 } | |
| 10646 | |
| 10647 room = scol - col + tabwidth - 1; | |
| 10648 if (room > 0) | |
| 10649 { | |
| 685 | 10650 /* Get buffer name in NameBuff[] */ |
| 10651 get_trans_bufname(cwp->w_buffer); | |
| 819 | 10652 shorten_dir(NameBuff); |
| 680 | 10653 len = vim_strsize(NameBuff); |
| 10654 p = NameBuff; | |
| 677 | 10655 #ifdef FEAT_MBYTE |
| 680 | 10656 if (has_mbyte) |
| 10657 while (len > room) | |
| 10658 { | |
| 10659 len -= ptr2cells(p); | |
|
11127
506f5d8b7d8b
patch 8.0.0451: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11121
diff
changeset
|
10660 MB_PTR_ADV(p); |
| 680 | 10661 } |
| 10662 else | |
| 10663 #endif | |
| 10664 if (len > room) | |
| 677 | 10665 { |
| 680 | 10666 p += len - room; |
| 10667 len = room; | |
| 677 | 10668 } |
| 699 | 10669 if (len > Columns - col - 1) |
| 10670 len = Columns - col - 1; | |
| 680 | 10671 |
| 835 | 10672 screen_puts_len(p, (int)STRLEN(p), 0, col, attr); |
| 680 | 10673 col += len; |
| 10674 } | |
| 10675 screen_putchar(' ', 0, col++, attr); | |
| 10676 | |
| 10677 /* Store the tab page number in TabPageIdxs[], so that | |
| 10678 * jump_to_mouse() knows where each one is. */ | |
| 10679 ++tabcount; | |
| 10680 while (scol < col) | |
| 10681 TabPageIdxs[scol++] = tabcount; | |
| 10682 } | |
| 10683 | |
| 10684 if (use_sep_chars) | |
| 10685 c = '_'; | |
| 10686 else | |
| 10687 c = ' '; | |
| 10688 screen_fill(0, 1, col, (int)Columns, c, c, attr_fill); | |
| 681 | 10689 |
| 10690 /* Put an "X" for closing the current tab if there are several. */ | |
| 10691 if (first_tabpage->tp_next != NULL) | |
| 10692 { | |
| 10693 screen_putchar('X', 0, (int)Columns - 1, attr_nosel); | |
| 10694 TabPageIdxs[Columns - 1] = -999; | |
| 10695 } | |
| 10696 } | |
| 834 | 10697 |
| 10698 /* Reset the flag here again, in case evaluating 'tabline' causes it to be | |
| 10699 * set. */ | |
| 10700 redraw_tabline = FALSE; | |
| 667 | 10701 } |
| 685 | 10702 |
| 10703 /* | |
| 10704 * Get buffer name for "buf" into NameBuff[]. | |
| 10705 * Takes care of special buffer names and translates special characters. | |
| 10706 */ | |
| 10707 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
10708 get_trans_bufname(buf_T *buf) |
| 685 | 10709 { |
| 10710 if (buf_spname(buf) != NULL) | |
| 3839 | 10711 vim_strncpy(NameBuff, buf_spname(buf), MAXPATHL - 1); |
| 685 | 10712 else |
| 10713 home_replace(buf, buf->b_fname, NameBuff, MAXPATHL, TRUE); | |
| 10714 trans_characters(NameBuff, MAXPATHL); | |
| 10715 } | |
| 667 | 10716 #endif |
| 10717 | |
| 7 | 10718 #if defined(FEAT_WINDOWS) || defined(FEAT_WILDMENU) || defined(FEAT_STL_OPT) |
| 10719 /* | |
| 10720 * Get the character to use in a status line. Get its attributes in "*attr". | |
| 10721 */ | |
| 10722 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
|
10723 fillchar_status(int *attr, win_T *wp) |
| 7 | 10724 { |
| 10725 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
|
10726 |
|
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
|
10727 #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
|
10728 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
|
10729 { |
|
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
|
10730 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
|
10731 { |
|
68c593f649d1
patch 8.0.0941: existing color schemes don't like StatusLineTerm
Christian Brabandt <cb@256bit.org>
parents:
12114
diff
changeset
|
10732 *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
|
10733 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
|
10734 } |
|
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
|
10735 else |
|
12122
68c593f649d1
patch 8.0.0941: existing color schemes don't like StatusLineTerm
Christian Brabandt <cb@256bit.org>
parents:
12114
diff
changeset
|
10736 { |
|
68c593f649d1
patch 8.0.0941: existing color schemes don't like StatusLineTerm
Christian Brabandt <cb@256bit.org>
parents:
12114
diff
changeset
|
10737 *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
|
10738 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
|
10739 } |
|
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
|
10740 } |
|
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 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
|
10742 #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
|
10743 if (wp == curwin) |
| 7 | 10744 { |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
10745 *attr = HL_ATTR(HLF_S); |
| 7 | 10746 fill = fill_stl; |
| 10747 } | |
| 10748 else | |
| 10749 { | |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
10750 *attr = HL_ATTR(HLF_SNC); |
| 7 | 10751 fill = fill_stlnc; |
| 10752 } | |
| 10753 /* Use fill when there is highlighting, and highlighting of current | |
| 10754 * window differs, or the fillchars differ, or this is not the | |
| 10755 * current window */ | |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
10756 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
|
10757 || wp != curwin || ONE_WINDOW) |
| 7 | 10758 || (fill_stl != fill_stlnc))) |
| 10759 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
|
10760 if (wp == curwin) |
| 7 | 10761 return '^'; |
| 10762 return '='; | |
| 10763 } | |
| 10764 #endif | |
| 10765 | |
|
8643
24b43dd167eb
commit https://github.com/vim/vim/commit/44a2f923c00f1384c9ecde12fb5b4711bc20702e
Christian Brabandt <cb@256bit.org>
parents:
8627
diff
changeset
|
10766 #ifdef FEAT_WINDOWS |
| 7 | 10767 /* |
| 10768 * Get the character to use in a separator between vertically split windows. | |
| 10769 * Get its attributes in "*attr". | |
| 10770 */ | |
| 10771 static int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
10772 fillchar_vsep(int *attr) |
| 7 | 10773 { |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
10774 *attr = HL_ATTR(HLF_C); |
| 7 | 10775 if (*attr == 0 && fill_vert == ' ') |
| 10776 return '|'; | |
| 10777 else | |
| 10778 return fill_vert; | |
| 10779 } | |
| 10780 #endif | |
| 10781 | |
| 10782 /* | |
| 10783 * Return TRUE if redrawing should currently be done. | |
| 10784 */ | |
| 10785 int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
10786 redrawing(void) |
| 7 | 10787 { |
|
11105
7c7e496e625d
patch 8.0.0440: not enough test coverage in Insert mode
Christian Brabandt <cb@256bit.org>
parents:
11010
diff
changeset
|
10788 #ifdef FEAT_EVAL |
|
7c7e496e625d
patch 8.0.0440: not enough test coverage in Insert mode
Christian Brabandt <cb@256bit.org>
parents:
11010
diff
changeset
|
10789 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
|
10790 return 0; |
|
7c7e496e625d
patch 8.0.0440: not enough test coverage in Insert mode
Christian Brabandt <cb@256bit.org>
parents:
11010
diff
changeset
|
10791 else |
|
7c7e496e625d
patch 8.0.0440: not enough test coverage in Insert mode
Christian Brabandt <cb@256bit.org>
parents:
11010
diff
changeset
|
10792 #endif |
|
7c7e496e625d
patch 8.0.0440: not enough test coverage in Insert mode
Christian Brabandt <cb@256bit.org>
parents:
11010
diff
changeset
|
10793 return (!RedrawingDisabled |
| 7 | 10794 && !(p_lz && char_avail() && !KeyTyped && !do_redraw)); |
| 10795 } | |
| 10796 | |
| 10797 /* | |
| 10798 * Return TRUE if printing messages 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 messaging(void) |
| 7 | 10802 { |
| 10803 return (!(p_lz && char_avail() && !KeyTyped)); | |
| 10804 } | |
| 10805 | |
| 10806 /* | |
| 10807 * Show current status info in ruler and various other places | |
| 10808 * If always is FALSE, only show ruler if position has changed. | |
| 10809 */ | |
| 10810 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
10811 showruler(int always) |
| 7 | 10812 { |
| 10813 if (!always && !redrawing()) | |
| 10814 return; | |
| 574 | 10815 #ifdef FEAT_INS_EXPAND |
| 10816 if (pum_visible()) | |
| 10817 { | |
| 639 | 10818 # ifdef FEAT_WINDOWS |
| 574 | 10819 /* Don't redraw right now, do it later. */ |
| 10820 curwin->w_redr_status = TRUE; | |
| 639 | 10821 # endif |
| 574 | 10822 return; |
| 10823 } | |
| 10824 #endif | |
| 7 | 10825 #if defined(FEAT_STL_OPT) && defined(FEAT_WINDOWS) |
| 40 | 10826 if ((*p_stl != NUL || *curwin->w_p_stl != NUL) && curwin->w_status_height) |
| 680 | 10827 { |
| 1983 | 10828 redraw_custom_statusline(curwin); |
| 680 | 10829 } |
| 7 | 10830 else |
| 10831 #endif | |
| 10832 #ifdef FEAT_CMDL_INFO | |
| 10833 win_redr_ruler(curwin, always); | |
| 10834 #endif | |
| 10835 | |
| 10836 #ifdef FEAT_TITLE | |
| 10837 if (need_maketitle | |
| 10838 # ifdef FEAT_STL_OPT | |
| 10839 || (p_icon && (stl_syntax & STL_IN_ICON)) | |
| 10840 || (p_title && (stl_syntax & STL_IN_TITLE)) | |
| 10841 # endif | |
| 10842 ) | |
| 10843 maketitle(); | |
| 10844 #endif | |
| 1588 | 10845 #ifdef FEAT_WINDOWS |
| 10846 /* Redraw the tab pages line if needed. */ | |
| 10847 if (redraw_tabline) | |
| 10848 draw_tabline(); | |
| 10849 #endif | |
| 7 | 10850 } |
| 10851 | |
| 10852 #ifdef FEAT_CMDL_INFO | |
| 10853 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
10854 win_redr_ruler(win_T *wp, int always) |
| 7 | 10855 { |
| 1869 | 10856 #define RULER_BUF_LEN 70 |
| 10857 char_u buffer[RULER_BUF_LEN]; | |
| 7 | 10858 int row; |
| 10859 int fillchar; | |
| 10860 int attr; | |
| 10861 int empty_line = FALSE; | |
| 10862 colnr_T virtcol; | |
| 10863 int i; | |
| 1869 | 10864 size_t len; |
| 7 | 10865 int o; |
|
8643
24b43dd167eb
commit https://github.com/vim/vim/commit/44a2f923c00f1384c9ecde12fb5b4711bc20702e
Christian Brabandt <cb@256bit.org>
parents:
8627
diff
changeset
|
10866 #ifdef FEAT_WINDOWS |
| 7 | 10867 int this_ru_col; |
| 10868 int off = 0; | |
| 10869 int width = Columns; | |
| 10870 # define WITH_OFF(x) x | |
| 10871 # define WITH_WIDTH(x) x | |
| 10872 #else | |
| 10873 # define WITH_OFF(x) 0 | |
| 10874 # define WITH_WIDTH(x) Columns | |
| 10875 # define this_ru_col ru_col | |
| 10876 #endif | |
| 10877 | |
| 10878 /* If 'ruler' off or redrawing disabled, don't do anything */ | |
| 10879 if (!p_ru) | |
| 10880 return; | |
| 10881 | |
| 10882 /* | |
| 10883 * Check if cursor.lnum is valid, since win_redr_ruler() may be called | |
| 10884 * after deleting lines, before cursor.lnum is corrected. | |
| 10885 */ | |
| 10886 if (wp->w_cursor.lnum > wp->w_buffer->b_ml.ml_line_count) | |
| 10887 return; | |
| 10888 | |
| 10889 #ifdef FEAT_INS_EXPAND | |
| 10890 /* Don't draw the ruler while doing insert-completion, it might overwrite | |
| 10891 * the (long) mode message. */ | |
| 10892 # ifdef FEAT_WINDOWS | |
| 10893 if (wp == lastwin && lastwin->w_status_height == 0) | |
| 10894 # endif | |
| 10895 if (edit_submode != NULL) | |
| 10896 return; | |
| 540 | 10897 /* Don't draw the ruler when the popup menu is visible, it may overlap. */ |
| 10898 if (pum_visible()) | |
| 10899 return; | |
| 7 | 10900 #endif |
| 10901 | |
| 10902 #ifdef FEAT_STL_OPT | |
| 10903 if (*p_ruf) | |
| 10904 { | |
| 680 | 10905 int save_called_emsg = called_emsg; |
| 10906 | |
| 10907 called_emsg = FALSE; | |
| 7 | 10908 win_redr_custom(wp, TRUE); |
| 680 | 10909 if (called_emsg) |
| 10910 set_string_option_direct((char_u *)"rulerformat", -1, | |
| 694 | 10911 (char_u *)"", OPT_FREE, SID_ERROR); |
| 680 | 10912 called_emsg |= save_called_emsg; |
| 7 | 10913 return; |
| 10914 } | |
| 10915 #endif | |
| 10916 | |
| 10917 /* | |
| 10918 * Check if not in Insert mode and the line is empty (will show "0-1"). | |
| 10919 */ | |
| 10920 if (!(State & INSERT) | |
| 10921 && *ml_get_buf(wp->w_buffer, wp->w_cursor.lnum, FALSE) == NUL) | |
| 10922 empty_line = TRUE; | |
| 10923 | |
| 10924 /* | |
| 10925 * Only draw the ruler when something changed. | |
| 10926 */ | |
| 10927 validate_virtcol_win(wp); | |
| 10928 if ( redraw_cmdline | |
| 10929 || always | |
| 10930 || wp->w_cursor.lnum != wp->w_ru_cursor.lnum | |
| 10931 || wp->w_cursor.col != wp->w_ru_cursor.col | |
| 10932 || wp->w_virtcol != wp->w_ru_virtcol | |
| 10933 #ifdef FEAT_VIRTUALEDIT | |
| 10934 || wp->w_cursor.coladd != wp->w_ru_cursor.coladd | |
| 10935 #endif | |
| 10936 || wp->w_topline != wp->w_ru_topline | |
| 10937 || wp->w_buffer->b_ml.ml_line_count != wp->w_ru_line_count | |
| 10938 #ifdef FEAT_DIFF | |
| 10939 || wp->w_topfill != wp->w_ru_topfill | |
| 10940 #endif | |
| 10941 || empty_line != wp->w_ru_empty) | |
| 10942 { | |
| 10943 cursor_off(); | |
| 10944 #ifdef FEAT_WINDOWS | |
| 10945 if (wp->w_status_height) | |
| 10946 { | |
| 10947 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
|
10948 fillchar = fillchar_status(&attr, wp); |
| 7 | 10949 off = W_WINCOL(wp); |
| 10950 width = W_WIDTH(wp); | |
| 10951 } | |
| 10952 else | |
| 10953 #endif | |
| 10954 { | |
| 10955 row = Rows - 1; | |
| 10956 fillchar = ' '; | |
| 10957 attr = 0; | |
|
8643
24b43dd167eb
commit https://github.com/vim/vim/commit/44a2f923c00f1384c9ecde12fb5b4711bc20702e
Christian Brabandt <cb@256bit.org>
parents:
8627
diff
changeset
|
10958 #ifdef FEAT_WINDOWS |
| 7 | 10959 width = Columns; |
| 10960 off = 0; | |
| 10961 #endif | |
| 10962 } | |
| 10963 | |
| 10964 /* In list mode virtcol needs to be recomputed */ | |
| 10965 virtcol = wp->w_virtcol; | |
| 10966 if (wp->w_p_list && lcs_tab1 == NUL) | |
| 10967 { | |
| 10968 wp->w_p_list = FALSE; | |
| 10969 getvvcol(wp, &wp->w_cursor, NULL, &virtcol, NULL); | |
| 10970 wp->w_p_list = TRUE; | |
| 10971 } | |
| 10972 | |
| 10973 /* | |
| 10974 * Some sprintfs return the length, some return a pointer. | |
| 10975 * To avoid portability problems we use strlen() here. | |
| 10976 */ | |
| 1869 | 10977 vim_snprintf((char *)buffer, RULER_BUF_LEN, "%ld,", |
| 7 | 10978 (wp->w_buffer->b_ml.ml_flags & ML_EMPTY) |
| 10979 ? 0L | |
| 10980 : (long)(wp->w_cursor.lnum)); | |
| 1869 | 10981 len = STRLEN(buffer); |
| 10982 col_print(buffer + len, RULER_BUF_LEN - len, | |
| 7 | 10983 empty_line ? 0 : (int)wp->w_cursor.col + 1, |
| 10984 (int)virtcol + 1); | |
| 10985 | |
| 10986 /* | |
| 10987 * Add a "50%" if there is room for it. | |
| 10988 * On the last line, don't print in the last column (scrolls the | |
| 10989 * screen up on some terminals). | |
| 10990 */ | |
| 10991 i = (int)STRLEN(buffer); | |
| 1869 | 10992 get_rel_pos(wp, buffer + i + 1, RULER_BUF_LEN - i - 1); |
| 7 | 10993 o = i + vim_strsize(buffer + i + 1); |
| 10994 #ifdef FEAT_WINDOWS | |
| 10995 if (wp->w_status_height == 0) /* can't use last char of screen */ | |
| 10996 #endif | |
| 10997 ++o; | |
|
8643
24b43dd167eb
commit https://github.com/vim/vim/commit/44a2f923c00f1384c9ecde12fb5b4711bc20702e
Christian Brabandt <cb@256bit.org>
parents:
8627
diff
changeset
|
10998 #ifdef FEAT_WINDOWS |
| 7 | 10999 this_ru_col = ru_col - (Columns - width); |
| 11000 if (this_ru_col < 0) | |
| 11001 this_ru_col = 0; | |
| 11002 #endif | |
| 11003 /* Never use more than half the window/screen width, leave the other | |
| 11004 * half for the filename. */ | |
| 11005 if (this_ru_col < (WITH_WIDTH(width) + 1) / 2) | |
| 11006 this_ru_col = (WITH_WIDTH(width) + 1) / 2; | |
| 11007 if (this_ru_col + o < WITH_WIDTH(width)) | |
| 11008 { | |
| 6466 | 11009 /* need at least 3 chars left for get_rel_pos() + NUL */ |
| 11010 while (this_ru_col + o < WITH_WIDTH(width) && RULER_BUF_LEN > i + 4) | |
| 7 | 11011 { |
| 11012 #ifdef FEAT_MBYTE | |
| 11013 if (has_mbyte) | |
| 11014 i += (*mb_char2bytes)(fillchar, buffer + i); | |
| 11015 else | |
| 11016 #endif | |
| 11017 buffer[i++] = fillchar; | |
| 11018 ++o; | |
| 11019 } | |
| 1869 | 11020 get_rel_pos(wp, buffer + i, RULER_BUF_LEN - i); |
| 7 | 11021 } |
| 11022 /* Truncate at window boundary. */ | |
| 11023 #ifdef FEAT_MBYTE | |
| 11024 if (has_mbyte) | |
| 11025 { | |
| 11026 o = 0; | |
| 474 | 11027 for (i = 0; buffer[i] != NUL; i += (*mb_ptr2len)(buffer + i)) |
| 7 | 11028 { |
| 11029 o += (*mb_ptr2cells)(buffer + i); | |
| 11030 if (this_ru_col + o > WITH_WIDTH(width)) | |
| 11031 { | |
| 11032 buffer[i] = NUL; | |
| 11033 break; | |
| 11034 } | |
| 11035 } | |
| 11036 } | |
| 11037 else | |
| 11038 #endif | |
| 11039 if (this_ru_col + (int)STRLEN(buffer) > WITH_WIDTH(width)) | |
| 11040 buffer[WITH_WIDTH(width) - this_ru_col] = NUL; | |
| 11041 | |
| 11042 screen_puts(buffer, row, this_ru_col + WITH_OFF(off), attr); | |
| 11043 i = redraw_cmdline; | |
| 11044 screen_fill(row, row + 1, | |
| 11045 this_ru_col + WITH_OFF(off) + (int)STRLEN(buffer), | |
| 11046 (int)(WITH_OFF(off) + WITH_WIDTH(width)), | |
| 11047 fillchar, fillchar, attr); | |
| 11048 /* don't redraw the cmdline because of showing the ruler */ | |
| 11049 redraw_cmdline = i; | |
| 11050 wp->w_ru_cursor = wp->w_cursor; | |
| 11051 wp->w_ru_virtcol = wp->w_virtcol; | |
| 11052 wp->w_ru_empty = empty_line; | |
| 11053 wp->w_ru_topline = wp->w_topline; | |
| 11054 wp->w_ru_line_count = wp->w_buffer->b_ml.ml_line_count; | |
| 11055 #ifdef FEAT_DIFF | |
| 11056 wp->w_ru_topfill = wp->w_topfill; | |
| 11057 #endif | |
| 11058 } | |
| 11059 } | |
| 11060 #endif | |
| 13 | 11061 |
| 11062 #if defined(FEAT_LINEBREAK) || defined(PROTO) | |
| 11063 /* | |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
11064 * 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
|
11065 * Caller may need to check if 'number' or 'relativenumber' is set. |
| 13 | 11066 * Otherwise it depends on 'numberwidth' and the line count. |
| 11067 */ | |
| 11068 int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
11069 number_width(win_T *wp) |
| 13 | 11070 { |
| 11071 int n; | |
| 11072 linenr_T lnum; | |
| 11073 | |
|
4736
3f2319a953b3
updated for version 7.3.1115
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
11074 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
|
11075 /* cursor line shows "0" */ |
|
3f2319a953b3
updated for version 7.3.1115
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
11076 lnum = wp->w_height; |
|
3f2319a953b3
updated for version 7.3.1115
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
11077 else |
|
3f2319a953b3
updated for version 7.3.1115
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
11078 /* cursor line shows absolute line number */ |
|
3f2319a953b3
updated for version 7.3.1115
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
11079 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
|
11080 |
| 6679 | 11081 if (lnum == wp->w_nrwidth_line_count && wp->w_nuw_cached == wp->w_p_nuw) |
| 13 | 11082 return wp->w_nrwidth_width; |
| 11083 wp->w_nrwidth_line_count = lnum; | |
| 11084 | |
| 11085 n = 0; | |
| 11086 do | |
| 11087 { | |
| 856 | 11088 lnum /= 10; |
| 11089 ++n; | |
| 13 | 11090 } while (lnum > 0); |
| 11091 | |
| 11092 /* 'numberwidth' gives the minimal width plus one */ | |
| 11093 if (n < wp->w_p_nuw - 1) | |
| 11094 n = wp->w_p_nuw - 1; | |
| 11095 | |
| 11096 wp->w_nrwidth_width = n; | |
| 6679 | 11097 wp->w_nuw_cached = wp->w_p_nuw; |
| 13 | 11098 return n; |
| 11099 } | |
| 11100 #endif | |
| 3986 | 11101 |
| 11102 /* | |
| 11103 * Return the current cursor column. This is the actual position on the | |
| 11104 * screen. First column is 0. | |
| 11105 */ | |
| 11106 int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
11107 screen_screencol(void) |
| 3986 | 11108 { |
| 11109 return screen_cur_col; | |
| 11110 } | |
| 11111 | |
| 11112 /* | |
| 11113 * Return the current cursor row. This is the actual position on the screen. | |
| 11114 * First row is 0. | |
| 11115 */ | |
| 11116 int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
11117 screen_screenrow(void) |
| 3986 | 11118 { |
| 11119 return screen_cur_row; | |
| 11120 } |