Mercurial > vim
annotate src/screen.c @ 11672:3c6cc2f24645 v8.0.0719
patch 8.0.0719: build failure without +terminal feature
commit https://github.com/vim/vim/commit/c0aa482a5add1e1125fd983d62c67a182c76ae24
Author: Bram Moolenaar <Bram@vim.org>
Date: Sun Jul 16 14:04:29 2017 +0200
patch 8.0.0719: build failure without +terminal feature
Problem: Build failure without +terminal feature.
Solution: Add #ifdefs.
| author | Christian Brabandt <cb@256bit.org> |
|---|---|
| date | Sun, 16 Jul 2017 14:15:03 +0200 |
| parents | 3b2afa2b77b3 |
| children | 4f59d2a66bf7 |
| 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 | |
| 115 /* | |
| 116 * Buffer for one screen line (characters and attributes). | |
| 117 */ | |
| 118 static schar_T *current_ScreenLine; | |
| 119 | |
|
7805
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7697
diff
changeset
|
120 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
|
121 static void win_draw_end(win_T *wp, int c1, int c2, int row, int endrow, hlf_T hl); |
| 7 | 122 #ifdef FEAT_FOLDING |
|
7805
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7697
diff
changeset
|
123 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
|
124 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
|
125 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
|
126 #endif |
|
11529
998d2cf59caa
patch 8.0.0647: syntax highlighting can make cause a freeze
Christian Brabandt <cb@256bit.org>
parents:
11521
diff
changeset
|
127 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
|
128 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
|
129 #ifdef FEAT_WINDOWS |
|
7805
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7697
diff
changeset
|
130 static void draw_vsep_win(win_T *wp, int row); |
| 7 | 131 #endif |
| 680 | 132 #ifdef FEAT_STL_OPT |
|
7805
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7697
diff
changeset
|
133 static void redraw_custom_statusline(win_T *wp); |
| 680 | 134 #endif |
| 7 | 135 #ifdef FEAT_SEARCH_EXTRA |
| 5985 | 136 # define SEARCH_HL_PRIORITY 0 |
|
7805
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7697
diff
changeset
|
137 static void start_search_hl(void); |
|
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7697
diff
changeset
|
138 static void end_search_hl(void); |
|
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7697
diff
changeset
|
139 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
|
140 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
|
141 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
|
142 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
|
143 #endif |
|
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7697
diff
changeset
|
144 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
|
145 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
|
146 #ifdef FEAT_MBYTE |
|
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7697
diff
changeset
|
147 static void screen_char_2(unsigned off, int row, int col); |
|
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7697
diff
changeset
|
148 #endif |
|
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7697
diff
changeset
|
149 static void screenclear2(void); |
|
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7697
diff
changeset
|
150 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
|
151 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
|
152 #ifdef FEAT_WINDOWS |
|
7805
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7697
diff
changeset
|
153 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
|
154 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
|
155 #endif |
|
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7697
diff
changeset
|
156 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
|
157 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
|
158 static void msg_pos_mode(void); |
|
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7697
diff
changeset
|
159 static void recording_mode(int attr); |
| 667 | 160 #if defined(FEAT_WINDOWS) |
|
7805
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7697
diff
changeset
|
161 static void draw_tabline(void); |
| 667 | 162 #endif |
| 7 | 163 #if defined(FEAT_WINDOWS) || defined(FEAT_WILDMENU) || defined(FEAT_STL_OPT) |
|
7805
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7697
diff
changeset
|
164 static int fillchar_status(int *attr, int is_curwin); |
| 7 | 165 #endif |
|
8643
24b43dd167eb
commit https://github.com/vim/vim/commit/44a2f923c00f1384c9ecde12fb5b4711bc20702e
Christian Brabandt <cb@256bit.org>
parents:
8627
diff
changeset
|
166 #ifdef FEAT_WINDOWS |
|
7805
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7697
diff
changeset
|
167 static int fillchar_vsep(int *attr); |
| 7 | 168 #endif |
| 169 #ifdef FEAT_STL_OPT | |
|
7805
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7697
diff
changeset
|
170 static void win_redr_custom(win_T *wp, int draw_ruler); |
| 7 | 171 #endif |
| 172 #ifdef FEAT_CMDL_INFO | |
|
7805
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7697
diff
changeset
|
173 static void win_redr_ruler(win_T *wp, int always); |
| 7 | 174 #endif |
| 175 | |
|
8643
24b43dd167eb
commit https://github.com/vim/vim/commit/44a2f923c00f1384c9ecde12fb5b4711bc20702e
Christian Brabandt <cb@256bit.org>
parents:
8627
diff
changeset
|
176 #if defined(FEAT_CLIPBOARD) || defined(FEAT_WINDOWS) |
| 7 | 177 /* Ugly global: overrule attribute used by screen_char() */ |
| 178 static int screen_char_attr = 0; | |
| 179 #endif | |
| 180 | |
|
11529
998d2cf59caa
patch 8.0.0647: syntax highlighting can make cause a freeze
Christian Brabandt <cb@256bit.org>
parents:
11521
diff
changeset
|
181 #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
|
182 /* 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
|
183 # 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
|
184 #endif |
|
998d2cf59caa
patch 8.0.0647: syntax highlighting can make cause a freeze
Christian Brabandt <cb@256bit.org>
parents:
11521
diff
changeset
|
185 |
|
11672
3c6cc2f24645
patch 8.0.0719: build failure without +terminal feature
Christian Brabandt <cb@256bit.org>
parents:
11670
diff
changeset
|
186 #ifdef FEAT_RIGHTLEFT |
|
3c6cc2f24645
patch 8.0.0719: build failure without +terminal feature
Christian Brabandt <cb@256bit.org>
parents:
11670
diff
changeset
|
187 # define HAS_RIGHTLEFT(x) x |
|
3c6cc2f24645
patch 8.0.0719: build failure without +terminal feature
Christian Brabandt <cb@256bit.org>
parents:
11670
diff
changeset
|
188 #else |
|
3c6cc2f24645
patch 8.0.0719: build failure without +terminal feature
Christian Brabandt <cb@256bit.org>
parents:
11670
diff
changeset
|
189 # define HAS_RIGHTLEFT(x) FALSE |
|
3c6cc2f24645
patch 8.0.0719: build failure without +terminal feature
Christian Brabandt <cb@256bit.org>
parents:
11670
diff
changeset
|
190 #endif |
|
3c6cc2f24645
patch 8.0.0719: build failure without +terminal feature
Christian Brabandt <cb@256bit.org>
parents:
11670
diff
changeset
|
191 |
| 7 | 192 /* |
| 193 * Redraw the current window later, with update_screen(type). | |
| 194 * Set must_redraw only if not already set to a higher value. | |
| 195 * e.g. if must_redraw is CLEAR, type NOT_VALID will do nothing. | |
| 196 */ | |
| 197 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
198 redraw_later(int type) |
| 7 | 199 { |
| 200 redraw_win_later(curwin, type); | |
| 201 } | |
| 202 | |
| 203 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
204 redraw_win_later( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
205 win_T *wp, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
206 int type) |
| 7 | 207 { |
| 208 if (wp->w_redr_type < type) | |
| 209 { | |
| 210 wp->w_redr_type = type; | |
| 211 if (type >= NOT_VALID) | |
| 212 wp->w_lines_valid = 0; | |
| 213 if (must_redraw < type) /* must_redraw is the maximum of all windows */ | |
| 214 must_redraw = type; | |
| 215 } | |
| 216 } | |
| 217 | |
| 218 /* | |
| 219 * Force a complete redraw later. Also resets the highlighting. To be used | |
| 220 * after executing a shell command that messes up the screen. | |
| 221 */ | |
| 222 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
223 redraw_later_clear(void) |
| 7 | 224 { |
| 225 redraw_all_later(CLEAR); | |
| 826 | 226 #ifdef FEAT_GUI |
| 227 if (gui.in_use) | |
| 228 /* Use a code that will reset gui.highlight_mask in | |
| 229 * gui_stop_highlight(). */ | |
| 230 screen_attr = HL_ALL + 1; | |
| 231 else | |
| 232 #endif | |
| 233 /* Use attributes that is very unlikely to appear in text. */ | |
| 234 screen_attr = HL_BOLD | HL_UNDERLINE | HL_INVERSE; | |
| 7 | 235 } |
| 236 | |
| 237 /* | |
| 238 * Mark all windows to be redrawn later. | |
| 239 */ | |
| 240 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
241 redraw_all_later(int type) |
| 7 | 242 { |
| 243 win_T *wp; | |
| 244 | |
| 245 FOR_ALL_WINDOWS(wp) | |
| 246 { | |
| 247 redraw_win_later(wp, type); | |
| 248 } | |
| 249 } | |
| 250 | |
| 251 /* | |
| 301 | 252 * Mark all windows that are editing the current buffer to be updated later. |
| 7 | 253 */ |
| 254 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
255 redraw_curbuf_later(int type) |
| 7 | 256 { |
| 257 redraw_buf_later(curbuf, type); | |
| 258 } | |
| 259 | |
| 260 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
261 redraw_buf_later(buf_T *buf, int type) |
| 7 | 262 { |
| 263 win_T *wp; | |
| 264 | |
| 265 FOR_ALL_WINDOWS(wp) | |
| 266 { | |
| 267 if (wp->w_buffer == buf) | |
| 268 redraw_win_later(wp, type); | |
| 269 } | |
| 270 } | |
| 271 | |
|
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
|
272 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
|
273 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
|
274 { |
|
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
|
275 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
|
276 |
|
11657
a7cd2a53590c
patch 8.0.0711: cannot build without the wildmenu feature
Christian Brabandt <cb@256bit.org>
parents:
11655
diff
changeset
|
277 #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
|
278 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
|
279 /* 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
|
280 * 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
|
281 return; |
|
11657
a7cd2a53590c
patch 8.0.0711: cannot build without the wildmenu feature
Christian Brabandt <cb@256bit.org>
parents:
11655
diff
changeset
|
282 #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
|
283 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
|
284 { |
|
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
|
285 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
|
286 { |
|
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 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
|
288 #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
|
289 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
|
290 #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
|
291 } |
|
32aed0993813
patch 8.0.0592: if a job writes to a buffer screen is not updated
Christian Brabandt <cb@256bit.org>
parents:
11277
diff
changeset
|
292 } |
|
32aed0993813
patch 8.0.0592: if a job writes to a buffer screen is not updated
Christian Brabandt <cb@256bit.org>
parents:
11277
diff
changeset
|
293 } |
|
32aed0993813
patch 8.0.0592: if a job writes to a buffer screen is not updated
Christian Brabandt <cb@256bit.org>
parents:
11277
diff
changeset
|
294 |
| 7 | 295 /* |
|
5090
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
296 * 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
|
297 * 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
|
298 * Return a code indicating what happened. |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
299 */ |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
300 int |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
301 redraw_asap(int type) |
|
5090
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
302 { |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
303 int rows; |
| 6959 | 304 int cols = screen_Columns; |
|
5090
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
305 int r; |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
306 int ret = 0; |
|
5096
a6ddcab6a240
updated for version 7.3.1291
Bram Moolenaar <bram@vim.org>
parents:
5090
diff
changeset
|
307 schar_T *screenline; /* copy from ScreenLines[] */ |
|
a6ddcab6a240
updated for version 7.3.1291
Bram Moolenaar <bram@vim.org>
parents:
5090
diff
changeset
|
308 sattr_T *screenattr; /* copy from ScreenAttrs[] */ |
|
5090
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
309 #ifdef FEAT_MBYTE |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
310 int i; |
|
5096
a6ddcab6a240
updated for version 7.3.1291
Bram Moolenaar <bram@vim.org>
parents:
5090
diff
changeset
|
311 u8char_T *screenlineUC = NULL; /* copy from ScreenLinesUC[] */ |
|
5090
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
312 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
|
313 schar_T *screenline2 = NULL; /* copy from ScreenLines2[] */ |
|
5090
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
314 #endif |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
315 |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
316 redraw_later(type); |
| 6959 | 317 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
|
318 return ret; |
|
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 /* Allocate space to save the text displayed in the command line area. */ |
| 6959 | 321 rows = screen_Rows - cmdline_row; |
|
5090
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
322 screenline = (schar_T *)lalloc( |
| 6959 | 323 (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
|
324 screenattr = (sattr_T *)lalloc( |
| 6959 | 325 (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
|
326 if (screenline == NULL || screenattr == NULL) |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
327 ret = 2; |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
328 #ifdef FEAT_MBYTE |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
329 if (enc_utf8) |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
330 { |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
331 screenlineUC = (u8char_T *)lalloc( |
| 6959 | 332 (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
|
333 if (screenlineUC == NULL) |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
334 ret = 2; |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
335 for (i = 0; i < p_mco; ++i) |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
336 { |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
337 screenlineC[i] = (u8char_T *)lalloc( |
| 6959 | 338 (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
|
339 if (screenlineC[i] == NULL) |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
340 ret = 2; |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
341 } |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
342 } |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
343 if (enc_dbcs == DBCS_JPNU) |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
344 { |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
345 screenline2 = (schar_T *)lalloc( |
| 6959 | 346 (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
|
347 if (screenline2 == NULL) |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
348 ret = 2; |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
349 } |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
350 #endif |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
351 |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
352 if (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 /* 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
|
355 for (r = 0; r < rows; ++r) |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
356 { |
| 6959 | 357 mch_memmove(screenline + r * cols, |
|
5090
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
358 ScreenLines + LineOffset[cmdline_row + r], |
| 6959 | 359 (size_t)cols * sizeof(schar_T)); |
| 360 mch_memmove(screenattr + r * cols, | |
|
5090
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
361 ScreenAttrs + LineOffset[cmdline_row + r], |
| 6959 | 362 (size_t)cols * sizeof(sattr_T)); |
|
5090
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
363 #ifdef FEAT_MBYTE |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
364 if (enc_utf8) |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
365 { |
| 6959 | 366 mch_memmove(screenlineUC + r * cols, |
|
5090
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
367 ScreenLinesUC + LineOffset[cmdline_row + r], |
| 6959 | 368 (size_t)cols * sizeof(u8char_T)); |
|
5090
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
369 for (i = 0; i < p_mco; ++i) |
| 6959 | 370 mch_memmove(screenlineC[i] + r * cols, |
| 371 ScreenLinesC[i] + LineOffset[cmdline_row + r], | |
| 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 } |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
374 if (enc_dbcs == DBCS_JPNU) |
| 6959 | 375 mch_memmove(screenline2 + r * cols, |
|
5090
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
376 ScreenLines2 + LineOffset[cmdline_row + r], |
| 6959 | 377 (size_t)cols * sizeof(schar_T)); |
|
5090
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
378 #endif |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
379 } |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
380 |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
381 update_screen(0); |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
382 ret = 3; |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
383 |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
384 if (must_redraw == 0) |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
385 { |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
386 int off = (int)(current_ScreenLine - ScreenLines); |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
387 |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
388 /* Restore the text displayed in the command line area. */ |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
389 for (r = 0; r < rows; ++r) |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
390 { |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
391 mch_memmove(current_ScreenLine, |
| 6959 | 392 screenline + r * cols, |
| 393 (size_t)cols * sizeof(schar_T)); | |
|
5090
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
394 mch_memmove(ScreenAttrs + off, |
| 6959 | 395 screenattr + r * cols, |
| 396 (size_t)cols * sizeof(sattr_T)); | |
|
5090
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
397 #ifdef FEAT_MBYTE |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
398 if (enc_utf8) |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
399 { |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
400 mch_memmove(ScreenLinesUC + off, |
| 6959 | 401 screenlineUC + r * cols, |
| 402 (size_t)cols * sizeof(u8char_T)); | |
|
5090
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
403 for (i = 0; i < p_mco; ++i) |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
404 mch_memmove(ScreenLinesC[i] + off, |
| 6959 | 405 screenlineC[i] + 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 } |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
408 if (enc_dbcs == DBCS_JPNU) |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
409 mch_memmove(ScreenLines2 + off, |
| 6959 | 410 screenline2 + r * cols, |
| 411 (size_t)cols * sizeof(schar_T)); | |
| 412 #endif | |
|
11670
3b2afa2b77b3
patch 8.0.0718: output of job in terminal is not displayed
Christian Brabandt <cb@256bit.org>
parents:
11657
diff
changeset
|
413 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
|
414 } |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
415 ret = 4; |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
416 } |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
417 } |
|
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 vim_free(screenline); |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
420 vim_free(screenattr); |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
421 #ifdef FEAT_MBYTE |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
422 if (enc_utf8) |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
423 { |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
424 vim_free(screenlineUC); |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
425 for (i = 0; i < p_mco; ++i) |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
426 vim_free(screenlineC[i]); |
|
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 if (enc_dbcs == DBCS_JPNU) |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
429 vim_free(screenline2); |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
430 #endif |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
431 |
|
5126
71859e71b1f9
updated for version 7.3.1306
Bram Moolenaar <bram@vim.org>
parents:
5096
diff
changeset
|
432 /* Show the intro message when appropriate. */ |
|
71859e71b1f9
updated for version 7.3.1306
Bram Moolenaar <bram@vim.org>
parents:
5096
diff
changeset
|
433 maybe_intro_message(); |
|
71859e71b1f9
updated for version 7.3.1306
Bram Moolenaar <bram@vim.org>
parents:
5096
diff
changeset
|
434 |
|
71859e71b1f9
updated for version 7.3.1306
Bram Moolenaar <bram@vim.org>
parents:
5096
diff
changeset
|
435 setcursor(); |
|
71859e71b1f9
updated for version 7.3.1306
Bram Moolenaar <bram@vim.org>
parents:
5096
diff
changeset
|
436 |
|
5090
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
437 return ret; |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
438 } |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
439 |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
440 /* |
|
8577
63dc856bd13d
commit https://github.com/vim/vim/commit/975b5271eed4fa0500c24a8f37be0b1797cb9db7
Christian Brabandt <cb@256bit.org>
parents:
8212
diff
changeset
|
441 * 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
|
442 * 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
|
443 * 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
|
444 */ |
|
63dc856bd13d
commit https://github.com/vim/vim/commit/975b5271eed4fa0500c24a8f37be0b1797cb9db7
Christian Brabandt <cb@256bit.org>
parents:
8212
diff
changeset
|
445 void |
|
9282
9f97a6290c63
commit https://github.com/vim/vim/commit/cf089463492fab53b2a5d81517829d22f882f82e
Christian Brabandt <cb@256bit.org>
parents:
9213
diff
changeset
|
446 redraw_after_callback(void) |
|
8577
63dc856bd13d
commit https://github.com/vim/vim/commit/975b5271eed4fa0500c24a8f37be0b1797cb9db7
Christian Brabandt <cb@256bit.org>
parents:
8212
diff
changeset
|
447 { |
|
8627
7c98c5d0298c
commit https://github.com/vim/vim/commit/bfb96c047b79b2aab5fd57a2472871508819f3ef
Christian Brabandt <cb@256bit.org>
parents:
8577
diff
changeset
|
448 if (State == HITRETURN || State == ASKMORE) |
|
7c98c5d0298c
commit https://github.com/vim/vim/commit/bfb96c047b79b2aab5fd57a2472871508819f3ef
Christian Brabandt <cb@256bit.org>
parents:
8577
diff
changeset
|
449 ; /* do nothing */ |
|
7c98c5d0298c
commit https://github.com/vim/vim/commit/bfb96c047b79b2aab5fd57a2472871508819f3ef
Christian Brabandt <cb@256bit.org>
parents:
8577
diff
changeset
|
450 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
|
451 { |
|
11655
8014350fe51a
patch 8.0.0710: a job that writes to a buffer clears completion
Christian Brabandt <cb@256bit.org>
parents:
11607
diff
changeset
|
452 /* 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
|
453 * wildmenu entries. */ |
|
11657
a7cd2a53590c
patch 8.0.0711: cannot build without the wildmenu feature
Christian Brabandt <cb@256bit.org>
parents:
11655
diff
changeset
|
454 if (msg_scrolled == 0 |
|
a7cd2a53590c
patch 8.0.0711: cannot build without the wildmenu feature
Christian Brabandt <cb@256bit.org>
parents:
11655
diff
changeset
|
455 #ifdef FEAT_WILDMENU |
|
a7cd2a53590c
patch 8.0.0711: cannot build without the wildmenu feature
Christian Brabandt <cb@256bit.org>
parents:
11655
diff
changeset
|
456 && wild_menu_showing == 0 |
|
a7cd2a53590c
patch 8.0.0711: cannot build without the wildmenu feature
Christian Brabandt <cb@256bit.org>
parents:
11655
diff
changeset
|
457 #endif |
|
a7cd2a53590c
patch 8.0.0711: cannot build without the wildmenu feature
Christian Brabandt <cb@256bit.org>
parents:
11655
diff
changeset
|
458 ) |
|
11416
32aed0993813
patch 8.0.0592: if a job writes to a buffer screen is not updated
Christian Brabandt <cb@256bit.org>
parents:
11277
diff
changeset
|
459 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
|
460 /* 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
|
461 * 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
|
462 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
|
463 } |
|
9444
e08c8502d7ce
commit https://github.com/vim/vim/commit/144445d15f2369a58b94b6fee2fe162fc81c8abe
Christian Brabandt <cb@256bit.org>
parents:
9428
diff
changeset
|
464 else if (State & (NORMAL | INSERT)) |
|
8627
7c98c5d0298c
commit https://github.com/vim/vim/commit/bfb96c047b79b2aab5fd57a2472871508819f3ef
Christian Brabandt <cb@256bit.org>
parents:
8577
diff
changeset
|
465 { |
|
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
|
466 /* 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
|
467 update_screen(VALID_NO_UPDATE); |
|
8627
7c98c5d0298c
commit https://github.com/vim/vim/commit/bfb96c047b79b2aab5fd57a2472871508819f3ef
Christian Brabandt <cb@256bit.org>
parents:
8577
diff
changeset
|
468 setcursor(); |
|
7c98c5d0298c
commit https://github.com/vim/vim/commit/bfb96c047b79b2aab5fd57a2472871508819f3ef
Christian Brabandt <cb@256bit.org>
parents:
8577
diff
changeset
|
469 } |
|
8577
63dc856bd13d
commit https://github.com/vim/vim/commit/975b5271eed4fa0500c24a8f37be0b1797cb9db7
Christian Brabandt <cb@256bit.org>
parents:
8212
diff
changeset
|
470 cursor_on(); |
|
63dc856bd13d
commit https://github.com/vim/vim/commit/975b5271eed4fa0500c24a8f37be0b1797cb9db7
Christian Brabandt <cb@256bit.org>
parents:
8212
diff
changeset
|
471 out_flush(); |
|
63dc856bd13d
commit https://github.com/vim/vim/commit/975b5271eed4fa0500c24a8f37be0b1797cb9db7
Christian Brabandt <cb@256bit.org>
parents:
8212
diff
changeset
|
472 #ifdef FEAT_GUI |
|
63dc856bd13d
commit https://github.com/vim/vim/commit/975b5271eed4fa0500c24a8f37be0b1797cb9db7
Christian Brabandt <cb@256bit.org>
parents:
8212
diff
changeset
|
473 if (gui.in_use) |
|
63dc856bd13d
commit https://github.com/vim/vim/commit/975b5271eed4fa0500c24a8f37be0b1797cb9db7
Christian Brabandt <cb@256bit.org>
parents:
8212
diff
changeset
|
474 { |
|
9428
0c7f47088e55
commit https://github.com/vim/vim/commit/9d5d3c9c4468ad76f16b50eabd3d9e7eab2ed44d
Christian Brabandt <cb@256bit.org>
parents:
9320
diff
changeset
|
475 /* 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
|
476 * flicker. */ |
|
0c7f47088e55
commit https://github.com/vim/vim/commit/9d5d3c9c4468ad76f16b50eabd3d9e7eab2ed44d
Christian Brabandt <cb@256bit.org>
parents:
9320
diff
changeset
|
477 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
|
478 gui_update_cursor(FALSE, FALSE); |
|
8577
63dc856bd13d
commit https://github.com/vim/vim/commit/975b5271eed4fa0500c24a8f37be0b1797cb9db7
Christian Brabandt <cb@256bit.org>
parents:
8212
diff
changeset
|
479 gui_mch_flush(); |
|
63dc856bd13d
commit https://github.com/vim/vim/commit/975b5271eed4fa0500c24a8f37be0b1797cb9db7
Christian Brabandt <cb@256bit.org>
parents:
8212
diff
changeset
|
480 } |
|
63dc856bd13d
commit https://github.com/vim/vim/commit/975b5271eed4fa0500c24a8f37be0b1797cb9db7
Christian Brabandt <cb@256bit.org>
parents:
8212
diff
changeset
|
481 #endif |
|
63dc856bd13d
commit https://github.com/vim/vim/commit/975b5271eed4fa0500c24a8f37be0b1797cb9db7
Christian Brabandt <cb@256bit.org>
parents:
8212
diff
changeset
|
482 } |
|
63dc856bd13d
commit https://github.com/vim/vim/commit/975b5271eed4fa0500c24a8f37be0b1797cb9db7
Christian Brabandt <cb@256bit.org>
parents:
8212
diff
changeset
|
483 |
|
63dc856bd13d
commit https://github.com/vim/vim/commit/975b5271eed4fa0500c24a8f37be0b1797cb9db7
Christian Brabandt <cb@256bit.org>
parents:
8212
diff
changeset
|
484 /* |
| 7 | 485 * Changed something in the current window, at buffer line "lnum", that |
| 486 * requires that line and possibly other lines to be redrawn. | |
| 487 * Used when entering/leaving Insert mode with the cursor on a folded line. | |
| 488 * Used to remove the "$" from a change command. | |
| 489 * Note that when also inserting/deleting lines w_redraw_top and w_redraw_bot | |
| 490 * may become invalid and the whole window will have to be redrawn. | |
| 491 */ | |
| 492 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
493 redrawWinline( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
494 linenr_T lnum, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
495 int invalid UNUSED) /* window line height is invalid now */ |
| 7 | 496 { |
| 497 #ifdef FEAT_FOLDING | |
| 498 int i; | |
| 499 #endif | |
| 500 | |
| 501 if (curwin->w_redraw_top == 0 || curwin->w_redraw_top > lnum) | |
| 502 curwin->w_redraw_top = lnum; | |
| 503 if (curwin->w_redraw_bot == 0 || curwin->w_redraw_bot < lnum) | |
| 504 curwin->w_redraw_bot = lnum; | |
| 505 redraw_later(VALID); | |
| 506 | |
| 507 #ifdef FEAT_FOLDING | |
| 508 if (invalid) | |
| 509 { | |
| 510 /* A w_lines[] entry for this lnum has become invalid. */ | |
| 511 i = find_wl_entry(curwin, lnum); | |
| 512 if (i >= 0) | |
| 513 curwin->w_lines[i].wl_valid = FALSE; | |
| 514 } | |
| 515 #endif | |
| 516 } | |
| 517 | |
| 518 /* | |
|
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
|
519 * Update all windows that are editing the current buffer. |
| 7 | 520 */ |
| 521 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
522 update_curbuf(int type) |
| 7 | 523 { |
| 524 redraw_curbuf_later(type); | |
| 525 update_screen(type); | |
| 526 } | |
| 527 | |
| 528 /* | |
| 529 * Based on the current value of curwin->w_topline, transfer a screenfull | |
| 530 * of stuff from Filemem to ScreenLines[], and update curwin->w_botline. | |
| 531 */ | |
| 532 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
|
533 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
|
534 { |
|
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
|
535 int type = type_arg; |
| 7 | 536 win_T *wp; |
| 537 static int did_intro = FALSE; | |
| 538 #if defined(FEAT_SEARCH_EXTRA) || defined(FEAT_CLIPBOARD) | |
| 539 int did_one; | |
| 540 #endif | |
|
9444
e08c8502d7ce
commit https://github.com/vim/vim/commit/144445d15f2369a58b94b6fee2fe162fc81c8abe
Christian Brabandt <cb@256bit.org>
parents:
9428
diff
changeset
|
541 #ifdef FEAT_GUI |
|
9848
664276833670
commit https://github.com/vim/vim/commit/107abd2ca53c31fd3bb40d77ff296e98eaae2975
Christian Brabandt <cb@256bit.org>
parents:
9754
diff
changeset
|
542 int did_undraw = FALSE; |
|
9444
e08c8502d7ce
commit https://github.com/vim/vim/commit/144445d15f2369a58b94b6fee2fe162fc81c8abe
Christian Brabandt <cb@256bit.org>
parents:
9428
diff
changeset
|
543 int gui_cursor_col; |
|
e08c8502d7ce
commit https://github.com/vim/vim/commit/144445d15f2369a58b94b6fee2fe162fc81c8abe
Christian Brabandt <cb@256bit.org>
parents:
9428
diff
changeset
|
544 int gui_cursor_row; |
|
e08c8502d7ce
commit https://github.com/vim/vim/commit/144445d15f2369a58b94b6fee2fe162fc81c8abe
Christian Brabandt <cb@256bit.org>
parents:
9428
diff
changeset
|
545 #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
|
546 int no_update = FALSE; |
| 7 | 547 |
| 2008 | 548 /* Don't do anything if the screen structures are (not yet) valid. */ |
| 7 | 549 if (!screen_valid(TRUE)) |
| 550 return; | |
| 551 | |
|
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
|
552 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
|
553 { |
|
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 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
|
555 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
|
556 } |
|
32aed0993813
patch 8.0.0592: if a job writes to a buffer screen is not updated
Christian Brabandt <cb@256bit.org>
parents:
11277
diff
changeset
|
557 |
| 7 | 558 if (must_redraw) |
| 559 { | |
| 560 if (type < must_redraw) /* use maximal type */ | |
| 561 type = must_redraw; | |
| 1331 | 562 |
| 563 /* must_redraw is reset here, so that when we run into some weird | |
| 564 * reason to redraw while busy redrawing (e.g., asynchronous | |
| 565 * scrolling), or update_topline() in win_update() will cause a | |
| 566 * scroll, the screen will be redrawn later or in win_update(). */ | |
| 7 | 567 must_redraw = 0; |
| 568 } | |
| 569 | |
| 570 /* Need to update w_lines[]. */ | |
| 571 if (curwin->w_lines_valid == 0 && type < NOT_VALID) | |
| 572 type = NOT_VALID; | |
| 573 | |
| 2008 | 574 /* Postpone the redrawing when it's not needed and when being called |
| 575 * recursively. */ | |
| 576 if (!redrawing() || updating_screen) | |
| 7 | 577 { |
| 578 redraw_later(type); /* remember type for next time */ | |
| 579 must_redraw = type; | |
| 580 if (type > INVERTED_ALL) | |
| 581 curwin->w_lines_valid = 0; /* don't use w_lines[].wl_size now */ | |
| 582 return; | |
| 583 } | |
| 584 | |
| 585 updating_screen = TRUE; | |
| 586 #ifdef FEAT_SYN_HL | |
| 587 ++display_tick; /* let syntax code know we're in a next round of | |
| 588 * display updating */ | |
| 589 #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
|
590 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
|
591 ++no_win_do_lines_ins; |
| 7 | 592 |
| 593 /* | |
| 594 * if the screen was scrolled up when displaying a message, scroll it down | |
| 595 */ | |
| 596 if (msg_scrolled) | |
| 597 { | |
| 598 clear_cmdline = TRUE; | |
| 599 if (msg_scrolled > Rows - 5) /* clearing is faster */ | |
| 600 type = CLEAR; | |
| 601 else if (type != CLEAR) | |
| 602 { | |
| 603 check_for_delay(FALSE); | |
| 604 if (screen_ins_lines(0, 0, msg_scrolled, (int)Rows, NULL) == FAIL) | |
| 605 type = CLEAR; | |
| 606 FOR_ALL_WINDOWS(wp) | |
| 607 { | |
| 608 if (W_WINROW(wp) < msg_scrolled) | |
| 609 { | |
| 610 if (W_WINROW(wp) + wp->w_height > msg_scrolled | |
| 611 && wp->w_redr_type < REDRAW_TOP | |
| 612 && wp->w_lines_valid > 0 | |
| 613 && wp->w_topline == wp->w_lines[0].wl_lnum) | |
| 614 { | |
| 615 wp->w_upd_rows = msg_scrolled - W_WINROW(wp); | |
| 616 wp->w_redr_type = REDRAW_TOP; | |
| 617 } | |
| 618 else | |
| 619 { | |
| 620 wp->w_redr_type = NOT_VALID; | |
| 621 #ifdef FEAT_WINDOWS | |
| 622 if (W_WINROW(wp) + wp->w_height + W_STATUS_HEIGHT(wp) | |
| 623 <= msg_scrolled) | |
| 624 wp->w_redr_status = TRUE; | |
| 625 #endif | |
| 626 } | |
| 627 } | |
| 628 } | |
|
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
|
629 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
|
630 redraw_cmdline = TRUE; |
| 667 | 631 #ifdef FEAT_WINDOWS |
| 673 | 632 redraw_tabline = TRUE; |
| 667 | 633 #endif |
| 7 | 634 } |
| 635 msg_scrolled = 0; | |
| 636 need_wait_return = FALSE; | |
| 637 } | |
| 638 | |
| 639 /* reset cmdline_row now (may have been changed temporarily) */ | |
| 640 compute_cmdrow(); | |
| 641 | |
| 642 /* Check for changed highlighting */ | |
| 643 if (need_highlight_changed) | |
| 644 highlight_changed(); | |
| 645 | |
| 646 if (type == CLEAR) /* first clear screen */ | |
| 647 { | |
| 648 screenclear(); /* will reset clear_cmdline */ | |
| 649 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
|
650 /* 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
|
651 must_redraw = 0; |
| 7 | 652 } |
| 653 | |
| 654 if (clear_cmdline) /* going to clear cmdline (done below) */ | |
| 655 check_for_delay(FALSE); | |
| 656 | |
| 13 | 657 #ifdef FEAT_LINEBREAK |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
658 /* 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
|
659 * changes. */ |
| 13 | 660 if (curwin->w_redr_type < NOT_VALID |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
661 && 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
|
662 ? number_width(curwin) : 0)) |
| 13 | 663 curwin->w_redr_type = NOT_VALID; |
| 664 #endif | |
| 665 | |
| 7 | 666 /* |
| 667 * Only start redrawing if there is really something to do. | |
| 668 */ | |
| 669 if (type == INVERTED) | |
| 670 update_curswant(); | |
| 671 if (curwin->w_redr_type < type | |
| 672 && !((type == VALID | |
| 673 && curwin->w_lines[0].wl_valid | |
| 674 #ifdef FEAT_DIFF | |
| 675 && curwin->w_topfill == curwin->w_old_topfill | |
| 676 && curwin->w_botfill == curwin->w_old_botfill | |
| 677 #endif | |
| 678 && curwin->w_topline == curwin->w_lines[0].wl_lnum) | |
| 679 || (type == INVERTED | |
| 1043 | 680 && VIsual_active |
| 7 | 681 && curwin->w_old_cursor_lnum == curwin->w_cursor.lnum |
| 682 && curwin->w_old_visual_mode == VIsual_mode | |
| 683 && (curwin->w_valid & VALID_VIRTCOL) | |
| 684 && curwin->w_old_curswant == curwin->w_curswant) | |
| 685 )) | |
| 686 curwin->w_redr_type = type; | |
| 687 | |
| 849 | 688 #ifdef FEAT_WINDOWS |
| 689 /* Redraw the tab pages line if needed. */ | |
| 690 if (redraw_tabline || type >= NOT_VALID) | |
| 691 draw_tabline(); | |
| 692 #endif | |
| 693 | |
| 7 | 694 #ifdef FEAT_SYN_HL |
| 695 /* | |
| 696 * Correct stored syntax highlighting info for changes in each displayed | |
| 697 * buffer. Each buffer must only be done once. | |
| 698 */ | |
| 699 FOR_ALL_WINDOWS(wp) | |
| 700 { | |
| 701 if (wp->w_buffer->b_mod_set) | |
| 702 { | |
| 703 # ifdef FEAT_WINDOWS | |
| 704 win_T *wwp; | |
| 705 | |
| 706 /* Check if we already did this buffer. */ | |
| 707 for (wwp = firstwin; wwp != wp; wwp = wwp->w_next) | |
| 708 if (wwp->w_buffer == wp->w_buffer) | |
| 709 break; | |
| 710 # endif | |
| 711 if ( | |
| 712 # ifdef FEAT_WINDOWS | |
| 713 wwp == wp && | |
| 714 # endif | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
715 syntax_present(wp)) |
| 7 | 716 syn_stack_apply_changes(wp->w_buffer); |
| 717 } | |
| 718 } | |
| 719 #endif | |
| 720 | |
| 721 /* | |
| 722 * Go from top to bottom through the windows, redrawing the ones that need | |
| 723 * it. | |
| 724 */ | |
| 725 #if defined(FEAT_SEARCH_EXTRA) || defined(FEAT_CLIPBOARD) | |
| 726 did_one = FALSE; | |
| 727 #endif | |
| 728 #ifdef FEAT_SEARCH_EXTRA | |
| 729 search_hl.rm.regprog = NULL; | |
| 730 #endif | |
| 731 FOR_ALL_WINDOWS(wp) | |
| 732 { | |
| 733 if (wp->w_redr_type != 0) | |
| 734 { | |
| 735 cursor_off(); | |
| 736 #if defined(FEAT_SEARCH_EXTRA) || defined(FEAT_CLIPBOARD) | |
| 737 if (!did_one) | |
| 738 { | |
| 739 did_one = TRUE; | |
| 740 # ifdef FEAT_SEARCH_EXTRA | |
| 741 start_search_hl(); | |
| 742 # endif | |
| 743 # ifdef FEAT_CLIPBOARD | |
| 744 /* When Visual area changed, may have to update selection. */ | |
| 3674 | 745 if (clip_star.available && clip_isautosel_star()) |
| 746 clip_update_selection(&clip_star); | |
| 747 if (clip_plus.available && clip_isautosel_plus()) | |
| 748 clip_update_selection(&clip_plus); | |
| 7 | 749 # endif |
| 750 #ifdef FEAT_GUI | |
| 751 /* Remove the cursor before starting to do anything, because | |
| 752 * scrolling may make it difficult to redraw the text under | |
| 753 * it. */ | |
|
9848
664276833670
commit https://github.com/vim/vim/commit/107abd2ca53c31fd3bb40d77ff296e98eaae2975
Christian Brabandt <cb@256bit.org>
parents:
9754
diff
changeset
|
754 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
|
755 { |
|
e08c8502d7ce
commit https://github.com/vim/vim/commit/144445d15f2369a58b94b6fee2fe162fc81c8abe
Christian Brabandt <cb@256bit.org>
parents:
9428
diff
changeset
|
756 gui_cursor_col = gui.cursor_col; |
|
e08c8502d7ce
commit https://github.com/vim/vim/commit/144445d15f2369a58b94b6fee2fe162fc81c8abe
Christian Brabandt <cb@256bit.org>
parents:
9428
diff
changeset
|
757 gui_cursor_row = gui.cursor_row; |
| 7 | 758 gui_undraw_cursor(); |
|
9848
664276833670
commit https://github.com/vim/vim/commit/107abd2ca53c31fd3bb40d77ff296e98eaae2975
Christian Brabandt <cb@256bit.org>
parents:
9754
diff
changeset
|
759 did_undraw = TRUE; |
|
9444
e08c8502d7ce
commit https://github.com/vim/vim/commit/144445d15f2369a58b94b6fee2fe162fc81c8abe
Christian Brabandt <cb@256bit.org>
parents:
9428
diff
changeset
|
760 } |
| 7 | 761 #endif |
| 762 } | |
| 763 #endif | |
| 764 win_update(wp); | |
| 765 } | |
| 766 | |
| 767 #ifdef FEAT_WINDOWS | |
| 768 /* redraw status line after the window to minimize cursor movement */ | |
| 769 if (wp->w_redr_status) | |
| 770 { | |
| 771 cursor_off(); | |
| 772 win_redr_status(wp); | |
| 773 } | |
| 774 #endif | |
| 775 } | |
| 776 #if defined(FEAT_SEARCH_EXTRA) | |
| 777 end_search_hl(); | |
| 778 #endif | |
| 4107 | 779 #ifdef FEAT_INS_EXPAND |
| 780 /* May need to redraw the popup menu. */ | |
| 781 if (pum_visible()) | |
| 782 pum_redraw(); | |
| 783 #endif | |
| 7 | 784 |
| 785 #ifdef FEAT_WINDOWS | |
| 786 /* Reset b_mod_set flags. Going through all windows is probably faster | |
| 787 * than going through all buffers (there could be many buffers). */ | |
|
9649
fd9727ae3c49
commit https://github.com/vim/vim/commit/2932359000b2f918d5fade79ea4d124d5943cd07
Christian Brabandt <cb@256bit.org>
parents:
9645
diff
changeset
|
788 FOR_ALL_WINDOWS(wp) |
| 7 | 789 wp->w_buffer->b_mod_set = FALSE; |
| 790 #else | |
| 791 curbuf->b_mod_set = FALSE; | |
| 792 #endif | |
| 793 | |
| 794 updating_screen = FALSE; | |
| 795 #ifdef FEAT_GUI | |
| 796 gui_may_resize_shell(); | |
| 797 #endif | |
| 798 | |
| 799 /* Clear or redraw the command line. Done last, because scrolling may | |
| 800 * mess up the command line. */ | |
| 801 if (clear_cmdline || redraw_cmdline) | |
| 802 showmode(); | |
| 803 | |
|
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
|
804 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
|
805 --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
|
806 |
| 7 | 807 /* 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
|
808 if (!did_intro) |
|
71859e71b1f9
updated for version 7.3.1306
Bram Moolenaar <bram@vim.org>
parents:
5096
diff
changeset
|
809 maybe_intro_message(); |
| 7 | 810 did_intro = TRUE; |
| 811 | |
| 812 #ifdef FEAT_GUI | |
| 813 /* Redraw the cursor and update the scrollbars when all screen updating is | |
| 814 * done. */ | |
| 815 if (gui.in_use) | |
| 816 { | |
| 817 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
|
818 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
|
819 { |
|
e08c8502d7ce
commit https://github.com/vim/vim/commit/144445d15f2369a58b94b6fee2fe162fc81c8abe
Christian Brabandt <cb@256bit.org>
parents:
9428
diff
changeset
|
820 /* 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
|
821 * uses that. */ |
|
e08c8502d7ce
commit https://github.com/vim/vim/commit/144445d15f2369a58b94b6fee2fe162fc81c8abe
Christian Brabandt <cb@256bit.org>
parents:
9428
diff
changeset
|
822 gui.col = gui_cursor_col; |
|
e08c8502d7ce
commit https://github.com/vim/vim/commit/144445d15f2369a58b94b6fee2fe162fc81c8abe
Christian Brabandt <cb@256bit.org>
parents:
9428
diff
changeset
|
823 gui.row = gui_cursor_row; |
|
10247
d54d4a258b96
commit https://github.com/vim/vim/commit/84dbd494dca599ecff05b2c2279d402c12e6d197
Christian Brabandt <cb@256bit.org>
parents:
10042
diff
changeset
|
824 # ifdef FEAT_MBYTE |
|
d54d4a258b96
commit https://github.com/vim/vim/commit/84dbd494dca599ecff05b2c2279d402c12e6d197
Christian Brabandt <cb@256bit.org>
parents:
10042
diff
changeset
|
825 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
|
826 # endif |
| 7 | 827 gui_update_cursor(FALSE, FALSE); |
|
9446
aaa6639b6f14
commit https://github.com/vim/vim/commit/65549bdef5805ba5a18a3d2d3909998dd7d9ed46
Christian Brabandt <cb@256bit.org>
parents:
9444
diff
changeset
|
828 screen_cur_col = gui.col; |
|
aaa6639b6f14
commit https://github.com/vim/vim/commit/65549bdef5805ba5a18a3d2d3909998dd7d9ed46
Christian Brabandt <cb@256bit.org>
parents:
9444
diff
changeset
|
829 screen_cur_row = gui.row; |
|
9444
e08c8502d7ce
commit https://github.com/vim/vim/commit/144445d15f2369a58b94b6fee2fe162fc81c8abe
Christian Brabandt <cb@256bit.org>
parents:
9428
diff
changeset
|
830 } |
| 7 | 831 gui_update_scrollbars(FALSE); |
| 832 } | |
| 833 #endif | |
| 834 } | |
| 835 | |
|
10793
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
836 #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
|
837 /* |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
838 * 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
|
839 * 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
|
840 */ |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
841 static void |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
842 update_prepare(void) |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
843 { |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
844 cursor_off(); |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
845 updating_screen = TRUE; |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
846 #ifdef FEAT_GUI |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
847 /* 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
|
848 * 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
|
849 if (gui.in_use) |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
850 gui_undraw_cursor(); |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
851 #endif |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
852 #ifdef FEAT_SEARCH_EXTRA |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
853 start_search_hl(); |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
854 #endif |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
855 } |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
856 |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
857 /* |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
858 * 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
|
859 */ |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
860 static void |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
861 update_finish(void) |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
862 { |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
863 if (redraw_cmdline) |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
864 showmode(); |
|
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 # ifdef FEAT_SEARCH_EXTRA |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
867 end_search_hl(); |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
868 # endif |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
869 |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
870 updating_screen = FALSE; |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
871 |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
872 # ifdef FEAT_GUI |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
873 gui_may_resize_shell(); |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
874 |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
875 /* 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
|
876 * done. */ |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
877 if (gui.in_use) |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
878 { |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
879 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
|
880 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
|
881 gui_update_scrollbars(FALSE); |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
882 } |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
883 # endif |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
884 } |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
885 #endif |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
886 |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
887 #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
|
888 /* |
|
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
889 * 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
|
890 * 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
|
891 */ |
|
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
892 int |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
893 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
|
894 { |
|
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
895 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
|
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 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
|
898 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
|
899 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
|
900 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
|
901 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
|
902 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
|
903 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
|
904 c = 'n'; |
|
2382
3a5ededa240a
Add the 'c' flag to 'concealcursor'.
Bram Moolenaar <bram@vim.org>
parents:
2381
diff
changeset
|
905 else if (State & CMDLINE) |
|
3a5ededa240a
Add the 'c' flag to 'concealcursor'.
Bram Moolenaar <bram@vim.org>
parents:
2381
diff
changeset
|
906 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
|
907 else |
|
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
908 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
|
909 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
|
910 } |
|
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
911 |
|
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
912 /* |
|
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
913 * 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
|
914 */ |
|
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
915 void |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
916 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
|
917 { |
|
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
918 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
|
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 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
|
921 /* 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
|
922 * 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
|
923 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
|
924 } |
|
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 |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
927 void |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
928 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
|
929 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
930 int row; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
931 int j; |
|
11529
998d2cf59caa
patch 8.0.0647: syntax highlighting can make cause a freeze
Christian Brabandt <cb@256bit.org>
parents:
11521
diff
changeset
|
932 #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
|
933 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
|
934 #endif |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
935 |
|
9100
ddccff0480d2
commit https://github.com/vim/vim/commit/908be438794619f10ef7fa25e24e5893b2ae0189
Christian Brabandt <cb@256bit.org>
parents:
9027
diff
changeset
|
936 /* 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
|
937 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
|
938 return; |
|
ddccff0480d2
commit https://github.com/vim/vim/commit/908be438794619f10ef7fa25e24e5893b2ae0189
Christian Brabandt <cb@256bit.org>
parents:
9027
diff
changeset
|
939 |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
940 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
|
941 && foldedCount(wp, lnum, &win_foldinfo) == 0) |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
942 { |
|
11529
998d2cf59caa
patch 8.0.0647: syntax highlighting can make cause a freeze
Christian Brabandt <cb@256bit.org>
parents:
11521
diff
changeset
|
943 #ifdef SYN_TIME_LIMIT |
|
998d2cf59caa
patch 8.0.0647: syntax highlighting can make cause a freeze
Christian Brabandt <cb@256bit.org>
parents:
11521
diff
changeset
|
944 /* 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
|
945 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
|
946 #endif |
|
10793
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
947 update_prepare(); |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
948 |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
949 row = 0; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
950 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
|
951 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
952 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
|
953 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
954 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
|
955 # ifdef FEAT_SEARCH_EXTRA |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
956 init_search_hl(wp); |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
957 start_search_hl(); |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
958 prepare_search_hl(wp, lnum); |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
959 # endif |
|
11529
998d2cf59caa
patch 8.0.0647: syntax highlighting can make cause a freeze
Christian Brabandt <cb@256bit.org>
parents:
11521
diff
changeset
|
960 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
|
961 #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
|
962 &syntax_tm |
|
998d2cf59caa
patch 8.0.0647: syntax highlighting can make cause a freeze
Christian Brabandt <cb@256bit.org>
parents:
11521
diff
changeset
|
963 #else |
|
998d2cf59caa
patch 8.0.0647: syntax highlighting can make cause a freeze
Christian Brabandt <cb@256bit.org>
parents:
11521
diff
changeset
|
964 NULL |
|
998d2cf59caa
patch 8.0.0647: syntax highlighting can make cause a freeze
Christian Brabandt <cb@256bit.org>
parents:
11521
diff
changeset
|
965 #endif |
|
998d2cf59caa
patch 8.0.0647: syntax highlighting can make cause a freeze
Christian Brabandt <cb@256bit.org>
parents:
11521
diff
changeset
|
966 ); |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
967 # if defined(FEAT_SEARCH_EXTRA) |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
968 end_search_hl(); |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
969 # endif |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
970 break; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
971 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
972 row += wp->w_lines[j].wl_size; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
973 } |
|
10793
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
974 |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
975 update_finish(); |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
976 } |
|
2378
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
977 need_cursor_line_redraw = FALSE; |
| 7 | 978 } |
| 979 #endif | |
| 980 | |
| 981 #if defined(FEAT_SIGNS) || defined(PROTO) | |
| 982 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
983 update_debug_sign(buf_T *buf, linenr_T lnum) |
| 7 | 984 { |
| 985 win_T *wp; | |
| 986 int doit = FALSE; | |
| 987 | |
| 988 # ifdef FEAT_FOLDING | |
| 989 win_foldinfo.fi_level = 0; | |
| 990 # endif | |
| 991 | |
| 992 /* update/delete a specific mark */ | |
| 993 FOR_ALL_WINDOWS(wp) | |
| 994 { | |
| 995 if (buf != NULL && lnum > 0) | |
| 996 { | |
| 997 if (wp->w_buffer == buf && lnum >= wp->w_topline | |
| 998 && lnum < wp->w_botline) | |
| 999 { | |
| 1000 if (wp->w_redraw_top == 0 || wp->w_redraw_top > lnum) | |
| 1001 wp->w_redraw_top = lnum; | |
| 1002 if (wp->w_redraw_bot == 0 || wp->w_redraw_bot < lnum) | |
| 1003 wp->w_redraw_bot = lnum; | |
| 1004 redraw_win_later(wp, VALID); | |
| 1005 } | |
| 1006 } | |
| 1007 else | |
| 1008 redraw_win_later(wp, VALID); | |
| 1009 if (wp->w_redr_type != 0) | |
| 1010 doit = TRUE; | |
| 1011 } | |
| 1012 | |
| 3250 | 1013 /* Return when there is nothing to do, screen updating is already |
| 1014 * happening (recursive call) or still starting up. */ | |
| 1015 if (!doit || updating_screen | |
| 1016 #ifdef FEAT_GUI | |
| 1017 || gui.starting | |
| 1018 #endif | |
| 1019 || starting) | |
| 7 | 1020 return; |
| 1021 | |
| 1022 /* update all windows that need updating */ | |
| 1023 update_prepare(); | |
| 1024 | |
| 1025 # ifdef FEAT_WINDOWS | |
|
9649
fd9727ae3c49
commit https://github.com/vim/vim/commit/2932359000b2f918d5fade79ea4d124d5943cd07
Christian Brabandt <cb@256bit.org>
parents:
9645
diff
changeset
|
1026 FOR_ALL_WINDOWS(wp) |
| 7 | 1027 { |
| 1028 if (wp->w_redr_type != 0) | |
| 1029 win_update(wp); | |
| 1030 if (wp->w_redr_status) | |
| 1031 win_redr_status(wp); | |
| 1032 } | |
| 1033 # else | |
| 1034 if (curwin->w_redr_type != 0) | |
| 1035 win_update(curwin); | |
| 1036 # endif | |
| 1037 | |
| 1038 update_finish(); | |
| 1039 } | |
| 1040 #endif | |
| 1041 | |
| 1042 | |
| 1043 #if defined(FEAT_GUI) || defined(PROTO) | |
| 1044 /* | |
| 1045 * Update a single window, its status line and maybe the command line msg. | |
| 1046 * Used for the GUI scrollbar. | |
| 1047 */ | |
| 1048 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1049 updateWindow(win_T *wp) |
| 7 | 1050 { |
| 2008 | 1051 /* return if already busy updating */ |
| 1052 if (updating_screen) | |
| 1053 return; | |
| 1054 | |
| 7 | 1055 update_prepare(); |
| 1056 | |
| 1057 #ifdef FEAT_CLIPBOARD | |
| 1058 /* When Visual area changed, may have to update selection. */ | |
| 3674 | 1059 if (clip_star.available && clip_isautosel_star()) |
| 1060 clip_update_selection(&clip_star); | |
| 1061 if (clip_plus.available && clip_isautosel_plus()) | |
| 1062 clip_update_selection(&clip_plus); | |
| 7 | 1063 #endif |
| 670 | 1064 |
| 7 | 1065 win_update(wp); |
| 670 | 1066 |
| 7 | 1067 #ifdef FEAT_WINDOWS |
| 670 | 1068 /* When the screen was cleared redraw the tab pages line. */ |
| 673 | 1069 if (redraw_tabline) |
| 677 | 1070 draw_tabline(); |
| 670 | 1071 |
| 7 | 1072 if (wp->w_redr_status |
| 1073 # ifdef FEAT_CMDL_INFO | |
| 1074 || p_ru | |
| 1075 # endif | |
| 1076 # ifdef FEAT_STL_OPT | |
| 40 | 1077 || *p_stl != NUL || *wp->w_p_stl != NUL |
| 7 | 1078 # endif |
| 1079 ) | |
| 1080 win_redr_status(wp); | |
| 1081 #endif | |
| 1082 | |
| 1083 update_finish(); | |
| 1084 } | |
| 1085 #endif | |
| 1086 | |
| 1087 /* | |
| 1088 * Update a single window. | |
| 1089 * | |
| 1090 * This may cause the windows below it also to be redrawn (when clearing the | |
| 1091 * screen or scrolling lines). | |
| 1092 * | |
| 1093 * How the window is redrawn depends on wp->w_redr_type. Each type also | |
| 1094 * implies the one below it. | |
| 1095 * NOT_VALID redraw the whole window | |
| 743 | 1096 * SOME_VALID redraw the whole window but do scroll when possible |
| 7 | 1097 * REDRAW_TOP redraw the top w_upd_rows window lines, otherwise like VALID |
| 1098 * INVERTED redraw the changed part of the Visual area | |
| 1099 * INVERTED_ALL redraw the whole Visual area | |
| 1100 * VALID 1. scroll up/down to adjust for a changed w_topline | |
| 1101 * 2. update lines at the top when scrolled down | |
| 1102 * 3. redraw changed text: | |
| 301 | 1103 * - if wp->w_buffer->b_mod_set set, update lines between |
| 7 | 1104 * b_mod_top and b_mod_bot. |
| 1105 * - if wp->w_redraw_top non-zero, redraw lines between | |
| 1106 * wp->w_redraw_top and wp->w_redr_bot. | |
| 1107 * - continue redrawing when syntax status is invalid. | |
| 1108 * 4. if scrolled up, update lines at the bottom. | |
| 1109 * This results in three areas that may need updating: | |
| 1110 * top: from first row to top_end (when scrolled down) | |
| 1111 * mid: from mid_start to mid_end (update inversion or changed text) | |
| 1112 * bot: from bot_start to last row (when scrolled up) | |
| 1113 */ | |
| 1114 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1115 win_update(win_T *wp) |
| 7 | 1116 { |
| 1117 buf_T *buf = wp->w_buffer; | |
| 1118 int type; | |
| 1119 int top_end = 0; /* Below last row of the top area that needs | |
| 1120 updating. 0 when no top area updating. */ | |
| 1121 int mid_start = 999;/* first row of the mid area that needs | |
| 1122 updating. 999 when no mid area updating. */ | |
| 1123 int mid_end = 0; /* Below last row of the mid area that needs | |
| 1124 updating. 0 when no mid area updating. */ | |
| 1125 int bot_start = 999;/* first row of the bot area that needs | |
| 1126 updating. 999 when no bot area updating */ | |
| 1127 int scrolled_down = FALSE; /* TRUE when scrolled down when | |
| 1128 w_topline got smaller a bit */ | |
| 1129 #ifdef FEAT_SEARCH_EXTRA | |
| 1326 | 1130 matchitem_T *cur; /* points to the match list */ |
| 7 | 1131 int top_to_mod = FALSE; /* redraw above mod_top */ |
| 1132 #endif | |
| 1133 | |
| 1134 int row; /* current window row to display */ | |
| 1135 linenr_T lnum; /* current buffer lnum to display */ | |
| 1136 int idx; /* current index in w_lines[] */ | |
| 1137 int srow; /* starting row of the current line */ | |
| 1138 | |
| 1139 int eof = FALSE; /* if TRUE, we hit the end of the file */ | |
| 1140 int didline = FALSE; /* if TRUE, we finished the last line */ | |
| 1141 int i; | |
| 1142 long j; | |
| 1143 static int recursive = FALSE; /* being called recursively */ | |
| 1144 int old_botline = wp->w_botline; | |
| 1145 #ifdef FEAT_FOLDING | |
| 1146 long fold_count; | |
| 1147 #endif | |
| 1148 #ifdef FEAT_SYN_HL | |
| 1149 /* remember what happened to the previous line, to know if | |
| 1150 * check_visual_highlight() can be used */ | |
| 1151 #define DID_NONE 1 /* didn't update a line */ | |
| 1152 #define DID_LINE 2 /* updated a normal line */ | |
| 1153 #define DID_FOLD 3 /* updated a folded line */ | |
| 1154 int did_update = DID_NONE; | |
| 1155 linenr_T syntax_last_parsed = 0; /* last parsed text line */ | |
| 1156 #endif | |
| 1157 linenr_T mod_top = 0; | |
| 1158 linenr_T mod_bot = 0; | |
| 1159 #if defined(FEAT_SYN_HL) || defined(FEAT_SEARCH_EXTRA) | |
| 1160 int save_got_int; | |
| 1161 #endif | |
|
11529
998d2cf59caa
patch 8.0.0647: syntax highlighting can make cause a freeze
Christian Brabandt <cb@256bit.org>
parents:
11521
diff
changeset
|
1162 #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
|
1163 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
|
1164 #endif |
| 7 | 1165 |
| 1166 type = wp->w_redr_type; | |
| 1167 | |
| 1168 if (type == NOT_VALID) | |
| 1169 { | |
| 1170 #ifdef FEAT_WINDOWS | |
| 1171 wp->w_redr_status = TRUE; | |
| 1172 #endif | |
| 1173 wp->w_lines_valid = 0; | |
| 1174 } | |
| 1175 | |
| 1176 /* Window is zero-height: nothing to draw. */ | |
| 1177 if (wp->w_height == 0) | |
| 1178 { | |
| 1179 wp->w_redr_type = 0; | |
| 1180 return; | |
| 1181 } | |
| 1182 | |
|
8643
24b43dd167eb
commit https://github.com/vim/vim/commit/44a2f923c00f1384c9ecde12fb5b4711bc20702e
Christian Brabandt <cb@256bit.org>
parents:
8627
diff
changeset
|
1183 #ifdef FEAT_WINDOWS |
| 7 | 1184 /* Window is zero-width: Only need to draw the separator. */ |
| 1185 if (wp->w_width == 0) | |
| 1186 { | |
| 1187 /* draw the vertical separator right of this window */ | |
| 1188 draw_vsep_win(wp, 0); | |
| 1189 wp->w_redr_type = 0; | |
| 1190 return; | |
| 1191 } | |
| 1192 #endif | |
| 1193 | |
|
11670
3b2afa2b77b3
patch 8.0.0718: output of job in terminal is not displayed
Christian Brabandt <cb@256bit.org>
parents:
11657
diff
changeset
|
1194 #ifdef FEAT_TERMINAL |
|
3b2afa2b77b3
patch 8.0.0718: output of job in terminal is not displayed
Christian Brabandt <cb@256bit.org>
parents:
11657
diff
changeset
|
1195 if (wp->w_buffer->b_term != NULL) |
|
3b2afa2b77b3
patch 8.0.0718: output of job in terminal is not displayed
Christian Brabandt <cb@256bit.org>
parents:
11657
diff
changeset
|
1196 { |
|
3b2afa2b77b3
patch 8.0.0718: output of job in terminal is not displayed
Christian Brabandt <cb@256bit.org>
parents:
11657
diff
changeset
|
1197 /* This window contains a terminal, redraw works completely |
|
3b2afa2b77b3
patch 8.0.0718: output of job in terminal is not displayed
Christian Brabandt <cb@256bit.org>
parents:
11657
diff
changeset
|
1198 * differently. */ |
|
3b2afa2b77b3
patch 8.0.0718: output of job in terminal is not displayed
Christian Brabandt <cb@256bit.org>
parents:
11657
diff
changeset
|
1199 term_update_window(wp); |
|
3b2afa2b77b3
patch 8.0.0718: output of job in terminal is not displayed
Christian Brabandt <cb@256bit.org>
parents:
11657
diff
changeset
|
1200 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
|
1201 return; |
|
3b2afa2b77b3
patch 8.0.0718: output of job in terminal is not displayed
Christian Brabandt <cb@256bit.org>
parents:
11657
diff
changeset
|
1202 } |
|
3b2afa2b77b3
patch 8.0.0718: output of job in terminal is not displayed
Christian Brabandt <cb@256bit.org>
parents:
11657
diff
changeset
|
1203 #endif |
|
3b2afa2b77b3
patch 8.0.0718: output of job in terminal is not displayed
Christian Brabandt <cb@256bit.org>
parents:
11657
diff
changeset
|
1204 |
| 7 | 1205 #ifdef FEAT_SEARCH_EXTRA |
|
2284
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
1206 init_search_hl(wp); |
| 7 | 1207 #endif |
| 1208 | |
| 13 | 1209 #ifdef FEAT_LINEBREAK |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
1210 /* 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
|
1211 * changes. */ |
|
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
1212 i = (wp->w_p_nu || wp->w_p_rnu) ? number_width(wp) : 0; |
| 677 | 1213 if (wp->w_nrwidth != i) |
| 13 | 1214 { |
| 1215 type = NOT_VALID; | |
| 677 | 1216 wp->w_nrwidth = i; |
| 13 | 1217 } |
| 1218 else | |
| 1219 #endif | |
| 1220 | |
| 7 | 1221 if (buf->b_mod_set && buf->b_mod_xlines != 0 && wp->w_redraw_top != 0) |
| 1222 { | |
| 1223 /* | |
| 1224 * When there are both inserted/deleted lines and specific lines to be | |
| 1225 * redrawn, w_redraw_top and w_redraw_bot may be invalid, just redraw | |
| 1226 * everything (only happens when redrawing is off for while). | |
| 1227 */ | |
| 1228 type = NOT_VALID; | |
| 1229 } | |
| 1230 else | |
| 1231 { | |
| 1232 /* | |
| 1233 * Set mod_top to the first line that needs displaying because of | |
| 1234 * changes. Set mod_bot to the first line after the changes. | |
| 1235 */ | |
| 1236 mod_top = wp->w_redraw_top; | |
| 1237 if (wp->w_redraw_bot != 0) | |
| 1238 mod_bot = wp->w_redraw_bot + 1; | |
| 1239 else | |
| 1240 mod_bot = 0; | |
| 1241 wp->w_redraw_top = 0; /* reset for next time */ | |
| 1242 wp->w_redraw_bot = 0; | |
| 1243 if (buf->b_mod_set) | |
| 1244 { | |
| 1245 if (mod_top == 0 || mod_top > buf->b_mod_top) | |
| 1246 { | |
| 1247 mod_top = buf->b_mod_top; | |
| 1248 #ifdef FEAT_SYN_HL | |
| 1249 /* Need to redraw lines above the change that may be included | |
| 1250 * in a pattern match. */ | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
1251 if (syntax_present(wp)) |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
1252 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
1253 mod_top -= buf->b_s.b_syn_sync_linebreaks; |
| 7 | 1254 if (mod_top < 1) |
| 1255 mod_top = 1; | |
| 1256 } | |
| 1257 #endif | |
| 1258 } | |
| 1259 if (mod_bot == 0 || mod_bot < buf->b_mod_bot) | |
| 1260 mod_bot = buf->b_mod_bot; | |
| 1261 | |
| 1262 #ifdef FEAT_SEARCH_EXTRA | |
| 1263 /* When 'hlsearch' is on and using a multi-line search pattern, a | |
| 1264 * change in one line may make the Search highlighting in a | |
| 1265 * previous line invalid. Simple solution: redraw all visible | |
| 1266 * lines above the change. | |
| 1326 | 1267 * Same for a match pattern. |
| 7 | 1268 */ |
| 699 | 1269 if (search_hl.rm.regprog != NULL |
| 1270 && re_multiline(search_hl.rm.regprog)) | |
| 7 | 1271 top_to_mod = TRUE; |
| 699 | 1272 else |
| 1326 | 1273 { |
| 1274 cur = wp->w_match_head; | |
| 1275 while (cur != NULL) | |
| 1276 { | |
| 1277 if (cur->match.regprog != NULL | |
| 1278 && re_multiline(cur->match.regprog)) | |
| 699 | 1279 { |
| 1280 top_to_mod = TRUE; | |
| 1281 break; | |
| 1282 } | |
| 1326 | 1283 cur = cur->next; |
| 1284 } | |
| 1285 } | |
| 7 | 1286 #endif |
| 1287 } | |
| 1288 #ifdef FEAT_FOLDING | |
| 1289 if (mod_top != 0 && hasAnyFolding(wp)) | |
| 1290 { | |
| 1291 linenr_T lnumt, lnumb; | |
| 1292 | |
| 1293 /* | |
| 1294 * A change in a line can cause lines above it to become folded or | |
| 1295 * unfolded. Find the top most buffer line that may be affected. | |
| 1296 * If the line was previously folded and displayed, get the first | |
| 1297 * line of that fold. If the line is folded now, get the first | |
| 1298 * folded line. Use the minimum of these two. | |
| 1299 */ | |
| 1300 | |
| 1301 /* Find last valid w_lines[] entry above mod_top. Set lnumt to | |
| 1302 * the line below it. If there is no valid entry, use w_topline. | |
| 1303 * Find the first valid w_lines[] entry below mod_bot. Set lnumb | |
| 1304 * to this line. If there is no valid entry, use MAXLNUM. */ | |
| 1305 lnumt = wp->w_topline; | |
| 1306 lnumb = MAXLNUM; | |
| 1307 for (i = 0; i < wp->w_lines_valid; ++i) | |
| 1308 if (wp->w_lines[i].wl_valid) | |
| 1309 { | |
| 1310 if (wp->w_lines[i].wl_lastlnum < mod_top) | |
| 1311 lnumt = wp->w_lines[i].wl_lastlnum + 1; | |
| 1312 if (lnumb == MAXLNUM && wp->w_lines[i].wl_lnum >= mod_bot) | |
| 1313 { | |
| 1314 lnumb = wp->w_lines[i].wl_lnum; | |
| 1315 /* When there is a fold column it might need updating | |
| 1316 * in the next line ("J" just above an open fold). */ | |
| 6553 | 1317 if (compute_foldcolumn(wp, 0) > 0) |
| 7 | 1318 ++lnumb; |
| 1319 } | |
| 1320 } | |
| 1321 | |
| 1322 (void)hasFoldingWin(wp, mod_top, &mod_top, NULL, TRUE, NULL); | |
| 1323 if (mod_top > lnumt) | |
| 1324 mod_top = lnumt; | |
| 1325 | |
| 1326 /* Now do the same for the bottom line (one above mod_bot). */ | |
| 1327 --mod_bot; | |
| 1328 (void)hasFoldingWin(wp, mod_bot, NULL, &mod_bot, TRUE, NULL); | |
| 1329 ++mod_bot; | |
| 1330 if (mod_bot < lnumb) | |
| 1331 mod_bot = lnumb; | |
| 1332 } | |
| 1333 #endif | |
| 1334 | |
| 1335 /* When a change starts above w_topline and the end is below | |
| 1336 * w_topline, start redrawing at w_topline. | |
| 36 | 1337 * If the end of the change is above w_topline: do like no change was |
| 1338 * made, but redraw the first line to find changes in syntax. */ | |
| 7 | 1339 if (mod_top != 0 && mod_top < wp->w_topline) |
| 1340 { | |
| 1341 if (mod_bot > wp->w_topline) | |
| 1342 mod_top = wp->w_topline; | |
| 1343 #ifdef FEAT_SYN_HL | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
1344 else if (syntax_present(wp)) |
| 7 | 1345 top_end = 1; |
| 1346 #endif | |
| 1347 } | |
| 36 | 1348 |
| 1349 /* When line numbers are displayed need to redraw all lines below | |
| 1350 * inserted/deleted lines. */ | |
| 1351 if (mod_top != 0 && buf->b_mod_xlines != 0 && wp->w_p_nu) | |
| 1352 mod_bot = MAXLNUM; | |
| 7 | 1353 } |
| 1354 | |
| 1355 /* | |
| 1356 * When only displaying the lines at the top, set top_end. Used when | |
| 1357 * window has scrolled down for msg_scrolled. | |
| 1358 */ | |
| 1359 if (type == REDRAW_TOP) | |
| 1360 { | |
| 1361 j = 0; | |
| 1362 for (i = 0; i < wp->w_lines_valid; ++i) | |
| 1363 { | |
| 1364 j += wp->w_lines[i].wl_size; | |
| 1365 if (j >= wp->w_upd_rows) | |
| 1366 { | |
| 1367 top_end = j; | |
| 1368 break; | |
| 1369 } | |
| 1370 } | |
| 1371 if (top_end == 0) | |
| 1372 /* not found (cannot happen?): redraw everything */ | |
| 1373 type = NOT_VALID; | |
| 1374 else | |
| 1375 /* top area defined, the rest is VALID */ | |
| 1376 type = VALID; | |
| 1377 } | |
| 1378 | |
| 1378 | 1379 /* Trick: we want to avoid clearing the screen twice. screenclear() will |
| 1331 | 1380 * set "screen_cleared" to TRUE. The special value MAYBE (which is still |
| 1381 * non-zero and thus not FALSE) will indicate that screenclear() was not | |
| 1382 * called. */ | |
| 1383 if (screen_cleared) | |
| 1384 screen_cleared = MAYBE; | |
| 1385 | |
| 7 | 1386 /* |
| 1387 * If there are no changes on the screen that require a complete redraw, | |
| 1388 * handle three cases: | |
| 1389 * 1: we are off the top of the screen by a few lines: scroll down | |
| 1390 * 2: wp->w_topline is below wp->w_lines[0].wl_lnum: may scroll up | |
| 1391 * 3: wp->w_topline is wp->w_lines[0].wl_lnum: find first entry in | |
| 1392 * w_lines[] that needs updating. | |
| 1393 */ | |
| 743 | 1394 if ((type == VALID || type == SOME_VALID |
| 1395 || type == INVERTED || type == INVERTED_ALL) | |
| 7 | 1396 #ifdef FEAT_DIFF |
| 1397 && !wp->w_botfill && !wp->w_old_botfill | |
| 1398 #endif | |
| 1399 ) | |
| 1400 { | |
| 1401 if (mod_top != 0 && wp->w_topline == mod_top) | |
| 1402 { | |
| 1403 /* | |
| 1404 * w_topline is the first changed line, the scrolling will be done | |
| 1405 * further down. | |
| 1406 */ | |
| 1407 } | |
| 1408 else if (wp->w_lines[0].wl_valid | |
| 1409 && (wp->w_topline < wp->w_lines[0].wl_lnum | |
| 1410 #ifdef FEAT_DIFF | |
| 1411 || (wp->w_topline == wp->w_lines[0].wl_lnum | |
| 1412 && wp->w_topfill > wp->w_old_topfill) | |
| 1413 #endif | |
| 1414 )) | |
| 1415 { | |
| 1416 /* | |
| 1417 * New topline is above old topline: May scroll down. | |
| 1418 */ | |
| 1419 #ifdef FEAT_FOLDING | |
| 1420 if (hasAnyFolding(wp)) | |
| 1421 { | |
| 1422 linenr_T ln; | |
| 1423 | |
| 1424 /* count the number of lines we are off, counting a sequence | |
| 1425 * of folded lines as one */ | |
| 1426 j = 0; | |
| 1427 for (ln = wp->w_topline; ln < wp->w_lines[0].wl_lnum; ++ln) | |
| 1428 { | |
| 1429 ++j; | |
| 1430 if (j >= wp->w_height - 2) | |
| 1431 break; | |
| 1432 (void)hasFoldingWin(wp, ln, NULL, &ln, TRUE, NULL); | |
| 1433 } | |
| 1434 } | |
| 1435 else | |
| 1436 #endif | |
| 1437 j = wp->w_lines[0].wl_lnum - wp->w_topline; | |
| 1438 if (j < wp->w_height - 2) /* not too far off */ | |
| 1439 { | |
| 1440 i = plines_m_win(wp, wp->w_topline, wp->w_lines[0].wl_lnum - 1); | |
| 1441 #ifdef FEAT_DIFF | |
| 1442 /* insert extra lines for previously invisible filler lines */ | |
| 1443 if (wp->w_lines[0].wl_lnum != wp->w_topline) | |
| 1444 i += diff_check_fill(wp, wp->w_lines[0].wl_lnum) | |
| 1445 - wp->w_old_topfill; | |
| 1446 #endif | |
| 1447 if (i < wp->w_height - 2) /* less than a screen off */ | |
| 1448 { | |
| 1449 /* | |
| 1450 * Try to insert the correct number of lines. | |
| 1451 * If not the last window, delete the lines at the bottom. | |
| 1452 * win_ins_lines may fail when the terminal can't do it. | |
| 1453 */ | |
| 1454 if (i > 0) | |
| 1455 check_for_delay(FALSE); | |
| 1456 if (win_ins_lines(wp, 0, i, FALSE, wp == firstwin) == OK) | |
| 1457 { | |
| 1458 if (wp->w_lines_valid != 0) | |
| 1459 { | |
| 1460 /* Need to update rows that are new, stop at the | |
| 1461 * first one that scrolled down. */ | |
| 1462 top_end = i; | |
| 1463 scrolled_down = TRUE; | |
| 1464 | |
| 1465 /* Move the entries that were scrolled, disable | |
| 1466 * the entries for the lines to be redrawn. */ | |
| 1467 if ((wp->w_lines_valid += j) > wp->w_height) | |
| 1468 wp->w_lines_valid = wp->w_height; | |
| 1469 for (idx = wp->w_lines_valid; idx - j >= 0; idx--) | |
| 1470 wp->w_lines[idx] = wp->w_lines[idx - j]; | |
| 1471 while (idx >= 0) | |
| 1472 wp->w_lines[idx--].wl_valid = FALSE; | |
| 1473 } | |
| 1474 } | |
| 1475 else | |
| 1476 mid_start = 0; /* redraw all lines */ | |
| 1477 } | |
| 1478 else | |
| 1479 mid_start = 0; /* redraw all lines */ | |
| 1480 } | |
| 1481 else | |
| 1482 mid_start = 0; /* redraw all lines */ | |
| 1483 } | |
| 1484 else | |
| 1485 { | |
| 1486 /* | |
| 1487 * New topline is at or below old topline: May scroll up. | |
| 1488 * When topline didn't change, find first entry in w_lines[] that | |
| 1489 * needs updating. | |
| 1490 */ | |
| 1491 | |
| 1492 /* try to find wp->w_topline in wp->w_lines[].wl_lnum */ | |
| 1493 j = -1; | |
| 1494 row = 0; | |
| 1495 for (i = 0; i < wp->w_lines_valid; i++) | |
| 1496 { | |
| 1497 if (wp->w_lines[i].wl_valid | |
| 1498 && wp->w_lines[i].wl_lnum == wp->w_topline) | |
| 1499 { | |
| 1500 j = i; | |
| 1501 break; | |
| 1502 } | |
| 1503 row += wp->w_lines[i].wl_size; | |
| 1504 } | |
| 1505 if (j == -1) | |
| 1506 { | |
| 1507 /* if wp->w_topline is not in wp->w_lines[].wl_lnum redraw all | |
| 1508 * lines */ | |
| 1509 mid_start = 0; | |
| 1510 } | |
| 1511 else | |
| 1512 { | |
| 1513 /* | |
| 1514 * Try to delete the correct number of lines. | |
| 1515 * wp->w_topline is at wp->w_lines[i].wl_lnum. | |
| 1516 */ | |
| 1517 #ifdef FEAT_DIFF | |
| 1518 /* If the topline didn't change, delete old filler lines, | |
| 1519 * otherwise delete filler lines of the new topline... */ | |
| 1520 if (wp->w_lines[0].wl_lnum == wp->w_topline) | |
| 1521 row += wp->w_old_topfill; | |
| 1522 else | |
| 1523 row += diff_check_fill(wp, wp->w_topline); | |
| 1524 /* ... but don't delete new filler lines. */ | |
| 1525 row -= wp->w_topfill; | |
| 1526 #endif | |
| 1527 if (row > 0) | |
| 1528 { | |
| 1529 check_for_delay(FALSE); | |
| 1530 if (win_del_lines(wp, 0, row, FALSE, wp == firstwin) == OK) | |
| 1531 bot_start = wp->w_height - row; | |
| 1532 else | |
| 1533 mid_start = 0; /* redraw all lines */ | |
| 1534 } | |
| 1535 if ((row == 0 || bot_start < 999) && wp->w_lines_valid != 0) | |
| 1536 { | |
| 1537 /* | |
| 1538 * Skip the lines (below the deleted lines) that are still | |
| 1539 * valid and don't need redrawing. Copy their info | |
| 1540 * upwards, to compensate for the deleted lines. Set | |
| 1541 * bot_start to the first row that needs redrawing. | |
| 1542 */ | |
| 1543 bot_start = 0; | |
| 1544 idx = 0; | |
| 1545 for (;;) | |
| 1546 { | |
| 1547 wp->w_lines[idx] = wp->w_lines[j]; | |
| 1548 /* stop at line that didn't fit, unless it is still | |
| 1549 * valid (no lines deleted) */ | |
| 1550 if (row > 0 && bot_start + row | |
| 1551 + (int)wp->w_lines[j].wl_size > wp->w_height) | |
| 1552 { | |
| 1553 wp->w_lines_valid = idx + 1; | |
| 1554 break; | |
| 1555 } | |
| 1556 bot_start += wp->w_lines[idx++].wl_size; | |
| 1557 | |
| 1558 /* stop at the last valid entry in w_lines[].wl_size */ | |
| 1559 if (++j >= wp->w_lines_valid) | |
| 1560 { | |
| 1561 wp->w_lines_valid = idx; | |
| 1562 break; | |
| 1563 } | |
| 1564 } | |
| 1565 #ifdef FEAT_DIFF | |
| 1566 /* Correct the first entry for filler lines at the top | |
| 1567 * when it won't get updated below. */ | |
| 1568 if (wp->w_p_diff && bot_start > 0) | |
| 1569 wp->w_lines[0].wl_size = | |
| 1570 plines_win_nofill(wp, wp->w_topline, TRUE) | |
| 1571 + wp->w_topfill; | |
| 1572 #endif | |
| 1573 } | |
| 1574 } | |
| 1575 } | |
| 1576 | |
| 1577 /* When starting redraw in the first line, redraw all lines. When | |
| 1578 * there is only one window it's probably faster to clear the screen | |
| 1579 * first. */ | |
| 1580 if (mid_start == 0) | |
| 1581 { | |
| 1582 mid_end = wp->w_height; | |
|
10349
cf988222b150
commit https://github.com/vim/vim/commit/a1f4cb93ba50ea9e40cd4b1f5592b8a6d1398660
Christian Brabandt <cb@256bit.org>
parents:
10307
diff
changeset
|
1583 if (ONE_WINDOW) |
| 981 | 1584 { |
| 1331 | 1585 /* Clear the screen when it was not done by win_del_lines() or |
| 1586 * win_ins_lines() above, "screen_cleared" is FALSE or MAYBE | |
| 1587 * then. */ | |
| 1588 if (screen_cleared != TRUE) | |
| 1589 screenclear(); | |
| 981 | 1590 #ifdef FEAT_WINDOWS |
| 1591 /* The screen was cleared, redraw the tab pages line. */ | |
| 1592 if (redraw_tabline) | |
| 1593 draw_tabline(); | |
| 1594 #endif | |
| 1595 } | |
| 7 | 1596 } |
| 1331 | 1597 |
| 1598 /* When win_del_lines() or win_ins_lines() caused the screen to be | |
| 1599 * cleared (only happens for the first window) or when screenclear() | |
| 1600 * was called directly above, "must_redraw" will have been set to | |
| 1601 * NOT_VALID, need to reset it here to avoid redrawing twice. */ | |
| 1602 if (screen_cleared == TRUE) | |
| 1603 must_redraw = 0; | |
| 7 | 1604 } |
| 1605 else | |
| 1606 { | |
| 1607 /* Not VALID or INVERTED: redraw all lines. */ | |
| 1608 mid_start = 0; | |
| 1609 mid_end = wp->w_height; | |
| 1610 } | |
| 1611 | |
| 743 | 1612 if (type == SOME_VALID) |
| 1613 { | |
| 1614 /* SOME_VALID: redraw all lines. */ | |
| 1615 mid_start = 0; | |
| 1616 mid_end = wp->w_height; | |
| 1617 type = NOT_VALID; | |
| 1618 } | |
| 1619 | |
| 7 | 1620 /* check if we are updating or removing the inverted part */ |
| 1621 if ((VIsual_active && buf == curwin->w_buffer) | |
| 1622 || (wp->w_old_cursor_lnum != 0 && type != NOT_VALID)) | |
| 1623 { | |
| 1624 linenr_T from, to; | |
| 1625 | |
| 1626 if (VIsual_active) | |
| 1627 { | |
| 1628 if (VIsual_active | |
| 1629 && (VIsual_mode != wp->w_old_visual_mode | |
| 1630 || type == INVERTED_ALL)) | |
| 1631 { | |
| 1632 /* | |
| 1633 * If the type of Visual selection changed, redraw the whole | |
| 1634 * selection. Also when the ownership of the X selection is | |
| 1635 * gained or lost. | |
| 1636 */ | |
| 1637 if (curwin->w_cursor.lnum < VIsual.lnum) | |
| 1638 { | |
| 1639 from = curwin->w_cursor.lnum; | |
| 1640 to = VIsual.lnum; | |
| 1641 } | |
| 1642 else | |
| 1643 { | |
| 1644 from = VIsual.lnum; | |
| 1645 to = curwin->w_cursor.lnum; | |
| 1646 } | |
| 1647 /* redraw more when the cursor moved as well */ | |
| 1648 if (wp->w_old_cursor_lnum < from) | |
| 1649 from = wp->w_old_cursor_lnum; | |
| 1650 if (wp->w_old_cursor_lnum > to) | |
| 1651 to = wp->w_old_cursor_lnum; | |
| 1652 if (wp->w_old_visual_lnum < from) | |
| 1653 from = wp->w_old_visual_lnum; | |
| 1654 if (wp->w_old_visual_lnum > to) | |
| 1655 to = wp->w_old_visual_lnum; | |
| 1656 } | |
| 1657 else | |
| 1658 { | |
| 1659 /* | |
| 1660 * Find the line numbers that need to be updated: The lines | |
| 1661 * between the old cursor position and the current cursor | |
| 1662 * position. Also check if the Visual position changed. | |
| 1663 */ | |
| 1664 if (curwin->w_cursor.lnum < wp->w_old_cursor_lnum) | |
| 1665 { | |
| 1666 from = curwin->w_cursor.lnum; | |
| 1667 to = wp->w_old_cursor_lnum; | |
| 1668 } | |
| 1669 else | |
| 1670 { | |
| 1671 from = wp->w_old_cursor_lnum; | |
| 1672 to = curwin->w_cursor.lnum; | |
| 1673 if (from == 0) /* Visual mode just started */ | |
| 1674 from = to; | |
| 1675 } | |
| 1676 | |
| 422 | 1677 if (VIsual.lnum != wp->w_old_visual_lnum |
| 1678 || VIsual.col != wp->w_old_visual_col) | |
| 7 | 1679 { |
| 1680 if (wp->w_old_visual_lnum < from | |
| 1681 && wp->w_old_visual_lnum != 0) | |
| 1682 from = wp->w_old_visual_lnum; | |
| 1683 if (wp->w_old_visual_lnum > to) | |
| 1684 to = wp->w_old_visual_lnum; | |
| 1685 if (VIsual.lnum < from) | |
| 1686 from = VIsual.lnum; | |
| 1687 if (VIsual.lnum > to) | |
| 1688 to = VIsual.lnum; | |
| 1689 } | |
| 1690 } | |
| 1691 | |
| 1692 /* | |
| 1693 * If in block mode and changed column or curwin->w_curswant: | |
| 1694 * update all lines. | |
| 1695 * First compute the actual start and end column. | |
| 1696 */ | |
| 1697 if (VIsual_mode == Ctrl_V) | |
| 1698 { | |
| 6266 | 1699 colnr_T fromc, toc; |
| 1700 #if defined(FEAT_VIRTUALEDIT) && defined(FEAT_LINEBREAK) | |
| 1701 int save_ve_flags = ve_flags; | |
| 1702 | |
| 1703 if (curwin->w_p_lbr) | |
| 1704 ve_flags = VE_ALL; | |
| 1705 #endif | |
| 7 | 1706 getvcols(wp, &VIsual, &curwin->w_cursor, &fromc, &toc); |
| 6266 | 1707 #if defined(FEAT_VIRTUALEDIT) && defined(FEAT_LINEBREAK) |
| 1708 ve_flags = save_ve_flags; | |
| 1709 #endif | |
| 7 | 1710 ++toc; |
| 1711 if (curwin->w_curswant == MAXCOL) | |
| 1712 toc = MAXCOL; | |
| 1713 | |
| 1714 if (fromc != wp->w_old_cursor_fcol | |
| 1715 || toc != wp->w_old_cursor_lcol) | |
| 1716 { | |
| 1717 if (from > VIsual.lnum) | |
| 1718 from = VIsual.lnum; | |
| 1719 if (to < VIsual.lnum) | |
| 1720 to = VIsual.lnum; | |
| 1721 } | |
| 1722 wp->w_old_cursor_fcol = fromc; | |
| 1723 wp->w_old_cursor_lcol = toc; | |
| 1724 } | |
| 1725 } | |
| 1726 else | |
| 1727 { | |
| 1728 /* Use the line numbers of the old Visual area. */ | |
| 1729 if (wp->w_old_cursor_lnum < wp->w_old_visual_lnum) | |
| 1730 { | |
| 1731 from = wp->w_old_cursor_lnum; | |
| 1732 to = wp->w_old_visual_lnum; | |
| 1733 } | |
| 1734 else | |
| 1735 { | |
| 1736 from = wp->w_old_visual_lnum; | |
| 1737 to = wp->w_old_cursor_lnum; | |
| 1738 } | |
| 1739 } | |
| 1740 | |
| 1741 /* | |
| 1742 * There is no need to update lines above the top of the window. | |
| 1743 */ | |
| 1744 if (from < wp->w_topline) | |
| 1745 from = wp->w_topline; | |
| 1746 | |
| 1747 /* | |
| 1748 * If we know the value of w_botline, use it to restrict the update to | |
| 1749 * the lines that are visible in the window. | |
| 1750 */ | |
| 1751 if (wp->w_valid & VALID_BOTLINE) | |
| 1752 { | |
| 1753 if (from >= wp->w_botline) | |
| 1754 from = wp->w_botline - 1; | |
| 1755 if (to >= wp->w_botline) | |
| 1756 to = wp->w_botline - 1; | |
| 1757 } | |
| 1758 | |
| 1759 /* | |
| 1760 * Find the minimal part to be updated. | |
| 1761 * Watch out for scrolling that made entries in w_lines[] invalid. | |
| 1762 * E.g., CTRL-U makes the first half of w_lines[] invalid and sets | |
| 1763 * top_end; need to redraw from top_end to the "to" line. | |
| 1764 * A middle mouse click with a Visual selection may change the text | |
| 1765 * above the Visual area and reset wl_valid, do count these for | |
| 1766 * mid_end (in srow). | |
| 1767 */ | |
| 1768 if (mid_start > 0) | |
| 1769 { | |
| 1770 lnum = wp->w_topline; | |
| 1771 idx = 0; | |
| 1772 srow = 0; | |
| 1773 if (scrolled_down) | |
| 1774 mid_start = top_end; | |
| 1775 else | |
| 1776 mid_start = 0; | |
| 1777 while (lnum < from && idx < wp->w_lines_valid) /* find start */ | |
| 1778 { | |
| 1779 if (wp->w_lines[idx].wl_valid) | |
| 1780 mid_start += wp->w_lines[idx].wl_size; | |
| 1781 else if (!scrolled_down) | |
| 1782 srow += wp->w_lines[idx].wl_size; | |
| 1783 ++idx; | |
| 1784 # ifdef FEAT_FOLDING | |
| 1785 if (idx < wp->w_lines_valid && wp->w_lines[idx].wl_valid) | |
| 1786 lnum = wp->w_lines[idx].wl_lnum; | |
| 1787 else | |
| 1788 # endif | |
| 1789 ++lnum; | |
| 1790 } | |
| 1791 srow += mid_start; | |
| 1792 mid_end = wp->w_height; | |
| 1793 for ( ; idx < wp->w_lines_valid; ++idx) /* find end */ | |
| 1794 { | |
| 1795 if (wp->w_lines[idx].wl_valid | |
| 1796 && wp->w_lines[idx].wl_lnum >= to + 1) | |
| 1797 { | |
| 1798 /* Only update until first row of this line */ | |
| 1799 mid_end = srow; | |
| 1800 break; | |
| 1801 } | |
| 1802 srow += wp->w_lines[idx].wl_size; | |
| 1803 } | |
| 1804 } | |
| 1805 } | |
| 1806 | |
| 1807 if (VIsual_active && buf == curwin->w_buffer) | |
| 1808 { | |
| 1809 wp->w_old_visual_mode = VIsual_mode; | |
| 1810 wp->w_old_cursor_lnum = curwin->w_cursor.lnum; | |
| 1811 wp->w_old_visual_lnum = VIsual.lnum; | |
| 422 | 1812 wp->w_old_visual_col = VIsual.col; |
| 7 | 1813 wp->w_old_curswant = curwin->w_curswant; |
| 1814 } | |
| 1815 else | |
| 1816 { | |
| 1817 wp->w_old_visual_mode = 0; | |
| 1818 wp->w_old_cursor_lnum = 0; | |
| 1819 wp->w_old_visual_lnum = 0; | |
| 422 | 1820 wp->w_old_visual_col = 0; |
| 7 | 1821 } |
| 1822 | |
| 1823 #if defined(FEAT_SYN_HL) || defined(FEAT_SEARCH_EXTRA) | |
| 1824 /* reset got_int, otherwise regexp won't work */ | |
| 1825 save_got_int = got_int; | |
| 1826 got_int = 0; | |
| 1827 #endif | |
|
11529
998d2cf59caa
patch 8.0.0647: syntax highlighting can make cause a freeze
Christian Brabandt <cb@256bit.org>
parents:
11521
diff
changeset
|
1828 #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
|
1829 /* 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
|
1830 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
|
1831 #endif |
| 7 | 1832 #ifdef FEAT_FOLDING |
| 1833 win_foldinfo.fi_level = 0; | |
| 1834 #endif | |
| 1835 | |
| 1836 /* | |
| 1837 * Update all the window rows. | |
| 1838 */ | |
| 1839 idx = 0; /* first entry in w_lines[].wl_size */ | |
| 1840 row = 0; | |
| 1841 srow = 0; | |
| 1842 lnum = wp->w_topline; /* first line shown in window */ | |
| 1843 for (;;) | |
| 1844 { | |
| 1845 /* stop updating when reached the end of the window (check for _past_ | |
| 1846 * the end of the window is at the end of the loop) */ | |
| 1847 if (row == wp->w_height) | |
| 1848 { | |
| 1849 didline = TRUE; | |
| 1850 break; | |
| 1851 } | |
| 1852 | |
| 1853 /* stop updating when hit the end of the file */ | |
| 1854 if (lnum > buf->b_ml.ml_line_count) | |
| 1855 { | |
| 1856 eof = TRUE; | |
| 1857 break; | |
| 1858 } | |
| 1859 | |
| 1860 /* Remember the starting row of the line that is going to be dealt | |
| 1861 * with. It is used further down when the line doesn't fit. */ | |
| 1862 srow = row; | |
| 1863 | |
| 1864 /* | |
| 1865 * Update a line when it is in an area that needs updating, when it | |
| 1866 * has changes or w_lines[idx] is invalid. | |
| 1867 * bot_start may be halfway a wrapped line after using | |
| 1868 * win_del_lines(), check if the current line includes it. | |
| 1869 * When syntax folding is being used, the saved syntax states will | |
| 1870 * already have been updated, we can't see where the syntax state is | |
| 1871 * the same again, just update until the end of the window. | |
| 1872 */ | |
| 1873 if (row < top_end | |
| 1874 || (row >= mid_start && row < mid_end) | |
| 1875 #ifdef FEAT_SEARCH_EXTRA | |
| 1876 || top_to_mod | |
| 1877 #endif | |
| 1878 || idx >= wp->w_lines_valid | |
| 1879 || (row + wp->w_lines[idx].wl_size > bot_start) | |
| 1880 || (mod_top != 0 | |
| 1881 && (lnum == mod_top | |
| 1882 || (lnum >= mod_top | |
| 1883 && (lnum < mod_bot | |
| 1884 #ifdef FEAT_SYN_HL | |
| 1885 || did_update == DID_FOLD | |
| 1886 || (did_update == DID_LINE | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
1887 && syntax_present(wp) |
| 7 | 1888 && ( |
| 1889 # ifdef FEAT_FOLDING | |
| 1890 (foldmethodIsSyntax(wp) | |
| 1891 && hasAnyFolding(wp)) || | |
| 1892 # endif | |
| 1893 syntax_check_changed(lnum))) | |
| 1894 #endif | |
|
4916
ba328b4a990e
updated for version 7.3.1203
Bram Moolenaar <bram@vim.org>
parents:
4805
diff
changeset
|
1895 #ifdef FEAT_SEARCH_EXTRA |
| 6018 | 1896 /* match in fixed position might need redraw |
| 1897 * if lines were inserted or deleted */ | |
| 1898 || (wp->w_match_head != NULL | |
| 1899 && buf->b_mod_xlines != 0) | |
|
4916
ba328b4a990e
updated for version 7.3.1203
Bram Moolenaar <bram@vim.org>
parents:
4805
diff
changeset
|
1900 #endif |
| 7 | 1901 ))))) |
| 1902 { | |
| 1903 #ifdef FEAT_SEARCH_EXTRA | |
| 1904 if (lnum == mod_top) | |
| 1905 top_to_mod = FALSE; | |
| 1906 #endif | |
| 1907 | |
| 1908 /* | |
| 1909 * When at start of changed lines: May scroll following lines | |
| 1910 * up or down to minimize redrawing. | |
| 1911 * Don't do this when the change continues until the end. | |
| 3318 | 1912 * Don't scroll when dollar_vcol >= 0, keep the "$". |
| 7 | 1913 */ |
| 1914 if (lnum == mod_top | |
| 1915 && mod_bot != MAXLNUM | |
| 3318 | 1916 && !(dollar_vcol >= 0 && mod_bot == mod_top + 1)) |
| 7 | 1917 { |
| 1918 int old_rows = 0; | |
| 1919 int new_rows = 0; | |
| 1920 int xtra_rows; | |
| 1921 linenr_T l; | |
| 1922 | |
| 1923 /* Count the old number of window rows, using w_lines[], which | |
| 1924 * should still contain the sizes for the lines as they are | |
| 1925 * currently displayed. */ | |
| 1926 for (i = idx; i < wp->w_lines_valid; ++i) | |
| 1927 { | |
| 1928 /* Only valid lines have a meaningful wl_lnum. Invalid | |
| 1929 * lines are part of the changed area. */ | |
| 1930 if (wp->w_lines[i].wl_valid | |
| 1931 && wp->w_lines[i].wl_lnum == mod_bot) | |
| 1932 break; | |
| 1933 old_rows += wp->w_lines[i].wl_size; | |
| 1934 #ifdef FEAT_FOLDING | |
| 1935 if (wp->w_lines[i].wl_valid | |
| 1936 && wp->w_lines[i].wl_lastlnum + 1 == mod_bot) | |
| 1937 { | |
| 1938 /* Must have found the last valid entry above mod_bot. | |
| 1939 * Add following invalid entries. */ | |
| 1940 ++i; | |
| 1941 while (i < wp->w_lines_valid | |
| 1942 && !wp->w_lines[i].wl_valid) | |
| 1943 old_rows += wp->w_lines[i++].wl_size; | |
| 1944 break; | |
| 1945 } | |
| 1946 #endif | |
| 1947 } | |
| 1948 | |
| 1949 if (i >= wp->w_lines_valid) | |
| 1950 { | |
| 1951 /* We can't find a valid line below the changed lines, | |
| 1952 * need to redraw until the end of the window. | |
| 1953 * Inserting/deleting lines has no use. */ | |
| 1954 bot_start = 0; | |
| 1955 } | |
| 1956 else | |
| 1957 { | |
| 1958 /* Able to count old number of rows: Count new window | |
| 1959 * rows, and may insert/delete lines */ | |
| 1960 j = idx; | |
| 1961 for (l = lnum; l < mod_bot; ++l) | |
| 1962 { | |
| 1963 #ifdef FEAT_FOLDING | |
| 1964 if (hasFoldingWin(wp, l, NULL, &l, TRUE, NULL)) | |
| 1965 ++new_rows; | |
| 1966 else | |
| 1967 #endif | |
| 1968 #ifdef FEAT_DIFF | |
| 1969 if (l == wp->w_topline) | |
| 1970 new_rows += plines_win_nofill(wp, l, TRUE) | |
| 1971 + wp->w_topfill; | |
| 1972 else | |
| 1973 #endif | |
| 1974 new_rows += plines_win(wp, l, TRUE); | |
| 1975 ++j; | |
| 1976 if (new_rows > wp->w_height - row - 2) | |
| 1977 { | |
| 1978 /* it's getting too much, must redraw the rest */ | |
| 1979 new_rows = 9999; | |
| 1980 break; | |
| 1981 } | |
| 1982 } | |
| 1983 xtra_rows = new_rows - old_rows; | |
| 1984 if (xtra_rows < 0) | |
| 1985 { | |
| 1986 /* May scroll text up. If there is not enough | |
| 1987 * remaining text or scrolling fails, must redraw the | |
| 1988 * rest. If scrolling works, must redraw the text | |
| 1989 * below the scrolled text. */ | |
| 1990 if (row - xtra_rows >= wp->w_height - 2) | |
| 1991 mod_bot = MAXLNUM; | |
| 1992 else | |
| 1993 { | |
| 1994 check_for_delay(FALSE); | |
| 1995 if (win_del_lines(wp, row, | |
| 1996 -xtra_rows, FALSE, FALSE) == FAIL) | |
| 1997 mod_bot = MAXLNUM; | |
| 1998 else | |
| 1999 bot_start = wp->w_height + xtra_rows; | |
| 2000 } | |
| 2001 } | |
| 2002 else if (xtra_rows > 0) | |
| 2003 { | |
| 2004 /* May scroll text down. If there is not enough | |
| 2005 * remaining text of scrolling fails, must redraw the | |
| 2006 * rest. */ | |
| 2007 if (row + xtra_rows >= wp->w_height - 2) | |
| 2008 mod_bot = MAXLNUM; | |
| 2009 else | |
| 2010 { | |
| 2011 check_for_delay(FALSE); | |
| 2012 if (win_ins_lines(wp, row + old_rows, | |
| 2013 xtra_rows, FALSE, FALSE) == FAIL) | |
| 2014 mod_bot = MAXLNUM; | |
| 2015 else if (top_end > row + old_rows) | |
| 2016 /* Scrolled the part at the top that requires | |
| 2017 * updating down. */ | |
| 2018 top_end += xtra_rows; | |
| 2019 } | |
| 2020 } | |
| 2021 | |
| 2022 /* When not updating the rest, may need to move w_lines[] | |
| 2023 * entries. */ | |
| 2024 if (mod_bot != MAXLNUM && i != j) | |
| 2025 { | |
| 2026 if (j < i) | |
| 2027 { | |
| 2028 int x = row + new_rows; | |
| 2029 | |
| 2030 /* move entries in w_lines[] upwards */ | |
| 2031 for (;;) | |
| 2032 { | |
| 2033 /* stop at last valid entry in w_lines[] */ | |
| 2034 if (i >= wp->w_lines_valid) | |
| 2035 { | |
| 2036 wp->w_lines_valid = j; | |
| 2037 break; | |
| 2038 } | |
| 2039 wp->w_lines[j] = wp->w_lines[i]; | |
| 2040 /* stop at a line that won't fit */ | |
| 2041 if (x + (int)wp->w_lines[j].wl_size | |
| 2042 > wp->w_height) | |
| 2043 { | |
| 2044 wp->w_lines_valid = j + 1; | |
| 2045 break; | |
| 2046 } | |
| 2047 x += wp->w_lines[j++].wl_size; | |
| 2048 ++i; | |
| 2049 } | |
| 2050 if (bot_start > x) | |
| 2051 bot_start = x; | |
| 2052 } | |
| 2053 else /* j > i */ | |
| 2054 { | |
| 2055 /* move entries in w_lines[] downwards */ | |
| 2056 j -= i; | |
| 2057 wp->w_lines_valid += j; | |
| 2058 if (wp->w_lines_valid > wp->w_height) | |
| 2059 wp->w_lines_valid = wp->w_height; | |
| 2060 for (i = wp->w_lines_valid; i - j >= idx; --i) | |
| 2061 wp->w_lines[i] = wp->w_lines[i - j]; | |
| 2062 | |
| 2063 /* The w_lines[] entries for inserted lines are | |
| 2064 * now invalid, but wl_size may be used above. | |
| 2065 * Reset to zero. */ | |
| 2066 while (i >= idx) | |
| 2067 { | |
| 2068 wp->w_lines[i].wl_size = 0; | |
| 2069 wp->w_lines[i--].wl_valid = FALSE; | |
| 2070 } | |
| 2071 } | |
| 2072 } | |
| 2073 } | |
| 2074 } | |
| 2075 | |
| 2076 #ifdef FEAT_FOLDING | |
| 2077 /* | |
| 2078 * When lines are folded, display one line for all of them. | |
| 2079 * Otherwise, display normally (can be several display lines when | |
| 2080 * 'wrap' is on). | |
| 2081 */ | |
| 2082 fold_count = foldedCount(wp, lnum, &win_foldinfo); | |
| 2083 if (fold_count != 0) | |
| 2084 { | |
| 2085 fold_line(wp, fold_count, &win_foldinfo, lnum, row); | |
| 2086 ++row; | |
| 2087 --fold_count; | |
| 2088 wp->w_lines[idx].wl_folded = TRUE; | |
| 2089 wp->w_lines[idx].wl_lastlnum = lnum + fold_count; | |
| 2090 # ifdef FEAT_SYN_HL | |
| 2091 did_update = DID_FOLD; | |
| 2092 # endif | |
| 2093 } | |
| 2094 else | |
| 2095 #endif | |
| 2096 if (idx < wp->w_lines_valid | |
| 2097 && wp->w_lines[idx].wl_valid | |
| 2098 && wp->w_lines[idx].wl_lnum == lnum | |
| 2099 && lnum > wp->w_topline | |
|
9665
b193bdb6ea25
commit https://github.com/vim/vim/commit/ad9c2a08f0509294269a2f11a59a438b944bdd5a
Christian Brabandt <cb@256bit.org>
parents:
9649
diff
changeset
|
2100 && !(dy_flags & (DY_LASTLINE | DY_TRUNCATE)) |
| 7 | 2101 && srow + wp->w_lines[idx].wl_size > wp->w_height |
| 2102 #ifdef FEAT_DIFF | |
| 2103 && diff_check_fill(wp, lnum) == 0 | |
| 2104 #endif | |
| 2105 ) | |
| 2106 { | |
| 2107 /* This line is not going to fit. Don't draw anything here, | |
| 2108 * will draw "@ " lines below. */ | |
| 2109 row = wp->w_height + 1; | |
| 2110 } | |
| 2111 else | |
| 2112 { | |
| 2113 #ifdef FEAT_SEARCH_EXTRA | |
| 2114 prepare_search_hl(wp, lnum); | |
| 2115 #endif | |
| 2116 #ifdef FEAT_SYN_HL | |
| 2117 /* Let the syntax stuff know we skipped a few lines. */ | |
| 2118 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
|
2119 && syntax_present(wp)) |
| 7 | 2120 syntax_end_parsing(syntax_last_parsed + 1); |
| 2121 #endif | |
| 2122 | |
| 2123 /* | |
| 2124 * Display one line. | |
| 2125 */ | |
|
11529
998d2cf59caa
patch 8.0.0647: syntax highlighting can make cause a freeze
Christian Brabandt <cb@256bit.org>
parents:
11521
diff
changeset
|
2126 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
|
2127 #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
|
2128 &syntax_tm |
|
998d2cf59caa
patch 8.0.0647: syntax highlighting can make cause a freeze
Christian Brabandt <cb@256bit.org>
parents:
11521
diff
changeset
|
2129 #else |
|
998d2cf59caa
patch 8.0.0647: syntax highlighting can make cause a freeze
Christian Brabandt <cb@256bit.org>
parents:
11521
diff
changeset
|
2130 NULL |
|
998d2cf59caa
patch 8.0.0647: syntax highlighting can make cause a freeze
Christian Brabandt <cb@256bit.org>
parents:
11521
diff
changeset
|
2131 #endif |
|
998d2cf59caa
patch 8.0.0647: syntax highlighting can make cause a freeze
Christian Brabandt <cb@256bit.org>
parents:
11521
diff
changeset
|
2132 ); |
| 7 | 2133 |
| 2134 #ifdef FEAT_FOLDING | |
| 2135 wp->w_lines[idx].wl_folded = FALSE; | |
| 2136 wp->w_lines[idx].wl_lastlnum = lnum; | |
| 2137 #endif | |
| 2138 #ifdef FEAT_SYN_HL | |
| 2139 did_update = DID_LINE; | |
| 2140 syntax_last_parsed = lnum; | |
| 2141 #endif | |
| 2142 } | |
| 2143 | |
| 2144 wp->w_lines[idx].wl_lnum = lnum; | |
| 2145 wp->w_lines[idx].wl_valid = TRUE; | |
| 2146 if (row > wp->w_height) /* past end of screen */ | |
| 2147 { | |
| 2148 /* we may need the size of that too long line later on */ | |
| 3318 | 2149 if (dollar_vcol == -1) |
| 7 | 2150 wp->w_lines[idx].wl_size = plines_win(wp, lnum, TRUE); |
| 2151 ++idx; | |
| 2152 break; | |
| 2153 } | |
| 3318 | 2154 if (dollar_vcol == -1) |
| 7 | 2155 wp->w_lines[idx].wl_size = row - srow; |
| 2156 ++idx; | |
| 2157 #ifdef FEAT_FOLDING | |
| 2158 lnum += fold_count + 1; | |
| 2159 #else | |
| 2160 ++lnum; | |
| 2161 #endif | |
| 2162 } | |
| 2163 else | |
| 2164 { | |
| 2165 /* This line does not need updating, advance to the next one */ | |
| 2166 row += wp->w_lines[idx++].wl_size; | |
| 2167 if (row > wp->w_height) /* past end of screen */ | |
| 2168 break; | |
| 2169 #ifdef FEAT_FOLDING | |
| 2170 lnum = wp->w_lines[idx - 1].wl_lastlnum + 1; | |
| 2171 #else | |
| 2172 ++lnum; | |
| 2173 #endif | |
| 2174 #ifdef FEAT_SYN_HL | |
| 2175 did_update = DID_NONE; | |
| 2176 #endif | |
| 2177 } | |
| 2178 | |
| 2179 if (lnum > buf->b_ml.ml_line_count) | |
| 2180 { | |
| 2181 eof = TRUE; | |
| 2182 break; | |
| 2183 } | |
| 2184 } | |
| 2185 /* | |
| 2186 * End of loop over all window lines. | |
| 2187 */ | |
| 2188 | |
| 2189 | |
| 2190 if (idx > wp->w_lines_valid) | |
| 2191 wp->w_lines_valid = idx; | |
| 2192 | |
| 2193 #ifdef FEAT_SYN_HL | |
| 2194 /* | |
| 2195 * Let the syntax stuff know we stop parsing here. | |
| 2196 */ | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
2197 if (syntax_last_parsed != 0 && syntax_present(wp)) |
| 7 | 2198 syntax_end_parsing(syntax_last_parsed + 1); |
| 2199 #endif | |
| 2200 | |
| 2201 /* | |
| 2202 * If we didn't hit the end of the file, and we didn't finish the last | |
| 2203 * line we were working on, then the line didn't fit. | |
| 2204 */ | |
| 2205 wp->w_empty_rows = 0; | |
| 2206 #ifdef FEAT_DIFF | |
| 2207 wp->w_filler_rows = 0; | |
| 2208 #endif | |
| 2209 if (!eof && !didline) | |
| 2210 { | |
| 2211 if (lnum == wp->w_topline) | |
| 2212 { | |
| 2213 /* | |
| 2214 * Single line that does not fit! | |
| 2215 * Don't overwrite it, it can be edited. | |
| 2216 */ | |
| 2217 wp->w_botline = lnum + 1; | |
| 2218 } | |
| 2219 #ifdef FEAT_DIFF | |
| 2220 else if (diff_check_fill(wp, lnum) >= wp->w_height - srow) | |
| 2221 { | |
| 2222 /* Window ends in filler lines. */ | |
| 2223 wp->w_botline = lnum; | |
| 2224 wp->w_filler_rows = wp->w_height - srow; | |
| 2225 } | |
| 2226 #endif | |
|
9665
b193bdb6ea25
commit https://github.com/vim/vim/commit/ad9c2a08f0509294269a2f11a59a438b944bdd5a
Christian Brabandt <cb@256bit.org>
parents:
9649
diff
changeset
|
2227 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
|
2228 { |
|
b193bdb6ea25
commit https://github.com/vim/vim/commit/ad9c2a08f0509294269a2f11a59a438b944bdd5a
Christian Brabandt <cb@256bit.org>
parents:
9649
diff
changeset
|
2229 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
|
2230 |
|
b193bdb6ea25
commit https://github.com/vim/vim/commit/ad9c2a08f0509294269a2f11a59a438b944bdd5a
Christian Brabandt <cb@256bit.org>
parents:
9649
diff
changeset
|
2231 /* |
|
b193bdb6ea25
commit https://github.com/vim/vim/commit/ad9c2a08f0509294269a2f11a59a438b944bdd5a
Christian Brabandt <cb@256bit.org>
parents:
9649
diff
changeset
|
2232 * 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
|
2233 */ |
|
b193bdb6ea25
commit https://github.com/vim/vim/commit/ad9c2a08f0509294269a2f11a59a438b944bdd5a
Christian Brabandt <cb@256bit.org>
parents:
9649
diff
changeset
|
2234 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
|
2235 HL_ATTR(HLF_AT)); |
|
9665
b193bdb6ea25
commit https://github.com/vim/vim/commit/ad9c2a08f0509294269a2f11a59a438b944bdd5a
Christian Brabandt <cb@256bit.org>
parents:
9649
diff
changeset
|
2236 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
|
2237 (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
|
2238 '@', ' ', HL_ATTR(HLF_AT)); |
|
9665
b193bdb6ea25
commit https://github.com/vim/vim/commit/ad9c2a08f0509294269a2f11a59a438b944bdd5a
Christian Brabandt <cb@256bit.org>
parents:
9649
diff
changeset
|
2239 set_empty_rows(wp, srow); |
|
b193bdb6ea25
commit https://github.com/vim/vim/commit/ad9c2a08f0509294269a2f11a59a438b944bdd5a
Christian Brabandt <cb@256bit.org>
parents:
9649
diff
changeset
|
2240 wp->w_botline = lnum; |
|
b193bdb6ea25
commit https://github.com/vim/vim/commit/ad9c2a08f0509294269a2f11a59a438b944bdd5a
Christian Brabandt <cb@256bit.org>
parents:
9649
diff
changeset
|
2241 } |
| 7 | 2242 else if (dy_flags & DY_LASTLINE) /* 'display' has "lastline" */ |
| 2243 { | |
| 2244 /* | |
| 2245 * Last line isn't finished: Display "@@@" at the end. | |
| 2246 */ | |
| 2247 screen_fill(W_WINROW(wp) + wp->w_height - 1, | |
| 2248 W_WINROW(wp) + wp->w_height, | |
| 2249 (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
|
2250 '@', '@', HL_ATTR(HLF_AT)); |
| 7 | 2251 set_empty_rows(wp, srow); |
| 2252 wp->w_botline = lnum; | |
| 2253 } | |
| 2254 else | |
| 2255 { | |
| 2256 win_draw_end(wp, '@', ' ', srow, wp->w_height, HLF_AT); | |
| 2257 wp->w_botline = lnum; | |
| 2258 } | |
| 2259 } | |
| 2260 else | |
| 2261 { | |
|
8643
24b43dd167eb
commit https://github.com/vim/vim/commit/44a2f923c00f1384c9ecde12fb5b4711bc20702e
Christian Brabandt <cb@256bit.org>
parents:
8627
diff
changeset
|
2262 #ifdef FEAT_WINDOWS |
| 7 | 2263 draw_vsep_win(wp, row); |
| 2264 #endif | |
| 2265 if (eof) /* we hit the end of the file */ | |
| 2266 { | |
| 2267 wp->w_botline = buf->b_ml.ml_line_count + 1; | |
| 2268 #ifdef FEAT_DIFF | |
| 2269 j = diff_check_fill(wp, wp->w_botline); | |
| 2270 if (j > 0 && !wp->w_botfill) | |
| 2271 { | |
| 2272 /* | |
| 2273 * Display filler lines at the end of the file | |
| 2274 */ | |
| 2275 if (char2cells(fill_diff) > 1) | |
| 2276 i = '-'; | |
| 2277 else | |
| 2278 i = fill_diff; | |
| 2279 if (row + j > wp->w_height) | |
| 2280 j = wp->w_height - row; | |
| 2281 win_draw_end(wp, i, i, row, row + (int)j, HLF_DED); | |
| 2282 row += j; | |
| 2283 } | |
| 2284 #endif | |
| 2285 } | |
| 3318 | 2286 else if (dollar_vcol == -1) |
| 7 | 2287 wp->w_botline = lnum; |
| 2288 | |
| 2289 /* make sure the rest of the screen is blank */ | |
| 2290 /* 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
|
2291 win_draw_end(wp, '~', ' ', row, wp->w_height, HLF_EOB); |
| 7 | 2292 } |
| 2293 | |
| 2294 /* Reset the type of redrawing required, the window has been updated. */ | |
| 2295 wp->w_redr_type = 0; | |
| 2296 #ifdef FEAT_DIFF | |
| 2297 wp->w_old_topfill = wp->w_topfill; | |
| 2298 wp->w_old_botfill = wp->w_botfill; | |
| 2299 #endif | |
| 2300 | |
| 3318 | 2301 if (dollar_vcol == -1) |
| 7 | 2302 { |
| 2303 /* | |
| 2304 * There is a trick with w_botline. If we invalidate it on each | |
| 2305 * change that might modify it, this will cause a lot of expensive | |
| 2306 * calls to plines() in update_topline() each time. Therefore the | |
| 2307 * value of w_botline is often approximated, and this value is used to | |
| 2308 * compute the value of w_topline. If the value of w_botline was | |
| 2309 * wrong, check that the value of w_topline is correct (cursor is on | |
| 2310 * the visible part of the text). If it's not, we need to redraw | |
| 2311 * again. Mostly this just means scrolling up a few lines, so it | |
| 2312 * doesn't look too bad. Only do this for the current window (where | |
| 2313 * changes are relevant). | |
| 2314 */ | |
| 2315 wp->w_valid |= VALID_BOTLINE; | |
| 2316 if (wp == curwin && wp->w_botline != old_botline && !recursive) | |
| 2317 { | |
| 2318 recursive = TRUE; | |
| 2319 curwin->w_valid &= ~VALID_TOPLINE; | |
| 2320 update_topline(); /* may invalidate w_botline again */ | |
| 2321 if (must_redraw != 0) | |
| 2322 { | |
| 2323 /* Don't update for changes in buffer again. */ | |
| 2324 i = curbuf->b_mod_set; | |
| 2325 curbuf->b_mod_set = FALSE; | |
| 2326 win_update(curwin); | |
| 2327 must_redraw = 0; | |
| 2328 curbuf->b_mod_set = i; | |
| 2329 } | |
| 2330 recursive = FALSE; | |
| 2331 } | |
| 2332 } | |
| 2333 | |
| 2334 #if defined(FEAT_SYN_HL) || defined(FEAT_SEARCH_EXTRA) | |
| 2335 /* restore got_int, unless CTRL-C was hit while redrawing */ | |
| 2336 if (!got_int) | |
| 2337 got_int = save_got_int; | |
| 2338 #endif | |
| 2339 } | |
| 2340 | |
| 2341 /* | |
| 2342 * Clear the rest of the window and mark the unused lines with "c1". use "c2" | |
| 2343 * as the filler character. | |
| 2344 */ | |
| 2345 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2346 win_draw_end( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2347 win_T *wp, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2348 int c1, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2349 int c2, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2350 int row, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2351 int endrow, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2352 hlf_T hl) |
| 7 | 2353 { |
| 2354 #if defined(FEAT_FOLDING) || defined(FEAT_SIGNS) || defined(FEAT_CMDWIN) | |
| 2355 int n = 0; | |
| 2356 # define FDC_OFF n | |
| 2357 #else | |
| 2358 # define FDC_OFF 0 | |
| 2359 #endif | |
| 6553 | 2360 #ifdef FEAT_FOLDING |
| 2361 int fdc = compute_foldcolumn(wp, 0); | |
| 2362 #endif | |
| 7 | 2363 |
| 2364 #ifdef FEAT_RIGHTLEFT | |
| 2365 if (wp->w_p_rl) | |
| 2366 { | |
| 2367 /* No check for cmdline window: should never be right-left. */ | |
| 2368 # ifdef FEAT_FOLDING | |
| 6553 | 2369 n = fdc; |
| 7 | 2370 |
| 2371 if (n > 0) | |
| 2372 { | |
| 2373 /* draw the fold column at the right */ | |
| 119 | 2374 if (n > W_WIDTH(wp)) |
| 2375 n = W_WIDTH(wp); | |
| 7 | 2376 screen_fill(W_WINROW(wp) + row, W_WINROW(wp) + endrow, |
| 2377 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
|
2378 ' ', ' ', HL_ATTR(HLF_FC)); |
| 7 | 2379 } |
| 2380 # endif | |
| 2381 # ifdef FEAT_SIGNS | |
|
9852
4eea48b76d03
commit https://github.com/vim/vim/commit/95ec9d6a6ab3117d60ff638670a803d43974ba51
Christian Brabandt <cb@256bit.org>
parents:
9848
diff
changeset
|
2382 if (signcolumn_on(wp)) |
| 7 | 2383 { |
| 2384 int nn = n + 2; | |
| 2385 | |
| 2386 /* draw the sign column left of the fold column */ | |
| 119 | 2387 if (nn > W_WIDTH(wp)) |
| 2388 nn = W_WIDTH(wp); | |
| 7 | 2389 screen_fill(W_WINROW(wp) + row, W_WINROW(wp) + endrow, |
| 2390 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
|
2391 ' ', ' ', HL_ATTR(HLF_SC)); |
| 7 | 2392 n = nn; |
| 2393 } | |
| 2394 # endif | |
| 2395 screen_fill(W_WINROW(wp) + row, W_WINROW(wp) + endrow, | |
| 2396 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
|
2397 c2, c2, HL_ATTR(hl)); |
| 7 | 2398 screen_fill(W_WINROW(wp) + row, W_WINROW(wp) + endrow, |
| 2399 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
|
2400 c1, c2, HL_ATTR(hl)); |
| 7 | 2401 } |
| 2402 else | |
| 2403 #endif | |
| 2404 { | |
| 2405 #ifdef FEAT_CMDWIN | |
| 2406 if (cmdwin_type != 0 && wp == curwin) | |
| 2407 { | |
| 2408 /* draw the cmdline character in the leftmost column */ | |
| 2409 n = 1; | |
| 2410 if (n > wp->w_width) | |
| 2411 n = wp->w_width; | |
| 2412 screen_fill(W_WINROW(wp) + row, W_WINROW(wp) + endrow, | |
| 2413 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
|
2414 cmdwin_type, ' ', HL_ATTR(HLF_AT)); |
| 7 | 2415 } |
| 2416 #endif | |
| 2417 #ifdef FEAT_FOLDING | |
| 6553 | 2418 if (fdc > 0) |
| 2419 { | |
| 2420 int nn = n + fdc; | |
| 7 | 2421 |
| 2422 /* draw the fold column at the left */ | |
| 2423 if (nn > W_WIDTH(wp)) | |
| 2424 nn = W_WIDTH(wp); | |
| 2425 screen_fill(W_WINROW(wp) + row, W_WINROW(wp) + endrow, | |
| 2426 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
|
2427 ' ', ' ', HL_ATTR(HLF_FC)); |
| 7 | 2428 n = nn; |
| 2429 } | |
| 2430 #endif | |
| 2431 #ifdef FEAT_SIGNS | |
|
9852
4eea48b76d03
commit https://github.com/vim/vim/commit/95ec9d6a6ab3117d60ff638670a803d43974ba51
Christian Brabandt <cb@256bit.org>
parents:
9848
diff
changeset
|
2432 if (signcolumn_on(wp)) |
| 7 | 2433 { |
| 2434 int nn = n + 2; | |
| 2435 | |
| 2436 /* draw the sign column after the fold column */ | |
| 2437 if (nn > W_WIDTH(wp)) | |
| 2438 nn = W_WIDTH(wp); | |
| 2439 screen_fill(W_WINROW(wp) + row, W_WINROW(wp) + endrow, | |
| 2440 W_WINCOL(wp) + n, (int)W_WINCOL(wp) + nn, | |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
2441 ' ', ' ', HL_ATTR(HLF_SC)); |
| 7 | 2442 n = nn; |
| 2443 } | |
| 2444 #endif | |
| 2445 screen_fill(W_WINROW(wp) + row, W_WINROW(wp) + endrow, | |
| 2446 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
|
2447 c1, c2, HL_ATTR(hl)); |
| 7 | 2448 } |
| 2449 set_empty_rows(wp, row); | |
| 2450 } | |
| 2451 | |
|
2314
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
2452 #ifdef FEAT_SYN_HL |
|
7805
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7697
diff
changeset
|
2453 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
|
2454 |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
2455 /* |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
2456 * 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
|
2457 */ |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
2458 static int |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2459 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
|
2460 { |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
2461 while (**color_cols >= 0 && vcol > **color_cols) |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
2462 ++*color_cols; |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
2463 return (**color_cols >= 0); |
|
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 #endif |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
2466 |
| 7 | 2467 #ifdef FEAT_FOLDING |
| 2468 /* | |
| 6553 | 2469 * Compute the width of the foldcolumn. Based on 'foldcolumn' and how much |
| 2470 * space is available for window "wp", minus "col". | |
| 2471 */ | |
| 2472 static int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2473 compute_foldcolumn(win_T *wp, int col) |
| 6553 | 2474 { |
| 2475 int fdc = wp->w_p_fdc; | |
| 2476 int wmw = wp == curwin && p_wmw == 0 ? 1 : p_wmw; | |
| 2477 int wwidth = W_WIDTH(wp); | |
| 2478 | |
| 2479 if (fdc > wwidth - (col + wmw)) | |
| 2480 fdc = wwidth - (col + wmw); | |
| 2481 return fdc; | |
| 2482 } | |
| 2483 | |
| 2484 /* | |
| 7 | 2485 * Display one folded line. |
| 2486 */ | |
| 2487 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2488 fold_line( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2489 win_T *wp, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2490 long fold_count, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2491 foldinfo_T *foldinfo, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2492 linenr_T lnum, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2493 int row) |
| 7 | 2494 { |
|
9754
a990e7ed260b
commit https://github.com/vim/vim/commit/ee695f787ade7fd88fc5f5497553d95c0c3645b5
Christian Brabandt <cb@256bit.org>
parents:
9665
diff
changeset
|
2495 char_u buf[FOLD_TEXT_LEN]; |
| 7 | 2496 pos_T *top, *bot; |
| 2497 linenr_T lnume = lnum + fold_count - 1; | |
| 2498 int len; | |
| 29 | 2499 char_u *text; |
| 7 | 2500 int fdc; |
| 2501 int col; | |
| 2502 int txtcol; | |
| 2503 int off = (int)(current_ScreenLine - ScreenLines); | |
| 216 | 2504 int ri; |
| 7 | 2505 |
| 2506 /* Build the fold line: | |
| 2507 * 1. Add the cmdwin_type for the command-line window | |
| 2508 * 2. Add the 'foldcolumn' | |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
2509 * 3. Add the 'number' or 'relativenumber' column |
| 7 | 2510 * 4. Compose the text |
| 2511 * 5. Add the text | |
| 2512 * 6. set highlighting for the Visual area an other text | |
| 2513 */ | |
| 2514 col = 0; | |
| 2515 | |
| 2516 /* | |
| 2517 * 1. Add the cmdwin_type for the command-line window | |
| 2518 * Ignores 'rightleft', this window is never right-left. | |
| 2519 */ | |
| 2520 #ifdef FEAT_CMDWIN | |
| 2521 if (cmdwin_type != 0 && wp == curwin) | |
| 2522 { | |
| 2523 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
|
2524 ScreenAttrs[off] = HL_ATTR(HLF_AT); |
| 7 | 2525 #ifdef FEAT_MBYTE |
| 2526 if (enc_utf8) | |
| 2527 ScreenLinesUC[off] = 0; | |
| 2528 #endif | |
| 2529 ++col; | |
| 2530 } | |
| 2531 #endif | |
| 2532 | |
| 2533 /* | |
| 2534 * 2. Add the 'foldcolumn' | |
| 6553 | 2535 * Reduce the width when there is not enough space. |
| 7 | 2536 */ |
| 6553 | 2537 fdc = compute_foldcolumn(wp, col); |
| 7 | 2538 if (fdc > 0) |
| 2539 { | |
| 2540 fill_foldcolumn(buf, wp, TRUE, lnum); | |
| 2541 #ifdef FEAT_RIGHTLEFT | |
| 2542 if (wp->w_p_rl) | |
| 2543 { | |
| 2544 int i; | |
| 2545 | |
| 2546 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
|
2547 HL_ATTR(HLF_FC)); |
| 7 | 2548 /* reverse the fold column */ |
| 2549 for (i = 0; i < fdc; ++i) | |
| 2550 ScreenLines[off + W_WIDTH(wp) - i - 1 - col] = buf[i]; | |
| 2551 } | |
| 2552 else | |
| 2553 #endif | |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
2554 copy_text_attr(off + col, buf, fdc, HL_ATTR(HLF_FC)); |
| 7 | 2555 col += fdc; |
| 2556 } | |
| 2557 | |
| 2558 #ifdef FEAT_RIGHTLEFT | |
| 216 | 2559 # define RL_MEMSET(p, v, l) if (wp->w_p_rl) \ |
| 2560 for (ri = 0; ri < l; ++ri) \ | |
| 2561 ScreenAttrs[off + (W_WIDTH(wp) - (p) - (l)) + ri] = v; \ | |
| 2562 else \ | |
| 2563 for (ri = 0; ri < l; ++ri) \ | |
| 2564 ScreenAttrs[off + (p) + ri] = v | |
| 7 | 2565 #else |
| 216 | 2566 # define RL_MEMSET(p, v, l) for (ri = 0; ri < l; ++ri) \ |
| 2567 ScreenAttrs[off + (p) + ri] = v | |
| 7 | 2568 #endif |
| 2569 | |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
2570 /* 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
|
2571 * text */ |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
2572 RL_MEMSET(col, HL_ATTR(HLF_FL), W_WIDTH(wp) - col); |
| 7 | 2573 |
| 2574 #ifdef FEAT_SIGNS | |
| 2575 /* 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
|
2576 if (signcolumn_on(wp)) |
| 7 | 2577 { |
| 2578 len = W_WIDTH(wp) - col; | |
| 2579 if (len > 0) | |
| 2580 { | |
| 2581 if (len > 2) | |
| 2582 len = 2; | |
| 2583 # ifdef FEAT_RIGHTLEFT | |
| 2584 if (wp->w_p_rl) | |
| 2585 /* the line number isn't reversed */ | |
| 2586 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
|
2587 (char_u *)" ", len, HL_ATTR(HLF_FL)); |
| 7 | 2588 else |
| 2589 # endif | |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
2590 copy_text_attr(off + col, (char_u *)" ", len, HL_ATTR(HLF_FL)); |
| 7 | 2591 col += len; |
| 2592 } | |
| 2593 } | |
| 2594 #endif | |
| 2595 | |
| 2596 /* | |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
2597 * 3. Add the 'number' or 'relativenumber' column |
| 7 | 2598 */ |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
2599 if (wp->w_p_nu || wp->w_p_rnu) |
| 7 | 2600 { |
| 2601 len = W_WIDTH(wp) - col; | |
| 2602 if (len > 0) | |
| 2603 { | |
| 13 | 2604 int w = number_width(wp); |
| 5905 | 2605 long num; |
| 2606 char *fmt = "%*ld "; | |
| 13 | 2607 |
| 2608 if (len > w + 1) | |
| 2609 len = w + 1; | |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
2610 |
|
4736
3f2319a953b3
updated for version 7.3.1115
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
2611 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
|
2612 /* 'number' + 'norelativenumber' */ |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
2613 num = (long)lnum; |
|
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
2614 else |
| 4065 | 2615 { |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
2616 /* 'relativenumber', don't use negative numbers */ |
| 2675 | 2617 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
|
2618 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
|
2619 { |
|
3f2319a953b3
updated for version 7.3.1115
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
2620 /* 'number' + 'relativenumber': cursor line shows absolute |
|
3f2319a953b3
updated for version 7.3.1115
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
2621 * line number */ |
| 4065 | 2622 num = lnum; |
| 2623 fmt = "%-*ld "; | |
| 2624 } | |
| 2625 } | |
| 2626 | |
| 2627 sprintf((char *)buf, fmt, w, num); | |
| 7 | 2628 #ifdef FEAT_RIGHTLEFT |
| 2629 if (wp->w_p_rl) | |
| 2630 /* the line number isn't reversed */ | |
| 2631 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
|
2632 HL_ATTR(HLF_FL)); |
| 7 | 2633 else |
| 2634 #endif | |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
2635 copy_text_attr(off + col, buf, len, HL_ATTR(HLF_FL)); |
| 7 | 2636 col += len; |
| 2637 } | |
| 2638 } | |
| 2639 | |
| 2640 /* | |
| 2641 * 4. Compose the folded-line string with 'foldtext', if set. | |
| 2642 */ | |
| 29 | 2643 text = get_foldtext(wp, lnum, lnume, foldinfo, buf); |
| 7 | 2644 |
| 2645 txtcol = col; /* remember where text starts */ | |
| 2646 | |
| 2647 /* | |
| 2648 * 5. move the text to current_ScreenLine. Fill up with "fill_fold". | |
| 2649 * Right-left text is put in columns 0 - number-col, normal text is put | |
| 2650 * in columns number-col - window-width. | |
| 2651 */ | |
| 2652 #ifdef FEAT_MBYTE | |
| 2653 if (has_mbyte) | |
| 2654 { | |
| 2655 int cells; | |
| 714 | 2656 int u8c, u8cc[MAX_MCO]; |
| 2657 int i; | |
| 7 | 2658 int idx; |
| 2659 int c_len; | |
| 33 | 2660 char_u *p; |
| 7 | 2661 # ifdef FEAT_ARABIC |
| 2662 int prev_c = 0; /* previous Arabic character */ | |
| 2663 int prev_c1 = 0; /* first composing char for prev_c */ | |
| 2664 # endif | |
| 2665 | |
| 2666 # ifdef FEAT_RIGHTLEFT | |
| 2667 if (wp->w_p_rl) | |
| 2668 idx = off; | |
| 2669 else | |
| 2670 # endif | |
| 2671 idx = off + col; | |
| 2672 | |
| 2673 /* Store multibyte characters in ScreenLines[] et al. correctly. */ | |
| 2674 for (p = text; *p != NUL; ) | |
| 2675 { | |
| 2676 cells = (*mb_ptr2cells)(p); | |
| 474 | 2677 c_len = (*mb_ptr2len)(p); |
| 7 | 2678 if (col + cells > W_WIDTH(wp) |
| 2679 # ifdef FEAT_RIGHTLEFT | |
| 2680 - (wp->w_p_rl ? col : 0) | |
| 2681 # endif | |
| 2682 ) | |
| 2683 break; | |
| 2684 ScreenLines[idx] = *p; | |
| 2685 if (enc_utf8) | |
| 2686 { | |
| 714 | 2687 u8c = utfc_ptr2char(p, u8cc); |
| 2688 if (*p < 0x80 && u8cc[0] == 0) | |
| 7 | 2689 { |
| 2690 ScreenLinesUC[idx] = 0; | |
| 2691 #ifdef FEAT_ARABIC | |
| 2692 prev_c = u8c; | |
| 2693 #endif | |
| 2694 } | |
| 2695 else | |
| 2696 { | |
| 2697 #ifdef FEAT_ARABIC | |
| 2698 if (p_arshape && !p_tbidi && ARABIC_CHAR(u8c)) | |
| 2699 { | |
| 2700 /* Do Arabic shaping. */ | |
| 714 | 2701 int pc, pc1, nc; |
| 2702 int pcc[MAX_MCO]; | |
| 7 | 2703 int firstbyte = *p; |
| 2704 | |
| 2705 /* The idea of what is the previous and next | |
| 2706 * character depends on 'rightleft'. */ | |
| 2707 if (wp->w_p_rl) | |
| 2708 { | |
| 2709 pc = prev_c; | |
| 2710 pc1 = prev_c1; | |
| 2711 nc = utf_ptr2char(p + c_len); | |
| 714 | 2712 prev_c1 = u8cc[0]; |
| 7 | 2713 } |
| 2714 else | |
| 2715 { | |
| 714 | 2716 pc = utfc_ptr2char(p + c_len, pcc); |
| 7 | 2717 nc = prev_c; |
| 714 | 2718 pc1 = pcc[0]; |
| 7 | 2719 } |
| 2720 prev_c = u8c; | |
| 2721 | |
| 714 | 2722 u8c = arabic_shape(u8c, &firstbyte, &u8cc[0], |
| 7 | 2723 pc, pc1, nc); |
| 2724 ScreenLines[idx] = firstbyte; | |
| 2725 } | |
| 2726 else | |
| 2727 prev_c = u8c; | |
| 2728 #endif | |
| 2729 /* Non-BMP character: display as ? or fullwidth ?. */ | |
| 1401 | 2730 #ifdef UNICODE16 |
| 7 | 2731 if (u8c >= 0x10000) |
| 2732 ScreenLinesUC[idx] = (cells == 2) ? 0xff1f : (int)'?'; | |
| 2733 else | |
| 1401 | 2734 #endif |
| 7 | 2735 ScreenLinesUC[idx] = u8c; |
| 714 | 2736 for (i = 0; i < Screen_mco; ++i) |
| 2737 { | |
| 2738 ScreenLinesC[i][idx] = u8cc[i]; | |
| 2739 if (u8cc[i] == 0) | |
| 2740 break; | |
| 2741 } | |
| 7 | 2742 } |
| 2743 if (cells > 1) | |
| 2744 ScreenLines[idx + 1] = 0; | |
| 2745 } | |
|
2069
63613d8d7e4d
updated for version 7.2.354
Bram Moolenaar <bram@zimbu.org>
parents:
2055
diff
changeset
|
2746 else if (enc_dbcs == DBCS_JPNU && *p == 0x8e) |
|
63613d8d7e4d
updated for version 7.2.354
Bram Moolenaar <bram@zimbu.org>
parents:
2055
diff
changeset
|
2747 /* double-byte single width character */ |
|
63613d8d7e4d
updated for version 7.2.354
Bram Moolenaar <bram@zimbu.org>
parents:
2055
diff
changeset
|
2748 ScreenLines2[idx] = p[1]; |
|
63613d8d7e4d
updated for version 7.2.354
Bram Moolenaar <bram@zimbu.org>
parents:
2055
diff
changeset
|
2749 else if (cells > 1) |
|
63613d8d7e4d
updated for version 7.2.354
Bram Moolenaar <bram@zimbu.org>
parents:
2055
diff
changeset
|
2750 /* double-width character */ |
|
63613d8d7e4d
updated for version 7.2.354
Bram Moolenaar <bram@zimbu.org>
parents:
2055
diff
changeset
|
2751 ScreenLines[idx + 1] = p[1]; |
| 7 | 2752 col += cells; |
| 2753 idx += cells; | |
| 2754 p += c_len; | |
| 2755 } | |
| 2756 } | |
| 2757 else | |
| 2758 #endif | |
| 2759 { | |
| 2760 len = (int)STRLEN(text); | |
| 2761 if (len > W_WIDTH(wp) - col) | |
| 2762 len = W_WIDTH(wp) - col; | |
| 2763 if (len > 0) | |
| 2764 { | |
| 2765 #ifdef FEAT_RIGHTLEFT | |
| 2766 if (wp->w_p_rl) | |
| 2767 STRNCPY(current_ScreenLine, text, len); | |
| 2768 else | |
| 2769 #endif | |
| 2770 STRNCPY(current_ScreenLine + col, text, len); | |
| 2771 col += len; | |
| 2772 } | |
| 2773 } | |
| 2774 | |
| 2775 /* Fill the rest of the line with the fold filler */ | |
| 2776 #ifdef FEAT_RIGHTLEFT | |
| 2777 if (wp->w_p_rl) | |
| 2778 col -= txtcol; | |
| 2779 #endif | |
| 2780 while (col < W_WIDTH(wp) | |
| 2781 #ifdef FEAT_RIGHTLEFT | |
| 2782 - (wp->w_p_rl ? txtcol : 0) | |
| 2783 #endif | |
| 2784 ) | |
| 2785 { | |
| 2786 #ifdef FEAT_MBYTE | |
| 2787 if (enc_utf8) | |
| 2788 { | |
| 2789 if (fill_fold >= 0x80) | |
| 2790 { | |
| 2791 ScreenLinesUC[off + col] = fill_fold; | |
| 714 | 2792 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
|
2793 ScreenLines[off + col] = 0x80; /* avoid storing zero */ |
| 7 | 2794 } |
| 2795 else | |
|
11277
f26a535d9464
patch 8.0.0524: folds messed up
Christian Brabandt <cb@256bit.org>
parents:
11269
diff
changeset
|
2796 { |
| 7 | 2797 ScreenLinesUC[off + col] = 0; |
|
11277
f26a535d9464
patch 8.0.0524: folds messed up
Christian Brabandt <cb@256bit.org>
parents:
11269
diff
changeset
|
2798 ScreenLines[off + col] = fill_fold; |
|
f26a535d9464
patch 8.0.0524: folds messed up
Christian Brabandt <cb@256bit.org>
parents:
11269
diff
changeset
|
2799 } |
|
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
|
2800 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
|
2801 } |
|
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
|
2802 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
|
2803 #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
|
2804 ScreenLines[off + col++] = fill_fold; |
| 7 | 2805 } |
| 2806 | |
| 2807 if (text != buf) | |
| 2808 vim_free(text); | |
| 2809 | |
| 2810 /* | |
| 2811 * 6. set highlighting for the Visual area an other text. | |
| 2812 * If all folded lines are in the Visual area, highlight the line. | |
| 2813 */ | |
| 2814 if (VIsual_active && wp->w_buffer == curwin->w_buffer) | |
| 2815 { | |
|
11121
778c10516955
patch 8.0.0448: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11105
diff
changeset
|
2816 if (LTOREQ_POS(curwin->w_cursor, VIsual)) |
| 7 | 2817 { |
| 2818 /* Visual is after curwin->w_cursor */ | |
| 2819 top = &curwin->w_cursor; | |
| 2820 bot = &VIsual; | |
| 2821 } | |
| 2822 else | |
| 2823 { | |
| 2824 /* Visual is before curwin->w_cursor */ | |
| 2825 top = &VIsual; | |
| 2826 bot = &curwin->w_cursor; | |
| 2827 } | |
| 2828 if (lnum >= top->lnum | |
| 2829 && lnume <= bot->lnum | |
| 2830 && (VIsual_mode != 'v' | |
| 2831 || ((lnum > top->lnum | |
| 2832 || (lnum == top->lnum | |
| 2833 && top->col == 0)) | |
| 2834 && (lnume < bot->lnum | |
| 2835 || (lnume == bot->lnum | |
| 2836 && (bot->col - (*p_sel == 'e')) | |
| 1883 | 2837 >= (colnr_T)STRLEN(ml_get_buf(wp->w_buffer, lnume, FALSE))))))) |
| 7 | 2838 { |
| 2839 if (VIsual_mode == Ctrl_V) | |
| 2840 { | |
| 2841 /* Visual block mode: highlight the chars part of the block */ | |
| 2842 if (wp->w_old_cursor_fcol + txtcol < (colnr_T)W_WIDTH(wp)) | |
| 2843 { | |
| 3040 | 2844 if (wp->w_old_cursor_lcol != MAXCOL |
| 2845 && wp->w_old_cursor_lcol + txtcol | |
| 2846 < (colnr_T)W_WIDTH(wp)) | |
| 7 | 2847 len = wp->w_old_cursor_lcol; |
| 2848 else | |
| 2849 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
|
2850 RL_MEMSET(wp->w_old_cursor_fcol + txtcol, HL_ATTR(HLF_V), |
| 230 | 2851 len - (int)wp->w_old_cursor_fcol); |
| 7 | 2852 } |
| 2853 } | |
| 2854 else | |
| 216 | 2855 { |
| 7 | 2856 /* 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
|
2857 RL_MEMSET(txtcol, HL_ATTR(HLF_V), W_WIDTH(wp) - txtcol); |
| 216 | 2858 } |
| 7 | 2859 } |
| 2860 } | |
| 2861 | |
| 743 | 2862 #ifdef FEAT_SYN_HL |
| 6685 | 2863 /* Show colorcolumn in the fold line, but let cursorcolumn override it. */ |
| 2864 if (wp->w_p_cc_cols) | |
| 2865 { | |
| 2866 int i = 0; | |
| 2867 int j = wp->w_p_cc_cols[i]; | |
| 2868 int old_txtcol = txtcol; | |
| 2869 | |
| 2870 while (j > -1) | |
| 2871 { | |
| 2872 txtcol += j; | |
| 2873 if (wp->w_p_wrap) | |
| 2874 txtcol -= wp->w_skipcol; | |
| 2875 else | |
| 2876 txtcol -= wp->w_leftcol; | |
| 2877 if (txtcol >= 0 && txtcol < W_WIDTH(wp)) | |
| 2878 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
|
2879 ScreenAttrs[off + txtcol], HL_ATTR(HLF_MC)); |
| 6685 | 2880 txtcol = old_txtcol; |
| 2881 j = wp->w_p_cc_cols[++i]; | |
| 2882 } | |
| 2883 } | |
| 2884 | |
| 743 | 2885 /* Show 'cursorcolumn' in the fold line. */ |
| 1725 | 2886 if (wp->w_p_cuc) |
| 2887 { | |
| 2888 txtcol += wp->w_virtcol; | |
| 2889 if (wp->w_p_wrap) | |
| 2890 txtcol -= wp->w_skipcol; | |
| 2891 else | |
| 2892 txtcol -= wp->w_leftcol; | |
| 2893 if (txtcol >= 0 && txtcol < W_WIDTH(wp)) | |
| 2894 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
|
2895 ScreenAttrs[off + txtcol], HL_ATTR(HLF_CUC)); |
| 1725 | 2896 } |
| 743 | 2897 #endif |
| 7 | 2898 |
|
11670
3b2afa2b77b3
patch 8.0.0718: output of job in terminal is not displayed
Christian Brabandt <cb@256bit.org>
parents:
11657
diff
changeset
|
2899 screen_line(row + W_WINROW(wp), W_WINCOL(wp), (int)W_WIDTH(wp), |
| 7 | 2900 (int)W_WIDTH(wp), FALSE); |
| 2901 | |
| 2902 /* | |
| 2903 * Update w_cline_height and w_cline_folded if the cursor line was | |
| 2904 * updated (saves a call to plines() later). | |
| 2905 */ | |
| 2906 if (wp == curwin | |
| 2907 && lnum <= curwin->w_cursor.lnum | |
| 2908 && lnume >= curwin->w_cursor.lnum) | |
| 2909 { | |
| 2910 curwin->w_cline_row = row; | |
| 2911 curwin->w_cline_height = 1; | |
| 2912 curwin->w_cline_folded = TRUE; | |
| 2913 curwin->w_valid |= (VALID_CHEIGHT|VALID_CROW); | |
| 2914 } | |
| 2915 } | |
| 2916 | |
| 2917 /* | |
| 2918 * Copy "buf[len]" to ScreenLines["off"] and set attributes to "attr". | |
| 2919 */ | |
| 2920 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2921 copy_text_attr( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2922 int off, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2923 char_u *buf, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2924 int len, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2925 int attr) |
| 7 | 2926 { |
| 216 | 2927 int i; |
| 2928 | |
| 7 | 2929 mch_memmove(ScreenLines + off, buf, (size_t)len); |
| 2930 # ifdef FEAT_MBYTE | |
| 2931 if (enc_utf8) | |
| 2932 vim_memset(ScreenLinesUC + off, 0, sizeof(u8char_T) * (size_t)len); | |
| 2933 # endif | |
| 216 | 2934 for (i = 0; i < len; ++i) |
| 2935 ScreenAttrs[off + i] = attr; | |
| 7 | 2936 } |
| 2937 | |
| 2938 /* | |
| 2939 * Fill the foldcolumn at "p" for window "wp". | |
| 548 | 2940 * Only to be called when 'foldcolumn' > 0. |
| 7 | 2941 */ |
| 2942 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2943 fill_foldcolumn( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2944 char_u *p, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2945 win_T *wp, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2946 int closed, /* TRUE of FALSE */ |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2947 linenr_T lnum) /* current line number */ |
| 7 | 2948 { |
| 2949 int i = 0; | |
| 2950 int level; | |
| 2951 int first_level; | |
| 519 | 2952 int empty; |
| 6553 | 2953 int fdc = compute_foldcolumn(wp, 0); |
| 7 | 2954 |
| 2955 /* Init to all spaces. */ | |
| 6929 | 2956 vim_memset(p, ' ', (size_t)fdc); |
| 7 | 2957 |
| 2958 level = win_foldinfo.fi_level; | |
| 2959 if (level > 0) | |
| 2960 { | |
| 519 | 2961 /* If there is only one column put more info in it. */ |
| 6553 | 2962 empty = (fdc == 1) ? 0 : 1; |
| 519 | 2963 |
| 7 | 2964 /* If the column is too narrow, we start at the lowest level that |
| 2965 * fits and use numbers to indicated the depth. */ | |
| 6553 | 2966 first_level = level - fdc - closed + 1 + empty; |
| 7 | 2967 if (first_level < 1) |
| 2968 first_level = 1; | |
| 2969 | |
| 6553 | 2970 for (i = 0; i + empty < fdc; ++i) |
| 7 | 2971 { |
| 2972 if (win_foldinfo.fi_lnum == lnum | |
| 2973 && first_level + i >= win_foldinfo.fi_low_level) | |
| 2974 p[i] = '-'; | |
| 2975 else if (first_level == 1) | |
| 2976 p[i] = '|'; | |
| 2977 else if (first_level + i <= 9) | |
| 2978 p[i] = '0' + first_level + i; | |
| 2979 else | |
| 2980 p[i] = '>'; | |
| 2981 if (first_level + i == level) | |
| 2982 break; | |
| 2983 } | |
| 2984 } | |
| 2985 if (closed) | |
| 6553 | 2986 p[i >= fdc ? i - 1 : i] = '+'; |
| 7 | 2987 } |
| 2988 #endif /* FEAT_FOLDING */ | |
| 2989 | |
| 2990 /* | |
| 2991 * Display line "lnum" of window 'wp' on the screen. | |
| 2992 * Start at row "startrow", stop when "endrow" is reached. | |
| 2993 * wp->w_virtcol needs to be valid. | |
| 2994 * | |
| 2995 * Return the number of last row the line occupies. | |
| 2996 */ | |
| 2997 static int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2998 win_line( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2999 win_T *wp, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
3000 linenr_T lnum, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
3001 int startrow, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
3002 int endrow, |
|
11529
998d2cf59caa
patch 8.0.0647: syntax highlighting can make cause a freeze
Christian Brabandt <cb@256bit.org>
parents:
11521
diff
changeset
|
3003 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
|
3004 proftime_T *syntax_tm) |
| 7 | 3005 { |
|
10801
e7b8be5ecacd
patch 8.0.0290: cursor positioning wrong if wide character wraps
Christian Brabandt <cb@256bit.org>
parents:
10793
diff
changeset
|
3006 int col = 0; /* visual column on screen */ |
| 7 | 3007 unsigned off; /* offset in ScreenLines/ScreenAttrs */ |
| 3008 int c = 0; /* init for GCC */ | |
| 3009 long vcol = 0; /* virtual column (for tabs) */ | |
| 6503 | 3010 #ifdef FEAT_LINEBREAK |
| 3011 long vcol_sbr = -1; /* virtual column after showbreak */ | |
| 3012 #endif | |
| 7 | 3013 long vcol_prev = -1; /* "vcol" of previous character */ |
| 3014 char_u *line; /* current line */ | |
| 3015 char_u *ptr; /* current position in "line" */ | |
| 3016 int row; /* row in the window, excl w_winrow */ | |
| 3017 int screen_row; /* row on the screen, incl w_winrow */ | |
| 3018 | |
| 3019 char_u extra[18]; /* "%ld" and 'fdc' must fit in here */ | |
| 3020 int n_extra = 0; /* number of extra chars */ | |
| 1340 | 3021 char_u *p_extra = NULL; /* string of extra chars, plus NUL */ |
| 6026 | 3022 char_u *p_extra_free = NULL; /* p_extra needs to be freed */ |
| 7 | 3023 int c_extra = NUL; /* extra chars, all the same */ |
| 3024 int extra_attr = 0; /* attributes when n_extra != 0 */ | |
| 3025 static char_u *at_end_str = (char_u *)""; /* used for p_extra when | |
| 3026 displaying lcs_eol at end-of-line */ | |
| 3027 int lcs_eol_one = lcs_eol; /* lcs_eol until it's been used */ | |
| 3028 int lcs_prec_todo = lcs_prec; /* lcs_prec until it's been used */ | |
| 3029 | |
| 3030 /* saved "extra" items for when draw_state becomes WL_LINE (again) */ | |
| 3031 int saved_n_extra = 0; | |
| 3032 char_u *saved_p_extra = NULL; | |
| 3033 int saved_c_extra = 0; | |
| 3034 int saved_char_attr = 0; | |
| 3035 | |
| 3036 int n_attr = 0; /* chars with special attr */ | |
| 3037 int saved_attr2 = 0; /* char_attr saved for n_attr */ | |
| 3038 int n_attr3 = 0; /* chars with overruling special attr */ | |
| 3039 int saved_attr3 = 0; /* char_attr saved for n_attr3 */ | |
| 3040 | |
| 3041 int n_skip = 0; /* nr of chars to skip for 'nowrap' */ | |
| 3042 | |
| 3043 int fromcol, tocol; /* start/end of inverting */ | |
| 3044 int fromcol_prev = -2; /* start of inverting after cursor */ | |
| 3045 int noinvcur = FALSE; /* don't invert the cursor */ | |
| 3046 pos_T *top, *bot; | |
| 1813 | 3047 int lnum_in_visual_area = FALSE; |
| 7 | 3048 pos_T pos; |
| 3049 long v; | |
| 3050 | |
| 3051 int char_attr = 0; /* attributes for next character */ | |
| 674 | 3052 int attr_pri = FALSE; /* char_attr has priority */ |
| 7 | 3053 int area_highlighting = FALSE; /* Visual or incsearch highlighting |
| 3054 in this line */ | |
| 3055 int attr = 0; /* attributes for area highlighting */ | |
| 3056 int area_attr = 0; /* attributes desired by highlighting */ | |
| 3057 int search_attr = 0; /* attributes desired by 'hlsearch' */ | |
| 3058 #ifdef FEAT_SYN_HL | |
| 743 | 3059 int vcol_save_attr = 0; /* saved attr for 'cursorcolumn' */ |
| 7 | 3060 int syntax_attr = 0; /* attributes desired by syntax */ |
| 3061 int has_syntax = FALSE; /* this buffer has syntax highl. */ | |
| 3062 int save_did_emsg; | |
| 1437 | 3063 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
|
3064 int draw_color_col = FALSE; /* highlight colorcolumn */ |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
3065 int *color_cols = NULL; /* pointer to according columns array */ |
| 743 | 3066 #endif |
| 3067 #ifdef FEAT_SPELL | |
| 221 | 3068 int has_spell = FALSE; /* this buffer has spell checking */ |
| 348 | 3069 # define SPWORDLEN 150 |
| 3070 char_u nextline[SPWORDLEN * 2];/* text with start of the next line */ | |
| 353 | 3071 int nextlinecol = 0; /* column where nextline[] starts */ |
| 3072 int nextline_idx = 0; /* index in nextline[] where next line | |
| 348 | 3073 starts */ |
| 221 | 3074 int spell_attr = 0; /* attributes desired by spelling */ |
| 3075 int word_end = 0; /* last byte with same spell_attr */ | |
| 378 | 3076 static linenr_T checked_lnum = 0; /* line number for "checked_col" */ |
| 3077 static int checked_col = 0; /* column in "checked_lnum" up to which | |
| 348 | 3078 * there are no spell errors */ |
| 386 | 3079 static int cap_col = -1; /* column to check for Cap word */ |
| 3080 static linenr_T capcol_lnum = 0; /* line number where "cap_col" used */ | |
| 348 | 3081 int cur_checked_col = 0; /* checked column for current line */ |
| 7 | 3082 #endif |
| 3083 int extra_check; /* has syntax or linebreak */ | |
| 3084 #ifdef FEAT_MBYTE | |
| 3085 int multi_attr = 0; /* attributes desired by multibyte */ | |
| 3086 int mb_l = 1; /* multi-byte byte length */ | |
| 3087 int mb_c = 0; /* decoded multi-byte character */ | |
| 3088 int mb_utf8 = FALSE; /* screen char is UTF-8 char */ | |
| 714 | 3089 int u8cc[MAX_MCO]; /* composing UTF-8 chars */ |
| 7 | 3090 #endif |
| 3091 #ifdef FEAT_DIFF | |
| 3092 int filler_lines; /* nr of filler lines to be drawn */ | |
| 3093 int filler_todo; /* nr of filler lines still to do + 1 */ | |
| 534 | 3094 hlf_T diff_hlf = (hlf_T)0; /* type of diff highlighting */ |
| 7 | 3095 int change_start = MAXCOL; /* first col of changed area */ |
| 3096 int change_end = -1; /* last col of changed area */ | |
| 3097 #endif | |
| 3098 colnr_T trailcol = MAXCOL; /* start of trailing spaces */ | |
| 3099 #ifdef FEAT_LINEBREAK | |
|
10392
957a1d560bda
commit https://github.com/vim/vim/commit/6c896867c4f5d759616028ef7cbfce2a9ed32600
Christian Brabandt <cb@256bit.org>
parents:
10349
diff
changeset
|
3100 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
|
3101 chars */ |
| 7 | 3102 #endif |
| 910 | 3103 #if defined(FEAT_SIGNS) || (defined(FEAT_QUICKFIX) && defined(FEAT_WINDOWS)) \ |
| 3104 || defined(FEAT_SYN_HL) || defined(FEAT_DIFF) | |
| 7 | 3105 # define LINE_ATTR |
| 1536 | 3106 int line_attr = 0; /* attribute for the whole line */ |
| 7 | 3107 #endif |
| 3108 #ifdef FEAT_SEARCH_EXTRA | |
| 1326 | 3109 matchitem_T *cur; /* points to the match list */ |
| 3110 match_T *shl; /* points to search_hl or a match */ | |
| 3111 int shl_flag; /* flag to indicate whether search_hl | |
| 3112 has been processed or not */ | |
| 5979 | 3113 int pos_inprogress; /* marks that position match search is |
| 3114 in progress */ | |
| 1326 | 3115 int prevcol_hl_flag; /* flag to indicate whether prevcol |
| 3116 equals startcol of search_hl or one | |
| 3117 of the matches */ | |
| 7 | 3118 #endif |
| 3119 #ifdef FEAT_ARABIC | |
| 3120 int prev_c = 0; /* previous Arabic character */ | |
| 3121 int prev_c1 = 0; /* first composing char for prev_c */ | |
| 3122 #endif | |
| 910 | 3123 #if defined(LINE_ATTR) |
| 867 | 3124 int did_line_attr = 0; |
| 3125 #endif | |
| 7 | 3126 |
| 3127 /* draw_state: items that are drawn in sequence: */ | |
| 3128 #define WL_START 0 /* nothing done yet */ | |
| 3129 #ifdef FEAT_CMDWIN | |
| 3130 # define WL_CMDLINE WL_START + 1 /* cmdline window column */ | |
| 3131 #else | |
| 3132 # define WL_CMDLINE WL_START | |
| 3133 #endif | |
| 3134 #ifdef FEAT_FOLDING | |
| 3135 # define WL_FOLD WL_CMDLINE + 1 /* 'foldcolumn' */ | |
| 3136 #else | |
| 3137 # define WL_FOLD WL_CMDLINE | |
| 3138 #endif | |
| 3139 #ifdef FEAT_SIGNS | |
| 3140 # define WL_SIGN WL_FOLD + 1 /* column for signs */ | |
| 3141 #else | |
| 3142 # define WL_SIGN WL_FOLD /* column for signs */ | |
| 3143 #endif | |
| 3144 #define WL_NR WL_SIGN + 1 /* line number */ | |
| 5995 | 3145 #ifdef FEAT_LINEBREAK |
| 3146 # define WL_BRI WL_NR + 1 /* 'breakindent' */ | |
| 3147 #else | |
| 3148 # define WL_BRI WL_NR | |
| 3149 #endif | |
| 7 | 3150 #if defined(FEAT_LINEBREAK) || defined(FEAT_DIFF) |
| 5995 | 3151 # define WL_SBR WL_BRI + 1 /* 'showbreak' or 'diff' */ |
| 7 | 3152 #else |
| 5995 | 3153 # define WL_SBR WL_BRI |
| 7 | 3154 #endif |
| 3155 #define WL_LINE WL_SBR + 1 /* text in the line */ | |
| 3156 int draw_state = WL_START; /* what to draw next */ | |
| 574 | 3157 #if defined(FEAT_XIM) && defined(FEAT_GUI_GTK) |
| 7 | 3158 int feedback_col = 0; |
| 3159 int feedback_old_attr = -1; | |
| 3160 #endif | |
| 3161 | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
3162 #ifdef FEAT_CONCEAL |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
3163 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
|
3164 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
|
3165 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
|
3166 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
|
3167 int is_concealing = FALSE; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
3168 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
|
3169 wrapping */ |
|
2409
0ca06a92adfb
Add support for horizontal scroll wheel. (Bjorn Winckler)
Bram Moolenaar <bram@vim.org>
parents:
2400
diff
changeset
|
3170 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
|
3171 int did_wcol = FALSE; |
|
8907
5deb9e8f4292
commit https://github.com/vim/vim/commit/4d585022023b96f6507e8cae5ed8fc8d926f5140
Christian Brabandt <cb@256bit.org>
parents:
8872
diff
changeset
|
3172 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
|
3173 int has_match_conc = 0; /* match wants to conceal */ |
| 6520 | 3174 int old_boguscols = 0; |
|
2332
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
3175 # define VCOL_HLC (vcol - vcol_off) |
|
5174
42d592dbbec3
updated for version 7.4a.013
Bram Moolenaar <bram@vim.org>
parents:
5126
diff
changeset
|
3176 # define FIX_FOR_BOGUSCOLS \ |
|
42d592dbbec3
updated for version 7.4a.013
Bram Moolenaar <bram@vim.org>
parents:
5126
diff
changeset
|
3177 { \ |
|
42d592dbbec3
updated for version 7.4a.013
Bram Moolenaar <bram@vim.org>
parents:
5126
diff
changeset
|
3178 n_extra += vcol_off; \ |
|
42d592dbbec3
updated for version 7.4a.013
Bram Moolenaar <bram@vim.org>
parents:
5126
diff
changeset
|
3179 vcol -= vcol_off; \ |
|
42d592dbbec3
updated for version 7.4a.013
Bram Moolenaar <bram@vim.org>
parents:
5126
diff
changeset
|
3180 vcol_off = 0; \ |
|
42d592dbbec3
updated for version 7.4a.013
Bram Moolenaar <bram@vim.org>
parents:
5126
diff
changeset
|
3181 col -= boguscols; \ |
| 6520 | 3182 old_boguscols = boguscols; \ |
|
5174
42d592dbbec3
updated for version 7.4a.013
Bram Moolenaar <bram@vim.org>
parents:
5126
diff
changeset
|
3183 boguscols = 0; \ |
|
42d592dbbec3
updated for version 7.4a.013
Bram Moolenaar <bram@vim.org>
parents:
5126
diff
changeset
|
3184 } |
|
2332
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
3185 #else |
|
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
3186 # define VCOL_HLC (vcol) |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
3187 #endif |
| 7 | 3188 |
| 3189 if (startrow > endrow) /* past the end already! */ | |
| 3190 return startrow; | |
| 3191 | |
| 3192 row = startrow; | |
| 3193 screen_row = row + W_WINROW(wp); | |
| 3194 | |
| 3195 /* | |
| 3196 * To speed up the loop below, set extra_check when there is linebreak, | |
| 3197 * trailing white space and/or syntax processing to be done. | |
| 3198 */ | |
| 3199 #ifdef FEAT_LINEBREAK | |
| 3200 extra_check = wp->w_p_lbr; | |
| 3201 #else | |
| 3202 extra_check = 0; | |
| 3203 #endif | |
| 3204 #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
|
3205 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
|
3206 # 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
|
3207 && !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
|
3208 # endif |
|
998d2cf59caa
patch 8.0.0647: syntax highlighting can make cause a freeze
Christian Brabandt <cb@256bit.org>
parents:
11521
diff
changeset
|
3209 ) |
| 7 | 3210 { |
| 3211 /* Prepare for syntax highlighting in this line. When there is an | |
| 3212 * error, stop syntax highlighting. */ | |
| 3213 save_did_emsg = did_emsg; | |
| 3214 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
|
3215 syntax_start(wp, lnum, syntax_tm); |
| 7 | 3216 if (did_emsg) |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
3217 wp->w_s->b_syn_error = TRUE; |
| 7 | 3218 else |
| 3219 { | |
| 3220 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
|
3221 #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
|
3222 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
|
3223 #endif |
|
998d2cf59caa
patch 8.0.0647: syntax highlighting can make cause a freeze
Christian Brabandt <cb@256bit.org>
parents:
11521
diff
changeset
|
3224 { |
|
998d2cf59caa
patch 8.0.0647: syntax highlighting can make cause a freeze
Christian Brabandt <cb@256bit.org>
parents:
11521
diff
changeset
|
3225 has_syntax = TRUE; |
|
998d2cf59caa
patch 8.0.0647: syntax highlighting can make cause a freeze
Christian Brabandt <cb@256bit.org>
parents:
11521
diff
changeset
|
3226 extra_check = TRUE; |
|
998d2cf59caa
patch 8.0.0647: syntax highlighting can make cause a freeze
Christian Brabandt <cb@256bit.org>
parents:
11521
diff
changeset
|
3227 } |
| 7 | 3228 } |
| 3229 } | |
|
2314
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
3230 |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
3231 /* Check for columns to display for 'colorcolumn'. */ |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
3232 color_cols = wp->w_p_cc_cols; |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
3233 if (color_cols != NULL) |
|
2332
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
3234 draw_color_col = advance_color_col(VCOL_HLC, &color_cols); |
| 743 | 3235 #endif |
| 3236 | |
| 3237 #ifdef FEAT_SPELL | |
| 258 | 3238 if (wp->w_p_spell |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
3239 && *wp->w_s->b_p_spl != NUL |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
3240 && 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
|
3241 && *(char **)(wp->w_s->b_langp.ga_data) != NULL) |
| 221 | 3242 { |
| 3243 /* Prepare for spell checking. */ | |
| 3244 has_spell = TRUE; | |
| 3245 extra_check = TRUE; | |
| 348 | 3246 |
| 3247 /* Get the start of the next line, so that words that wrap to the next | |
| 3248 * line are found too: "et<line-break>al.". | |
| 3249 * Trick: skip a few chars for C/shell/Vim comments */ | |
| 3250 nextline[SPWORDLEN] = NUL; | |
| 3251 if (lnum < wp->w_buffer->b_ml.ml_line_count) | |
| 3252 { | |
| 3253 line = ml_get_buf(wp->w_buffer, lnum + 1, FALSE); | |
| 3254 spell_cat_line(nextline + SPWORDLEN, line, SPWORDLEN); | |
| 3255 } | |
| 3256 | |
| 3257 /* When a word wrapped from the previous line the start of the current | |
| 3258 * line is valid. */ | |
| 3259 if (lnum == checked_lnum) | |
| 3260 cur_checked_col = checked_col; | |
| 3261 checked_lnum = 0; | |
| 386 | 3262 |
| 3263 /* When there was a sentence end in the previous line may require a | |
| 3264 * word starting with capital in this line. In line 1 always check | |
| 3265 * the first word. */ | |
| 3266 if (lnum != capcol_lnum) | |
| 3267 cap_col = -1; | |
| 3268 if (lnum == 1) | |
| 3269 cap_col = 0; | |
| 3270 capcol_lnum = 0; | |
| 221 | 3271 } |
| 7 | 3272 #endif |
| 3273 | |
| 3274 /* | |
| 3275 * handle visual active in this window | |
| 3276 */ | |
| 3277 fromcol = -10; | |
| 3278 tocol = MAXCOL; | |
| 3279 if (VIsual_active && wp->w_buffer == curwin->w_buffer) | |
| 3280 { | |
| 3281 /* 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
|
3282 if (LTOREQ_POS(curwin->w_cursor, VIsual)) |
| 7 | 3283 { |
| 3284 top = &curwin->w_cursor; | |
| 3285 bot = &VIsual; | |
| 3286 } | |
| 3287 else /* Visual is before curwin->w_cursor */ | |
| 3288 { | |
| 3289 top = &VIsual; | |
| 3290 bot = &curwin->w_cursor; | |
| 3291 } | |
| 1813 | 3292 lnum_in_visual_area = (lnum >= top->lnum && lnum <= bot->lnum); |
| 7 | 3293 if (VIsual_mode == Ctrl_V) /* block mode */ |
| 3294 { | |
| 1813 | 3295 if (lnum_in_visual_area) |
| 7 | 3296 { |
| 3297 fromcol = wp->w_old_cursor_fcol; | |
| 3298 tocol = wp->w_old_cursor_lcol; | |
| 3299 } | |
| 3300 } | |
| 3301 else /* non-block mode */ | |
| 3302 { | |
| 3303 if (lnum > top->lnum && lnum <= bot->lnum) | |
| 3304 fromcol = 0; | |
| 3305 else if (lnum == top->lnum) | |
| 3306 { | |
| 3307 if (VIsual_mode == 'V') /* linewise */ | |
| 3308 fromcol = 0; | |
| 3309 else | |
| 3310 { | |
| 3311 getvvcol(wp, top, (colnr_T *)&fromcol, NULL, NULL); | |
| 3312 if (gchar_pos(top) == NUL) | |
| 3313 tocol = fromcol + 1; | |
| 3314 } | |
| 3315 } | |
| 3316 if (VIsual_mode != 'V' && lnum == bot->lnum) | |
| 3317 { | |
| 3318 if (*p_sel == 'e' && bot->col == 0 | |
| 3319 #ifdef FEAT_VIRTUALEDIT | |
| 3320 && bot->coladd == 0 | |
| 3321 #endif | |
| 3322 ) | |
| 3323 { | |
| 3324 fromcol = -10; | |
| 3325 tocol = MAXCOL; | |
| 3326 } | |
| 36 | 3327 else if (bot->col == MAXCOL) |
| 3328 tocol = MAXCOL; | |
| 7 | 3329 else |
| 3330 { | |
| 3331 pos = *bot; | |
| 3332 if (*p_sel == 'e') | |
| 3333 getvvcol(wp, &pos, (colnr_T *)&tocol, NULL, NULL); | |
| 3334 else | |
| 3335 { | |
| 3336 getvvcol(wp, &pos, NULL, NULL, (colnr_T *)&tocol); | |
| 3337 ++tocol; | |
| 3338 } | |
| 3339 } | |
| 3340 } | |
| 3341 } | |
| 3342 | |
| 3343 /* Check if the character under the cursor should not be inverted */ | |
| 3344 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
|
3345 #ifdef FEAT_GUI |
| 7 | 3346 && !gui.in_use |
|
8212
05b88224cea1
commit https://github.com/vim/vim/commit/48e330aff911be1c798c88a973af6437a8141fce
Christian Brabandt <cb@256bit.org>
parents:
7833
diff
changeset
|
3347 #endif |
| 7 | 3348 ) |
| 3349 noinvcur = TRUE; | |
| 3350 | |
| 3351 /* if inverting in this line set area_highlighting */ | |
| 3352 if (fromcol >= 0) | |
| 3353 { | |
| 3354 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
|
3355 attr = HL_ATTR(HLF_V); |
| 7 | 3356 #if defined(FEAT_CLIPBOARD) && defined(FEAT_X11) |
| 3674 | 3357 if ((clip_star.available && !clip_star.owned |
| 3358 && clip_isautosel_star()) | |
| 3359 || (clip_plus.available && !clip_plus.owned | |
| 3360 && 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
|
3361 attr = HL_ATTR(HLF_VNC); |
| 7 | 3362 #endif |
| 3363 } | |
| 3364 } | |
| 3365 | |
| 3366 /* | |
| 674 | 3367 * handle 'incsearch' and ":s///c" highlighting |
| 7 | 3368 */ |
| 5735 | 3369 else if (highlight_match |
| 7 | 3370 && wp == curwin |
| 3371 && lnum >= curwin->w_cursor.lnum | |
| 3372 && lnum <= curwin->w_cursor.lnum + search_match_lines) | |
| 3373 { | |
| 3374 if (lnum == curwin->w_cursor.lnum) | |
| 3375 getvcol(curwin, &(curwin->w_cursor), | |
| 3376 (colnr_T *)&fromcol, NULL, NULL); | |
| 3377 else | |
| 3378 fromcol = 0; | |
| 3379 if (lnum == curwin->w_cursor.lnum + search_match_lines) | |
| 3380 { | |
| 3381 pos.lnum = lnum; | |
| 3382 pos.col = search_match_endcol; | |
| 3383 getvcol(curwin, &pos, (colnr_T *)&tocol, NULL, NULL); | |
| 3384 } | |
| 3385 else | |
| 3386 tocol = MAXCOL; | |
| 1850 | 3387 /* do at least one character; happens when past end of line */ |
| 3388 if (fromcol == tocol) | |
| 3389 tocol = fromcol + 1; | |
| 7 | 3390 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
|
3391 attr = HL_ATTR(HLF_I); |
| 7 | 3392 } |
| 3393 | |
| 3394 #ifdef FEAT_DIFF | |
| 3395 filler_lines = diff_check(wp, lnum); | |
| 3396 if (filler_lines < 0) | |
| 3397 { | |
| 3398 if (filler_lines == -1) | |
| 3399 { | |
| 3400 if (diff_find_change(wp, lnum, &change_start, &change_end)) | |
| 3401 diff_hlf = HLF_ADD; /* added line */ | |
| 3402 else if (change_start == 0) | |
| 3403 diff_hlf = HLF_TXD; /* changed text */ | |
| 3404 else | |
| 3405 diff_hlf = HLF_CHD; /* changed line */ | |
| 3406 } | |
| 3407 else | |
| 3408 diff_hlf = HLF_ADD; /* added line */ | |
| 3409 filler_lines = 0; | |
| 3410 area_highlighting = TRUE; | |
| 3411 } | |
| 3412 if (lnum == wp->w_topline) | |
| 3413 filler_lines = wp->w_topfill; | |
| 3414 filler_todo = filler_lines; | |
| 3415 #endif | |
| 3416 | |
| 3417 #ifdef LINE_ATTR | |
| 3418 # ifdef FEAT_SIGNS | |
| 3419 /* If this line has a sign with line highlighting set line_attr. */ | |
| 3420 v = buf_getsigntype(wp->w_buffer, lnum, SIGN_LINEHL); | |
| 3421 if (v != 0) | |
| 3422 line_attr = sign_get_attr((int)v, TRUE); | |
| 3423 # endif | |
| 3424 # if defined(FEAT_QUICKFIX) && defined(FEAT_WINDOWS) | |
| 3425 /* Highlight the current line in the quickfix window. */ | |
| 644 | 3426 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
|
3427 line_attr = HL_ATTR(HLF_QFL); |
| 7 | 3428 # endif |
| 3429 if (line_attr != 0) | |
| 3430 area_highlighting = TRUE; | |
| 3431 #endif | |
| 3432 | |
| 3433 line = ml_get_buf(wp->w_buffer, lnum, FALSE); | |
| 3434 ptr = line; | |
| 3435 | |
| 743 | 3436 #ifdef FEAT_SPELL |
| 348 | 3437 if (has_spell) |
| 3438 { | |
| 386 | 3439 /* For checking first word with a capital skip white space. */ |
| 3440 if (cap_col == 0) | |
| 835 | 3441 cap_col = (int)(skipwhite(line) - line); |
| 386 | 3442 |
| 348 | 3443 /* To be able to spell-check over line boundaries copy the end of the |
| 3444 * current line into nextline[]. Above the start of the next line was | |
| 3445 * copied to nextline[SPWORDLEN]. */ | |
| 3446 if (nextline[SPWORDLEN] == NUL) | |
| 3447 { | |
| 3448 /* No next line or it is empty. */ | |
| 3449 nextlinecol = MAXCOL; | |
| 3450 nextline_idx = 0; | |
| 3451 } | |
| 3452 else | |
| 3453 { | |
| 835 | 3454 v = (long)STRLEN(line); |
| 348 | 3455 if (v < SPWORDLEN) |
| 3456 { | |
| 3457 /* Short line, use it completely and append the start of the | |
| 3458 * next line. */ | |
| 3459 nextlinecol = 0; | |
| 3460 mch_memmove(nextline, line, (size_t)v); | |
| 1621 | 3461 STRMOVE(nextline + v, nextline + SPWORDLEN); |
| 348 | 3462 nextline_idx = v + 1; |
| 3463 } | |
| 3464 else | |
| 3465 { | |
| 3466 /* Long line, use only the last SPWORDLEN bytes. */ | |
| 3467 nextlinecol = v - SPWORDLEN; | |
| 3468 mch_memmove(nextline, line + nextlinecol, SPWORDLEN); | |
| 3469 nextline_idx = SPWORDLEN + 1; | |
| 3470 } | |
| 3471 } | |
| 3472 } | |
| 3473 #endif | |
| 3474 | |
|
7344
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
3475 if (wp->w_p_list) |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
3476 { |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
3477 if (lcs_space || lcs_trail) |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
3478 extra_check = TRUE; |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
3479 /* find start of trailing whitespace */ |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
3480 if (lcs_trail) |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
3481 { |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
3482 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
|
3483 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
|
3484 --trailcol; |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
3485 trailcol += (colnr_T) (ptr - line); |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
3486 } |
| 7 | 3487 } |
| 3488 | |
| 3489 /* | |
| 3490 * 'nowrap' or 'wrap' and a single line that doesn't fit: Advance to the | |
| 3491 * first character to be displayed. | |
| 3492 */ | |
| 3493 if (wp->w_p_wrap) | |
| 3494 v = wp->w_skipcol; | |
| 3495 else | |
| 3496 v = wp->w_leftcol; | |
| 3497 if (v > 0) | |
| 3498 { | |
| 3499 #ifdef FEAT_MBYTE | |
| 3500 char_u *prev_ptr = ptr; | |
| 3501 #endif | |
| 3502 while (vcol < v && *ptr != NUL) | |
| 3503 { | |
| 5995 | 3504 c = win_lbr_chartabsize(wp, line, ptr, (colnr_T)vcol, NULL); |
| 7 | 3505 vcol += c; |
| 3506 #ifdef FEAT_MBYTE | |
| 3507 prev_ptr = ptr; | |
| 39 | 3508 #endif |
|
11127
506f5d8b7d8b
patch 8.0.0451: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11121
diff
changeset
|
3509 MB_PTR_ADV(ptr); |
| 7 | 3510 } |
| 3511 | |
| 1984 | 3512 /* When: |
| 3513 * - 'cuc' is set, or | |
|
2314
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
3514 * - 'colorcolumn' is set, or |
| 1984 | 3515 * - 'virtualedit' is set, or |
| 3516 * - the visual mode is active, | |
| 3517 * the end of the line may be before the start of the displayed part. | |
| 3518 */ | |
| 3519 if (vcol < v && ( | |
| 5735 | 3520 #ifdef FEAT_SYN_HL |
| 3521 wp->w_p_cuc || draw_color_col || | |
| 3522 #endif | |
| 3523 #ifdef FEAT_VIRTUALEDIT | |
| 3524 virtual_active() || | |
| 3525 #endif | |
| 3526 (VIsual_active && wp->w_buffer == curwin->w_buffer))) | |
| 1984 | 3527 { |
| 7 | 3528 vcol = v; |
| 1984 | 3529 } |
| 7 | 3530 |
| 3531 /* Handle a character that's not completely on the screen: Put ptr at | |
| 3532 * that character but skip the first few screen characters. */ | |
| 3533 if (vcol > v) | |
| 3534 { | |
| 3535 vcol -= c; | |
| 3536 #ifdef FEAT_MBYTE | |
| 3537 ptr = prev_ptr; | |
| 3538 #else | |
| 3539 --ptr; | |
| 3540 #endif | |
|
11010
c004e17fa36b
patch 8.0.0394: tabs are not aligned when scrolling horizontally
Christian Brabandt <cb@256bit.org>
parents:
10988
diff
changeset
|
3541 /* 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
|
3542 * 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
|
3543 if (( |
|
c004e17fa36b
patch 8.0.0394: tabs are not aligned when scrolling horizontally
Christian Brabandt <cb@256bit.org>
parents:
10988
diff
changeset
|
3544 #ifdef FEAT_MBYTE |
|
c004e17fa36b
patch 8.0.0394: tabs are not aligned when scrolling horizontally
Christian Brabandt <cb@256bit.org>
parents:
10988
diff
changeset
|
3545 (*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
|
3546 #endif |
|
c004e17fa36b
patch 8.0.0394: tabs are not aligned when scrolling horizontally
Christian Brabandt <cb@256bit.org>
parents:
10988
diff
changeset
|
3547 *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
|
3548 n_skip = v - vcol; |
| 7 | 3549 } |
| 3550 | |
| 3551 /* | |
| 3552 * Adjust for when the inverted text is before the screen, | |
| 3553 * and when the start of the inverted text is before the screen. | |
| 3554 */ | |
| 3555 if (tocol <= vcol) | |
| 3556 fromcol = 0; | |
| 3557 else if (fromcol >= 0 && fromcol < vcol) | |
| 3558 fromcol = vcol; | |
| 3559 | |
| 3560 #ifdef FEAT_LINEBREAK | |
| 3561 /* When w_skipcol is non-zero, first line needs 'showbreak' */ | |
| 3562 if (wp->w_p_wrap) | |
| 3563 need_showbreak = TRUE; | |
| 3564 #endif | |
| 743 | 3565 #ifdef FEAT_SPELL |
| 499 | 3566 /* When spell checking a word we need to figure out the start of the |
| 3567 * word and if it's badly spelled or not. */ | |
| 3568 if (has_spell) | |
| 3569 { | |
| 3570 int len; | |
| 1536 | 3571 colnr_T linecol = (colnr_T)(ptr - line); |
| 534 | 3572 hlf_T spell_hlf = HLF_COUNT; |
| 499 | 3573 |
| 3574 pos = wp->w_cursor; | |
| 3575 wp->w_cursor.lnum = lnum; | |
| 1536 | 3576 wp->w_cursor.col = linecol; |
| 534 | 3577 len = spell_move_to(wp, FORWARD, TRUE, TRUE, &spell_hlf); |
| 1536 | 3578 |
| 3579 /* spell_move_to() may call ml_get() and make "line" invalid */ | |
| 3580 line = ml_get_buf(wp->w_buffer, lnum, FALSE); | |
| 3581 ptr = line + linecol; | |
| 3582 | |
| 530 | 3583 if (len == 0 || (int)wp->w_cursor.col > ptr - line) |
| 499 | 3584 { |
| 3585 /* no bad word found at line start, don't check until end of a | |
| 3586 * word */ | |
| 534 | 3587 spell_hlf = HLF_COUNT; |
| 3572 | 3588 word_end = (int)(spell_to_word_end(ptr, wp) - line + 1); |
| 499 | 3589 } |
| 3590 else | |
| 534 | 3591 { |
| 499 | 3592 /* bad word found, use attributes until end of word */ |
| 3593 word_end = wp->w_cursor.col + len + 1; | |
| 3594 | |
| 534 | 3595 /* Turn index into actual attributes. */ |
| 3596 if (spell_hlf != HLF_COUNT) | |
| 3597 spell_attr = highlight_attr[spell_hlf]; | |
| 3598 } | |
| 499 | 3599 wp->w_cursor = pos; |
| 501 | 3600 |
| 743 | 3601 # ifdef FEAT_SYN_HL |
| 501 | 3602 /* Need to restart syntax highlighting for this line. */ |
| 3603 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
|
3604 syntax_start(wp, lnum, syntax_tm); |
| 743 | 3605 # endif |
| 499 | 3606 } |
| 3607 #endif | |
| 7 | 3608 } |
| 3609 | |
| 3610 /* | |
| 3611 * Correct highlighting for cursor that can't be disabled. | |
| 3612 * Avoids having to check this for each character. | |
| 3613 */ | |
| 3614 if (fromcol >= 0) | |
| 3615 { | |
| 3616 if (noinvcur) | |
| 3617 { | |
| 3618 if ((colnr_T)fromcol == wp->w_virtcol) | |
| 3619 { | |
| 3620 /* highlighting starts at cursor, let it start just after the | |
| 3621 * cursor */ | |
| 3622 fromcol_prev = fromcol; | |
| 3623 fromcol = -1; | |
| 3624 } | |
| 3625 else if ((colnr_T)fromcol < wp->w_virtcol) | |
| 3626 /* restart highlighting after the cursor */ | |
| 3627 fromcol_prev = wp->w_virtcol; | |
| 3628 } | |
| 3629 if (fromcol >= tocol) | |
| 3630 fromcol = -1; | |
| 3631 } | |
| 3632 | |
| 3633 #ifdef FEAT_SEARCH_EXTRA | |
| 3634 /* | |
| 1326 | 3635 * Handle highlighting the last used search pattern and matches. |
| 3636 * Do this for both search_hl and the match list. | |
| 7 | 3637 */ |
| 1326 | 3638 cur = wp->w_match_head; |
| 3639 shl_flag = FALSE; | |
| 3640 while (cur != NULL || shl_flag == FALSE) | |
| 3641 { | |
| 3642 if (shl_flag == FALSE) | |
| 3643 { | |
| 3644 shl = &search_hl; | |
| 3645 shl_flag = TRUE; | |
| 3646 } | |
| 3647 else | |
| 3648 shl = &cur->hl; | |
| 36 | 3649 shl->startcol = MAXCOL; |
| 3650 shl->endcol = MAXCOL; | |
| 7 | 3651 shl->attr_cur = 0; |
|
9885
4e8b05fa12c6
commit https://github.com/vim/vim/commit/4f416e41243ca151b95d39d81ce23d00b1484755
Christian Brabandt <cb@256bit.org>
parents:
9877
diff
changeset
|
3652 shl->is_addpos = FALSE; |
| 5979 | 3653 v = (long)(ptr - line); |
| 3654 if (cur != NULL) | |
| 3655 cur->pos.cur = 0; | |
|
9992
3e3b0ce24b61
commit https://github.com/vim/vim/commit/e17bdffff78ebd6a4e3cff26754cc667557ea810
Christian Brabandt <cb@256bit.org>
parents:
9939
diff
changeset
|
3656 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
|
3657 shl == &search_hl ? NULL : cur); |
| 5979 | 3658 |
| 3659 /* Need to get the line again, a multi-line regexp may have made it | |
| 3660 * invalid. */ | |
| 3661 line = ml_get_buf(wp->w_buffer, lnum, FALSE); | |
| 3662 ptr = line + v; | |
| 3663 | |
| 3664 if (shl->lnum != 0 && shl->lnum <= lnum) | |
| 3665 { | |
| 3666 if (shl->lnum == lnum) | |
| 3667 shl->startcol = shl->rm.startpos[0].col; | |
| 3668 else | |
| 3669 shl->startcol = 0; | |
| 3670 if (lnum == shl->lnum + shl->rm.endpos[0].lnum | |
| 3671 - shl->rm.startpos[0].lnum) | |
| 3672 shl->endcol = shl->rm.endpos[0].col; | |
| 3673 else | |
| 3674 shl->endcol = MAXCOL; | |
| 3675 /* Highlight one character for an empty match. */ | |
| 3676 if (shl->startcol == shl->endcol) | |
| 3677 { | |
| 3678 #ifdef FEAT_MBYTE | |
| 3679 if (has_mbyte && line[shl->endcol] != NUL) | |
| 3680 shl->endcol += (*mb_ptr2len)(line + shl->endcol); | |
| 7 | 3681 else |
| 5979 | 3682 #endif |
| 3683 ++shl->endcol; | |
| 3684 } | |
| 3685 if ((long)shl->startcol < v) /* match at leftcol */ | |
| 3686 { | |
| 3687 shl->attr_cur = shl->attr; | |
| 3688 search_attr = shl->attr; | |
| 3689 } | |
| 3690 area_highlighting = TRUE; | |
| 7 | 3691 } |
| 1326 | 3692 if (shl != &search_hl && cur != NULL) |
| 3693 cur = cur->next; | |
| 7 | 3694 } |
| 3695 #endif | |
| 3696 | |
| 743 | 3697 #ifdef FEAT_SYN_HL |
|
5068
6a7ae677d6a1
updated for version 7.3.1277
Bram Moolenaar <bram@vim.org>
parents:
4916
diff
changeset
|
3698 /* 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
|
3699 * 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
|
3700 * then. */ |
|
5078
22ac43fb6d30
updated for version 7.3.1282
Bram Moolenaar <bram@vim.org>
parents:
5068
diff
changeset
|
3701 if (wp->w_p_cul && lnum == wp->w_cursor.lnum |
| 5979 | 3702 && !(wp == curwin && VIsual_active)) |
| 743 | 3703 { |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
3704 line_attr = HL_ATTR(HLF_CUL); |
| 743 | 3705 area_highlighting = TRUE; |
| 3706 } | |
| 3707 #endif | |
| 3708 | |
| 504 | 3709 off = (unsigned)(current_ScreenLine - ScreenLines); |
| 7 | 3710 col = 0; |
| 3711 #ifdef FEAT_RIGHTLEFT | |
| 3712 if (wp->w_p_rl) | |
| 3713 { | |
| 3714 /* Rightleft window: process the text in the normal direction, but put | |
| 3715 * it in current_ScreenLine[] from right to left. Start at the | |
| 3716 * rightmost column of the window. */ | |
| 3717 col = W_WIDTH(wp) - 1; | |
| 3718 off += col; | |
| 3719 } | |
| 3720 #endif | |
| 3721 | |
| 3722 /* | |
| 3723 * Repeat for the whole displayed line. | |
| 3724 */ | |
| 3725 for (;;) | |
| 3726 { | |
| 6947 | 3727 #ifdef FEAT_CONCEAL |
|
8907
5deb9e8f4292
commit https://github.com/vim/vim/commit/4d585022023b96f6507e8cae5ed8fc8d926f5140
Christian Brabandt <cb@256bit.org>
parents:
8872
diff
changeset
|
3728 has_match_conc = 0; |
| 6947 | 3729 #endif |
| 7 | 3730 /* Skip this quickly when working on the text. */ |
| 3731 if (draw_state != WL_LINE) | |
| 3732 { | |
| 3733 #ifdef FEAT_CMDWIN | |
| 3734 if (draw_state == WL_CMDLINE - 1 && n_extra == 0) | |
| 3735 { | |
| 3736 draw_state = WL_CMDLINE; | |
| 3737 if (cmdwin_type != 0 && wp == curwin) | |
| 3738 { | |
| 3739 /* Draw the cmdline character. */ | |
| 3740 n_extra = 1; | |
| 1340 | 3741 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
|
3742 char_attr = HL_ATTR(HLF_AT); |
| 7 | 3743 } |
| 3744 } | |
| 3745 #endif | |
| 3746 | |
| 3747 #ifdef FEAT_FOLDING | |
| 3748 if (draw_state == WL_FOLD - 1 && n_extra == 0) | |
| 3749 { | |
| 6553 | 3750 int fdc = compute_foldcolumn(wp, 0); |
| 3751 | |
| 7 | 3752 draw_state = WL_FOLD; |
| 6553 | 3753 if (fdc > 0) |
| 7 | 3754 { |
|
10466
34b50194f82d
commit https://github.com/vim/vim/commit/6270660611a151c5d0f614a5f0248ccdc80ed971
Christian Brabandt <cb@256bit.org>
parents:
10392
diff
changeset
|
3755 /* 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
|
3756 * already be in use. */ |
|
10690
206ab11fa76e
patch 8.0.0235: memory leak in diff mode
Christian Brabandt <cb@256bit.org>
parents:
10538
diff
changeset
|
3757 vim_free(p_extra_free); |
|
10466
34b50194f82d
commit https://github.com/vim/vim/commit/6270660611a151c5d0f614a5f0248ccdc80ed971
Christian Brabandt <cb@256bit.org>
parents:
10392
diff
changeset
|
3758 p_extra_free = alloc(12 + 1); |
|
34b50194f82d
commit https://github.com/vim/vim/commit/6270660611a151c5d0f614a5f0248ccdc80ed971
Christian Brabandt <cb@256bit.org>
parents:
10392
diff
changeset
|
3759 |
|
34b50194f82d
commit https://github.com/vim/vim/commit/6270660611a151c5d0f614a5f0248ccdc80ed971
Christian Brabandt <cb@256bit.org>
parents:
10392
diff
changeset
|
3760 if (p_extra_free != NULL) |
|
34b50194f82d
commit https://github.com/vim/vim/commit/6270660611a151c5d0f614a5f0248ccdc80ed971
Christian Brabandt <cb@256bit.org>
parents:
10392
diff
changeset
|
3761 { |
|
34b50194f82d
commit https://github.com/vim/vim/commit/6270660611a151c5d0f614a5f0248ccdc80ed971
Christian Brabandt <cb@256bit.org>
parents:
10392
diff
changeset
|
3762 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
|
3763 n_extra = fdc; |
|
34b50194f82d
commit https://github.com/vim/vim/commit/6270660611a151c5d0f614a5f0248ccdc80ed971
Christian Brabandt <cb@256bit.org>
parents:
10392
diff
changeset
|
3764 p_extra_free[n_extra] = NUL; |
|
34b50194f82d
commit https://github.com/vim/vim/commit/6270660611a151c5d0f614a5f0248ccdc80ed971
Christian Brabandt <cb@256bit.org>
parents:
10392
diff
changeset
|
3765 p_extra = p_extra_free; |
|
34b50194f82d
commit https://github.com/vim/vim/commit/6270660611a151c5d0f614a5f0248ccdc80ed971
Christian Brabandt <cb@256bit.org>
parents:
10392
diff
changeset
|
3766 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
|
3767 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
|
3768 } |
| 7 | 3769 } |
| 3770 } | |
| 3771 #endif | |
| 3772 | |
| 3773 #ifdef FEAT_SIGNS | |
| 3774 if (draw_state == WL_SIGN - 1 && n_extra == 0) | |
| 3775 { | |
| 3776 draw_state = WL_SIGN; | |
| 3777 /* Show the sign column when there are any signs in this | |
| 3778 * buffer or when using Netbeans. */ | |
|
9852
4eea48b76d03
commit https://github.com/vim/vim/commit/95ec9d6a6ab3117d60ff638670a803d43974ba51
Christian Brabandt <cb@256bit.org>
parents:
9848
diff
changeset
|
3779 if (signcolumn_on(wp)) |
| 7 | 3780 { |
| 2661 | 3781 int text_sign; |
| 7 | 3782 # ifdef FEAT_SIGN_ICONS |
| 2661 | 3783 int icon_sign; |
| 7 | 3784 # endif |
| 3785 | |
| 3786 /* Draw two cells with the sign value or blank. */ | |
| 3787 c_extra = ' '; | |
|
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_SC); |
| 7 | 3789 n_extra = 2; |
| 3790 | |
| 5921 | 3791 if (row == startrow |
| 3792 #ifdef FEAT_DIFF | |
| 3793 + filler_lines && filler_todo <= 0 | |
| 3794 #endif | |
| 3795 ) | |
| 7 | 3796 { |
| 3797 text_sign = buf_getsigntype(wp->w_buffer, lnum, | |
| 3798 SIGN_TEXT); | |
| 3799 # ifdef FEAT_SIGN_ICONS | |
| 3800 icon_sign = buf_getsigntype(wp->w_buffer, lnum, | |
| 3801 SIGN_ICON); | |
| 3802 if (gui.in_use && icon_sign != 0) | |
| 3803 { | |
| 3804 /* Use the image in this position. */ | |
| 3805 c_extra = SIGN_BYTE; | |
| 3806 # ifdef FEAT_NETBEANS_INTG | |
| 3807 if (buf_signcount(wp->w_buffer, lnum) > 1) | |
| 3808 c_extra = MULTISIGN_BYTE; | |
| 3809 # endif | |
| 3810 char_attr = icon_sign; | |
| 3811 } | |
| 3812 else | |
| 3813 # endif | |
| 3814 if (text_sign != 0) | |
| 3815 { | |
| 3816 p_extra = sign_get_text(text_sign); | |
| 3817 if (p_extra != NULL) | |
| 3818 { | |
| 3819 c_extra = NUL; | |
| 835 | 3820 n_extra = (int)STRLEN(p_extra); |
| 7 | 3821 } |
| 3822 char_attr = sign_get_attr(text_sign, FALSE); | |
| 3823 } | |
| 3824 } | |
| 3825 } | |
| 3826 } | |
| 3827 #endif | |
| 3828 | |
| 3829 if (draw_state == WL_NR - 1 && n_extra == 0) | |
| 3830 { | |
| 3831 draw_state = WL_NR; | |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
3832 /* 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
|
3833 * 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
|
3834 if ((wp->w_p_nu || wp->w_p_rnu) |
| 7 | 3835 && (row == startrow |
| 3836 #ifdef FEAT_DIFF | |
| 3837 + filler_lines | |
| 3838 #endif | |
| 3839 || vim_strchr(p_cpo, CPO_NUMCOL) == NULL)) | |
| 3840 { | |
| 3841 /* Draw the line number (empty space after wrapping). */ | |
| 3842 if (row == startrow | |
| 3843 #ifdef FEAT_DIFF | |
| 3844 + filler_lines | |
| 3845 #endif | |
| 3846 ) | |
| 3847 { | |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
3848 long num; |
| 4065 | 3849 char *fmt = "%*ld "; |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
3850 |
|
4736
3f2319a953b3
updated for version 7.3.1115
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
3851 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
|
3852 /* 'number' + 'norelativenumber' */ |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
3853 num = (long)lnum; |
|
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
3854 else |
| 4065 | 3855 { |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
3856 /* 'relativenumber', don't use negative numbers */ |
| 2675 | 3857 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
|
3858 if (num == 0 && wp->w_p_nu && wp->w_p_rnu) |
| 4065 | 3859 { |
|
4736
3f2319a953b3
updated for version 7.3.1115
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
3860 /* 'number' + 'relativenumber' */ |
| 4065 | 3861 num = lnum; |
| 3862 fmt = "%-*ld "; | |
| 3863 } | |
| 3864 } | |
| 3865 | |
| 3866 sprintf((char *)extra, fmt, | |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
3867 number_width(wp), num); |
| 7 | 3868 if (wp->w_skipcol > 0) |
| 3869 for (p_extra = extra; *p_extra == ' '; ++p_extra) | |
| 3870 *p_extra = '-'; | |
| 3871 #ifdef FEAT_RIGHTLEFT | |
| 3872 if (wp->w_p_rl) /* reverse line numbers */ | |
| 3873 rl_mirror(extra); | |
| 3874 #endif | |
| 3875 p_extra = extra; | |
| 3876 c_extra = NUL; | |
| 3877 } | |
| 3878 else | |
| 3879 c_extra = ' '; | |
| 13 | 3880 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
|
3881 char_attr = HL_ATTR(HLF_N); |
| 743 | 3882 #ifdef FEAT_SYN_HL |
| 3883 /* When 'cursorline' is set highlight the line number of | |
| 3427 | 3884 * the current line differently. |
| 3885 * TODO: Can we use CursorLine instead of CursorLineNr | |
| 3886 * when CursorLineNr isn't set? */ | |
|
5078
22ac43fb6d30
updated for version 7.3.1282
Bram Moolenaar <bram@vim.org>
parents:
5068
diff
changeset
|
3887 if ((wp->w_p_cul || wp->w_p_rnu) |
| 4065 | 3888 && 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
|
3889 char_attr = HL_ATTR(HLF_CLN); |
| 743 | 3890 #endif |
| 7 | 3891 } |
| 3892 } | |
| 3893 | |
| 5995 | 3894 #ifdef FEAT_LINEBREAK |
| 3895 if (wp->w_p_brisbr && draw_state == WL_BRI - 1 | |
| 3896 && n_extra == 0 && *p_sbr != NUL) | |
| 3897 /* draw indent after showbreak value */ | |
| 3898 draw_state = WL_BRI; | |
| 3899 else if (wp->w_p_brisbr && draw_state == WL_SBR && n_extra == 0) | |
| 3900 /* After the showbreak, draw the breakindent */ | |
| 3901 draw_state = WL_BRI - 1; | |
| 3902 | |
| 3903 /* draw 'breakindent': indent wrapped text accordingly */ | |
| 3904 if (draw_state == WL_BRI - 1 && n_extra == 0) | |
| 3905 { | |
| 3906 draw_state = WL_BRI; | |
|
10392
957a1d560bda
commit https://github.com/vim/vim/commit/6c896867c4f5d759616028ef7cbfce2a9ed32600
Christian Brabandt <cb@256bit.org>
parents:
10349
diff
changeset
|
3907 /* 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
|
3908 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
|
3909 && (row != startrow || need_showbreak) |
| 5995 | 3910 # ifdef FEAT_DIFF |
| 3911 && filler_lines == 0 | |
| 6834 | 3912 # endif |
| 5995 | 3913 ) |
| 3914 { | |
|
10392
957a1d560bda
commit https://github.com/vim/vim/commit/6c896867c4f5d759616028ef7cbfce2a9ed32600
Christian Brabandt <cb@256bit.org>
parents:
10349
diff
changeset
|
3915 char_attr = 0; |
| 6834 | 3916 # ifdef FEAT_DIFF |
| 5995 | 3917 if (diff_hlf != (hlf_T)0) |
| 6106 | 3918 { |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
3919 char_attr = HL_ATTR(diff_hlf); |
| 6834 | 3920 # ifdef FEAT_SYN_HL |
| 6106 | 3921 if (wp->w_p_cul && lnum == wp->w_cursor.lnum) |
| 3922 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
|
3923 HL_ATTR(HLF_CUL)); |
| 6834 | 3924 # endif |
| 6106 | 3925 } |
| 6834 | 3926 # endif |
| 6028 | 3927 p_extra = NULL; |
| 5995 | 3928 c_extra = ' '; |
| 3929 n_extra = get_breakindent_win(wp, | |
| 3930 ml_get_buf(wp->w_buffer, lnum, FALSE)); | |
| 3931 /* Correct end of highlighted area for 'breakindent', | |
| 3932 * required when 'linebreak' is also set. */ | |
| 3933 if (tocol == vcol) | |
| 3934 tocol += n_extra; | |
| 3935 } | |
| 3936 } | |
| 3937 #endif | |
| 3938 | |
| 7 | 3939 #if defined(FEAT_LINEBREAK) || defined(FEAT_DIFF) |
| 3940 if (draw_state == WL_SBR - 1 && n_extra == 0) | |
| 3941 { | |
| 3942 draw_state = WL_SBR; | |
| 3943 # ifdef FEAT_DIFF | |
| 3944 if (filler_todo > 0) | |
| 3945 { | |
| 3946 /* Draw "deleted" diff line(s). */ | |
| 3947 if (char2cells(fill_diff) > 1) | |
| 3948 c_extra = '-'; | |
| 3949 else | |
| 3950 c_extra = fill_diff; | |
| 3951 # ifdef FEAT_RIGHTLEFT | |
| 3952 if (wp->w_p_rl) | |
| 3953 n_extra = col + 1; | |
| 3954 else | |
| 3955 # endif | |
| 3956 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
|
3957 char_attr = HL_ATTR(HLF_DED); |
| 7 | 3958 } |
| 3959 # endif | |
| 3960 # ifdef FEAT_LINEBREAK | |
| 3961 if (*p_sbr != NUL && need_showbreak) | |
| 3962 { | |
| 3963 /* Draw 'showbreak' at the start of each broken line. */ | |
| 3964 p_extra = p_sbr; | |
| 3965 c_extra = NUL; | |
| 3966 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
|
3967 char_attr = HL_ATTR(HLF_AT); |
| 7 | 3968 need_showbreak = FALSE; |
| 6503 | 3969 vcol_sbr = vcol + MB_CHARLEN(p_sbr); |
| 7 | 3970 /* Correct end of highlighted area for 'showbreak', |
| 3971 * required when 'linebreak' is also set. */ | |
| 3972 if (tocol == vcol) | |
| 3973 tocol += n_extra; | |
|
5068
6a7ae677d6a1
updated for version 7.3.1277
Bram Moolenaar <bram@vim.org>
parents:
4916
diff
changeset
|
3974 #ifdef FEAT_SYN_HL |
|
6a7ae677d6a1
updated for version 7.3.1277
Bram Moolenaar <bram@vim.org>
parents:
4916
diff
changeset
|
3975 /* combine 'showbreak' with 'cursorline' */ |
|
5078
22ac43fb6d30
updated for version 7.3.1282
Bram Moolenaar <bram@vim.org>
parents:
5068
diff
changeset
|
3976 if (wp->w_p_cul && lnum == wp->w_cursor.lnum) |
| 6106 | 3977 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
|
3978 HL_ATTR(HLF_CUL)); |
|
5068
6a7ae677d6a1
updated for version 7.3.1277
Bram Moolenaar <bram@vim.org>
parents:
4916
diff
changeset
|
3979 #endif |
| 7 | 3980 } |
| 3981 # endif | |
| 3982 } | |
| 3983 #endif | |
| 3984 | |
| 3985 if (draw_state == WL_LINE - 1 && n_extra == 0) | |
| 3986 { | |
| 3987 draw_state = WL_LINE; | |
| 3988 if (saved_n_extra) | |
| 3989 { | |
| 3990 /* Continue item from end of wrapped line. */ | |
| 3991 n_extra = saved_n_extra; | |
| 3992 c_extra = saved_c_extra; | |
| 3993 p_extra = saved_p_extra; | |
| 3994 char_attr = saved_char_attr; | |
| 3995 } | |
| 3996 else | |
| 3997 char_attr = 0; | |
| 3998 } | |
| 3999 } | |
| 4000 | |
| 4001 /* When still displaying '$' of change command, stop at cursor */ | |
| 3318 | 4002 if (dollar_vcol >= 0 && wp == curwin |
| 819 | 4003 && lnum == wp->w_cursor.lnum && vcol >= (long)wp->w_virtcol |
| 7 | 4004 #ifdef FEAT_DIFF |
| 4005 && filler_todo <= 0 | |
| 4006 #endif | |
| 4007 ) | |
| 4008 { | |
|
11670
3b2afa2b77b3
patch 8.0.0718: output of job in terminal is not displayed
Christian Brabandt <cb@256bit.org>
parents:
11657
diff
changeset
|
4009 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
|
4010 HAS_RIGHTLEFT(wp->w_p_rl)); |
| 819 | 4011 /* Pretend we have finished updating the window. Except when |
| 4012 * 'cursorcolumn' is set. */ | |
| 4013 #ifdef FEAT_SYN_HL | |
| 4014 if (wp->w_p_cuc) | |
| 4015 row = wp->w_cline_row + wp->w_cline_height; | |
| 4016 else | |
| 4017 #endif | |
| 4018 row = wp->w_height; | |
| 7 | 4019 break; |
| 4020 } | |
| 4021 | |
| 4022 if (draw_state == WL_LINE && area_highlighting) | |
| 4023 { | |
| 4024 /* handle Visual or match highlighting in this line */ | |
| 4025 if (vcol == fromcol | |
| 4026 #ifdef FEAT_MBYTE | |
| 4027 || (has_mbyte && vcol + 1 == fromcol && n_extra == 0 | |
| 4028 && (*mb_ptr2cells)(ptr) > 1) | |
| 4029 #endif | |
| 4030 || ((int)vcol_prev == fromcol_prev | |
| 1814 | 4031 && vcol_prev < vcol /* not at margin */ |
| 7 | 4032 && vcol < tocol)) |
| 4033 area_attr = attr; /* start highlighting */ | |
| 4034 else if (area_attr != 0 | |
| 4035 && (vcol == tocol | |
| 4036 || (noinvcur && (colnr_T)vcol == wp->w_virtcol))) | |
| 4037 area_attr = 0; /* stop highlighting */ | |
| 4038 | |
| 4039 #ifdef FEAT_SEARCH_EXTRA | |
| 4040 if (!n_extra) | |
| 4041 { | |
| 4042 /* | |
| 4043 * Check for start/end of search pattern match. | |
| 4044 * After end, check for start/end of next match. | |
| 4045 * When another match, have to check for start again. | |
| 4046 * Watch out for matching an empty string! | |
| 1326 | 4047 * Do this for 'search_hl' and the match list (ordered by |
| 4048 * priority). | |
| 7 | 4049 */ |
| 36 | 4050 v = (long)(ptr - line); |
| 1326 | 4051 cur = wp->w_match_head; |
| 4052 shl_flag = FALSE; | |
| 4053 while (cur != NULL || shl_flag == FALSE) | |
| 4054 { | |
| 4055 if (shl_flag == FALSE | |
| 4056 && ((cur != NULL | |
| 4057 && cur->priority > SEARCH_HL_PRIORITY) | |
| 4058 || cur == NULL)) | |
| 4059 { | |
| 4060 shl = &search_hl; | |
| 4061 shl_flag = TRUE; | |
| 4062 } | |
| 4063 else | |
| 4064 shl = &cur->hl; | |
| 5979 | 4065 if (cur != NULL) |
| 4066 cur->pos.cur = 0; | |
| 4067 pos_inprogress = TRUE; | |
| 4068 while (shl->rm.regprog != NULL | |
| 4069 || (cur != NULL && pos_inprogress)) | |
| 7 | 4070 { |
| 36 | 4071 if (shl->startcol != MAXCOL |
| 4072 && v >= (long)shl->startcol | |
| 4073 && v < (long)shl->endcol) | |
| 7 | 4074 { |
| 6430 | 4075 #ifdef FEAT_MBYTE |
| 4076 int tmp_col = v + MB_PTR2LEN(ptr); | |
| 4077 | |
| 4078 if (shl->endcol < tmp_col) | |
| 4079 shl->endcol = tmp_col; | |
| 4080 #endif | |
| 7 | 4081 shl->attr_cur = shl->attr; |
| 6947 | 4082 #ifdef FEAT_CONCEAL |
| 4083 if (cur != NULL && syn_name2id((char_u *)"Conceal") | |
| 4084 == cur->hlg_id) | |
| 4085 { | |
|
8907
5deb9e8f4292
commit https://github.com/vim/vim/commit/4d585022023b96f6507e8cae5ed8fc8d926f5140
Christian Brabandt <cb@256bit.org>
parents:
8872
diff
changeset
|
4086 has_match_conc = |
|
5deb9e8f4292
commit https://github.com/vim/vim/commit/4d585022023b96f6507e8cae5ed8fc8d926f5140
Christian Brabandt <cb@256bit.org>
parents:
8872
diff
changeset
|
4087 v == (long)shl->startcol ? 2 : 1; |
| 6947 | 4088 match_conc = cur->conceal_char; |
| 4089 } | |
| 4090 else | |
|
8907
5deb9e8f4292
commit https://github.com/vim/vim/commit/4d585022023b96f6507e8cae5ed8fc8d926f5140
Christian Brabandt <cb@256bit.org>
parents:
8872
diff
changeset
|
4091 has_match_conc = match_conc = 0; |
| 6947 | 4092 #endif |
| 7 | 4093 } |
| 6430 | 4094 else if (v == (long)shl->endcol) |
| 7 | 4095 { |
| 4096 shl->attr_cur = 0; | |
|
9992
3e3b0ce24b61
commit https://github.com/vim/vim/commit/e17bdffff78ebd6a4e3cff26754cc667557ea810
Christian Brabandt <cb@256bit.org>
parents:
9939
diff
changeset
|
4097 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
|
4098 shl == &search_hl ? NULL : cur); |
| 5979 | 4099 pos_inprogress = cur == NULL || cur->pos.cur == 0 |
| 6947 | 4100 ? FALSE : TRUE; |
| 7 | 4101 |
| 4102 /* Need to get the line again, a multi-line regexp | |
| 4103 * may have made it invalid. */ | |
| 4104 line = ml_get_buf(wp->w_buffer, lnum, FALSE); | |
| 4105 ptr = line + v; | |
| 4106 | |
| 4107 if (shl->lnum == lnum) | |
| 4108 { | |
| 36 | 4109 shl->startcol = shl->rm.startpos[0].col; |
| 7 | 4110 if (shl->rm.endpos[0].lnum == 0) |
| 36 | 4111 shl->endcol = shl->rm.endpos[0].col; |
| 7 | 4112 else |
| 36 | 4113 shl->endcol = MAXCOL; |
| 4114 | |
| 4115 if (shl->startcol == shl->endcol) | |
| 7 | 4116 { |
| 4117 /* highlight empty match, try again after | |
| 4118 * it */ | |
| 4119 #ifdef FEAT_MBYTE | |
| 4120 if (has_mbyte) | |
| 474 | 4121 shl->endcol += (*mb_ptr2len)(line |
| 36 | 4122 + shl->endcol); |
| 7 | 4123 else |
| 4124 #endif | |
| 36 | 4125 ++shl->endcol; |
| 7 | 4126 } |
| 4127 | |
| 4128 /* Loop to check if the match starts at the | |
| 4129 * current position */ | |
| 4130 continue; | |
| 4131 } | |
| 4132 } | |
| 4133 break; | |
| 4134 } | |
| 1326 | 4135 if (shl != &search_hl && cur != NULL) |
| 4136 cur = cur->next; | |
| 4137 } | |
| 4138 | |
| 4139 /* Use attributes from match with highest priority among | |
| 4140 * 'search_hl' and the match list. */ | |
| 4141 search_attr = search_hl.attr_cur; | |
| 4142 cur = wp->w_match_head; | |
| 4143 shl_flag = FALSE; | |
| 4144 while (cur != NULL || shl_flag == FALSE) | |
| 4145 { | |
| 4146 if (shl_flag == FALSE | |
| 4147 && ((cur != NULL | |
| 4148 && cur->priority > SEARCH_HL_PRIORITY) | |
| 4149 || cur == NULL)) | |
| 699 | 4150 { |
| 1326 | 4151 shl = &search_hl; |
| 4152 shl_flag = TRUE; | |
| 699 | 4153 } |
| 1326 | 4154 else |
| 4155 shl = &cur->hl; | |
| 4156 if (shl->attr_cur != 0) | |
| 4157 search_attr = shl->attr_cur; | |
| 4158 if (shl != &search_hl && cur != NULL) | |
| 4159 cur = cur->next; | |
| 4160 } | |
| 7 | 4161 } |
| 4162 #endif | |
| 4163 | |
| 4164 #ifdef FEAT_DIFF | |
| 674 | 4165 if (diff_hlf != (hlf_T)0) |
| 7 | 4166 { |
| 1295 | 4167 if (diff_hlf == HLF_CHD && ptr - line >= change_start |
| 4168 && n_extra == 0) | |
| 7 | 4169 diff_hlf = HLF_TXD; /* changed text */ |
| 1295 | 4170 if (diff_hlf == HLF_TXD && ptr - line > change_end |
| 4171 && n_extra == 0) | |
| 7 | 4172 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
|
4173 line_attr = HL_ATTR(diff_hlf); |
| 6106 | 4174 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
|
4175 line_attr = hl_combine_attr(line_attr, HL_ATTR(HLF_CUL)); |
| 674 | 4176 } |
| 4177 #endif | |
| 4178 | |
| 4179 /* Decide which of the highlight attributes to use. */ | |
| 4180 attr_pri = TRUE; | |
| 6717 | 4181 #ifdef LINE_ATTR |
| 674 | 4182 if (area_attr != 0) |
| 6717 | 4183 char_attr = hl_combine_attr(line_attr, area_attr); |
| 674 | 4184 else if (search_attr != 0) |
| 6717 | 4185 char_attr = hl_combine_attr(line_attr, search_attr); |
| 674 | 4186 /* Use line_attr when not in the Visual or 'incsearch' area |
| 4187 * (area_attr may be 0 when "noinvcur" is set). */ | |
| 4188 else if (line_attr != 0 && ((fromcol == -10 && tocol == MAXCOL) | |
| 1842 | 4189 || vcol < fromcol || vcol_prev < fromcol_prev |
| 4190 || vcol >= tocol)) | |
| 674 | 4191 char_attr = line_attr; |
| 6717 | 4192 #else |
| 4193 if (area_attr != 0) | |
| 4194 char_attr = area_attr; | |
| 4195 else if (search_attr != 0) | |
| 4196 char_attr = search_attr; | |
| 674 | 4197 #endif |
| 4198 else | |
| 4199 { | |
| 4200 attr_pri = FALSE; | |
| 4201 #ifdef FEAT_SYN_HL | |
| 4202 if (has_syntax) | |
| 4203 char_attr = syntax_attr; | |
| 4204 else | |
| 4205 #endif | |
| 4206 char_attr = 0; | |
| 4207 } | |
| 7 | 4208 } |
| 4209 | |
| 4210 /* | |
| 4211 * Get the next character to put on the screen. | |
| 4212 */ | |
| 4213 /* | |
| 1340 | 4214 * The "p_extra" points to the extra stuff that is inserted to |
| 4215 * represent special characters (non-printable stuff) and other | |
| 4216 * things. When all characters are the same, c_extra is used. | |
| 4217 * "p_extra" must end in a NUL to avoid mb_ptr2len() reads past | |
| 4218 * "p_extra[n_extra]". | |
| 7 | 4219 * For the '$' of the 'list' option, n_extra == 1, p_extra == "". |
| 4220 */ | |
| 4221 if (n_extra > 0) | |
| 4222 { | |
| 4223 if (c_extra != NUL) | |
| 4224 { | |
| 4225 c = c_extra; | |
| 4226 #ifdef FEAT_MBYTE | |
| 4227 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
|
4228 if (enc_utf8 && utf_char2len(c) > 1) |
| 7 | 4229 { |
| 4230 mb_utf8 = TRUE; | |
| 714 | 4231 u8cc[0] = 0; |
| 819 | 4232 c = 0xc0; |
| 7 | 4233 } |
| 4234 else | |
| 4235 mb_utf8 = FALSE; | |
| 4236 #endif | |
| 4237 } | |
| 4238 else | |
| 4239 { | |
| 4240 c = *p_extra; | |
| 4241 #ifdef FEAT_MBYTE | |
| 4242 if (has_mbyte) | |
| 4243 { | |
| 4244 mb_c = c; | |
| 4245 if (enc_utf8) | |
| 4246 { | |
| 4247 /* If the UTF-8 character is more than one byte: | |
| 4248 * 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
|
4249 mb_l = utfc_ptr2len(p_extra); |
| 7 | 4250 mb_utf8 = FALSE; |
| 4251 if (mb_l > n_extra) | |
| 4252 mb_l = 1; | |
| 4253 else if (mb_l > 1) | |
| 4254 { | |
| 714 | 4255 mb_c = utfc_ptr2char(p_extra, u8cc); |
| 7 | 4256 mb_utf8 = TRUE; |
| 819 | 4257 c = 0xc0; |
| 7 | 4258 } |
| 4259 } | |
| 4260 else | |
| 4261 { | |
| 4262 /* if this is a DBCS character, put it in "mb_c" */ | |
| 4263 mb_l = MB_BYTE2LEN(c); | |
| 4264 if (mb_l >= n_extra) | |
| 4265 mb_l = 1; | |
| 4266 else if (mb_l > 1) | |
| 4267 mb_c = (c << 8) + p_extra[1]; | |
| 4268 } | |
| 504 | 4269 if (mb_l == 0) /* at the NUL at end-of-line */ |
| 4270 mb_l = 1; | |
| 4271 | |
| 7 | 4272 /* If a double-width char doesn't fit display a '>' in the |
| 4273 * last column. */ | |
| 504 | 4274 if (( |
| 7 | 4275 # ifdef FEAT_RIGHTLEFT |
| 4276 wp->w_p_rl ? (col <= 0) : | |
| 4277 # endif | |
| 504 | 4278 (col >= W_WIDTH(wp) - 1)) |
| 7 | 4279 && (*mb_char2cells)(mb_c) == 2) |
| 4280 { | |
| 4281 c = '>'; | |
| 4282 mb_c = c; | |
| 4283 mb_l = 1; | |
| 4284 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
|
4285 multi_attr = HL_ATTR(HLF_AT); |
| 7 | 4286 /* put the pointer back to output the double-width |
| 4287 * character at the start of the next line. */ | |
| 4288 ++n_extra; | |
| 4289 --p_extra; | |
| 4290 } | |
| 4291 else | |
| 4292 { | |
| 4293 n_extra -= mb_l - 1; | |
| 4294 p_extra += mb_l - 1; | |
| 4295 } | |
| 4296 } | |
| 4297 #endif | |
| 4298 ++p_extra; | |
| 4299 } | |
| 4300 --n_extra; | |
| 4301 } | |
| 4302 else | |
| 4303 { | |
|
10986
62bcadce6c82
patch 8.0.0382: warning in tiny build for unused variable
Christian Brabandt <cb@256bit.org>
parents:
10982
diff
changeset
|
4304 #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
|
4305 int c0; |
|
10986
62bcadce6c82
patch 8.0.0382: warning in tiny build for unused variable
Christian Brabandt <cb@256bit.org>
parents:
10982
diff
changeset
|
4306 #endif |
|
10982
5e20c9f96cd5
patch 8.0.0380: with 'linebreak' double wide char wraps badly
Christian Brabandt <cb@256bit.org>
parents:
10928
diff
changeset
|
4307 |
| 6026 | 4308 if (p_extra_free != NULL) |
| 4309 { | |
| 4310 vim_free(p_extra_free); | |
| 4311 p_extra_free = NULL; | |
| 4312 } | |
| 7 | 4313 /* |
| 4314 * Get a character from the line itself. | |
| 4315 */ | |
|
10988
b5de553d6062
patch 8.0.0383: misplaced #ifdef
Christian Brabandt <cb@256bit.org>
parents:
10986
diff
changeset
|
4316 c = *ptr; |
|
10986
62bcadce6c82
patch 8.0.0382: warning in tiny build for unused variable
Christian Brabandt <cb@256bit.org>
parents:
10982
diff
changeset
|
4317 #ifdef FEAT_LINEBREAK |
|
10988
b5de553d6062
patch 8.0.0383: misplaced #ifdef
Christian Brabandt <cb@256bit.org>
parents:
10986
diff
changeset
|
4318 c0 = *ptr; |
|
10986
62bcadce6c82
patch 8.0.0382: warning in tiny build for unused variable
Christian Brabandt <cb@256bit.org>
parents:
10982
diff
changeset
|
4319 #endif |
| 7 | 4320 #ifdef FEAT_MBYTE |
| 4321 if (has_mbyte) | |
| 4322 { | |
| 4323 mb_c = c; | |
| 4324 if (enc_utf8) | |
| 4325 { | |
| 4326 /* If the UTF-8 character is more than one byte: Decode it | |
| 4327 * 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
|
4328 mb_l = utfc_ptr2len(ptr); |
| 7 | 4329 mb_utf8 = FALSE; |
| 4330 if (mb_l > 1) | |
| 4331 { | |
| 714 | 4332 mb_c = utfc_ptr2char(ptr, u8cc); |
| 7 | 4333 /* Overlong encoded ASCII or ASCII with composing char |
| 4334 * is displayed normally, except a NUL. */ | |
| 4335 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
|
4336 { |
|
62bcadce6c82
patch 8.0.0382: warning in tiny build for unused variable
Christian Brabandt <cb@256bit.org>
parents:
10982
diff
changeset
|
4337 c = mb_c; |
|
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 |
|
62bcadce6c82
patch 8.0.0382: warning in tiny build for unused variable
Christian Brabandt <cb@256bit.org>
parents:
10982
diff
changeset
|
4339 c0 = mb_c; |
|
62bcadce6c82
patch 8.0.0382: warning in tiny build for unused variable
Christian Brabandt <cb@256bit.org>
parents:
10982
diff
changeset
|
4340 # endif |
|
62bcadce6c82
patch 8.0.0382: warning in tiny build for unused variable
Christian Brabandt <cb@256bit.org>
parents:
10982
diff
changeset
|
4341 } |
| 7 | 4342 mb_utf8 = TRUE; |
| 507 | 4343 |
| 4344 /* At start of the line we can have a composing char. | |
| 4345 * Draw it as a space with a composing char. */ | |
| 4346 if (utf_iscomposing(mb_c)) | |
| 4347 { | |
| 1326 | 4348 int i; |
| 4349 | |
| 714 | 4350 for (i = Screen_mco - 1; i > 0; --i) |
| 4351 u8cc[i] = u8cc[i - 1]; | |
| 4352 u8cc[0] = mb_c; | |
| 507 | 4353 mb_c = ' '; |
| 4354 } | |
| 7 | 4355 } |
| 4356 | |
| 4357 if ((mb_l == 1 && c >= 0x80) | |
| 4358 || (mb_l >= 1 && mb_c == 0) | |
| 4359 || (mb_l > 1 && (!vim_isprintc(mb_c) | |
| 1401 | 4360 # ifdef UNICODE16 |
| 4361 || mb_c >= 0x10000 | |
| 4362 # endif | |
| 4363 ))) | |
| 7 | 4364 { |
| 4365 /* | |
| 4366 * Illegal UTF-8 byte: display as <xx>. | |
| 4367 * Non-BMP character : display as ? or fullwidth ?. | |
| 4368 */ | |
| 1401 | 4369 # ifdef UNICODE16 |
| 7 | 4370 if (mb_c < 0x10000) |
| 1401 | 4371 # endif |
| 7 | 4372 { |
| 4373 transchar_hex(extra, mb_c); | |
| 714 | 4374 # ifdef FEAT_RIGHTLEFT |
| 7 | 4375 if (wp->w_p_rl) /* reverse */ |
| 4376 rl_mirror(extra); | |
| 714 | 4377 # endif |
| 7 | 4378 } |
| 1401 | 4379 # ifdef UNICODE16 |
| 7 | 4380 else if (utf_char2cells(mb_c) != 2) |
| 4381 STRCPY(extra, "?"); | |
| 4382 else | |
| 4383 /* 0xff1f in UTF-8: full-width '?' */ | |
| 4384 STRCPY(extra, "\357\274\237"); | |
| 1401 | 4385 # endif |
| 7 | 4386 |
| 4387 p_extra = extra; | |
| 4388 c = *p_extra; | |
| 4389 mb_c = mb_ptr2char_adv(&p_extra); | |
| 4390 mb_utf8 = (c >= 0x80); | |
| 4391 n_extra = (int)STRLEN(p_extra); | |
| 4392 c_extra = NUL; | |
| 4393 if (area_attr == 0 && search_attr == 0) | |
| 4394 { | |
| 4395 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
|
4396 extra_attr = HL_ATTR(HLF_8); |
| 7 | 4397 saved_attr2 = char_attr; /* save current attr */ |
| 4398 } | |
| 4399 } | |
| 4400 else if (mb_l == 0) /* at the NUL at end-of-line */ | |
| 4401 mb_l = 1; | |
| 4402 #ifdef FEAT_ARABIC | |
| 4403 else if (p_arshape && !p_tbidi && ARABIC_CHAR(mb_c)) | |
| 4404 { | |
| 4405 /* Do Arabic shaping. */ | |
| 714 | 4406 int pc, pc1, nc; |
| 4407 int pcc[MAX_MCO]; | |
| 7 | 4408 |
| 4409 /* The idea of what is the previous and next | |
| 4410 * character depends on 'rightleft'. */ | |
| 4411 if (wp->w_p_rl) | |
| 4412 { | |
| 4413 pc = prev_c; | |
| 4414 pc1 = prev_c1; | |
| 4415 nc = utf_ptr2char(ptr + mb_l); | |
| 714 | 4416 prev_c1 = u8cc[0]; |
| 7 | 4417 } |
| 4418 else | |
| 4419 { | |
| 714 | 4420 pc = utfc_ptr2char(ptr + mb_l, pcc); |
| 7 | 4421 nc = prev_c; |
| 714 | 4422 pc1 = pcc[0]; |
| 7 | 4423 } |
| 4424 prev_c = mb_c; | |
| 4425 | |
| 714 | 4426 mb_c = arabic_shape(mb_c, &c, &u8cc[0], pc, pc1, nc); |
| 7 | 4427 } |
| 4428 else | |
| 4429 prev_c = mb_c; | |
| 4430 #endif | |
| 4431 } | |
| 4432 else /* enc_dbcs */ | |
| 4433 { | |
| 4434 mb_l = MB_BYTE2LEN(c); | |
| 4435 if (mb_l == 0) /* at the NUL at end-of-line */ | |
| 4436 mb_l = 1; | |
| 4437 else if (mb_l > 1) | |
| 4438 { | |
| 4439 /* We assume a second byte below 32 is illegal. | |
| 4440 * Hopefully this is OK for all double-byte encodings! | |
| 4441 */ | |
| 4442 if (ptr[1] >= 32) | |
| 4443 mb_c = (c << 8) + ptr[1]; | |
| 4444 else | |
| 4445 { | |
| 4446 if (ptr[1] == NUL) | |
| 4447 { | |
| 4448 /* head byte at end of line */ | |
| 4449 mb_l = 1; | |
| 4450 transchar_nonprint(extra, c); | |
| 4451 } | |
| 4452 else | |
| 4453 { | |
| 4454 /* illegal tail byte */ | |
| 4455 mb_l = 2; | |
| 4456 STRCPY(extra, "XX"); | |
| 4457 } | |
| 4458 p_extra = extra; | |
| 4459 n_extra = (int)STRLEN(extra) - 1; | |
| 4460 c_extra = NUL; | |
| 4461 c = *p_extra++; | |
| 4462 if (area_attr == 0 && search_attr == 0) | |
| 4463 { | |
| 4464 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
|
4465 extra_attr = HL_ATTR(HLF_8); |
| 7 | 4466 saved_attr2 = char_attr; /* save current attr */ |
| 4467 } | |
| 4468 mb_c = c; | |
| 4469 } | |
| 4470 } | |
| 4471 } | |
| 4472 /* If a double-width char doesn't fit display a '>' in the | |
| 4473 * last column; the character is displayed at the start of the | |
| 4474 * next line. */ | |
| 4475 if (( | |
| 4476 # ifdef FEAT_RIGHTLEFT | |
| 4477 wp->w_p_rl ? (col <= 0) : | |
| 4478 # endif | |
| 4479 (col >= W_WIDTH(wp) - 1)) | |
| 4480 && (*mb_char2cells)(mb_c) == 2) | |
| 4481 { | |
| 4482 c = '>'; | |
| 4483 mb_c = c; | |
| 4484 mb_utf8 = FALSE; | |
| 4485 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
|
4486 multi_attr = HL_ATTR(HLF_AT); |
| 7 | 4487 /* Put pointer back so that the character will be |
| 4488 * displayed at the start of the next line. */ | |
| 4489 --ptr; | |
| 4490 } | |
| 4491 else if (*ptr != NUL) | |
| 4492 ptr += mb_l - 1; | |
| 4493 | |
| 4494 /* 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
|
4495 * a '<' in the first column. Don't do this for unprintable |
| 4352 | 4496 * 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
|
4497 if (n_skip > 0 && mb_l > 1 && n_extra == 0) |
| 7 | 4498 { |
| 4499 n_extra = 1; | |
| 3586 | 4500 c_extra = MB_FILLER_CHAR; |
| 7 | 4501 c = ' '; |
| 4502 if (area_attr == 0 && search_attr == 0) | |
| 4503 { | |
| 4504 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
|
4505 extra_attr = HL_ATTR(HLF_AT); |
| 7 | 4506 saved_attr2 = char_attr; /* save current attr */ |
| 4507 } | |
| 4508 mb_c = c; | |
| 4509 mb_utf8 = FALSE; | |
| 4510 mb_l = 1; | |
| 4511 } | |
| 4512 | |
| 4513 } | |
| 4514 #endif | |
| 4515 ++ptr; | |
| 4516 | |
| 4517 if (extra_check) | |
| 4518 { | |
| 743 | 4519 #ifdef FEAT_SPELL |
| 221 | 4520 int can_spell = TRUE; |
| 743 | 4521 #endif |
| 4522 | |
| 4523 #ifdef FEAT_SYN_HL | |
| 7 | 4524 /* Get syntax attribute, unless still at the start of the line |
| 4525 * (double-wide char that doesn't fit). */ | |
| 221 | 4526 v = (long)(ptr - line); |
| 4527 if (has_syntax && v > 0) | |
| 7 | 4528 { |
| 4529 /* Get the syntax attribute for the character. If there | |
| 4530 * is an error, disable syntax highlighting. */ | |
| 4531 save_did_emsg = did_emsg; | |
| 4532 did_emsg = FALSE; | |
| 4533 | |
| 221 | 4534 syntax_attr = get_syntax_attr((colnr_T)v - 1, |
| 743 | 4535 # ifdef FEAT_SPELL |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
4536 has_spell ? &can_spell : |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
4537 # endif |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
4538 NULL, FALSE); |
| 7 | 4539 |
| 4540 if (did_emsg) | |
| 482 | 4541 { |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
4542 wp->w_s->b_syn_error = TRUE; |
| 482 | 4543 has_syntax = FALSE; |
| 4544 } | |
| 7 | 4545 else |
| 4546 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
|
4547 #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
|
4548 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
|
4549 has_syntax = FALSE; |
|
998d2cf59caa
patch 8.0.0647: syntax highlighting can make cause a freeze
Christian Brabandt <cb@256bit.org>
parents:
11521
diff
changeset
|
4550 #endif |
| 7 | 4551 |
| 4552 /* Need to get the line again, a multi-line regexp may | |
| 4553 * have made it invalid. */ | |
| 4554 line = ml_get_buf(wp->w_buffer, lnum, FALSE); | |
| 4555 ptr = line + v; | |
| 4556 | |
| 674 | 4557 if (!attr_pri) |
| 7 | 4558 char_attr = syntax_attr; |
| 301 | 4559 else |
| 303 | 4560 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
|
4561 # 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
|
4562 /* 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
|
4563 * 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
|
4564 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
|
4565 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
|
4566 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
|
4567 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
|
4568 # endif |
| 7 | 4569 } |
| 743 | 4570 #endif |
| 4571 | |
| 4572 #ifdef FEAT_SPELL | |
| 301 | 4573 /* Check spelling (unless at the end of the line). |
| 319 | 4574 * Only do this when there is no syntax highlighting, the |
| 4575 * @Spell cluster is not used or the current syntax item | |
| 4576 * contains the @Spell cluster. */ | |
| 348 | 4577 if (has_spell && v >= word_end && v > cur_checked_col) |
| 221 | 4578 { |
| 230 | 4579 spell_attr = 0; |
| 743 | 4580 # ifdef FEAT_SYN_HL |
| 674 | 4581 if (!attr_pri) |
| 230 | 4582 char_attr = syntax_attr; |
| 743 | 4583 # endif |
| 4584 if (c != 0 && ( | |
| 4585 # ifdef FEAT_SYN_HL | |
| 4586 !has_syntax || | |
| 4587 # endif | |
| 4588 can_spell)) | |
| 221 | 4589 { |
| 348 | 4590 char_u *prev_ptr, *p; |
| 4591 int len; | |
| 534 | 4592 hlf_T spell_hlf = HLF_COUNT; |
| 221 | 4593 # ifdef FEAT_MBYTE |
| 336 | 4594 if (has_mbyte) |
| 4595 { | |
| 4596 prev_ptr = ptr - mb_l; | |
| 4597 v -= mb_l - 1; | |
| 4598 } | |
| 4599 else | |
| 221 | 4600 # endif |
| 336 | 4601 prev_ptr = ptr - 1; |
| 348 | 4602 |
| 4603 /* Use nextline[] if possible, it has the start of the | |
| 4604 * next line concatenated. */ | |
| 4605 if ((prev_ptr - line) - nextlinecol >= 0) | |
| 4606 p = nextline + (prev_ptr - line) - nextlinecol; | |
| 4607 else | |
| 4608 p = prev_ptr; | |
| 835 | 4609 cap_col -= (int)(prev_ptr - line); |
| 625 | 4610 len = spell_check(wp, p, &spell_hlf, &cap_col, |
| 4611 nochange); | |
| 348 | 4612 word_end = v + len; |
| 301 | 4613 |
| 4614 /* In Insert mode only highlight a word that | |
| 4615 * doesn't touch the cursor. */ | |
| 534 | 4616 if (spell_hlf != HLF_COUNT |
| 301 | 4617 && (State & INSERT) != 0 |
| 4618 && wp->w_cursor.lnum == lnum | |
| 4619 && wp->w_cursor.col >= | |
| 4620 (colnr_T)(prev_ptr - line) | |
| 4621 && wp->w_cursor.col < (colnr_T)word_end) | |
| 221 | 4622 { |
| 534 | 4623 spell_hlf = HLF_COUNT; |
| 301 | 4624 spell_redraw_lnum = lnum; |
| 221 | 4625 } |
| 348 | 4626 |
| 534 | 4627 if (spell_hlf == HLF_COUNT && p != prev_ptr |
| 348 | 4628 && (p - nextline) + len > nextline_idx) |
| 4629 { | |
| 4630 /* Remember that the good word continues at the | |
| 4631 * start of the next line. */ | |
| 4632 checked_lnum = lnum + 1; | |
| 835 | 4633 checked_col = (int)((p - nextline) + len - nextline_idx); |
| 348 | 4634 } |
| 386 | 4635 |
| 534 | 4636 /* Turn index into actual attributes. */ |
| 4637 if (spell_hlf != HLF_COUNT) | |
| 4638 spell_attr = highlight_attr[spell_hlf]; | |
| 4639 | |
| 386 | 4640 if (cap_col > 0) |
| 4641 { | |
| 4642 if (p != prev_ptr | |
| 4643 && (p - nextline) + cap_col >= nextline_idx) | |
| 4644 { | |
| 4645 /* Remember that the word in the next line | |
| 4646 * must start with a capital. */ | |
| 4647 capcol_lnum = lnum + 1; | |
| 835 | 4648 cap_col = (int)((p - nextline) + cap_col |
| 4649 - nextline_idx); | |
| 386 | 4650 } |
| 4651 else | |
| 4652 /* Compute the actual column. */ | |
| 835 | 4653 cap_col += (int)(prev_ptr - line); |
| 386 | 4654 } |
| 221 | 4655 } |
| 4656 } | |
| 4657 if (spell_attr != 0) | |
| 348 | 4658 { |
| 674 | 4659 if (!attr_pri) |
| 348 | 4660 char_attr = hl_combine_attr(char_attr, spell_attr); |
| 4661 else | |
| 4662 char_attr = hl_combine_attr(spell_attr, char_attr); | |
| 4663 } | |
| 7 | 4664 #endif |
| 4665 #ifdef FEAT_LINEBREAK | |
| 4666 /* | |
| 221 | 4667 * Found last space before word: check for line break. |
| 7 | 4668 */ |
|
10982
5e20c9f96cd5
patch 8.0.0380: with 'linebreak' double wide char wraps badly
Christian Brabandt <cb@256bit.org>
parents:
10928
diff
changeset
|
4669 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
|
4670 && VIM_ISBREAK(c) && !VIM_ISBREAK((int)*ptr)) |
| 7 | 4671 { |
| 6681 | 4672 # ifdef FEAT_MBYTE |
| 6693 | 4673 int mb_off = has_mbyte ? (*mb_head_off)(line, ptr - 1) : 0; |
| 6681 | 4674 # endif |
| 5995 | 4675 char_u *p = ptr - ( |
| 7 | 4676 # ifdef FEAT_MBYTE |
| 6693 | 4677 mb_off + |
| 7 | 4678 # endif |
| 5995 | 4679 1); |
| 6681 | 4680 |
| 5995 | 4681 /* TODO: is passing p for start of the line OK? */ |
| 6026 | 4682 n_extra = win_lbr_chartabsize(wp, line, p, (colnr_T)vcol, |
| 5995 | 4683 NULL) - 1; |
| 6371 | 4684 if (c == TAB && n_extra + col > W_WIDTH(wp)) |
| 4685 n_extra = (int)wp->w_buffer->b_p_ts | |
| 4686 - vcol % (int)wp->w_buffer->b_p_ts - 1; | |
| 4687 | |
| 6681 | 4688 # ifdef FEAT_MBYTE |
| 6693 | 4689 c_extra = mb_off > 0 ? MB_FILLER_CHAR : ' '; |
| 6681 | 4690 # else |
| 7 | 4691 c_extra = ' '; |
| 6681 | 4692 # endif |
|
11129
f4ea50924c6d
patch 8.0.0452: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11127
diff
changeset
|
4693 if (VIM_ISWHITE(c)) |
|
5174
42d592dbbec3
updated for version 7.4a.013
Bram Moolenaar <bram@vim.org>
parents:
5126
diff
changeset
|
4694 { |
|
42d592dbbec3
updated for version 7.4a.013
Bram Moolenaar <bram@vim.org>
parents:
5126
diff
changeset
|
4695 #ifdef FEAT_CONCEAL |
|
42d592dbbec3
updated for version 7.4a.013
Bram Moolenaar <bram@vim.org>
parents:
5126
diff
changeset
|
4696 if (c == TAB) |
|
42d592dbbec3
updated for version 7.4a.013
Bram Moolenaar <bram@vim.org>
parents:
5126
diff
changeset
|
4697 /* See "Tab alignment" below. */ |
|
42d592dbbec3
updated for version 7.4a.013
Bram Moolenaar <bram@vim.org>
parents:
5126
diff
changeset
|
4698 FIX_FOR_BOGUSCOLS; |
|
42d592dbbec3
updated for version 7.4a.013
Bram Moolenaar <bram@vim.org>
parents:
5126
diff
changeset
|
4699 #endif |
| 6026 | 4700 if (!wp->w_p_list) |
| 4701 c = ' '; | |
|
5174
42d592dbbec3
updated for version 7.4a.013
Bram Moolenaar <bram@vim.org>
parents:
5126
diff
changeset
|
4702 } |
| 7 | 4703 } |
| 4704 #endif | |
| 4705 | |
|
7344
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
4706 /* '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
|
4707 */ |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
4708 if (wp->w_p_list |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
4709 && (((c == 160 |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
4710 #ifdef FEAT_MBYTE |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
4711 || (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
|
4712 #endif |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
4713 ) && lcs_nbsp) |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
4714 || (c == ' ' && lcs_space && ptr - line <= trailcol))) |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
4715 { |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
4716 c = (c == ' ') ? lcs_space : lcs_nbsp; |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
4717 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
|
4718 { |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
4719 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
|
4720 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
|
4721 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
|
4722 } |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
4723 #ifdef FEAT_MBYTE |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
4724 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
|
4725 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
|
4726 { |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
4727 mb_utf8 = TRUE; |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
4728 u8cc[0] = 0; |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
4729 c = 0xc0; |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
4730 } |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
4731 else |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
4732 mb_utf8 = FALSE; |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
4733 #endif |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
4734 } |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
4735 |
| 7 | 4736 if (trailcol != MAXCOL && ptr > line + trailcol && c == ' ') |
| 4737 { | |
| 4738 c = lcs_trail; | |
| 674 | 4739 if (!attr_pri) |
| 7 | 4740 { |
| 4741 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
|
4742 extra_attr = HL_ATTR(HLF_8); |
| 7 | 4743 saved_attr2 = char_attr; /* save current attr */ |
| 4744 } | |
| 4745 #ifdef FEAT_MBYTE | |
| 4746 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
|
4747 if (enc_utf8 && utf_char2len(c) > 1) |
| 7 | 4748 { |
| 4749 mb_utf8 = TRUE; | |
| 714 | 4750 u8cc[0] = 0; |
| 819 | 4751 c = 0xc0; |
| 7 | 4752 } |
| 4753 else | |
| 4754 mb_utf8 = FALSE; | |
| 4755 #endif | |
| 4756 } | |
| 4757 } | |
| 4758 | |
| 4759 /* | |
| 4760 * Handling of non-printable characters. | |
| 4761 */ | |
|
7697
f04e2b6feea2
commit https://github.com/vim/vim/commit/88e8f9f14434a7cd538d0c159dc432bea869a5bd
Christian Brabandt <cb@256bit.org>
parents:
7603
diff
changeset
|
4762 if (!vim_isprintc(c)) |
| 7 | 4763 { |
| 4764 /* | |
| 4765 * when getting a character from the file, we may have to | |
| 4766 * turn it into something else on the way to putting it | |
| 4767 * into "ScreenLines". | |
| 4768 */ | |
| 4769 if (c == TAB && (!wp->w_p_list || lcs_tab1)) | |
| 4770 { | |
| 6026 | 4771 int tab_len = 0; |
| 6503 | 4772 long vcol_adjusted = vcol; /* removed showbreak length */ |
| 4773 #ifdef FEAT_LINEBREAK | |
| 4774 /* only adjust the tab_len, when at the first column | |
| 4775 * after the showbreak value was drawn */ | |
| 4776 if (*p_sbr != NUL && vcol == vcol_sbr && wp->w_p_wrap) | |
| 4777 vcol_adjusted = vcol - MB_CHARLEN(p_sbr); | |
| 4778 #endif | |
| 7 | 4779 /* tab amount depends on current column */ |
| 6026 | 4780 tab_len = (int)wp->w_buffer->b_p_ts |
| 6503 | 4781 - vcol_adjusted % (int)wp->w_buffer->b_p_ts - 1; |
| 4782 | |
| 6026 | 4783 #ifdef FEAT_LINEBREAK |
| 6100 | 4784 if (!wp->w_p_lbr || !wp->w_p_list) |
| 6026 | 4785 #endif |
| 4786 /* tab amount depends on current column */ | |
| 4787 n_extra = tab_len; | |
| 4788 #ifdef FEAT_LINEBREAK | |
| 4789 else | |
| 4790 { | |
| 4791 char_u *p; | |
| 4792 int len = n_extra; | |
| 4793 int i; | |
| 4794 int saved_nextra = n_extra; | |
| 4795 | |
| 6172 | 4796 #ifdef FEAT_CONCEAL |
| 6627 | 4797 if (vcol_off > 0) |
| 6172 | 4798 /* there are characters to conceal */ |
| 4799 tab_len += vcol_off; | |
| 6520 | 4800 /* boguscols before FIX_FOR_BOGUSCOLS macro from above |
| 4801 */ | |
| 4802 if (wp->w_p_list && lcs_tab1 && old_boguscols > 0 | |
| 4803 && n_extra > tab_len) | |
| 4804 tab_len += n_extra - tab_len; | |
| 4805 #endif | |
| 4806 | |
| 6026 | 4807 /* if n_extra > 0, it gives the number of chars, to |
| 4808 * use for a tab, else we need to calculate the width | |
| 4809 * for a tab */ | |
| 4810 #ifdef FEAT_MBYTE | |
| 4811 len = (tab_len * mb_char2len(lcs_tab2)); | |
| 4812 if (n_extra > 0) | |
| 4813 len += n_extra - tab_len; | |
| 4814 #endif | |
| 4815 c = lcs_tab1; | |
| 4816 p = alloc((unsigned)(len + 1)); | |
| 4817 vim_memset(p, ' ', len); | |
| 4818 p[len] = NUL; | |
|
10690
206ab11fa76e
patch 8.0.0235: memory leak in diff mode
Christian Brabandt <cb@256bit.org>
parents:
10538
diff
changeset
|
4819 vim_free(p_extra_free); |
| 6026 | 4820 p_extra_free = p; |
| 4821 for (i = 0; i < tab_len; i++) | |
| 4822 { | |
| 4823 #ifdef FEAT_MBYTE | |
| 4824 mb_char2bytes(lcs_tab2, p); | |
| 4825 p += mb_char2len(lcs_tab2); | |
| 4826 n_extra += mb_char2len(lcs_tab2) | |
| 4827 - (saved_nextra > 0 ? 1 : 0); | |
| 4828 #else | |
| 4829 p[i] = lcs_tab2; | |
| 4830 #endif | |
| 4831 } | |
| 4832 p_extra = p_extra_free; | |
| 6172 | 4833 #ifdef FEAT_CONCEAL |
| 4834 /* n_extra will be increased by FIX_FOX_BOGUSCOLS | |
| 4835 * macro below, so need to adjust for that here */ | |
| 6627 | 4836 if (vcol_off > 0) |
| 6172 | 4837 n_extra -= vcol_off; |
| 4838 #endif | |
| 6026 | 4839 } |
| 4840 #endif | |
| 3984 | 4841 #ifdef FEAT_CONCEAL |
| 6627 | 4842 { |
| 4843 int vc_saved = vcol_off; | |
| 4844 | |
| 4845 /* Tab alignment should be identical regardless of | |
| 4846 * 'conceallevel' value. So tab compensates of all | |
| 4847 * previous concealed characters, and thus resets | |
| 4848 * vcol_off and boguscols accumulated so far in the | |
| 4849 * line. Note that the tab can be longer than | |
| 4850 * 'tabstop' when there are concealed characters. */ | |
| 4851 FIX_FOR_BOGUSCOLS; | |
| 4852 | |
| 4853 /* Make sure, the highlighting for the tab char will be | |
| 4854 * correctly set further below (effectively reverts the | |
| 4855 * FIX_FOR_BOGSUCOLS macro */ | |
| 4856 if (n_extra == tab_len + vc_saved && wp->w_p_list | |
| 6520 | 4857 && lcs_tab1) |
| 6627 | 4858 tab_len += vc_saved; |
| 4859 } | |
| 3984 | 4860 #endif |
| 7 | 4861 #ifdef FEAT_MBYTE |
| 4862 mb_utf8 = FALSE; /* don't draw as UTF-8 */ | |
| 4863 #endif | |
| 4864 if (wp->w_p_list) | |
| 4865 { | |
| 4866 c = lcs_tab1; | |
| 6026 | 4867 #ifdef FEAT_LINEBREAK |
| 4868 if (wp->w_p_lbr) | |
| 4869 c_extra = NUL; /* using p_extra from above */ | |
| 4870 else | |
| 4871 #endif | |
| 4872 c_extra = lcs_tab2; | |
| 4873 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
|
4874 extra_attr = HL_ATTR(HLF_8); |
| 7 | 4875 saved_attr2 = char_attr; /* save current attr */ |
| 4876 #ifdef FEAT_MBYTE | |
| 4877 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
|
4878 if (enc_utf8 && utf_char2len(c) > 1) |
| 7 | 4879 { |
| 4880 mb_utf8 = TRUE; | |
| 714 | 4881 u8cc[0] = 0; |
| 819 | 4882 c = 0xc0; |
| 7 | 4883 } |
| 4884 #endif | |
| 4885 } | |
| 4886 else | |
| 4887 { | |
| 4888 c_extra = ' '; | |
| 4889 c = ' '; | |
| 4890 } | |
| 4891 } | |
| 36 | 4892 else if (c == NUL |
| 6799 | 4893 && (wp->w_p_list |
| 36 | 4894 || ((fromcol >= 0 || fromcol_prev >= 0) |
| 4895 && tocol > vcol | |
| 4896 && VIsual_mode != Ctrl_V | |
| 4897 && ( | |
| 4898 # ifdef FEAT_RIGHTLEFT | |
| 4899 wp->w_p_rl ? (col >= 0) : | |
| 4900 # endif | |
| 4901 (col < W_WIDTH(wp))) | |
| 4902 && !(noinvcur | |
| 1850 | 4903 && lnum == wp->w_cursor.lnum |
| 36 | 4904 && (colnr_T)vcol == wp->w_virtcol))) |
| 6815 | 4905 && lcs_eol_one > 0) |
| 7 | 4906 { |
| 36 | 4907 /* Display a '$' after the line or highlight an extra |
| 4908 * character if the line break is included. */ | |
| 7 | 4909 #if defined(FEAT_DIFF) || defined(LINE_ATTR) |
| 4910 /* For a diff line the highlighting continues after the | |
| 4911 * "$". */ | |
| 4912 if ( | |
| 4913 # ifdef FEAT_DIFF | |
| 534 | 4914 diff_hlf == (hlf_T)0 |
| 7 | 4915 # ifdef LINE_ATTR |
| 4916 && | |
| 4917 # endif | |
| 4918 # endif | |
| 4919 # ifdef LINE_ATTR | |
| 4920 line_attr == 0 | |
| 4921 # endif | |
| 4922 ) | |
| 4923 #endif | |
| 4924 { | |
| 4925 #ifdef FEAT_VIRTUALEDIT | |
| 4926 /* In virtualedit, visual selections may extend | |
| 4927 * beyond end of line. */ | |
| 4928 if (area_highlighting && virtual_active() | |
| 4929 && tocol != MAXCOL && vcol < tocol) | |
| 4930 n_extra = 0; | |
| 4931 else | |
| 4932 #endif | |
| 4933 { | |
| 4934 p_extra = at_end_str; | |
| 4935 n_extra = 1; | |
| 4936 c_extra = NUL; | |
| 4937 } | |
| 4938 } | |
| 6799 | 4939 if (wp->w_p_list && lcs_eol > 0) |
| 36 | 4940 c = lcs_eol; |
| 4941 else | |
| 4942 c = ' '; | |
| 7 | 4943 lcs_eol_one = -1; |
| 4944 --ptr; /* put it back at the NUL */ | |
| 674 | 4945 if (!attr_pri) |
| 7 | 4946 { |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
4947 extra_attr = HL_ATTR(HLF_AT); |
| 7 | 4948 n_attr = 1; |
| 4949 } | |
| 4950 #ifdef FEAT_MBYTE | |
| 4951 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
|
4952 if (enc_utf8 && utf_char2len(c) > 1) |
| 7 | 4953 { |
| 4954 mb_utf8 = TRUE; | |
| 714 | 4955 u8cc[0] = 0; |
| 819 | 4956 c = 0xc0; |
| 7 | 4957 } |
| 4958 else | |
| 4959 mb_utf8 = FALSE; /* don't draw as UTF-8 */ | |
| 4960 #endif | |
| 4961 } | |
| 4962 else if (c != NUL) | |
| 4963 { | |
| 4964 p_extra = transchar(c); | |
| 6064 | 4965 if (n_extra == 0) |
| 4966 n_extra = byte2cells(c) - 1; | |
| 7 | 4967 #ifdef FEAT_RIGHTLEFT |
| 4968 if ((dy_flags & DY_UHEX) && wp->w_p_rl) | |
| 4969 rl_mirror(p_extra); /* reverse "<12>" */ | |
| 4970 #endif | |
| 4971 c_extra = NUL; | |
| 6026 | 4972 #ifdef FEAT_LINEBREAK |
| 4973 if (wp->w_p_lbr) | |
| 4974 { | |
| 4975 char_u *p; | |
| 4976 | |
| 4977 c = *p_extra; | |
| 4978 p = alloc((unsigned)n_extra + 1); | |
| 4979 vim_memset(p, ' ', n_extra); | |
| 4980 STRNCPY(p, p_extra + 1, STRLEN(p_extra) - 1); | |
| 4981 p[n_extra] = NUL; | |
|
10690
206ab11fa76e
patch 8.0.0235: memory leak in diff mode
Christian Brabandt <cb@256bit.org>
parents:
10538
diff
changeset
|
4982 vim_free(p_extra_free); |
| 6026 | 4983 p_extra_free = p_extra = p; |
| 4984 } | |
| 4985 else | |
| 4986 #endif | |
| 4987 { | |
| 4988 n_extra = byte2cells(c) - 1; | |
| 4989 c = *p_extra++; | |
| 4990 } | |
| 674 | 4991 if (!attr_pri) |
| 7 | 4992 { |
| 4993 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
|
4994 extra_attr = HL_ATTR(HLF_8); |
| 7 | 4995 saved_attr2 = char_attr; /* save current attr */ |
| 4996 } | |
| 4997 #ifdef FEAT_MBYTE | |
| 4998 mb_utf8 = FALSE; /* don't draw as UTF-8 */ | |
| 4999 #endif | |
| 5000 } | |
| 5001 #ifdef FEAT_VIRTUALEDIT | |
| 5002 else if (VIsual_active | |
| 5003 && (VIsual_mode == Ctrl_V | |
| 5004 || VIsual_mode == 'v') | |
| 5005 && virtual_active() | |
| 5006 && tocol != MAXCOL | |
| 5007 && vcol < tocol | |
| 5008 && ( | |
| 5009 # ifdef FEAT_RIGHTLEFT | |
| 5010 wp->w_p_rl ? (col >= 0) : | |
| 5011 # endif | |
| 5012 (col < W_WIDTH(wp)))) | |
| 5013 { | |
| 5014 c = ' '; | |
| 5015 --ptr; /* put it back at the NUL */ | |
| 5016 } | |
| 5017 #endif | |
| 910 | 5018 #if defined(LINE_ATTR) |
| 7 | 5019 else if (( |
| 5020 # ifdef FEAT_DIFF | |
| 910 | 5021 diff_hlf != (hlf_T)0 || |
| 7 | 5022 # endif |
| 5023 line_attr != 0 | |
| 5024 ) && ( | |
| 5025 # ifdef FEAT_RIGHTLEFT | |
| 5026 wp->w_p_rl ? (col >= 0) : | |
| 5027 # endif | |
|
2553
37d3f90f5203
Conceal feature caused the 'cursorline' highlighting to stop early.
Bram Moolenaar <bram@vim.org>
parents:
2520
diff
changeset
|
5028 (col |
|
37d3f90f5203
Conceal feature caused the 'cursorline' highlighting to stop early.
Bram Moolenaar <bram@vim.org>
parents:
2520
diff
changeset
|
5029 # ifdef FEAT_CONCEAL |
|
37d3f90f5203
Conceal feature caused the 'cursorline' highlighting to stop early.
Bram Moolenaar <bram@vim.org>
parents:
2520
diff
changeset
|
5030 - boguscols |
|
37d3f90f5203
Conceal feature caused the 'cursorline' highlighting to stop early.
Bram Moolenaar <bram@vim.org>
parents:
2520
diff
changeset
|
5031 # endif |
|
37d3f90f5203
Conceal feature caused the 'cursorline' highlighting to stop early.
Bram Moolenaar <bram@vim.org>
parents:
2520
diff
changeset
|
5032 < W_WIDTH(wp)))) |
| 7 | 5033 { |
| 5034 /* Highlight until the right side of the window */ | |
| 5035 c = ' '; | |
| 5036 --ptr; /* put it back at the NUL */ | |
| 867 | 5037 |
| 5038 /* Remember we do the char for line highlighting. */ | |
| 5039 ++did_line_attr; | |
| 5040 | |
| 5041 /* don't do search HL for the rest of the line */ | |
| 5042 if (line_attr != 0 && char_attr == search_attr && col > 0) | |
| 5043 char_attr = line_attr; | |
| 7 | 5044 # ifdef FEAT_DIFF |
| 5045 if (diff_hlf == HLF_TXD) | |
| 5046 { | |
| 5047 diff_hlf = HLF_CHD; | |
| 5048 if (attr == 0 || char_attr != attr) | |
| 6106 | 5049 { |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
5050 char_attr = HL_ATTR(diff_hlf); |
| 6106 | 5051 if (wp->w_p_cul && lnum == wp->w_cursor.lnum) |
| 5052 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
|
5053 HL_ATTR(HLF_CUL)); |
| 6106 | 5054 } |
| 7 | 5055 } |
| 5056 # endif | |
| 5057 } | |
| 5058 #endif | |
| 5059 } | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5060 |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5061 #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
|
5062 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
|
5063 && (wp != curwin || lnum != wp->w_cursor.lnum || |
| 6947 | 5064 conceal_cursor_line(wp) ) |
|
8907
5deb9e8f4292
commit https://github.com/vim/vim/commit/4d585022023b96f6507e8cae5ed8fc8d926f5140
Christian Brabandt <cb@256bit.org>
parents:
8872
diff
changeset
|
5065 && ( (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
|
5066 && !(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
|
5067 && 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
|
5068 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5069 char_attr = conceal_attr; |
|
8907
5deb9e8f4292
commit https://github.com/vim/vim/commit/4d585022023b96f6507e8cae5ed8fc8d926f5140
Christian Brabandt <cb@256bit.org>
parents:
8872
diff
changeset
|
5070 if ((prev_syntax_id != syntax_seqnr || has_match_conc > 1) |
| 6947 | 5071 && (syn_get_sub_char() != NUL || match_conc |
| 5072 || 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
|
5073 && 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
|
5074 { |
|
a96dd77ce213
For conceal mode: when two different syntax items follow each other, show the
Bram Moolenaar <bram@vim.org>
parents:
2364
diff
changeset
|
5075 /* 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
|
5076 * character. */ |
| 6947 | 5077 if (match_conc) |
| 5078 c = match_conc; | |
| 5079 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
|
5080 c = syn_get_sub_char(); |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5081 else if (lcs_conceal != NUL) |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5082 c = lcs_conceal; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5083 else |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5084 c = ' '; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5085 |
|
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
|
5086 prev_syntax_id = syntax_seqnr; |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5087 |
|
2332
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
5088 if (n_extra > 0) |
|
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
5089 vcol_off += n_extra; |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5090 vcol += n_extra; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5091 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
|
5092 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5093 # ifdef FEAT_RIGHTLEFT |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5094 if (wp->w_p_rl) |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5095 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5096 col -= n_extra; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5097 boguscols -= n_extra; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5098 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5099 else |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5100 # endif |
|
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 boguscols += n_extra; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5103 col += n_extra; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5104 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5105 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5106 n_extra = 0; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5107 n_attr = 0; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5108 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5109 else if (n_skip == 0) |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5110 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5111 is_concealing = TRUE; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5112 n_skip = 1; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5113 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5114 # ifdef FEAT_MBYTE |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5115 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
|
5116 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
|
5117 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5118 mb_utf8 = TRUE; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5119 u8cc[0] = 0; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5120 c = 0xc0; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5121 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5122 else |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5123 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
|
5124 # endif |
|
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 else |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5127 { |
|
2375
a96dd77ce213
For conceal mode: when two different syntax items follow each other, show the
Bram Moolenaar <bram@vim.org>
parents:
2364
diff
changeset
|
5128 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
|
5129 is_concealing = FALSE; |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5130 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5131 #endif /* FEAT_CONCEAL */ |
| 7 | 5132 } |
| 5133 | |
|
2378
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
5134 #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
|
5135 /* 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
|
5136 * 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
|
5137 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
|
5138 && 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
|
5139 && 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
|
5140 && (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
|
5141 { |
|
7603
d3892f6c917e
commit https://github.com/vim/vim/commit/e39b3d9fb4e4006684c33847d1ef6a0d742699dd
Christian Brabandt <cb@256bit.org>
parents:
7344
diff
changeset
|
5142 # ifdef FEAT_RIGHTLEFT |
|
d3892f6c917e
commit https://github.com/vim/vim/commit/e39b3d9fb4e4006684c33847d1ef6a0d742699dd
Christian Brabandt <cb@256bit.org>
parents:
7344
diff
changeset
|
5143 if (wp->w_p_rl) |
|
d3892f6c917e
commit https://github.com/vim/vim/commit/e39b3d9fb4e4006684c33847d1ef6a0d742699dd
Christian Brabandt <cb@256bit.org>
parents:
7344
diff
changeset
|
5144 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
|
5145 else |
|
d3892f6c917e
commit https://github.com/vim/vim/commit/e39b3d9fb4e4006684c33847d1ef6a0d742699dd
Christian Brabandt <cb@256bit.org>
parents:
7344
diff
changeset
|
5146 # endif |
|
d3892f6c917e
commit https://github.com/vim/vim/commit/e39b3d9fb4e4006684c33847d1ef6a0d742699dd
Christian Brabandt <cb@256bit.org>
parents:
7344
diff
changeset
|
5147 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
|
5148 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
|
5149 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
|
5150 } |
|
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
5151 #endif |
|
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
5152 |
| 7 | 5153 /* Don't override visual selection highlighting. */ |
| 5154 if (n_attr > 0 | |
| 5155 && draw_state == WL_LINE | |
| 674 | 5156 && !attr_pri) |
| 7 | 5157 char_attr = extra_attr; |
| 5158 | |
| 42 | 5159 #if defined(FEAT_XIM) && defined(FEAT_GUI_GTK) |
| 7 | 5160 /* XIM don't send preedit_start and preedit_end, but they send |
| 5161 * preedit_changed and commit. Thus Vim can't set "im_is_active", use | |
| 5162 * im_is_preediting() here. */ | |
| 5163 if (xic != NULL | |
| 1850 | 5164 && lnum == wp->w_cursor.lnum |
| 7 | 5165 && (State & INSERT) |
| 5166 && !p_imdisable | |
| 5167 && im_is_preediting() | |
| 5168 && draw_state == WL_LINE) | |
| 5169 { | |
| 5170 colnr_T tcol; | |
| 5171 | |
| 5172 if (preedit_end_col == MAXCOL) | |
| 1850 | 5173 getvcol(curwin, &(wp->w_cursor), &tcol, NULL, NULL); |
| 7 | 5174 else |
| 5175 tcol = preedit_end_col; | |
| 5176 if ((long)preedit_start_col <= vcol && vcol < (long)tcol) | |
| 5177 { | |
| 5178 if (feedback_old_attr < 0) | |
| 5179 { | |
| 5180 feedback_col = 0; | |
| 5181 feedback_old_attr = char_attr; | |
| 5182 } | |
| 5183 char_attr = im_get_feedback_attr(feedback_col); | |
| 5184 if (char_attr < 0) | |
| 5185 char_attr = feedback_old_attr; | |
| 5186 feedback_col++; | |
| 5187 } | |
| 5188 else if (feedback_old_attr >= 0) | |
| 5189 { | |
| 5190 char_attr = feedback_old_attr; | |
| 5191 feedback_old_attr = -1; | |
| 5192 feedback_col = 0; | |
| 5193 } | |
| 5194 } | |
| 5195 #endif | |
| 5196 /* | |
| 5197 * Handle the case where we are in column 0 but not on the first | |
| 5198 * character of the line and the user wants us to show us a | |
| 5199 * special character (via 'listchars' option "precedes:<char>". | |
| 5200 */ | |
| 5201 if (lcs_prec_todo != NUL | |
| 6276 | 5202 && wp->w_p_list |
| 7 | 5203 && (wp->w_p_wrap ? wp->w_skipcol > 0 : wp->w_leftcol > 0) |
| 5204 #ifdef FEAT_DIFF | |
| 5205 && filler_todo <= 0 | |
| 5206 #endif | |
| 5207 && draw_state > WL_NR | |
| 5208 && c != NUL) | |
| 5209 { | |
| 5210 c = lcs_prec; | |
| 5211 lcs_prec_todo = NUL; | |
| 5212 #ifdef FEAT_MBYTE | |
| 3586 | 5213 if (has_mbyte && (*mb_char2cells)(mb_c) > 1) |
| 5214 { | |
| 5215 /* Double-width character being overwritten by the "precedes" | |
| 5216 * character, need to fill up half the character. */ | |
| 5217 c_extra = MB_FILLER_CHAR; | |
| 5218 n_extra = 1; | |
| 5219 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
|
5220 extra_attr = HL_ATTR(HLF_AT); |
| 3586 | 5221 } |
| 7 | 5222 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
|
5223 if (enc_utf8 && utf_char2len(c) > 1) |
| 7 | 5224 { |
| 5225 mb_utf8 = TRUE; | |
| 714 | 5226 u8cc[0] = 0; |
| 819 | 5227 c = 0xc0; |
| 7 | 5228 } |
| 5229 else | |
| 5230 mb_utf8 = FALSE; /* don't draw as UTF-8 */ | |
| 5231 #endif | |
| 674 | 5232 if (!attr_pri) |
| 7 | 5233 { |
| 5234 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
|
5235 char_attr = HL_ATTR(HLF_AT); /* later copied to char_attr */ |
| 7 | 5236 n_attr3 = 1; |
| 5237 } | |
| 5238 } | |
| 5239 | |
| 5240 /* | |
| 867 | 5241 * At end of the text line or just after the last character. |
| 7 | 5242 */ |
| 867 | 5243 if (c == NUL |
| 910 | 5244 #if defined(LINE_ATTR) |
| 867 | 5245 || did_line_attr == 1 |
| 5246 #endif | |
| 5247 ) | |
| 5248 { | |
| 5249 #ifdef FEAT_SEARCH_EXTRA | |
| 5250 long prevcol = (long)(ptr - line) - (c == NUL); | |
| 1437 | 5251 |
| 5252 /* we're not really at that column when skipping some text */ | |
| 1439 | 5253 if ((long)(wp->w_p_wrap ? wp->w_skipcol : wp->w_leftcol) > prevcol) |
| 1437 | 5254 ++prevcol; |
| 867 | 5255 #endif |
| 5256 | |
|
2332
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
5257 /* Invert at least one char, used for Visual and empty line or |
| 7 | 5258 * highlight match at end of line. If it's beyond the last |
| 5259 * char on the screen, just overwrite that one (tricky!) Not | |
| 5260 * needed when a '$' was displayed for 'list'. */ | |
| 1326 | 5261 #ifdef FEAT_SEARCH_EXTRA |
| 5262 prevcol_hl_flag = FALSE; | |
|
9885
4e8b05fa12c6
commit https://github.com/vim/vim/commit/4f416e41243ca151b95d39d81ce23d00b1484755
Christian Brabandt <cb@256bit.org>
parents:
9877
diff
changeset
|
5263 if (!search_hl.is_addpos && prevcol == (long)search_hl.startcol) |
| 1326 | 5264 prevcol_hl_flag = TRUE; |
| 5265 else | |
| 5266 { | |
| 5267 cur = wp->w_match_head; | |
| 5268 while (cur != NULL) | |
| 5269 { | |
|
9885
4e8b05fa12c6
commit https://github.com/vim/vim/commit/4f416e41243ca151b95d39d81ce23d00b1484755
Christian Brabandt <cb@256bit.org>
parents:
9877
diff
changeset
|
5270 if (!cur->hl.is_addpos && prevcol == (long)cur->hl.startcol) |
| 1326 | 5271 { |
| 5272 prevcol_hl_flag = TRUE; | |
| 5273 break; | |
| 5274 } | |
| 5275 cur = cur->next; | |
| 5276 } | |
| 5277 } | |
| 5278 #endif | |
| 7 | 5279 if (lcs_eol == lcs_eol_one |
| 1850 | 5280 && ((area_attr != 0 && vcol == fromcol |
| 5281 && (VIsual_mode != Ctrl_V | |
| 5282 || lnum == VIsual.lnum | |
| 5283 || lnum == curwin->w_cursor.lnum) | |
| 5284 && c == NUL) | |
| 7 | 5285 #ifdef FEAT_SEARCH_EXTRA |
| 5286 /* highlight 'hlsearch' match at end of line */ | |
| 1326 | 5287 || (prevcol_hl_flag == TRUE |
| 910 | 5288 # if defined(LINE_ATTR) |
| 867 | 5289 && did_line_attr <= 1 |
| 5290 # endif | |
| 5291 ) | |
| 7 | 5292 #endif |
| 5293 )) | |
| 5294 { | |
| 5295 int n = 0; | |
| 5296 | |
| 5297 #ifdef FEAT_RIGHTLEFT | |
| 5298 if (wp->w_p_rl) | |
| 5299 { | |
| 5300 if (col < 0) | |
| 5301 n = 1; | |
| 5302 } | |
| 5303 else | |
| 5304 #endif | |
| 5305 { | |
| 5306 if (col >= W_WIDTH(wp)) | |
| 5307 n = -1; | |
| 5308 } | |
| 5309 if (n != 0) | |
| 5310 { | |
| 5311 /* At the window boundary, highlight the last character | |
| 5312 * instead (better than nothing). */ | |
| 5313 off += n; | |
| 5314 col += n; | |
| 5315 } | |
| 5316 else | |
| 5317 { | |
| 5318 /* Add a blank character to highlight. */ | |
| 5319 ScreenLines[off] = ' '; | |
| 5320 #ifdef FEAT_MBYTE | |
| 5321 if (enc_utf8) | |
| 5322 ScreenLinesUC[off] = 0; | |
| 5323 #endif | |
| 5324 } | |
| 5325 #ifdef FEAT_SEARCH_EXTRA | |
| 5326 if (area_attr == 0) | |
| 5327 { | |
| 1326 | 5328 /* Use attributes from match with highest priority among |
| 5329 * 'search_hl' and the match list. */ | |
| 5330 char_attr = search_hl.attr; | |
| 5331 cur = wp->w_match_head; | |
| 5332 shl_flag = FALSE; | |
| 5333 while (cur != NULL || shl_flag == FALSE) | |
| 699 | 5334 { |
| 1326 | 5335 if (shl_flag == FALSE |
| 5336 && ((cur != NULL | |
| 5337 && cur->priority > SEARCH_HL_PRIORITY) | |
| 5338 || cur == NULL)) | |
| 699 | 5339 { |
| 1326 | 5340 shl = &search_hl; |
| 5341 shl_flag = TRUE; | |
| 699 | 5342 } |
| 1326 | 5343 else |
| 5344 shl = &cur->hl; | |
|
9885
4e8b05fa12c6
commit https://github.com/vim/vim/commit/4f416e41243ca151b95d39d81ce23d00b1484755
Christian Brabandt <cb@256bit.org>
parents:
9877
diff
changeset
|
5345 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
|
5346 && (shl == &search_hl || !shl->is_addpos)) |
| 1326 | 5347 char_attr = shl->attr; |
| 5348 if (shl != &search_hl && cur != NULL) | |
| 5349 cur = cur->next; | |
| 699 | 5350 } |
| 7 | 5351 } |
| 5352 #endif | |
| 5353 ScreenAttrs[off] = char_attr; | |
| 5354 #ifdef FEAT_RIGHTLEFT | |
| 5355 if (wp->w_p_rl) | |
| 1437 | 5356 { |
| 7 | 5357 --col; |
| 1437 | 5358 --off; |
| 5359 } | |
| 7 | 5360 else |
| 5361 #endif | |
| 1437 | 5362 { |
| 7 | 5363 ++col; |
| 1437 | 5364 ++off; |
| 5365 } | |
| 743 | 5366 ++vcol; |
| 1437 | 5367 #ifdef FEAT_SYN_HL |
| 5368 eol_hl_off = 1; | |
| 5369 #endif | |
| 743 | 5370 } |
| 867 | 5371 } |
| 5372 | |
| 5373 /* | |
| 5374 * At end of the text line. | |
| 5375 */ | |
| 5376 if (c == NUL) | |
| 5377 { | |
| 743 | 5378 #ifdef FEAT_SYN_HL |
| 1850 | 5379 if (eol_hl_off > 0 && vcol - eol_hl_off == (long)wp->w_virtcol |
| 5380 && lnum == wp->w_cursor.lnum) | |
| 1437 | 5381 { |
| 5382 /* highlight last char after line */ | |
| 5383 --col; | |
| 5384 --off; | |
| 5385 --vcol; | |
| 5386 } | |
| 5387 | |
|
2314
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5388 /* Highlight 'cursorcolumn' & 'colorcolumn' past end of the line. */ |
| 758 | 5389 if (wp->w_p_wrap) |
| 5390 v = wp->w_skipcol; | |
| 5391 else | |
| 5392 v = wp->w_leftcol; | |
|
2314
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5393 |
| 820 | 5394 /* check if line ends before left margin */ |
| 5395 if (vcol < v + col - win_col_off(wp)) | |
| 5396 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
|
5397 #ifdef FEAT_CONCEAL |
|
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
5398 /* 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
|
5399 * edge for 'cursorcolumn'. */ |
|
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
5400 col -= boguscols; |
|
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
5401 boguscols = 0; |
|
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
5402 #endif |
|
2314
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5403 |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5404 if (draw_color_col) |
|
2332
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
5405 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
|
5406 |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5407 if (((wp->w_p_cuc |
|
2332
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
5408 && (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
|
5409 && (int)wp->w_virtcol < |
|
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
5410 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
|
5411 && lnum != wp->w_cursor.lnum) |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5412 || draw_color_col) |
| 743 | 5413 # ifdef FEAT_RIGHTLEFT |
| 5414 && !wp->w_p_rl | |
| 5415 # endif | |
| 5416 ) | |
| 5417 { | |
|
2314
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5418 int rightmost_vcol = 0; |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5419 int i; |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5420 |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5421 if (wp->w_p_cuc) |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5422 rightmost_vcol = wp->w_virtcol; |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5423 if (draw_color_col) |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5424 /* determine rightmost colorcolumn to possibly draw */ |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5425 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
|
5426 if (rightmost_vcol < color_cols[i]) |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5427 rightmost_vcol = color_cols[i]; |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5428 |
| 743 | 5429 while (col < W_WIDTH(wp)) |
| 5430 { | |
| 5431 ScreenLines[off] = ' '; | |
| 5432 #ifdef FEAT_MBYTE | |
| 5433 if (enc_utf8) | |
| 5434 ScreenLinesUC[off] = 0; | |
| 5435 #endif | |
| 5436 ++col; | |
|
2356
eb1f2554cac5
Fix 'colorcolumn' adjecent columns not highlighted after end of line.
Bram Moolenaar <bram@vim.org>
parents:
2349
diff
changeset
|
5437 if (draw_color_col) |
|
eb1f2554cac5
Fix 'colorcolumn' adjecent columns not highlighted after end of line.
Bram Moolenaar <bram@vim.org>
parents:
2349
diff
changeset
|
5438 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
|
5439 &color_cols); |
|
eb1f2554cac5
Fix 'colorcolumn' adjecent columns not highlighted after end of line.
Bram Moolenaar <bram@vim.org>
parents:
2349
diff
changeset
|
5440 |
|
2332
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
5441 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
|
5442 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
|
5443 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
|
5444 ScreenAttrs[off++] = HL_ATTR(HLF_MC); |
|
2314
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5445 else |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5446 ScreenAttrs[off++] = 0; |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5447 |
|
2332
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
5448 if (VCOL_HLC >= rightmost_vcol) |
| 743 | 5449 break; |
|
2314
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5450 |
| 743 | 5451 ++vcol; |
| 5452 } | |
| 5453 } | |
| 5454 #endif | |
| 7 | 5455 |
|
11670
3b2afa2b77b3
patch 8.0.0718: output of job in terminal is not displayed
Christian Brabandt <cb@256bit.org>
parents:
11657
diff
changeset
|
5456 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
|
5457 (int)W_WIDTH(wp), HAS_RIGHTLEFT(wp->w_p_rl)); |
| 7 | 5458 row++; |
| 5459 | |
| 5460 /* | |
| 5461 * Update w_cline_height and w_cline_folded if the cursor line was | |
| 5462 * updated (saves a call to plines() later). | |
| 5463 */ | |
| 5464 if (wp == curwin && lnum == curwin->w_cursor.lnum) | |
| 5465 { | |
| 5466 curwin->w_cline_row = startrow; | |
| 5467 curwin->w_cline_height = row - startrow; | |
| 5468 #ifdef FEAT_FOLDING | |
| 5469 curwin->w_cline_folded = FALSE; | |
| 5470 #endif | |
| 5471 curwin->w_valid |= (VALID_CHEIGHT|VALID_CROW); | |
| 5472 } | |
| 5473 | |
| 5474 break; | |
| 5475 } | |
| 5476 | |
| 5477 /* line continues beyond line end */ | |
| 5478 if (lcs_ext | |
| 5479 && !wp->w_p_wrap | |
| 5480 #ifdef FEAT_DIFF | |
| 5481 && filler_todo <= 0 | |
| 5482 #endif | |
| 5483 && ( | |
| 5484 #ifdef FEAT_RIGHTLEFT | |
| 5485 wp->w_p_rl ? col == 0 : | |
| 5486 #endif | |
| 5487 col == W_WIDTH(wp) - 1) | |
| 5488 && (*ptr != NUL | |
| 1555 | 5489 || (wp->w_p_list && lcs_eol_one > 0) |
| 7 | 5490 || (n_extra && (c_extra != NUL || *p_extra != NUL)))) |
| 5491 { | |
| 5492 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
|
5493 char_attr = HL_ATTR(HLF_AT); |
| 7 | 5494 #ifdef FEAT_MBYTE |
| 5495 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
|
5496 if (enc_utf8 && utf_char2len(c) > 1) |
| 7 | 5497 { |
| 5498 mb_utf8 = TRUE; | |
| 714 | 5499 u8cc[0] = 0; |
| 819 | 5500 c = 0xc0; |
| 7 | 5501 } |
| 5502 else | |
| 5503 mb_utf8 = FALSE; | |
| 5504 #endif | |
| 5505 } | |
| 5506 | |
| 743 | 5507 #ifdef FEAT_SYN_HL |
|
2314
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5508 /* advance to the next 'colorcolumn' */ |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5509 if (draw_color_col) |
|
2332
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
5510 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
|
5511 |
| 743 | 5512 /* 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
|
5513 * highlight the cursor position itself. |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5514 * 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
|
5515 * 'cursorcolumn' */ |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5516 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
|
5517 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
|
5518 && search_attr == 0 && area_attr == 0) |
|
2314
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5519 { |
|
2332
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
5520 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
|
5521 && lnum != wp->w_cursor.lnum) |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5522 { |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5523 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
|
5524 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
|
5525 } |
|
2346
b38c324bdc36
Fix: 'colorcolumn' interfered with concealed text.
Bram Moolenaar <bram@vim.org>
parents:
2338
diff
changeset
|
5526 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
|
5527 { |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5528 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
|
5529 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
|
5530 } |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5531 } |
| 743 | 5532 #endif |
| 5533 | |
| 7 | 5534 /* |
| 5535 * Store character to be displayed. | |
| 5536 * Skip characters that are left of the screen for 'nowrap'. | |
| 5537 */ | |
| 5538 vcol_prev = vcol; | |
| 5539 if (draw_state < WL_LINE || n_skip <= 0) | |
| 5540 { | |
| 5541 /* | |
| 5542 * Store the character. | |
| 5543 */ | |
| 5544 #if defined(FEAT_RIGHTLEFT) && defined(FEAT_MBYTE) | |
| 5545 if (has_mbyte && wp->w_p_rl && (*mb_char2cells)(mb_c) > 1) | |
| 5546 { | |
| 5547 /* A double-wide character is: put first halve in left cell. */ | |
| 5548 --off; | |
| 5549 --col; | |
| 5550 } | |
| 5551 #endif | |
| 5552 ScreenLines[off] = c; | |
| 5553 #ifdef FEAT_MBYTE | |
| 5554 if (enc_dbcs == DBCS_JPNU) | |
|
2069
63613d8d7e4d
updated for version 7.2.354
Bram Moolenaar <bram@zimbu.org>
parents:
2055
diff
changeset
|
5555 { |
|
63613d8d7e4d
updated for version 7.2.354
Bram Moolenaar <bram@zimbu.org>
parents:
2055
diff
changeset
|
5556 if ((mb_c & 0xff00) == 0x8e00) |
|
63613d8d7e4d
updated for version 7.2.354
Bram Moolenaar <bram@zimbu.org>
parents:
2055
diff
changeset
|
5557 ScreenLines[off] = 0x8e; |
| 7 | 5558 ScreenLines2[off] = mb_c & 0xff; |
|
2069
63613d8d7e4d
updated for version 7.2.354
Bram Moolenaar <bram@zimbu.org>
parents:
2055
diff
changeset
|
5559 } |
| 7 | 5560 else if (enc_utf8) |
| 5561 { | |
| 5562 if (mb_utf8) | |
| 5563 { | |
| 1326 | 5564 int i; |
| 5565 | |
| 7 | 5566 ScreenLinesUC[off] = mb_c; |
| 819 | 5567 if ((c & 0xff) == 0) |
| 5568 ScreenLines[off] = 0x80; /* avoid storing zero */ | |
| 714 | 5569 for (i = 0; i < Screen_mco; ++i) |
| 5570 { | |
| 5571 ScreenLinesC[i][off] = u8cc[i]; | |
| 5572 if (u8cc[i] == 0) | |
| 5573 break; | |
| 5574 } | |
| 7 | 5575 } |
| 5576 else | |
| 5577 ScreenLinesUC[off] = 0; | |
| 5578 } | |
| 5579 if (multi_attr) | |
| 5580 { | |
| 5581 ScreenAttrs[off] = multi_attr; | |
| 5582 multi_attr = 0; | |
| 5583 } | |
| 5584 else | |
| 5585 #endif | |
| 5586 ScreenAttrs[off] = char_attr; | |
| 5587 | |
| 5588 #ifdef FEAT_MBYTE | |
| 5589 if (has_mbyte && (*mb_char2cells)(mb_c) > 1) | |
| 5590 { | |
| 5591 /* Need to fill two screen columns. */ | |
| 5592 ++off; | |
| 5593 ++col; | |
| 5594 if (enc_utf8) | |
| 5595 /* UTF-8: Put a 0 in the second screen char. */ | |
| 5596 ScreenLines[off] = 0; | |
| 5597 else | |
| 5598 /* DBCS: Put second byte in the second screen char. */ | |
| 5599 ScreenLines[off] = mb_c & 0xff; | |
|
7287
6fcadba9ec7a
commit https://github.com/vim/vim/commit/32a214e78df0120f92fe049eab1385c60f0cdb0b
Christian Brabandt <cb@256bit.org>
parents:
7233
diff
changeset
|
5600 if (draw_state > WL_NR |
|
6fcadba9ec7a
commit https://github.com/vim/vim/commit/32a214e78df0120f92fe049eab1385c60f0cdb0b
Christian Brabandt <cb@256bit.org>
parents:
7233
diff
changeset
|
5601 #ifdef FEAT_DIFF |
|
6fcadba9ec7a
commit https://github.com/vim/vim/commit/32a214e78df0120f92fe049eab1385c60f0cdb0b
Christian Brabandt <cb@256bit.org>
parents:
7233
diff
changeset
|
5602 && filler_todo <= 0 |
|
6fcadba9ec7a
commit https://github.com/vim/vim/commit/32a214e78df0120f92fe049eab1385c60f0cdb0b
Christian Brabandt <cb@256bit.org>
parents:
7233
diff
changeset
|
5603 #endif |
|
6fcadba9ec7a
commit https://github.com/vim/vim/commit/32a214e78df0120f92fe049eab1385c60f0cdb0b
Christian Brabandt <cb@256bit.org>
parents:
7233
diff
changeset
|
5604 ) |
|
6fcadba9ec7a
commit https://github.com/vim/vim/commit/32a214e78df0120f92fe049eab1385c60f0cdb0b
Christian Brabandt <cb@256bit.org>
parents:
7233
diff
changeset
|
5605 ++vcol; |
| 7 | 5606 /* When "tocol" is halfway a character, set it to the end of |
| 5607 * the character, otherwise highlighting won't stop. */ | |
| 5608 if (tocol == vcol) | |
| 5609 ++tocol; | |
| 5610 #ifdef FEAT_RIGHTLEFT | |
| 5611 if (wp->w_p_rl) | |
| 5612 { | |
| 5613 /* now it's time to backup one cell */ | |
| 5614 --off; | |
| 5615 --col; | |
| 5616 } | |
| 5617 #endif | |
| 5618 } | |
| 5619 #endif | |
| 5620 #ifdef FEAT_RIGHTLEFT | |
| 5621 if (wp->w_p_rl) | |
| 5622 { | |
| 5623 --off; | |
| 5624 --col; | |
| 5625 } | |
| 5626 else | |
| 5627 #endif | |
| 5628 { | |
| 5629 ++off; | |
| 5630 ++col; | |
| 5631 } | |
| 5632 } | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5633 #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
|
5634 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
|
5635 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5636 --n_skip; |
|
2332
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
5637 ++vcol_off; |
|
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
5638 if (n_extra > 0) |
|
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
5639 vcol_off += n_extra; |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5640 if (wp->w_p_wrap) |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5641 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5642 /* |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5643 * Special voodoo required if 'wrap' is on. |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5644 * |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5645 * 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
|
5646 * 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
|
5647 * 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
|
5648 * 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
|
5649 * |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5650 * 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
|
5651 * 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
|
5652 * 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
|
5653 * of bad columns we have advanced. |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5654 */ |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5655 if (n_extra > 0) |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5656 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5657 vcol += n_extra; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5658 # ifdef FEAT_RIGHTLEFT |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5659 if (wp->w_p_rl) |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5660 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5661 col -= n_extra; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5662 boguscols -= n_extra; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5663 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5664 else |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5665 # endif |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5666 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5667 col += n_extra; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5668 boguscols += n_extra; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5669 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5670 n_extra = 0; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5671 n_attr = 0; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5672 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5673 |
|
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 # ifdef FEAT_MBYTE |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5676 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
|
5677 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5678 /* Need to fill two screen columns. */ |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5679 # ifdef FEAT_RIGHTLEFT |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5680 if (wp->w_p_rl) |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5681 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5682 --boguscols; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5683 --col; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5684 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5685 else |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5686 # endif |
|
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 ++boguscols; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5689 ++col; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5690 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5691 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5692 # endif |
|
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 # ifdef FEAT_RIGHTLEFT |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5695 if (wp->w_p_rl) |
|
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 --boguscols; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5698 --col; |
|
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 else |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5701 # endif |
|
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 ++boguscols; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5704 ++col; |
|
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 else |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5708 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5709 if (n_extra > 0) |
|
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 vcol += n_extra; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5712 n_extra = 0; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5713 n_attr = 0; |
|
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 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5716 |
|
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 #endif /* FEAT_CONCEAL */ |
| 7 | 5719 else |
| 5720 --n_skip; | |
| 5721 | |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
5722 /* 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
|
5723 * column. */ |
| 1849 | 5724 if (draw_state > WL_NR |
| 7 | 5725 #ifdef FEAT_DIFF |
| 5726 && filler_todo <= 0 | |
| 5727 #endif | |
| 5728 ) | |
| 5729 ++vcol; | |
| 5730 | |
| 743 | 5731 #ifdef FEAT_SYN_HL |
| 5732 if (vcol_save_attr >= 0) | |
| 5733 char_attr = vcol_save_attr; | |
| 5734 #endif | |
| 5735 | |
| 7 | 5736 /* restore attributes after "predeces" in 'listchars' */ |
| 5737 if (draw_state > WL_NR && n_attr3 > 0 && --n_attr3 == 0) | |
| 5738 char_attr = saved_attr3; | |
| 5739 | |
| 5740 /* restore attributes after last 'listchars' or 'number' char */ | |
| 5741 if (n_attr > 0 && draw_state == WL_LINE && --n_attr == 0) | |
| 5742 char_attr = saved_attr2; | |
| 5743 | |
| 5744 /* | |
| 5745 * At end of screen line and there is more to come: Display the line | |
| 1378 | 5746 * so far. If there is no more to display it is caught above. |
| 7 | 5747 */ |
| 5748 if (( | |
| 5749 #ifdef FEAT_RIGHTLEFT | |
| 5750 wp->w_p_rl ? (col < 0) : | |
| 5751 #endif | |
| 5752 (col >= W_WIDTH(wp))) | |
| 5753 && (*ptr != NUL | |
| 5754 #ifdef FEAT_DIFF | |
| 5755 || filler_todo > 0 | |
| 5756 #endif | |
| 2724 | 5757 || (wp->w_p_list && lcs_eol != NUL && p_extra != at_end_str) |
| 7 | 5758 || (n_extra != 0 && (c_extra != NUL || *p_extra != NUL))) |
| 5759 ) | |
| 5760 { | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5761 #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
|
5762 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
|
5763 (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
|
5764 boguscols = 0; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5765 #else |
|
11670
3b2afa2b77b3
patch 8.0.0718: output of job in terminal is not displayed
Christian Brabandt <cb@256bit.org>
parents:
11657
diff
changeset
|
5766 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
|
5767 (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
|
5768 #endif |
| 7 | 5769 ++row; |
| 5770 ++screen_row; | |
| 5771 | |
| 5772 /* When not wrapping and finished diff lines, or when displayed | |
| 5773 * '$' and highlighting until last column, break here. */ | |
| 5774 if ((!wp->w_p_wrap | |
| 5775 #ifdef FEAT_DIFF | |
| 5776 && filler_todo <= 0 | |
| 5777 #endif | |
| 5778 ) || lcs_eol_one == -1) | |
| 5779 break; | |
| 5780 | |
| 5781 /* When the window is too narrow draw all "@" lines. */ | |
| 5782 if (draw_state != WL_LINE | |
| 5783 #ifdef FEAT_DIFF | |
| 5784 && filler_todo <= 0 | |
| 5785 #endif | |
| 5786 ) | |
| 5787 { | |
| 5788 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
|
5789 #ifdef FEAT_WINDOWS |
| 7 | 5790 draw_vsep_win(wp, row); |
| 5791 #endif | |
| 5792 row = endrow; | |
| 5793 } | |
| 5794 | |
| 5795 /* When line got too long for screen break here. */ | |
| 5796 if (row == endrow) | |
| 5797 { | |
| 5798 ++row; | |
| 5799 break; | |
| 5800 } | |
| 5801 | |
| 5802 if (screen_cur_row == screen_row - 1 | |
| 5803 #ifdef FEAT_DIFF | |
| 5804 && filler_todo <= 0 | |
| 5805 #endif | |
|
10349
cf988222b150
commit https://github.com/vim/vim/commit/a1f4cb93ba50ea9e40cd4b1f5592b8a6d1398660
Christian Brabandt <cb@256bit.org>
parents:
10307
diff
changeset
|
5806 #ifdef FEAT_WINDOWS |
|
cf988222b150
commit https://github.com/vim/vim/commit/a1f4cb93ba50ea9e40cd4b1f5592b8a6d1398660
Christian Brabandt <cb@256bit.org>
parents:
10307
diff
changeset
|
5807 && W_WIDTH(wp) == Columns |
|
cf988222b150
commit https://github.com/vim/vim/commit/a1f4cb93ba50ea9e40cd4b1f5592b8a6d1398660
Christian Brabandt <cb@256bit.org>
parents:
10307
diff
changeset
|
5808 #endif |
|
cf988222b150
commit https://github.com/vim/vim/commit/a1f4cb93ba50ea9e40cd4b1f5592b8a6d1398660
Christian Brabandt <cb@256bit.org>
parents:
10307
diff
changeset
|
5809 ) |
| 7 | 5810 { |
| 5811 /* Remember that the line wraps, used for modeless copy. */ | |
| 5812 LineWraps[screen_row - 1] = TRUE; | |
| 5813 | |
| 5814 /* | |
| 5815 * Special trick to make copy/paste of wrapped lines work with | |
| 5816 * xterm/screen: write an extra character beyond the end of | |
| 5817 * the line. This will work with all terminal types | |
| 5818 * (regardless of the xn,am settings). | |
| 5819 * Only do this on a fast tty. | |
| 5820 * Only do this if the cursor is on the current line | |
| 5821 * (something has been written in it). | |
| 5822 * Don't do this for the GUI. | |
| 5823 * Don't do this for double-width characters. | |
| 5824 * Don't do this for a window not at the right screen border. | |
| 5825 */ | |
| 5826 if (p_tf | |
| 5827 #ifdef FEAT_GUI | |
| 5828 && !gui.in_use | |
| 5829 #endif | |
| 5830 #ifdef FEAT_MBYTE | |
| 5831 && !(has_mbyte | |
| 1378 | 5832 && ((*mb_off2cells)(LineOffset[screen_row], |
| 5833 LineOffset[screen_row] + screen_Columns) | |
| 5834 == 2 | |
| 7 | 5835 || (*mb_off2cells)(LineOffset[screen_row - 1] |
| 1378 | 5836 + (int)Columns - 2, |
| 5837 LineOffset[screen_row] + screen_Columns) | |
| 5838 == 2)) | |
| 7 | 5839 #endif |
| 5840 ) | |
| 5841 { | |
| 5842 /* First make sure we are at the end of the screen line, | |
| 5843 * then output the same character again to let the | |
| 5844 * terminal know about the wrap. If the terminal doesn't | |
| 5845 * auto-wrap, we overwrite the character. */ | |
| 5846 if (screen_cur_col != W_WIDTH(wp)) | |
| 5847 screen_char(LineOffset[screen_row - 1] | |
| 5848 + (unsigned)Columns - 1, | |
| 5849 screen_row - 1, (int)(Columns - 1)); | |
| 5850 | |
| 5851 #ifdef FEAT_MBYTE | |
| 5852 /* When there is a multi-byte character, just output a | |
| 5853 * space to keep it simple. */ | |
| 148 | 5854 if (has_mbyte && MB_BYTE2LEN(ScreenLines[LineOffset[ |
| 5855 screen_row - 1] + (Columns - 1)]) > 1) | |
| 7 | 5856 out_char(' '); |
| 5857 else | |
| 5858 #endif | |
| 5859 out_char(ScreenLines[LineOffset[screen_row - 1] | |
| 5860 + (Columns - 1)]); | |
| 5861 /* force a redraw of the first char on the next line */ | |
| 5862 ScreenAttrs[LineOffset[screen_row]] = (sattr_T)-1; | |
| 5863 screen_start(); /* don't know where cursor is now */ | |
| 5864 } | |
| 5865 } | |
| 5866 | |
| 5867 col = 0; | |
| 5868 off = (unsigned)(current_ScreenLine - ScreenLines); | |
| 5869 #ifdef FEAT_RIGHTLEFT | |
| 5870 if (wp->w_p_rl) | |
| 5871 { | |
| 5872 col = W_WIDTH(wp) - 1; /* col is not used if breaking! */ | |
| 5873 off += col; | |
| 5874 } | |
| 5875 #endif | |
| 5876 | |
| 5877 /* reset the drawing state for the start of a wrapped line */ | |
| 5878 draw_state = WL_START; | |
| 5879 saved_n_extra = n_extra; | |
| 5880 saved_p_extra = p_extra; | |
| 5881 saved_c_extra = c_extra; | |
| 5882 saved_char_attr = char_attr; | |
| 5883 n_extra = 0; | |
| 5884 lcs_prec_todo = lcs_prec; | |
| 5885 #ifdef FEAT_LINEBREAK | |
| 5886 # ifdef FEAT_DIFF | |
| 5887 if (filler_todo <= 0) | |
| 5888 # endif | |
| 5889 need_showbreak = TRUE; | |
| 5890 #endif | |
| 5891 #ifdef FEAT_DIFF | |
| 5892 --filler_todo; | |
| 5893 /* When the filler lines are actually below the last line of the | |
| 5894 * file, don't draw the line itself, break here. */ | |
| 5895 if (filler_todo == 0 && wp->w_botfill) | |
| 5896 break; | |
| 5897 #endif | |
| 5898 } | |
| 5899 | |
| 5900 } /* for every character in the line */ | |
| 5901 | |
| 743 | 5902 #ifdef FEAT_SPELL |
| 386 | 5903 /* After an empty line check first word for capital. */ |
| 5904 if (*skipwhite(line) == NUL) | |
| 5905 { | |
| 5906 capcol_lnum = lnum + 1; | |
| 5907 cap_col = 0; | |
| 5908 } | |
| 5909 #endif | |
| 5910 | |
|
10690
206ab11fa76e
patch 8.0.0235: memory leak in diff mode
Christian Brabandt <cb@256bit.org>
parents:
10538
diff
changeset
|
5911 vim_free(p_extra_free); |
| 7 | 5912 return row; |
| 5913 } | |
| 5914 | |
| 714 | 5915 #ifdef FEAT_MBYTE |
|
7805
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7697
diff
changeset
|
5916 static int comp_char_differs(int, int); |
| 714 | 5917 |
| 5918 /* | |
| 5919 * 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
|
5920 * Only to be used when ScreenLinesUC[off_from] != 0. |
| 714 | 5921 */ |
| 5922 static int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
5923 comp_char_differs(int off_from, int off_to) |
| 714 | 5924 { |
| 5925 int i; | |
| 5926 | |
| 5927 for (i = 0; i < Screen_mco; ++i) | |
| 5928 { | |
| 5929 if (ScreenLinesC[i][off_from] != ScreenLinesC[i][off_to]) | |
| 5930 return TRUE; | |
| 5931 if (ScreenLinesC[i][off_from] == 0) | |
| 5932 break; | |
| 5933 } | |
| 5934 return FALSE; | |
| 5935 } | |
| 5936 #endif | |
| 5937 | |
| 7 | 5938 /* |
| 5939 * Check whether the given character needs redrawing: | |
| 5940 * - the (first byte of the) character is different | |
| 5941 * - the attributes are different | |
| 5942 * - the character is multi-byte and the next byte is different | |
| 1616 | 5943 * - the character is two cells wide and the second cell differs. |
| 7 | 5944 */ |
| 5945 static int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
5946 char_needs_redraw(int off_from, int off_to, int cols) |
| 7 | 5947 { |
| 5948 if (cols > 0 | |
| 5949 && ((ScreenLines[off_from] != ScreenLines[off_to] | |
| 5950 || ScreenAttrs[off_from] != ScreenAttrs[off_to]) | |
| 5951 | |
| 5952 #ifdef FEAT_MBYTE | |
| 5953 || (enc_dbcs != 0 | |
| 5954 && MB_BYTE2LEN(ScreenLines[off_from]) > 1 | |
| 5955 && (enc_dbcs == DBCS_JPNU && ScreenLines[off_from] == 0x8e | |
| 5956 ? ScreenLines2[off_from] != ScreenLines2[off_to] | |
| 5957 : (cols > 1 && ScreenLines[off_from + 1] | |
| 5958 != ScreenLines[off_to + 1]))) | |
| 5959 || (enc_utf8 | |
| 5960 && (ScreenLinesUC[off_from] != ScreenLinesUC[off_to] | |
| 5961 || (ScreenLinesUC[off_from] != 0 | |
| 1616 | 5962 && comp_char_differs(off_from, off_to)) |
| 3759 | 5963 || ((*mb_off2cells)(off_from, off_from + cols) > 1 |
| 5964 && ScreenLines[off_from + 1] | |
| 5965 != ScreenLines[off_to + 1]))) | |
| 7 | 5966 #endif |
| 5967 )) | |
| 5968 return TRUE; | |
| 5969 return FALSE; | |
| 5970 } | |
| 5971 | |
|
11670
3b2afa2b77b3
patch 8.0.0718: output of job in terminal is not displayed
Christian Brabandt <cb@256bit.org>
parents:
11657
diff
changeset
|
5972 #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
|
5973 /* |
|
3b2afa2b77b3
patch 8.0.0718: output of job in terminal is not displayed
Christian Brabandt <cb@256bit.org>
parents:
11657
diff
changeset
|
5974 * 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
|
5975 */ |
|
3b2afa2b77b3
patch 8.0.0718: output of job in terminal is not displayed
Christian Brabandt <cb@256bit.org>
parents:
11657
diff
changeset
|
5976 int |
|
3b2afa2b77b3
patch 8.0.0718: output of job in terminal is not displayed
Christian Brabandt <cb@256bit.org>
parents:
11657
diff
changeset
|
5977 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
|
5978 { |
|
3b2afa2b77b3
patch 8.0.0718: output of job in terminal is not displayed
Christian Brabandt <cb@256bit.org>
parents:
11657
diff
changeset
|
5979 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
|
5980 } |
|
3b2afa2b77b3
patch 8.0.0718: output of job in terminal is not displayed
Christian Brabandt <cb@256bit.org>
parents:
11657
diff
changeset
|
5981 #endif |
|
3b2afa2b77b3
patch 8.0.0718: output of job in terminal is not displayed
Christian Brabandt <cb@256bit.org>
parents:
11657
diff
changeset
|
5982 |
| 7 | 5983 /* |
| 5984 * Move one "cooked" screen line to the screen, but only the characters that | |
| 5985 * have actually changed. Handle insert/delete character. | |
| 5986 * "coloff" gives the first column on the screen for this line. | |
| 5987 * "endcol" gives the columns where valid characters are. | |
| 5988 * "clear_width" is the width of the window. It's > 0 if the rest of the line | |
| 5989 * needs to be cleared, negative otherwise. | |
| 5990 * "rlflag" is TRUE in a rightleft window: | |
| 5991 * When TRUE and "clear_width" > 0, clear columns 0 to "endcol" | |
| 5992 * When FALSE and "clear_width" > 0, clear columns "endcol" to "clear_width" | |
| 5993 */ | |
|
11670
3b2afa2b77b3
patch 8.0.0718: output of job in terminal is not displayed
Christian Brabandt <cb@256bit.org>
parents:
11657
diff
changeset
|
5994 void |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
5995 screen_line( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
5996 int row, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
5997 int coloff, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
5998 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
|
5999 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
|
6000 int rlflag UNUSED) |
| 7 | 6001 { |
| 6002 unsigned off_from; | |
| 6003 unsigned off_to; | |
| 1378 | 6004 #ifdef FEAT_MBYTE |
| 6005 unsigned max_off_from; | |
| 6006 unsigned max_off_to; | |
| 6007 #endif | |
| 7 | 6008 int col = 0; |
|
8643
24b43dd167eb
commit https://github.com/vim/vim/commit/44a2f923c00f1384c9ecde12fb5b4711bc20702e
Christian Brabandt <cb@256bit.org>
parents:
8627
diff
changeset
|
6009 #if defined(FEAT_GUI) || defined(UNIX) || defined(FEAT_WINDOWS) |
| 7 | 6010 int hl; |
| 6011 #endif | |
| 6012 int force = FALSE; /* force update rest of the line */ | |
| 6013 int redraw_this /* bool: does character need redraw? */ | |
| 6014 #ifdef FEAT_GUI | |
| 6015 = TRUE /* For GUI when while-loop empty */ | |
| 6016 #endif | |
| 6017 ; | |
| 6018 int redraw_next; /* redraw_this for next character */ | |
| 6019 #ifdef FEAT_MBYTE | |
| 6020 int clear_next = FALSE; | |
| 6021 int char_cells; /* 1: normal char */ | |
| 6022 /* 2: occupies two display cells */ | |
| 6023 # define CHAR_CELLS char_cells | |
| 6024 #else | |
| 6025 # define CHAR_CELLS 1 | |
| 6026 #endif | |
| 6027 | |
| 3413 | 6028 /* Check for illegal row and col, just in case. */ |
| 6029 if (row >= Rows) | |
| 6030 row = Rows - 1; | |
| 6031 if (endcol > Columns) | |
| 6032 endcol = Columns; | |
| 6033 | |
| 7 | 6034 # ifdef FEAT_CLIPBOARD |
| 6035 clip_may_clear_selection(row, row); | |
| 6036 # endif | |
| 6037 | |
| 6038 off_from = (unsigned)(current_ScreenLine - ScreenLines); | |
| 6039 off_to = LineOffset[row] + coloff; | |
| 1378 | 6040 #ifdef FEAT_MBYTE |
| 6041 max_off_from = off_from + screen_Columns; | |
| 6042 max_off_to = LineOffset[row] + screen_Columns; | |
| 6043 #endif | |
| 7 | 6044 |
| 6045 #ifdef FEAT_RIGHTLEFT | |
| 6046 if (rlflag) | |
| 6047 { | |
| 6048 /* Clear rest first, because it's left of the text. */ | |
| 6049 if (clear_width > 0) | |
| 6050 { | |
| 6051 while (col <= endcol && ScreenLines[off_to] == ' ' | |
| 6052 && ScreenAttrs[off_to] == 0 | |
| 6053 # ifdef FEAT_MBYTE | |
| 6054 && (!enc_utf8 || ScreenLinesUC[off_to] == 0) | |
| 6055 # endif | |
| 6056 ) | |
| 6057 { | |
| 6058 ++off_to; | |
| 6059 ++col; | |
| 6060 } | |
| 6061 if (col <= endcol) | |
| 6062 screen_fill(row, row + 1, col + coloff, | |
| 6063 endcol + coloff + 1, ' ', ' ', 0); | |
| 6064 } | |
| 6065 col = endcol + 1; | |
| 6066 off_to = LineOffset[row] + col + coloff; | |
| 6067 off_from += col; | |
| 6068 endcol = (clear_width > 0 ? clear_width : -clear_width); | |
| 6069 } | |
| 6070 #endif /* FEAT_RIGHTLEFT */ | |
| 6071 | |
| 6072 redraw_next = char_needs_redraw(off_from, off_to, endcol - col); | |
| 6073 | |
| 6074 while (col < endcol) | |
| 6075 { | |
| 6076 #ifdef FEAT_MBYTE | |
| 6077 if (has_mbyte && (col + 1 < endcol)) | |
| 1378 | 6078 char_cells = (*mb_off2cells)(off_from, max_off_from); |
| 7 | 6079 else |
| 6080 char_cells = 1; | |
| 6081 #endif | |
| 6082 | |
| 6083 redraw_this = redraw_next; | |
| 6084 redraw_next = force || char_needs_redraw(off_from + CHAR_CELLS, | |
| 6085 off_to + CHAR_CELLS, endcol - col - CHAR_CELLS); | |
| 6086 | |
| 6087 #ifdef FEAT_GUI | |
| 6088 /* If the next character was bold, then redraw the current character to | |
| 6089 * remove any pixels that might have spilt over into us. This only | |
| 6090 * happens in the GUI. | |
| 6091 */ | |
| 6092 if (redraw_next && gui.in_use) | |
| 6093 { | |
| 6094 hl = ScreenAttrs[off_to + CHAR_CELLS]; | |
| 743 | 6095 if (hl > HL_ALL) |
| 6096 hl = syn_attr2attr(hl); | |
| 6097 if (hl & HL_BOLD) | |
| 7 | 6098 redraw_this = TRUE; |
| 6099 } | |
| 6100 #endif | |
| 6101 | |
| 6102 if (redraw_this) | |
| 6103 { | |
| 6104 /* | |
| 6105 * Special handling when 'xs' termcap flag set (hpterm): | |
| 6106 * Attributes for characters are stored at the position where the | |
| 6107 * cursor is when writing the highlighting code. The | |
| 6108 * start-highlighting code must be written with the cursor on the | |
| 6109 * first highlighted character. The stop-highlighting code must | |
| 6110 * be written with the cursor just after the last highlighted | |
| 6111 * character. | |
| 6112 * Overwriting a character doesn't remove it's highlighting. Need | |
| 6113 * to clear the rest of the line, and force redrawing it | |
| 6114 * completely. | |
| 6115 */ | |
| 6116 if ( p_wiv | |
| 6117 && !force | |
| 6118 #ifdef FEAT_GUI | |
| 6119 && !gui.in_use | |
| 6120 #endif | |
| 6121 && ScreenAttrs[off_to] != 0 | |
| 6122 && ScreenAttrs[off_from] != ScreenAttrs[off_to]) | |
| 6123 { | |
| 6124 /* | |
| 6125 * Need to remove highlighting attributes here. | |
| 6126 */ | |
| 6127 windgoto(row, col + coloff); | |
| 6128 out_str(T_CE); /* clear rest of this screen line */ | |
| 6129 screen_start(); /* don't know where cursor is now */ | |
| 6130 force = TRUE; /* force redraw of rest of the line */ | |
| 6131 redraw_next = TRUE; /* or else next char would miss out */ | |
| 6132 | |
| 6133 /* | |
| 6134 * If the previous character was highlighted, need to stop | |
| 6135 * highlighting at this character. | |
| 6136 */ | |
| 6137 if (col + coloff > 0 && ScreenAttrs[off_to - 1] != 0) | |
| 6138 { | |
| 6139 screen_attr = ScreenAttrs[off_to - 1]; | |
| 6140 term_windgoto(row, col + coloff); | |
| 6141 screen_stop_highlight(); | |
| 6142 } | |
| 6143 else | |
| 6144 screen_attr = 0; /* highlighting has stopped */ | |
| 6145 } | |
| 6146 #ifdef FEAT_MBYTE | |
| 6147 if (enc_dbcs != 0) | |
| 6148 { | |
| 6149 /* Check if overwriting a double-byte with a single-byte or | |
| 6150 * the other way around requires another character to be | |
| 6151 * redrawn. For UTF-8 this isn't needed, because comparing | |
| 6152 * ScreenLinesUC[] is sufficient. */ | |
| 6153 if (char_cells == 1 | |
| 6154 && col + 1 < endcol | |
| 1378 | 6155 && (*mb_off2cells)(off_to, max_off_to) > 1) |
| 7 | 6156 { |
| 6157 /* Writing a single-cell character over a double-cell | |
| 6158 * character: need to redraw the next cell. */ | |
| 6159 ScreenLines[off_to + 1] = 0; | |
| 6160 redraw_next = TRUE; | |
| 6161 } | |
| 6162 else if (char_cells == 2 | |
| 6163 && col + 2 < endcol | |
| 1378 | 6164 && (*mb_off2cells)(off_to, max_off_to) == 1 |
| 6165 && (*mb_off2cells)(off_to + 1, max_off_to) > 1) | |
| 7 | 6166 { |
| 6167 /* Writing the second half of a double-cell character over | |
| 6168 * a double-cell character: need to redraw the second | |
| 6169 * cell. */ | |
| 6170 ScreenLines[off_to + 2] = 0; | |
| 6171 redraw_next = TRUE; | |
| 6172 } | |
| 6173 | |
| 6174 if (enc_dbcs == DBCS_JPNU) | |
| 6175 ScreenLines2[off_to] = ScreenLines2[off_from]; | |
| 6176 } | |
| 6177 /* When writing a single-width character over a double-width | |
| 6178 * character and at the end of the redrawn text, need to clear out | |
| 6179 * the right halve of the old character. | |
| 6180 * Also required when writing the right halve of a double-width | |
| 6181 * char over the left halve of an existing one. */ | |
| 6182 if (has_mbyte && col + char_cells == endcol | |
| 6183 && ((char_cells == 1 | |
| 1378 | 6184 && (*mb_off2cells)(off_to, max_off_to) > 1) |
| 7 | 6185 || (char_cells == 2 |
| 1378 | 6186 && (*mb_off2cells)(off_to, max_off_to) == 1 |
| 6187 && (*mb_off2cells)(off_to + 1, max_off_to) > 1))) | |
| 7 | 6188 clear_next = TRUE; |
| 6189 #endif | |
| 6190 | |
| 6191 ScreenLines[off_to] = ScreenLines[off_from]; | |
| 6192 #ifdef FEAT_MBYTE | |
| 6193 if (enc_utf8) | |
| 6194 { | |
| 6195 ScreenLinesUC[off_to] = ScreenLinesUC[off_from]; | |
| 6196 if (ScreenLinesUC[off_from] != 0) | |
| 6197 { | |
| 714 | 6198 int i; |
| 6199 | |
| 6200 for (i = 0; i < Screen_mco; ++i) | |
| 6201 ScreenLinesC[i][off_to] = ScreenLinesC[i][off_from]; | |
| 7 | 6202 } |
| 6203 } | |
| 6204 if (char_cells == 2) | |
| 6205 ScreenLines[off_to + 1] = ScreenLines[off_from + 1]; | |
| 6206 #endif | |
| 6207 | |
| 6208 #if defined(FEAT_GUI) || defined(UNIX) | |
| 1843 | 6209 /* The bold trick makes a single column of pixels appear in the |
| 6210 * next character. When a bold character is removed, the next | |
| 7 | 6211 * character should be redrawn too. This happens for our own GUI |
| 6212 * and for some xterms. */ | |
| 6213 if ( | |
| 6214 # ifdef FEAT_GUI | |
| 6215 gui.in_use | |
| 6216 # endif | |
| 6217 # if defined(FEAT_GUI) && defined(UNIX) | |
| 6218 || | |
| 6219 # endif | |
| 6220 # ifdef UNIX | |
| 6221 term_is_xterm | |
| 6222 # endif | |
| 6223 ) | |
| 6224 { | |
| 6225 hl = ScreenAttrs[off_to]; | |
| 743 | 6226 if (hl > HL_ALL) |
| 6227 hl = syn_attr2attr(hl); | |
| 6228 if (hl & HL_BOLD) | |
| 7 | 6229 redraw_next = TRUE; |
| 6230 } | |
| 6231 #endif | |
| 6232 ScreenAttrs[off_to] = ScreenAttrs[off_from]; | |
| 6233 #ifdef FEAT_MBYTE | |
| 819 | 6234 /* For simplicity set the attributes of second half of a |
| 6235 * double-wide character equal to the first half. */ | |
| 6236 if (char_cells == 2) | |
| 6237 ScreenAttrs[off_to + 1] = ScreenAttrs[off_from]; | |
| 6238 | |
| 7 | 6239 if (enc_dbcs != 0 && char_cells == 2) |
| 6240 screen_char_2(off_to, row, col + coloff); | |
| 6241 else | |
| 6242 #endif | |
| 6243 screen_char(off_to, row, col + coloff); | |
| 6244 } | |
| 6245 else if ( p_wiv | |
| 6246 #ifdef FEAT_GUI | |
| 6247 && !gui.in_use | |
| 6248 #endif | |
| 6249 && col + coloff > 0) | |
| 6250 { | |
| 6251 if (ScreenAttrs[off_to] == ScreenAttrs[off_to - 1]) | |
| 6252 { | |
| 6253 /* | |
| 6254 * Don't output stop-highlight when moving the cursor, it will | |
| 6255 * stop the highlighting when it should continue. | |
| 6256 */ | |
| 6257 screen_attr = 0; | |
| 6258 } | |
| 6259 else if (screen_attr != 0) | |
| 6260 screen_stop_highlight(); | |
| 6261 } | |
| 6262 | |
| 6263 off_to += CHAR_CELLS; | |
| 6264 off_from += CHAR_CELLS; | |
| 6265 col += CHAR_CELLS; | |
| 6266 } | |
| 6267 | |
| 6268 #ifdef FEAT_MBYTE | |
| 6269 if (clear_next) | |
| 6270 { | |
| 6271 /* Clear the second half of a double-wide character of which the left | |
| 6272 * half was overwritten with a single-wide character. */ | |
| 6273 ScreenLines[off_to] = ' '; | |
| 6274 if (enc_utf8) | |
| 6275 ScreenLinesUC[off_to] = 0; | |
| 6276 screen_char(off_to, row, col + coloff); | |
| 6277 } | |
| 6278 #endif | |
| 6279 | |
| 6280 if (clear_width > 0 | |
| 6281 #ifdef FEAT_RIGHTLEFT | |
| 6282 && !rlflag | |
| 6283 #endif | |
| 6284 ) | |
| 6285 { | |
| 6286 #ifdef FEAT_GUI | |
| 6287 int startCol = col; | |
| 6288 #endif | |
| 6289 | |
| 6290 /* blank out the rest of the line */ | |
| 6291 while (col < clear_width && ScreenLines[off_to] == ' ' | |
| 6292 && ScreenAttrs[off_to] == 0 | |
| 6293 #ifdef FEAT_MBYTE | |
| 6294 && (!enc_utf8 || ScreenLinesUC[off_to] == 0) | |
| 6295 #endif | |
| 6296 ) | |
| 6297 { | |
| 6298 ++off_to; | |
| 6299 ++col; | |
| 6300 } | |
| 6301 if (col < clear_width) | |
| 6302 { | |
| 6303 #ifdef FEAT_GUI | |
| 6304 /* | |
| 6305 * In the GUI, clearing the rest of the line may leave pixels | |
| 6306 * behind if the first character cleared was bold. Some bold | |
| 6307 * fonts spill over the left. In this case we redraw the previous | |
| 6308 * character too. If we didn't skip any blanks above, then we | |
| 6309 * only redraw if the character wasn't already redrawn anyway. | |
| 6310 */ | |
| 996 | 6311 if (gui.in_use && (col > startCol || !redraw_this)) |
| 7 | 6312 { |
| 6313 hl = ScreenAttrs[off_to]; | |
| 6314 if (hl > HL_ALL || (hl & HL_BOLD)) | |
| 996 | 6315 { |
| 6316 int prev_cells = 1; | |
| 6317 # ifdef FEAT_MBYTE | |
| 6318 if (enc_utf8) | |
| 6319 /* for utf-8, ScreenLines[char_offset + 1] == 0 means | |
| 6320 * that its width is 2. */ | |
| 6321 prev_cells = ScreenLines[off_to - 1] == 0 ? 2 : 1; | |
| 6322 else if (enc_dbcs != 0) | |
| 6323 { | |
| 6324 /* find previous character by counting from first | |
| 6325 * column and get its width. */ | |
| 6326 unsigned off = LineOffset[row]; | |
| 1378 | 6327 unsigned max_off = LineOffset[row] + screen_Columns; |
| 996 | 6328 |
| 6329 while (off < off_to) | |
| 6330 { | |
| 1378 | 6331 prev_cells = (*mb_off2cells)(off, max_off); |
| 996 | 6332 off += prev_cells; |
| 6333 } | |
| 6334 } | |
| 6335 | |
| 6336 if (enc_dbcs != 0 && prev_cells > 1) | |
| 6337 screen_char_2(off_to - prev_cells, row, | |
| 6338 col + coloff - prev_cells); | |
| 6339 else | |
| 6340 # endif | |
| 6341 screen_char(off_to - prev_cells, row, | |
| 6342 col + coloff - prev_cells); | |
| 6343 } | |
| 7 | 6344 } |
| 6345 #endif | |
| 6346 screen_fill(row, row + 1, col + coloff, clear_width + coloff, | |
| 6347 ' ', ' ', 0); | |
|
8643
24b43dd167eb
commit https://github.com/vim/vim/commit/44a2f923c00f1384c9ecde12fb5b4711bc20702e
Christian Brabandt <cb@256bit.org>
parents:
8627
diff
changeset
|
6348 #ifdef FEAT_WINDOWS |
| 7 | 6349 off_to += clear_width - col; |
| 6350 col = clear_width; | |
| 6351 #endif | |
| 6352 } | |
| 6353 } | |
| 6354 | |
| 6355 if (clear_width > 0) | |
| 6356 { | |
|
8643
24b43dd167eb
commit https://github.com/vim/vim/commit/44a2f923c00f1384c9ecde12fb5b4711bc20702e
Christian Brabandt <cb@256bit.org>
parents:
8627
diff
changeset
|
6357 #ifdef FEAT_WINDOWS |
| 7 | 6358 /* For a window that's left of another, draw the separator char. */ |
| 6359 if (col + coloff < Columns) | |
| 6360 { | |
| 6361 int c; | |
| 6362 | |
| 6363 c = fillchar_vsep(&hl); | |
| 6477 | 6364 if (ScreenLines[off_to] != (schar_T)c |
| 7 | 6365 # ifdef FEAT_MBYTE |
| 714 | 6366 || (enc_utf8 && (int)ScreenLinesUC[off_to] |
| 6367 != (c >= 0x80 ? c : 0)) | |
| 7 | 6368 # endif |
| 6369 || ScreenAttrs[off_to] != hl) | |
| 6370 { | |
| 6371 ScreenLines[off_to] = c; | |
| 6372 ScreenAttrs[off_to] = hl; | |
| 6373 # ifdef FEAT_MBYTE | |
| 6374 if (enc_utf8) | |
| 6375 { | |
| 6376 if (c >= 0x80) | |
| 6377 { | |
| 6378 ScreenLinesUC[off_to] = c; | |
| 714 | 6379 ScreenLinesC[0][off_to] = 0; |
| 7 | 6380 } |
| 6381 else | |
| 6382 ScreenLinesUC[off_to] = 0; | |
| 6383 } | |
| 6384 # endif | |
| 6385 screen_char(off_to, row, col + coloff); | |
| 6386 } | |
| 6387 } | |
| 6388 else | |
| 6389 #endif | |
| 6390 LineWraps[row] = FALSE; | |
| 6391 } | |
| 6392 } | |
| 6393 | |
| 474 | 6394 #if defined(FEAT_RIGHTLEFT) || defined(PROTO) |
| 7 | 6395 /* |
| 474 | 6396 * Mirror text "str" for right-left displaying. |
| 6397 * Only works for single-byte characters (e.g., numbers). | |
| 7 | 6398 */ |
| 474 | 6399 void |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6400 rl_mirror(char_u *str) |
| 7 | 6401 { |
| 6402 char_u *p1, *p2; | |
| 6403 int t; | |
| 6404 | |
| 6405 for (p1 = str, p2 = str + STRLEN(str) - 1; p1 < p2; ++p1, --p2) | |
| 6406 { | |
| 6407 t = *p1; | |
| 6408 *p1 = *p2; | |
| 6409 *p2 = t; | |
| 6410 } | |
| 6411 } | |
| 6412 #endif | |
| 6413 | |
| 6414 #if defined(FEAT_WINDOWS) || defined(PROTO) | |
| 6415 /* | |
| 6416 * mark all status lines for redraw; used after first :cd | |
| 6417 */ | |
| 6418 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6419 status_redraw_all(void) |
| 7 | 6420 { |
| 6421 win_T *wp; | |
| 6422 | |
|
9649
fd9727ae3c49
commit https://github.com/vim/vim/commit/2932359000b2f918d5fade79ea4d124d5943cd07
Christian Brabandt <cb@256bit.org>
parents:
9645
diff
changeset
|
6423 FOR_ALL_WINDOWS(wp) |
| 7 | 6424 if (wp->w_status_height) |
| 6425 { | |
| 6426 wp->w_redr_status = TRUE; | |
| 6427 redraw_later(VALID); | |
| 6428 } | |
| 6429 } | |
| 6430 | |
| 6431 /* | |
| 6432 * mark all status lines of the current buffer for redraw | |
| 6433 */ | |
| 6434 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6435 status_redraw_curbuf(void) |
| 7 | 6436 { |
| 6437 win_T *wp; | |
| 6438 | |
|
9649
fd9727ae3c49
commit https://github.com/vim/vim/commit/2932359000b2f918d5fade79ea4d124d5943cd07
Christian Brabandt <cb@256bit.org>
parents:
9645
diff
changeset
|
6439 FOR_ALL_WINDOWS(wp) |
| 7 | 6440 if (wp->w_status_height != 0 && wp->w_buffer == curbuf) |
| 6441 { | |
| 6442 wp->w_redr_status = TRUE; | |
| 6443 redraw_later(VALID); | |
| 6444 } | |
| 6445 } | |
| 6446 | |
| 6447 /* | |
| 6448 * Redraw all status lines that need to be redrawn. | |
| 6449 */ | |
| 6450 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6451 redraw_statuslines(void) |
| 7 | 6452 { |
| 6453 win_T *wp; | |
| 6454 | |
|
9649
fd9727ae3c49
commit https://github.com/vim/vim/commit/2932359000b2f918d5fade79ea4d124d5943cd07
Christian Brabandt <cb@256bit.org>
parents:
9645
diff
changeset
|
6455 FOR_ALL_WINDOWS(wp) |
| 7 | 6456 if (wp->w_redr_status) |
| 6457 win_redr_status(wp); | |
| 673 | 6458 if (redraw_tabline) |
| 677 | 6459 draw_tabline(); |
| 7 | 6460 } |
| 6461 #endif | |
| 6462 | |
|
8643
24b43dd167eb
commit https://github.com/vim/vim/commit/44a2f923c00f1384c9ecde12fb5b4711bc20702e
Christian Brabandt <cb@256bit.org>
parents:
8627
diff
changeset
|
6463 #if (defined(FEAT_WILDMENU) && defined(FEAT_WINDOWS)) || defined(PROTO) |
| 7 | 6464 /* |
| 6465 * Redraw all status lines at the bottom of frame "frp". | |
| 6466 */ | |
| 6467 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6468 win_redraw_last_status(frame_T *frp) |
| 7 | 6469 { |
| 6470 if (frp->fr_layout == FR_LEAF) | |
| 6471 frp->fr_win->w_redr_status = TRUE; | |
| 6472 else if (frp->fr_layout == FR_ROW) | |
| 6473 { | |
| 6474 for (frp = frp->fr_child; frp != NULL; frp = frp->fr_next) | |
| 6475 win_redraw_last_status(frp); | |
| 6476 } | |
| 6477 else /* frp->fr_layout == FR_COL */ | |
| 6478 { | |
| 6479 frp = frp->fr_child; | |
| 6480 while (frp->fr_next != NULL) | |
| 6481 frp = frp->fr_next; | |
| 6482 win_redraw_last_status(frp); | |
| 6483 } | |
| 6484 } | |
| 6485 #endif | |
| 6486 | |
|
8643
24b43dd167eb
commit https://github.com/vim/vim/commit/44a2f923c00f1384c9ecde12fb5b4711bc20702e
Christian Brabandt <cb@256bit.org>
parents:
8627
diff
changeset
|
6487 #ifdef FEAT_WINDOWS |
| 7 | 6488 /* |
| 6489 * Draw the verticap separator right of window "wp" starting with line "row". | |
| 6490 */ | |
| 6491 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6492 draw_vsep_win(win_T *wp, int row) |
| 7 | 6493 { |
| 6494 int hl; | |
| 6495 int c; | |
| 6496 | |
| 6497 if (wp->w_vsep_width) | |
| 6498 { | |
| 6499 /* draw the vertical separator right of this window */ | |
| 6500 c = fillchar_vsep(&hl); | |
| 6501 screen_fill(W_WINROW(wp) + row, W_WINROW(wp) + wp->w_height, | |
| 6502 W_ENDCOL(wp), W_ENDCOL(wp) + 1, | |
| 6503 c, ' ', hl); | |
| 6504 } | |
| 6505 } | |
| 6506 #endif | |
| 6507 | |
| 6508 #ifdef FEAT_WILDMENU | |
|
7805
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7697
diff
changeset
|
6509 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
|
6510 static int skip_status_match_char(expand_T *xp, char_u *s); |
| 7 | 6511 |
| 6512 /* | |
| 1378 | 6513 * Get the length of an item as it will be shown in the status line. |
| 7 | 6514 */ |
| 6515 static int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6516 status_match_len(expand_T *xp, char_u *s) |
| 7 | 6517 { |
| 6518 int len = 0; | |
| 6519 | |
| 6520 #ifdef FEAT_MENU | |
| 6521 int emenu = (xp->xp_context == EXPAND_MENUS | |
| 6522 || xp->xp_context == EXPAND_MENUNAMES); | |
| 6523 | |
| 6524 /* Check for menu separators - replace with '|'. */ | |
| 6525 if (emenu && menu_is_separator(s)) | |
| 6526 return 1; | |
| 6527 #endif | |
| 6528 | |
| 6529 while (*s != NUL) | |
| 6530 { | |
| 1685 | 6531 s += skip_status_match_char(xp, s); |
| 42 | 6532 len += ptr2cells(s); |
|
11127
506f5d8b7d8b
patch 8.0.0451: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11121
diff
changeset
|
6533 MB_PTR_ADV(s); |
| 7 | 6534 } |
| 6535 | |
| 6536 return len; | |
| 6537 } | |
| 6538 | |
| 6539 /* | |
| 1685 | 6540 * Return the number of characters that should be skipped in a status match. |
| 277 | 6541 * These are backslashes used for escaping. Do show backslashes in help tags. |
| 6542 */ | |
| 6543 static int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6544 skip_status_match_char(expand_T *xp, char_u *s) |
| 277 | 6545 { |
| 1685 | 6546 if ((rem_backslash(s) && xp->xp_context != EXPAND_HELP) |
| 277 | 6547 #ifdef FEAT_MENU |
| 6548 || ((xp->xp_context == EXPAND_MENUS | |
| 6549 || xp->xp_context == EXPAND_MENUNAMES) | |
| 6550 && (s[0] == '\t' || (s[0] == '\\' && s[1] != NUL))) | |
| 6551 #endif | |
| 1685 | 6552 ) |
| 6553 { | |
| 6554 #ifndef BACKSLASH_IN_FILENAME | |
| 6555 if (xp->xp_shell && csh_like_shell() && s[1] == '\\' && s[2] == '!') | |
| 6556 return 2; | |
| 6557 #endif | |
| 6558 return 1; | |
| 6559 } | |
| 6560 return 0; | |
| 277 | 6561 } |
| 6562 | |
| 6563 /* | |
| 7 | 6564 * Show wildchar matches in the status line. |
| 6565 * Show at least the "match" item. | |
| 6566 * We start at item 'first_match' in the list and show all matches that fit. | |
| 6567 * | |
| 6568 * If inversion is possible we use it. Else '=' characters are used. | |
| 6569 */ | |
| 6570 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6571 win_redr_status_matches( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6572 expand_T *xp, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6573 int num_matches, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6574 char_u **matches, /* list of matches */ |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6575 int match, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6576 int showtail) |
| 7 | 6577 { |
| 6578 #define L_MATCH(m) (showtail ? sm_gettail(matches[m]) : matches[m]) | |
| 6579 int row; | |
| 6580 char_u *buf; | |
| 6581 int len; | |
| 1378 | 6582 int clen; /* length in screen cells */ |
| 7 | 6583 int fillchar; |
| 6584 int attr; | |
| 6585 int i; | |
| 6586 int highlight = TRUE; | |
| 6587 char_u *selstart = NULL; | |
| 6588 int selstart_col = 0; | |
| 6589 char_u *selend = NULL; | |
| 6590 static int first_match = 0; | |
| 6591 int add_left = FALSE; | |
| 6592 char_u *s; | |
| 6593 #ifdef FEAT_MENU | |
| 6594 int emenu; | |
| 6595 #endif | |
| 6596 #if defined(FEAT_MBYTE) || defined(FEAT_MENU) | |
| 6597 int l; | |
| 6598 #endif | |
| 6599 | |
| 6600 if (matches == NULL) /* interrupted completion? */ | |
| 6601 return; | |
| 6602 | |
| 39 | 6603 #ifdef FEAT_MBYTE |
| 6604 if (has_mbyte) | |
| 6605 buf = alloc((unsigned)Columns * MB_MAXBYTES + 1); | |
| 6606 else | |
| 6607 #endif | |
| 6608 buf = alloc((unsigned)Columns + 1); | |
| 7 | 6609 if (buf == NULL) |
| 6610 return; | |
| 6611 | |
| 6612 if (match == -1) /* don't show match but original text */ | |
| 6613 { | |
| 6614 match = 0; | |
| 6615 highlight = FALSE; | |
| 6616 } | |
| 6617 /* count 1 for the ending ">" */ | |
| 6618 clen = status_match_len(xp, L_MATCH(match)) + 3; | |
| 6619 if (match == 0) | |
| 6620 first_match = 0; | |
| 6621 else if (match < first_match) | |
| 6622 { | |
| 6623 /* jumping left, as far as we can go */ | |
| 6624 first_match = match; | |
| 6625 add_left = TRUE; | |
| 6626 } | |
| 6627 else | |
| 6628 { | |
| 6629 /* check if match fits on the screen */ | |
| 6630 for (i = first_match; i < match; ++i) | |
| 6631 clen += status_match_len(xp, L_MATCH(i)) + 2; | |
| 6632 if (first_match > 0) | |
| 6633 clen += 2; | |
| 6634 /* jumping right, put match at the left */ | |
| 6635 if ((long)clen > Columns) | |
| 6636 { | |
| 6637 first_match = match; | |
| 6638 /* if showing the last match, we can add some on the left */ | |
| 6639 clen = 2; | |
| 6640 for (i = match; i < num_matches; ++i) | |
| 6641 { | |
| 6642 clen += status_match_len(xp, L_MATCH(i)) + 2; | |
| 6643 if ((long)clen >= Columns) | |
| 6644 break; | |
| 6645 } | |
| 6646 if (i == num_matches) | |
| 6647 add_left = TRUE; | |
| 6648 } | |
| 6649 } | |
| 6650 if (add_left) | |
| 6651 while (first_match > 0) | |
| 6652 { | |
| 6653 clen += status_match_len(xp, L_MATCH(first_match - 1)) + 2; | |
| 6654 if ((long)clen >= Columns) | |
| 6655 break; | |
| 6656 --first_match; | |
| 6657 } | |
| 6658 | |
| 6659 fillchar = fillchar_status(&attr, TRUE); | |
| 6660 | |
| 6661 if (first_match == 0) | |
| 6662 { | |
| 6663 *buf = NUL; | |
| 6664 len = 0; | |
| 6665 } | |
| 6666 else | |
| 6667 { | |
| 6668 STRCPY(buf, "< "); | |
| 6669 len = 2; | |
| 6670 } | |
| 6671 clen = len; | |
| 6672 | |
| 6673 i = first_match; | |
| 6674 while ((long)(clen + status_match_len(xp, L_MATCH(i)) + 2) < Columns) | |
| 6675 { | |
| 6676 if (i == match) | |
| 6677 { | |
| 6678 selstart = buf + len; | |
| 6679 selstart_col = clen; | |
| 6680 } | |
| 6681 | |
| 6682 s = L_MATCH(i); | |
| 6683 /* Check for menu separators - replace with '|' */ | |
| 6684 #ifdef FEAT_MENU | |
| 6685 emenu = (xp->xp_context == EXPAND_MENUS | |
| 6686 || xp->xp_context == EXPAND_MENUNAMES); | |
| 6687 if (emenu && menu_is_separator(s)) | |
| 6688 { | |
| 6689 STRCPY(buf + len, transchar('|')); | |
| 6690 l = (int)STRLEN(buf + len); | |
| 6691 len += l; | |
| 6692 clen += l; | |
| 6693 } | |
| 6694 else | |
| 6695 #endif | |
| 6696 for ( ; *s != NUL; ++s) | |
| 6697 { | |
| 1685 | 6698 s += skip_status_match_char(xp, s); |
| 7 | 6699 clen += ptr2cells(s); |
| 6700 #ifdef FEAT_MBYTE | |
| 474 | 6701 if (has_mbyte && (l = (*mb_ptr2len)(s)) > 1) |
| 7 | 6702 { |
| 6703 STRNCPY(buf + len, s, l); | |
| 6704 s += l - 1; | |
| 6705 len += l; | |
| 6706 } | |
| 6707 else | |
| 6708 #endif | |
| 6709 { | |
| 6710 STRCPY(buf + len, transchar_byte(*s)); | |
| 6711 len += (int)STRLEN(buf + len); | |
| 6712 } | |
| 6713 } | |
| 6714 if (i == match) | |
| 6715 selend = buf + len; | |
| 6716 | |
| 6717 *(buf + len++) = ' '; | |
| 6718 *(buf + len++) = ' '; | |
| 6719 clen += 2; | |
| 6720 if (++i == num_matches) | |
| 6721 break; | |
| 6722 } | |
| 6723 | |
| 6724 if (i != num_matches) | |
| 6725 { | |
| 6726 *(buf + len++) = '>'; | |
| 6727 ++clen; | |
| 6728 } | |
| 6729 | |
| 6730 buf[len] = NUL; | |
| 6731 | |
| 6732 row = cmdline_row - 1; | |
| 6733 if (row >= 0) | |
| 6734 { | |
| 6735 if (wild_menu_showing == 0) | |
| 6736 { | |
| 6737 if (msg_scrolled > 0) | |
| 6738 { | |
| 6739 /* Put the wildmenu just above the command line. If there is | |
| 6740 * no room, scroll the screen one line up. */ | |
| 6741 if (cmdline_row == Rows - 1) | |
| 6742 { | |
| 6743 screen_del_lines(0, 0, 1, (int)Rows, TRUE, NULL); | |
| 6744 ++msg_scrolled; | |
| 6745 } | |
| 6746 else | |
| 6747 { | |
| 6748 ++cmdline_row; | |
| 6749 ++row; | |
| 6750 } | |
| 6751 wild_menu_showing = WM_SCROLLED; | |
| 6752 } | |
| 6753 else | |
| 6754 { | |
| 6755 /* Create status line if needed by setting 'laststatus' to 2. | |
| 6756 * Set 'winminheight' to zero to avoid that the window is | |
| 6757 * resized. */ | |
| 6758 if (lastwin->w_status_height == 0) | |
| 6759 { | |
| 6760 save_p_ls = p_ls; | |
| 6761 save_p_wmh = p_wmh; | |
| 6762 p_ls = 2; | |
| 6763 p_wmh = 0; | |
| 6764 last_status(FALSE); | |
| 6765 } | |
| 6766 wild_menu_showing = WM_SHOWN; | |
| 6767 } | |
| 6768 } | |
| 6769 | |
| 6770 screen_puts(buf, row, 0, attr); | |
| 6771 if (selstart != NULL && highlight) | |
| 6772 { | |
| 6773 *selend = NUL; | |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
6774 screen_puts(selstart, row, selstart_col, HL_ATTR(HLF_WM)); |
| 7 | 6775 } |
| 6776 | |
| 6777 screen_fill(row, row + 1, clen, (int)Columns, fillchar, fillchar, attr); | |
| 6778 } | |
| 6779 | |
|
8643
24b43dd167eb
commit https://github.com/vim/vim/commit/44a2f923c00f1384c9ecde12fb5b4711bc20702e
Christian Brabandt <cb@256bit.org>
parents:
8627
diff
changeset
|
6780 #ifdef FEAT_WINDOWS |
| 7 | 6781 win_redraw_last_status(topframe); |
| 6782 #else | |
| 6783 lastwin->w_redr_status = TRUE; | |
| 6784 #endif | |
| 6785 vim_free(buf); | |
| 6786 } | |
| 6787 #endif | |
| 6788 | |
| 6789 #if defined(FEAT_WINDOWS) || defined(PROTO) | |
| 6790 /* | |
| 6791 * Redraw the status line of window wp. | |
| 6792 * | |
| 6793 * If inversion is possible we use it. Else '=' characters are used. | |
| 6794 */ | |
| 6795 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6796 win_redr_status(win_T *wp) |
| 7 | 6797 { |
| 6798 int row; | |
| 6799 char_u *p; | |
| 6800 int len; | |
| 6801 int fillchar; | |
| 6802 int attr; | |
| 6803 int this_ru_col; | |
| 1910 | 6804 static int busy = FALSE; |
| 6805 | |
| 6806 /* It's possible to get here recursively when 'statusline' (indirectly) | |
| 6807 * invokes ":redrawstatus". Simply ignore the call then. */ | |
| 6808 if (busy) | |
| 6809 return; | |
| 6810 busy = TRUE; | |
| 7 | 6811 |
| 6812 wp->w_redr_status = FALSE; | |
| 6813 if (wp->w_status_height == 0) | |
| 6814 { | |
| 6815 /* no status line, can only be last window */ | |
| 6816 redraw_cmdline = TRUE; | |
| 6817 } | |
| 540 | 6818 else if (!redrawing() |
| 6819 #ifdef FEAT_INS_EXPAND | |
| 6820 /* don't update status line when popup menu is visible and may be | |
| 6821 * drawn over it */ | |
| 6822 || pum_visible() | |
| 6823 #endif | |
| 6824 ) | |
| 7 | 6825 { |
| 6826 /* Don't redraw right now, do it later. */ | |
| 6827 wp->w_redr_status = TRUE; | |
| 6828 } | |
| 6829 #ifdef FEAT_STL_OPT | |
| 40 | 6830 else if (*p_stl != NUL || *wp->w_p_stl != NUL) |
| 7 | 6831 { |
| 6832 /* redraw custom status line */ | |
| 1983 | 6833 redraw_custom_statusline(wp); |
| 7 | 6834 } |
| 6835 #endif | |
| 6836 else | |
| 6837 { | |
| 6838 fillchar = fillchar_status(&attr, wp == curwin); | |
| 6839 | |
| 685 | 6840 get_trans_bufname(wp->w_buffer); |
| 7 | 6841 p = NameBuff; |
| 6842 len = (int)STRLEN(p); | |
| 6843 | |
| 6844 if (wp->w_buffer->b_help | |
| 6845 #ifdef FEAT_QUICKFIX | |
| 6846 || wp->w_p_pvw | |
| 6847 #endif | |
| 6848 || bufIsChanged(wp->w_buffer) | |
| 6849 || wp->w_buffer->b_p_ro) | |
| 6850 *(p + len++) = ' '; | |
| 6851 if (wp->w_buffer->b_help) | |
| 6852 { | |
| 809 | 6853 STRCPY(p + len, _("[Help]")); |
| 7 | 6854 len += (int)STRLEN(p + len); |
| 6855 } | |
| 6856 #ifdef FEAT_QUICKFIX | |
| 6857 if (wp->w_p_pvw) | |
| 6858 { | |
| 6859 STRCPY(p + len, _("[Preview]")); | |
| 6860 len += (int)STRLEN(p + len); | |
| 6861 } | |
| 6862 #endif | |
| 6863 if (bufIsChanged(wp->w_buffer)) | |
| 6864 { | |
| 6865 STRCPY(p + len, "[+]"); | |
| 6866 len += 3; | |
| 6867 } | |
| 6868 if (wp->w_buffer->b_p_ro) | |
| 6869 { | |
|
4795
8360a59aa04b
updated for version 7.3.1144
Bram Moolenaar <bram@vim.org>
parents:
4736
diff
changeset
|
6870 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
|
6871 len += (int)STRLEN(p + len); |
| 7 | 6872 } |
| 6873 | |
| 6874 this_ru_col = ru_col - (Columns - W_WIDTH(wp)); | |
| 6875 if (this_ru_col < (W_WIDTH(wp) + 1) / 2) | |
| 6876 this_ru_col = (W_WIDTH(wp) + 1) / 2; | |
| 6877 if (this_ru_col <= 1) | |
| 6878 { | |
| 6879 p = (char_u *)"<"; /* No room for file name! */ | |
| 6880 len = 1; | |
| 6881 } | |
| 6882 else | |
| 6883 #ifdef FEAT_MBYTE | |
| 6884 if (has_mbyte) | |
| 6885 { | |
| 6886 int clen = 0, i; | |
| 6887 | |
| 6888 /* Count total number of display cells. */ | |
|
2338
da6ec32d8d8f
Added strwidth() and strchars() functions.
Bram Moolenaar <bram@vim.org>
parents:
2332
diff
changeset
|
6889 clen = mb_string2cells(p, -1); |
|
da6ec32d8d8f
Added strwidth() and strchars() functions.
Bram Moolenaar <bram@vim.org>
parents:
2332
diff
changeset
|
6890 |
| 7 | 6891 /* Find first character that will fit. |
| 6892 * Going from start to end is much faster for DBCS. */ | |
| 6893 for (i = 0; p[i] != NUL && clen >= this_ru_col - 1; | |
| 474 | 6894 i += (*mb_ptr2len)(p + i)) |
| 7 | 6895 clen -= (*mb_ptr2cells)(p + i); |
| 6896 len = clen; | |
| 6897 if (i > 0) | |
| 6898 { | |
| 6899 p = p + i - 1; | |
| 6900 *p = '<'; | |
| 6901 ++len; | |
| 6902 } | |
| 6903 | |
| 6904 } | |
| 6905 else | |
| 6906 #endif | |
| 6907 if (len > this_ru_col - 1) | |
| 6908 { | |
| 6909 p += len - (this_ru_col - 1); | |
| 6910 *p = '<'; | |
| 6911 len = this_ru_col - 1; | |
| 6912 } | |
| 6913 | |
| 6914 row = W_WINROW(wp) + wp->w_height; | |
| 6915 screen_puts(p, row, W_WINCOL(wp), attr); | |
| 6916 screen_fill(row, row + 1, len + W_WINCOL(wp), | |
| 6917 this_ru_col + W_WINCOL(wp), fillchar, fillchar, attr); | |
| 6918 | |
|
9645
123d3c102035
commit https://github.com/vim/vim/commit/73ac0c4281a3606651604a3cbcc334bfb3859a87
Christian Brabandt <cb@256bit.org>
parents:
9489
diff
changeset
|
6919 if (get_keymap_str(wp, (char_u *)"<%s>", NameBuff, MAXPATHL) |
| 7 | 6920 && (int)(this_ru_col - len) > (int)(STRLEN(NameBuff) + 1)) |
| 6921 screen_puts(NameBuff, row, (int)(this_ru_col - STRLEN(NameBuff) | |
| 6922 - 1 + W_WINCOL(wp)), attr); | |
| 6923 | |
| 6924 #ifdef FEAT_CMDL_INFO | |
| 6925 win_redr_ruler(wp, TRUE); | |
| 6926 #endif | |
| 6927 } | |
| 6928 | |
| 6929 /* | |
| 6930 * May need to draw the character below the vertical separator. | |
| 6931 */ | |
| 6932 if (wp->w_vsep_width != 0 && wp->w_status_height != 0 && redrawing()) | |
| 6933 { | |
| 6934 if (stl_connected(wp)) | |
| 6935 fillchar = fillchar_status(&attr, wp == curwin); | |
| 6936 else | |
| 6937 fillchar = fillchar_vsep(&attr); | |
| 6938 screen_putchar(fillchar, W_WINROW(wp) + wp->w_height, W_ENDCOL(wp), | |
| 6939 attr); | |
| 6940 } | |
| 1910 | 6941 busy = FALSE; |
| 7 | 6942 } |
| 6943 | |
| 680 | 6944 #ifdef FEAT_STL_OPT |
| 6945 /* | |
| 6946 * Redraw the status line according to 'statusline' and take care of any | |
| 6947 * errors encountered. | |
| 6948 */ | |
| 6949 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6950 redraw_custom_statusline(win_T *wp) |
| 680 | 6951 { |
| 1983 | 6952 static int entered = FALSE; |
|
8847
470ea7526cc6
commit https://github.com/vim/vim/commit/a742e084b677f76c67e9e52c4f9fb9ab24002e20
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
6953 int saved_did_emsg = did_emsg; |
| 1983 | 6954 |
| 6955 /* When called recursively return. This can happen when the statusline | |
| 6956 * contains an expression that triggers a redraw. */ | |
| 6957 if (entered) | |
| 6958 return; | |
| 6959 entered = TRUE; | |
| 680 | 6960 |
|
8847
470ea7526cc6
commit https://github.com/vim/vim/commit/a742e084b677f76c67e9e52c4f9fb9ab24002e20
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
6961 did_emsg = FALSE; |
| 680 | 6962 win_redr_custom(wp, FALSE); |
|
8847
470ea7526cc6
commit https://github.com/vim/vim/commit/a742e084b677f76c67e9e52c4f9fb9ab24002e20
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
6963 if (did_emsg) |
| 1983 | 6964 { |
| 6965 /* When there is an error disable the statusline, otherwise the | |
| 6966 * display is messed up with errors and a redraw triggers the problem | |
| 6967 * again and again. */ | |
| 680 | 6968 set_string_option_direct((char_u *)"statusline", -1, |
| 6969 (char_u *)"", OPT_FREE | (*wp->w_p_stl != NUL | |
| 694 | 6970 ? OPT_LOCAL : OPT_GLOBAL), SID_ERROR); |
| 1983 | 6971 } |
|
8847
470ea7526cc6
commit https://github.com/vim/vim/commit/a742e084b677f76c67e9e52c4f9fb9ab24002e20
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
6972 did_emsg |= saved_did_emsg; |
| 1983 | 6973 entered = FALSE; |
| 680 | 6974 } |
| 6975 #endif | |
| 6976 | |
| 7 | 6977 /* |
| 6978 * Return TRUE if the status line of window "wp" is connected to the status | |
| 6979 * line of the window right of it. If not, then it's a vertical separator. | |
| 6980 * Only call if (wp->w_vsep_width != 0). | |
| 6981 */ | |
| 6982 int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6983 stl_connected(win_T *wp) |
| 7 | 6984 { |
| 6985 frame_T *fr; | |
| 6986 | |
| 6987 fr = wp->w_frame; | |
| 6988 while (fr->fr_parent != NULL) | |
| 6989 { | |
| 6990 if (fr->fr_parent->fr_layout == FR_COL) | |
| 6991 { | |
| 6992 if (fr->fr_next != NULL) | |
| 6993 break; | |
| 6994 } | |
| 6995 else | |
| 6996 { | |
| 6997 if (fr->fr_next != NULL) | |
| 6998 return TRUE; | |
| 6999 } | |
| 7000 fr = fr->fr_parent; | |
| 7001 } | |
| 7002 return FALSE; | |
| 7003 } | |
| 7004 | |
| 7005 #endif /* FEAT_WINDOWS */ | |
| 7006 | |
| 7007 #if defined(FEAT_WINDOWS) || defined(FEAT_STL_OPT) || defined(PROTO) | |
| 7008 /* | |
| 7009 * Get the value to show for the language mappings, active 'keymap'. | |
| 7010 */ | |
| 7011 int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7012 get_keymap_str( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7013 win_T *wp, |
|
9645
123d3c102035
commit https://github.com/vim/vim/commit/73ac0c4281a3606651604a3cbcc334bfb3859a87
Christian Brabandt <cb@256bit.org>
parents:
9489
diff
changeset
|
7014 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
|
7015 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
|
7016 int len) /* length of buffer */ |
| 7 | 7017 { |
| 7018 char_u *p; | |
| 7019 | |
| 7020 if (wp->w_buffer->b_p_iminsert != B_IMODE_LMAP) | |
| 7021 return FALSE; | |
| 7022 | |
| 7023 { | |
| 7024 #ifdef FEAT_EVAL | |
| 7025 buf_T *old_curbuf = curbuf; | |
| 7026 win_T *old_curwin = curwin; | |
| 7027 char_u *s; | |
| 7028 | |
| 7029 curbuf = wp->w_buffer; | |
| 7030 curwin = wp; | |
| 7031 STRCPY(buf, "b:keymap_name"); /* must be writable */ | |
| 7032 ++emsg_skip; | |
| 714 | 7033 s = p = eval_to_string(buf, NULL, FALSE); |
| 7 | 7034 --emsg_skip; |
| 7035 curbuf = old_curbuf; | |
| 7036 curwin = old_curwin; | |
| 7037 if (p == NULL || *p == NUL) | |
| 7038 #endif | |
| 7039 { | |
| 7040 #ifdef FEAT_KEYMAP | |
| 7041 if (wp->w_buffer->b_kmap_state & KEYMAP_LOADED) | |
| 7042 p = wp->w_buffer->b_p_keymap; | |
| 7043 else | |
| 7044 #endif | |
| 7045 p = (char_u *)"lang"; | |
| 7046 } | |
|
9645
123d3c102035
commit https://github.com/vim/vim/commit/73ac0c4281a3606651604a3cbcc334bfb3859a87
Christian Brabandt <cb@256bit.org>
parents:
9489
diff
changeset
|
7047 if (vim_snprintf((char *)buf, len, (char *)fmt, p) > len - 1) |
| 7 | 7048 buf[0] = NUL; |
| 7049 #ifdef FEAT_EVAL | |
| 7050 vim_free(s); | |
| 7051 #endif | |
| 7052 } | |
| 7053 return buf[0] != NUL; | |
| 7054 } | |
| 7055 #endif | |
| 7056 | |
| 7057 #if defined(FEAT_STL_OPT) || defined(PROTO) | |
| 7058 /* | |
| 677 | 7059 * Redraw the status line or ruler of window "wp". |
| 7060 * When "wp" is NULL redraw the tab pages line from 'tabline'. | |
| 7 | 7061 */ |
| 7062 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7063 win_redr_custom( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7064 win_T *wp, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7065 int draw_ruler) /* TRUE or FALSE */ |
| 7 | 7066 { |
| 5539 | 7067 static int entered = FALSE; |
| 7 | 7068 int attr; |
| 7069 int curattr; | |
| 7070 int row; | |
| 7071 int col = 0; | |
| 7072 int maxwidth; | |
| 7073 int width; | |
| 7074 int n; | |
| 7075 int len; | |
| 7076 int fillchar; | |
| 7077 char_u buf[MAXPATHL]; | |
| 1983 | 7078 char_u *stl; |
| 7 | 7079 char_u *p; |
| 681 | 7080 struct stl_hlrec hltab[STL_MAX_ITEM]; |
| 7081 struct stl_hlrec tabtab[STL_MAX_ITEM]; | |
| 677 | 7082 int use_sandbox = FALSE; |
| 2693 | 7083 win_T *ewp; |
| 7084 int p_crb_save; | |
| 7 | 7085 |
| 5539 | 7086 /* There is a tiny chance that this gets called recursively: When |
| 7087 * redrawing a status line triggers redrawing the ruler or tabline. | |
| 7088 * Avoid trouble by not allowing recursion. */ | |
| 7089 if (entered) | |
| 7090 return; | |
| 7091 entered = TRUE; | |
| 7092 | |
| 7 | 7093 /* setup environment for the task at hand */ |
| 677 | 7094 if (wp == NULL) |
| 7095 { | |
| 7096 /* Use 'tabline'. Always at the first line of the screen. */ | |
| 1983 | 7097 stl = p_tal; |
| 677 | 7098 row = 0; |
| 707 | 7099 fillchar = ' '; |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
7100 attr = HL_ATTR(HLF_TPF); |
| 677 | 7101 maxwidth = Columns; |
| 7102 # ifdef FEAT_EVAL | |
| 681 | 7103 use_sandbox = was_set_insecurely((char_u *)"tabline", 0); |
| 677 | 7104 # endif |
| 7105 } | |
| 40 | 7106 else |
| 677 | 7107 { |
| 7108 row = W_WINROW(wp) + wp->w_height; | |
| 7109 fillchar = fillchar_status(&attr, wp == curwin); | |
| 7110 maxwidth = W_WIDTH(wp); | |
| 7111 | |
| 7112 if (draw_ruler) | |
| 7113 { | |
| 1983 | 7114 stl = p_ruf; |
| 677 | 7115 /* advance past any leading group spec - implicit in ru_col */ |
| 1983 | 7116 if (*stl == '%') |
| 7117 { | |
| 7118 if (*++stl == '-') | |
| 7119 stl++; | |
| 7120 if (atoi((char *)stl)) | |
| 7121 while (VIM_ISDIGIT(*stl)) | |
| 7122 stl++; | |
| 7123 if (*stl++ != '(') | |
| 7124 stl = p_ruf; | |
| 677 | 7125 } |
|
8643
24b43dd167eb
commit https://github.com/vim/vim/commit/44a2f923c00f1384c9ecde12fb5b4711bc20702e
Christian Brabandt <cb@256bit.org>
parents:
8627
diff
changeset
|
7126 #ifdef FEAT_WINDOWS |
| 677 | 7127 col = ru_col - (Columns - W_WIDTH(wp)); |
| 7128 if (col < (W_WIDTH(wp) + 1) / 2) | |
| 7129 col = (W_WIDTH(wp) + 1) / 2; | |
| 7 | 7130 #else |
| 677 | 7131 col = ru_col; |
| 7132 if (col > (Columns + 1) / 2) | |
| 7133 col = (Columns + 1) / 2; | |
| 7134 #endif | |
| 7135 maxwidth = W_WIDTH(wp) - col; | |
| 7 | 7136 #ifdef FEAT_WINDOWS |
| 677 | 7137 if (!wp->w_status_height) |
| 7138 #endif | |
| 7139 { | |
| 7140 row = Rows - 1; | |
| 7141 --maxwidth; /* writing in last column may cause scrolling */ | |
| 7142 fillchar = ' '; | |
| 7143 attr = 0; | |
| 7144 } | |
| 7145 | |
| 7146 # ifdef FEAT_EVAL | |
| 681 | 7147 use_sandbox = was_set_insecurely((char_u *)"rulerformat", 0); |
| 677 | 7148 # endif |
| 7149 } | |
| 7150 else | |
| 7151 { | |
| 7152 if (*wp->w_p_stl != NUL) | |
| 1983 | 7153 stl = wp->w_p_stl; |
| 677 | 7154 else |
| 1983 | 7155 stl = p_stl; |
| 677 | 7156 # ifdef FEAT_EVAL |
| 681 | 7157 use_sandbox = was_set_insecurely((char_u *)"statusline", |
| 7158 *wp->w_p_stl == NUL ? 0 : OPT_LOCAL); | |
| 677 | 7159 # endif |
| 7160 } | |
| 7161 | |
|
8643
24b43dd167eb
commit https://github.com/vim/vim/commit/44a2f923c00f1384c9ecde12fb5b4711bc20702e
Christian Brabandt <cb@256bit.org>
parents:
8627
diff
changeset
|
7162 #ifdef FEAT_WINDOWS |
| 677 | 7163 col += W_WINCOL(wp); |
| 7164 #endif | |
| 7165 } | |
| 7166 | |
| 7 | 7167 if (maxwidth <= 0) |
| 5539 | 7168 goto theend; |
| 677 | 7169 |
| 2693 | 7170 /* Temporarily reset 'cursorbind', we don't want a side effect from moving |
| 7171 * the cursor away and back. */ | |
| 7172 ewp = wp == NULL ? curwin : wp; | |
| 7173 p_crb_save = ewp->w_p_crb; | |
| 7174 ewp->w_p_crb = FALSE; | |
| 7175 | |
| 1983 | 7176 /* Make a copy, because the statusline may include a function call that |
| 7177 * might change the option value and free the memory. */ | |
| 7178 stl = vim_strsave(stl); | |
| 2693 | 7179 width = build_stl_str_hl(ewp, buf, sizeof(buf), |
| 1983 | 7180 stl, use_sandbox, |
| 681 | 7181 fillchar, maxwidth, hltab, tabtab); |
| 1983 | 7182 vim_free(stl); |
| 2693 | 7183 ewp->w_p_crb = p_crb_save; |
| 2661 | 7184 |
| 7185 /* Make all characters printable. */ | |
| 7186 p = transstr(buf); | |
| 7187 if (p != NULL) | |
| 7188 { | |
| 7189 vim_strncpy(buf, p, sizeof(buf) - 1); | |
| 7190 vim_free(p); | |
| 7191 } | |
| 7192 | |
| 7193 /* fill up with "fillchar" */ | |
| 835 | 7194 len = (int)STRLEN(buf); |
| 1883 | 7195 while (width < maxwidth && len < (int)sizeof(buf) - 1) |
| 7 | 7196 { |
| 7197 #ifdef FEAT_MBYTE | |
| 7198 len += (*mb_char2bytes)(fillchar, buf + len); | |
| 7199 #else | |
| 7200 buf[len++] = fillchar; | |
| 7201 #endif | |
| 7202 ++width; | |
| 7203 } | |
| 7204 buf[len] = NUL; | |
| 7205 | |
| 681 | 7206 /* |
| 7207 * Draw each snippet with the specified highlighting. | |
| 7208 */ | |
| 7 | 7209 curattr = attr; |
| 7210 p = buf; | |
| 681 | 7211 for (n = 0; hltab[n].start != NULL; n++) |
| 7212 { | |
| 7213 len = (int)(hltab[n].start - p); | |
| 7 | 7214 screen_puts_len(p, len, row, col, curattr); |
| 7215 col += vim_strnsize(p, len); | |
| 681 | 7216 p = hltab[n].start; |
| 7217 | |
| 7218 if (hltab[n].userhl == 0) | |
| 7 | 7219 curattr = attr; |
| 681 | 7220 else if (hltab[n].userhl < 0) |
| 7221 curattr = syn_id2attr(-hltab[n].userhl); | |
| 7 | 7222 #ifdef FEAT_WINDOWS |
| 680 | 7223 else if (wp != NULL && wp != curwin && wp->w_status_height != 0) |
| 681 | 7224 curattr = highlight_stlnc[hltab[n].userhl - 1]; |
| 7 | 7225 #endif |
| 7226 else | |
| 681 | 7227 curattr = highlight_user[hltab[n].userhl - 1]; |
| 7 | 7228 } |
| 7229 screen_puts(p, row, col, curattr); | |
| 681 | 7230 |
| 7231 if (wp == NULL) | |
| 7232 { | |
| 7233 /* Fill the TabPageIdxs[] array for clicking in the tab pagesline. */ | |
| 7234 col = 0; | |
| 7235 len = 0; | |
| 7236 p = buf; | |
| 7237 fillchar = 0; | |
| 7238 for (n = 0; tabtab[n].start != NULL; n++) | |
| 7239 { | |
| 7240 len += vim_strnsize(p, (int)(tabtab[n].start - p)); | |
| 7241 while (col < len) | |
| 7242 TabPageIdxs[col++] = fillchar; | |
| 7243 p = tabtab[n].start; | |
| 7244 fillchar = tabtab[n].userhl; | |
| 7245 } | |
| 7246 while (col < Columns) | |
| 7247 TabPageIdxs[col++] = fillchar; | |
| 7248 } | |
| 5539 | 7249 |
| 7250 theend: | |
| 7251 entered = FALSE; | |
| 7 | 7252 } |
| 7253 | |
| 7254 #endif /* FEAT_STL_OPT */ | |
| 7255 | |
| 7256 /* | |
| 7257 * Output a single character directly to the screen and update ScreenLines. | |
| 7258 */ | |
| 7259 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7260 screen_putchar(int c, int row, int col, int attr) |
| 7 | 7261 { |
| 3549 | 7262 char_u buf[MB_MAXBYTES + 1]; |
| 7263 | |
| 7 | 7264 #ifdef FEAT_MBYTE |
| 3549 | 7265 if (has_mbyte) |
| 7266 buf[(*mb_char2bytes)(c, buf)] = NUL; | |
| 7267 else | |
| 7268 #endif | |
| 7269 { | |
| 7270 buf[0] = c; | |
| 7271 buf[1] = NUL; | |
| 7272 } | |
| 7 | 7273 screen_puts(buf, row, col, attr); |
| 7274 } | |
| 7275 | |
| 7276 /* | |
| 7277 * Get a single character directly from ScreenLines into "bytes[]". | |
| 7278 * Also return its attribute in *attrp; | |
| 7279 */ | |
| 7280 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7281 screen_getbytes(int row, int col, char_u *bytes, int *attrp) |
| 7 | 7282 { |
| 7283 unsigned off; | |
| 7284 | |
| 7285 /* safety check */ | |
| 7286 if (ScreenLines != NULL && row < screen_Rows && col < screen_Columns) | |
| 7287 { | |
| 7288 off = LineOffset[row] + col; | |
| 7289 *attrp = ScreenAttrs[off]; | |
| 7290 bytes[0] = ScreenLines[off]; | |
| 7291 bytes[1] = NUL; | |
| 7292 | |
| 7293 #ifdef FEAT_MBYTE | |
| 7294 if (enc_utf8 && ScreenLinesUC[off] != 0) | |
| 7295 bytes[utfc_char2bytes(off, bytes)] = NUL; | |
| 7296 else if (enc_dbcs == DBCS_JPNU && ScreenLines[off] == 0x8e) | |
| 7297 { | |
| 7298 bytes[0] = ScreenLines[off]; | |
| 7299 bytes[1] = ScreenLines2[off]; | |
| 7300 bytes[2] = NUL; | |
| 7301 } | |
| 7302 else if (enc_dbcs && MB_BYTE2LEN(bytes[0]) > 1) | |
| 7303 { | |
| 7304 bytes[1] = ScreenLines[off + 1]; | |
| 7305 bytes[2] = NUL; | |
| 7306 } | |
| 7307 #endif | |
| 7308 } | |
| 7309 } | |
| 7310 | |
| 714 | 7311 #ifdef FEAT_MBYTE |
|
7805
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7697
diff
changeset
|
7312 static int screen_comp_differs(int, int*); |
| 714 | 7313 |
| 7314 /* | |
| 7315 * Return TRUE if composing characters for screen posn "off" differs from | |
| 7316 * composing characters in "u8cc". | |
|
2124
dc8a5699253b
updated for version 7.2.406
Bram Moolenaar <bram@zimbu.org>
parents:
2122
diff
changeset
|
7317 * Only to be used when ScreenLinesUC[off] != 0. |
| 714 | 7318 */ |
| 7319 static int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7320 screen_comp_differs(int off, int *u8cc) |
| 714 | 7321 { |
| 7322 int i; | |
| 7323 | |
| 7324 for (i = 0; i < Screen_mco; ++i) | |
| 7325 { | |
| 7326 if (ScreenLinesC[i][off] != (u8char_T)u8cc[i]) | |
| 7327 return TRUE; | |
| 7328 if (u8cc[i] == 0) | |
| 7329 break; | |
| 7330 } | |
| 7331 return FALSE; | |
| 7332 } | |
| 7333 #endif | |
| 7334 | |
| 7 | 7335 /* |
| 7336 * Put string '*text' on the screen at position 'row' and 'col', with | |
| 7337 * attributes 'attr', and update ScreenLines[] and ScreenAttrs[]. | |
| 7338 * Note: only outputs within one row, message is truncated at screen boundary! | |
| 7339 * Note: if ScreenLines[], row and/or col is invalid, nothing is done. | |
| 7340 */ | |
| 7341 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7342 screen_puts( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7343 char_u *text, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7344 int row, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7345 int col, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7346 int attr) |
| 7 | 7347 { |
| 7348 screen_puts_len(text, -1, row, col, attr); | |
| 7349 } | |
| 7350 | |
| 7351 /* | |
| 7352 * Like screen_puts(), but output "text[len]". When "len" is -1 output up to | |
| 7353 * a NUL. | |
| 7354 */ | |
| 7355 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7356 screen_puts_len( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7357 char_u *text, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7358 int textlen, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7359 int row, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7360 int col, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7361 int attr) |
| 7 | 7362 { |
| 7363 unsigned off; | |
| 7364 char_u *ptr = text; | |
| 5923 | 7365 int len = textlen; |
| 7 | 7366 int c; |
| 7367 #ifdef FEAT_MBYTE | |
| 1378 | 7368 unsigned max_off; |
| 7 | 7369 int mbyte_blen = 1; |
| 7370 int mbyte_cells = 1; | |
| 7371 int u8c = 0; | |
| 714 | 7372 int u8cc[MAX_MCO]; |
| 7 | 7373 int clear_next_cell = FALSE; |
| 7374 # ifdef FEAT_ARABIC | |
| 7375 int prev_c = 0; /* previous Arabic character */ | |
| 714 | 7376 int pc, nc, nc1; |
| 7377 int pcc[MAX_MCO]; | |
| 7 | 7378 # endif |
| 7379 #endif | |
| 1843 | 7380 #if defined(FEAT_MBYTE) || defined(FEAT_GUI) || defined(UNIX) |
| 7381 int force_redraw_this; | |
| 7382 int force_redraw_next = FALSE; | |
| 7383 #endif | |
| 7384 int need_redraw; | |
| 7 | 7385 |
| 7386 if (ScreenLines == NULL || row >= screen_Rows) /* safety check */ | |
| 7387 return; | |
| 1843 | 7388 off = LineOffset[row] + col; |
| 7 | 7389 |
| 1668 | 7390 #ifdef FEAT_MBYTE |
| 7391 /* When drawing over the right halve of a double-wide char clear out the | |
| 7392 * left halve. Only needed in a terminal. */ | |
| 1685 | 7393 if (has_mbyte && col > 0 && col < screen_Columns |
| 1668 | 7394 # ifdef FEAT_GUI |
| 7395 && !gui.in_use | |
| 7396 # endif | |
| 7397 && mb_fix_col(col, row) != col) | |
| 1843 | 7398 { |
| 7399 ScreenLines[off - 1] = ' '; | |
| 7400 ScreenAttrs[off - 1] = 0; | |
| 7401 if (enc_utf8) | |
| 7402 { | |
| 7403 ScreenLinesUC[off - 1] = 0; | |
| 7404 ScreenLinesC[0][off - 1] = 0; | |
| 7405 } | |
| 7406 /* redraw the previous cell, make it empty */ | |
| 7407 screen_char(off - 1, row, col - 1); | |
| 7408 /* force the cell at "col" to be redrawn */ | |
| 7409 force_redraw_next = TRUE; | |
| 7410 } | |
| 7411 #endif | |
| 7412 | |
| 1378 | 7413 #ifdef FEAT_MBYTE |
| 7414 max_off = LineOffset[row] + screen_Columns; | |
| 7415 #endif | |
| 1340 | 7416 while (col < screen_Columns |
| 7417 && (len < 0 || (int)(ptr - text) < len) | |
| 7418 && *ptr != NUL) | |
| 7 | 7419 { |
| 7420 c = *ptr; | |
| 7421 #ifdef FEAT_MBYTE | |
| 7422 /* check if this is the first byte of a multibyte */ | |
| 7423 if (has_mbyte) | |
| 7424 { | |
| 7425 if (enc_utf8 && len > 0) | |
| 474 | 7426 mbyte_blen = utfc_ptr2len_len(ptr, (int)((text + len) - ptr)); |
| 7 | 7427 else |
| 474 | 7428 mbyte_blen = (*mb_ptr2len)(ptr); |
| 7 | 7429 if (enc_dbcs == DBCS_JPNU && c == 0x8e) |
| 7430 mbyte_cells = 1; | |
| 7431 else if (enc_dbcs != 0) | |
| 7432 mbyte_cells = mbyte_blen; | |
| 7433 else /* enc_utf8 */ | |
| 7434 { | |
| 7435 if (len >= 0) | |
| 714 | 7436 u8c = utfc_ptr2char_len(ptr, u8cc, |
| 7 | 7437 (int)((text + len) - ptr)); |
| 7438 else | |
| 714 | 7439 u8c = utfc_ptr2char(ptr, u8cc); |
| 7 | 7440 mbyte_cells = utf_char2cells(u8c); |
| 1401 | 7441 # ifdef UNICODE16 |
| 7 | 7442 /* Non-BMP character: display as ? or fullwidth ?. */ |
| 7443 if (u8c >= 0x10000) | |
| 7444 { | |
| 7445 u8c = (mbyte_cells == 2) ? 0xff1f : (int)'?'; | |
| 7446 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
|
7447 attr = HL_ATTR(HLF_8); |
| 7 | 7448 } |
| 1401 | 7449 # endif |
| 7 | 7450 # ifdef FEAT_ARABIC |
| 7451 if (p_arshape && !p_tbidi && ARABIC_CHAR(u8c)) | |
| 7452 { | |
| 7453 /* Do Arabic shaping. */ | |
| 7454 if (len >= 0 && (int)(ptr - text) + mbyte_blen >= len) | |
| 7455 { | |
| 7456 /* Past end of string to be displayed. */ | |
| 7457 nc = NUL; | |
| 7458 nc1 = NUL; | |
| 7459 } | |
| 7460 else | |
| 714 | 7461 { |
| 1994 | 7462 nc = utfc_ptr2char_len(ptr + mbyte_blen, pcc, |
| 7463 (int)((text + len) - ptr - mbyte_blen)); | |
| 714 | 7464 nc1 = pcc[0]; |
| 7465 } | |
| 7 | 7466 pc = prev_c; |
| 7467 prev_c = u8c; | |
| 714 | 7468 u8c = arabic_shape(u8c, &c, &u8cc[0], nc, nc1, pc); |
| 7 | 7469 } |
| 7470 else | |
| 7471 prev_c = u8c; | |
| 7472 # endif | |
|
2055
4aa4510d548c
updated for version 7.2.341
Bram Moolenaar <bram@zimbu.org>
parents:
2008
diff
changeset
|
7473 if (col + mbyte_cells > screen_Columns) |
|
4aa4510d548c
updated for version 7.2.341
Bram Moolenaar <bram@zimbu.org>
parents:
2008
diff
changeset
|
7474 { |
|
4aa4510d548c
updated for version 7.2.341
Bram Moolenaar <bram@zimbu.org>
parents:
2008
diff
changeset
|
7475 /* 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
|
7476 * 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
|
7477 c = '>'; |
|
4aa4510d548c
updated for version 7.2.341
Bram Moolenaar <bram@zimbu.org>
parents:
2008
diff
changeset
|
7478 mbyte_cells = 1; |
|
4aa4510d548c
updated for version 7.2.341
Bram Moolenaar <bram@zimbu.org>
parents:
2008
diff
changeset
|
7479 } |
| 7 | 7480 } |
| 7481 } | |
| 7482 #endif | |
| 7483 | |
| 1843 | 7484 #if defined(FEAT_MBYTE) || defined(FEAT_GUI) || defined(UNIX) |
| 7485 force_redraw_this = force_redraw_next; | |
| 7486 force_redraw_next = FALSE; | |
| 7487 #endif | |
| 7488 | |
| 7489 need_redraw = ScreenLines[off] != c | |
| 7 | 7490 #ifdef FEAT_MBYTE |
| 7491 || (mbyte_cells == 2 | |
| 7492 && ScreenLines[off + 1] != (enc_dbcs ? ptr[1] : 0)) | |
| 7493 || (enc_dbcs == DBCS_JPNU | |
| 7494 && c == 0x8e | |
| 7495 && ScreenLines2[off] != ptr[1]) | |
| 7496 || (enc_utf8 | |
|
2124
dc8a5699253b
updated for version 7.2.406
Bram Moolenaar <bram@zimbu.org>
parents:
2122
diff
changeset
|
7497 && (ScreenLinesUC[off] != |
|
dc8a5699253b
updated for version 7.2.406
Bram Moolenaar <bram@zimbu.org>
parents:
2122
diff
changeset
|
7498 (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
|
7499 || (ScreenLinesUC[off] != 0 |
|
dc8a5699253b
updated for version 7.2.406
Bram Moolenaar <bram@zimbu.org>
parents:
2122
diff
changeset
|
7500 && screen_comp_differs(off, u8cc)))) |
| 7 | 7501 #endif |
| 7502 || ScreenAttrs[off] != attr | |
| 1843 | 7503 || exmode_active; |
| 7504 | |
| 7505 if (need_redraw | |
| 7506 #if defined(FEAT_MBYTE) || defined(FEAT_GUI) || defined(UNIX) | |
| 7507 || force_redraw_this | |
| 7508 #endif | |
| 7 | 7509 ) |
| 7510 { | |
| 7511 #if defined(FEAT_GUI) || defined(UNIX) | |
| 7512 /* The bold trick makes a single row of pixels appear in the next | |
| 7513 * character. When a bold character is removed, the next | |
| 7514 * character should be redrawn too. This happens for our own GUI | |
| 1843 | 7515 * and for some xterms. */ |
| 7516 if (need_redraw && ScreenLines[off] != ' ' && ( | |
| 7 | 7517 # ifdef FEAT_GUI |
| 7518 gui.in_use | |
| 7519 # endif | |
| 7520 # if defined(FEAT_GUI) && defined(UNIX) | |
| 7521 || | |
| 7522 # endif | |
| 7523 # ifdef UNIX | |
| 7524 term_is_xterm | |
| 7525 # endif | |
| 1843 | 7526 )) |
| 7527 { | |
| 7528 int n = ScreenAttrs[off]; | |
| 7529 | |
| 7530 if (n > HL_ALL) | |
| 7531 n = syn_attr2attr(n); | |
| 7532 if (n & HL_BOLD) | |
| 7533 force_redraw_next = TRUE; | |
| 7 | 7534 } |
| 7535 #endif | |
| 7536 #ifdef FEAT_MBYTE | |
| 7537 /* When at the end of the text and overwriting a two-cell | |
| 7538 * character with a one-cell character, need to clear the next | |
| 7539 * cell. Also when overwriting the left halve of a two-cell char | |
| 7540 * with the right halve of a two-cell char. Do this only once | |
| 7541 * (mb_off2cells() may return 2 on the right halve). */ | |
| 7542 if (clear_next_cell) | |
| 7543 clear_next_cell = FALSE; | |
| 7544 else if (has_mbyte | |
| 7545 && (len < 0 ? ptr[mbyte_blen] == NUL | |
| 7546 : ptr + mbyte_blen >= text + len) | |
| 1378 | 7547 && ((mbyte_cells == 1 && (*mb_off2cells)(off, max_off) > 1) |
| 7 | 7548 || (mbyte_cells == 2 |
| 1378 | 7549 && (*mb_off2cells)(off, max_off) == 1 |
| 7550 && (*mb_off2cells)(off + 1, max_off) > 1))) | |
| 7 | 7551 clear_next_cell = TRUE; |
| 7552 | |
| 7553 /* Make sure we never leave a second byte of a double-byte behind, | |
| 7554 * it confuses mb_off2cells(). */ | |
| 7555 if (enc_dbcs | |
| 1378 | 7556 && ((mbyte_cells == 1 && (*mb_off2cells)(off, max_off) > 1) |
| 7 | 7557 || (mbyte_cells == 2 |
| 1378 | 7558 && (*mb_off2cells)(off, max_off) == 1 |
| 7559 && (*mb_off2cells)(off + 1, max_off) > 1))) | |
| 7 | 7560 ScreenLines[off + mbyte_blen] = 0; |
| 7561 #endif | |
| 7562 ScreenLines[off] = c; | |
| 7563 ScreenAttrs[off] = attr; | |
| 7564 #ifdef FEAT_MBYTE | |
| 7565 if (enc_utf8) | |
| 7566 { | |
| 714 | 7567 if (c < 0x80 && u8cc[0] == 0) |
| 7 | 7568 ScreenLinesUC[off] = 0; |
| 7569 else | |
| 7570 { | |
| 714 | 7571 int i; |
| 7572 | |
| 7 | 7573 ScreenLinesUC[off] = u8c; |
| 714 | 7574 for (i = 0; i < Screen_mco; ++i) |
| 7575 { | |
| 7576 ScreenLinesC[i][off] = u8cc[i]; | |
| 7577 if (u8cc[i] == 0) | |
| 7578 break; | |
| 7579 } | |
| 7 | 7580 } |
| 7581 if (mbyte_cells == 2) | |
| 7582 { | |
| 7583 ScreenLines[off + 1] = 0; | |
| 7584 ScreenAttrs[off + 1] = attr; | |
| 7585 } | |
| 7586 screen_char(off, row, col); | |
| 7587 } | |
| 7588 else if (mbyte_cells == 2) | |
| 7589 { | |
| 7590 ScreenLines[off + 1] = ptr[1]; | |
| 7591 ScreenAttrs[off + 1] = attr; | |
| 7592 screen_char_2(off, row, col); | |
| 7593 } | |
| 7594 else if (enc_dbcs == DBCS_JPNU && c == 0x8e) | |
| 7595 { | |
| 7596 ScreenLines2[off] = ptr[1]; | |
| 7597 screen_char(off, row, col); | |
| 7598 } | |
| 7599 else | |
| 7600 #endif | |
| 7601 screen_char(off, row, col); | |
| 7602 } | |
| 7603 #ifdef FEAT_MBYTE | |
| 7604 if (has_mbyte) | |
| 7605 { | |
| 7606 off += mbyte_cells; | |
| 7607 col += mbyte_cells; | |
| 7608 ptr += mbyte_blen; | |
| 7609 if (clear_next_cell) | |
| 5923 | 7610 { |
| 7611 /* This only happens at the end, display one space next. */ | |
| 7 | 7612 ptr = (char_u *)" "; |
| 5923 | 7613 len = -1; |
| 7614 } | |
| 7 | 7615 } |
| 7616 else | |
| 7617 #endif | |
| 7618 { | |
| 7619 ++off; | |
| 7620 ++col; | |
| 7621 ++ptr; | |
| 7622 } | |
| 7623 } | |
| 1843 | 7624 |
| 7625 #if defined(FEAT_MBYTE) || defined(FEAT_GUI) || defined(UNIX) | |
| 7626 /* If we detected the next character needs to be redrawn, but the text | |
| 7627 * doesn't extend up to there, update the character here. */ | |
| 7628 if (force_redraw_next && col < screen_Columns) | |
| 7629 { | |
| 7630 # ifdef FEAT_MBYTE | |
| 7631 if (enc_dbcs != 0 && dbcs_off2cells(off, max_off) > 1) | |
| 7632 screen_char_2(off, row, col); | |
| 7633 else | |
| 7634 # endif | |
| 7635 screen_char(off, row, col); | |
| 7636 } | |
| 7637 #endif | |
| 7 | 7638 } |
| 7639 | |
| 7640 #ifdef FEAT_SEARCH_EXTRA | |
| 7641 /* | |
| 1326 | 7642 * Prepare for 'hlsearch' highlighting. |
| 7 | 7643 */ |
| 7644 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7645 start_search_hl(void) |
| 7 | 7646 { |
| 7647 if (p_hls && !no_hlsearch) | |
| 7648 { | |
| 7649 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
|
7650 search_hl.attr = HL_ATTR(HLF_L); |
| 1521 | 7651 # ifdef FEAT_RELTIME |
| 7652 /* Set the time limit to 'redrawtime'. */ | |
| 7653 profile_setlimit(p_rdt, &search_hl.tm); | |
| 7654 # endif | |
| 7 | 7655 } |
| 7656 } | |
| 7657 | |
| 7658 /* | |
| 1326 | 7659 * Clean up for 'hlsearch' highlighting. |
| 7 | 7660 */ |
| 7661 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7662 end_search_hl(void) |
| 7 | 7663 { |
| 7664 if (search_hl.rm.regprog != NULL) | |
| 7665 { | |
|
4805
66803af09906
updated for version 7.3.1149
Bram Moolenaar <bram@vim.org>
parents:
4795
diff
changeset
|
7666 vim_regfree(search_hl.rm.regprog); |
| 7 | 7667 search_hl.rm.regprog = NULL; |
| 7668 } | |
| 7669 } | |
| 7670 | |
| 7671 /* | |
|
2284
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7672 * 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
|
7673 */ |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7674 static void |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7675 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
|
7676 { |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7677 matchitem_T *cur; |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7678 |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7679 /* 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
|
7680 * match */ |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7681 cur = wp->w_match_head; |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7682 while (cur != NULL) |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7683 { |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7684 cur->hl.rm = cur->match; |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7685 if (cur->hlg_id == 0) |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7686 cur->hl.attr = 0; |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7687 else |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7688 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
|
7689 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
|
7690 cur->hl.lnum = 0; |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7691 cur->hl.first_lnum = 0; |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7692 # ifdef FEAT_RELTIME |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7693 /* 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
|
7694 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
|
7695 # endif |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7696 cur = cur->next; |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7697 } |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7698 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
|
7699 search_hl.lnum = 0; |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7700 search_hl.first_lnum = 0; |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7701 /* 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
|
7702 } |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7703 |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7704 /* |
| 7 | 7705 * Advance to the match in window "wp" line "lnum" or past it. |
| 7706 */ | |
| 7707 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7708 prepare_search_hl(win_T *wp, linenr_T lnum) |
| 7 | 7709 { |
| 1326 | 7710 matchitem_T *cur; /* points to the match list */ |
| 7711 match_T *shl; /* points to search_hl or a match */ | |
| 7712 int shl_flag; /* flag to indicate whether search_hl | |
| 7713 has been processed or not */ | |
| 5979 | 7714 int pos_inprogress; /* marks that position match search is |
| 7715 in progress */ | |
| 7 | 7716 int n; |
| 7717 | |
| 7718 /* | |
| 7719 * When using a multi-line pattern, start searching at the top | |
| 7720 * of the window or just after a closed fold. | |
| 1326 | 7721 * Do this both for search_hl and the match list. |
| 7 | 7722 */ |
| 1326 | 7723 cur = wp->w_match_head; |
| 7724 shl_flag = FALSE; | |
| 7725 while (cur != NULL || shl_flag == FALSE) | |
| 7726 { | |
| 7727 if (shl_flag == FALSE) | |
| 7728 { | |
| 7729 shl = &search_hl; | |
| 7730 shl_flag = TRUE; | |
| 7731 } | |
| 7732 else | |
| 7733 shl = &cur->hl; | |
| 7 | 7734 if (shl->rm.regprog != NULL |
| 7735 && shl->lnum == 0 | |
| 7736 && re_multiline(shl->rm.regprog)) | |
| 7737 { | |
| 7738 if (shl->first_lnum == 0) | |
| 7739 { | |
| 7740 # ifdef FEAT_FOLDING | |
| 7741 for (shl->first_lnum = lnum; | |
| 7742 shl->first_lnum > wp->w_topline; --shl->first_lnum) | |
| 7743 if (hasFoldingWin(wp, shl->first_lnum - 1, | |
| 7744 NULL, NULL, TRUE, NULL)) | |
| 7745 break; | |
| 7746 # else | |
| 7747 shl->first_lnum = wp->w_topline; | |
| 7748 # endif | |
| 7749 } | |
| 5979 | 7750 if (cur != NULL) |
| 7751 cur->pos.cur = 0; | |
| 7752 pos_inprogress = TRUE; | |
| 7 | 7753 n = 0; |
| 5979 | 7754 while (shl->first_lnum < lnum && (shl->rm.regprog != NULL |
| 7755 || (cur != NULL && pos_inprogress))) | |
| 7756 { | |
|
9992
3e3b0ce24b61
commit https://github.com/vim/vim/commit/e17bdffff78ebd6a4e3cff26754cc667557ea810
Christian Brabandt <cb@256bit.org>
parents:
9939
diff
changeset
|
7757 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
|
7758 shl == &search_hl ? NULL : cur); |
| 5979 | 7759 pos_inprogress = cur == NULL || cur->pos.cur == 0 |
| 7760 ? FALSE : TRUE; | |
| 7 | 7761 if (shl->lnum != 0) |
| 7762 { | |
| 7763 shl->first_lnum = shl->lnum | |
| 7764 + shl->rm.endpos[0].lnum | |
| 7765 - shl->rm.startpos[0].lnum; | |
| 7766 n = shl->rm.endpos[0].col; | |
| 7767 } | |
| 7768 else | |
| 7769 { | |
| 7770 ++shl->first_lnum; | |
| 7771 n = 0; | |
| 7772 } | |
| 7773 } | |
| 7774 } | |
| 1326 | 7775 if (shl != &search_hl && cur != NULL) |
| 7776 cur = cur->next; | |
| 7 | 7777 } |
| 7778 } | |
| 7779 | |
| 7780 /* | |
| 1326 | 7781 * Search for a next 'hlsearch' or match. |
| 7 | 7782 * Uses shl->buf. |
| 7783 * Sets shl->lnum and shl->rm contents. | |
| 7784 * Note: Assumes a previous match is always before "lnum", unless | |
| 7785 * shl->lnum is zero. | |
| 7786 * Careful: Any pointers for buffer lines will become invalid. | |
| 7787 */ | |
| 7788 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7789 next_search_hl( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7790 win_T *win, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7791 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
|
7792 linenr_T lnum, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7793 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
|
7794 matchitem_T *cur) /* to retrieve match positions if any */ |
| 7 | 7795 { |
| 7796 linenr_T l; | |
| 7797 colnr_T matchcol; | |
| 7798 long nmatched; | |
| 7799 | |
| 7800 if (shl->lnum != 0) | |
| 7801 { | |
| 7802 /* Check for three situations: | |
| 7803 * 1. If the "lnum" is below a previous match, start a new search. | |
| 7804 * 2. If the previous match includes "mincol", use it. | |
| 7805 * 3. Continue after the previous match. | |
| 7806 */ | |
| 7807 l = shl->lnum + shl->rm.endpos[0].lnum - shl->rm.startpos[0].lnum; | |
| 7808 if (lnum > l) | |
| 7809 shl->lnum = 0; | |
| 7810 else if (lnum < l || shl->rm.endpos[0].col > mincol) | |
| 7811 return; | |
| 7812 } | |
| 7813 | |
| 7814 /* | |
| 7815 * Repeat searching for a match until one is found that includes "mincol" | |
| 7816 * or none is found in this line. | |
| 7817 */ | |
| 7818 called_emsg = FALSE; | |
| 7819 for (;;) | |
| 7820 { | |
| 1521 | 7821 #ifdef FEAT_RELTIME |
| 7822 /* Stop searching after passing the time limit. */ | |
| 7823 if (profile_passed_limit(&(shl->tm))) | |
| 7824 { | |
| 7825 shl->lnum = 0; /* no match found in time */ | |
| 7826 break; | |
| 7827 } | |
| 7828 #endif | |
| 7 | 7829 /* Three situations: |
| 7830 * 1. No useful previous match: search from start of line. | |
| 7831 * 2. Not Vi compatible or empty match: continue at next character. | |
| 7832 * Break the loop if this is beyond the end of the line. | |
| 7833 * 3. Vi compatible searching: continue at end of previous match. | |
| 7834 */ | |
| 7835 if (shl->lnum == 0) | |
| 7836 matchcol = 0; | |
| 7837 else if (vim_strchr(p_cpo, CPO_SEARCH) == NULL | |
| 7838 || (shl->rm.endpos[0].lnum == 0 | |
| 685 | 7839 && shl->rm.endpos[0].col <= shl->rm.startpos[0].col)) |
| 7840 { | |
| 688 | 7841 char_u *ml; |
| 685 | 7842 |
| 7843 matchcol = shl->rm.startpos[0].col; | |
| 688 | 7844 ml = ml_get_buf(shl->buf, lnum, FALSE) + matchcol; |
| 685 | 7845 if (*ml == NUL) |
| 7846 { | |
| 7847 ++matchcol; | |
| 7 | 7848 shl->lnum = 0; |
| 7849 break; | |
| 7850 } | |
| 685 | 7851 #ifdef FEAT_MBYTE |
| 7852 if (has_mbyte) | |
| 7853 matchcol += mb_ptr2len(ml); | |
| 7854 else | |
| 7855 #endif | |
| 7856 ++matchcol; | |
| 7 | 7857 } |
| 7858 else | |
| 7859 matchcol = shl->rm.endpos[0].col; | |
| 7860 | |
| 7861 shl->lnum = lnum; | |
| 5979 | 7862 if (shl->rm.regprog != NULL) |
| 7863 { | |
| 6394 | 7864 /* Remember whether shl->rm is using a copy of the regprog in |
| 7865 * cur->match. */ | |
| 7866 int regprog_is_copy = (shl != &search_hl && cur != NULL | |
| 7867 && shl == &cur->hl | |
| 7868 && 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
|
7869 int timed_out = FALSE; |
| 6394 | 7870 |
| 5979 | 7871 nmatched = vim_regexec_multi(&shl->rm, win, shl->buf, lnum, |
| 7872 matchcol, | |
| 1521 | 7873 #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
|
7874 &(shl->tm), &timed_out |
| 1521 | 7875 #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
|
7876 NULL, NULL |
| 5979 | 7877 #endif |
| 7878 ); | |
| 6394 | 7879 /* Copy the regprog, in case it got freed and recompiled. */ |
| 7880 if (regprog_is_copy) | |
| 7881 cur->match.regprog = cur->hl.rm.regprog; | |
| 7882 | |
|
11521
578df034735d
patch 8.0.0643: when a pattern search is slow Vim becomes unusable
Christian Brabandt <cb@256bit.org>
parents:
11516
diff
changeset
|
7883 if (called_emsg || got_int || timed_out) |
| 5979 | 7884 { |
| 7885 /* Error while handling regexp: stop using this regexp. */ | |
| 7886 if (shl == &search_hl) | |
| 7887 { | |
| 7888 /* don't free regprog in the match list, it's a copy */ | |
| 7889 vim_regfree(shl->rm.regprog); | |
| 7890 SET_NO_HLSEARCH(TRUE); | |
| 7891 } | |
| 7892 shl->rm.regprog = NULL; | |
| 7893 shl->lnum = 0; | |
| 7894 got_int = FALSE; /* avoid the "Type :quit to exit Vim" | |
| 7895 message */ | |
| 7896 break; | |
| 7897 } | |
| 7898 } | |
| 7899 else if (cur != NULL) | |
| 7900 nmatched = next_search_hl_pos(shl, lnum, &(cur->pos), matchcol); | |
| 5987 | 7901 else |
| 7902 nmatched = 0; | |
| 7 | 7903 if (nmatched == 0) |
| 7904 { | |
| 7905 shl->lnum = 0; /* no match found */ | |
| 7906 break; | |
| 7907 } | |
| 7908 if (shl->rm.startpos[0].lnum > 0 | |
| 7909 || shl->rm.startpos[0].col >= mincol | |
| 7910 || nmatched > 1 | |
| 7911 || shl->rm.endpos[0].col > mincol) | |
| 7912 { | |
| 7913 shl->lnum += shl->rm.startpos[0].lnum; | |
| 7914 break; /* useful match found */ | |
| 7915 } | |
| 7916 } | |
| 7917 } | |
| 7918 | |
|
10287
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
7919 /* |
|
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
7920 * 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
|
7921 * Return zero otherwise. |
|
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
7922 */ |
| 5979 | 7923 static int |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7924 next_search_hl_pos( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7925 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
|
7926 linenr_T lnum, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7927 posmatch_T *posmatch, /* match positions */ |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7928 colnr_T mincol) /* minimal column for a match */ |
| 5979 | 7929 { |
| 7930 int i; | |
|
10287
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
7931 int found = -1; |
|
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
7932 |
| 5979 | 7933 for (i = posmatch->cur; i < MAXPOSMATCH; i++) |
| 7934 { | |
|
10273
489eae19cad9
commit https://github.com/vim/vim/commit/a6c27ee6db2c328e0ab0e6d143e2a295a0bb9c9a
Christian Brabandt <cb@256bit.org>
parents:
10247
diff
changeset
|
7935 llpos_T *pos = &posmatch->pos[i]; |
|
489eae19cad9
commit https://github.com/vim/vim/commit/a6c27ee6db2c328e0ab0e6d143e2a295a0bb9c9a
Christian Brabandt <cb@256bit.org>
parents:
10247
diff
changeset
|
7936 |
|
489eae19cad9
commit https://github.com/vim/vim/commit/a6c27ee6db2c328e0ab0e6d143e2a295a0bb9c9a
Christian Brabandt <cb@256bit.org>
parents:
10247
diff
changeset
|
7937 if (pos->lnum == 0) |
| 5979 | 7938 break; |
|
10287
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
7939 if (pos->len == 0 && pos->col < mincol) |
| 5979 | 7940 continue; |
|
10273
489eae19cad9
commit https://github.com/vim/vim/commit/a6c27ee6db2c328e0ab0e6d143e2a295a0bb9c9a
Christian Brabandt <cb@256bit.org>
parents:
10247
diff
changeset
|
7941 if (pos->lnum == lnum) |
| 5979 | 7942 { |
|
10287
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
7943 if (found >= 0) |
|
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
7944 { |
|
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
7945 /* 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
|
7946 * them */ |
|
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
7947 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
|
7948 { |
|
489eae19cad9
commit https://github.com/vim/vim/commit/a6c27ee6db2c328e0ab0e6d143e2a295a0bb9c9a
Christian Brabandt <cb@256bit.org>
parents:
10247
diff
changeset
|
7949 llpos_T tmp = *pos; |
|
489eae19cad9
commit https://github.com/vim/vim/commit/a6c27ee6db2c328e0ab0e6d143e2a295a0bb9c9a
Christian Brabandt <cb@256bit.org>
parents:
10247
diff
changeset
|
7950 |
|
10287
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
7951 *pos = posmatch->pos[found]; |
|
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
7952 posmatch->pos[found] = tmp; |
| 5979 | 7953 } |
| 7954 } | |
| 7955 else | |
|
10287
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
7956 found = i; |
| 5979 | 7957 } |
| 7958 } | |
| 7959 posmatch->cur = 0; | |
|
10287
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
7960 if (found >= 0) |
|
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
7961 { |
|
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
7962 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
|
7963 ? 0 : posmatch->pos[found].col - 1; |
|
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
7964 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
|
7965 ? MAXCOL : start + posmatch->pos[found].len; |
|
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
7966 |
|
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
7967 shl->lnum = lnum; |
| 5979 | 7968 shl->rm.startpos[0].lnum = 0; |
| 7969 shl->rm.startpos[0].col = start; | |
| 7970 shl->rm.endpos[0].lnum = 0; | |
| 7971 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
|
7972 shl->is_addpos = TRUE; |
|
10287
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
7973 posmatch->cur = found + 1; |
|
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
7974 return 1; |
|
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
7975 } |
|
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
7976 return 0; |
| 5979 | 7977 } |
| 5985 | 7978 #endif |
| 5979 | 7979 |
| 7 | 7980 static void |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7981 screen_start_highlight(int attr) |
| 7 | 7982 { |
| 7983 attrentry_T *aep = NULL; | |
| 7984 | |
| 7985 screen_attr = attr; | |
| 7986 if (full_screen | |
| 7987 #ifdef WIN3264 | |
| 7988 && termcap_active | |
| 7989 #endif | |
| 7990 ) | |
| 7991 { | |
| 7992 #ifdef FEAT_GUI | |
| 7993 if (gui.in_use) | |
| 7994 { | |
| 7995 char buf[20]; | |
| 7996 | |
| 681 | 7997 /* The GUI handles this internally. */ |
| 7998 sprintf(buf, IF_EB("\033|%dh", ESC_STR "|%dh"), attr); | |
| 7 | 7999 OUT_STR(buf); |
| 8000 } | |
| 8001 else | |
| 8002 #endif | |
| 8003 { | |
| 8004 if (attr > HL_ALL) /* special HL attr. */ | |
| 8005 { | |
|
8969
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8006 if (IS_CTERM) |
| 7 | 8007 aep = syn_cterm_attr2entry(attr); |
| 8008 else | |
| 8009 aep = syn_term_attr2entry(attr); | |
| 8010 if (aep == NULL) /* did ":syntax clear" */ | |
| 8011 attr = 0; | |
| 8012 else | |
| 8013 attr = aep->ae_attr; | |
| 8014 } | |
| 8015 if ((attr & HL_BOLD) && T_MD != NULL) /* bold */ | |
| 8016 out_str(T_MD); | |
|
8969
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8017 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
|
8018 #ifdef FEAT_TERMGUICOLORS |
|
773d627cac0b
commit https://github.com/vim/vim/commit/61be73bb0f965a895bfb064ea3e55476ac175162
Christian Brabandt <cb@256bit.org>
parents:
8977
diff
changeset
|
8019 (p_tgc ? |
|
9939
ccb6461b82df
commit https://github.com/vim/vim/commit/1b58cdd160c2e0ada0f638679a2aa27e4665fc48
Christian Brabandt <cb@256bit.org>
parents:
9885
diff
changeset
|
8020 (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
|
8021 #endif |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8022 (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
|
8023 #ifdef FEAT_TERMGUICOLORS |
|
8969
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8024 ) |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8025 #endif |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8026 ) |
| 681 | 8027 /* If the Normal FG color has BOLD attribute and the new HL |
| 8028 * has a FG color defined, clear BOLD. */ | |
| 8029 out_str(T_ME); | |
| 7 | 8030 if ((attr & HL_STANDOUT) && T_SO != NULL) /* standout */ |
| 8031 out_str(T_SO); | |
| 205 | 8032 if ((attr & (HL_UNDERLINE | HL_UNDERCURL)) && T_US != NULL) |
| 8033 /* underline or undercurl */ | |
| 7 | 8034 out_str(T_US); |
| 8035 if ((attr & HL_ITALIC) && T_CZH != NULL) /* italic */ | |
| 8036 out_str(T_CZH); | |
| 8037 if ((attr & HL_INVERSE) && T_MR != NULL) /* inverse (reverse) */ | |
| 8038 out_str(T_MR); | |
| 8039 | |
| 8040 /* | |
| 8041 * Output the color or start string after bold etc., in case the | |
| 8042 * bold etc. override the color setting. | |
| 8043 */ | |
| 8044 if (aep != NULL) | |
| 8045 { | |
|
9027
773d627cac0b
commit https://github.com/vim/vim/commit/61be73bb0f965a895bfb064ea3e55476ac175162
Christian Brabandt <cb@256bit.org>
parents:
8977
diff
changeset
|
8046 #ifdef FEAT_TERMGUICOLORS |
|
773d627cac0b
commit https://github.com/vim/vim/commit/61be73bb0f965a895bfb064ea3e55476ac175162
Christian Brabandt <cb@256bit.org>
parents:
8977
diff
changeset
|
8047 if (p_tgc) |
|
8969
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8048 { |
|
9939
ccb6461b82df
commit https://github.com/vim/vim/commit/1b58cdd160c2e0ada0f638679a2aa27e4665fc48
Christian Brabandt <cb@256bit.org>
parents:
9885
diff
changeset
|
8049 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
|
8050 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
|
8051 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
|
8052 term_bg_rgb_color(aep->ae_u.cterm.bg_rgb); |
| 7 | 8053 } |
| 8054 else | |
|
8969
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8055 #endif |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8056 { |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8057 if (t_colors > 1) |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8058 { |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8059 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
|
8060 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
|
8061 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
|
8062 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
|
8063 } |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8064 else |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8065 { |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8066 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
|
8067 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
|
8068 } |
| 7 | 8069 } |
| 8070 } | |
| 8071 } | |
| 8072 } | |
| 8073 } | |
| 8074 | |
| 8075 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8076 screen_stop_highlight(void) |
| 7 | 8077 { |
| 8078 int do_ME = FALSE; /* output T_ME code */ | |
| 8079 | |
| 8080 if (screen_attr != 0 | |
| 8081 #ifdef WIN3264 | |
| 8082 && termcap_active | |
| 8083 #endif | |
| 8084 ) | |
| 8085 { | |
| 8086 #ifdef FEAT_GUI | |
| 8087 if (gui.in_use) | |
| 8088 { | |
| 8089 char buf[20]; | |
| 8090 | |
| 8091 /* use internal GUI code */ | |
| 8092 sprintf(buf, IF_EB("\033|%dH", ESC_STR "|%dH"), screen_attr); | |
| 8093 OUT_STR(buf); | |
| 8094 } | |
| 8095 else | |
| 8096 #endif | |
| 8097 { | |
| 8098 if (screen_attr > HL_ALL) /* special HL attr. */ | |
| 8099 { | |
| 8100 attrentry_T *aep; | |
| 8101 | |
|
8969
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8102 if (IS_CTERM) |
| 7 | 8103 { |
| 8104 /* | |
| 8105 * Assume that t_me restores the original colors! | |
| 8106 */ | |
| 8107 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
|
8108 if (aep != NULL && |
|
9027
773d627cac0b
commit https://github.com/vim/vim/commit/61be73bb0f965a895bfb064ea3e55476ac175162
Christian Brabandt <cb@256bit.org>
parents:
8977
diff
changeset
|
8109 #ifdef FEAT_TERMGUICOLORS |
|
773d627cac0b
commit https://github.com/vim/vim/commit/61be73bb0f965a895bfb064ea3e55476ac175162
Christian Brabandt <cb@256bit.org>
parents:
8977
diff
changeset
|
8110 (p_tgc ? |
|
9939
ccb6461b82df
commit https://github.com/vim/vim/commit/1b58cdd160c2e0ada0f638679a2aa27e4665fc48
Christian Brabandt <cb@256bit.org>
parents:
9885
diff
changeset
|
8111 (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
|
8112 || 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
|
8113 #endif |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8114 (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
|
8115 #ifdef FEAT_TERMGUICOLORS |
|
8969
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8116 ) |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8117 #endif |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8118 ) |
| 7 | 8119 do_ME = TRUE; |
| 8120 } | |
| 8121 else | |
| 8122 { | |
| 8123 aep = syn_term_attr2entry(screen_attr); | |
| 8124 if (aep != NULL && aep->ae_u.term.stop != NULL) | |
| 8125 { | |
| 8126 if (STRCMP(aep->ae_u.term.stop, T_ME) == 0) | |
| 8127 do_ME = TRUE; | |
| 8128 else | |
| 8129 out_str(aep->ae_u.term.stop); | |
| 8130 } | |
| 8131 } | |
| 8132 if (aep == NULL) /* did ":syntax clear" */ | |
| 8133 screen_attr = 0; | |
| 8134 else | |
| 8135 screen_attr = aep->ae_attr; | |
| 8136 } | |
| 8137 | |
| 8138 /* | |
| 8139 * Often all ending-codes are equal to T_ME. Avoid outputting the | |
| 8140 * same sequence several times. | |
| 8141 */ | |
| 8142 if (screen_attr & HL_STANDOUT) | |
| 8143 { | |
| 8144 if (STRCMP(T_SE, T_ME) == 0) | |
| 8145 do_ME = TRUE; | |
| 8146 else | |
| 8147 out_str(T_SE); | |
| 8148 } | |
| 205 | 8149 if (screen_attr & (HL_UNDERLINE | HL_UNDERCURL)) |
| 7 | 8150 { |
| 8151 if (STRCMP(T_UE, T_ME) == 0) | |
| 8152 do_ME = TRUE; | |
| 8153 else | |
| 8154 out_str(T_UE); | |
| 8155 } | |
| 8156 if (screen_attr & HL_ITALIC) | |
| 8157 { | |
| 8158 if (STRCMP(T_CZR, T_ME) == 0) | |
| 8159 do_ME = TRUE; | |
| 8160 else | |
| 8161 out_str(T_CZR); | |
| 8162 } | |
| 8163 if (do_ME || (screen_attr & (HL_BOLD | HL_INVERSE))) | |
| 8164 out_str(T_ME); | |
| 8165 | |
|
9027
773d627cac0b
commit https://github.com/vim/vim/commit/61be73bb0f965a895bfb064ea3e55476ac175162
Christian Brabandt <cb@256bit.org>
parents:
8977
diff
changeset
|
8166 #ifdef FEAT_TERMGUICOLORS |
|
773d627cac0b
commit https://github.com/vim/vim/commit/61be73bb0f965a895bfb064ea3e55476ac175162
Christian Brabandt <cb@256bit.org>
parents:
8977
diff
changeset
|
8167 if (p_tgc) |
|
8969
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8168 { |
|
9939
ccb6461b82df
commit https://github.com/vim/vim/commit/1b58cdd160c2e0ada0f638679a2aa27e4665fc48
Christian Brabandt <cb@256bit.org>
parents:
9885
diff
changeset
|
8169 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
|
8170 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
|
8171 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
|
8172 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
|
8173 } |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8174 else |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8175 #endif |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8176 { |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8177 if (t_colors > 1) |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8178 { |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8179 /* set Normal cterm colors */ |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8180 if (cterm_normal_fg_color != 0) |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8181 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
|
8182 if (cterm_normal_bg_color != 0) |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8183 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
|
8184 if (cterm_normal_fg_bold) |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8185 out_str(T_MD); |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8186 } |
| 7 | 8187 } |
| 8188 } | |
| 8189 } | |
| 8190 screen_attr = 0; | |
| 8191 } | |
| 8192 | |
| 8193 /* | |
| 8194 * Reset the colors for a cterm. Used when leaving Vim. | |
| 8195 * The machine specific code may override this again. | |
| 8196 */ | |
| 8197 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8198 reset_cterm_colors(void) |
| 7 | 8199 { |
|
8969
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8200 if (IS_CTERM) |
| 7 | 8201 { |
| 8202 /* set Normal cterm colors */ | |
|
9027
773d627cac0b
commit https://github.com/vim/vim/commit/61be73bb0f965a895bfb064ea3e55476ac175162
Christian Brabandt <cb@256bit.org>
parents:
8977
diff
changeset
|
8203 #ifdef FEAT_TERMGUICOLORS |
|
9939
ccb6461b82df
commit https://github.com/vim/vim/commit/1b58cdd160c2e0ada0f638679a2aa27e4665fc48
Christian Brabandt <cb@256bit.org>
parents:
9885
diff
changeset
|
8204 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
|
8205 || cterm_normal_bg_gui_color != INVALCOLOR) |
|
ccb6461b82df
commit https://github.com/vim/vim/commit/1b58cdd160c2e0ada0f638679a2aa27e4665fc48
Christian Brabandt <cb@256bit.org>
parents:
9885
diff
changeset
|
8206 : (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
|
8207 #else |
| 7 | 8208 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
|
8209 #endif |
| 7 | 8210 { |
| 8211 out_str(T_OP); | |
| 8212 screen_attr = -1; | |
| 8213 } | |
| 8214 if (cterm_normal_fg_bold) | |
| 8215 { | |
| 8216 out_str(T_ME); | |
| 8217 screen_attr = -1; | |
| 8218 } | |
| 8219 } | |
| 8220 } | |
| 8221 | |
| 8222 /* | |
| 8223 * Put character ScreenLines["off"] on the screen at position "row" and "col", | |
| 8224 * using the attributes from ScreenAttrs["off"]. | |
| 8225 */ | |
| 8226 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8227 screen_char(unsigned off, int row, int col) |
| 7 | 8228 { |
| 8229 int attr; | |
| 8230 | |
| 8231 /* Check for illegal values, just in case (could happen just after | |
| 8232 * resizing). */ | |
| 8233 if (row >= screen_Rows || col >= screen_Columns) | |
| 8234 return; | |
| 8235 | |
| 6602 | 8236 /* Outputting a character in the last cell on the screen may scroll the |
| 8237 * screen up. Only do it when the "xn" termcap property is set, otherwise | |
| 8238 * mark the character invalid (update it when scrolled up). */ | |
| 8239 if (*T_XN == NUL | |
| 8240 && row == screen_Rows - 1 && col == screen_Columns - 1 | |
| 7 | 8241 #ifdef FEAT_RIGHTLEFT |
| 8242 /* account for first command-line character in rightleft mode */ | |
| 8243 && !cmdmsg_rl | |
| 8244 #endif | |
| 8245 ) | |
| 8246 { | |
| 8247 ScreenAttrs[off] = (sattr_T)-1; | |
| 8248 return; | |
| 8249 } | |
| 8250 | |
| 8251 /* | |
| 8252 * Stop highlighting first, so it's easier to move the cursor. | |
| 8253 */ | |
|
8643
24b43dd167eb
commit https://github.com/vim/vim/commit/44a2f923c00f1384c9ecde12fb5b4711bc20702e
Christian Brabandt <cb@256bit.org>
parents:
8627
diff
changeset
|
8254 #if defined(FEAT_CLIPBOARD) || defined(FEAT_WINDOWS) |
| 7 | 8255 if (screen_char_attr != 0) |
| 8256 attr = screen_char_attr; | |
| 8257 else | |
| 8258 #endif | |
| 8259 attr = ScreenAttrs[off]; | |
| 8260 if (screen_attr != attr) | |
| 8261 screen_stop_highlight(); | |
| 8262 | |
| 8263 windgoto(row, col); | |
| 8264 | |
| 8265 if (screen_attr != attr) | |
| 8266 screen_start_highlight(attr); | |
| 8267 | |
| 8268 #ifdef FEAT_MBYTE | |
| 8269 if (enc_utf8 && ScreenLinesUC[off] != 0) | |
| 8270 { | |
| 8271 char_u buf[MB_MAXBYTES + 1]; | |
| 8272 | |
| 8273 /* Convert UTF-8 character to bytes and write it. */ | |
| 8274 | |
| 8275 buf[utfc_char2bytes(off, buf)] = NUL; | |
| 8276 | |
| 8277 out_str(buf); | |
|
8819
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8817
diff
changeset
|
8278 if (utf_ambiguous_width(ScreenLinesUC[off])) |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8817
diff
changeset
|
8279 screen_cur_col = 9999; |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8817
diff
changeset
|
8280 else if (utf_char2cells(ScreenLinesUC[off]) > 1) |
| 7 | 8281 ++screen_cur_col; |
| 8282 } | |
| 8283 else | |
| 8284 #endif | |
| 8285 { | |
| 8286 #ifdef FEAT_MBYTE | |
| 8287 out_flush_check(); | |
| 8288 #endif | |
| 8289 out_char(ScreenLines[off]); | |
| 8290 #ifdef FEAT_MBYTE | |
| 8291 /* double-byte character in single-width cell */ | |
| 8292 if (enc_dbcs == DBCS_JPNU && ScreenLines[off] == 0x8e) | |
| 8293 out_char(ScreenLines2[off]); | |
| 8294 #endif | |
| 8295 } | |
| 8296 | |
| 8297 screen_cur_col++; | |
| 8298 } | |
| 8299 | |
| 8300 #ifdef FEAT_MBYTE | |
| 8301 | |
| 8302 /* | |
| 8303 * Used for enc_dbcs only: Put one double-wide character at ScreenLines["off"] | |
| 8304 * on the screen at position 'row' and 'col'. | |
| 8305 * The attributes of the first byte is used for all. This is required to | |
| 8306 * output the two bytes of a double-byte character with nothing in between. | |
| 8307 */ | |
| 8308 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8309 screen_char_2(unsigned off, int row, int col) |
| 7 | 8310 { |
| 8311 /* Check for illegal values (could be wrong when screen was resized). */ | |
| 8312 if (off + 1 >= (unsigned)(screen_Rows * screen_Columns)) | |
| 8313 return; | |
| 8314 | |
| 8315 /* Outputting the last character on the screen may scrollup the screen. | |
| 8316 * Don't to it! Mark the character invalid (update it when scrolled up) */ | |
| 8317 if (row == screen_Rows - 1 && col >= screen_Columns - 2) | |
| 8318 { | |
| 8319 ScreenAttrs[off] = (sattr_T)-1; | |
| 8320 return; | |
| 8321 } | |
| 8322 | |
| 8323 /* Output the first byte normally (positions the cursor), then write the | |
| 8324 * second byte directly. */ | |
| 8325 screen_char(off, row, col); | |
| 8326 out_char(ScreenLines[off + 1]); | |
| 8327 ++screen_cur_col; | |
| 8328 } | |
| 8329 #endif | |
| 8330 | |
|
8643
24b43dd167eb
commit https://github.com/vim/vim/commit/44a2f923c00f1384c9ecde12fb5b4711bc20702e
Christian Brabandt <cb@256bit.org>
parents:
8627
diff
changeset
|
8331 #if defined(FEAT_CLIPBOARD) || defined(FEAT_WINDOWS) || defined(PROTO) |
| 7 | 8332 /* |
| 8333 * Draw a rectangle of the screen, inverted when "invert" is TRUE. | |
| 8334 * This uses the contents of ScreenLines[] and doesn't change it. | |
| 8335 */ | |
| 8336 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8337 screen_draw_rectangle( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8338 int row, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8339 int col, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8340 int height, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8341 int width, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8342 int invert) |
| 7 | 8343 { |
| 8344 int r, c; | |
| 8345 int off; | |
| 1378 | 8346 #ifdef FEAT_MBYTE |
| 8347 int max_off; | |
| 8348 #endif | |
| 7 | 8349 |
| 534 | 8350 /* Can't use ScreenLines unless initialized */ |
| 8351 if (ScreenLines == NULL) | |
| 8352 return; | |
| 8353 | |
| 7 | 8354 if (invert) |
| 8355 screen_char_attr = HL_INVERSE; | |
| 8356 for (r = row; r < row + height; ++r) | |
| 8357 { | |
| 8358 off = LineOffset[r]; | |
| 1378 | 8359 #ifdef FEAT_MBYTE |
| 8360 max_off = off + screen_Columns; | |
| 8361 #endif | |
| 7 | 8362 for (c = col; c < col + width; ++c) |
| 8363 { | |
| 8364 #ifdef FEAT_MBYTE | |
| 1378 | 8365 if (enc_dbcs != 0 && dbcs_off2cells(off + c, max_off) > 1) |
| 7 | 8366 { |
| 8367 screen_char_2(off + c, r, c); | |
| 8368 ++c; | |
| 8369 } | |
| 8370 else | |
| 8371 #endif | |
| 8372 { | |
| 8373 screen_char(off + c, r, c); | |
| 8374 #ifdef FEAT_MBYTE | |
| 1378 | 8375 if (utf_off2cells(off + c, max_off) > 1) |
| 7 | 8376 ++c; |
| 8377 #endif | |
| 8378 } | |
| 8379 } | |
| 8380 } | |
| 8381 screen_char_attr = 0; | |
| 8382 } | |
| 8383 #endif | |
| 8384 | |
|
8643
24b43dd167eb
commit https://github.com/vim/vim/commit/44a2f923c00f1384c9ecde12fb5b4711bc20702e
Christian Brabandt <cb@256bit.org>
parents:
8627
diff
changeset
|
8385 #ifdef FEAT_WINDOWS |
| 7 | 8386 /* |
| 8387 * Redraw the characters for a vertically split window. | |
| 8388 */ | |
| 8389 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8390 redraw_block(int row, int end, win_T *wp) |
| 7 | 8391 { |
| 8392 int col; | |
| 8393 int width; | |
| 8394 | |
| 8395 # ifdef FEAT_CLIPBOARD | |
| 8396 clip_may_clear_selection(row, end - 1); | |
| 8397 # endif | |
| 8398 | |
| 8399 if (wp == NULL) | |
| 8400 { | |
| 8401 col = 0; | |
| 8402 width = Columns; | |
| 8403 } | |
| 8404 else | |
| 8405 { | |
| 8406 col = wp->w_wincol; | |
| 8407 width = wp->w_width; | |
| 8408 } | |
| 8409 screen_draw_rectangle(row, col, end - row, width, FALSE); | |
| 8410 } | |
| 8411 #endif | |
| 8412 | |
| 8413 /* | |
| 8414 * Fill the screen from 'start_row' to 'end_row', from 'start_col' to 'end_col' | |
| 8415 * with character 'c1' in first column followed by 'c2' in the other columns. | |
| 8416 * Use attributes 'attr'. | |
| 8417 */ | |
| 8418 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8419 screen_fill( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8420 int start_row, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8421 int end_row, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8422 int start_col, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8423 int end_col, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8424 int c1, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8425 int c2, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8426 int attr) |
| 7 | 8427 { |
| 8428 int row; | |
| 8429 int col; | |
| 8430 int off; | |
| 8431 int end_off; | |
| 8432 int did_delete; | |
| 8433 int c; | |
| 8434 int norm_term; | |
| 8435 #if defined(FEAT_GUI) || defined(UNIX) | |
| 8436 int force_next = FALSE; | |
| 8437 #endif | |
| 8438 | |
| 8439 if (end_row > screen_Rows) /* safety check */ | |
| 8440 end_row = screen_Rows; | |
| 8441 if (end_col > screen_Columns) /* safety check */ | |
| 8442 end_col = screen_Columns; | |
| 8443 if (ScreenLines == NULL | |
| 8444 || start_row >= end_row | |
| 8445 || start_col >= end_col) /* nothing to do */ | |
| 8446 return; | |
| 8447 | |
| 8448 /* it's a "normal" terminal when not in a GUI or cterm */ | |
| 8449 norm_term = ( | |
| 8450 #ifdef FEAT_GUI | |
| 8451 !gui.in_use && | |
| 8452 #endif | |
|
8969
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8453 !IS_CTERM); |
| 7 | 8454 for (row = start_row; row < end_row; ++row) |
| 8455 { | |
| 1668 | 8456 #ifdef FEAT_MBYTE |
| 8457 if (has_mbyte | |
| 8458 # ifdef FEAT_GUI | |
| 8459 && !gui.in_use | |
| 8460 # endif | |
| 8461 ) | |
| 8462 { | |
| 8463 /* When drawing over the right halve of a double-wide char clear | |
| 8464 * out the left halve. When drawing over the left halve of a | |
| 8465 * double wide-char clear out the right halve. Only needed in a | |
| 8466 * terminal. */ | |
| 1685 | 8467 if (start_col > 0 && mb_fix_col(start_col, row) != start_col) |
| 1670 | 8468 screen_puts_len((char_u *)" ", 1, row, start_col - 1, 0); |
| 1677 | 8469 if (end_col < screen_Columns && mb_fix_col(end_col, row) != end_col) |
| 1670 | 8470 screen_puts_len((char_u *)" ", 1, row, end_col, 0); |
| 1668 | 8471 } |
| 8472 #endif | |
| 7 | 8473 /* |
| 8474 * Try to use delete-line termcap code, when no attributes or in a | |
| 8475 * "normal" terminal, where a bold/italic space is just a | |
| 8476 * space. | |
| 8477 */ | |
| 8478 did_delete = FALSE; | |
| 8479 if (c2 == ' ' | |
| 8480 && end_col == Columns | |
| 8481 && can_clear(T_CE) | |
| 8482 && (attr == 0 | |
| 8483 || (norm_term | |
| 8484 && attr <= HL_ALL | |
| 8485 && ((attr & ~(HL_BOLD | HL_ITALIC)) == 0)))) | |
| 8486 { | |
| 8487 /* | |
| 8488 * check if we really need to clear something | |
| 8489 */ | |
| 8490 col = start_col; | |
| 8491 if (c1 != ' ') /* don't clear first char */ | |
| 8492 ++col; | |
| 8493 | |
| 8494 off = LineOffset[row] + col; | |
| 8495 end_off = LineOffset[row] + end_col; | |
| 8496 | |
| 8497 /* skip blanks (used often, keep it fast!) */ | |
| 8498 #ifdef FEAT_MBYTE | |
| 8499 if (enc_utf8) | |
| 8500 while (off < end_off && ScreenLines[off] == ' ' | |
| 8501 && ScreenAttrs[off] == 0 && ScreenLinesUC[off] == 0) | |
| 8502 ++off; | |
| 8503 else | |
| 8504 #endif | |
| 8505 while (off < end_off && ScreenLines[off] == ' ' | |
| 8506 && ScreenAttrs[off] == 0) | |
| 8507 ++off; | |
| 8508 if (off < end_off) /* something to be cleared */ | |
| 8509 { | |
| 8510 col = off - LineOffset[row]; | |
| 8511 screen_stop_highlight(); | |
| 8512 term_windgoto(row, col);/* clear rest of this screen line */ | |
| 8513 out_str(T_CE); | |
| 8514 screen_start(); /* don't know where cursor is now */ | |
| 8515 col = end_col - col; | |
| 8516 while (col--) /* clear chars in ScreenLines */ | |
| 8517 { | |
| 8518 ScreenLines[off] = ' '; | |
| 8519 #ifdef FEAT_MBYTE | |
| 8520 if (enc_utf8) | |
| 8521 ScreenLinesUC[off] = 0; | |
| 8522 #endif | |
| 8523 ScreenAttrs[off] = 0; | |
| 8524 ++off; | |
| 8525 } | |
| 8526 } | |
| 8527 did_delete = TRUE; /* the chars are cleared now */ | |
| 8528 } | |
| 8529 | |
| 8530 off = LineOffset[row] + start_col; | |
| 8531 c = c1; | |
| 8532 for (col = start_col; col < end_col; ++col) | |
| 8533 { | |
| 8534 if (ScreenLines[off] != c | |
| 8535 #ifdef FEAT_MBYTE | |
| 714 | 8536 || (enc_utf8 && (int)ScreenLinesUC[off] |
| 8537 != (c >= 0x80 ? c : 0)) | |
| 7 | 8538 #endif |
| 8539 || ScreenAttrs[off] != attr | |
| 8540 #if defined(FEAT_GUI) || defined(UNIX) | |
| 8541 || force_next | |
| 8542 #endif | |
| 8543 ) | |
| 8544 { | |
| 8545 #if defined(FEAT_GUI) || defined(UNIX) | |
| 8546 /* The bold trick may make a single row of pixels appear in | |
| 8547 * the next character. When a bold character is removed, the | |
| 8548 * next character should be redrawn too. This happens for our | |
| 8549 * own GUI and for some xterms. */ | |
| 8550 if ( | |
| 8551 # ifdef FEAT_GUI | |
| 8552 gui.in_use | |
| 8553 # endif | |
| 8554 # if defined(FEAT_GUI) && defined(UNIX) | |
| 8555 || | |
| 8556 # endif | |
| 8557 # ifdef UNIX | |
| 8558 term_is_xterm | |
| 8559 # endif | |
| 8560 ) | |
| 8561 { | |
| 8562 if (ScreenLines[off] != ' ' | |
| 8563 && (ScreenAttrs[off] > HL_ALL | |
| 8564 || ScreenAttrs[off] & HL_BOLD)) | |
| 8565 force_next = TRUE; | |
| 8566 else | |
| 8567 force_next = FALSE; | |
| 8568 } | |
| 8569 #endif | |
| 8570 ScreenLines[off] = c; | |
| 8571 #ifdef FEAT_MBYTE | |
| 8572 if (enc_utf8) | |
| 8573 { | |
| 8574 if (c >= 0x80) | |
| 8575 { | |
| 8576 ScreenLinesUC[off] = c; | |
| 714 | 8577 ScreenLinesC[0][off] = 0; |
| 7 | 8578 } |
| 8579 else | |
| 8580 ScreenLinesUC[off] = 0; | |
| 8581 } | |
| 8582 #endif | |
| 8583 ScreenAttrs[off] = attr; | |
| 8584 if (!did_delete || c != ' ') | |
| 8585 screen_char(off, row, col); | |
| 8586 } | |
| 8587 ++off; | |
| 8588 if (col == start_col) | |
| 8589 { | |
| 8590 if (did_delete) | |
| 8591 break; | |
| 8592 c = c2; | |
| 8593 } | |
| 8594 } | |
| 8595 if (end_col == Columns) | |
| 8596 LineWraps[row] = FALSE; | |
| 8597 if (row == Rows - 1) /* overwritten the command line */ | |
| 8598 { | |
| 8599 redraw_cmdline = TRUE; | |
| 8600 if (c1 == ' ' && c2 == ' ') | |
| 8601 clear_cmdline = FALSE; /* command line has been cleared */ | |
| 644 | 8602 if (start_col == 0) |
| 8603 mode_displayed = FALSE; /* mode cleared or overwritten */ | |
| 7 | 8604 } |
| 8605 } | |
| 8606 } | |
| 8607 | |
| 8608 /* | |
| 8609 * Check if there should be a delay. Used before clearing or redrawing the | |
| 8610 * screen or the command line. | |
| 8611 */ | |
| 8612 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8613 check_for_delay(int check_msg_scroll) |
| 7 | 8614 { |
| 8615 if ((emsg_on_display || (check_msg_scroll && msg_scroll)) | |
| 8616 && !did_wait_return | |
| 8617 && emsg_silent == 0) | |
| 8618 { | |
| 8619 out_flush(); | |
| 8620 ui_delay(1000L, TRUE); | |
| 8621 emsg_on_display = FALSE; | |
| 8622 if (check_msg_scroll) | |
| 8623 msg_scroll = FALSE; | |
| 8624 } | |
| 8625 } | |
| 8626 | |
| 8627 /* | |
| 8628 * screen_valid - allocate screen buffers if size changed | |
| 3263 | 8629 * If "doclear" is TRUE: clear screen if it has been resized. |
| 7 | 8630 * Returns TRUE if there is a valid screen to write to. |
| 8631 * Returns FALSE when starting up and screen not initialized yet. | |
| 8632 */ | |
| 8633 int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8634 screen_valid(int doclear) |
| 7 | 8635 { |
| 3263 | 8636 screenalloc(doclear); /* allocate screen buffers if size changed */ |
| 7 | 8637 return (ScreenLines != NULL); |
| 8638 } | |
| 8639 | |
| 8640 /* | |
| 8641 * Resize the shell to Rows and Columns. | |
| 8642 * Allocate ScreenLines[] and associated items. | |
| 8643 * | |
| 8644 * There may be some time between setting Rows and Columns and (re)allocating | |
| 8645 * ScreenLines[]. This happens when starting up and when (manually) changing | |
| 8646 * the shell size. Always use screen_Rows and screen_Columns to access items | |
| 8647 * in ScreenLines[]. Use Rows and Columns for positioning text etc. where the | |
| 8648 * final size of the shell is needed. | |
| 8649 */ | |
| 8650 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8651 screenalloc(int doclear) |
| 7 | 8652 { |
| 8653 int new_row, old_row; | |
| 8654 #ifdef FEAT_GUI | |
| 8655 int old_Rows; | |
| 8656 #endif | |
| 8657 win_T *wp; | |
| 8658 int outofmem = FALSE; | |
| 8659 int len; | |
| 8660 schar_T *new_ScreenLines; | |
| 8661 #ifdef FEAT_MBYTE | |
| 8662 u8char_T *new_ScreenLinesUC = NULL; | |
| 714 | 8663 u8char_T *new_ScreenLinesC[MAX_MCO]; |
| 7 | 8664 schar_T *new_ScreenLines2 = NULL; |
| 714 | 8665 int i; |
| 7 | 8666 #endif |
| 8667 sattr_T *new_ScreenAttrs; | |
| 8668 unsigned *new_LineOffset; | |
| 8669 char_u *new_LineWraps; | |
| 671 | 8670 #ifdef FEAT_WINDOWS |
| 681 | 8671 short *new_TabPageIdxs; |
| 671 | 8672 tabpage_T *tp; |
| 8673 #endif | |
| 7 | 8674 static int entered = FALSE; /* avoid recursiveness */ |
| 944 | 8675 static int done_outofmem_msg = FALSE; /* did outofmem message */ |
| 1824 | 8676 #ifdef FEAT_AUTOCMD |
| 8677 int retry_count = 0; | |
| 8678 | |
| 8679 retry: | |
| 8680 #endif | |
| 7 | 8681 /* |
| 8682 * Allocation of the screen buffers is done only when the size changes and | |
| 8683 * when Rows and Columns have been set and we have started doing full | |
| 8684 * screen stuff. | |
| 8685 */ | |
| 8686 if ((ScreenLines != NULL | |
| 8687 && Rows == screen_Rows | |
| 8688 && Columns == screen_Columns | |
| 8689 #ifdef FEAT_MBYTE | |
| 8690 && enc_utf8 == (ScreenLinesUC != NULL) | |
| 8691 && (enc_dbcs == DBCS_JPNU) == (ScreenLines2 != NULL) | |
| 714 | 8692 && p_mco == Screen_mco |
| 7 | 8693 #endif |
| 8694 ) | |
| 8695 || Rows == 0 | |
| 8696 || Columns == 0 | |
| 8697 || (!full_screen && ScreenLines == NULL)) | |
| 8698 return; | |
| 8699 | |
| 8700 /* | |
| 8701 * It's possible that we produce an out-of-memory message below, which | |
| 8702 * will cause this function to be called again. To break the loop, just | |
| 8703 * return here. | |
| 8704 */ | |
| 8705 if (entered) | |
| 8706 return; | |
| 8707 entered = TRUE; | |
| 8708 | |
| 911 | 8709 /* |
| 8710 * Note that the window sizes are updated before reallocating the arrays, | |
| 8711 * thus we must not redraw here! | |
| 8712 */ | |
| 8713 ++RedrawingDisabled; | |
| 8714 | |
| 7 | 8715 win_new_shellsize(); /* fit the windows in the new sized shell */ |
| 8716 | |
| 8717 comp_col(); /* recompute columns for shown command and ruler */ | |
| 8718 | |
| 8719 /* | |
| 8720 * We're changing the size of the screen. | |
| 8721 * - Allocate new arrays for ScreenLines and ScreenAttrs. | |
| 8722 * - Move lines from the old arrays into the new arrays, clear extra | |
| 8723 * lines (unless the screen is going to be cleared). | |
| 8724 * - Free the old arrays. | |
| 8725 * | |
| 8726 * If anything fails, make ScreenLines NULL, so we don't do anything! | |
| 8727 * Continuing with the old ScreenLines may result in a crash, because the | |
| 8728 * size is wrong. | |
| 8729 */ | |
| 671 | 8730 FOR_ALL_TAB_WINDOWS(tp, wp) |
| 7 | 8731 win_free_lsize(wp); |
| 1946 | 8732 #ifdef FEAT_AUTOCMD |
| 8733 if (aucmd_win != NULL) | |
| 8734 win_free_lsize(aucmd_win); | |
| 8735 #endif | |
| 7 | 8736 |
| 8737 new_ScreenLines = (schar_T *)lalloc((long_u)( | |
| 8738 (Rows + 1) * Columns * sizeof(schar_T)), FALSE); | |
| 8739 #ifdef FEAT_MBYTE | |
|
2122
476336a5ae95
updated for version 7.2.404
Bram Moolenaar <bram@zimbu.org>
parents:
2069
diff
changeset
|
8740 vim_memset(new_ScreenLinesC, 0, sizeof(u8char_T *) * MAX_MCO); |
| 7 | 8741 if (enc_utf8) |
| 8742 { | |
| 8743 new_ScreenLinesUC = (u8char_T *)lalloc((long_u)( | |
| 8744 (Rows + 1) * Columns * sizeof(u8char_T)), FALSE); | |
| 714 | 8745 for (i = 0; i < p_mco; ++i) |
|
2124
dc8a5699253b
updated for version 7.2.406
Bram Moolenaar <bram@zimbu.org>
parents:
2122
diff
changeset
|
8746 new_ScreenLinesC[i] = (u8char_T *)lalloc_clear((long_u)( |
| 7 | 8747 (Rows + 1) * Columns * sizeof(u8char_T)), FALSE); |
| 8748 } | |
| 8749 if (enc_dbcs == DBCS_JPNU) | |
| 8750 new_ScreenLines2 = (schar_T *)lalloc((long_u)( | |
| 8751 (Rows + 1) * Columns * sizeof(schar_T)), FALSE); | |
| 8752 #endif | |
| 8753 new_ScreenAttrs = (sattr_T *)lalloc((long_u)( | |
| 8754 (Rows + 1) * Columns * sizeof(sattr_T)), FALSE); | |
| 8755 new_LineOffset = (unsigned *)lalloc((long_u)( | |
| 8756 Rows * sizeof(unsigned)), FALSE); | |
| 8757 new_LineWraps = (char_u *)lalloc((long_u)(Rows * sizeof(char_u)), FALSE); | |
| 671 | 8758 #ifdef FEAT_WINDOWS |
| 681 | 8759 new_TabPageIdxs = (short *)lalloc((long_u)(Columns * sizeof(short)), FALSE); |
| 671 | 8760 #endif |
| 7 | 8761 |
| 677 | 8762 FOR_ALL_TAB_WINDOWS(tp, wp) |
| 7 | 8763 { |
| 8764 if (win_alloc_lines(wp) == FAIL) | |
| 8765 { | |
| 8766 outofmem = TRUE; | |
| 8767 #ifdef FEAT_WINDOWS | |
| 1819 | 8768 goto give_up; |
| 8769 #endif | |
| 8770 } | |
| 8771 } | |
| 1906 | 8772 #ifdef FEAT_AUTOCMD |
| 1946 | 8773 if (aucmd_win != NULL && aucmd_win->w_lines == NULL |
| 8774 && win_alloc_lines(aucmd_win) == FAIL) | |
| 1906 | 8775 outofmem = TRUE; |
| 8776 #endif | |
| 1819 | 8777 #ifdef FEAT_WINDOWS |
| 8778 give_up: | |
| 8779 #endif | |
| 7 | 8780 |
| 714 | 8781 #ifdef FEAT_MBYTE |
| 8782 for (i = 0; i < p_mco; ++i) | |
| 8783 if (new_ScreenLinesC[i] == NULL) | |
| 8784 break; | |
| 8785 #endif | |
| 7 | 8786 if (new_ScreenLines == NULL |
| 8787 #ifdef FEAT_MBYTE | |
| 714 | 8788 || (enc_utf8 && (new_ScreenLinesUC == NULL || i != p_mco)) |
| 7 | 8789 || (enc_dbcs == DBCS_JPNU && new_ScreenLines2 == NULL) |
| 8790 #endif | |
| 8791 || new_ScreenAttrs == NULL | |
| 8792 || new_LineOffset == NULL | |
| 8793 || new_LineWraps == NULL | |
| 671 | 8794 #ifdef FEAT_WINDOWS |
| 8795 || new_TabPageIdxs == NULL | |
| 8796 #endif | |
| 7 | 8797 || outofmem) |
| 8798 { | |
| 944 | 8799 if (ScreenLines != NULL || !done_outofmem_msg) |
| 534 | 8800 { |
| 8801 /* guess the size */ | |
| 8802 do_outofmem_msg((long_u)((Rows + 1) * Columns)); | |
| 8803 | |
| 8804 /* Remember we did this to avoid getting outofmem messages over | |
| 8805 * and over again. */ | |
| 944 | 8806 done_outofmem_msg = TRUE; |
| 534 | 8807 } |
| 7 | 8808 vim_free(new_ScreenLines); |
| 8809 new_ScreenLines = NULL; | |
| 8810 #ifdef FEAT_MBYTE | |
| 8811 vim_free(new_ScreenLinesUC); | |
| 8812 new_ScreenLinesUC = NULL; | |
| 714 | 8813 for (i = 0; i < p_mco; ++i) |
| 8814 { | |
| 8815 vim_free(new_ScreenLinesC[i]); | |
| 8816 new_ScreenLinesC[i] = NULL; | |
| 8817 } | |
| 7 | 8818 vim_free(new_ScreenLines2); |
| 8819 new_ScreenLines2 = NULL; | |
| 8820 #endif | |
| 8821 vim_free(new_ScreenAttrs); | |
| 8822 new_ScreenAttrs = NULL; | |
| 8823 vim_free(new_LineOffset); | |
| 8824 new_LineOffset = NULL; | |
| 8825 vim_free(new_LineWraps); | |
| 8826 new_LineWraps = NULL; | |
| 671 | 8827 #ifdef FEAT_WINDOWS |
| 8828 vim_free(new_TabPageIdxs); | |
| 8829 new_TabPageIdxs = NULL; | |
| 8830 #endif | |
| 7 | 8831 } |
| 8832 else | |
| 8833 { | |
| 944 | 8834 done_outofmem_msg = FALSE; |
| 534 | 8835 |
| 7 | 8836 for (new_row = 0; new_row < Rows; ++new_row) |
| 8837 { | |
| 8838 new_LineOffset[new_row] = new_row * Columns; | |
| 8839 new_LineWraps[new_row] = FALSE; | |
| 8840 | |
| 8841 /* | |
| 8842 * If the screen is not going to be cleared, copy as much as | |
| 8843 * possible from the old screen to the new one and clear the rest | |
| 8844 * (used when resizing the window at the "--more--" prompt or when | |
| 8845 * executing an external command, for the GUI). | |
| 8846 */ | |
| 3263 | 8847 if (!doclear) |
| 7 | 8848 { |
| 8849 (void)vim_memset(new_ScreenLines + new_row * Columns, | |
| 8850 ' ', (size_t)Columns * sizeof(schar_T)); | |
| 8851 #ifdef FEAT_MBYTE | |
| 8852 if (enc_utf8) | |
| 8853 { | |
| 8854 (void)vim_memset(new_ScreenLinesUC + new_row * Columns, | |
| 8855 0, (size_t)Columns * sizeof(u8char_T)); | |
| 714 | 8856 for (i = 0; i < p_mco; ++i) |
| 8857 (void)vim_memset(new_ScreenLinesC[i] | |
| 8858 + new_row * Columns, | |
| 7 | 8859 0, (size_t)Columns * sizeof(u8char_T)); |
| 8860 } | |
| 8861 if (enc_dbcs == DBCS_JPNU) | |
| 8862 (void)vim_memset(new_ScreenLines2 + new_row * Columns, | |
| 8863 0, (size_t)Columns * sizeof(schar_T)); | |
| 8864 #endif | |
| 8865 (void)vim_memset(new_ScreenAttrs + new_row * Columns, | |
| 8866 0, (size_t)Columns * sizeof(sattr_T)); | |
| 8867 old_row = new_row + (screen_Rows - Rows); | |
| 534 | 8868 if (old_row >= 0 && ScreenLines != NULL) |
| 7 | 8869 { |
| 8870 if (screen_Columns < Columns) | |
| 8871 len = screen_Columns; | |
| 8872 else | |
| 8873 len = Columns; | |
| 26 | 8874 #ifdef FEAT_MBYTE |
| 571 | 8875 /* When switching to utf-8 don't copy characters, they |
| 714 | 8876 * may be invalid now. Also when p_mco changes. */ |
| 8877 if (!(enc_utf8 && ScreenLinesUC == NULL) | |
| 8878 && p_mco == Screen_mco) | |
| 26 | 8879 #endif |
| 8880 mch_memmove(new_ScreenLines + new_LineOffset[new_row], | |
| 8881 ScreenLines + LineOffset[old_row], | |
| 8882 (size_t)len * sizeof(schar_T)); | |
| 7 | 8883 #ifdef FEAT_MBYTE |
| 714 | 8884 if (enc_utf8 && ScreenLinesUC != NULL |
| 8885 && p_mco == Screen_mco) | |
| 7 | 8886 { |
| 8887 mch_memmove(new_ScreenLinesUC + new_LineOffset[new_row], | |
| 8888 ScreenLinesUC + LineOffset[old_row], | |
| 8889 (size_t)len * sizeof(u8char_T)); | |
| 714 | 8890 for (i = 0; i < p_mco; ++i) |
| 8891 mch_memmove(new_ScreenLinesC[i] | |
| 8892 + new_LineOffset[new_row], | |
| 8893 ScreenLinesC[i] + LineOffset[old_row], | |
| 7 | 8894 (size_t)len * sizeof(u8char_T)); |
| 8895 } | |
| 8896 if (enc_dbcs == DBCS_JPNU && ScreenLines2 != NULL) | |
| 8897 mch_memmove(new_ScreenLines2 + new_LineOffset[new_row], | |
| 8898 ScreenLines2 + LineOffset[old_row], | |
| 8899 (size_t)len * sizeof(schar_T)); | |
| 8900 #endif | |
| 8901 mch_memmove(new_ScreenAttrs + new_LineOffset[new_row], | |
| 8902 ScreenAttrs + LineOffset[old_row], | |
| 8903 (size_t)len * sizeof(sattr_T)); | |
| 8904 } | |
| 8905 } | |
| 8906 } | |
| 8907 /* Use the last line of the screen for the current line. */ | |
| 8908 current_ScreenLine = new_ScreenLines + Rows * Columns; | |
| 8909 } | |
| 8910 | |
| 356 | 8911 free_screenlines(); |
| 8912 | |
| 7 | 8913 ScreenLines = new_ScreenLines; |
| 8914 #ifdef FEAT_MBYTE | |
| 8915 ScreenLinesUC = new_ScreenLinesUC; | |
| 714 | 8916 for (i = 0; i < p_mco; ++i) |
| 8917 ScreenLinesC[i] = new_ScreenLinesC[i]; | |
| 8918 Screen_mco = p_mco; | |
| 7 | 8919 ScreenLines2 = new_ScreenLines2; |
| 8920 #endif | |
| 8921 ScreenAttrs = new_ScreenAttrs; | |
| 8922 LineOffset = new_LineOffset; | |
| 8923 LineWraps = new_LineWraps; | |
| 671 | 8924 #ifdef FEAT_WINDOWS |
| 8925 TabPageIdxs = new_TabPageIdxs; | |
| 8926 #endif | |
| 7 | 8927 |
| 8928 /* It's important that screen_Rows and screen_Columns reflect the actual | |
| 8929 * size of ScreenLines[]. Set them before calling anything. */ | |
| 8930 #ifdef FEAT_GUI | |
| 8931 old_Rows = screen_Rows; | |
| 8932 #endif | |
| 8933 screen_Rows = Rows; | |
| 8934 screen_Columns = Columns; | |
| 8935 | |
| 8936 must_redraw = CLEAR; /* need to clear the screen later */ | |
| 3263 | 8937 if (doclear) |
| 7 | 8938 screenclear2(); |
| 8939 | |
| 8940 #ifdef FEAT_GUI | |
| 8941 else if (gui.in_use | |
| 8942 && !gui.starting | |
| 8943 && ScreenLines != NULL | |
| 8944 && old_Rows != Rows) | |
| 8945 { | |
| 8946 (void)gui_redraw_block(0, 0, (int)Rows - 1, (int)Columns - 1, 0); | |
| 8947 /* | |
| 8948 * Adjust the position of the cursor, for when executing an external | |
| 8949 * command. | |
| 8950 */ | |
| 8951 if (msg_row >= Rows) /* Rows got smaller */ | |
| 8952 msg_row = Rows - 1; /* put cursor at last row */ | |
| 8953 else if (Rows > old_Rows) /* Rows got bigger */ | |
| 8954 msg_row += Rows - old_Rows; /* put cursor in same place */ | |
| 8955 if (msg_col >= Columns) /* Columns got smaller */ | |
| 8956 msg_col = Columns - 1; /* put cursor at last column */ | |
| 8957 } | |
| 8958 #endif | |
| 8959 | |
| 8960 entered = FALSE; | |
| 911 | 8961 --RedrawingDisabled; |
| 766 | 8962 |
| 8963 #ifdef FEAT_AUTOCMD | |
| 1824 | 8964 /* |
| 8965 * Do not apply autocommands more than 3 times to avoid an endless loop | |
| 8966 * in case applying autocommands always changes Rows or Columns. | |
| 8967 */ | |
| 8968 if (starting == 0 && ++retry_count <= 3) | |
| 8969 { | |
| 766 | 8970 apply_autocmds(EVENT_VIMRESIZED, NULL, NULL, FALSE, curbuf); |
| 1824 | 8971 /* In rare cases, autocommands may have altered Rows or Columns, |
| 8972 * jump back to check if we need to allocate the screen again. */ | |
| 8973 goto retry; | |
| 8974 } | |
| 766 | 8975 #endif |
| 7 | 8976 } |
| 8977 | |
| 8978 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8979 free_screenlines(void) |
| 356 | 8980 { |
| 8981 #ifdef FEAT_MBYTE | |
| 714 | 8982 int i; |
| 8983 | |
| 356 | 8984 vim_free(ScreenLinesUC); |
| 714 | 8985 for (i = 0; i < Screen_mco; ++i) |
| 8986 vim_free(ScreenLinesC[i]); | |
| 356 | 8987 vim_free(ScreenLines2); |
| 8988 #endif | |
| 714 | 8989 vim_free(ScreenLines); |
| 356 | 8990 vim_free(ScreenAttrs); |
| 8991 vim_free(LineOffset); | |
| 8992 vim_free(LineWraps); | |
| 671 | 8993 #ifdef FEAT_WINDOWS |
| 8994 vim_free(TabPageIdxs); | |
| 8995 #endif | |
| 356 | 8996 } |
| 8997 | |
| 8998 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8999 screenclear(void) |
| 7 | 9000 { |
| 9001 check_for_delay(FALSE); | |
| 9002 screenalloc(FALSE); /* allocate screen buffers if size changed */ | |
| 9003 screenclear2(); /* clear the screen */ | |
| 9004 } | |
| 9005 | |
| 9006 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9007 screenclear2(void) |
| 7 | 9008 { |
| 9009 int i; | |
| 9010 | |
| 9011 if (starting == NO_SCREEN || ScreenLines == NULL | |
| 9012 #ifdef FEAT_GUI | |
| 9013 || (gui.in_use && gui.starting) | |
| 9014 #endif | |
| 9015 ) | |
| 9016 return; | |
| 9017 | |
| 9018 #ifdef FEAT_GUI | |
| 9019 if (!gui.in_use) | |
| 9020 #endif | |
| 9021 screen_attr = -1; /* force setting the Normal colors */ | |
| 9022 screen_stop_highlight(); /* don't want highlighting here */ | |
| 9023 | |
| 9024 #ifdef FEAT_CLIPBOARD | |
| 9025 /* disable selection without redrawing it */ | |
| 9026 clip_scroll_selection(9999); | |
| 9027 #endif | |
| 9028 | |
| 9029 /* blank out ScreenLines */ | |
| 9030 for (i = 0; i < Rows; ++i) | |
| 9031 { | |
| 9032 lineclear(LineOffset[i], (int)Columns); | |
| 9033 LineWraps[i] = FALSE; | |
| 9034 } | |
| 9035 | |
| 9036 if (can_clear(T_CL)) | |
| 9037 { | |
| 9038 out_str(T_CL); /* clear the display */ | |
| 9039 clear_cmdline = FALSE; | |
| 644 | 9040 mode_displayed = FALSE; |
| 7 | 9041 } |
| 9042 else | |
| 9043 { | |
| 9044 /* can't clear the screen, mark all chars with invalid attributes */ | |
| 9045 for (i = 0; i < Rows; ++i) | |
| 9046 lineinvalid(LineOffset[i], (int)Columns); | |
| 9047 clear_cmdline = TRUE; | |
| 9048 } | |
| 9049 | |
| 9050 screen_cleared = TRUE; /* can use contents of ScreenLines now */ | |
| 9051 | |
| 9052 win_rest_invalid(firstwin); | |
| 9053 redraw_cmdline = TRUE; | |
| 670 | 9054 #ifdef FEAT_WINDOWS |
| 673 | 9055 redraw_tabline = TRUE; |
| 670 | 9056 #endif |
| 7 | 9057 if (must_redraw == CLEAR) /* no need to clear again */ |
| 9058 must_redraw = NOT_VALID; | |
| 9059 compute_cmdrow(); | |
| 9060 msg_row = cmdline_row; /* put cursor on last line for messages */ | |
| 9061 msg_col = 0; | |
| 9062 screen_start(); /* don't know where cursor is now */ | |
| 9063 msg_scrolled = 0; /* can't scroll back */ | |
| 9064 msg_didany = FALSE; | |
| 9065 msg_didout = FALSE; | |
| 9066 } | |
| 9067 | |
| 9068 /* | |
| 9069 * Clear one line in ScreenLines. | |
| 9070 */ | |
| 9071 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9072 lineclear(unsigned off, int width) |
| 7 | 9073 { |
| 9074 (void)vim_memset(ScreenLines + off, ' ', (size_t)width * sizeof(schar_T)); | |
| 9075 #ifdef FEAT_MBYTE | |
| 9076 if (enc_utf8) | |
| 9077 (void)vim_memset(ScreenLinesUC + off, 0, | |
| 9078 (size_t)width * sizeof(u8char_T)); | |
| 9079 #endif | |
| 9080 (void)vim_memset(ScreenAttrs + off, 0, (size_t)width * sizeof(sattr_T)); | |
| 9081 } | |
| 9082 | |
| 9083 /* | |
| 9084 * Mark one line in ScreenLines invalid by setting the attributes to an | |
| 9085 * invalid value. | |
| 9086 */ | |
| 9087 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9088 lineinvalid(unsigned off, int width) |
| 7 | 9089 { |
| 9090 (void)vim_memset(ScreenAttrs + off, -1, (size_t)width * sizeof(sattr_T)); | |
| 9091 } | |
| 9092 | |
|
8643
24b43dd167eb
commit https://github.com/vim/vim/commit/44a2f923c00f1384c9ecde12fb5b4711bc20702e
Christian Brabandt <cb@256bit.org>
parents:
8627
diff
changeset
|
9093 #ifdef FEAT_WINDOWS |
| 7 | 9094 /* |
| 9095 * Copy part of a Screenline for vertically split window "wp". | |
| 9096 */ | |
| 9097 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9098 linecopy(int to, int from, win_T *wp) |
| 7 | 9099 { |
| 9100 unsigned off_to = LineOffset[to] + wp->w_wincol; | |
| 9101 unsigned off_from = LineOffset[from] + wp->w_wincol; | |
| 9102 | |
| 9103 mch_memmove(ScreenLines + off_to, ScreenLines + off_from, | |
| 9104 wp->w_width * sizeof(schar_T)); | |
| 9105 # ifdef FEAT_MBYTE | |
| 9106 if (enc_utf8) | |
| 9107 { | |
| 714 | 9108 int i; |
| 9109 | |
| 7 | 9110 mch_memmove(ScreenLinesUC + off_to, ScreenLinesUC + off_from, |
| 9111 wp->w_width * sizeof(u8char_T)); | |
| 714 | 9112 for (i = 0; i < p_mco; ++i) |
| 9113 mch_memmove(ScreenLinesC[i] + off_to, ScreenLinesC[i] + off_from, | |
| 9114 wp->w_width * sizeof(u8char_T)); | |
| 7 | 9115 } |
| 9116 if (enc_dbcs == DBCS_JPNU) | |
| 9117 mch_memmove(ScreenLines2 + off_to, ScreenLines2 + off_from, | |
| 9118 wp->w_width * sizeof(schar_T)); | |
| 9119 # endif | |
| 9120 mch_memmove(ScreenAttrs + off_to, ScreenAttrs + off_from, | |
| 9121 wp->w_width * sizeof(sattr_T)); | |
| 9122 } | |
| 9123 #endif | |
| 9124 | |
| 9125 /* | |
| 9126 * Return TRUE if clearing with term string "p" would work. | |
| 9127 * It can't work when the string is empty or it won't set the right background. | |
| 9128 */ | |
| 9129 int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9130 can_clear(char_u *p) |
| 7 | 9131 { |
| 9132 return (*p != NUL && (t_colors <= 1 | |
| 9133 #ifdef FEAT_GUI | |
| 9134 || gui.in_use | |
| 9135 #endif | |
|
9027
773d627cac0b
commit https://github.com/vim/vim/commit/61be73bb0f965a895bfb064ea3e55476ac175162
Christian Brabandt <cb@256bit.org>
parents:
8977
diff
changeset
|
9136 #ifdef FEAT_TERMGUICOLORS |
|
9939
ccb6461b82df
commit https://github.com/vim/vim/commit/1b58cdd160c2e0ada0f638679a2aa27e4665fc48
Christian Brabandt <cb@256bit.org>
parents:
9885
diff
changeset
|
9137 || (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
|
9138 || (!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
|
9139 #else |
|
b6472fd9f5ba
commit https://github.com/vim/vim/commit/d18f672fc9477f3c0cb7cc4ce8d9237ed825c612
Christian Brabandt <cb@256bit.org>
parents:
9282
diff
changeset
|
9140 || cterm_normal_bg_color == 0 |
|
b6472fd9f5ba
commit https://github.com/vim/vim/commit/d18f672fc9477f3c0cb7cc4ce8d9237ed825c612
Christian Brabandt <cb@256bit.org>
parents:
9282
diff
changeset
|
9141 #endif |
|
b6472fd9f5ba
commit https://github.com/vim/vim/commit/d18f672fc9477f3c0cb7cc4ce8d9237ed825c612
Christian Brabandt <cb@256bit.org>
parents:
9282
diff
changeset
|
9142 || *T_UT != NUL)); |
| 7 | 9143 } |
| 9144 | |
| 9145 /* | |
| 9146 * Reset cursor position. Use whenever cursor was moved because of outputting | |
| 9147 * something directly to the screen (shell commands) or a terminal control | |
| 9148 * code. | |
| 9149 */ | |
| 9150 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9151 screen_start(void) |
| 7 | 9152 { |
| 9153 screen_cur_row = screen_cur_col = 9999; | |
| 9154 } | |
| 9155 | |
| 9156 /* | |
| 9157 * Move the cursor to position "row","col" in the screen. | |
| 9158 * This tries to find the most efficient way to move, minimizing the number of | |
| 9159 * characters sent to the terminal. | |
| 9160 */ | |
| 9161 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9162 windgoto(int row, int col) |
| 7 | 9163 { |
| 205 | 9164 sattr_T *p; |
| 7 | 9165 int i; |
| 9166 int plan; | |
| 9167 int cost; | |
| 9168 int wouldbe_col; | |
| 9169 int noinvcurs; | |
| 9170 char_u *bs; | |
| 9171 int goto_cost; | |
| 9172 int attr; | |
| 9173 | |
| 1213 | 9174 #define GOTO_COST 7 /* assume a term_windgoto() takes about 7 chars */ |
| 7 | 9175 #define HIGHL_COST 5 /* assume unhighlight takes 5 chars */ |
| 9176 | |
| 9177 #define PLAN_LE 1 | |
| 9178 #define PLAN_CR 2 | |
| 9179 #define PLAN_NL 3 | |
| 9180 #define PLAN_WRITE 4 | |
| 9181 /* Can't use ScreenLines unless initialized */ | |
| 9182 if (ScreenLines == NULL) | |
| 9183 return; | |
| 9184 | |
| 9185 if (col != screen_cur_col || row != screen_cur_row) | |
| 9186 { | |
| 9187 /* Check for valid position. */ | |
| 9188 if (row < 0) /* window without text lines? */ | |
| 9189 row = 0; | |
| 9190 if (row >= screen_Rows) | |
| 9191 row = screen_Rows - 1; | |
| 9192 if (col >= screen_Columns) | |
| 9193 col = screen_Columns - 1; | |
| 9194 | |
| 9195 /* check if no cursor movement is allowed in highlight mode */ | |
| 9196 if (screen_attr && *T_MS == NUL) | |
| 9197 noinvcurs = HIGHL_COST; | |
| 9198 else | |
| 9199 noinvcurs = 0; | |
| 9200 goto_cost = GOTO_COST + noinvcurs; | |
| 9201 | |
| 9202 /* | |
| 9203 * Plan how to do the positioning: | |
| 9204 * 1. Use CR to move it to column 0, same row. | |
| 9205 * 2. Use T_LE to move it a few columns to the left. | |
| 9206 * 3. Use NL to move a few lines down, column 0. | |
| 9207 * 4. Move a few columns to the right with T_ND or by writing chars. | |
| 9208 * | |
| 9209 * Don't do this if the cursor went beyond the last column, the cursor | |
| 9210 * position is unknown then (some terminals wrap, some don't ) | |
| 9211 * | |
| 1213 | 9212 * First check if the highlighting attributes allow us to write |
| 7 | 9213 * characters to move the cursor to the right. |
| 9214 */ | |
| 9215 if (row >= screen_cur_row && screen_cur_col < Columns) | |
| 9216 { | |
| 9217 /* | |
| 9218 * If the cursor is in the same row, bigger col, we can use CR | |
| 9219 * or T_LE. | |
| 9220 */ | |
| 9221 bs = NULL; /* init for GCC */ | |
| 9222 attr = screen_attr; | |
| 9223 if (row == screen_cur_row && col < screen_cur_col) | |
| 9224 { | |
| 9225 /* "le" is preferred over "bc", because "bc" is obsolete */ | |
| 9226 if (*T_LE) | |
| 9227 bs = T_LE; /* "cursor left" */ | |
| 9228 else | |
| 9229 bs = T_BC; /* "backspace character (old) */ | |
| 9230 if (*bs) | |
| 9231 cost = (screen_cur_col - col) * (int)STRLEN(bs); | |
| 9232 else | |
| 9233 cost = 999; | |
| 9234 if (col + 1 < cost) /* using CR is less characters */ | |
| 9235 { | |
| 9236 plan = PLAN_CR; | |
| 9237 wouldbe_col = 0; | |
| 9238 cost = 1; /* CR is just one character */ | |
| 9239 } | |
| 9240 else | |
| 9241 { | |
| 9242 plan = PLAN_LE; | |
| 9243 wouldbe_col = col; | |
| 9244 } | |
| 9245 if (noinvcurs) /* will stop highlighting */ | |
| 9246 { | |
| 9247 cost += noinvcurs; | |
| 9248 attr = 0; | |
| 9249 } | |
| 9250 } | |
| 9251 | |
| 9252 /* | |
| 9253 * If the cursor is above where we want to be, we can use CR LF. | |
| 9254 */ | |
| 9255 else if (row > screen_cur_row) | |
| 9256 { | |
| 9257 plan = PLAN_NL; | |
| 9258 wouldbe_col = 0; | |
| 9259 cost = (row - screen_cur_row) * 2; /* CR LF */ | |
| 9260 if (noinvcurs) /* will stop highlighting */ | |
| 9261 { | |
| 9262 cost += noinvcurs; | |
| 9263 attr = 0; | |
| 9264 } | |
| 9265 } | |
| 9266 | |
| 9267 /* | |
| 9268 * If the cursor is in the same row, smaller col, just use write. | |
| 9269 */ | |
| 9270 else | |
| 9271 { | |
| 9272 plan = PLAN_WRITE; | |
| 9273 wouldbe_col = screen_cur_col; | |
| 9274 cost = 0; | |
| 9275 } | |
| 9276 | |
| 9277 /* | |
| 9278 * Check if any characters that need to be written have the | |
| 9279 * correct attributes. Also avoid UTF-8 characters. | |
| 9280 */ | |
| 9281 i = col - wouldbe_col; | |
| 9282 if (i > 0) | |
| 9283 cost += i; | |
| 9284 if (cost < goto_cost && i > 0) | |
| 9285 { | |
| 9286 /* | |
| 9287 * Check if the attributes are correct without additionally | |
| 9288 * stopping highlighting. | |
| 9289 */ | |
| 9290 p = ScreenAttrs + LineOffset[row] + wouldbe_col; | |
| 9291 while (i && *p++ == attr) | |
| 9292 --i; | |
| 9293 if (i != 0) | |
| 9294 { | |
| 9295 /* | |
| 9296 * Try if it works when highlighting is stopped here. | |
| 9297 */ | |
| 9298 if (*--p == 0) | |
| 9299 { | |
| 9300 cost += noinvcurs; | |
| 9301 while (i && *p++ == 0) | |
| 9302 --i; | |
| 9303 } | |
| 9304 if (i != 0) | |
| 9305 cost = 999; /* different attributes, don't do it */ | |
| 9306 } | |
| 9307 #ifdef FEAT_MBYTE | |
| 9308 if (enc_utf8) | |
| 9309 { | |
| 9310 /* Don't use an UTF-8 char for positioning, it's slow. */ | |
| 9311 for (i = wouldbe_col; i < col; ++i) | |
| 9312 if (ScreenLinesUC[LineOffset[row] + i] != 0) | |
| 9313 { | |
| 9314 cost = 999; | |
| 9315 break; | |
| 9316 } | |
| 9317 } | |
| 9318 #endif | |
| 9319 } | |
| 9320 | |
| 9321 /* | |
| 9322 * We can do it without term_windgoto()! | |
| 9323 */ | |
| 9324 if (cost < goto_cost) | |
| 9325 { | |
| 9326 if (plan == PLAN_LE) | |
| 9327 { | |
| 9328 if (noinvcurs) | |
| 9329 screen_stop_highlight(); | |
| 9330 while (screen_cur_col > col) | |
| 9331 { | |
| 9332 out_str(bs); | |
| 9333 --screen_cur_col; | |
| 9334 } | |
| 9335 } | |
| 9336 else if (plan == PLAN_CR) | |
| 9337 { | |
| 9338 if (noinvcurs) | |
| 9339 screen_stop_highlight(); | |
| 9340 out_char('\r'); | |
| 9341 screen_cur_col = 0; | |
| 9342 } | |
| 9343 else if (plan == PLAN_NL) | |
| 9344 { | |
| 9345 if (noinvcurs) | |
| 9346 screen_stop_highlight(); | |
| 9347 while (screen_cur_row < row) | |
| 9348 { | |
| 9349 out_char('\n'); | |
| 9350 ++screen_cur_row; | |
| 9351 } | |
| 9352 screen_cur_col = 0; | |
| 9353 } | |
| 9354 | |
| 9355 i = col - screen_cur_col; | |
| 9356 if (i > 0) | |
| 9357 { | |
| 9358 /* | |
| 9359 * Use cursor-right if it's one character only. Avoids | |
| 9360 * removing a line of pixels from the last bold char, when | |
| 9361 * using the bold trick in the GUI. | |
| 9362 */ | |
| 9363 if (T_ND[0] != NUL && T_ND[1] == NUL) | |
| 9364 { | |
| 9365 while (i-- > 0) | |
| 9366 out_char(*T_ND); | |
| 9367 } | |
| 9368 else | |
| 9369 { | |
| 9370 int off; | |
| 9371 | |
| 9372 off = LineOffset[row] + screen_cur_col; | |
| 9373 while (i-- > 0) | |
| 9374 { | |
| 9375 if (ScreenAttrs[off] != screen_attr) | |
| 9376 screen_stop_highlight(); | |
| 9377 #ifdef FEAT_MBYTE | |
| 9378 out_flush_check(); | |
| 9379 #endif | |
| 9380 out_char(ScreenLines[off]); | |
| 9381 #ifdef FEAT_MBYTE | |
| 9382 if (enc_dbcs == DBCS_JPNU | |
| 9383 && ScreenLines[off] == 0x8e) | |
| 9384 out_char(ScreenLines2[off]); | |
| 9385 #endif | |
| 9386 ++off; | |
| 9387 } | |
| 9388 } | |
| 9389 } | |
| 9390 } | |
| 9391 } | |
| 9392 else | |
| 9393 cost = 999; | |
| 9394 | |
| 9395 if (cost >= goto_cost) | |
| 9396 { | |
| 9397 if (noinvcurs) | |
| 9398 screen_stop_highlight(); | |
| 5995 | 9399 if (row == screen_cur_row && (col > screen_cur_col) |
| 9400 && *T_CRI != NUL) | |
| 7 | 9401 term_cursor_right(col - screen_cur_col); |
| 9402 else | |
| 9403 term_windgoto(row, col); | |
| 9404 } | |
| 9405 screen_cur_row = row; | |
| 9406 screen_cur_col = col; | |
| 9407 } | |
| 9408 } | |
| 9409 | |
| 9410 /* | |
| 9411 * Set cursor to its position in the current window. | |
| 9412 */ | |
| 9413 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9414 setcursor(void) |
| 7 | 9415 { |
| 9416 if (redrawing()) | |
| 9417 { | |
| 9418 validate_cursor(); | |
| 9419 windgoto(W_WINROW(curwin) + curwin->w_wrow, | |
| 9420 W_WINCOL(curwin) + ( | |
| 9421 #ifdef FEAT_RIGHTLEFT | |
| 1545 | 9422 /* With 'rightleft' set and the cursor on a double-wide |
| 9423 * character, position it on the leftmost column. */ | |
| 7 | 9424 curwin->w_p_rl ? ((int)W_WIDTH(curwin) - curwin->w_wcol - ( |
| 9425 # ifdef FEAT_MBYTE | |
| 1545 | 9426 (has_mbyte |
| 9427 && (*mb_ptr2cells)(ml_get_cursor()) == 2 | |
| 9428 && vim_isprintc(gchar_cursor())) ? 2 : | |
| 7 | 9429 # endif |
| 9430 1)) : | |
| 9431 #endif | |
| 9432 curwin->w_wcol)); | |
| 9433 } | |
| 9434 } | |
| 9435 | |
| 9436 | |
| 9437 /* | |
|
11655
8014350fe51a
patch 8.0.0710: a job that writes to a buffer clears completion
Christian Brabandt <cb@256bit.org>
parents:
11607
diff
changeset
|
9438 * 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
|
9439 * 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
|
9440 * If 'mayclear' is TRUE the screen will be cleared if it is faster than |
| 7 | 9441 * scrolling. |
| 9442 * Returns FAIL if the lines are not inserted, OK for success. | |
| 9443 */ | |
| 9444 int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9445 win_ins_lines( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9446 win_T *wp, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9447 int row, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9448 int line_count, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9449 int invalid, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9450 int mayclear) |
| 7 | 9451 { |
| 9452 int did_delete; | |
| 9453 int nextrow; | |
| 9454 int lastrow; | |
| 9455 int retval; | |
| 9456 | |
| 9457 if (invalid) | |
| 9458 wp->w_lines_valid = 0; | |
| 9459 | |
| 9460 if (wp->w_height < 5) | |
| 9461 return FAIL; | |
| 9462 | |
| 9463 if (line_count > wp->w_height - row) | |
| 9464 line_count = wp->w_height - row; | |
| 9465 | |
| 9466 retval = win_do_lines(wp, row, line_count, mayclear, FALSE); | |
| 9467 if (retval != MAYBE) | |
| 9468 return retval; | |
| 9469 | |
| 9470 /* | |
| 9471 * If there is a next window or a status line, we first try to delete the | |
| 9472 * lines at the bottom to avoid messing what is after the window. | |
| 9473 * If this fails and there are following windows, don't do anything to avoid | |
| 9474 * messing up those windows, better just redraw. | |
| 9475 */ | |
| 9476 did_delete = FALSE; | |
| 9477 #ifdef FEAT_WINDOWS | |
| 9478 if (wp->w_next != NULL || wp->w_status_height) | |
| 9479 { | |
| 9480 if (screen_del_lines(0, W_WINROW(wp) + wp->w_height - line_count, | |
| 9481 line_count, (int)Rows, FALSE, NULL) == OK) | |
| 9482 did_delete = TRUE; | |
| 9483 else if (wp->w_next) | |
| 9484 return FAIL; | |
| 9485 } | |
| 9486 #endif | |
| 9487 /* | |
| 9488 * if no lines deleted, blank the lines that will end up below the window | |
| 9489 */ | |
| 9490 if (!did_delete) | |
| 9491 { | |
| 9492 #ifdef FEAT_WINDOWS | |
| 9493 wp->w_redr_status = TRUE; | |
| 9494 #endif | |
| 9495 redraw_cmdline = TRUE; | |
| 9496 nextrow = W_WINROW(wp) + wp->w_height + W_STATUS_HEIGHT(wp); | |
| 9497 lastrow = nextrow + line_count; | |
| 9498 if (lastrow > Rows) | |
| 9499 lastrow = Rows; | |
| 9500 screen_fill(nextrow - line_count, lastrow - line_count, | |
| 9501 W_WINCOL(wp), (int)W_ENDCOL(wp), | |
| 9502 ' ', ' ', 0); | |
| 9503 } | |
| 9504 | |
| 9505 if (screen_ins_lines(0, W_WINROW(wp) + row, line_count, (int)Rows, NULL) | |
| 9506 == FAIL) | |
| 9507 { | |
| 9508 /* deletion will have messed up other windows */ | |
| 9509 if (did_delete) | |
| 9510 { | |
| 9511 #ifdef FEAT_WINDOWS | |
| 9512 wp->w_redr_status = TRUE; | |
| 9513 #endif | |
| 9514 win_rest_invalid(W_NEXT(wp)); | |
| 9515 } | |
| 9516 return FAIL; | |
| 9517 } | |
| 9518 | |
| 9519 return OK; | |
| 9520 } | |
| 9521 | |
| 9522 /* | |
|
11655
8014350fe51a
patch 8.0.0710: a job that writes to a buffer clears completion
Christian Brabandt <cb@256bit.org>
parents:
11607
diff
changeset
|
9523 * Delete "line_count" window lines at "row" in window "wp". |
| 7 | 9524 * If "invalid" is TRUE curwin->w_lines[] is invalidated. |
| 9525 * If "mayclear" is TRUE the screen will be cleared if it is faster than | |
| 9526 * scrolling | |
| 9527 * Return OK for success, FAIL if the lines are not deleted. | |
| 9528 */ | |
| 9529 int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9530 win_del_lines( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9531 win_T *wp, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9532 int row, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9533 int line_count, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9534 int invalid, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9535 int mayclear) |
| 7 | 9536 { |
| 9537 int retval; | |
| 9538 | |
| 9539 if (invalid) | |
| 9540 wp->w_lines_valid = 0; | |
| 9541 | |
| 9542 if (line_count > wp->w_height - row) | |
| 9543 line_count = wp->w_height - row; | |
| 9544 | |
| 9545 retval = win_do_lines(wp, row, line_count, mayclear, TRUE); | |
| 9546 if (retval != MAYBE) | |
| 9547 return retval; | |
| 9548 | |
| 9549 if (screen_del_lines(0, W_WINROW(wp) + row, line_count, | |
| 9550 (int)Rows, FALSE, NULL) == FAIL) | |
| 9551 return FAIL; | |
| 9552 | |
| 9553 #ifdef FEAT_WINDOWS | |
| 9554 /* | |
| 9555 * If there are windows or status lines below, try to put them at the | |
| 9556 * correct place. If we can't do that, they have to be redrawn. | |
| 9557 */ | |
| 9558 if (wp->w_next || wp->w_status_height || cmdline_row < Rows - 1) | |
| 9559 { | |
| 9560 if (screen_ins_lines(0, W_WINROW(wp) + wp->w_height - line_count, | |
| 9561 line_count, (int)Rows, NULL) == FAIL) | |
| 9562 { | |
| 9563 wp->w_redr_status = TRUE; | |
| 9564 win_rest_invalid(wp->w_next); | |
| 9565 } | |
| 9566 } | |
| 9567 /* | |
| 9568 * If this is the last window and there is no status line, redraw the | |
| 9569 * command line later. | |
| 9570 */ | |
| 9571 else | |
| 9572 #endif | |
| 9573 redraw_cmdline = TRUE; | |
| 9574 return OK; | |
| 9575 } | |
| 9576 | |
| 9577 /* | |
| 9578 * Common code for win_ins_lines() and win_del_lines(). | |
| 9579 * Returns OK or FAIL when the work has been done. | |
| 9580 * Returns MAYBE when not finished yet. | |
| 9581 */ | |
| 9582 static int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9583 win_do_lines( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9584 win_T *wp, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9585 int row, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9586 int line_count, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9587 int mayclear, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9588 int del) |
| 7 | 9589 { |
| 9590 int retval; | |
| 9591 | |
| 9592 if (!redrawing() || line_count <= 0) | |
| 9593 return FAIL; | |
| 9594 | |
|
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
|
9595 /* 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
|
9596 * 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
|
9597 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
|
9598 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
|
9599 |
| 7 | 9600 /* only a few lines left: redraw is faster */ |
| 9601 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
|
9602 #ifdef FEAT_WINDOWS |
| 7 | 9603 && wp->w_width == Columns |
| 9604 #endif | |
| 9605 ) | |
| 9606 { | |
|
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
|
9607 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
|
9608 screenclear(); /* will set wp->w_lines_valid to 0 */ |
| 7 | 9609 return FAIL; |
| 9610 } | |
| 9611 | |
| 9612 /* | |
| 9613 * Delete all remaining lines | |
| 9614 */ | |
| 9615 if (row + line_count >= wp->w_height) | |
| 9616 { | |
| 9617 screen_fill(W_WINROW(wp) + row, W_WINROW(wp) + wp->w_height, | |
| 9618 W_WINCOL(wp), (int)W_ENDCOL(wp), | |
| 9619 ' ', ' ', 0); | |
| 9620 return OK; | |
| 9621 } | |
| 9622 | |
| 9623 /* | |
|
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
|
9624 * When scrolling, the message on the command line should be cleared, |
| 7 | 9625 * 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
|
9626 * Don't do this when avoiding to insert lines. |
| 7 | 9627 */ |
|
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
|
9628 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
|
9629 clear_cmdline = TRUE; |
| 7 | 9630 |
| 9631 /* | |
| 9632 * If the terminal can set a scroll region, use that. | |
| 9633 * Always do this in a vertically split window. This will redraw from | |
| 9634 * ScreenLines[] when t_CV isn't defined. That's faster than using | |
| 9635 * win_line(). | |
| 9636 * 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
|
9637 * 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
|
9638 * scroll-up . |
| 7 | 9639 */ |
| 9640 if (scroll_region | |
|
8643
24b43dd167eb
commit https://github.com/vim/vim/commit/44a2f923c00f1384c9ecde12fb5b4711bc20702e
Christian Brabandt <cb@256bit.org>
parents:
8627
diff
changeset
|
9641 #ifdef FEAT_WINDOWS |
| 7 | 9642 || W_WIDTH(wp) != Columns |
| 9643 #endif | |
| 9644 ) | |
| 9645 { | |
|
8643
24b43dd167eb
commit https://github.com/vim/vim/commit/44a2f923c00f1384c9ecde12fb5b4711bc20702e
Christian Brabandt <cb@256bit.org>
parents:
8627
diff
changeset
|
9646 #ifdef FEAT_WINDOWS |
| 7 | 9647 if (scroll_region && (wp->w_width == Columns || *T_CSV != NUL)) |
| 9648 #endif | |
| 9649 scroll_region_set(wp, row); | |
| 9650 if (del) | |
| 9651 retval = screen_del_lines(W_WINROW(wp) + row, 0, line_count, | |
| 9652 wp->w_height - row, FALSE, wp); | |
| 9653 else | |
| 9654 retval = screen_ins_lines(W_WINROW(wp) + row, 0, line_count, | |
| 9655 wp->w_height - row, wp); | |
|
8643
24b43dd167eb
commit https://github.com/vim/vim/commit/44a2f923c00f1384c9ecde12fb5b4711bc20702e
Christian Brabandt <cb@256bit.org>
parents:
8627
diff
changeset
|
9656 #ifdef FEAT_WINDOWS |
| 7 | 9657 if (scroll_region && (wp->w_width == Columns || *T_CSV != NUL)) |
| 9658 #endif | |
| 9659 scroll_region_reset(); | |
| 9660 return retval; | |
| 9661 } | |
| 9662 | |
| 9663 #ifdef FEAT_WINDOWS | |
| 9664 if (wp->w_next != NULL && p_tf) /* don't delete/insert on fast terminal */ | |
| 9665 return FAIL; | |
| 9666 #endif | |
| 9667 | |
| 9668 return MAYBE; | |
| 9669 } | |
| 9670 | |
| 9671 /* | |
| 9672 * window 'wp' and everything after it is messed up, mark it for redraw | |
| 9673 */ | |
| 9674 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9675 win_rest_invalid(win_T *wp) |
| 7 | 9676 { |
| 9677 #ifdef FEAT_WINDOWS | |
| 9678 while (wp != NULL) | |
| 9679 #else | |
| 9680 if (wp != NULL) | |
| 9681 #endif | |
| 9682 { | |
| 9683 redraw_win_later(wp, NOT_VALID); | |
| 9684 #ifdef FEAT_WINDOWS | |
| 9685 wp->w_redr_status = TRUE; | |
| 9686 wp = wp->w_next; | |
| 9687 #endif | |
| 9688 } | |
| 9689 redraw_cmdline = TRUE; | |
| 9690 } | |
| 9691 | |
| 9692 /* | |
| 9693 * The rest of the routines in this file perform screen manipulations. The | |
| 9694 * given operation is performed physically on the screen. The corresponding | |
| 9695 * change is also made to the internal screen image. In this way, the editor | |
| 9696 * anticipates the effect of editing changes on the appearance of the screen. | |
| 9697 * That way, when we call screenupdate a complete redraw isn't usually | |
| 9698 * necessary. Another advantage is that we can keep adding code to anticipate | |
| 9699 * screen changes, and in the meantime, everything still works. | |
| 9700 */ | |
| 9701 | |
| 9702 /* | |
| 9703 * types for inserting or deleting lines | |
| 9704 */ | |
| 9705 #define USE_T_CAL 1 | |
| 9706 #define USE_T_CDL 2 | |
| 9707 #define USE_T_AL 3 | |
| 9708 #define USE_T_CE 4 | |
| 9709 #define USE_T_DL 5 | |
| 9710 #define USE_T_SR 6 | |
| 9711 #define USE_NL 7 | |
| 9712 #define USE_T_CD 8 | |
| 9713 #define USE_REDRAW 9 | |
| 9714 | |
| 9715 /* | |
| 9716 * insert lines on the screen and update ScreenLines[] | |
| 9717 * 'end' is the line after the scrolled part. Normally it is Rows. | |
| 9718 * When scrolling region used 'off' is the offset from the top for the region. | |
| 9719 * 'row' and 'end' are relative to the start of the region. | |
| 9720 * | |
| 9721 * return FAIL for failure, OK for success. | |
| 9722 */ | |
| 446 | 9723 int |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9724 screen_ins_lines( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9725 int off, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9726 int row, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9727 int line_count, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9728 int end, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9729 win_T *wp) /* NULL or window to use width from */ |
| 7 | 9730 { |
| 9731 int i; | |
| 9732 int j; | |
| 9733 unsigned temp; | |
| 9734 int cursor_row; | |
| 9735 int type; | |
| 9736 int result_empty; | |
| 9737 int can_ce = can_clear(T_CE); | |
| 9738 | |
| 9739 /* | |
| 9740 * FAIL if | |
| 9741 * - there is no valid screen | |
| 9742 * - the screen has to be redrawn completely | |
| 9743 * - the line count is less than one | |
| 9744 * - the line count is more than 'ttyscroll' | |
| 9745 */ | |
| 9746 if (!screen_valid(TRUE) || line_count <= 0 || line_count > p_ttyscroll) | |
| 9747 return FAIL; | |
| 9748 | |
| 9749 /* | |
| 9750 * There are seven ways to insert lines: | |
| 9751 * 0. When in a vertically split window and t_CV isn't set, redraw the | |
| 9752 * characters from ScreenLines[]. | |
| 9753 * 1. Use T_CD (clear to end of display) if it exists and the result of | |
| 9754 * the insert is just empty lines | |
| 9755 * 2. Use T_CAL (insert multiple lines) if it exists and T_AL is not | |
| 9756 * present or line_count > 1. It looks better if we do all the inserts | |
| 9757 * at once. | |
| 9758 * 3. Use T_CDL (delete multiple lines) if it exists and the result of the | |
| 9759 * insert is just empty lines and T_CE is not present or line_count > | |
| 9760 * 1. | |
| 9761 * 4. Use T_AL (insert line) if it exists. | |
| 9762 * 5. Use T_CE (erase line) if it exists and the result of the insert is | |
| 9763 * just empty lines. | |
| 9764 * 6. Use T_DL (delete line) if it exists and the result of the insert is | |
| 9765 * just empty lines. | |
| 9766 * 7. Use T_SR (scroll reverse) if it exists and inserting at row 0 and | |
| 9767 * the 'da' flag is not set or we have clear line capability. | |
| 9768 * 8. redraw the characters from ScreenLines[]. | |
| 9769 * | |
| 9770 * Careful: In a hpterm scroll reverse doesn't work as expected, it moves | |
| 9771 * the scrollbar for the window. It does have insert line, use that if it | |
| 9772 * exists. | |
| 9773 */ | |
| 9774 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
|
9775 #ifdef FEAT_WINDOWS |
| 7 | 9776 if (wp != NULL && wp->w_width != Columns && *T_CSV == NUL) |
| 9777 type = USE_REDRAW; | |
| 9778 else | |
| 9779 #endif | |
| 9780 if (can_clear(T_CD) && result_empty) | |
| 9781 type = USE_T_CD; | |
| 9782 else if (*T_CAL != NUL && (line_count > 1 || *T_AL == NUL)) | |
| 9783 type = USE_T_CAL; | |
| 9784 else if (*T_CDL != NUL && result_empty && (line_count > 1 || !can_ce)) | |
| 9785 type = USE_T_CDL; | |
| 9786 else if (*T_AL != NUL) | |
| 9787 type = USE_T_AL; | |
| 9788 else if (can_ce && result_empty) | |
| 9789 type = USE_T_CE; | |
| 9790 else if (*T_DL != NUL && result_empty) | |
| 9791 type = USE_T_DL; | |
| 9792 else if (*T_SR != NUL && row == 0 && (*T_DA == NUL || can_ce)) | |
| 9793 type = USE_T_SR; | |
| 9794 else | |
| 9795 return FAIL; | |
| 9796 | |
| 9797 /* | |
| 9798 * For clearing the lines screen_del_lines() is used. This will also take | |
| 9799 * care of t_db if necessary. | |
| 9800 */ | |
| 9801 if (type == USE_T_CD || type == USE_T_CDL || | |
| 9802 type == USE_T_CE || type == USE_T_DL) | |
| 9803 return screen_del_lines(off, row, line_count, end, FALSE, wp); | |
| 9804 | |
| 9805 /* | |
| 9806 * If text is retained below the screen, first clear or delete as many | |
| 9807 * lines at the bottom of the window as are about to be inserted so that | |
| 9808 * the deleted lines won't later surface during a screen_del_lines. | |
| 9809 */ | |
| 9810 if (*T_DB) | |
| 9811 screen_del_lines(off, end - line_count, line_count, end, FALSE, wp); | |
| 9812 | |
| 9813 #ifdef FEAT_CLIPBOARD | |
| 9814 /* Remove a modeless selection when inserting lines halfway the screen | |
| 9815 * or not the full width of the screen. */ | |
| 9816 if (off + row > 0 | |
|
8643
24b43dd167eb
commit https://github.com/vim/vim/commit/44a2f923c00f1384c9ecde12fb5b4711bc20702e
Christian Brabandt <cb@256bit.org>
parents:
8627
diff
changeset
|
9817 # ifdef FEAT_WINDOWS |
| 7 | 9818 || (wp != NULL && wp->w_width != Columns) |
| 9819 # endif | |
| 9820 ) | |
| 3674 | 9821 clip_clear_selection(&clip_star); |
| 7 | 9822 else |
| 9823 clip_scroll_selection(-line_count); | |
| 9824 #endif | |
| 9825 | |
| 9826 #ifdef FEAT_GUI | |
| 9827 /* Don't update the GUI cursor here, ScreenLines[] is invalid until the | |
| 9828 * scrolling is actually carried out. */ | |
|
9848
664276833670
commit https://github.com/vim/vim/commit/107abd2ca53c31fd3bb40d77ff296e98eaae2975
Christian Brabandt <cb@256bit.org>
parents:
9754
diff
changeset
|
9829 gui_dont_update_cursor(row + off <= gui.cursor_row); |
| 7 | 9830 #endif |
| 9831 | |
| 9832 if (*T_CCS != NUL) /* cursor relative to region */ | |
| 9833 cursor_row = row; | |
| 9834 else | |
| 9835 cursor_row = row + off; | |
| 9836 | |
| 9837 /* | |
| 9838 * Shift LineOffset[] line_count down to reflect the inserted lines. | |
| 9839 * Clear the inserted lines in ScreenLines[]. | |
| 9840 */ | |
| 9841 row += off; | |
| 9842 end += off; | |
| 9843 for (i = 0; i < line_count; ++i) | |
| 9844 { | |
|
8643
24b43dd167eb
commit https://github.com/vim/vim/commit/44a2f923c00f1384c9ecde12fb5b4711bc20702e
Christian Brabandt <cb@256bit.org>
parents:
8627
diff
changeset
|
9845 #ifdef FEAT_WINDOWS |
| 7 | 9846 if (wp != NULL && wp->w_width != Columns) |
| 9847 { | |
| 9848 /* need to copy part of a line */ | |
| 9849 j = end - 1 - i; | |
| 9850 while ((j -= line_count) >= row) | |
| 9851 linecopy(j + line_count, j, wp); | |
| 9852 j += line_count; | |
| 9853 if (can_clear((char_u *)" ")) | |
| 9854 lineclear(LineOffset[j] + wp->w_wincol, wp->w_width); | |
| 9855 else | |
| 9856 lineinvalid(LineOffset[j] + wp->w_wincol, wp->w_width); | |
| 9857 LineWraps[j] = FALSE; | |
| 9858 } | |
| 9859 else | |
| 9860 #endif | |
| 9861 { | |
| 9862 j = end - 1 - i; | |
| 9863 temp = LineOffset[j]; | |
| 9864 while ((j -= line_count) >= row) | |
| 9865 { | |
| 9866 LineOffset[j + line_count] = LineOffset[j]; | |
| 9867 LineWraps[j + line_count] = LineWraps[j]; | |
| 9868 } | |
| 9869 LineOffset[j + line_count] = temp; | |
| 9870 LineWraps[j + line_count] = FALSE; | |
| 9871 if (can_clear((char_u *)" ")) | |
| 9872 lineclear(temp, (int)Columns); | |
| 9873 else | |
| 9874 lineinvalid(temp, (int)Columns); | |
| 9875 } | |
| 9876 } | |
| 9877 | |
| 9878 screen_stop_highlight(); | |
| 9879 windgoto(cursor_row, 0); | |
| 9880 | |
|
8643
24b43dd167eb
commit https://github.com/vim/vim/commit/44a2f923c00f1384c9ecde12fb5b4711bc20702e
Christian Brabandt <cb@256bit.org>
parents:
8627
diff
changeset
|
9881 #ifdef FEAT_WINDOWS |
| 7 | 9882 /* redraw the characters */ |
| 9883 if (type == USE_REDRAW) | |
| 9884 redraw_block(row, end, wp); | |
| 9885 else | |
| 9886 #endif | |
| 9887 if (type == USE_T_CAL) | |
| 9888 { | |
| 9889 term_append_lines(line_count); | |
| 9890 screen_start(); /* don't know where cursor is now */ | |
| 9891 } | |
| 9892 else | |
| 9893 { | |
| 9894 for (i = 0; i < line_count; i++) | |
| 9895 { | |
| 9896 if (type == USE_T_AL) | |
| 9897 { | |
| 9898 if (i && cursor_row != 0) | |
| 9899 windgoto(cursor_row, 0); | |
| 9900 out_str(T_AL); | |
| 9901 } | |
| 9902 else /* type == USE_T_SR */ | |
| 9903 out_str(T_SR); | |
| 9904 screen_start(); /* don't know where cursor is now */ | |
| 9905 } | |
| 9906 } | |
| 9907 | |
| 9908 /* | |
| 9909 * With scroll-reverse and 'da' flag set we need to clear the lines that | |
| 9910 * have been scrolled down into the region. | |
| 9911 */ | |
| 9912 if (type == USE_T_SR && *T_DA) | |
| 9913 { | |
| 9914 for (i = 0; i < line_count; ++i) | |
| 9915 { | |
| 9916 windgoto(off + i, 0); | |
| 9917 out_str(T_CE); | |
| 9918 screen_start(); /* don't know where cursor is now */ | |
| 9919 } | |
| 9920 } | |
| 9921 | |
| 9922 #ifdef FEAT_GUI | |
| 9923 gui_can_update_cursor(); | |
| 9924 if (gui.in_use) | |
| 9925 out_flush(); /* always flush after a scroll */ | |
| 9926 #endif | |
| 9927 return OK; | |
| 9928 } | |
| 9929 | |
| 9930 /* | |
|
9848
664276833670
commit https://github.com/vim/vim/commit/107abd2ca53c31fd3bb40d77ff296e98eaae2975
Christian Brabandt <cb@256bit.org>
parents:
9754
diff
changeset
|
9931 * 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
|
9932 * "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
|
9933 * 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
|
9934 * "row" and "end" are relative to the start of the region. |
| 7 | 9935 * |
| 9936 * Return OK for success, FAIL if the lines are not deleted. | |
| 9937 */ | |
| 9938 int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9939 screen_del_lines( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9940 int off, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9941 int row, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9942 int line_count, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9943 int end, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9944 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
|
9945 win_T *wp UNUSED) /* NULL or window to use width from */ |
| 7 | 9946 { |
| 9947 int j; | |
| 9948 int i; | |
| 9949 unsigned temp; | |
| 9950 int cursor_row; | |
| 9951 int cursor_end; | |
| 9952 int result_empty; /* result is empty until end of region */ | |
| 9953 int can_delete; /* deleting line codes can be used */ | |
| 9954 int type; | |
| 9955 | |
| 9956 /* | |
| 9957 * FAIL if | |
| 9958 * - there is no valid screen | |
| 9959 * - the screen has to be redrawn completely | |
| 9960 * - the line count is less than one | |
| 9961 * - the line count is more than 'ttyscroll' | |
| 9962 */ | |
| 9963 if (!screen_valid(TRUE) || line_count <= 0 || | |
| 9964 (!force && line_count > p_ttyscroll)) | |
| 9965 return FAIL; | |
| 9966 | |
| 9967 /* | |
| 9968 * Check if the rest of the current region will become empty. | |
| 9969 */ | |
| 9970 result_empty = row + line_count >= end; | |
| 9971 | |
| 9972 /* | |
| 9973 * We can delete lines only when 'db' flag not set or when 'ce' option | |
| 9974 * available. | |
| 9975 */ | |
| 9976 can_delete = (*T_DB == NUL || can_clear(T_CE)); | |
| 9977 | |
| 9978 /* | |
| 9979 * There are six ways to delete lines: | |
| 9980 * 0. When in a vertically split window and t_CV isn't set, redraw the | |
| 9981 * characters from ScreenLines[]. | |
| 9982 * 1. Use T_CD if it exists and the result is empty. | |
| 9983 * 2. Use newlines if row == 0 and count == 1 or T_CDL does not exist. | |
| 9984 * 3. Use T_CDL (delete multiple lines) if it exists and line_count > 1 or | |
| 9985 * none of the other ways work. | |
| 9986 * 4. Use T_CE (erase line) if the result is empty. | |
| 9987 * 5. Use T_DL (delete line) if it exists. | |
| 9988 * 6. redraw the characters from ScreenLines[]. | |
| 9989 */ | |
|
8643
24b43dd167eb
commit https://github.com/vim/vim/commit/44a2f923c00f1384c9ecde12fb5b4711bc20702e
Christian Brabandt <cb@256bit.org>
parents:
8627
diff
changeset
|
9990 #ifdef FEAT_WINDOWS |
| 7 | 9991 if (wp != NULL && wp->w_width != Columns && *T_CSV == NUL) |
| 9992 type = USE_REDRAW; | |
| 9993 else | |
| 9994 #endif | |
| 9995 if (can_clear(T_CD) && result_empty) | |
| 9996 type = USE_T_CD; | |
| 9997 #if defined(__BEOS__) && defined(BEOS_DR8) | |
| 9998 /* | |
| 9999 * USE_NL does not seem to work in Terminal of DR8 so we set T_DB="" in | |
| 10000 * its internal termcap... this works okay for tests which test *T_DB != | |
| 10001 * NUL. It has the disadvantage that the user cannot use any :set t_* | |
| 10002 * command to get T_DB (back) to empty_option, only :set term=... will do | |
| 10003 * the trick... | |
| 10004 * Anyway, this hack will hopefully go away with the next OS release. | |
| 10005 * (Olaf Seibert) | |
| 10006 */ | |
| 10007 else if (row == 0 && T_DB == empty_option | |
| 10008 && (line_count == 1 || *T_CDL == NUL)) | |
| 10009 #else | |
| 10010 else if (row == 0 && ( | |
| 10011 #ifndef AMIGA | |
| 10012 /* On the Amiga, somehow '\n' on the last line doesn't always scroll | |
| 10013 * up, so use delete-line command */ | |
| 10014 line_count == 1 || | |
| 10015 #endif | |
| 10016 *T_CDL == NUL)) | |
| 10017 #endif | |
| 10018 type = USE_NL; | |
| 10019 else if (*T_CDL != NUL && line_count > 1 && can_delete) | |
| 10020 type = USE_T_CDL; | |
| 10021 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
|
10022 #ifdef FEAT_WINDOWS |
| 7 | 10023 && (wp == NULL || wp->w_width == Columns) |
| 10024 #endif | |
| 10025 ) | |
| 10026 type = USE_T_CE; | |
| 10027 else if (*T_DL != NUL && can_delete) | |
| 10028 type = USE_T_DL; | |
| 10029 else if (*T_CDL != NUL && can_delete) | |
| 10030 type = USE_T_CDL; | |
| 10031 else | |
| 10032 return FAIL; | |
| 10033 | |
| 10034 #ifdef FEAT_CLIPBOARD | |
| 10035 /* Remove a modeless selection when deleting lines halfway the screen or | |
| 10036 * not the full width of the screen. */ | |
| 10037 if (off + row > 0 | |
|
8643
24b43dd167eb
commit https://github.com/vim/vim/commit/44a2f923c00f1384c9ecde12fb5b4711bc20702e
Christian Brabandt <cb@256bit.org>
parents:
8627
diff
changeset
|
10038 # ifdef FEAT_WINDOWS |
| 7 | 10039 || (wp != NULL && wp->w_width != Columns) |
| 10040 # endif | |
| 10041 ) | |
| 3674 | 10042 clip_clear_selection(&clip_star); |
| 7 | 10043 else |
| 10044 clip_scroll_selection(line_count); | |
| 10045 #endif | |
| 10046 | |
| 10047 #ifdef FEAT_GUI | |
| 10048 /* Don't update the GUI cursor here, ScreenLines[] is invalid until the | |
| 10049 * scrolling is actually carried out. */ | |
|
9848
664276833670
commit https://github.com/vim/vim/commit/107abd2ca53c31fd3bb40d77ff296e98eaae2975
Christian Brabandt <cb@256bit.org>
parents:
9754
diff
changeset
|
10050 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
|
10051 && gui.cursor_row < end + off); |
| 7 | 10052 #endif |
| 10053 | |
| 10054 if (*T_CCS != NUL) /* cursor relative to region */ | |
| 10055 { | |
| 10056 cursor_row = row; | |
| 10057 cursor_end = end; | |
| 10058 } | |
| 10059 else | |
| 10060 { | |
| 10061 cursor_row = row + off; | |
| 10062 cursor_end = end + off; | |
| 10063 } | |
| 10064 | |
| 10065 /* | |
| 10066 * Now shift LineOffset[] line_count up to reflect the deleted lines. | |
| 10067 * Clear the inserted lines in ScreenLines[]. | |
| 10068 */ | |
| 10069 row += off; | |
| 10070 end += off; | |
| 10071 for (i = 0; i < line_count; ++i) | |
| 10072 { | |
|
8643
24b43dd167eb
commit https://github.com/vim/vim/commit/44a2f923c00f1384c9ecde12fb5b4711bc20702e
Christian Brabandt <cb@256bit.org>
parents:
8627
diff
changeset
|
10073 #ifdef FEAT_WINDOWS |
| 7 | 10074 if (wp != NULL && wp->w_width != Columns) |
| 10075 { | |
| 10076 /* need to copy part of a line */ | |
| 10077 j = row + i; | |
| 10078 while ((j += line_count) <= end - 1) | |
| 10079 linecopy(j - line_count, j, wp); | |
| 10080 j -= line_count; | |
| 10081 if (can_clear((char_u *)" ")) | |
| 10082 lineclear(LineOffset[j] + wp->w_wincol, wp->w_width); | |
| 10083 else | |
| 10084 lineinvalid(LineOffset[j] + wp->w_wincol, wp->w_width); | |
| 10085 LineWraps[j] = FALSE; | |
| 10086 } | |
| 10087 else | |
| 10088 #endif | |
| 10089 { | |
| 10090 /* whole width, moving the line pointers is faster */ | |
| 10091 j = row + i; | |
| 10092 temp = LineOffset[j]; | |
| 10093 while ((j += line_count) <= end - 1) | |
| 10094 { | |
| 10095 LineOffset[j - line_count] = LineOffset[j]; | |
| 10096 LineWraps[j - line_count] = LineWraps[j]; | |
| 10097 } | |
| 10098 LineOffset[j - line_count] = temp; | |
| 10099 LineWraps[j - line_count] = FALSE; | |
| 10100 if (can_clear((char_u *)" ")) | |
| 10101 lineclear(temp, (int)Columns); | |
| 10102 else | |
| 10103 lineinvalid(temp, (int)Columns); | |
| 10104 } | |
| 10105 } | |
| 10106 | |
| 10107 screen_stop_highlight(); | |
| 10108 | |
|
8643
24b43dd167eb
commit https://github.com/vim/vim/commit/44a2f923c00f1384c9ecde12fb5b4711bc20702e
Christian Brabandt <cb@256bit.org>
parents:
8627
diff
changeset
|
10109 #ifdef FEAT_WINDOWS |
| 7 | 10110 /* redraw the characters */ |
| 10111 if (type == USE_REDRAW) | |
| 10112 redraw_block(row, end, wp); | |
| 10113 else | |
| 10114 #endif | |
| 10115 if (type == USE_T_CD) /* delete the lines */ | |
| 10116 { | |
| 10117 windgoto(cursor_row, 0); | |
| 10118 out_str(T_CD); | |
| 10119 screen_start(); /* don't know where cursor is now */ | |
| 10120 } | |
| 10121 else if (type == USE_T_CDL) | |
| 10122 { | |
| 10123 windgoto(cursor_row, 0); | |
| 10124 term_delete_lines(line_count); | |
| 10125 screen_start(); /* don't know where cursor is now */ | |
| 10126 } | |
| 10127 /* | |
| 10128 * Deleting lines at top of the screen or scroll region: Just scroll | |
| 10129 * the whole screen (scroll region) up by outputting newlines on the | |
| 10130 * last line. | |
| 10131 */ | |
| 10132 else if (type == USE_NL) | |
| 10133 { | |
| 10134 windgoto(cursor_end - 1, 0); | |
| 10135 for (i = line_count; --i >= 0; ) | |
| 10136 out_char('\n'); /* cursor will remain on same line */ | |
| 10137 } | |
| 10138 else | |
| 10139 { | |
| 10140 for (i = line_count; --i >= 0; ) | |
| 10141 { | |
| 10142 if (type == USE_T_DL) | |
| 10143 { | |
| 10144 windgoto(cursor_row, 0); | |
| 10145 out_str(T_DL); /* delete a line */ | |
| 10146 } | |
| 10147 else /* type == USE_T_CE */ | |
| 10148 { | |
| 10149 windgoto(cursor_row + i, 0); | |
| 10150 out_str(T_CE); /* erase a line */ | |
| 10151 } | |
| 10152 screen_start(); /* don't know where cursor is now */ | |
| 10153 } | |
| 10154 } | |
| 10155 | |
| 10156 /* | |
| 10157 * If the 'db' flag is set, we need to clear the lines that have been | |
| 10158 * scrolled up at the bottom of the region. | |
| 10159 */ | |
| 10160 if (*T_DB && (type == USE_T_DL || type == USE_T_CDL)) | |
| 10161 { | |
| 10162 for (i = line_count; i > 0; --i) | |
| 10163 { | |
| 10164 windgoto(cursor_end - i, 0); | |
| 10165 out_str(T_CE); /* erase a line */ | |
| 10166 screen_start(); /* don't know where cursor is now */ | |
| 10167 } | |
| 10168 } | |
| 10169 | |
| 10170 #ifdef FEAT_GUI | |
| 10171 gui_can_update_cursor(); | |
| 10172 if (gui.in_use) | |
| 10173 out_flush(); /* always flush after a scroll */ | |
| 10174 #endif | |
| 10175 | |
| 10176 return OK; | |
| 10177 } | |
| 10178 | |
| 10179 /* | |
| 10180 * show the current mode and ruler | |
| 10181 * | |
| 10182 * If clear_cmdline is TRUE, clear the rest of the cmdline. | |
| 10183 * If clear_cmdline is FALSE there may be a message there that needs to be | |
| 10184 * cleared only if a mode is shown. | |
| 10185 * Return the length of the message (0 if no message). | |
| 10186 */ | |
| 10187 int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
10188 showmode(void) |
| 7 | 10189 { |
| 10190 int need_clear; | |
| 10191 int length = 0; | |
| 10192 int do_mode; | |
| 10193 int attr; | |
| 10194 int nwr_save; | |
| 10195 #ifdef FEAT_INS_EXPAND | |
| 10196 int sub_attr; | |
| 10197 #endif | |
| 10198 | |
| 642 | 10199 do_mode = ((p_smd && msg_silent == 0) |
| 10200 && ((State & INSERT) | |
| 10201 || restart_edit | |
| 5735 | 10202 || VIsual_active)); |
| 7 | 10203 if (do_mode || Recording) |
| 10204 { | |
| 10205 /* | |
| 10206 * Don't show mode right now, when not redrawing or inside a mapping. | |
| 10207 * Call char_avail() only when we are going to show something, because | |
| 10208 * it takes a bit of time. | |
| 10209 */ | |
| 10210 if (!redrawing() || (char_avail() && !KeyTyped) || msg_silent != 0) | |
| 10211 { | |
| 10212 redraw_cmdline = TRUE; /* show mode later */ | |
| 10213 return 0; | |
| 10214 } | |
| 10215 | |
| 10216 nwr_save = need_wait_return; | |
| 10217 | |
| 10218 /* wait a bit before overwriting an important message */ | |
| 10219 check_for_delay(FALSE); | |
| 10220 | |
| 10221 /* if the cmdline is more than one line high, erase top lines */ | |
| 10222 need_clear = clear_cmdline; | |
| 10223 if (clear_cmdline && cmdline_row < Rows - 1) | |
| 10224 msg_clr_cmdline(); /* will reset clear_cmdline */ | |
| 10225 | |
| 10226 /* Position on the last line in the window, column 0 */ | |
| 10227 msg_pos_mode(); | |
| 10228 cursor_off(); | |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
10229 attr = HL_ATTR(HLF_CM); /* Highlight mode */ |
| 7 | 10230 if (do_mode) |
| 10231 { | |
| 10232 MSG_PUTS_ATTR("--", attr); | |
| 10233 #if defined(FEAT_XIM) | |
| 2520 | 10234 if ( |
| 10235 # ifdef FEAT_GUI_GTK | |
| 10236 preedit_get_status() | |
| 1668 | 10237 # else |
| 10238 im_get_status() | |
| 2520 | 10239 # endif |
| 1668 | 10240 ) |
|
2277
f42e0b5ff9e9
Change remaining HAVE_GTK2 to FEAT_GUI_GTK.
Bram Moolenaar <bram@vim.org>
parents:
2269
diff
changeset
|
10241 # ifdef FEAT_GUI_GTK /* most of the time, it's not XIM being used */ |
| 7 | 10242 MSG_PUTS_ATTR(" IM", attr); |
| 10243 # else | |
| 10244 MSG_PUTS_ATTR(" XIM", attr); | |
| 10245 # endif | |
| 10246 #endif | |
| 10247 #if defined(FEAT_HANGULIN) && defined(FEAT_GUI) | |
| 10248 if (gui.in_use) | |
| 10249 { | |
| 10250 if (hangul_input_state_get()) | |
|
7208
2c00f6b312bf
commit https://github.com/vim/vim/commit/72f4cc4a987d123c0ed909c85b9a05f65cef7202
Christian Brabandt <cb@256bit.org>
parents:
7007
diff
changeset
|
10251 { |
|
2c00f6b312bf
commit https://github.com/vim/vim/commit/72f4cc4a987d123c0ed909c85b9a05f65cef7202
Christian Brabandt <cb@256bit.org>
parents:
7007
diff
changeset
|
10252 /* HANGUL */ |
|
2c00f6b312bf
commit https://github.com/vim/vim/commit/72f4cc4a987d123c0ed909c85b9a05f65cef7202
Christian Brabandt <cb@256bit.org>
parents:
7007
diff
changeset
|
10253 if (enc_utf8) |
|
2c00f6b312bf
commit https://github.com/vim/vim/commit/72f4cc4a987d123c0ed909c85b9a05f65cef7202
Christian Brabandt <cb@256bit.org>
parents:
7007
diff
changeset
|
10254 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
|
10255 else |
|
2c00f6b312bf
commit https://github.com/vim/vim/commit/72f4cc4a987d123c0ed909c85b9a05f65cef7202
Christian Brabandt <cb@256bit.org>
parents:
7007
diff
changeset
|
10256 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
|
10257 } |
| 7 | 10258 } |
| 10259 #endif | |
| 10260 #ifdef FEAT_INS_EXPAND | |
| 5946 | 10261 /* CTRL-X in Insert mode */ |
| 10262 if (edit_submode != NULL && !shortmess(SHM_COMPLETIONMENU)) | |
| 7 | 10263 { |
| 10264 /* These messages can get long, avoid a wrap in a narrow | |
| 10265 * window. Prefer showing edit_submode_extra. */ | |
| 10266 length = (Rows - msg_row) * Columns - 3; | |
| 10267 if (edit_submode_extra != NULL) | |
| 10268 length -= vim_strsize(edit_submode_extra); | |
| 10269 if (length > 0) | |
| 10270 { | |
| 10271 if (edit_submode_pre != NULL) | |
| 10272 length -= vim_strsize(edit_submode_pre); | |
| 10273 if (length - vim_strsize(edit_submode) > 0) | |
| 10274 { | |
| 10275 if (edit_submode_pre != NULL) | |
| 10276 msg_puts_attr(edit_submode_pre, attr); | |
| 10277 msg_puts_attr(edit_submode, attr); | |
| 10278 } | |
| 10279 if (edit_submode_extra != NULL) | |
| 10280 { | |
| 10281 MSG_PUTS_ATTR(" ", attr); /* add a space in between */ | |
| 10282 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
|
10283 sub_attr = HL_ATTR(edit_submode_highl); |
| 7 | 10284 else |
| 10285 sub_attr = attr; | |
| 10286 msg_puts_attr(edit_submode_extra, sub_attr); | |
| 10287 } | |
| 10288 } | |
| 10289 length = 0; | |
| 10290 } | |
| 10291 else | |
| 10292 #endif | |
| 10293 { | |
| 10294 #ifdef FEAT_VREPLACE | |
| 10295 if (State & VREPLACE_FLAG) | |
| 10296 MSG_PUTS_ATTR(_(" VREPLACE"), attr); | |
| 10297 else | |
| 10298 #endif | |
| 10299 if (State & REPLACE_FLAG) | |
| 10300 MSG_PUTS_ATTR(_(" REPLACE"), attr); | |
| 10301 else if (State & INSERT) | |
| 10302 { | |
| 10303 #ifdef FEAT_RIGHTLEFT | |
| 10304 if (p_ri) | |
| 10305 MSG_PUTS_ATTR(_(" REVERSE"), attr); | |
| 10306 #endif | |
| 10307 MSG_PUTS_ATTR(_(" INSERT"), attr); | |
| 10308 } | |
| 10309 else if (restart_edit == 'I') | |
| 10310 MSG_PUTS_ATTR(_(" (insert)"), attr); | |
| 10311 else if (restart_edit == 'R') | |
| 10312 MSG_PUTS_ATTR(_(" (replace)"), attr); | |
| 10313 else if (restart_edit == 'V') | |
| 10314 MSG_PUTS_ATTR(_(" (vreplace)"), attr); | |
| 10315 #ifdef FEAT_RIGHTLEFT | |
| 10316 if (p_hkmap) | |
| 10317 MSG_PUTS_ATTR(_(" Hebrew"), attr); | |
| 10318 # ifdef FEAT_FKMAP | |
| 10319 if (p_fkmap) | |
| 10320 MSG_PUTS_ATTR(farsi_text_5, attr); | |
| 10321 # endif | |
| 10322 #endif | |
| 10323 #ifdef FEAT_KEYMAP | |
| 10324 if (State & LANGMAP) | |
| 10325 { | |
| 10326 # ifdef FEAT_ARABIC | |
| 10327 if (curwin->w_p_arab) | |
| 10328 MSG_PUTS_ATTR(_(" Arabic"), attr); | |
| 10329 else | |
| 10330 # endif | |
|
9645
123d3c102035
commit https://github.com/vim/vim/commit/73ac0c4281a3606651604a3cbcc334bfb3859a87
Christian Brabandt <cb@256bit.org>
parents:
9489
diff
changeset
|
10331 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
|
10332 NameBuff, MAXPATHL)) |
|
123d3c102035
commit https://github.com/vim/vim/commit/73ac0c4281a3606651604a3cbcc334bfb3859a87
Christian Brabandt <cb@256bit.org>
parents:
9489
diff
changeset
|
10333 MSG_PUTS_ATTR(NameBuff, attr); |
| 7 | 10334 } |
| 10335 #endif | |
| 10336 if ((State & INSERT) && p_paste) | |
| 10337 MSG_PUTS_ATTR(_(" (paste)"), attr); | |
| 10338 | |
| 10339 if (VIsual_active) | |
| 10340 { | |
| 10341 char *p; | |
| 10342 | |
| 10343 /* Don't concatenate separate words to avoid translation | |
| 10344 * problems. */ | |
| 10345 switch ((VIsual_select ? 4 : 0) | |
| 10346 + (VIsual_mode == Ctrl_V) * 2 | |
| 10347 + (VIsual_mode == 'V')) | |
| 10348 { | |
| 10349 case 0: p = N_(" VISUAL"); break; | |
| 10350 case 1: p = N_(" VISUAL LINE"); break; | |
| 10351 case 2: p = N_(" VISUAL BLOCK"); break; | |
| 10352 case 4: p = N_(" SELECT"); break; | |
| 10353 case 5: p = N_(" SELECT LINE"); break; | |
| 10354 default: p = N_(" SELECT BLOCK"); break; | |
| 10355 } | |
| 10356 MSG_PUTS_ATTR(_(p), attr); | |
| 10357 } | |
| 10358 MSG_PUTS_ATTR(" --", attr); | |
| 10359 } | |
| 644 | 10360 |
| 7 | 10361 need_clear = TRUE; |
| 10362 } | |
| 10363 if (Recording | |
| 10364 #ifdef FEAT_INS_EXPAND | |
| 10365 && edit_submode == NULL /* otherwise it gets too long */ | |
| 10366 #endif | |
| 10367 ) | |
| 10368 { | |
|
7233
9487ea110214
commit https://github.com/vim/vim/commit/a0ed84a26897c994512873a895b9fc54e90c6845
Christian Brabandt <cb@256bit.org>
parents:
7208
diff
changeset
|
10369 recording_mode(attr); |
| 7 | 10370 need_clear = TRUE; |
| 10371 } | |
| 644 | 10372 |
| 10373 mode_displayed = TRUE; | |
| 7 | 10374 if (need_clear || clear_cmdline) |
| 10375 msg_clr_eos(); | |
| 10376 msg_didout = FALSE; /* overwrite this message */ | |
| 10377 length = msg_col; | |
| 10378 msg_col = 0; | |
| 10379 need_wait_return = nwr_save; /* never ask for hit-return for this */ | |
| 10380 } | |
| 10381 else if (clear_cmdline && msg_silent == 0) | |
| 10382 /* Clear the whole command line. Will reset "clear_cmdline". */ | |
| 10383 msg_clr_cmdline(); | |
| 10384 | |
| 10385 #ifdef FEAT_CMDL_INFO | |
| 10386 /* In Visual mode the size of the selected area must be redrawn. */ | |
| 10387 if (VIsual_active) | |
| 10388 clear_showcmd(); | |
| 10389 | |
| 10390 /* If the last window has no status line, the ruler is after the mode | |
| 10391 * message and must be redrawn */ | |
| 10392 if (redrawing() | |
| 10393 # ifdef FEAT_WINDOWS | |
| 10394 && lastwin->w_status_height == 0 | |
| 10395 # endif | |
| 10396 ) | |
| 10397 win_redr_ruler(lastwin, TRUE); | |
| 10398 #endif | |
| 10399 redraw_cmdline = FALSE; | |
| 10400 clear_cmdline = FALSE; | |
| 10401 | |
| 10402 return length; | |
| 10403 } | |
| 10404 | |
| 10405 /* | |
| 10406 * Position for a mode message. | |
| 10407 */ | |
| 10408 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
10409 msg_pos_mode(void) |
| 7 | 10410 { |
| 10411 msg_col = 0; | |
| 10412 msg_row = Rows - 1; | |
| 10413 } | |
| 10414 | |
| 10415 /* | |
| 10416 * Delete mode message. Used when ESC is typed which is expected to end | |
| 10417 * Insert mode (but Insert mode didn't end yet!). | |
| 644 | 10418 * Caller should check "mode_displayed". |
| 7 | 10419 */ |
| 10420 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
10421 unshowmode(int force) |
| 7 | 10422 { |
| 10423 /* | |
|
2055
4aa4510d548c
updated for version 7.2.341
Bram Moolenaar <bram@zimbu.org>
parents:
2008
diff
changeset
|
10424 * Don't delete it right now, when not redrawing or inside a mapping. |
| 7 | 10425 */ |
| 10426 if (!redrawing() || (!force && char_avail() && !KeyTyped)) | |
| 10427 redraw_cmdline = TRUE; /* delete mode later */ | |
| 10428 else | |
|
8817
b7eb7bbd71d0
commit https://github.com/vim/vim/commit/fd773e9e88add7d1ffef890fb9f3a00d613b4326
Christian Brabandt <cb@256bit.org>
parents:
8643
diff
changeset
|
10429 clearmode(); |
|
b7eb7bbd71d0
commit https://github.com/vim/vim/commit/fd773e9e88add7d1ffef890fb9f3a00d613b4326
Christian Brabandt <cb@256bit.org>
parents:
8643
diff
changeset
|
10430 } |
|
b7eb7bbd71d0
commit https://github.com/vim/vim/commit/fd773e9e88add7d1ffef890fb9f3a00d613b4326
Christian Brabandt <cb@256bit.org>
parents:
8643
diff
changeset
|
10431 |
|
b7eb7bbd71d0
commit https://github.com/vim/vim/commit/fd773e9e88add7d1ffef890fb9f3a00d613b4326
Christian Brabandt <cb@256bit.org>
parents:
8643
diff
changeset
|
10432 /* |
|
b7eb7bbd71d0
commit https://github.com/vim/vim/commit/fd773e9e88add7d1ffef890fb9f3a00d613b4326
Christian Brabandt <cb@256bit.org>
parents:
8643
diff
changeset
|
10433 * Clear the mode message. |
|
b7eb7bbd71d0
commit https://github.com/vim/vim/commit/fd773e9e88add7d1ffef890fb9f3a00d613b4326
Christian Brabandt <cb@256bit.org>
parents:
8643
diff
changeset
|
10434 */ |
|
b7eb7bbd71d0
commit https://github.com/vim/vim/commit/fd773e9e88add7d1ffef890fb9f3a00d613b4326
Christian Brabandt <cb@256bit.org>
parents:
8643
diff
changeset
|
10435 void |
|
9282
9f97a6290c63
commit https://github.com/vim/vim/commit/cf089463492fab53b2a5d81517829d22f882f82e
Christian Brabandt <cb@256bit.org>
parents:
9213
diff
changeset
|
10436 clearmode(void) |
|
8817
b7eb7bbd71d0
commit https://github.com/vim/vim/commit/fd773e9e88add7d1ffef890fb9f3a00d613b4326
Christian Brabandt <cb@256bit.org>
parents:
8643
diff
changeset
|
10437 { |
|
b7eb7bbd71d0
commit https://github.com/vim/vim/commit/fd773e9e88add7d1ffef890fb9f3a00d613b4326
Christian Brabandt <cb@256bit.org>
parents:
8643
diff
changeset
|
10438 msg_pos_mode(); |
|
b7eb7bbd71d0
commit https://github.com/vim/vim/commit/fd773e9e88add7d1ffef890fb9f3a00d613b4326
Christian Brabandt <cb@256bit.org>
parents:
8643
diff
changeset
|
10439 if (Recording) |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
10440 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
|
10441 msg_clr_eos(); |
| 7 | 10442 } |
| 10443 | |
|
7233
9487ea110214
commit https://github.com/vim/vim/commit/a0ed84a26897c994512873a895b9fc54e90c6845
Christian Brabandt <cb@256bit.org>
parents:
7208
diff
changeset
|
10444 static void |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
10445 recording_mode(int attr) |
|
7233
9487ea110214
commit https://github.com/vim/vim/commit/a0ed84a26897c994512873a895b9fc54e90c6845
Christian Brabandt <cb@256bit.org>
parents:
7208
diff
changeset
|
10446 { |
|
9487ea110214
commit https://github.com/vim/vim/commit/a0ed84a26897c994512873a895b9fc54e90c6845
Christian Brabandt <cb@256bit.org>
parents:
7208
diff
changeset
|
10447 MSG_PUTS_ATTR(_("recording"), attr); |
|
9487ea110214
commit https://github.com/vim/vim/commit/a0ed84a26897c994512873a895b9fc54e90c6845
Christian Brabandt <cb@256bit.org>
parents:
7208
diff
changeset
|
10448 if (!shortmess(SHM_RECORDING)) |
|
9487ea110214
commit https://github.com/vim/vim/commit/a0ed84a26897c994512873a895b9fc54e90c6845
Christian Brabandt <cb@256bit.org>
parents:
7208
diff
changeset
|
10449 { |
|
9487ea110214
commit https://github.com/vim/vim/commit/a0ed84a26897c994512873a895b9fc54e90c6845
Christian Brabandt <cb@256bit.org>
parents:
7208
diff
changeset
|
10450 char_u s[4]; |
|
9487ea110214
commit https://github.com/vim/vim/commit/a0ed84a26897c994512873a895b9fc54e90c6845
Christian Brabandt <cb@256bit.org>
parents:
7208
diff
changeset
|
10451 sprintf((char *)s, " @%c", Recording); |
|
9487ea110214
commit https://github.com/vim/vim/commit/a0ed84a26897c994512873a895b9fc54e90c6845
Christian Brabandt <cb@256bit.org>
parents:
7208
diff
changeset
|
10452 MSG_PUTS_ATTR(s, attr); |
|
9487ea110214
commit https://github.com/vim/vim/commit/a0ed84a26897c994512873a895b9fc54e90c6845
Christian Brabandt <cb@256bit.org>
parents:
7208
diff
changeset
|
10453 } |
|
9487ea110214
commit https://github.com/vim/vim/commit/a0ed84a26897c994512873a895b9fc54e90c6845
Christian Brabandt <cb@256bit.org>
parents:
7208
diff
changeset
|
10454 } |
|
9487ea110214
commit https://github.com/vim/vim/commit/a0ed84a26897c994512873a895b9fc54e90c6845
Christian Brabandt <cb@256bit.org>
parents:
7208
diff
changeset
|
10455 |
| 667 | 10456 #if defined(FEAT_WINDOWS) |
| 10457 /* | |
| 10458 * Draw the tab pages line at the top of the Vim window. | |
| 10459 */ | |
| 10460 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
10461 draw_tabline(void) |
| 667 | 10462 { |
| 10463 int tabcount = 0; | |
| 10464 tabpage_T *tp; | |
| 10465 int tabwidth; | |
| 10466 int col = 0; | |
| 673 | 10467 int scol = 0; |
| 667 | 10468 int attr; |
| 10469 win_T *wp; | |
| 671 | 10470 win_T *cwp; |
| 10471 int wincount; | |
| 10472 int modified; | |
| 667 | 10473 int c; |
| 10474 int len; | |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
10475 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
|
10476 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
|
10477 int attr_fill = HL_ATTR(HLF_TPF); |
| 673 | 10478 char_u *p; |
| 677 | 10479 int room; |
| 10480 int use_sep_chars = (t_colors < 8 | |
| 10481 #ifdef FEAT_GUI | |
| 10482 && !gui.in_use | |
| 10483 #endif | |
|
9027
773d627cac0b
commit https://github.com/vim/vim/commit/61be73bb0f965a895bfb064ea3e55476ac175162
Christian Brabandt <cb@256bit.org>
parents:
8977
diff
changeset
|
10484 #ifdef FEAT_TERMGUICOLORS |
|
773d627cac0b
commit https://github.com/vim/vim/commit/61be73bb0f965a895bfb064ea3e55476ac175162
Christian Brabandt <cb@256bit.org>
parents:
8977
diff
changeset
|
10485 && !p_tgc |
|
8969
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
10486 #endif |
| 677 | 10487 ); |
| 673 | 10488 |
|
10538
c7f671dfd735
patch 8.0.0159: crash on startup when updating tabline
Christian Brabandt <cb@256bit.org>
parents:
10466
diff
changeset
|
10489 if (ScreenLines == NULL) |
|
c7f671dfd735
patch 8.0.0159: crash on startup when updating tabline
Christian Brabandt <cb@256bit.org>
parents:
10466
diff
changeset
|
10490 return; |
| 673 | 10491 redraw_tabline = FALSE; |
| 667 | 10492 |
| 685 | 10493 #ifdef FEAT_GUI_TABLINE |
| 798 | 10494 /* Take care of a GUI tabline. */ |
| 685 | 10495 if (gui_use_tabline()) |
| 10496 { | |
| 10497 gui_update_tabline(); | |
| 10498 return; | |
| 10499 } | |
| 10500 #endif | |
| 10501 | |
| 10502 if (tabline_height() < 1) | |
| 667 | 10503 return; |
| 10504 | |
| 677 | 10505 #if defined(FEAT_STL_OPT) |
| 681 | 10506 |
| 10507 /* Init TabPageIdxs[] to zero: Clicking outside of tabs has no effect. */ | |
| 10508 for (scol = 0; scol < Columns; ++scol) | |
| 10509 TabPageIdxs[scol] = 0; | |
| 10510 | |
| 677 | 10511 /* Use the 'tabline' option if it's set. */ |
| 10512 if (*p_tal != NUL) | |
| 10513 { | |
|
8872
4d4de770f970
commit https://github.com/vim/vim/commit/f73d3bc253fa79ad220f52f04b93e782e95a9d43
Christian Brabandt <cb@256bit.org>
parents:
8847
diff
changeset
|
10514 int saved_did_emsg = did_emsg; |
| 680 | 10515 |
| 10516 /* Check for an error. If there is one we would loop in redrawing the | |
| 10517 * 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
|
10518 did_emsg = FALSE; |
| 677 | 10519 win_redr_custom(NULL, FALSE); |
|
8872
4d4de770f970
commit https://github.com/vim/vim/commit/f73d3bc253fa79ad220f52f04b93e782e95a9d43
Christian Brabandt <cb@256bit.org>
parents:
8847
diff
changeset
|
10520 if (did_emsg) |
| 680 | 10521 set_string_option_direct((char_u *)"tabline", -1, |
| 694 | 10522 (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
|
10523 did_emsg |= saved_did_emsg; |
| 680 | 10524 } |
| 10525 else | |
| 10526 #endif | |
| 10527 { | |
|
9649
fd9727ae3c49
commit https://github.com/vim/vim/commit/2932359000b2f918d5fade79ea4d124d5943cd07
Christian Brabandt <cb@256bit.org>
parents:
9645
diff
changeset
|
10528 FOR_ALL_TABPAGES(tp) |
| 680 | 10529 ++tabcount; |
| 10530 | |
| 10531 tabwidth = (Columns - 1 + tabcount / 2) / tabcount; | |
| 10532 if (tabwidth < 6) | |
| 10533 tabwidth = 6; | |
| 10534 | |
| 10535 attr = attr_nosel; | |
| 10536 tabcount = 0; | |
| 681 | 10537 scol = 0; |
| 699 | 10538 for (tp = first_tabpage; tp != NULL && col < Columns - 4; |
| 10539 tp = tp->tp_next) | |
| 680 | 10540 { |
| 10541 scol = col; | |
| 10542 | |
| 10543 if (tp->tp_topframe == topframe) | |
| 10544 attr = attr_sel; | |
| 10545 if (use_sep_chars && col > 0) | |
| 10546 screen_putchar('|', 0, col++, attr); | |
| 10547 | |
| 10548 if (tp->tp_topframe != topframe) | |
| 10549 attr = attr_nosel; | |
| 10550 | |
| 10551 screen_putchar(' ', 0, col++, attr); | |
| 10552 | |
| 10553 if (tp == curtab) | |
| 10554 { | |
| 10555 cwp = curwin; | |
| 10556 wp = firstwin; | |
| 10557 } | |
| 10558 else | |
| 10559 { | |
| 10560 cwp = tp->tp_curwin; | |
| 10561 wp = tp->tp_firstwin; | |
| 10562 } | |
| 10563 | |
| 10564 modified = FALSE; | |
| 10565 for (wincount = 0; wp != NULL; wp = wp->w_next, ++wincount) | |
| 10566 if (bufIsChanged(wp->w_buffer)) | |
| 10567 modified = TRUE; | |
| 10568 if (modified || wincount > 1) | |
| 10569 { | |
| 10570 if (wincount > 1) | |
| 10571 { | |
| 10572 vim_snprintf((char *)NameBuff, MAXPATHL, "%d", wincount); | |
| 835 | 10573 len = (int)STRLEN(NameBuff); |
| 699 | 10574 if (col + len >= Columns - 3) |
| 10575 break; | |
| 680 | 10576 screen_puts_len(NameBuff, len, 0, col, |
| 677 | 10577 #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
|
10578 hl_combine_attr(attr, HL_ATTR(HLF_T)) |
| 677 | 10579 #else |
| 6106 | 10580 attr |
| 680 | 10581 #endif |
| 10582 ); | |
| 10583 col += len; | |
| 10584 } | |
| 10585 if (modified) | |
| 10586 screen_puts_len((char_u *)"+", 1, 0, col++, attr); | |
| 10587 screen_putchar(' ', 0, col++, attr); | |
| 10588 } | |
| 10589 | |
| 10590 room = scol - col + tabwidth - 1; | |
| 10591 if (room > 0) | |
| 10592 { | |
| 685 | 10593 /* Get buffer name in NameBuff[] */ |
| 10594 get_trans_bufname(cwp->w_buffer); | |
| 819 | 10595 shorten_dir(NameBuff); |
| 680 | 10596 len = vim_strsize(NameBuff); |
| 10597 p = NameBuff; | |
| 677 | 10598 #ifdef FEAT_MBYTE |
| 680 | 10599 if (has_mbyte) |
| 10600 while (len > room) | |
| 10601 { | |
| 10602 len -= ptr2cells(p); | |
|
11127
506f5d8b7d8b
patch 8.0.0451: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11121
diff
changeset
|
10603 MB_PTR_ADV(p); |
| 680 | 10604 } |
| 10605 else | |
| 10606 #endif | |
| 10607 if (len > room) | |
| 677 | 10608 { |
| 680 | 10609 p += len - room; |
| 10610 len = room; | |
| 677 | 10611 } |
| 699 | 10612 if (len > Columns - col - 1) |
| 10613 len = Columns - col - 1; | |
| 680 | 10614 |
| 835 | 10615 screen_puts_len(p, (int)STRLEN(p), 0, col, attr); |
| 680 | 10616 col += len; |
| 10617 } | |
| 10618 screen_putchar(' ', 0, col++, attr); | |
| 10619 | |
| 10620 /* Store the tab page number in TabPageIdxs[], so that | |
| 10621 * jump_to_mouse() knows where each one is. */ | |
| 10622 ++tabcount; | |
| 10623 while (scol < col) | |
| 10624 TabPageIdxs[scol++] = tabcount; | |
| 10625 } | |
| 10626 | |
| 10627 if (use_sep_chars) | |
| 10628 c = '_'; | |
| 10629 else | |
| 10630 c = ' '; | |
| 10631 screen_fill(0, 1, col, (int)Columns, c, c, attr_fill); | |
| 681 | 10632 |
| 10633 /* Put an "X" for closing the current tab if there are several. */ | |
| 10634 if (first_tabpage->tp_next != NULL) | |
| 10635 { | |
| 10636 screen_putchar('X', 0, (int)Columns - 1, attr_nosel); | |
| 10637 TabPageIdxs[Columns - 1] = -999; | |
| 10638 } | |
| 10639 } | |
| 834 | 10640 |
| 10641 /* Reset the flag here again, in case evaluating 'tabline' causes it to be | |
| 10642 * set. */ | |
| 10643 redraw_tabline = FALSE; | |
| 667 | 10644 } |
| 685 | 10645 |
| 10646 /* | |
| 10647 * Get buffer name for "buf" into NameBuff[]. | |
| 10648 * Takes care of special buffer names and translates special characters. | |
| 10649 */ | |
| 10650 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
10651 get_trans_bufname(buf_T *buf) |
| 685 | 10652 { |
| 10653 if (buf_spname(buf) != NULL) | |
| 3839 | 10654 vim_strncpy(NameBuff, buf_spname(buf), MAXPATHL - 1); |
| 685 | 10655 else |
| 10656 home_replace(buf, buf->b_fname, NameBuff, MAXPATHL, TRUE); | |
| 10657 trans_characters(NameBuff, MAXPATHL); | |
| 10658 } | |
| 667 | 10659 #endif |
| 10660 | |
| 7 | 10661 #if defined(FEAT_WINDOWS) || defined(FEAT_WILDMENU) || defined(FEAT_STL_OPT) |
| 10662 /* | |
| 10663 * Get the character to use in a status line. Get its attributes in "*attr". | |
| 10664 */ | |
| 10665 static int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
10666 fillchar_status(int *attr, int is_curwin) |
| 7 | 10667 { |
| 10668 int fill; | |
| 10669 if (is_curwin) | |
| 10670 { | |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
10671 *attr = HL_ATTR(HLF_S); |
| 7 | 10672 fill = fill_stl; |
| 10673 } | |
| 10674 else | |
| 10675 { | |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
10676 *attr = HL_ATTR(HLF_SNC); |
| 7 | 10677 fill = fill_stlnc; |
| 10678 } | |
| 10679 /* Use fill when there is highlighting, and highlighting of current | |
| 10680 * window differs, or the fillchars differ, or this is not the | |
| 10681 * current window */ | |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
10682 if (*attr != 0 && ((HL_ATTR(HLF_S) != HL_ATTR(HLF_SNC) |
|
10349
cf988222b150
commit https://github.com/vim/vim/commit/a1f4cb93ba50ea9e40cd4b1f5592b8a6d1398660
Christian Brabandt <cb@256bit.org>
parents:
10307
diff
changeset
|
10683 || !is_curwin || ONE_WINDOW) |
| 7 | 10684 || (fill_stl != fill_stlnc))) |
| 10685 return fill; | |
| 10686 if (is_curwin) | |
| 10687 return '^'; | |
| 10688 return '='; | |
| 10689 } | |
| 10690 #endif | |
| 10691 | |
|
8643
24b43dd167eb
commit https://github.com/vim/vim/commit/44a2f923c00f1384c9ecde12fb5b4711bc20702e
Christian Brabandt <cb@256bit.org>
parents:
8627
diff
changeset
|
10692 #ifdef FEAT_WINDOWS |
| 7 | 10693 /* |
| 10694 * Get the character to use in a separator between vertically split windows. | |
| 10695 * Get its attributes in "*attr". | |
| 10696 */ | |
| 10697 static int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
10698 fillchar_vsep(int *attr) |
| 7 | 10699 { |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
10700 *attr = HL_ATTR(HLF_C); |
| 7 | 10701 if (*attr == 0 && fill_vert == ' ') |
| 10702 return '|'; | |
| 10703 else | |
| 10704 return fill_vert; | |
| 10705 } | |
| 10706 #endif | |
| 10707 | |
| 10708 /* | |
| 10709 * Return TRUE if redrawing should currently be done. | |
| 10710 */ | |
| 10711 int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
10712 redrawing(void) |
| 7 | 10713 { |
|
11105
7c7e496e625d
patch 8.0.0440: not enough test coverage in Insert mode
Christian Brabandt <cb@256bit.org>
parents:
11010
diff
changeset
|
10714 #ifdef FEAT_EVAL |
|
7c7e496e625d
patch 8.0.0440: not enough test coverage in Insert mode
Christian Brabandt <cb@256bit.org>
parents:
11010
diff
changeset
|
10715 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
|
10716 return 0; |
|
7c7e496e625d
patch 8.0.0440: not enough test coverage in Insert mode
Christian Brabandt <cb@256bit.org>
parents:
11010
diff
changeset
|
10717 else |
|
7c7e496e625d
patch 8.0.0440: not enough test coverage in Insert mode
Christian Brabandt <cb@256bit.org>
parents:
11010
diff
changeset
|
10718 #endif |
|
7c7e496e625d
patch 8.0.0440: not enough test coverage in Insert mode
Christian Brabandt <cb@256bit.org>
parents:
11010
diff
changeset
|
10719 return (!RedrawingDisabled |
| 7 | 10720 && !(p_lz && char_avail() && !KeyTyped && !do_redraw)); |
| 10721 } | |
| 10722 | |
| 10723 /* | |
| 10724 * Return TRUE if printing messages should currently be done. | |
| 10725 */ | |
| 10726 int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
10727 messaging(void) |
| 7 | 10728 { |
| 10729 return (!(p_lz && char_avail() && !KeyTyped)); | |
| 10730 } | |
| 10731 | |
| 10732 /* | |
| 10733 * Show current status info in ruler and various other places | |
| 10734 * If always is FALSE, only show ruler if position has changed. | |
| 10735 */ | |
| 10736 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
10737 showruler(int always) |
| 7 | 10738 { |
| 10739 if (!always && !redrawing()) | |
| 10740 return; | |
| 574 | 10741 #ifdef FEAT_INS_EXPAND |
| 10742 if (pum_visible()) | |
| 10743 { | |
| 639 | 10744 # ifdef FEAT_WINDOWS |
| 574 | 10745 /* Don't redraw right now, do it later. */ |
| 10746 curwin->w_redr_status = TRUE; | |
| 639 | 10747 # endif |
| 574 | 10748 return; |
| 10749 } | |
| 10750 #endif | |
| 7 | 10751 #if defined(FEAT_STL_OPT) && defined(FEAT_WINDOWS) |
| 40 | 10752 if ((*p_stl != NUL || *curwin->w_p_stl != NUL) && curwin->w_status_height) |
| 680 | 10753 { |
| 1983 | 10754 redraw_custom_statusline(curwin); |
| 680 | 10755 } |
| 7 | 10756 else |
| 10757 #endif | |
| 10758 #ifdef FEAT_CMDL_INFO | |
| 10759 win_redr_ruler(curwin, always); | |
| 10760 #endif | |
| 10761 | |
| 10762 #ifdef FEAT_TITLE | |
| 10763 if (need_maketitle | |
| 10764 # ifdef FEAT_STL_OPT | |
| 10765 || (p_icon && (stl_syntax & STL_IN_ICON)) | |
| 10766 || (p_title && (stl_syntax & STL_IN_TITLE)) | |
| 10767 # endif | |
| 10768 ) | |
| 10769 maketitle(); | |
| 10770 #endif | |
| 1588 | 10771 #ifdef FEAT_WINDOWS |
| 10772 /* Redraw the tab pages line if needed. */ | |
| 10773 if (redraw_tabline) | |
| 10774 draw_tabline(); | |
| 10775 #endif | |
| 7 | 10776 } |
| 10777 | |
| 10778 #ifdef FEAT_CMDL_INFO | |
| 10779 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
10780 win_redr_ruler(win_T *wp, int always) |
| 7 | 10781 { |
| 1869 | 10782 #define RULER_BUF_LEN 70 |
| 10783 char_u buffer[RULER_BUF_LEN]; | |
| 7 | 10784 int row; |
| 10785 int fillchar; | |
| 10786 int attr; | |
| 10787 int empty_line = FALSE; | |
| 10788 colnr_T virtcol; | |
| 10789 int i; | |
| 1869 | 10790 size_t len; |
| 7 | 10791 int o; |
|
8643
24b43dd167eb
commit https://github.com/vim/vim/commit/44a2f923c00f1384c9ecde12fb5b4711bc20702e
Christian Brabandt <cb@256bit.org>
parents:
8627
diff
changeset
|
10792 #ifdef FEAT_WINDOWS |
| 7 | 10793 int this_ru_col; |
| 10794 int off = 0; | |
| 10795 int width = Columns; | |
| 10796 # define WITH_OFF(x) x | |
| 10797 # define WITH_WIDTH(x) x | |
| 10798 #else | |
| 10799 # define WITH_OFF(x) 0 | |
| 10800 # define WITH_WIDTH(x) Columns | |
| 10801 # define this_ru_col ru_col | |
| 10802 #endif | |
| 10803 | |
| 10804 /* If 'ruler' off or redrawing disabled, don't do anything */ | |
| 10805 if (!p_ru) | |
| 10806 return; | |
| 10807 | |
| 10808 /* | |
| 10809 * Check if cursor.lnum is valid, since win_redr_ruler() may be called | |
| 10810 * after deleting lines, before cursor.lnum is corrected. | |
| 10811 */ | |
| 10812 if (wp->w_cursor.lnum > wp->w_buffer->b_ml.ml_line_count) | |
| 10813 return; | |
| 10814 | |
| 10815 #ifdef FEAT_INS_EXPAND | |
| 10816 /* Don't draw the ruler while doing insert-completion, it might overwrite | |
| 10817 * the (long) mode message. */ | |
| 10818 # ifdef FEAT_WINDOWS | |
| 10819 if (wp == lastwin && lastwin->w_status_height == 0) | |
| 10820 # endif | |
| 10821 if (edit_submode != NULL) | |
| 10822 return; | |
| 540 | 10823 /* Don't draw the ruler when the popup menu is visible, it may overlap. */ |
| 10824 if (pum_visible()) | |
| 10825 return; | |
| 7 | 10826 #endif |
| 10827 | |
| 10828 #ifdef FEAT_STL_OPT | |
| 10829 if (*p_ruf) | |
| 10830 { | |
| 680 | 10831 int save_called_emsg = called_emsg; |
| 10832 | |
| 10833 called_emsg = FALSE; | |
| 7 | 10834 win_redr_custom(wp, TRUE); |
| 680 | 10835 if (called_emsg) |
| 10836 set_string_option_direct((char_u *)"rulerformat", -1, | |
| 694 | 10837 (char_u *)"", OPT_FREE, SID_ERROR); |
| 680 | 10838 called_emsg |= save_called_emsg; |
| 7 | 10839 return; |
| 10840 } | |
| 10841 #endif | |
| 10842 | |
| 10843 /* | |
| 10844 * Check if not in Insert mode and the line is empty (will show "0-1"). | |
| 10845 */ | |
| 10846 if (!(State & INSERT) | |
| 10847 && *ml_get_buf(wp->w_buffer, wp->w_cursor.lnum, FALSE) == NUL) | |
| 10848 empty_line = TRUE; | |
| 10849 | |
| 10850 /* | |
| 10851 * Only draw the ruler when something changed. | |
| 10852 */ | |
| 10853 validate_virtcol_win(wp); | |
| 10854 if ( redraw_cmdline | |
| 10855 || always | |
| 10856 || wp->w_cursor.lnum != wp->w_ru_cursor.lnum | |
| 10857 || wp->w_cursor.col != wp->w_ru_cursor.col | |
| 10858 || wp->w_virtcol != wp->w_ru_virtcol | |
| 10859 #ifdef FEAT_VIRTUALEDIT | |
| 10860 || wp->w_cursor.coladd != wp->w_ru_cursor.coladd | |
| 10861 #endif | |
| 10862 || wp->w_topline != wp->w_ru_topline | |
| 10863 || wp->w_buffer->b_ml.ml_line_count != wp->w_ru_line_count | |
| 10864 #ifdef FEAT_DIFF | |
| 10865 || wp->w_topfill != wp->w_ru_topfill | |
| 10866 #endif | |
| 10867 || empty_line != wp->w_ru_empty) | |
| 10868 { | |
| 10869 cursor_off(); | |
| 10870 #ifdef FEAT_WINDOWS | |
| 10871 if (wp->w_status_height) | |
| 10872 { | |
| 10873 row = W_WINROW(wp) + wp->w_height; | |
| 10874 fillchar = fillchar_status(&attr, wp == curwin); | |
| 10875 off = W_WINCOL(wp); | |
| 10876 width = W_WIDTH(wp); | |
| 10877 } | |
| 10878 else | |
| 10879 #endif | |
| 10880 { | |
| 10881 row = Rows - 1; | |
| 10882 fillchar = ' '; | |
| 10883 attr = 0; | |
|
8643
24b43dd167eb
commit https://github.com/vim/vim/commit/44a2f923c00f1384c9ecde12fb5b4711bc20702e
Christian Brabandt <cb@256bit.org>
parents:
8627
diff
changeset
|
10884 #ifdef FEAT_WINDOWS |
| 7 | 10885 width = Columns; |
| 10886 off = 0; | |
| 10887 #endif | |
| 10888 } | |
| 10889 | |
| 10890 /* In list mode virtcol needs to be recomputed */ | |
| 10891 virtcol = wp->w_virtcol; | |
| 10892 if (wp->w_p_list && lcs_tab1 == NUL) | |
| 10893 { | |
| 10894 wp->w_p_list = FALSE; | |
| 10895 getvvcol(wp, &wp->w_cursor, NULL, &virtcol, NULL); | |
| 10896 wp->w_p_list = TRUE; | |
| 10897 } | |
| 10898 | |
| 10899 /* | |
| 10900 * Some sprintfs return the length, some return a pointer. | |
| 10901 * To avoid portability problems we use strlen() here. | |
| 10902 */ | |
| 1869 | 10903 vim_snprintf((char *)buffer, RULER_BUF_LEN, "%ld,", |
| 7 | 10904 (wp->w_buffer->b_ml.ml_flags & ML_EMPTY) |
| 10905 ? 0L | |
| 10906 : (long)(wp->w_cursor.lnum)); | |
| 1869 | 10907 len = STRLEN(buffer); |
| 10908 col_print(buffer + len, RULER_BUF_LEN - len, | |
| 7 | 10909 empty_line ? 0 : (int)wp->w_cursor.col + 1, |
| 10910 (int)virtcol + 1); | |
| 10911 | |
| 10912 /* | |
| 10913 * Add a "50%" if there is room for it. | |
| 10914 * On the last line, don't print in the last column (scrolls the | |
| 10915 * screen up on some terminals). | |
| 10916 */ | |
| 10917 i = (int)STRLEN(buffer); | |
| 1869 | 10918 get_rel_pos(wp, buffer + i + 1, RULER_BUF_LEN - i - 1); |
| 7 | 10919 o = i + vim_strsize(buffer + i + 1); |
| 10920 #ifdef FEAT_WINDOWS | |
| 10921 if (wp->w_status_height == 0) /* can't use last char of screen */ | |
| 10922 #endif | |
| 10923 ++o; | |
|
8643
24b43dd167eb
commit https://github.com/vim/vim/commit/44a2f923c00f1384c9ecde12fb5b4711bc20702e
Christian Brabandt <cb@256bit.org>
parents:
8627
diff
changeset
|
10924 #ifdef FEAT_WINDOWS |
| 7 | 10925 this_ru_col = ru_col - (Columns - width); |
| 10926 if (this_ru_col < 0) | |
| 10927 this_ru_col = 0; | |
| 10928 #endif | |
| 10929 /* Never use more than half the window/screen width, leave the other | |
| 10930 * half for the filename. */ | |
| 10931 if (this_ru_col < (WITH_WIDTH(width) + 1) / 2) | |
| 10932 this_ru_col = (WITH_WIDTH(width) + 1) / 2; | |
| 10933 if (this_ru_col + o < WITH_WIDTH(width)) | |
| 10934 { | |
| 6466 | 10935 /* need at least 3 chars left for get_rel_pos() + NUL */ |
| 10936 while (this_ru_col + o < WITH_WIDTH(width) && RULER_BUF_LEN > i + 4) | |
| 7 | 10937 { |
| 10938 #ifdef FEAT_MBYTE | |
| 10939 if (has_mbyte) | |
| 10940 i += (*mb_char2bytes)(fillchar, buffer + i); | |
| 10941 else | |
| 10942 #endif | |
| 10943 buffer[i++] = fillchar; | |
| 10944 ++o; | |
| 10945 } | |
| 1869 | 10946 get_rel_pos(wp, buffer + i, RULER_BUF_LEN - i); |
| 7 | 10947 } |
| 10948 /* Truncate at window boundary. */ | |
| 10949 #ifdef FEAT_MBYTE | |
| 10950 if (has_mbyte) | |
| 10951 { | |
| 10952 o = 0; | |
| 474 | 10953 for (i = 0; buffer[i] != NUL; i += (*mb_ptr2len)(buffer + i)) |
| 7 | 10954 { |
| 10955 o += (*mb_ptr2cells)(buffer + i); | |
| 10956 if (this_ru_col + o > WITH_WIDTH(width)) | |
| 10957 { | |
| 10958 buffer[i] = NUL; | |
| 10959 break; | |
| 10960 } | |
| 10961 } | |
| 10962 } | |
| 10963 else | |
| 10964 #endif | |
| 10965 if (this_ru_col + (int)STRLEN(buffer) > WITH_WIDTH(width)) | |
| 10966 buffer[WITH_WIDTH(width) - this_ru_col] = NUL; | |
| 10967 | |
| 10968 screen_puts(buffer, row, this_ru_col + WITH_OFF(off), attr); | |
| 10969 i = redraw_cmdline; | |
| 10970 screen_fill(row, row + 1, | |
| 10971 this_ru_col + WITH_OFF(off) + (int)STRLEN(buffer), | |
| 10972 (int)(WITH_OFF(off) + WITH_WIDTH(width)), | |
| 10973 fillchar, fillchar, attr); | |
| 10974 /* don't redraw the cmdline because of showing the ruler */ | |
| 10975 redraw_cmdline = i; | |
| 10976 wp->w_ru_cursor = wp->w_cursor; | |
| 10977 wp->w_ru_virtcol = wp->w_virtcol; | |
| 10978 wp->w_ru_empty = empty_line; | |
| 10979 wp->w_ru_topline = wp->w_topline; | |
| 10980 wp->w_ru_line_count = wp->w_buffer->b_ml.ml_line_count; | |
| 10981 #ifdef FEAT_DIFF | |
| 10982 wp->w_ru_topfill = wp->w_topfill; | |
| 10983 #endif | |
| 10984 } | |
| 10985 } | |
| 10986 #endif | |
| 13 | 10987 |
| 10988 #if defined(FEAT_LINEBREAK) || defined(PROTO) | |
| 10989 /* | |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
10990 * 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
|
10991 * Caller may need to check if 'number' or 'relativenumber' is set. |
| 13 | 10992 * Otherwise it depends on 'numberwidth' and the line count. |
| 10993 */ | |
| 10994 int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
10995 number_width(win_T *wp) |
| 13 | 10996 { |
| 10997 int n; | |
| 10998 linenr_T lnum; | |
| 10999 | |
|
4736
3f2319a953b3
updated for version 7.3.1115
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
11000 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
|
11001 /* cursor line shows "0" */ |
|
3f2319a953b3
updated for version 7.3.1115
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
11002 lnum = wp->w_height; |
|
3f2319a953b3
updated for version 7.3.1115
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
11003 else |
|
3f2319a953b3
updated for version 7.3.1115
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
11004 /* cursor line shows absolute line number */ |
|
3f2319a953b3
updated for version 7.3.1115
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
11005 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
|
11006 |
| 6679 | 11007 if (lnum == wp->w_nrwidth_line_count && wp->w_nuw_cached == wp->w_p_nuw) |
| 13 | 11008 return wp->w_nrwidth_width; |
| 11009 wp->w_nrwidth_line_count = lnum; | |
| 11010 | |
| 11011 n = 0; | |
| 11012 do | |
| 11013 { | |
| 856 | 11014 lnum /= 10; |
| 11015 ++n; | |
| 13 | 11016 } while (lnum > 0); |
| 11017 | |
| 11018 /* 'numberwidth' gives the minimal width plus one */ | |
| 11019 if (n < wp->w_p_nuw - 1) | |
| 11020 n = wp->w_p_nuw - 1; | |
| 11021 | |
| 11022 wp->w_nrwidth_width = n; | |
| 6679 | 11023 wp->w_nuw_cached = wp->w_p_nuw; |
| 13 | 11024 return n; |
| 11025 } | |
| 11026 #endif | |
| 3986 | 11027 |
| 11028 /* | |
| 11029 * Return the current cursor column. This is the actual position on the | |
| 11030 * screen. First column is 0. | |
| 11031 */ | |
| 11032 int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
11033 screen_screencol(void) |
| 3986 | 11034 { |
| 11035 return screen_cur_col; | |
| 11036 } | |
| 11037 | |
| 11038 /* | |
| 11039 * Return the current cursor row. This is the actual position on the screen. | |
| 11040 * First row is 0. | |
| 11041 */ | |
| 11042 int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
11043 screen_screenrow(void) |
| 3986 | 11044 { |
| 11045 return screen_cur_row; | |
| 11046 } |