Mercurial > vim
annotate src/screen.c @ 13094:72366f4e3264 v8.0.1422
patch 8.0.1422: no fallback to underline when undercurl is not set
commit https://github.com/vim/vim/commit/45a0000d5c4a5ea934d5a16a2ab5bbcf307623ac
Author: Bram Moolenaar <Bram@vim.org>
Date: Fri Dec 22 21:12:34 2017 +0100
patch 8.0.1422: no fallback to underline when undercurl is not set
Problem: No fallback to underline when undercurl is not set. (Ben Jackson)
Solution: Check for the value to be empty instead of NULL. (closes https://github.com/vim/vim/issues/2424)
| author | Christian Brabandt <cb@256bit.org> |
|---|---|
| date | Fri, 22 Dec 2017 21:15:06 +0100 |
| parents | 27934188d7b5 |
| children | 808625d4b71b |
| 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 | |
|
12487
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
110 #if defined(FEAT_MENU) || defined(FEAT_FOLDING) |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
111 static int text_to_screenline(win_T *wp, char_u *text, int col); |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
112 #endif |
| 7 | 113 #ifdef FEAT_FOLDING |
| 114 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
|
115 static int compute_foldcolumn(win_T *wp, int col); |
| 7 | 116 #endif |
| 117 | |
|
11698
4f59d2a66bf7
patch 8.0.0732: when updating a buffer modeless selection is lost
Christian Brabandt <cb@256bit.org>
parents:
11672
diff
changeset
|
118 /* Flag that is set when drawing for a callback, not from the main command |
|
4f59d2a66bf7
patch 8.0.0732: when updating a buffer modeless selection is lost
Christian Brabandt <cb@256bit.org>
parents:
11672
diff
changeset
|
119 * loop. */ |
|
4f59d2a66bf7
patch 8.0.0732: when updating a buffer modeless selection is lost
Christian Brabandt <cb@256bit.org>
parents:
11672
diff
changeset
|
120 static int redrawing_for_callback = 0; |
|
4f59d2a66bf7
patch 8.0.0732: when updating a buffer modeless selection is lost
Christian Brabandt <cb@256bit.org>
parents:
11672
diff
changeset
|
121 |
| 7 | 122 /* |
| 123 * Buffer for one screen line (characters and attributes). | |
| 124 */ | |
| 125 static schar_T *current_ScreenLine; | |
| 126 | |
|
7805
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7697
diff
changeset
|
127 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
|
128 static void win_draw_end(win_T *wp, int c1, int c2, int row, int endrow, hlf_T hl); |
| 7 | 129 #ifdef FEAT_FOLDING |
|
7805
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7697
diff
changeset
|
130 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
|
131 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
|
132 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
|
133 #endif |
|
12510
7a887dccd13a
patch 8.0.1133: syntax timeout not used correctly
Christian Brabandt <cb@256bit.org>
parents:
12487
diff
changeset
|
134 static int win_line(win_T *, linenr_T, int, int, int nochange); |
|
7805
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7697
diff
changeset
|
135 static int char_needs_redraw(int off_from, int off_to, int cols); |
|
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7697
diff
changeset
|
136 static void draw_vsep_win(win_T *wp, int row); |
| 680 | 137 #ifdef FEAT_STL_OPT |
|
7805
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7697
diff
changeset
|
138 static void redraw_custom_statusline(win_T *wp); |
| 680 | 139 #endif |
| 7 | 140 #ifdef FEAT_SEARCH_EXTRA |
| 5985 | 141 # define SEARCH_HL_PRIORITY 0 |
|
7805
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7697
diff
changeset
|
142 static void start_search_hl(void); |
|
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7697
diff
changeset
|
143 static void end_search_hl(void); |
|
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7697
diff
changeset
|
144 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
|
145 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
|
146 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
|
147 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
|
148 #endif |
|
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7697
diff
changeset
|
149 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
|
150 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
|
151 #ifdef FEAT_MBYTE |
|
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7697
diff
changeset
|
152 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
|
153 #endif |
|
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7697
diff
changeset
|
154 static void screenclear2(void); |
|
12152
69af108df70e
patch 8.0.0956: scrolling in a terminal window has flicker
Christian Brabandt <cb@256bit.org>
parents:
12122
diff
changeset
|
155 static void lineclear(unsigned off, int width, int attr); |
|
7805
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7697
diff
changeset
|
156 static void lineinvalid(unsigned off, int width); |
|
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7697
diff
changeset
|
157 static void linecopy(int to, int from, win_T *wp); |
|
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7697
diff
changeset
|
158 static void redraw_block(int row, int end, win_T *wp); |
|
12152
69af108df70e
patch 8.0.0956: scrolling in a terminal window has flicker
Christian Brabandt <cb@256bit.org>
parents:
12122
diff
changeset
|
159 static int win_do_lines(win_T *wp, int row, int line_count, int mayclear, int del, int clear_attr); |
|
7805
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7697
diff
changeset
|
160 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
|
161 static void msg_pos_mode(void); |
|
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7697
diff
changeset
|
162 static void recording_mode(int attr); |
|
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7697
diff
changeset
|
163 static void draw_tabline(void); |
|
11890
318ae82d8ba4
patch 8.0.0825: not easy to see that a window is a terminal window
Christian Brabandt <cb@256bit.org>
parents:
11866
diff
changeset
|
164 static int fillchar_status(int *attr, win_T *wp); |
|
7805
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7697
diff
changeset
|
165 static int fillchar_vsep(int *attr); |
|
12487
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
166 #ifdef FEAT_MENU |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
167 static void redraw_win_toolbar(win_T *wp); |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
168 #endif |
| 7 | 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 | |
| 176 /* Ugly global: overrule attribute used by screen_char() */ | |
| 177 static int screen_char_attr = 0; | |
| 178 | |
|
11529
998d2cf59caa
patch 8.0.0647: syntax highlighting can make cause a freeze
Christian Brabandt <cb@256bit.org>
parents:
11521
diff
changeset
|
179 #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
|
180 /* 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
|
181 # 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
|
182 #endif |
|
998d2cf59caa
patch 8.0.0647: syntax highlighting can make cause a freeze
Christian Brabandt <cb@256bit.org>
parents:
11521
diff
changeset
|
183 |
|
11672
3c6cc2f24645
patch 8.0.0719: build failure without +terminal feature
Christian Brabandt <cb@256bit.org>
parents:
11670
diff
changeset
|
184 #ifdef FEAT_RIGHTLEFT |
|
3c6cc2f24645
patch 8.0.0719: build failure without +terminal feature
Christian Brabandt <cb@256bit.org>
parents:
11670
diff
changeset
|
185 # define HAS_RIGHTLEFT(x) x |
|
3c6cc2f24645
patch 8.0.0719: build failure without +terminal feature
Christian Brabandt <cb@256bit.org>
parents:
11670
diff
changeset
|
186 #else |
|
3c6cc2f24645
patch 8.0.0719: build failure without +terminal feature
Christian Brabandt <cb@256bit.org>
parents:
11670
diff
changeset
|
187 # define HAS_RIGHTLEFT(x) FALSE |
|
3c6cc2f24645
patch 8.0.0719: build failure without +terminal feature
Christian Brabandt <cb@256bit.org>
parents:
11670
diff
changeset
|
188 #endif |
|
3c6cc2f24645
patch 8.0.0719: build failure without +terminal feature
Christian Brabandt <cb@256bit.org>
parents:
11670
diff
changeset
|
189 |
| 7 | 190 /* |
| 191 * Redraw the current window later, with update_screen(type). | |
| 192 * Set must_redraw only if not already set to a higher value. | |
| 193 * e.g. if must_redraw is CLEAR, type NOT_VALID will do nothing. | |
| 194 */ | |
| 195 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
196 redraw_later(int type) |
| 7 | 197 { |
| 198 redraw_win_later(curwin, type); | |
| 199 } | |
| 200 | |
| 201 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
202 redraw_win_later( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
203 win_T *wp, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
204 int type) |
| 7 | 205 { |
|
12672
4e846c9d61a8
patch 8.0.1214: accessing freed memory when EXITFREE is set
Christian Brabandt <cb@256bit.org>
parents:
12582
diff
changeset
|
206 if (!exiting && wp->w_redr_type < type) |
| 7 | 207 { |
| 208 wp->w_redr_type = type; | |
| 209 if (type >= NOT_VALID) | |
| 210 wp->w_lines_valid = 0; | |
| 211 if (must_redraw < type) /* must_redraw is the maximum of all windows */ | |
| 212 must_redraw = type; | |
| 213 } | |
| 214 } | |
| 215 | |
| 216 /* | |
| 217 * Force a complete redraw later. Also resets the highlighting. To be used | |
| 218 * after executing a shell command that messes up the screen. | |
| 219 */ | |
| 220 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
221 redraw_later_clear(void) |
| 7 | 222 { |
| 223 redraw_all_later(CLEAR); | |
| 826 | 224 #ifdef FEAT_GUI |
| 225 if (gui.in_use) | |
| 226 /* Use a code that will reset gui.highlight_mask in | |
| 227 * gui_stop_highlight(). */ | |
| 228 screen_attr = HL_ALL + 1; | |
| 229 else | |
| 230 #endif | |
| 231 /* Use attributes that is very unlikely to appear in text. */ | |
|
12317
2a8890b80923
patch 8.0.1038: strike-through text not supported
Christian Brabandt <cb@256bit.org>
parents:
12293
diff
changeset
|
232 screen_attr = HL_BOLD | HL_UNDERLINE | HL_INVERSE | HL_STRIKETHROUGH; |
| 7 | 233 } |
| 234 | |
| 235 /* | |
| 236 * Mark all windows to be redrawn later. | |
| 237 */ | |
| 238 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
239 redraw_all_later(int type) |
| 7 | 240 { |
| 241 win_T *wp; | |
| 242 | |
| 243 FOR_ALL_WINDOWS(wp) | |
| 244 { | |
| 245 redraw_win_later(wp, type); | |
| 246 } | |
| 247 } | |
| 248 | |
| 249 /* | |
| 301 | 250 * Mark all windows that are editing the current buffer to be updated later. |
| 7 | 251 */ |
| 252 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
253 redraw_curbuf_later(int type) |
| 7 | 254 { |
| 255 redraw_buf_later(curbuf, type); | |
| 256 } | |
| 257 | |
| 258 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
259 redraw_buf_later(buf_T *buf, int type) |
| 7 | 260 { |
| 261 win_T *wp; | |
| 262 | |
| 263 FOR_ALL_WINDOWS(wp) | |
| 264 { | |
| 265 if (wp->w_buffer == buf) | |
| 266 redraw_win_later(wp, type); | |
| 267 } | |
| 268 } | |
| 269 | |
|
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
|
270 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
|
271 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
|
272 { |
|
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 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
|
274 |
|
11657
a7cd2a53590c
patch 8.0.0711: cannot build without the wildmenu feature
Christian Brabandt <cb@256bit.org>
parents:
11655
diff
changeset
|
275 #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
|
276 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
|
277 /* 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
|
278 * 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
|
279 return; |
|
11657
a7cd2a53590c
patch 8.0.0711: cannot build without the wildmenu feature
Christian Brabandt <cb@256bit.org>
parents:
11655
diff
changeset
|
280 #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
|
281 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
|
282 { |
|
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 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
|
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 redraw_win_later(wp, type); |
|
32aed0993813
patch 8.0.0592: if a job writes to a buffer screen is not updated
Christian Brabandt <cb@256bit.org>
parents:
11277
diff
changeset
|
286 wp->w_redr_status = TRUE; |
|
32aed0993813
patch 8.0.0592: if a job writes to a buffer screen is not updated
Christian Brabandt <cb@256bit.org>
parents:
11277
diff
changeset
|
287 } |
|
32aed0993813
patch 8.0.0592: if a job writes to a buffer screen is not updated
Christian Brabandt <cb@256bit.org>
parents:
11277
diff
changeset
|
288 } |
|
32aed0993813
patch 8.0.0592: if a job writes to a buffer screen is not updated
Christian Brabandt <cb@256bit.org>
parents:
11277
diff
changeset
|
289 } |
|
32aed0993813
patch 8.0.0592: if a job writes to a buffer screen is not updated
Christian Brabandt <cb@256bit.org>
parents:
11277
diff
changeset
|
290 |
| 7 | 291 /* |
|
5090
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
292 * 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
|
293 * 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
|
294 * Return a code indicating what happened. |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
295 */ |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
296 int |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
297 redraw_asap(int type) |
|
5090
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
298 { |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
299 int rows; |
| 6959 | 300 int cols = screen_Columns; |
|
5090
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
301 int r; |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
302 int ret = 0; |
|
5096
a6ddcab6a240
updated for version 7.3.1291
Bram Moolenaar <bram@vim.org>
parents:
5090
diff
changeset
|
303 schar_T *screenline; /* copy from ScreenLines[] */ |
|
a6ddcab6a240
updated for version 7.3.1291
Bram Moolenaar <bram@vim.org>
parents:
5090
diff
changeset
|
304 sattr_T *screenattr; /* copy from ScreenAttrs[] */ |
|
5090
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
305 #ifdef FEAT_MBYTE |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
306 int i; |
|
5096
a6ddcab6a240
updated for version 7.3.1291
Bram Moolenaar <bram@vim.org>
parents:
5090
diff
changeset
|
307 u8char_T *screenlineUC = NULL; /* copy from ScreenLinesUC[] */ |
|
5090
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
308 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
|
309 schar_T *screenline2 = NULL; /* copy from ScreenLines2[] */ |
|
5090
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
310 #endif |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
311 |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
312 redraw_later(type); |
| 6959 | 313 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
|
314 return ret; |
|
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 /* Allocate space to save the text displayed in the command line area. */ |
| 6959 | 317 rows = screen_Rows - cmdline_row; |
|
5090
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
318 screenline = (schar_T *)lalloc( |
| 6959 | 319 (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
|
320 screenattr = (sattr_T *)lalloc( |
| 6959 | 321 (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
|
322 if (screenline == NULL || screenattr == NULL) |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
323 ret = 2; |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
324 #ifdef FEAT_MBYTE |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
325 if (enc_utf8) |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
326 { |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
327 screenlineUC = (u8char_T *)lalloc( |
| 6959 | 328 (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
|
329 if (screenlineUC == NULL) |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
330 ret = 2; |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
331 for (i = 0; i < p_mco; ++i) |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
332 { |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
333 screenlineC[i] = (u8char_T *)lalloc( |
| 6959 | 334 (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
|
335 if (screenlineC[i] == NULL) |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
336 ret = 2; |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
337 } |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
338 } |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
339 if (enc_dbcs == DBCS_JPNU) |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
340 { |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
341 screenline2 = (schar_T *)lalloc( |
| 6959 | 342 (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
|
343 if (screenline2 == NULL) |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
344 ret = 2; |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
345 } |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
346 #endif |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
347 |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
348 if (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 /* 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
|
351 for (r = 0; r < rows; ++r) |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
352 { |
| 6959 | 353 mch_memmove(screenline + r * cols, |
|
5090
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
354 ScreenLines + LineOffset[cmdline_row + r], |
| 6959 | 355 (size_t)cols * sizeof(schar_T)); |
| 356 mch_memmove(screenattr + r * cols, | |
|
5090
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
357 ScreenAttrs + LineOffset[cmdline_row + r], |
| 6959 | 358 (size_t)cols * sizeof(sattr_T)); |
|
5090
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
359 #ifdef FEAT_MBYTE |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
360 if (enc_utf8) |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
361 { |
| 6959 | 362 mch_memmove(screenlineUC + r * cols, |
|
5090
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
363 ScreenLinesUC + LineOffset[cmdline_row + r], |
| 6959 | 364 (size_t)cols * sizeof(u8char_T)); |
|
5090
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
365 for (i = 0; i < p_mco; ++i) |
| 6959 | 366 mch_memmove(screenlineC[i] + r * cols, |
| 367 ScreenLinesC[i] + LineOffset[cmdline_row + r], | |
| 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 } |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
370 if (enc_dbcs == DBCS_JPNU) |
| 6959 | 371 mch_memmove(screenline2 + r * cols, |
|
5090
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
372 ScreenLines2 + LineOffset[cmdline_row + r], |
| 6959 | 373 (size_t)cols * sizeof(schar_T)); |
|
5090
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
374 #endif |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
375 } |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
376 |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
377 update_screen(0); |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
378 ret = 3; |
|
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 if (must_redraw == 0) |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
381 { |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
382 int off = (int)(current_ScreenLine - ScreenLines); |
|
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 /* 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
|
385 for (r = 0; r < rows; ++r) |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
386 { |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
387 mch_memmove(current_ScreenLine, |
| 6959 | 388 screenline + r * cols, |
| 389 (size_t)cols * sizeof(schar_T)); | |
|
5090
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
390 mch_memmove(ScreenAttrs + off, |
| 6959 | 391 screenattr + r * cols, |
| 392 (size_t)cols * sizeof(sattr_T)); | |
|
5090
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
393 #ifdef FEAT_MBYTE |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
394 if (enc_utf8) |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
395 { |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
396 mch_memmove(ScreenLinesUC + off, |
| 6959 | 397 screenlineUC + r * cols, |
| 398 (size_t)cols * sizeof(u8char_T)); | |
|
5090
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
399 for (i = 0; i < p_mco; ++i) |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
400 mch_memmove(ScreenLinesC[i] + off, |
| 6959 | 401 screenlineC[i] + 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 } |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
404 if (enc_dbcs == DBCS_JPNU) |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
405 mch_memmove(ScreenLines2 + off, |
| 6959 | 406 screenline2 + r * cols, |
| 407 (size_t)cols * sizeof(schar_T)); | |
| 408 #endif | |
|
11670
3b2afa2b77b3
patch 8.0.0718: output of job in terminal is not displayed
Christian Brabandt <cb@256bit.org>
parents:
11657
diff
changeset
|
409 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
|
410 } |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
411 ret = 4; |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
412 } |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
413 } |
|
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 vim_free(screenline); |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
416 vim_free(screenattr); |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
417 #ifdef FEAT_MBYTE |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
418 if (enc_utf8) |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
419 { |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
420 vim_free(screenlineUC); |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
421 for (i = 0; i < p_mco; ++i) |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
422 vim_free(screenlineC[i]); |
|
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 if (enc_dbcs == DBCS_JPNU) |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
425 vim_free(screenline2); |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
426 #endif |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
427 |
|
5126
71859e71b1f9
updated for version 7.3.1306
Bram Moolenaar <bram@vim.org>
parents:
5096
diff
changeset
|
428 /* Show the intro message when appropriate. */ |
|
71859e71b1f9
updated for version 7.3.1306
Bram Moolenaar <bram@vim.org>
parents:
5096
diff
changeset
|
429 maybe_intro_message(); |
|
71859e71b1f9
updated for version 7.3.1306
Bram Moolenaar <bram@vim.org>
parents:
5096
diff
changeset
|
430 |
|
71859e71b1f9
updated for version 7.3.1306
Bram Moolenaar <bram@vim.org>
parents:
5096
diff
changeset
|
431 setcursor(); |
|
71859e71b1f9
updated for version 7.3.1306
Bram Moolenaar <bram@vim.org>
parents:
5096
diff
changeset
|
432 |
|
5090
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
433 return ret; |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
434 } |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
435 |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
436 /* |
|
8577
63dc856bd13d
commit https://github.com/vim/vim/commit/975b5271eed4fa0500c24a8f37be0b1797cb9db7
Christian Brabandt <cb@256bit.org>
parents:
8212
diff
changeset
|
437 * 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
|
438 * 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
|
439 * it belongs. If highlighting was changed a redraw is needed. |
|
12244
d0b039e2ed56
patch 8.0.1002: unnecessarily updating screen after timer callback
Christian Brabandt <cb@256bit.org>
parents:
12152
diff
changeset
|
440 * If "call_update_screen" is FALSE don't call update_screen() when at the |
|
d0b039e2ed56
patch 8.0.1002: unnecessarily updating screen after timer callback
Christian Brabandt <cb@256bit.org>
parents:
12152
diff
changeset
|
441 * command line. |
|
8577
63dc856bd13d
commit https://github.com/vim/vim/commit/975b5271eed4fa0500c24a8f37be0b1797cb9db7
Christian Brabandt <cb@256bit.org>
parents:
8212
diff
changeset
|
442 */ |
|
63dc856bd13d
commit https://github.com/vim/vim/commit/975b5271eed4fa0500c24a8f37be0b1797cb9db7
Christian Brabandt <cb@256bit.org>
parents:
8212
diff
changeset
|
443 void |
|
12244
d0b039e2ed56
patch 8.0.1002: unnecessarily updating screen after timer callback
Christian Brabandt <cb@256bit.org>
parents:
12152
diff
changeset
|
444 redraw_after_callback(int call_update_screen) |
|
8577
63dc856bd13d
commit https://github.com/vim/vim/commit/975b5271eed4fa0500c24a8f37be0b1797cb9db7
Christian Brabandt <cb@256bit.org>
parents:
8212
diff
changeset
|
445 { |
|
11698
4f59d2a66bf7
patch 8.0.0732: when updating a buffer modeless selection is lost
Christian Brabandt <cb@256bit.org>
parents:
11672
diff
changeset
|
446 ++redrawing_for_callback; |
|
4f59d2a66bf7
patch 8.0.0732: when updating a buffer modeless selection is lost
Christian Brabandt <cb@256bit.org>
parents:
11672
diff
changeset
|
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 |
|
12244
d0b039e2ed56
patch 8.0.1002: unnecessarily updating screen after timer callback
Christian Brabandt <cb@256bit.org>
parents:
12152
diff
changeset
|
458 && call_update_screen) |
|
11416
32aed0993813
patch 8.0.0592: if a job writes to a buffer screen is not updated
Christian Brabandt <cb@256bit.org>
parents:
11277
diff
changeset
|
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 } |
|
12487
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
464 else if (State & (NORMAL | INSERT | TERMINAL)) |
|
8627
7c98c5d0298c
commit https://github.com/vim/vim/commit/bfb96c047b79b2aab5fd57a2472871508819f3ef
Christian Brabandt <cb@256bit.org>
parents:
8577
diff
changeset
|
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 |
|
11698
4f59d2a66bf7
patch 8.0.0732: when updating a buffer modeless selection is lost
Christian Brabandt <cb@256bit.org>
parents:
11672
diff
changeset
|
482 |
|
4f59d2a66bf7
patch 8.0.0732: when updating a buffer modeless selection is lost
Christian Brabandt <cb@256bit.org>
parents:
11672
diff
changeset
|
483 --redrawing_for_callback; |
|
8577
63dc856bd13d
commit https://github.com/vim/vim/commit/975b5271eed4fa0500c24a8f37be0b1797cb9db7
Christian Brabandt <cb@256bit.org>
parents:
8212
diff
changeset
|
484 } |
|
63dc856bd13d
commit https://github.com/vim/vim/commit/975b5271eed4fa0500c24a8f37be0b1797cb9db7
Christian Brabandt <cb@256bit.org>
parents:
8212
diff
changeset
|
485 |
|
63dc856bd13d
commit https://github.com/vim/vim/commit/975b5271eed4fa0500c24a8f37be0b1797cb9db7
Christian Brabandt <cb@256bit.org>
parents:
8212
diff
changeset
|
486 /* |
| 7 | 487 * Changed something in the current window, at buffer line "lnum", that |
| 488 * requires that line and possibly other lines to be redrawn. | |
| 489 * Used when entering/leaving Insert mode with the cursor on a folded line. | |
| 490 * Used to remove the "$" from a change command. | |
| 491 * Note that when also inserting/deleting lines w_redraw_top and w_redraw_bot | |
| 492 * may become invalid and the whole window will have to be redrawn. | |
| 493 */ | |
| 494 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
495 redrawWinline( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
496 linenr_T lnum, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
497 int invalid UNUSED) /* window line height is invalid now */ |
| 7 | 498 { |
| 499 #ifdef FEAT_FOLDING | |
| 500 int i; | |
| 501 #endif | |
| 502 | |
| 503 if (curwin->w_redraw_top == 0 || curwin->w_redraw_top > lnum) | |
| 504 curwin->w_redraw_top = lnum; | |
| 505 if (curwin->w_redraw_bot == 0 || curwin->w_redraw_bot < lnum) | |
| 506 curwin->w_redraw_bot = lnum; | |
| 507 redraw_later(VALID); | |
| 508 | |
| 509 #ifdef FEAT_FOLDING | |
| 510 if (invalid) | |
| 511 { | |
| 512 /* A w_lines[] entry for this lnum has become invalid. */ | |
| 513 i = find_wl_entry(curwin, lnum); | |
| 514 if (i >= 0) | |
| 515 curwin->w_lines[i].wl_valid = FALSE; | |
| 516 } | |
| 517 #endif | |
| 518 } | |
| 519 | |
| 520 /* | |
|
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
|
521 * Update all windows that are editing the current buffer. |
| 7 | 522 */ |
| 523 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
524 update_curbuf(int type) |
| 7 | 525 { |
| 526 redraw_curbuf_later(type); | |
| 527 update_screen(type); | |
| 528 } | |
| 529 | |
| 530 /* | |
| 531 * Based on the current value of curwin->w_topline, transfer a screenfull | |
| 532 * of stuff from Filemem to ScreenLines[], and update curwin->w_botline. | |
|
12441
854f49cf0abe
patch 8.0.1100: stuck in redraw loop when 'lazyredraw' is set
Christian Brabandt <cb@256bit.org>
parents:
12435
diff
changeset
|
533 * Return OK when the screen was updated, FAIL if it was not done. |
|
854f49cf0abe
patch 8.0.1100: stuck in redraw loop when 'lazyredraw' is set
Christian Brabandt <cb@256bit.org>
parents:
12435
diff
changeset
|
534 */ |
|
854f49cf0abe
patch 8.0.1100: stuck in redraw loop when 'lazyredraw' is set
Christian Brabandt <cb@256bit.org>
parents:
12435
diff
changeset
|
535 int |
|
11416
32aed0993813
patch 8.0.0592: if a job writes to a buffer screen is not updated
Christian Brabandt <cb@256bit.org>
parents:
11277
diff
changeset
|
536 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
|
537 { |
|
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
|
538 int type = type_arg; |
| 7 | 539 win_T *wp; |
| 540 static int did_intro = FALSE; | |
| 541 #if defined(FEAT_SEARCH_EXTRA) || defined(FEAT_CLIPBOARD) | |
| 542 int did_one; | |
| 543 #endif | |
|
9444
e08c8502d7ce
commit https://github.com/vim/vim/commit/144445d15f2369a58b94b6fee2fe162fc81c8abe
Christian Brabandt <cb@256bit.org>
parents:
9428
diff
changeset
|
544 #ifdef FEAT_GUI |
|
9848
664276833670
commit https://github.com/vim/vim/commit/107abd2ca53c31fd3bb40d77ff296e98eaae2975
Christian Brabandt <cb@256bit.org>
parents:
9754
diff
changeset
|
545 int did_undraw = FALSE; |
|
9444
e08c8502d7ce
commit https://github.com/vim/vim/commit/144445d15f2369a58b94b6fee2fe162fc81c8abe
Christian Brabandt <cb@256bit.org>
parents:
9428
diff
changeset
|
546 int gui_cursor_col; |
|
e08c8502d7ce
commit https://github.com/vim/vim/commit/144445d15f2369a58b94b6fee2fe162fc81c8abe
Christian Brabandt <cb@256bit.org>
parents:
9428
diff
changeset
|
547 int gui_cursor_row; |
|
e08c8502d7ce
commit https://github.com/vim/vim/commit/144445d15f2369a58b94b6fee2fe162fc81c8abe
Christian Brabandt <cb@256bit.org>
parents:
9428
diff
changeset
|
548 #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
|
549 int no_update = FALSE; |
| 7 | 550 |
| 2008 | 551 /* Don't do anything if the screen structures are (not yet) valid. */ |
| 7 | 552 if (!screen_valid(TRUE)) |
|
12441
854f49cf0abe
patch 8.0.1100: stuck in redraw loop when 'lazyredraw' is set
Christian Brabandt <cb@256bit.org>
parents:
12435
diff
changeset
|
553 return FAIL; |
| 7 | 554 |
|
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
|
555 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
|
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 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
|
558 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
|
559 } |
|
32aed0993813
patch 8.0.0592: if a job writes to a buffer screen is not updated
Christian Brabandt <cb@256bit.org>
parents:
11277
diff
changeset
|
560 |
| 7 | 561 if (must_redraw) |
| 562 { | |
| 563 if (type < must_redraw) /* use maximal type */ | |
| 564 type = must_redraw; | |
| 1331 | 565 |
| 566 /* must_redraw is reset here, so that when we run into some weird | |
| 567 * reason to redraw while busy redrawing (e.g., asynchronous | |
| 568 * scrolling), or update_topline() in win_update() will cause a | |
| 569 * scroll, the screen will be redrawn later or in win_update(). */ | |
| 7 | 570 must_redraw = 0; |
| 571 } | |
| 572 | |
| 573 /* Need to update w_lines[]. */ | |
| 574 if (curwin->w_lines_valid == 0 && type < NOT_VALID) | |
| 575 type = NOT_VALID; | |
| 576 | |
| 2008 | 577 /* Postpone the redrawing when it's not needed and when being called |
| 578 * recursively. */ | |
| 579 if (!redrawing() || updating_screen) | |
| 7 | 580 { |
| 581 redraw_later(type); /* remember type for next time */ | |
| 582 must_redraw = type; | |
| 583 if (type > INVERTED_ALL) | |
| 584 curwin->w_lines_valid = 0; /* don't use w_lines[].wl_size now */ | |
|
12441
854f49cf0abe
patch 8.0.1100: stuck in redraw loop when 'lazyredraw' is set
Christian Brabandt <cb@256bit.org>
parents:
12435
diff
changeset
|
585 return FAIL; |
| 7 | 586 } |
| 587 | |
| 588 updating_screen = TRUE; | |
| 589 #ifdef FEAT_SYN_HL | |
| 590 ++display_tick; /* let syntax code know we're in a next round of | |
| 591 * display updating */ | |
| 592 #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
|
593 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
|
594 ++no_win_do_lines_ins; |
| 7 | 595 |
| 596 /* | |
| 597 * if the screen was scrolled up when displaying a message, scroll it down | |
| 598 */ | |
| 599 if (msg_scrolled) | |
| 600 { | |
| 601 clear_cmdline = TRUE; | |
| 602 if (msg_scrolled > Rows - 5) /* clearing is faster */ | |
| 603 type = CLEAR; | |
| 604 else if (type != CLEAR) | |
| 605 { | |
| 606 check_for_delay(FALSE); | |
|
12152
69af108df70e
patch 8.0.0956: scrolling in a terminal window has flicker
Christian Brabandt <cb@256bit.org>
parents:
12122
diff
changeset
|
607 if (screen_ins_lines(0, 0, msg_scrolled, (int)Rows, 0, NULL) |
|
69af108df70e
patch 8.0.0956: scrolling in a terminal window has flicker
Christian Brabandt <cb@256bit.org>
parents:
12122
diff
changeset
|
608 == FAIL) |
| 7 | 609 type = CLEAR; |
| 610 FOR_ALL_WINDOWS(wp) | |
| 611 { | |
| 612 if (W_WINROW(wp) < msg_scrolled) | |
| 613 { | |
| 614 if (W_WINROW(wp) + wp->w_height > msg_scrolled | |
| 615 && wp->w_redr_type < REDRAW_TOP | |
| 616 && wp->w_lines_valid > 0 | |
| 617 && wp->w_topline == wp->w_lines[0].wl_lnum) | |
| 618 { | |
| 619 wp->w_upd_rows = msg_scrolled - W_WINROW(wp); | |
| 620 wp->w_redr_type = REDRAW_TOP; | |
| 621 } | |
| 622 else | |
| 623 { | |
| 624 wp->w_redr_type = NOT_VALID; | |
|
12529
158917d728b4
patch 8.0.1143: macros always expand to the same thing
Christian Brabandt <cb@256bit.org>
parents:
12515
diff
changeset
|
625 if (W_WINROW(wp) + wp->w_height + wp->w_status_height |
|
158917d728b4
patch 8.0.1143: macros always expand to the same thing
Christian Brabandt <cb@256bit.org>
parents:
12515
diff
changeset
|
626 <= msg_scrolled) |
| 7 | 627 wp->w_redr_status = TRUE; |
| 628 } | |
| 629 } | |
| 630 } | |
|
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
|
631 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
|
632 redraw_cmdline = TRUE; |
| 673 | 633 redraw_tabline = TRUE; |
| 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 /* Redraw the tab pages line if needed. */ |
| 689 if (redraw_tabline || type >= NOT_VALID) | |
| 690 draw_tabline(); | |
| 691 | |
| 7 | 692 #ifdef FEAT_SYN_HL |
| 693 /* | |
| 694 * Correct stored syntax highlighting info for changes in each displayed | |
| 695 * buffer. Each buffer must only be done once. | |
| 696 */ | |
| 697 FOR_ALL_WINDOWS(wp) | |
| 698 { | |
| 699 if (wp->w_buffer->b_mod_set) | |
| 700 { | |
| 701 win_T *wwp; | |
| 702 | |
| 703 /* Check if we already did this buffer. */ | |
| 704 for (wwp = firstwin; wwp != wp; wwp = wwp->w_next) | |
| 705 if (wwp->w_buffer == wp->w_buffer) | |
| 706 break; | |
|
12477
68d7bc045dbe
patch 8.0.1118: FEAT_WINDOWS adds a lot of #ifdefs
Christian Brabandt <cb@256bit.org>
parents:
12441
diff
changeset
|
707 if (wwp == wp && syntax_present(wp)) |
| 7 | 708 syn_stack_apply_changes(wp->w_buffer); |
| 709 } | |
| 710 } | |
| 711 #endif | |
| 712 | |
| 713 /* | |
| 714 * Go from top to bottom through the windows, redrawing the ones that need | |
| 715 * it. | |
| 716 */ | |
| 717 #if defined(FEAT_SEARCH_EXTRA) || defined(FEAT_CLIPBOARD) | |
| 718 did_one = FALSE; | |
| 719 #endif | |
| 720 #ifdef FEAT_SEARCH_EXTRA | |
| 721 search_hl.rm.regprog = NULL; | |
| 722 #endif | |
| 723 FOR_ALL_WINDOWS(wp) | |
| 724 { | |
| 725 if (wp->w_redr_type != 0) | |
| 726 { | |
| 727 cursor_off(); | |
| 728 #if defined(FEAT_SEARCH_EXTRA) || defined(FEAT_CLIPBOARD) | |
| 729 if (!did_one) | |
| 730 { | |
| 731 did_one = TRUE; | |
| 732 # ifdef FEAT_SEARCH_EXTRA | |
| 733 start_search_hl(); | |
| 734 # endif | |
| 735 # ifdef FEAT_CLIPBOARD | |
| 736 /* When Visual area changed, may have to update selection. */ | |
| 3674 | 737 if (clip_star.available && clip_isautosel_star()) |
| 738 clip_update_selection(&clip_star); | |
| 739 if (clip_plus.available && clip_isautosel_plus()) | |
| 740 clip_update_selection(&clip_plus); | |
| 7 | 741 # endif |
| 742 #ifdef FEAT_GUI | |
| 743 /* Remove the cursor before starting to do anything, because | |
| 744 * scrolling may make it difficult to redraw the text under | |
| 745 * it. */ | |
|
9848
664276833670
commit https://github.com/vim/vim/commit/107abd2ca53c31fd3bb40d77ff296e98eaae2975
Christian Brabandt <cb@256bit.org>
parents:
9754
diff
changeset
|
746 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
|
747 { |
|
e08c8502d7ce
commit https://github.com/vim/vim/commit/144445d15f2369a58b94b6fee2fe162fc81c8abe
Christian Brabandt <cb@256bit.org>
parents:
9428
diff
changeset
|
748 gui_cursor_col = gui.cursor_col; |
|
e08c8502d7ce
commit https://github.com/vim/vim/commit/144445d15f2369a58b94b6fee2fe162fc81c8abe
Christian Brabandt <cb@256bit.org>
parents:
9428
diff
changeset
|
749 gui_cursor_row = gui.cursor_row; |
| 7 | 750 gui_undraw_cursor(); |
|
9848
664276833670
commit https://github.com/vim/vim/commit/107abd2ca53c31fd3bb40d77ff296e98eaae2975
Christian Brabandt <cb@256bit.org>
parents:
9754
diff
changeset
|
751 did_undraw = TRUE; |
|
9444
e08c8502d7ce
commit https://github.com/vim/vim/commit/144445d15f2369a58b94b6fee2fe162fc81c8abe
Christian Brabandt <cb@256bit.org>
parents:
9428
diff
changeset
|
752 } |
| 7 | 753 #endif |
| 754 } | |
| 755 #endif | |
| 756 win_update(wp); | |
| 757 } | |
| 758 | |
| 759 /* redraw status line after the window to minimize cursor movement */ | |
| 760 if (wp->w_redr_status) | |
| 761 { | |
| 762 cursor_off(); | |
| 763 win_redr_status(wp); | |
| 764 } | |
| 765 } | |
| 766 #if defined(FEAT_SEARCH_EXTRA) | |
| 767 end_search_hl(); | |
| 768 #endif | |
| 4107 | 769 #ifdef FEAT_INS_EXPAND |
| 770 /* May need to redraw the popup menu. */ | |
| 771 if (pum_visible()) | |
| 772 pum_redraw(); | |
| 773 #endif | |
| 7 | 774 |
| 775 /* Reset b_mod_set flags. Going through all windows is probably faster | |
| 776 * 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
|
777 FOR_ALL_WINDOWS(wp) |
| 7 | 778 wp->w_buffer->b_mod_set = FALSE; |
| 779 | |
| 780 updating_screen = FALSE; | |
| 781 #ifdef FEAT_GUI | |
| 782 gui_may_resize_shell(); | |
| 783 #endif | |
| 784 | |
| 785 /* Clear or redraw the command line. Done last, because scrolling may | |
| 786 * mess up the command line. */ | |
| 787 if (clear_cmdline || redraw_cmdline) | |
| 788 showmode(); | |
| 789 | |
|
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
|
790 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
|
791 --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
|
792 |
| 7 | 793 /* 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
|
794 if (!did_intro) |
|
71859e71b1f9
updated for version 7.3.1306
Bram Moolenaar <bram@vim.org>
parents:
5096
diff
changeset
|
795 maybe_intro_message(); |
| 7 | 796 did_intro = TRUE; |
| 797 | |
| 798 #ifdef FEAT_GUI | |
| 799 /* Redraw the cursor and update the scrollbars when all screen updating is | |
| 800 * done. */ | |
| 801 if (gui.in_use) | |
| 802 { | |
| 803 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
|
804 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
|
805 { |
|
e08c8502d7ce
commit https://github.com/vim/vim/commit/144445d15f2369a58b94b6fee2fe162fc81c8abe
Christian Brabandt <cb@256bit.org>
parents:
9428
diff
changeset
|
806 /* 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
|
807 * uses that. */ |
|
e08c8502d7ce
commit https://github.com/vim/vim/commit/144445d15f2369a58b94b6fee2fe162fc81c8abe
Christian Brabandt <cb@256bit.org>
parents:
9428
diff
changeset
|
808 gui.col = gui_cursor_col; |
|
e08c8502d7ce
commit https://github.com/vim/vim/commit/144445d15f2369a58b94b6fee2fe162fc81c8abe
Christian Brabandt <cb@256bit.org>
parents:
9428
diff
changeset
|
809 gui.row = gui_cursor_row; |
|
10247
d54d4a258b96
commit https://github.com/vim/vim/commit/84dbd494dca599ecff05b2c2279d402c12e6d197
Christian Brabandt <cb@256bit.org>
parents:
10042
diff
changeset
|
810 # ifdef FEAT_MBYTE |
|
d54d4a258b96
commit https://github.com/vim/vim/commit/84dbd494dca599ecff05b2c2279d402c12e6d197
Christian Brabandt <cb@256bit.org>
parents:
10042
diff
changeset
|
811 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
|
812 # endif |
| 7 | 813 gui_update_cursor(FALSE, FALSE); |
|
9446
aaa6639b6f14
commit https://github.com/vim/vim/commit/65549bdef5805ba5a18a3d2d3909998dd7d9ed46
Christian Brabandt <cb@256bit.org>
parents:
9444
diff
changeset
|
814 screen_cur_col = gui.col; |
|
aaa6639b6f14
commit https://github.com/vim/vim/commit/65549bdef5805ba5a18a3d2d3909998dd7d9ed46
Christian Brabandt <cb@256bit.org>
parents:
9444
diff
changeset
|
815 screen_cur_row = gui.row; |
|
9444
e08c8502d7ce
commit https://github.com/vim/vim/commit/144445d15f2369a58b94b6fee2fe162fc81c8abe
Christian Brabandt <cb@256bit.org>
parents:
9428
diff
changeset
|
816 } |
| 7 | 817 gui_update_scrollbars(FALSE); |
| 818 } | |
| 819 #endif | |
|
12441
854f49cf0abe
patch 8.0.1100: stuck in redraw loop when 'lazyredraw' is set
Christian Brabandt <cb@256bit.org>
parents:
12435
diff
changeset
|
820 return OK; |
| 7 | 821 } |
| 822 | |
|
10793
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
823 #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
|
824 /* |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
825 * 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
|
826 * 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
|
827 */ |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
828 static void |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
829 update_prepare(void) |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
830 { |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
831 cursor_off(); |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
832 updating_screen = TRUE; |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
833 #ifdef FEAT_GUI |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
834 /* 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
|
835 * 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
|
836 if (gui.in_use) |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
837 gui_undraw_cursor(); |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
838 #endif |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
839 #ifdef FEAT_SEARCH_EXTRA |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
840 start_search_hl(); |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
841 #endif |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
842 } |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
843 |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
844 /* |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
845 * 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
|
846 */ |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
847 static void |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
848 update_finish(void) |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
849 { |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
850 if (redraw_cmdline) |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
851 showmode(); |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
852 |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
853 # ifdef FEAT_SEARCH_EXTRA |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
854 end_search_hl(); |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
855 # endif |
|
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 updating_screen = FALSE; |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
858 |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
859 # ifdef FEAT_GUI |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
860 gui_may_resize_shell(); |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
861 |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
862 /* 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
|
863 * done. */ |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
864 if (gui.in_use) |
|
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 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
|
867 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
|
868 gui_update_scrollbars(FALSE); |
|
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 # endif |
|
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 #endif |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
873 |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
874 #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
|
875 /* |
|
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
876 * 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
|
877 * 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
|
878 */ |
|
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
879 int |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
880 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
|
881 { |
|
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
882 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
|
883 |
|
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
884 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
|
885 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
|
886 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
|
887 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
|
888 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
|
889 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
|
890 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
|
891 c = 'n'; |
|
2382
3a5ededa240a
Add the 'c' flag to 'concealcursor'.
Bram Moolenaar <bram@vim.org>
parents:
2381
diff
changeset
|
892 else if (State & CMDLINE) |
|
3a5ededa240a
Add the 'c' flag to 'concealcursor'.
Bram Moolenaar <bram@vim.org>
parents:
2381
diff
changeset
|
893 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
|
894 else |
|
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
895 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
|
896 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
|
897 } |
|
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
898 |
|
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
899 /* |
|
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
900 * 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
|
901 */ |
|
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
902 void |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
903 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
|
904 { |
|
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
905 if (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
|
906 { |
|
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
907 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
|
908 /* 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
|
909 * 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
|
910 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
|
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 |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
914 void |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
915 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
|
916 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
917 int row; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
918 int j; |
|
11529
998d2cf59caa
patch 8.0.0647: syntax highlighting can make cause a freeze
Christian Brabandt <cb@256bit.org>
parents:
11521
diff
changeset
|
919 #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
|
920 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
|
921 #endif |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
922 |
|
9100
ddccff0480d2
commit https://github.com/vim/vim/commit/908be438794619f10ef7fa25e24e5893b2ae0189
Christian Brabandt <cb@256bit.org>
parents:
9027
diff
changeset
|
923 /* 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
|
924 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
|
925 return; |
|
ddccff0480d2
commit https://github.com/vim/vim/commit/908be438794619f10ef7fa25e24e5893b2ae0189
Christian Brabandt <cb@256bit.org>
parents:
9027
diff
changeset
|
926 |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
927 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
|
928 && foldedCount(wp, lnum, &win_foldinfo) == 0) |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
929 { |
|
11529
998d2cf59caa
patch 8.0.0647: syntax highlighting can make cause a freeze
Christian Brabandt <cb@256bit.org>
parents:
11521
diff
changeset
|
930 #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
|
931 /* 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
|
932 profile_setlimit(p_rdt, &syntax_tm); |
|
12510
7a887dccd13a
patch 8.0.1133: syntax timeout not used correctly
Christian Brabandt <cb@256bit.org>
parents:
12487
diff
changeset
|
933 syn_set_timeout(&syntax_tm); |
|
11529
998d2cf59caa
patch 8.0.0647: syntax highlighting can make cause a freeze
Christian Brabandt <cb@256bit.org>
parents:
11521
diff
changeset
|
934 #endif |
|
10793
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
935 update_prepare(); |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
936 |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
937 row = 0; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
938 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
|
939 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
940 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
|
941 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
942 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
|
943 # ifdef FEAT_SEARCH_EXTRA |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
944 init_search_hl(wp); |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
945 start_search_hl(); |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
946 prepare_search_hl(wp, lnum); |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
947 # endif |
|
12510
7a887dccd13a
patch 8.0.1133: syntax timeout not used correctly
Christian Brabandt <cb@256bit.org>
parents:
12487
diff
changeset
|
948 win_line(wp, lnum, row, row + wp->w_lines[j].wl_size, FALSE); |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
949 # if defined(FEAT_SEARCH_EXTRA) |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
950 end_search_hl(); |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
951 # endif |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
952 break; |
|
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 row += wp->w_lines[j].wl_size; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
955 } |
|
10793
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
956 |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
957 update_finish(); |
|
12510
7a887dccd13a
patch 8.0.1133: syntax timeout not used correctly
Christian Brabandt <cb@256bit.org>
parents:
12487
diff
changeset
|
958 |
|
7a887dccd13a
patch 8.0.1133: syntax timeout not used correctly
Christian Brabandt <cb@256bit.org>
parents:
12487
diff
changeset
|
959 #ifdef SYN_TIME_LIMIT |
|
7a887dccd13a
patch 8.0.1133: syntax timeout not used correctly
Christian Brabandt <cb@256bit.org>
parents:
12487
diff
changeset
|
960 syn_set_timeout(NULL); |
|
7a887dccd13a
patch 8.0.1133: syntax timeout not used correctly
Christian Brabandt <cb@256bit.org>
parents:
12487
diff
changeset
|
961 #endif |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
962 } |
|
2378
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
963 need_cursor_line_redraw = FALSE; |
| 7 | 964 } |
| 965 #endif | |
| 966 | |
| 967 #if defined(FEAT_SIGNS) || defined(PROTO) | |
| 968 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
969 update_debug_sign(buf_T *buf, linenr_T lnum) |
| 7 | 970 { |
| 971 win_T *wp; | |
| 972 int doit = FALSE; | |
| 973 | |
| 974 # ifdef FEAT_FOLDING | |
| 975 win_foldinfo.fi_level = 0; | |
| 976 # endif | |
| 977 | |
| 978 /* update/delete a specific mark */ | |
| 979 FOR_ALL_WINDOWS(wp) | |
| 980 { | |
| 981 if (buf != NULL && lnum > 0) | |
| 982 { | |
| 983 if (wp->w_buffer == buf && lnum >= wp->w_topline | |
| 984 && lnum < wp->w_botline) | |
| 985 { | |
| 986 if (wp->w_redraw_top == 0 || wp->w_redraw_top > lnum) | |
| 987 wp->w_redraw_top = lnum; | |
| 988 if (wp->w_redraw_bot == 0 || wp->w_redraw_bot < lnum) | |
| 989 wp->w_redraw_bot = lnum; | |
| 990 redraw_win_later(wp, VALID); | |
| 991 } | |
| 992 } | |
| 993 else | |
| 994 redraw_win_later(wp, VALID); | |
| 995 if (wp->w_redr_type != 0) | |
| 996 doit = TRUE; | |
| 997 } | |
| 998 | |
| 3250 | 999 /* Return when there is nothing to do, screen updating is already |
|
11915
594d96ac226b
patch 8.0.0837: signs can be drawn on top of console messages
Christian Brabandt <cb@256bit.org>
parents:
11890
diff
changeset
|
1000 * happening (recursive call), messages on the screen or still starting up. |
|
594d96ac226b
patch 8.0.0837: signs can be drawn on top of console messages
Christian Brabandt <cb@256bit.org>
parents:
11890
diff
changeset
|
1001 */ |
| 3250 | 1002 if (!doit || updating_screen |
|
11915
594d96ac226b
patch 8.0.0837: signs can be drawn on top of console messages
Christian Brabandt <cb@256bit.org>
parents:
11890
diff
changeset
|
1003 || State == ASKMORE || State == HITRETURN |
|
594d96ac226b
patch 8.0.0837: signs can be drawn on top of console messages
Christian Brabandt <cb@256bit.org>
parents:
11890
diff
changeset
|
1004 || msg_scrolled |
| 3250 | 1005 #ifdef FEAT_GUI |
| 1006 || gui.starting | |
| 1007 #endif | |
| 1008 || starting) | |
| 7 | 1009 return; |
| 1010 | |
| 1011 /* update all windows that need updating */ | |
| 1012 update_prepare(); | |
| 1013 | |
|
9649
fd9727ae3c49
commit https://github.com/vim/vim/commit/2932359000b2f918d5fade79ea4d124d5943cd07
Christian Brabandt <cb@256bit.org>
parents:
9645
diff
changeset
|
1014 FOR_ALL_WINDOWS(wp) |
| 7 | 1015 { |
| 1016 if (wp->w_redr_type != 0) | |
| 1017 win_update(wp); | |
| 1018 if (wp->w_redr_status) | |
| 1019 win_redr_status(wp); | |
| 1020 } | |
| 1021 | |
| 1022 update_finish(); | |
| 1023 } | |
| 1024 #endif | |
| 1025 | |
| 1026 | |
| 1027 #if defined(FEAT_GUI) || defined(PROTO) | |
| 1028 /* | |
| 1029 * Update a single window, its status line and maybe the command line msg. | |
| 1030 * Used for the GUI scrollbar. | |
| 1031 */ | |
| 1032 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1033 updateWindow(win_T *wp) |
| 7 | 1034 { |
| 2008 | 1035 /* return if already busy updating */ |
| 1036 if (updating_screen) | |
| 1037 return; | |
| 1038 | |
| 7 | 1039 update_prepare(); |
| 1040 | |
| 1041 #ifdef FEAT_CLIPBOARD | |
| 1042 /* When Visual area changed, may have to update selection. */ | |
| 3674 | 1043 if (clip_star.available && clip_isautosel_star()) |
| 1044 clip_update_selection(&clip_star); | |
| 1045 if (clip_plus.available && clip_isautosel_plus()) | |
| 1046 clip_update_selection(&clip_plus); | |
| 7 | 1047 #endif |
| 670 | 1048 |
| 7 | 1049 win_update(wp); |
| 670 | 1050 |
| 1051 /* When the screen was cleared redraw the tab pages line. */ | |
| 673 | 1052 if (redraw_tabline) |
| 677 | 1053 draw_tabline(); |
| 670 | 1054 |
| 7 | 1055 if (wp->w_redr_status |
| 1056 # ifdef FEAT_CMDL_INFO | |
| 1057 || p_ru | |
| 1058 # endif | |
| 1059 # ifdef FEAT_STL_OPT | |
| 40 | 1060 || *p_stl != NUL || *wp->w_p_stl != NUL |
| 7 | 1061 # endif |
| 1062 ) | |
| 1063 win_redr_status(wp); | |
| 1064 | |
| 1065 update_finish(); | |
| 1066 } | |
| 1067 #endif | |
| 1068 | |
| 1069 /* | |
| 1070 * Update a single window. | |
| 1071 * | |
| 1072 * This may cause the windows below it also to be redrawn (when clearing the | |
| 1073 * screen or scrolling lines). | |
| 1074 * | |
| 1075 * How the window is redrawn depends on wp->w_redr_type. Each type also | |
| 1076 * implies the one below it. | |
| 1077 * NOT_VALID redraw the whole window | |
| 743 | 1078 * SOME_VALID redraw the whole window but do scroll when possible |
| 7 | 1079 * REDRAW_TOP redraw the top w_upd_rows window lines, otherwise like VALID |
| 1080 * INVERTED redraw the changed part of the Visual area | |
| 1081 * INVERTED_ALL redraw the whole Visual area | |
| 1082 * VALID 1. scroll up/down to adjust for a changed w_topline | |
| 1083 * 2. update lines at the top when scrolled down | |
| 1084 * 3. redraw changed text: | |
| 301 | 1085 * - if wp->w_buffer->b_mod_set set, update lines between |
| 7 | 1086 * b_mod_top and b_mod_bot. |
| 1087 * - if wp->w_redraw_top non-zero, redraw lines between | |
| 1088 * wp->w_redraw_top and wp->w_redr_bot. | |
| 1089 * - continue redrawing when syntax status is invalid. | |
| 1090 * 4. if scrolled up, update lines at the bottom. | |
| 1091 * This results in three areas that may need updating: | |
| 1092 * top: from first row to top_end (when scrolled down) | |
| 1093 * mid: from mid_start to mid_end (update inversion or changed text) | |
| 1094 * bot: from bot_start to last row (when scrolled up) | |
| 1095 */ | |
| 1096 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1097 win_update(win_T *wp) |
| 7 | 1098 { |
| 1099 buf_T *buf = wp->w_buffer; | |
| 1100 int type; | |
| 1101 int top_end = 0; /* Below last row of the top area that needs | |
| 1102 updating. 0 when no top area updating. */ | |
| 1103 int mid_start = 999;/* first row of the mid area that needs | |
| 1104 updating. 999 when no mid area updating. */ | |
| 1105 int mid_end = 0; /* Below last row of the mid area that needs | |
| 1106 updating. 0 when no mid area updating. */ | |
| 1107 int bot_start = 999;/* first row of the bot area that needs | |
| 1108 updating. 999 when no bot area updating */ | |
| 1109 int scrolled_down = FALSE; /* TRUE when scrolled down when | |
| 1110 w_topline got smaller a bit */ | |
| 1111 #ifdef FEAT_SEARCH_EXTRA | |
| 1326 | 1112 matchitem_T *cur; /* points to the match list */ |
| 7 | 1113 int top_to_mod = FALSE; /* redraw above mod_top */ |
| 1114 #endif | |
| 1115 | |
| 1116 int row; /* current window row to display */ | |
| 1117 linenr_T lnum; /* current buffer lnum to display */ | |
| 1118 int idx; /* current index in w_lines[] */ | |
| 1119 int srow; /* starting row of the current line */ | |
| 1120 | |
| 1121 int eof = FALSE; /* if TRUE, we hit the end of the file */ | |
| 1122 int didline = FALSE; /* if TRUE, we finished the last line */ | |
| 1123 int i; | |
| 1124 long j; | |
| 1125 static int recursive = FALSE; /* being called recursively */ | |
| 1126 int old_botline = wp->w_botline; | |
| 1127 #ifdef FEAT_FOLDING | |
| 1128 long fold_count; | |
| 1129 #endif | |
| 1130 #ifdef FEAT_SYN_HL | |
| 1131 /* remember what happened to the previous line, to know if | |
| 1132 * check_visual_highlight() can be used */ | |
| 1133 #define DID_NONE 1 /* didn't update a line */ | |
| 1134 #define DID_LINE 2 /* updated a normal line */ | |
| 1135 #define DID_FOLD 3 /* updated a folded line */ | |
| 1136 int did_update = DID_NONE; | |
| 1137 linenr_T syntax_last_parsed = 0; /* last parsed text line */ | |
| 1138 #endif | |
| 1139 linenr_T mod_top = 0; | |
| 1140 linenr_T mod_bot = 0; | |
| 1141 #if defined(FEAT_SYN_HL) || defined(FEAT_SEARCH_EXTRA) | |
| 1142 int save_got_int; | |
| 1143 #endif | |
|
11529
998d2cf59caa
patch 8.0.0647: syntax highlighting can make cause a freeze
Christian Brabandt <cb@256bit.org>
parents:
11521
diff
changeset
|
1144 #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
|
1145 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
|
1146 #endif |
| 7 | 1147 |
| 1148 type = wp->w_redr_type; | |
| 1149 | |
| 1150 if (type == NOT_VALID) | |
| 1151 { | |
| 1152 wp->w_redr_status = TRUE; | |
| 1153 wp->w_lines_valid = 0; | |
| 1154 } | |
| 1155 | |
| 1156 /* Window is zero-height: nothing to draw. */ | |
|
12998
dd734ee3e2fe
patch 8.0.1375: window size wrong after maximizing with WinBar
Christian Brabandt <cb@256bit.org>
parents:
12964
diff
changeset
|
1157 if (wp->w_height + WINBAR_HEIGHT(wp) == 0) |
| 7 | 1158 { |
| 1159 wp->w_redr_type = 0; | |
| 1160 return; | |
| 1161 } | |
| 1162 | |
| 1163 /* Window is zero-width: Only need to draw the separator. */ | |
| 1164 if (wp->w_width == 0) | |
| 1165 { | |
| 1166 /* draw the vertical separator right of this window */ | |
| 1167 draw_vsep_win(wp, 0); | |
| 1168 wp->w_redr_type = 0; | |
| 1169 return; | |
| 1170 } | |
| 1171 | |
|
11670
3b2afa2b77b3
patch 8.0.0718: output of job in terminal is not displayed
Christian Brabandt <cb@256bit.org>
parents:
11657
diff
changeset
|
1172 #ifdef FEAT_TERMINAL |
|
11834
0cfe4a07c2ad
patch 8.0.0797: finished job in terminal window is not handled
Christian Brabandt <cb@256bit.org>
parents:
11698
diff
changeset
|
1173 /* If this window contains a terminal, redraw works completely differently. |
|
0cfe4a07c2ad
patch 8.0.0797: finished job in terminal window is not handled
Christian Brabandt <cb@256bit.org>
parents:
11698
diff
changeset
|
1174 */ |
|
0cfe4a07c2ad
patch 8.0.0797: finished job in terminal window is not handled
Christian Brabandt <cb@256bit.org>
parents:
11698
diff
changeset
|
1175 if (term_update_window(wp) == OK) |
|
0cfe4a07c2ad
patch 8.0.0797: finished job in terminal window is not handled
Christian Brabandt <cb@256bit.org>
parents:
11698
diff
changeset
|
1176 { |
|
11670
3b2afa2b77b3
patch 8.0.0718: output of job in terminal is not displayed
Christian Brabandt <cb@256bit.org>
parents:
11657
diff
changeset
|
1177 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
|
1178 return; |
|
3b2afa2b77b3
patch 8.0.0718: output of job in terminal is not displayed
Christian Brabandt <cb@256bit.org>
parents:
11657
diff
changeset
|
1179 } |
|
3b2afa2b77b3
patch 8.0.0718: output of job in terminal is not displayed
Christian Brabandt <cb@256bit.org>
parents:
11657
diff
changeset
|
1180 #endif |
|
3b2afa2b77b3
patch 8.0.0718: output of job in terminal is not displayed
Christian Brabandt <cb@256bit.org>
parents:
11657
diff
changeset
|
1181 |
| 7 | 1182 #ifdef FEAT_SEARCH_EXTRA |
|
2284
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
1183 init_search_hl(wp); |
| 7 | 1184 #endif |
| 1185 | |
| 13 | 1186 #ifdef FEAT_LINEBREAK |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
1187 /* 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
|
1188 * changes. */ |
|
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
1189 i = (wp->w_p_nu || wp->w_p_rnu) ? number_width(wp) : 0; |
| 677 | 1190 if (wp->w_nrwidth != i) |
| 13 | 1191 { |
| 1192 type = NOT_VALID; | |
| 677 | 1193 wp->w_nrwidth = i; |
| 13 | 1194 } |
| 1195 else | |
| 1196 #endif | |
| 1197 | |
| 7 | 1198 if (buf->b_mod_set && buf->b_mod_xlines != 0 && wp->w_redraw_top != 0) |
| 1199 { | |
| 1200 /* | |
| 1201 * When there are both inserted/deleted lines and specific lines to be | |
| 1202 * redrawn, w_redraw_top and w_redraw_bot may be invalid, just redraw | |
| 1203 * everything (only happens when redrawing is off for while). | |
| 1204 */ | |
| 1205 type = NOT_VALID; | |
| 1206 } | |
| 1207 else | |
| 1208 { | |
| 1209 /* | |
| 1210 * Set mod_top to the first line that needs displaying because of | |
| 1211 * changes. Set mod_bot to the first line after the changes. | |
| 1212 */ | |
| 1213 mod_top = wp->w_redraw_top; | |
| 1214 if (wp->w_redraw_bot != 0) | |
| 1215 mod_bot = wp->w_redraw_bot + 1; | |
| 1216 else | |
| 1217 mod_bot = 0; | |
| 1218 wp->w_redraw_top = 0; /* reset for next time */ | |
| 1219 wp->w_redraw_bot = 0; | |
| 1220 if (buf->b_mod_set) | |
| 1221 { | |
| 1222 if (mod_top == 0 || mod_top > buf->b_mod_top) | |
| 1223 { | |
| 1224 mod_top = buf->b_mod_top; | |
| 1225 #ifdef FEAT_SYN_HL | |
| 1226 /* Need to redraw lines above the change that may be included | |
| 1227 * in a pattern match. */ | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
1228 if (syntax_present(wp)) |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
1229 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
1230 mod_top -= buf->b_s.b_syn_sync_linebreaks; |
| 7 | 1231 if (mod_top < 1) |
| 1232 mod_top = 1; | |
| 1233 } | |
| 1234 #endif | |
| 1235 } | |
| 1236 if (mod_bot == 0 || mod_bot < buf->b_mod_bot) | |
| 1237 mod_bot = buf->b_mod_bot; | |
| 1238 | |
| 1239 #ifdef FEAT_SEARCH_EXTRA | |
| 1240 /* When 'hlsearch' is on and using a multi-line search pattern, a | |
| 1241 * change in one line may make the Search highlighting in a | |
| 1242 * previous line invalid. Simple solution: redraw all visible | |
| 1243 * lines above the change. | |
| 1326 | 1244 * Same for a match pattern. |
| 7 | 1245 */ |
| 699 | 1246 if (search_hl.rm.regprog != NULL |
| 1247 && re_multiline(search_hl.rm.regprog)) | |
| 7 | 1248 top_to_mod = TRUE; |
| 699 | 1249 else |
| 1326 | 1250 { |
| 1251 cur = wp->w_match_head; | |
| 1252 while (cur != NULL) | |
| 1253 { | |
| 1254 if (cur->match.regprog != NULL | |
| 1255 && re_multiline(cur->match.regprog)) | |
| 699 | 1256 { |
| 1257 top_to_mod = TRUE; | |
| 1258 break; | |
| 1259 } | |
| 1326 | 1260 cur = cur->next; |
| 1261 } | |
| 1262 } | |
| 7 | 1263 #endif |
| 1264 } | |
| 1265 #ifdef FEAT_FOLDING | |
| 1266 if (mod_top != 0 && hasAnyFolding(wp)) | |
| 1267 { | |
| 1268 linenr_T lnumt, lnumb; | |
| 1269 | |
| 1270 /* | |
| 1271 * A change in a line can cause lines above it to become folded or | |
| 1272 * unfolded. Find the top most buffer line that may be affected. | |
| 1273 * If the line was previously folded and displayed, get the first | |
| 1274 * line of that fold. If the line is folded now, get the first | |
| 1275 * folded line. Use the minimum of these two. | |
| 1276 */ | |
| 1277 | |
| 1278 /* Find last valid w_lines[] entry above mod_top. Set lnumt to | |
| 1279 * the line below it. If there is no valid entry, use w_topline. | |
| 1280 * Find the first valid w_lines[] entry below mod_bot. Set lnumb | |
| 1281 * to this line. If there is no valid entry, use MAXLNUM. */ | |
| 1282 lnumt = wp->w_topline; | |
| 1283 lnumb = MAXLNUM; | |
| 1284 for (i = 0; i < wp->w_lines_valid; ++i) | |
| 1285 if (wp->w_lines[i].wl_valid) | |
| 1286 { | |
| 1287 if (wp->w_lines[i].wl_lastlnum < mod_top) | |
| 1288 lnumt = wp->w_lines[i].wl_lastlnum + 1; | |
| 1289 if (lnumb == MAXLNUM && wp->w_lines[i].wl_lnum >= mod_bot) | |
| 1290 { | |
| 1291 lnumb = wp->w_lines[i].wl_lnum; | |
| 1292 /* When there is a fold column it might need updating | |
| 1293 * in the next line ("J" just above an open fold). */ | |
| 6553 | 1294 if (compute_foldcolumn(wp, 0) > 0) |
| 7 | 1295 ++lnumb; |
| 1296 } | |
| 1297 } | |
| 1298 | |
| 1299 (void)hasFoldingWin(wp, mod_top, &mod_top, NULL, TRUE, NULL); | |
| 1300 if (mod_top > lnumt) | |
| 1301 mod_top = lnumt; | |
| 1302 | |
| 1303 /* Now do the same for the bottom line (one above mod_bot). */ | |
| 1304 --mod_bot; | |
| 1305 (void)hasFoldingWin(wp, mod_bot, NULL, &mod_bot, TRUE, NULL); | |
| 1306 ++mod_bot; | |
| 1307 if (mod_bot < lnumb) | |
| 1308 mod_bot = lnumb; | |
| 1309 } | |
| 1310 #endif | |
| 1311 | |
| 1312 /* When a change starts above w_topline and the end is below | |
| 1313 * w_topline, start redrawing at w_topline. | |
| 36 | 1314 * If the end of the change is above w_topline: do like no change was |
| 1315 * made, but redraw the first line to find changes in syntax. */ | |
| 7 | 1316 if (mod_top != 0 && mod_top < wp->w_topline) |
| 1317 { | |
| 1318 if (mod_bot > wp->w_topline) | |
| 1319 mod_top = wp->w_topline; | |
| 1320 #ifdef FEAT_SYN_HL | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
1321 else if (syntax_present(wp)) |
| 7 | 1322 top_end = 1; |
| 1323 #endif | |
| 1324 } | |
| 36 | 1325 |
| 1326 /* When line numbers are displayed need to redraw all lines below | |
| 1327 * inserted/deleted lines. */ | |
| 1328 if (mod_top != 0 && buf->b_mod_xlines != 0 && wp->w_p_nu) | |
| 1329 mod_bot = MAXLNUM; | |
| 7 | 1330 } |
| 1331 | |
| 1332 /* | |
| 1333 * When only displaying the lines at the top, set top_end. Used when | |
| 1334 * window has scrolled down for msg_scrolled. | |
| 1335 */ | |
| 1336 if (type == REDRAW_TOP) | |
| 1337 { | |
| 1338 j = 0; | |
| 1339 for (i = 0; i < wp->w_lines_valid; ++i) | |
| 1340 { | |
| 1341 j += wp->w_lines[i].wl_size; | |
| 1342 if (j >= wp->w_upd_rows) | |
| 1343 { | |
| 1344 top_end = j; | |
| 1345 break; | |
| 1346 } | |
| 1347 } | |
| 1348 if (top_end == 0) | |
| 1349 /* not found (cannot happen?): redraw everything */ | |
| 1350 type = NOT_VALID; | |
| 1351 else | |
| 1352 /* top area defined, the rest is VALID */ | |
| 1353 type = VALID; | |
| 1354 } | |
| 1355 | |
| 1378 | 1356 /* Trick: we want to avoid clearing the screen twice. screenclear() will |
| 1331 | 1357 * set "screen_cleared" to TRUE. The special value MAYBE (which is still |
| 1358 * non-zero and thus not FALSE) will indicate that screenclear() was not | |
| 1359 * called. */ | |
| 1360 if (screen_cleared) | |
| 1361 screen_cleared = MAYBE; | |
| 1362 | |
| 7 | 1363 /* |
| 1364 * If there are no changes on the screen that require a complete redraw, | |
| 1365 * handle three cases: | |
| 1366 * 1: we are off the top of the screen by a few lines: scroll down | |
| 1367 * 2: wp->w_topline is below wp->w_lines[0].wl_lnum: may scroll up | |
| 1368 * 3: wp->w_topline is wp->w_lines[0].wl_lnum: find first entry in | |
| 1369 * w_lines[] that needs updating. | |
| 1370 */ | |
| 743 | 1371 if ((type == VALID || type == SOME_VALID |
| 1372 || type == INVERTED || type == INVERTED_ALL) | |
| 7 | 1373 #ifdef FEAT_DIFF |
| 1374 && !wp->w_botfill && !wp->w_old_botfill | |
| 1375 #endif | |
| 1376 ) | |
| 1377 { | |
| 1378 if (mod_top != 0 && wp->w_topline == mod_top) | |
| 1379 { | |
| 1380 /* | |
| 1381 * w_topline is the first changed line, the scrolling will be done | |
| 1382 * further down. | |
| 1383 */ | |
| 1384 } | |
| 1385 else if (wp->w_lines[0].wl_valid | |
| 1386 && (wp->w_topline < wp->w_lines[0].wl_lnum | |
| 1387 #ifdef FEAT_DIFF | |
| 1388 || (wp->w_topline == wp->w_lines[0].wl_lnum | |
| 1389 && wp->w_topfill > wp->w_old_topfill) | |
| 1390 #endif | |
| 1391 )) | |
| 1392 { | |
| 1393 /* | |
| 1394 * New topline is above old topline: May scroll down. | |
| 1395 */ | |
| 1396 #ifdef FEAT_FOLDING | |
| 1397 if (hasAnyFolding(wp)) | |
| 1398 { | |
| 1399 linenr_T ln; | |
| 1400 | |
| 1401 /* count the number of lines we are off, counting a sequence | |
| 1402 * of folded lines as one */ | |
| 1403 j = 0; | |
| 1404 for (ln = wp->w_topline; ln < wp->w_lines[0].wl_lnum; ++ln) | |
| 1405 { | |
| 1406 ++j; | |
| 1407 if (j >= wp->w_height - 2) | |
| 1408 break; | |
| 1409 (void)hasFoldingWin(wp, ln, NULL, &ln, TRUE, NULL); | |
| 1410 } | |
| 1411 } | |
| 1412 else | |
| 1413 #endif | |
| 1414 j = wp->w_lines[0].wl_lnum - wp->w_topline; | |
| 1415 if (j < wp->w_height - 2) /* not too far off */ | |
| 1416 { | |
| 1417 i = plines_m_win(wp, wp->w_topline, wp->w_lines[0].wl_lnum - 1); | |
| 1418 #ifdef FEAT_DIFF | |
| 1419 /* insert extra lines for previously invisible filler lines */ | |
| 1420 if (wp->w_lines[0].wl_lnum != wp->w_topline) | |
| 1421 i += diff_check_fill(wp, wp->w_lines[0].wl_lnum) | |
| 1422 - wp->w_old_topfill; | |
| 1423 #endif | |
| 1424 if (i < wp->w_height - 2) /* less than a screen off */ | |
| 1425 { | |
| 1426 /* | |
| 1427 * Try to insert the correct number of lines. | |
| 1428 * If not the last window, delete the lines at the bottom. | |
| 1429 * win_ins_lines may fail when the terminal can't do it. | |
| 1430 */ | |
| 1431 if (i > 0) | |
| 1432 check_for_delay(FALSE); | |
| 1433 if (win_ins_lines(wp, 0, i, FALSE, wp == firstwin) == OK) | |
| 1434 { | |
| 1435 if (wp->w_lines_valid != 0) | |
| 1436 { | |
| 1437 /* Need to update rows that are new, stop at the | |
| 1438 * first one that scrolled down. */ | |
| 1439 top_end = i; | |
| 1440 scrolled_down = TRUE; | |
| 1441 | |
| 1442 /* Move the entries that were scrolled, disable | |
| 1443 * the entries for the lines to be redrawn. */ | |
| 1444 if ((wp->w_lines_valid += j) > wp->w_height) | |
| 1445 wp->w_lines_valid = wp->w_height; | |
| 1446 for (idx = wp->w_lines_valid; idx - j >= 0; idx--) | |
| 1447 wp->w_lines[idx] = wp->w_lines[idx - j]; | |
| 1448 while (idx >= 0) | |
| 1449 wp->w_lines[idx--].wl_valid = FALSE; | |
| 1450 } | |
| 1451 } | |
| 1452 else | |
| 1453 mid_start = 0; /* redraw all lines */ | |
| 1454 } | |
| 1455 else | |
| 1456 mid_start = 0; /* redraw all lines */ | |
| 1457 } | |
| 1458 else | |
| 1459 mid_start = 0; /* redraw all lines */ | |
| 1460 } | |
| 1461 else | |
| 1462 { | |
| 1463 /* | |
| 1464 * New topline is at or below old topline: May scroll up. | |
| 1465 * When topline didn't change, find first entry in w_lines[] that | |
| 1466 * needs updating. | |
| 1467 */ | |
| 1468 | |
| 1469 /* try to find wp->w_topline in wp->w_lines[].wl_lnum */ | |
| 1470 j = -1; | |
| 1471 row = 0; | |
| 1472 for (i = 0; i < wp->w_lines_valid; i++) | |
| 1473 { | |
| 1474 if (wp->w_lines[i].wl_valid | |
| 1475 && wp->w_lines[i].wl_lnum == wp->w_topline) | |
| 1476 { | |
| 1477 j = i; | |
| 1478 break; | |
| 1479 } | |
| 1480 row += wp->w_lines[i].wl_size; | |
| 1481 } | |
| 1482 if (j == -1) | |
| 1483 { | |
| 1484 /* if wp->w_topline is not in wp->w_lines[].wl_lnum redraw all | |
| 1485 * lines */ | |
| 1486 mid_start = 0; | |
| 1487 } | |
| 1488 else | |
| 1489 { | |
| 1490 /* | |
| 1491 * Try to delete the correct number of lines. | |
| 1492 * wp->w_topline is at wp->w_lines[i].wl_lnum. | |
| 1493 */ | |
| 1494 #ifdef FEAT_DIFF | |
| 1495 /* If the topline didn't change, delete old filler lines, | |
| 1496 * otherwise delete filler lines of the new topline... */ | |
| 1497 if (wp->w_lines[0].wl_lnum == wp->w_topline) | |
| 1498 row += wp->w_old_topfill; | |
| 1499 else | |
| 1500 row += diff_check_fill(wp, wp->w_topline); | |
| 1501 /* ... but don't delete new filler lines. */ | |
| 1502 row -= wp->w_topfill; | |
| 1503 #endif | |
| 1504 if (row > 0) | |
| 1505 { | |
| 1506 check_for_delay(FALSE); | |
|
12152
69af108df70e
patch 8.0.0956: scrolling in a terminal window has flicker
Christian Brabandt <cb@256bit.org>
parents:
12122
diff
changeset
|
1507 if (win_del_lines(wp, 0, row, FALSE, wp == firstwin, 0) |
|
69af108df70e
patch 8.0.0956: scrolling in a terminal window has flicker
Christian Brabandt <cb@256bit.org>
parents:
12122
diff
changeset
|
1508 == OK) |
| 7 | 1509 bot_start = wp->w_height - row; |
| 1510 else | |
| 1511 mid_start = 0; /* redraw all lines */ | |
| 1512 } | |
| 1513 if ((row == 0 || bot_start < 999) && wp->w_lines_valid != 0) | |
| 1514 { | |
| 1515 /* | |
| 1516 * Skip the lines (below the deleted lines) that are still | |
| 1517 * valid and don't need redrawing. Copy their info | |
| 1518 * upwards, to compensate for the deleted lines. Set | |
| 1519 * bot_start to the first row that needs redrawing. | |
| 1520 */ | |
| 1521 bot_start = 0; | |
| 1522 idx = 0; | |
| 1523 for (;;) | |
| 1524 { | |
| 1525 wp->w_lines[idx] = wp->w_lines[j]; | |
| 1526 /* stop at line that didn't fit, unless it is still | |
| 1527 * valid (no lines deleted) */ | |
| 1528 if (row > 0 && bot_start + row | |
| 1529 + (int)wp->w_lines[j].wl_size > wp->w_height) | |
| 1530 { | |
| 1531 wp->w_lines_valid = idx + 1; | |
| 1532 break; | |
| 1533 } | |
| 1534 bot_start += wp->w_lines[idx++].wl_size; | |
| 1535 | |
| 1536 /* stop at the last valid entry in w_lines[].wl_size */ | |
| 1537 if (++j >= wp->w_lines_valid) | |
| 1538 { | |
| 1539 wp->w_lines_valid = idx; | |
| 1540 break; | |
| 1541 } | |
| 1542 } | |
| 1543 #ifdef FEAT_DIFF | |
| 1544 /* Correct the first entry for filler lines at the top | |
| 1545 * when it won't get updated below. */ | |
| 1546 if (wp->w_p_diff && bot_start > 0) | |
| 1547 wp->w_lines[0].wl_size = | |
| 1548 plines_win_nofill(wp, wp->w_topline, TRUE) | |
| 1549 + wp->w_topfill; | |
| 1550 #endif | |
| 1551 } | |
| 1552 } | |
| 1553 } | |
| 1554 | |
| 1555 /* When starting redraw in the first line, redraw all lines. When | |
| 1556 * there is only one window it's probably faster to clear the screen | |
| 1557 * first. */ | |
| 1558 if (mid_start == 0) | |
| 1559 { | |
| 1560 mid_end = wp->w_height; | |
|
10349
cf988222b150
commit https://github.com/vim/vim/commit/a1f4cb93ba50ea9e40cd4b1f5592b8a6d1398660
Christian Brabandt <cb@256bit.org>
parents:
10307
diff
changeset
|
1561 if (ONE_WINDOW) |
| 981 | 1562 { |
| 1331 | 1563 /* Clear the screen when it was not done by win_del_lines() or |
| 1564 * win_ins_lines() above, "screen_cleared" is FALSE or MAYBE | |
| 1565 * then. */ | |
| 1566 if (screen_cleared != TRUE) | |
| 1567 screenclear(); | |
| 981 | 1568 /* The screen was cleared, redraw the tab pages line. */ |
| 1569 if (redraw_tabline) | |
| 1570 draw_tabline(); | |
| 1571 } | |
| 7 | 1572 } |
| 1331 | 1573 |
| 1574 /* When win_del_lines() or win_ins_lines() caused the screen to be | |
| 1575 * cleared (only happens for the first window) or when screenclear() | |
| 1576 * was called directly above, "must_redraw" will have been set to | |
| 1577 * NOT_VALID, need to reset it here to avoid redrawing twice. */ | |
| 1578 if (screen_cleared == TRUE) | |
| 1579 must_redraw = 0; | |
| 7 | 1580 } |
| 1581 else | |
| 1582 { | |
| 1583 /* Not VALID or INVERTED: redraw all lines. */ | |
| 1584 mid_start = 0; | |
| 1585 mid_end = wp->w_height; | |
| 1586 } | |
| 1587 | |
| 743 | 1588 if (type == SOME_VALID) |
| 1589 { | |
| 1590 /* SOME_VALID: redraw all lines. */ | |
| 1591 mid_start = 0; | |
| 1592 mid_end = wp->w_height; | |
| 1593 type = NOT_VALID; | |
| 1594 } | |
| 1595 | |
| 7 | 1596 /* check if we are updating or removing the inverted part */ |
| 1597 if ((VIsual_active && buf == curwin->w_buffer) | |
| 1598 || (wp->w_old_cursor_lnum != 0 && type != NOT_VALID)) | |
| 1599 { | |
| 1600 linenr_T from, to; | |
| 1601 | |
| 1602 if (VIsual_active) | |
| 1603 { | |
| 1604 if (VIsual_active | |
| 1605 && (VIsual_mode != wp->w_old_visual_mode | |
| 1606 || type == INVERTED_ALL)) | |
| 1607 { | |
| 1608 /* | |
| 1609 * If the type of Visual selection changed, redraw the whole | |
| 1610 * selection. Also when the ownership of the X selection is | |
| 1611 * gained or lost. | |
| 1612 */ | |
| 1613 if (curwin->w_cursor.lnum < VIsual.lnum) | |
| 1614 { | |
| 1615 from = curwin->w_cursor.lnum; | |
| 1616 to = VIsual.lnum; | |
| 1617 } | |
| 1618 else | |
| 1619 { | |
| 1620 from = VIsual.lnum; | |
| 1621 to = curwin->w_cursor.lnum; | |
| 1622 } | |
| 1623 /* redraw more when the cursor moved as well */ | |
| 1624 if (wp->w_old_cursor_lnum < from) | |
| 1625 from = wp->w_old_cursor_lnum; | |
| 1626 if (wp->w_old_cursor_lnum > to) | |
| 1627 to = wp->w_old_cursor_lnum; | |
| 1628 if (wp->w_old_visual_lnum < from) | |
| 1629 from = wp->w_old_visual_lnum; | |
| 1630 if (wp->w_old_visual_lnum > to) | |
| 1631 to = wp->w_old_visual_lnum; | |
| 1632 } | |
| 1633 else | |
| 1634 { | |
| 1635 /* | |
| 1636 * Find the line numbers that need to be updated: The lines | |
| 1637 * between the old cursor position and the current cursor | |
| 1638 * position. Also check if the Visual position changed. | |
| 1639 */ | |
| 1640 if (curwin->w_cursor.lnum < wp->w_old_cursor_lnum) | |
| 1641 { | |
| 1642 from = curwin->w_cursor.lnum; | |
| 1643 to = wp->w_old_cursor_lnum; | |
| 1644 } | |
| 1645 else | |
| 1646 { | |
| 1647 from = wp->w_old_cursor_lnum; | |
| 1648 to = curwin->w_cursor.lnum; | |
| 1649 if (from == 0) /* Visual mode just started */ | |
| 1650 from = to; | |
| 1651 } | |
| 1652 | |
| 422 | 1653 if (VIsual.lnum != wp->w_old_visual_lnum |
| 1654 || VIsual.col != wp->w_old_visual_col) | |
| 7 | 1655 { |
| 1656 if (wp->w_old_visual_lnum < from | |
| 1657 && wp->w_old_visual_lnum != 0) | |
| 1658 from = wp->w_old_visual_lnum; | |
| 1659 if (wp->w_old_visual_lnum > to) | |
| 1660 to = wp->w_old_visual_lnum; | |
| 1661 if (VIsual.lnum < from) | |
| 1662 from = VIsual.lnum; | |
| 1663 if (VIsual.lnum > to) | |
| 1664 to = VIsual.lnum; | |
| 1665 } | |
| 1666 } | |
| 1667 | |
| 1668 /* | |
| 1669 * If in block mode and changed column or curwin->w_curswant: | |
| 1670 * update all lines. | |
| 1671 * First compute the actual start and end column. | |
| 1672 */ | |
| 1673 if (VIsual_mode == Ctrl_V) | |
| 1674 { | |
| 6266 | 1675 colnr_T fromc, toc; |
| 1676 #if defined(FEAT_VIRTUALEDIT) && defined(FEAT_LINEBREAK) | |
| 1677 int save_ve_flags = ve_flags; | |
| 1678 | |
| 1679 if (curwin->w_p_lbr) | |
| 1680 ve_flags = VE_ALL; | |
| 1681 #endif | |
| 7 | 1682 getvcols(wp, &VIsual, &curwin->w_cursor, &fromc, &toc); |
| 6266 | 1683 #if defined(FEAT_VIRTUALEDIT) && defined(FEAT_LINEBREAK) |
| 1684 ve_flags = save_ve_flags; | |
| 1685 #endif | |
| 7 | 1686 ++toc; |
| 1687 if (curwin->w_curswant == MAXCOL) | |
| 1688 toc = MAXCOL; | |
| 1689 | |
| 1690 if (fromc != wp->w_old_cursor_fcol | |
| 1691 || toc != wp->w_old_cursor_lcol) | |
| 1692 { | |
| 1693 if (from > VIsual.lnum) | |
| 1694 from = VIsual.lnum; | |
| 1695 if (to < VIsual.lnum) | |
| 1696 to = VIsual.lnum; | |
| 1697 } | |
| 1698 wp->w_old_cursor_fcol = fromc; | |
| 1699 wp->w_old_cursor_lcol = toc; | |
| 1700 } | |
| 1701 } | |
| 1702 else | |
| 1703 { | |
| 1704 /* Use the line numbers of the old Visual area. */ | |
| 1705 if (wp->w_old_cursor_lnum < wp->w_old_visual_lnum) | |
| 1706 { | |
| 1707 from = wp->w_old_cursor_lnum; | |
| 1708 to = wp->w_old_visual_lnum; | |
| 1709 } | |
| 1710 else | |
| 1711 { | |
| 1712 from = wp->w_old_visual_lnum; | |
| 1713 to = wp->w_old_cursor_lnum; | |
| 1714 } | |
| 1715 } | |
| 1716 | |
| 1717 /* | |
| 1718 * There is no need to update lines above the top of the window. | |
| 1719 */ | |
| 1720 if (from < wp->w_topline) | |
| 1721 from = wp->w_topline; | |
| 1722 | |
| 1723 /* | |
| 1724 * If we know the value of w_botline, use it to restrict the update to | |
| 1725 * the lines that are visible in the window. | |
| 1726 */ | |
| 1727 if (wp->w_valid & VALID_BOTLINE) | |
| 1728 { | |
| 1729 if (from >= wp->w_botline) | |
| 1730 from = wp->w_botline - 1; | |
| 1731 if (to >= wp->w_botline) | |
| 1732 to = wp->w_botline - 1; | |
| 1733 } | |
| 1734 | |
| 1735 /* | |
| 1736 * Find the minimal part to be updated. | |
| 1737 * Watch out for scrolling that made entries in w_lines[] invalid. | |
| 1738 * E.g., CTRL-U makes the first half of w_lines[] invalid and sets | |
| 1739 * top_end; need to redraw from top_end to the "to" line. | |
| 1740 * A middle mouse click with a Visual selection may change the text | |
| 1741 * above the Visual area and reset wl_valid, do count these for | |
| 1742 * mid_end (in srow). | |
| 1743 */ | |
| 1744 if (mid_start > 0) | |
| 1745 { | |
| 1746 lnum = wp->w_topline; | |
| 1747 idx = 0; | |
| 1748 srow = 0; | |
| 1749 if (scrolled_down) | |
| 1750 mid_start = top_end; | |
| 1751 else | |
| 1752 mid_start = 0; | |
| 1753 while (lnum < from && idx < wp->w_lines_valid) /* find start */ | |
| 1754 { | |
| 1755 if (wp->w_lines[idx].wl_valid) | |
| 1756 mid_start += wp->w_lines[idx].wl_size; | |
| 1757 else if (!scrolled_down) | |
| 1758 srow += wp->w_lines[idx].wl_size; | |
| 1759 ++idx; | |
| 1760 # ifdef FEAT_FOLDING | |
| 1761 if (idx < wp->w_lines_valid && wp->w_lines[idx].wl_valid) | |
| 1762 lnum = wp->w_lines[idx].wl_lnum; | |
| 1763 else | |
| 1764 # endif | |
| 1765 ++lnum; | |
| 1766 } | |
| 1767 srow += mid_start; | |
| 1768 mid_end = wp->w_height; | |
| 1769 for ( ; idx < wp->w_lines_valid; ++idx) /* find end */ | |
| 1770 { | |
| 1771 if (wp->w_lines[idx].wl_valid | |
| 1772 && wp->w_lines[idx].wl_lnum >= to + 1) | |
| 1773 { | |
| 1774 /* Only update until first row of this line */ | |
| 1775 mid_end = srow; | |
| 1776 break; | |
| 1777 } | |
| 1778 srow += wp->w_lines[idx].wl_size; | |
| 1779 } | |
| 1780 } | |
| 1781 } | |
| 1782 | |
| 1783 if (VIsual_active && buf == curwin->w_buffer) | |
| 1784 { | |
| 1785 wp->w_old_visual_mode = VIsual_mode; | |
| 1786 wp->w_old_cursor_lnum = curwin->w_cursor.lnum; | |
| 1787 wp->w_old_visual_lnum = VIsual.lnum; | |
| 422 | 1788 wp->w_old_visual_col = VIsual.col; |
| 7 | 1789 wp->w_old_curswant = curwin->w_curswant; |
| 1790 } | |
| 1791 else | |
| 1792 { | |
| 1793 wp->w_old_visual_mode = 0; | |
| 1794 wp->w_old_cursor_lnum = 0; | |
| 1795 wp->w_old_visual_lnum = 0; | |
| 422 | 1796 wp->w_old_visual_col = 0; |
| 7 | 1797 } |
| 1798 | |
| 1799 #if defined(FEAT_SYN_HL) || defined(FEAT_SEARCH_EXTRA) | |
| 1800 /* reset got_int, otherwise regexp won't work */ | |
| 1801 save_got_int = got_int; | |
| 1802 got_int = 0; | |
| 1803 #endif | |
|
11529
998d2cf59caa
patch 8.0.0647: syntax highlighting can make cause a freeze
Christian Brabandt <cb@256bit.org>
parents:
11521
diff
changeset
|
1804 #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
|
1805 /* 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
|
1806 profile_setlimit(p_rdt, &syntax_tm); |
|
12510
7a887dccd13a
patch 8.0.1133: syntax timeout not used correctly
Christian Brabandt <cb@256bit.org>
parents:
12487
diff
changeset
|
1807 syn_set_timeout(&syntax_tm); |
|
11529
998d2cf59caa
patch 8.0.0647: syntax highlighting can make cause a freeze
Christian Brabandt <cb@256bit.org>
parents:
11521
diff
changeset
|
1808 #endif |
| 7 | 1809 #ifdef FEAT_FOLDING |
| 1810 win_foldinfo.fi_level = 0; | |
| 1811 #endif | |
| 1812 | |
|
12487
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
1813 #ifdef FEAT_MENU |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
1814 /* |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
1815 * Draw the window toolbar, if there is one. |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
1816 * TODO: only when needed. |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
1817 */ |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
1818 if (winbar_height(wp) > 0) |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
1819 redraw_win_toolbar(wp); |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
1820 #endif |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
1821 |
| 7 | 1822 /* |
| 1823 * Update all the window rows. | |
| 1824 */ | |
| 1825 idx = 0; /* first entry in w_lines[].wl_size */ | |
| 1826 row = 0; | |
| 1827 srow = 0; | |
| 1828 lnum = wp->w_topline; /* first line shown in window */ | |
| 1829 for (;;) | |
| 1830 { | |
| 1831 /* stop updating when reached the end of the window (check for _past_ | |
| 1832 * the end of the window is at the end of the loop) */ | |
| 1833 if (row == wp->w_height) | |
| 1834 { | |
| 1835 didline = TRUE; | |
| 1836 break; | |
| 1837 } | |
| 1838 | |
| 1839 /* stop updating when hit the end of the file */ | |
| 1840 if (lnum > buf->b_ml.ml_line_count) | |
| 1841 { | |
| 1842 eof = TRUE; | |
| 1843 break; | |
| 1844 } | |
| 1845 | |
| 1846 /* Remember the starting row of the line that is going to be dealt | |
| 1847 * with. It is used further down when the line doesn't fit. */ | |
| 1848 srow = row; | |
| 1849 | |
| 1850 /* | |
| 1851 * Update a line when it is in an area that needs updating, when it | |
| 1852 * has changes or w_lines[idx] is invalid. | |
| 1853 * bot_start may be halfway a wrapped line after using | |
| 1854 * win_del_lines(), check if the current line includes it. | |
| 1855 * When syntax folding is being used, the saved syntax states will | |
| 1856 * already have been updated, we can't see where the syntax state is | |
| 1857 * the same again, just update until the end of the window. | |
| 1858 */ | |
| 1859 if (row < top_end | |
| 1860 || (row >= mid_start && row < mid_end) | |
| 1861 #ifdef FEAT_SEARCH_EXTRA | |
| 1862 || top_to_mod | |
| 1863 #endif | |
| 1864 || idx >= wp->w_lines_valid | |
| 1865 || (row + wp->w_lines[idx].wl_size > bot_start) | |
| 1866 || (mod_top != 0 | |
| 1867 && (lnum == mod_top | |
| 1868 || (lnum >= mod_top | |
| 1869 && (lnum < mod_bot | |
| 1870 #ifdef FEAT_SYN_HL | |
| 1871 || did_update == DID_FOLD | |
| 1872 || (did_update == DID_LINE | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
1873 && syntax_present(wp) |
| 7 | 1874 && ( |
| 1875 # ifdef FEAT_FOLDING | |
| 1876 (foldmethodIsSyntax(wp) | |
| 1877 && hasAnyFolding(wp)) || | |
| 1878 # endif | |
| 1879 syntax_check_changed(lnum))) | |
| 1880 #endif | |
|
4916
ba328b4a990e
updated for version 7.3.1203
Bram Moolenaar <bram@vim.org>
parents:
4805
diff
changeset
|
1881 #ifdef FEAT_SEARCH_EXTRA |
| 6018 | 1882 /* match in fixed position might need redraw |
| 1883 * if lines were inserted or deleted */ | |
| 1884 || (wp->w_match_head != NULL | |
| 1885 && buf->b_mod_xlines != 0) | |
|
4916
ba328b4a990e
updated for version 7.3.1203
Bram Moolenaar <bram@vim.org>
parents:
4805
diff
changeset
|
1886 #endif |
| 7 | 1887 ))))) |
| 1888 { | |
| 1889 #ifdef FEAT_SEARCH_EXTRA | |
| 1890 if (lnum == mod_top) | |
| 1891 top_to_mod = FALSE; | |
| 1892 #endif | |
| 1893 | |
| 1894 /* | |
| 1895 * When at start of changed lines: May scroll following lines | |
| 1896 * up or down to minimize redrawing. | |
| 1897 * Don't do this when the change continues until the end. | |
| 3318 | 1898 * Don't scroll when dollar_vcol >= 0, keep the "$". |
| 7 | 1899 */ |
| 1900 if (lnum == mod_top | |
| 1901 && mod_bot != MAXLNUM | |
| 3318 | 1902 && !(dollar_vcol >= 0 && mod_bot == mod_top + 1)) |
| 7 | 1903 { |
| 1904 int old_rows = 0; | |
| 1905 int new_rows = 0; | |
| 1906 int xtra_rows; | |
| 1907 linenr_T l; | |
| 1908 | |
| 1909 /* Count the old number of window rows, using w_lines[], which | |
| 1910 * should still contain the sizes for the lines as they are | |
| 1911 * currently displayed. */ | |
| 1912 for (i = idx; i < wp->w_lines_valid; ++i) | |
| 1913 { | |
| 1914 /* Only valid lines have a meaningful wl_lnum. Invalid | |
| 1915 * lines are part of the changed area. */ | |
| 1916 if (wp->w_lines[i].wl_valid | |
| 1917 && wp->w_lines[i].wl_lnum == mod_bot) | |
| 1918 break; | |
| 1919 old_rows += wp->w_lines[i].wl_size; | |
| 1920 #ifdef FEAT_FOLDING | |
| 1921 if (wp->w_lines[i].wl_valid | |
| 1922 && wp->w_lines[i].wl_lastlnum + 1 == mod_bot) | |
| 1923 { | |
| 1924 /* Must have found the last valid entry above mod_bot. | |
| 1925 * Add following invalid entries. */ | |
| 1926 ++i; | |
| 1927 while (i < wp->w_lines_valid | |
| 1928 && !wp->w_lines[i].wl_valid) | |
| 1929 old_rows += wp->w_lines[i++].wl_size; | |
| 1930 break; | |
| 1931 } | |
| 1932 #endif | |
| 1933 } | |
| 1934 | |
| 1935 if (i >= wp->w_lines_valid) | |
| 1936 { | |
| 1937 /* We can't find a valid line below the changed lines, | |
| 1938 * need to redraw until the end of the window. | |
| 1939 * Inserting/deleting lines has no use. */ | |
| 1940 bot_start = 0; | |
| 1941 } | |
| 1942 else | |
| 1943 { | |
| 1944 /* Able to count old number of rows: Count new window | |
| 1945 * rows, and may insert/delete lines */ | |
| 1946 j = idx; | |
| 1947 for (l = lnum; l < mod_bot; ++l) | |
| 1948 { | |
| 1949 #ifdef FEAT_FOLDING | |
| 1950 if (hasFoldingWin(wp, l, NULL, &l, TRUE, NULL)) | |
| 1951 ++new_rows; | |
| 1952 else | |
| 1953 #endif | |
| 1954 #ifdef FEAT_DIFF | |
| 1955 if (l == wp->w_topline) | |
| 1956 new_rows += plines_win_nofill(wp, l, TRUE) | |
| 1957 + wp->w_topfill; | |
| 1958 else | |
| 1959 #endif | |
| 1960 new_rows += plines_win(wp, l, TRUE); | |
| 1961 ++j; | |
| 1962 if (new_rows > wp->w_height - row - 2) | |
| 1963 { | |
| 1964 /* it's getting too much, must redraw the rest */ | |
| 1965 new_rows = 9999; | |
| 1966 break; | |
| 1967 } | |
| 1968 } | |
| 1969 xtra_rows = new_rows - old_rows; | |
| 1970 if (xtra_rows < 0) | |
| 1971 { | |
| 1972 /* May scroll text up. If there is not enough | |
| 1973 * remaining text or scrolling fails, must redraw the | |
| 1974 * rest. If scrolling works, must redraw the text | |
| 1975 * below the scrolled text. */ | |
| 1976 if (row - xtra_rows >= wp->w_height - 2) | |
| 1977 mod_bot = MAXLNUM; | |
| 1978 else | |
| 1979 { | |
| 1980 check_for_delay(FALSE); | |
| 1981 if (win_del_lines(wp, row, | |
|
12152
69af108df70e
patch 8.0.0956: scrolling in a terminal window has flicker
Christian Brabandt <cb@256bit.org>
parents:
12122
diff
changeset
|
1982 -xtra_rows, FALSE, FALSE, 0) == FAIL) |
| 7 | 1983 mod_bot = MAXLNUM; |
| 1984 else | |
| 1985 bot_start = wp->w_height + xtra_rows; | |
| 1986 } | |
| 1987 } | |
| 1988 else if (xtra_rows > 0) | |
| 1989 { | |
| 1990 /* May scroll text down. If there is not enough | |
| 1991 * remaining text of scrolling fails, must redraw the | |
| 1992 * rest. */ | |
| 1993 if (row + xtra_rows >= wp->w_height - 2) | |
| 1994 mod_bot = MAXLNUM; | |
| 1995 else | |
| 1996 { | |
| 1997 check_for_delay(FALSE); | |
| 1998 if (win_ins_lines(wp, row + old_rows, | |
| 1999 xtra_rows, FALSE, FALSE) == FAIL) | |
| 2000 mod_bot = MAXLNUM; | |
| 2001 else if (top_end > row + old_rows) | |
| 2002 /* Scrolled the part at the top that requires | |
| 2003 * updating down. */ | |
| 2004 top_end += xtra_rows; | |
| 2005 } | |
| 2006 } | |
| 2007 | |
| 2008 /* When not updating the rest, may need to move w_lines[] | |
| 2009 * entries. */ | |
| 2010 if (mod_bot != MAXLNUM && i != j) | |
| 2011 { | |
| 2012 if (j < i) | |
| 2013 { | |
| 2014 int x = row + new_rows; | |
| 2015 | |
| 2016 /* move entries in w_lines[] upwards */ | |
| 2017 for (;;) | |
| 2018 { | |
| 2019 /* stop at last valid entry in w_lines[] */ | |
| 2020 if (i >= wp->w_lines_valid) | |
| 2021 { | |
| 2022 wp->w_lines_valid = j; | |
| 2023 break; | |
| 2024 } | |
| 2025 wp->w_lines[j] = wp->w_lines[i]; | |
| 2026 /* stop at a line that won't fit */ | |
| 2027 if (x + (int)wp->w_lines[j].wl_size | |
| 2028 > wp->w_height) | |
| 2029 { | |
| 2030 wp->w_lines_valid = j + 1; | |
| 2031 break; | |
| 2032 } | |
| 2033 x += wp->w_lines[j++].wl_size; | |
| 2034 ++i; | |
| 2035 } | |
| 2036 if (bot_start > x) | |
| 2037 bot_start = x; | |
| 2038 } | |
| 2039 else /* j > i */ | |
| 2040 { | |
| 2041 /* move entries in w_lines[] downwards */ | |
| 2042 j -= i; | |
| 2043 wp->w_lines_valid += j; | |
| 2044 if (wp->w_lines_valid > wp->w_height) | |
| 2045 wp->w_lines_valid = wp->w_height; | |
| 2046 for (i = wp->w_lines_valid; i - j >= idx; --i) | |
| 2047 wp->w_lines[i] = wp->w_lines[i - j]; | |
| 2048 | |
| 2049 /* The w_lines[] entries for inserted lines are | |
| 2050 * now invalid, but wl_size may be used above. | |
| 2051 * Reset to zero. */ | |
| 2052 while (i >= idx) | |
| 2053 { | |
| 2054 wp->w_lines[i].wl_size = 0; | |
| 2055 wp->w_lines[i--].wl_valid = FALSE; | |
| 2056 } | |
| 2057 } | |
| 2058 } | |
| 2059 } | |
| 2060 } | |
| 2061 | |
| 2062 #ifdef FEAT_FOLDING | |
| 2063 /* | |
| 2064 * When lines are folded, display one line for all of them. | |
| 2065 * Otherwise, display normally (can be several display lines when | |
| 2066 * 'wrap' is on). | |
| 2067 */ | |
| 2068 fold_count = foldedCount(wp, lnum, &win_foldinfo); | |
| 2069 if (fold_count != 0) | |
| 2070 { | |
| 2071 fold_line(wp, fold_count, &win_foldinfo, lnum, row); | |
| 2072 ++row; | |
| 2073 --fold_count; | |
| 2074 wp->w_lines[idx].wl_folded = TRUE; | |
| 2075 wp->w_lines[idx].wl_lastlnum = lnum + fold_count; | |
| 2076 # ifdef FEAT_SYN_HL | |
| 2077 did_update = DID_FOLD; | |
| 2078 # endif | |
| 2079 } | |
| 2080 else | |
| 2081 #endif | |
| 2082 if (idx < wp->w_lines_valid | |
| 2083 && wp->w_lines[idx].wl_valid | |
| 2084 && wp->w_lines[idx].wl_lnum == lnum | |
| 2085 && lnum > wp->w_topline | |
|
9665
b193bdb6ea25
commit https://github.com/vim/vim/commit/ad9c2a08f0509294269a2f11a59a438b944bdd5a
Christian Brabandt <cb@256bit.org>
parents:
9649
diff
changeset
|
2086 && !(dy_flags & (DY_LASTLINE | DY_TRUNCATE)) |
| 7 | 2087 && srow + wp->w_lines[idx].wl_size > wp->w_height |
| 2088 #ifdef FEAT_DIFF | |
| 2089 && diff_check_fill(wp, lnum) == 0 | |
| 2090 #endif | |
| 2091 ) | |
| 2092 { | |
| 2093 /* This line is not going to fit. Don't draw anything here, | |
| 2094 * will draw "@ " lines below. */ | |
| 2095 row = wp->w_height + 1; | |
| 2096 } | |
| 2097 else | |
| 2098 { | |
| 2099 #ifdef FEAT_SEARCH_EXTRA | |
| 2100 prepare_search_hl(wp, lnum); | |
| 2101 #endif | |
| 2102 #ifdef FEAT_SYN_HL | |
| 2103 /* Let the syntax stuff know we skipped a few lines. */ | |
| 2104 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
|
2105 && syntax_present(wp)) |
| 7 | 2106 syntax_end_parsing(syntax_last_parsed + 1); |
| 2107 #endif | |
| 2108 | |
| 2109 /* | |
| 2110 * Display one line. | |
| 2111 */ | |
|
12510
7a887dccd13a
patch 8.0.1133: syntax timeout not used correctly
Christian Brabandt <cb@256bit.org>
parents:
12487
diff
changeset
|
2112 row = win_line(wp, lnum, srow, wp->w_height, mod_top == 0); |
| 7 | 2113 |
| 2114 #ifdef FEAT_FOLDING | |
| 2115 wp->w_lines[idx].wl_folded = FALSE; | |
| 2116 wp->w_lines[idx].wl_lastlnum = lnum; | |
| 2117 #endif | |
| 2118 #ifdef FEAT_SYN_HL | |
| 2119 did_update = DID_LINE; | |
| 2120 syntax_last_parsed = lnum; | |
| 2121 #endif | |
| 2122 } | |
| 2123 | |
| 2124 wp->w_lines[idx].wl_lnum = lnum; | |
| 2125 wp->w_lines[idx].wl_valid = TRUE; | |
|
12700
306a7a357c71
patch 8.0.1228: invalid memory access in GUI test
Christian Brabandt <cb@256bit.org>
parents:
12672
diff
changeset
|
2126 |
|
306a7a357c71
patch 8.0.1228: invalid memory access in GUI test
Christian Brabandt <cb@256bit.org>
parents:
12672
diff
changeset
|
2127 /* Past end of the window or end of the screen. Note that after |
|
306a7a357c71
patch 8.0.1228: invalid memory access in GUI test
Christian Brabandt <cb@256bit.org>
parents:
12672
diff
changeset
|
2128 * resizing wp->w_height may be end up too big. That's a problem |
|
306a7a357c71
patch 8.0.1228: invalid memory access in GUI test
Christian Brabandt <cb@256bit.org>
parents:
12672
diff
changeset
|
2129 * elsewhere, but prevent a crash here. */ |
|
306a7a357c71
patch 8.0.1228: invalid memory access in GUI test
Christian Brabandt <cb@256bit.org>
parents:
12672
diff
changeset
|
2130 if (row > wp->w_height || row + wp->w_winrow >= Rows) |
| 7 | 2131 { |
| 2132 /* we may need the size of that too long line later on */ | |
| 3318 | 2133 if (dollar_vcol == -1) |
| 7 | 2134 wp->w_lines[idx].wl_size = plines_win(wp, lnum, TRUE); |
| 2135 ++idx; | |
| 2136 break; | |
| 2137 } | |
| 3318 | 2138 if (dollar_vcol == -1) |
| 7 | 2139 wp->w_lines[idx].wl_size = row - srow; |
| 2140 ++idx; | |
| 2141 #ifdef FEAT_FOLDING | |
| 2142 lnum += fold_count + 1; | |
| 2143 #else | |
| 2144 ++lnum; | |
| 2145 #endif | |
| 2146 } | |
| 2147 else | |
| 2148 { | |
| 2149 /* This line does not need updating, advance to the next one */ | |
| 2150 row += wp->w_lines[idx++].wl_size; | |
| 2151 if (row > wp->w_height) /* past end of screen */ | |
| 2152 break; | |
| 2153 #ifdef FEAT_FOLDING | |
| 2154 lnum = wp->w_lines[idx - 1].wl_lastlnum + 1; | |
| 2155 #else | |
| 2156 ++lnum; | |
| 2157 #endif | |
| 2158 #ifdef FEAT_SYN_HL | |
| 2159 did_update = DID_NONE; | |
| 2160 #endif | |
| 2161 } | |
| 2162 | |
| 2163 if (lnum > buf->b_ml.ml_line_count) | |
| 2164 { | |
| 2165 eof = TRUE; | |
| 2166 break; | |
| 2167 } | |
| 2168 } | |
| 2169 /* | |
| 2170 * End of loop over all window lines. | |
| 2171 */ | |
| 2172 | |
| 2173 | |
| 2174 if (idx > wp->w_lines_valid) | |
| 2175 wp->w_lines_valid = idx; | |
| 2176 | |
| 2177 #ifdef FEAT_SYN_HL | |
| 2178 /* | |
| 2179 * Let the syntax stuff know we stop parsing here. | |
| 2180 */ | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
2181 if (syntax_last_parsed != 0 && syntax_present(wp)) |
| 7 | 2182 syntax_end_parsing(syntax_last_parsed + 1); |
| 2183 #endif | |
| 2184 | |
| 2185 /* | |
| 2186 * If we didn't hit the end of the file, and we didn't finish the last | |
| 2187 * line we were working on, then the line didn't fit. | |
| 2188 */ | |
| 2189 wp->w_empty_rows = 0; | |
| 2190 #ifdef FEAT_DIFF | |
| 2191 wp->w_filler_rows = 0; | |
| 2192 #endif | |
| 2193 if (!eof && !didline) | |
| 2194 { | |
| 2195 if (lnum == wp->w_topline) | |
| 2196 { | |
| 2197 /* | |
| 2198 * Single line that does not fit! | |
| 2199 * Don't overwrite it, it can be edited. | |
| 2200 */ | |
| 2201 wp->w_botline = lnum + 1; | |
| 2202 } | |
| 2203 #ifdef FEAT_DIFF | |
| 2204 else if (diff_check_fill(wp, lnum) >= wp->w_height - srow) | |
| 2205 { | |
| 2206 /* Window ends in filler lines. */ | |
| 2207 wp->w_botline = lnum; | |
| 2208 wp->w_filler_rows = wp->w_height - srow; | |
| 2209 } | |
| 2210 #endif | |
|
9665
b193bdb6ea25
commit https://github.com/vim/vim/commit/ad9c2a08f0509294269a2f11a59a438b944bdd5a
Christian Brabandt <cb@256bit.org>
parents:
9649
diff
changeset
|
2211 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
|
2212 { |
|
b193bdb6ea25
commit https://github.com/vim/vim/commit/ad9c2a08f0509294269a2f11a59a438b944bdd5a
Christian Brabandt <cb@256bit.org>
parents:
9649
diff
changeset
|
2213 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
|
2214 |
|
b193bdb6ea25
commit https://github.com/vim/vim/commit/ad9c2a08f0509294269a2f11a59a438b944bdd5a
Christian Brabandt <cb@256bit.org>
parents:
9649
diff
changeset
|
2215 /* |
|
b193bdb6ea25
commit https://github.com/vim/vim/commit/ad9c2a08f0509294269a2f11a59a438b944bdd5a
Christian Brabandt <cb@256bit.org>
parents:
9649
diff
changeset
|
2216 * 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
|
2217 */ |
|
12513
3ca08bf99396
patch 8.0.1135: W_WINCOL() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12510
diff
changeset
|
2218 screen_puts_len((char_u *)"@@", 2, scr_row, wp->w_wincol, |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
2219 HL_ATTR(HLF_AT)); |
|
9665
b193bdb6ea25
commit https://github.com/vim/vim/commit/ad9c2a08f0509294269a2f11a59a438b944bdd5a
Christian Brabandt <cb@256bit.org>
parents:
9649
diff
changeset
|
2220 screen_fill(scr_row, scr_row + 1, |
|
12513
3ca08bf99396
patch 8.0.1135: W_WINCOL() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12510
diff
changeset
|
2221 (int)wp->w_wincol + 2, (int)W_ENDCOL(wp), |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
2222 '@', ' ', HL_ATTR(HLF_AT)); |
|
9665
b193bdb6ea25
commit https://github.com/vim/vim/commit/ad9c2a08f0509294269a2f11a59a438b944bdd5a
Christian Brabandt <cb@256bit.org>
parents:
9649
diff
changeset
|
2223 set_empty_rows(wp, srow); |
|
b193bdb6ea25
commit https://github.com/vim/vim/commit/ad9c2a08f0509294269a2f11a59a438b944bdd5a
Christian Brabandt <cb@256bit.org>
parents:
9649
diff
changeset
|
2224 wp->w_botline = lnum; |
|
b193bdb6ea25
commit https://github.com/vim/vim/commit/ad9c2a08f0509294269a2f11a59a438b944bdd5a
Christian Brabandt <cb@256bit.org>
parents:
9649
diff
changeset
|
2225 } |
| 7 | 2226 else if (dy_flags & DY_LASTLINE) /* 'display' has "lastline" */ |
| 2227 { | |
| 2228 /* | |
| 2229 * Last line isn't finished: Display "@@@" at the end. | |
| 2230 */ | |
| 2231 screen_fill(W_WINROW(wp) + wp->w_height - 1, | |
| 2232 W_WINROW(wp) + wp->w_height, | |
| 2233 (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
|
2234 '@', '@', HL_ATTR(HLF_AT)); |
| 7 | 2235 set_empty_rows(wp, srow); |
| 2236 wp->w_botline = lnum; | |
| 2237 } | |
| 2238 else | |
| 2239 { | |
| 2240 win_draw_end(wp, '@', ' ', srow, wp->w_height, HLF_AT); | |
| 2241 wp->w_botline = lnum; | |
| 2242 } | |
| 2243 } | |
| 2244 else | |
| 2245 { | |
| 2246 draw_vsep_win(wp, row); | |
| 2247 if (eof) /* we hit the end of the file */ | |
| 2248 { | |
| 2249 wp->w_botline = buf->b_ml.ml_line_count + 1; | |
| 2250 #ifdef FEAT_DIFF | |
| 2251 j = diff_check_fill(wp, wp->w_botline); | |
| 2252 if (j > 0 && !wp->w_botfill) | |
| 2253 { | |
| 2254 /* | |
| 2255 * Display filler lines at the end of the file | |
| 2256 */ | |
| 2257 if (char2cells(fill_diff) > 1) | |
| 2258 i = '-'; | |
| 2259 else | |
| 2260 i = fill_diff; | |
| 2261 if (row + j > wp->w_height) | |
| 2262 j = wp->w_height - row; | |
| 2263 win_draw_end(wp, i, i, row, row + (int)j, HLF_DED); | |
| 2264 row += j; | |
| 2265 } | |
| 2266 #endif | |
| 2267 } | |
| 3318 | 2268 else if (dollar_vcol == -1) |
| 7 | 2269 wp->w_botline = lnum; |
| 2270 | |
| 2271 /* make sure the rest of the screen is blank */ | |
| 2272 /* 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
|
2273 win_draw_end(wp, '~', ' ', row, wp->w_height, HLF_EOB); |
| 7 | 2274 } |
| 2275 | |
|
12510
7a887dccd13a
patch 8.0.1133: syntax timeout not used correctly
Christian Brabandt <cb@256bit.org>
parents:
12487
diff
changeset
|
2276 #ifdef SYN_TIME_LIMIT |
|
7a887dccd13a
patch 8.0.1133: syntax timeout not used correctly
Christian Brabandt <cb@256bit.org>
parents:
12487
diff
changeset
|
2277 syn_set_timeout(NULL); |
|
7a887dccd13a
patch 8.0.1133: syntax timeout not used correctly
Christian Brabandt <cb@256bit.org>
parents:
12487
diff
changeset
|
2278 #endif |
|
7a887dccd13a
patch 8.0.1133: syntax timeout not used correctly
Christian Brabandt <cb@256bit.org>
parents:
12487
diff
changeset
|
2279 |
| 7 | 2280 /* Reset the type of redrawing required, the window has been updated. */ |
| 2281 wp->w_redr_type = 0; | |
| 2282 #ifdef FEAT_DIFF | |
| 2283 wp->w_old_topfill = wp->w_topfill; | |
| 2284 wp->w_old_botfill = wp->w_botfill; | |
| 2285 #endif | |
| 2286 | |
| 3318 | 2287 if (dollar_vcol == -1) |
| 7 | 2288 { |
| 2289 /* | |
| 2290 * There is a trick with w_botline. If we invalidate it on each | |
| 2291 * change that might modify it, this will cause a lot of expensive | |
| 2292 * calls to plines() in update_topline() each time. Therefore the | |
| 2293 * value of w_botline is often approximated, and this value is used to | |
| 2294 * compute the value of w_topline. If the value of w_botline was | |
| 2295 * wrong, check that the value of w_topline is correct (cursor is on | |
| 2296 * the visible part of the text). If it's not, we need to redraw | |
| 2297 * again. Mostly this just means scrolling up a few lines, so it | |
| 2298 * doesn't look too bad. Only do this for the current window (where | |
| 2299 * changes are relevant). | |
| 2300 */ | |
| 2301 wp->w_valid |= VALID_BOTLINE; | |
| 2302 if (wp == curwin && wp->w_botline != old_botline && !recursive) | |
| 2303 { | |
| 2304 recursive = TRUE; | |
| 2305 curwin->w_valid &= ~VALID_TOPLINE; | |
| 2306 update_topline(); /* may invalidate w_botline again */ | |
| 2307 if (must_redraw != 0) | |
| 2308 { | |
| 2309 /* Don't update for changes in buffer again. */ | |
| 2310 i = curbuf->b_mod_set; | |
| 2311 curbuf->b_mod_set = FALSE; | |
| 2312 win_update(curwin); | |
| 2313 must_redraw = 0; | |
| 2314 curbuf->b_mod_set = i; | |
| 2315 } | |
| 2316 recursive = FALSE; | |
| 2317 } | |
| 2318 } | |
| 2319 | |
| 2320 #if defined(FEAT_SYN_HL) || defined(FEAT_SEARCH_EXTRA) | |
| 2321 /* restore got_int, unless CTRL-C was hit while redrawing */ | |
| 2322 if (!got_int) | |
| 2323 got_int = save_got_int; | |
| 2324 #endif | |
| 2325 } | |
| 2326 | |
| 2327 /* | |
| 2328 * Clear the rest of the window and mark the unused lines with "c1". use "c2" | |
| 2329 * as the filler character. | |
| 2330 */ | |
| 2331 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2332 win_draw_end( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2333 win_T *wp, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2334 int c1, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2335 int c2, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2336 int row, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2337 int endrow, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2338 hlf_T hl) |
| 7 | 2339 { |
| 2340 #if defined(FEAT_FOLDING) || defined(FEAT_SIGNS) || defined(FEAT_CMDWIN) | |
| 2341 int n = 0; | |
| 2342 # define FDC_OFF n | |
| 2343 #else | |
| 2344 # define FDC_OFF 0 | |
| 2345 #endif | |
| 6553 | 2346 #ifdef FEAT_FOLDING |
| 2347 int fdc = compute_foldcolumn(wp, 0); | |
| 2348 #endif | |
| 7 | 2349 |
| 2350 #ifdef FEAT_RIGHTLEFT | |
| 2351 if (wp->w_p_rl) | |
| 2352 { | |
| 2353 /* No check for cmdline window: should never be right-left. */ | |
| 2354 # ifdef FEAT_FOLDING | |
| 6553 | 2355 n = fdc; |
| 7 | 2356 |
| 2357 if (n > 0) | |
| 2358 { | |
| 2359 /* draw the fold column at the right */ | |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
2360 if (n > wp->w_width) |
|
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
2361 n = wp->w_width; |
| 7 | 2362 screen_fill(W_WINROW(wp) + row, W_WINROW(wp) + endrow, |
| 2363 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
|
2364 ' ', ' ', HL_ATTR(HLF_FC)); |
| 7 | 2365 } |
| 2366 # endif | |
| 2367 # ifdef FEAT_SIGNS | |
|
9852
4eea48b76d03
commit https://github.com/vim/vim/commit/95ec9d6a6ab3117d60ff638670a803d43974ba51
Christian Brabandt <cb@256bit.org>
parents:
9848
diff
changeset
|
2368 if (signcolumn_on(wp)) |
| 7 | 2369 { |
| 2370 int nn = n + 2; | |
| 2371 | |
| 2372 /* draw the sign column left of the fold column */ | |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
2373 if (nn > wp->w_width) |
|
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
2374 nn = wp->w_width; |
| 7 | 2375 screen_fill(W_WINROW(wp) + row, W_WINROW(wp) + endrow, |
| 2376 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
|
2377 ' ', ' ', HL_ATTR(HLF_SC)); |
| 7 | 2378 n = nn; |
| 2379 } | |
| 2380 # endif | |
| 2381 screen_fill(W_WINROW(wp) + row, W_WINROW(wp) + endrow, | |
|
12513
3ca08bf99396
patch 8.0.1135: W_WINCOL() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12510
diff
changeset
|
2382 wp->w_wincol, W_ENDCOL(wp) - 1 - FDC_OFF, |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
2383 c2, c2, HL_ATTR(hl)); |
| 7 | 2384 screen_fill(W_WINROW(wp) + row, W_WINROW(wp) + endrow, |
| 2385 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
|
2386 c1, c2, HL_ATTR(hl)); |
| 7 | 2387 } |
| 2388 else | |
| 2389 #endif | |
| 2390 { | |
| 2391 #ifdef FEAT_CMDWIN | |
| 2392 if (cmdwin_type != 0 && wp == curwin) | |
| 2393 { | |
| 2394 /* draw the cmdline character in the leftmost column */ | |
| 2395 n = 1; | |
| 2396 if (n > wp->w_width) | |
| 2397 n = wp->w_width; | |
| 2398 screen_fill(W_WINROW(wp) + row, W_WINROW(wp) + endrow, | |
|
12513
3ca08bf99396
patch 8.0.1135: W_WINCOL() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12510
diff
changeset
|
2399 wp->w_wincol, (int)wp->w_wincol + n, |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
2400 cmdwin_type, ' ', HL_ATTR(HLF_AT)); |
| 7 | 2401 } |
| 2402 #endif | |
| 2403 #ifdef FEAT_FOLDING | |
| 6553 | 2404 if (fdc > 0) |
| 2405 { | |
| 2406 int nn = n + fdc; | |
| 7 | 2407 |
| 2408 /* draw the fold column at the left */ | |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
2409 if (nn > wp->w_width) |
|
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
2410 nn = wp->w_width; |
| 7 | 2411 screen_fill(W_WINROW(wp) + row, W_WINROW(wp) + endrow, |
|
12513
3ca08bf99396
patch 8.0.1135: W_WINCOL() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12510
diff
changeset
|
2412 wp->w_wincol + n, (int)wp->w_wincol + nn, |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
2413 ' ', ' ', HL_ATTR(HLF_FC)); |
| 7 | 2414 n = nn; |
| 2415 } | |
| 2416 #endif | |
| 2417 #ifdef FEAT_SIGNS | |
|
9852
4eea48b76d03
commit https://github.com/vim/vim/commit/95ec9d6a6ab3117d60ff638670a803d43974ba51
Christian Brabandt <cb@256bit.org>
parents:
9848
diff
changeset
|
2418 if (signcolumn_on(wp)) |
| 7 | 2419 { |
| 2420 int nn = n + 2; | |
| 2421 | |
| 2422 /* draw the sign column after the fold column */ | |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
2423 if (nn > wp->w_width) |
|
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
2424 nn = wp->w_width; |
| 7 | 2425 screen_fill(W_WINROW(wp) + row, W_WINROW(wp) + endrow, |
|
12513
3ca08bf99396
patch 8.0.1135: W_WINCOL() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12510
diff
changeset
|
2426 wp->w_wincol + n, (int)wp->w_wincol + nn, |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
2427 ' ', ' ', HL_ATTR(HLF_SC)); |
| 7 | 2428 n = nn; |
| 2429 } | |
| 2430 #endif | |
| 2431 screen_fill(W_WINROW(wp) + row, W_WINROW(wp) + endrow, | |
|
12513
3ca08bf99396
patch 8.0.1135: W_WINCOL() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12510
diff
changeset
|
2432 wp->w_wincol + FDC_OFF, (int)W_ENDCOL(wp), |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
2433 c1, c2, HL_ATTR(hl)); |
| 7 | 2434 } |
| 2435 set_empty_rows(wp, row); | |
| 2436 } | |
| 2437 | |
|
2314
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
2438 #ifdef FEAT_SYN_HL |
|
7805
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7697
diff
changeset
|
2439 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
|
2440 |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
2441 /* |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
2442 * 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
|
2443 */ |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
2444 static int |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2445 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
|
2446 { |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
2447 while (**color_cols >= 0 && vcol > **color_cols) |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
2448 ++*color_cols; |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
2449 return (**color_cols >= 0); |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
2450 } |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
2451 #endif |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
2452 |
|
12487
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2453 #if defined(FEAT_MENU) || defined(FEAT_FOLDING) |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2454 /* |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2455 * Copy "text" to ScreenLines using "attr". |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2456 * Returns the next screen column. |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2457 */ |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2458 static int |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2459 text_to_screenline(win_T *wp, char_u *text, int col) |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2460 { |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2461 int off = (int)(current_ScreenLine - ScreenLines); |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2462 |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2463 #ifdef FEAT_MBYTE |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2464 if (has_mbyte) |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2465 { |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2466 int cells; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2467 int u8c, u8cc[MAX_MCO]; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2468 int i; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2469 int idx; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2470 int c_len; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2471 char_u *p; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2472 # ifdef FEAT_ARABIC |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2473 int prev_c = 0; /* previous Arabic character */ |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2474 int prev_c1 = 0; /* first composing char for prev_c */ |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2475 # endif |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2476 |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2477 # ifdef FEAT_RIGHTLEFT |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2478 if (wp->w_p_rl) |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2479 idx = off; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2480 else |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2481 # endif |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2482 idx = off + col; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2483 |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2484 /* Store multibyte characters in ScreenLines[] et al. correctly. */ |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2485 for (p = text; *p != NUL; ) |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2486 { |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2487 cells = (*mb_ptr2cells)(p); |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2488 c_len = (*mb_ptr2len)(p); |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
2489 if (col + cells > wp->w_width |
|
12487
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2490 # ifdef FEAT_RIGHTLEFT |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2491 - (wp->w_p_rl ? col : 0) |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2492 # endif |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2493 ) |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2494 break; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2495 ScreenLines[idx] = *p; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2496 if (enc_utf8) |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2497 { |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2498 u8c = utfc_ptr2char(p, u8cc); |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2499 if (*p < 0x80 && u8cc[0] == 0) |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2500 { |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2501 ScreenLinesUC[idx] = 0; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2502 #ifdef FEAT_ARABIC |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2503 prev_c = u8c; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2504 #endif |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2505 } |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2506 else |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2507 { |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2508 #ifdef FEAT_ARABIC |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2509 if (p_arshape && !p_tbidi && ARABIC_CHAR(u8c)) |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2510 { |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2511 /* Do Arabic shaping. */ |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2512 int pc, pc1, nc; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2513 int pcc[MAX_MCO]; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2514 int firstbyte = *p; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2515 |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2516 /* The idea of what is the previous and next |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2517 * character depends on 'rightleft'. */ |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2518 if (wp->w_p_rl) |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2519 { |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2520 pc = prev_c; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2521 pc1 = prev_c1; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2522 nc = utf_ptr2char(p + c_len); |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2523 prev_c1 = u8cc[0]; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2524 } |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2525 else |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2526 { |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2527 pc = utfc_ptr2char(p + c_len, pcc); |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2528 nc = prev_c; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2529 pc1 = pcc[0]; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2530 } |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2531 prev_c = u8c; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2532 |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2533 u8c = arabic_shape(u8c, &firstbyte, &u8cc[0], |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2534 pc, pc1, nc); |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2535 ScreenLines[idx] = firstbyte; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2536 } |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2537 else |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2538 prev_c = u8c; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2539 #endif |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2540 /* Non-BMP character: display as ? or fullwidth ?. */ |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2541 #ifdef UNICODE16 |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2542 if (u8c >= 0x10000) |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2543 ScreenLinesUC[idx] = (cells == 2) ? 0xff1f : (int)'?'; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2544 else |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2545 #endif |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2546 ScreenLinesUC[idx] = u8c; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2547 for (i = 0; i < Screen_mco; ++i) |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2548 { |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2549 ScreenLinesC[i][idx] = u8cc[i]; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2550 if (u8cc[i] == 0) |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2551 break; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2552 } |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2553 } |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2554 if (cells > 1) |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2555 ScreenLines[idx + 1] = 0; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2556 } |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2557 else if (enc_dbcs == DBCS_JPNU && *p == 0x8e) |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2558 /* double-byte single width character */ |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2559 ScreenLines2[idx] = p[1]; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2560 else if (cells > 1) |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2561 /* double-width character */ |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2562 ScreenLines[idx + 1] = p[1]; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2563 col += cells; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2564 idx += cells; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2565 p += c_len; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2566 } |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2567 } |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2568 else |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2569 #endif |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2570 { |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2571 int len = (int)STRLEN(text); |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2572 |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
2573 if (len > wp->w_width - col) |
|
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
2574 len = wp->w_width - col; |
|
12487
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2575 if (len > 0) |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2576 { |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2577 #ifdef FEAT_RIGHTLEFT |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2578 if (wp->w_p_rl) |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2579 STRNCPY(current_ScreenLine, text, len); |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2580 else |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2581 #endif |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2582 STRNCPY(current_ScreenLine + col, text, len); |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2583 col += len; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2584 } |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2585 } |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2586 return col; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2587 } |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2588 #endif |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2589 |
| 7 | 2590 #ifdef FEAT_FOLDING |
| 2591 /* | |
| 6553 | 2592 * Compute the width of the foldcolumn. Based on 'foldcolumn' and how much |
| 2593 * space is available for window "wp", minus "col". | |
| 2594 */ | |
| 2595 static int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2596 compute_foldcolumn(win_T *wp, int col) |
| 6553 | 2597 { |
| 2598 int fdc = wp->w_p_fdc; | |
| 2599 int wmw = wp == curwin && p_wmw == 0 ? 1 : p_wmw; | |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
2600 int wwidth = wp->w_width; |
| 6553 | 2601 |
| 2602 if (fdc > wwidth - (col + wmw)) | |
| 2603 fdc = wwidth - (col + wmw); | |
| 2604 return fdc; | |
| 2605 } | |
| 2606 | |
| 2607 /* | |
| 7 | 2608 * Display one folded line. |
| 2609 */ | |
| 2610 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2611 fold_line( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2612 win_T *wp, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2613 long fold_count, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2614 foldinfo_T *foldinfo, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2615 linenr_T lnum, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2616 int row) |
| 7 | 2617 { |
|
9754
a990e7ed260b
commit https://github.com/vim/vim/commit/ee695f787ade7fd88fc5f5497553d95c0c3645b5
Christian Brabandt <cb@256bit.org>
parents:
9665
diff
changeset
|
2618 char_u buf[FOLD_TEXT_LEN]; |
| 7 | 2619 pos_T *top, *bot; |
| 2620 linenr_T lnume = lnum + fold_count - 1; | |
| 2621 int len; | |
| 29 | 2622 char_u *text; |
| 7 | 2623 int fdc; |
| 2624 int col; | |
| 2625 int txtcol; | |
| 2626 int off = (int)(current_ScreenLine - ScreenLines); | |
| 216 | 2627 int ri; |
| 7 | 2628 |
| 2629 /* Build the fold line: | |
| 2630 * 1. Add the cmdwin_type for the command-line window | |
| 2631 * 2. Add the 'foldcolumn' | |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
2632 * 3. Add the 'number' or 'relativenumber' column |
| 7 | 2633 * 4. Compose the text |
| 2634 * 5. Add the text | |
| 2635 * 6. set highlighting for the Visual area an other text | |
| 2636 */ | |
| 2637 col = 0; | |
| 2638 | |
| 2639 /* | |
| 2640 * 1. Add the cmdwin_type for the command-line window | |
| 2641 * Ignores 'rightleft', this window is never right-left. | |
| 2642 */ | |
| 2643 #ifdef FEAT_CMDWIN | |
| 2644 if (cmdwin_type != 0 && wp == curwin) | |
| 2645 { | |
| 2646 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
|
2647 ScreenAttrs[off] = HL_ATTR(HLF_AT); |
| 7 | 2648 #ifdef FEAT_MBYTE |
| 2649 if (enc_utf8) | |
| 2650 ScreenLinesUC[off] = 0; | |
| 2651 #endif | |
| 2652 ++col; | |
| 2653 } | |
| 2654 #endif | |
| 2655 | |
| 2656 /* | |
| 2657 * 2. Add the 'foldcolumn' | |
| 6553 | 2658 * Reduce the width when there is not enough space. |
| 7 | 2659 */ |
| 6553 | 2660 fdc = compute_foldcolumn(wp, col); |
| 7 | 2661 if (fdc > 0) |
| 2662 { | |
| 2663 fill_foldcolumn(buf, wp, TRUE, lnum); | |
| 2664 #ifdef FEAT_RIGHTLEFT | |
| 2665 if (wp->w_p_rl) | |
| 2666 { | |
| 2667 int i; | |
| 2668 | |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
2669 copy_text_attr(off + wp->w_width - fdc - col, buf, fdc, |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
2670 HL_ATTR(HLF_FC)); |
| 7 | 2671 /* reverse the fold column */ |
| 2672 for (i = 0; i < fdc; ++i) | |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
2673 ScreenLines[off + wp->w_width - i - 1 - col] = buf[i]; |
| 7 | 2674 } |
| 2675 else | |
| 2676 #endif | |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
2677 copy_text_attr(off + col, buf, fdc, HL_ATTR(HLF_FC)); |
| 7 | 2678 col += fdc; |
| 2679 } | |
| 2680 | |
| 2681 #ifdef FEAT_RIGHTLEFT | |
| 216 | 2682 # define RL_MEMSET(p, v, l) if (wp->w_p_rl) \ |
| 2683 for (ri = 0; ri < l; ++ri) \ | |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
2684 ScreenAttrs[off + (wp->w_width - (p) - (l)) + ri] = v; \ |
| 216 | 2685 else \ |
| 2686 for (ri = 0; ri < l; ++ri) \ | |
| 2687 ScreenAttrs[off + (p) + ri] = v | |
| 7 | 2688 #else |
| 216 | 2689 # define RL_MEMSET(p, v, l) for (ri = 0; ri < l; ++ri) \ |
| 2690 ScreenAttrs[off + (p) + ri] = v | |
| 7 | 2691 #endif |
| 2692 | |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
2693 /* 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
|
2694 * text */ |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
2695 RL_MEMSET(col, HL_ATTR(HLF_FL), wp->w_width - col); |
| 7 | 2696 |
| 2697 #ifdef FEAT_SIGNS | |
| 2698 /* 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
|
2699 if (signcolumn_on(wp)) |
| 7 | 2700 { |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
2701 len = wp->w_width - col; |
| 7 | 2702 if (len > 0) |
| 2703 { | |
| 2704 if (len > 2) | |
| 2705 len = 2; | |
| 2706 # ifdef FEAT_RIGHTLEFT | |
| 2707 if (wp->w_p_rl) | |
| 2708 /* the line number isn't reversed */ | |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
2709 copy_text_attr(off + wp->w_width - len - col, |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
2710 (char_u *)" ", len, HL_ATTR(HLF_FL)); |
| 7 | 2711 else |
| 2712 # endif | |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
2713 copy_text_attr(off + col, (char_u *)" ", len, HL_ATTR(HLF_FL)); |
| 7 | 2714 col += len; |
| 2715 } | |
| 2716 } | |
| 2717 #endif | |
| 2718 | |
| 2719 /* | |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
2720 * 3. Add the 'number' or 'relativenumber' column |
| 7 | 2721 */ |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
2722 if (wp->w_p_nu || wp->w_p_rnu) |
| 7 | 2723 { |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
2724 len = wp->w_width - col; |
| 7 | 2725 if (len > 0) |
| 2726 { | |
| 13 | 2727 int w = number_width(wp); |
| 5905 | 2728 long num; |
| 2729 char *fmt = "%*ld "; | |
| 13 | 2730 |
| 2731 if (len > w + 1) | |
| 2732 len = w + 1; | |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
2733 |
|
4736
3f2319a953b3
updated for version 7.3.1115
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
2734 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
|
2735 /* 'number' + 'norelativenumber' */ |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
2736 num = (long)lnum; |
|
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
2737 else |
| 4065 | 2738 { |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
2739 /* 'relativenumber', don't use negative numbers */ |
| 2675 | 2740 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
|
2741 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
|
2742 { |
|
3f2319a953b3
updated for version 7.3.1115
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
2743 /* 'number' + 'relativenumber': cursor line shows absolute |
|
3f2319a953b3
updated for version 7.3.1115
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
2744 * line number */ |
| 4065 | 2745 num = lnum; |
| 2746 fmt = "%-*ld "; | |
| 2747 } | |
| 2748 } | |
| 2749 | |
| 2750 sprintf((char *)buf, fmt, w, num); | |
| 7 | 2751 #ifdef FEAT_RIGHTLEFT |
| 2752 if (wp->w_p_rl) | |
| 2753 /* the line number isn't reversed */ | |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
2754 copy_text_attr(off + wp->w_width - len - col, buf, len, |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
2755 HL_ATTR(HLF_FL)); |
| 7 | 2756 else |
| 2757 #endif | |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
2758 copy_text_attr(off + col, buf, len, HL_ATTR(HLF_FL)); |
| 7 | 2759 col += len; |
| 2760 } | |
| 2761 } | |
| 2762 | |
| 2763 /* | |
| 2764 * 4. Compose the folded-line string with 'foldtext', if set. | |
| 2765 */ | |
| 29 | 2766 text = get_foldtext(wp, lnum, lnume, foldinfo, buf); |
| 7 | 2767 |
| 2768 txtcol = col; /* remember where text starts */ | |
| 2769 | |
| 2770 /* | |
| 2771 * 5. move the text to current_ScreenLine. Fill up with "fill_fold". | |
| 2772 * Right-left text is put in columns 0 - number-col, normal text is put | |
| 2773 * in columns number-col - window-width. | |
| 2774 */ | |
|
12487
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2775 col = text_to_screenline(wp, text, col); |
| 7 | 2776 |
| 2777 /* Fill the rest of the line with the fold filler */ | |
| 2778 #ifdef FEAT_RIGHTLEFT | |
| 2779 if (wp->w_p_rl) | |
| 2780 col -= txtcol; | |
| 2781 #endif | |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
2782 while (col < wp->w_width |
| 7 | 2783 #ifdef FEAT_RIGHTLEFT |
| 2784 - (wp->w_p_rl ? txtcol : 0) | |
| 2785 #endif | |
| 2786 ) | |
| 2787 { | |
| 2788 #ifdef FEAT_MBYTE | |
| 2789 if (enc_utf8) | |
| 2790 { | |
| 2791 if (fill_fold >= 0x80) | |
| 2792 { | |
| 2793 ScreenLinesUC[off + col] = fill_fold; | |
| 714 | 2794 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
|
2795 ScreenLines[off + col] = 0x80; /* avoid storing zero */ |
| 7 | 2796 } |
| 2797 else | |
|
11277
f26a535d9464
patch 8.0.0524: folds messed up
Christian Brabandt <cb@256bit.org>
parents:
11269
diff
changeset
|
2798 { |
| 7 | 2799 ScreenLinesUC[off + col] = 0; |
|
11277
f26a535d9464
patch 8.0.0524: folds messed up
Christian Brabandt <cb@256bit.org>
parents:
11269
diff
changeset
|
2800 ScreenLines[off + col] = fill_fold; |
|
f26a535d9464
patch 8.0.0524: folds messed up
Christian Brabandt <cb@256bit.org>
parents:
11269
diff
changeset
|
2801 } |
|
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
|
2802 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
|
2803 } |
|
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 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
|
2805 #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
|
2806 ScreenLines[off + col++] = fill_fold; |
| 7 | 2807 } |
| 2808 | |
| 2809 if (text != buf) | |
| 2810 vim_free(text); | |
| 2811 | |
| 2812 /* | |
| 2813 * 6. set highlighting for the Visual area an other text. | |
| 2814 * If all folded lines are in the Visual area, highlight the line. | |
| 2815 */ | |
| 2816 if (VIsual_active && wp->w_buffer == curwin->w_buffer) | |
| 2817 { | |
|
11121
778c10516955
patch 8.0.0448: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11105
diff
changeset
|
2818 if (LTOREQ_POS(curwin->w_cursor, VIsual)) |
| 7 | 2819 { |
| 2820 /* Visual is after curwin->w_cursor */ | |
| 2821 top = &curwin->w_cursor; | |
| 2822 bot = &VIsual; | |
| 2823 } | |
| 2824 else | |
| 2825 { | |
| 2826 /* Visual is before curwin->w_cursor */ | |
| 2827 top = &VIsual; | |
| 2828 bot = &curwin->w_cursor; | |
| 2829 } | |
| 2830 if (lnum >= top->lnum | |
| 2831 && lnume <= bot->lnum | |
| 2832 && (VIsual_mode != 'v' | |
| 2833 || ((lnum > top->lnum | |
| 2834 || (lnum == top->lnum | |
| 2835 && top->col == 0)) | |
| 2836 && (lnume < bot->lnum | |
| 2837 || (lnume == bot->lnum | |
| 2838 && (bot->col - (*p_sel == 'e')) | |
| 1883 | 2839 >= (colnr_T)STRLEN(ml_get_buf(wp->w_buffer, lnume, FALSE))))))) |
| 7 | 2840 { |
| 2841 if (VIsual_mode == Ctrl_V) | |
| 2842 { | |
| 2843 /* Visual block mode: highlight the chars part of the block */ | |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
2844 if (wp->w_old_cursor_fcol + txtcol < (colnr_T)wp->w_width) |
| 7 | 2845 { |
| 3040 | 2846 if (wp->w_old_cursor_lcol != MAXCOL |
| 2847 && wp->w_old_cursor_lcol + txtcol | |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
2848 < (colnr_T)wp->w_width) |
| 7 | 2849 len = wp->w_old_cursor_lcol; |
| 2850 else | |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
2851 len = wp->w_width - txtcol; |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
2852 RL_MEMSET(wp->w_old_cursor_fcol + txtcol, HL_ATTR(HLF_V), |
| 230 | 2853 len - (int)wp->w_old_cursor_fcol); |
| 7 | 2854 } |
| 2855 } | |
| 2856 else | |
| 216 | 2857 { |
| 7 | 2858 /* Set all attributes of the text */ |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
2859 RL_MEMSET(txtcol, HL_ATTR(HLF_V), wp->w_width - txtcol); |
| 216 | 2860 } |
| 7 | 2861 } |
| 2862 } | |
| 2863 | |
| 743 | 2864 #ifdef FEAT_SYN_HL |
| 6685 | 2865 /* Show colorcolumn in the fold line, but let cursorcolumn override it. */ |
| 2866 if (wp->w_p_cc_cols) | |
| 2867 { | |
| 2868 int i = 0; | |
| 2869 int j = wp->w_p_cc_cols[i]; | |
| 2870 int old_txtcol = txtcol; | |
| 2871 | |
| 2872 while (j > -1) | |
| 2873 { | |
| 2874 txtcol += j; | |
| 2875 if (wp->w_p_wrap) | |
| 2876 txtcol -= wp->w_skipcol; | |
| 2877 else | |
| 2878 txtcol -= wp->w_leftcol; | |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
2879 if (txtcol >= 0 && txtcol < wp->w_width) |
| 6685 | 2880 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
|
2881 ScreenAttrs[off + txtcol], HL_ATTR(HLF_MC)); |
| 6685 | 2882 txtcol = old_txtcol; |
| 2883 j = wp->w_p_cc_cols[++i]; | |
| 2884 } | |
| 2885 } | |
| 2886 | |
| 743 | 2887 /* Show 'cursorcolumn' in the fold line. */ |
| 1725 | 2888 if (wp->w_p_cuc) |
| 2889 { | |
| 2890 txtcol += wp->w_virtcol; | |
| 2891 if (wp->w_p_wrap) | |
| 2892 txtcol -= wp->w_skipcol; | |
| 2893 else | |
| 2894 txtcol -= wp->w_leftcol; | |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
2895 if (txtcol >= 0 && txtcol < wp->w_width) |
| 1725 | 2896 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
|
2897 ScreenAttrs[off + txtcol], HL_ATTR(HLF_CUC)); |
| 1725 | 2898 } |
| 743 | 2899 #endif |
| 7 | 2900 |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
2901 screen_line(row + W_WINROW(wp), wp->w_wincol, (int)wp->w_width, |
|
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
2902 (int)wp->w_width, FALSE); |
| 7 | 2903 |
| 2904 /* | |
| 2905 * Update w_cline_height and w_cline_folded if the cursor line was | |
| 2906 * updated (saves a call to plines() later). | |
| 2907 */ | |
| 2908 if (wp == curwin | |
| 2909 && lnum <= curwin->w_cursor.lnum | |
| 2910 && lnume >= curwin->w_cursor.lnum) | |
| 2911 { | |
| 2912 curwin->w_cline_row = row; | |
| 2913 curwin->w_cline_height = 1; | |
| 2914 curwin->w_cline_folded = TRUE; | |
| 2915 curwin->w_valid |= (VALID_CHEIGHT|VALID_CROW); | |
| 2916 } | |
| 2917 } | |
| 2918 | |
| 2919 /* | |
| 2920 * Copy "buf[len]" to ScreenLines["off"] and set attributes to "attr". | |
| 2921 */ | |
| 2922 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2923 copy_text_attr( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2924 int off, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2925 char_u *buf, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2926 int len, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2927 int attr) |
| 7 | 2928 { |
| 216 | 2929 int i; |
| 2930 | |
| 7 | 2931 mch_memmove(ScreenLines + off, buf, (size_t)len); |
| 2932 # ifdef FEAT_MBYTE | |
| 2933 if (enc_utf8) | |
| 2934 vim_memset(ScreenLinesUC + off, 0, sizeof(u8char_T) * (size_t)len); | |
| 2935 # endif | |
| 216 | 2936 for (i = 0; i < len; ++i) |
| 2937 ScreenAttrs[off + i] = attr; | |
| 7 | 2938 } |
| 2939 | |
| 2940 /* | |
| 2941 * Fill the foldcolumn at "p" for window "wp". | |
| 548 | 2942 * Only to be called when 'foldcolumn' > 0. |
| 7 | 2943 */ |
| 2944 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2945 fill_foldcolumn( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2946 char_u *p, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2947 win_T *wp, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2948 int closed, /* TRUE of FALSE */ |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2949 linenr_T lnum) /* current line number */ |
| 7 | 2950 { |
| 2951 int i = 0; | |
| 2952 int level; | |
| 2953 int first_level; | |
| 519 | 2954 int empty; |
| 6553 | 2955 int fdc = compute_foldcolumn(wp, 0); |
| 7 | 2956 |
| 2957 /* Init to all spaces. */ | |
| 6929 | 2958 vim_memset(p, ' ', (size_t)fdc); |
| 7 | 2959 |
| 2960 level = win_foldinfo.fi_level; | |
| 2961 if (level > 0) | |
| 2962 { | |
| 519 | 2963 /* If there is only one column put more info in it. */ |
| 6553 | 2964 empty = (fdc == 1) ? 0 : 1; |
| 519 | 2965 |
| 7 | 2966 /* If the column is too narrow, we start at the lowest level that |
| 2967 * fits and use numbers to indicated the depth. */ | |
| 6553 | 2968 first_level = level - fdc - closed + 1 + empty; |
| 7 | 2969 if (first_level < 1) |
| 2970 first_level = 1; | |
| 2971 | |
| 6553 | 2972 for (i = 0; i + empty < fdc; ++i) |
| 7 | 2973 { |
| 2974 if (win_foldinfo.fi_lnum == lnum | |
| 2975 && first_level + i >= win_foldinfo.fi_low_level) | |
| 2976 p[i] = '-'; | |
| 2977 else if (first_level == 1) | |
| 2978 p[i] = '|'; | |
| 2979 else if (first_level + i <= 9) | |
| 2980 p[i] = '0' + first_level + i; | |
| 2981 else | |
| 2982 p[i] = '>'; | |
| 2983 if (first_level + i == level) | |
| 2984 break; | |
| 2985 } | |
| 2986 } | |
| 2987 if (closed) | |
| 6553 | 2988 p[i >= fdc ? i - 1 : i] = '+'; |
| 7 | 2989 } |
| 2990 #endif /* FEAT_FOLDING */ | |
| 2991 | |
| 2992 /* | |
| 2993 * Display line "lnum" of window 'wp' on the screen. | |
| 2994 * Start at row "startrow", stop when "endrow" is reached. | |
| 2995 * wp->w_virtcol needs to be valid. | |
| 2996 * | |
| 2997 * Return the number of last row the line occupies. | |
| 2998 */ | |
| 2999 static int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
3000 win_line( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
3001 win_T *wp, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
3002 linenr_T lnum, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
3003 int startrow, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
3004 int endrow, |
|
12510
7a887dccd13a
patch 8.0.1133: syntax timeout not used correctly
Christian Brabandt <cb@256bit.org>
parents:
12487
diff
changeset
|
3005 int nochange UNUSED) /* not updating for changed text */ |
| 7 | 3006 { |
|
10801
e7b8be5ecacd
patch 8.0.0290: cursor positioning wrong if wide character wraps
Christian Brabandt <cb@256bit.org>
parents:
10793
diff
changeset
|
3007 int col = 0; /* visual column on screen */ |
| 7 | 3008 unsigned off; /* offset in ScreenLines/ScreenAttrs */ |
| 3009 int c = 0; /* init for GCC */ | |
| 3010 long vcol = 0; /* virtual column (for tabs) */ | |
| 6503 | 3011 #ifdef FEAT_LINEBREAK |
| 3012 long vcol_sbr = -1; /* virtual column after showbreak */ | |
| 3013 #endif | |
| 7 | 3014 long vcol_prev = -1; /* "vcol" of previous character */ |
| 3015 char_u *line; /* current line */ | |
| 3016 char_u *ptr; /* current position in "line" */ | |
| 3017 int row; /* row in the window, excl w_winrow */ | |
| 3018 int screen_row; /* row on the screen, incl w_winrow */ | |
| 3019 | |
| 3020 char_u extra[18]; /* "%ld" and 'fdc' must fit in here */ | |
| 3021 int n_extra = 0; /* number of extra chars */ | |
| 1340 | 3022 char_u *p_extra = NULL; /* string of extra chars, plus NUL */ |
| 6026 | 3023 char_u *p_extra_free = NULL; /* p_extra needs to be freed */ |
| 7 | 3024 int c_extra = NUL; /* extra chars, all the same */ |
| 3025 int extra_attr = 0; /* attributes when n_extra != 0 */ | |
| 3026 static char_u *at_end_str = (char_u *)""; /* used for p_extra when | |
| 3027 displaying lcs_eol at end-of-line */ | |
| 3028 int lcs_eol_one = lcs_eol; /* lcs_eol until it's been used */ | |
| 3029 int lcs_prec_todo = lcs_prec; /* lcs_prec until it's been used */ | |
| 3030 | |
| 3031 /* saved "extra" items for when draw_state becomes WL_LINE (again) */ | |
| 3032 int saved_n_extra = 0; | |
| 3033 char_u *saved_p_extra = NULL; | |
| 3034 int saved_c_extra = 0; | |
| 3035 int saved_char_attr = 0; | |
| 3036 | |
| 3037 int n_attr = 0; /* chars with special attr */ | |
| 3038 int saved_attr2 = 0; /* char_attr saved for n_attr */ | |
| 3039 int n_attr3 = 0; /* chars with overruling special attr */ | |
| 3040 int saved_attr3 = 0; /* char_attr saved for n_attr3 */ | |
| 3041 | |
| 3042 int n_skip = 0; /* nr of chars to skip for 'nowrap' */ | |
| 3043 | |
| 3044 int fromcol, tocol; /* start/end of inverting */ | |
| 3045 int fromcol_prev = -2; /* start of inverting after cursor */ | |
| 3046 int noinvcur = FALSE; /* don't invert the cursor */ | |
| 3047 pos_T *top, *bot; | |
| 1813 | 3048 int lnum_in_visual_area = FALSE; |
| 7 | 3049 pos_T pos; |
| 3050 long v; | |
| 3051 | |
| 3052 int char_attr = 0; /* attributes for next character */ | |
| 674 | 3053 int attr_pri = FALSE; /* char_attr has priority */ |
| 7 | 3054 int area_highlighting = FALSE; /* Visual or incsearch highlighting |
| 3055 in this line */ | |
| 3056 int attr = 0; /* attributes for area highlighting */ | |
| 3057 int area_attr = 0; /* attributes desired by highlighting */ | |
| 3058 int search_attr = 0; /* attributes desired by 'hlsearch' */ | |
| 3059 #ifdef FEAT_SYN_HL | |
| 743 | 3060 int vcol_save_attr = 0; /* saved attr for 'cursorcolumn' */ |
| 7 | 3061 int syntax_attr = 0; /* attributes desired by syntax */ |
| 3062 int has_syntax = FALSE; /* this buffer has syntax highl. */ | |
| 3063 int save_did_emsg; | |
| 1437 | 3064 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
|
3065 int draw_color_col = FALSE; /* highlight colorcolumn */ |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
3066 int *color_cols = NULL; /* pointer to according columns array */ |
| 743 | 3067 #endif |
| 3068 #ifdef FEAT_SPELL | |
| 221 | 3069 int has_spell = FALSE; /* this buffer has spell checking */ |
| 348 | 3070 # define SPWORDLEN 150 |
| 3071 char_u nextline[SPWORDLEN * 2];/* text with start of the next line */ | |
| 353 | 3072 int nextlinecol = 0; /* column where nextline[] starts */ |
| 3073 int nextline_idx = 0; /* index in nextline[] where next line | |
| 348 | 3074 starts */ |
| 221 | 3075 int spell_attr = 0; /* attributes desired by spelling */ |
| 3076 int word_end = 0; /* last byte with same spell_attr */ | |
| 378 | 3077 static linenr_T checked_lnum = 0; /* line number for "checked_col" */ |
| 3078 static int checked_col = 0; /* column in "checked_lnum" up to which | |
| 348 | 3079 * there are no spell errors */ |
| 386 | 3080 static int cap_col = -1; /* column to check for Cap word */ |
| 3081 static linenr_T capcol_lnum = 0; /* line number where "cap_col" used */ | |
| 348 | 3082 int cur_checked_col = 0; /* checked column for current line */ |
| 7 | 3083 #endif |
| 3084 int extra_check; /* has syntax or linebreak */ | |
| 3085 #ifdef FEAT_MBYTE | |
| 3086 int multi_attr = 0; /* attributes desired by multibyte */ | |
| 3087 int mb_l = 1; /* multi-byte byte length */ | |
| 3088 int mb_c = 0; /* decoded multi-byte character */ | |
| 3089 int mb_utf8 = FALSE; /* screen char is UTF-8 char */ | |
| 714 | 3090 int u8cc[MAX_MCO]; /* composing UTF-8 chars */ |
| 7 | 3091 #endif |
| 3092 #ifdef FEAT_DIFF | |
| 3093 int filler_lines; /* nr of filler lines to be drawn */ | |
| 3094 int filler_todo; /* nr of filler lines still to do + 1 */ | |
| 534 | 3095 hlf_T diff_hlf = (hlf_T)0; /* type of diff highlighting */ |
| 7 | 3096 int change_start = MAXCOL; /* first col of changed area */ |
| 3097 int change_end = -1; /* last col of changed area */ | |
| 3098 #endif | |
| 3099 colnr_T trailcol = MAXCOL; /* start of trailing spaces */ | |
| 3100 #ifdef FEAT_LINEBREAK | |
|
10392
957a1d560bda
commit https://github.com/vim/vim/commit/6c896867c4f5d759616028ef7cbfce2a9ed32600
Christian Brabandt <cb@256bit.org>
parents:
10349
diff
changeset
|
3101 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
|
3102 chars */ |
| 7 | 3103 #endif |
|
12477
68d7bc045dbe
patch 8.0.1118: FEAT_WINDOWS adds a lot of #ifdefs
Christian Brabandt <cb@256bit.org>
parents:
12441
diff
changeset
|
3104 #if defined(FEAT_SIGNS) || defined(FEAT_QUICKFIX) \ |
| 910 | 3105 || defined(FEAT_SYN_HL) || defined(FEAT_DIFF) |
| 7 | 3106 # define LINE_ATTR |
| 1536 | 3107 int line_attr = 0; /* attribute for the whole line */ |
| 7 | 3108 #endif |
| 3109 #ifdef FEAT_SEARCH_EXTRA | |
| 1326 | 3110 matchitem_T *cur; /* points to the match list */ |
| 3111 match_T *shl; /* points to search_hl or a match */ | |
| 3112 int shl_flag; /* flag to indicate whether search_hl | |
| 3113 has been processed or not */ | |
| 5979 | 3114 int pos_inprogress; /* marks that position match search is |
| 3115 in progress */ | |
| 1326 | 3116 int prevcol_hl_flag; /* flag to indicate whether prevcol |
| 3117 equals startcol of search_hl or one | |
| 3118 of the matches */ | |
| 7 | 3119 #endif |
| 3120 #ifdef FEAT_ARABIC | |
| 3121 int prev_c = 0; /* previous Arabic character */ | |
| 3122 int prev_c1 = 0; /* first composing char for prev_c */ | |
| 3123 #endif | |
| 910 | 3124 #if defined(LINE_ATTR) |
| 867 | 3125 int did_line_attr = 0; |
| 3126 #endif | |
|
11836
f080b225a2a4
patch 8.0.0798: no highlighting in a terminal window with a finished job
Christian Brabandt <cb@256bit.org>
parents:
11834
diff
changeset
|
3127 #ifdef FEAT_TERMINAL |
|
f080b225a2a4
patch 8.0.0798: no highlighting in a terminal window with a finished job
Christian Brabandt <cb@256bit.org>
parents:
11834
diff
changeset
|
3128 int get_term_attr = FALSE; |
|
12433
735b49ff8fbb
patch 8.0.1096: terminal window in Normal mode has wrong background
Christian Brabandt <cb@256bit.org>
parents:
12323
diff
changeset
|
3129 int term_attr = 0; /* background for terminal window */ |
|
11836
f080b225a2a4
patch 8.0.0798: no highlighting in a terminal window with a finished job
Christian Brabandt <cb@256bit.org>
parents:
11834
diff
changeset
|
3130 #endif |
| 7 | 3131 |
| 3132 /* draw_state: items that are drawn in sequence: */ | |
| 3133 #define WL_START 0 /* nothing done yet */ | |
| 3134 #ifdef FEAT_CMDWIN | |
| 3135 # define WL_CMDLINE WL_START + 1 /* cmdline window column */ | |
| 3136 #else | |
| 3137 # define WL_CMDLINE WL_START | |
| 3138 #endif | |
| 3139 #ifdef FEAT_FOLDING | |
| 3140 # define WL_FOLD WL_CMDLINE + 1 /* 'foldcolumn' */ | |
| 3141 #else | |
| 3142 # define WL_FOLD WL_CMDLINE | |
| 3143 #endif | |
| 3144 #ifdef FEAT_SIGNS | |
| 3145 # define WL_SIGN WL_FOLD + 1 /* column for signs */ | |
| 3146 #else | |
| 3147 # define WL_SIGN WL_FOLD /* column for signs */ | |
| 3148 #endif | |
| 3149 #define WL_NR WL_SIGN + 1 /* line number */ | |
| 5995 | 3150 #ifdef FEAT_LINEBREAK |
| 3151 # define WL_BRI WL_NR + 1 /* 'breakindent' */ | |
| 3152 #else | |
| 3153 # define WL_BRI WL_NR | |
| 3154 #endif | |
| 7 | 3155 #if defined(FEAT_LINEBREAK) || defined(FEAT_DIFF) |
| 5995 | 3156 # define WL_SBR WL_BRI + 1 /* 'showbreak' or 'diff' */ |
| 7 | 3157 #else |
| 5995 | 3158 # define WL_SBR WL_BRI |
| 7 | 3159 #endif |
| 3160 #define WL_LINE WL_SBR + 1 /* text in the line */ | |
| 3161 int draw_state = WL_START; /* what to draw next */ | |
| 574 | 3162 #if defined(FEAT_XIM) && defined(FEAT_GUI_GTK) |
| 7 | 3163 int feedback_col = 0; |
| 3164 int feedback_old_attr = -1; | |
| 3165 #endif | |
| 3166 | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
3167 #ifdef FEAT_CONCEAL |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
3168 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
|
3169 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
|
3170 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
|
3171 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
|
3172 int is_concealing = FALSE; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
3173 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
|
3174 wrapping */ |
|
2409
0ca06a92adfb
Add support for horizontal scroll wheel. (Bjorn Winckler)
Bram Moolenaar <bram@vim.org>
parents:
2400
diff
changeset
|
3175 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
|
3176 int did_wcol = FALSE; |
|
8907
5deb9e8f4292
commit https://github.com/vim/vim/commit/4d585022023b96f6507e8cae5ed8fc8d926f5140
Christian Brabandt <cb@256bit.org>
parents:
8872
diff
changeset
|
3177 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
|
3178 int has_match_conc = 0; /* match wants to conceal */ |
| 6520 | 3179 int old_boguscols = 0; |
|
2332
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
3180 # define VCOL_HLC (vcol - vcol_off) |
|
5174
42d592dbbec3
updated for version 7.4a.013
Bram Moolenaar <bram@vim.org>
parents:
5126
diff
changeset
|
3181 # define FIX_FOR_BOGUSCOLS \ |
|
42d592dbbec3
updated for version 7.4a.013
Bram Moolenaar <bram@vim.org>
parents:
5126
diff
changeset
|
3182 { \ |
|
42d592dbbec3
updated for version 7.4a.013
Bram Moolenaar <bram@vim.org>
parents:
5126
diff
changeset
|
3183 n_extra += vcol_off; \ |
|
42d592dbbec3
updated for version 7.4a.013
Bram Moolenaar <bram@vim.org>
parents:
5126
diff
changeset
|
3184 vcol -= vcol_off; \ |
|
42d592dbbec3
updated for version 7.4a.013
Bram Moolenaar <bram@vim.org>
parents:
5126
diff
changeset
|
3185 vcol_off = 0; \ |
|
42d592dbbec3
updated for version 7.4a.013
Bram Moolenaar <bram@vim.org>
parents:
5126
diff
changeset
|
3186 col -= boguscols; \ |
| 6520 | 3187 old_boguscols = boguscols; \ |
|
5174
42d592dbbec3
updated for version 7.4a.013
Bram Moolenaar <bram@vim.org>
parents:
5126
diff
changeset
|
3188 boguscols = 0; \ |
|
42d592dbbec3
updated for version 7.4a.013
Bram Moolenaar <bram@vim.org>
parents:
5126
diff
changeset
|
3189 } |
|
2332
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
3190 #else |
|
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
3191 # define VCOL_HLC (vcol) |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
3192 #endif |
| 7 | 3193 |
| 3194 if (startrow > endrow) /* past the end already! */ | |
| 3195 return startrow; | |
| 3196 | |
| 3197 row = startrow; | |
| 3198 screen_row = row + W_WINROW(wp); | |
| 3199 | |
| 3200 /* | |
| 3201 * To speed up the loop below, set extra_check when there is linebreak, | |
| 3202 * trailing white space and/or syntax processing to be done. | |
| 3203 */ | |
| 3204 #ifdef FEAT_LINEBREAK | |
| 3205 extra_check = wp->w_p_lbr; | |
| 3206 #else | |
| 3207 extra_check = 0; | |
| 3208 #endif | |
| 3209 #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
|
3210 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
|
3211 # 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
|
3212 && !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
|
3213 # endif |
|
998d2cf59caa
patch 8.0.0647: syntax highlighting can make cause a freeze
Christian Brabandt <cb@256bit.org>
parents:
11521
diff
changeset
|
3214 ) |
| 7 | 3215 { |
| 3216 /* Prepare for syntax highlighting in this line. When there is an | |
| 3217 * error, stop syntax highlighting. */ | |
| 3218 save_did_emsg = did_emsg; | |
| 3219 did_emsg = FALSE; | |
|
12510
7a887dccd13a
patch 8.0.1133: syntax timeout not used correctly
Christian Brabandt <cb@256bit.org>
parents:
12487
diff
changeset
|
3220 syntax_start(wp, lnum); |
| 7 | 3221 if (did_emsg) |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
3222 wp->w_s->b_syn_error = TRUE; |
| 7 | 3223 else |
| 3224 { | |
| 3225 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
|
3226 #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
|
3227 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
|
3228 #endif |
|
998d2cf59caa
patch 8.0.0647: syntax highlighting can make cause a freeze
Christian Brabandt <cb@256bit.org>
parents:
11521
diff
changeset
|
3229 { |
|
998d2cf59caa
patch 8.0.0647: syntax highlighting can make cause a freeze
Christian Brabandt <cb@256bit.org>
parents:
11521
diff
changeset
|
3230 has_syntax = TRUE; |
|
998d2cf59caa
patch 8.0.0647: syntax highlighting can make cause a freeze
Christian Brabandt <cb@256bit.org>
parents:
11521
diff
changeset
|
3231 extra_check = TRUE; |
|
998d2cf59caa
patch 8.0.0647: syntax highlighting can make cause a freeze
Christian Brabandt <cb@256bit.org>
parents:
11521
diff
changeset
|
3232 } |
| 7 | 3233 } |
| 3234 } | |
|
2314
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
3235 |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
3236 /* Check for columns to display for 'colorcolumn'. */ |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
3237 color_cols = wp->w_p_cc_cols; |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
3238 if (color_cols != NULL) |
|
2332
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
3239 draw_color_col = advance_color_col(VCOL_HLC, &color_cols); |
| 743 | 3240 #endif |
| 3241 | |
|
11836
f080b225a2a4
patch 8.0.0798: no highlighting in a terminal window with a finished job
Christian Brabandt <cb@256bit.org>
parents:
11834
diff
changeset
|
3242 #ifdef FEAT_TERMINAL |
|
11866
be40c8a9240d
patch 8.0.0813: cannot use a terminal window while the job is running
Christian Brabandt <cb@256bit.org>
parents:
11864
diff
changeset
|
3243 if (term_show_buffer(wp->w_buffer)) |
|
11836
f080b225a2a4
patch 8.0.0798: no highlighting in a terminal window with a finished job
Christian Brabandt <cb@256bit.org>
parents:
11834
diff
changeset
|
3244 { |
|
f080b225a2a4
patch 8.0.0798: no highlighting in a terminal window with a finished job
Christian Brabandt <cb@256bit.org>
parents:
11834
diff
changeset
|
3245 extra_check = TRUE; |
|
f080b225a2a4
patch 8.0.0798: no highlighting in a terminal window with a finished job
Christian Brabandt <cb@256bit.org>
parents:
11834
diff
changeset
|
3246 get_term_attr = TRUE; |
|
12435
40961647f547
patch 8.0.1097: background color wrong if job changes background color
Christian Brabandt <cb@256bit.org>
parents:
12433
diff
changeset
|
3247 term_attr = term_get_attr(wp->w_buffer, lnum, -1); |
|
11836
f080b225a2a4
patch 8.0.0798: no highlighting in a terminal window with a finished job
Christian Brabandt <cb@256bit.org>
parents:
11834
diff
changeset
|
3248 } |
|
f080b225a2a4
patch 8.0.0798: no highlighting in a terminal window with a finished job
Christian Brabandt <cb@256bit.org>
parents:
11834
diff
changeset
|
3249 #endif |
|
f080b225a2a4
patch 8.0.0798: no highlighting in a terminal window with a finished job
Christian Brabandt <cb@256bit.org>
parents:
11834
diff
changeset
|
3250 |
| 743 | 3251 #ifdef FEAT_SPELL |
| 258 | 3252 if (wp->w_p_spell |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
3253 && *wp->w_s->b_p_spl != NUL |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
3254 && 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
|
3255 && *(char **)(wp->w_s->b_langp.ga_data) != NULL) |
| 221 | 3256 { |
| 3257 /* Prepare for spell checking. */ | |
| 3258 has_spell = TRUE; | |
| 3259 extra_check = TRUE; | |
| 348 | 3260 |
| 3261 /* Get the start of the next line, so that words that wrap to the next | |
| 3262 * line are found too: "et<line-break>al.". | |
| 3263 * Trick: skip a few chars for C/shell/Vim comments */ | |
| 3264 nextline[SPWORDLEN] = NUL; | |
| 3265 if (lnum < wp->w_buffer->b_ml.ml_line_count) | |
| 3266 { | |
| 3267 line = ml_get_buf(wp->w_buffer, lnum + 1, FALSE); | |
| 3268 spell_cat_line(nextline + SPWORDLEN, line, SPWORDLEN); | |
| 3269 } | |
| 3270 | |
| 3271 /* When a word wrapped from the previous line the start of the current | |
| 3272 * line is valid. */ | |
| 3273 if (lnum == checked_lnum) | |
| 3274 cur_checked_col = checked_col; | |
| 3275 checked_lnum = 0; | |
| 386 | 3276 |
| 3277 /* When there was a sentence end in the previous line may require a | |
| 3278 * word starting with capital in this line. In line 1 always check | |
| 3279 * the first word. */ | |
| 3280 if (lnum != capcol_lnum) | |
| 3281 cap_col = -1; | |
| 3282 if (lnum == 1) | |
| 3283 cap_col = 0; | |
| 3284 capcol_lnum = 0; | |
| 221 | 3285 } |
| 7 | 3286 #endif |
| 3287 | |
| 3288 /* | |
| 3289 * handle visual active in this window | |
| 3290 */ | |
| 3291 fromcol = -10; | |
| 3292 tocol = MAXCOL; | |
| 3293 if (VIsual_active && wp->w_buffer == curwin->w_buffer) | |
| 3294 { | |
| 3295 /* 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
|
3296 if (LTOREQ_POS(curwin->w_cursor, VIsual)) |
| 7 | 3297 { |
| 3298 top = &curwin->w_cursor; | |
| 3299 bot = &VIsual; | |
| 3300 } | |
| 3301 else /* Visual is before curwin->w_cursor */ | |
| 3302 { | |
| 3303 top = &VIsual; | |
| 3304 bot = &curwin->w_cursor; | |
| 3305 } | |
| 1813 | 3306 lnum_in_visual_area = (lnum >= top->lnum && lnum <= bot->lnum); |
| 7 | 3307 if (VIsual_mode == Ctrl_V) /* block mode */ |
| 3308 { | |
| 1813 | 3309 if (lnum_in_visual_area) |
| 7 | 3310 { |
| 3311 fromcol = wp->w_old_cursor_fcol; | |
| 3312 tocol = wp->w_old_cursor_lcol; | |
| 3313 } | |
| 3314 } | |
| 3315 else /* non-block mode */ | |
| 3316 { | |
| 3317 if (lnum > top->lnum && lnum <= bot->lnum) | |
| 3318 fromcol = 0; | |
| 3319 else if (lnum == top->lnum) | |
| 3320 { | |
| 3321 if (VIsual_mode == 'V') /* linewise */ | |
| 3322 fromcol = 0; | |
| 3323 else | |
| 3324 { | |
| 3325 getvvcol(wp, top, (colnr_T *)&fromcol, NULL, NULL); | |
| 3326 if (gchar_pos(top) == NUL) | |
| 3327 tocol = fromcol + 1; | |
| 3328 } | |
| 3329 } | |
| 3330 if (VIsual_mode != 'V' && lnum == bot->lnum) | |
| 3331 { | |
| 3332 if (*p_sel == 'e' && bot->col == 0 | |
| 3333 #ifdef FEAT_VIRTUALEDIT | |
| 3334 && bot->coladd == 0 | |
| 3335 #endif | |
| 3336 ) | |
| 3337 { | |
| 3338 fromcol = -10; | |
| 3339 tocol = MAXCOL; | |
| 3340 } | |
| 36 | 3341 else if (bot->col == MAXCOL) |
| 3342 tocol = MAXCOL; | |
| 7 | 3343 else |
| 3344 { | |
| 3345 pos = *bot; | |
| 3346 if (*p_sel == 'e') | |
| 3347 getvvcol(wp, &pos, (colnr_T *)&tocol, NULL, NULL); | |
| 3348 else | |
| 3349 { | |
| 3350 getvvcol(wp, &pos, NULL, NULL, (colnr_T *)&tocol); | |
| 3351 ++tocol; | |
| 3352 } | |
| 3353 } | |
| 3354 } | |
| 3355 } | |
| 3356 | |
| 3357 /* Check if the character under the cursor should not be inverted */ | |
| 3358 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
|
3359 #ifdef FEAT_GUI |
| 7 | 3360 && !gui.in_use |
|
8212
05b88224cea1
commit https://github.com/vim/vim/commit/48e330aff911be1c798c88a973af6437a8141fce
Christian Brabandt <cb@256bit.org>
parents:
7833
diff
changeset
|
3361 #endif |
| 7 | 3362 ) |
| 3363 noinvcur = TRUE; | |
| 3364 | |
| 3365 /* if inverting in this line set area_highlighting */ | |
| 3366 if (fromcol >= 0) | |
| 3367 { | |
| 3368 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
|
3369 attr = HL_ATTR(HLF_V); |
| 7 | 3370 #if defined(FEAT_CLIPBOARD) && defined(FEAT_X11) |
| 3674 | 3371 if ((clip_star.available && !clip_star.owned |
| 3372 && clip_isautosel_star()) | |
| 3373 || (clip_plus.available && !clip_plus.owned | |
| 3374 && 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
|
3375 attr = HL_ATTR(HLF_VNC); |
| 7 | 3376 #endif |
| 3377 } | |
| 3378 } | |
| 3379 | |
| 3380 /* | |
| 674 | 3381 * handle 'incsearch' and ":s///c" highlighting |
| 7 | 3382 */ |
| 5735 | 3383 else if (highlight_match |
| 7 | 3384 && wp == curwin |
| 3385 && lnum >= curwin->w_cursor.lnum | |
| 3386 && lnum <= curwin->w_cursor.lnum + search_match_lines) | |
| 3387 { | |
| 3388 if (lnum == curwin->w_cursor.lnum) | |
| 3389 getvcol(curwin, &(curwin->w_cursor), | |
| 3390 (colnr_T *)&fromcol, NULL, NULL); | |
| 3391 else | |
| 3392 fromcol = 0; | |
| 3393 if (lnum == curwin->w_cursor.lnum + search_match_lines) | |
| 3394 { | |
| 3395 pos.lnum = lnum; | |
| 3396 pos.col = search_match_endcol; | |
| 3397 getvcol(curwin, &pos, (colnr_T *)&tocol, NULL, NULL); | |
| 3398 } | |
| 3399 else | |
| 3400 tocol = MAXCOL; | |
| 1850 | 3401 /* do at least one character; happens when past end of line */ |
| 3402 if (fromcol == tocol) | |
| 3403 tocol = fromcol + 1; | |
| 7 | 3404 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
|
3405 attr = HL_ATTR(HLF_I); |
| 7 | 3406 } |
| 3407 | |
| 3408 #ifdef FEAT_DIFF | |
| 3409 filler_lines = diff_check(wp, lnum); | |
| 3410 if (filler_lines < 0) | |
| 3411 { | |
| 3412 if (filler_lines == -1) | |
| 3413 { | |
| 3414 if (diff_find_change(wp, lnum, &change_start, &change_end)) | |
| 3415 diff_hlf = HLF_ADD; /* added line */ | |
| 3416 else if (change_start == 0) | |
| 3417 diff_hlf = HLF_TXD; /* changed text */ | |
| 3418 else | |
| 3419 diff_hlf = HLF_CHD; /* changed line */ | |
| 3420 } | |
| 3421 else | |
| 3422 diff_hlf = HLF_ADD; /* added line */ | |
| 3423 filler_lines = 0; | |
| 3424 area_highlighting = TRUE; | |
| 3425 } | |
| 3426 if (lnum == wp->w_topline) | |
| 3427 filler_lines = wp->w_topfill; | |
| 3428 filler_todo = filler_lines; | |
| 3429 #endif | |
| 3430 | |
| 3431 #ifdef LINE_ATTR | |
| 3432 # ifdef FEAT_SIGNS | |
| 3433 /* If this line has a sign with line highlighting set line_attr. */ | |
| 3434 v = buf_getsigntype(wp->w_buffer, lnum, SIGN_LINEHL); | |
| 3435 if (v != 0) | |
| 3436 line_attr = sign_get_attr((int)v, TRUE); | |
| 3437 # endif | |
|
12477
68d7bc045dbe
patch 8.0.1118: FEAT_WINDOWS adds a lot of #ifdefs
Christian Brabandt <cb@256bit.org>
parents:
12441
diff
changeset
|
3438 # if defined(FEAT_QUICKFIX) |
| 7 | 3439 /* Highlight the current line in the quickfix window. */ |
| 644 | 3440 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
|
3441 line_attr = HL_ATTR(HLF_QFL); |
| 7 | 3442 # endif |
| 3443 if (line_attr != 0) | |
| 3444 area_highlighting = TRUE; | |
| 3445 #endif | |
| 3446 | |
| 3447 line = ml_get_buf(wp->w_buffer, lnum, FALSE); | |
| 3448 ptr = line; | |
| 3449 | |
| 743 | 3450 #ifdef FEAT_SPELL |
| 348 | 3451 if (has_spell) |
| 3452 { | |
| 386 | 3453 /* For checking first word with a capital skip white space. */ |
| 3454 if (cap_col == 0) | |
|
12323
4dba3e4f3b01
patch 8.0.1041: bogus characters when indenting during visual-block append
Christian Brabandt <cb@256bit.org>
parents:
12317
diff
changeset
|
3455 cap_col = getwhitecols(line); |
| 386 | 3456 |
| 348 | 3457 /* To be able to spell-check over line boundaries copy the end of the |
| 3458 * current line into nextline[]. Above the start of the next line was | |
| 3459 * copied to nextline[SPWORDLEN]. */ | |
| 3460 if (nextline[SPWORDLEN] == NUL) | |
| 3461 { | |
| 3462 /* No next line or it is empty. */ | |
| 3463 nextlinecol = MAXCOL; | |
| 3464 nextline_idx = 0; | |
| 3465 } | |
| 3466 else | |
| 3467 { | |
| 835 | 3468 v = (long)STRLEN(line); |
| 348 | 3469 if (v < SPWORDLEN) |
| 3470 { | |
| 3471 /* Short line, use it completely and append the start of the | |
| 3472 * next line. */ | |
| 3473 nextlinecol = 0; | |
| 3474 mch_memmove(nextline, line, (size_t)v); | |
| 1621 | 3475 STRMOVE(nextline + v, nextline + SPWORDLEN); |
| 348 | 3476 nextline_idx = v + 1; |
| 3477 } | |
| 3478 else | |
| 3479 { | |
| 3480 /* Long line, use only the last SPWORDLEN bytes. */ | |
| 3481 nextlinecol = v - SPWORDLEN; | |
| 3482 mch_memmove(nextline, line + nextlinecol, SPWORDLEN); | |
| 3483 nextline_idx = SPWORDLEN + 1; | |
| 3484 } | |
| 3485 } | |
| 3486 } | |
| 3487 #endif | |
| 3488 | |
|
7344
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
3489 if (wp->w_p_list) |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
3490 { |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
3491 if (lcs_space || lcs_trail) |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
3492 extra_check = TRUE; |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
3493 /* find start of trailing whitespace */ |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
3494 if (lcs_trail) |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
3495 { |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
3496 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
|
3497 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
|
3498 --trailcol; |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
3499 trailcol += (colnr_T) (ptr - line); |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
3500 } |
| 7 | 3501 } |
| 3502 | |
| 3503 /* | |
| 3504 * 'nowrap' or 'wrap' and a single line that doesn't fit: Advance to the | |
| 3505 * first character to be displayed. | |
| 3506 */ | |
| 3507 if (wp->w_p_wrap) | |
| 3508 v = wp->w_skipcol; | |
| 3509 else | |
| 3510 v = wp->w_leftcol; | |
| 3511 if (v > 0) | |
| 3512 { | |
| 3513 #ifdef FEAT_MBYTE | |
| 3514 char_u *prev_ptr = ptr; | |
| 3515 #endif | |
| 3516 while (vcol < v && *ptr != NUL) | |
| 3517 { | |
| 5995 | 3518 c = win_lbr_chartabsize(wp, line, ptr, (colnr_T)vcol, NULL); |
| 7 | 3519 vcol += c; |
| 3520 #ifdef FEAT_MBYTE | |
| 3521 prev_ptr = ptr; | |
| 39 | 3522 #endif |
|
11127
506f5d8b7d8b
patch 8.0.0451: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11121
diff
changeset
|
3523 MB_PTR_ADV(ptr); |
| 7 | 3524 } |
| 3525 | |
| 1984 | 3526 /* When: |
| 3527 * - 'cuc' is set, or | |
|
2314
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
3528 * - 'colorcolumn' is set, or |
| 1984 | 3529 * - 'virtualedit' is set, or |
| 3530 * - the visual mode is active, | |
| 3531 * the end of the line may be before the start of the displayed part. | |
| 3532 */ | |
| 3533 if (vcol < v && ( | |
| 5735 | 3534 #ifdef FEAT_SYN_HL |
| 3535 wp->w_p_cuc || draw_color_col || | |
| 3536 #endif | |
| 3537 #ifdef FEAT_VIRTUALEDIT | |
| 3538 virtual_active() || | |
| 3539 #endif | |
| 3540 (VIsual_active && wp->w_buffer == curwin->w_buffer))) | |
| 1984 | 3541 { |
| 7 | 3542 vcol = v; |
| 1984 | 3543 } |
| 7 | 3544 |
| 3545 /* Handle a character that's not completely on the screen: Put ptr at | |
| 3546 * that character but skip the first few screen characters. */ | |
| 3547 if (vcol > v) | |
| 3548 { | |
| 3549 vcol -= c; | |
| 3550 #ifdef FEAT_MBYTE | |
| 3551 ptr = prev_ptr; | |
| 3552 #else | |
| 3553 --ptr; | |
| 3554 #endif | |
|
11010
c004e17fa36b
patch 8.0.0394: tabs are not aligned when scrolling horizontally
Christian Brabandt <cb@256bit.org>
parents:
10988
diff
changeset
|
3555 /* 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
|
3556 * 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
|
3557 if (( |
|
c004e17fa36b
patch 8.0.0394: tabs are not aligned when scrolling horizontally
Christian Brabandt <cb@256bit.org>
parents:
10988
diff
changeset
|
3558 #ifdef FEAT_MBYTE |
|
c004e17fa36b
patch 8.0.0394: tabs are not aligned when scrolling horizontally
Christian Brabandt <cb@256bit.org>
parents:
10988
diff
changeset
|
3559 (*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
|
3560 #endif |
|
c004e17fa36b
patch 8.0.0394: tabs are not aligned when scrolling horizontally
Christian Brabandt <cb@256bit.org>
parents:
10988
diff
changeset
|
3561 *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
|
3562 n_skip = v - vcol; |
| 7 | 3563 } |
| 3564 | |
| 3565 /* | |
| 3566 * Adjust for when the inverted text is before the screen, | |
| 3567 * and when the start of the inverted text is before the screen. | |
| 3568 */ | |
| 3569 if (tocol <= vcol) | |
| 3570 fromcol = 0; | |
| 3571 else if (fromcol >= 0 && fromcol < vcol) | |
| 3572 fromcol = vcol; | |
| 3573 | |
| 3574 #ifdef FEAT_LINEBREAK | |
| 3575 /* When w_skipcol is non-zero, first line needs 'showbreak' */ | |
| 3576 if (wp->w_p_wrap) | |
| 3577 need_showbreak = TRUE; | |
| 3578 #endif | |
| 743 | 3579 #ifdef FEAT_SPELL |
| 499 | 3580 /* When spell checking a word we need to figure out the start of the |
| 3581 * word and if it's badly spelled or not. */ | |
| 3582 if (has_spell) | |
| 3583 { | |
| 3584 int len; | |
| 1536 | 3585 colnr_T linecol = (colnr_T)(ptr - line); |
| 534 | 3586 hlf_T spell_hlf = HLF_COUNT; |
| 499 | 3587 |
| 3588 pos = wp->w_cursor; | |
| 3589 wp->w_cursor.lnum = lnum; | |
| 1536 | 3590 wp->w_cursor.col = linecol; |
| 534 | 3591 len = spell_move_to(wp, FORWARD, TRUE, TRUE, &spell_hlf); |
| 1536 | 3592 |
| 3593 /* spell_move_to() may call ml_get() and make "line" invalid */ | |
| 3594 line = ml_get_buf(wp->w_buffer, lnum, FALSE); | |
| 3595 ptr = line + linecol; | |
| 3596 | |
| 530 | 3597 if (len == 0 || (int)wp->w_cursor.col > ptr - line) |
| 499 | 3598 { |
| 3599 /* no bad word found at line start, don't check until end of a | |
| 3600 * word */ | |
| 534 | 3601 spell_hlf = HLF_COUNT; |
| 3572 | 3602 word_end = (int)(spell_to_word_end(ptr, wp) - line + 1); |
| 499 | 3603 } |
| 3604 else | |
| 534 | 3605 { |
| 499 | 3606 /* bad word found, use attributes until end of word */ |
| 3607 word_end = wp->w_cursor.col + len + 1; | |
| 3608 | |
| 534 | 3609 /* Turn index into actual attributes. */ |
| 3610 if (spell_hlf != HLF_COUNT) | |
| 3611 spell_attr = highlight_attr[spell_hlf]; | |
| 3612 } | |
| 499 | 3613 wp->w_cursor = pos; |
| 501 | 3614 |
| 743 | 3615 # ifdef FEAT_SYN_HL |
| 501 | 3616 /* Need to restart syntax highlighting for this line. */ |
| 3617 if (has_syntax) | |
|
12510
7a887dccd13a
patch 8.0.1133: syntax timeout not used correctly
Christian Brabandt <cb@256bit.org>
parents:
12487
diff
changeset
|
3618 syntax_start(wp, lnum); |
| 743 | 3619 # endif |
| 499 | 3620 } |
| 3621 #endif | |
| 7 | 3622 } |
| 3623 | |
| 3624 /* | |
| 3625 * Correct highlighting for cursor that can't be disabled. | |
| 3626 * Avoids having to check this for each character. | |
| 3627 */ | |
| 3628 if (fromcol >= 0) | |
| 3629 { | |
| 3630 if (noinvcur) | |
| 3631 { | |
| 3632 if ((colnr_T)fromcol == wp->w_virtcol) | |
| 3633 { | |
| 3634 /* highlighting starts at cursor, let it start just after the | |
| 3635 * cursor */ | |
| 3636 fromcol_prev = fromcol; | |
| 3637 fromcol = -1; | |
| 3638 } | |
| 3639 else if ((colnr_T)fromcol < wp->w_virtcol) | |
| 3640 /* restart highlighting after the cursor */ | |
| 3641 fromcol_prev = wp->w_virtcol; | |
| 3642 } | |
| 3643 if (fromcol >= tocol) | |
| 3644 fromcol = -1; | |
| 3645 } | |
| 3646 | |
| 3647 #ifdef FEAT_SEARCH_EXTRA | |
| 3648 /* | |
| 1326 | 3649 * Handle highlighting the last used search pattern and matches. |
| 3650 * Do this for both search_hl and the match list. | |
| 7 | 3651 */ |
| 1326 | 3652 cur = wp->w_match_head; |
| 3653 shl_flag = FALSE; | |
| 3654 while (cur != NULL || shl_flag == FALSE) | |
| 3655 { | |
| 3656 if (shl_flag == FALSE) | |
| 3657 { | |
| 3658 shl = &search_hl; | |
| 3659 shl_flag = TRUE; | |
| 3660 } | |
| 3661 else | |
| 3662 shl = &cur->hl; | |
| 36 | 3663 shl->startcol = MAXCOL; |
| 3664 shl->endcol = MAXCOL; | |
| 7 | 3665 shl->attr_cur = 0; |
|
9885
4e8b05fa12c6
commit https://github.com/vim/vim/commit/4f416e41243ca151b95d39d81ce23d00b1484755
Christian Brabandt <cb@256bit.org>
parents:
9877
diff
changeset
|
3666 shl->is_addpos = FALSE; |
| 5979 | 3667 v = (long)(ptr - line); |
| 3668 if (cur != NULL) | |
| 3669 cur->pos.cur = 0; | |
|
9992
3e3b0ce24b61
commit https://github.com/vim/vim/commit/e17bdffff78ebd6a4e3cff26754cc667557ea810
Christian Brabandt <cb@256bit.org>
parents:
9939
diff
changeset
|
3670 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
|
3671 shl == &search_hl ? NULL : cur); |
| 5979 | 3672 |
| 3673 /* Need to get the line again, a multi-line regexp may have made it | |
| 3674 * invalid. */ | |
| 3675 line = ml_get_buf(wp->w_buffer, lnum, FALSE); | |
| 3676 ptr = line + v; | |
| 3677 | |
| 3678 if (shl->lnum != 0 && shl->lnum <= lnum) | |
| 3679 { | |
| 3680 if (shl->lnum == lnum) | |
| 3681 shl->startcol = shl->rm.startpos[0].col; | |
| 3682 else | |
| 3683 shl->startcol = 0; | |
| 3684 if (lnum == shl->lnum + shl->rm.endpos[0].lnum | |
| 3685 - shl->rm.startpos[0].lnum) | |
| 3686 shl->endcol = shl->rm.endpos[0].col; | |
| 3687 else | |
| 3688 shl->endcol = MAXCOL; | |
| 3689 /* Highlight one character for an empty match. */ | |
| 3690 if (shl->startcol == shl->endcol) | |
| 3691 { | |
| 3692 #ifdef FEAT_MBYTE | |
| 3693 if (has_mbyte && line[shl->endcol] != NUL) | |
| 3694 shl->endcol += (*mb_ptr2len)(line + shl->endcol); | |
| 7 | 3695 else |
| 5979 | 3696 #endif |
| 3697 ++shl->endcol; | |
| 3698 } | |
| 3699 if ((long)shl->startcol < v) /* match at leftcol */ | |
| 3700 { | |
| 3701 shl->attr_cur = shl->attr; | |
| 3702 search_attr = shl->attr; | |
| 3703 } | |
| 3704 area_highlighting = TRUE; | |
| 7 | 3705 } |
| 1326 | 3706 if (shl != &search_hl && cur != NULL) |
| 3707 cur = cur->next; | |
| 7 | 3708 } |
| 3709 #endif | |
| 3710 | |
| 743 | 3711 #ifdef FEAT_SYN_HL |
|
5068
6a7ae677d6a1
updated for version 7.3.1277
Bram Moolenaar <bram@vim.org>
parents:
4916
diff
changeset
|
3712 /* 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
|
3713 * 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
|
3714 * then. */ |
|
5078
22ac43fb6d30
updated for version 7.3.1282
Bram Moolenaar <bram@vim.org>
parents:
5068
diff
changeset
|
3715 if (wp->w_p_cul && lnum == wp->w_cursor.lnum |
| 5979 | 3716 && !(wp == curwin && VIsual_active)) |
| 743 | 3717 { |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
3718 line_attr = HL_ATTR(HLF_CUL); |
| 743 | 3719 area_highlighting = TRUE; |
| 3720 } | |
| 3721 #endif | |
| 3722 | |
| 504 | 3723 off = (unsigned)(current_ScreenLine - ScreenLines); |
| 7 | 3724 col = 0; |
| 3725 #ifdef FEAT_RIGHTLEFT | |
| 3726 if (wp->w_p_rl) | |
| 3727 { | |
| 3728 /* Rightleft window: process the text in the normal direction, but put | |
| 3729 * it in current_ScreenLine[] from right to left. Start at the | |
| 3730 * rightmost column of the window. */ | |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
3731 col = wp->w_width - 1; |
| 7 | 3732 off += col; |
| 3733 } | |
| 3734 #endif | |
| 3735 | |
| 3736 /* | |
| 3737 * Repeat for the whole displayed line. | |
| 3738 */ | |
| 3739 for (;;) | |
| 3740 { | |
| 6947 | 3741 #ifdef FEAT_CONCEAL |
|
8907
5deb9e8f4292
commit https://github.com/vim/vim/commit/4d585022023b96f6507e8cae5ed8fc8d926f5140
Christian Brabandt <cb@256bit.org>
parents:
8872
diff
changeset
|
3742 has_match_conc = 0; |
| 6947 | 3743 #endif |
| 7 | 3744 /* Skip this quickly when working on the text. */ |
| 3745 if (draw_state != WL_LINE) | |
| 3746 { | |
| 3747 #ifdef FEAT_CMDWIN | |
| 3748 if (draw_state == WL_CMDLINE - 1 && n_extra == 0) | |
| 3749 { | |
| 3750 draw_state = WL_CMDLINE; | |
| 3751 if (cmdwin_type != 0 && wp == curwin) | |
| 3752 { | |
| 3753 /* Draw the cmdline character. */ | |
| 3754 n_extra = 1; | |
| 1340 | 3755 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
|
3756 char_attr = HL_ATTR(HLF_AT); |
| 7 | 3757 } |
| 3758 } | |
| 3759 #endif | |
| 3760 | |
| 3761 #ifdef FEAT_FOLDING | |
| 3762 if (draw_state == WL_FOLD - 1 && n_extra == 0) | |
| 3763 { | |
| 6553 | 3764 int fdc = compute_foldcolumn(wp, 0); |
| 3765 | |
| 7 | 3766 draw_state = WL_FOLD; |
| 6553 | 3767 if (fdc > 0) |
| 7 | 3768 { |
|
10466
34b50194f82d
commit https://github.com/vim/vim/commit/6270660611a151c5d0f614a5f0248ccdc80ed971
Christian Brabandt <cb@256bit.org>
parents:
10392
diff
changeset
|
3769 /* 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
|
3770 * already be in use. */ |
|
10690
206ab11fa76e
patch 8.0.0235: memory leak in diff mode
Christian Brabandt <cb@256bit.org>
parents:
10538
diff
changeset
|
3771 vim_free(p_extra_free); |
|
10466
34b50194f82d
commit https://github.com/vim/vim/commit/6270660611a151c5d0f614a5f0248ccdc80ed971
Christian Brabandt <cb@256bit.org>
parents:
10392
diff
changeset
|
3772 p_extra_free = alloc(12 + 1); |
|
34b50194f82d
commit https://github.com/vim/vim/commit/6270660611a151c5d0f614a5f0248ccdc80ed971
Christian Brabandt <cb@256bit.org>
parents:
10392
diff
changeset
|
3773 |
|
34b50194f82d
commit https://github.com/vim/vim/commit/6270660611a151c5d0f614a5f0248ccdc80ed971
Christian Brabandt <cb@256bit.org>
parents:
10392
diff
changeset
|
3774 if (p_extra_free != NULL) |
|
34b50194f82d
commit https://github.com/vim/vim/commit/6270660611a151c5d0f614a5f0248ccdc80ed971
Christian Brabandt <cb@256bit.org>
parents:
10392
diff
changeset
|
3775 { |
|
34b50194f82d
commit https://github.com/vim/vim/commit/6270660611a151c5d0f614a5f0248ccdc80ed971
Christian Brabandt <cb@256bit.org>
parents:
10392
diff
changeset
|
3776 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
|
3777 n_extra = fdc; |
|
34b50194f82d
commit https://github.com/vim/vim/commit/6270660611a151c5d0f614a5f0248ccdc80ed971
Christian Brabandt <cb@256bit.org>
parents:
10392
diff
changeset
|
3778 p_extra_free[n_extra] = NUL; |
|
34b50194f82d
commit https://github.com/vim/vim/commit/6270660611a151c5d0f614a5f0248ccdc80ed971
Christian Brabandt <cb@256bit.org>
parents:
10392
diff
changeset
|
3779 p_extra = p_extra_free; |
|
34b50194f82d
commit https://github.com/vim/vim/commit/6270660611a151c5d0f614a5f0248ccdc80ed971
Christian Brabandt <cb@256bit.org>
parents:
10392
diff
changeset
|
3780 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
|
3781 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
|
3782 } |
| 7 | 3783 } |
| 3784 } | |
| 3785 #endif | |
| 3786 | |
| 3787 #ifdef FEAT_SIGNS | |
| 3788 if (draw_state == WL_SIGN - 1 && n_extra == 0) | |
| 3789 { | |
| 3790 draw_state = WL_SIGN; | |
| 3791 /* Show the sign column when there are any signs in this | |
| 3792 * buffer or when using Netbeans. */ | |
|
9852
4eea48b76d03
commit https://github.com/vim/vim/commit/95ec9d6a6ab3117d60ff638670a803d43974ba51
Christian Brabandt <cb@256bit.org>
parents:
9848
diff
changeset
|
3793 if (signcolumn_on(wp)) |
| 7 | 3794 { |
| 2661 | 3795 int text_sign; |
| 7 | 3796 # ifdef FEAT_SIGN_ICONS |
| 2661 | 3797 int icon_sign; |
| 7 | 3798 # endif |
| 3799 | |
| 3800 /* Draw two cells with the sign value or blank. */ | |
| 3801 c_extra = ' '; | |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
3802 char_attr = HL_ATTR(HLF_SC); |
| 7 | 3803 n_extra = 2; |
| 3804 | |
| 5921 | 3805 if (row == startrow |
| 3806 #ifdef FEAT_DIFF | |
| 3807 + filler_lines && filler_todo <= 0 | |
| 3808 #endif | |
| 3809 ) | |
| 7 | 3810 { |
| 3811 text_sign = buf_getsigntype(wp->w_buffer, lnum, | |
| 3812 SIGN_TEXT); | |
| 3813 # ifdef FEAT_SIGN_ICONS | |
| 3814 icon_sign = buf_getsigntype(wp->w_buffer, lnum, | |
| 3815 SIGN_ICON); | |
| 3816 if (gui.in_use && icon_sign != 0) | |
| 3817 { | |
| 3818 /* Use the image in this position. */ | |
| 3819 c_extra = SIGN_BYTE; | |
| 3820 # ifdef FEAT_NETBEANS_INTG | |
| 3821 if (buf_signcount(wp->w_buffer, lnum) > 1) | |
| 3822 c_extra = MULTISIGN_BYTE; | |
| 3823 # endif | |
| 3824 char_attr = icon_sign; | |
| 3825 } | |
| 3826 else | |
| 3827 # endif | |
| 3828 if (text_sign != 0) | |
| 3829 { | |
| 3830 p_extra = sign_get_text(text_sign); | |
| 3831 if (p_extra != NULL) | |
| 3832 { | |
| 3833 c_extra = NUL; | |
| 835 | 3834 n_extra = (int)STRLEN(p_extra); |
| 7 | 3835 } |
| 3836 char_attr = sign_get_attr(text_sign, FALSE); | |
| 3837 } | |
| 3838 } | |
| 3839 } | |
| 3840 } | |
| 3841 #endif | |
| 3842 | |
| 3843 if (draw_state == WL_NR - 1 && n_extra == 0) | |
| 3844 { | |
| 3845 draw_state = WL_NR; | |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
3846 /* 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
|
3847 * 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
|
3848 if ((wp->w_p_nu || wp->w_p_rnu) |
| 7 | 3849 && (row == startrow |
| 3850 #ifdef FEAT_DIFF | |
| 3851 + filler_lines | |
| 3852 #endif | |
| 3853 || vim_strchr(p_cpo, CPO_NUMCOL) == NULL)) | |
| 3854 { | |
| 3855 /* Draw the line number (empty space after wrapping). */ | |
| 3856 if (row == startrow | |
| 3857 #ifdef FEAT_DIFF | |
| 3858 + filler_lines | |
| 3859 #endif | |
| 3860 ) | |
| 3861 { | |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
3862 long num; |
| 4065 | 3863 char *fmt = "%*ld "; |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
3864 |
|
4736
3f2319a953b3
updated for version 7.3.1115
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
3865 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
|
3866 /* 'number' + 'norelativenumber' */ |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
3867 num = (long)lnum; |
|
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
3868 else |
| 4065 | 3869 { |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
3870 /* 'relativenumber', don't use negative numbers */ |
| 2675 | 3871 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
|
3872 if (num == 0 && wp->w_p_nu && wp->w_p_rnu) |
| 4065 | 3873 { |
|
4736
3f2319a953b3
updated for version 7.3.1115
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
3874 /* 'number' + 'relativenumber' */ |
| 4065 | 3875 num = lnum; |
| 3876 fmt = "%-*ld "; | |
| 3877 } | |
| 3878 } | |
| 3879 | |
| 3880 sprintf((char *)extra, fmt, | |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
3881 number_width(wp), num); |
| 7 | 3882 if (wp->w_skipcol > 0) |
| 3883 for (p_extra = extra; *p_extra == ' '; ++p_extra) | |
| 3884 *p_extra = '-'; | |
| 3885 #ifdef FEAT_RIGHTLEFT | |
| 3886 if (wp->w_p_rl) /* reverse line numbers */ | |
| 3887 rl_mirror(extra); | |
| 3888 #endif | |
| 3889 p_extra = extra; | |
| 3890 c_extra = NUL; | |
| 3891 } | |
| 3892 else | |
| 3893 c_extra = ' '; | |
| 13 | 3894 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
|
3895 char_attr = HL_ATTR(HLF_N); |
| 743 | 3896 #ifdef FEAT_SYN_HL |
| 3897 /* When 'cursorline' is set highlight the line number of | |
| 3427 | 3898 * the current line differently. |
| 3899 * TODO: Can we use CursorLine instead of CursorLineNr | |
| 3900 * when CursorLineNr isn't set? */ | |
|
5078
22ac43fb6d30
updated for version 7.3.1282
Bram Moolenaar <bram@vim.org>
parents:
5068
diff
changeset
|
3901 if ((wp->w_p_cul || wp->w_p_rnu) |
| 4065 | 3902 && 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
|
3903 char_attr = HL_ATTR(HLF_CLN); |
| 743 | 3904 #endif |
| 7 | 3905 } |
| 3906 } | |
| 3907 | |
| 5995 | 3908 #ifdef FEAT_LINEBREAK |
| 3909 if (wp->w_p_brisbr && draw_state == WL_BRI - 1 | |
| 3910 && n_extra == 0 && *p_sbr != NUL) | |
| 3911 /* draw indent after showbreak value */ | |
| 3912 draw_state = WL_BRI; | |
| 3913 else if (wp->w_p_brisbr && draw_state == WL_SBR && n_extra == 0) | |
| 3914 /* After the showbreak, draw the breakindent */ | |
| 3915 draw_state = WL_BRI - 1; | |
| 3916 | |
| 3917 /* draw 'breakindent': indent wrapped text accordingly */ | |
| 3918 if (draw_state == WL_BRI - 1 && n_extra == 0) | |
| 3919 { | |
| 3920 draw_state = WL_BRI; | |
|
10392
957a1d560bda
commit https://github.com/vim/vim/commit/6c896867c4f5d759616028ef7cbfce2a9ed32600
Christian Brabandt <cb@256bit.org>
parents:
10349
diff
changeset
|
3921 /* 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
|
3922 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
|
3923 && (row != startrow || need_showbreak) |
| 5995 | 3924 # ifdef FEAT_DIFF |
| 3925 && filler_lines == 0 | |
| 6834 | 3926 # endif |
| 5995 | 3927 ) |
| 3928 { | |
|
10392
957a1d560bda
commit https://github.com/vim/vim/commit/6c896867c4f5d759616028ef7cbfce2a9ed32600
Christian Brabandt <cb@256bit.org>
parents:
10349
diff
changeset
|
3929 char_attr = 0; |
| 6834 | 3930 # ifdef FEAT_DIFF |
| 5995 | 3931 if (diff_hlf != (hlf_T)0) |
| 6106 | 3932 { |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
3933 char_attr = HL_ATTR(diff_hlf); |
| 6834 | 3934 # ifdef FEAT_SYN_HL |
| 6106 | 3935 if (wp->w_p_cul && lnum == wp->w_cursor.lnum) |
| 3936 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
|
3937 HL_ATTR(HLF_CUL)); |
| 6834 | 3938 # endif |
| 6106 | 3939 } |
| 6834 | 3940 # endif |
| 6028 | 3941 p_extra = NULL; |
| 5995 | 3942 c_extra = ' '; |
| 3943 n_extra = get_breakindent_win(wp, | |
| 3944 ml_get_buf(wp->w_buffer, lnum, FALSE)); | |
| 3945 /* Correct end of highlighted area for 'breakindent', | |
| 3946 * required when 'linebreak' is also set. */ | |
| 3947 if (tocol == vcol) | |
| 3948 tocol += n_extra; | |
| 3949 } | |
| 3950 } | |
| 3951 #endif | |
| 3952 | |
| 7 | 3953 #if defined(FEAT_LINEBREAK) || defined(FEAT_DIFF) |
| 3954 if (draw_state == WL_SBR - 1 && n_extra == 0) | |
| 3955 { | |
| 3956 draw_state = WL_SBR; | |
| 3957 # ifdef FEAT_DIFF | |
| 3958 if (filler_todo > 0) | |
| 3959 { | |
| 3960 /* Draw "deleted" diff line(s). */ | |
| 3961 if (char2cells(fill_diff) > 1) | |
| 3962 c_extra = '-'; | |
| 3963 else | |
| 3964 c_extra = fill_diff; | |
| 3965 # ifdef FEAT_RIGHTLEFT | |
| 3966 if (wp->w_p_rl) | |
| 3967 n_extra = col + 1; | |
| 3968 else | |
| 3969 # endif | |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
3970 n_extra = wp->w_width - col; |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
3971 char_attr = HL_ATTR(HLF_DED); |
| 7 | 3972 } |
| 3973 # endif | |
| 3974 # ifdef FEAT_LINEBREAK | |
| 3975 if (*p_sbr != NUL && need_showbreak) | |
| 3976 { | |
| 3977 /* Draw 'showbreak' at the start of each broken line. */ | |
| 3978 p_extra = p_sbr; | |
| 3979 c_extra = NUL; | |
| 3980 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
|
3981 char_attr = HL_ATTR(HLF_AT); |
| 7 | 3982 need_showbreak = FALSE; |
| 6503 | 3983 vcol_sbr = vcol + MB_CHARLEN(p_sbr); |
| 7 | 3984 /* Correct end of highlighted area for 'showbreak', |
| 3985 * required when 'linebreak' is also set. */ | |
| 3986 if (tocol == vcol) | |
| 3987 tocol += n_extra; | |
|
5068
6a7ae677d6a1
updated for version 7.3.1277
Bram Moolenaar <bram@vim.org>
parents:
4916
diff
changeset
|
3988 #ifdef FEAT_SYN_HL |
|
6a7ae677d6a1
updated for version 7.3.1277
Bram Moolenaar <bram@vim.org>
parents:
4916
diff
changeset
|
3989 /* combine 'showbreak' with 'cursorline' */ |
|
5078
22ac43fb6d30
updated for version 7.3.1282
Bram Moolenaar <bram@vim.org>
parents:
5068
diff
changeset
|
3990 if (wp->w_p_cul && lnum == wp->w_cursor.lnum) |
| 6106 | 3991 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
|
3992 HL_ATTR(HLF_CUL)); |
|
5068
6a7ae677d6a1
updated for version 7.3.1277
Bram Moolenaar <bram@vim.org>
parents:
4916
diff
changeset
|
3993 #endif |
| 7 | 3994 } |
| 3995 # endif | |
| 3996 } | |
| 3997 #endif | |
| 3998 | |
| 3999 if (draw_state == WL_LINE - 1 && n_extra == 0) | |
| 4000 { | |
| 4001 draw_state = WL_LINE; | |
| 4002 if (saved_n_extra) | |
| 4003 { | |
| 4004 /* Continue item from end of wrapped line. */ | |
| 4005 n_extra = saved_n_extra; | |
| 4006 c_extra = saved_c_extra; | |
| 4007 p_extra = saved_p_extra; | |
| 4008 char_attr = saved_char_attr; | |
| 4009 } | |
| 4010 else | |
| 4011 char_attr = 0; | |
| 4012 } | |
| 4013 } | |
| 4014 | |
| 4015 /* When still displaying '$' of change command, stop at cursor */ | |
| 3318 | 4016 if (dollar_vcol >= 0 && wp == curwin |
| 819 | 4017 && lnum == wp->w_cursor.lnum && vcol >= (long)wp->w_virtcol |
| 7 | 4018 #ifdef FEAT_DIFF |
| 4019 && filler_todo <= 0 | |
| 4020 #endif | |
| 4021 ) | |
| 4022 { | |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
4023 screen_line(screen_row, wp->w_wincol, col, -(int)wp->w_width, |
|
11672
3c6cc2f24645
patch 8.0.0719: build failure without +terminal feature
Christian Brabandt <cb@256bit.org>
parents:
11670
diff
changeset
|
4024 HAS_RIGHTLEFT(wp->w_p_rl)); |
| 819 | 4025 /* Pretend we have finished updating the window. Except when |
| 4026 * 'cursorcolumn' is set. */ | |
| 4027 #ifdef FEAT_SYN_HL | |
| 4028 if (wp->w_p_cuc) | |
| 4029 row = wp->w_cline_row + wp->w_cline_height; | |
| 4030 else | |
| 4031 #endif | |
| 4032 row = wp->w_height; | |
| 7 | 4033 break; |
| 4034 } | |
| 4035 | |
| 4036 if (draw_state == WL_LINE && area_highlighting) | |
| 4037 { | |
| 4038 /* handle Visual or match highlighting in this line */ | |
| 4039 if (vcol == fromcol | |
| 4040 #ifdef FEAT_MBYTE | |
| 4041 || (has_mbyte && vcol + 1 == fromcol && n_extra == 0 | |
| 4042 && (*mb_ptr2cells)(ptr) > 1) | |
| 4043 #endif | |
| 4044 || ((int)vcol_prev == fromcol_prev | |
| 1814 | 4045 && vcol_prev < vcol /* not at margin */ |
| 7 | 4046 && vcol < tocol)) |
| 4047 area_attr = attr; /* start highlighting */ | |
| 4048 else if (area_attr != 0 | |
| 4049 && (vcol == tocol | |
| 4050 || (noinvcur && (colnr_T)vcol == wp->w_virtcol))) | |
| 4051 area_attr = 0; /* stop highlighting */ | |
| 4052 | |
| 4053 #ifdef FEAT_SEARCH_EXTRA | |
| 4054 if (!n_extra) | |
| 4055 { | |
| 4056 /* | |
| 4057 * Check for start/end of search pattern match. | |
| 4058 * After end, check for start/end of next match. | |
| 4059 * When another match, have to check for start again. | |
| 4060 * Watch out for matching an empty string! | |
| 1326 | 4061 * Do this for 'search_hl' and the match list (ordered by |
| 4062 * priority). | |
| 7 | 4063 */ |
| 36 | 4064 v = (long)(ptr - line); |
| 1326 | 4065 cur = wp->w_match_head; |
| 4066 shl_flag = FALSE; | |
| 4067 while (cur != NULL || shl_flag == FALSE) | |
| 4068 { | |
| 4069 if (shl_flag == FALSE | |
| 4070 && ((cur != NULL | |
| 4071 && cur->priority > SEARCH_HL_PRIORITY) | |
| 4072 || cur == NULL)) | |
| 4073 { | |
| 4074 shl = &search_hl; | |
| 4075 shl_flag = TRUE; | |
| 4076 } | |
| 4077 else | |
| 4078 shl = &cur->hl; | |
| 5979 | 4079 if (cur != NULL) |
| 4080 cur->pos.cur = 0; | |
| 4081 pos_inprogress = TRUE; | |
| 4082 while (shl->rm.regprog != NULL | |
| 4083 || (cur != NULL && pos_inprogress)) | |
| 7 | 4084 { |
| 36 | 4085 if (shl->startcol != MAXCOL |
| 4086 && v >= (long)shl->startcol | |
| 4087 && v < (long)shl->endcol) | |
| 7 | 4088 { |
| 6430 | 4089 #ifdef FEAT_MBYTE |
| 4090 int tmp_col = v + MB_PTR2LEN(ptr); | |
| 4091 | |
| 4092 if (shl->endcol < tmp_col) | |
| 4093 shl->endcol = tmp_col; | |
| 4094 #endif | |
| 7 | 4095 shl->attr_cur = shl->attr; |
| 6947 | 4096 #ifdef FEAT_CONCEAL |
| 4097 if (cur != NULL && syn_name2id((char_u *)"Conceal") | |
| 4098 == cur->hlg_id) | |
| 4099 { | |
|
8907
5deb9e8f4292
commit https://github.com/vim/vim/commit/4d585022023b96f6507e8cae5ed8fc8d926f5140
Christian Brabandt <cb@256bit.org>
parents:
8872
diff
changeset
|
4100 has_match_conc = |
|
5deb9e8f4292
commit https://github.com/vim/vim/commit/4d585022023b96f6507e8cae5ed8fc8d926f5140
Christian Brabandt <cb@256bit.org>
parents:
8872
diff
changeset
|
4101 v == (long)shl->startcol ? 2 : 1; |
| 6947 | 4102 match_conc = cur->conceal_char; |
| 4103 } | |
| 4104 else | |
|
8907
5deb9e8f4292
commit https://github.com/vim/vim/commit/4d585022023b96f6507e8cae5ed8fc8d926f5140
Christian Brabandt <cb@256bit.org>
parents:
8872
diff
changeset
|
4105 has_match_conc = match_conc = 0; |
| 6947 | 4106 #endif |
| 7 | 4107 } |
| 6430 | 4108 else if (v == (long)shl->endcol) |
| 7 | 4109 { |
| 4110 shl->attr_cur = 0; | |
|
9992
3e3b0ce24b61
commit https://github.com/vim/vim/commit/e17bdffff78ebd6a4e3cff26754cc667557ea810
Christian Brabandt <cb@256bit.org>
parents:
9939
diff
changeset
|
4111 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
|
4112 shl == &search_hl ? NULL : cur); |
| 5979 | 4113 pos_inprogress = cur == NULL || cur->pos.cur == 0 |
| 6947 | 4114 ? FALSE : TRUE; |
| 7 | 4115 |
| 4116 /* Need to get the line again, a multi-line regexp | |
| 4117 * may have made it invalid. */ | |
| 4118 line = ml_get_buf(wp->w_buffer, lnum, FALSE); | |
| 4119 ptr = line + v; | |
| 4120 | |
| 4121 if (shl->lnum == lnum) | |
| 4122 { | |
| 36 | 4123 shl->startcol = shl->rm.startpos[0].col; |
| 7 | 4124 if (shl->rm.endpos[0].lnum == 0) |
| 36 | 4125 shl->endcol = shl->rm.endpos[0].col; |
| 7 | 4126 else |
| 36 | 4127 shl->endcol = MAXCOL; |
| 4128 | |
| 4129 if (shl->startcol == shl->endcol) | |
| 7 | 4130 { |
| 4131 /* highlight empty match, try again after | |
| 4132 * it */ | |
| 4133 #ifdef FEAT_MBYTE | |
| 4134 if (has_mbyte) | |
| 474 | 4135 shl->endcol += (*mb_ptr2len)(line |
| 36 | 4136 + shl->endcol); |
| 7 | 4137 else |
| 4138 #endif | |
| 36 | 4139 ++shl->endcol; |
| 7 | 4140 } |
| 4141 | |
| 4142 /* Loop to check if the match starts at the | |
| 4143 * current position */ | |
| 4144 continue; | |
| 4145 } | |
| 4146 } | |
| 4147 break; | |
| 4148 } | |
| 1326 | 4149 if (shl != &search_hl && cur != NULL) |
| 4150 cur = cur->next; | |
| 4151 } | |
| 4152 | |
| 4153 /* Use attributes from match with highest priority among | |
| 4154 * 'search_hl' and the match list. */ | |
| 4155 search_attr = search_hl.attr_cur; | |
| 4156 cur = wp->w_match_head; | |
| 4157 shl_flag = FALSE; | |
| 4158 while (cur != NULL || shl_flag == FALSE) | |
| 4159 { | |
| 4160 if (shl_flag == FALSE | |
| 4161 && ((cur != NULL | |
| 4162 && cur->priority > SEARCH_HL_PRIORITY) | |
| 4163 || cur == NULL)) | |
| 699 | 4164 { |
| 1326 | 4165 shl = &search_hl; |
| 4166 shl_flag = TRUE; | |
| 699 | 4167 } |
| 1326 | 4168 else |
| 4169 shl = &cur->hl; | |
| 4170 if (shl->attr_cur != 0) | |
| 4171 search_attr = shl->attr_cur; | |
| 4172 if (shl != &search_hl && cur != NULL) | |
| 4173 cur = cur->next; | |
| 4174 } | |
|
12580
ba55861aa52c
patch 8.0.1168: wrong highlighting with combination of match and 'cursorline'
Christian Brabandt <cb@256bit.org>
parents:
12529
diff
changeset
|
4175 /* Only highlight one character after the last column. */ |
|
12582
97f0c74976c6
patch 8.0.1169: highlignting one char too many with 'list' and 'cul'
Christian Brabandt <cb@256bit.org>
parents:
12580
diff
changeset
|
4176 if (*ptr == NUL && (did_line_attr >= 1 |
|
97f0c74976c6
patch 8.0.1169: highlignting one char too many with 'list' and 'cul'
Christian Brabandt <cb@256bit.org>
parents:
12580
diff
changeset
|
4177 || (wp->w_p_list && lcs_eol_one == -1))) |
|
12580
ba55861aa52c
patch 8.0.1168: wrong highlighting with combination of match and 'cursorline'
Christian Brabandt <cb@256bit.org>
parents:
12529
diff
changeset
|
4178 search_attr = 0; |
| 7 | 4179 } |
| 4180 #endif | |
| 4181 | |
| 4182 #ifdef FEAT_DIFF | |
| 674 | 4183 if (diff_hlf != (hlf_T)0) |
| 7 | 4184 { |
| 1295 | 4185 if (diff_hlf == HLF_CHD && ptr - line >= change_start |
| 4186 && n_extra == 0) | |
| 7 | 4187 diff_hlf = HLF_TXD; /* changed text */ |
| 1295 | 4188 if (diff_hlf == HLF_TXD && ptr - line > change_end |
| 4189 && n_extra == 0) | |
| 7 | 4190 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
|
4191 line_attr = HL_ATTR(diff_hlf); |
| 6106 | 4192 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
|
4193 line_attr = hl_combine_attr(line_attr, HL_ATTR(HLF_CUL)); |
| 674 | 4194 } |
| 4195 #endif | |
| 4196 | |
| 4197 /* Decide which of the highlight attributes to use. */ | |
| 4198 attr_pri = TRUE; | |
| 6717 | 4199 #ifdef LINE_ATTR |
| 674 | 4200 if (area_attr != 0) |
| 6717 | 4201 char_attr = hl_combine_attr(line_attr, area_attr); |
| 674 | 4202 else if (search_attr != 0) |
| 6717 | 4203 char_attr = hl_combine_attr(line_attr, search_attr); |
| 674 | 4204 /* Use line_attr when not in the Visual or 'incsearch' area |
| 4205 * (area_attr may be 0 when "noinvcur" is set). */ | |
| 4206 else if (line_attr != 0 && ((fromcol == -10 && tocol == MAXCOL) | |
| 1842 | 4207 || vcol < fromcol || vcol_prev < fromcol_prev |
| 4208 || vcol >= tocol)) | |
| 674 | 4209 char_attr = line_attr; |
| 6717 | 4210 #else |
| 4211 if (area_attr != 0) | |
| 4212 char_attr = area_attr; | |
| 4213 else if (search_attr != 0) | |
| 4214 char_attr = search_attr; | |
| 674 | 4215 #endif |
| 4216 else | |
| 4217 { | |
| 4218 attr_pri = FALSE; | |
| 4219 #ifdef FEAT_SYN_HL | |
| 4220 if (has_syntax) | |
| 4221 char_attr = syntax_attr; | |
| 4222 else | |
| 4223 #endif | |
| 4224 char_attr = 0; | |
| 4225 } | |
| 7 | 4226 } |
| 4227 | |
| 4228 /* | |
| 4229 * Get the next character to put on the screen. | |
| 4230 */ | |
| 4231 /* | |
| 1340 | 4232 * The "p_extra" points to the extra stuff that is inserted to |
| 4233 * represent special characters (non-printable stuff) and other | |
| 4234 * things. When all characters are the same, c_extra is used. | |
| 4235 * "p_extra" must end in a NUL to avoid mb_ptr2len() reads past | |
| 4236 * "p_extra[n_extra]". | |
| 7 | 4237 * For the '$' of the 'list' option, n_extra == 1, p_extra == "". |
| 4238 */ | |
| 4239 if (n_extra > 0) | |
| 4240 { | |
| 4241 if (c_extra != NUL) | |
| 4242 { | |
| 4243 c = c_extra; | |
| 4244 #ifdef FEAT_MBYTE | |
| 4245 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
|
4246 if (enc_utf8 && utf_char2len(c) > 1) |
| 7 | 4247 { |
| 4248 mb_utf8 = TRUE; | |
| 714 | 4249 u8cc[0] = 0; |
| 819 | 4250 c = 0xc0; |
| 7 | 4251 } |
| 4252 else | |
| 4253 mb_utf8 = FALSE; | |
| 4254 #endif | |
| 4255 } | |
| 4256 else | |
| 4257 { | |
| 4258 c = *p_extra; | |
| 4259 #ifdef FEAT_MBYTE | |
| 4260 if (has_mbyte) | |
| 4261 { | |
| 4262 mb_c = c; | |
| 4263 if (enc_utf8) | |
| 4264 { | |
| 4265 /* If the UTF-8 character is more than one byte: | |
| 4266 * 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
|
4267 mb_l = utfc_ptr2len(p_extra); |
| 7 | 4268 mb_utf8 = FALSE; |
| 4269 if (mb_l > n_extra) | |
| 4270 mb_l = 1; | |
| 4271 else if (mb_l > 1) | |
| 4272 { | |
| 714 | 4273 mb_c = utfc_ptr2char(p_extra, u8cc); |
| 7 | 4274 mb_utf8 = TRUE; |
| 819 | 4275 c = 0xc0; |
| 7 | 4276 } |
| 4277 } | |
| 4278 else | |
| 4279 { | |
| 4280 /* if this is a DBCS character, put it in "mb_c" */ | |
| 4281 mb_l = MB_BYTE2LEN(c); | |
| 4282 if (mb_l >= n_extra) | |
| 4283 mb_l = 1; | |
| 4284 else if (mb_l > 1) | |
| 4285 mb_c = (c << 8) + p_extra[1]; | |
| 4286 } | |
| 504 | 4287 if (mb_l == 0) /* at the NUL at end-of-line */ |
| 4288 mb_l = 1; | |
| 4289 | |
| 7 | 4290 /* If a double-width char doesn't fit display a '>' in the |
| 4291 * last column. */ | |
| 504 | 4292 if (( |
| 7 | 4293 # ifdef FEAT_RIGHTLEFT |
| 4294 wp->w_p_rl ? (col <= 0) : | |
| 4295 # endif | |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
4296 (col >= wp->w_width - 1)) |
| 7 | 4297 && (*mb_char2cells)(mb_c) == 2) |
| 4298 { | |
| 4299 c = '>'; | |
| 4300 mb_c = c; | |
| 4301 mb_l = 1; | |
| 4302 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
|
4303 multi_attr = HL_ATTR(HLF_AT); |
| 7 | 4304 /* put the pointer back to output the double-width |
| 4305 * character at the start of the next line. */ | |
| 4306 ++n_extra; | |
| 4307 --p_extra; | |
| 4308 } | |
| 4309 else | |
| 4310 { | |
| 4311 n_extra -= mb_l - 1; | |
| 4312 p_extra += mb_l - 1; | |
| 4313 } | |
| 4314 } | |
| 4315 #endif | |
| 4316 ++p_extra; | |
| 4317 } | |
| 4318 --n_extra; | |
| 4319 } | |
| 4320 else | |
| 4321 { | |
|
10986
62bcadce6c82
patch 8.0.0382: warning in tiny build for unused variable
Christian Brabandt <cb@256bit.org>
parents:
10982
diff
changeset
|
4322 #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
|
4323 int c0; |
|
10986
62bcadce6c82
patch 8.0.0382: warning in tiny build for unused variable
Christian Brabandt <cb@256bit.org>
parents:
10982
diff
changeset
|
4324 #endif |
|
10982
5e20c9f96cd5
patch 8.0.0380: with 'linebreak' double wide char wraps badly
Christian Brabandt <cb@256bit.org>
parents:
10928
diff
changeset
|
4325 |
| 6026 | 4326 if (p_extra_free != NULL) |
| 4327 { | |
| 4328 vim_free(p_extra_free); | |
| 4329 p_extra_free = NULL; | |
| 4330 } | |
| 7 | 4331 /* |
| 4332 * Get a character from the line itself. | |
| 4333 */ | |
|
10988
b5de553d6062
patch 8.0.0383: misplaced #ifdef
Christian Brabandt <cb@256bit.org>
parents:
10986
diff
changeset
|
4334 c = *ptr; |
|
10986
62bcadce6c82
patch 8.0.0382: warning in tiny build for unused variable
Christian Brabandt <cb@256bit.org>
parents:
10982
diff
changeset
|
4335 #ifdef FEAT_LINEBREAK |
|
10988
b5de553d6062
patch 8.0.0383: misplaced #ifdef
Christian Brabandt <cb@256bit.org>
parents:
10986
diff
changeset
|
4336 c0 = *ptr; |
|
10986
62bcadce6c82
patch 8.0.0382: warning in tiny build for unused variable
Christian Brabandt <cb@256bit.org>
parents:
10982
diff
changeset
|
4337 #endif |
| 7 | 4338 #ifdef FEAT_MBYTE |
| 4339 if (has_mbyte) | |
| 4340 { | |
| 4341 mb_c = c; | |
| 4342 if (enc_utf8) | |
| 4343 { | |
| 4344 /* If the UTF-8 character is more than one byte: Decode it | |
| 4345 * 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
|
4346 mb_l = utfc_ptr2len(ptr); |
| 7 | 4347 mb_utf8 = FALSE; |
| 4348 if (mb_l > 1) | |
| 4349 { | |
| 714 | 4350 mb_c = utfc_ptr2char(ptr, u8cc); |
| 7 | 4351 /* Overlong encoded ASCII or ASCII with composing char |
| 4352 * is displayed normally, except a NUL. */ | |
| 4353 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
|
4354 { |
|
62bcadce6c82
patch 8.0.0382: warning in tiny build for unused variable
Christian Brabandt <cb@256bit.org>
parents:
10982
diff
changeset
|
4355 c = mb_c; |
|
62bcadce6c82
patch 8.0.0382: warning in tiny build for unused variable
Christian Brabandt <cb@256bit.org>
parents:
10982
diff
changeset
|
4356 # ifdef FEAT_LINEBREAK |
|
62bcadce6c82
patch 8.0.0382: warning in tiny build for unused variable
Christian Brabandt <cb@256bit.org>
parents:
10982
diff
changeset
|
4357 c0 = mb_c; |
|
62bcadce6c82
patch 8.0.0382: warning in tiny build for unused variable
Christian Brabandt <cb@256bit.org>
parents:
10982
diff
changeset
|
4358 # endif |
|
62bcadce6c82
patch 8.0.0382: warning in tiny build for unused variable
Christian Brabandt <cb@256bit.org>
parents:
10982
diff
changeset
|
4359 } |
| 7 | 4360 mb_utf8 = TRUE; |
| 507 | 4361 |
| 4362 /* At start of the line we can have a composing char. | |
| 4363 * Draw it as a space with a composing char. */ | |
| 4364 if (utf_iscomposing(mb_c)) | |
| 4365 { | |
| 1326 | 4366 int i; |
| 4367 | |
| 714 | 4368 for (i = Screen_mco - 1; i > 0; --i) |
| 4369 u8cc[i] = u8cc[i - 1]; | |
| 4370 u8cc[0] = mb_c; | |
| 507 | 4371 mb_c = ' '; |
| 4372 } | |
| 7 | 4373 } |
| 4374 | |
| 4375 if ((mb_l == 1 && c >= 0x80) | |
| 4376 || (mb_l >= 1 && mb_c == 0) | |
| 4377 || (mb_l > 1 && (!vim_isprintc(mb_c) | |
| 1401 | 4378 # ifdef UNICODE16 |
| 4379 || mb_c >= 0x10000 | |
| 4380 # endif | |
| 4381 ))) | |
| 7 | 4382 { |
| 4383 /* | |
| 4384 * Illegal UTF-8 byte: display as <xx>. | |
| 4385 * Non-BMP character : display as ? or fullwidth ?. | |
| 4386 */ | |
| 1401 | 4387 # ifdef UNICODE16 |
| 7 | 4388 if (mb_c < 0x10000) |
| 1401 | 4389 # endif |
| 7 | 4390 { |
| 4391 transchar_hex(extra, mb_c); | |
| 714 | 4392 # ifdef FEAT_RIGHTLEFT |
| 7 | 4393 if (wp->w_p_rl) /* reverse */ |
| 4394 rl_mirror(extra); | |
| 714 | 4395 # endif |
| 7 | 4396 } |
| 1401 | 4397 # ifdef UNICODE16 |
| 7 | 4398 else if (utf_char2cells(mb_c) != 2) |
| 4399 STRCPY(extra, "?"); | |
| 4400 else | |
| 4401 /* 0xff1f in UTF-8: full-width '?' */ | |
| 4402 STRCPY(extra, "\357\274\237"); | |
| 1401 | 4403 # endif |
| 7 | 4404 |
| 4405 p_extra = extra; | |
| 4406 c = *p_extra; | |
| 4407 mb_c = mb_ptr2char_adv(&p_extra); | |
| 4408 mb_utf8 = (c >= 0x80); | |
| 4409 n_extra = (int)STRLEN(p_extra); | |
| 4410 c_extra = NUL; | |
| 4411 if (area_attr == 0 && search_attr == 0) | |
| 4412 { | |
| 4413 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
|
4414 extra_attr = HL_ATTR(HLF_8); |
| 7 | 4415 saved_attr2 = char_attr; /* save current attr */ |
| 4416 } | |
| 4417 } | |
| 4418 else if (mb_l == 0) /* at the NUL at end-of-line */ | |
| 4419 mb_l = 1; | |
| 4420 #ifdef FEAT_ARABIC | |
| 4421 else if (p_arshape && !p_tbidi && ARABIC_CHAR(mb_c)) | |
| 4422 { | |
| 4423 /* Do Arabic shaping. */ | |
| 714 | 4424 int pc, pc1, nc; |
| 4425 int pcc[MAX_MCO]; | |
| 7 | 4426 |
| 4427 /* The idea of what is the previous and next | |
| 4428 * character depends on 'rightleft'. */ | |
| 4429 if (wp->w_p_rl) | |
| 4430 { | |
| 4431 pc = prev_c; | |
| 4432 pc1 = prev_c1; | |
| 4433 nc = utf_ptr2char(ptr + mb_l); | |
| 714 | 4434 prev_c1 = u8cc[0]; |
| 7 | 4435 } |
| 4436 else | |
| 4437 { | |
| 714 | 4438 pc = utfc_ptr2char(ptr + mb_l, pcc); |
| 7 | 4439 nc = prev_c; |
| 714 | 4440 pc1 = pcc[0]; |
| 7 | 4441 } |
| 4442 prev_c = mb_c; | |
| 4443 | |
| 714 | 4444 mb_c = arabic_shape(mb_c, &c, &u8cc[0], pc, pc1, nc); |
| 7 | 4445 } |
| 4446 else | |
| 4447 prev_c = mb_c; | |
| 4448 #endif | |
| 4449 } | |
| 4450 else /* enc_dbcs */ | |
| 4451 { | |
| 4452 mb_l = MB_BYTE2LEN(c); | |
| 4453 if (mb_l == 0) /* at the NUL at end-of-line */ | |
| 4454 mb_l = 1; | |
| 4455 else if (mb_l > 1) | |
| 4456 { | |
| 4457 /* We assume a second byte below 32 is illegal. | |
| 4458 * Hopefully this is OK for all double-byte encodings! | |
| 4459 */ | |
| 4460 if (ptr[1] >= 32) | |
| 4461 mb_c = (c << 8) + ptr[1]; | |
| 4462 else | |
| 4463 { | |
| 4464 if (ptr[1] == NUL) | |
| 4465 { | |
| 4466 /* head byte at end of line */ | |
| 4467 mb_l = 1; | |
| 4468 transchar_nonprint(extra, c); | |
| 4469 } | |
| 4470 else | |
| 4471 { | |
| 4472 /* illegal tail byte */ | |
| 4473 mb_l = 2; | |
| 4474 STRCPY(extra, "XX"); | |
| 4475 } | |
| 4476 p_extra = extra; | |
| 4477 n_extra = (int)STRLEN(extra) - 1; | |
| 4478 c_extra = NUL; | |
| 4479 c = *p_extra++; | |
| 4480 if (area_attr == 0 && search_attr == 0) | |
| 4481 { | |
| 4482 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
|
4483 extra_attr = HL_ATTR(HLF_8); |
| 7 | 4484 saved_attr2 = char_attr; /* save current attr */ |
| 4485 } | |
| 4486 mb_c = c; | |
| 4487 } | |
| 4488 } | |
| 4489 } | |
| 4490 /* If a double-width char doesn't fit display a '>' in the | |
| 4491 * last column; the character is displayed at the start of the | |
| 4492 * next line. */ | |
| 4493 if (( | |
| 4494 # ifdef FEAT_RIGHTLEFT | |
| 4495 wp->w_p_rl ? (col <= 0) : | |
| 4496 # endif | |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
4497 (col >= wp->w_width - 1)) |
| 7 | 4498 && (*mb_char2cells)(mb_c) == 2) |
| 4499 { | |
| 4500 c = '>'; | |
| 4501 mb_c = c; | |
| 4502 mb_utf8 = FALSE; | |
| 4503 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
|
4504 multi_attr = HL_ATTR(HLF_AT); |
| 7 | 4505 /* Put pointer back so that the character will be |
| 4506 * displayed at the start of the next line. */ | |
| 4507 --ptr; | |
| 4508 } | |
| 4509 else if (*ptr != NUL) | |
| 4510 ptr += mb_l - 1; | |
| 4511 | |
| 4512 /* 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
|
4513 * a '<' in the first column. Don't do this for unprintable |
| 4352 | 4514 * 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
|
4515 if (n_skip > 0 && mb_l > 1 && n_extra == 0) |
| 7 | 4516 { |
| 4517 n_extra = 1; | |
| 3586 | 4518 c_extra = MB_FILLER_CHAR; |
| 7 | 4519 c = ' '; |
| 4520 if (area_attr == 0 && search_attr == 0) | |
| 4521 { | |
| 4522 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
|
4523 extra_attr = HL_ATTR(HLF_AT); |
| 7 | 4524 saved_attr2 = char_attr; /* save current attr */ |
| 4525 } | |
| 4526 mb_c = c; | |
| 4527 mb_utf8 = FALSE; | |
| 4528 mb_l = 1; | |
| 4529 } | |
| 4530 | |
| 4531 } | |
| 4532 #endif | |
| 4533 ++ptr; | |
| 4534 | |
| 4535 if (extra_check) | |
| 4536 { | |
| 743 | 4537 #ifdef FEAT_SPELL |
| 221 | 4538 int can_spell = TRUE; |
| 743 | 4539 #endif |
| 4540 | |
|
11836
f080b225a2a4
patch 8.0.0798: no highlighting in a terminal window with a finished job
Christian Brabandt <cb@256bit.org>
parents:
11834
diff
changeset
|
4541 #ifdef FEAT_TERMINAL |
|
f080b225a2a4
patch 8.0.0798: no highlighting in a terminal window with a finished job
Christian Brabandt <cb@256bit.org>
parents:
11834
diff
changeset
|
4542 if (get_term_attr) |
|
f080b225a2a4
patch 8.0.0798: no highlighting in a terminal window with a finished job
Christian Brabandt <cb@256bit.org>
parents:
11834
diff
changeset
|
4543 { |
|
11864
97eb443fee5d
patch 8.0.0812: terminal window colors shift when 'number' is set
Christian Brabandt <cb@256bit.org>
parents:
11836
diff
changeset
|
4544 syntax_attr = term_get_attr(wp->w_buffer, lnum, vcol); |
|
11836
f080b225a2a4
patch 8.0.0798: no highlighting in a terminal window with a finished job
Christian Brabandt <cb@256bit.org>
parents:
11834
diff
changeset
|
4545 |
|
f080b225a2a4
patch 8.0.0798: no highlighting in a terminal window with a finished job
Christian Brabandt <cb@256bit.org>
parents:
11834
diff
changeset
|
4546 if (!attr_pri) |
|
f080b225a2a4
patch 8.0.0798: no highlighting in a terminal window with a finished job
Christian Brabandt <cb@256bit.org>
parents:
11834
diff
changeset
|
4547 char_attr = syntax_attr; |
|
f080b225a2a4
patch 8.0.0798: no highlighting in a terminal window with a finished job
Christian Brabandt <cb@256bit.org>
parents:
11834
diff
changeset
|
4548 else |
|
f080b225a2a4
patch 8.0.0798: no highlighting in a terminal window with a finished job
Christian Brabandt <cb@256bit.org>
parents:
11834
diff
changeset
|
4549 char_attr = hl_combine_attr(syntax_attr, char_attr); |
|
f080b225a2a4
patch 8.0.0798: no highlighting in a terminal window with a finished job
Christian Brabandt <cb@256bit.org>
parents:
11834
diff
changeset
|
4550 } |
|
f080b225a2a4
patch 8.0.0798: no highlighting in a terminal window with a finished job
Christian Brabandt <cb@256bit.org>
parents:
11834
diff
changeset
|
4551 #endif |
|
f080b225a2a4
patch 8.0.0798: no highlighting in a terminal window with a finished job
Christian Brabandt <cb@256bit.org>
parents:
11834
diff
changeset
|
4552 |
| 743 | 4553 #ifdef FEAT_SYN_HL |
| 7 | 4554 /* Get syntax attribute, unless still at the start of the line |
| 4555 * (double-wide char that doesn't fit). */ | |
| 221 | 4556 v = (long)(ptr - line); |
| 4557 if (has_syntax && v > 0) | |
| 7 | 4558 { |
| 4559 /* Get the syntax attribute for the character. If there | |
| 4560 * is an error, disable syntax highlighting. */ | |
| 4561 save_did_emsg = did_emsg; | |
| 4562 did_emsg = FALSE; | |
| 4563 | |
| 221 | 4564 syntax_attr = get_syntax_attr((colnr_T)v - 1, |
| 743 | 4565 # ifdef FEAT_SPELL |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
4566 has_spell ? &can_spell : |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
4567 # endif |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
4568 NULL, FALSE); |
| 7 | 4569 |
| 4570 if (did_emsg) | |
| 482 | 4571 { |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
4572 wp->w_s->b_syn_error = TRUE; |
| 482 | 4573 has_syntax = FALSE; |
| 4574 } | |
| 7 | 4575 else |
| 4576 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
|
4577 #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
|
4578 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
|
4579 has_syntax = FALSE; |
|
998d2cf59caa
patch 8.0.0647: syntax highlighting can make cause a freeze
Christian Brabandt <cb@256bit.org>
parents:
11521
diff
changeset
|
4580 #endif |
| 7 | 4581 |
| 4582 /* Need to get the line again, a multi-line regexp may | |
| 4583 * have made it invalid. */ | |
| 4584 line = ml_get_buf(wp->w_buffer, lnum, FALSE); | |
| 4585 ptr = line + v; | |
| 4586 | |
| 674 | 4587 if (!attr_pri) |
| 7 | 4588 char_attr = syntax_attr; |
| 301 | 4589 else |
| 303 | 4590 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
|
4591 # 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
|
4592 /* 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
|
4593 * 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
|
4594 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
|
4595 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
|
4596 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
|
4597 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
|
4598 # endif |
| 7 | 4599 } |
| 743 | 4600 #endif |
| 4601 | |
| 4602 #ifdef FEAT_SPELL | |
| 301 | 4603 /* Check spelling (unless at the end of the line). |
| 319 | 4604 * Only do this when there is no syntax highlighting, the |
| 4605 * @Spell cluster is not used or the current syntax item | |
| 4606 * contains the @Spell cluster. */ | |
| 348 | 4607 if (has_spell && v >= word_end && v > cur_checked_col) |
| 221 | 4608 { |
| 230 | 4609 spell_attr = 0; |
| 743 | 4610 # ifdef FEAT_SYN_HL |
| 674 | 4611 if (!attr_pri) |
| 230 | 4612 char_attr = syntax_attr; |
| 743 | 4613 # endif |
| 4614 if (c != 0 && ( | |
| 4615 # ifdef FEAT_SYN_HL | |
| 4616 !has_syntax || | |
| 4617 # endif | |
| 4618 can_spell)) | |
| 221 | 4619 { |
| 348 | 4620 char_u *prev_ptr, *p; |
| 4621 int len; | |
| 534 | 4622 hlf_T spell_hlf = HLF_COUNT; |
| 221 | 4623 # ifdef FEAT_MBYTE |
| 336 | 4624 if (has_mbyte) |
| 4625 { | |
| 4626 prev_ptr = ptr - mb_l; | |
| 4627 v -= mb_l - 1; | |
| 4628 } | |
| 4629 else | |
| 221 | 4630 # endif |
| 336 | 4631 prev_ptr = ptr - 1; |
| 348 | 4632 |
| 4633 /* Use nextline[] if possible, it has the start of the | |
| 4634 * next line concatenated. */ | |
| 4635 if ((prev_ptr - line) - nextlinecol >= 0) | |
| 4636 p = nextline + (prev_ptr - line) - nextlinecol; | |
| 4637 else | |
| 4638 p = prev_ptr; | |
| 835 | 4639 cap_col -= (int)(prev_ptr - line); |
| 625 | 4640 len = spell_check(wp, p, &spell_hlf, &cap_col, |
| 4641 nochange); | |
| 348 | 4642 word_end = v + len; |
| 301 | 4643 |
| 4644 /* In Insert mode only highlight a word that | |
| 4645 * doesn't touch the cursor. */ | |
| 534 | 4646 if (spell_hlf != HLF_COUNT |
| 301 | 4647 && (State & INSERT) != 0 |
| 4648 && wp->w_cursor.lnum == lnum | |
| 4649 && wp->w_cursor.col >= | |
| 4650 (colnr_T)(prev_ptr - line) | |
| 4651 && wp->w_cursor.col < (colnr_T)word_end) | |
| 221 | 4652 { |
| 534 | 4653 spell_hlf = HLF_COUNT; |
| 301 | 4654 spell_redraw_lnum = lnum; |
| 221 | 4655 } |
| 348 | 4656 |
| 534 | 4657 if (spell_hlf == HLF_COUNT && p != prev_ptr |
| 348 | 4658 && (p - nextline) + len > nextline_idx) |
| 4659 { | |
| 4660 /* Remember that the good word continues at the | |
| 4661 * start of the next line. */ | |
| 4662 checked_lnum = lnum + 1; | |
| 835 | 4663 checked_col = (int)((p - nextline) + len - nextline_idx); |
| 348 | 4664 } |
| 386 | 4665 |
| 534 | 4666 /* Turn index into actual attributes. */ |
| 4667 if (spell_hlf != HLF_COUNT) | |
| 4668 spell_attr = highlight_attr[spell_hlf]; | |
| 4669 | |
| 386 | 4670 if (cap_col > 0) |
| 4671 { | |
| 4672 if (p != prev_ptr | |
| 4673 && (p - nextline) + cap_col >= nextline_idx) | |
| 4674 { | |
| 4675 /* Remember that the word in the next line | |
| 4676 * must start with a capital. */ | |
| 4677 capcol_lnum = lnum + 1; | |
| 835 | 4678 cap_col = (int)((p - nextline) + cap_col |
| 4679 - nextline_idx); | |
| 386 | 4680 } |
| 4681 else | |
| 4682 /* Compute the actual column. */ | |
| 835 | 4683 cap_col += (int)(prev_ptr - line); |
| 386 | 4684 } |
| 221 | 4685 } |
| 4686 } | |
| 4687 if (spell_attr != 0) | |
| 348 | 4688 { |
| 674 | 4689 if (!attr_pri) |
| 348 | 4690 char_attr = hl_combine_attr(char_attr, spell_attr); |
| 4691 else | |
| 4692 char_attr = hl_combine_attr(spell_attr, char_attr); | |
| 4693 } | |
| 7 | 4694 #endif |
| 4695 #ifdef FEAT_LINEBREAK | |
| 4696 /* | |
| 221 | 4697 * Found last space before word: check for line break. |
| 7 | 4698 */ |
|
10982
5e20c9f96cd5
patch 8.0.0380: with 'linebreak' double wide char wraps badly
Christian Brabandt <cb@256bit.org>
parents:
10928
diff
changeset
|
4699 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
|
4700 && VIM_ISBREAK(c) && !VIM_ISBREAK((int)*ptr)) |
| 7 | 4701 { |
| 6681 | 4702 # ifdef FEAT_MBYTE |
| 6693 | 4703 int mb_off = has_mbyte ? (*mb_head_off)(line, ptr - 1) : 0; |
| 6681 | 4704 # endif |
| 5995 | 4705 char_u *p = ptr - ( |
| 7 | 4706 # ifdef FEAT_MBYTE |
| 6693 | 4707 mb_off + |
| 7 | 4708 # endif |
| 5995 | 4709 1); |
| 6681 | 4710 |
| 5995 | 4711 /* TODO: is passing p for start of the line OK? */ |
| 6026 | 4712 n_extra = win_lbr_chartabsize(wp, line, p, (colnr_T)vcol, |
| 5995 | 4713 NULL) - 1; |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
4714 if (c == TAB && n_extra + col > wp->w_width) |
| 6371 | 4715 n_extra = (int)wp->w_buffer->b_p_ts |
| 4716 - vcol % (int)wp->w_buffer->b_p_ts - 1; | |
| 4717 | |
| 6681 | 4718 # ifdef FEAT_MBYTE |
| 6693 | 4719 c_extra = mb_off > 0 ? MB_FILLER_CHAR : ' '; |
| 6681 | 4720 # else |
| 7 | 4721 c_extra = ' '; |
| 6681 | 4722 # endif |
|
11129
f4ea50924c6d
patch 8.0.0452: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11127
diff
changeset
|
4723 if (VIM_ISWHITE(c)) |
|
5174
42d592dbbec3
updated for version 7.4a.013
Bram Moolenaar <bram@vim.org>
parents:
5126
diff
changeset
|
4724 { |
|
42d592dbbec3
updated for version 7.4a.013
Bram Moolenaar <bram@vim.org>
parents:
5126
diff
changeset
|
4725 #ifdef FEAT_CONCEAL |
|
42d592dbbec3
updated for version 7.4a.013
Bram Moolenaar <bram@vim.org>
parents:
5126
diff
changeset
|
4726 if (c == TAB) |
|
42d592dbbec3
updated for version 7.4a.013
Bram Moolenaar <bram@vim.org>
parents:
5126
diff
changeset
|
4727 /* See "Tab alignment" below. */ |
|
42d592dbbec3
updated for version 7.4a.013
Bram Moolenaar <bram@vim.org>
parents:
5126
diff
changeset
|
4728 FIX_FOR_BOGUSCOLS; |
|
42d592dbbec3
updated for version 7.4a.013
Bram Moolenaar <bram@vim.org>
parents:
5126
diff
changeset
|
4729 #endif |
| 6026 | 4730 if (!wp->w_p_list) |
| 4731 c = ' '; | |
|
5174
42d592dbbec3
updated for version 7.4a.013
Bram Moolenaar <bram@vim.org>
parents:
5126
diff
changeset
|
4732 } |
| 7 | 4733 } |
| 4734 #endif | |
| 4735 | |
|
7344
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
4736 /* '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
|
4737 */ |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
4738 if (wp->w_p_list |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
4739 && (((c == 160 |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
4740 #ifdef FEAT_MBYTE |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
4741 || (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
|
4742 #endif |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
4743 ) && lcs_nbsp) |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
4744 || (c == ' ' && lcs_space && ptr - line <= trailcol))) |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
4745 { |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
4746 c = (c == ' ') ? lcs_space : lcs_nbsp; |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
4747 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
|
4748 { |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
4749 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
|
4750 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
|
4751 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
|
4752 } |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
4753 #ifdef FEAT_MBYTE |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
4754 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
|
4755 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
|
4756 { |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
4757 mb_utf8 = TRUE; |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
4758 u8cc[0] = 0; |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
4759 c = 0xc0; |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
4760 } |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
4761 else |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
4762 mb_utf8 = FALSE; |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
4763 #endif |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
4764 } |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
4765 |
| 7 | 4766 if (trailcol != MAXCOL && ptr > line + trailcol && c == ' ') |
| 4767 { | |
| 4768 c = lcs_trail; | |
| 674 | 4769 if (!attr_pri) |
| 7 | 4770 { |
| 4771 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
|
4772 extra_attr = HL_ATTR(HLF_8); |
| 7 | 4773 saved_attr2 = char_attr; /* save current attr */ |
| 4774 } | |
| 4775 #ifdef FEAT_MBYTE | |
| 4776 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
|
4777 if (enc_utf8 && utf_char2len(c) > 1) |
| 7 | 4778 { |
| 4779 mb_utf8 = TRUE; | |
| 714 | 4780 u8cc[0] = 0; |
| 819 | 4781 c = 0xc0; |
| 7 | 4782 } |
| 4783 else | |
| 4784 mb_utf8 = FALSE; | |
| 4785 #endif | |
| 4786 } | |
| 4787 } | |
| 4788 | |
| 4789 /* | |
| 4790 * Handling of non-printable characters. | |
| 4791 */ | |
|
7697
f04e2b6feea2
commit https://github.com/vim/vim/commit/88e8f9f14434a7cd538d0c159dc432bea869a5bd
Christian Brabandt <cb@256bit.org>
parents:
7603
diff
changeset
|
4792 if (!vim_isprintc(c)) |
| 7 | 4793 { |
| 4794 /* | |
| 4795 * when getting a character from the file, we may have to | |
| 4796 * turn it into something else on the way to putting it | |
| 4797 * into "ScreenLines". | |
| 4798 */ | |
| 4799 if (c == TAB && (!wp->w_p_list || lcs_tab1)) | |
| 4800 { | |
| 6026 | 4801 int tab_len = 0; |
| 6503 | 4802 long vcol_adjusted = vcol; /* removed showbreak length */ |
| 4803 #ifdef FEAT_LINEBREAK | |
| 4804 /* only adjust the tab_len, when at the first column | |
| 4805 * after the showbreak value was drawn */ | |
| 4806 if (*p_sbr != NUL && vcol == vcol_sbr && wp->w_p_wrap) | |
| 4807 vcol_adjusted = vcol - MB_CHARLEN(p_sbr); | |
| 4808 #endif | |
| 7 | 4809 /* tab amount depends on current column */ |
| 6026 | 4810 tab_len = (int)wp->w_buffer->b_p_ts |
| 6503 | 4811 - vcol_adjusted % (int)wp->w_buffer->b_p_ts - 1; |
| 4812 | |
| 6026 | 4813 #ifdef FEAT_LINEBREAK |
| 6100 | 4814 if (!wp->w_p_lbr || !wp->w_p_list) |
| 6026 | 4815 #endif |
| 4816 /* tab amount depends on current column */ | |
| 4817 n_extra = tab_len; | |
| 4818 #ifdef FEAT_LINEBREAK | |
| 4819 else | |
| 4820 { | |
| 4821 char_u *p; | |
| 4822 int len = n_extra; | |
| 4823 int i; | |
| 4824 int saved_nextra = n_extra; | |
| 4825 | |
| 6172 | 4826 #ifdef FEAT_CONCEAL |
| 6627 | 4827 if (vcol_off > 0) |
| 6172 | 4828 /* there are characters to conceal */ |
| 4829 tab_len += vcol_off; | |
| 6520 | 4830 /* boguscols before FIX_FOR_BOGUSCOLS macro from above |
| 4831 */ | |
| 4832 if (wp->w_p_list && lcs_tab1 && old_boguscols > 0 | |
| 4833 && n_extra > tab_len) | |
| 4834 tab_len += n_extra - tab_len; | |
| 4835 #endif | |
| 4836 | |
| 6026 | 4837 /* if n_extra > 0, it gives the number of chars, to |
| 4838 * use for a tab, else we need to calculate the width | |
| 4839 * for a tab */ | |
| 4840 #ifdef FEAT_MBYTE | |
| 4841 len = (tab_len * mb_char2len(lcs_tab2)); | |
| 4842 if (n_extra > 0) | |
| 4843 len += n_extra - tab_len; | |
| 4844 #endif | |
| 4845 c = lcs_tab1; | |
| 4846 p = alloc((unsigned)(len + 1)); | |
| 4847 vim_memset(p, ' ', len); | |
| 4848 p[len] = NUL; | |
|
10690
206ab11fa76e
patch 8.0.0235: memory leak in diff mode
Christian Brabandt <cb@256bit.org>
parents:
10538
diff
changeset
|
4849 vim_free(p_extra_free); |
| 6026 | 4850 p_extra_free = p; |
| 4851 for (i = 0; i < tab_len; i++) | |
| 4852 { | |
| 4853 #ifdef FEAT_MBYTE | |
| 4854 mb_char2bytes(lcs_tab2, p); | |
| 4855 p += mb_char2len(lcs_tab2); | |
| 4856 n_extra += mb_char2len(lcs_tab2) | |
| 4857 - (saved_nextra > 0 ? 1 : 0); | |
| 4858 #else | |
| 4859 p[i] = lcs_tab2; | |
| 4860 #endif | |
| 4861 } | |
| 4862 p_extra = p_extra_free; | |
| 6172 | 4863 #ifdef FEAT_CONCEAL |
| 4864 /* n_extra will be increased by FIX_FOX_BOGUSCOLS | |
| 4865 * macro below, so need to adjust for that here */ | |
| 6627 | 4866 if (vcol_off > 0) |
| 6172 | 4867 n_extra -= vcol_off; |
| 4868 #endif | |
| 6026 | 4869 } |
| 4870 #endif | |
| 3984 | 4871 #ifdef FEAT_CONCEAL |
| 6627 | 4872 { |
| 4873 int vc_saved = vcol_off; | |
| 4874 | |
| 4875 /* Tab alignment should be identical regardless of | |
| 4876 * 'conceallevel' value. So tab compensates of all | |
| 4877 * previous concealed characters, and thus resets | |
| 4878 * vcol_off and boguscols accumulated so far in the | |
| 4879 * line. Note that the tab can be longer than | |
| 4880 * 'tabstop' when there are concealed characters. */ | |
| 4881 FIX_FOR_BOGUSCOLS; | |
| 4882 | |
| 4883 /* Make sure, the highlighting for the tab char will be | |
| 4884 * correctly set further below (effectively reverts the | |
| 4885 * FIX_FOR_BOGSUCOLS macro */ | |
| 4886 if (n_extra == tab_len + vc_saved && wp->w_p_list | |
| 6520 | 4887 && lcs_tab1) |
| 6627 | 4888 tab_len += vc_saved; |
| 4889 } | |
| 3984 | 4890 #endif |
| 7 | 4891 #ifdef FEAT_MBYTE |
| 4892 mb_utf8 = FALSE; /* don't draw as UTF-8 */ | |
| 4893 #endif | |
| 4894 if (wp->w_p_list) | |
| 4895 { | |
| 4896 c = lcs_tab1; | |
| 6026 | 4897 #ifdef FEAT_LINEBREAK |
| 4898 if (wp->w_p_lbr) | |
| 4899 c_extra = NUL; /* using p_extra from above */ | |
| 4900 else | |
| 4901 #endif | |
| 4902 c_extra = lcs_tab2; | |
| 4903 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
|
4904 extra_attr = HL_ATTR(HLF_8); |
| 7 | 4905 saved_attr2 = char_attr; /* save current attr */ |
| 4906 #ifdef FEAT_MBYTE | |
| 4907 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
|
4908 if (enc_utf8 && utf_char2len(c) > 1) |
| 7 | 4909 { |
| 4910 mb_utf8 = TRUE; | |
| 714 | 4911 u8cc[0] = 0; |
| 819 | 4912 c = 0xc0; |
| 7 | 4913 } |
| 4914 #endif | |
| 4915 } | |
| 4916 else | |
| 4917 { | |
| 4918 c_extra = ' '; | |
| 4919 c = ' '; | |
| 4920 } | |
| 4921 } | |
| 36 | 4922 else if (c == NUL |
| 6799 | 4923 && (wp->w_p_list |
| 36 | 4924 || ((fromcol >= 0 || fromcol_prev >= 0) |
| 4925 && tocol > vcol | |
| 4926 && VIsual_mode != Ctrl_V | |
| 4927 && ( | |
| 4928 # ifdef FEAT_RIGHTLEFT | |
| 4929 wp->w_p_rl ? (col >= 0) : | |
| 4930 # endif | |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
4931 (col < wp->w_width)) |
| 36 | 4932 && !(noinvcur |
| 1850 | 4933 && lnum == wp->w_cursor.lnum |
| 36 | 4934 && (colnr_T)vcol == wp->w_virtcol))) |
| 6815 | 4935 && lcs_eol_one > 0) |
| 7 | 4936 { |
| 36 | 4937 /* Display a '$' after the line or highlight an extra |
| 4938 * character if the line break is included. */ | |
| 7 | 4939 #if defined(FEAT_DIFF) || defined(LINE_ATTR) |
| 4940 /* For a diff line the highlighting continues after the | |
| 4941 * "$". */ | |
| 4942 if ( | |
| 4943 # ifdef FEAT_DIFF | |
| 534 | 4944 diff_hlf == (hlf_T)0 |
| 7 | 4945 # ifdef LINE_ATTR |
| 4946 && | |
| 4947 # endif | |
| 4948 # endif | |
| 4949 # ifdef LINE_ATTR | |
| 4950 line_attr == 0 | |
| 4951 # endif | |
| 4952 ) | |
| 4953 #endif | |
| 4954 { | |
| 4955 #ifdef FEAT_VIRTUALEDIT | |
| 4956 /* In virtualedit, visual selections may extend | |
| 4957 * beyond end of line. */ | |
| 4958 if (area_highlighting && virtual_active() | |
| 4959 && tocol != MAXCOL && vcol < tocol) | |
| 4960 n_extra = 0; | |
| 4961 else | |
| 4962 #endif | |
| 4963 { | |
| 4964 p_extra = at_end_str; | |
| 4965 n_extra = 1; | |
| 4966 c_extra = NUL; | |
| 4967 } | |
| 4968 } | |
| 6799 | 4969 if (wp->w_p_list && lcs_eol > 0) |
| 36 | 4970 c = lcs_eol; |
| 4971 else | |
| 4972 c = ' '; | |
| 7 | 4973 lcs_eol_one = -1; |
| 4974 --ptr; /* put it back at the NUL */ | |
| 674 | 4975 if (!attr_pri) |
| 7 | 4976 { |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
4977 extra_attr = HL_ATTR(HLF_AT); |
| 7 | 4978 n_attr = 1; |
| 4979 } | |
| 4980 #ifdef FEAT_MBYTE | |
| 4981 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
|
4982 if (enc_utf8 && utf_char2len(c) > 1) |
| 7 | 4983 { |
| 4984 mb_utf8 = TRUE; | |
| 714 | 4985 u8cc[0] = 0; |
| 819 | 4986 c = 0xc0; |
| 7 | 4987 } |
| 4988 else | |
| 4989 mb_utf8 = FALSE; /* don't draw as UTF-8 */ | |
| 4990 #endif | |
| 4991 } | |
| 4992 else if (c != NUL) | |
| 4993 { | |
| 4994 p_extra = transchar(c); | |
| 6064 | 4995 if (n_extra == 0) |
| 4996 n_extra = byte2cells(c) - 1; | |
| 7 | 4997 #ifdef FEAT_RIGHTLEFT |
| 4998 if ((dy_flags & DY_UHEX) && wp->w_p_rl) | |
| 4999 rl_mirror(p_extra); /* reverse "<12>" */ | |
| 5000 #endif | |
| 5001 c_extra = NUL; | |
| 6026 | 5002 #ifdef FEAT_LINEBREAK |
| 5003 if (wp->w_p_lbr) | |
| 5004 { | |
| 5005 char_u *p; | |
| 5006 | |
| 5007 c = *p_extra; | |
| 5008 p = alloc((unsigned)n_extra + 1); | |
| 5009 vim_memset(p, ' ', n_extra); | |
| 5010 STRNCPY(p, p_extra + 1, STRLEN(p_extra) - 1); | |
| 5011 p[n_extra] = NUL; | |
|
10690
206ab11fa76e
patch 8.0.0235: memory leak in diff mode
Christian Brabandt <cb@256bit.org>
parents:
10538
diff
changeset
|
5012 vim_free(p_extra_free); |
| 6026 | 5013 p_extra_free = p_extra = p; |
| 5014 } | |
| 5015 else | |
| 5016 #endif | |
| 5017 { | |
| 5018 n_extra = byte2cells(c) - 1; | |
| 5019 c = *p_extra++; | |
| 5020 } | |
| 674 | 5021 if (!attr_pri) |
| 7 | 5022 { |
| 5023 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
|
5024 extra_attr = HL_ATTR(HLF_8); |
| 7 | 5025 saved_attr2 = char_attr; /* save current attr */ |
| 5026 } | |
| 5027 #ifdef FEAT_MBYTE | |
| 5028 mb_utf8 = FALSE; /* don't draw as UTF-8 */ | |
| 5029 #endif | |
| 5030 } | |
| 5031 #ifdef FEAT_VIRTUALEDIT | |
| 5032 else if (VIsual_active | |
| 5033 && (VIsual_mode == Ctrl_V | |
| 5034 || VIsual_mode == 'v') | |
| 5035 && virtual_active() | |
| 5036 && tocol != MAXCOL | |
| 5037 && vcol < tocol | |
| 5038 && ( | |
| 5039 # ifdef FEAT_RIGHTLEFT | |
| 5040 wp->w_p_rl ? (col >= 0) : | |
| 5041 # endif | |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
5042 (col < wp->w_width))) |
| 7 | 5043 { |
| 5044 c = ' '; | |
| 5045 --ptr; /* put it back at the NUL */ | |
| 5046 } | |
| 5047 #endif | |
| 910 | 5048 #if defined(LINE_ATTR) |
| 7 | 5049 else if (( |
| 5050 # ifdef FEAT_DIFF | |
| 910 | 5051 diff_hlf != (hlf_T)0 || |
| 7 | 5052 # endif |
|
12433
735b49ff8fbb
patch 8.0.1096: terminal window in Normal mode has wrong background
Christian Brabandt <cb@256bit.org>
parents:
12323
diff
changeset
|
5053 # ifdef FEAT_TERMINAL |
|
735b49ff8fbb
patch 8.0.1096: terminal window in Normal mode has wrong background
Christian Brabandt <cb@256bit.org>
parents:
12323
diff
changeset
|
5054 term_attr != 0 || |
|
735b49ff8fbb
patch 8.0.1096: terminal window in Normal mode has wrong background
Christian Brabandt <cb@256bit.org>
parents:
12323
diff
changeset
|
5055 # endif |
| 7 | 5056 line_attr != 0 |
| 5057 ) && ( | |
| 5058 # ifdef FEAT_RIGHTLEFT | |
| 5059 wp->w_p_rl ? (col >= 0) : | |
| 5060 # endif | |
|
2553
37d3f90f5203
Conceal feature caused the 'cursorline' highlighting to stop early.
Bram Moolenaar <bram@vim.org>
parents:
2520
diff
changeset
|
5061 (col |
|
37d3f90f5203
Conceal feature caused the 'cursorline' highlighting to stop early.
Bram Moolenaar <bram@vim.org>
parents:
2520
diff
changeset
|
5062 # ifdef FEAT_CONCEAL |
|
37d3f90f5203
Conceal feature caused the 'cursorline' highlighting to stop early.
Bram Moolenaar <bram@vim.org>
parents:
2520
diff
changeset
|
5063 - boguscols |
|
37d3f90f5203
Conceal feature caused the 'cursorline' highlighting to stop early.
Bram Moolenaar <bram@vim.org>
parents:
2520
diff
changeset
|
5064 # endif |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
5065 < wp->w_width))) |
| 7 | 5066 { |
| 5067 /* Highlight until the right side of the window */ | |
| 5068 c = ' '; | |
| 5069 --ptr; /* put it back at the NUL */ | |
| 867 | 5070 |
| 5071 /* Remember we do the char for line highlighting. */ | |
| 5072 ++did_line_attr; | |
| 5073 | |
| 5074 /* don't do search HL for the rest of the line */ | |
|
12580
ba55861aa52c
patch 8.0.1168: wrong highlighting with combination of match and 'cursorline'
Christian Brabandt <cb@256bit.org>
parents:
12529
diff
changeset
|
5075 if (line_attr != 0 && char_attr == search_attr |
|
ba55861aa52c
patch 8.0.1168: wrong highlighting with combination of match and 'cursorline'
Christian Brabandt <cb@256bit.org>
parents:
12529
diff
changeset
|
5076 && (did_line_attr > 1 |
|
ba55861aa52c
patch 8.0.1168: wrong highlighting with combination of match and 'cursorline'
Christian Brabandt <cb@256bit.org>
parents:
12529
diff
changeset
|
5077 || (wp->w_p_list && lcs_eol > 0))) |
| 867 | 5078 char_attr = line_attr; |
| 7 | 5079 # ifdef FEAT_DIFF |
| 5080 if (diff_hlf == HLF_TXD) | |
| 5081 { | |
| 5082 diff_hlf = HLF_CHD; | |
| 5083 if (attr == 0 || char_attr != attr) | |
| 6106 | 5084 { |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
5085 char_attr = HL_ATTR(diff_hlf); |
| 6106 | 5086 if (wp->w_p_cul && lnum == wp->w_cursor.lnum) |
| 5087 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
|
5088 HL_ATTR(HLF_CUL)); |
| 6106 | 5089 } |
| 7 | 5090 } |
| 5091 # endif | |
|
12433
735b49ff8fbb
patch 8.0.1096: terminal window in Normal mode has wrong background
Christian Brabandt <cb@256bit.org>
parents:
12323
diff
changeset
|
5092 # ifdef FEAT_TERMINAL |
|
735b49ff8fbb
patch 8.0.1096: terminal window in Normal mode has wrong background
Christian Brabandt <cb@256bit.org>
parents:
12323
diff
changeset
|
5093 if (term_attr != 0) |
|
735b49ff8fbb
patch 8.0.1096: terminal window in Normal mode has wrong background
Christian Brabandt <cb@256bit.org>
parents:
12323
diff
changeset
|
5094 { |
|
735b49ff8fbb
patch 8.0.1096: terminal window in Normal mode has wrong background
Christian Brabandt <cb@256bit.org>
parents:
12323
diff
changeset
|
5095 char_attr = term_attr; |
|
735b49ff8fbb
patch 8.0.1096: terminal window in Normal mode has wrong background
Christian Brabandt <cb@256bit.org>
parents:
12323
diff
changeset
|
5096 if (wp->w_p_cul && lnum == wp->w_cursor.lnum) |
|
735b49ff8fbb
patch 8.0.1096: terminal window in Normal mode has wrong background
Christian Brabandt <cb@256bit.org>
parents:
12323
diff
changeset
|
5097 char_attr = hl_combine_attr(char_attr, |
|
735b49ff8fbb
patch 8.0.1096: terminal window in Normal mode has wrong background
Christian Brabandt <cb@256bit.org>
parents:
12323
diff
changeset
|
5098 HL_ATTR(HLF_CUL)); |
|
735b49ff8fbb
patch 8.0.1096: terminal window in Normal mode has wrong background
Christian Brabandt <cb@256bit.org>
parents:
12323
diff
changeset
|
5099 } |
|
735b49ff8fbb
patch 8.0.1096: terminal window in Normal mode has wrong background
Christian Brabandt <cb@256bit.org>
parents:
12323
diff
changeset
|
5100 # endif |
| 7 | 5101 } |
| 5102 #endif | |
| 5103 } | |
|
2250
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 #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
|
5106 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
|
5107 && (wp != curwin || lnum != wp->w_cursor.lnum || |
| 6947 | 5108 conceal_cursor_line(wp) ) |
|
8907
5deb9e8f4292
commit https://github.com/vim/vim/commit/4d585022023b96f6507e8cae5ed8fc8d926f5140
Christian Brabandt <cb@256bit.org>
parents:
8872
diff
changeset
|
5109 && ( (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
|
5110 && !(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
|
5111 && 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
|
5112 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5113 char_attr = conceal_attr; |
|
8907
5deb9e8f4292
commit https://github.com/vim/vim/commit/4d585022023b96f6507e8cae5ed8fc8d926f5140
Christian Brabandt <cb@256bit.org>
parents:
8872
diff
changeset
|
5114 if ((prev_syntax_id != syntax_seqnr || has_match_conc > 1) |
| 6947 | 5115 && (syn_get_sub_char() != NUL || match_conc |
| 5116 || 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
|
5117 && 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
|
5118 { |
|
a96dd77ce213
For conceal mode: when two different syntax items follow each other, show the
Bram Moolenaar <bram@vim.org>
parents:
2364
diff
changeset
|
5119 /* 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
|
5120 * character. */ |
| 6947 | 5121 if (match_conc) |
| 5122 c = match_conc; | |
| 5123 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
|
5124 c = syn_get_sub_char(); |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5125 else if (lcs_conceal != NUL) |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5126 c = lcs_conceal; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5127 else |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5128 c = ' '; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5129 |
|
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
|
5130 prev_syntax_id = syntax_seqnr; |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5131 |
|
2332
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
5132 if (n_extra > 0) |
|
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
5133 vcol_off += n_extra; |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5134 vcol += n_extra; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5135 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
|
5136 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5137 # ifdef FEAT_RIGHTLEFT |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5138 if (wp->w_p_rl) |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5139 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5140 col -= n_extra; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5141 boguscols -= n_extra; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5142 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5143 else |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5144 # endif |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5145 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5146 boguscols += n_extra; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5147 col += n_extra; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5148 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5149 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5150 n_extra = 0; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5151 n_attr = 0; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5152 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5153 else if (n_skip == 0) |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5154 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5155 is_concealing = TRUE; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5156 n_skip = 1; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5157 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5158 # ifdef FEAT_MBYTE |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5159 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
|
5160 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
|
5161 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5162 mb_utf8 = TRUE; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5163 u8cc[0] = 0; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5164 c = 0xc0; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5165 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5166 else |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5167 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
|
5168 # endif |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5169 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5170 else |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5171 { |
|
2375
a96dd77ce213
For conceal mode: when two different syntax items follow each other, show the
Bram Moolenaar <bram@vim.org>
parents:
2364
diff
changeset
|
5172 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
|
5173 is_concealing = FALSE; |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5174 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5175 #endif /* FEAT_CONCEAL */ |
| 7 | 5176 } |
| 5177 | |
|
2378
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
5178 #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
|
5179 /* 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
|
5180 * 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
|
5181 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
|
5182 && 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
|
5183 && 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
|
5184 && (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
|
5185 { |
|
7603
d3892f6c917e
commit https://github.com/vim/vim/commit/e39b3d9fb4e4006684c33847d1ef6a0d742699dd
Christian Brabandt <cb@256bit.org>
parents:
7344
diff
changeset
|
5186 # ifdef FEAT_RIGHTLEFT |
|
d3892f6c917e
commit https://github.com/vim/vim/commit/e39b3d9fb4e4006684c33847d1ef6a0d742699dd
Christian Brabandt <cb@256bit.org>
parents:
7344
diff
changeset
|
5187 if (wp->w_p_rl) |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
5188 wp->w_wcol = wp->w_width - col + boguscols - 1; |
|
7603
d3892f6c917e
commit https://github.com/vim/vim/commit/e39b3d9fb4e4006684c33847d1ef6a0d742699dd
Christian Brabandt <cb@256bit.org>
parents:
7344
diff
changeset
|
5189 else |
|
d3892f6c917e
commit https://github.com/vim/vim/commit/e39b3d9fb4e4006684c33847d1ef6a0d742699dd
Christian Brabandt <cb@256bit.org>
parents:
7344
diff
changeset
|
5190 # endif |
|
d3892f6c917e
commit https://github.com/vim/vim/commit/e39b3d9fb4e4006684c33847d1ef6a0d742699dd
Christian Brabandt <cb@256bit.org>
parents:
7344
diff
changeset
|
5191 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
|
5192 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
|
5193 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
|
5194 } |
|
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
5195 #endif |
|
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
5196 |
| 7 | 5197 /* Don't override visual selection highlighting. */ |
| 5198 if (n_attr > 0 | |
| 5199 && draw_state == WL_LINE | |
| 674 | 5200 && !attr_pri) |
| 7 | 5201 char_attr = extra_attr; |
| 5202 | |
| 42 | 5203 #if defined(FEAT_XIM) && defined(FEAT_GUI_GTK) |
| 7 | 5204 /* XIM don't send preedit_start and preedit_end, but they send |
| 5205 * preedit_changed and commit. Thus Vim can't set "im_is_active", use | |
| 5206 * im_is_preediting() here. */ | |
|
12293
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12244
diff
changeset
|
5207 if (p_imst == IM_ON_THE_SPOT |
|
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12244
diff
changeset
|
5208 && xic != NULL |
| 1850 | 5209 && lnum == wp->w_cursor.lnum |
| 7 | 5210 && (State & INSERT) |
| 5211 && !p_imdisable | |
| 5212 && im_is_preediting() | |
| 5213 && draw_state == WL_LINE) | |
| 5214 { | |
| 5215 colnr_T tcol; | |
| 5216 | |
| 5217 if (preedit_end_col == MAXCOL) | |
| 1850 | 5218 getvcol(curwin, &(wp->w_cursor), &tcol, NULL, NULL); |
| 7 | 5219 else |
| 5220 tcol = preedit_end_col; | |
| 5221 if ((long)preedit_start_col <= vcol && vcol < (long)tcol) | |
| 5222 { | |
| 5223 if (feedback_old_attr < 0) | |
| 5224 { | |
| 5225 feedback_col = 0; | |
| 5226 feedback_old_attr = char_attr; | |
| 5227 } | |
| 5228 char_attr = im_get_feedback_attr(feedback_col); | |
| 5229 if (char_attr < 0) | |
| 5230 char_attr = feedback_old_attr; | |
| 5231 feedback_col++; | |
| 5232 } | |
| 5233 else if (feedback_old_attr >= 0) | |
| 5234 { | |
| 5235 char_attr = feedback_old_attr; | |
| 5236 feedback_old_attr = -1; | |
| 5237 feedback_col = 0; | |
| 5238 } | |
| 5239 } | |
| 5240 #endif | |
| 5241 /* | |
| 5242 * Handle the case where we are in column 0 but not on the first | |
| 5243 * character of the line and the user wants us to show us a | |
| 5244 * special character (via 'listchars' option "precedes:<char>". | |
| 5245 */ | |
| 5246 if (lcs_prec_todo != NUL | |
| 6276 | 5247 && wp->w_p_list |
| 7 | 5248 && (wp->w_p_wrap ? wp->w_skipcol > 0 : wp->w_leftcol > 0) |
| 5249 #ifdef FEAT_DIFF | |
| 5250 && filler_todo <= 0 | |
| 5251 #endif | |
| 5252 && draw_state > WL_NR | |
| 5253 && c != NUL) | |
| 5254 { | |
| 5255 c = lcs_prec; | |
| 5256 lcs_prec_todo = NUL; | |
| 5257 #ifdef FEAT_MBYTE | |
| 3586 | 5258 if (has_mbyte && (*mb_char2cells)(mb_c) > 1) |
| 5259 { | |
| 5260 /* Double-width character being overwritten by the "precedes" | |
| 5261 * character, need to fill up half the character. */ | |
| 5262 c_extra = MB_FILLER_CHAR; | |
| 5263 n_extra = 1; | |
| 5264 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
|
5265 extra_attr = HL_ATTR(HLF_AT); |
| 3586 | 5266 } |
| 7 | 5267 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
|
5268 if (enc_utf8 && utf_char2len(c) > 1) |
| 7 | 5269 { |
| 5270 mb_utf8 = TRUE; | |
| 714 | 5271 u8cc[0] = 0; |
| 819 | 5272 c = 0xc0; |
| 7 | 5273 } |
| 5274 else | |
| 5275 mb_utf8 = FALSE; /* don't draw as UTF-8 */ | |
| 5276 #endif | |
| 674 | 5277 if (!attr_pri) |
| 7 | 5278 { |
| 5279 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
|
5280 char_attr = HL_ATTR(HLF_AT); /* later copied to char_attr */ |
| 7 | 5281 n_attr3 = 1; |
| 5282 } | |
| 5283 } | |
| 5284 | |
| 5285 /* | |
| 867 | 5286 * At end of the text line or just after the last character. |
| 7 | 5287 */ |
| 867 | 5288 if (c == NUL |
| 910 | 5289 #if defined(LINE_ATTR) |
| 867 | 5290 || did_line_attr == 1 |
| 5291 #endif | |
| 5292 ) | |
| 5293 { | |
| 5294 #ifdef FEAT_SEARCH_EXTRA | |
| 5295 long prevcol = (long)(ptr - line) - (c == NUL); | |
| 1437 | 5296 |
| 5297 /* we're not really at that column when skipping some text */ | |
| 1439 | 5298 if ((long)(wp->w_p_wrap ? wp->w_skipcol : wp->w_leftcol) > prevcol) |
| 1437 | 5299 ++prevcol; |
| 867 | 5300 #endif |
| 5301 | |
|
2332
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
5302 /* Invert at least one char, used for Visual and empty line or |
| 7 | 5303 * highlight match at end of line. If it's beyond the last |
| 5304 * char on the screen, just overwrite that one (tricky!) Not | |
| 5305 * needed when a '$' was displayed for 'list'. */ | |
| 1326 | 5306 #ifdef FEAT_SEARCH_EXTRA |
| 5307 prevcol_hl_flag = FALSE; | |
|
9885
4e8b05fa12c6
commit https://github.com/vim/vim/commit/4f416e41243ca151b95d39d81ce23d00b1484755
Christian Brabandt <cb@256bit.org>
parents:
9877
diff
changeset
|
5308 if (!search_hl.is_addpos && prevcol == (long)search_hl.startcol) |
| 1326 | 5309 prevcol_hl_flag = TRUE; |
| 5310 else | |
| 5311 { | |
| 5312 cur = wp->w_match_head; | |
| 5313 while (cur != NULL) | |
| 5314 { | |
|
9885
4e8b05fa12c6
commit https://github.com/vim/vim/commit/4f416e41243ca151b95d39d81ce23d00b1484755
Christian Brabandt <cb@256bit.org>
parents:
9877
diff
changeset
|
5315 if (!cur->hl.is_addpos && prevcol == (long)cur->hl.startcol) |
| 1326 | 5316 { |
| 5317 prevcol_hl_flag = TRUE; | |
| 5318 break; | |
| 5319 } | |
| 5320 cur = cur->next; | |
| 5321 } | |
| 5322 } | |
| 5323 #endif | |
| 7 | 5324 if (lcs_eol == lcs_eol_one |
| 1850 | 5325 && ((area_attr != 0 && vcol == fromcol |
| 5326 && (VIsual_mode != Ctrl_V | |
| 5327 || lnum == VIsual.lnum | |
| 5328 || lnum == curwin->w_cursor.lnum) | |
| 5329 && c == NUL) | |
| 7 | 5330 #ifdef FEAT_SEARCH_EXTRA |
| 5331 /* highlight 'hlsearch' match at end of line */ | |
| 1326 | 5332 || (prevcol_hl_flag == TRUE |
|
12580
ba55861aa52c
patch 8.0.1168: wrong highlighting with combination of match and 'cursorline'
Christian Brabandt <cb@256bit.org>
parents:
12529
diff
changeset
|
5333 # ifdef FEAT_SYN_HL |
|
ba55861aa52c
patch 8.0.1168: wrong highlighting with combination of match and 'cursorline'
Christian Brabandt <cb@256bit.org>
parents:
12529
diff
changeset
|
5334 && !(wp->w_p_cul && lnum == wp->w_cursor.lnum |
|
ba55861aa52c
patch 8.0.1168: wrong highlighting with combination of match and 'cursorline'
Christian Brabandt <cb@256bit.org>
parents:
12529
diff
changeset
|
5335 && !(wp == curwin && VIsual_active)) |
|
ba55861aa52c
patch 8.0.1168: wrong highlighting with combination of match and 'cursorline'
Christian Brabandt <cb@256bit.org>
parents:
12529
diff
changeset
|
5336 # endif |
|
ba55861aa52c
patch 8.0.1168: wrong highlighting with combination of match and 'cursorline'
Christian Brabandt <cb@256bit.org>
parents:
12529
diff
changeset
|
5337 # ifdef FEAT_DIFF |
|
ba55861aa52c
patch 8.0.1168: wrong highlighting with combination of match and 'cursorline'
Christian Brabandt <cb@256bit.org>
parents:
12529
diff
changeset
|
5338 && diff_hlf == (hlf_T)0 |
|
ba55861aa52c
patch 8.0.1168: wrong highlighting with combination of match and 'cursorline'
Christian Brabandt <cb@256bit.org>
parents:
12529
diff
changeset
|
5339 # endif |
| 910 | 5340 # if defined(LINE_ATTR) |
| 867 | 5341 && did_line_attr <= 1 |
| 5342 # endif | |
| 5343 ) | |
| 7 | 5344 #endif |
| 5345 )) | |
| 5346 { | |
| 5347 int n = 0; | |
| 5348 | |
| 5349 #ifdef FEAT_RIGHTLEFT | |
| 5350 if (wp->w_p_rl) | |
| 5351 { | |
| 5352 if (col < 0) | |
| 5353 n = 1; | |
| 5354 } | |
| 5355 else | |
| 5356 #endif | |
| 5357 { | |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
5358 if (col >= wp->w_width) |
| 7 | 5359 n = -1; |
| 5360 } | |
| 5361 if (n != 0) | |
| 5362 { | |
| 5363 /* At the window boundary, highlight the last character | |
| 5364 * instead (better than nothing). */ | |
| 5365 off += n; | |
| 5366 col += n; | |
| 5367 } | |
| 5368 else | |
| 5369 { | |
| 5370 /* Add a blank character to highlight. */ | |
| 5371 ScreenLines[off] = ' '; | |
| 5372 #ifdef FEAT_MBYTE | |
| 5373 if (enc_utf8) | |
| 5374 ScreenLinesUC[off] = 0; | |
| 5375 #endif | |
| 5376 } | |
| 5377 #ifdef FEAT_SEARCH_EXTRA | |
| 5378 if (area_attr == 0) | |
| 5379 { | |
| 1326 | 5380 /* Use attributes from match with highest priority among |
| 5381 * 'search_hl' and the match list. */ | |
| 5382 char_attr = search_hl.attr; | |
| 5383 cur = wp->w_match_head; | |
| 5384 shl_flag = FALSE; | |
| 5385 while (cur != NULL || shl_flag == FALSE) | |
| 699 | 5386 { |
| 1326 | 5387 if (shl_flag == FALSE |
| 5388 && ((cur != NULL | |
| 5389 && cur->priority > SEARCH_HL_PRIORITY) | |
| 5390 || cur == NULL)) | |
| 699 | 5391 { |
| 1326 | 5392 shl = &search_hl; |
| 5393 shl_flag = TRUE; | |
| 699 | 5394 } |
| 1326 | 5395 else |
| 5396 shl = &cur->hl; | |
|
9885
4e8b05fa12c6
commit https://github.com/vim/vim/commit/4f416e41243ca151b95d39d81ce23d00b1484755
Christian Brabandt <cb@256bit.org>
parents:
9877
diff
changeset
|
5397 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
|
5398 && (shl == &search_hl || !shl->is_addpos)) |
| 1326 | 5399 char_attr = shl->attr; |
| 5400 if (shl != &search_hl && cur != NULL) | |
| 5401 cur = cur->next; | |
| 699 | 5402 } |
| 7 | 5403 } |
| 5404 #endif | |
| 5405 ScreenAttrs[off] = char_attr; | |
| 5406 #ifdef FEAT_RIGHTLEFT | |
| 5407 if (wp->w_p_rl) | |
| 1437 | 5408 { |
| 7 | 5409 --col; |
| 1437 | 5410 --off; |
| 5411 } | |
| 7 | 5412 else |
| 5413 #endif | |
| 1437 | 5414 { |
| 7 | 5415 ++col; |
| 1437 | 5416 ++off; |
| 5417 } | |
| 743 | 5418 ++vcol; |
| 1437 | 5419 #ifdef FEAT_SYN_HL |
| 5420 eol_hl_off = 1; | |
| 5421 #endif | |
| 743 | 5422 } |
| 867 | 5423 } |
| 5424 | |
| 5425 /* | |
| 5426 * At end of the text line. | |
| 5427 */ | |
| 5428 if (c == NUL) | |
| 5429 { | |
| 743 | 5430 #ifdef FEAT_SYN_HL |
| 1850 | 5431 if (eol_hl_off > 0 && vcol - eol_hl_off == (long)wp->w_virtcol |
| 5432 && lnum == wp->w_cursor.lnum) | |
| 1437 | 5433 { |
| 5434 /* highlight last char after line */ | |
| 5435 --col; | |
| 5436 --off; | |
| 5437 --vcol; | |
| 5438 } | |
| 5439 | |
|
2314
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5440 /* Highlight 'cursorcolumn' & 'colorcolumn' past end of the line. */ |
| 758 | 5441 if (wp->w_p_wrap) |
| 5442 v = wp->w_skipcol; | |
| 5443 else | |
| 5444 v = wp->w_leftcol; | |
|
2314
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5445 |
| 820 | 5446 /* check if line ends before left margin */ |
| 5447 if (vcol < v + col - win_col_off(wp)) | |
| 5448 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
|
5449 #ifdef FEAT_CONCEAL |
|
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
5450 /* 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
|
5451 * edge for 'cursorcolumn'. */ |
|
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
5452 col -= boguscols; |
|
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
5453 boguscols = 0; |
|
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
5454 #endif |
|
2314
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5455 |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5456 if (draw_color_col) |
|
2332
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
5457 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
|
5458 |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5459 if (((wp->w_p_cuc |
|
2332
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
5460 && (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
|
5461 && (int)wp->w_virtcol < |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
5462 wp->w_width * (row - startrow + 1) + v |
|
2314
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5463 && lnum != wp->w_cursor.lnum) |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5464 || draw_color_col) |
| 743 | 5465 # ifdef FEAT_RIGHTLEFT |
| 5466 && !wp->w_p_rl | |
| 5467 # endif | |
| 5468 ) | |
| 5469 { | |
|
2314
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5470 int rightmost_vcol = 0; |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5471 int i; |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5472 |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5473 if (wp->w_p_cuc) |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5474 rightmost_vcol = wp->w_virtcol; |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5475 if (draw_color_col) |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5476 /* determine rightmost colorcolumn to possibly draw */ |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5477 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
|
5478 if (rightmost_vcol < color_cols[i]) |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5479 rightmost_vcol = color_cols[i]; |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5480 |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
5481 while (col < wp->w_width) |
| 743 | 5482 { |
| 5483 ScreenLines[off] = ' '; | |
| 5484 #ifdef FEAT_MBYTE | |
| 5485 if (enc_utf8) | |
| 5486 ScreenLinesUC[off] = 0; | |
| 5487 #endif | |
| 5488 ++col; | |
|
2356
eb1f2554cac5
Fix 'colorcolumn' adjecent columns not highlighted after end of line.
Bram Moolenaar <bram@vim.org>
parents:
2349
diff
changeset
|
5489 if (draw_color_col) |
|
eb1f2554cac5
Fix 'colorcolumn' adjecent columns not highlighted after end of line.
Bram Moolenaar <bram@vim.org>
parents:
2349
diff
changeset
|
5490 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
|
5491 &color_cols); |
|
eb1f2554cac5
Fix 'colorcolumn' adjecent columns not highlighted after end of line.
Bram Moolenaar <bram@vim.org>
parents:
2349
diff
changeset
|
5492 |
|
2332
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
5493 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
|
5494 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
|
5495 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
|
5496 ScreenAttrs[off++] = HL_ATTR(HLF_MC); |
|
2314
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5497 else |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5498 ScreenAttrs[off++] = 0; |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5499 |
|
2332
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
5500 if (VCOL_HLC >= rightmost_vcol) |
| 743 | 5501 break; |
|
2314
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5502 |
| 743 | 5503 ++vcol; |
| 5504 } | |
| 5505 } | |
| 5506 #endif | |
| 7 | 5507 |
|
12513
3ca08bf99396
patch 8.0.1135: W_WINCOL() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12510
diff
changeset
|
5508 screen_line(screen_row, wp->w_wincol, col, |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
5509 (int)wp->w_width, HAS_RIGHTLEFT(wp->w_p_rl)); |
| 7 | 5510 row++; |
| 5511 | |
| 5512 /* | |
| 5513 * Update w_cline_height and w_cline_folded if the cursor line was | |
| 5514 * updated (saves a call to plines() later). | |
| 5515 */ | |
| 5516 if (wp == curwin && lnum == curwin->w_cursor.lnum) | |
| 5517 { | |
| 5518 curwin->w_cline_row = startrow; | |
| 5519 curwin->w_cline_height = row - startrow; | |
| 5520 #ifdef FEAT_FOLDING | |
| 5521 curwin->w_cline_folded = FALSE; | |
| 5522 #endif | |
| 5523 curwin->w_valid |= (VALID_CHEIGHT|VALID_CROW); | |
| 5524 } | |
| 5525 | |
| 5526 break; | |
| 5527 } | |
| 5528 | |
| 5529 /* line continues beyond line end */ | |
| 5530 if (lcs_ext | |
| 5531 && !wp->w_p_wrap | |
| 5532 #ifdef FEAT_DIFF | |
| 5533 && filler_todo <= 0 | |
| 5534 #endif | |
| 5535 && ( | |
| 5536 #ifdef FEAT_RIGHTLEFT | |
| 5537 wp->w_p_rl ? col == 0 : | |
| 5538 #endif | |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
5539 col == wp->w_width - 1) |
| 7 | 5540 && (*ptr != NUL |
| 1555 | 5541 || (wp->w_p_list && lcs_eol_one > 0) |
| 7 | 5542 || (n_extra && (c_extra != NUL || *p_extra != NUL)))) |
| 5543 { | |
| 5544 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
|
5545 char_attr = HL_ATTR(HLF_AT); |
| 7 | 5546 #ifdef FEAT_MBYTE |
| 5547 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
|
5548 if (enc_utf8 && utf_char2len(c) > 1) |
| 7 | 5549 { |
| 5550 mb_utf8 = TRUE; | |
| 714 | 5551 u8cc[0] = 0; |
| 819 | 5552 c = 0xc0; |
| 7 | 5553 } |
| 5554 else | |
| 5555 mb_utf8 = FALSE; | |
| 5556 #endif | |
| 5557 } | |
| 5558 | |
| 743 | 5559 #ifdef FEAT_SYN_HL |
|
2314
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5560 /* advance to the next 'colorcolumn' */ |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5561 if (draw_color_col) |
|
2332
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
5562 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
|
5563 |
| 743 | 5564 /* 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
|
5565 * highlight the cursor position itself. |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5566 * 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
|
5567 * 'cursorcolumn' */ |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5568 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
|
5569 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
|
5570 && search_attr == 0 && area_attr == 0) |
|
2314
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5571 { |
|
2332
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
5572 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
|
5573 && lnum != wp->w_cursor.lnum) |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5574 { |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5575 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
|
5576 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
|
5577 } |
|
2346
b38c324bdc36
Fix: 'colorcolumn' interfered with concealed text.
Bram Moolenaar <bram@vim.org>
parents:
2338
diff
changeset
|
5578 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
|
5579 { |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5580 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
|
5581 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
|
5582 } |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5583 } |
| 743 | 5584 #endif |
| 5585 | |
| 7 | 5586 /* |
| 5587 * Store character to be displayed. | |
| 5588 * Skip characters that are left of the screen for 'nowrap'. | |
| 5589 */ | |
| 5590 vcol_prev = vcol; | |
| 5591 if (draw_state < WL_LINE || n_skip <= 0) | |
| 5592 { | |
| 5593 /* | |
| 5594 * Store the character. | |
| 5595 */ | |
| 5596 #if defined(FEAT_RIGHTLEFT) && defined(FEAT_MBYTE) | |
| 5597 if (has_mbyte && wp->w_p_rl && (*mb_char2cells)(mb_c) > 1) | |
| 5598 { | |
| 5599 /* A double-wide character is: put first halve in left cell. */ | |
| 5600 --off; | |
| 5601 --col; | |
| 5602 } | |
| 5603 #endif | |
| 5604 ScreenLines[off] = c; | |
| 5605 #ifdef FEAT_MBYTE | |
| 5606 if (enc_dbcs == DBCS_JPNU) | |
|
2069
63613d8d7e4d
updated for version 7.2.354
Bram Moolenaar <bram@zimbu.org>
parents:
2055
diff
changeset
|
5607 { |
|
63613d8d7e4d
updated for version 7.2.354
Bram Moolenaar <bram@zimbu.org>
parents:
2055
diff
changeset
|
5608 if ((mb_c & 0xff00) == 0x8e00) |
|
63613d8d7e4d
updated for version 7.2.354
Bram Moolenaar <bram@zimbu.org>
parents:
2055
diff
changeset
|
5609 ScreenLines[off] = 0x8e; |
| 7 | 5610 ScreenLines2[off] = mb_c & 0xff; |
|
2069
63613d8d7e4d
updated for version 7.2.354
Bram Moolenaar <bram@zimbu.org>
parents:
2055
diff
changeset
|
5611 } |
| 7 | 5612 else if (enc_utf8) |
| 5613 { | |
| 5614 if (mb_utf8) | |
| 5615 { | |
| 1326 | 5616 int i; |
| 5617 | |
| 7 | 5618 ScreenLinesUC[off] = mb_c; |
| 819 | 5619 if ((c & 0xff) == 0) |
| 5620 ScreenLines[off] = 0x80; /* avoid storing zero */ | |
| 714 | 5621 for (i = 0; i < Screen_mco; ++i) |
| 5622 { | |
| 5623 ScreenLinesC[i][off] = u8cc[i]; | |
| 5624 if (u8cc[i] == 0) | |
| 5625 break; | |
| 5626 } | |
| 7 | 5627 } |
| 5628 else | |
| 5629 ScreenLinesUC[off] = 0; | |
| 5630 } | |
| 5631 if (multi_attr) | |
| 5632 { | |
| 5633 ScreenAttrs[off] = multi_attr; | |
| 5634 multi_attr = 0; | |
| 5635 } | |
| 5636 else | |
| 5637 #endif | |
| 5638 ScreenAttrs[off] = char_attr; | |
| 5639 | |
| 5640 #ifdef FEAT_MBYTE | |
| 5641 if (has_mbyte && (*mb_char2cells)(mb_c) > 1) | |
| 5642 { | |
| 5643 /* Need to fill two screen columns. */ | |
| 5644 ++off; | |
| 5645 ++col; | |
| 5646 if (enc_utf8) | |
| 5647 /* UTF-8: Put a 0 in the second screen char. */ | |
| 5648 ScreenLines[off] = 0; | |
| 5649 else | |
| 5650 /* DBCS: Put second byte in the second screen char. */ | |
| 5651 ScreenLines[off] = mb_c & 0xff; | |
|
7287
6fcadba9ec7a
commit https://github.com/vim/vim/commit/32a214e78df0120f92fe049eab1385c60f0cdb0b
Christian Brabandt <cb@256bit.org>
parents:
7233
diff
changeset
|
5652 if (draw_state > WL_NR |
|
6fcadba9ec7a
commit https://github.com/vim/vim/commit/32a214e78df0120f92fe049eab1385c60f0cdb0b
Christian Brabandt <cb@256bit.org>
parents:
7233
diff
changeset
|
5653 #ifdef FEAT_DIFF |
|
6fcadba9ec7a
commit https://github.com/vim/vim/commit/32a214e78df0120f92fe049eab1385c60f0cdb0b
Christian Brabandt <cb@256bit.org>
parents:
7233
diff
changeset
|
5654 && filler_todo <= 0 |
|
6fcadba9ec7a
commit https://github.com/vim/vim/commit/32a214e78df0120f92fe049eab1385c60f0cdb0b
Christian Brabandt <cb@256bit.org>
parents:
7233
diff
changeset
|
5655 #endif |
|
6fcadba9ec7a
commit https://github.com/vim/vim/commit/32a214e78df0120f92fe049eab1385c60f0cdb0b
Christian Brabandt <cb@256bit.org>
parents:
7233
diff
changeset
|
5656 ) |
|
6fcadba9ec7a
commit https://github.com/vim/vim/commit/32a214e78df0120f92fe049eab1385c60f0cdb0b
Christian Brabandt <cb@256bit.org>
parents:
7233
diff
changeset
|
5657 ++vcol; |
| 7 | 5658 /* When "tocol" is halfway a character, set it to the end of |
| 5659 * the character, otherwise highlighting won't stop. */ | |
| 5660 if (tocol == vcol) | |
| 5661 ++tocol; | |
| 5662 #ifdef FEAT_RIGHTLEFT | |
| 5663 if (wp->w_p_rl) | |
| 5664 { | |
| 5665 /* now it's time to backup one cell */ | |
| 5666 --off; | |
| 5667 --col; | |
| 5668 } | |
| 5669 #endif | |
| 5670 } | |
| 5671 #endif | |
| 5672 #ifdef FEAT_RIGHTLEFT | |
| 5673 if (wp->w_p_rl) | |
| 5674 { | |
| 5675 --off; | |
| 5676 --col; | |
| 5677 } | |
| 5678 else | |
| 5679 #endif | |
| 5680 { | |
| 5681 ++off; | |
| 5682 ++col; | |
| 5683 } | |
| 5684 } | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5685 #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
|
5686 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
|
5687 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5688 --n_skip; |
|
2332
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
5689 ++vcol_off; |
|
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
5690 if (n_extra > 0) |
|
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
5691 vcol_off += n_extra; |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5692 if (wp->w_p_wrap) |
|
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 /* |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5695 * Special voodoo required if 'wrap' is on. |
|
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 * 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
|
5698 * 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
|
5699 * 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
|
5700 * 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
|
5701 * |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5702 * 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
|
5703 * 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
|
5704 * 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
|
5705 * of bad columns we have advanced. |
|
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 if (n_extra > 0) |
|
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 vcol += n_extra; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5710 # ifdef FEAT_RIGHTLEFT |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5711 if (wp->w_p_rl) |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5712 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5713 col -= n_extra; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5714 boguscols -= n_extra; |
|
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 else |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5717 # endif |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5718 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5719 col += n_extra; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5720 boguscols += n_extra; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5721 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5722 n_extra = 0; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5723 n_attr = 0; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5724 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5725 |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5726 |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5727 # ifdef FEAT_MBYTE |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5728 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
|
5729 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5730 /* Need to fill two screen columns. */ |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5731 # ifdef FEAT_RIGHTLEFT |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5732 if (wp->w_p_rl) |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5733 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5734 --boguscols; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5735 --col; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5736 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5737 else |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5738 # endif |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5739 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5740 ++boguscols; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5741 ++col; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5742 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5743 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5744 # endif |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5745 |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5746 # ifdef FEAT_RIGHTLEFT |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5747 if (wp->w_p_rl) |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5748 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5749 --boguscols; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5750 --col; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5751 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5752 else |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5753 # endif |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5754 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5755 ++boguscols; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5756 ++col; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5757 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5758 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5759 else |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5760 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5761 if (n_extra > 0) |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5762 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5763 vcol += n_extra; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5764 n_extra = 0; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5765 n_attr = 0; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5766 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5767 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5768 |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5769 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5770 #endif /* FEAT_CONCEAL */ |
| 7 | 5771 else |
| 5772 --n_skip; | |
| 5773 | |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
5774 /* 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
|
5775 * column. */ |
| 1849 | 5776 if (draw_state > WL_NR |
| 7 | 5777 #ifdef FEAT_DIFF |
| 5778 && filler_todo <= 0 | |
| 5779 #endif | |
| 5780 ) | |
| 5781 ++vcol; | |
| 5782 | |
| 743 | 5783 #ifdef FEAT_SYN_HL |
| 5784 if (vcol_save_attr >= 0) | |
| 5785 char_attr = vcol_save_attr; | |
| 5786 #endif | |
| 5787 | |
| 7 | 5788 /* restore attributes after "predeces" in 'listchars' */ |
| 5789 if (draw_state > WL_NR && n_attr3 > 0 && --n_attr3 == 0) | |
| 5790 char_attr = saved_attr3; | |
| 5791 | |
| 5792 /* restore attributes after last 'listchars' or 'number' char */ | |
| 5793 if (n_attr > 0 && draw_state == WL_LINE && --n_attr == 0) | |
| 5794 char_attr = saved_attr2; | |
| 5795 | |
| 5796 /* | |
| 5797 * At end of screen line and there is more to come: Display the line | |
| 1378 | 5798 * so far. If there is no more to display it is caught above. |
| 7 | 5799 */ |
| 5800 if (( | |
| 5801 #ifdef FEAT_RIGHTLEFT | |
| 5802 wp->w_p_rl ? (col < 0) : | |
| 5803 #endif | |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
5804 (col >= wp->w_width)) |
| 7 | 5805 && (*ptr != NUL |
| 5806 #ifdef FEAT_DIFF | |
| 5807 || filler_todo > 0 | |
| 5808 #endif | |
| 2724 | 5809 || (wp->w_p_list && lcs_eol != NUL && p_extra != at_end_str) |
| 7 | 5810 || (n_extra != 0 && (c_extra != NUL || *p_extra != NUL))) |
| 5811 ) | |
| 5812 { | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5813 #ifdef FEAT_CONCEAL |
|
12513
3ca08bf99396
patch 8.0.1135: W_WINCOL() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12510
diff
changeset
|
5814 screen_line(screen_row, wp->w_wincol, col - boguscols, |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
5815 (int)wp->w_width, HAS_RIGHTLEFT(wp->w_p_rl)); |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5816 boguscols = 0; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5817 #else |
|
12513
3ca08bf99396
patch 8.0.1135: W_WINCOL() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12510
diff
changeset
|
5818 screen_line(screen_row, wp->w_wincol, col, |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
5819 (int)wp->w_width, HAS_RIGHTLEFT(wp->w_p_rl)); |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5820 #endif |
| 7 | 5821 ++row; |
| 5822 ++screen_row; | |
| 5823 | |
| 5824 /* When not wrapping and finished diff lines, or when displayed | |
| 5825 * '$' and highlighting until last column, break here. */ | |
| 5826 if ((!wp->w_p_wrap | |
| 5827 #ifdef FEAT_DIFF | |
| 5828 && filler_todo <= 0 | |
| 5829 #endif | |
| 5830 ) || lcs_eol_one == -1) | |
| 5831 break; | |
| 5832 | |
| 5833 /* When the window is too narrow draw all "@" lines. */ | |
| 5834 if (draw_state != WL_LINE | |
| 5835 #ifdef FEAT_DIFF | |
| 5836 && filler_todo <= 0 | |
| 5837 #endif | |
| 5838 ) | |
| 5839 { | |
| 5840 win_draw_end(wp, '@', ' ', row, wp->w_height, HLF_AT); | |
| 5841 draw_vsep_win(wp, row); | |
| 5842 row = endrow; | |
| 5843 } | |
| 5844 | |
| 5845 /* When line got too long for screen break here. */ | |
| 5846 if (row == endrow) | |
| 5847 { | |
| 5848 ++row; | |
| 5849 break; | |
| 5850 } | |
| 5851 | |
| 5852 if (screen_cur_row == screen_row - 1 | |
| 5853 #ifdef FEAT_DIFF | |
| 5854 && filler_todo <= 0 | |
| 5855 #endif | |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
5856 && wp->w_width == Columns) |
| 7 | 5857 { |
| 5858 /* Remember that the line wraps, used for modeless copy. */ | |
| 5859 LineWraps[screen_row - 1] = TRUE; | |
| 5860 | |
| 5861 /* | |
| 5862 * Special trick to make copy/paste of wrapped lines work with | |
| 5863 * xterm/screen: write an extra character beyond the end of | |
| 5864 * the line. This will work with all terminal types | |
| 5865 * (regardless of the xn,am settings). | |
| 5866 * Only do this on a fast tty. | |
| 5867 * Only do this if the cursor is on the current line | |
| 5868 * (something has been written in it). | |
| 5869 * Don't do this for the GUI. | |
| 5870 * Don't do this for double-width characters. | |
| 5871 * Don't do this for a window not at the right screen border. | |
| 5872 */ | |
| 5873 if (p_tf | |
| 5874 #ifdef FEAT_GUI | |
| 5875 && !gui.in_use | |
| 5876 #endif | |
| 5877 #ifdef FEAT_MBYTE | |
| 5878 && !(has_mbyte | |
| 1378 | 5879 && ((*mb_off2cells)(LineOffset[screen_row], |
| 5880 LineOffset[screen_row] + screen_Columns) | |
| 5881 == 2 | |
| 7 | 5882 || (*mb_off2cells)(LineOffset[screen_row - 1] |
| 1378 | 5883 + (int)Columns - 2, |
| 5884 LineOffset[screen_row] + screen_Columns) | |
| 5885 == 2)) | |
| 7 | 5886 #endif |
| 5887 ) | |
| 5888 { | |
| 5889 /* First make sure we are at the end of the screen line, | |
| 5890 * then output the same character again to let the | |
| 5891 * terminal know about the wrap. If the terminal doesn't | |
| 5892 * auto-wrap, we overwrite the character. */ | |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
5893 if (screen_cur_col != wp->w_width) |
| 7 | 5894 screen_char(LineOffset[screen_row - 1] |
| 5895 + (unsigned)Columns - 1, | |
| 5896 screen_row - 1, (int)(Columns - 1)); | |
| 5897 | |
| 5898 #ifdef FEAT_MBYTE | |
| 5899 /* When there is a multi-byte character, just output a | |
| 5900 * space to keep it simple. */ | |
| 148 | 5901 if (has_mbyte && MB_BYTE2LEN(ScreenLines[LineOffset[ |
| 5902 screen_row - 1] + (Columns - 1)]) > 1) | |
| 7 | 5903 out_char(' '); |
| 5904 else | |
| 5905 #endif | |
| 5906 out_char(ScreenLines[LineOffset[screen_row - 1] | |
| 5907 + (Columns - 1)]); | |
| 5908 /* force a redraw of the first char on the next line */ | |
| 5909 ScreenAttrs[LineOffset[screen_row]] = (sattr_T)-1; | |
| 5910 screen_start(); /* don't know where cursor is now */ | |
| 5911 } | |
| 5912 } | |
| 5913 | |
| 5914 col = 0; | |
| 5915 off = (unsigned)(current_ScreenLine - ScreenLines); | |
| 5916 #ifdef FEAT_RIGHTLEFT | |
| 5917 if (wp->w_p_rl) | |
| 5918 { | |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
5919 col = wp->w_width - 1; /* col is not used if breaking! */ |
| 7 | 5920 off += col; |
| 5921 } | |
| 5922 #endif | |
| 5923 | |
| 5924 /* reset the drawing state for the start of a wrapped line */ | |
| 5925 draw_state = WL_START; | |
| 5926 saved_n_extra = n_extra; | |
| 5927 saved_p_extra = p_extra; | |
| 5928 saved_c_extra = c_extra; | |
| 5929 saved_char_attr = char_attr; | |
| 5930 n_extra = 0; | |
| 5931 lcs_prec_todo = lcs_prec; | |
| 5932 #ifdef FEAT_LINEBREAK | |
| 5933 # ifdef FEAT_DIFF | |
| 5934 if (filler_todo <= 0) | |
| 5935 # endif | |
| 5936 need_showbreak = TRUE; | |
| 5937 #endif | |
| 5938 #ifdef FEAT_DIFF | |
| 5939 --filler_todo; | |
| 5940 /* When the filler lines are actually below the last line of the | |
| 5941 * file, don't draw the line itself, break here. */ | |
| 5942 if (filler_todo == 0 && wp->w_botfill) | |
| 5943 break; | |
| 5944 #endif | |
| 5945 } | |
| 5946 | |
| 5947 } /* for every character in the line */ | |
| 5948 | |
| 743 | 5949 #ifdef FEAT_SPELL |
| 386 | 5950 /* After an empty line check first word for capital. */ |
| 5951 if (*skipwhite(line) == NUL) | |
| 5952 { | |
| 5953 capcol_lnum = lnum + 1; | |
| 5954 cap_col = 0; | |
| 5955 } | |
| 5956 #endif | |
| 5957 | |
|
10690
206ab11fa76e
patch 8.0.0235: memory leak in diff mode
Christian Brabandt <cb@256bit.org>
parents:
10538
diff
changeset
|
5958 vim_free(p_extra_free); |
| 7 | 5959 return row; |
| 5960 } | |
| 5961 | |
| 714 | 5962 #ifdef FEAT_MBYTE |
|
7805
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7697
diff
changeset
|
5963 static int comp_char_differs(int, int); |
| 714 | 5964 |
| 5965 /* | |
| 5966 * 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
|
5967 * Only to be used when ScreenLinesUC[off_from] != 0. |
| 714 | 5968 */ |
| 5969 static int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
5970 comp_char_differs(int off_from, int off_to) |
| 714 | 5971 { |
| 5972 int i; | |
| 5973 | |
| 5974 for (i = 0; i < Screen_mco; ++i) | |
| 5975 { | |
| 5976 if (ScreenLinesC[i][off_from] != ScreenLinesC[i][off_to]) | |
| 5977 return TRUE; | |
| 5978 if (ScreenLinesC[i][off_from] == 0) | |
| 5979 break; | |
| 5980 } | |
| 5981 return FALSE; | |
| 5982 } | |
| 5983 #endif | |
| 5984 | |
| 7 | 5985 /* |
| 5986 * Check whether the given character needs redrawing: | |
| 5987 * - the (first byte of the) character is different | |
| 5988 * - the attributes are different | |
| 5989 * - the character is multi-byte and the next byte is different | |
| 1616 | 5990 * - the character is two cells wide and the second cell differs. |
| 7 | 5991 */ |
| 5992 static int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
5993 char_needs_redraw(int off_from, int off_to, int cols) |
| 7 | 5994 { |
| 5995 if (cols > 0 | |
| 5996 && ((ScreenLines[off_from] != ScreenLines[off_to] | |
| 5997 || ScreenAttrs[off_from] != ScreenAttrs[off_to]) | |
| 5998 | |
| 5999 #ifdef FEAT_MBYTE | |
| 6000 || (enc_dbcs != 0 | |
| 6001 && MB_BYTE2LEN(ScreenLines[off_from]) > 1 | |
| 6002 && (enc_dbcs == DBCS_JPNU && ScreenLines[off_from] == 0x8e | |
| 6003 ? ScreenLines2[off_from] != ScreenLines2[off_to] | |
| 6004 : (cols > 1 && ScreenLines[off_from + 1] | |
| 6005 != ScreenLines[off_to + 1]))) | |
| 6006 || (enc_utf8 | |
| 6007 && (ScreenLinesUC[off_from] != ScreenLinesUC[off_to] | |
| 6008 || (ScreenLinesUC[off_from] != 0 | |
| 1616 | 6009 && comp_char_differs(off_from, off_to)) |
| 3759 | 6010 || ((*mb_off2cells)(off_from, off_from + cols) > 1 |
| 6011 && ScreenLines[off_from + 1] | |
| 6012 != ScreenLines[off_to + 1]))) | |
| 7 | 6013 #endif |
| 6014 )) | |
| 6015 return TRUE; | |
| 6016 return FALSE; | |
| 6017 } | |
| 6018 | |
|
11670
3b2afa2b77b3
patch 8.0.0718: output of job in terminal is not displayed
Christian Brabandt <cb@256bit.org>
parents:
11657
diff
changeset
|
6019 #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
|
6020 /* |
|
3b2afa2b77b3
patch 8.0.0718: output of job in terminal is not displayed
Christian Brabandt <cb@256bit.org>
parents:
11657
diff
changeset
|
6021 * 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
|
6022 */ |
|
3b2afa2b77b3
patch 8.0.0718: output of job in terminal is not displayed
Christian Brabandt <cb@256bit.org>
parents:
11657
diff
changeset
|
6023 int |
|
3b2afa2b77b3
patch 8.0.0718: output of job in terminal is not displayed
Christian Brabandt <cb@256bit.org>
parents:
11657
diff
changeset
|
6024 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
|
6025 { |
|
3b2afa2b77b3
patch 8.0.0718: output of job in terminal is not displayed
Christian Brabandt <cb@256bit.org>
parents:
11657
diff
changeset
|
6026 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
|
6027 } |
|
3b2afa2b77b3
patch 8.0.0718: output of job in terminal is not displayed
Christian Brabandt <cb@256bit.org>
parents:
11657
diff
changeset
|
6028 #endif |
|
3b2afa2b77b3
patch 8.0.0718: output of job in terminal is not displayed
Christian Brabandt <cb@256bit.org>
parents:
11657
diff
changeset
|
6029 |
| 7 | 6030 /* |
| 6031 * Move one "cooked" screen line to the screen, but only the characters that | |
| 6032 * have actually changed. Handle insert/delete character. | |
| 6033 * "coloff" gives the first column on the screen for this line. | |
| 6034 * "endcol" gives the columns where valid characters are. | |
| 6035 * "clear_width" is the width of the window. It's > 0 if the rest of the line | |
| 6036 * needs to be cleared, negative otherwise. | |
| 6037 * "rlflag" is TRUE in a rightleft window: | |
| 6038 * When TRUE and "clear_width" > 0, clear columns 0 to "endcol" | |
| 6039 * When FALSE and "clear_width" > 0, clear columns "endcol" to "clear_width" | |
| 6040 */ | |
|
11670
3b2afa2b77b3
patch 8.0.0718: output of job in terminal is not displayed
Christian Brabandt <cb@256bit.org>
parents:
11657
diff
changeset
|
6041 void |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6042 screen_line( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6043 int row, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6044 int coloff, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6045 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
|
6046 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
|
6047 int rlflag UNUSED) |
| 7 | 6048 { |
| 6049 unsigned off_from; | |
| 6050 unsigned off_to; | |
| 1378 | 6051 #ifdef FEAT_MBYTE |
| 6052 unsigned max_off_from; | |
| 6053 unsigned max_off_to; | |
| 6054 #endif | |
| 7 | 6055 int col = 0; |
| 6056 int hl; | |
| 6057 int force = FALSE; /* force update rest of the line */ | |
| 6058 int redraw_this /* bool: does character need redraw? */ | |
| 6059 #ifdef FEAT_GUI | |
| 6060 = TRUE /* For GUI when while-loop empty */ | |
| 6061 #endif | |
| 6062 ; | |
| 6063 int redraw_next; /* redraw_this for next character */ | |
| 6064 #ifdef FEAT_MBYTE | |
| 6065 int clear_next = FALSE; | |
| 6066 int char_cells; /* 1: normal char */ | |
| 6067 /* 2: occupies two display cells */ | |
| 6068 # define CHAR_CELLS char_cells | |
| 6069 #else | |
| 6070 # define CHAR_CELLS 1 | |
| 6071 #endif | |
| 6072 | |
| 3413 | 6073 /* Check for illegal row and col, just in case. */ |
| 6074 if (row >= Rows) | |
| 6075 row = Rows - 1; | |
| 6076 if (endcol > Columns) | |
| 6077 endcol = Columns; | |
| 6078 | |
| 7 | 6079 # ifdef FEAT_CLIPBOARD |
| 6080 clip_may_clear_selection(row, row); | |
| 6081 # endif | |
| 6082 | |
| 6083 off_from = (unsigned)(current_ScreenLine - ScreenLines); | |
| 6084 off_to = LineOffset[row] + coloff; | |
| 1378 | 6085 #ifdef FEAT_MBYTE |
| 6086 max_off_from = off_from + screen_Columns; | |
| 6087 max_off_to = LineOffset[row] + screen_Columns; | |
| 6088 #endif | |
| 7 | 6089 |
| 6090 #ifdef FEAT_RIGHTLEFT | |
| 6091 if (rlflag) | |
| 6092 { | |
| 6093 /* Clear rest first, because it's left of the text. */ | |
| 6094 if (clear_width > 0) | |
| 6095 { | |
| 6096 while (col <= endcol && ScreenLines[off_to] == ' ' | |
| 6097 && ScreenAttrs[off_to] == 0 | |
| 6098 # ifdef FEAT_MBYTE | |
| 6099 && (!enc_utf8 || ScreenLinesUC[off_to] == 0) | |
| 6100 # endif | |
| 6101 ) | |
| 6102 { | |
| 6103 ++off_to; | |
| 6104 ++col; | |
| 6105 } | |
| 6106 if (col <= endcol) | |
| 6107 screen_fill(row, row + 1, col + coloff, | |
| 6108 endcol + coloff + 1, ' ', ' ', 0); | |
| 6109 } | |
| 6110 col = endcol + 1; | |
| 6111 off_to = LineOffset[row] + col + coloff; | |
| 6112 off_from += col; | |
| 6113 endcol = (clear_width > 0 ? clear_width : -clear_width); | |
| 6114 } | |
| 6115 #endif /* FEAT_RIGHTLEFT */ | |
| 6116 | |
| 6117 redraw_next = char_needs_redraw(off_from, off_to, endcol - col); | |
| 6118 | |
| 6119 while (col < endcol) | |
| 6120 { | |
| 6121 #ifdef FEAT_MBYTE | |
| 6122 if (has_mbyte && (col + 1 < endcol)) | |
| 1378 | 6123 char_cells = (*mb_off2cells)(off_from, max_off_from); |
| 7 | 6124 else |
| 6125 char_cells = 1; | |
| 6126 #endif | |
| 6127 | |
| 6128 redraw_this = redraw_next; | |
| 6129 redraw_next = force || char_needs_redraw(off_from + CHAR_CELLS, | |
| 6130 off_to + CHAR_CELLS, endcol - col - CHAR_CELLS); | |
| 6131 | |
| 6132 #ifdef FEAT_GUI | |
| 6133 /* If the next character was bold, then redraw the current character to | |
| 6134 * remove any pixels that might have spilt over into us. This only | |
| 6135 * happens in the GUI. | |
| 6136 */ | |
| 6137 if (redraw_next && gui.in_use) | |
| 6138 { | |
| 6139 hl = ScreenAttrs[off_to + CHAR_CELLS]; | |
| 743 | 6140 if (hl > HL_ALL) |
| 6141 hl = syn_attr2attr(hl); | |
| 6142 if (hl & HL_BOLD) | |
| 7 | 6143 redraw_this = TRUE; |
| 6144 } | |
| 6145 #endif | |
| 6146 | |
| 6147 if (redraw_this) | |
| 6148 { | |
| 6149 /* | |
| 6150 * Special handling when 'xs' termcap flag set (hpterm): | |
| 6151 * Attributes for characters are stored at the position where the | |
| 6152 * cursor is when writing the highlighting code. The | |
| 6153 * start-highlighting code must be written with the cursor on the | |
| 6154 * first highlighted character. The stop-highlighting code must | |
| 6155 * be written with the cursor just after the last highlighted | |
| 6156 * character. | |
| 6157 * Overwriting a character doesn't remove it's highlighting. Need | |
| 6158 * to clear the rest of the line, and force redrawing it | |
| 6159 * completely. | |
| 6160 */ | |
| 6161 if ( p_wiv | |
| 6162 && !force | |
| 6163 #ifdef FEAT_GUI | |
| 6164 && !gui.in_use | |
| 6165 #endif | |
| 6166 && ScreenAttrs[off_to] != 0 | |
| 6167 && ScreenAttrs[off_from] != ScreenAttrs[off_to]) | |
| 6168 { | |
| 6169 /* | |
| 6170 * Need to remove highlighting attributes here. | |
| 6171 */ | |
| 6172 windgoto(row, col + coloff); | |
| 6173 out_str(T_CE); /* clear rest of this screen line */ | |
| 6174 screen_start(); /* don't know where cursor is now */ | |
| 6175 force = TRUE; /* force redraw of rest of the line */ | |
| 6176 redraw_next = TRUE; /* or else next char would miss out */ | |
| 6177 | |
| 6178 /* | |
| 6179 * If the previous character was highlighted, need to stop | |
| 6180 * highlighting at this character. | |
| 6181 */ | |
| 6182 if (col + coloff > 0 && ScreenAttrs[off_to - 1] != 0) | |
| 6183 { | |
| 6184 screen_attr = ScreenAttrs[off_to - 1]; | |
| 6185 term_windgoto(row, col + coloff); | |
| 6186 screen_stop_highlight(); | |
| 6187 } | |
| 6188 else | |
| 6189 screen_attr = 0; /* highlighting has stopped */ | |
| 6190 } | |
| 6191 #ifdef FEAT_MBYTE | |
| 6192 if (enc_dbcs != 0) | |
| 6193 { | |
| 6194 /* Check if overwriting a double-byte with a single-byte or | |
| 6195 * the other way around requires another character to be | |
| 6196 * redrawn. For UTF-8 this isn't needed, because comparing | |
| 6197 * ScreenLinesUC[] is sufficient. */ | |
| 6198 if (char_cells == 1 | |
| 6199 && col + 1 < endcol | |
| 1378 | 6200 && (*mb_off2cells)(off_to, max_off_to) > 1) |
| 7 | 6201 { |
| 6202 /* Writing a single-cell character over a double-cell | |
| 6203 * character: need to redraw the next cell. */ | |
| 6204 ScreenLines[off_to + 1] = 0; | |
| 6205 redraw_next = TRUE; | |
| 6206 } | |
| 6207 else if (char_cells == 2 | |
| 6208 && col + 2 < endcol | |
| 1378 | 6209 && (*mb_off2cells)(off_to, max_off_to) == 1 |
| 6210 && (*mb_off2cells)(off_to + 1, max_off_to) > 1) | |
| 7 | 6211 { |
| 6212 /* Writing the second half of a double-cell character over | |
| 6213 * a double-cell character: need to redraw the second | |
| 6214 * cell. */ | |
| 6215 ScreenLines[off_to + 2] = 0; | |
| 6216 redraw_next = TRUE; | |
| 6217 } | |
| 6218 | |
| 6219 if (enc_dbcs == DBCS_JPNU) | |
| 6220 ScreenLines2[off_to] = ScreenLines2[off_from]; | |
| 6221 } | |
| 6222 /* When writing a single-width character over a double-width | |
| 6223 * character and at the end of the redrawn text, need to clear out | |
| 6224 * the right halve of the old character. | |
| 6225 * Also required when writing the right halve of a double-width | |
| 6226 * char over the left halve of an existing one. */ | |
| 6227 if (has_mbyte && col + char_cells == endcol | |
| 6228 && ((char_cells == 1 | |
| 1378 | 6229 && (*mb_off2cells)(off_to, max_off_to) > 1) |
| 7 | 6230 || (char_cells == 2 |
| 1378 | 6231 && (*mb_off2cells)(off_to, max_off_to) == 1 |
| 6232 && (*mb_off2cells)(off_to + 1, max_off_to) > 1))) | |
| 7 | 6233 clear_next = TRUE; |
| 6234 #endif | |
| 6235 | |
| 6236 ScreenLines[off_to] = ScreenLines[off_from]; | |
| 6237 #ifdef FEAT_MBYTE | |
| 6238 if (enc_utf8) | |
| 6239 { | |
| 6240 ScreenLinesUC[off_to] = ScreenLinesUC[off_from]; | |
| 6241 if (ScreenLinesUC[off_from] != 0) | |
| 6242 { | |
| 714 | 6243 int i; |
| 6244 | |
| 6245 for (i = 0; i < Screen_mco; ++i) | |
| 6246 ScreenLinesC[i][off_to] = ScreenLinesC[i][off_from]; | |
| 7 | 6247 } |
| 6248 } | |
| 6249 if (char_cells == 2) | |
| 6250 ScreenLines[off_to + 1] = ScreenLines[off_from + 1]; | |
| 6251 #endif | |
| 6252 | |
| 6253 #if defined(FEAT_GUI) || defined(UNIX) | |
| 1843 | 6254 /* The bold trick makes a single column of pixels appear in the |
| 6255 * next character. When a bold character is removed, the next | |
| 7 | 6256 * character should be redrawn too. This happens for our own GUI |
| 6257 * and for some xterms. */ | |
| 6258 if ( | |
| 6259 # ifdef FEAT_GUI | |
| 6260 gui.in_use | |
| 6261 # endif | |
| 6262 # if defined(FEAT_GUI) && defined(UNIX) | |
| 6263 || | |
| 6264 # endif | |
| 6265 # ifdef UNIX | |
| 6266 term_is_xterm | |
| 6267 # endif | |
| 6268 ) | |
| 6269 { | |
| 6270 hl = ScreenAttrs[off_to]; | |
| 743 | 6271 if (hl > HL_ALL) |
| 6272 hl = syn_attr2attr(hl); | |
| 6273 if (hl & HL_BOLD) | |
| 7 | 6274 redraw_next = TRUE; |
| 6275 } | |
| 6276 #endif | |
| 6277 ScreenAttrs[off_to] = ScreenAttrs[off_from]; | |
| 6278 #ifdef FEAT_MBYTE | |
| 819 | 6279 /* For simplicity set the attributes of second half of a |
| 6280 * double-wide character equal to the first half. */ | |
| 6281 if (char_cells == 2) | |
| 6282 ScreenAttrs[off_to + 1] = ScreenAttrs[off_from]; | |
| 6283 | |
| 7 | 6284 if (enc_dbcs != 0 && char_cells == 2) |
| 6285 screen_char_2(off_to, row, col + coloff); | |
| 6286 else | |
| 6287 #endif | |
| 6288 screen_char(off_to, row, col + coloff); | |
| 6289 } | |
| 6290 else if ( p_wiv | |
| 6291 #ifdef FEAT_GUI | |
| 6292 && !gui.in_use | |
| 6293 #endif | |
| 6294 && col + coloff > 0) | |
| 6295 { | |
| 6296 if (ScreenAttrs[off_to] == ScreenAttrs[off_to - 1]) | |
| 6297 { | |
| 6298 /* | |
| 6299 * Don't output stop-highlight when moving the cursor, it will | |
| 6300 * stop the highlighting when it should continue. | |
| 6301 */ | |
| 6302 screen_attr = 0; | |
| 6303 } | |
| 6304 else if (screen_attr != 0) | |
| 6305 screen_stop_highlight(); | |
| 6306 } | |
| 6307 | |
| 6308 off_to += CHAR_CELLS; | |
| 6309 off_from += CHAR_CELLS; | |
| 6310 col += CHAR_CELLS; | |
| 6311 } | |
| 6312 | |
| 6313 #ifdef FEAT_MBYTE | |
| 6314 if (clear_next) | |
| 6315 { | |
| 6316 /* Clear the second half of a double-wide character of which the left | |
| 6317 * half was overwritten with a single-wide character. */ | |
| 6318 ScreenLines[off_to] = ' '; | |
| 6319 if (enc_utf8) | |
| 6320 ScreenLinesUC[off_to] = 0; | |
| 6321 screen_char(off_to, row, col + coloff); | |
| 6322 } | |
| 6323 #endif | |
| 6324 | |
| 6325 if (clear_width > 0 | |
| 6326 #ifdef FEAT_RIGHTLEFT | |
| 6327 && !rlflag | |
| 6328 #endif | |
| 6329 ) | |
| 6330 { | |
| 6331 #ifdef FEAT_GUI | |
| 6332 int startCol = col; | |
| 6333 #endif | |
| 6334 | |
| 6335 /* blank out the rest of the line */ | |
| 6336 while (col < clear_width && ScreenLines[off_to] == ' ' | |
| 6337 && ScreenAttrs[off_to] == 0 | |
| 6338 #ifdef FEAT_MBYTE | |
| 6339 && (!enc_utf8 || ScreenLinesUC[off_to] == 0) | |
| 6340 #endif | |
| 6341 ) | |
| 6342 { | |
| 6343 ++off_to; | |
| 6344 ++col; | |
| 6345 } | |
| 6346 if (col < clear_width) | |
| 6347 { | |
| 6348 #ifdef FEAT_GUI | |
| 6349 /* | |
| 6350 * In the GUI, clearing the rest of the line may leave pixels | |
| 6351 * behind if the first character cleared was bold. Some bold | |
| 6352 * fonts spill over the left. In this case we redraw the previous | |
| 6353 * character too. If we didn't skip any blanks above, then we | |
| 6354 * only redraw if the character wasn't already redrawn anyway. | |
| 6355 */ | |
| 996 | 6356 if (gui.in_use && (col > startCol || !redraw_this)) |
| 7 | 6357 { |
| 6358 hl = ScreenAttrs[off_to]; | |
| 6359 if (hl > HL_ALL || (hl & HL_BOLD)) | |
| 996 | 6360 { |
| 6361 int prev_cells = 1; | |
| 6362 # ifdef FEAT_MBYTE | |
| 6363 if (enc_utf8) | |
| 6364 /* for utf-8, ScreenLines[char_offset + 1] == 0 means | |
| 6365 * that its width is 2. */ | |
| 6366 prev_cells = ScreenLines[off_to - 1] == 0 ? 2 : 1; | |
| 6367 else if (enc_dbcs != 0) | |
| 6368 { | |
| 6369 /* find previous character by counting from first | |
| 6370 * column and get its width. */ | |
| 6371 unsigned off = LineOffset[row]; | |
| 1378 | 6372 unsigned max_off = LineOffset[row] + screen_Columns; |
| 996 | 6373 |
| 6374 while (off < off_to) | |
| 6375 { | |
| 1378 | 6376 prev_cells = (*mb_off2cells)(off, max_off); |
| 996 | 6377 off += prev_cells; |
| 6378 } | |
| 6379 } | |
| 6380 | |
| 6381 if (enc_dbcs != 0 && prev_cells > 1) | |
| 6382 screen_char_2(off_to - prev_cells, row, | |
| 6383 col + coloff - prev_cells); | |
| 6384 else | |
| 6385 # endif | |
| 6386 screen_char(off_to - prev_cells, row, | |
| 6387 col + coloff - prev_cells); | |
| 6388 } | |
| 7 | 6389 } |
| 6390 #endif | |
| 6391 screen_fill(row, row + 1, col + coloff, clear_width + coloff, | |
| 6392 ' ', ' ', 0); | |
| 6393 off_to += clear_width - col; | |
| 6394 col = clear_width; | |
| 6395 } | |
| 6396 } | |
| 6397 | |
| 6398 if (clear_width > 0) | |
| 6399 { | |
| 6400 /* For a window that's left of another, draw the separator char. */ | |
| 6401 if (col + coloff < Columns) | |
| 6402 { | |
| 6403 int c; | |
| 6404 | |
| 6405 c = fillchar_vsep(&hl); | |
| 6477 | 6406 if (ScreenLines[off_to] != (schar_T)c |
|
12477
68d7bc045dbe
patch 8.0.1118: FEAT_WINDOWS adds a lot of #ifdefs
Christian Brabandt <cb@256bit.org>
parents:
12441
diff
changeset
|
6407 #ifdef FEAT_MBYTE |
| 714 | 6408 || (enc_utf8 && (int)ScreenLinesUC[off_to] |
| 6409 != (c >= 0x80 ? c : 0)) | |
|
12477
68d7bc045dbe
patch 8.0.1118: FEAT_WINDOWS adds a lot of #ifdefs
Christian Brabandt <cb@256bit.org>
parents:
12441
diff
changeset
|
6410 #endif |
| 7 | 6411 || ScreenAttrs[off_to] != hl) |
| 6412 { | |
| 6413 ScreenLines[off_to] = c; | |
| 6414 ScreenAttrs[off_to] = hl; | |
|
12477
68d7bc045dbe
patch 8.0.1118: FEAT_WINDOWS adds a lot of #ifdefs
Christian Brabandt <cb@256bit.org>
parents:
12441
diff
changeset
|
6415 #ifdef FEAT_MBYTE |
| 7 | 6416 if (enc_utf8) |
| 6417 { | |
| 6418 if (c >= 0x80) | |
| 6419 { | |
| 6420 ScreenLinesUC[off_to] = c; | |
| 714 | 6421 ScreenLinesC[0][off_to] = 0; |
| 7 | 6422 } |
| 6423 else | |
| 6424 ScreenLinesUC[off_to] = 0; | |
| 6425 } | |
|
12477
68d7bc045dbe
patch 8.0.1118: FEAT_WINDOWS adds a lot of #ifdefs
Christian Brabandt <cb@256bit.org>
parents:
12441
diff
changeset
|
6426 #endif |
| 7 | 6427 screen_char(off_to, row, col + coloff); |
| 6428 } | |
| 6429 } | |
| 6430 else | |
| 6431 LineWraps[row] = FALSE; | |
| 6432 } | |
| 6433 } | |
| 6434 | |
| 474 | 6435 #if defined(FEAT_RIGHTLEFT) || defined(PROTO) |
| 7 | 6436 /* |
| 474 | 6437 * Mirror text "str" for right-left displaying. |
| 6438 * Only works for single-byte characters (e.g., numbers). | |
| 7 | 6439 */ |
| 474 | 6440 void |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6441 rl_mirror(char_u *str) |
| 7 | 6442 { |
| 6443 char_u *p1, *p2; | |
| 6444 int t; | |
| 6445 | |
| 6446 for (p1 = str, p2 = str + STRLEN(str) - 1; p1 < p2; ++p1, --p2) | |
| 6447 { | |
| 6448 t = *p1; | |
| 6449 *p1 = *p2; | |
| 6450 *p2 = t; | |
| 6451 } | |
| 6452 } | |
| 6453 #endif | |
| 6454 | |
| 6455 /* | |
| 6456 * mark all status lines for redraw; used after first :cd | |
| 6457 */ | |
| 6458 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6459 status_redraw_all(void) |
| 7 | 6460 { |
| 6461 win_T *wp; | |
| 6462 | |
|
9649
fd9727ae3c49
commit https://github.com/vim/vim/commit/2932359000b2f918d5fade79ea4d124d5943cd07
Christian Brabandt <cb@256bit.org>
parents:
9645
diff
changeset
|
6463 FOR_ALL_WINDOWS(wp) |
| 7 | 6464 if (wp->w_status_height) |
| 6465 { | |
| 6466 wp->w_redr_status = TRUE; | |
| 6467 redraw_later(VALID); | |
| 6468 } | |
| 6469 } | |
| 6470 | |
| 6471 /* | |
| 6472 * mark all status lines of the current buffer for redraw | |
| 6473 */ | |
| 6474 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6475 status_redraw_curbuf(void) |
| 7 | 6476 { |
| 6477 win_T *wp; | |
| 6478 | |
|
9649
fd9727ae3c49
commit https://github.com/vim/vim/commit/2932359000b2f918d5fade79ea4d124d5943cd07
Christian Brabandt <cb@256bit.org>
parents:
9645
diff
changeset
|
6479 FOR_ALL_WINDOWS(wp) |
| 7 | 6480 if (wp->w_status_height != 0 && wp->w_buffer == curbuf) |
| 6481 { | |
| 6482 wp->w_redr_status = TRUE; | |
| 6483 redraw_later(VALID); | |
| 6484 } | |
| 6485 } | |
| 6486 | |
| 6487 /* | |
| 6488 * Redraw all status lines that need to be redrawn. | |
| 6489 */ | |
| 6490 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6491 redraw_statuslines(void) |
| 7 | 6492 { |
| 6493 win_T *wp; | |
| 6494 | |
|
9649
fd9727ae3c49
commit https://github.com/vim/vim/commit/2932359000b2f918d5fade79ea4d124d5943cd07
Christian Brabandt <cb@256bit.org>
parents:
9645
diff
changeset
|
6495 FOR_ALL_WINDOWS(wp) |
| 7 | 6496 if (wp->w_redr_status) |
| 6497 win_redr_status(wp); | |
| 673 | 6498 if (redraw_tabline) |
| 677 | 6499 draw_tabline(); |
| 7 | 6500 } |
|
12477
68d7bc045dbe
patch 8.0.1118: FEAT_WINDOWS adds a lot of #ifdefs
Christian Brabandt <cb@256bit.org>
parents:
12441
diff
changeset
|
6501 |
|
68d7bc045dbe
patch 8.0.1118: FEAT_WINDOWS adds a lot of #ifdefs
Christian Brabandt <cb@256bit.org>
parents:
12441
diff
changeset
|
6502 #if defined(FEAT_WILDMENU) || defined(PROTO) |
| 7 | 6503 /* |
| 6504 * Redraw all status lines at the bottom of frame "frp". | |
| 6505 */ | |
| 6506 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6507 win_redraw_last_status(frame_T *frp) |
| 7 | 6508 { |
| 6509 if (frp->fr_layout == FR_LEAF) | |
| 6510 frp->fr_win->w_redr_status = TRUE; | |
| 6511 else if (frp->fr_layout == FR_ROW) | |
| 6512 { | |
| 6513 for (frp = frp->fr_child; frp != NULL; frp = frp->fr_next) | |
| 6514 win_redraw_last_status(frp); | |
| 6515 } | |
| 6516 else /* frp->fr_layout == FR_COL */ | |
| 6517 { | |
| 6518 frp = frp->fr_child; | |
| 6519 while (frp->fr_next != NULL) | |
| 6520 frp = frp->fr_next; | |
| 6521 win_redraw_last_status(frp); | |
| 6522 } | |
| 6523 } | |
| 6524 #endif | |
| 6525 | |
| 6526 /* | |
| 6527 * Draw the verticap separator right of window "wp" starting with line "row". | |
| 6528 */ | |
| 6529 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6530 draw_vsep_win(win_T *wp, int row) |
| 7 | 6531 { |
| 6532 int hl; | |
| 6533 int c; | |
| 6534 | |
| 6535 if (wp->w_vsep_width) | |
| 6536 { | |
| 6537 /* draw the vertical separator right of this window */ | |
| 6538 c = fillchar_vsep(&hl); | |
| 6539 screen_fill(W_WINROW(wp) + row, W_WINROW(wp) + wp->w_height, | |
| 6540 W_ENDCOL(wp), W_ENDCOL(wp) + 1, | |
| 6541 c, ' ', hl); | |
| 6542 } | |
| 6543 } | |
| 6544 | |
| 6545 #ifdef FEAT_WILDMENU | |
|
7805
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7697
diff
changeset
|
6546 static int status_match_len(expand_T *xp, char_u *s); |
|
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7697
diff
changeset
|
6547 static int skip_status_match_char(expand_T *xp, char_u *s); |
| 7 | 6548 |
| 6549 /* | |
| 1378 | 6550 * Get the length of an item as it will be shown in the status line. |
| 7 | 6551 */ |
| 6552 static int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6553 status_match_len(expand_T *xp, char_u *s) |
| 7 | 6554 { |
| 6555 int len = 0; | |
| 6556 | |
| 6557 #ifdef FEAT_MENU | |
| 6558 int emenu = (xp->xp_context == EXPAND_MENUS | |
| 6559 || xp->xp_context == EXPAND_MENUNAMES); | |
| 6560 | |
| 6561 /* Check for menu separators - replace with '|'. */ | |
| 6562 if (emenu && menu_is_separator(s)) | |
| 6563 return 1; | |
| 6564 #endif | |
| 6565 | |
| 6566 while (*s != NUL) | |
| 6567 { | |
| 1685 | 6568 s += skip_status_match_char(xp, s); |
| 42 | 6569 len += ptr2cells(s); |
|
11127
506f5d8b7d8b
patch 8.0.0451: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11121
diff
changeset
|
6570 MB_PTR_ADV(s); |
| 7 | 6571 } |
| 6572 | |
| 6573 return len; | |
| 6574 } | |
| 6575 | |
| 6576 /* | |
| 1685 | 6577 * Return the number of characters that should be skipped in a status match. |
| 277 | 6578 * These are backslashes used for escaping. Do show backslashes in help tags. |
| 6579 */ | |
| 6580 static int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6581 skip_status_match_char(expand_T *xp, char_u *s) |
| 277 | 6582 { |
| 1685 | 6583 if ((rem_backslash(s) && xp->xp_context != EXPAND_HELP) |
| 277 | 6584 #ifdef FEAT_MENU |
| 6585 || ((xp->xp_context == EXPAND_MENUS | |
| 6586 || xp->xp_context == EXPAND_MENUNAMES) | |
| 6587 && (s[0] == '\t' || (s[0] == '\\' && s[1] != NUL))) | |
| 6588 #endif | |
| 1685 | 6589 ) |
| 6590 { | |
| 6591 #ifndef BACKSLASH_IN_FILENAME | |
| 6592 if (xp->xp_shell && csh_like_shell() && s[1] == '\\' && s[2] == '!') | |
| 6593 return 2; | |
| 6594 #endif | |
| 6595 return 1; | |
| 6596 } | |
| 6597 return 0; | |
| 277 | 6598 } |
| 6599 | |
| 6600 /* | |
| 7 | 6601 * Show wildchar matches in the status line. |
| 6602 * Show at least the "match" item. | |
| 6603 * We start at item 'first_match' in the list and show all matches that fit. | |
| 6604 * | |
| 6605 * If inversion is possible we use it. Else '=' characters are used. | |
| 6606 */ | |
| 6607 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6608 win_redr_status_matches( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6609 expand_T *xp, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6610 int num_matches, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6611 char_u **matches, /* list of matches */ |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6612 int match, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6613 int showtail) |
| 7 | 6614 { |
| 6615 #define L_MATCH(m) (showtail ? sm_gettail(matches[m]) : matches[m]) | |
| 6616 int row; | |
| 6617 char_u *buf; | |
| 6618 int len; | |
| 1378 | 6619 int clen; /* length in screen cells */ |
| 7 | 6620 int fillchar; |
| 6621 int attr; | |
| 6622 int i; | |
| 6623 int highlight = TRUE; | |
| 6624 char_u *selstart = NULL; | |
| 6625 int selstart_col = 0; | |
| 6626 char_u *selend = NULL; | |
| 6627 static int first_match = 0; | |
| 6628 int add_left = FALSE; | |
| 6629 char_u *s; | |
| 6630 #ifdef FEAT_MENU | |
| 6631 int emenu; | |
| 6632 #endif | |
| 6633 #if defined(FEAT_MBYTE) || defined(FEAT_MENU) | |
| 6634 int l; | |
| 6635 #endif | |
| 6636 | |
| 6637 if (matches == NULL) /* interrupted completion? */ | |
| 6638 return; | |
| 6639 | |
| 39 | 6640 #ifdef FEAT_MBYTE |
| 6641 if (has_mbyte) | |
| 6642 buf = alloc((unsigned)Columns * MB_MAXBYTES + 1); | |
| 6643 else | |
| 6644 #endif | |
| 6645 buf = alloc((unsigned)Columns + 1); | |
| 7 | 6646 if (buf == NULL) |
| 6647 return; | |
| 6648 | |
| 6649 if (match == -1) /* don't show match but original text */ | |
| 6650 { | |
| 6651 match = 0; | |
| 6652 highlight = FALSE; | |
| 6653 } | |
| 6654 /* count 1 for the ending ">" */ | |
| 6655 clen = status_match_len(xp, L_MATCH(match)) + 3; | |
| 6656 if (match == 0) | |
| 6657 first_match = 0; | |
| 6658 else if (match < first_match) | |
| 6659 { | |
| 6660 /* jumping left, as far as we can go */ | |
| 6661 first_match = match; | |
| 6662 add_left = TRUE; | |
| 6663 } | |
| 6664 else | |
| 6665 { | |
| 6666 /* check if match fits on the screen */ | |
| 6667 for (i = first_match; i < match; ++i) | |
| 6668 clen += status_match_len(xp, L_MATCH(i)) + 2; | |
| 6669 if (first_match > 0) | |
| 6670 clen += 2; | |
| 6671 /* jumping right, put match at the left */ | |
| 6672 if ((long)clen > Columns) | |
| 6673 { | |
| 6674 first_match = match; | |
| 6675 /* if showing the last match, we can add some on the left */ | |
| 6676 clen = 2; | |
| 6677 for (i = match; i < num_matches; ++i) | |
| 6678 { | |
| 6679 clen += status_match_len(xp, L_MATCH(i)) + 2; | |
| 6680 if ((long)clen >= Columns) | |
| 6681 break; | |
| 6682 } | |
| 6683 if (i == num_matches) | |
| 6684 add_left = TRUE; | |
| 6685 } | |
| 6686 } | |
| 6687 if (add_left) | |
| 6688 while (first_match > 0) | |
| 6689 { | |
| 6690 clen += status_match_len(xp, L_MATCH(first_match - 1)) + 2; | |
| 6691 if ((long)clen >= Columns) | |
| 6692 break; | |
| 6693 --first_match; | |
| 6694 } | |
| 6695 | |
|
11890
318ae82d8ba4
patch 8.0.0825: not easy to see that a window is a terminal window
Christian Brabandt <cb@256bit.org>
parents:
11866
diff
changeset
|
6696 fillchar = fillchar_status(&attr, curwin); |
| 7 | 6697 |
| 6698 if (first_match == 0) | |
| 6699 { | |
| 6700 *buf = NUL; | |
| 6701 len = 0; | |
| 6702 } | |
| 6703 else | |
| 6704 { | |
| 6705 STRCPY(buf, "< "); | |
| 6706 len = 2; | |
| 6707 } | |
| 6708 clen = len; | |
| 6709 | |
| 6710 i = first_match; | |
| 6711 while ((long)(clen + status_match_len(xp, L_MATCH(i)) + 2) < Columns) | |
| 6712 { | |
| 6713 if (i == match) | |
| 6714 { | |
| 6715 selstart = buf + len; | |
| 6716 selstart_col = clen; | |
| 6717 } | |
| 6718 | |
| 6719 s = L_MATCH(i); | |
| 6720 /* Check for menu separators - replace with '|' */ | |
| 6721 #ifdef FEAT_MENU | |
| 6722 emenu = (xp->xp_context == EXPAND_MENUS | |
| 6723 || xp->xp_context == EXPAND_MENUNAMES); | |
| 6724 if (emenu && menu_is_separator(s)) | |
| 6725 { | |
| 6726 STRCPY(buf + len, transchar('|')); | |
| 6727 l = (int)STRLEN(buf + len); | |
| 6728 len += l; | |
| 6729 clen += l; | |
| 6730 } | |
| 6731 else | |
| 6732 #endif | |
| 6733 for ( ; *s != NUL; ++s) | |
| 6734 { | |
| 1685 | 6735 s += skip_status_match_char(xp, s); |
| 7 | 6736 clen += ptr2cells(s); |
| 6737 #ifdef FEAT_MBYTE | |
| 474 | 6738 if (has_mbyte && (l = (*mb_ptr2len)(s)) > 1) |
| 7 | 6739 { |
| 6740 STRNCPY(buf + len, s, l); | |
| 6741 s += l - 1; | |
| 6742 len += l; | |
| 6743 } | |
| 6744 else | |
| 6745 #endif | |
| 6746 { | |
| 6747 STRCPY(buf + len, transchar_byte(*s)); | |
| 6748 len += (int)STRLEN(buf + len); | |
| 6749 } | |
| 6750 } | |
| 6751 if (i == match) | |
| 6752 selend = buf + len; | |
| 6753 | |
| 6754 *(buf + len++) = ' '; | |
| 6755 *(buf + len++) = ' '; | |
| 6756 clen += 2; | |
| 6757 if (++i == num_matches) | |
| 6758 break; | |
| 6759 } | |
| 6760 | |
| 6761 if (i != num_matches) | |
| 6762 { | |
| 6763 *(buf + len++) = '>'; | |
| 6764 ++clen; | |
| 6765 } | |
| 6766 | |
| 6767 buf[len] = NUL; | |
| 6768 | |
| 6769 row = cmdline_row - 1; | |
| 6770 if (row >= 0) | |
| 6771 { | |
| 6772 if (wild_menu_showing == 0) | |
| 6773 { | |
| 6774 if (msg_scrolled > 0) | |
| 6775 { | |
| 6776 /* Put the wildmenu just above the command line. If there is | |
| 6777 * no room, scroll the screen one line up. */ | |
| 6778 if (cmdline_row == Rows - 1) | |
| 6779 { | |
|
12152
69af108df70e
patch 8.0.0956: scrolling in a terminal window has flicker
Christian Brabandt <cb@256bit.org>
parents:
12122
diff
changeset
|
6780 screen_del_lines(0, 0, 1, (int)Rows, TRUE, 0, NULL); |
| 7 | 6781 ++msg_scrolled; |
| 6782 } | |
| 6783 else | |
| 6784 { | |
| 6785 ++cmdline_row; | |
| 6786 ++row; | |
| 6787 } | |
| 6788 wild_menu_showing = WM_SCROLLED; | |
| 6789 } | |
| 6790 else | |
| 6791 { | |
| 6792 /* Create status line if needed by setting 'laststatus' to 2. | |
| 6793 * Set 'winminheight' to zero to avoid that the window is | |
| 6794 * resized. */ | |
| 6795 if (lastwin->w_status_height == 0) | |
| 6796 { | |
| 6797 save_p_ls = p_ls; | |
| 6798 save_p_wmh = p_wmh; | |
| 6799 p_ls = 2; | |
| 6800 p_wmh = 0; | |
| 6801 last_status(FALSE); | |
| 6802 } | |
| 6803 wild_menu_showing = WM_SHOWN; | |
| 6804 } | |
| 6805 } | |
| 6806 | |
| 6807 screen_puts(buf, row, 0, attr); | |
| 6808 if (selstart != NULL && highlight) | |
| 6809 { | |
| 6810 *selend = NUL; | |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
6811 screen_puts(selstart, row, selstart_col, HL_ATTR(HLF_WM)); |
| 7 | 6812 } |
| 6813 | |
| 6814 screen_fill(row, row + 1, clen, (int)Columns, fillchar, fillchar, attr); | |
| 6815 } | |
| 6816 | |
| 6817 win_redraw_last_status(topframe); | |
| 6818 vim_free(buf); | |
| 6819 } | |
| 6820 #endif | |
| 6821 | |
| 6822 /* | |
| 6823 * Redraw the status line of window wp. | |
| 6824 * | |
| 6825 * If inversion is possible we use it. Else '=' characters are used. | |
| 6826 */ | |
| 6827 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6828 win_redr_status(win_T *wp) |
| 7 | 6829 { |
| 6830 int row; | |
| 6831 char_u *p; | |
| 6832 int len; | |
| 6833 int fillchar; | |
| 6834 int attr; | |
| 6835 int this_ru_col; | |
| 1910 | 6836 static int busy = FALSE; |
| 6837 | |
| 6838 /* It's possible to get here recursively when 'statusline' (indirectly) | |
| 6839 * invokes ":redrawstatus". Simply ignore the call then. */ | |
| 6840 if (busy) | |
| 6841 return; | |
| 6842 busy = TRUE; | |
| 7 | 6843 |
| 6844 wp->w_redr_status = FALSE; | |
| 6845 if (wp->w_status_height == 0) | |
| 6846 { | |
| 6847 /* no status line, can only be last window */ | |
| 6848 redraw_cmdline = TRUE; | |
| 6849 } | |
| 540 | 6850 else if (!redrawing() |
| 6851 #ifdef FEAT_INS_EXPAND | |
| 6852 /* don't update status line when popup menu is visible and may be | |
| 6853 * drawn over it */ | |
| 6854 || pum_visible() | |
| 6855 #endif | |
| 6856 ) | |
| 7 | 6857 { |
| 6858 /* Don't redraw right now, do it later. */ | |
| 6859 wp->w_redr_status = TRUE; | |
| 6860 } | |
| 6861 #ifdef FEAT_STL_OPT | |
| 40 | 6862 else if (*p_stl != NUL || *wp->w_p_stl != NUL) |
| 7 | 6863 { |
| 6864 /* redraw custom status line */ | |
| 1983 | 6865 redraw_custom_statusline(wp); |
| 7 | 6866 } |
| 6867 #endif | |
| 6868 else | |
| 6869 { | |
|
11890
318ae82d8ba4
patch 8.0.0825: not easy to see that a window is a terminal window
Christian Brabandt <cb@256bit.org>
parents:
11866
diff
changeset
|
6870 fillchar = fillchar_status(&attr, wp); |
| 7 | 6871 |
| 685 | 6872 get_trans_bufname(wp->w_buffer); |
| 7 | 6873 p = NameBuff; |
| 6874 len = (int)STRLEN(p); | |
| 6875 | |
|
11834
0cfe4a07c2ad
patch 8.0.0797: finished job in terminal window is not handled
Christian Brabandt <cb@256bit.org>
parents:
11698
diff
changeset
|
6876 if (bt_help(wp->w_buffer) |
| 7 | 6877 #ifdef FEAT_QUICKFIX |
| 6878 || wp->w_p_pvw | |
| 6879 #endif | |
| 6880 || bufIsChanged(wp->w_buffer) | |
| 6881 || wp->w_buffer->b_p_ro) | |
| 6882 *(p + len++) = ' '; | |
|
11834
0cfe4a07c2ad
patch 8.0.0797: finished job in terminal window is not handled
Christian Brabandt <cb@256bit.org>
parents:
11698
diff
changeset
|
6883 if (bt_help(wp->w_buffer)) |
| 7 | 6884 { |
| 809 | 6885 STRCPY(p + len, _("[Help]")); |
| 7 | 6886 len += (int)STRLEN(p + len); |
| 6887 } | |
| 6888 #ifdef FEAT_QUICKFIX | |
| 6889 if (wp->w_p_pvw) | |
| 6890 { | |
| 6891 STRCPY(p + len, _("[Preview]")); | |
| 6892 len += (int)STRLEN(p + len); | |
| 6893 } | |
| 6894 #endif | |
|
11981
cf36b424ea03
patch 8.0.0871: status line for a terminal window always has "[+]".
Christian Brabandt <cb@256bit.org>
parents:
11915
diff
changeset
|
6895 if (bufIsChanged(wp->w_buffer) |
|
cf36b424ea03
patch 8.0.0871: status line for a terminal window always has "[+]".
Christian Brabandt <cb@256bit.org>
parents:
11915
diff
changeset
|
6896 #ifdef FEAT_TERMINAL |
|
cf36b424ea03
patch 8.0.0871: status line for a terminal window always has "[+]".
Christian Brabandt <cb@256bit.org>
parents:
11915
diff
changeset
|
6897 && !bt_terminal(wp->w_buffer) |
|
cf36b424ea03
patch 8.0.0871: status line for a terminal window always has "[+]".
Christian Brabandt <cb@256bit.org>
parents:
11915
diff
changeset
|
6898 #endif |
|
cf36b424ea03
patch 8.0.0871: status line for a terminal window always has "[+]".
Christian Brabandt <cb@256bit.org>
parents:
11915
diff
changeset
|
6899 ) |
| 7 | 6900 { |
| 6901 STRCPY(p + len, "[+]"); | |
| 6902 len += 3; | |
| 6903 } | |
| 6904 if (wp->w_buffer->b_p_ro) | |
| 6905 { | |
|
4795
8360a59aa04b
updated for version 7.3.1144
Bram Moolenaar <bram@vim.org>
parents:
4736
diff
changeset
|
6906 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
|
6907 len += (int)STRLEN(p + len); |
| 7 | 6908 } |
| 6909 | |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
6910 this_ru_col = ru_col - (Columns - wp->w_width); |
|
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
6911 if (this_ru_col < (wp->w_width + 1) / 2) |
|
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
6912 this_ru_col = (wp->w_width + 1) / 2; |
| 7 | 6913 if (this_ru_col <= 1) |
| 6914 { | |
| 6915 p = (char_u *)"<"; /* No room for file name! */ | |
| 6916 len = 1; | |
| 6917 } | |
| 6918 else | |
| 6919 #ifdef FEAT_MBYTE | |
| 6920 if (has_mbyte) | |
| 6921 { | |
| 6922 int clen = 0, i; | |
| 6923 | |
| 6924 /* Count total number of display cells. */ | |
|
2338
da6ec32d8d8f
Added strwidth() and strchars() functions.
Bram Moolenaar <bram@vim.org>
parents:
2332
diff
changeset
|
6925 clen = mb_string2cells(p, -1); |
|
da6ec32d8d8f
Added strwidth() and strchars() functions.
Bram Moolenaar <bram@vim.org>
parents:
2332
diff
changeset
|
6926 |
| 7 | 6927 /* Find first character that will fit. |
| 6928 * Going from start to end is much faster for DBCS. */ | |
| 6929 for (i = 0; p[i] != NUL && clen >= this_ru_col - 1; | |
| 474 | 6930 i += (*mb_ptr2len)(p + i)) |
| 7 | 6931 clen -= (*mb_ptr2cells)(p + i); |
| 6932 len = clen; | |
| 6933 if (i > 0) | |
| 6934 { | |
| 6935 p = p + i - 1; | |
| 6936 *p = '<'; | |
| 6937 ++len; | |
| 6938 } | |
| 6939 | |
| 6940 } | |
| 6941 else | |
| 6942 #endif | |
| 6943 if (len > this_ru_col - 1) | |
| 6944 { | |
| 6945 p += len - (this_ru_col - 1); | |
| 6946 *p = '<'; | |
| 6947 len = this_ru_col - 1; | |
| 6948 } | |
| 6949 | |
| 6950 row = W_WINROW(wp) + wp->w_height; | |
|
12513
3ca08bf99396
patch 8.0.1135: W_WINCOL() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12510
diff
changeset
|
6951 screen_puts(p, row, wp->w_wincol, attr); |
|
3ca08bf99396
patch 8.0.1135: W_WINCOL() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12510
diff
changeset
|
6952 screen_fill(row, row + 1, len + wp->w_wincol, |
|
3ca08bf99396
patch 8.0.1135: W_WINCOL() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12510
diff
changeset
|
6953 this_ru_col + wp->w_wincol, fillchar, fillchar, attr); |
| 7 | 6954 |
|
9645
123d3c102035
commit https://github.com/vim/vim/commit/73ac0c4281a3606651604a3cbcc334bfb3859a87
Christian Brabandt <cb@256bit.org>
parents:
9489
diff
changeset
|
6955 if (get_keymap_str(wp, (char_u *)"<%s>", NameBuff, MAXPATHL) |
| 7 | 6956 && (int)(this_ru_col - len) > (int)(STRLEN(NameBuff) + 1)) |
| 6957 screen_puts(NameBuff, row, (int)(this_ru_col - STRLEN(NameBuff) | |
|
12513
3ca08bf99396
patch 8.0.1135: W_WINCOL() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12510
diff
changeset
|
6958 - 1 + wp->w_wincol), attr); |
| 7 | 6959 |
| 6960 #ifdef FEAT_CMDL_INFO | |
| 6961 win_redr_ruler(wp, TRUE); | |
| 6962 #endif | |
| 6963 } | |
| 6964 | |
| 6965 /* | |
| 6966 * May need to draw the character below the vertical separator. | |
| 6967 */ | |
| 6968 if (wp->w_vsep_width != 0 && wp->w_status_height != 0 && redrawing()) | |
| 6969 { | |
| 6970 if (stl_connected(wp)) | |
|
11890
318ae82d8ba4
patch 8.0.0825: not easy to see that a window is a terminal window
Christian Brabandt <cb@256bit.org>
parents:
11866
diff
changeset
|
6971 fillchar = fillchar_status(&attr, wp); |
| 7 | 6972 else |
| 6973 fillchar = fillchar_vsep(&attr); | |
| 6974 screen_putchar(fillchar, W_WINROW(wp) + wp->w_height, W_ENDCOL(wp), | |
| 6975 attr); | |
| 6976 } | |
| 1910 | 6977 busy = FALSE; |
| 7 | 6978 } |
| 6979 | |
| 680 | 6980 #ifdef FEAT_STL_OPT |
| 6981 /* | |
| 6982 * Redraw the status line according to 'statusline' and take care of any | |
| 6983 * errors encountered. | |
| 6984 */ | |
| 6985 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6986 redraw_custom_statusline(win_T *wp) |
| 680 | 6987 { |
| 1983 | 6988 static int entered = FALSE; |
|
8847
470ea7526cc6
commit https://github.com/vim/vim/commit/a742e084b677f76c67e9e52c4f9fb9ab24002e20
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
6989 int saved_did_emsg = did_emsg; |
| 1983 | 6990 |
| 6991 /* When called recursively return. This can happen when the statusline | |
| 6992 * contains an expression that triggers a redraw. */ | |
| 6993 if (entered) | |
| 6994 return; | |
| 6995 entered = TRUE; | |
| 680 | 6996 |
|
8847
470ea7526cc6
commit https://github.com/vim/vim/commit/a742e084b677f76c67e9e52c4f9fb9ab24002e20
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
6997 did_emsg = FALSE; |
| 680 | 6998 win_redr_custom(wp, FALSE); |
|
8847
470ea7526cc6
commit https://github.com/vim/vim/commit/a742e084b677f76c67e9e52c4f9fb9ab24002e20
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
6999 if (did_emsg) |
| 1983 | 7000 { |
| 7001 /* When there is an error disable the statusline, otherwise the | |
| 7002 * display is messed up with errors and a redraw triggers the problem | |
| 7003 * again and again. */ | |
| 680 | 7004 set_string_option_direct((char_u *)"statusline", -1, |
| 7005 (char_u *)"", OPT_FREE | (*wp->w_p_stl != NUL | |
| 694 | 7006 ? OPT_LOCAL : OPT_GLOBAL), SID_ERROR); |
| 1983 | 7007 } |
|
8847
470ea7526cc6
commit https://github.com/vim/vim/commit/a742e084b677f76c67e9e52c4f9fb9ab24002e20
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
7008 did_emsg |= saved_did_emsg; |
| 1983 | 7009 entered = FALSE; |
| 680 | 7010 } |
| 7011 #endif | |
| 7012 | |
| 7 | 7013 /* |
| 7014 * Return TRUE if the status line of window "wp" is connected to the status | |
| 7015 * line of the window right of it. If not, then it's a vertical separator. | |
| 7016 * Only call if (wp->w_vsep_width != 0). | |
| 7017 */ | |
| 7018 int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7019 stl_connected(win_T *wp) |
| 7 | 7020 { |
| 7021 frame_T *fr; | |
| 7022 | |
| 7023 fr = wp->w_frame; | |
| 7024 while (fr->fr_parent != NULL) | |
| 7025 { | |
| 7026 if (fr->fr_parent->fr_layout == FR_COL) | |
| 7027 { | |
| 7028 if (fr->fr_next != NULL) | |
| 7029 break; | |
| 7030 } | |
| 7031 else | |
| 7032 { | |
| 7033 if (fr->fr_next != NULL) | |
| 7034 return TRUE; | |
| 7035 } | |
| 7036 fr = fr->fr_parent; | |
| 7037 } | |
| 7038 return FALSE; | |
| 7039 } | |
| 7040 | |
|
12477
68d7bc045dbe
patch 8.0.1118: FEAT_WINDOWS adds a lot of #ifdefs
Christian Brabandt <cb@256bit.org>
parents:
12441
diff
changeset
|
7041 |
| 7 | 7042 /* |
| 7043 * Get the value to show for the language mappings, active 'keymap'. | |
| 7044 */ | |
| 7045 int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7046 get_keymap_str( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7047 win_T *wp, |
|
9645
123d3c102035
commit https://github.com/vim/vim/commit/73ac0c4281a3606651604a3cbcc334bfb3859a87
Christian Brabandt <cb@256bit.org>
parents:
9489
diff
changeset
|
7048 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
|
7049 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
|
7050 int len) /* length of buffer */ |
| 7 | 7051 { |
| 7052 char_u *p; | |
| 7053 | |
| 7054 if (wp->w_buffer->b_p_iminsert != B_IMODE_LMAP) | |
| 7055 return FALSE; | |
| 7056 | |
| 7057 { | |
| 7058 #ifdef FEAT_EVAL | |
| 7059 buf_T *old_curbuf = curbuf; | |
| 7060 win_T *old_curwin = curwin; | |
| 7061 char_u *s; | |
| 7062 | |
| 7063 curbuf = wp->w_buffer; | |
| 7064 curwin = wp; | |
| 7065 STRCPY(buf, "b:keymap_name"); /* must be writable */ | |
| 7066 ++emsg_skip; | |
| 714 | 7067 s = p = eval_to_string(buf, NULL, FALSE); |
| 7 | 7068 --emsg_skip; |
| 7069 curbuf = old_curbuf; | |
| 7070 curwin = old_curwin; | |
| 7071 if (p == NULL || *p == NUL) | |
| 7072 #endif | |
| 7073 { | |
| 7074 #ifdef FEAT_KEYMAP | |
| 7075 if (wp->w_buffer->b_kmap_state & KEYMAP_LOADED) | |
| 7076 p = wp->w_buffer->b_p_keymap; | |
| 7077 else | |
| 7078 #endif | |
| 7079 p = (char_u *)"lang"; | |
| 7080 } | |
|
9645
123d3c102035
commit https://github.com/vim/vim/commit/73ac0c4281a3606651604a3cbcc334bfb3859a87
Christian Brabandt <cb@256bit.org>
parents:
9489
diff
changeset
|
7081 if (vim_snprintf((char *)buf, len, (char *)fmt, p) > len - 1) |
| 7 | 7082 buf[0] = NUL; |
| 7083 #ifdef FEAT_EVAL | |
| 7084 vim_free(s); | |
| 7085 #endif | |
| 7086 } | |
| 7087 return buf[0] != NUL; | |
| 7088 } | |
| 7089 | |
| 7090 #if defined(FEAT_STL_OPT) || defined(PROTO) | |
| 7091 /* | |
| 677 | 7092 * Redraw the status line or ruler of window "wp". |
| 7093 * When "wp" is NULL redraw the tab pages line from 'tabline'. | |
| 7 | 7094 */ |
| 7095 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7096 win_redr_custom( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7097 win_T *wp, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7098 int draw_ruler) /* TRUE or FALSE */ |
| 7 | 7099 { |
| 5539 | 7100 static int entered = FALSE; |
| 7 | 7101 int attr; |
| 7102 int curattr; | |
| 7103 int row; | |
| 7104 int col = 0; | |
| 7105 int maxwidth; | |
| 7106 int width; | |
| 7107 int n; | |
| 7108 int len; | |
| 7109 int fillchar; | |
| 7110 char_u buf[MAXPATHL]; | |
| 1983 | 7111 char_u *stl; |
| 7 | 7112 char_u *p; |
| 681 | 7113 struct stl_hlrec hltab[STL_MAX_ITEM]; |
| 7114 struct stl_hlrec tabtab[STL_MAX_ITEM]; | |
| 677 | 7115 int use_sandbox = FALSE; |
| 2693 | 7116 win_T *ewp; |
| 7117 int p_crb_save; | |
| 7 | 7118 |
| 5539 | 7119 /* There is a tiny chance that this gets called recursively: When |
| 7120 * redrawing a status line triggers redrawing the ruler or tabline. | |
| 7121 * Avoid trouble by not allowing recursion. */ | |
| 7122 if (entered) | |
| 7123 return; | |
| 7124 entered = TRUE; | |
| 7125 | |
| 7 | 7126 /* setup environment for the task at hand */ |
| 677 | 7127 if (wp == NULL) |
| 7128 { | |
| 7129 /* Use 'tabline'. Always at the first line of the screen. */ | |
| 1983 | 7130 stl = p_tal; |
| 677 | 7131 row = 0; |
| 707 | 7132 fillchar = ' '; |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
7133 attr = HL_ATTR(HLF_TPF); |
| 677 | 7134 maxwidth = Columns; |
| 7135 # ifdef FEAT_EVAL | |
| 681 | 7136 use_sandbox = was_set_insecurely((char_u *)"tabline", 0); |
| 677 | 7137 # endif |
| 7138 } | |
| 40 | 7139 else |
| 677 | 7140 { |
| 7141 row = W_WINROW(wp) + wp->w_height; | |
|
11890
318ae82d8ba4
patch 8.0.0825: not easy to see that a window is a terminal window
Christian Brabandt <cb@256bit.org>
parents:
11866
diff
changeset
|
7142 fillchar = fillchar_status(&attr, wp); |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
7143 maxwidth = wp->w_width; |
| 677 | 7144 |
| 7145 if (draw_ruler) | |
| 7146 { | |
| 1983 | 7147 stl = p_ruf; |
| 677 | 7148 /* advance past any leading group spec - implicit in ru_col */ |
| 1983 | 7149 if (*stl == '%') |
| 7150 { | |
| 7151 if (*++stl == '-') | |
| 7152 stl++; | |
| 7153 if (atoi((char *)stl)) | |
| 7154 while (VIM_ISDIGIT(*stl)) | |
| 7155 stl++; | |
| 7156 if (*stl++ != '(') | |
| 7157 stl = p_ruf; | |
| 677 | 7158 } |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
7159 col = ru_col - (Columns - wp->w_width); |
|
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
7160 if (col < (wp->w_width + 1) / 2) |
|
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
7161 col = (wp->w_width + 1) / 2; |
|
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
7162 maxwidth = wp->w_width - col; |
| 677 | 7163 if (!wp->w_status_height) |
| 7164 { | |
| 7165 row = Rows - 1; | |
| 7166 --maxwidth; /* writing in last column may cause scrolling */ | |
| 7167 fillchar = ' '; | |
| 7168 attr = 0; | |
| 7169 } | |
| 7170 | |
| 7171 # ifdef FEAT_EVAL | |
| 681 | 7172 use_sandbox = was_set_insecurely((char_u *)"rulerformat", 0); |
| 677 | 7173 # endif |
| 7174 } | |
| 7175 else | |
| 7176 { | |
| 7177 if (*wp->w_p_stl != NUL) | |
| 1983 | 7178 stl = wp->w_p_stl; |
| 677 | 7179 else |
| 1983 | 7180 stl = p_stl; |
| 677 | 7181 # ifdef FEAT_EVAL |
| 681 | 7182 use_sandbox = was_set_insecurely((char_u *)"statusline", |
| 7183 *wp->w_p_stl == NUL ? 0 : OPT_LOCAL); | |
| 677 | 7184 # endif |
| 7185 } | |
| 7186 | |
|
12513
3ca08bf99396
patch 8.0.1135: W_WINCOL() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12510
diff
changeset
|
7187 col += wp->w_wincol; |
| 677 | 7188 } |
| 7189 | |
| 7 | 7190 if (maxwidth <= 0) |
| 5539 | 7191 goto theend; |
| 677 | 7192 |
| 2693 | 7193 /* Temporarily reset 'cursorbind', we don't want a side effect from moving |
| 7194 * the cursor away and back. */ | |
| 7195 ewp = wp == NULL ? curwin : wp; | |
| 7196 p_crb_save = ewp->w_p_crb; | |
| 7197 ewp->w_p_crb = FALSE; | |
| 7198 | |
| 1983 | 7199 /* Make a copy, because the statusline may include a function call that |
| 7200 * might change the option value and free the memory. */ | |
| 7201 stl = vim_strsave(stl); | |
| 2693 | 7202 width = build_stl_str_hl(ewp, buf, sizeof(buf), |
| 1983 | 7203 stl, use_sandbox, |
| 681 | 7204 fillchar, maxwidth, hltab, tabtab); |
| 1983 | 7205 vim_free(stl); |
| 2693 | 7206 ewp->w_p_crb = p_crb_save; |
| 2661 | 7207 |
| 7208 /* Make all characters printable. */ | |
| 7209 p = transstr(buf); | |
| 7210 if (p != NULL) | |
| 7211 { | |
| 7212 vim_strncpy(buf, p, sizeof(buf) - 1); | |
| 7213 vim_free(p); | |
| 7214 } | |
| 7215 | |
| 7216 /* fill up with "fillchar" */ | |
| 835 | 7217 len = (int)STRLEN(buf); |
| 1883 | 7218 while (width < maxwidth && len < (int)sizeof(buf) - 1) |
| 7 | 7219 { |
| 7220 #ifdef FEAT_MBYTE | |
| 7221 len += (*mb_char2bytes)(fillchar, buf + len); | |
| 7222 #else | |
| 7223 buf[len++] = fillchar; | |
| 7224 #endif | |
| 7225 ++width; | |
| 7226 } | |
| 7227 buf[len] = NUL; | |
| 7228 | |
| 681 | 7229 /* |
| 7230 * Draw each snippet with the specified highlighting. | |
| 7231 */ | |
| 7 | 7232 curattr = attr; |
| 7233 p = buf; | |
| 681 | 7234 for (n = 0; hltab[n].start != NULL; n++) |
| 7235 { | |
| 7236 len = (int)(hltab[n].start - p); | |
| 7 | 7237 screen_puts_len(p, len, row, col, curattr); |
| 7238 col += vim_strnsize(p, len); | |
| 681 | 7239 p = hltab[n].start; |
| 7240 | |
| 7241 if (hltab[n].userhl == 0) | |
| 7 | 7242 curattr = attr; |
| 681 | 7243 else if (hltab[n].userhl < 0) |
| 7244 curattr = syn_id2attr(-hltab[n].userhl); | |
|
12477
68d7bc045dbe
patch 8.0.1118: FEAT_WINDOWS adds a lot of #ifdefs
Christian Brabandt <cb@256bit.org>
parents:
12441
diff
changeset
|
7245 #ifdef FEAT_TERMINAL |
|
12122
68c593f649d1
patch 8.0.0941: existing color schemes don't like StatusLineTerm
Christian Brabandt <cb@256bit.org>
parents:
12114
diff
changeset
|
7246 else if (wp != NULL && wp != curwin && bt_terminal(wp->w_buffer) |
|
68c593f649d1
patch 8.0.0941: existing color schemes don't like StatusLineTerm
Christian Brabandt <cb@256bit.org>
parents:
12114
diff
changeset
|
7247 && wp->w_status_height != 0) |
|
68c593f649d1
patch 8.0.0941: existing color schemes don't like StatusLineTerm
Christian Brabandt <cb@256bit.org>
parents:
12114
diff
changeset
|
7248 curattr = highlight_stltermnc[hltab[n].userhl - 1]; |
|
12114
f306e6decaf9
patch 8.0.0937: user highlight groups not adjusted for terminal
Christian Brabandt <cb@256bit.org>
parents:
11981
diff
changeset
|
7249 else if (wp != NULL && bt_terminal(wp->w_buffer) |
|
f306e6decaf9
patch 8.0.0937: user highlight groups not adjusted for terminal
Christian Brabandt <cb@256bit.org>
parents:
11981
diff
changeset
|
7250 && wp->w_status_height != 0) |
|
f306e6decaf9
patch 8.0.0937: user highlight groups not adjusted for terminal
Christian Brabandt <cb@256bit.org>
parents:
11981
diff
changeset
|
7251 curattr = highlight_stlterm[hltab[n].userhl - 1]; |
|
12477
68d7bc045dbe
patch 8.0.1118: FEAT_WINDOWS adds a lot of #ifdefs
Christian Brabandt <cb@256bit.org>
parents:
12441
diff
changeset
|
7252 #endif |
| 680 | 7253 else if (wp != NULL && wp != curwin && wp->w_status_height != 0) |
| 681 | 7254 curattr = highlight_stlnc[hltab[n].userhl - 1]; |
| 7 | 7255 else |
| 681 | 7256 curattr = highlight_user[hltab[n].userhl - 1]; |
| 7 | 7257 } |
| 7258 screen_puts(p, row, col, curattr); | |
| 681 | 7259 |
| 7260 if (wp == NULL) | |
| 7261 { | |
| 7262 /* Fill the TabPageIdxs[] array for clicking in the tab pagesline. */ | |
| 7263 col = 0; | |
| 7264 len = 0; | |
| 7265 p = buf; | |
| 7266 fillchar = 0; | |
| 7267 for (n = 0; tabtab[n].start != NULL; n++) | |
| 7268 { | |
| 7269 len += vim_strnsize(p, (int)(tabtab[n].start - p)); | |
| 7270 while (col < len) | |
| 7271 TabPageIdxs[col++] = fillchar; | |
| 7272 p = tabtab[n].start; | |
| 7273 fillchar = tabtab[n].userhl; | |
| 7274 } | |
| 7275 while (col < Columns) | |
| 7276 TabPageIdxs[col++] = fillchar; | |
| 7277 } | |
| 5539 | 7278 |
| 7279 theend: | |
| 7280 entered = FALSE; | |
| 7 | 7281 } |
| 7282 | |
| 7283 #endif /* FEAT_STL_OPT */ | |
| 7284 | |
| 7285 /* | |
| 7286 * Output a single character directly to the screen and update ScreenLines. | |
| 7287 */ | |
| 7288 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7289 screen_putchar(int c, int row, int col, int attr) |
| 7 | 7290 { |
| 3549 | 7291 char_u buf[MB_MAXBYTES + 1]; |
| 7292 | |
| 7 | 7293 #ifdef FEAT_MBYTE |
| 3549 | 7294 if (has_mbyte) |
| 7295 buf[(*mb_char2bytes)(c, buf)] = NUL; | |
| 7296 else | |
| 7297 #endif | |
| 7298 { | |
| 7299 buf[0] = c; | |
| 7300 buf[1] = NUL; | |
| 7301 } | |
| 7 | 7302 screen_puts(buf, row, col, attr); |
| 7303 } | |
| 7304 | |
| 7305 /* | |
| 7306 * Get a single character directly from ScreenLines into "bytes[]". | |
| 7307 * Also return its attribute in *attrp; | |
| 7308 */ | |
| 7309 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7310 screen_getbytes(int row, int col, char_u *bytes, int *attrp) |
| 7 | 7311 { |
| 7312 unsigned off; | |
| 7313 | |
| 7314 /* safety check */ | |
| 7315 if (ScreenLines != NULL && row < screen_Rows && col < screen_Columns) | |
| 7316 { | |
| 7317 off = LineOffset[row] + col; | |
| 7318 *attrp = ScreenAttrs[off]; | |
| 7319 bytes[0] = ScreenLines[off]; | |
| 7320 bytes[1] = NUL; | |
| 7321 | |
| 7322 #ifdef FEAT_MBYTE | |
| 7323 if (enc_utf8 && ScreenLinesUC[off] != 0) | |
| 7324 bytes[utfc_char2bytes(off, bytes)] = NUL; | |
| 7325 else if (enc_dbcs == DBCS_JPNU && ScreenLines[off] == 0x8e) | |
| 7326 { | |
| 7327 bytes[0] = ScreenLines[off]; | |
| 7328 bytes[1] = ScreenLines2[off]; | |
| 7329 bytes[2] = NUL; | |
| 7330 } | |
| 7331 else if (enc_dbcs && MB_BYTE2LEN(bytes[0]) > 1) | |
| 7332 { | |
| 7333 bytes[1] = ScreenLines[off + 1]; | |
| 7334 bytes[2] = NUL; | |
| 7335 } | |
| 7336 #endif | |
| 7337 } | |
| 7338 } | |
| 7339 | |
| 714 | 7340 #ifdef FEAT_MBYTE |
|
7805
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7697
diff
changeset
|
7341 static int screen_comp_differs(int, int*); |
| 714 | 7342 |
| 7343 /* | |
| 7344 * Return TRUE if composing characters for screen posn "off" differs from | |
| 7345 * composing characters in "u8cc". | |
|
2124
dc8a5699253b
updated for version 7.2.406
Bram Moolenaar <bram@zimbu.org>
parents:
2122
diff
changeset
|
7346 * Only to be used when ScreenLinesUC[off] != 0. |
| 714 | 7347 */ |
| 7348 static int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7349 screen_comp_differs(int off, int *u8cc) |
| 714 | 7350 { |
| 7351 int i; | |
| 7352 | |
| 7353 for (i = 0; i < Screen_mco; ++i) | |
| 7354 { | |
| 7355 if (ScreenLinesC[i][off] != (u8char_T)u8cc[i]) | |
| 7356 return TRUE; | |
| 7357 if (u8cc[i] == 0) | |
| 7358 break; | |
| 7359 } | |
| 7360 return FALSE; | |
| 7361 } | |
| 7362 #endif | |
| 7363 | |
| 7 | 7364 /* |
| 7365 * Put string '*text' on the screen at position 'row' and 'col', with | |
| 7366 * attributes 'attr', and update ScreenLines[] and ScreenAttrs[]. | |
| 7367 * Note: only outputs within one row, message is truncated at screen boundary! | |
| 7368 * Note: if ScreenLines[], row and/or col is invalid, nothing is done. | |
| 7369 */ | |
| 7370 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7371 screen_puts( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7372 char_u *text, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7373 int row, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7374 int col, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7375 int attr) |
| 7 | 7376 { |
| 7377 screen_puts_len(text, -1, row, col, attr); | |
| 7378 } | |
| 7379 | |
| 7380 /* | |
| 7381 * Like screen_puts(), but output "text[len]". When "len" is -1 output up to | |
| 7382 * a NUL. | |
| 7383 */ | |
| 7384 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7385 screen_puts_len( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7386 char_u *text, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7387 int textlen, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7388 int row, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7389 int col, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7390 int attr) |
| 7 | 7391 { |
| 7392 unsigned off; | |
| 7393 char_u *ptr = text; | |
| 5923 | 7394 int len = textlen; |
| 7 | 7395 int c; |
| 7396 #ifdef FEAT_MBYTE | |
| 1378 | 7397 unsigned max_off; |
| 7 | 7398 int mbyte_blen = 1; |
| 7399 int mbyte_cells = 1; | |
| 7400 int u8c = 0; | |
| 714 | 7401 int u8cc[MAX_MCO]; |
| 7 | 7402 int clear_next_cell = FALSE; |
| 7403 # ifdef FEAT_ARABIC | |
| 7404 int prev_c = 0; /* previous Arabic character */ | |
| 714 | 7405 int pc, nc, nc1; |
| 7406 int pcc[MAX_MCO]; | |
| 7 | 7407 # endif |
| 7408 #endif | |
| 1843 | 7409 #if defined(FEAT_MBYTE) || defined(FEAT_GUI) || defined(UNIX) |
| 7410 int force_redraw_this; | |
| 7411 int force_redraw_next = FALSE; | |
| 7412 #endif | |
| 7413 int need_redraw; | |
| 7 | 7414 |
| 7415 if (ScreenLines == NULL || row >= screen_Rows) /* safety check */ | |
| 7416 return; | |
| 1843 | 7417 off = LineOffset[row] + col; |
| 7 | 7418 |
| 1668 | 7419 #ifdef FEAT_MBYTE |
| 7420 /* When drawing over the right halve of a double-wide char clear out the | |
| 7421 * left halve. Only needed in a terminal. */ | |
| 1685 | 7422 if (has_mbyte && col > 0 && col < screen_Columns |
| 1668 | 7423 # ifdef FEAT_GUI |
| 7424 && !gui.in_use | |
| 7425 # endif | |
| 7426 && mb_fix_col(col, row) != col) | |
| 1843 | 7427 { |
| 7428 ScreenLines[off - 1] = ' '; | |
| 7429 ScreenAttrs[off - 1] = 0; | |
| 7430 if (enc_utf8) | |
| 7431 { | |
| 7432 ScreenLinesUC[off - 1] = 0; | |
| 7433 ScreenLinesC[0][off - 1] = 0; | |
| 7434 } | |
| 7435 /* redraw the previous cell, make it empty */ | |
| 7436 screen_char(off - 1, row, col - 1); | |
| 7437 /* force the cell at "col" to be redrawn */ | |
| 7438 force_redraw_next = TRUE; | |
| 7439 } | |
| 7440 #endif | |
| 7441 | |
| 1378 | 7442 #ifdef FEAT_MBYTE |
| 7443 max_off = LineOffset[row] + screen_Columns; | |
| 7444 #endif | |
| 1340 | 7445 while (col < screen_Columns |
| 7446 && (len < 0 || (int)(ptr - text) < len) | |
| 7447 && *ptr != NUL) | |
| 7 | 7448 { |
| 7449 c = *ptr; | |
| 7450 #ifdef FEAT_MBYTE | |
| 7451 /* check if this is the first byte of a multibyte */ | |
| 7452 if (has_mbyte) | |
| 7453 { | |
| 7454 if (enc_utf8 && len > 0) | |
| 474 | 7455 mbyte_blen = utfc_ptr2len_len(ptr, (int)((text + len) - ptr)); |
| 7 | 7456 else |
| 474 | 7457 mbyte_blen = (*mb_ptr2len)(ptr); |
| 7 | 7458 if (enc_dbcs == DBCS_JPNU && c == 0x8e) |
| 7459 mbyte_cells = 1; | |
| 7460 else if (enc_dbcs != 0) | |
| 7461 mbyte_cells = mbyte_blen; | |
| 7462 else /* enc_utf8 */ | |
| 7463 { | |
| 7464 if (len >= 0) | |
| 714 | 7465 u8c = utfc_ptr2char_len(ptr, u8cc, |
| 7 | 7466 (int)((text + len) - ptr)); |
| 7467 else | |
| 714 | 7468 u8c = utfc_ptr2char(ptr, u8cc); |
| 7 | 7469 mbyte_cells = utf_char2cells(u8c); |
| 1401 | 7470 # ifdef UNICODE16 |
| 7 | 7471 /* Non-BMP character: display as ? or fullwidth ?. */ |
| 7472 if (u8c >= 0x10000) | |
| 7473 { | |
| 7474 u8c = (mbyte_cells == 2) ? 0xff1f : (int)'?'; | |
| 7475 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
|
7476 attr = HL_ATTR(HLF_8); |
| 7 | 7477 } |
| 1401 | 7478 # endif |
| 7 | 7479 # ifdef FEAT_ARABIC |
| 7480 if (p_arshape && !p_tbidi && ARABIC_CHAR(u8c)) | |
| 7481 { | |
| 7482 /* Do Arabic shaping. */ | |
| 7483 if (len >= 0 && (int)(ptr - text) + mbyte_blen >= len) | |
| 7484 { | |
| 7485 /* Past end of string to be displayed. */ | |
| 7486 nc = NUL; | |
| 7487 nc1 = NUL; | |
| 7488 } | |
| 7489 else | |
| 714 | 7490 { |
| 1994 | 7491 nc = utfc_ptr2char_len(ptr + mbyte_blen, pcc, |
| 7492 (int)((text + len) - ptr - mbyte_blen)); | |
| 714 | 7493 nc1 = pcc[0]; |
| 7494 } | |
| 7 | 7495 pc = prev_c; |
| 7496 prev_c = u8c; | |
| 714 | 7497 u8c = arabic_shape(u8c, &c, &u8cc[0], nc, nc1, pc); |
| 7 | 7498 } |
| 7499 else | |
| 7500 prev_c = u8c; | |
| 7501 # endif | |
|
2055
4aa4510d548c
updated for version 7.2.341
Bram Moolenaar <bram@zimbu.org>
parents:
2008
diff
changeset
|
7502 if (col + mbyte_cells > screen_Columns) |
|
4aa4510d548c
updated for version 7.2.341
Bram Moolenaar <bram@zimbu.org>
parents:
2008
diff
changeset
|
7503 { |
|
4aa4510d548c
updated for version 7.2.341
Bram Moolenaar <bram@zimbu.org>
parents:
2008
diff
changeset
|
7504 /* 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
|
7505 * 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
|
7506 c = '>'; |
|
4aa4510d548c
updated for version 7.2.341
Bram Moolenaar <bram@zimbu.org>
parents:
2008
diff
changeset
|
7507 mbyte_cells = 1; |
|
4aa4510d548c
updated for version 7.2.341
Bram Moolenaar <bram@zimbu.org>
parents:
2008
diff
changeset
|
7508 } |
| 7 | 7509 } |
| 7510 } | |
| 7511 #endif | |
| 7512 | |
| 1843 | 7513 #if defined(FEAT_MBYTE) || defined(FEAT_GUI) || defined(UNIX) |
| 7514 force_redraw_this = force_redraw_next; | |
| 7515 force_redraw_next = FALSE; | |
| 7516 #endif | |
| 7517 | |
| 7518 need_redraw = ScreenLines[off] != c | |
| 7 | 7519 #ifdef FEAT_MBYTE |
| 7520 || (mbyte_cells == 2 | |
| 7521 && ScreenLines[off + 1] != (enc_dbcs ? ptr[1] : 0)) | |
| 7522 || (enc_dbcs == DBCS_JPNU | |
| 7523 && c == 0x8e | |
| 7524 && ScreenLines2[off] != ptr[1]) | |
| 7525 || (enc_utf8 | |
|
2124
dc8a5699253b
updated for version 7.2.406
Bram Moolenaar <bram@zimbu.org>
parents:
2122
diff
changeset
|
7526 && (ScreenLinesUC[off] != |
|
dc8a5699253b
updated for version 7.2.406
Bram Moolenaar <bram@zimbu.org>
parents:
2122
diff
changeset
|
7527 (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
|
7528 || (ScreenLinesUC[off] != 0 |
|
dc8a5699253b
updated for version 7.2.406
Bram Moolenaar <bram@zimbu.org>
parents:
2122
diff
changeset
|
7529 && screen_comp_differs(off, u8cc)))) |
| 7 | 7530 #endif |
| 7531 || ScreenAttrs[off] != attr | |
| 1843 | 7532 || exmode_active; |
| 7533 | |
| 7534 if (need_redraw | |
| 7535 #if defined(FEAT_MBYTE) || defined(FEAT_GUI) || defined(UNIX) | |
| 7536 || force_redraw_this | |
| 7537 #endif | |
| 7 | 7538 ) |
| 7539 { | |
| 7540 #if defined(FEAT_GUI) || defined(UNIX) | |
| 7541 /* The bold trick makes a single row of pixels appear in the next | |
| 7542 * character. When a bold character is removed, the next | |
| 7543 * character should be redrawn too. This happens for our own GUI | |
| 1843 | 7544 * and for some xterms. */ |
| 7545 if (need_redraw && ScreenLines[off] != ' ' && ( | |
| 7 | 7546 # ifdef FEAT_GUI |
| 7547 gui.in_use | |
| 7548 # endif | |
| 7549 # if defined(FEAT_GUI) && defined(UNIX) | |
| 7550 || | |
| 7551 # endif | |
| 7552 # ifdef UNIX | |
| 7553 term_is_xterm | |
| 7554 # endif | |
| 1843 | 7555 )) |
| 7556 { | |
| 7557 int n = ScreenAttrs[off]; | |
| 7558 | |
| 7559 if (n > HL_ALL) | |
| 7560 n = syn_attr2attr(n); | |
| 7561 if (n & HL_BOLD) | |
| 7562 force_redraw_next = TRUE; | |
| 7 | 7563 } |
| 7564 #endif | |
| 7565 #ifdef FEAT_MBYTE | |
| 7566 /* When at the end of the text and overwriting a two-cell | |
| 7567 * character with a one-cell character, need to clear the next | |
| 7568 * cell. Also when overwriting the left halve of a two-cell char | |
| 7569 * with the right halve of a two-cell char. Do this only once | |
| 7570 * (mb_off2cells() may return 2 on the right halve). */ | |
| 7571 if (clear_next_cell) | |
| 7572 clear_next_cell = FALSE; | |
| 7573 else if (has_mbyte | |
| 7574 && (len < 0 ? ptr[mbyte_blen] == NUL | |
| 7575 : ptr + mbyte_blen >= text + len) | |
| 1378 | 7576 && ((mbyte_cells == 1 && (*mb_off2cells)(off, max_off) > 1) |
| 7 | 7577 || (mbyte_cells == 2 |
| 1378 | 7578 && (*mb_off2cells)(off, max_off) == 1 |
| 7579 && (*mb_off2cells)(off + 1, max_off) > 1))) | |
| 7 | 7580 clear_next_cell = TRUE; |
| 7581 | |
| 7582 /* Make sure we never leave a second byte of a double-byte behind, | |
| 7583 * it confuses mb_off2cells(). */ | |
| 7584 if (enc_dbcs | |
| 1378 | 7585 && ((mbyte_cells == 1 && (*mb_off2cells)(off, max_off) > 1) |
| 7 | 7586 || (mbyte_cells == 2 |
| 1378 | 7587 && (*mb_off2cells)(off, max_off) == 1 |
| 7588 && (*mb_off2cells)(off + 1, max_off) > 1))) | |
| 7 | 7589 ScreenLines[off + mbyte_blen] = 0; |
| 7590 #endif | |
| 7591 ScreenLines[off] = c; | |
| 7592 ScreenAttrs[off] = attr; | |
| 7593 #ifdef FEAT_MBYTE | |
| 7594 if (enc_utf8) | |
| 7595 { | |
| 714 | 7596 if (c < 0x80 && u8cc[0] == 0) |
| 7 | 7597 ScreenLinesUC[off] = 0; |
| 7598 else | |
| 7599 { | |
| 714 | 7600 int i; |
| 7601 | |
| 7 | 7602 ScreenLinesUC[off] = u8c; |
| 714 | 7603 for (i = 0; i < Screen_mco; ++i) |
| 7604 { | |
| 7605 ScreenLinesC[i][off] = u8cc[i]; | |
| 7606 if (u8cc[i] == 0) | |
| 7607 break; | |
| 7608 } | |
| 7 | 7609 } |
| 7610 if (mbyte_cells == 2) | |
| 7611 { | |
| 7612 ScreenLines[off + 1] = 0; | |
| 7613 ScreenAttrs[off + 1] = attr; | |
| 7614 } | |
| 7615 screen_char(off, row, col); | |
| 7616 } | |
| 7617 else if (mbyte_cells == 2) | |
| 7618 { | |
| 7619 ScreenLines[off + 1] = ptr[1]; | |
| 7620 ScreenAttrs[off + 1] = attr; | |
| 7621 screen_char_2(off, row, col); | |
| 7622 } | |
| 7623 else if (enc_dbcs == DBCS_JPNU && c == 0x8e) | |
| 7624 { | |
| 7625 ScreenLines2[off] = ptr[1]; | |
| 7626 screen_char(off, row, col); | |
| 7627 } | |
| 7628 else | |
| 7629 #endif | |
| 7630 screen_char(off, row, col); | |
| 7631 } | |
| 7632 #ifdef FEAT_MBYTE | |
| 7633 if (has_mbyte) | |
| 7634 { | |
| 7635 off += mbyte_cells; | |
| 7636 col += mbyte_cells; | |
| 7637 ptr += mbyte_blen; | |
| 7638 if (clear_next_cell) | |
| 5923 | 7639 { |
| 7640 /* This only happens at the end, display one space next. */ | |
| 7 | 7641 ptr = (char_u *)" "; |
| 5923 | 7642 len = -1; |
| 7643 } | |
| 7 | 7644 } |
| 7645 else | |
| 7646 #endif | |
| 7647 { | |
| 7648 ++off; | |
| 7649 ++col; | |
| 7650 ++ptr; | |
| 7651 } | |
| 7652 } | |
| 1843 | 7653 |
| 7654 #if defined(FEAT_MBYTE) || defined(FEAT_GUI) || defined(UNIX) | |
| 7655 /* If we detected the next character needs to be redrawn, but the text | |
| 7656 * doesn't extend up to there, update the character here. */ | |
| 7657 if (force_redraw_next && col < screen_Columns) | |
| 7658 { | |
| 7659 # ifdef FEAT_MBYTE | |
| 7660 if (enc_dbcs != 0 && dbcs_off2cells(off, max_off) > 1) | |
| 7661 screen_char_2(off, row, col); | |
| 7662 else | |
| 7663 # endif | |
| 7664 screen_char(off, row, col); | |
| 7665 } | |
| 7666 #endif | |
| 7 | 7667 } |
| 7668 | |
| 7669 #ifdef FEAT_SEARCH_EXTRA | |
| 7670 /* | |
| 1326 | 7671 * Prepare for 'hlsearch' highlighting. |
| 7 | 7672 */ |
| 7673 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7674 start_search_hl(void) |
| 7 | 7675 { |
| 7676 if (p_hls && !no_hlsearch) | |
| 7677 { | |
| 7678 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
|
7679 search_hl.attr = HL_ATTR(HLF_L); |
| 1521 | 7680 # ifdef FEAT_RELTIME |
| 7681 /* Set the time limit to 'redrawtime'. */ | |
| 7682 profile_setlimit(p_rdt, &search_hl.tm); | |
| 7683 # endif | |
| 7 | 7684 } |
| 7685 } | |
| 7686 | |
| 7687 /* | |
| 1326 | 7688 * Clean up for 'hlsearch' highlighting. |
| 7 | 7689 */ |
| 7690 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7691 end_search_hl(void) |
| 7 | 7692 { |
| 7693 if (search_hl.rm.regprog != NULL) | |
| 7694 { | |
|
4805
66803af09906
updated for version 7.3.1149
Bram Moolenaar <bram@vim.org>
parents:
4795
diff
changeset
|
7695 vim_regfree(search_hl.rm.regprog); |
| 7 | 7696 search_hl.rm.regprog = NULL; |
| 7697 } | |
| 7698 } | |
| 7699 | |
| 7700 /* | |
|
2284
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7701 * 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
|
7702 */ |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7703 static void |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7704 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
|
7705 { |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7706 matchitem_T *cur; |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7707 |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7708 /* 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
|
7709 * match */ |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7710 cur = wp->w_match_head; |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7711 while (cur != NULL) |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7712 { |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7713 cur->hl.rm = cur->match; |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7714 if (cur->hlg_id == 0) |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7715 cur->hl.attr = 0; |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7716 else |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7717 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
|
7718 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
|
7719 cur->hl.lnum = 0; |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7720 cur->hl.first_lnum = 0; |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7721 # ifdef FEAT_RELTIME |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7722 /* 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
|
7723 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
|
7724 # endif |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7725 cur = cur->next; |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7726 } |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7727 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
|
7728 search_hl.lnum = 0; |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7729 search_hl.first_lnum = 0; |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7730 /* 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
|
7731 } |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7732 |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7733 /* |
| 7 | 7734 * Advance to the match in window "wp" line "lnum" or past it. |
| 7735 */ | |
| 7736 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7737 prepare_search_hl(win_T *wp, linenr_T lnum) |
| 7 | 7738 { |
| 1326 | 7739 matchitem_T *cur; /* points to the match list */ |
| 7740 match_T *shl; /* points to search_hl or a match */ | |
| 7741 int shl_flag; /* flag to indicate whether search_hl | |
| 7742 has been processed or not */ | |
| 5979 | 7743 int pos_inprogress; /* marks that position match search is |
| 7744 in progress */ | |
| 7 | 7745 int n; |
| 7746 | |
| 7747 /* | |
| 7748 * When using a multi-line pattern, start searching at the top | |
| 7749 * of the window or just after a closed fold. | |
| 1326 | 7750 * Do this both for search_hl and the match list. |
| 7 | 7751 */ |
| 1326 | 7752 cur = wp->w_match_head; |
| 7753 shl_flag = FALSE; | |
| 7754 while (cur != NULL || shl_flag == FALSE) | |
| 7755 { | |
| 7756 if (shl_flag == FALSE) | |
| 7757 { | |
| 7758 shl = &search_hl; | |
| 7759 shl_flag = TRUE; | |
| 7760 } | |
| 7761 else | |
| 7762 shl = &cur->hl; | |
| 7 | 7763 if (shl->rm.regprog != NULL |
| 7764 && shl->lnum == 0 | |
| 7765 && re_multiline(shl->rm.regprog)) | |
| 7766 { | |
| 7767 if (shl->first_lnum == 0) | |
| 7768 { | |
| 7769 # ifdef FEAT_FOLDING | |
| 7770 for (shl->first_lnum = lnum; | |
| 7771 shl->first_lnum > wp->w_topline; --shl->first_lnum) | |
| 7772 if (hasFoldingWin(wp, shl->first_lnum - 1, | |
| 7773 NULL, NULL, TRUE, NULL)) | |
| 7774 break; | |
| 7775 # else | |
| 7776 shl->first_lnum = wp->w_topline; | |
| 7777 # endif | |
| 7778 } | |
| 5979 | 7779 if (cur != NULL) |
| 7780 cur->pos.cur = 0; | |
| 7781 pos_inprogress = TRUE; | |
| 7 | 7782 n = 0; |
| 5979 | 7783 while (shl->first_lnum < lnum && (shl->rm.regprog != NULL |
| 7784 || (cur != NULL && pos_inprogress))) | |
| 7785 { | |
|
9992
3e3b0ce24b61
commit https://github.com/vim/vim/commit/e17bdffff78ebd6a4e3cff26754cc667557ea810
Christian Brabandt <cb@256bit.org>
parents:
9939
diff
changeset
|
7786 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
|
7787 shl == &search_hl ? NULL : cur); |
| 5979 | 7788 pos_inprogress = cur == NULL || cur->pos.cur == 0 |
| 7789 ? FALSE : TRUE; | |
| 7 | 7790 if (shl->lnum != 0) |
| 7791 { | |
| 7792 shl->first_lnum = shl->lnum | |
| 7793 + shl->rm.endpos[0].lnum | |
| 7794 - shl->rm.startpos[0].lnum; | |
| 7795 n = shl->rm.endpos[0].col; | |
| 7796 } | |
| 7797 else | |
| 7798 { | |
| 7799 ++shl->first_lnum; | |
| 7800 n = 0; | |
| 7801 } | |
| 7802 } | |
| 7803 } | |
| 1326 | 7804 if (shl != &search_hl && cur != NULL) |
| 7805 cur = cur->next; | |
| 7 | 7806 } |
| 7807 } | |
| 7808 | |
| 7809 /* | |
| 1326 | 7810 * Search for a next 'hlsearch' or match. |
| 7 | 7811 * Uses shl->buf. |
| 7812 * Sets shl->lnum and shl->rm contents. | |
| 7813 * Note: Assumes a previous match is always before "lnum", unless | |
| 7814 * shl->lnum is zero. | |
| 7815 * Careful: Any pointers for buffer lines will become invalid. | |
| 7816 */ | |
| 7817 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7818 next_search_hl( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7819 win_T *win, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7820 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
|
7821 linenr_T lnum, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7822 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
|
7823 matchitem_T *cur) /* to retrieve match positions if any */ |
| 7 | 7824 { |
| 7825 linenr_T l; | |
| 7826 colnr_T matchcol; | |
| 7827 long nmatched; | |
| 7828 | |
| 7829 if (shl->lnum != 0) | |
| 7830 { | |
| 7831 /* Check for three situations: | |
| 7832 * 1. If the "lnum" is below a previous match, start a new search. | |
| 7833 * 2. If the previous match includes "mincol", use it. | |
| 7834 * 3. Continue after the previous match. | |
| 7835 */ | |
| 7836 l = shl->lnum + shl->rm.endpos[0].lnum - shl->rm.startpos[0].lnum; | |
| 7837 if (lnum > l) | |
| 7838 shl->lnum = 0; | |
| 7839 else if (lnum < l || shl->rm.endpos[0].col > mincol) | |
| 7840 return; | |
| 7841 } | |
| 7842 | |
| 7843 /* | |
| 7844 * Repeat searching for a match until one is found that includes "mincol" | |
| 7845 * or none is found in this line. | |
| 7846 */ | |
| 7847 called_emsg = FALSE; | |
| 7848 for (;;) | |
| 7849 { | |
| 1521 | 7850 #ifdef FEAT_RELTIME |
| 7851 /* Stop searching after passing the time limit. */ | |
| 7852 if (profile_passed_limit(&(shl->tm))) | |
| 7853 { | |
| 7854 shl->lnum = 0; /* no match found in time */ | |
| 7855 break; | |
| 7856 } | |
| 7857 #endif | |
| 7 | 7858 /* Three situations: |
| 7859 * 1. No useful previous match: search from start of line. | |
| 7860 * 2. Not Vi compatible or empty match: continue at next character. | |
| 7861 * Break the loop if this is beyond the end of the line. | |
| 7862 * 3. Vi compatible searching: continue at end of previous match. | |
| 7863 */ | |
| 7864 if (shl->lnum == 0) | |
| 7865 matchcol = 0; | |
| 7866 else if (vim_strchr(p_cpo, CPO_SEARCH) == NULL | |
| 7867 || (shl->rm.endpos[0].lnum == 0 | |
| 685 | 7868 && shl->rm.endpos[0].col <= shl->rm.startpos[0].col)) |
| 7869 { | |
| 688 | 7870 char_u *ml; |
| 685 | 7871 |
| 7872 matchcol = shl->rm.startpos[0].col; | |
| 688 | 7873 ml = ml_get_buf(shl->buf, lnum, FALSE) + matchcol; |
| 685 | 7874 if (*ml == NUL) |
| 7875 { | |
| 7876 ++matchcol; | |
| 7 | 7877 shl->lnum = 0; |
| 7878 break; | |
| 7879 } | |
| 685 | 7880 #ifdef FEAT_MBYTE |
| 7881 if (has_mbyte) | |
| 7882 matchcol += mb_ptr2len(ml); | |
| 7883 else | |
| 7884 #endif | |
| 7885 ++matchcol; | |
| 7 | 7886 } |
| 7887 else | |
| 7888 matchcol = shl->rm.endpos[0].col; | |
| 7889 | |
| 7890 shl->lnum = lnum; | |
| 5979 | 7891 if (shl->rm.regprog != NULL) |
| 7892 { | |
| 6394 | 7893 /* Remember whether shl->rm is using a copy of the regprog in |
| 7894 * cur->match. */ | |
| 7895 int regprog_is_copy = (shl != &search_hl && cur != NULL | |
| 7896 && shl == &cur->hl | |
| 7897 && 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
|
7898 int timed_out = FALSE; |
| 6394 | 7899 |
| 5979 | 7900 nmatched = vim_regexec_multi(&shl->rm, win, shl->buf, lnum, |
| 7901 matchcol, | |
| 1521 | 7902 #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
|
7903 &(shl->tm), &timed_out |
| 1521 | 7904 #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
|
7905 NULL, NULL |
| 5979 | 7906 #endif |
| 7907 ); | |
| 6394 | 7908 /* Copy the regprog, in case it got freed and recompiled. */ |
| 7909 if (regprog_is_copy) | |
| 7910 cur->match.regprog = cur->hl.rm.regprog; | |
| 7911 | |
|
11521
578df034735d
patch 8.0.0643: when a pattern search is slow Vim becomes unusable
Christian Brabandt <cb@256bit.org>
parents:
11516
diff
changeset
|
7912 if (called_emsg || got_int || timed_out) |
| 5979 | 7913 { |
| 7914 /* Error while handling regexp: stop using this regexp. */ | |
| 7915 if (shl == &search_hl) | |
| 7916 { | |
| 7917 /* don't free regprog in the match list, it's a copy */ | |
| 7918 vim_regfree(shl->rm.regprog); | |
| 7919 SET_NO_HLSEARCH(TRUE); | |
| 7920 } | |
| 7921 shl->rm.regprog = NULL; | |
| 7922 shl->lnum = 0; | |
| 7923 got_int = FALSE; /* avoid the "Type :quit to exit Vim" | |
| 7924 message */ | |
| 7925 break; | |
| 7926 } | |
| 7927 } | |
| 7928 else if (cur != NULL) | |
| 7929 nmatched = next_search_hl_pos(shl, lnum, &(cur->pos), matchcol); | |
| 5987 | 7930 else |
| 7931 nmatched = 0; | |
| 7 | 7932 if (nmatched == 0) |
| 7933 { | |
| 7934 shl->lnum = 0; /* no match found */ | |
| 7935 break; | |
| 7936 } | |
| 7937 if (shl->rm.startpos[0].lnum > 0 | |
| 7938 || shl->rm.startpos[0].col >= mincol | |
| 7939 || nmatched > 1 | |
| 7940 || shl->rm.endpos[0].col > mincol) | |
| 7941 { | |
| 7942 shl->lnum += shl->rm.startpos[0].lnum; | |
| 7943 break; /* useful match found */ | |
| 7944 } | |
| 7945 } | |
| 7946 } | |
| 7947 | |
|
10287
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
7948 /* |
|
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
7949 * 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
|
7950 * Return zero otherwise. |
|
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
7951 */ |
| 5979 | 7952 static int |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7953 next_search_hl_pos( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7954 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
|
7955 linenr_T lnum, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7956 posmatch_T *posmatch, /* match positions */ |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7957 colnr_T mincol) /* minimal column for a match */ |
| 5979 | 7958 { |
| 7959 int i; | |
|
10287
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
7960 int found = -1; |
|
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
7961 |
| 5979 | 7962 for (i = posmatch->cur; i < MAXPOSMATCH; i++) |
| 7963 { | |
|
10273
489eae19cad9
commit https://github.com/vim/vim/commit/a6c27ee6db2c328e0ab0e6d143e2a295a0bb9c9a
Christian Brabandt <cb@256bit.org>
parents:
10247
diff
changeset
|
7964 llpos_T *pos = &posmatch->pos[i]; |
|
489eae19cad9
commit https://github.com/vim/vim/commit/a6c27ee6db2c328e0ab0e6d143e2a295a0bb9c9a
Christian Brabandt <cb@256bit.org>
parents:
10247
diff
changeset
|
7965 |
|
489eae19cad9
commit https://github.com/vim/vim/commit/a6c27ee6db2c328e0ab0e6d143e2a295a0bb9c9a
Christian Brabandt <cb@256bit.org>
parents:
10247
diff
changeset
|
7966 if (pos->lnum == 0) |
| 5979 | 7967 break; |
|
10287
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
7968 if (pos->len == 0 && pos->col < mincol) |
| 5979 | 7969 continue; |
|
10273
489eae19cad9
commit https://github.com/vim/vim/commit/a6c27ee6db2c328e0ab0e6d143e2a295a0bb9c9a
Christian Brabandt <cb@256bit.org>
parents:
10247
diff
changeset
|
7970 if (pos->lnum == lnum) |
| 5979 | 7971 { |
|
10287
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
7972 if (found >= 0) |
|
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
7973 { |
|
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
7974 /* 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
|
7975 * them */ |
|
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
7976 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
|
7977 { |
|
489eae19cad9
commit https://github.com/vim/vim/commit/a6c27ee6db2c328e0ab0e6d143e2a295a0bb9c9a
Christian Brabandt <cb@256bit.org>
parents:
10247
diff
changeset
|
7978 llpos_T tmp = *pos; |
|
489eae19cad9
commit https://github.com/vim/vim/commit/a6c27ee6db2c328e0ab0e6d143e2a295a0bb9c9a
Christian Brabandt <cb@256bit.org>
parents:
10247
diff
changeset
|
7979 |
|
10287
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
7980 *pos = posmatch->pos[found]; |
|
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
7981 posmatch->pos[found] = tmp; |
| 5979 | 7982 } |
| 7983 } | |
| 7984 else | |
|
10287
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
7985 found = i; |
| 5979 | 7986 } |
| 7987 } | |
| 7988 posmatch->cur = 0; | |
|
10287
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
7989 if (found >= 0) |
|
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
7990 { |
|
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
7991 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
|
7992 ? 0 : posmatch->pos[found].col - 1; |
|
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
7993 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
|
7994 ? MAXCOL : start + posmatch->pos[found].len; |
|
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
7995 |
|
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
7996 shl->lnum = lnum; |
| 5979 | 7997 shl->rm.startpos[0].lnum = 0; |
| 7998 shl->rm.startpos[0].col = start; | |
| 7999 shl->rm.endpos[0].lnum = 0; | |
| 8000 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
|
8001 shl->is_addpos = TRUE; |
|
10287
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
8002 posmatch->cur = found + 1; |
|
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
8003 return 1; |
|
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
8004 } |
|
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
8005 return 0; |
| 5979 | 8006 } |
| 5985 | 8007 #endif |
| 5979 | 8008 |
| 7 | 8009 static void |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8010 screen_start_highlight(int attr) |
| 7 | 8011 { |
| 8012 attrentry_T *aep = NULL; | |
| 8013 | |
| 8014 screen_attr = attr; | |
| 8015 if (full_screen | |
| 8016 #ifdef WIN3264 | |
| 8017 && termcap_active | |
| 8018 #endif | |
| 8019 ) | |
| 8020 { | |
| 8021 #ifdef FEAT_GUI | |
| 8022 if (gui.in_use) | |
| 8023 { | |
| 8024 char buf[20]; | |
| 8025 | |
| 681 | 8026 /* The GUI handles this internally. */ |
| 8027 sprintf(buf, IF_EB("\033|%dh", ESC_STR "|%dh"), attr); | |
| 7 | 8028 OUT_STR(buf); |
| 8029 } | |
| 8030 else | |
| 8031 #endif | |
| 8032 { | |
| 8033 if (attr > HL_ALL) /* special HL attr. */ | |
| 8034 { | |
|
8969
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8035 if (IS_CTERM) |
| 7 | 8036 aep = syn_cterm_attr2entry(attr); |
| 8037 else | |
| 8038 aep = syn_term_attr2entry(attr); | |
| 8039 if (aep == NULL) /* did ":syntax clear" */ | |
| 8040 attr = 0; | |
| 8041 else | |
| 8042 attr = aep->ae_attr; | |
| 8043 } | |
|
13094
72366f4e3264
patch 8.0.1422: no fallback to underline when undercurl is not set
Christian Brabandt <cb@256bit.org>
parents:
13024
diff
changeset
|
8044 if ((attr & HL_BOLD) && *T_MD != NUL) /* bold */ |
| 7 | 8045 out_str(T_MD); |
|
8969
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8046 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
|
8047 #ifdef FEAT_TERMGUICOLORS |
|
773d627cac0b
commit https://github.com/vim/vim/commit/61be73bb0f965a895bfb064ea3e55476ac175162
Christian Brabandt <cb@256bit.org>
parents:
8977
diff
changeset
|
8048 (p_tgc ? |
|
9939
ccb6461b82df
commit https://github.com/vim/vim/commit/1b58cdd160c2e0ada0f638679a2aa27e4665fc48
Christian Brabandt <cb@256bit.org>
parents:
9885
diff
changeset
|
8049 (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 #endif |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8051 (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
|
8052 #ifdef FEAT_TERMGUICOLORS |
|
8969
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8053 ) |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8054 #endif |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8055 ) |
| 681 | 8056 /* If the Normal FG color has BOLD attribute and the new HL |
| 8057 * has a FG color defined, clear BOLD. */ | |
| 8058 out_str(T_ME); | |
|
13094
72366f4e3264
patch 8.0.1422: no fallback to underline when undercurl is not set
Christian Brabandt <cb@256bit.org>
parents:
13024
diff
changeset
|
8059 if ((attr & HL_STANDOUT) && *T_SO != NUL) /* standout */ |
| 7 | 8060 out_str(T_SO); |
|
13094
72366f4e3264
patch 8.0.1422: no fallback to underline when undercurl is not set
Christian Brabandt <cb@256bit.org>
parents:
13024
diff
changeset
|
8061 if ((attr & HL_UNDERCURL) && *T_UCS != NUL) /* undercurl */ |
|
12964
339681756948
patch 8.0.1358: undercurl is not used in the terminal
Christian Brabandt <cb@256bit.org>
parents:
12700
diff
changeset
|
8062 out_str(T_UCS); |
|
339681756948
patch 8.0.1358: undercurl is not used in the terminal
Christian Brabandt <cb@256bit.org>
parents:
12700
diff
changeset
|
8063 if (((attr & HL_UNDERLINE) /* underline or undercurl */ |
|
13094
72366f4e3264
patch 8.0.1422: no fallback to underline when undercurl is not set
Christian Brabandt <cb@256bit.org>
parents:
13024
diff
changeset
|
8064 || ((attr & HL_UNDERCURL) && *T_UCS == NUL)) |
|
72366f4e3264
patch 8.0.1422: no fallback to underline when undercurl is not set
Christian Brabandt <cb@256bit.org>
parents:
13024
diff
changeset
|
8065 && *T_US != NUL) |
| 7 | 8066 out_str(T_US); |
|
13094
72366f4e3264
patch 8.0.1422: no fallback to underline when undercurl is not set
Christian Brabandt <cb@256bit.org>
parents:
13024
diff
changeset
|
8067 if ((attr & HL_ITALIC) && *T_CZH != NUL) /* italic */ |
| 7 | 8068 out_str(T_CZH); |
|
13094
72366f4e3264
patch 8.0.1422: no fallback to underline when undercurl is not set
Christian Brabandt <cb@256bit.org>
parents:
13024
diff
changeset
|
8069 if ((attr & HL_INVERSE) && *T_MR != NUL) /* inverse (reverse) */ |
| 7 | 8070 out_str(T_MR); |
|
13094
72366f4e3264
patch 8.0.1422: no fallback to underline when undercurl is not set
Christian Brabandt <cb@256bit.org>
parents:
13024
diff
changeset
|
8071 if ((attr & HL_STRIKETHROUGH) && *T_STS != NUL) /* strike */ |
|
12317
2a8890b80923
patch 8.0.1038: strike-through text not supported
Christian Brabandt <cb@256bit.org>
parents:
12293
diff
changeset
|
8072 out_str(T_STS); |
| 7 | 8073 |
| 8074 /* | |
| 8075 * Output the color or start string after bold etc., in case the | |
| 8076 * bold etc. override the color setting. | |
| 8077 */ | |
| 8078 if (aep != NULL) | |
| 8079 { | |
|
9027
773d627cac0b
commit https://github.com/vim/vim/commit/61be73bb0f965a895bfb064ea3e55476ac175162
Christian Brabandt <cb@256bit.org>
parents:
8977
diff
changeset
|
8080 #ifdef FEAT_TERMGUICOLORS |
|
773d627cac0b
commit https://github.com/vim/vim/commit/61be73bb0f965a895bfb064ea3e55476ac175162
Christian Brabandt <cb@256bit.org>
parents:
8977
diff
changeset
|
8081 if (p_tgc) |
|
8969
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8082 { |
|
9939
ccb6461b82df
commit https://github.com/vim/vim/commit/1b58cdd160c2e0ada0f638679a2aa27e4665fc48
Christian Brabandt <cb@256bit.org>
parents:
9885
diff
changeset
|
8083 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
|
8084 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
|
8085 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
|
8086 term_bg_rgb_color(aep->ae_u.cterm.bg_rgb); |
| 7 | 8087 } |
| 8088 else | |
|
8969
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8089 #endif |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8090 { |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8091 if (t_colors > 1) |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8092 { |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8093 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
|
8094 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
|
8095 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
|
8096 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
|
8097 } |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8098 else |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8099 { |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8100 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
|
8101 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
|
8102 } |
| 7 | 8103 } |
| 8104 } | |
| 8105 } | |
| 8106 } | |
| 8107 } | |
| 8108 | |
| 8109 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8110 screen_stop_highlight(void) |
| 7 | 8111 { |
| 8112 int do_ME = FALSE; /* output T_ME code */ | |
| 8113 | |
| 8114 if (screen_attr != 0 | |
| 8115 #ifdef WIN3264 | |
| 8116 && termcap_active | |
| 8117 #endif | |
| 8118 ) | |
| 8119 { | |
| 8120 #ifdef FEAT_GUI | |
| 8121 if (gui.in_use) | |
| 8122 { | |
| 8123 char buf[20]; | |
| 8124 | |
| 8125 /* use internal GUI code */ | |
| 8126 sprintf(buf, IF_EB("\033|%dH", ESC_STR "|%dH"), screen_attr); | |
| 8127 OUT_STR(buf); | |
| 8128 } | |
| 8129 else | |
| 8130 #endif | |
| 8131 { | |
| 8132 if (screen_attr > HL_ALL) /* special HL attr. */ | |
| 8133 { | |
| 8134 attrentry_T *aep; | |
| 8135 | |
|
8969
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8136 if (IS_CTERM) |
| 7 | 8137 { |
| 8138 /* | |
| 8139 * Assume that t_me restores the original colors! | |
| 8140 */ | |
| 8141 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
|
8142 if (aep != NULL && |
|
9027
773d627cac0b
commit https://github.com/vim/vim/commit/61be73bb0f965a895bfb064ea3e55476ac175162
Christian Brabandt <cb@256bit.org>
parents:
8977
diff
changeset
|
8143 #ifdef FEAT_TERMGUICOLORS |
|
773d627cac0b
commit https://github.com/vim/vim/commit/61be73bb0f965a895bfb064ea3e55476ac175162
Christian Brabandt <cb@256bit.org>
parents:
8977
diff
changeset
|
8144 (p_tgc ? |
|
9939
ccb6461b82df
commit https://github.com/vim/vim/commit/1b58cdd160c2e0ada0f638679a2aa27e4665fc48
Christian Brabandt <cb@256bit.org>
parents:
9885
diff
changeset
|
8145 (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
|
8146 || 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
|
8147 #endif |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8148 (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
|
8149 #ifdef FEAT_TERMGUICOLORS |
|
8969
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8150 ) |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8151 #endif |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8152 ) |
| 7 | 8153 do_ME = TRUE; |
| 8154 } | |
| 8155 else | |
| 8156 { | |
| 8157 aep = syn_term_attr2entry(screen_attr); | |
| 8158 if (aep != NULL && aep->ae_u.term.stop != NULL) | |
| 8159 { | |
| 8160 if (STRCMP(aep->ae_u.term.stop, T_ME) == 0) | |
| 8161 do_ME = TRUE; | |
| 8162 else | |
| 8163 out_str(aep->ae_u.term.stop); | |
| 8164 } | |
| 8165 } | |
| 8166 if (aep == NULL) /* did ":syntax clear" */ | |
| 8167 screen_attr = 0; | |
| 8168 else | |
| 8169 screen_attr = aep->ae_attr; | |
| 8170 } | |
| 8171 | |
| 8172 /* | |
| 8173 * Often all ending-codes are equal to T_ME. Avoid outputting the | |
| 8174 * same sequence several times. | |
| 8175 */ | |
| 8176 if (screen_attr & HL_STANDOUT) | |
| 8177 { | |
| 8178 if (STRCMP(T_SE, T_ME) == 0) | |
| 8179 do_ME = TRUE; | |
| 8180 else | |
| 8181 out_str(T_SE); | |
| 8182 } | |
|
13094
72366f4e3264
patch 8.0.1422: no fallback to underline when undercurl is not set
Christian Brabandt <cb@256bit.org>
parents:
13024
diff
changeset
|
8183 if ((screen_attr & HL_UNDERCURL) && *T_UCE != NUL) |
|
12964
339681756948
patch 8.0.1358: undercurl is not used in the terminal
Christian Brabandt <cb@256bit.org>
parents:
12700
diff
changeset
|
8184 { |
|
339681756948
patch 8.0.1358: undercurl is not used in the terminal
Christian Brabandt <cb@256bit.org>
parents:
12700
diff
changeset
|
8185 if (STRCMP(T_UCE, T_ME) == 0) |
|
339681756948
patch 8.0.1358: undercurl is not used in the terminal
Christian Brabandt <cb@256bit.org>
parents:
12700
diff
changeset
|
8186 do_ME = TRUE; |
|
339681756948
patch 8.0.1358: undercurl is not used in the terminal
Christian Brabandt <cb@256bit.org>
parents:
12700
diff
changeset
|
8187 else |
|
339681756948
patch 8.0.1358: undercurl is not used in the terminal
Christian Brabandt <cb@256bit.org>
parents:
12700
diff
changeset
|
8188 out_str(T_UCE); |
|
339681756948
patch 8.0.1358: undercurl is not used in the terminal
Christian Brabandt <cb@256bit.org>
parents:
12700
diff
changeset
|
8189 } |
|
339681756948
patch 8.0.1358: undercurl is not used in the terminal
Christian Brabandt <cb@256bit.org>
parents:
12700
diff
changeset
|
8190 if ((screen_attr & HL_UNDERLINE) |
|
13094
72366f4e3264
patch 8.0.1422: no fallback to underline when undercurl is not set
Christian Brabandt <cb@256bit.org>
parents:
13024
diff
changeset
|
8191 || ((screen_attr & HL_UNDERCURL) && *T_UCE == NUL)) |
| 7 | 8192 { |
| 8193 if (STRCMP(T_UE, T_ME) == 0) | |
| 8194 do_ME = TRUE; | |
| 8195 else | |
| 8196 out_str(T_UE); | |
| 8197 } | |
| 8198 if (screen_attr & HL_ITALIC) | |
| 8199 { | |
| 8200 if (STRCMP(T_CZR, T_ME) == 0) | |
| 8201 do_ME = TRUE; | |
| 8202 else | |
| 8203 out_str(T_CZR); | |
| 8204 } | |
|
12317
2a8890b80923
patch 8.0.1038: strike-through text not supported
Christian Brabandt <cb@256bit.org>
parents:
12293
diff
changeset
|
8205 if (screen_attr & HL_STRIKETHROUGH) |
|
2a8890b80923
patch 8.0.1038: strike-through text not supported
Christian Brabandt <cb@256bit.org>
parents:
12293
diff
changeset
|
8206 { |
|
2a8890b80923
patch 8.0.1038: strike-through text not supported
Christian Brabandt <cb@256bit.org>
parents:
12293
diff
changeset
|
8207 if (STRCMP(T_STE, T_ME) == 0) |
|
2a8890b80923
patch 8.0.1038: strike-through text not supported
Christian Brabandt <cb@256bit.org>
parents:
12293
diff
changeset
|
8208 do_ME = TRUE; |
|
2a8890b80923
patch 8.0.1038: strike-through text not supported
Christian Brabandt <cb@256bit.org>
parents:
12293
diff
changeset
|
8209 else |
|
2a8890b80923
patch 8.0.1038: strike-through text not supported
Christian Brabandt <cb@256bit.org>
parents:
12293
diff
changeset
|
8210 out_str(T_STE); |
|
2a8890b80923
patch 8.0.1038: strike-through text not supported
Christian Brabandt <cb@256bit.org>
parents:
12293
diff
changeset
|
8211 } |
| 7 | 8212 if (do_ME || (screen_attr & (HL_BOLD | HL_INVERSE))) |
| 8213 out_str(T_ME); | |
| 8214 | |
|
9027
773d627cac0b
commit https://github.com/vim/vim/commit/61be73bb0f965a895bfb064ea3e55476ac175162
Christian Brabandt <cb@256bit.org>
parents:
8977
diff
changeset
|
8215 #ifdef FEAT_TERMGUICOLORS |
|
773d627cac0b
commit https://github.com/vim/vim/commit/61be73bb0f965a895bfb064ea3e55476ac175162
Christian Brabandt <cb@256bit.org>
parents:
8977
diff
changeset
|
8216 if (p_tgc) |
|
8969
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8217 { |
|
9939
ccb6461b82df
commit https://github.com/vim/vim/commit/1b58cdd160c2e0ada0f638679a2aa27e4665fc48
Christian Brabandt <cb@256bit.org>
parents:
9885
diff
changeset
|
8218 if (cterm_normal_fg_gui_color != INVALCOLOR) |
|
8969
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8219 term_fg_rgb_color(cterm_normal_fg_gui_color); |
|
9939
ccb6461b82df
commit https://github.com/vim/vim/commit/1b58cdd160c2e0ada0f638679a2aa27e4665fc48
Christian Brabandt <cb@256bit.org>
parents:
9885
diff
changeset
|
8220 if (cterm_normal_bg_gui_color != INVALCOLOR) |
|
8969
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8221 term_bg_rgb_color(cterm_normal_bg_gui_color); |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8222 } |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8223 else |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8224 #endif |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8225 { |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8226 if (t_colors > 1) |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8227 { |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8228 /* set Normal cterm colors */ |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8229 if (cterm_normal_fg_color != 0) |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8230 term_fg_color(cterm_normal_fg_color - 1); |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8231 if (cterm_normal_bg_color != 0) |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8232 term_bg_color(cterm_normal_bg_color - 1); |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8233 if (cterm_normal_fg_bold) |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8234 out_str(T_MD); |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8235 } |
| 7 | 8236 } |
| 8237 } | |
| 8238 } | |
| 8239 screen_attr = 0; | |
| 8240 } | |
| 8241 | |
| 8242 /* | |
| 8243 * Reset the colors for a cterm. Used when leaving Vim. | |
| 8244 * The machine specific code may override this again. | |
| 8245 */ | |
| 8246 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8247 reset_cterm_colors(void) |
| 7 | 8248 { |
|
8969
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8249 if (IS_CTERM) |
| 7 | 8250 { |
| 8251 /* set Normal cterm colors */ | |
|
9027
773d627cac0b
commit https://github.com/vim/vim/commit/61be73bb0f965a895bfb064ea3e55476ac175162
Christian Brabandt <cb@256bit.org>
parents:
8977
diff
changeset
|
8252 #ifdef FEAT_TERMGUICOLORS |
|
9939
ccb6461b82df
commit https://github.com/vim/vim/commit/1b58cdd160c2e0ada0f638679a2aa27e4665fc48
Christian Brabandt <cb@256bit.org>
parents:
9885
diff
changeset
|
8253 if (p_tgc ? (cterm_normal_fg_gui_color != INVALCOLOR |
|
ccb6461b82df
commit https://github.com/vim/vim/commit/1b58cdd160c2e0ada0f638679a2aa27e4665fc48
Christian Brabandt <cb@256bit.org>
parents:
9885
diff
changeset
|
8254 || cterm_normal_bg_gui_color != INVALCOLOR) |
|
ccb6461b82df
commit https://github.com/vim/vim/commit/1b58cdd160c2e0ada0f638679a2aa27e4665fc48
Christian Brabandt <cb@256bit.org>
parents:
9885
diff
changeset
|
8255 : (cterm_normal_fg_color > 0 || cterm_normal_bg_color > 0)) |
|
8969
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8256 #else |
| 7 | 8257 if (cterm_normal_fg_color > 0 || cterm_normal_bg_color > 0) |
|
8969
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8258 #endif |
| 7 | 8259 { |
| 8260 out_str(T_OP); | |
| 8261 screen_attr = -1; | |
| 8262 } | |
| 8263 if (cterm_normal_fg_bold) | |
| 8264 { | |
| 8265 out_str(T_ME); | |
| 8266 screen_attr = -1; | |
| 8267 } | |
| 8268 } | |
| 8269 } | |
| 8270 | |
| 8271 /* | |
| 8272 * Put character ScreenLines["off"] on the screen at position "row" and "col", | |
| 8273 * using the attributes from ScreenAttrs["off"]. | |
| 8274 */ | |
| 8275 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8276 screen_char(unsigned off, int row, int col) |
| 7 | 8277 { |
| 8278 int attr; | |
| 8279 | |
| 8280 /* Check for illegal values, just in case (could happen just after | |
| 8281 * resizing). */ | |
| 8282 if (row >= screen_Rows || col >= screen_Columns) | |
| 8283 return; | |
| 8284 | |
| 6602 | 8285 /* Outputting a character in the last cell on the screen may scroll the |
| 8286 * screen up. Only do it when the "xn" termcap property is set, otherwise | |
| 8287 * mark the character invalid (update it when scrolled up). */ | |
| 8288 if (*T_XN == NUL | |
| 8289 && row == screen_Rows - 1 && col == screen_Columns - 1 | |
| 7 | 8290 #ifdef FEAT_RIGHTLEFT |
| 8291 /* account for first command-line character in rightleft mode */ | |
| 8292 && !cmdmsg_rl | |
| 8293 #endif | |
| 8294 ) | |
| 8295 { | |
| 8296 ScreenAttrs[off] = (sattr_T)-1; | |
| 8297 return; | |
| 8298 } | |
| 8299 | |
| 8300 /* | |
| 8301 * Stop highlighting first, so it's easier to move the cursor. | |
| 8302 */ | |
| 8303 if (screen_char_attr != 0) | |
| 8304 attr = screen_char_attr; | |
| 8305 else | |
| 8306 attr = ScreenAttrs[off]; | |
| 8307 if (screen_attr != attr) | |
| 8308 screen_stop_highlight(); | |
| 8309 | |
| 8310 windgoto(row, col); | |
| 8311 | |
| 8312 if (screen_attr != attr) | |
| 8313 screen_start_highlight(attr); | |
| 8314 | |
| 8315 #ifdef FEAT_MBYTE | |
| 8316 if (enc_utf8 && ScreenLinesUC[off] != 0) | |
| 8317 { | |
| 8318 char_u buf[MB_MAXBYTES + 1]; | |
| 8319 | |
|
8819
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8817
diff
changeset
|
8320 if (utf_ambiguous_width(ScreenLinesUC[off])) |
|
13024
27934188d7b5
patch 8.0.1388: char not overwritten with ambiguous width char
Christian Brabandt <cb@256bit.org>
parents:
12998
diff
changeset
|
8321 { |
|
27934188d7b5
patch 8.0.1388: char not overwritten with ambiguous width char
Christian Brabandt <cb@256bit.org>
parents:
12998
diff
changeset
|
8322 if (*p_ambw == 'd' |
|
27934188d7b5
patch 8.0.1388: char not overwritten with ambiguous width char
Christian Brabandt <cb@256bit.org>
parents:
12998
diff
changeset
|
8323 # ifdef FEAT_GUI |
|
27934188d7b5
patch 8.0.1388: char not overwritten with ambiguous width char
Christian Brabandt <cb@256bit.org>
parents:
12998
diff
changeset
|
8324 && !gui.in_use |
|
27934188d7b5
patch 8.0.1388: char not overwritten with ambiguous width char
Christian Brabandt <cb@256bit.org>
parents:
12998
diff
changeset
|
8325 # endif |
|
27934188d7b5
patch 8.0.1388: char not overwritten with ambiguous width char
Christian Brabandt <cb@256bit.org>
parents:
12998
diff
changeset
|
8326 ) |
|
27934188d7b5
patch 8.0.1388: char not overwritten with ambiguous width char
Christian Brabandt <cb@256bit.org>
parents:
12998
diff
changeset
|
8327 { |
|
27934188d7b5
patch 8.0.1388: char not overwritten with ambiguous width char
Christian Brabandt <cb@256bit.org>
parents:
12998
diff
changeset
|
8328 /* Clear the two screen cells. If the character is actually |
|
27934188d7b5
patch 8.0.1388: char not overwritten with ambiguous width char
Christian Brabandt <cb@256bit.org>
parents:
12998
diff
changeset
|
8329 * single width it won't change the second cell. */ |
|
27934188d7b5
patch 8.0.1388: char not overwritten with ambiguous width char
Christian Brabandt <cb@256bit.org>
parents:
12998
diff
changeset
|
8330 out_str((char_u *)" "); |
|
27934188d7b5
patch 8.0.1388: char not overwritten with ambiguous width char
Christian Brabandt <cb@256bit.org>
parents:
12998
diff
changeset
|
8331 term_windgoto(row, col); |
|
27934188d7b5
patch 8.0.1388: char not overwritten with ambiguous width char
Christian Brabandt <cb@256bit.org>
parents:
12998
diff
changeset
|
8332 } |
|
27934188d7b5
patch 8.0.1388: char not overwritten with ambiguous width char
Christian Brabandt <cb@256bit.org>
parents:
12998
diff
changeset
|
8333 /* not sure where the cursor is after drawing the ambiguous width |
|
27934188d7b5
patch 8.0.1388: char not overwritten with ambiguous width char
Christian Brabandt <cb@256bit.org>
parents:
12998
diff
changeset
|
8334 * character */ |
|
8819
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8817
diff
changeset
|
8335 screen_cur_col = 9999; |
|
13024
27934188d7b5
patch 8.0.1388: char not overwritten with ambiguous width char
Christian Brabandt <cb@256bit.org>
parents:
12998
diff
changeset
|
8336 } |
|
8819
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8817
diff
changeset
|
8337 else if (utf_char2cells(ScreenLinesUC[off]) > 1) |
| 7 | 8338 ++screen_cur_col; |
|
13024
27934188d7b5
patch 8.0.1388: char not overwritten with ambiguous width char
Christian Brabandt <cb@256bit.org>
parents:
12998
diff
changeset
|
8339 |
|
27934188d7b5
patch 8.0.1388: char not overwritten with ambiguous width char
Christian Brabandt <cb@256bit.org>
parents:
12998
diff
changeset
|
8340 /* Convert the UTF-8 character to bytes and write it. */ |
|
27934188d7b5
patch 8.0.1388: char not overwritten with ambiguous width char
Christian Brabandt <cb@256bit.org>
parents:
12998
diff
changeset
|
8341 buf[utfc_char2bytes(off, buf)] = NUL; |
|
27934188d7b5
patch 8.0.1388: char not overwritten with ambiguous width char
Christian Brabandt <cb@256bit.org>
parents:
12998
diff
changeset
|
8342 out_str(buf); |
| 7 | 8343 } |
| 8344 else | |
| 8345 #endif | |
| 8346 { | |
| 8347 #ifdef FEAT_MBYTE | |
| 8348 out_flush_check(); | |
| 8349 #endif | |
| 8350 out_char(ScreenLines[off]); | |
| 8351 #ifdef FEAT_MBYTE | |
| 8352 /* double-byte character in single-width cell */ | |
| 8353 if (enc_dbcs == DBCS_JPNU && ScreenLines[off] == 0x8e) | |
| 8354 out_char(ScreenLines2[off]); | |
| 8355 #endif | |
| 8356 } | |
| 8357 | |
| 8358 screen_cur_col++; | |
| 8359 } | |
| 8360 | |
| 8361 #ifdef FEAT_MBYTE | |
| 8362 | |
| 8363 /* | |
| 8364 * Used for enc_dbcs only: Put one double-wide character at ScreenLines["off"] | |
| 8365 * on the screen at position 'row' and 'col'. | |
| 8366 * The attributes of the first byte is used for all. This is required to | |
| 8367 * output the two bytes of a double-byte character with nothing in between. | |
| 8368 */ | |
| 8369 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8370 screen_char_2(unsigned off, int row, int col) |
| 7 | 8371 { |
| 8372 /* Check for illegal values (could be wrong when screen was resized). */ | |
| 8373 if (off + 1 >= (unsigned)(screen_Rows * screen_Columns)) | |
| 8374 return; | |
| 8375 | |
| 8376 /* Outputting the last character on the screen may scrollup the screen. | |
| 8377 * Don't to it! Mark the character invalid (update it when scrolled up) */ | |
| 8378 if (row == screen_Rows - 1 && col >= screen_Columns - 2) | |
| 8379 { | |
| 8380 ScreenAttrs[off] = (sattr_T)-1; | |
| 8381 return; | |
| 8382 } | |
| 8383 | |
| 8384 /* Output the first byte normally (positions the cursor), then write the | |
| 8385 * second byte directly. */ | |
| 8386 screen_char(off, row, col); | |
| 8387 out_char(ScreenLines[off + 1]); | |
| 8388 ++screen_cur_col; | |
| 8389 } | |
| 8390 #endif | |
| 8391 | |
| 8392 /* | |
| 8393 * Draw a rectangle of the screen, inverted when "invert" is TRUE. | |
| 8394 * This uses the contents of ScreenLines[] and doesn't change it. | |
| 8395 */ | |
| 8396 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8397 screen_draw_rectangle( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8398 int row, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8399 int col, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8400 int height, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8401 int width, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8402 int invert) |
| 7 | 8403 { |
| 8404 int r, c; | |
| 8405 int off; | |
| 1378 | 8406 #ifdef FEAT_MBYTE |
| 8407 int max_off; | |
| 8408 #endif | |
| 7 | 8409 |
| 534 | 8410 /* Can't use ScreenLines unless initialized */ |
| 8411 if (ScreenLines == NULL) | |
| 8412 return; | |
| 8413 | |
| 7 | 8414 if (invert) |
| 8415 screen_char_attr = HL_INVERSE; | |
| 8416 for (r = row; r < row + height; ++r) | |
| 8417 { | |
| 8418 off = LineOffset[r]; | |
| 1378 | 8419 #ifdef FEAT_MBYTE |
| 8420 max_off = off + screen_Columns; | |
| 8421 #endif | |
| 7 | 8422 for (c = col; c < col + width; ++c) |
| 8423 { | |
| 8424 #ifdef FEAT_MBYTE | |
| 1378 | 8425 if (enc_dbcs != 0 && dbcs_off2cells(off + c, max_off) > 1) |
| 7 | 8426 { |
| 8427 screen_char_2(off + c, r, c); | |
| 8428 ++c; | |
| 8429 } | |
| 8430 else | |
| 8431 #endif | |
| 8432 { | |
| 8433 screen_char(off + c, r, c); | |
| 8434 #ifdef FEAT_MBYTE | |
| 1378 | 8435 if (utf_off2cells(off + c, max_off) > 1) |
| 7 | 8436 ++c; |
| 8437 #endif | |
| 8438 } | |
| 8439 } | |
| 8440 } | |
| 8441 screen_char_attr = 0; | |
| 8442 } | |
|
12477
68d7bc045dbe
patch 8.0.1118: FEAT_WINDOWS adds a lot of #ifdefs
Christian Brabandt <cb@256bit.org>
parents:
12441
diff
changeset
|
8443 |
| 7 | 8444 /* |
| 8445 * Redraw the characters for a vertically split window. | |
| 8446 */ | |
| 8447 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8448 redraw_block(int row, int end, win_T *wp) |
| 7 | 8449 { |
| 8450 int col; | |
| 8451 int width; | |
| 8452 | |
| 8453 # ifdef FEAT_CLIPBOARD | |
| 8454 clip_may_clear_selection(row, end - 1); | |
| 8455 # endif | |
| 8456 | |
| 8457 if (wp == NULL) | |
| 8458 { | |
| 8459 col = 0; | |
| 8460 width = Columns; | |
| 8461 } | |
| 8462 else | |
| 8463 { | |
| 8464 col = wp->w_wincol; | |
| 8465 width = wp->w_width; | |
| 8466 } | |
| 8467 screen_draw_rectangle(row, col, end - row, width, FALSE); | |
| 8468 } | |
| 8469 | |
|
12487
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
8470 static void |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
8471 space_to_screenline(int off, int attr) |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
8472 { |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
8473 ScreenLines[off] = ' '; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
8474 ScreenAttrs[off] = attr; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
8475 # ifdef FEAT_MBYTE |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
8476 if (enc_utf8) |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
8477 ScreenLinesUC[off] = 0; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
8478 # endif |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
8479 } |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
8480 |
| 7 | 8481 /* |
| 8482 * Fill the screen from 'start_row' to 'end_row', from 'start_col' to 'end_col' | |
| 8483 * with character 'c1' in first column followed by 'c2' in the other columns. | |
| 8484 * Use attributes 'attr'. | |
| 8485 */ | |
| 8486 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8487 screen_fill( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8488 int start_row, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8489 int end_row, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8490 int start_col, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8491 int end_col, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8492 int c1, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8493 int c2, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8494 int attr) |
| 7 | 8495 { |
| 8496 int row; | |
| 8497 int col; | |
| 8498 int off; | |
| 8499 int end_off; | |
| 8500 int did_delete; | |
| 8501 int c; | |
| 8502 int norm_term; | |
| 8503 #if defined(FEAT_GUI) || defined(UNIX) | |
| 8504 int force_next = FALSE; | |
| 8505 #endif | |
| 8506 | |
| 8507 if (end_row > screen_Rows) /* safety check */ | |
| 8508 end_row = screen_Rows; | |
| 8509 if (end_col > screen_Columns) /* safety check */ | |
| 8510 end_col = screen_Columns; | |
| 8511 if (ScreenLines == NULL | |
| 8512 || start_row >= end_row | |
| 8513 || start_col >= end_col) /* nothing to do */ | |
| 8514 return; | |
| 8515 | |
| 8516 /* it's a "normal" terminal when not in a GUI or cterm */ | |
| 8517 norm_term = ( | |
| 8518 #ifdef FEAT_GUI | |
| 8519 !gui.in_use && | |
| 8520 #endif | |
|
8969
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8521 !IS_CTERM); |
| 7 | 8522 for (row = start_row; row < end_row; ++row) |
| 8523 { | |
| 1668 | 8524 #ifdef FEAT_MBYTE |
| 8525 if (has_mbyte | |
| 8526 # ifdef FEAT_GUI | |
| 8527 && !gui.in_use | |
| 8528 # endif | |
| 8529 ) | |
| 8530 { | |
| 8531 /* When drawing over the right halve of a double-wide char clear | |
| 8532 * out the left halve. When drawing over the left halve of a | |
| 8533 * double wide-char clear out the right halve. Only needed in a | |
| 8534 * terminal. */ | |
| 1685 | 8535 if (start_col > 0 && mb_fix_col(start_col, row) != start_col) |
| 1670 | 8536 screen_puts_len((char_u *)" ", 1, row, start_col - 1, 0); |
| 1677 | 8537 if (end_col < screen_Columns && mb_fix_col(end_col, row) != end_col) |
| 1670 | 8538 screen_puts_len((char_u *)" ", 1, row, end_col, 0); |
| 1668 | 8539 } |
| 8540 #endif | |
| 7 | 8541 /* |
| 8542 * Try to use delete-line termcap code, when no attributes or in a | |
| 8543 * "normal" terminal, where a bold/italic space is just a | |
| 8544 * space. | |
| 8545 */ | |
| 8546 did_delete = FALSE; | |
| 8547 if (c2 == ' ' | |
| 8548 && end_col == Columns | |
| 8549 && can_clear(T_CE) | |
| 8550 && (attr == 0 | |
| 8551 || (norm_term | |
| 8552 && attr <= HL_ALL | |
| 8553 && ((attr & ~(HL_BOLD | HL_ITALIC)) == 0)))) | |
| 8554 { | |
| 8555 /* | |
| 8556 * check if we really need to clear something | |
| 8557 */ | |
| 8558 col = start_col; | |
| 8559 if (c1 != ' ') /* don't clear first char */ | |
| 8560 ++col; | |
| 8561 | |
| 8562 off = LineOffset[row] + col; | |
| 8563 end_off = LineOffset[row] + end_col; | |
| 8564 | |
| 8565 /* skip blanks (used often, keep it fast!) */ | |
| 8566 #ifdef FEAT_MBYTE | |
| 8567 if (enc_utf8) | |
| 8568 while (off < end_off && ScreenLines[off] == ' ' | |
| 8569 && ScreenAttrs[off] == 0 && ScreenLinesUC[off] == 0) | |
| 8570 ++off; | |
| 8571 else | |
| 8572 #endif | |
| 8573 while (off < end_off && ScreenLines[off] == ' ' | |
| 8574 && ScreenAttrs[off] == 0) | |
| 8575 ++off; | |
| 8576 if (off < end_off) /* something to be cleared */ | |
| 8577 { | |
| 8578 col = off - LineOffset[row]; | |
| 8579 screen_stop_highlight(); | |
| 8580 term_windgoto(row, col);/* clear rest of this screen line */ | |
| 8581 out_str(T_CE); | |
| 8582 screen_start(); /* don't know where cursor is now */ | |
| 8583 col = end_col - col; | |
| 8584 while (col--) /* clear chars in ScreenLines */ | |
| 8585 { | |
|
12487
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
8586 space_to_screenline(off, 0); |
| 7 | 8587 ++off; |
| 8588 } | |
| 8589 } | |
| 8590 did_delete = TRUE; /* the chars are cleared now */ | |
| 8591 } | |
| 8592 | |
| 8593 off = LineOffset[row] + start_col; | |
| 8594 c = c1; | |
| 8595 for (col = start_col; col < end_col; ++col) | |
| 8596 { | |
| 8597 if (ScreenLines[off] != c | |
| 8598 #ifdef FEAT_MBYTE | |
| 714 | 8599 || (enc_utf8 && (int)ScreenLinesUC[off] |
| 8600 != (c >= 0x80 ? c : 0)) | |
| 7 | 8601 #endif |
| 8602 || ScreenAttrs[off] != attr | |
| 8603 #if defined(FEAT_GUI) || defined(UNIX) | |
| 8604 || force_next | |
| 8605 #endif | |
| 8606 ) | |
| 8607 { | |
| 8608 #if defined(FEAT_GUI) || defined(UNIX) | |
| 8609 /* The bold trick may make a single row of pixels appear in | |
| 8610 * the next character. When a bold character is removed, the | |
| 8611 * next character should be redrawn too. This happens for our | |
| 8612 * own GUI and for some xterms. */ | |
| 8613 if ( | |
| 8614 # ifdef FEAT_GUI | |
| 8615 gui.in_use | |
| 8616 # endif | |
| 8617 # if defined(FEAT_GUI) && defined(UNIX) | |
| 8618 || | |
| 8619 # endif | |
| 8620 # ifdef UNIX | |
| 8621 term_is_xterm | |
| 8622 # endif | |
| 8623 ) | |
| 8624 { | |
| 8625 if (ScreenLines[off] != ' ' | |
| 8626 && (ScreenAttrs[off] > HL_ALL | |
| 8627 || ScreenAttrs[off] & HL_BOLD)) | |
| 8628 force_next = TRUE; | |
| 8629 else | |
| 8630 force_next = FALSE; | |
| 8631 } | |
| 8632 #endif | |
| 8633 ScreenLines[off] = c; | |
| 8634 #ifdef FEAT_MBYTE | |
| 8635 if (enc_utf8) | |
| 8636 { | |
| 8637 if (c >= 0x80) | |
| 8638 { | |
| 8639 ScreenLinesUC[off] = c; | |
| 714 | 8640 ScreenLinesC[0][off] = 0; |
| 7 | 8641 } |
| 8642 else | |
| 8643 ScreenLinesUC[off] = 0; | |
| 8644 } | |
| 8645 #endif | |
| 8646 ScreenAttrs[off] = attr; | |
| 8647 if (!did_delete || c != ' ') | |
| 8648 screen_char(off, row, col); | |
| 8649 } | |
| 8650 ++off; | |
| 8651 if (col == start_col) | |
| 8652 { | |
| 8653 if (did_delete) | |
| 8654 break; | |
| 8655 c = c2; | |
| 8656 } | |
| 8657 } | |
| 8658 if (end_col == Columns) | |
| 8659 LineWraps[row] = FALSE; | |
| 8660 if (row == Rows - 1) /* overwritten the command line */ | |
| 8661 { | |
| 8662 redraw_cmdline = TRUE; | |
| 8663 if (c1 == ' ' && c2 == ' ') | |
| 8664 clear_cmdline = FALSE; /* command line has been cleared */ | |
| 644 | 8665 if (start_col == 0) |
| 8666 mode_displayed = FALSE; /* mode cleared or overwritten */ | |
| 7 | 8667 } |
| 8668 } | |
| 8669 } | |
| 8670 | |
| 8671 /* | |
| 8672 * Check if there should be a delay. Used before clearing or redrawing the | |
| 8673 * screen or the command line. | |
| 8674 */ | |
| 8675 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8676 check_for_delay(int check_msg_scroll) |
| 7 | 8677 { |
| 8678 if ((emsg_on_display || (check_msg_scroll && msg_scroll)) | |
| 8679 && !did_wait_return | |
| 8680 && emsg_silent == 0) | |
| 8681 { | |
| 8682 out_flush(); | |
| 8683 ui_delay(1000L, TRUE); | |
| 8684 emsg_on_display = FALSE; | |
| 8685 if (check_msg_scroll) | |
| 8686 msg_scroll = FALSE; | |
| 8687 } | |
| 8688 } | |
| 8689 | |
| 8690 /* | |
| 8691 * screen_valid - allocate screen buffers if size changed | |
| 3263 | 8692 * If "doclear" is TRUE: clear screen if it has been resized. |
| 7 | 8693 * Returns TRUE if there is a valid screen to write to. |
| 8694 * Returns FALSE when starting up and screen not initialized yet. | |
| 8695 */ | |
| 8696 int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8697 screen_valid(int doclear) |
| 7 | 8698 { |
| 3263 | 8699 screenalloc(doclear); /* allocate screen buffers if size changed */ |
| 7 | 8700 return (ScreenLines != NULL); |
| 8701 } | |
| 8702 | |
| 8703 /* | |
| 8704 * Resize the shell to Rows and Columns. | |
| 8705 * Allocate ScreenLines[] and associated items. | |
| 8706 * | |
| 8707 * There may be some time between setting Rows and Columns and (re)allocating | |
| 8708 * ScreenLines[]. This happens when starting up and when (manually) changing | |
| 8709 * the shell size. Always use screen_Rows and screen_Columns to access items | |
| 8710 * in ScreenLines[]. Use Rows and Columns for positioning text etc. where the | |
| 8711 * final size of the shell is needed. | |
| 8712 */ | |
| 8713 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8714 screenalloc(int doclear) |
| 7 | 8715 { |
| 8716 int new_row, old_row; | |
| 8717 #ifdef FEAT_GUI | |
| 8718 int old_Rows; | |
| 8719 #endif | |
| 8720 win_T *wp; | |
| 8721 int outofmem = FALSE; | |
| 8722 int len; | |
| 8723 schar_T *new_ScreenLines; | |
| 8724 #ifdef FEAT_MBYTE | |
| 8725 u8char_T *new_ScreenLinesUC = NULL; | |
| 714 | 8726 u8char_T *new_ScreenLinesC[MAX_MCO]; |
| 7 | 8727 schar_T *new_ScreenLines2 = NULL; |
| 714 | 8728 int i; |
| 7 | 8729 #endif |
| 8730 sattr_T *new_ScreenAttrs; | |
| 8731 unsigned *new_LineOffset; | |
| 8732 char_u *new_LineWraps; | |
| 681 | 8733 short *new_TabPageIdxs; |
| 671 | 8734 tabpage_T *tp; |
| 7 | 8735 static int entered = FALSE; /* avoid recursiveness */ |
| 944 | 8736 static int done_outofmem_msg = FALSE; /* did outofmem message */ |
| 1824 | 8737 #ifdef FEAT_AUTOCMD |
| 8738 int retry_count = 0; | |
| 8739 | |
| 8740 retry: | |
| 8741 #endif | |
| 7 | 8742 /* |
| 8743 * Allocation of the screen buffers is done only when the size changes and | |
| 8744 * when Rows and Columns have been set and we have started doing full | |
| 8745 * screen stuff. | |
| 8746 */ | |
| 8747 if ((ScreenLines != NULL | |
| 8748 && Rows == screen_Rows | |
| 8749 && Columns == screen_Columns | |
| 8750 #ifdef FEAT_MBYTE | |
| 8751 && enc_utf8 == (ScreenLinesUC != NULL) | |
| 8752 && (enc_dbcs == DBCS_JPNU) == (ScreenLines2 != NULL) | |
| 714 | 8753 && p_mco == Screen_mco |
| 7 | 8754 #endif |
| 8755 ) | |
| 8756 || Rows == 0 | |
| 8757 || Columns == 0 | |
| 8758 || (!full_screen && ScreenLines == NULL)) | |
| 8759 return; | |
| 8760 | |
| 8761 /* | |
| 8762 * It's possible that we produce an out-of-memory message below, which | |
| 8763 * will cause this function to be called again. To break the loop, just | |
| 8764 * return here. | |
| 8765 */ | |
| 8766 if (entered) | |
| 8767 return; | |
| 8768 entered = TRUE; | |
| 8769 | |
| 911 | 8770 /* |
| 8771 * Note that the window sizes are updated before reallocating the arrays, | |
| 8772 * thus we must not redraw here! | |
| 8773 */ | |
| 8774 ++RedrawingDisabled; | |
| 8775 | |
| 7 | 8776 win_new_shellsize(); /* fit the windows in the new sized shell */ |
| 8777 | |
| 8778 comp_col(); /* recompute columns for shown command and ruler */ | |
| 8779 | |
| 8780 /* | |
| 8781 * We're changing the size of the screen. | |
| 8782 * - Allocate new arrays for ScreenLines and ScreenAttrs. | |
| 8783 * - Move lines from the old arrays into the new arrays, clear extra | |
| 8784 * lines (unless the screen is going to be cleared). | |
| 8785 * - Free the old arrays. | |
| 8786 * | |
| 8787 * If anything fails, make ScreenLines NULL, so we don't do anything! | |
| 8788 * Continuing with the old ScreenLines may result in a crash, because the | |
| 8789 * size is wrong. | |
| 8790 */ | |
| 671 | 8791 FOR_ALL_TAB_WINDOWS(tp, wp) |
| 7 | 8792 win_free_lsize(wp); |
| 1946 | 8793 #ifdef FEAT_AUTOCMD |
| 8794 if (aucmd_win != NULL) | |
| 8795 win_free_lsize(aucmd_win); | |
| 8796 #endif | |
| 7 | 8797 |
| 8798 new_ScreenLines = (schar_T *)lalloc((long_u)( | |
| 8799 (Rows + 1) * Columns * sizeof(schar_T)), FALSE); | |
| 8800 #ifdef FEAT_MBYTE | |
|
2122
476336a5ae95
updated for version 7.2.404
Bram Moolenaar <bram@zimbu.org>
parents:
2069
diff
changeset
|
8801 vim_memset(new_ScreenLinesC, 0, sizeof(u8char_T *) * MAX_MCO); |
| 7 | 8802 if (enc_utf8) |
| 8803 { | |
| 8804 new_ScreenLinesUC = (u8char_T *)lalloc((long_u)( | |
| 8805 (Rows + 1) * Columns * sizeof(u8char_T)), FALSE); | |
| 714 | 8806 for (i = 0; i < p_mco; ++i) |
|
2124
dc8a5699253b
updated for version 7.2.406
Bram Moolenaar <bram@zimbu.org>
parents:
2122
diff
changeset
|
8807 new_ScreenLinesC[i] = (u8char_T *)lalloc_clear((long_u)( |
| 7 | 8808 (Rows + 1) * Columns * sizeof(u8char_T)), FALSE); |
| 8809 } | |
| 8810 if (enc_dbcs == DBCS_JPNU) | |
| 8811 new_ScreenLines2 = (schar_T *)lalloc((long_u)( | |
| 8812 (Rows + 1) * Columns * sizeof(schar_T)), FALSE); | |
| 8813 #endif | |
| 8814 new_ScreenAttrs = (sattr_T *)lalloc((long_u)( | |
| 8815 (Rows + 1) * Columns * sizeof(sattr_T)), FALSE); | |
| 8816 new_LineOffset = (unsigned *)lalloc((long_u)( | |
| 8817 Rows * sizeof(unsigned)), FALSE); | |
| 8818 new_LineWraps = (char_u *)lalloc((long_u)(Rows * sizeof(char_u)), FALSE); | |
| 681 | 8819 new_TabPageIdxs = (short *)lalloc((long_u)(Columns * sizeof(short)), FALSE); |
| 7 | 8820 |
| 677 | 8821 FOR_ALL_TAB_WINDOWS(tp, wp) |
| 7 | 8822 { |
| 8823 if (win_alloc_lines(wp) == FAIL) | |
| 8824 { | |
| 8825 outofmem = TRUE; | |
| 1819 | 8826 goto give_up; |
| 8827 } | |
| 8828 } | |
| 1906 | 8829 #ifdef FEAT_AUTOCMD |
| 1946 | 8830 if (aucmd_win != NULL && aucmd_win->w_lines == NULL |
| 8831 && win_alloc_lines(aucmd_win) == FAIL) | |
| 1906 | 8832 outofmem = TRUE; |
| 8833 #endif | |
| 1819 | 8834 give_up: |
| 7 | 8835 |
| 714 | 8836 #ifdef FEAT_MBYTE |
| 8837 for (i = 0; i < p_mco; ++i) | |
| 8838 if (new_ScreenLinesC[i] == NULL) | |
| 8839 break; | |
| 8840 #endif | |
| 7 | 8841 if (new_ScreenLines == NULL |
| 8842 #ifdef FEAT_MBYTE | |
| 714 | 8843 || (enc_utf8 && (new_ScreenLinesUC == NULL || i != p_mco)) |
| 7 | 8844 || (enc_dbcs == DBCS_JPNU && new_ScreenLines2 == NULL) |
| 8845 #endif | |
| 8846 || new_ScreenAttrs == NULL | |
| 8847 || new_LineOffset == NULL | |
| 8848 || new_LineWraps == NULL | |
| 671 | 8849 || new_TabPageIdxs == NULL |
| 7 | 8850 || outofmem) |
| 8851 { | |
| 944 | 8852 if (ScreenLines != NULL || !done_outofmem_msg) |
| 534 | 8853 { |
| 8854 /* guess the size */ | |
| 8855 do_outofmem_msg((long_u)((Rows + 1) * Columns)); | |
| 8856 | |
| 8857 /* Remember we did this to avoid getting outofmem messages over | |
| 8858 * and over again. */ | |
| 944 | 8859 done_outofmem_msg = TRUE; |
| 534 | 8860 } |
| 7 | 8861 vim_free(new_ScreenLines); |
| 8862 new_ScreenLines = NULL; | |
| 8863 #ifdef FEAT_MBYTE | |
| 8864 vim_free(new_ScreenLinesUC); | |
| 8865 new_ScreenLinesUC = NULL; | |
| 714 | 8866 for (i = 0; i < p_mco; ++i) |
| 8867 { | |
| 8868 vim_free(new_ScreenLinesC[i]); | |
| 8869 new_ScreenLinesC[i] = NULL; | |
| 8870 } | |
| 7 | 8871 vim_free(new_ScreenLines2); |
| 8872 new_ScreenLines2 = NULL; | |
| 8873 #endif | |
| 8874 vim_free(new_ScreenAttrs); | |
| 8875 new_ScreenAttrs = NULL; | |
| 8876 vim_free(new_LineOffset); | |
| 8877 new_LineOffset = NULL; | |
| 8878 vim_free(new_LineWraps); | |
| 8879 new_LineWraps = NULL; | |
| 671 | 8880 vim_free(new_TabPageIdxs); |
| 8881 new_TabPageIdxs = NULL; | |
| 7 | 8882 } |
| 8883 else | |
| 8884 { | |
| 944 | 8885 done_outofmem_msg = FALSE; |
| 534 | 8886 |
| 7 | 8887 for (new_row = 0; new_row < Rows; ++new_row) |
| 8888 { | |
| 8889 new_LineOffset[new_row] = new_row * Columns; | |
| 8890 new_LineWraps[new_row] = FALSE; | |
| 8891 | |
| 8892 /* | |
| 8893 * If the screen is not going to be cleared, copy as much as | |
| 8894 * possible from the old screen to the new one and clear the rest | |
| 8895 * (used when resizing the window at the "--more--" prompt or when | |
| 8896 * executing an external command, for the GUI). | |
| 8897 */ | |
| 3263 | 8898 if (!doclear) |
| 7 | 8899 { |
| 8900 (void)vim_memset(new_ScreenLines + new_row * Columns, | |
| 8901 ' ', (size_t)Columns * sizeof(schar_T)); | |
| 8902 #ifdef FEAT_MBYTE | |
| 8903 if (enc_utf8) | |
| 8904 { | |
| 8905 (void)vim_memset(new_ScreenLinesUC + new_row * Columns, | |
| 8906 0, (size_t)Columns * sizeof(u8char_T)); | |
| 714 | 8907 for (i = 0; i < p_mco; ++i) |
| 8908 (void)vim_memset(new_ScreenLinesC[i] | |
| 8909 + new_row * Columns, | |
| 7 | 8910 0, (size_t)Columns * sizeof(u8char_T)); |
| 8911 } | |
| 8912 if (enc_dbcs == DBCS_JPNU) | |
| 8913 (void)vim_memset(new_ScreenLines2 + new_row * Columns, | |
| 8914 0, (size_t)Columns * sizeof(schar_T)); | |
| 8915 #endif | |
| 8916 (void)vim_memset(new_ScreenAttrs + new_row * Columns, | |
| 8917 0, (size_t)Columns * sizeof(sattr_T)); | |
| 8918 old_row = new_row + (screen_Rows - Rows); | |
| 534 | 8919 if (old_row >= 0 && ScreenLines != NULL) |
| 7 | 8920 { |
| 8921 if (screen_Columns < Columns) | |
| 8922 len = screen_Columns; | |
| 8923 else | |
| 8924 len = Columns; | |
| 26 | 8925 #ifdef FEAT_MBYTE |
| 571 | 8926 /* When switching to utf-8 don't copy characters, they |
| 714 | 8927 * may be invalid now. Also when p_mco changes. */ |
| 8928 if (!(enc_utf8 && ScreenLinesUC == NULL) | |
| 8929 && p_mco == Screen_mco) | |
| 26 | 8930 #endif |
| 8931 mch_memmove(new_ScreenLines + new_LineOffset[new_row], | |
| 8932 ScreenLines + LineOffset[old_row], | |
| 8933 (size_t)len * sizeof(schar_T)); | |
| 7 | 8934 #ifdef FEAT_MBYTE |
| 714 | 8935 if (enc_utf8 && ScreenLinesUC != NULL |
| 8936 && p_mco == Screen_mco) | |
| 7 | 8937 { |
| 8938 mch_memmove(new_ScreenLinesUC + new_LineOffset[new_row], | |
| 8939 ScreenLinesUC + LineOffset[old_row], | |
| 8940 (size_t)len * sizeof(u8char_T)); | |
| 714 | 8941 for (i = 0; i < p_mco; ++i) |
| 8942 mch_memmove(new_ScreenLinesC[i] | |
| 8943 + new_LineOffset[new_row], | |
| 8944 ScreenLinesC[i] + LineOffset[old_row], | |
| 7 | 8945 (size_t)len * sizeof(u8char_T)); |
| 8946 } | |
| 8947 if (enc_dbcs == DBCS_JPNU && ScreenLines2 != NULL) | |
| 8948 mch_memmove(new_ScreenLines2 + new_LineOffset[new_row], | |
| 8949 ScreenLines2 + LineOffset[old_row], | |
| 8950 (size_t)len * sizeof(schar_T)); | |
| 8951 #endif | |
| 8952 mch_memmove(new_ScreenAttrs + new_LineOffset[new_row], | |
| 8953 ScreenAttrs + LineOffset[old_row], | |
| 8954 (size_t)len * sizeof(sattr_T)); | |
| 8955 } | |
| 8956 } | |
| 8957 } | |
| 8958 /* Use the last line of the screen for the current line. */ | |
| 8959 current_ScreenLine = new_ScreenLines + Rows * Columns; | |
| 8960 } | |
| 8961 | |
| 356 | 8962 free_screenlines(); |
| 8963 | |
| 7 | 8964 ScreenLines = new_ScreenLines; |
| 8965 #ifdef FEAT_MBYTE | |
| 8966 ScreenLinesUC = new_ScreenLinesUC; | |
| 714 | 8967 for (i = 0; i < p_mco; ++i) |
| 8968 ScreenLinesC[i] = new_ScreenLinesC[i]; | |
| 8969 Screen_mco = p_mco; | |
| 7 | 8970 ScreenLines2 = new_ScreenLines2; |
| 8971 #endif | |
| 8972 ScreenAttrs = new_ScreenAttrs; | |
| 8973 LineOffset = new_LineOffset; | |
| 8974 LineWraps = new_LineWraps; | |
| 671 | 8975 TabPageIdxs = new_TabPageIdxs; |
| 7 | 8976 |
| 8977 /* It's important that screen_Rows and screen_Columns reflect the actual | |
| 8978 * size of ScreenLines[]. Set them before calling anything. */ | |
| 8979 #ifdef FEAT_GUI | |
| 8980 old_Rows = screen_Rows; | |
| 8981 #endif | |
| 8982 screen_Rows = Rows; | |
| 8983 screen_Columns = Columns; | |
| 8984 | |
| 8985 must_redraw = CLEAR; /* need to clear the screen later */ | |
| 3263 | 8986 if (doclear) |
| 7 | 8987 screenclear2(); |
| 8988 | |
| 8989 #ifdef FEAT_GUI | |
| 8990 else if (gui.in_use | |
| 8991 && !gui.starting | |
| 8992 && ScreenLines != NULL | |
| 8993 && old_Rows != Rows) | |
| 8994 { | |
| 8995 (void)gui_redraw_block(0, 0, (int)Rows - 1, (int)Columns - 1, 0); | |
| 8996 /* | |
| 8997 * Adjust the position of the cursor, for when executing an external | |
| 8998 * command. | |
| 8999 */ | |
| 9000 if (msg_row >= Rows) /* Rows got smaller */ | |
| 9001 msg_row = Rows - 1; /* put cursor at last row */ | |
| 9002 else if (Rows > old_Rows) /* Rows got bigger */ | |
| 9003 msg_row += Rows - old_Rows; /* put cursor in same place */ | |
| 9004 if (msg_col >= Columns) /* Columns got smaller */ | |
| 9005 msg_col = Columns - 1; /* put cursor at last column */ | |
| 9006 } | |
| 9007 #endif | |
| 9008 | |
| 9009 entered = FALSE; | |
| 911 | 9010 --RedrawingDisabled; |
| 766 | 9011 |
| 9012 #ifdef FEAT_AUTOCMD | |
| 1824 | 9013 /* |
| 9014 * Do not apply autocommands more than 3 times to avoid an endless loop | |
| 9015 * in case applying autocommands always changes Rows or Columns. | |
| 9016 */ | |
| 9017 if (starting == 0 && ++retry_count <= 3) | |
| 9018 { | |
| 766 | 9019 apply_autocmds(EVENT_VIMRESIZED, NULL, NULL, FALSE, curbuf); |
| 1824 | 9020 /* In rare cases, autocommands may have altered Rows or Columns, |
| 9021 * jump back to check if we need to allocate the screen again. */ | |
| 9022 goto retry; | |
| 9023 } | |
| 766 | 9024 #endif |
| 7 | 9025 } |
| 9026 | |
| 9027 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9028 free_screenlines(void) |
| 356 | 9029 { |
| 9030 #ifdef FEAT_MBYTE | |
| 714 | 9031 int i; |
| 9032 | |
| 356 | 9033 vim_free(ScreenLinesUC); |
| 714 | 9034 for (i = 0; i < Screen_mco; ++i) |
| 9035 vim_free(ScreenLinesC[i]); | |
| 356 | 9036 vim_free(ScreenLines2); |
| 9037 #endif | |
| 714 | 9038 vim_free(ScreenLines); |
| 356 | 9039 vim_free(ScreenAttrs); |
| 9040 vim_free(LineOffset); | |
| 9041 vim_free(LineWraps); | |
| 671 | 9042 vim_free(TabPageIdxs); |
| 356 | 9043 } |
| 9044 | |
| 9045 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9046 screenclear(void) |
| 7 | 9047 { |
| 9048 check_for_delay(FALSE); | |
| 9049 screenalloc(FALSE); /* allocate screen buffers if size changed */ | |
| 9050 screenclear2(); /* clear the screen */ | |
| 9051 } | |
| 9052 | |
| 9053 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9054 screenclear2(void) |
| 7 | 9055 { |
| 9056 int i; | |
| 9057 | |
| 9058 if (starting == NO_SCREEN || ScreenLines == NULL | |
| 9059 #ifdef FEAT_GUI | |
| 9060 || (gui.in_use && gui.starting) | |
| 9061 #endif | |
| 9062 ) | |
| 9063 return; | |
| 9064 | |
| 9065 #ifdef FEAT_GUI | |
| 9066 if (!gui.in_use) | |
| 9067 #endif | |
| 9068 screen_attr = -1; /* force setting the Normal colors */ | |
| 9069 screen_stop_highlight(); /* don't want highlighting here */ | |
| 9070 | |
| 9071 #ifdef FEAT_CLIPBOARD | |
| 9072 /* disable selection without redrawing it */ | |
| 9073 clip_scroll_selection(9999); | |
| 9074 #endif | |
| 9075 | |
| 9076 /* blank out ScreenLines */ | |
| 9077 for (i = 0; i < Rows; ++i) | |
| 9078 { | |
|
12152
69af108df70e
patch 8.0.0956: scrolling in a terminal window has flicker
Christian Brabandt <cb@256bit.org>
parents:
12122
diff
changeset
|
9079 lineclear(LineOffset[i], (int)Columns, 0); |
| 7 | 9080 LineWraps[i] = FALSE; |
| 9081 } | |
| 9082 | |
| 9083 if (can_clear(T_CL)) | |
| 9084 { | |
| 9085 out_str(T_CL); /* clear the display */ | |
| 9086 clear_cmdline = FALSE; | |
| 644 | 9087 mode_displayed = FALSE; |
| 7 | 9088 } |
| 9089 else | |
| 9090 { | |
| 9091 /* can't clear the screen, mark all chars with invalid attributes */ | |
| 9092 for (i = 0; i < Rows; ++i) | |
| 9093 lineinvalid(LineOffset[i], (int)Columns); | |
| 9094 clear_cmdline = TRUE; | |
| 9095 } | |
| 9096 | |
| 9097 screen_cleared = TRUE; /* can use contents of ScreenLines now */ | |
| 9098 | |
| 9099 win_rest_invalid(firstwin); | |
| 9100 redraw_cmdline = TRUE; | |
| 673 | 9101 redraw_tabline = TRUE; |
| 7 | 9102 if (must_redraw == CLEAR) /* no need to clear again */ |
| 9103 must_redraw = NOT_VALID; | |
| 9104 compute_cmdrow(); | |
| 9105 msg_row = cmdline_row; /* put cursor on last line for messages */ | |
| 9106 msg_col = 0; | |
| 9107 screen_start(); /* don't know where cursor is now */ | |
| 9108 msg_scrolled = 0; /* can't scroll back */ | |
| 9109 msg_didany = FALSE; | |
| 9110 msg_didout = FALSE; | |
| 9111 } | |
| 9112 | |
| 9113 /* | |
| 9114 * Clear one line in ScreenLines. | |
| 9115 */ | |
| 9116 static void | |
|
12152
69af108df70e
patch 8.0.0956: scrolling in a terminal window has flicker
Christian Brabandt <cb@256bit.org>
parents:
12122
diff
changeset
|
9117 lineclear(unsigned off, int width, int attr) |
| 7 | 9118 { |
| 9119 (void)vim_memset(ScreenLines + off, ' ', (size_t)width * sizeof(schar_T)); | |
| 9120 #ifdef FEAT_MBYTE | |
| 9121 if (enc_utf8) | |
| 9122 (void)vim_memset(ScreenLinesUC + off, 0, | |
| 9123 (size_t)width * sizeof(u8char_T)); | |
| 9124 #endif | |
|
12152
69af108df70e
patch 8.0.0956: scrolling in a terminal window has flicker
Christian Brabandt <cb@256bit.org>
parents:
12122
diff
changeset
|
9125 (void)vim_memset(ScreenAttrs + off, attr, (size_t)width * sizeof(sattr_T)); |
| 7 | 9126 } |
| 9127 | |
| 9128 /* | |
| 9129 * Mark one line in ScreenLines invalid by setting the attributes to an | |
| 9130 * invalid value. | |
| 9131 */ | |
| 9132 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9133 lineinvalid(unsigned off, int width) |
| 7 | 9134 { |
| 9135 (void)vim_memset(ScreenAttrs + off, -1, (size_t)width * sizeof(sattr_T)); | |
| 9136 } | |
| 9137 | |
| 9138 /* | |
| 9139 * Copy part of a Screenline for vertically split window "wp". | |
| 9140 */ | |
| 9141 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9142 linecopy(int to, int from, win_T *wp) |
| 7 | 9143 { |
| 9144 unsigned off_to = LineOffset[to] + wp->w_wincol; | |
| 9145 unsigned off_from = LineOffset[from] + wp->w_wincol; | |
| 9146 | |
| 9147 mch_memmove(ScreenLines + off_to, ScreenLines + off_from, | |
| 9148 wp->w_width * sizeof(schar_T)); | |
|
12477
68d7bc045dbe
patch 8.0.1118: FEAT_WINDOWS adds a lot of #ifdefs
Christian Brabandt <cb@256bit.org>
parents:
12441
diff
changeset
|
9149 #ifdef FEAT_MBYTE |
| 7 | 9150 if (enc_utf8) |
| 9151 { | |
| 714 | 9152 int i; |
| 9153 | |
| 7 | 9154 mch_memmove(ScreenLinesUC + off_to, ScreenLinesUC + off_from, |
| 9155 wp->w_width * sizeof(u8char_T)); | |
| 714 | 9156 for (i = 0; i < p_mco; ++i) |
| 9157 mch_memmove(ScreenLinesC[i] + off_to, ScreenLinesC[i] + off_from, | |
| 9158 wp->w_width * sizeof(u8char_T)); | |
| 7 | 9159 } |
| 9160 if (enc_dbcs == DBCS_JPNU) | |
| 9161 mch_memmove(ScreenLines2 + off_to, ScreenLines2 + off_from, | |
| 9162 wp->w_width * sizeof(schar_T)); | |
|
12477
68d7bc045dbe
patch 8.0.1118: FEAT_WINDOWS adds a lot of #ifdefs
Christian Brabandt <cb@256bit.org>
parents:
12441
diff
changeset
|
9163 #endif |
| 7 | 9164 mch_memmove(ScreenAttrs + off_to, ScreenAttrs + off_from, |
| 9165 wp->w_width * sizeof(sattr_T)); | |
| 9166 } | |
| 9167 | |
| 9168 /* | |
| 9169 * Return TRUE if clearing with term string "p" would work. | |
| 9170 * It can't work when the string is empty or it won't set the right background. | |
| 9171 */ | |
| 9172 int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9173 can_clear(char_u *p) |
| 7 | 9174 { |
| 9175 return (*p != NUL && (t_colors <= 1 | |
| 9176 #ifdef FEAT_GUI | |
| 9177 || gui.in_use | |
| 9178 #endif | |
|
9027
773d627cac0b
commit https://github.com/vim/vim/commit/61be73bb0f965a895bfb064ea3e55476ac175162
Christian Brabandt <cb@256bit.org>
parents:
8977
diff
changeset
|
9179 #ifdef FEAT_TERMGUICOLORS |
|
9939
ccb6461b82df
commit https://github.com/vim/vim/commit/1b58cdd160c2e0ada0f638679a2aa27e4665fc48
Christian Brabandt <cb@256bit.org>
parents:
9885
diff
changeset
|
9180 || (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
|
9181 || (!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
|
9182 #else |
|
b6472fd9f5ba
commit https://github.com/vim/vim/commit/d18f672fc9477f3c0cb7cc4ce8d9237ed825c612
Christian Brabandt <cb@256bit.org>
parents:
9282
diff
changeset
|
9183 || cterm_normal_bg_color == 0 |
|
b6472fd9f5ba
commit https://github.com/vim/vim/commit/d18f672fc9477f3c0cb7cc4ce8d9237ed825c612
Christian Brabandt <cb@256bit.org>
parents:
9282
diff
changeset
|
9184 #endif |
|
b6472fd9f5ba
commit https://github.com/vim/vim/commit/d18f672fc9477f3c0cb7cc4ce8d9237ed825c612
Christian Brabandt <cb@256bit.org>
parents:
9282
diff
changeset
|
9185 || *T_UT != NUL)); |
| 7 | 9186 } |
| 9187 | |
| 9188 /* | |
| 9189 * Reset cursor position. Use whenever cursor was moved because of outputting | |
| 9190 * something directly to the screen (shell commands) or a terminal control | |
| 9191 * code. | |
| 9192 */ | |
| 9193 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9194 screen_start(void) |
| 7 | 9195 { |
| 9196 screen_cur_row = screen_cur_col = 9999; | |
| 9197 } | |
| 9198 | |
| 9199 /* | |
| 9200 * Move the cursor to position "row","col" in the screen. | |
| 9201 * This tries to find the most efficient way to move, minimizing the number of | |
| 9202 * characters sent to the terminal. | |
| 9203 */ | |
| 9204 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9205 windgoto(int row, int col) |
| 7 | 9206 { |
| 205 | 9207 sattr_T *p; |
| 7 | 9208 int i; |
| 9209 int plan; | |
| 9210 int cost; | |
| 9211 int wouldbe_col; | |
| 9212 int noinvcurs; | |
| 9213 char_u *bs; | |
| 9214 int goto_cost; | |
| 9215 int attr; | |
| 9216 | |
| 1213 | 9217 #define GOTO_COST 7 /* assume a term_windgoto() takes about 7 chars */ |
| 7 | 9218 #define HIGHL_COST 5 /* assume unhighlight takes 5 chars */ |
| 9219 | |
| 9220 #define PLAN_LE 1 | |
| 9221 #define PLAN_CR 2 | |
| 9222 #define PLAN_NL 3 | |
| 9223 #define PLAN_WRITE 4 | |
| 9224 /* Can't use ScreenLines unless initialized */ | |
| 9225 if (ScreenLines == NULL) | |
| 9226 return; | |
| 9227 | |
| 9228 if (col != screen_cur_col || row != screen_cur_row) | |
| 9229 { | |
| 9230 /* Check for valid position. */ | |
| 9231 if (row < 0) /* window without text lines? */ | |
| 9232 row = 0; | |
| 9233 if (row >= screen_Rows) | |
| 9234 row = screen_Rows - 1; | |
| 9235 if (col >= screen_Columns) | |
| 9236 col = screen_Columns - 1; | |
| 9237 | |
| 9238 /* check if no cursor movement is allowed in highlight mode */ | |
| 9239 if (screen_attr && *T_MS == NUL) | |
| 9240 noinvcurs = HIGHL_COST; | |
| 9241 else | |
| 9242 noinvcurs = 0; | |
| 9243 goto_cost = GOTO_COST + noinvcurs; | |
| 9244 | |
| 9245 /* | |
| 9246 * Plan how to do the positioning: | |
| 9247 * 1. Use CR to move it to column 0, same row. | |
| 9248 * 2. Use T_LE to move it a few columns to the left. | |
| 9249 * 3. Use NL to move a few lines down, column 0. | |
| 9250 * 4. Move a few columns to the right with T_ND or by writing chars. | |
| 9251 * | |
| 9252 * Don't do this if the cursor went beyond the last column, the cursor | |
| 9253 * position is unknown then (some terminals wrap, some don't ) | |
| 9254 * | |
| 1213 | 9255 * First check if the highlighting attributes allow us to write |
| 7 | 9256 * characters to move the cursor to the right. |
| 9257 */ | |
| 9258 if (row >= screen_cur_row && screen_cur_col < Columns) | |
| 9259 { | |
| 9260 /* | |
| 9261 * If the cursor is in the same row, bigger col, we can use CR | |
| 9262 * or T_LE. | |
| 9263 */ | |
| 9264 bs = NULL; /* init for GCC */ | |
| 9265 attr = screen_attr; | |
| 9266 if (row == screen_cur_row && col < screen_cur_col) | |
| 9267 { | |
| 9268 /* "le" is preferred over "bc", because "bc" is obsolete */ | |
| 9269 if (*T_LE) | |
| 9270 bs = T_LE; /* "cursor left" */ | |
| 9271 else | |
| 9272 bs = T_BC; /* "backspace character (old) */ | |
| 9273 if (*bs) | |
| 9274 cost = (screen_cur_col - col) * (int)STRLEN(bs); | |
| 9275 else | |
| 9276 cost = 999; | |
| 9277 if (col + 1 < cost) /* using CR is less characters */ | |
| 9278 { | |
| 9279 plan = PLAN_CR; | |
| 9280 wouldbe_col = 0; | |
| 9281 cost = 1; /* CR is just one character */ | |
| 9282 } | |
| 9283 else | |
| 9284 { | |
| 9285 plan = PLAN_LE; | |
| 9286 wouldbe_col = col; | |
| 9287 } | |
| 9288 if (noinvcurs) /* will stop highlighting */ | |
| 9289 { | |
| 9290 cost += noinvcurs; | |
| 9291 attr = 0; | |
| 9292 } | |
| 9293 } | |
| 9294 | |
| 9295 /* | |
| 9296 * If the cursor is above where we want to be, we can use CR LF. | |
| 9297 */ | |
| 9298 else if (row > screen_cur_row) | |
| 9299 { | |
| 9300 plan = PLAN_NL; | |
| 9301 wouldbe_col = 0; | |
| 9302 cost = (row - screen_cur_row) * 2; /* CR LF */ | |
| 9303 if (noinvcurs) /* will stop highlighting */ | |
| 9304 { | |
| 9305 cost += noinvcurs; | |
| 9306 attr = 0; | |
| 9307 } | |
| 9308 } | |
| 9309 | |
| 9310 /* | |
| 9311 * If the cursor is in the same row, smaller col, just use write. | |
| 9312 */ | |
| 9313 else | |
| 9314 { | |
| 9315 plan = PLAN_WRITE; | |
| 9316 wouldbe_col = screen_cur_col; | |
| 9317 cost = 0; | |
| 9318 } | |
| 9319 | |
| 9320 /* | |
| 9321 * Check if any characters that need to be written have the | |
| 9322 * correct attributes. Also avoid UTF-8 characters. | |
| 9323 */ | |
| 9324 i = col - wouldbe_col; | |
| 9325 if (i > 0) | |
| 9326 cost += i; | |
| 9327 if (cost < goto_cost && i > 0) | |
| 9328 { | |
| 9329 /* | |
| 9330 * Check if the attributes are correct without additionally | |
| 9331 * stopping highlighting. | |
| 9332 */ | |
| 9333 p = ScreenAttrs + LineOffset[row] + wouldbe_col; | |
| 9334 while (i && *p++ == attr) | |
| 9335 --i; | |
| 9336 if (i != 0) | |
| 9337 { | |
| 9338 /* | |
| 9339 * Try if it works when highlighting is stopped here. | |
| 9340 */ | |
| 9341 if (*--p == 0) | |
| 9342 { | |
| 9343 cost += noinvcurs; | |
| 9344 while (i && *p++ == 0) | |
| 9345 --i; | |
| 9346 } | |
| 9347 if (i != 0) | |
| 9348 cost = 999; /* different attributes, don't do it */ | |
| 9349 } | |
| 9350 #ifdef FEAT_MBYTE | |
| 9351 if (enc_utf8) | |
| 9352 { | |
| 9353 /* Don't use an UTF-8 char for positioning, it's slow. */ | |
| 9354 for (i = wouldbe_col; i < col; ++i) | |
| 9355 if (ScreenLinesUC[LineOffset[row] + i] != 0) | |
| 9356 { | |
| 9357 cost = 999; | |
| 9358 break; | |
| 9359 } | |
| 9360 } | |
| 9361 #endif | |
| 9362 } | |
| 9363 | |
| 9364 /* | |
| 9365 * We can do it without term_windgoto()! | |
| 9366 */ | |
| 9367 if (cost < goto_cost) | |
| 9368 { | |
| 9369 if (plan == PLAN_LE) | |
| 9370 { | |
| 9371 if (noinvcurs) | |
| 9372 screen_stop_highlight(); | |
| 9373 while (screen_cur_col > col) | |
| 9374 { | |
| 9375 out_str(bs); | |
| 9376 --screen_cur_col; | |
| 9377 } | |
| 9378 } | |
| 9379 else if (plan == PLAN_CR) | |
| 9380 { | |
| 9381 if (noinvcurs) | |
| 9382 screen_stop_highlight(); | |
| 9383 out_char('\r'); | |
| 9384 screen_cur_col = 0; | |
| 9385 } | |
| 9386 else if (plan == PLAN_NL) | |
| 9387 { | |
| 9388 if (noinvcurs) | |
| 9389 screen_stop_highlight(); | |
| 9390 while (screen_cur_row < row) | |
| 9391 { | |
| 9392 out_char('\n'); | |
| 9393 ++screen_cur_row; | |
| 9394 } | |
| 9395 screen_cur_col = 0; | |
| 9396 } | |
| 9397 | |
| 9398 i = col - screen_cur_col; | |
| 9399 if (i > 0) | |
| 9400 { | |
| 9401 /* | |
| 9402 * Use cursor-right if it's one character only. Avoids | |
| 9403 * removing a line of pixels from the last bold char, when | |
| 9404 * using the bold trick in the GUI. | |
| 9405 */ | |
| 9406 if (T_ND[0] != NUL && T_ND[1] == NUL) | |
| 9407 { | |
| 9408 while (i-- > 0) | |
| 9409 out_char(*T_ND); | |
| 9410 } | |
| 9411 else | |
| 9412 { | |
| 9413 int off; | |
| 9414 | |
| 9415 off = LineOffset[row] + screen_cur_col; | |
| 9416 while (i-- > 0) | |
| 9417 { | |
| 9418 if (ScreenAttrs[off] != screen_attr) | |
| 9419 screen_stop_highlight(); | |
| 9420 #ifdef FEAT_MBYTE | |
| 9421 out_flush_check(); | |
| 9422 #endif | |
| 9423 out_char(ScreenLines[off]); | |
| 9424 #ifdef FEAT_MBYTE | |
| 9425 if (enc_dbcs == DBCS_JPNU | |
| 9426 && ScreenLines[off] == 0x8e) | |
| 9427 out_char(ScreenLines2[off]); | |
| 9428 #endif | |
| 9429 ++off; | |
| 9430 } | |
| 9431 } | |
| 9432 } | |
| 9433 } | |
| 9434 } | |
| 9435 else | |
| 9436 cost = 999; | |
| 9437 | |
| 9438 if (cost >= goto_cost) | |
| 9439 { | |
| 9440 if (noinvcurs) | |
| 9441 screen_stop_highlight(); | |
| 5995 | 9442 if (row == screen_cur_row && (col > screen_cur_col) |
| 9443 && *T_CRI != NUL) | |
| 7 | 9444 term_cursor_right(col - screen_cur_col); |
| 9445 else | |
| 9446 term_windgoto(row, col); | |
| 9447 } | |
| 9448 screen_cur_row = row; | |
| 9449 screen_cur_col = col; | |
| 9450 } | |
| 9451 } | |
| 9452 | |
| 9453 /* | |
| 9454 * Set cursor to its position in the current window. | |
| 9455 */ | |
| 9456 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9457 setcursor(void) |
| 7 | 9458 { |
| 9459 if (redrawing()) | |
| 9460 { | |
| 9461 validate_cursor(); | |
| 9462 windgoto(W_WINROW(curwin) + curwin->w_wrow, | |
|
12513
3ca08bf99396
patch 8.0.1135: W_WINCOL() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12510
diff
changeset
|
9463 curwin->w_wincol + ( |
| 7 | 9464 #ifdef FEAT_RIGHTLEFT |
| 1545 | 9465 /* With 'rightleft' set and the cursor on a double-wide |
| 9466 * character, position it on the leftmost column. */ | |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
9467 curwin->w_p_rl ? ((int)curwin->w_width - curwin->w_wcol - ( |
| 7 | 9468 # ifdef FEAT_MBYTE |
| 1545 | 9469 (has_mbyte |
| 9470 && (*mb_ptr2cells)(ml_get_cursor()) == 2 | |
| 9471 && vim_isprintc(gchar_cursor())) ? 2 : | |
| 7 | 9472 # endif |
| 9473 1)) : | |
| 9474 #endif | |
| 9475 curwin->w_wcol)); | |
| 9476 } | |
| 9477 } | |
| 9478 | |
| 9479 | |
| 9480 /* | |
|
11655
8014350fe51a
patch 8.0.0710: a job that writes to a buffer clears completion
Christian Brabandt <cb@256bit.org>
parents:
11607
diff
changeset
|
9481 * 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
|
9482 * 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
|
9483 * If 'mayclear' is TRUE the screen will be cleared if it is faster than |
| 7 | 9484 * scrolling. |
| 9485 * Returns FAIL if the lines are not inserted, OK for success. | |
| 9486 */ | |
| 9487 int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9488 win_ins_lines( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9489 win_T *wp, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9490 int row, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9491 int line_count, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9492 int invalid, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9493 int mayclear) |
| 7 | 9494 { |
| 9495 int did_delete; | |
| 9496 int nextrow; | |
| 9497 int lastrow; | |
| 9498 int retval; | |
| 9499 | |
| 9500 if (invalid) | |
| 9501 wp->w_lines_valid = 0; | |
| 9502 | |
| 9503 if (wp->w_height < 5) | |
| 9504 return FAIL; | |
| 9505 | |
| 9506 if (line_count > wp->w_height - row) | |
| 9507 line_count = wp->w_height - row; | |
| 9508 | |
|
12152
69af108df70e
patch 8.0.0956: scrolling in a terminal window has flicker
Christian Brabandt <cb@256bit.org>
parents:
12122
diff
changeset
|
9509 retval = win_do_lines(wp, row, line_count, mayclear, FALSE, 0); |
| 7 | 9510 if (retval != MAYBE) |
| 9511 return retval; | |
| 9512 | |
| 9513 /* | |
| 9514 * If there is a next window or a status line, we first try to delete the | |
| 9515 * lines at the bottom to avoid messing what is after the window. | |
| 9516 * If this fails and there are following windows, don't do anything to avoid | |
| 9517 * messing up those windows, better just redraw. | |
| 9518 */ | |
| 9519 did_delete = FALSE; | |
| 9520 if (wp->w_next != NULL || wp->w_status_height) | |
| 9521 { | |
| 9522 if (screen_del_lines(0, W_WINROW(wp) + wp->w_height - line_count, | |
|
12152
69af108df70e
patch 8.0.0956: scrolling in a terminal window has flicker
Christian Brabandt <cb@256bit.org>
parents:
12122
diff
changeset
|
9523 line_count, (int)Rows, FALSE, 0, NULL) == OK) |
| 7 | 9524 did_delete = TRUE; |
| 9525 else if (wp->w_next) | |
| 9526 return FAIL; | |
| 9527 } | |
| 9528 /* | |
| 9529 * if no lines deleted, blank the lines that will end up below the window | |
| 9530 */ | |
| 9531 if (!did_delete) | |
| 9532 { | |
| 9533 wp->w_redr_status = TRUE; | |
| 9534 redraw_cmdline = TRUE; | |
|
12529
158917d728b4
patch 8.0.1143: macros always expand to the same thing
Christian Brabandt <cb@256bit.org>
parents:
12515
diff
changeset
|
9535 nextrow = W_WINROW(wp) + wp->w_height + wp->w_status_height; |
| 7 | 9536 lastrow = nextrow + line_count; |
| 9537 if (lastrow > Rows) | |
| 9538 lastrow = Rows; | |
| 9539 screen_fill(nextrow - line_count, lastrow - line_count, | |
|
12513
3ca08bf99396
patch 8.0.1135: W_WINCOL() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12510
diff
changeset
|
9540 wp->w_wincol, (int)W_ENDCOL(wp), |
| 7 | 9541 ' ', ' ', 0); |
| 9542 } | |
| 9543 | |
|
12152
69af108df70e
patch 8.0.0956: scrolling in a terminal window has flicker
Christian Brabandt <cb@256bit.org>
parents:
12122
diff
changeset
|
9544 if (screen_ins_lines(0, W_WINROW(wp) + row, line_count, (int)Rows, 0, NULL) |
| 7 | 9545 == FAIL) |
| 9546 { | |
| 9547 /* deletion will have messed up other windows */ | |
| 9548 if (did_delete) | |
| 9549 { | |
| 9550 wp->w_redr_status = TRUE; | |
| 9551 win_rest_invalid(W_NEXT(wp)); | |
| 9552 } | |
| 9553 return FAIL; | |
| 9554 } | |
| 9555 | |
| 9556 return OK; | |
| 9557 } | |
| 9558 | |
| 9559 /* | |
|
11655
8014350fe51a
patch 8.0.0710: a job that writes to a buffer clears completion
Christian Brabandt <cb@256bit.org>
parents:
11607
diff
changeset
|
9560 * Delete "line_count" window lines at "row" in window "wp". |
| 7 | 9561 * If "invalid" is TRUE curwin->w_lines[] is invalidated. |
| 9562 * If "mayclear" is TRUE the screen will be cleared if it is faster than | |
| 9563 * scrolling | |
| 9564 * Return OK for success, FAIL if the lines are not deleted. | |
| 9565 */ | |
| 9566 int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9567 win_del_lines( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9568 win_T *wp, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9569 int row, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9570 int line_count, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9571 int invalid, |
|
12152
69af108df70e
patch 8.0.0956: scrolling in a terminal window has flicker
Christian Brabandt <cb@256bit.org>
parents:
12122
diff
changeset
|
9572 int mayclear, |
|
69af108df70e
patch 8.0.0956: scrolling in a terminal window has flicker
Christian Brabandt <cb@256bit.org>
parents:
12122
diff
changeset
|
9573 int clear_attr) /* for clearing lines */ |
| 7 | 9574 { |
| 9575 int retval; | |
| 9576 | |
| 9577 if (invalid) | |
| 9578 wp->w_lines_valid = 0; | |
| 9579 | |
| 9580 if (line_count > wp->w_height - row) | |
| 9581 line_count = wp->w_height - row; | |
| 9582 | |
|
12152
69af108df70e
patch 8.0.0956: scrolling in a terminal window has flicker
Christian Brabandt <cb@256bit.org>
parents:
12122
diff
changeset
|
9583 retval = win_do_lines(wp, row, line_count, mayclear, TRUE, clear_attr); |
| 7 | 9584 if (retval != MAYBE) |
| 9585 return retval; | |
| 9586 | |
| 9587 if (screen_del_lines(0, W_WINROW(wp) + row, line_count, | |
|
12152
69af108df70e
patch 8.0.0956: scrolling in a terminal window has flicker
Christian Brabandt <cb@256bit.org>
parents:
12122
diff
changeset
|
9588 (int)Rows, FALSE, clear_attr, NULL) == FAIL) |
| 7 | 9589 return FAIL; |
| 9590 | |
| 9591 /* | |
| 9592 * If there are windows or status lines below, try to put them at the | |
| 9593 * correct place. If we can't do that, they have to be redrawn. | |
| 9594 */ | |
| 9595 if (wp->w_next || wp->w_status_height || cmdline_row < Rows - 1) | |
| 9596 { | |
| 9597 if (screen_ins_lines(0, W_WINROW(wp) + wp->w_height - line_count, | |
|
12152
69af108df70e
patch 8.0.0956: scrolling in a terminal window has flicker
Christian Brabandt <cb@256bit.org>
parents:
12122
diff
changeset
|
9598 line_count, (int)Rows, clear_attr, NULL) == FAIL) |
| 7 | 9599 { |
| 9600 wp->w_redr_status = TRUE; | |
| 9601 win_rest_invalid(wp->w_next); | |
| 9602 } | |
| 9603 } | |
| 9604 /* | |
| 9605 * If this is the last window and there is no status line, redraw the | |
| 9606 * command line later. | |
| 9607 */ | |
| 9608 else | |
| 9609 redraw_cmdline = TRUE; | |
| 9610 return OK; | |
| 9611 } | |
| 9612 | |
| 9613 /* | |
| 9614 * Common code for win_ins_lines() and win_del_lines(). | |
| 9615 * Returns OK or FAIL when the work has been done. | |
| 9616 * Returns MAYBE when not finished yet. | |
| 9617 */ | |
| 9618 static int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9619 win_do_lines( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9620 win_T *wp, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9621 int row, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9622 int line_count, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9623 int mayclear, |
|
12152
69af108df70e
patch 8.0.0956: scrolling in a terminal window has flicker
Christian Brabandt <cb@256bit.org>
parents:
12122
diff
changeset
|
9624 int del, |
|
69af108df70e
patch 8.0.0956: scrolling in a terminal window has flicker
Christian Brabandt <cb@256bit.org>
parents:
12122
diff
changeset
|
9625 int clear_attr) |
| 7 | 9626 { |
| 9627 int retval; | |
| 9628 | |
| 9629 if (!redrawing() || line_count <= 0) | |
| 9630 return FAIL; | |
| 9631 | |
|
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
|
9632 /* 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
|
9633 * 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
|
9634 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
|
9635 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
|
9636 |
| 7 | 9637 /* only a few lines left: redraw is faster */ |
|
12477
68d7bc045dbe
patch 8.0.1118: FEAT_WINDOWS adds a lot of #ifdefs
Christian Brabandt <cb@256bit.org>
parents:
12441
diff
changeset
|
9638 if (mayclear && Rows - line_count < 5 && wp->w_width == Columns) |
| 7 | 9639 { |
|
11416
32aed0993813
patch 8.0.0592: if a job writes to a buffer screen is not updated
Christian Brabandt <cb@256bit.org>
parents:
11277
diff
changeset
|
9640 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
|
9641 screenclear(); /* will set wp->w_lines_valid to 0 */ |
| 7 | 9642 return FAIL; |
| 9643 } | |
| 9644 | |
| 9645 /* | |
| 9646 * Delete all remaining lines | |
| 9647 */ | |
| 9648 if (row + line_count >= wp->w_height) | |
| 9649 { | |
| 9650 screen_fill(W_WINROW(wp) + row, W_WINROW(wp) + wp->w_height, | |
|
12513
3ca08bf99396
patch 8.0.1135: W_WINCOL() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12510
diff
changeset
|
9651 wp->w_wincol, (int)W_ENDCOL(wp), |
| 7 | 9652 ' ', ' ', 0); |
| 9653 return OK; | |
| 9654 } | |
| 9655 | |
| 9656 /* | |
|
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
|
9657 * When scrolling, the message on the command line should be cleared, |
| 7 | 9658 * 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
|
9659 * Don't do this when avoiding to insert lines. |
| 7 | 9660 */ |
|
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
|
9661 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
|
9662 clear_cmdline = TRUE; |
| 7 | 9663 |
| 9664 /* | |
| 9665 * If the terminal can set a scroll region, use that. | |
| 9666 * Always do this in a vertically split window. This will redraw from | |
| 9667 * ScreenLines[] when t_CV isn't defined. That's faster than using | |
| 9668 * win_line(). | |
| 9669 * 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
|
9670 * 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
|
9671 * scroll-up . |
| 7 | 9672 */ |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
9673 if (scroll_region || wp->w_width != Columns) |
|
12477
68d7bc045dbe
patch 8.0.1118: FEAT_WINDOWS adds a lot of #ifdefs
Christian Brabandt <cb@256bit.org>
parents:
12441
diff
changeset
|
9674 { |
| 7 | 9675 if (scroll_region && (wp->w_width == Columns || *T_CSV != NUL)) |
| 9676 scroll_region_set(wp, row); | |
| 9677 if (del) | |
| 9678 retval = screen_del_lines(W_WINROW(wp) + row, 0, line_count, | |
|
12152
69af108df70e
patch 8.0.0956: scrolling in a terminal window has flicker
Christian Brabandt <cb@256bit.org>
parents:
12122
diff
changeset
|
9679 wp->w_height - row, FALSE, clear_attr, wp); |
| 7 | 9680 else |
| 9681 retval = screen_ins_lines(W_WINROW(wp) + row, 0, line_count, | |
|
12152
69af108df70e
patch 8.0.0956: scrolling in a terminal window has flicker
Christian Brabandt <cb@256bit.org>
parents:
12122
diff
changeset
|
9682 wp->w_height - row, clear_attr, wp); |
| 7 | 9683 if (scroll_region && (wp->w_width == Columns || *T_CSV != NUL)) |
| 9684 scroll_region_reset(); | |
| 9685 return retval; | |
| 9686 } | |
| 9687 | |
| 9688 if (wp->w_next != NULL && p_tf) /* don't delete/insert on fast terminal */ | |
| 9689 return FAIL; | |
| 9690 | |
| 9691 return MAYBE; | |
| 9692 } | |
| 9693 | |
| 9694 /* | |
| 9695 * window 'wp' and everything after it is messed up, mark it for redraw | |
| 9696 */ | |
| 9697 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9698 win_rest_invalid(win_T *wp) |
| 7 | 9699 { |
| 9700 while (wp != NULL) | |
| 9701 { | |
| 9702 redraw_win_later(wp, NOT_VALID); | |
| 9703 wp->w_redr_status = TRUE; | |
| 9704 wp = wp->w_next; | |
| 9705 } | |
| 9706 redraw_cmdline = TRUE; | |
| 9707 } | |
| 9708 | |
| 9709 /* | |
| 9710 * The rest of the routines in this file perform screen manipulations. The | |
| 9711 * given operation is performed physically on the screen. The corresponding | |
| 9712 * change is also made to the internal screen image. In this way, the editor | |
| 9713 * anticipates the effect of editing changes on the appearance of the screen. | |
| 9714 * That way, when we call screenupdate a complete redraw isn't usually | |
| 9715 * necessary. Another advantage is that we can keep adding code to anticipate | |
| 9716 * screen changes, and in the meantime, everything still works. | |
| 9717 */ | |
| 9718 | |
| 9719 /* | |
| 9720 * types for inserting or deleting lines | |
| 9721 */ | |
| 9722 #define USE_T_CAL 1 | |
| 9723 #define USE_T_CDL 2 | |
| 9724 #define USE_T_AL 3 | |
| 9725 #define USE_T_CE 4 | |
| 9726 #define USE_T_DL 5 | |
| 9727 #define USE_T_SR 6 | |
| 9728 #define USE_NL 7 | |
| 9729 #define USE_T_CD 8 | |
| 9730 #define USE_REDRAW 9 | |
| 9731 | |
| 9732 /* | |
| 9733 * insert lines on the screen and update ScreenLines[] | |
| 9734 * 'end' is the line after the scrolled part. Normally it is Rows. | |
| 9735 * When scrolling region used 'off' is the offset from the top for the region. | |
| 9736 * 'row' and 'end' are relative to the start of the region. | |
| 9737 * | |
| 9738 * return FAIL for failure, OK for success. | |
| 9739 */ | |
| 446 | 9740 int |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9741 screen_ins_lines( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9742 int off, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9743 int row, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9744 int line_count, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9745 int end, |
|
12152
69af108df70e
patch 8.0.0956: scrolling in a terminal window has flicker
Christian Brabandt <cb@256bit.org>
parents:
12122
diff
changeset
|
9746 int clear_attr, |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9747 win_T *wp) /* NULL or window to use width from */ |
| 7 | 9748 { |
| 9749 int i; | |
| 9750 int j; | |
| 9751 unsigned temp; | |
| 9752 int cursor_row; | |
| 9753 int type; | |
| 9754 int result_empty; | |
| 9755 int can_ce = can_clear(T_CE); | |
| 9756 | |
| 9757 /* | |
| 9758 * FAIL if | |
| 9759 * - there is no valid screen | |
| 9760 * - the screen has to be redrawn completely | |
| 9761 * - the line count is less than one | |
| 9762 * - the line count is more than 'ttyscroll' | |
|
11698
4f59d2a66bf7
patch 8.0.0732: when updating a buffer modeless selection is lost
Christian Brabandt <cb@256bit.org>
parents:
11672
diff
changeset
|
9763 * - redrawing for a callback and there is a modeless selection |
| 7 | 9764 */ |
|
11698
4f59d2a66bf7
patch 8.0.0732: when updating a buffer modeless selection is lost
Christian Brabandt <cb@256bit.org>
parents:
11672
diff
changeset
|
9765 if (!screen_valid(TRUE) || line_count <= 0 || line_count > p_ttyscroll |
|
4f59d2a66bf7
patch 8.0.0732: when updating a buffer modeless selection is lost
Christian Brabandt <cb@256bit.org>
parents:
11672
diff
changeset
|
9766 #ifdef FEAT_CLIPBOARD |
|
4f59d2a66bf7
patch 8.0.0732: when updating a buffer modeless selection is lost
Christian Brabandt <cb@256bit.org>
parents:
11672
diff
changeset
|
9767 || (clip_star.state != SELECT_CLEARED |
|
4f59d2a66bf7
patch 8.0.0732: when updating a buffer modeless selection is lost
Christian Brabandt <cb@256bit.org>
parents:
11672
diff
changeset
|
9768 && redrawing_for_callback > 0) |
|
4f59d2a66bf7
patch 8.0.0732: when updating a buffer modeless selection is lost
Christian Brabandt <cb@256bit.org>
parents:
11672
diff
changeset
|
9769 #endif |
|
4f59d2a66bf7
patch 8.0.0732: when updating a buffer modeless selection is lost
Christian Brabandt <cb@256bit.org>
parents:
11672
diff
changeset
|
9770 ) |
| 7 | 9771 return FAIL; |
| 9772 | |
| 9773 /* | |
| 9774 * There are seven ways to insert lines: | |
| 9775 * 0. When in a vertically split window and t_CV isn't set, redraw the | |
| 9776 * characters from ScreenLines[]. | |
| 9777 * 1. Use T_CD (clear to end of display) if it exists and the result of | |
| 9778 * the insert is just empty lines | |
| 9779 * 2. Use T_CAL (insert multiple lines) if it exists and T_AL is not | |
| 9780 * present or line_count > 1. It looks better if we do all the inserts | |
| 9781 * at once. | |
| 9782 * 3. Use T_CDL (delete multiple lines) if it exists and the result of the | |
| 9783 * insert is just empty lines and T_CE is not present or line_count > | |
| 9784 * 1. | |
| 9785 * 4. Use T_AL (insert line) if it exists. | |
| 9786 * 5. Use T_CE (erase line) if it exists and the result of the insert is | |
| 9787 * just empty lines. | |
| 9788 * 6. Use T_DL (delete line) if it exists and the result of the insert is | |
| 9789 * just empty lines. | |
| 9790 * 7. Use T_SR (scroll reverse) if it exists and inserting at row 0 and | |
| 9791 * the 'da' flag is not set or we have clear line capability. | |
| 9792 * 8. redraw the characters from ScreenLines[]. | |
| 9793 * | |
| 9794 * Careful: In a hpterm scroll reverse doesn't work as expected, it moves | |
| 9795 * the scrollbar for the window. It does have insert line, use that if it | |
| 9796 * exists. | |
| 9797 */ | |
| 9798 result_empty = (row + line_count >= end); | |
| 9799 if (wp != NULL && wp->w_width != Columns && *T_CSV == NUL) | |
| 9800 type = USE_REDRAW; | |
|
12477
68d7bc045dbe
patch 8.0.1118: FEAT_WINDOWS adds a lot of #ifdefs
Christian Brabandt <cb@256bit.org>
parents:
12441
diff
changeset
|
9801 else if (can_clear(T_CD) && result_empty) |
| 7 | 9802 type = USE_T_CD; |
| 9803 else if (*T_CAL != NUL && (line_count > 1 || *T_AL == NUL)) | |
| 9804 type = USE_T_CAL; | |
| 9805 else if (*T_CDL != NUL && result_empty && (line_count > 1 || !can_ce)) | |
| 9806 type = USE_T_CDL; | |
| 9807 else if (*T_AL != NUL) | |
| 9808 type = USE_T_AL; | |
| 9809 else if (can_ce && result_empty) | |
| 9810 type = USE_T_CE; | |
| 9811 else if (*T_DL != NUL && result_empty) | |
| 9812 type = USE_T_DL; | |
| 9813 else if (*T_SR != NUL && row == 0 && (*T_DA == NUL || can_ce)) | |
| 9814 type = USE_T_SR; | |
| 9815 else | |
| 9816 return FAIL; | |
| 9817 | |
| 9818 /* | |
| 9819 * For clearing the lines screen_del_lines() is used. This will also take | |
| 9820 * care of t_db if necessary. | |
| 9821 */ | |
| 9822 if (type == USE_T_CD || type == USE_T_CDL || | |
| 9823 type == USE_T_CE || type == USE_T_DL) | |
|
12152
69af108df70e
patch 8.0.0956: scrolling in a terminal window has flicker
Christian Brabandt <cb@256bit.org>
parents:
12122
diff
changeset
|
9824 return screen_del_lines(off, row, line_count, end, FALSE, 0, wp); |
| 7 | 9825 |
| 9826 /* | |
| 9827 * If text is retained below the screen, first clear or delete as many | |
| 9828 * lines at the bottom of the window as are about to be inserted so that | |
| 9829 * the deleted lines won't later surface during a screen_del_lines. | |
| 9830 */ | |
| 9831 if (*T_DB) | |
|
12152
69af108df70e
patch 8.0.0956: scrolling in a terminal window has flicker
Christian Brabandt <cb@256bit.org>
parents:
12122
diff
changeset
|
9832 screen_del_lines(off, end - line_count, line_count, end, FALSE, 0, wp); |
| 7 | 9833 |
| 9834 #ifdef FEAT_CLIPBOARD | |
| 9835 /* Remove a modeless selection when inserting lines halfway the screen | |
| 9836 * or not the full width of the screen. */ | |
|
12477
68d7bc045dbe
patch 8.0.1118: FEAT_WINDOWS adds a lot of #ifdefs
Christian Brabandt <cb@256bit.org>
parents:
12441
diff
changeset
|
9837 if (off + row > 0 || (wp != NULL && wp->w_width != Columns)) |
| 3674 | 9838 clip_clear_selection(&clip_star); |
| 7 | 9839 else |
| 9840 clip_scroll_selection(-line_count); | |
| 9841 #endif | |
| 9842 | |
| 9843 #ifdef FEAT_GUI | |
| 9844 /* Don't update the GUI cursor here, ScreenLines[] is invalid until the | |
| 9845 * scrolling is actually carried out. */ | |
|
9848
664276833670
commit https://github.com/vim/vim/commit/107abd2ca53c31fd3bb40d77ff296e98eaae2975
Christian Brabandt <cb@256bit.org>
parents:
9754
diff
changeset
|
9846 gui_dont_update_cursor(row + off <= gui.cursor_row); |
| 7 | 9847 #endif |
| 9848 | |
| 9849 if (*T_CCS != NUL) /* cursor relative to region */ | |
| 9850 cursor_row = row; | |
| 9851 else | |
| 9852 cursor_row = row + off; | |
| 9853 | |
| 9854 /* | |
| 9855 * Shift LineOffset[] line_count down to reflect the inserted lines. | |
| 9856 * Clear the inserted lines in ScreenLines[]. | |
| 9857 */ | |
| 9858 row += off; | |
| 9859 end += off; | |
| 9860 for (i = 0; i < line_count; ++i) | |
| 9861 { | |
| 9862 if (wp != NULL && wp->w_width != Columns) | |
| 9863 { | |
| 9864 /* need to copy part of a line */ | |
| 9865 j = end - 1 - i; | |
| 9866 while ((j -= line_count) >= row) | |
| 9867 linecopy(j + line_count, j, wp); | |
| 9868 j += line_count; | |
| 9869 if (can_clear((char_u *)" ")) | |
|
12152
69af108df70e
patch 8.0.0956: scrolling in a terminal window has flicker
Christian Brabandt <cb@256bit.org>
parents:
12122
diff
changeset
|
9870 lineclear(LineOffset[j] + wp->w_wincol, wp->w_width, |
|
69af108df70e
patch 8.0.0956: scrolling in a terminal window has flicker
Christian Brabandt <cb@256bit.org>
parents:
12122
diff
changeset
|
9871 clear_attr); |
| 7 | 9872 else |
| 9873 lineinvalid(LineOffset[j] + wp->w_wincol, wp->w_width); | |
| 9874 LineWraps[j] = FALSE; | |
| 9875 } | |
| 9876 else | |
| 9877 { | |
| 9878 j = end - 1 - i; | |
| 9879 temp = LineOffset[j]; | |
| 9880 while ((j -= line_count) >= row) | |
| 9881 { | |
| 9882 LineOffset[j + line_count] = LineOffset[j]; | |
| 9883 LineWraps[j + line_count] = LineWraps[j]; | |
| 9884 } | |
| 9885 LineOffset[j + line_count] = temp; | |
| 9886 LineWraps[j + line_count] = FALSE; | |
| 9887 if (can_clear((char_u *)" ")) | |
|
12152
69af108df70e
patch 8.0.0956: scrolling in a terminal window has flicker
Christian Brabandt <cb@256bit.org>
parents:
12122
diff
changeset
|
9888 lineclear(temp, (int)Columns, clear_attr); |
| 7 | 9889 else |
| 9890 lineinvalid(temp, (int)Columns); | |
| 9891 } | |
| 9892 } | |
| 9893 | |
| 9894 screen_stop_highlight(); | |
| 9895 windgoto(cursor_row, 0); | |
|
12152
69af108df70e
patch 8.0.0956: scrolling in a terminal window has flicker
Christian Brabandt <cb@256bit.org>
parents:
12122
diff
changeset
|
9896 if (clear_attr != 0) |
|
69af108df70e
patch 8.0.0956: scrolling in a terminal window has flicker
Christian Brabandt <cb@256bit.org>
parents:
12122
diff
changeset
|
9897 screen_start_highlight(clear_attr); |
| 7 | 9898 |
| 9899 /* redraw the characters */ | |
| 9900 if (type == USE_REDRAW) | |
| 9901 redraw_block(row, end, wp); | |
|
12477
68d7bc045dbe
patch 8.0.1118: FEAT_WINDOWS adds a lot of #ifdefs
Christian Brabandt <cb@256bit.org>
parents:
12441
diff
changeset
|
9902 else if (type == USE_T_CAL) |
| 7 | 9903 { |
| 9904 term_append_lines(line_count); | |
| 9905 screen_start(); /* don't know where cursor is now */ | |
| 9906 } | |
| 9907 else | |
| 9908 { | |
| 9909 for (i = 0; i < line_count; i++) | |
| 9910 { | |
| 9911 if (type == USE_T_AL) | |
| 9912 { | |
| 9913 if (i && cursor_row != 0) | |
| 9914 windgoto(cursor_row, 0); | |
| 9915 out_str(T_AL); | |
| 9916 } | |
| 9917 else /* type == USE_T_SR */ | |
| 9918 out_str(T_SR); | |
| 9919 screen_start(); /* don't know where cursor is now */ | |
| 9920 } | |
| 9921 } | |
| 9922 | |
| 9923 /* | |
| 9924 * With scroll-reverse and 'da' flag set we need to clear the lines that | |
| 9925 * have been scrolled down into the region. | |
| 9926 */ | |
| 9927 if (type == USE_T_SR && *T_DA) | |
| 9928 { | |
| 9929 for (i = 0; i < line_count; ++i) | |
| 9930 { | |
| 9931 windgoto(off + i, 0); | |
| 9932 out_str(T_CE); | |
| 9933 screen_start(); /* don't know where cursor is now */ | |
| 9934 } | |
| 9935 } | |
| 9936 | |
| 9937 #ifdef FEAT_GUI | |
| 9938 gui_can_update_cursor(); | |
| 9939 if (gui.in_use) | |
| 9940 out_flush(); /* always flush after a scroll */ | |
| 9941 #endif | |
| 9942 return OK; | |
| 9943 } | |
| 9944 | |
| 9945 /* | |
|
9848
664276833670
commit https://github.com/vim/vim/commit/107abd2ca53c31fd3bb40d77ff296e98eaae2975
Christian Brabandt <cb@256bit.org>
parents:
9754
diff
changeset
|
9946 * 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
|
9947 * "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
|
9948 * 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
|
9949 * "row" and "end" are relative to the start of the region. |
| 7 | 9950 * |
| 9951 * Return OK for success, FAIL if the lines are not deleted. | |
| 9952 */ | |
| 9953 int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9954 screen_del_lines( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9955 int off, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9956 int row, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9957 int line_count, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9958 int end, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9959 int force, /* even when line_count > p_ttyscroll */ |
|
12152
69af108df70e
patch 8.0.0956: scrolling in a terminal window has flicker
Christian Brabandt <cb@256bit.org>
parents:
12122
diff
changeset
|
9960 int clear_attr, /* used for clearing lines */ |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9961 win_T *wp UNUSED) /* NULL or window to use width from */ |
| 7 | 9962 { |
| 9963 int j; | |
| 9964 int i; | |
| 9965 unsigned temp; | |
| 9966 int cursor_row; | |
| 9967 int cursor_end; | |
| 9968 int result_empty; /* result is empty until end of region */ | |
| 9969 int can_delete; /* deleting line codes can be used */ | |
| 9970 int type; | |
| 9971 | |
| 9972 /* | |
| 9973 * FAIL if | |
| 9974 * - there is no valid screen | |
| 9975 * - the screen has to be redrawn completely | |
| 9976 * - the line count is less than one | |
| 9977 * - the line count is more than 'ttyscroll' | |
|
11698
4f59d2a66bf7
patch 8.0.0732: when updating a buffer modeless selection is lost
Christian Brabandt <cb@256bit.org>
parents:
11672
diff
changeset
|
9978 * - redrawing for a callback and there is a modeless selection |
| 7 | 9979 */ |
|
11698
4f59d2a66bf7
patch 8.0.0732: when updating a buffer modeless selection is lost
Christian Brabandt <cb@256bit.org>
parents:
11672
diff
changeset
|
9980 if (!screen_valid(TRUE) || line_count <= 0 |
|
4f59d2a66bf7
patch 8.0.0732: when updating a buffer modeless selection is lost
Christian Brabandt <cb@256bit.org>
parents:
11672
diff
changeset
|
9981 || (!force && line_count > p_ttyscroll) |
|
4f59d2a66bf7
patch 8.0.0732: when updating a buffer modeless selection is lost
Christian Brabandt <cb@256bit.org>
parents:
11672
diff
changeset
|
9982 #ifdef FEAT_CLIPBOARD |
|
4f59d2a66bf7
patch 8.0.0732: when updating a buffer modeless selection is lost
Christian Brabandt <cb@256bit.org>
parents:
11672
diff
changeset
|
9983 || (clip_star.state != SELECT_CLEARED |
|
4f59d2a66bf7
patch 8.0.0732: when updating a buffer modeless selection is lost
Christian Brabandt <cb@256bit.org>
parents:
11672
diff
changeset
|
9984 && redrawing_for_callback > 0) |
|
4f59d2a66bf7
patch 8.0.0732: when updating a buffer modeless selection is lost
Christian Brabandt <cb@256bit.org>
parents:
11672
diff
changeset
|
9985 #endif |
|
4f59d2a66bf7
patch 8.0.0732: when updating a buffer modeless selection is lost
Christian Brabandt <cb@256bit.org>
parents:
11672
diff
changeset
|
9986 ) |
| 7 | 9987 return FAIL; |
| 9988 | |
| 9989 /* | |
| 9990 * Check if the rest of the current region will become empty. | |
| 9991 */ | |
| 9992 result_empty = row + line_count >= end; | |
| 9993 | |
| 9994 /* | |
| 9995 * We can delete lines only when 'db' flag not set or when 'ce' option | |
| 9996 * available. | |
| 9997 */ | |
| 9998 can_delete = (*T_DB == NUL || can_clear(T_CE)); | |
| 9999 | |
| 10000 /* | |
| 10001 * There are six ways to delete lines: | |
| 10002 * 0. When in a vertically split window and t_CV isn't set, redraw the | |
| 10003 * characters from ScreenLines[]. | |
| 10004 * 1. Use T_CD if it exists and the result is empty. | |
| 10005 * 2. Use newlines if row == 0 and count == 1 or T_CDL does not exist. | |
| 10006 * 3. Use T_CDL (delete multiple lines) if it exists and line_count > 1 or | |
| 10007 * none of the other ways work. | |
| 10008 * 4. Use T_CE (erase line) if the result is empty. | |
| 10009 * 5. Use T_DL (delete line) if it exists. | |
| 10010 * 6. redraw the characters from ScreenLines[]. | |
| 10011 */ | |
| 10012 if (wp != NULL && wp->w_width != Columns && *T_CSV == NUL) | |
| 10013 type = USE_REDRAW; | |
|
12477
68d7bc045dbe
patch 8.0.1118: FEAT_WINDOWS adds a lot of #ifdefs
Christian Brabandt <cb@256bit.org>
parents:
12441
diff
changeset
|
10014 else if (can_clear(T_CD) && result_empty) |
| 7 | 10015 type = USE_T_CD; |
| 10016 #if defined(__BEOS__) && defined(BEOS_DR8) | |
| 10017 /* | |
| 10018 * USE_NL does not seem to work in Terminal of DR8 so we set T_DB="" in | |
| 10019 * its internal termcap... this works okay for tests which test *T_DB != | |
| 10020 * NUL. It has the disadvantage that the user cannot use any :set t_* | |
| 10021 * command to get T_DB (back) to empty_option, only :set term=... will do | |
| 10022 * the trick... | |
| 10023 * Anyway, this hack will hopefully go away with the next OS release. | |
| 10024 * (Olaf Seibert) | |
| 10025 */ | |
| 10026 else if (row == 0 && T_DB == empty_option | |
| 10027 && (line_count == 1 || *T_CDL == NUL)) | |
| 10028 #else | |
| 10029 else if (row == 0 && ( | |
| 10030 #ifndef AMIGA | |
| 10031 /* On the Amiga, somehow '\n' on the last line doesn't always scroll | |
| 10032 * up, so use delete-line command */ | |
| 10033 line_count == 1 || | |
| 10034 #endif | |
| 10035 *T_CDL == NUL)) | |
| 10036 #endif | |
| 10037 type = USE_NL; | |
| 10038 else if (*T_CDL != NUL && line_count > 1 && can_delete) | |
| 10039 type = USE_T_CDL; | |
| 10040 else if (can_clear(T_CE) && result_empty | |
|
12477
68d7bc045dbe
patch 8.0.1118: FEAT_WINDOWS adds a lot of #ifdefs
Christian Brabandt <cb@256bit.org>
parents:
12441
diff
changeset
|
10041 && (wp == NULL || wp->w_width == Columns)) |
| 7 | 10042 type = USE_T_CE; |
| 10043 else if (*T_DL != NUL && can_delete) | |
| 10044 type = USE_T_DL; | |
| 10045 else if (*T_CDL != NUL && can_delete) | |
| 10046 type = USE_T_CDL; | |
| 10047 else | |
| 10048 return FAIL; | |
| 10049 | |
| 10050 #ifdef FEAT_CLIPBOARD | |
| 10051 /* Remove a modeless selection when deleting lines halfway the screen or | |
| 10052 * not the full width of the screen. */ | |
|
12477
68d7bc045dbe
patch 8.0.1118: FEAT_WINDOWS adds a lot of #ifdefs
Christian Brabandt <cb@256bit.org>
parents:
12441
diff
changeset
|
10053 if (off + row > 0 || (wp != NULL && wp->w_width != Columns)) |
| 3674 | 10054 clip_clear_selection(&clip_star); |
| 7 | 10055 else |
| 10056 clip_scroll_selection(line_count); | |
| 10057 #endif | |
| 10058 | |
| 10059 #ifdef FEAT_GUI | |
| 10060 /* Don't update the GUI cursor here, ScreenLines[] is invalid until the | |
| 10061 * scrolling is actually carried out. */ | |
|
9848
664276833670
commit https://github.com/vim/vim/commit/107abd2ca53c31fd3bb40d77ff296e98eaae2975
Christian Brabandt <cb@256bit.org>
parents:
9754
diff
changeset
|
10062 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
|
10063 && gui.cursor_row < end + off); |
| 7 | 10064 #endif |
| 10065 | |
| 10066 if (*T_CCS != NUL) /* cursor relative to region */ | |
| 10067 { | |
| 10068 cursor_row = row; | |
| 10069 cursor_end = end; | |
| 10070 } | |
| 10071 else | |
| 10072 { | |
| 10073 cursor_row = row + off; | |
| 10074 cursor_end = end + off; | |
| 10075 } | |
| 10076 | |
| 10077 /* | |
| 10078 * Now shift LineOffset[] line_count up to reflect the deleted lines. | |
| 10079 * Clear the inserted lines in ScreenLines[]. | |
| 10080 */ | |
| 10081 row += off; | |
| 10082 end += off; | |
| 10083 for (i = 0; i < line_count; ++i) | |
| 10084 { | |
| 10085 if (wp != NULL && wp->w_width != Columns) | |
| 10086 { | |
| 10087 /* need to copy part of a line */ | |
| 10088 j = row + i; | |
| 10089 while ((j += line_count) <= end - 1) | |
| 10090 linecopy(j - line_count, j, wp); | |
| 10091 j -= line_count; | |
| 10092 if (can_clear((char_u *)" ")) | |
|
12152
69af108df70e
patch 8.0.0956: scrolling in a terminal window has flicker
Christian Brabandt <cb@256bit.org>
parents:
12122
diff
changeset
|
10093 lineclear(LineOffset[j] + wp->w_wincol, wp->w_width, |
|
69af108df70e
patch 8.0.0956: scrolling in a terminal window has flicker
Christian Brabandt <cb@256bit.org>
parents:
12122
diff
changeset
|
10094 clear_attr); |
| 7 | 10095 else |
| 10096 lineinvalid(LineOffset[j] + wp->w_wincol, wp->w_width); | |
| 10097 LineWraps[j] = FALSE; | |
| 10098 } | |
| 10099 else | |
| 10100 { | |
| 10101 /* whole width, moving the line pointers is faster */ | |
| 10102 j = row + i; | |
| 10103 temp = LineOffset[j]; | |
| 10104 while ((j += line_count) <= end - 1) | |
| 10105 { | |
| 10106 LineOffset[j - line_count] = LineOffset[j]; | |
| 10107 LineWraps[j - line_count] = LineWraps[j]; | |
| 10108 } | |
| 10109 LineOffset[j - line_count] = temp; | |
| 10110 LineWraps[j - line_count] = FALSE; | |
| 10111 if (can_clear((char_u *)" ")) | |
|
12152
69af108df70e
patch 8.0.0956: scrolling in a terminal window has flicker
Christian Brabandt <cb@256bit.org>
parents:
12122
diff
changeset
|
10112 lineclear(temp, (int)Columns, clear_attr); |
| 7 | 10113 else |
| 10114 lineinvalid(temp, (int)Columns); | |
| 10115 } | |
| 10116 } | |
| 10117 | |
|
12152
69af108df70e
patch 8.0.0956: scrolling in a terminal window has flicker
Christian Brabandt <cb@256bit.org>
parents:
12122
diff
changeset
|
10118 if (screen_attr != clear_attr) |
|
69af108df70e
patch 8.0.0956: scrolling in a terminal window has flicker
Christian Brabandt <cb@256bit.org>
parents:
12122
diff
changeset
|
10119 screen_stop_highlight(); |
|
69af108df70e
patch 8.0.0956: scrolling in a terminal window has flicker
Christian Brabandt <cb@256bit.org>
parents:
12122
diff
changeset
|
10120 if (clear_attr != 0) |
|
69af108df70e
patch 8.0.0956: scrolling in a terminal window has flicker
Christian Brabandt <cb@256bit.org>
parents:
12122
diff
changeset
|
10121 screen_start_highlight(clear_attr); |
| 7 | 10122 |
| 10123 /* redraw the characters */ | |
| 10124 if (type == USE_REDRAW) | |
| 10125 redraw_block(row, end, wp); | |
|
12477
68d7bc045dbe
patch 8.0.1118: FEAT_WINDOWS adds a lot of #ifdefs
Christian Brabandt <cb@256bit.org>
parents:
12441
diff
changeset
|
10126 else if (type == USE_T_CD) /* delete the lines */ |
| 7 | 10127 { |
| 10128 windgoto(cursor_row, 0); | |
| 10129 out_str(T_CD); | |
| 10130 screen_start(); /* don't know where cursor is now */ | |
| 10131 } | |
| 10132 else if (type == USE_T_CDL) | |
| 10133 { | |
| 10134 windgoto(cursor_row, 0); | |
| 10135 term_delete_lines(line_count); | |
| 10136 screen_start(); /* don't know where cursor is now */ | |
| 10137 } | |
| 10138 /* | |
| 10139 * Deleting lines at top of the screen or scroll region: Just scroll | |
| 10140 * the whole screen (scroll region) up by outputting newlines on the | |
| 10141 * last line. | |
| 10142 */ | |
| 10143 else if (type == USE_NL) | |
| 10144 { | |
| 10145 windgoto(cursor_end - 1, 0); | |
| 10146 for (i = line_count; --i >= 0; ) | |
| 10147 out_char('\n'); /* cursor will remain on same line */ | |
| 10148 } | |
| 10149 else | |
| 10150 { | |
| 10151 for (i = line_count; --i >= 0; ) | |
| 10152 { | |
| 10153 if (type == USE_T_DL) | |
| 10154 { | |
| 10155 windgoto(cursor_row, 0); | |
| 10156 out_str(T_DL); /* delete a line */ | |
| 10157 } | |
| 10158 else /* type == USE_T_CE */ | |
| 10159 { | |
| 10160 windgoto(cursor_row + i, 0); | |
| 10161 out_str(T_CE); /* erase a line */ | |
| 10162 } | |
| 10163 screen_start(); /* don't know where cursor is now */ | |
| 10164 } | |
| 10165 } | |
| 10166 | |
| 10167 /* | |
| 10168 * If the 'db' flag is set, we need to clear the lines that have been | |
| 10169 * scrolled up at the bottom of the region. | |
| 10170 */ | |
| 10171 if (*T_DB && (type == USE_T_DL || type == USE_T_CDL)) | |
| 10172 { | |
| 10173 for (i = line_count; i > 0; --i) | |
| 10174 { | |
| 10175 windgoto(cursor_end - i, 0); | |
| 10176 out_str(T_CE); /* erase a line */ | |
| 10177 screen_start(); /* don't know where cursor is now */ | |
| 10178 } | |
| 10179 } | |
| 10180 | |
| 10181 #ifdef FEAT_GUI | |
| 10182 gui_can_update_cursor(); | |
| 10183 if (gui.in_use) | |
| 10184 out_flush(); /* always flush after a scroll */ | |
| 10185 #endif | |
| 10186 | |
| 10187 return OK; | |
| 10188 } | |
| 10189 | |
| 10190 /* | |
| 10191 * show the current mode and ruler | |
| 10192 * | |
| 10193 * If clear_cmdline is TRUE, clear the rest of the cmdline. | |
| 10194 * If clear_cmdline is FALSE there may be a message there that needs to be | |
| 10195 * cleared only if a mode is shown. | |
| 10196 * Return the length of the message (0 if no message). | |
| 10197 */ | |
| 10198 int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
10199 showmode(void) |
| 7 | 10200 { |
| 10201 int need_clear; | |
| 10202 int length = 0; | |
| 10203 int do_mode; | |
| 10204 int attr; | |
| 10205 int nwr_save; | |
| 10206 #ifdef FEAT_INS_EXPAND | |
| 10207 int sub_attr; | |
| 10208 #endif | |
| 10209 | |
| 642 | 10210 do_mode = ((p_smd && msg_silent == 0) |
| 10211 && ((State & INSERT) | |
| 10212 || restart_edit | |
| 5735 | 10213 || VIsual_active)); |
| 7 | 10214 if (do_mode || Recording) |
| 10215 { | |
| 10216 /* | |
| 10217 * Don't show mode right now, when not redrawing or inside a mapping. | |
| 10218 * Call char_avail() only when we are going to show something, because | |
| 10219 * it takes a bit of time. | |
| 10220 */ | |
| 10221 if (!redrawing() || (char_avail() && !KeyTyped) || msg_silent != 0) | |
| 10222 { | |
| 10223 redraw_cmdline = TRUE; /* show mode later */ | |
| 10224 return 0; | |
| 10225 } | |
| 10226 | |
| 10227 nwr_save = need_wait_return; | |
| 10228 | |
| 10229 /* wait a bit before overwriting an important message */ | |
| 10230 check_for_delay(FALSE); | |
| 10231 | |
| 10232 /* if the cmdline is more than one line high, erase top lines */ | |
| 10233 need_clear = clear_cmdline; | |
| 10234 if (clear_cmdline && cmdline_row < Rows - 1) | |
| 10235 msg_clr_cmdline(); /* will reset clear_cmdline */ | |
| 10236 | |
| 10237 /* Position on the last line in the window, column 0 */ | |
| 10238 msg_pos_mode(); | |
| 10239 cursor_off(); | |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
10240 attr = HL_ATTR(HLF_CM); /* Highlight mode */ |
| 7 | 10241 if (do_mode) |
| 10242 { | |
| 10243 MSG_PUTS_ATTR("--", attr); | |
| 10244 #if defined(FEAT_XIM) | |
| 2520 | 10245 if ( |
| 10246 # ifdef FEAT_GUI_GTK | |
| 10247 preedit_get_status() | |
| 1668 | 10248 # else |
| 10249 im_get_status() | |
| 2520 | 10250 # endif |
| 1668 | 10251 ) |
|
2277
f42e0b5ff9e9
Change remaining HAVE_GTK2 to FEAT_GUI_GTK.
Bram Moolenaar <bram@vim.org>
parents:
2269
diff
changeset
|
10252 # ifdef FEAT_GUI_GTK /* most of the time, it's not XIM being used */ |
| 7 | 10253 MSG_PUTS_ATTR(" IM", attr); |
| 10254 # else | |
| 10255 MSG_PUTS_ATTR(" XIM", attr); | |
| 10256 # endif | |
| 10257 #endif | |
| 10258 #if defined(FEAT_HANGULIN) && defined(FEAT_GUI) | |
| 10259 if (gui.in_use) | |
| 10260 { | |
| 10261 if (hangul_input_state_get()) | |
|
7208
2c00f6b312bf
commit https://github.com/vim/vim/commit/72f4cc4a987d123c0ed909c85b9a05f65cef7202
Christian Brabandt <cb@256bit.org>
parents:
7007
diff
changeset
|
10262 { |
|
2c00f6b312bf
commit https://github.com/vim/vim/commit/72f4cc4a987d123c0ed909c85b9a05f65cef7202
Christian Brabandt <cb@256bit.org>
parents:
7007
diff
changeset
|
10263 /* HANGUL */ |
|
2c00f6b312bf
commit https://github.com/vim/vim/commit/72f4cc4a987d123c0ed909c85b9a05f65cef7202
Christian Brabandt <cb@256bit.org>
parents:
7007
diff
changeset
|
10264 if (enc_utf8) |
|
2c00f6b312bf
commit https://github.com/vim/vim/commit/72f4cc4a987d123c0ed909c85b9a05f65cef7202
Christian Brabandt <cb@256bit.org>
parents:
7007
diff
changeset
|
10265 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
|
10266 else |
|
2c00f6b312bf
commit https://github.com/vim/vim/commit/72f4cc4a987d123c0ed909c85b9a05f65cef7202
Christian Brabandt <cb@256bit.org>
parents:
7007
diff
changeset
|
10267 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
|
10268 } |
| 7 | 10269 } |
| 10270 #endif | |
| 10271 #ifdef FEAT_INS_EXPAND | |
| 5946 | 10272 /* CTRL-X in Insert mode */ |
| 10273 if (edit_submode != NULL && !shortmess(SHM_COMPLETIONMENU)) | |
| 7 | 10274 { |
| 10275 /* These messages can get long, avoid a wrap in a narrow | |
| 10276 * window. Prefer showing edit_submode_extra. */ | |
| 10277 length = (Rows - msg_row) * Columns - 3; | |
| 10278 if (edit_submode_extra != NULL) | |
| 10279 length -= vim_strsize(edit_submode_extra); | |
| 10280 if (length > 0) | |
| 10281 { | |
| 10282 if (edit_submode_pre != NULL) | |
| 10283 length -= vim_strsize(edit_submode_pre); | |
| 10284 if (length - vim_strsize(edit_submode) > 0) | |
| 10285 { | |
| 10286 if (edit_submode_pre != NULL) | |
| 10287 msg_puts_attr(edit_submode_pre, attr); | |
| 10288 msg_puts_attr(edit_submode, attr); | |
| 10289 } | |
| 10290 if (edit_submode_extra != NULL) | |
| 10291 { | |
| 10292 MSG_PUTS_ATTR(" ", attr); /* add a space in between */ | |
| 10293 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
|
10294 sub_attr = HL_ATTR(edit_submode_highl); |
| 7 | 10295 else |
| 10296 sub_attr = attr; | |
| 10297 msg_puts_attr(edit_submode_extra, sub_attr); | |
| 10298 } | |
| 10299 } | |
| 10300 length = 0; | |
| 10301 } | |
| 10302 else | |
| 10303 #endif | |
| 10304 { | |
| 10305 #ifdef FEAT_VREPLACE | |
| 10306 if (State & VREPLACE_FLAG) | |
| 10307 MSG_PUTS_ATTR(_(" VREPLACE"), attr); | |
| 10308 else | |
| 10309 #endif | |
| 10310 if (State & REPLACE_FLAG) | |
| 10311 MSG_PUTS_ATTR(_(" REPLACE"), attr); | |
| 10312 else if (State & INSERT) | |
| 10313 { | |
| 10314 #ifdef FEAT_RIGHTLEFT | |
| 10315 if (p_ri) | |
| 10316 MSG_PUTS_ATTR(_(" REVERSE"), attr); | |
| 10317 #endif | |
| 10318 MSG_PUTS_ATTR(_(" INSERT"), attr); | |
| 10319 } | |
| 10320 else if (restart_edit == 'I') | |
| 10321 MSG_PUTS_ATTR(_(" (insert)"), attr); | |
| 10322 else if (restart_edit == 'R') | |
| 10323 MSG_PUTS_ATTR(_(" (replace)"), attr); | |
| 10324 else if (restart_edit == 'V') | |
| 10325 MSG_PUTS_ATTR(_(" (vreplace)"), attr); | |
| 10326 #ifdef FEAT_RIGHTLEFT | |
| 10327 if (p_hkmap) | |
| 10328 MSG_PUTS_ATTR(_(" Hebrew"), attr); | |
| 10329 # ifdef FEAT_FKMAP | |
| 10330 if (p_fkmap) | |
| 10331 MSG_PUTS_ATTR(farsi_text_5, attr); | |
| 10332 # endif | |
| 10333 #endif | |
| 10334 #ifdef FEAT_KEYMAP | |
| 10335 if (State & LANGMAP) | |
| 10336 { | |
| 10337 # ifdef FEAT_ARABIC | |
| 10338 if (curwin->w_p_arab) | |
| 10339 MSG_PUTS_ATTR(_(" Arabic"), attr); | |
| 10340 else | |
| 10341 # endif | |
|
9645
123d3c102035
commit https://github.com/vim/vim/commit/73ac0c4281a3606651604a3cbcc334bfb3859a87
Christian Brabandt <cb@256bit.org>
parents:
9489
diff
changeset
|
10342 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
|
10343 NameBuff, MAXPATHL)) |
|
123d3c102035
commit https://github.com/vim/vim/commit/73ac0c4281a3606651604a3cbcc334bfb3859a87
Christian Brabandt <cb@256bit.org>
parents:
9489
diff
changeset
|
10344 MSG_PUTS_ATTR(NameBuff, attr); |
| 7 | 10345 } |
| 10346 #endif | |
| 10347 if ((State & INSERT) && p_paste) | |
| 10348 MSG_PUTS_ATTR(_(" (paste)"), attr); | |
| 10349 | |
| 10350 if (VIsual_active) | |
| 10351 { | |
| 10352 char *p; | |
| 10353 | |
| 10354 /* Don't concatenate separate words to avoid translation | |
| 10355 * problems. */ | |
| 10356 switch ((VIsual_select ? 4 : 0) | |
| 10357 + (VIsual_mode == Ctrl_V) * 2 | |
| 10358 + (VIsual_mode == 'V')) | |
| 10359 { | |
| 10360 case 0: p = N_(" VISUAL"); break; | |
| 10361 case 1: p = N_(" VISUAL LINE"); break; | |
| 10362 case 2: p = N_(" VISUAL BLOCK"); break; | |
| 10363 case 4: p = N_(" SELECT"); break; | |
| 10364 case 5: p = N_(" SELECT LINE"); break; | |
| 10365 default: p = N_(" SELECT BLOCK"); break; | |
| 10366 } | |
| 10367 MSG_PUTS_ATTR(_(p), attr); | |
| 10368 } | |
| 10369 MSG_PUTS_ATTR(" --", attr); | |
| 10370 } | |
| 644 | 10371 |
| 7 | 10372 need_clear = TRUE; |
| 10373 } | |
| 10374 if (Recording | |
| 10375 #ifdef FEAT_INS_EXPAND | |
| 10376 && edit_submode == NULL /* otherwise it gets too long */ | |
| 10377 #endif | |
| 10378 ) | |
| 10379 { | |
|
7233
9487ea110214
commit https://github.com/vim/vim/commit/a0ed84a26897c994512873a895b9fc54e90c6845
Christian Brabandt <cb@256bit.org>
parents:
7208
diff
changeset
|
10380 recording_mode(attr); |
| 7 | 10381 need_clear = TRUE; |
| 10382 } | |
| 644 | 10383 |
| 10384 mode_displayed = TRUE; | |
| 7 | 10385 if (need_clear || clear_cmdline) |
| 10386 msg_clr_eos(); | |
| 10387 msg_didout = FALSE; /* overwrite this message */ | |
| 10388 length = msg_col; | |
| 10389 msg_col = 0; | |
| 10390 need_wait_return = nwr_save; /* never ask for hit-return for this */ | |
| 10391 } | |
| 10392 else if (clear_cmdline && msg_silent == 0) | |
| 10393 /* Clear the whole command line. Will reset "clear_cmdline". */ | |
| 10394 msg_clr_cmdline(); | |
| 10395 | |
| 10396 #ifdef FEAT_CMDL_INFO | |
| 10397 /* In Visual mode the size of the selected area must be redrawn. */ | |
| 10398 if (VIsual_active) | |
| 10399 clear_showcmd(); | |
| 10400 | |
| 10401 /* If the last window has no status line, the ruler is after the mode | |
| 10402 * message and must be redrawn */ | |
|
12477
68d7bc045dbe
patch 8.0.1118: FEAT_WINDOWS adds a lot of #ifdefs
Christian Brabandt <cb@256bit.org>
parents:
12441
diff
changeset
|
10403 if (redrawing() && lastwin->w_status_height == 0) |
| 7 | 10404 win_redr_ruler(lastwin, TRUE); |
| 10405 #endif | |
| 10406 redraw_cmdline = FALSE; | |
| 10407 clear_cmdline = FALSE; | |
| 10408 | |
| 10409 return length; | |
| 10410 } | |
| 10411 | |
| 10412 /* | |
| 10413 * Position for a mode message. | |
| 10414 */ | |
| 10415 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
10416 msg_pos_mode(void) |
| 7 | 10417 { |
| 10418 msg_col = 0; | |
| 10419 msg_row = Rows - 1; | |
| 10420 } | |
| 10421 | |
| 10422 /* | |
| 10423 * Delete mode message. Used when ESC is typed which is expected to end | |
| 10424 * Insert mode (but Insert mode didn't end yet!). | |
| 644 | 10425 * Caller should check "mode_displayed". |
| 7 | 10426 */ |
| 10427 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
10428 unshowmode(int force) |
| 7 | 10429 { |
| 10430 /* | |
|
2055
4aa4510d548c
updated for version 7.2.341
Bram Moolenaar <bram@zimbu.org>
parents:
2008
diff
changeset
|
10431 * Don't delete it right now, when not redrawing or inside a mapping. |
| 7 | 10432 */ |
| 10433 if (!redrawing() || (!force && char_avail() && !KeyTyped)) | |
| 10434 redraw_cmdline = TRUE; /* delete mode later */ | |
| 10435 else | |
|
8817
b7eb7bbd71d0
commit https://github.com/vim/vim/commit/fd773e9e88add7d1ffef890fb9f3a00d613b4326
Christian Brabandt <cb@256bit.org>
parents:
8643
diff
changeset
|
10436 clearmode(); |
|
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 |
|
b7eb7bbd71d0
commit https://github.com/vim/vim/commit/fd773e9e88add7d1ffef890fb9f3a00d613b4326
Christian Brabandt <cb@256bit.org>
parents:
8643
diff
changeset
|
10439 /* |
|
b7eb7bbd71d0
commit https://github.com/vim/vim/commit/fd773e9e88add7d1ffef890fb9f3a00d613b4326
Christian Brabandt <cb@256bit.org>
parents:
8643
diff
changeset
|
10440 * Clear the mode message. |
|
b7eb7bbd71d0
commit https://github.com/vim/vim/commit/fd773e9e88add7d1ffef890fb9f3a00d613b4326
Christian Brabandt <cb@256bit.org>
parents:
8643
diff
changeset
|
10441 */ |
|
b7eb7bbd71d0
commit https://github.com/vim/vim/commit/fd773e9e88add7d1ffef890fb9f3a00d613b4326
Christian Brabandt <cb@256bit.org>
parents:
8643
diff
changeset
|
10442 void |
|
9282
9f97a6290c63
commit https://github.com/vim/vim/commit/cf089463492fab53b2a5d81517829d22f882f82e
Christian Brabandt <cb@256bit.org>
parents:
9213
diff
changeset
|
10443 clearmode(void) |
|
8817
b7eb7bbd71d0
commit https://github.com/vim/vim/commit/fd773e9e88add7d1ffef890fb9f3a00d613b4326
Christian Brabandt <cb@256bit.org>
parents:
8643
diff
changeset
|
10444 { |
|
b7eb7bbd71d0
commit https://github.com/vim/vim/commit/fd773e9e88add7d1ffef890fb9f3a00d613b4326
Christian Brabandt <cb@256bit.org>
parents:
8643
diff
changeset
|
10445 msg_pos_mode(); |
|
b7eb7bbd71d0
commit https://github.com/vim/vim/commit/fd773e9e88add7d1ffef890fb9f3a00d613b4326
Christian Brabandt <cb@256bit.org>
parents:
8643
diff
changeset
|
10446 if (Recording) |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
10447 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
|
10448 msg_clr_eos(); |
| 7 | 10449 } |
| 10450 | |
|
7233
9487ea110214
commit https://github.com/vim/vim/commit/a0ed84a26897c994512873a895b9fc54e90c6845
Christian Brabandt <cb@256bit.org>
parents:
7208
diff
changeset
|
10451 static void |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
10452 recording_mode(int attr) |
|
7233
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 MSG_PUTS_ATTR(_("recording"), attr); |
|
9487ea110214
commit https://github.com/vim/vim/commit/a0ed84a26897c994512873a895b9fc54e90c6845
Christian Brabandt <cb@256bit.org>
parents:
7208
diff
changeset
|
10455 if (!shortmess(SHM_RECORDING)) |
|
9487ea110214
commit https://github.com/vim/vim/commit/a0ed84a26897c994512873a895b9fc54e90c6845
Christian Brabandt <cb@256bit.org>
parents:
7208
diff
changeset
|
10456 { |
|
9487ea110214
commit https://github.com/vim/vim/commit/a0ed84a26897c994512873a895b9fc54e90c6845
Christian Brabandt <cb@256bit.org>
parents:
7208
diff
changeset
|
10457 char_u s[4]; |
|
9487ea110214
commit https://github.com/vim/vim/commit/a0ed84a26897c994512873a895b9fc54e90c6845
Christian Brabandt <cb@256bit.org>
parents:
7208
diff
changeset
|
10458 sprintf((char *)s, " @%c", Recording); |
|
9487ea110214
commit https://github.com/vim/vim/commit/a0ed84a26897c994512873a895b9fc54e90c6845
Christian Brabandt <cb@256bit.org>
parents:
7208
diff
changeset
|
10459 MSG_PUTS_ATTR(s, attr); |
|
9487ea110214
commit https://github.com/vim/vim/commit/a0ed84a26897c994512873a895b9fc54e90c6845
Christian Brabandt <cb@256bit.org>
parents:
7208
diff
changeset
|
10460 } |
|
9487ea110214
commit https://github.com/vim/vim/commit/a0ed84a26897c994512873a895b9fc54e90c6845
Christian Brabandt <cb@256bit.org>
parents:
7208
diff
changeset
|
10461 } |
|
9487ea110214
commit https://github.com/vim/vim/commit/a0ed84a26897c994512873a895b9fc54e90c6845
Christian Brabandt <cb@256bit.org>
parents:
7208
diff
changeset
|
10462 |
| 667 | 10463 /* |
| 10464 * Draw the tab pages line at the top of the Vim window. | |
| 10465 */ | |
| 10466 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
10467 draw_tabline(void) |
| 667 | 10468 { |
| 10469 int tabcount = 0; | |
| 10470 tabpage_T *tp; | |
| 10471 int tabwidth; | |
| 10472 int col = 0; | |
| 673 | 10473 int scol = 0; |
| 667 | 10474 int attr; |
| 10475 win_T *wp; | |
| 671 | 10476 win_T *cwp; |
| 10477 int wincount; | |
| 10478 int modified; | |
| 667 | 10479 int c; |
| 10480 int len; | |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
10481 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
|
10482 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
|
10483 int attr_fill = HL_ATTR(HLF_TPF); |
| 673 | 10484 char_u *p; |
| 677 | 10485 int room; |
| 10486 int use_sep_chars = (t_colors < 8 | |
| 10487 #ifdef FEAT_GUI | |
| 10488 && !gui.in_use | |
| 10489 #endif | |
|
9027
773d627cac0b
commit https://github.com/vim/vim/commit/61be73bb0f965a895bfb064ea3e55476ac175162
Christian Brabandt <cb@256bit.org>
parents:
8977
diff
changeset
|
10490 #ifdef FEAT_TERMGUICOLORS |
|
773d627cac0b
commit https://github.com/vim/vim/commit/61be73bb0f965a895bfb064ea3e55476ac175162
Christian Brabandt <cb@256bit.org>
parents:
8977
diff
changeset
|
10491 && !p_tgc |
|
8969
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
10492 #endif |
| 677 | 10493 ); |
| 673 | 10494 |
|
10538
c7f671dfd735
patch 8.0.0159: crash on startup when updating tabline
Christian Brabandt <cb@256bit.org>
parents:
10466
diff
changeset
|
10495 if (ScreenLines == NULL) |
|
c7f671dfd735
patch 8.0.0159: crash on startup when updating tabline
Christian Brabandt <cb@256bit.org>
parents:
10466
diff
changeset
|
10496 return; |
| 673 | 10497 redraw_tabline = FALSE; |
| 667 | 10498 |
| 685 | 10499 #ifdef FEAT_GUI_TABLINE |
| 798 | 10500 /* Take care of a GUI tabline. */ |
| 685 | 10501 if (gui_use_tabline()) |
| 10502 { | |
| 10503 gui_update_tabline(); | |
| 10504 return; | |
| 10505 } | |
| 10506 #endif | |
| 10507 | |
| 10508 if (tabline_height() < 1) | |
| 667 | 10509 return; |
| 10510 | |
| 677 | 10511 #if defined(FEAT_STL_OPT) |
| 681 | 10512 |
| 10513 /* Init TabPageIdxs[] to zero: Clicking outside of tabs has no effect. */ | |
| 10514 for (scol = 0; scol < Columns; ++scol) | |
| 10515 TabPageIdxs[scol] = 0; | |
| 10516 | |
| 677 | 10517 /* Use the 'tabline' option if it's set. */ |
| 10518 if (*p_tal != NUL) | |
| 10519 { | |
|
8872
4d4de770f970
commit https://github.com/vim/vim/commit/f73d3bc253fa79ad220f52f04b93e782e95a9d43
Christian Brabandt <cb@256bit.org>
parents:
8847
diff
changeset
|
10520 int saved_did_emsg = did_emsg; |
| 680 | 10521 |
| 10522 /* Check for an error. If there is one we would loop in redrawing the | |
| 10523 * 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
|
10524 did_emsg = FALSE; |
| 677 | 10525 win_redr_custom(NULL, FALSE); |
|
8872
4d4de770f970
commit https://github.com/vim/vim/commit/f73d3bc253fa79ad220f52f04b93e782e95a9d43
Christian Brabandt <cb@256bit.org>
parents:
8847
diff
changeset
|
10526 if (did_emsg) |
| 680 | 10527 set_string_option_direct((char_u *)"tabline", -1, |
| 694 | 10528 (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
|
10529 did_emsg |= saved_did_emsg; |
| 680 | 10530 } |
| 10531 else | |
| 10532 #endif | |
| 10533 { | |
|
9649
fd9727ae3c49
commit https://github.com/vim/vim/commit/2932359000b2f918d5fade79ea4d124d5943cd07
Christian Brabandt <cb@256bit.org>
parents:
9645
diff
changeset
|
10534 FOR_ALL_TABPAGES(tp) |
| 680 | 10535 ++tabcount; |
| 10536 | |
| 10537 tabwidth = (Columns - 1 + tabcount / 2) / tabcount; | |
| 10538 if (tabwidth < 6) | |
| 10539 tabwidth = 6; | |
| 10540 | |
| 10541 attr = attr_nosel; | |
| 10542 tabcount = 0; | |
| 681 | 10543 scol = 0; |
| 699 | 10544 for (tp = first_tabpage; tp != NULL && col < Columns - 4; |
| 10545 tp = tp->tp_next) | |
| 680 | 10546 { |
| 10547 scol = col; | |
| 10548 | |
| 10549 if (tp->tp_topframe == topframe) | |
| 10550 attr = attr_sel; | |
| 10551 if (use_sep_chars && col > 0) | |
| 10552 screen_putchar('|', 0, col++, attr); | |
| 10553 | |
| 10554 if (tp->tp_topframe != topframe) | |
| 10555 attr = attr_nosel; | |
| 10556 | |
| 10557 screen_putchar(' ', 0, col++, attr); | |
| 10558 | |
| 10559 if (tp == curtab) | |
| 10560 { | |
| 10561 cwp = curwin; | |
| 10562 wp = firstwin; | |
| 10563 } | |
| 10564 else | |
| 10565 { | |
| 10566 cwp = tp->tp_curwin; | |
| 10567 wp = tp->tp_firstwin; | |
| 10568 } | |
| 10569 | |
| 10570 modified = FALSE; | |
| 10571 for (wincount = 0; wp != NULL; wp = wp->w_next, ++wincount) | |
| 10572 if (bufIsChanged(wp->w_buffer)) | |
| 10573 modified = TRUE; | |
| 10574 if (modified || wincount > 1) | |
| 10575 { | |
| 10576 if (wincount > 1) | |
| 10577 { | |
| 10578 vim_snprintf((char *)NameBuff, MAXPATHL, "%d", wincount); | |
| 835 | 10579 len = (int)STRLEN(NameBuff); |
| 699 | 10580 if (col + len >= Columns - 3) |
| 10581 break; | |
| 680 | 10582 screen_puts_len(NameBuff, len, 0, col, |
| 677 | 10583 #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
|
10584 hl_combine_attr(attr, HL_ATTR(HLF_T)) |
| 677 | 10585 #else |
| 6106 | 10586 attr |
| 680 | 10587 #endif |
| 10588 ); | |
| 10589 col += len; | |
| 10590 } | |
| 10591 if (modified) | |
| 10592 screen_puts_len((char_u *)"+", 1, 0, col++, attr); | |
| 10593 screen_putchar(' ', 0, col++, attr); | |
| 10594 } | |
| 10595 | |
| 10596 room = scol - col + tabwidth - 1; | |
| 10597 if (room > 0) | |
| 10598 { | |
| 685 | 10599 /* Get buffer name in NameBuff[] */ |
| 10600 get_trans_bufname(cwp->w_buffer); | |
| 819 | 10601 shorten_dir(NameBuff); |
| 680 | 10602 len = vim_strsize(NameBuff); |
| 10603 p = NameBuff; | |
| 677 | 10604 #ifdef FEAT_MBYTE |
| 680 | 10605 if (has_mbyte) |
| 10606 while (len > room) | |
| 10607 { | |
| 10608 len -= ptr2cells(p); | |
|
11127
506f5d8b7d8b
patch 8.0.0451: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11121
diff
changeset
|
10609 MB_PTR_ADV(p); |
| 680 | 10610 } |
| 10611 else | |
| 10612 #endif | |
| 10613 if (len > room) | |
| 677 | 10614 { |
| 680 | 10615 p += len - room; |
| 10616 len = room; | |
| 677 | 10617 } |
| 699 | 10618 if (len > Columns - col - 1) |
| 10619 len = Columns - col - 1; | |
| 680 | 10620 |
| 835 | 10621 screen_puts_len(p, (int)STRLEN(p), 0, col, attr); |
| 680 | 10622 col += len; |
| 10623 } | |
| 10624 screen_putchar(' ', 0, col++, attr); | |
| 10625 | |
| 10626 /* Store the tab page number in TabPageIdxs[], so that | |
| 10627 * jump_to_mouse() knows where each one is. */ | |
| 10628 ++tabcount; | |
| 10629 while (scol < col) | |
| 10630 TabPageIdxs[scol++] = tabcount; | |
| 10631 } | |
| 10632 | |
| 10633 if (use_sep_chars) | |
| 10634 c = '_'; | |
| 10635 else | |
| 10636 c = ' '; | |
| 10637 screen_fill(0, 1, col, (int)Columns, c, c, attr_fill); | |
| 681 | 10638 |
| 10639 /* Put an "X" for closing the current tab if there are several. */ | |
| 10640 if (first_tabpage->tp_next != NULL) | |
| 10641 { | |
| 10642 screen_putchar('X', 0, (int)Columns - 1, attr_nosel); | |
| 10643 TabPageIdxs[Columns - 1] = -999; | |
| 10644 } | |
| 10645 } | |
| 834 | 10646 |
| 10647 /* Reset the flag here again, in case evaluating 'tabline' causes it to be | |
| 10648 * set. */ | |
| 10649 redraw_tabline = FALSE; | |
| 667 | 10650 } |
| 685 | 10651 |
| 10652 /* | |
| 10653 * Get buffer name for "buf" into NameBuff[]. | |
| 10654 * Takes care of special buffer names and translates special characters. | |
| 10655 */ | |
| 10656 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
10657 get_trans_bufname(buf_T *buf) |
| 685 | 10658 { |
| 10659 if (buf_spname(buf) != NULL) | |
| 3839 | 10660 vim_strncpy(NameBuff, buf_spname(buf), MAXPATHL - 1); |
| 685 | 10661 else |
| 10662 home_replace(buf, buf->b_fname, NameBuff, MAXPATHL, TRUE); | |
| 10663 trans_characters(NameBuff, MAXPATHL); | |
| 10664 } | |
|
12477
68d7bc045dbe
patch 8.0.1118: FEAT_WINDOWS adds a lot of #ifdefs
Christian Brabandt <cb@256bit.org>
parents:
12441
diff
changeset
|
10665 |
| 7 | 10666 /* |
| 10667 * Get the character to use in a status line. Get its attributes in "*attr". | |
| 10668 */ | |
| 10669 static int | |
|
11890
318ae82d8ba4
patch 8.0.0825: not easy to see that a window is a terminal window
Christian Brabandt <cb@256bit.org>
parents:
11866
diff
changeset
|
10670 fillchar_status(int *attr, win_T *wp) |
| 7 | 10671 { |
| 10672 int fill; | |
|
11890
318ae82d8ba4
patch 8.0.0825: not easy to see that a window is a terminal window
Christian Brabandt <cb@256bit.org>
parents:
11866
diff
changeset
|
10673 |
|
318ae82d8ba4
patch 8.0.0825: not easy to see that a window is a terminal window
Christian Brabandt <cb@256bit.org>
parents:
11866
diff
changeset
|
10674 #ifdef FEAT_TERMINAL |
|
318ae82d8ba4
patch 8.0.0825: not easy to see that a window is a terminal window
Christian Brabandt <cb@256bit.org>
parents:
11866
diff
changeset
|
10675 if (bt_terminal(wp->w_buffer)) |
|
318ae82d8ba4
patch 8.0.0825: not easy to see that a window is a terminal window
Christian Brabandt <cb@256bit.org>
parents:
11866
diff
changeset
|
10676 { |
|
318ae82d8ba4
patch 8.0.0825: not easy to see that a window is a terminal window
Christian Brabandt <cb@256bit.org>
parents:
11866
diff
changeset
|
10677 if (wp == curwin) |
|
12122
68c593f649d1
patch 8.0.0941: existing color schemes don't like StatusLineTerm
Christian Brabandt <cb@256bit.org>
parents:
12114
diff
changeset
|
10678 { |
|
68c593f649d1
patch 8.0.0941: existing color schemes don't like StatusLineTerm
Christian Brabandt <cb@256bit.org>
parents:
12114
diff
changeset
|
10679 *attr = HL_ATTR(HLF_ST); |
|
11890
318ae82d8ba4
patch 8.0.0825: not easy to see that a window is a terminal window
Christian Brabandt <cb@256bit.org>
parents:
11866
diff
changeset
|
10680 fill = fill_stl; |
|
12122
68c593f649d1
patch 8.0.0941: existing color schemes don't like StatusLineTerm
Christian Brabandt <cb@256bit.org>
parents:
12114
diff
changeset
|
10681 } |
|
11890
318ae82d8ba4
patch 8.0.0825: not easy to see that a window is a terminal window
Christian Brabandt <cb@256bit.org>
parents:
11866
diff
changeset
|
10682 else |
|
12122
68c593f649d1
patch 8.0.0941: existing color schemes don't like StatusLineTerm
Christian Brabandt <cb@256bit.org>
parents:
12114
diff
changeset
|
10683 { |
|
68c593f649d1
patch 8.0.0941: existing color schemes don't like StatusLineTerm
Christian Brabandt <cb@256bit.org>
parents:
12114
diff
changeset
|
10684 *attr = HL_ATTR(HLF_STNC); |
|
11890
318ae82d8ba4
patch 8.0.0825: not easy to see that a window is a terminal window
Christian Brabandt <cb@256bit.org>
parents:
11866
diff
changeset
|
10685 fill = fill_stlnc; |
|
12122
68c593f649d1
patch 8.0.0941: existing color schemes don't like StatusLineTerm
Christian Brabandt <cb@256bit.org>
parents:
12114
diff
changeset
|
10686 } |
|
11890
318ae82d8ba4
patch 8.0.0825: not easy to see that a window is a terminal window
Christian Brabandt <cb@256bit.org>
parents:
11866
diff
changeset
|
10687 } |
|
318ae82d8ba4
patch 8.0.0825: not easy to see that a window is a terminal window
Christian Brabandt <cb@256bit.org>
parents:
11866
diff
changeset
|
10688 else |
|
318ae82d8ba4
patch 8.0.0825: not easy to see that a window is a terminal window
Christian Brabandt <cb@256bit.org>
parents:
11866
diff
changeset
|
10689 #endif |
|
318ae82d8ba4
patch 8.0.0825: not easy to see that a window is a terminal window
Christian Brabandt <cb@256bit.org>
parents:
11866
diff
changeset
|
10690 if (wp == curwin) |
| 7 | 10691 { |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
10692 *attr = HL_ATTR(HLF_S); |
| 7 | 10693 fill = fill_stl; |
| 10694 } | |
| 10695 else | |
| 10696 { | |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
10697 *attr = HL_ATTR(HLF_SNC); |
| 7 | 10698 fill = fill_stlnc; |
| 10699 } | |
| 10700 /* Use fill when there is highlighting, and highlighting of current | |
| 10701 * window differs, or the fillchars differ, or this is not the | |
| 10702 * current window */ | |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
10703 if (*attr != 0 && ((HL_ATTR(HLF_S) != HL_ATTR(HLF_SNC) |
|
11890
318ae82d8ba4
patch 8.0.0825: not easy to see that a window is a terminal window
Christian Brabandt <cb@256bit.org>
parents:
11866
diff
changeset
|
10704 || wp != curwin || ONE_WINDOW) |
| 7 | 10705 || (fill_stl != fill_stlnc))) |
| 10706 return fill; | |
|
11890
318ae82d8ba4
patch 8.0.0825: not easy to see that a window is a terminal window
Christian Brabandt <cb@256bit.org>
parents:
11866
diff
changeset
|
10707 if (wp == curwin) |
| 7 | 10708 return '^'; |
| 10709 return '='; | |
| 10710 } | |
|
12477
68d7bc045dbe
patch 8.0.1118: FEAT_WINDOWS adds a lot of #ifdefs
Christian Brabandt <cb@256bit.org>
parents:
12441
diff
changeset
|
10711 |
| 7 | 10712 /* |
| 10713 * Get the character to use in a separator between vertically split windows. | |
| 10714 * Get its attributes in "*attr". | |
| 10715 */ | |
| 10716 static int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
10717 fillchar_vsep(int *attr) |
| 7 | 10718 { |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
10719 *attr = HL_ATTR(HLF_C); |
| 7 | 10720 if (*attr == 0 && fill_vert == ' ') |
| 10721 return '|'; | |
| 10722 else | |
| 10723 return fill_vert; | |
| 10724 } | |
| 10725 | |
| 10726 /* | |
| 10727 * Return TRUE if redrawing should currently be done. | |
| 10728 */ | |
| 10729 int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
10730 redrawing(void) |
| 7 | 10731 { |
|
11105
7c7e496e625d
patch 8.0.0440: not enough test coverage in Insert mode
Christian Brabandt <cb@256bit.org>
parents:
11010
diff
changeset
|
10732 #ifdef FEAT_EVAL |
|
7c7e496e625d
patch 8.0.0440: not enough test coverage in Insert mode
Christian Brabandt <cb@256bit.org>
parents:
11010
diff
changeset
|
10733 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
|
10734 return 0; |
|
7c7e496e625d
patch 8.0.0440: not enough test coverage in Insert mode
Christian Brabandt <cb@256bit.org>
parents:
11010
diff
changeset
|
10735 else |
|
7c7e496e625d
patch 8.0.0440: not enough test coverage in Insert mode
Christian Brabandt <cb@256bit.org>
parents:
11010
diff
changeset
|
10736 #endif |
|
7c7e496e625d
patch 8.0.0440: not enough test coverage in Insert mode
Christian Brabandt <cb@256bit.org>
parents:
11010
diff
changeset
|
10737 return (!RedrawingDisabled |
| 7 | 10738 && !(p_lz && char_avail() && !KeyTyped && !do_redraw)); |
| 10739 } | |
| 10740 | |
| 10741 /* | |
| 10742 * Return TRUE if printing messages should currently be done. | |
| 10743 */ | |
| 10744 int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
10745 messaging(void) |
| 7 | 10746 { |
| 10747 return (!(p_lz && char_avail() && !KeyTyped)); | |
| 10748 } | |
| 10749 | |
|
12487
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10750 #ifdef FEAT_MENU |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10751 /* |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10752 * Draw the window toolbar. |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10753 */ |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10754 static void |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10755 redraw_win_toolbar(win_T *wp) |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10756 { |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10757 vimmenu_T *menu; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10758 int item_idx = 0; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10759 int item_count = 0; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10760 int col = 0; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10761 int next_col; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10762 int off = (int)(current_ScreenLine - ScreenLines); |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10763 int fill_attr = syn_name2attr((char_u *)"ToolbarLine"); |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10764 int button_attr = syn_name2attr((char_u *)"ToolbarButton"); |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10765 |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10766 vim_free(wp->w_winbar_items); |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10767 for (menu = wp->w_winbar->children; menu != NULL; menu = menu->next) |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10768 ++item_count; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10769 wp->w_winbar_items = (winbar_item_T *)alloc_clear( |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10770 (unsigned)sizeof(winbar_item_T) * (item_count + 1)); |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10771 |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10772 /* TODO: use fewer spaces if there is not enough room */ |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10773 for (menu = wp->w_winbar->children; |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
10774 menu != NULL && col < wp->w_width; menu = menu->next) |
|
12487
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10775 { |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10776 space_to_screenline(off + col, fill_attr); |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
10777 if (++col >= wp->w_width) |
|
12487
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10778 break; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10779 if (col > 1) |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10780 { |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10781 space_to_screenline(off + col, fill_attr); |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
10782 if (++col >= wp->w_width) |
|
12487
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10783 break; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10784 } |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10785 |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10786 wp->w_winbar_items[item_idx].wb_startcol = col; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10787 space_to_screenline(off + col, button_attr); |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
10788 if (++col >= wp->w_width) |
|
12487
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10789 break; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10790 |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10791 next_col = text_to_screenline(wp, menu->name, col); |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10792 while (col < next_col) |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10793 { |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10794 ScreenAttrs[off + col] = button_attr; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10795 ++col; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10796 } |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10797 wp->w_winbar_items[item_idx].wb_endcol = col; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10798 wp->w_winbar_items[item_idx].wb_menu = menu; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10799 ++item_idx; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10800 |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
10801 if (col >= wp->w_width) |
|
12487
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10802 break; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10803 space_to_screenline(off + col, button_attr); |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10804 ++col; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10805 } |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
10806 while (col < wp->w_width) |
|
12487
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10807 { |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10808 space_to_screenline(off + col, fill_attr); |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10809 ++col; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10810 } |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10811 wp->w_winbar_items[item_idx].wb_menu = NULL; /* end marker */ |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10812 |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
10813 screen_line(wp->w_winrow, wp->w_wincol, (int)wp->w_width, |
|
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
10814 (int)wp->w_width, FALSE); |
|
12487
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10815 } |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10816 #endif |
| 7 | 10817 /* |
| 10818 * Show current status info in ruler and various other places | |
| 10819 * If always is FALSE, only show ruler if position has changed. | |
| 10820 */ | |
| 10821 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
10822 showruler(int always) |
| 7 | 10823 { |
| 10824 if (!always && !redrawing()) | |
| 10825 return; | |
| 574 | 10826 #ifdef FEAT_INS_EXPAND |
| 10827 if (pum_visible()) | |
| 10828 { | |
| 10829 /* Don't redraw right now, do it later. */ | |
| 10830 curwin->w_redr_status = TRUE; | |
| 10831 return; | |
| 10832 } | |
| 10833 #endif | |
|
12477
68d7bc045dbe
patch 8.0.1118: FEAT_WINDOWS adds a lot of #ifdefs
Christian Brabandt <cb@256bit.org>
parents:
12441
diff
changeset
|
10834 #if defined(FEAT_STL_OPT) |
| 40 | 10835 if ((*p_stl != NUL || *curwin->w_p_stl != NUL) && curwin->w_status_height) |
| 680 | 10836 { |
| 1983 | 10837 redraw_custom_statusline(curwin); |
| 680 | 10838 } |
| 7 | 10839 else |
| 10840 #endif | |
| 10841 #ifdef FEAT_CMDL_INFO | |
| 10842 win_redr_ruler(curwin, always); | |
| 10843 #endif | |
| 10844 | |
| 10845 #ifdef FEAT_TITLE | |
| 10846 if (need_maketitle | |
| 10847 # ifdef FEAT_STL_OPT | |
| 10848 || (p_icon && (stl_syntax & STL_IN_ICON)) | |
| 10849 || (p_title && (stl_syntax & STL_IN_TITLE)) | |
| 10850 # endif | |
| 10851 ) | |
| 10852 maketitle(); | |
| 10853 #endif | |
| 1588 | 10854 /* Redraw the tab pages line if needed. */ |
| 10855 if (redraw_tabline) | |
| 10856 draw_tabline(); | |
| 7 | 10857 } |
| 10858 | |
| 10859 #ifdef FEAT_CMDL_INFO | |
| 10860 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
10861 win_redr_ruler(win_T *wp, int always) |
| 7 | 10862 { |
| 1869 | 10863 #define RULER_BUF_LEN 70 |
| 10864 char_u buffer[RULER_BUF_LEN]; | |
| 7 | 10865 int row; |
| 10866 int fillchar; | |
| 10867 int attr; | |
| 10868 int empty_line = FALSE; | |
| 10869 colnr_T virtcol; | |
| 10870 int i; | |
| 1869 | 10871 size_t len; |
| 7 | 10872 int o; |
| 10873 int this_ru_col; | |
| 10874 int off = 0; | |
| 10875 int width = Columns; | |
| 10876 | |
| 10877 /* If 'ruler' off or redrawing disabled, don't do anything */ | |
| 10878 if (!p_ru) | |
| 10879 return; | |
| 10880 | |
| 10881 /* | |
| 10882 * Check if cursor.lnum is valid, since win_redr_ruler() may be called | |
| 10883 * after deleting lines, before cursor.lnum is corrected. | |
| 10884 */ | |
| 10885 if (wp->w_cursor.lnum > wp->w_buffer->b_ml.ml_line_count) | |
| 10886 return; | |
| 10887 | |
| 10888 #ifdef FEAT_INS_EXPAND | |
| 10889 /* Don't draw the ruler while doing insert-completion, it might overwrite | |
| 10890 * the (long) mode message. */ | |
| 10891 if (wp == lastwin && lastwin->w_status_height == 0) | |
| 10892 if (edit_submode != NULL) | |
| 10893 return; | |
| 540 | 10894 /* Don't draw the ruler when the popup menu is visible, it may overlap. */ |
| 10895 if (pum_visible()) | |
| 10896 return; | |
| 7 | 10897 #endif |
| 10898 | |
| 10899 #ifdef FEAT_STL_OPT | |
| 10900 if (*p_ruf) | |
| 10901 { | |
| 680 | 10902 int save_called_emsg = called_emsg; |
| 10903 | |
| 10904 called_emsg = FALSE; | |
| 7 | 10905 win_redr_custom(wp, TRUE); |
| 680 | 10906 if (called_emsg) |
| 10907 set_string_option_direct((char_u *)"rulerformat", -1, | |
| 694 | 10908 (char_u *)"", OPT_FREE, SID_ERROR); |
| 680 | 10909 called_emsg |= save_called_emsg; |
| 7 | 10910 return; |
| 10911 } | |
| 10912 #endif | |
| 10913 | |
| 10914 /* | |
| 10915 * Check if not in Insert mode and the line is empty (will show "0-1"). | |
| 10916 */ | |
| 10917 if (!(State & INSERT) | |
| 10918 && *ml_get_buf(wp->w_buffer, wp->w_cursor.lnum, FALSE) == NUL) | |
| 10919 empty_line = TRUE; | |
| 10920 | |
| 10921 /* | |
| 10922 * Only draw the ruler when something changed. | |
| 10923 */ | |
| 10924 validate_virtcol_win(wp); | |
| 10925 if ( redraw_cmdline | |
| 10926 || always | |
| 10927 || wp->w_cursor.lnum != wp->w_ru_cursor.lnum | |
| 10928 || wp->w_cursor.col != wp->w_ru_cursor.col | |
| 10929 || wp->w_virtcol != wp->w_ru_virtcol | |
| 10930 #ifdef FEAT_VIRTUALEDIT | |
| 10931 || wp->w_cursor.coladd != wp->w_ru_cursor.coladd | |
| 10932 #endif | |
| 10933 || wp->w_topline != wp->w_ru_topline | |
| 10934 || wp->w_buffer->b_ml.ml_line_count != wp->w_ru_line_count | |
| 10935 #ifdef FEAT_DIFF | |
| 10936 || wp->w_topfill != wp->w_ru_topfill | |
| 10937 #endif | |
| 10938 || empty_line != wp->w_ru_empty) | |
| 10939 { | |
| 10940 cursor_off(); | |
| 10941 if (wp->w_status_height) | |
| 10942 { | |
| 10943 row = W_WINROW(wp) + wp->w_height; | |
|
11890
318ae82d8ba4
patch 8.0.0825: not easy to see that a window is a terminal window
Christian Brabandt <cb@256bit.org>
parents:
11866
diff
changeset
|
10944 fillchar = fillchar_status(&attr, wp); |
|
12513
3ca08bf99396
patch 8.0.1135: W_WINCOL() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12510
diff
changeset
|
10945 off = wp->w_wincol; |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
10946 width = wp->w_width; |
| 7 | 10947 } |
| 10948 else | |
| 10949 { | |
| 10950 row = Rows - 1; | |
| 10951 fillchar = ' '; | |
| 10952 attr = 0; | |
| 10953 width = Columns; | |
| 10954 off = 0; | |
| 10955 } | |
| 10956 | |
| 10957 /* In list mode virtcol needs to be recomputed */ | |
| 10958 virtcol = wp->w_virtcol; | |
| 10959 if (wp->w_p_list && lcs_tab1 == NUL) | |
| 10960 { | |
| 10961 wp->w_p_list = FALSE; | |
| 10962 getvvcol(wp, &wp->w_cursor, NULL, &virtcol, NULL); | |
| 10963 wp->w_p_list = TRUE; | |
| 10964 } | |
| 10965 | |
| 10966 /* | |
| 10967 * Some sprintfs return the length, some return a pointer. | |
| 10968 * To avoid portability problems we use strlen() here. | |
| 10969 */ | |
| 1869 | 10970 vim_snprintf((char *)buffer, RULER_BUF_LEN, "%ld,", |
| 7 | 10971 (wp->w_buffer->b_ml.ml_flags & ML_EMPTY) |
| 10972 ? 0L | |
| 10973 : (long)(wp->w_cursor.lnum)); | |
| 1869 | 10974 len = STRLEN(buffer); |
| 10975 col_print(buffer + len, RULER_BUF_LEN - len, | |
| 7 | 10976 empty_line ? 0 : (int)wp->w_cursor.col + 1, |
| 10977 (int)virtcol + 1); | |
| 10978 | |
| 10979 /* | |
| 10980 * Add a "50%" if there is room for it. | |
| 10981 * On the last line, don't print in the last column (scrolls the | |
| 10982 * screen up on some terminals). | |
| 10983 */ | |
| 10984 i = (int)STRLEN(buffer); | |
| 1869 | 10985 get_rel_pos(wp, buffer + i + 1, RULER_BUF_LEN - i - 1); |
| 7 | 10986 o = i + vim_strsize(buffer + i + 1); |
| 10987 if (wp->w_status_height == 0) /* can't use last char of screen */ | |
| 10988 ++o; | |
| 10989 this_ru_col = ru_col - (Columns - width); | |
| 10990 if (this_ru_col < 0) | |
| 10991 this_ru_col = 0; | |
| 10992 /* Never use more than half the window/screen width, leave the other | |
| 10993 * half for the filename. */ | |
|
12477
68d7bc045dbe
patch 8.0.1118: FEAT_WINDOWS adds a lot of #ifdefs
Christian Brabandt <cb@256bit.org>
parents:
12441
diff
changeset
|
10994 if (this_ru_col < (width + 1) / 2) |
|
68d7bc045dbe
patch 8.0.1118: FEAT_WINDOWS adds a lot of #ifdefs
Christian Brabandt <cb@256bit.org>
parents:
12441
diff
changeset
|
10995 this_ru_col = (width + 1) / 2; |
|
68d7bc045dbe
patch 8.0.1118: FEAT_WINDOWS adds a lot of #ifdefs
Christian Brabandt <cb@256bit.org>
parents:
12441
diff
changeset
|
10996 if (this_ru_col + o < width) |
| 7 | 10997 { |
| 6466 | 10998 /* need at least 3 chars left for get_rel_pos() + NUL */ |
|
12477
68d7bc045dbe
patch 8.0.1118: FEAT_WINDOWS adds a lot of #ifdefs
Christian Brabandt <cb@256bit.org>
parents:
12441
diff
changeset
|
10999 while (this_ru_col + o < width && RULER_BUF_LEN > i + 4) |
| 7 | 11000 { |
| 11001 #ifdef FEAT_MBYTE | |
| 11002 if (has_mbyte) | |
| 11003 i += (*mb_char2bytes)(fillchar, buffer + i); | |
| 11004 else | |
| 11005 #endif | |
| 11006 buffer[i++] = fillchar; | |
| 11007 ++o; | |
| 11008 } | |
| 1869 | 11009 get_rel_pos(wp, buffer + i, RULER_BUF_LEN - i); |
| 7 | 11010 } |
| 11011 /* Truncate at window boundary. */ | |
| 11012 #ifdef FEAT_MBYTE | |
| 11013 if (has_mbyte) | |
| 11014 { | |
| 11015 o = 0; | |
| 474 | 11016 for (i = 0; buffer[i] != NUL; i += (*mb_ptr2len)(buffer + i)) |
| 7 | 11017 { |
| 11018 o += (*mb_ptr2cells)(buffer + i); | |
|
12477
68d7bc045dbe
patch 8.0.1118: FEAT_WINDOWS adds a lot of #ifdefs
Christian Brabandt <cb@256bit.org>
parents:
12441
diff
changeset
|
11019 if (this_ru_col + o > width) |
| 7 | 11020 { |
| 11021 buffer[i] = NUL; | |
| 11022 break; | |
| 11023 } | |
| 11024 } | |
| 11025 } | |
| 11026 else | |
| 11027 #endif | |
|
12477
68d7bc045dbe
patch 8.0.1118: FEAT_WINDOWS adds a lot of #ifdefs
Christian Brabandt <cb@256bit.org>
parents:
12441
diff
changeset
|
11028 if (this_ru_col + (int)STRLEN(buffer) > width) |
|
68d7bc045dbe
patch 8.0.1118: FEAT_WINDOWS adds a lot of #ifdefs
Christian Brabandt <cb@256bit.org>
parents:
12441
diff
changeset
|
11029 buffer[width - this_ru_col] = NUL; |
|
68d7bc045dbe
patch 8.0.1118: FEAT_WINDOWS adds a lot of #ifdefs
Christian Brabandt <cb@256bit.org>
parents:
12441
diff
changeset
|
11030 |
|
68d7bc045dbe
patch 8.0.1118: FEAT_WINDOWS adds a lot of #ifdefs
Christian Brabandt <cb@256bit.org>
parents:
12441
diff
changeset
|
11031 screen_puts(buffer, row, this_ru_col + off, attr); |
| 7 | 11032 i = redraw_cmdline; |
| 11033 screen_fill(row, row + 1, | |
|
12477
68d7bc045dbe
patch 8.0.1118: FEAT_WINDOWS adds a lot of #ifdefs
Christian Brabandt <cb@256bit.org>
parents:
12441
diff
changeset
|
11034 this_ru_col + off + (int)STRLEN(buffer), |
|
68d7bc045dbe
patch 8.0.1118: FEAT_WINDOWS adds a lot of #ifdefs
Christian Brabandt <cb@256bit.org>
parents:
12441
diff
changeset
|
11035 (int)(off + width), |
| 7 | 11036 fillchar, fillchar, attr); |
| 11037 /* don't redraw the cmdline because of showing the ruler */ | |
| 11038 redraw_cmdline = i; | |
| 11039 wp->w_ru_cursor = wp->w_cursor; | |
| 11040 wp->w_ru_virtcol = wp->w_virtcol; | |
| 11041 wp->w_ru_empty = empty_line; | |
| 11042 wp->w_ru_topline = wp->w_topline; | |
| 11043 wp->w_ru_line_count = wp->w_buffer->b_ml.ml_line_count; | |
| 11044 #ifdef FEAT_DIFF | |
| 11045 wp->w_ru_topfill = wp->w_topfill; | |
| 11046 #endif | |
| 11047 } | |
| 11048 } | |
| 11049 #endif | |
| 13 | 11050 |
| 11051 #if defined(FEAT_LINEBREAK) || defined(PROTO) | |
| 11052 /* | |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
11053 * 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
|
11054 * Caller may need to check if 'number' or 'relativenumber' is set. |
| 13 | 11055 * Otherwise it depends on 'numberwidth' and the line count. |
| 11056 */ | |
| 11057 int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
11058 number_width(win_T *wp) |
| 13 | 11059 { |
| 11060 int n; | |
| 11061 linenr_T lnum; | |
| 11062 | |
|
4736
3f2319a953b3
updated for version 7.3.1115
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
11063 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
|
11064 /* cursor line shows "0" */ |
|
3f2319a953b3
updated for version 7.3.1115
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
11065 lnum = wp->w_height; |
|
3f2319a953b3
updated for version 7.3.1115
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
11066 else |
|
3f2319a953b3
updated for version 7.3.1115
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
11067 /* cursor line shows absolute line number */ |
|
3f2319a953b3
updated for version 7.3.1115
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
11068 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
|
11069 |
| 6679 | 11070 if (lnum == wp->w_nrwidth_line_count && wp->w_nuw_cached == wp->w_p_nuw) |
| 13 | 11071 return wp->w_nrwidth_width; |
| 11072 wp->w_nrwidth_line_count = lnum; | |
| 11073 | |
| 11074 n = 0; | |
| 11075 do | |
| 11076 { | |
| 856 | 11077 lnum /= 10; |
| 11078 ++n; | |
| 13 | 11079 } while (lnum > 0); |
| 11080 | |
| 11081 /* 'numberwidth' gives the minimal width plus one */ | |
| 11082 if (n < wp->w_p_nuw - 1) | |
| 11083 n = wp->w_p_nuw - 1; | |
| 11084 | |
| 11085 wp->w_nrwidth_width = n; | |
| 6679 | 11086 wp->w_nuw_cached = wp->w_p_nuw; |
| 13 | 11087 return n; |
| 11088 } | |
| 11089 #endif | |
| 3986 | 11090 |
| 11091 /* | |
| 11092 * Return the current cursor column. This is the actual position on the | |
| 11093 * screen. First column is 0. | |
| 11094 */ | |
| 11095 int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
11096 screen_screencol(void) |
| 3986 | 11097 { |
| 11098 return screen_cur_col; | |
| 11099 } | |
| 11100 | |
| 11101 /* | |
| 11102 * Return the current cursor row. This is the actual position on the screen. | |
| 11103 * First row is 0. | |
| 11104 */ | |
| 11105 int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
11106 screen_screenrow(void) |
| 3986 | 11107 { |
| 11108 return screen_cur_row; | |
| 11109 } |