Mercurial > vim
annotate src/screen.c @ 11607:24664144de4e v8.0.0686
patch 8.0.0686: extra redraw when using CTRL-L in second window
commit https://github.com/vim/vim/commit/9f5f7bf4d5f757ef885acf74ce03c25429a328aa
Author: Bram Moolenaar <Bram@vim.org>
Date: Wed Jun 28 20:45:26 2017 +0200
patch 8.0.0686: extra redraw when using CTRL-L in second window
Problem: When typing CTRL-L in a window that's not the first one, another
redraw will happen later. (Christian Brabandt)
Solution: Reset must_redraw after calling screenclear().
| author | Christian Brabandt <cb@256bit.org> |
|---|---|
| date | Wed, 28 Jun 2017 21:00:03 +0200 |
| parents | 18373179040e |
| children | 8014350fe51a |
| rev | line source |
|---|---|
|
10042
4aead6a9b7a9
commit https://github.com/vim/vim/commit/edf3f97ae2af024708ebb4ac614227327033ca47
Christian Brabandt <cb@256bit.org>
parents:
9992
diff
changeset
|
1 /* vi:set ts=8 sts=4 sw=4 noet: |
| 7 | 2 * |
| 3 * VIM - Vi IMproved by Bram Moolenaar | |
| 4 * | |
| 5 * Do ":help uganda" in Vim to read copying and usage conditions. | |
| 6 * Do ":help credits" in Vim to see a list of people who contributed. | |
| 7 * See README.txt for an overview of the Vim source code. | |
| 8 */ | |
| 9 | |
| 10 /* | |
| 11 * screen.c: code for displaying on the screen | |
| 12 * | |
| 13 * Output to the screen (console, terminal emulator or GUI window) is minimized | |
| 14 * by remembering what is already on the screen, and only updating the parts | |
| 15 * that changed. | |
| 16 * | |
| 17 * ScreenLines[off] Contains a copy of the whole screen, as it is currently | |
| 18 * displayed (excluding text written by external commands). | |
| 19 * ScreenAttrs[off] Contains the associated attributes. | |
| 20 * LineOffset[row] Contains the offset into ScreenLines*[] and ScreenAttrs[] | |
| 21 * for each line. | |
| 22 * LineWraps[row] Flag for each line whether it wraps to the next line. | |
| 23 * | |
| 24 * For double-byte characters, two consecutive bytes in ScreenLines[] can form | |
| 25 * one character which occupies two display cells. | |
| 26 * For UTF-8 a multi-byte character is converted to Unicode and stored in | |
| 27 * ScreenLinesUC[]. ScreenLines[] contains the first byte only. For an ASCII | |
|
2124
dc8a5699253b
updated for version 7.2.406
Bram Moolenaar <bram@zimbu.org>
parents:
2122
diff
changeset
|
28 * character without composing chars ScreenLinesUC[] will be 0 and |
|
dc8a5699253b
updated for version 7.2.406
Bram Moolenaar <bram@zimbu.org>
parents:
2122
diff
changeset
|
29 * ScreenLinesC[][] is not used. When the character occupies two display |
|
dc8a5699253b
updated for version 7.2.406
Bram Moolenaar <bram@zimbu.org>
parents:
2122
diff
changeset
|
30 * cells the next byte in ScreenLines[] is 0. |
| 714 | 31 * ScreenLinesC[][] contain up to 'maxcombine' composing characters |
|
2124
dc8a5699253b
updated for version 7.2.406
Bram Moolenaar <bram@zimbu.org>
parents:
2122
diff
changeset
|
32 * (drawn on top of the first character). There is 0 after the last one used. |
| 7 | 33 * ScreenLines2[] is only used for euc-jp to store the second byte if the |
| 34 * first byte is 0x8e (single-width character). | |
| 35 * | |
| 36 * The screen_*() functions write to the screen and handle updating | |
| 37 * ScreenLines[]. | |
| 38 * | |
| 39 * update_screen() is the function that updates all windows and status lines. | |
| 40 * It is called form the main loop when must_redraw is non-zero. It may be | |
| 1213 | 41 * called from other places when an immediate screen update is needed. |
| 7 | 42 * |
| 43 * The part of the buffer that is displayed in a window is set with: | |
| 44 * - w_topline (first buffer line in window) | |
| 5946 | 45 * - w_topfill (filler lines above the first line) |
| 7 | 46 * - w_leftcol (leftmost window cell in window), |
| 47 * - w_skipcol (skipped window cells of first line) | |
| 48 * | |
| 49 * Commands that only move the cursor around in a window, do not need to take | |
| 50 * action to update the display. The main loop will check if w_topline is | |
| 51 * valid and update it (scroll the window) when needed. | |
| 52 * | |
| 53 * Commands that scroll a window change w_topline and must call | |
| 54 * check_cursor() to move the cursor into the visible part of the window, and | |
| 55 * call redraw_later(VALID) to have the window displayed by update_screen() | |
| 56 * later. | |
| 57 * | |
| 58 * Commands that change text in the buffer must call changed_bytes() or | |
| 59 * changed_lines() to mark the area that changed and will require updating | |
| 60 * later. The main loop will call update_screen(), which will update each | |
| 61 * window that shows the changed buffer. This assumes text above the change | |
| 62 * can remain displayed as it is. Text after the change may need updating for | |
| 63 * scrolling, folding and syntax highlighting. | |
| 64 * | |
| 65 * Commands that change how a window is displayed (e.g., setting 'list') or | |
| 66 * invalidate the contents of a window in another way (e.g., change fold | |
| 67 * settings), must call redraw_later(NOT_VALID) to have the whole window | |
| 68 * redisplayed by update_screen() later. | |
| 69 * | |
| 70 * Commands that change how a buffer is displayed (e.g., setting 'tabstop') | |
| 71 * must call redraw_curbuf_later(NOT_VALID) to have all the windows for the | |
| 72 * buffer redisplayed by update_screen() later. | |
| 73 * | |
| 743 | 74 * Commands that change highlighting and possibly cause a scroll too must call |
| 75 * redraw_later(SOME_VALID) to update the whole window but still use scrolling | |
| 76 * to avoid redrawing everything. But the length of displayed lines must not | |
| 77 * change, use NOT_VALID then. | |
| 78 * | |
| 7 | 79 * Commands that move the window position must call redraw_later(NOT_VALID). |
| 80 * TODO: should minimize redrawing by scrolling when possible. | |
| 81 * | |
| 82 * Commands that change everything (e.g., resizing the screen) must call | |
| 83 * redraw_all_later(NOT_VALID) or redraw_all_later(CLEAR). | |
| 84 * | |
| 85 * Things that are handled indirectly: | |
| 86 * - When messages scroll the screen up, msg_scrolled will be set and | |
| 87 * update_screen() called to redraw. | |
| 88 */ | |
| 89 | |
| 90 #include "vim.h" | |
| 91 | |
| 3586 | 92 #define MB_FILLER_CHAR '<' /* character used when a double-width character |
| 93 * doesn't fit. */ | |
| 94 | |
| 7 | 95 /* |
| 96 * The attributes that are actually active for writing to the screen. | |
| 97 */ | |
| 98 static int screen_attr = 0; | |
| 99 | |
| 100 /* | |
| 101 * Positioning the cursor is reduced by remembering the last position. | |
| 102 * Mostly used by windgoto() and screen_char(). | |
| 103 */ | |
| 104 static int screen_cur_row, screen_cur_col; /* last known cursor position */ | |
| 105 | |
| 106 #ifdef FEAT_SEARCH_EXTRA | |
| 107 static match_T search_hl; /* used for 'hlsearch' highlight matching */ | |
| 108 #endif | |
| 109 | |
| 110 #ifdef FEAT_FOLDING | |
| 111 static foldinfo_T win_foldinfo; /* info for 'foldcolumn' */ | |
|
7805
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7697
diff
changeset
|
112 static int compute_foldcolumn(win_T *wp, int col); |
| 7 | 113 #endif |
| 114 | |
| 115 /* | |
| 116 * Buffer for one screen line (characters and attributes). | |
| 117 */ | |
| 118 static schar_T *current_ScreenLine; | |
| 119 | |
|
7805
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7697
diff
changeset
|
120 static void win_update(win_T *wp); |
|
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7697
diff
changeset
|
121 static void win_draw_end(win_T *wp, int c1, int c2, int row, int endrow, hlf_T hl); |
| 7 | 122 #ifdef FEAT_FOLDING |
|
7805
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7697
diff
changeset
|
123 static void fold_line(win_T *wp, long fold_count, foldinfo_T *foldinfo, linenr_T lnum, int row); |
|
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7697
diff
changeset
|
124 static void fill_foldcolumn(char_u *p, win_T *wp, int closed, linenr_T lnum); |
|
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7697
diff
changeset
|
125 static void copy_text_attr(int off, char_u *buf, int len, int attr); |
|
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7697
diff
changeset
|
126 #endif |
|
11529
998d2cf59caa
patch 8.0.0647: syntax highlighting can make cause a freeze
Christian Brabandt <cb@256bit.org>
parents:
11521
diff
changeset
|
127 static int win_line(win_T *, linenr_T, int, int, int nochange, proftime_T *syntax_tm); |
|
7805
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7697
diff
changeset
|
128 static int char_needs_redraw(int off_from, int off_to, int cols); |
| 7 | 129 #ifdef FEAT_RIGHTLEFT |
|
7805
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7697
diff
changeset
|
130 static void screen_line(int row, int coloff, int endcol, int clear_width, int rlflag); |
| 7 | 131 # define SCREEN_LINE(r, o, e, c, rl) screen_line((r), (o), (e), (c), (rl)) |
| 132 #else | |
|
7805
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7697
diff
changeset
|
133 static void screen_line(int row, int coloff, int endcol, int clear_width); |
| 7 | 134 # define SCREEN_LINE(r, o, e, c, rl) screen_line((r), (o), (e), (c)) |
| 135 #endif | |
|
8643
24b43dd167eb
commit https://github.com/vim/vim/commit/44a2f923c00f1384c9ecde12fb5b4711bc20702e
Christian Brabandt <cb@256bit.org>
parents:
8627
diff
changeset
|
136 #ifdef FEAT_WINDOWS |
|
7805
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7697
diff
changeset
|
137 static void draw_vsep_win(win_T *wp, int row); |
| 7 | 138 #endif |
| 680 | 139 #ifdef FEAT_STL_OPT |
|
7805
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7697
diff
changeset
|
140 static void redraw_custom_statusline(win_T *wp); |
| 680 | 141 #endif |
| 7 | 142 #ifdef FEAT_SEARCH_EXTRA |
| 5985 | 143 # define SEARCH_HL_PRIORITY 0 |
|
7805
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7697
diff
changeset
|
144 static void start_search_hl(void); |
|
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7697
diff
changeset
|
145 static void end_search_hl(void); |
|
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7697
diff
changeset
|
146 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
|
147 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
|
148 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
|
149 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
|
150 #endif |
|
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7697
diff
changeset
|
151 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
|
152 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
|
153 #ifdef FEAT_MBYTE |
|
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7697
diff
changeset
|
154 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
|
155 #endif |
|
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7697
diff
changeset
|
156 static void screenclear2(void); |
|
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7697
diff
changeset
|
157 static void lineclear(unsigned off, int width); |
|
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7697
diff
changeset
|
158 static void lineinvalid(unsigned off, int width); |
|
8643
24b43dd167eb
commit https://github.com/vim/vim/commit/44a2f923c00f1384c9ecde12fb5b4711bc20702e
Christian Brabandt <cb@256bit.org>
parents:
8627
diff
changeset
|
159 #ifdef FEAT_WINDOWS |
|
7805
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7697
diff
changeset
|
160 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
|
161 static void redraw_block(int row, int end, win_T *wp); |
|
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7697
diff
changeset
|
162 #endif |
|
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7697
diff
changeset
|
163 static int win_do_lines(win_T *wp, int row, int line_count, int mayclear, int del); |
|
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7697
diff
changeset
|
164 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
|
165 static void msg_pos_mode(void); |
|
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7697
diff
changeset
|
166 static void recording_mode(int attr); |
| 667 | 167 #if defined(FEAT_WINDOWS) |
|
7805
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7697
diff
changeset
|
168 static void draw_tabline(void); |
| 667 | 169 #endif |
| 7 | 170 #if defined(FEAT_WINDOWS) || defined(FEAT_WILDMENU) || defined(FEAT_STL_OPT) |
|
7805
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7697
diff
changeset
|
171 static int fillchar_status(int *attr, int is_curwin); |
| 7 | 172 #endif |
|
8643
24b43dd167eb
commit https://github.com/vim/vim/commit/44a2f923c00f1384c9ecde12fb5b4711bc20702e
Christian Brabandt <cb@256bit.org>
parents:
8627
diff
changeset
|
173 #ifdef FEAT_WINDOWS |
|
7805
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7697
diff
changeset
|
174 static int fillchar_vsep(int *attr); |
| 7 | 175 #endif |
| 176 #ifdef FEAT_STL_OPT | |
|
7805
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7697
diff
changeset
|
177 static void win_redr_custom(win_T *wp, int draw_ruler); |
| 7 | 178 #endif |
| 179 #ifdef FEAT_CMDL_INFO | |
|
7805
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7697
diff
changeset
|
180 static void win_redr_ruler(win_T *wp, int always); |
| 7 | 181 #endif |
| 182 | |
|
8643
24b43dd167eb
commit https://github.com/vim/vim/commit/44a2f923c00f1384c9ecde12fb5b4711bc20702e
Christian Brabandt <cb@256bit.org>
parents:
8627
diff
changeset
|
183 #if defined(FEAT_CLIPBOARD) || defined(FEAT_WINDOWS) |
| 7 | 184 /* Ugly global: overrule attribute used by screen_char() */ |
| 185 static int screen_char_attr = 0; | |
| 186 #endif | |
| 187 | |
|
11529
998d2cf59caa
patch 8.0.0647: syntax highlighting can make cause a freeze
Christian Brabandt <cb@256bit.org>
parents:
11521
diff
changeset
|
188 #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
|
189 /* 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
|
190 # 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
|
191 #endif |
|
998d2cf59caa
patch 8.0.0647: syntax highlighting can make cause a freeze
Christian Brabandt <cb@256bit.org>
parents:
11521
diff
changeset
|
192 |
| 7 | 193 /* |
| 194 * Redraw the current window later, with update_screen(type). | |
| 195 * Set must_redraw only if not already set to a higher value. | |
| 196 * e.g. if must_redraw is CLEAR, type NOT_VALID will do nothing. | |
| 197 */ | |
| 198 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
199 redraw_later(int type) |
| 7 | 200 { |
| 201 redraw_win_later(curwin, type); | |
| 202 } | |
| 203 | |
| 204 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
205 redraw_win_later( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
206 win_T *wp, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
207 int type) |
| 7 | 208 { |
| 209 if (wp->w_redr_type < type) | |
| 210 { | |
| 211 wp->w_redr_type = type; | |
| 212 if (type >= NOT_VALID) | |
| 213 wp->w_lines_valid = 0; | |
| 214 if (must_redraw < type) /* must_redraw is the maximum of all windows */ | |
| 215 must_redraw = type; | |
| 216 } | |
| 217 } | |
| 218 | |
| 219 /* | |
| 220 * Force a complete redraw later. Also resets the highlighting. To be used | |
| 221 * after executing a shell command that messes up the screen. | |
| 222 */ | |
| 223 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
224 redraw_later_clear(void) |
| 7 | 225 { |
| 226 redraw_all_later(CLEAR); | |
| 826 | 227 #ifdef FEAT_GUI |
| 228 if (gui.in_use) | |
| 229 /* Use a code that will reset gui.highlight_mask in | |
| 230 * gui_stop_highlight(). */ | |
| 231 screen_attr = HL_ALL + 1; | |
| 232 else | |
| 233 #endif | |
| 234 /* Use attributes that is very unlikely to appear in text. */ | |
| 235 screen_attr = HL_BOLD | HL_UNDERLINE | HL_INVERSE; | |
| 7 | 236 } |
| 237 | |
| 238 /* | |
| 239 * Mark all windows to be redrawn later. | |
| 240 */ | |
| 241 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
242 redraw_all_later(int type) |
| 7 | 243 { |
| 244 win_T *wp; | |
| 245 | |
| 246 FOR_ALL_WINDOWS(wp) | |
| 247 { | |
| 248 redraw_win_later(wp, type); | |
| 249 } | |
| 250 } | |
| 251 | |
| 252 /* | |
| 301 | 253 * Mark all windows that are editing the current buffer to be updated later. |
| 7 | 254 */ |
| 255 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
256 redraw_curbuf_later(int type) |
| 7 | 257 { |
| 258 redraw_buf_later(curbuf, type); | |
| 259 } | |
| 260 | |
| 261 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
262 redraw_buf_later(buf_T *buf, int type) |
| 7 | 263 { |
| 264 win_T *wp; | |
| 265 | |
| 266 FOR_ALL_WINDOWS(wp) | |
| 267 { | |
| 268 if (wp->w_buffer == buf) | |
| 269 redraw_win_later(wp, type); | |
| 270 } | |
| 271 } | |
| 272 | |
|
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
|
273 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
|
274 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
|
275 { |
|
32aed0993813
patch 8.0.0592: if a job writes to a buffer screen is not updated
Christian Brabandt <cb@256bit.org>
parents:
11277
diff
changeset
|
276 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
|
277 |
|
32aed0993813
patch 8.0.0592: if a job writes to a buffer screen is not updated
Christian Brabandt <cb@256bit.org>
parents:
11277
diff
changeset
|
278 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
|
279 { |
|
32aed0993813
patch 8.0.0592: if a job writes to a buffer screen is not updated
Christian Brabandt <cb@256bit.org>
parents:
11277
diff
changeset
|
280 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
|
281 { |
|
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 redraw_win_later(wp, type); |
|
11420
d1b6cf96882a
patch 8.0.0594: build failure when windows feature is missing
Christian Brabandt <cb@256bit.org>
parents:
11416
diff
changeset
|
283 #ifdef FEAT_WINDOWS |
|
11416
32aed0993813
patch 8.0.0592: if a job writes to a buffer screen is not updated
Christian Brabandt <cb@256bit.org>
parents:
11277
diff
changeset
|
284 wp->w_redr_status = TRUE; |
|
11420
d1b6cf96882a
patch 8.0.0594: build failure when windows feature is missing
Christian Brabandt <cb@256bit.org>
parents:
11416
diff
changeset
|
285 #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
|
286 } |
|
32aed0993813
patch 8.0.0592: if a job writes to a buffer screen is not updated
Christian Brabandt <cb@256bit.org>
parents:
11277
diff
changeset
|
287 } |
|
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 |
| 7 | 290 /* |
|
5090
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
291 * 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
|
292 * 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
|
293 * Return a code indicating what happened. |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
294 */ |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
295 int |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
296 redraw_asap(int type) |
|
5090
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
297 { |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
298 int rows; |
| 6959 | 299 int cols = screen_Columns; |
|
5090
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
300 int r; |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
301 int ret = 0; |
|
5096
a6ddcab6a240
updated for version 7.3.1291
Bram Moolenaar <bram@vim.org>
parents:
5090
diff
changeset
|
302 schar_T *screenline; /* copy from ScreenLines[] */ |
|
a6ddcab6a240
updated for version 7.3.1291
Bram Moolenaar <bram@vim.org>
parents:
5090
diff
changeset
|
303 sattr_T *screenattr; /* copy from ScreenAttrs[] */ |
|
5090
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
304 #ifdef FEAT_MBYTE |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
305 int i; |
|
5096
a6ddcab6a240
updated for version 7.3.1291
Bram Moolenaar <bram@vim.org>
parents:
5090
diff
changeset
|
306 u8char_T *screenlineUC = NULL; /* copy from ScreenLinesUC[] */ |
|
5090
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
307 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
|
308 schar_T *screenline2 = NULL; /* copy from ScreenLines2[] */ |
|
5090
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
309 #endif |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
310 |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
311 redraw_later(type); |
| 6959 | 312 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
|
313 return ret; |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
314 |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
315 /* Allocate space to save the text displayed in the command line area. */ |
| 6959 | 316 rows = screen_Rows - cmdline_row; |
|
5090
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
317 screenline = (schar_T *)lalloc( |
| 6959 | 318 (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
|
319 screenattr = (sattr_T *)lalloc( |
| 6959 | 320 (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
|
321 if (screenline == NULL || screenattr == NULL) |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
322 ret = 2; |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
323 #ifdef FEAT_MBYTE |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
324 if (enc_utf8) |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
325 { |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
326 screenlineUC = (u8char_T *)lalloc( |
| 6959 | 327 (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
|
328 if (screenlineUC == NULL) |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
329 ret = 2; |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
330 for (i = 0; i < p_mco; ++i) |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
331 { |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
332 screenlineC[i] = (u8char_T *)lalloc( |
| 6959 | 333 (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
|
334 if (screenlineC[i] == NULL) |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
335 ret = 2; |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
336 } |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
337 } |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
338 if (enc_dbcs == DBCS_JPNU) |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
339 { |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
340 screenline2 = (schar_T *)lalloc( |
| 6959 | 341 (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
|
342 if (screenline2 == NULL) |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
343 ret = 2; |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
344 } |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
345 #endif |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
346 |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
347 if (ret != 2) |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
348 { |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
349 /* 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
|
350 for (r = 0; r < rows; ++r) |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
351 { |
| 6959 | 352 mch_memmove(screenline + r * cols, |
|
5090
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
353 ScreenLines + LineOffset[cmdline_row + r], |
| 6959 | 354 (size_t)cols * sizeof(schar_T)); |
| 355 mch_memmove(screenattr + r * cols, | |
|
5090
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
356 ScreenAttrs + LineOffset[cmdline_row + r], |
| 6959 | 357 (size_t)cols * sizeof(sattr_T)); |
|
5090
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
358 #ifdef FEAT_MBYTE |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
359 if (enc_utf8) |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
360 { |
| 6959 | 361 mch_memmove(screenlineUC + r * cols, |
|
5090
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
362 ScreenLinesUC + LineOffset[cmdline_row + r], |
| 6959 | 363 (size_t)cols * sizeof(u8char_T)); |
|
5090
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
364 for (i = 0; i < p_mco; ++i) |
| 6959 | 365 mch_memmove(screenlineC[i] + r * cols, |
| 366 ScreenLinesC[i] + LineOffset[cmdline_row + r], | |
| 367 (size_t)cols * sizeof(u8char_T)); | |
|
5090
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
368 } |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
369 if (enc_dbcs == DBCS_JPNU) |
| 6959 | 370 mch_memmove(screenline2 + r * cols, |
|
5090
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
371 ScreenLines2 + LineOffset[cmdline_row + r], |
| 6959 | 372 (size_t)cols * sizeof(schar_T)); |
|
5090
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
373 #endif |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
374 } |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
375 |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
376 update_screen(0); |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
377 ret = 3; |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
378 |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
379 if (must_redraw == 0) |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
380 { |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
381 int off = (int)(current_ScreenLine - ScreenLines); |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
382 |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
383 /* 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
|
384 for (r = 0; r < rows; ++r) |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
385 { |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
386 mch_memmove(current_ScreenLine, |
| 6959 | 387 screenline + r * cols, |
| 388 (size_t)cols * sizeof(schar_T)); | |
|
5090
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
389 mch_memmove(ScreenAttrs + off, |
| 6959 | 390 screenattr + r * cols, |
| 391 (size_t)cols * sizeof(sattr_T)); | |
|
5090
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
392 #ifdef FEAT_MBYTE |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
393 if (enc_utf8) |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
394 { |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
395 mch_memmove(ScreenLinesUC + off, |
| 6959 | 396 screenlineUC + r * cols, |
| 397 (size_t)cols * sizeof(u8char_T)); | |
|
5090
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
398 for (i = 0; i < p_mco; ++i) |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
399 mch_memmove(ScreenLinesC[i] + off, |
| 6959 | 400 screenlineC[i] + r * cols, |
| 401 (size_t)cols * sizeof(u8char_T)); | |
|
5090
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
402 } |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
403 if (enc_dbcs == DBCS_JPNU) |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
404 mch_memmove(ScreenLines2 + off, |
| 6959 | 405 screenline2 + r * cols, |
| 406 (size_t)cols * sizeof(schar_T)); | |
| 407 #endif | |
| 408 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
|
409 } |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
410 ret = 4; |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
411 } |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
412 } |
|
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 vim_free(screenline); |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
415 vim_free(screenattr); |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
416 #ifdef FEAT_MBYTE |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
417 if (enc_utf8) |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
418 { |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
419 vim_free(screenlineUC); |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
420 for (i = 0; i < p_mco; ++i) |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
421 vim_free(screenlineC[i]); |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
422 } |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
423 if (enc_dbcs == DBCS_JPNU) |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
424 vim_free(screenline2); |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
425 #endif |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
426 |
|
5126
71859e71b1f9
updated for version 7.3.1306
Bram Moolenaar <bram@vim.org>
parents:
5096
diff
changeset
|
427 /* Show the intro message when appropriate. */ |
|
71859e71b1f9
updated for version 7.3.1306
Bram Moolenaar <bram@vim.org>
parents:
5096
diff
changeset
|
428 maybe_intro_message(); |
|
71859e71b1f9
updated for version 7.3.1306
Bram Moolenaar <bram@vim.org>
parents:
5096
diff
changeset
|
429 |
|
71859e71b1f9
updated for version 7.3.1306
Bram Moolenaar <bram@vim.org>
parents:
5096
diff
changeset
|
430 setcursor(); |
|
71859e71b1f9
updated for version 7.3.1306
Bram Moolenaar <bram@vim.org>
parents:
5096
diff
changeset
|
431 |
|
5090
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
432 return ret; |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
433 } |
|
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 /* |
|
8577
63dc856bd13d
commit https://github.com/vim/vim/commit/975b5271eed4fa0500c24a8f37be0b1797cb9db7
Christian Brabandt <cb@256bit.org>
parents:
8212
diff
changeset
|
436 * 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
|
437 * 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
|
438 * it belongs. If highlighting was changed a redraw is needed. |
|
63dc856bd13d
commit https://github.com/vim/vim/commit/975b5271eed4fa0500c24a8f37be0b1797cb9db7
Christian Brabandt <cb@256bit.org>
parents:
8212
diff
changeset
|
439 */ |
|
63dc856bd13d
commit https://github.com/vim/vim/commit/975b5271eed4fa0500c24a8f37be0b1797cb9db7
Christian Brabandt <cb@256bit.org>
parents:
8212
diff
changeset
|
440 void |
|
9282
9f97a6290c63
commit https://github.com/vim/vim/commit/cf089463492fab53b2a5d81517829d22f882f82e
Christian Brabandt <cb@256bit.org>
parents:
9213
diff
changeset
|
441 redraw_after_callback(void) |
|
8577
63dc856bd13d
commit https://github.com/vim/vim/commit/975b5271eed4fa0500c24a8f37be0b1797cb9db7
Christian Brabandt <cb@256bit.org>
parents:
8212
diff
changeset
|
442 { |
|
8627
7c98c5d0298c
commit https://github.com/vim/vim/commit/bfb96c047b79b2aab5fd57a2472871508819f3ef
Christian Brabandt <cb@256bit.org>
parents:
8577
diff
changeset
|
443 if (State == HITRETURN || State == ASKMORE) |
|
7c98c5d0298c
commit https://github.com/vim/vim/commit/bfb96c047b79b2aab5fd57a2472871508819f3ef
Christian Brabandt <cb@256bit.org>
parents:
8577
diff
changeset
|
444 ; /* do nothing */ |
|
7c98c5d0298c
commit https://github.com/vim/vim/commit/bfb96c047b79b2aab5fd57a2472871508819f3ef
Christian Brabandt <cb@256bit.org>
parents:
8577
diff
changeset
|
445 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
|
446 { |
|
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
|
447 /* Redrawing only works when the screen didn't scroll. */ |
|
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
|
448 if (msg_scrolled == 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
|
449 { |
|
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
|
450 update_screen(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
|
451 compute_cmdrow(); |
|
32aed0993813
patch 8.0.0592: if a job writes to a buffer screen is not updated
Christian Brabandt <cb@256bit.org>
parents:
11277
diff
changeset
|
452 } |
|
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
|
453 else |
|
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
|
454 { |
|
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
|
455 /* Redraw in the same position, so that the user can continue |
|
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
|
456 * editing the command. */ |
|
32aed0993813
patch 8.0.0592: if a job writes to a buffer screen is not updated
Christian Brabandt <cb@256bit.org>
parents:
11277
diff
changeset
|
457 compute_cmdrow(); |
|
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
|
458 if (cmdline_row > msg_scrolled) |
|
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 cmdline_row -= msg_scrolled; |
|
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
|
460 else |
|
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
|
461 cmdline_row = 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
|
462 } |
|
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 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
|
464 } |
|
9444
e08c8502d7ce
commit https://github.com/vim/vim/commit/144445d15f2369a58b94b6fee2fe162fc81c8abe
Christian Brabandt <cb@256bit.org>
parents:
9428
diff
changeset
|
465 else if (State & (NORMAL | INSERT)) |
|
8627
7c98c5d0298c
commit https://github.com/vim/vim/commit/bfb96c047b79b2aab5fd57a2472871508819f3ef
Christian Brabandt <cb@256bit.org>
parents:
8577
diff
changeset
|
466 { |
|
11416
32aed0993813
patch 8.0.0592: if a job writes to a buffer screen is not updated
Christian Brabandt <cb@256bit.org>
parents:
11277
diff
changeset
|
467 /* 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
|
468 update_screen(VALID_NO_UPDATE); |
|
8627
7c98c5d0298c
commit https://github.com/vim/vim/commit/bfb96c047b79b2aab5fd57a2472871508819f3ef
Christian Brabandt <cb@256bit.org>
parents:
8577
diff
changeset
|
469 setcursor(); |
|
7c98c5d0298c
commit https://github.com/vim/vim/commit/bfb96c047b79b2aab5fd57a2472871508819f3ef
Christian Brabandt <cb@256bit.org>
parents:
8577
diff
changeset
|
470 } |
|
8577
63dc856bd13d
commit https://github.com/vim/vim/commit/975b5271eed4fa0500c24a8f37be0b1797cb9db7
Christian Brabandt <cb@256bit.org>
parents:
8212
diff
changeset
|
471 cursor_on(); |
|
63dc856bd13d
commit https://github.com/vim/vim/commit/975b5271eed4fa0500c24a8f37be0b1797cb9db7
Christian Brabandt <cb@256bit.org>
parents:
8212
diff
changeset
|
472 out_flush(); |
|
63dc856bd13d
commit https://github.com/vim/vim/commit/975b5271eed4fa0500c24a8f37be0b1797cb9db7
Christian Brabandt <cb@256bit.org>
parents:
8212
diff
changeset
|
473 #ifdef FEAT_GUI |
|
63dc856bd13d
commit https://github.com/vim/vim/commit/975b5271eed4fa0500c24a8f37be0b1797cb9db7
Christian Brabandt <cb@256bit.org>
parents:
8212
diff
changeset
|
474 if (gui.in_use) |
|
63dc856bd13d
commit https://github.com/vim/vim/commit/975b5271eed4fa0500c24a8f37be0b1797cb9db7
Christian Brabandt <cb@256bit.org>
parents:
8212
diff
changeset
|
475 { |
|
9428
0c7f47088e55
commit https://github.com/vim/vim/commit/9d5d3c9c4468ad76f16b50eabd3d9e7eab2ed44d
Christian Brabandt <cb@256bit.org>
parents:
9320
diff
changeset
|
476 /* 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
|
477 * flicker. */ |
|
0c7f47088e55
commit https://github.com/vim/vim/commit/9d5d3c9c4468ad76f16b50eabd3d9e7eab2ed44d
Christian Brabandt <cb@256bit.org>
parents:
9320
diff
changeset
|
478 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
|
479 gui_update_cursor(FALSE, FALSE); |
|
8577
63dc856bd13d
commit https://github.com/vim/vim/commit/975b5271eed4fa0500c24a8f37be0b1797cb9db7
Christian Brabandt <cb@256bit.org>
parents:
8212
diff
changeset
|
480 gui_mch_flush(); |
|
63dc856bd13d
commit https://github.com/vim/vim/commit/975b5271eed4fa0500c24a8f37be0b1797cb9db7
Christian Brabandt <cb@256bit.org>
parents:
8212
diff
changeset
|
481 } |
|
63dc856bd13d
commit https://github.com/vim/vim/commit/975b5271eed4fa0500c24a8f37be0b1797cb9db7
Christian Brabandt <cb@256bit.org>
parents:
8212
diff
changeset
|
482 #endif |
|
63dc856bd13d
commit https://github.com/vim/vim/commit/975b5271eed4fa0500c24a8f37be0b1797cb9db7
Christian Brabandt <cb@256bit.org>
parents:
8212
diff
changeset
|
483 } |
|
63dc856bd13d
commit https://github.com/vim/vim/commit/975b5271eed4fa0500c24a8f37be0b1797cb9db7
Christian Brabandt <cb@256bit.org>
parents:
8212
diff
changeset
|
484 |
|
63dc856bd13d
commit https://github.com/vim/vim/commit/975b5271eed4fa0500c24a8f37be0b1797cb9db7
Christian Brabandt <cb@256bit.org>
parents:
8212
diff
changeset
|
485 /* |
| 7 | 486 * Changed something in the current window, at buffer line "lnum", that |
| 487 * requires that line and possibly other lines to be redrawn. | |
| 488 * Used when entering/leaving Insert mode with the cursor on a folded line. | |
| 489 * Used to remove the "$" from a change command. | |
| 490 * Note that when also inserting/deleting lines w_redraw_top and w_redraw_bot | |
| 491 * may become invalid and the whole window will have to be redrawn. | |
| 492 */ | |
| 493 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
494 redrawWinline( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
495 linenr_T lnum, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
496 int invalid UNUSED) /* window line height is invalid now */ |
| 7 | 497 { |
| 498 #ifdef FEAT_FOLDING | |
| 499 int i; | |
| 500 #endif | |
| 501 | |
| 502 if (curwin->w_redraw_top == 0 || curwin->w_redraw_top > lnum) | |
| 503 curwin->w_redraw_top = lnum; | |
| 504 if (curwin->w_redraw_bot == 0 || curwin->w_redraw_bot < lnum) | |
| 505 curwin->w_redraw_bot = lnum; | |
| 506 redraw_later(VALID); | |
| 507 | |
| 508 #ifdef FEAT_FOLDING | |
| 509 if (invalid) | |
| 510 { | |
| 511 /* A w_lines[] entry for this lnum has become invalid. */ | |
| 512 i = find_wl_entry(curwin, lnum); | |
| 513 if (i >= 0) | |
| 514 curwin->w_lines[i].wl_valid = FALSE; | |
| 515 } | |
| 516 #endif | |
| 517 } | |
| 518 | |
| 519 /* | |
|
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
|
520 * Update all windows that are editing the current buffer. |
| 7 | 521 */ |
| 522 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
523 update_curbuf(int type) |
| 7 | 524 { |
| 525 redraw_curbuf_later(type); | |
| 526 update_screen(type); | |
| 527 } | |
| 528 | |
| 529 /* | |
| 530 * Based on the current value of curwin->w_topline, transfer a screenfull | |
| 531 * of stuff from Filemem to ScreenLines[], and update curwin->w_botline. | |
| 532 */ | |
| 533 void | |
|
11416
32aed0993813
patch 8.0.0592: if a job writes to a buffer screen is not updated
Christian Brabandt <cb@256bit.org>
parents:
11277
diff
changeset
|
534 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
|
535 { |
|
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 int type = type_arg; |
| 7 | 537 win_T *wp; |
| 538 static int did_intro = FALSE; | |
| 539 #if defined(FEAT_SEARCH_EXTRA) || defined(FEAT_CLIPBOARD) | |
| 540 int did_one; | |
| 541 #endif | |
|
9444
e08c8502d7ce
commit https://github.com/vim/vim/commit/144445d15f2369a58b94b6fee2fe162fc81c8abe
Christian Brabandt <cb@256bit.org>
parents:
9428
diff
changeset
|
542 #ifdef FEAT_GUI |
|
9848
664276833670
commit https://github.com/vim/vim/commit/107abd2ca53c31fd3bb40d77ff296e98eaae2975
Christian Brabandt <cb@256bit.org>
parents:
9754
diff
changeset
|
543 int did_undraw = FALSE; |
|
9444
e08c8502d7ce
commit https://github.com/vim/vim/commit/144445d15f2369a58b94b6fee2fe162fc81c8abe
Christian Brabandt <cb@256bit.org>
parents:
9428
diff
changeset
|
544 int gui_cursor_col; |
|
e08c8502d7ce
commit https://github.com/vim/vim/commit/144445d15f2369a58b94b6fee2fe162fc81c8abe
Christian Brabandt <cb@256bit.org>
parents:
9428
diff
changeset
|
545 int gui_cursor_row; |
|
e08c8502d7ce
commit https://github.com/vim/vim/commit/144445d15f2369a58b94b6fee2fe162fc81c8abe
Christian Brabandt <cb@256bit.org>
parents:
9428
diff
changeset
|
546 #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
|
547 int no_update = FALSE; |
| 7 | 548 |
| 2008 | 549 /* Don't do anything if the screen structures are (not yet) valid. */ |
| 7 | 550 if (!screen_valid(TRUE)) |
| 551 return; | |
| 552 | |
|
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
|
553 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
|
554 { |
|
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 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
|
556 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
|
557 } |
|
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 |
| 7 | 559 if (must_redraw) |
| 560 { | |
| 561 if (type < must_redraw) /* use maximal type */ | |
| 562 type = must_redraw; | |
| 1331 | 563 |
| 564 /* must_redraw is reset here, so that when we run into some weird | |
| 565 * reason to redraw while busy redrawing (e.g., asynchronous | |
| 566 * scrolling), or update_topline() in win_update() will cause a | |
| 567 * scroll, the screen will be redrawn later or in win_update(). */ | |
| 7 | 568 must_redraw = 0; |
| 569 } | |
| 570 | |
| 571 /* Need to update w_lines[]. */ | |
| 572 if (curwin->w_lines_valid == 0 && type < NOT_VALID) | |
| 573 type = NOT_VALID; | |
| 574 | |
| 2008 | 575 /* Postpone the redrawing when it's not needed and when being called |
| 576 * recursively. */ | |
| 577 if (!redrawing() || updating_screen) | |
| 7 | 578 { |
| 579 redraw_later(type); /* remember type for next time */ | |
| 580 must_redraw = type; | |
| 581 if (type > INVERTED_ALL) | |
| 582 curwin->w_lines_valid = 0; /* don't use w_lines[].wl_size now */ | |
| 583 return; | |
| 584 } | |
| 585 | |
| 586 updating_screen = TRUE; | |
| 587 #ifdef FEAT_SYN_HL | |
| 588 ++display_tick; /* let syntax code know we're in a next round of | |
| 589 * display updating */ | |
| 590 #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
|
591 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
|
592 ++no_win_do_lines_ins; |
| 7 | 593 |
| 594 /* | |
| 595 * if the screen was scrolled up when displaying a message, scroll it down | |
| 596 */ | |
| 597 if (msg_scrolled) | |
| 598 { | |
| 599 clear_cmdline = TRUE; | |
| 600 if (msg_scrolled > Rows - 5) /* clearing is faster */ | |
| 601 type = CLEAR; | |
| 602 else if (type != CLEAR) | |
| 603 { | |
| 604 check_for_delay(FALSE); | |
| 605 if (screen_ins_lines(0, 0, msg_scrolled, (int)Rows, NULL) == FAIL) | |
| 606 type = CLEAR; | |
| 607 FOR_ALL_WINDOWS(wp) | |
| 608 { | |
| 609 if (W_WINROW(wp) < msg_scrolled) | |
| 610 { | |
| 611 if (W_WINROW(wp) + wp->w_height > msg_scrolled | |
| 612 && wp->w_redr_type < REDRAW_TOP | |
| 613 && wp->w_lines_valid > 0 | |
| 614 && wp->w_topline == wp->w_lines[0].wl_lnum) | |
| 615 { | |
| 616 wp->w_upd_rows = msg_scrolled - W_WINROW(wp); | |
| 617 wp->w_redr_type = REDRAW_TOP; | |
| 618 } | |
| 619 else | |
| 620 { | |
| 621 wp->w_redr_type = NOT_VALID; | |
| 622 #ifdef FEAT_WINDOWS | |
| 623 if (W_WINROW(wp) + wp->w_height + W_STATUS_HEIGHT(wp) | |
| 624 <= msg_scrolled) | |
| 625 wp->w_redr_status = TRUE; | |
| 626 #endif | |
| 627 } | |
| 628 } | |
| 629 } | |
|
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
|
630 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
|
631 redraw_cmdline = TRUE; |
| 667 | 632 #ifdef FEAT_WINDOWS |
| 673 | 633 redraw_tabline = TRUE; |
| 667 | 634 #endif |
| 7 | 635 } |
| 636 msg_scrolled = 0; | |
| 637 need_wait_return = FALSE; | |
| 638 } | |
| 639 | |
| 640 /* reset cmdline_row now (may have been changed temporarily) */ | |
| 641 compute_cmdrow(); | |
| 642 | |
| 643 /* Check for changed highlighting */ | |
| 644 if (need_highlight_changed) | |
| 645 highlight_changed(); | |
| 646 | |
| 647 if (type == CLEAR) /* first clear screen */ | |
| 648 { | |
| 649 screenclear(); /* will reset clear_cmdline */ | |
| 650 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
|
651 /* 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
|
652 must_redraw = 0; |
| 7 | 653 } |
| 654 | |
| 655 if (clear_cmdline) /* going to clear cmdline (done below) */ | |
| 656 check_for_delay(FALSE); | |
| 657 | |
| 13 | 658 #ifdef FEAT_LINEBREAK |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
659 /* 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
|
660 * changes. */ |
| 13 | 661 if (curwin->w_redr_type < NOT_VALID |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
662 && 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
|
663 ? number_width(curwin) : 0)) |
| 13 | 664 curwin->w_redr_type = NOT_VALID; |
| 665 #endif | |
| 666 | |
| 7 | 667 /* |
| 668 * Only start redrawing if there is really something to do. | |
| 669 */ | |
| 670 if (type == INVERTED) | |
| 671 update_curswant(); | |
| 672 if (curwin->w_redr_type < type | |
| 673 && !((type == VALID | |
| 674 && curwin->w_lines[0].wl_valid | |
| 675 #ifdef FEAT_DIFF | |
| 676 && curwin->w_topfill == curwin->w_old_topfill | |
| 677 && curwin->w_botfill == curwin->w_old_botfill | |
| 678 #endif | |
| 679 && curwin->w_topline == curwin->w_lines[0].wl_lnum) | |
| 680 || (type == INVERTED | |
| 1043 | 681 && VIsual_active |
| 7 | 682 && curwin->w_old_cursor_lnum == curwin->w_cursor.lnum |
| 683 && curwin->w_old_visual_mode == VIsual_mode | |
| 684 && (curwin->w_valid & VALID_VIRTCOL) | |
| 685 && curwin->w_old_curswant == curwin->w_curswant) | |
| 686 )) | |
| 687 curwin->w_redr_type = type; | |
| 688 | |
| 849 | 689 #ifdef FEAT_WINDOWS |
| 690 /* Redraw the tab pages line if needed. */ | |
| 691 if (redraw_tabline || type >= NOT_VALID) | |
| 692 draw_tabline(); | |
| 693 #endif | |
| 694 | |
| 7 | 695 #ifdef FEAT_SYN_HL |
| 696 /* | |
| 697 * Correct stored syntax highlighting info for changes in each displayed | |
| 698 * buffer. Each buffer must only be done once. | |
| 699 */ | |
| 700 FOR_ALL_WINDOWS(wp) | |
| 701 { | |
| 702 if (wp->w_buffer->b_mod_set) | |
| 703 { | |
| 704 # ifdef FEAT_WINDOWS | |
| 705 win_T *wwp; | |
| 706 | |
| 707 /* Check if we already did this buffer. */ | |
| 708 for (wwp = firstwin; wwp != wp; wwp = wwp->w_next) | |
| 709 if (wwp->w_buffer == wp->w_buffer) | |
| 710 break; | |
| 711 # endif | |
| 712 if ( | |
| 713 # ifdef FEAT_WINDOWS | |
| 714 wwp == wp && | |
| 715 # endif | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
716 syntax_present(wp)) |
| 7 | 717 syn_stack_apply_changes(wp->w_buffer); |
| 718 } | |
| 719 } | |
| 720 #endif | |
| 721 | |
| 722 /* | |
| 723 * Go from top to bottom through the windows, redrawing the ones that need | |
| 724 * it. | |
| 725 */ | |
| 726 #if defined(FEAT_SEARCH_EXTRA) || defined(FEAT_CLIPBOARD) | |
| 727 did_one = FALSE; | |
| 728 #endif | |
| 729 #ifdef FEAT_SEARCH_EXTRA | |
| 730 search_hl.rm.regprog = NULL; | |
| 731 #endif | |
| 732 FOR_ALL_WINDOWS(wp) | |
| 733 { | |
| 734 if (wp->w_redr_type != 0) | |
| 735 { | |
| 736 cursor_off(); | |
| 737 #if defined(FEAT_SEARCH_EXTRA) || defined(FEAT_CLIPBOARD) | |
| 738 if (!did_one) | |
| 739 { | |
| 740 did_one = TRUE; | |
| 741 # ifdef FEAT_SEARCH_EXTRA | |
| 742 start_search_hl(); | |
| 743 # endif | |
| 744 # ifdef FEAT_CLIPBOARD | |
| 745 /* When Visual area changed, may have to update selection. */ | |
| 3674 | 746 if (clip_star.available && clip_isautosel_star()) |
| 747 clip_update_selection(&clip_star); | |
| 748 if (clip_plus.available && clip_isautosel_plus()) | |
| 749 clip_update_selection(&clip_plus); | |
| 7 | 750 # endif |
| 751 #ifdef FEAT_GUI | |
| 752 /* Remove the cursor before starting to do anything, because | |
| 753 * scrolling may make it difficult to redraw the text under | |
| 754 * it. */ | |
|
9848
664276833670
commit https://github.com/vim/vim/commit/107abd2ca53c31fd3bb40d77ff296e98eaae2975
Christian Brabandt <cb@256bit.org>
parents:
9754
diff
changeset
|
755 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
|
756 { |
|
e08c8502d7ce
commit https://github.com/vim/vim/commit/144445d15f2369a58b94b6fee2fe162fc81c8abe
Christian Brabandt <cb@256bit.org>
parents:
9428
diff
changeset
|
757 gui_cursor_col = gui.cursor_col; |
|
e08c8502d7ce
commit https://github.com/vim/vim/commit/144445d15f2369a58b94b6fee2fe162fc81c8abe
Christian Brabandt <cb@256bit.org>
parents:
9428
diff
changeset
|
758 gui_cursor_row = gui.cursor_row; |
| 7 | 759 gui_undraw_cursor(); |
|
9848
664276833670
commit https://github.com/vim/vim/commit/107abd2ca53c31fd3bb40d77ff296e98eaae2975
Christian Brabandt <cb@256bit.org>
parents:
9754
diff
changeset
|
760 did_undraw = TRUE; |
|
9444
e08c8502d7ce
commit https://github.com/vim/vim/commit/144445d15f2369a58b94b6fee2fe162fc81c8abe
Christian Brabandt <cb@256bit.org>
parents:
9428
diff
changeset
|
761 } |
| 7 | 762 #endif |
| 763 } | |
| 764 #endif | |
| 765 win_update(wp); | |
| 766 } | |
| 767 | |
| 768 #ifdef FEAT_WINDOWS | |
| 769 /* redraw status line after the window to minimize cursor movement */ | |
| 770 if (wp->w_redr_status) | |
| 771 { | |
| 772 cursor_off(); | |
| 773 win_redr_status(wp); | |
| 774 } | |
| 775 #endif | |
| 776 } | |
| 777 #if defined(FEAT_SEARCH_EXTRA) | |
| 778 end_search_hl(); | |
| 779 #endif | |
| 4107 | 780 #ifdef FEAT_INS_EXPAND |
| 781 /* May need to redraw the popup menu. */ | |
| 782 if (pum_visible()) | |
| 783 pum_redraw(); | |
| 784 #endif | |
| 7 | 785 |
| 786 #ifdef FEAT_WINDOWS | |
| 787 /* Reset b_mod_set flags. Going through all windows is probably faster | |
| 788 * 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
|
789 FOR_ALL_WINDOWS(wp) |
| 7 | 790 wp->w_buffer->b_mod_set = FALSE; |
| 791 #else | |
| 792 curbuf->b_mod_set = FALSE; | |
| 793 #endif | |
| 794 | |
| 795 updating_screen = FALSE; | |
| 796 #ifdef FEAT_GUI | |
| 797 gui_may_resize_shell(); | |
| 798 #endif | |
| 799 | |
| 800 /* Clear or redraw the command line. Done last, because scrolling may | |
| 801 * mess up the command line. */ | |
| 802 if (clear_cmdline || redraw_cmdline) | |
| 803 showmode(); | |
| 804 | |
|
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
|
805 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
|
806 --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
|
807 |
| 7 | 808 /* 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
|
809 if (!did_intro) |
|
71859e71b1f9
updated for version 7.3.1306
Bram Moolenaar <bram@vim.org>
parents:
5096
diff
changeset
|
810 maybe_intro_message(); |
| 7 | 811 did_intro = TRUE; |
| 812 | |
| 813 #ifdef FEAT_GUI | |
| 814 /* Redraw the cursor and update the scrollbars when all screen updating is | |
| 815 * done. */ | |
| 816 if (gui.in_use) | |
| 817 { | |
| 818 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
|
819 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
|
820 { |
|
e08c8502d7ce
commit https://github.com/vim/vim/commit/144445d15f2369a58b94b6fee2fe162fc81c8abe
Christian Brabandt <cb@256bit.org>
parents:
9428
diff
changeset
|
821 /* 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
|
822 * uses that. */ |
|
e08c8502d7ce
commit https://github.com/vim/vim/commit/144445d15f2369a58b94b6fee2fe162fc81c8abe
Christian Brabandt <cb@256bit.org>
parents:
9428
diff
changeset
|
823 gui.col = gui_cursor_col; |
|
e08c8502d7ce
commit https://github.com/vim/vim/commit/144445d15f2369a58b94b6fee2fe162fc81c8abe
Christian Brabandt <cb@256bit.org>
parents:
9428
diff
changeset
|
824 gui.row = gui_cursor_row; |
|
10247
d54d4a258b96
commit https://github.com/vim/vim/commit/84dbd494dca599ecff05b2c2279d402c12e6d197
Christian Brabandt <cb@256bit.org>
parents:
10042
diff
changeset
|
825 # ifdef FEAT_MBYTE |
|
d54d4a258b96
commit https://github.com/vim/vim/commit/84dbd494dca599ecff05b2c2279d402c12e6d197
Christian Brabandt <cb@256bit.org>
parents:
10042
diff
changeset
|
826 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
|
827 # endif |
| 7 | 828 gui_update_cursor(FALSE, FALSE); |
|
9446
aaa6639b6f14
commit https://github.com/vim/vim/commit/65549bdef5805ba5a18a3d2d3909998dd7d9ed46
Christian Brabandt <cb@256bit.org>
parents:
9444
diff
changeset
|
829 screen_cur_col = gui.col; |
|
aaa6639b6f14
commit https://github.com/vim/vim/commit/65549bdef5805ba5a18a3d2d3909998dd7d9ed46
Christian Brabandt <cb@256bit.org>
parents:
9444
diff
changeset
|
830 screen_cur_row = gui.row; |
|
9444
e08c8502d7ce
commit https://github.com/vim/vim/commit/144445d15f2369a58b94b6fee2fe162fc81c8abe
Christian Brabandt <cb@256bit.org>
parents:
9428
diff
changeset
|
831 } |
| 7 | 832 gui_update_scrollbars(FALSE); |
| 833 } | |
| 834 #endif | |
| 835 } | |
| 836 | |
|
10793
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
837 #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
|
838 /* |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
839 * 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
|
840 * 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
|
841 */ |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
842 static void |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
843 update_prepare(void) |
|
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 cursor_off(); |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
846 updating_screen = TRUE; |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
847 #ifdef FEAT_GUI |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
848 /* 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
|
849 * 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
|
850 if (gui.in_use) |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
851 gui_undraw_cursor(); |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
852 #endif |
|
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 start_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 |
|
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 * 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
|
860 */ |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
861 static void |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
862 update_finish(void) |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
863 { |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
864 if (redraw_cmdline) |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
865 showmode(); |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
866 |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
867 # ifdef FEAT_SEARCH_EXTRA |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
868 end_search_hl(); |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
869 # endif |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
870 |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
871 updating_screen = FALSE; |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
872 |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
873 # ifdef FEAT_GUI |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
874 gui_may_resize_shell(); |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
875 |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
876 /* 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
|
877 * done. */ |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
878 if (gui.in_use) |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
879 { |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
880 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
|
881 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
|
882 gui_update_scrollbars(FALSE); |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
883 } |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
884 # endif |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
885 } |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
886 #endif |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
887 |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
888 #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
|
889 /* |
|
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
890 * 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
|
891 * 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
|
892 */ |
|
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
893 int |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
894 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
|
895 { |
|
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
896 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
|
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 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
|
899 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
|
900 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
|
901 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
|
902 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
|
903 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
|
904 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
|
905 c = 'n'; |
|
2382
3a5ededa240a
Add the 'c' flag to 'concealcursor'.
Bram Moolenaar <bram@vim.org>
parents:
2381
diff
changeset
|
906 else if (State & CMDLINE) |
|
3a5ededa240a
Add the 'c' flag to 'concealcursor'.
Bram Moolenaar <bram@vim.org>
parents:
2381
diff
changeset
|
907 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
|
908 else |
|
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
909 return FALSE; |
|
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
910 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
|
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 /* |
|
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
914 * 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
|
915 */ |
|
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
916 void |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
917 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
|
918 { |
|
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
919 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
|
920 { |
|
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
921 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
|
922 /* 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
|
923 * 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
|
924 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
|
925 } |
|
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
926 } |
|
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
927 |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
928 void |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
929 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
|
930 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
931 int row; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
932 int j; |
|
11529
998d2cf59caa
patch 8.0.0647: syntax highlighting can make cause a freeze
Christian Brabandt <cb@256bit.org>
parents:
11521
diff
changeset
|
933 #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
|
934 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
|
935 #endif |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
936 |
|
9100
ddccff0480d2
commit https://github.com/vim/vim/commit/908be438794619f10ef7fa25e24e5893b2ae0189
Christian Brabandt <cb@256bit.org>
parents:
9027
diff
changeset
|
937 /* 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
|
938 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
|
939 return; |
|
ddccff0480d2
commit https://github.com/vim/vim/commit/908be438794619f10ef7fa25e24e5893b2ae0189
Christian Brabandt <cb@256bit.org>
parents:
9027
diff
changeset
|
940 |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
941 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
|
942 && foldedCount(wp, lnum, &win_foldinfo) == 0) |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
943 { |
|
11529
998d2cf59caa
patch 8.0.0647: syntax highlighting can make cause a freeze
Christian Brabandt <cb@256bit.org>
parents:
11521
diff
changeset
|
944 #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
|
945 /* 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
|
946 profile_setlimit(p_rdt, &syntax_tm); |
|
998d2cf59caa
patch 8.0.0647: syntax highlighting can make cause a freeze
Christian Brabandt <cb@256bit.org>
parents:
11521
diff
changeset
|
947 #endif |
|
10793
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
948 update_prepare(); |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
949 |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
950 row = 0; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
951 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
|
952 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
953 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
|
954 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
955 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
|
956 # ifdef FEAT_SEARCH_EXTRA |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
957 init_search_hl(wp); |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
958 start_search_hl(); |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
959 prepare_search_hl(wp, lnum); |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
960 # endif |
|
11529
998d2cf59caa
patch 8.0.0647: syntax highlighting can make cause a freeze
Christian Brabandt <cb@256bit.org>
parents:
11521
diff
changeset
|
961 win_line(wp, lnum, row, row + wp->w_lines[j].wl_size, FALSE, |
|
998d2cf59caa
patch 8.0.0647: syntax highlighting can make cause a freeze
Christian Brabandt <cb@256bit.org>
parents:
11521
diff
changeset
|
962 #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
|
963 &syntax_tm |
|
998d2cf59caa
patch 8.0.0647: syntax highlighting can make cause a freeze
Christian Brabandt <cb@256bit.org>
parents:
11521
diff
changeset
|
964 #else |
|
998d2cf59caa
patch 8.0.0647: syntax highlighting can make cause a freeze
Christian Brabandt <cb@256bit.org>
parents:
11521
diff
changeset
|
965 NULL |
|
998d2cf59caa
patch 8.0.0647: syntax highlighting can make cause a freeze
Christian Brabandt <cb@256bit.org>
parents:
11521
diff
changeset
|
966 #endif |
|
998d2cf59caa
patch 8.0.0647: syntax highlighting can make cause a freeze
Christian Brabandt <cb@256bit.org>
parents:
11521
diff
changeset
|
967 ); |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
968 # if defined(FEAT_SEARCH_EXTRA) |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
969 end_search_hl(); |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
970 # endif |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
971 break; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
972 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
973 row += wp->w_lines[j].wl_size; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
974 } |
|
10793
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
975 |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
976 update_finish(); |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
977 } |
|
2378
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
978 need_cursor_line_redraw = FALSE; |
| 7 | 979 } |
| 980 #endif | |
| 981 | |
| 982 #if defined(FEAT_SIGNS) || defined(PROTO) | |
| 983 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
984 update_debug_sign(buf_T *buf, linenr_T lnum) |
| 7 | 985 { |
| 986 win_T *wp; | |
| 987 int doit = FALSE; | |
| 988 | |
| 989 # ifdef FEAT_FOLDING | |
| 990 win_foldinfo.fi_level = 0; | |
| 991 # endif | |
| 992 | |
| 993 /* update/delete a specific mark */ | |
| 994 FOR_ALL_WINDOWS(wp) | |
| 995 { | |
| 996 if (buf != NULL && lnum > 0) | |
| 997 { | |
| 998 if (wp->w_buffer == buf && lnum >= wp->w_topline | |
| 999 && lnum < wp->w_botline) | |
| 1000 { | |
| 1001 if (wp->w_redraw_top == 0 || wp->w_redraw_top > lnum) | |
| 1002 wp->w_redraw_top = lnum; | |
| 1003 if (wp->w_redraw_bot == 0 || wp->w_redraw_bot < lnum) | |
| 1004 wp->w_redraw_bot = lnum; | |
| 1005 redraw_win_later(wp, VALID); | |
| 1006 } | |
| 1007 } | |
| 1008 else | |
| 1009 redraw_win_later(wp, VALID); | |
| 1010 if (wp->w_redr_type != 0) | |
| 1011 doit = TRUE; | |
| 1012 } | |
| 1013 | |
| 3250 | 1014 /* Return when there is nothing to do, screen updating is already |
| 1015 * happening (recursive call) or still starting up. */ | |
| 1016 if (!doit || updating_screen | |
| 1017 #ifdef FEAT_GUI | |
| 1018 || gui.starting | |
| 1019 #endif | |
| 1020 || starting) | |
| 7 | 1021 return; |
| 1022 | |
| 1023 /* update all windows that need updating */ | |
| 1024 update_prepare(); | |
| 1025 | |
| 1026 # ifdef FEAT_WINDOWS | |
|
9649
fd9727ae3c49
commit https://github.com/vim/vim/commit/2932359000b2f918d5fade79ea4d124d5943cd07
Christian Brabandt <cb@256bit.org>
parents:
9645
diff
changeset
|
1027 FOR_ALL_WINDOWS(wp) |
| 7 | 1028 { |
| 1029 if (wp->w_redr_type != 0) | |
| 1030 win_update(wp); | |
| 1031 if (wp->w_redr_status) | |
| 1032 win_redr_status(wp); | |
| 1033 } | |
| 1034 # else | |
| 1035 if (curwin->w_redr_type != 0) | |
| 1036 win_update(curwin); | |
| 1037 # endif | |
| 1038 | |
| 1039 update_finish(); | |
| 1040 } | |
| 1041 #endif | |
| 1042 | |
| 1043 | |
| 1044 #if defined(FEAT_GUI) || defined(PROTO) | |
| 1045 /* | |
| 1046 * Update a single window, its status line and maybe the command line msg. | |
| 1047 * Used for the GUI scrollbar. | |
| 1048 */ | |
| 1049 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1050 updateWindow(win_T *wp) |
| 7 | 1051 { |
| 2008 | 1052 /* return if already busy updating */ |
| 1053 if (updating_screen) | |
| 1054 return; | |
| 1055 | |
| 7 | 1056 update_prepare(); |
| 1057 | |
| 1058 #ifdef FEAT_CLIPBOARD | |
| 1059 /* When Visual area changed, may have to update selection. */ | |
| 3674 | 1060 if (clip_star.available && clip_isautosel_star()) |
| 1061 clip_update_selection(&clip_star); | |
| 1062 if (clip_plus.available && clip_isautosel_plus()) | |
| 1063 clip_update_selection(&clip_plus); | |
| 7 | 1064 #endif |
| 670 | 1065 |
| 7 | 1066 win_update(wp); |
| 670 | 1067 |
| 7 | 1068 #ifdef FEAT_WINDOWS |
| 670 | 1069 /* When the screen was cleared redraw the tab pages line. */ |
| 673 | 1070 if (redraw_tabline) |
| 677 | 1071 draw_tabline(); |
| 670 | 1072 |
| 7 | 1073 if (wp->w_redr_status |
| 1074 # ifdef FEAT_CMDL_INFO | |
| 1075 || p_ru | |
| 1076 # endif | |
| 1077 # ifdef FEAT_STL_OPT | |
| 40 | 1078 || *p_stl != NUL || *wp->w_p_stl != NUL |
| 7 | 1079 # endif |
| 1080 ) | |
| 1081 win_redr_status(wp); | |
| 1082 #endif | |
| 1083 | |
| 1084 update_finish(); | |
| 1085 } | |
| 1086 #endif | |
| 1087 | |
| 1088 /* | |
| 1089 * Update a single window. | |
| 1090 * | |
| 1091 * This may cause the windows below it also to be redrawn (when clearing the | |
| 1092 * screen or scrolling lines). | |
| 1093 * | |
| 1094 * How the window is redrawn depends on wp->w_redr_type. Each type also | |
| 1095 * implies the one below it. | |
| 1096 * NOT_VALID redraw the whole window | |
| 743 | 1097 * SOME_VALID redraw the whole window but do scroll when possible |
| 7 | 1098 * REDRAW_TOP redraw the top w_upd_rows window lines, otherwise like VALID |
| 1099 * INVERTED redraw the changed part of the Visual area | |
| 1100 * INVERTED_ALL redraw the whole Visual area | |
| 1101 * VALID 1. scroll up/down to adjust for a changed w_topline | |
| 1102 * 2. update lines at the top when scrolled down | |
| 1103 * 3. redraw changed text: | |
| 301 | 1104 * - if wp->w_buffer->b_mod_set set, update lines between |
| 7 | 1105 * b_mod_top and b_mod_bot. |
| 1106 * - if wp->w_redraw_top non-zero, redraw lines between | |
| 1107 * wp->w_redraw_top and wp->w_redr_bot. | |
| 1108 * - continue redrawing when syntax status is invalid. | |
| 1109 * 4. if scrolled up, update lines at the bottom. | |
| 1110 * This results in three areas that may need updating: | |
| 1111 * top: from first row to top_end (when scrolled down) | |
| 1112 * mid: from mid_start to mid_end (update inversion or changed text) | |
| 1113 * bot: from bot_start to last row (when scrolled up) | |
| 1114 */ | |
| 1115 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1116 win_update(win_T *wp) |
| 7 | 1117 { |
| 1118 buf_T *buf = wp->w_buffer; | |
| 1119 int type; | |
| 1120 int top_end = 0; /* Below last row of the top area that needs | |
| 1121 updating. 0 when no top area updating. */ | |
| 1122 int mid_start = 999;/* first row of the mid area that needs | |
| 1123 updating. 999 when no mid area updating. */ | |
| 1124 int mid_end = 0; /* Below last row of the mid area that needs | |
| 1125 updating. 0 when no mid area updating. */ | |
| 1126 int bot_start = 999;/* first row of the bot area that needs | |
| 1127 updating. 999 when no bot area updating */ | |
| 1128 int scrolled_down = FALSE; /* TRUE when scrolled down when | |
| 1129 w_topline got smaller a bit */ | |
| 1130 #ifdef FEAT_SEARCH_EXTRA | |
| 1326 | 1131 matchitem_T *cur; /* points to the match list */ |
| 7 | 1132 int top_to_mod = FALSE; /* redraw above mod_top */ |
| 1133 #endif | |
| 1134 | |
| 1135 int row; /* current window row to display */ | |
| 1136 linenr_T lnum; /* current buffer lnum to display */ | |
| 1137 int idx; /* current index in w_lines[] */ | |
| 1138 int srow; /* starting row of the current line */ | |
| 1139 | |
| 1140 int eof = FALSE; /* if TRUE, we hit the end of the file */ | |
| 1141 int didline = FALSE; /* if TRUE, we finished the last line */ | |
| 1142 int i; | |
| 1143 long j; | |
| 1144 static int recursive = FALSE; /* being called recursively */ | |
| 1145 int old_botline = wp->w_botline; | |
| 1146 #ifdef FEAT_FOLDING | |
| 1147 long fold_count; | |
| 1148 #endif | |
| 1149 #ifdef FEAT_SYN_HL | |
| 1150 /* remember what happened to the previous line, to know if | |
| 1151 * check_visual_highlight() can be used */ | |
| 1152 #define DID_NONE 1 /* didn't update a line */ | |
| 1153 #define DID_LINE 2 /* updated a normal line */ | |
| 1154 #define DID_FOLD 3 /* updated a folded line */ | |
| 1155 int did_update = DID_NONE; | |
| 1156 linenr_T syntax_last_parsed = 0; /* last parsed text line */ | |
| 1157 #endif | |
| 1158 linenr_T mod_top = 0; | |
| 1159 linenr_T mod_bot = 0; | |
| 1160 #if defined(FEAT_SYN_HL) || defined(FEAT_SEARCH_EXTRA) | |
| 1161 int save_got_int; | |
| 1162 #endif | |
|
11529
998d2cf59caa
patch 8.0.0647: syntax highlighting can make cause a freeze
Christian Brabandt <cb@256bit.org>
parents:
11521
diff
changeset
|
1163 #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
|
1164 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
|
1165 #endif |
| 7 | 1166 |
| 1167 type = wp->w_redr_type; | |
| 1168 | |
| 1169 if (type == NOT_VALID) | |
| 1170 { | |
| 1171 #ifdef FEAT_WINDOWS | |
| 1172 wp->w_redr_status = TRUE; | |
| 1173 #endif | |
| 1174 wp->w_lines_valid = 0; | |
| 1175 } | |
| 1176 | |
| 1177 /* Window is zero-height: nothing to draw. */ | |
| 1178 if (wp->w_height == 0) | |
| 1179 { | |
| 1180 wp->w_redr_type = 0; | |
| 1181 return; | |
| 1182 } | |
| 1183 | |
|
8643
24b43dd167eb
commit https://github.com/vim/vim/commit/44a2f923c00f1384c9ecde12fb5b4711bc20702e
Christian Brabandt <cb@256bit.org>
parents:
8627
diff
changeset
|
1184 #ifdef FEAT_WINDOWS |
| 7 | 1185 /* Window is zero-width: Only need to draw the separator. */ |
| 1186 if (wp->w_width == 0) | |
| 1187 { | |
| 1188 /* draw the vertical separator right of this window */ | |
| 1189 draw_vsep_win(wp, 0); | |
| 1190 wp->w_redr_type = 0; | |
| 1191 return; | |
| 1192 } | |
| 1193 #endif | |
| 1194 | |
| 1195 #ifdef FEAT_SEARCH_EXTRA | |
|
2284
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
1196 init_search_hl(wp); |
| 7 | 1197 #endif |
| 1198 | |
| 13 | 1199 #ifdef FEAT_LINEBREAK |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
1200 /* 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
|
1201 * changes. */ |
|
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
1202 i = (wp->w_p_nu || wp->w_p_rnu) ? number_width(wp) : 0; |
| 677 | 1203 if (wp->w_nrwidth != i) |
| 13 | 1204 { |
| 1205 type = NOT_VALID; | |
| 677 | 1206 wp->w_nrwidth = i; |
| 13 | 1207 } |
| 1208 else | |
| 1209 #endif | |
| 1210 | |
| 7 | 1211 if (buf->b_mod_set && buf->b_mod_xlines != 0 && wp->w_redraw_top != 0) |
| 1212 { | |
| 1213 /* | |
| 1214 * When there are both inserted/deleted lines and specific lines to be | |
| 1215 * redrawn, w_redraw_top and w_redraw_bot may be invalid, just redraw | |
| 1216 * everything (only happens when redrawing is off for while). | |
| 1217 */ | |
| 1218 type = NOT_VALID; | |
| 1219 } | |
| 1220 else | |
| 1221 { | |
| 1222 /* | |
| 1223 * Set mod_top to the first line that needs displaying because of | |
| 1224 * changes. Set mod_bot to the first line after the changes. | |
| 1225 */ | |
| 1226 mod_top = wp->w_redraw_top; | |
| 1227 if (wp->w_redraw_bot != 0) | |
| 1228 mod_bot = wp->w_redraw_bot + 1; | |
| 1229 else | |
| 1230 mod_bot = 0; | |
| 1231 wp->w_redraw_top = 0; /* reset for next time */ | |
| 1232 wp->w_redraw_bot = 0; | |
| 1233 if (buf->b_mod_set) | |
| 1234 { | |
| 1235 if (mod_top == 0 || mod_top > buf->b_mod_top) | |
| 1236 { | |
| 1237 mod_top = buf->b_mod_top; | |
| 1238 #ifdef FEAT_SYN_HL | |
| 1239 /* Need to redraw lines above the change that may be included | |
| 1240 * in a pattern match. */ | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
1241 if (syntax_present(wp)) |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
1242 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
1243 mod_top -= buf->b_s.b_syn_sync_linebreaks; |
| 7 | 1244 if (mod_top < 1) |
| 1245 mod_top = 1; | |
| 1246 } | |
| 1247 #endif | |
| 1248 } | |
| 1249 if (mod_bot == 0 || mod_bot < buf->b_mod_bot) | |
| 1250 mod_bot = buf->b_mod_bot; | |
| 1251 | |
| 1252 #ifdef FEAT_SEARCH_EXTRA | |
| 1253 /* When 'hlsearch' is on and using a multi-line search pattern, a | |
| 1254 * change in one line may make the Search highlighting in a | |
| 1255 * previous line invalid. Simple solution: redraw all visible | |
| 1256 * lines above the change. | |
| 1326 | 1257 * Same for a match pattern. |
| 7 | 1258 */ |
| 699 | 1259 if (search_hl.rm.regprog != NULL |
| 1260 && re_multiline(search_hl.rm.regprog)) | |
| 7 | 1261 top_to_mod = TRUE; |
| 699 | 1262 else |
| 1326 | 1263 { |
| 1264 cur = wp->w_match_head; | |
| 1265 while (cur != NULL) | |
| 1266 { | |
| 1267 if (cur->match.regprog != NULL | |
| 1268 && re_multiline(cur->match.regprog)) | |
| 699 | 1269 { |
| 1270 top_to_mod = TRUE; | |
| 1271 break; | |
| 1272 } | |
| 1326 | 1273 cur = cur->next; |
| 1274 } | |
| 1275 } | |
| 7 | 1276 #endif |
| 1277 } | |
| 1278 #ifdef FEAT_FOLDING | |
| 1279 if (mod_top != 0 && hasAnyFolding(wp)) | |
| 1280 { | |
| 1281 linenr_T lnumt, lnumb; | |
| 1282 | |
| 1283 /* | |
| 1284 * A change in a line can cause lines above it to become folded or | |
| 1285 * unfolded. Find the top most buffer line that may be affected. | |
| 1286 * If the line was previously folded and displayed, get the first | |
| 1287 * line of that fold. If the line is folded now, get the first | |
| 1288 * folded line. Use the minimum of these two. | |
| 1289 */ | |
| 1290 | |
| 1291 /* Find last valid w_lines[] entry above mod_top. Set lnumt to | |
| 1292 * the line below it. If there is no valid entry, use w_topline. | |
| 1293 * Find the first valid w_lines[] entry below mod_bot. Set lnumb | |
| 1294 * to this line. If there is no valid entry, use MAXLNUM. */ | |
| 1295 lnumt = wp->w_topline; | |
| 1296 lnumb = MAXLNUM; | |
| 1297 for (i = 0; i < wp->w_lines_valid; ++i) | |
| 1298 if (wp->w_lines[i].wl_valid) | |
| 1299 { | |
| 1300 if (wp->w_lines[i].wl_lastlnum < mod_top) | |
| 1301 lnumt = wp->w_lines[i].wl_lastlnum + 1; | |
| 1302 if (lnumb == MAXLNUM && wp->w_lines[i].wl_lnum >= mod_bot) | |
| 1303 { | |
| 1304 lnumb = wp->w_lines[i].wl_lnum; | |
| 1305 /* When there is a fold column it might need updating | |
| 1306 * in the next line ("J" just above an open fold). */ | |
| 6553 | 1307 if (compute_foldcolumn(wp, 0) > 0) |
| 7 | 1308 ++lnumb; |
| 1309 } | |
| 1310 } | |
| 1311 | |
| 1312 (void)hasFoldingWin(wp, mod_top, &mod_top, NULL, TRUE, NULL); | |
| 1313 if (mod_top > lnumt) | |
| 1314 mod_top = lnumt; | |
| 1315 | |
| 1316 /* Now do the same for the bottom line (one above mod_bot). */ | |
| 1317 --mod_bot; | |
| 1318 (void)hasFoldingWin(wp, mod_bot, NULL, &mod_bot, TRUE, NULL); | |
| 1319 ++mod_bot; | |
| 1320 if (mod_bot < lnumb) | |
| 1321 mod_bot = lnumb; | |
| 1322 } | |
| 1323 #endif | |
| 1324 | |
| 1325 /* When a change starts above w_topline and the end is below | |
| 1326 * w_topline, start redrawing at w_topline. | |
| 36 | 1327 * If the end of the change is above w_topline: do like no change was |
| 1328 * made, but redraw the first line to find changes in syntax. */ | |
| 7 | 1329 if (mod_top != 0 && mod_top < wp->w_topline) |
| 1330 { | |
| 1331 if (mod_bot > wp->w_topline) | |
| 1332 mod_top = wp->w_topline; | |
| 1333 #ifdef FEAT_SYN_HL | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
1334 else if (syntax_present(wp)) |
| 7 | 1335 top_end = 1; |
| 1336 #endif | |
| 1337 } | |
| 36 | 1338 |
| 1339 /* When line numbers are displayed need to redraw all lines below | |
| 1340 * inserted/deleted lines. */ | |
| 1341 if (mod_top != 0 && buf->b_mod_xlines != 0 && wp->w_p_nu) | |
| 1342 mod_bot = MAXLNUM; | |
| 7 | 1343 } |
| 1344 | |
| 1345 /* | |
| 1346 * When only displaying the lines at the top, set top_end. Used when | |
| 1347 * window has scrolled down for msg_scrolled. | |
| 1348 */ | |
| 1349 if (type == REDRAW_TOP) | |
| 1350 { | |
| 1351 j = 0; | |
| 1352 for (i = 0; i < wp->w_lines_valid; ++i) | |
| 1353 { | |
| 1354 j += wp->w_lines[i].wl_size; | |
| 1355 if (j >= wp->w_upd_rows) | |
| 1356 { | |
| 1357 top_end = j; | |
| 1358 break; | |
| 1359 } | |
| 1360 } | |
| 1361 if (top_end == 0) | |
| 1362 /* not found (cannot happen?): redraw everything */ | |
| 1363 type = NOT_VALID; | |
| 1364 else | |
| 1365 /* top area defined, the rest is VALID */ | |
| 1366 type = VALID; | |
| 1367 } | |
| 1368 | |
| 1378 | 1369 /* Trick: we want to avoid clearing the screen twice. screenclear() will |
| 1331 | 1370 * set "screen_cleared" to TRUE. The special value MAYBE (which is still |
| 1371 * non-zero and thus not FALSE) will indicate that screenclear() was not | |
| 1372 * called. */ | |
| 1373 if (screen_cleared) | |
| 1374 screen_cleared = MAYBE; | |
| 1375 | |
| 7 | 1376 /* |
| 1377 * If there are no changes on the screen that require a complete redraw, | |
| 1378 * handle three cases: | |
| 1379 * 1: we are off the top of the screen by a few lines: scroll down | |
| 1380 * 2: wp->w_topline is below wp->w_lines[0].wl_lnum: may scroll up | |
| 1381 * 3: wp->w_topline is wp->w_lines[0].wl_lnum: find first entry in | |
| 1382 * w_lines[] that needs updating. | |
| 1383 */ | |
| 743 | 1384 if ((type == VALID || type == SOME_VALID |
| 1385 || type == INVERTED || type == INVERTED_ALL) | |
| 7 | 1386 #ifdef FEAT_DIFF |
| 1387 && !wp->w_botfill && !wp->w_old_botfill | |
| 1388 #endif | |
| 1389 ) | |
| 1390 { | |
| 1391 if (mod_top != 0 && wp->w_topline == mod_top) | |
| 1392 { | |
| 1393 /* | |
| 1394 * w_topline is the first changed line, the scrolling will be done | |
| 1395 * further down. | |
| 1396 */ | |
| 1397 } | |
| 1398 else if (wp->w_lines[0].wl_valid | |
| 1399 && (wp->w_topline < wp->w_lines[0].wl_lnum | |
| 1400 #ifdef FEAT_DIFF | |
| 1401 || (wp->w_topline == wp->w_lines[0].wl_lnum | |
| 1402 && wp->w_topfill > wp->w_old_topfill) | |
| 1403 #endif | |
| 1404 )) | |
| 1405 { | |
| 1406 /* | |
| 1407 * New topline is above old topline: May scroll down. | |
| 1408 */ | |
| 1409 #ifdef FEAT_FOLDING | |
| 1410 if (hasAnyFolding(wp)) | |
| 1411 { | |
| 1412 linenr_T ln; | |
| 1413 | |
| 1414 /* count the number of lines we are off, counting a sequence | |
| 1415 * of folded lines as one */ | |
| 1416 j = 0; | |
| 1417 for (ln = wp->w_topline; ln < wp->w_lines[0].wl_lnum; ++ln) | |
| 1418 { | |
| 1419 ++j; | |
| 1420 if (j >= wp->w_height - 2) | |
| 1421 break; | |
| 1422 (void)hasFoldingWin(wp, ln, NULL, &ln, TRUE, NULL); | |
| 1423 } | |
| 1424 } | |
| 1425 else | |
| 1426 #endif | |
| 1427 j = wp->w_lines[0].wl_lnum - wp->w_topline; | |
| 1428 if (j < wp->w_height - 2) /* not too far off */ | |
| 1429 { | |
| 1430 i = plines_m_win(wp, wp->w_topline, wp->w_lines[0].wl_lnum - 1); | |
| 1431 #ifdef FEAT_DIFF | |
| 1432 /* insert extra lines for previously invisible filler lines */ | |
| 1433 if (wp->w_lines[0].wl_lnum != wp->w_topline) | |
| 1434 i += diff_check_fill(wp, wp->w_lines[0].wl_lnum) | |
| 1435 - wp->w_old_topfill; | |
| 1436 #endif | |
| 1437 if (i < wp->w_height - 2) /* less than a screen off */ | |
| 1438 { | |
| 1439 /* | |
| 1440 * Try to insert the correct number of lines. | |
| 1441 * If not the last window, delete the lines at the bottom. | |
| 1442 * win_ins_lines may fail when the terminal can't do it. | |
| 1443 */ | |
| 1444 if (i > 0) | |
| 1445 check_for_delay(FALSE); | |
| 1446 if (win_ins_lines(wp, 0, i, FALSE, wp == firstwin) == OK) | |
| 1447 { | |
| 1448 if (wp->w_lines_valid != 0) | |
| 1449 { | |
| 1450 /* Need to update rows that are new, stop at the | |
| 1451 * first one that scrolled down. */ | |
| 1452 top_end = i; | |
| 1453 scrolled_down = TRUE; | |
| 1454 | |
| 1455 /* Move the entries that were scrolled, disable | |
| 1456 * the entries for the lines to be redrawn. */ | |
| 1457 if ((wp->w_lines_valid += j) > wp->w_height) | |
| 1458 wp->w_lines_valid = wp->w_height; | |
| 1459 for (idx = wp->w_lines_valid; idx - j >= 0; idx--) | |
| 1460 wp->w_lines[idx] = wp->w_lines[idx - j]; | |
| 1461 while (idx >= 0) | |
| 1462 wp->w_lines[idx--].wl_valid = FALSE; | |
| 1463 } | |
| 1464 } | |
| 1465 else | |
| 1466 mid_start = 0; /* redraw all lines */ | |
| 1467 } | |
| 1468 else | |
| 1469 mid_start = 0; /* redraw all lines */ | |
| 1470 } | |
| 1471 else | |
| 1472 mid_start = 0; /* redraw all lines */ | |
| 1473 } | |
| 1474 else | |
| 1475 { | |
| 1476 /* | |
| 1477 * New topline is at or below old topline: May scroll up. | |
| 1478 * When topline didn't change, find first entry in w_lines[] that | |
| 1479 * needs updating. | |
| 1480 */ | |
| 1481 | |
| 1482 /* try to find wp->w_topline in wp->w_lines[].wl_lnum */ | |
| 1483 j = -1; | |
| 1484 row = 0; | |
| 1485 for (i = 0; i < wp->w_lines_valid; i++) | |
| 1486 { | |
| 1487 if (wp->w_lines[i].wl_valid | |
| 1488 && wp->w_lines[i].wl_lnum == wp->w_topline) | |
| 1489 { | |
| 1490 j = i; | |
| 1491 break; | |
| 1492 } | |
| 1493 row += wp->w_lines[i].wl_size; | |
| 1494 } | |
| 1495 if (j == -1) | |
| 1496 { | |
| 1497 /* if wp->w_topline is not in wp->w_lines[].wl_lnum redraw all | |
| 1498 * lines */ | |
| 1499 mid_start = 0; | |
| 1500 } | |
| 1501 else | |
| 1502 { | |
| 1503 /* | |
| 1504 * Try to delete the correct number of lines. | |
| 1505 * wp->w_topline is at wp->w_lines[i].wl_lnum. | |
| 1506 */ | |
| 1507 #ifdef FEAT_DIFF | |
| 1508 /* If the topline didn't change, delete old filler lines, | |
| 1509 * otherwise delete filler lines of the new topline... */ | |
| 1510 if (wp->w_lines[0].wl_lnum == wp->w_topline) | |
| 1511 row += wp->w_old_topfill; | |
| 1512 else | |
| 1513 row += diff_check_fill(wp, wp->w_topline); | |
| 1514 /* ... but don't delete new filler lines. */ | |
| 1515 row -= wp->w_topfill; | |
| 1516 #endif | |
| 1517 if (row > 0) | |
| 1518 { | |
| 1519 check_for_delay(FALSE); | |
| 1520 if (win_del_lines(wp, 0, row, FALSE, wp == firstwin) == OK) | |
| 1521 bot_start = wp->w_height - row; | |
| 1522 else | |
| 1523 mid_start = 0; /* redraw all lines */ | |
| 1524 } | |
| 1525 if ((row == 0 || bot_start < 999) && wp->w_lines_valid != 0) | |
| 1526 { | |
| 1527 /* | |
| 1528 * Skip the lines (below the deleted lines) that are still | |
| 1529 * valid and don't need redrawing. Copy their info | |
| 1530 * upwards, to compensate for the deleted lines. Set | |
| 1531 * bot_start to the first row that needs redrawing. | |
| 1532 */ | |
| 1533 bot_start = 0; | |
| 1534 idx = 0; | |
| 1535 for (;;) | |
| 1536 { | |
| 1537 wp->w_lines[idx] = wp->w_lines[j]; | |
| 1538 /* stop at line that didn't fit, unless it is still | |
| 1539 * valid (no lines deleted) */ | |
| 1540 if (row > 0 && bot_start + row | |
| 1541 + (int)wp->w_lines[j].wl_size > wp->w_height) | |
| 1542 { | |
| 1543 wp->w_lines_valid = idx + 1; | |
| 1544 break; | |
| 1545 } | |
| 1546 bot_start += wp->w_lines[idx++].wl_size; | |
| 1547 | |
| 1548 /* stop at the last valid entry in w_lines[].wl_size */ | |
| 1549 if (++j >= wp->w_lines_valid) | |
| 1550 { | |
| 1551 wp->w_lines_valid = idx; | |
| 1552 break; | |
| 1553 } | |
| 1554 } | |
| 1555 #ifdef FEAT_DIFF | |
| 1556 /* Correct the first entry for filler lines at the top | |
| 1557 * when it won't get updated below. */ | |
| 1558 if (wp->w_p_diff && bot_start > 0) | |
| 1559 wp->w_lines[0].wl_size = | |
| 1560 plines_win_nofill(wp, wp->w_topline, TRUE) | |
| 1561 + wp->w_topfill; | |
| 1562 #endif | |
| 1563 } | |
| 1564 } | |
| 1565 } | |
| 1566 | |
| 1567 /* When starting redraw in the first line, redraw all lines. When | |
| 1568 * there is only one window it's probably faster to clear the screen | |
| 1569 * first. */ | |
| 1570 if (mid_start == 0) | |
| 1571 { | |
| 1572 mid_end = wp->w_height; | |
|
10349
cf988222b150
commit https://github.com/vim/vim/commit/a1f4cb93ba50ea9e40cd4b1f5592b8a6d1398660
Christian Brabandt <cb@256bit.org>
parents:
10307
diff
changeset
|
1573 if (ONE_WINDOW) |
| 981 | 1574 { |
| 1331 | 1575 /* Clear the screen when it was not done by win_del_lines() or |
| 1576 * win_ins_lines() above, "screen_cleared" is FALSE or MAYBE | |
| 1577 * then. */ | |
| 1578 if (screen_cleared != TRUE) | |
| 1579 screenclear(); | |
| 981 | 1580 #ifdef FEAT_WINDOWS |
| 1581 /* The screen was cleared, redraw the tab pages line. */ | |
| 1582 if (redraw_tabline) | |
| 1583 draw_tabline(); | |
| 1584 #endif | |
| 1585 } | |
| 7 | 1586 } |
| 1331 | 1587 |
| 1588 /* When win_del_lines() or win_ins_lines() caused the screen to be | |
| 1589 * cleared (only happens for the first window) or when screenclear() | |
| 1590 * was called directly above, "must_redraw" will have been set to | |
| 1591 * NOT_VALID, need to reset it here to avoid redrawing twice. */ | |
| 1592 if (screen_cleared == TRUE) | |
| 1593 must_redraw = 0; | |
| 7 | 1594 } |
| 1595 else | |
| 1596 { | |
| 1597 /* Not VALID or INVERTED: redraw all lines. */ | |
| 1598 mid_start = 0; | |
| 1599 mid_end = wp->w_height; | |
| 1600 } | |
| 1601 | |
| 743 | 1602 if (type == SOME_VALID) |
| 1603 { | |
| 1604 /* SOME_VALID: redraw all lines. */ | |
| 1605 mid_start = 0; | |
| 1606 mid_end = wp->w_height; | |
| 1607 type = NOT_VALID; | |
| 1608 } | |
| 1609 | |
| 7 | 1610 /* check if we are updating or removing the inverted part */ |
| 1611 if ((VIsual_active && buf == curwin->w_buffer) | |
| 1612 || (wp->w_old_cursor_lnum != 0 && type != NOT_VALID)) | |
| 1613 { | |
| 1614 linenr_T from, to; | |
| 1615 | |
| 1616 if (VIsual_active) | |
| 1617 { | |
| 1618 if (VIsual_active | |
| 1619 && (VIsual_mode != wp->w_old_visual_mode | |
| 1620 || type == INVERTED_ALL)) | |
| 1621 { | |
| 1622 /* | |
| 1623 * If the type of Visual selection changed, redraw the whole | |
| 1624 * selection. Also when the ownership of the X selection is | |
| 1625 * gained or lost. | |
| 1626 */ | |
| 1627 if (curwin->w_cursor.lnum < VIsual.lnum) | |
| 1628 { | |
| 1629 from = curwin->w_cursor.lnum; | |
| 1630 to = VIsual.lnum; | |
| 1631 } | |
| 1632 else | |
| 1633 { | |
| 1634 from = VIsual.lnum; | |
| 1635 to = curwin->w_cursor.lnum; | |
| 1636 } | |
| 1637 /* redraw more when the cursor moved as well */ | |
| 1638 if (wp->w_old_cursor_lnum < from) | |
| 1639 from = wp->w_old_cursor_lnum; | |
| 1640 if (wp->w_old_cursor_lnum > to) | |
| 1641 to = wp->w_old_cursor_lnum; | |
| 1642 if (wp->w_old_visual_lnum < from) | |
| 1643 from = wp->w_old_visual_lnum; | |
| 1644 if (wp->w_old_visual_lnum > to) | |
| 1645 to = wp->w_old_visual_lnum; | |
| 1646 } | |
| 1647 else | |
| 1648 { | |
| 1649 /* | |
| 1650 * Find the line numbers that need to be updated: The lines | |
| 1651 * between the old cursor position and the current cursor | |
| 1652 * position. Also check if the Visual position changed. | |
| 1653 */ | |
| 1654 if (curwin->w_cursor.lnum < wp->w_old_cursor_lnum) | |
| 1655 { | |
| 1656 from = curwin->w_cursor.lnum; | |
| 1657 to = wp->w_old_cursor_lnum; | |
| 1658 } | |
| 1659 else | |
| 1660 { | |
| 1661 from = wp->w_old_cursor_lnum; | |
| 1662 to = curwin->w_cursor.lnum; | |
| 1663 if (from == 0) /* Visual mode just started */ | |
| 1664 from = to; | |
| 1665 } | |
| 1666 | |
| 422 | 1667 if (VIsual.lnum != wp->w_old_visual_lnum |
| 1668 || VIsual.col != wp->w_old_visual_col) | |
| 7 | 1669 { |
| 1670 if (wp->w_old_visual_lnum < from | |
| 1671 && wp->w_old_visual_lnum != 0) | |
| 1672 from = wp->w_old_visual_lnum; | |
| 1673 if (wp->w_old_visual_lnum > to) | |
| 1674 to = wp->w_old_visual_lnum; | |
| 1675 if (VIsual.lnum < from) | |
| 1676 from = VIsual.lnum; | |
| 1677 if (VIsual.lnum > to) | |
| 1678 to = VIsual.lnum; | |
| 1679 } | |
| 1680 } | |
| 1681 | |
| 1682 /* | |
| 1683 * If in block mode and changed column or curwin->w_curswant: | |
| 1684 * update all lines. | |
| 1685 * First compute the actual start and end column. | |
| 1686 */ | |
| 1687 if (VIsual_mode == Ctrl_V) | |
| 1688 { | |
| 6266 | 1689 colnr_T fromc, toc; |
| 1690 #if defined(FEAT_VIRTUALEDIT) && defined(FEAT_LINEBREAK) | |
| 1691 int save_ve_flags = ve_flags; | |
| 1692 | |
| 1693 if (curwin->w_p_lbr) | |
| 1694 ve_flags = VE_ALL; | |
| 1695 #endif | |
| 7 | 1696 getvcols(wp, &VIsual, &curwin->w_cursor, &fromc, &toc); |
| 6266 | 1697 #if defined(FEAT_VIRTUALEDIT) && defined(FEAT_LINEBREAK) |
| 1698 ve_flags = save_ve_flags; | |
| 1699 #endif | |
| 7 | 1700 ++toc; |
| 1701 if (curwin->w_curswant == MAXCOL) | |
| 1702 toc = MAXCOL; | |
| 1703 | |
| 1704 if (fromc != wp->w_old_cursor_fcol | |
| 1705 || toc != wp->w_old_cursor_lcol) | |
| 1706 { | |
| 1707 if (from > VIsual.lnum) | |
| 1708 from = VIsual.lnum; | |
| 1709 if (to < VIsual.lnum) | |
| 1710 to = VIsual.lnum; | |
| 1711 } | |
| 1712 wp->w_old_cursor_fcol = fromc; | |
| 1713 wp->w_old_cursor_lcol = toc; | |
| 1714 } | |
| 1715 } | |
| 1716 else | |
| 1717 { | |
| 1718 /* Use the line numbers of the old Visual area. */ | |
| 1719 if (wp->w_old_cursor_lnum < wp->w_old_visual_lnum) | |
| 1720 { | |
| 1721 from = wp->w_old_cursor_lnum; | |
| 1722 to = wp->w_old_visual_lnum; | |
| 1723 } | |
| 1724 else | |
| 1725 { | |
| 1726 from = wp->w_old_visual_lnum; | |
| 1727 to = wp->w_old_cursor_lnum; | |
| 1728 } | |
| 1729 } | |
| 1730 | |
| 1731 /* | |
| 1732 * There is no need to update lines above the top of the window. | |
| 1733 */ | |
| 1734 if (from < wp->w_topline) | |
| 1735 from = wp->w_topline; | |
| 1736 | |
| 1737 /* | |
| 1738 * If we know the value of w_botline, use it to restrict the update to | |
| 1739 * the lines that are visible in the window. | |
| 1740 */ | |
| 1741 if (wp->w_valid & VALID_BOTLINE) | |
| 1742 { | |
| 1743 if (from >= wp->w_botline) | |
| 1744 from = wp->w_botline - 1; | |
| 1745 if (to >= wp->w_botline) | |
| 1746 to = wp->w_botline - 1; | |
| 1747 } | |
| 1748 | |
| 1749 /* | |
| 1750 * Find the minimal part to be updated. | |
| 1751 * Watch out for scrolling that made entries in w_lines[] invalid. | |
| 1752 * E.g., CTRL-U makes the first half of w_lines[] invalid and sets | |
| 1753 * top_end; need to redraw from top_end to the "to" line. | |
| 1754 * A middle mouse click with a Visual selection may change the text | |
| 1755 * above the Visual area and reset wl_valid, do count these for | |
| 1756 * mid_end (in srow). | |
| 1757 */ | |
| 1758 if (mid_start > 0) | |
| 1759 { | |
| 1760 lnum = wp->w_topline; | |
| 1761 idx = 0; | |
| 1762 srow = 0; | |
| 1763 if (scrolled_down) | |
| 1764 mid_start = top_end; | |
| 1765 else | |
| 1766 mid_start = 0; | |
| 1767 while (lnum < from && idx < wp->w_lines_valid) /* find start */ | |
| 1768 { | |
| 1769 if (wp->w_lines[idx].wl_valid) | |
| 1770 mid_start += wp->w_lines[idx].wl_size; | |
| 1771 else if (!scrolled_down) | |
| 1772 srow += wp->w_lines[idx].wl_size; | |
| 1773 ++idx; | |
| 1774 # ifdef FEAT_FOLDING | |
| 1775 if (idx < wp->w_lines_valid && wp->w_lines[idx].wl_valid) | |
| 1776 lnum = wp->w_lines[idx].wl_lnum; | |
| 1777 else | |
| 1778 # endif | |
| 1779 ++lnum; | |
| 1780 } | |
| 1781 srow += mid_start; | |
| 1782 mid_end = wp->w_height; | |
| 1783 for ( ; idx < wp->w_lines_valid; ++idx) /* find end */ | |
| 1784 { | |
| 1785 if (wp->w_lines[idx].wl_valid | |
| 1786 && wp->w_lines[idx].wl_lnum >= to + 1) | |
| 1787 { | |
| 1788 /* Only update until first row of this line */ | |
| 1789 mid_end = srow; | |
| 1790 break; | |
| 1791 } | |
| 1792 srow += wp->w_lines[idx].wl_size; | |
| 1793 } | |
| 1794 } | |
| 1795 } | |
| 1796 | |
| 1797 if (VIsual_active && buf == curwin->w_buffer) | |
| 1798 { | |
| 1799 wp->w_old_visual_mode = VIsual_mode; | |
| 1800 wp->w_old_cursor_lnum = curwin->w_cursor.lnum; | |
| 1801 wp->w_old_visual_lnum = VIsual.lnum; | |
| 422 | 1802 wp->w_old_visual_col = VIsual.col; |
| 7 | 1803 wp->w_old_curswant = curwin->w_curswant; |
| 1804 } | |
| 1805 else | |
| 1806 { | |
| 1807 wp->w_old_visual_mode = 0; | |
| 1808 wp->w_old_cursor_lnum = 0; | |
| 1809 wp->w_old_visual_lnum = 0; | |
| 422 | 1810 wp->w_old_visual_col = 0; |
| 7 | 1811 } |
| 1812 | |
| 1813 #if defined(FEAT_SYN_HL) || defined(FEAT_SEARCH_EXTRA) | |
| 1814 /* reset got_int, otherwise regexp won't work */ | |
| 1815 save_got_int = got_int; | |
| 1816 got_int = 0; | |
| 1817 #endif | |
|
11529
998d2cf59caa
patch 8.0.0647: syntax highlighting can make cause a freeze
Christian Brabandt <cb@256bit.org>
parents:
11521
diff
changeset
|
1818 #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
|
1819 /* 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
|
1820 profile_setlimit(p_rdt, &syntax_tm); |
|
998d2cf59caa
patch 8.0.0647: syntax highlighting can make cause a freeze
Christian Brabandt <cb@256bit.org>
parents:
11521
diff
changeset
|
1821 #endif |
| 7 | 1822 #ifdef FEAT_FOLDING |
| 1823 win_foldinfo.fi_level = 0; | |
| 1824 #endif | |
| 1825 | |
| 1826 /* | |
| 1827 * Update all the window rows. | |
| 1828 */ | |
| 1829 idx = 0; /* first entry in w_lines[].wl_size */ | |
| 1830 row = 0; | |
| 1831 srow = 0; | |
| 1832 lnum = wp->w_topline; /* first line shown in window */ | |
| 1833 for (;;) | |
| 1834 { | |
| 1835 /* stop updating when reached the end of the window (check for _past_ | |
| 1836 * the end of the window is at the end of the loop) */ | |
| 1837 if (row == wp->w_height) | |
| 1838 { | |
| 1839 didline = TRUE; | |
| 1840 break; | |
| 1841 } | |
| 1842 | |
| 1843 /* stop updating when hit the end of the file */ | |
| 1844 if (lnum > buf->b_ml.ml_line_count) | |
| 1845 { | |
| 1846 eof = TRUE; | |
| 1847 break; | |
| 1848 } | |
| 1849 | |
| 1850 /* Remember the starting row of the line that is going to be dealt | |
| 1851 * with. It is used further down when the line doesn't fit. */ | |
| 1852 srow = row; | |
| 1853 | |
| 1854 /* | |
| 1855 * Update a line when it is in an area that needs updating, when it | |
| 1856 * has changes or w_lines[idx] is invalid. | |
| 1857 * bot_start may be halfway a wrapped line after using | |
| 1858 * win_del_lines(), check if the current line includes it. | |
| 1859 * When syntax folding is being used, the saved syntax states will | |
| 1860 * already have been updated, we can't see where the syntax state is | |
| 1861 * the same again, just update until the end of the window. | |
| 1862 */ | |
| 1863 if (row < top_end | |
| 1864 || (row >= mid_start && row < mid_end) | |
| 1865 #ifdef FEAT_SEARCH_EXTRA | |
| 1866 || top_to_mod | |
| 1867 #endif | |
| 1868 || idx >= wp->w_lines_valid | |
| 1869 || (row + wp->w_lines[idx].wl_size > bot_start) | |
| 1870 || (mod_top != 0 | |
| 1871 && (lnum == mod_top | |
| 1872 || (lnum >= mod_top | |
| 1873 && (lnum < mod_bot | |
| 1874 #ifdef FEAT_SYN_HL | |
| 1875 || did_update == DID_FOLD | |
| 1876 || (did_update == DID_LINE | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
1877 && syntax_present(wp) |
| 7 | 1878 && ( |
| 1879 # ifdef FEAT_FOLDING | |
| 1880 (foldmethodIsSyntax(wp) | |
| 1881 && hasAnyFolding(wp)) || | |
| 1882 # endif | |
| 1883 syntax_check_changed(lnum))) | |
| 1884 #endif | |
|
4916
ba328b4a990e
updated for version 7.3.1203
Bram Moolenaar <bram@vim.org>
parents:
4805
diff
changeset
|
1885 #ifdef FEAT_SEARCH_EXTRA |
| 6018 | 1886 /* match in fixed position might need redraw |
| 1887 * if lines were inserted or deleted */ | |
| 1888 || (wp->w_match_head != NULL | |
| 1889 && buf->b_mod_xlines != 0) | |
|
4916
ba328b4a990e
updated for version 7.3.1203
Bram Moolenaar <bram@vim.org>
parents:
4805
diff
changeset
|
1890 #endif |
| 7 | 1891 ))))) |
| 1892 { | |
| 1893 #ifdef FEAT_SEARCH_EXTRA | |
| 1894 if (lnum == mod_top) | |
| 1895 top_to_mod = FALSE; | |
| 1896 #endif | |
| 1897 | |
| 1898 /* | |
| 1899 * When at start of changed lines: May scroll following lines | |
| 1900 * up or down to minimize redrawing. | |
| 1901 * Don't do this when the change continues until the end. | |
| 3318 | 1902 * Don't scroll when dollar_vcol >= 0, keep the "$". |
| 7 | 1903 */ |
| 1904 if (lnum == mod_top | |
| 1905 && mod_bot != MAXLNUM | |
| 3318 | 1906 && !(dollar_vcol >= 0 && mod_bot == mod_top + 1)) |
| 7 | 1907 { |
| 1908 int old_rows = 0; | |
| 1909 int new_rows = 0; | |
| 1910 int xtra_rows; | |
| 1911 linenr_T l; | |
| 1912 | |
| 1913 /* Count the old number of window rows, using w_lines[], which | |
| 1914 * should still contain the sizes for the lines as they are | |
| 1915 * currently displayed. */ | |
| 1916 for (i = idx; i < wp->w_lines_valid; ++i) | |
| 1917 { | |
| 1918 /* Only valid lines have a meaningful wl_lnum. Invalid | |
| 1919 * lines are part of the changed area. */ | |
| 1920 if (wp->w_lines[i].wl_valid | |
| 1921 && wp->w_lines[i].wl_lnum == mod_bot) | |
| 1922 break; | |
| 1923 old_rows += wp->w_lines[i].wl_size; | |
| 1924 #ifdef FEAT_FOLDING | |
| 1925 if (wp->w_lines[i].wl_valid | |
| 1926 && wp->w_lines[i].wl_lastlnum + 1 == mod_bot) | |
| 1927 { | |
| 1928 /* Must have found the last valid entry above mod_bot. | |
| 1929 * Add following invalid entries. */ | |
| 1930 ++i; | |
| 1931 while (i < wp->w_lines_valid | |
| 1932 && !wp->w_lines[i].wl_valid) | |
| 1933 old_rows += wp->w_lines[i++].wl_size; | |
| 1934 break; | |
| 1935 } | |
| 1936 #endif | |
| 1937 } | |
| 1938 | |
| 1939 if (i >= wp->w_lines_valid) | |
| 1940 { | |
| 1941 /* We can't find a valid line below the changed lines, | |
| 1942 * need to redraw until the end of the window. | |
| 1943 * Inserting/deleting lines has no use. */ | |
| 1944 bot_start = 0; | |
| 1945 } | |
| 1946 else | |
| 1947 { | |
| 1948 /* Able to count old number of rows: Count new window | |
| 1949 * rows, and may insert/delete lines */ | |
| 1950 j = idx; | |
| 1951 for (l = lnum; l < mod_bot; ++l) | |
| 1952 { | |
| 1953 #ifdef FEAT_FOLDING | |
| 1954 if (hasFoldingWin(wp, l, NULL, &l, TRUE, NULL)) | |
| 1955 ++new_rows; | |
| 1956 else | |
| 1957 #endif | |
| 1958 #ifdef FEAT_DIFF | |
| 1959 if (l == wp->w_topline) | |
| 1960 new_rows += plines_win_nofill(wp, l, TRUE) | |
| 1961 + wp->w_topfill; | |
| 1962 else | |
| 1963 #endif | |
| 1964 new_rows += plines_win(wp, l, TRUE); | |
| 1965 ++j; | |
| 1966 if (new_rows > wp->w_height - row - 2) | |
| 1967 { | |
| 1968 /* it's getting too much, must redraw the rest */ | |
| 1969 new_rows = 9999; | |
| 1970 break; | |
| 1971 } | |
| 1972 } | |
| 1973 xtra_rows = new_rows - old_rows; | |
| 1974 if (xtra_rows < 0) | |
| 1975 { | |
| 1976 /* May scroll text up. If there is not enough | |
| 1977 * remaining text or scrolling fails, must redraw the | |
| 1978 * rest. If scrolling works, must redraw the text | |
| 1979 * below the scrolled text. */ | |
| 1980 if (row - xtra_rows >= wp->w_height - 2) | |
| 1981 mod_bot = MAXLNUM; | |
| 1982 else | |
| 1983 { | |
| 1984 check_for_delay(FALSE); | |
| 1985 if (win_del_lines(wp, row, | |
| 1986 -xtra_rows, FALSE, FALSE) == FAIL) | |
| 1987 mod_bot = MAXLNUM; | |
| 1988 else | |
| 1989 bot_start = wp->w_height + xtra_rows; | |
| 1990 } | |
| 1991 } | |
| 1992 else if (xtra_rows > 0) | |
| 1993 { | |
| 1994 /* May scroll text down. If there is not enough | |
| 1995 * remaining text of scrolling fails, must redraw the | |
| 1996 * rest. */ | |
| 1997 if (row + xtra_rows >= wp->w_height - 2) | |
| 1998 mod_bot = MAXLNUM; | |
| 1999 else | |
| 2000 { | |
| 2001 check_for_delay(FALSE); | |
| 2002 if (win_ins_lines(wp, row + old_rows, | |
| 2003 xtra_rows, FALSE, FALSE) == FAIL) | |
| 2004 mod_bot = MAXLNUM; | |
| 2005 else if (top_end > row + old_rows) | |
| 2006 /* Scrolled the part at the top that requires | |
| 2007 * updating down. */ | |
| 2008 top_end += xtra_rows; | |
| 2009 } | |
| 2010 } | |
| 2011 | |
| 2012 /* When not updating the rest, may need to move w_lines[] | |
| 2013 * entries. */ | |
| 2014 if (mod_bot != MAXLNUM && i != j) | |
| 2015 { | |
| 2016 if (j < i) | |
| 2017 { | |
| 2018 int x = row + new_rows; | |
| 2019 | |
| 2020 /* move entries in w_lines[] upwards */ | |
| 2021 for (;;) | |
| 2022 { | |
| 2023 /* stop at last valid entry in w_lines[] */ | |
| 2024 if (i >= wp->w_lines_valid) | |
| 2025 { | |
| 2026 wp->w_lines_valid = j; | |
| 2027 break; | |
| 2028 } | |
| 2029 wp->w_lines[j] = wp->w_lines[i]; | |
| 2030 /* stop at a line that won't fit */ | |
| 2031 if (x + (int)wp->w_lines[j].wl_size | |
| 2032 > wp->w_height) | |
| 2033 { | |
| 2034 wp->w_lines_valid = j + 1; | |
| 2035 break; | |
| 2036 } | |
| 2037 x += wp->w_lines[j++].wl_size; | |
| 2038 ++i; | |
| 2039 } | |
| 2040 if (bot_start > x) | |
| 2041 bot_start = x; | |
| 2042 } | |
| 2043 else /* j > i */ | |
| 2044 { | |
| 2045 /* move entries in w_lines[] downwards */ | |
| 2046 j -= i; | |
| 2047 wp->w_lines_valid += j; | |
| 2048 if (wp->w_lines_valid > wp->w_height) | |
| 2049 wp->w_lines_valid = wp->w_height; | |
| 2050 for (i = wp->w_lines_valid; i - j >= idx; --i) | |
| 2051 wp->w_lines[i] = wp->w_lines[i - j]; | |
| 2052 | |
| 2053 /* The w_lines[] entries for inserted lines are | |
| 2054 * now invalid, but wl_size may be used above. | |
| 2055 * Reset to zero. */ | |
| 2056 while (i >= idx) | |
| 2057 { | |
| 2058 wp->w_lines[i].wl_size = 0; | |
| 2059 wp->w_lines[i--].wl_valid = FALSE; | |
| 2060 } | |
| 2061 } | |
| 2062 } | |
| 2063 } | |
| 2064 } | |
| 2065 | |
| 2066 #ifdef FEAT_FOLDING | |
| 2067 /* | |
| 2068 * When lines are folded, display one line for all of them. | |
| 2069 * Otherwise, display normally (can be several display lines when | |
| 2070 * 'wrap' is on). | |
| 2071 */ | |
| 2072 fold_count = foldedCount(wp, lnum, &win_foldinfo); | |
| 2073 if (fold_count != 0) | |
| 2074 { | |
| 2075 fold_line(wp, fold_count, &win_foldinfo, lnum, row); | |
| 2076 ++row; | |
| 2077 --fold_count; | |
| 2078 wp->w_lines[idx].wl_folded = TRUE; | |
| 2079 wp->w_lines[idx].wl_lastlnum = lnum + fold_count; | |
| 2080 # ifdef FEAT_SYN_HL | |
| 2081 did_update = DID_FOLD; | |
| 2082 # endif | |
| 2083 } | |
| 2084 else | |
| 2085 #endif | |
| 2086 if (idx < wp->w_lines_valid | |
| 2087 && wp->w_lines[idx].wl_valid | |
| 2088 && wp->w_lines[idx].wl_lnum == lnum | |
| 2089 && lnum > wp->w_topline | |
|
9665
b193bdb6ea25
commit https://github.com/vim/vim/commit/ad9c2a08f0509294269a2f11a59a438b944bdd5a
Christian Brabandt <cb@256bit.org>
parents:
9649
diff
changeset
|
2090 && !(dy_flags & (DY_LASTLINE | DY_TRUNCATE)) |
| 7 | 2091 && srow + wp->w_lines[idx].wl_size > wp->w_height |
| 2092 #ifdef FEAT_DIFF | |
| 2093 && diff_check_fill(wp, lnum) == 0 | |
| 2094 #endif | |
| 2095 ) | |
| 2096 { | |
| 2097 /* This line is not going to fit. Don't draw anything here, | |
| 2098 * will draw "@ " lines below. */ | |
| 2099 row = wp->w_height + 1; | |
| 2100 } | |
| 2101 else | |
| 2102 { | |
| 2103 #ifdef FEAT_SEARCH_EXTRA | |
| 2104 prepare_search_hl(wp, lnum); | |
| 2105 #endif | |
| 2106 #ifdef FEAT_SYN_HL | |
| 2107 /* Let the syntax stuff know we skipped a few lines. */ | |
| 2108 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
|
2109 && syntax_present(wp)) |
| 7 | 2110 syntax_end_parsing(syntax_last_parsed + 1); |
| 2111 #endif | |
| 2112 | |
| 2113 /* | |
| 2114 * Display one line. | |
| 2115 */ | |
|
11529
998d2cf59caa
patch 8.0.0647: syntax highlighting can make cause a freeze
Christian Brabandt <cb@256bit.org>
parents:
11521
diff
changeset
|
2116 row = win_line(wp, lnum, srow, wp->w_height, mod_top == 0, |
|
998d2cf59caa
patch 8.0.0647: syntax highlighting can make cause a freeze
Christian Brabandt <cb@256bit.org>
parents:
11521
diff
changeset
|
2117 #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
|
2118 &syntax_tm |
|
998d2cf59caa
patch 8.0.0647: syntax highlighting can make cause a freeze
Christian Brabandt <cb@256bit.org>
parents:
11521
diff
changeset
|
2119 #else |
|
998d2cf59caa
patch 8.0.0647: syntax highlighting can make cause a freeze
Christian Brabandt <cb@256bit.org>
parents:
11521
diff
changeset
|
2120 NULL |
|
998d2cf59caa
patch 8.0.0647: syntax highlighting can make cause a freeze
Christian Brabandt <cb@256bit.org>
parents:
11521
diff
changeset
|
2121 #endif |
|
998d2cf59caa
patch 8.0.0647: syntax highlighting can make cause a freeze
Christian Brabandt <cb@256bit.org>
parents:
11521
diff
changeset
|
2122 ); |
| 7 | 2123 |
| 2124 #ifdef FEAT_FOLDING | |
| 2125 wp->w_lines[idx].wl_folded = FALSE; | |
| 2126 wp->w_lines[idx].wl_lastlnum = lnum; | |
| 2127 #endif | |
| 2128 #ifdef FEAT_SYN_HL | |
| 2129 did_update = DID_LINE; | |
| 2130 syntax_last_parsed = lnum; | |
| 2131 #endif | |
| 2132 } | |
| 2133 | |
| 2134 wp->w_lines[idx].wl_lnum = lnum; | |
| 2135 wp->w_lines[idx].wl_valid = TRUE; | |
| 2136 if (row > wp->w_height) /* past end of screen */ | |
| 2137 { | |
| 2138 /* we may need the size of that too long line later on */ | |
| 3318 | 2139 if (dollar_vcol == -1) |
| 7 | 2140 wp->w_lines[idx].wl_size = plines_win(wp, lnum, TRUE); |
| 2141 ++idx; | |
| 2142 break; | |
| 2143 } | |
| 3318 | 2144 if (dollar_vcol == -1) |
| 7 | 2145 wp->w_lines[idx].wl_size = row - srow; |
| 2146 ++idx; | |
| 2147 #ifdef FEAT_FOLDING | |
| 2148 lnum += fold_count + 1; | |
| 2149 #else | |
| 2150 ++lnum; | |
| 2151 #endif | |
| 2152 } | |
| 2153 else | |
| 2154 { | |
| 2155 /* This line does not need updating, advance to the next one */ | |
| 2156 row += wp->w_lines[idx++].wl_size; | |
| 2157 if (row > wp->w_height) /* past end of screen */ | |
| 2158 break; | |
| 2159 #ifdef FEAT_FOLDING | |
| 2160 lnum = wp->w_lines[idx - 1].wl_lastlnum + 1; | |
| 2161 #else | |
| 2162 ++lnum; | |
| 2163 #endif | |
| 2164 #ifdef FEAT_SYN_HL | |
| 2165 did_update = DID_NONE; | |
| 2166 #endif | |
| 2167 } | |
| 2168 | |
| 2169 if (lnum > buf->b_ml.ml_line_count) | |
| 2170 { | |
| 2171 eof = TRUE; | |
| 2172 break; | |
| 2173 } | |
| 2174 } | |
| 2175 /* | |
| 2176 * End of loop over all window lines. | |
| 2177 */ | |
| 2178 | |
| 2179 | |
| 2180 if (idx > wp->w_lines_valid) | |
| 2181 wp->w_lines_valid = idx; | |
| 2182 | |
| 2183 #ifdef FEAT_SYN_HL | |
| 2184 /* | |
| 2185 * Let the syntax stuff know we stop parsing here. | |
| 2186 */ | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
2187 if (syntax_last_parsed != 0 && syntax_present(wp)) |
| 7 | 2188 syntax_end_parsing(syntax_last_parsed + 1); |
| 2189 #endif | |
| 2190 | |
| 2191 /* | |
| 2192 * If we didn't hit the end of the file, and we didn't finish the last | |
| 2193 * line we were working on, then the line didn't fit. | |
| 2194 */ | |
| 2195 wp->w_empty_rows = 0; | |
| 2196 #ifdef FEAT_DIFF | |
| 2197 wp->w_filler_rows = 0; | |
| 2198 #endif | |
| 2199 if (!eof && !didline) | |
| 2200 { | |
| 2201 if (lnum == wp->w_topline) | |
| 2202 { | |
| 2203 /* | |
| 2204 * Single line that does not fit! | |
| 2205 * Don't overwrite it, it can be edited. | |
| 2206 */ | |
| 2207 wp->w_botline = lnum + 1; | |
| 2208 } | |
| 2209 #ifdef FEAT_DIFF | |
| 2210 else if (diff_check_fill(wp, lnum) >= wp->w_height - srow) | |
| 2211 { | |
| 2212 /* Window ends in filler lines. */ | |
| 2213 wp->w_botline = lnum; | |
| 2214 wp->w_filler_rows = wp->w_height - srow; | |
| 2215 } | |
| 2216 #endif | |
|
9665
b193bdb6ea25
commit https://github.com/vim/vim/commit/ad9c2a08f0509294269a2f11a59a438b944bdd5a
Christian Brabandt <cb@256bit.org>
parents:
9649
diff
changeset
|
2217 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
|
2218 { |
|
b193bdb6ea25
commit https://github.com/vim/vim/commit/ad9c2a08f0509294269a2f11a59a438b944bdd5a
Christian Brabandt <cb@256bit.org>
parents:
9649
diff
changeset
|
2219 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
|
2220 |
|
b193bdb6ea25
commit https://github.com/vim/vim/commit/ad9c2a08f0509294269a2f11a59a438b944bdd5a
Christian Brabandt <cb@256bit.org>
parents:
9649
diff
changeset
|
2221 /* |
|
b193bdb6ea25
commit https://github.com/vim/vim/commit/ad9c2a08f0509294269a2f11a59a438b944bdd5a
Christian Brabandt <cb@256bit.org>
parents:
9649
diff
changeset
|
2222 * 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
|
2223 */ |
|
b193bdb6ea25
commit https://github.com/vim/vim/commit/ad9c2a08f0509294269a2f11a59a438b944bdd5a
Christian Brabandt <cb@256bit.org>
parents:
9649
diff
changeset
|
2224 screen_puts_len((char_u *)"@@", 2, scr_row, W_WINCOL(wp), |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
2225 HL_ATTR(HLF_AT)); |
|
9665
b193bdb6ea25
commit https://github.com/vim/vim/commit/ad9c2a08f0509294269a2f11a59a438b944bdd5a
Christian Brabandt <cb@256bit.org>
parents:
9649
diff
changeset
|
2226 screen_fill(scr_row, scr_row + 1, |
|
b193bdb6ea25
commit https://github.com/vim/vim/commit/ad9c2a08f0509294269a2f11a59a438b944bdd5a
Christian Brabandt <cb@256bit.org>
parents:
9649
diff
changeset
|
2227 (int)W_WINCOL(wp) + 2, (int)W_ENDCOL(wp), |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
2228 '@', ' ', HL_ATTR(HLF_AT)); |
|
9665
b193bdb6ea25
commit https://github.com/vim/vim/commit/ad9c2a08f0509294269a2f11a59a438b944bdd5a
Christian Brabandt <cb@256bit.org>
parents:
9649
diff
changeset
|
2229 set_empty_rows(wp, srow); |
|
b193bdb6ea25
commit https://github.com/vim/vim/commit/ad9c2a08f0509294269a2f11a59a438b944bdd5a
Christian Brabandt <cb@256bit.org>
parents:
9649
diff
changeset
|
2230 wp->w_botline = lnum; |
|
b193bdb6ea25
commit https://github.com/vim/vim/commit/ad9c2a08f0509294269a2f11a59a438b944bdd5a
Christian Brabandt <cb@256bit.org>
parents:
9649
diff
changeset
|
2231 } |
| 7 | 2232 else if (dy_flags & DY_LASTLINE) /* 'display' has "lastline" */ |
| 2233 { | |
| 2234 /* | |
| 2235 * Last line isn't finished: Display "@@@" at the end. | |
| 2236 */ | |
| 2237 screen_fill(W_WINROW(wp) + wp->w_height - 1, | |
| 2238 W_WINROW(wp) + wp->w_height, | |
| 2239 (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
|
2240 '@', '@', HL_ATTR(HLF_AT)); |
| 7 | 2241 set_empty_rows(wp, srow); |
| 2242 wp->w_botline = lnum; | |
| 2243 } | |
| 2244 else | |
| 2245 { | |
| 2246 win_draw_end(wp, '@', ' ', srow, wp->w_height, HLF_AT); | |
| 2247 wp->w_botline = lnum; | |
| 2248 } | |
| 2249 } | |
| 2250 else | |
| 2251 { | |
|
8643
24b43dd167eb
commit https://github.com/vim/vim/commit/44a2f923c00f1384c9ecde12fb5b4711bc20702e
Christian Brabandt <cb@256bit.org>
parents:
8627
diff
changeset
|
2252 #ifdef FEAT_WINDOWS |
| 7 | 2253 draw_vsep_win(wp, row); |
| 2254 #endif | |
| 2255 if (eof) /* we hit the end of the file */ | |
| 2256 { | |
| 2257 wp->w_botline = buf->b_ml.ml_line_count + 1; | |
| 2258 #ifdef FEAT_DIFF | |
| 2259 j = diff_check_fill(wp, wp->w_botline); | |
| 2260 if (j > 0 && !wp->w_botfill) | |
| 2261 { | |
| 2262 /* | |
| 2263 * Display filler lines at the end of the file | |
| 2264 */ | |
| 2265 if (char2cells(fill_diff) > 1) | |
| 2266 i = '-'; | |
| 2267 else | |
| 2268 i = fill_diff; | |
| 2269 if (row + j > wp->w_height) | |
| 2270 j = wp->w_height - row; | |
| 2271 win_draw_end(wp, i, i, row, row + (int)j, HLF_DED); | |
| 2272 row += j; | |
| 2273 } | |
| 2274 #endif | |
| 2275 } | |
| 3318 | 2276 else if (dollar_vcol == -1) |
| 7 | 2277 wp->w_botline = lnum; |
| 2278 | |
| 2279 /* make sure the rest of the screen is blank */ | |
| 2280 /* 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
|
2281 win_draw_end(wp, '~', ' ', row, wp->w_height, HLF_EOB); |
| 7 | 2282 } |
| 2283 | |
| 2284 /* Reset the type of redrawing required, the window has been updated. */ | |
| 2285 wp->w_redr_type = 0; | |
| 2286 #ifdef FEAT_DIFF | |
| 2287 wp->w_old_topfill = wp->w_topfill; | |
| 2288 wp->w_old_botfill = wp->w_botfill; | |
| 2289 #endif | |
| 2290 | |
| 3318 | 2291 if (dollar_vcol == -1) |
| 7 | 2292 { |
| 2293 /* | |
| 2294 * There is a trick with w_botline. If we invalidate it on each | |
| 2295 * change that might modify it, this will cause a lot of expensive | |
| 2296 * calls to plines() in update_topline() each time. Therefore the | |
| 2297 * value of w_botline is often approximated, and this value is used to | |
| 2298 * compute the value of w_topline. If the value of w_botline was | |
| 2299 * wrong, check that the value of w_topline is correct (cursor is on | |
| 2300 * the visible part of the text). If it's not, we need to redraw | |
| 2301 * again. Mostly this just means scrolling up a few lines, so it | |
| 2302 * doesn't look too bad. Only do this for the current window (where | |
| 2303 * changes are relevant). | |
| 2304 */ | |
| 2305 wp->w_valid |= VALID_BOTLINE; | |
| 2306 if (wp == curwin && wp->w_botline != old_botline && !recursive) | |
| 2307 { | |
| 2308 recursive = TRUE; | |
| 2309 curwin->w_valid &= ~VALID_TOPLINE; | |
| 2310 update_topline(); /* may invalidate w_botline again */ | |
| 2311 if (must_redraw != 0) | |
| 2312 { | |
| 2313 /* Don't update for changes in buffer again. */ | |
| 2314 i = curbuf->b_mod_set; | |
| 2315 curbuf->b_mod_set = FALSE; | |
| 2316 win_update(curwin); | |
| 2317 must_redraw = 0; | |
| 2318 curbuf->b_mod_set = i; | |
| 2319 } | |
| 2320 recursive = FALSE; | |
| 2321 } | |
| 2322 } | |
| 2323 | |
| 2324 #if defined(FEAT_SYN_HL) || defined(FEAT_SEARCH_EXTRA) | |
| 2325 /* restore got_int, unless CTRL-C was hit while redrawing */ | |
| 2326 if (!got_int) | |
| 2327 got_int = save_got_int; | |
| 2328 #endif | |
| 2329 } | |
| 2330 | |
| 2331 /* | |
| 2332 * Clear the rest of the window and mark the unused lines with "c1". use "c2" | |
| 2333 * as the filler character. | |
| 2334 */ | |
| 2335 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2336 win_draw_end( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2337 win_T *wp, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2338 int c1, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2339 int c2, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2340 int row, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2341 int endrow, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2342 hlf_T hl) |
| 7 | 2343 { |
| 2344 #if defined(FEAT_FOLDING) || defined(FEAT_SIGNS) || defined(FEAT_CMDWIN) | |
| 2345 int n = 0; | |
| 2346 # define FDC_OFF n | |
| 2347 #else | |
| 2348 # define FDC_OFF 0 | |
| 2349 #endif | |
| 6553 | 2350 #ifdef FEAT_FOLDING |
| 2351 int fdc = compute_foldcolumn(wp, 0); | |
| 2352 #endif | |
| 7 | 2353 |
| 2354 #ifdef FEAT_RIGHTLEFT | |
| 2355 if (wp->w_p_rl) | |
| 2356 { | |
| 2357 /* No check for cmdline window: should never be right-left. */ | |
| 2358 # ifdef FEAT_FOLDING | |
| 6553 | 2359 n = fdc; |
| 7 | 2360 |
| 2361 if (n > 0) | |
| 2362 { | |
| 2363 /* draw the fold column at the right */ | |
| 119 | 2364 if (n > W_WIDTH(wp)) |
| 2365 n = W_WIDTH(wp); | |
| 7 | 2366 screen_fill(W_WINROW(wp) + row, W_WINROW(wp) + endrow, |
| 2367 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
|
2368 ' ', ' ', HL_ATTR(HLF_FC)); |
| 7 | 2369 } |
| 2370 # endif | |
| 2371 # ifdef FEAT_SIGNS | |
|
9852
4eea48b76d03
commit https://github.com/vim/vim/commit/95ec9d6a6ab3117d60ff638670a803d43974ba51
Christian Brabandt <cb@256bit.org>
parents:
9848
diff
changeset
|
2372 if (signcolumn_on(wp)) |
| 7 | 2373 { |
| 2374 int nn = n + 2; | |
| 2375 | |
| 2376 /* draw the sign column left of the fold column */ | |
| 119 | 2377 if (nn > W_WIDTH(wp)) |
| 2378 nn = W_WIDTH(wp); | |
| 7 | 2379 screen_fill(W_WINROW(wp) + row, W_WINROW(wp) + endrow, |
| 2380 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
|
2381 ' ', ' ', HL_ATTR(HLF_SC)); |
| 7 | 2382 n = nn; |
| 2383 } | |
| 2384 # endif | |
| 2385 screen_fill(W_WINROW(wp) + row, W_WINROW(wp) + endrow, | |
| 2386 W_WINCOL(wp), W_ENDCOL(wp) - 1 - FDC_OFF, | |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
2387 c2, c2, HL_ATTR(hl)); |
| 7 | 2388 screen_fill(W_WINROW(wp) + row, W_WINROW(wp) + endrow, |
| 2389 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
|
2390 c1, c2, HL_ATTR(hl)); |
| 7 | 2391 } |
| 2392 else | |
| 2393 #endif | |
| 2394 { | |
| 2395 #ifdef FEAT_CMDWIN | |
| 2396 if (cmdwin_type != 0 && wp == curwin) | |
| 2397 { | |
| 2398 /* draw the cmdline character in the leftmost column */ | |
| 2399 n = 1; | |
| 2400 if (n > wp->w_width) | |
| 2401 n = wp->w_width; | |
| 2402 screen_fill(W_WINROW(wp) + row, W_WINROW(wp) + endrow, | |
| 2403 W_WINCOL(wp), (int)W_WINCOL(wp) + n, | |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
2404 cmdwin_type, ' ', HL_ATTR(HLF_AT)); |
| 7 | 2405 } |
| 2406 #endif | |
| 2407 #ifdef FEAT_FOLDING | |
| 6553 | 2408 if (fdc > 0) |
| 2409 { | |
| 2410 int nn = n + fdc; | |
| 7 | 2411 |
| 2412 /* draw the fold column at the left */ | |
| 2413 if (nn > W_WIDTH(wp)) | |
| 2414 nn = W_WIDTH(wp); | |
| 2415 screen_fill(W_WINROW(wp) + row, W_WINROW(wp) + endrow, | |
| 2416 W_WINCOL(wp) + n, (int)W_WINCOL(wp) + nn, | |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
2417 ' ', ' ', HL_ATTR(HLF_FC)); |
| 7 | 2418 n = nn; |
| 2419 } | |
| 2420 #endif | |
| 2421 #ifdef FEAT_SIGNS | |
|
9852
4eea48b76d03
commit https://github.com/vim/vim/commit/95ec9d6a6ab3117d60ff638670a803d43974ba51
Christian Brabandt <cb@256bit.org>
parents:
9848
diff
changeset
|
2422 if (signcolumn_on(wp)) |
| 7 | 2423 { |
| 2424 int nn = n + 2; | |
| 2425 | |
| 2426 /* draw the sign column after the fold column */ | |
| 2427 if (nn > W_WIDTH(wp)) | |
| 2428 nn = W_WIDTH(wp); | |
| 2429 screen_fill(W_WINROW(wp) + row, W_WINROW(wp) + endrow, | |
| 2430 W_WINCOL(wp) + n, (int)W_WINCOL(wp) + nn, | |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
2431 ' ', ' ', HL_ATTR(HLF_SC)); |
| 7 | 2432 n = nn; |
| 2433 } | |
| 2434 #endif | |
| 2435 screen_fill(W_WINROW(wp) + row, W_WINROW(wp) + endrow, | |
| 2436 W_WINCOL(wp) + FDC_OFF, (int)W_ENDCOL(wp), | |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
2437 c1, c2, HL_ATTR(hl)); |
| 7 | 2438 } |
| 2439 set_empty_rows(wp, row); | |
| 2440 } | |
| 2441 | |
|
2314
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
2442 #ifdef FEAT_SYN_HL |
|
7805
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7697
diff
changeset
|
2443 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
|
2444 |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
2445 /* |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
2446 * 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
|
2447 */ |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
2448 static int |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2449 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
|
2450 { |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
2451 while (**color_cols >= 0 && vcol > **color_cols) |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
2452 ++*color_cols; |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
2453 return (**color_cols >= 0); |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
2454 } |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
2455 #endif |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
2456 |
| 7 | 2457 #ifdef FEAT_FOLDING |
| 2458 /* | |
| 6553 | 2459 * Compute the width of the foldcolumn. Based on 'foldcolumn' and how much |
| 2460 * space is available for window "wp", minus "col". | |
| 2461 */ | |
| 2462 static int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2463 compute_foldcolumn(win_T *wp, int col) |
| 6553 | 2464 { |
| 2465 int fdc = wp->w_p_fdc; | |
| 2466 int wmw = wp == curwin && p_wmw == 0 ? 1 : p_wmw; | |
| 2467 int wwidth = W_WIDTH(wp); | |
| 2468 | |
| 2469 if (fdc > wwidth - (col + wmw)) | |
| 2470 fdc = wwidth - (col + wmw); | |
| 2471 return fdc; | |
| 2472 } | |
| 2473 | |
| 2474 /* | |
| 7 | 2475 * Display one folded line. |
| 2476 */ | |
| 2477 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2478 fold_line( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2479 win_T *wp, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2480 long fold_count, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2481 foldinfo_T *foldinfo, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2482 linenr_T lnum, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2483 int row) |
| 7 | 2484 { |
|
9754
a990e7ed260b
commit https://github.com/vim/vim/commit/ee695f787ade7fd88fc5f5497553d95c0c3645b5
Christian Brabandt <cb@256bit.org>
parents:
9665
diff
changeset
|
2485 char_u buf[FOLD_TEXT_LEN]; |
| 7 | 2486 pos_T *top, *bot; |
| 2487 linenr_T lnume = lnum + fold_count - 1; | |
| 2488 int len; | |
| 29 | 2489 char_u *text; |
| 7 | 2490 int fdc; |
| 2491 int col; | |
| 2492 int txtcol; | |
| 2493 int off = (int)(current_ScreenLine - ScreenLines); | |
| 216 | 2494 int ri; |
| 7 | 2495 |
| 2496 /* Build the fold line: | |
| 2497 * 1. Add the cmdwin_type for the command-line window | |
| 2498 * 2. Add the 'foldcolumn' | |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
2499 * 3. Add the 'number' or 'relativenumber' column |
| 7 | 2500 * 4. Compose the text |
| 2501 * 5. Add the text | |
| 2502 * 6. set highlighting for the Visual area an other text | |
| 2503 */ | |
| 2504 col = 0; | |
| 2505 | |
| 2506 /* | |
| 2507 * 1. Add the cmdwin_type for the command-line window | |
| 2508 * Ignores 'rightleft', this window is never right-left. | |
| 2509 */ | |
| 2510 #ifdef FEAT_CMDWIN | |
| 2511 if (cmdwin_type != 0 && wp == curwin) | |
| 2512 { | |
| 2513 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
|
2514 ScreenAttrs[off] = HL_ATTR(HLF_AT); |
| 7 | 2515 #ifdef FEAT_MBYTE |
| 2516 if (enc_utf8) | |
| 2517 ScreenLinesUC[off] = 0; | |
| 2518 #endif | |
| 2519 ++col; | |
| 2520 } | |
| 2521 #endif | |
| 2522 | |
| 2523 /* | |
| 2524 * 2. Add the 'foldcolumn' | |
| 6553 | 2525 * Reduce the width when there is not enough space. |
| 7 | 2526 */ |
| 6553 | 2527 fdc = compute_foldcolumn(wp, col); |
| 7 | 2528 if (fdc > 0) |
| 2529 { | |
| 2530 fill_foldcolumn(buf, wp, TRUE, lnum); | |
| 2531 #ifdef FEAT_RIGHTLEFT | |
| 2532 if (wp->w_p_rl) | |
| 2533 { | |
| 2534 int i; | |
| 2535 | |
| 2536 copy_text_attr(off + W_WIDTH(wp) - fdc - col, buf, fdc, | |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
2537 HL_ATTR(HLF_FC)); |
| 7 | 2538 /* reverse the fold column */ |
| 2539 for (i = 0; i < fdc; ++i) | |
| 2540 ScreenLines[off + W_WIDTH(wp) - i - 1 - col] = buf[i]; | |
| 2541 } | |
| 2542 else | |
| 2543 #endif | |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
2544 copy_text_attr(off + col, buf, fdc, HL_ATTR(HLF_FC)); |
| 7 | 2545 col += fdc; |
| 2546 } | |
| 2547 | |
| 2548 #ifdef FEAT_RIGHTLEFT | |
| 216 | 2549 # define RL_MEMSET(p, v, l) if (wp->w_p_rl) \ |
| 2550 for (ri = 0; ri < l; ++ri) \ | |
| 2551 ScreenAttrs[off + (W_WIDTH(wp) - (p) - (l)) + ri] = v; \ | |
| 2552 else \ | |
| 2553 for (ri = 0; ri < l; ++ri) \ | |
| 2554 ScreenAttrs[off + (p) + ri] = v | |
| 7 | 2555 #else |
| 216 | 2556 # define RL_MEMSET(p, v, l) for (ri = 0; ri < l; ++ri) \ |
| 2557 ScreenAttrs[off + (p) + ri] = v | |
| 7 | 2558 #endif |
| 2559 | |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
2560 /* 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
|
2561 * text */ |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
2562 RL_MEMSET(col, HL_ATTR(HLF_FL), W_WIDTH(wp) - col); |
| 7 | 2563 |
| 2564 #ifdef FEAT_SIGNS | |
| 2565 /* 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
|
2566 if (signcolumn_on(wp)) |
| 7 | 2567 { |
| 2568 len = W_WIDTH(wp) - col; | |
| 2569 if (len > 0) | |
| 2570 { | |
| 2571 if (len > 2) | |
| 2572 len = 2; | |
| 2573 # ifdef FEAT_RIGHTLEFT | |
| 2574 if (wp->w_p_rl) | |
| 2575 /* the line number isn't reversed */ | |
| 2576 copy_text_attr(off + W_WIDTH(wp) - len - col, | |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
2577 (char_u *)" ", len, HL_ATTR(HLF_FL)); |
| 7 | 2578 else |
| 2579 # endif | |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
2580 copy_text_attr(off + col, (char_u *)" ", len, HL_ATTR(HLF_FL)); |
| 7 | 2581 col += len; |
| 2582 } | |
| 2583 } | |
| 2584 #endif | |
| 2585 | |
| 2586 /* | |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
2587 * 3. Add the 'number' or 'relativenumber' column |
| 7 | 2588 */ |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
2589 if (wp->w_p_nu || wp->w_p_rnu) |
| 7 | 2590 { |
| 2591 len = W_WIDTH(wp) - col; | |
| 2592 if (len > 0) | |
| 2593 { | |
| 13 | 2594 int w = number_width(wp); |
| 5905 | 2595 long num; |
| 2596 char *fmt = "%*ld "; | |
| 13 | 2597 |
| 2598 if (len > w + 1) | |
| 2599 len = w + 1; | |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
2600 |
|
4736
3f2319a953b3
updated for version 7.3.1115
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
2601 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
|
2602 /* 'number' + 'norelativenumber' */ |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
2603 num = (long)lnum; |
|
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
2604 else |
| 4065 | 2605 { |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
2606 /* 'relativenumber', don't use negative numbers */ |
| 2675 | 2607 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
|
2608 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
|
2609 { |
|
3f2319a953b3
updated for version 7.3.1115
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
2610 /* 'number' + 'relativenumber': cursor line shows absolute |
|
3f2319a953b3
updated for version 7.3.1115
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
2611 * line number */ |
| 4065 | 2612 num = lnum; |
| 2613 fmt = "%-*ld "; | |
| 2614 } | |
| 2615 } | |
| 2616 | |
| 2617 sprintf((char *)buf, fmt, w, num); | |
| 7 | 2618 #ifdef FEAT_RIGHTLEFT |
| 2619 if (wp->w_p_rl) | |
| 2620 /* the line number isn't reversed */ | |
| 2621 copy_text_attr(off + W_WIDTH(wp) - len - col, buf, len, | |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
2622 HL_ATTR(HLF_FL)); |
| 7 | 2623 else |
| 2624 #endif | |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
2625 copy_text_attr(off + col, buf, len, HL_ATTR(HLF_FL)); |
| 7 | 2626 col += len; |
| 2627 } | |
| 2628 } | |
| 2629 | |
| 2630 /* | |
| 2631 * 4. Compose the folded-line string with 'foldtext', if set. | |
| 2632 */ | |
| 29 | 2633 text = get_foldtext(wp, lnum, lnume, foldinfo, buf); |
| 7 | 2634 |
| 2635 txtcol = col; /* remember where text starts */ | |
| 2636 | |
| 2637 /* | |
| 2638 * 5. move the text to current_ScreenLine. Fill up with "fill_fold". | |
| 2639 * Right-left text is put in columns 0 - number-col, normal text is put | |
| 2640 * in columns number-col - window-width. | |
| 2641 */ | |
| 2642 #ifdef FEAT_MBYTE | |
| 2643 if (has_mbyte) | |
| 2644 { | |
| 2645 int cells; | |
| 714 | 2646 int u8c, u8cc[MAX_MCO]; |
| 2647 int i; | |
| 7 | 2648 int idx; |
| 2649 int c_len; | |
| 33 | 2650 char_u *p; |
| 7 | 2651 # ifdef FEAT_ARABIC |
| 2652 int prev_c = 0; /* previous Arabic character */ | |
| 2653 int prev_c1 = 0; /* first composing char for prev_c */ | |
| 2654 # endif | |
| 2655 | |
| 2656 # ifdef FEAT_RIGHTLEFT | |
| 2657 if (wp->w_p_rl) | |
| 2658 idx = off; | |
| 2659 else | |
| 2660 # endif | |
| 2661 idx = off + col; | |
| 2662 | |
| 2663 /* Store multibyte characters in ScreenLines[] et al. correctly. */ | |
| 2664 for (p = text; *p != NUL; ) | |
| 2665 { | |
| 2666 cells = (*mb_ptr2cells)(p); | |
| 474 | 2667 c_len = (*mb_ptr2len)(p); |
| 7 | 2668 if (col + cells > W_WIDTH(wp) |
| 2669 # ifdef FEAT_RIGHTLEFT | |
| 2670 - (wp->w_p_rl ? col : 0) | |
| 2671 # endif | |
| 2672 ) | |
| 2673 break; | |
| 2674 ScreenLines[idx] = *p; | |
| 2675 if (enc_utf8) | |
| 2676 { | |
| 714 | 2677 u8c = utfc_ptr2char(p, u8cc); |
| 2678 if (*p < 0x80 && u8cc[0] == 0) | |
| 7 | 2679 { |
| 2680 ScreenLinesUC[idx] = 0; | |
| 2681 #ifdef FEAT_ARABIC | |
| 2682 prev_c = u8c; | |
| 2683 #endif | |
| 2684 } | |
| 2685 else | |
| 2686 { | |
| 2687 #ifdef FEAT_ARABIC | |
| 2688 if (p_arshape && !p_tbidi && ARABIC_CHAR(u8c)) | |
| 2689 { | |
| 2690 /* Do Arabic shaping. */ | |
| 714 | 2691 int pc, pc1, nc; |
| 2692 int pcc[MAX_MCO]; | |
| 7 | 2693 int firstbyte = *p; |
| 2694 | |
| 2695 /* The idea of what is the previous and next | |
| 2696 * character depends on 'rightleft'. */ | |
| 2697 if (wp->w_p_rl) | |
| 2698 { | |
| 2699 pc = prev_c; | |
| 2700 pc1 = prev_c1; | |
| 2701 nc = utf_ptr2char(p + c_len); | |
| 714 | 2702 prev_c1 = u8cc[0]; |
| 7 | 2703 } |
| 2704 else | |
| 2705 { | |
| 714 | 2706 pc = utfc_ptr2char(p + c_len, pcc); |
| 7 | 2707 nc = prev_c; |
| 714 | 2708 pc1 = pcc[0]; |
| 7 | 2709 } |
| 2710 prev_c = u8c; | |
| 2711 | |
| 714 | 2712 u8c = arabic_shape(u8c, &firstbyte, &u8cc[0], |
| 7 | 2713 pc, pc1, nc); |
| 2714 ScreenLines[idx] = firstbyte; | |
| 2715 } | |
| 2716 else | |
| 2717 prev_c = u8c; | |
| 2718 #endif | |
| 2719 /* Non-BMP character: display as ? or fullwidth ?. */ | |
| 1401 | 2720 #ifdef UNICODE16 |
| 7 | 2721 if (u8c >= 0x10000) |
| 2722 ScreenLinesUC[idx] = (cells == 2) ? 0xff1f : (int)'?'; | |
| 2723 else | |
| 1401 | 2724 #endif |
| 7 | 2725 ScreenLinesUC[idx] = u8c; |
| 714 | 2726 for (i = 0; i < Screen_mco; ++i) |
| 2727 { | |
| 2728 ScreenLinesC[i][idx] = u8cc[i]; | |
| 2729 if (u8cc[i] == 0) | |
| 2730 break; | |
| 2731 } | |
| 7 | 2732 } |
| 2733 if (cells > 1) | |
| 2734 ScreenLines[idx + 1] = 0; | |
| 2735 } | |
|
2069
63613d8d7e4d
updated for version 7.2.354
Bram Moolenaar <bram@zimbu.org>
parents:
2055
diff
changeset
|
2736 else if (enc_dbcs == DBCS_JPNU && *p == 0x8e) |
|
63613d8d7e4d
updated for version 7.2.354
Bram Moolenaar <bram@zimbu.org>
parents:
2055
diff
changeset
|
2737 /* double-byte single width character */ |
|
63613d8d7e4d
updated for version 7.2.354
Bram Moolenaar <bram@zimbu.org>
parents:
2055
diff
changeset
|
2738 ScreenLines2[idx] = p[1]; |
|
63613d8d7e4d
updated for version 7.2.354
Bram Moolenaar <bram@zimbu.org>
parents:
2055
diff
changeset
|
2739 else if (cells > 1) |
|
63613d8d7e4d
updated for version 7.2.354
Bram Moolenaar <bram@zimbu.org>
parents:
2055
diff
changeset
|
2740 /* double-width character */ |
|
63613d8d7e4d
updated for version 7.2.354
Bram Moolenaar <bram@zimbu.org>
parents:
2055
diff
changeset
|
2741 ScreenLines[idx + 1] = p[1]; |
| 7 | 2742 col += cells; |
| 2743 idx += cells; | |
| 2744 p += c_len; | |
| 2745 } | |
| 2746 } | |
| 2747 else | |
| 2748 #endif | |
| 2749 { | |
| 2750 len = (int)STRLEN(text); | |
| 2751 if (len > W_WIDTH(wp) - col) | |
| 2752 len = W_WIDTH(wp) - col; | |
| 2753 if (len > 0) | |
| 2754 { | |
| 2755 #ifdef FEAT_RIGHTLEFT | |
| 2756 if (wp->w_p_rl) | |
| 2757 STRNCPY(current_ScreenLine, text, len); | |
| 2758 else | |
| 2759 #endif | |
| 2760 STRNCPY(current_ScreenLine + col, text, len); | |
| 2761 col += len; | |
| 2762 } | |
| 2763 } | |
| 2764 | |
| 2765 /* Fill the rest of the line with the fold filler */ | |
| 2766 #ifdef FEAT_RIGHTLEFT | |
| 2767 if (wp->w_p_rl) | |
| 2768 col -= txtcol; | |
| 2769 #endif | |
| 2770 while (col < W_WIDTH(wp) | |
| 2771 #ifdef FEAT_RIGHTLEFT | |
| 2772 - (wp->w_p_rl ? txtcol : 0) | |
| 2773 #endif | |
| 2774 ) | |
| 2775 { | |
| 2776 #ifdef FEAT_MBYTE | |
| 2777 if (enc_utf8) | |
| 2778 { | |
| 2779 if (fill_fold >= 0x80) | |
| 2780 { | |
| 2781 ScreenLinesUC[off + col] = fill_fold; | |
| 714 | 2782 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
|
2783 ScreenLines[off + col] = 0x80; /* avoid storing zero */ |
| 7 | 2784 } |
| 2785 else | |
|
11277
f26a535d9464
patch 8.0.0524: folds messed up
Christian Brabandt <cb@256bit.org>
parents:
11269
diff
changeset
|
2786 { |
| 7 | 2787 ScreenLinesUC[off + col] = 0; |
|
11277
f26a535d9464
patch 8.0.0524: folds messed up
Christian Brabandt <cb@256bit.org>
parents:
11269
diff
changeset
|
2788 ScreenLines[off + col] = fill_fold; |
|
f26a535d9464
patch 8.0.0524: folds messed up
Christian Brabandt <cb@256bit.org>
parents:
11269
diff
changeset
|
2789 } |
|
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
|
2790 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
|
2791 } |
|
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
|
2792 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
|
2793 #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
|
2794 ScreenLines[off + col++] = fill_fold; |
| 7 | 2795 } |
| 2796 | |
| 2797 if (text != buf) | |
| 2798 vim_free(text); | |
| 2799 | |
| 2800 /* | |
| 2801 * 6. set highlighting for the Visual area an other text. | |
| 2802 * If all folded lines are in the Visual area, highlight the line. | |
| 2803 */ | |
| 2804 if (VIsual_active && wp->w_buffer == curwin->w_buffer) | |
| 2805 { | |
|
11121
778c10516955
patch 8.0.0448: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11105
diff
changeset
|
2806 if (LTOREQ_POS(curwin->w_cursor, VIsual)) |
| 7 | 2807 { |
| 2808 /* Visual is after curwin->w_cursor */ | |
| 2809 top = &curwin->w_cursor; | |
| 2810 bot = &VIsual; | |
| 2811 } | |
| 2812 else | |
| 2813 { | |
| 2814 /* Visual is before curwin->w_cursor */ | |
| 2815 top = &VIsual; | |
| 2816 bot = &curwin->w_cursor; | |
| 2817 } | |
| 2818 if (lnum >= top->lnum | |
| 2819 && lnume <= bot->lnum | |
| 2820 && (VIsual_mode != 'v' | |
| 2821 || ((lnum > top->lnum | |
| 2822 || (lnum == top->lnum | |
| 2823 && top->col == 0)) | |
| 2824 && (lnume < bot->lnum | |
| 2825 || (lnume == bot->lnum | |
| 2826 && (bot->col - (*p_sel == 'e')) | |
| 1883 | 2827 >= (colnr_T)STRLEN(ml_get_buf(wp->w_buffer, lnume, FALSE))))))) |
| 7 | 2828 { |
| 2829 if (VIsual_mode == Ctrl_V) | |
| 2830 { | |
| 2831 /* Visual block mode: highlight the chars part of the block */ | |
| 2832 if (wp->w_old_cursor_fcol + txtcol < (colnr_T)W_WIDTH(wp)) | |
| 2833 { | |
| 3040 | 2834 if (wp->w_old_cursor_lcol != MAXCOL |
| 2835 && wp->w_old_cursor_lcol + txtcol | |
| 2836 < (colnr_T)W_WIDTH(wp)) | |
| 7 | 2837 len = wp->w_old_cursor_lcol; |
| 2838 else | |
| 2839 len = W_WIDTH(wp) - txtcol; | |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
2840 RL_MEMSET(wp->w_old_cursor_fcol + txtcol, HL_ATTR(HLF_V), |
| 230 | 2841 len - (int)wp->w_old_cursor_fcol); |
| 7 | 2842 } |
| 2843 } | |
| 2844 else | |
| 216 | 2845 { |
| 7 | 2846 /* Set all attributes of the text */ |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
2847 RL_MEMSET(txtcol, HL_ATTR(HLF_V), W_WIDTH(wp) - txtcol); |
| 216 | 2848 } |
| 7 | 2849 } |
| 2850 } | |
| 2851 | |
| 743 | 2852 #ifdef FEAT_SYN_HL |
| 6685 | 2853 /* Show colorcolumn in the fold line, but let cursorcolumn override it. */ |
| 2854 if (wp->w_p_cc_cols) | |
| 2855 { | |
| 2856 int i = 0; | |
| 2857 int j = wp->w_p_cc_cols[i]; | |
| 2858 int old_txtcol = txtcol; | |
| 2859 | |
| 2860 while (j > -1) | |
| 2861 { | |
| 2862 txtcol += j; | |
| 2863 if (wp->w_p_wrap) | |
| 2864 txtcol -= wp->w_skipcol; | |
| 2865 else | |
| 2866 txtcol -= wp->w_leftcol; | |
| 2867 if (txtcol >= 0 && txtcol < W_WIDTH(wp)) | |
| 2868 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
|
2869 ScreenAttrs[off + txtcol], HL_ATTR(HLF_MC)); |
| 6685 | 2870 txtcol = old_txtcol; |
| 2871 j = wp->w_p_cc_cols[++i]; | |
| 2872 } | |
| 2873 } | |
| 2874 | |
| 743 | 2875 /* Show 'cursorcolumn' in the fold line. */ |
| 1725 | 2876 if (wp->w_p_cuc) |
| 2877 { | |
| 2878 txtcol += wp->w_virtcol; | |
| 2879 if (wp->w_p_wrap) | |
| 2880 txtcol -= wp->w_skipcol; | |
| 2881 else | |
| 2882 txtcol -= wp->w_leftcol; | |
| 2883 if (txtcol >= 0 && txtcol < W_WIDTH(wp)) | |
| 2884 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
|
2885 ScreenAttrs[off + txtcol], HL_ATTR(HLF_CUC)); |
| 1725 | 2886 } |
| 743 | 2887 #endif |
| 7 | 2888 |
| 2889 SCREEN_LINE(row + W_WINROW(wp), W_WINCOL(wp), (int)W_WIDTH(wp), | |
| 2890 (int)W_WIDTH(wp), FALSE); | |
| 2891 | |
| 2892 /* | |
| 2893 * Update w_cline_height and w_cline_folded if the cursor line was | |
| 2894 * updated (saves a call to plines() later). | |
| 2895 */ | |
| 2896 if (wp == curwin | |
| 2897 && lnum <= curwin->w_cursor.lnum | |
| 2898 && lnume >= curwin->w_cursor.lnum) | |
| 2899 { | |
| 2900 curwin->w_cline_row = row; | |
| 2901 curwin->w_cline_height = 1; | |
| 2902 curwin->w_cline_folded = TRUE; | |
| 2903 curwin->w_valid |= (VALID_CHEIGHT|VALID_CROW); | |
| 2904 } | |
| 2905 } | |
| 2906 | |
| 2907 /* | |
| 2908 * Copy "buf[len]" to ScreenLines["off"] and set attributes to "attr". | |
| 2909 */ | |
| 2910 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2911 copy_text_attr( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2912 int off, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2913 char_u *buf, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2914 int len, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2915 int attr) |
| 7 | 2916 { |
| 216 | 2917 int i; |
| 2918 | |
| 7 | 2919 mch_memmove(ScreenLines + off, buf, (size_t)len); |
| 2920 # ifdef FEAT_MBYTE | |
| 2921 if (enc_utf8) | |
| 2922 vim_memset(ScreenLinesUC + off, 0, sizeof(u8char_T) * (size_t)len); | |
| 2923 # endif | |
| 216 | 2924 for (i = 0; i < len; ++i) |
| 2925 ScreenAttrs[off + i] = attr; | |
| 7 | 2926 } |
| 2927 | |
| 2928 /* | |
| 2929 * Fill the foldcolumn at "p" for window "wp". | |
| 548 | 2930 * Only to be called when 'foldcolumn' > 0. |
| 7 | 2931 */ |
| 2932 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2933 fill_foldcolumn( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2934 char_u *p, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2935 win_T *wp, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2936 int closed, /* TRUE of FALSE */ |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2937 linenr_T lnum) /* current line number */ |
| 7 | 2938 { |
| 2939 int i = 0; | |
| 2940 int level; | |
| 2941 int first_level; | |
| 519 | 2942 int empty; |
| 6553 | 2943 int fdc = compute_foldcolumn(wp, 0); |
| 7 | 2944 |
| 2945 /* Init to all spaces. */ | |
| 6929 | 2946 vim_memset(p, ' ', (size_t)fdc); |
| 7 | 2947 |
| 2948 level = win_foldinfo.fi_level; | |
| 2949 if (level > 0) | |
| 2950 { | |
| 519 | 2951 /* If there is only one column put more info in it. */ |
| 6553 | 2952 empty = (fdc == 1) ? 0 : 1; |
| 519 | 2953 |
| 7 | 2954 /* If the column is too narrow, we start at the lowest level that |
| 2955 * fits and use numbers to indicated the depth. */ | |
| 6553 | 2956 first_level = level - fdc - closed + 1 + empty; |
| 7 | 2957 if (first_level < 1) |
| 2958 first_level = 1; | |
| 2959 | |
| 6553 | 2960 for (i = 0; i + empty < fdc; ++i) |
| 7 | 2961 { |
| 2962 if (win_foldinfo.fi_lnum == lnum | |
| 2963 && first_level + i >= win_foldinfo.fi_low_level) | |
| 2964 p[i] = '-'; | |
| 2965 else if (first_level == 1) | |
| 2966 p[i] = '|'; | |
| 2967 else if (first_level + i <= 9) | |
| 2968 p[i] = '0' + first_level + i; | |
| 2969 else | |
| 2970 p[i] = '>'; | |
| 2971 if (first_level + i == level) | |
| 2972 break; | |
| 2973 } | |
| 2974 } | |
| 2975 if (closed) | |
| 6553 | 2976 p[i >= fdc ? i - 1 : i] = '+'; |
| 7 | 2977 } |
| 2978 #endif /* FEAT_FOLDING */ | |
| 2979 | |
| 2980 /* | |
| 2981 * Display line "lnum" of window 'wp' on the screen. | |
| 2982 * Start at row "startrow", stop when "endrow" is reached. | |
| 2983 * wp->w_virtcol needs to be valid. | |
| 2984 * | |
| 2985 * Return the number of last row the line occupies. | |
| 2986 */ | |
| 2987 static int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2988 win_line( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2989 win_T *wp, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2990 linenr_T lnum, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2991 int startrow, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2992 int endrow, |
|
11529
998d2cf59caa
patch 8.0.0647: syntax highlighting can make cause a freeze
Christian Brabandt <cb@256bit.org>
parents:
11521
diff
changeset
|
2993 int nochange UNUSED, /* not updating for changed text */ |
|
998d2cf59caa
patch 8.0.0647: syntax highlighting can make cause a freeze
Christian Brabandt <cb@256bit.org>
parents:
11521
diff
changeset
|
2994 proftime_T *syntax_tm) |
| 7 | 2995 { |
|
10801
e7b8be5ecacd
patch 8.0.0290: cursor positioning wrong if wide character wraps
Christian Brabandt <cb@256bit.org>
parents:
10793
diff
changeset
|
2996 int col = 0; /* visual column on screen */ |
| 7 | 2997 unsigned off; /* offset in ScreenLines/ScreenAttrs */ |
| 2998 int c = 0; /* init for GCC */ | |
| 2999 long vcol = 0; /* virtual column (for tabs) */ | |
| 6503 | 3000 #ifdef FEAT_LINEBREAK |
| 3001 long vcol_sbr = -1; /* virtual column after showbreak */ | |
| 3002 #endif | |
| 7 | 3003 long vcol_prev = -1; /* "vcol" of previous character */ |
| 3004 char_u *line; /* current line */ | |
| 3005 char_u *ptr; /* current position in "line" */ | |
| 3006 int row; /* row in the window, excl w_winrow */ | |
| 3007 int screen_row; /* row on the screen, incl w_winrow */ | |
| 3008 | |
| 3009 char_u extra[18]; /* "%ld" and 'fdc' must fit in here */ | |
| 3010 int n_extra = 0; /* number of extra chars */ | |
| 1340 | 3011 char_u *p_extra = NULL; /* string of extra chars, plus NUL */ |
| 6026 | 3012 char_u *p_extra_free = NULL; /* p_extra needs to be freed */ |
| 7 | 3013 int c_extra = NUL; /* extra chars, all the same */ |
| 3014 int extra_attr = 0; /* attributes when n_extra != 0 */ | |
| 3015 static char_u *at_end_str = (char_u *)""; /* used for p_extra when | |
| 3016 displaying lcs_eol at end-of-line */ | |
| 3017 int lcs_eol_one = lcs_eol; /* lcs_eol until it's been used */ | |
| 3018 int lcs_prec_todo = lcs_prec; /* lcs_prec until it's been used */ | |
| 3019 | |
| 3020 /* saved "extra" items for when draw_state becomes WL_LINE (again) */ | |
| 3021 int saved_n_extra = 0; | |
| 3022 char_u *saved_p_extra = NULL; | |
| 3023 int saved_c_extra = 0; | |
| 3024 int saved_char_attr = 0; | |
| 3025 | |
| 3026 int n_attr = 0; /* chars with special attr */ | |
| 3027 int saved_attr2 = 0; /* char_attr saved for n_attr */ | |
| 3028 int n_attr3 = 0; /* chars with overruling special attr */ | |
| 3029 int saved_attr3 = 0; /* char_attr saved for n_attr3 */ | |
| 3030 | |
| 3031 int n_skip = 0; /* nr of chars to skip for 'nowrap' */ | |
| 3032 | |
| 3033 int fromcol, tocol; /* start/end of inverting */ | |
| 3034 int fromcol_prev = -2; /* start of inverting after cursor */ | |
| 3035 int noinvcur = FALSE; /* don't invert the cursor */ | |
| 3036 pos_T *top, *bot; | |
| 1813 | 3037 int lnum_in_visual_area = FALSE; |
| 7 | 3038 pos_T pos; |
| 3039 long v; | |
| 3040 | |
| 3041 int char_attr = 0; /* attributes for next character */ | |
| 674 | 3042 int attr_pri = FALSE; /* char_attr has priority */ |
| 7 | 3043 int area_highlighting = FALSE; /* Visual or incsearch highlighting |
| 3044 in this line */ | |
| 3045 int attr = 0; /* attributes for area highlighting */ | |
| 3046 int area_attr = 0; /* attributes desired by highlighting */ | |
| 3047 int search_attr = 0; /* attributes desired by 'hlsearch' */ | |
| 3048 #ifdef FEAT_SYN_HL | |
| 743 | 3049 int vcol_save_attr = 0; /* saved attr for 'cursorcolumn' */ |
| 7 | 3050 int syntax_attr = 0; /* attributes desired by syntax */ |
| 3051 int has_syntax = FALSE; /* this buffer has syntax highl. */ | |
| 3052 int save_did_emsg; | |
| 1437 | 3053 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
|
3054 int draw_color_col = FALSE; /* highlight colorcolumn */ |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
3055 int *color_cols = NULL; /* pointer to according columns array */ |
| 743 | 3056 #endif |
| 3057 #ifdef FEAT_SPELL | |
| 221 | 3058 int has_spell = FALSE; /* this buffer has spell checking */ |
| 348 | 3059 # define SPWORDLEN 150 |
| 3060 char_u nextline[SPWORDLEN * 2];/* text with start of the next line */ | |
| 353 | 3061 int nextlinecol = 0; /* column where nextline[] starts */ |
| 3062 int nextline_idx = 0; /* index in nextline[] where next line | |
| 348 | 3063 starts */ |
| 221 | 3064 int spell_attr = 0; /* attributes desired by spelling */ |
| 3065 int word_end = 0; /* last byte with same spell_attr */ | |
| 378 | 3066 static linenr_T checked_lnum = 0; /* line number for "checked_col" */ |
| 3067 static int checked_col = 0; /* column in "checked_lnum" up to which | |
| 348 | 3068 * there are no spell errors */ |
| 386 | 3069 static int cap_col = -1; /* column to check for Cap word */ |
| 3070 static linenr_T capcol_lnum = 0; /* line number where "cap_col" used */ | |
| 348 | 3071 int cur_checked_col = 0; /* checked column for current line */ |
| 7 | 3072 #endif |
| 3073 int extra_check; /* has syntax or linebreak */ | |
| 3074 #ifdef FEAT_MBYTE | |
| 3075 int multi_attr = 0; /* attributes desired by multibyte */ | |
| 3076 int mb_l = 1; /* multi-byte byte length */ | |
| 3077 int mb_c = 0; /* decoded multi-byte character */ | |
| 3078 int mb_utf8 = FALSE; /* screen char is UTF-8 char */ | |
| 714 | 3079 int u8cc[MAX_MCO]; /* composing UTF-8 chars */ |
| 7 | 3080 #endif |
| 3081 #ifdef FEAT_DIFF | |
| 3082 int filler_lines; /* nr of filler lines to be drawn */ | |
| 3083 int filler_todo; /* nr of filler lines still to do + 1 */ | |
| 534 | 3084 hlf_T diff_hlf = (hlf_T)0; /* type of diff highlighting */ |
| 7 | 3085 int change_start = MAXCOL; /* first col of changed area */ |
| 3086 int change_end = -1; /* last col of changed area */ | |
| 3087 #endif | |
| 3088 colnr_T trailcol = MAXCOL; /* start of trailing spaces */ | |
| 3089 #ifdef FEAT_LINEBREAK | |
|
10392
957a1d560bda
commit https://github.com/vim/vim/commit/6c896867c4f5d759616028ef7cbfce2a9ed32600
Christian Brabandt <cb@256bit.org>
parents:
10349
diff
changeset
|
3090 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
|
3091 chars */ |
| 7 | 3092 #endif |
| 910 | 3093 #if defined(FEAT_SIGNS) || (defined(FEAT_QUICKFIX) && defined(FEAT_WINDOWS)) \ |
| 3094 || defined(FEAT_SYN_HL) || defined(FEAT_DIFF) | |
| 7 | 3095 # define LINE_ATTR |
| 1536 | 3096 int line_attr = 0; /* attribute for the whole line */ |
| 7 | 3097 #endif |
| 3098 #ifdef FEAT_SEARCH_EXTRA | |
| 1326 | 3099 matchitem_T *cur; /* points to the match list */ |
| 3100 match_T *shl; /* points to search_hl or a match */ | |
| 3101 int shl_flag; /* flag to indicate whether search_hl | |
| 3102 has been processed or not */ | |
| 5979 | 3103 int pos_inprogress; /* marks that position match search is |
| 3104 in progress */ | |
| 1326 | 3105 int prevcol_hl_flag; /* flag to indicate whether prevcol |
| 3106 equals startcol of search_hl or one | |
| 3107 of the matches */ | |
| 7 | 3108 #endif |
| 3109 #ifdef FEAT_ARABIC | |
| 3110 int prev_c = 0; /* previous Arabic character */ | |
| 3111 int prev_c1 = 0; /* first composing char for prev_c */ | |
| 3112 #endif | |
| 910 | 3113 #if defined(LINE_ATTR) |
| 867 | 3114 int did_line_attr = 0; |
| 3115 #endif | |
| 7 | 3116 |
| 3117 /* draw_state: items that are drawn in sequence: */ | |
| 3118 #define WL_START 0 /* nothing done yet */ | |
| 3119 #ifdef FEAT_CMDWIN | |
| 3120 # define WL_CMDLINE WL_START + 1 /* cmdline window column */ | |
| 3121 #else | |
| 3122 # define WL_CMDLINE WL_START | |
| 3123 #endif | |
| 3124 #ifdef FEAT_FOLDING | |
| 3125 # define WL_FOLD WL_CMDLINE + 1 /* 'foldcolumn' */ | |
| 3126 #else | |
| 3127 # define WL_FOLD WL_CMDLINE | |
| 3128 #endif | |
| 3129 #ifdef FEAT_SIGNS | |
| 3130 # define WL_SIGN WL_FOLD + 1 /* column for signs */ | |
| 3131 #else | |
| 3132 # define WL_SIGN WL_FOLD /* column for signs */ | |
| 3133 #endif | |
| 3134 #define WL_NR WL_SIGN + 1 /* line number */ | |
| 5995 | 3135 #ifdef FEAT_LINEBREAK |
| 3136 # define WL_BRI WL_NR + 1 /* 'breakindent' */ | |
| 3137 #else | |
| 3138 # define WL_BRI WL_NR | |
| 3139 #endif | |
| 7 | 3140 #if defined(FEAT_LINEBREAK) || defined(FEAT_DIFF) |
| 5995 | 3141 # define WL_SBR WL_BRI + 1 /* 'showbreak' or 'diff' */ |
| 7 | 3142 #else |
| 5995 | 3143 # define WL_SBR WL_BRI |
| 7 | 3144 #endif |
| 3145 #define WL_LINE WL_SBR + 1 /* text in the line */ | |
| 3146 int draw_state = WL_START; /* what to draw next */ | |
| 574 | 3147 #if defined(FEAT_XIM) && defined(FEAT_GUI_GTK) |
| 7 | 3148 int feedback_col = 0; |
| 3149 int feedback_old_attr = -1; | |
| 3150 #endif | |
| 3151 | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
3152 #ifdef FEAT_CONCEAL |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
3153 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
|
3154 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
|
3155 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
|
3156 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
|
3157 int is_concealing = FALSE; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
3158 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
|
3159 wrapping */ |
|
2409
0ca06a92adfb
Add support for horizontal scroll wheel. (Bjorn Winckler)
Bram Moolenaar <bram@vim.org>
parents:
2400
diff
changeset
|
3160 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
|
3161 int did_wcol = FALSE; |
|
8907
5deb9e8f4292
commit https://github.com/vim/vim/commit/4d585022023b96f6507e8cae5ed8fc8d926f5140
Christian Brabandt <cb@256bit.org>
parents:
8872
diff
changeset
|
3162 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
|
3163 int has_match_conc = 0; /* match wants to conceal */ |
| 6520 | 3164 int old_boguscols = 0; |
|
2332
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
3165 # define VCOL_HLC (vcol - vcol_off) |
|
5174
42d592dbbec3
updated for version 7.4a.013
Bram Moolenaar <bram@vim.org>
parents:
5126
diff
changeset
|
3166 # define FIX_FOR_BOGUSCOLS \ |
|
42d592dbbec3
updated for version 7.4a.013
Bram Moolenaar <bram@vim.org>
parents:
5126
diff
changeset
|
3167 { \ |
|
42d592dbbec3
updated for version 7.4a.013
Bram Moolenaar <bram@vim.org>
parents:
5126
diff
changeset
|
3168 n_extra += vcol_off; \ |
|
42d592dbbec3
updated for version 7.4a.013
Bram Moolenaar <bram@vim.org>
parents:
5126
diff
changeset
|
3169 vcol -= vcol_off; \ |
|
42d592dbbec3
updated for version 7.4a.013
Bram Moolenaar <bram@vim.org>
parents:
5126
diff
changeset
|
3170 vcol_off = 0; \ |
|
42d592dbbec3
updated for version 7.4a.013
Bram Moolenaar <bram@vim.org>
parents:
5126
diff
changeset
|
3171 col -= boguscols; \ |
| 6520 | 3172 old_boguscols = boguscols; \ |
|
5174
42d592dbbec3
updated for version 7.4a.013
Bram Moolenaar <bram@vim.org>
parents:
5126
diff
changeset
|
3173 boguscols = 0; \ |
|
42d592dbbec3
updated for version 7.4a.013
Bram Moolenaar <bram@vim.org>
parents:
5126
diff
changeset
|
3174 } |
|
2332
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
3175 #else |
|
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
3176 # define VCOL_HLC (vcol) |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
3177 #endif |
| 7 | 3178 |
| 3179 if (startrow > endrow) /* past the end already! */ | |
| 3180 return startrow; | |
| 3181 | |
| 3182 row = startrow; | |
| 3183 screen_row = row + W_WINROW(wp); | |
| 3184 | |
| 3185 /* | |
| 3186 * To speed up the loop below, set extra_check when there is linebreak, | |
| 3187 * trailing white space and/or syntax processing to be done. | |
| 3188 */ | |
| 3189 #ifdef FEAT_LINEBREAK | |
| 3190 extra_check = wp->w_p_lbr; | |
| 3191 #else | |
| 3192 extra_check = 0; | |
| 3193 #endif | |
| 3194 #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
|
3195 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
|
3196 # 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
|
3197 && !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
|
3198 # endif |
|
998d2cf59caa
patch 8.0.0647: syntax highlighting can make cause a freeze
Christian Brabandt <cb@256bit.org>
parents:
11521
diff
changeset
|
3199 ) |
| 7 | 3200 { |
| 3201 /* Prepare for syntax highlighting in this line. When there is an | |
| 3202 * error, stop syntax highlighting. */ | |
| 3203 save_did_emsg = did_emsg; | |
| 3204 did_emsg = FALSE; | |
|
11529
998d2cf59caa
patch 8.0.0647: syntax highlighting can make cause a freeze
Christian Brabandt <cb@256bit.org>
parents:
11521
diff
changeset
|
3205 syntax_start(wp, lnum, syntax_tm); |
| 7 | 3206 if (did_emsg) |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
3207 wp->w_s->b_syn_error = TRUE; |
| 7 | 3208 else |
| 3209 { | |
| 3210 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
|
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 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
|
3213 #endif |
|
998d2cf59caa
patch 8.0.0647: syntax highlighting can make cause a freeze
Christian Brabandt <cb@256bit.org>
parents:
11521
diff
changeset
|
3214 { |
|
998d2cf59caa
patch 8.0.0647: syntax highlighting can make cause a freeze
Christian Brabandt <cb@256bit.org>
parents:
11521
diff
changeset
|
3215 has_syntax = TRUE; |
|
998d2cf59caa
patch 8.0.0647: syntax highlighting can make cause a freeze
Christian Brabandt <cb@256bit.org>
parents:
11521
diff
changeset
|
3216 extra_check = TRUE; |
|
998d2cf59caa
patch 8.0.0647: syntax highlighting can make cause a freeze
Christian Brabandt <cb@256bit.org>
parents:
11521
diff
changeset
|
3217 } |
| 7 | 3218 } |
| 3219 } | |
|
2314
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
3220 |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
3221 /* Check for columns to display for 'colorcolumn'. */ |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
3222 color_cols = wp->w_p_cc_cols; |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
3223 if (color_cols != NULL) |
|
2332
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
3224 draw_color_col = advance_color_col(VCOL_HLC, &color_cols); |
| 743 | 3225 #endif |
| 3226 | |
| 3227 #ifdef FEAT_SPELL | |
| 258 | 3228 if (wp->w_p_spell |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
3229 && *wp->w_s->b_p_spl != NUL |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
3230 && 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
|
3231 && *(char **)(wp->w_s->b_langp.ga_data) != NULL) |
| 221 | 3232 { |
| 3233 /* Prepare for spell checking. */ | |
| 3234 has_spell = TRUE; | |
| 3235 extra_check = TRUE; | |
| 348 | 3236 |
| 3237 /* Get the start of the next line, so that words that wrap to the next | |
| 3238 * line are found too: "et<line-break>al.". | |
| 3239 * Trick: skip a few chars for C/shell/Vim comments */ | |
| 3240 nextline[SPWORDLEN] = NUL; | |
| 3241 if (lnum < wp->w_buffer->b_ml.ml_line_count) | |
| 3242 { | |
| 3243 line = ml_get_buf(wp->w_buffer, lnum + 1, FALSE); | |
| 3244 spell_cat_line(nextline + SPWORDLEN, line, SPWORDLEN); | |
| 3245 } | |
| 3246 | |
| 3247 /* When a word wrapped from the previous line the start of the current | |
| 3248 * line is valid. */ | |
| 3249 if (lnum == checked_lnum) | |
| 3250 cur_checked_col = checked_col; | |
| 3251 checked_lnum = 0; | |
| 386 | 3252 |
| 3253 /* When there was a sentence end in the previous line may require a | |
| 3254 * word starting with capital in this line. In line 1 always check | |
| 3255 * the first word. */ | |
| 3256 if (lnum != capcol_lnum) | |
| 3257 cap_col = -1; | |
| 3258 if (lnum == 1) | |
| 3259 cap_col = 0; | |
| 3260 capcol_lnum = 0; | |
| 221 | 3261 } |
| 7 | 3262 #endif |
| 3263 | |
| 3264 /* | |
| 3265 * handle visual active in this window | |
| 3266 */ | |
| 3267 fromcol = -10; | |
| 3268 tocol = MAXCOL; | |
| 3269 if (VIsual_active && wp->w_buffer == curwin->w_buffer) | |
| 3270 { | |
| 3271 /* 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
|
3272 if (LTOREQ_POS(curwin->w_cursor, VIsual)) |
| 7 | 3273 { |
| 3274 top = &curwin->w_cursor; | |
| 3275 bot = &VIsual; | |
| 3276 } | |
| 3277 else /* Visual is before curwin->w_cursor */ | |
| 3278 { | |
| 3279 top = &VIsual; | |
| 3280 bot = &curwin->w_cursor; | |
| 3281 } | |
| 1813 | 3282 lnum_in_visual_area = (lnum >= top->lnum && lnum <= bot->lnum); |
| 7 | 3283 if (VIsual_mode == Ctrl_V) /* block mode */ |
| 3284 { | |
| 1813 | 3285 if (lnum_in_visual_area) |
| 7 | 3286 { |
| 3287 fromcol = wp->w_old_cursor_fcol; | |
| 3288 tocol = wp->w_old_cursor_lcol; | |
| 3289 } | |
| 3290 } | |
| 3291 else /* non-block mode */ | |
| 3292 { | |
| 3293 if (lnum > top->lnum && lnum <= bot->lnum) | |
| 3294 fromcol = 0; | |
| 3295 else if (lnum == top->lnum) | |
| 3296 { | |
| 3297 if (VIsual_mode == 'V') /* linewise */ | |
| 3298 fromcol = 0; | |
| 3299 else | |
| 3300 { | |
| 3301 getvvcol(wp, top, (colnr_T *)&fromcol, NULL, NULL); | |
| 3302 if (gchar_pos(top) == NUL) | |
| 3303 tocol = fromcol + 1; | |
| 3304 } | |
| 3305 } | |
| 3306 if (VIsual_mode != 'V' && lnum == bot->lnum) | |
| 3307 { | |
| 3308 if (*p_sel == 'e' && bot->col == 0 | |
| 3309 #ifdef FEAT_VIRTUALEDIT | |
| 3310 && bot->coladd == 0 | |
| 3311 #endif | |
| 3312 ) | |
| 3313 { | |
| 3314 fromcol = -10; | |
| 3315 tocol = MAXCOL; | |
| 3316 } | |
| 36 | 3317 else if (bot->col == MAXCOL) |
| 3318 tocol = MAXCOL; | |
| 7 | 3319 else |
| 3320 { | |
| 3321 pos = *bot; | |
| 3322 if (*p_sel == 'e') | |
| 3323 getvvcol(wp, &pos, (colnr_T *)&tocol, NULL, NULL); | |
| 3324 else | |
| 3325 { | |
| 3326 getvvcol(wp, &pos, NULL, NULL, (colnr_T *)&tocol); | |
| 3327 ++tocol; | |
| 3328 } | |
| 3329 } | |
| 3330 } | |
| 3331 } | |
| 3332 | |
| 3333 /* Check if the character under the cursor should not be inverted */ | |
| 3334 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
|
3335 #ifdef FEAT_GUI |
| 7 | 3336 && !gui.in_use |
|
8212
05b88224cea1
commit https://github.com/vim/vim/commit/48e330aff911be1c798c88a973af6437a8141fce
Christian Brabandt <cb@256bit.org>
parents:
7833
diff
changeset
|
3337 #endif |
| 7 | 3338 ) |
| 3339 noinvcur = TRUE; | |
| 3340 | |
| 3341 /* if inverting in this line set area_highlighting */ | |
| 3342 if (fromcol >= 0) | |
| 3343 { | |
| 3344 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
|
3345 attr = HL_ATTR(HLF_V); |
| 7 | 3346 #if defined(FEAT_CLIPBOARD) && defined(FEAT_X11) |
| 3674 | 3347 if ((clip_star.available && !clip_star.owned |
| 3348 && clip_isautosel_star()) | |
| 3349 || (clip_plus.available && !clip_plus.owned | |
| 3350 && 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
|
3351 attr = HL_ATTR(HLF_VNC); |
| 7 | 3352 #endif |
| 3353 } | |
| 3354 } | |
| 3355 | |
| 3356 /* | |
| 674 | 3357 * handle 'incsearch' and ":s///c" highlighting |
| 7 | 3358 */ |
| 5735 | 3359 else if (highlight_match |
| 7 | 3360 && wp == curwin |
| 3361 && lnum >= curwin->w_cursor.lnum | |
| 3362 && lnum <= curwin->w_cursor.lnum + search_match_lines) | |
| 3363 { | |
| 3364 if (lnum == curwin->w_cursor.lnum) | |
| 3365 getvcol(curwin, &(curwin->w_cursor), | |
| 3366 (colnr_T *)&fromcol, NULL, NULL); | |
| 3367 else | |
| 3368 fromcol = 0; | |
| 3369 if (lnum == curwin->w_cursor.lnum + search_match_lines) | |
| 3370 { | |
| 3371 pos.lnum = lnum; | |
| 3372 pos.col = search_match_endcol; | |
| 3373 getvcol(curwin, &pos, (colnr_T *)&tocol, NULL, NULL); | |
| 3374 } | |
| 3375 else | |
| 3376 tocol = MAXCOL; | |
| 1850 | 3377 /* do at least one character; happens when past end of line */ |
| 3378 if (fromcol == tocol) | |
| 3379 tocol = fromcol + 1; | |
| 7 | 3380 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
|
3381 attr = HL_ATTR(HLF_I); |
| 7 | 3382 } |
| 3383 | |
| 3384 #ifdef FEAT_DIFF | |
| 3385 filler_lines = diff_check(wp, lnum); | |
| 3386 if (filler_lines < 0) | |
| 3387 { | |
| 3388 if (filler_lines == -1) | |
| 3389 { | |
| 3390 if (diff_find_change(wp, lnum, &change_start, &change_end)) | |
| 3391 diff_hlf = HLF_ADD; /* added line */ | |
| 3392 else if (change_start == 0) | |
| 3393 diff_hlf = HLF_TXD; /* changed text */ | |
| 3394 else | |
| 3395 diff_hlf = HLF_CHD; /* changed line */ | |
| 3396 } | |
| 3397 else | |
| 3398 diff_hlf = HLF_ADD; /* added line */ | |
| 3399 filler_lines = 0; | |
| 3400 area_highlighting = TRUE; | |
| 3401 } | |
| 3402 if (lnum == wp->w_topline) | |
| 3403 filler_lines = wp->w_topfill; | |
| 3404 filler_todo = filler_lines; | |
| 3405 #endif | |
| 3406 | |
| 3407 #ifdef LINE_ATTR | |
| 3408 # ifdef FEAT_SIGNS | |
| 3409 /* If this line has a sign with line highlighting set line_attr. */ | |
| 3410 v = buf_getsigntype(wp->w_buffer, lnum, SIGN_LINEHL); | |
| 3411 if (v != 0) | |
| 3412 line_attr = sign_get_attr((int)v, TRUE); | |
| 3413 # endif | |
| 3414 # if defined(FEAT_QUICKFIX) && defined(FEAT_WINDOWS) | |
| 3415 /* Highlight the current line in the quickfix window. */ | |
| 644 | 3416 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
|
3417 line_attr = HL_ATTR(HLF_QFL); |
| 7 | 3418 # endif |
| 3419 if (line_attr != 0) | |
| 3420 area_highlighting = TRUE; | |
| 3421 #endif | |
| 3422 | |
| 3423 line = ml_get_buf(wp->w_buffer, lnum, FALSE); | |
| 3424 ptr = line; | |
| 3425 | |
| 743 | 3426 #ifdef FEAT_SPELL |
| 348 | 3427 if (has_spell) |
| 3428 { | |
| 386 | 3429 /* For checking first word with a capital skip white space. */ |
| 3430 if (cap_col == 0) | |
| 835 | 3431 cap_col = (int)(skipwhite(line) - line); |
| 386 | 3432 |
| 348 | 3433 /* To be able to spell-check over line boundaries copy the end of the |
| 3434 * current line into nextline[]. Above the start of the next line was | |
| 3435 * copied to nextline[SPWORDLEN]. */ | |
| 3436 if (nextline[SPWORDLEN] == NUL) | |
| 3437 { | |
| 3438 /* No next line or it is empty. */ | |
| 3439 nextlinecol = MAXCOL; | |
| 3440 nextline_idx = 0; | |
| 3441 } | |
| 3442 else | |
| 3443 { | |
| 835 | 3444 v = (long)STRLEN(line); |
| 348 | 3445 if (v < SPWORDLEN) |
| 3446 { | |
| 3447 /* Short line, use it completely and append the start of the | |
| 3448 * next line. */ | |
| 3449 nextlinecol = 0; | |
| 3450 mch_memmove(nextline, line, (size_t)v); | |
| 1621 | 3451 STRMOVE(nextline + v, nextline + SPWORDLEN); |
| 348 | 3452 nextline_idx = v + 1; |
| 3453 } | |
| 3454 else | |
| 3455 { | |
| 3456 /* Long line, use only the last SPWORDLEN bytes. */ | |
| 3457 nextlinecol = v - SPWORDLEN; | |
| 3458 mch_memmove(nextline, line + nextlinecol, SPWORDLEN); | |
| 3459 nextline_idx = SPWORDLEN + 1; | |
| 3460 } | |
| 3461 } | |
| 3462 } | |
| 3463 #endif | |
| 3464 | |
|
7344
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
3465 if (wp->w_p_list) |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
3466 { |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
3467 if (lcs_space || lcs_trail) |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
3468 extra_check = TRUE; |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
3469 /* find start of trailing whitespace */ |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
3470 if (lcs_trail) |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
3471 { |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
3472 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
|
3473 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
|
3474 --trailcol; |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
3475 trailcol += (colnr_T) (ptr - line); |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
3476 } |
| 7 | 3477 } |
| 3478 | |
| 3479 /* | |
| 3480 * 'nowrap' or 'wrap' and a single line that doesn't fit: Advance to the | |
| 3481 * first character to be displayed. | |
| 3482 */ | |
| 3483 if (wp->w_p_wrap) | |
| 3484 v = wp->w_skipcol; | |
| 3485 else | |
| 3486 v = wp->w_leftcol; | |
| 3487 if (v > 0) | |
| 3488 { | |
| 3489 #ifdef FEAT_MBYTE | |
| 3490 char_u *prev_ptr = ptr; | |
| 3491 #endif | |
| 3492 while (vcol < v && *ptr != NUL) | |
| 3493 { | |
| 5995 | 3494 c = win_lbr_chartabsize(wp, line, ptr, (colnr_T)vcol, NULL); |
| 7 | 3495 vcol += c; |
| 3496 #ifdef FEAT_MBYTE | |
| 3497 prev_ptr = ptr; | |
| 39 | 3498 #endif |
|
11127
506f5d8b7d8b
patch 8.0.0451: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11121
diff
changeset
|
3499 MB_PTR_ADV(ptr); |
| 7 | 3500 } |
| 3501 | |
| 1984 | 3502 /* When: |
| 3503 * - 'cuc' is set, or | |
|
2314
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
3504 * - 'colorcolumn' is set, or |
| 1984 | 3505 * - 'virtualedit' is set, or |
| 3506 * - the visual mode is active, | |
| 3507 * the end of the line may be before the start of the displayed part. | |
| 3508 */ | |
| 3509 if (vcol < v && ( | |
| 5735 | 3510 #ifdef FEAT_SYN_HL |
| 3511 wp->w_p_cuc || draw_color_col || | |
| 3512 #endif | |
| 3513 #ifdef FEAT_VIRTUALEDIT | |
| 3514 virtual_active() || | |
| 3515 #endif | |
| 3516 (VIsual_active && wp->w_buffer == curwin->w_buffer))) | |
| 1984 | 3517 { |
| 7 | 3518 vcol = v; |
| 1984 | 3519 } |
| 7 | 3520 |
| 3521 /* Handle a character that's not completely on the screen: Put ptr at | |
| 3522 * that character but skip the first few screen characters. */ | |
| 3523 if (vcol > v) | |
| 3524 { | |
| 3525 vcol -= c; | |
| 3526 #ifdef FEAT_MBYTE | |
| 3527 ptr = prev_ptr; | |
| 3528 #else | |
| 3529 --ptr; | |
| 3530 #endif | |
|
11010
c004e17fa36b
patch 8.0.0394: tabs are not aligned when scrolling horizontally
Christian Brabandt <cb@256bit.org>
parents:
10988
diff
changeset
|
3531 /* 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
|
3532 * 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
|
3533 if (( |
|
c004e17fa36b
patch 8.0.0394: tabs are not aligned when scrolling horizontally
Christian Brabandt <cb@256bit.org>
parents:
10988
diff
changeset
|
3534 #ifdef FEAT_MBYTE |
|
c004e17fa36b
patch 8.0.0394: tabs are not aligned when scrolling horizontally
Christian Brabandt <cb@256bit.org>
parents:
10988
diff
changeset
|
3535 (*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
|
3536 #endif |
|
c004e17fa36b
patch 8.0.0394: tabs are not aligned when scrolling horizontally
Christian Brabandt <cb@256bit.org>
parents:
10988
diff
changeset
|
3537 *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
|
3538 n_skip = v - vcol; |
| 7 | 3539 } |
| 3540 | |
| 3541 /* | |
| 3542 * Adjust for when the inverted text is before the screen, | |
| 3543 * and when the start of the inverted text is before the screen. | |
| 3544 */ | |
| 3545 if (tocol <= vcol) | |
| 3546 fromcol = 0; | |
| 3547 else if (fromcol >= 0 && fromcol < vcol) | |
| 3548 fromcol = vcol; | |
| 3549 | |
| 3550 #ifdef FEAT_LINEBREAK | |
| 3551 /* When w_skipcol is non-zero, first line needs 'showbreak' */ | |
| 3552 if (wp->w_p_wrap) | |
| 3553 need_showbreak = TRUE; | |
| 3554 #endif | |
| 743 | 3555 #ifdef FEAT_SPELL |
| 499 | 3556 /* When spell checking a word we need to figure out the start of the |
| 3557 * word and if it's badly spelled or not. */ | |
| 3558 if (has_spell) | |
| 3559 { | |
| 3560 int len; | |
| 1536 | 3561 colnr_T linecol = (colnr_T)(ptr - line); |
| 534 | 3562 hlf_T spell_hlf = HLF_COUNT; |
| 499 | 3563 |
| 3564 pos = wp->w_cursor; | |
| 3565 wp->w_cursor.lnum = lnum; | |
| 1536 | 3566 wp->w_cursor.col = linecol; |
| 534 | 3567 len = spell_move_to(wp, FORWARD, TRUE, TRUE, &spell_hlf); |
| 1536 | 3568 |
| 3569 /* spell_move_to() may call ml_get() and make "line" invalid */ | |
| 3570 line = ml_get_buf(wp->w_buffer, lnum, FALSE); | |
| 3571 ptr = line + linecol; | |
| 3572 | |
| 530 | 3573 if (len == 0 || (int)wp->w_cursor.col > ptr - line) |
| 499 | 3574 { |
| 3575 /* no bad word found at line start, don't check until end of a | |
| 3576 * word */ | |
| 534 | 3577 spell_hlf = HLF_COUNT; |
| 3572 | 3578 word_end = (int)(spell_to_word_end(ptr, wp) - line + 1); |
| 499 | 3579 } |
| 3580 else | |
| 534 | 3581 { |
| 499 | 3582 /* bad word found, use attributes until end of word */ |
| 3583 word_end = wp->w_cursor.col + len + 1; | |
| 3584 | |
| 534 | 3585 /* Turn index into actual attributes. */ |
| 3586 if (spell_hlf != HLF_COUNT) | |
| 3587 spell_attr = highlight_attr[spell_hlf]; | |
| 3588 } | |
| 499 | 3589 wp->w_cursor = pos; |
| 501 | 3590 |
| 743 | 3591 # ifdef FEAT_SYN_HL |
| 501 | 3592 /* Need to restart syntax highlighting for this line. */ |
| 3593 if (has_syntax) | |
|
11529
998d2cf59caa
patch 8.0.0647: syntax highlighting can make cause a freeze
Christian Brabandt <cb@256bit.org>
parents:
11521
diff
changeset
|
3594 syntax_start(wp, lnum, syntax_tm); |
| 743 | 3595 # endif |
| 499 | 3596 } |
| 3597 #endif | |
| 7 | 3598 } |
| 3599 | |
| 3600 /* | |
| 3601 * Correct highlighting for cursor that can't be disabled. | |
| 3602 * Avoids having to check this for each character. | |
| 3603 */ | |
| 3604 if (fromcol >= 0) | |
| 3605 { | |
| 3606 if (noinvcur) | |
| 3607 { | |
| 3608 if ((colnr_T)fromcol == wp->w_virtcol) | |
| 3609 { | |
| 3610 /* highlighting starts at cursor, let it start just after the | |
| 3611 * cursor */ | |
| 3612 fromcol_prev = fromcol; | |
| 3613 fromcol = -1; | |
| 3614 } | |
| 3615 else if ((colnr_T)fromcol < wp->w_virtcol) | |
| 3616 /* restart highlighting after the cursor */ | |
| 3617 fromcol_prev = wp->w_virtcol; | |
| 3618 } | |
| 3619 if (fromcol >= tocol) | |
| 3620 fromcol = -1; | |
| 3621 } | |
| 3622 | |
| 3623 #ifdef FEAT_SEARCH_EXTRA | |
| 3624 /* | |
| 1326 | 3625 * Handle highlighting the last used search pattern and matches. |
| 3626 * Do this for both search_hl and the match list. | |
| 7 | 3627 */ |
| 1326 | 3628 cur = wp->w_match_head; |
| 3629 shl_flag = FALSE; | |
| 3630 while (cur != NULL || shl_flag == FALSE) | |
| 3631 { | |
| 3632 if (shl_flag == FALSE) | |
| 3633 { | |
| 3634 shl = &search_hl; | |
| 3635 shl_flag = TRUE; | |
| 3636 } | |
| 3637 else | |
| 3638 shl = &cur->hl; | |
| 36 | 3639 shl->startcol = MAXCOL; |
| 3640 shl->endcol = MAXCOL; | |
| 7 | 3641 shl->attr_cur = 0; |
|
9885
4e8b05fa12c6
commit https://github.com/vim/vim/commit/4f416e41243ca151b95d39d81ce23d00b1484755
Christian Brabandt <cb@256bit.org>
parents:
9877
diff
changeset
|
3642 shl->is_addpos = FALSE; |
| 5979 | 3643 v = (long)(ptr - line); |
| 3644 if (cur != NULL) | |
| 3645 cur->pos.cur = 0; | |
|
9992
3e3b0ce24b61
commit https://github.com/vim/vim/commit/e17bdffff78ebd6a4e3cff26754cc667557ea810
Christian Brabandt <cb@256bit.org>
parents:
9939
diff
changeset
|
3646 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
|
3647 shl == &search_hl ? NULL : cur); |
| 5979 | 3648 |
| 3649 /* Need to get the line again, a multi-line regexp may have made it | |
| 3650 * invalid. */ | |
| 3651 line = ml_get_buf(wp->w_buffer, lnum, FALSE); | |
| 3652 ptr = line + v; | |
| 3653 | |
| 3654 if (shl->lnum != 0 && shl->lnum <= lnum) | |
| 3655 { | |
| 3656 if (shl->lnum == lnum) | |
| 3657 shl->startcol = shl->rm.startpos[0].col; | |
| 3658 else | |
| 3659 shl->startcol = 0; | |
| 3660 if (lnum == shl->lnum + shl->rm.endpos[0].lnum | |
| 3661 - shl->rm.startpos[0].lnum) | |
| 3662 shl->endcol = shl->rm.endpos[0].col; | |
| 3663 else | |
| 3664 shl->endcol = MAXCOL; | |
| 3665 /* Highlight one character for an empty match. */ | |
| 3666 if (shl->startcol == shl->endcol) | |
| 3667 { | |
| 3668 #ifdef FEAT_MBYTE | |
| 3669 if (has_mbyte && line[shl->endcol] != NUL) | |
| 3670 shl->endcol += (*mb_ptr2len)(line + shl->endcol); | |
| 7 | 3671 else |
| 5979 | 3672 #endif |
| 3673 ++shl->endcol; | |
| 3674 } | |
| 3675 if ((long)shl->startcol < v) /* match at leftcol */ | |
| 3676 { | |
| 3677 shl->attr_cur = shl->attr; | |
| 3678 search_attr = shl->attr; | |
| 3679 } | |
| 3680 area_highlighting = TRUE; | |
| 7 | 3681 } |
| 1326 | 3682 if (shl != &search_hl && cur != NULL) |
| 3683 cur = cur->next; | |
| 7 | 3684 } |
| 3685 #endif | |
| 3686 | |
| 743 | 3687 #ifdef FEAT_SYN_HL |
|
5068
6a7ae677d6a1
updated for version 7.3.1277
Bram Moolenaar <bram@vim.org>
parents:
4916
diff
changeset
|
3688 /* 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
|
3689 * 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
|
3690 * then. */ |
|
5078
22ac43fb6d30
updated for version 7.3.1282
Bram Moolenaar <bram@vim.org>
parents:
5068
diff
changeset
|
3691 if (wp->w_p_cul && lnum == wp->w_cursor.lnum |
| 5979 | 3692 && !(wp == curwin && VIsual_active)) |
| 743 | 3693 { |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
3694 line_attr = HL_ATTR(HLF_CUL); |
| 743 | 3695 area_highlighting = TRUE; |
| 3696 } | |
| 3697 #endif | |
| 3698 | |
| 504 | 3699 off = (unsigned)(current_ScreenLine - ScreenLines); |
| 7 | 3700 col = 0; |
| 3701 #ifdef FEAT_RIGHTLEFT | |
| 3702 if (wp->w_p_rl) | |
| 3703 { | |
| 3704 /* Rightleft window: process the text in the normal direction, but put | |
| 3705 * it in current_ScreenLine[] from right to left. Start at the | |
| 3706 * rightmost column of the window. */ | |
| 3707 col = W_WIDTH(wp) - 1; | |
| 3708 off += col; | |
| 3709 } | |
| 3710 #endif | |
| 3711 | |
| 3712 /* | |
| 3713 * Repeat for the whole displayed line. | |
| 3714 */ | |
| 3715 for (;;) | |
| 3716 { | |
| 6947 | 3717 #ifdef FEAT_CONCEAL |
|
8907
5deb9e8f4292
commit https://github.com/vim/vim/commit/4d585022023b96f6507e8cae5ed8fc8d926f5140
Christian Brabandt <cb@256bit.org>
parents:
8872
diff
changeset
|
3718 has_match_conc = 0; |
| 6947 | 3719 #endif |
| 7 | 3720 /* Skip this quickly when working on the text. */ |
| 3721 if (draw_state != WL_LINE) | |
| 3722 { | |
| 3723 #ifdef FEAT_CMDWIN | |
| 3724 if (draw_state == WL_CMDLINE - 1 && n_extra == 0) | |
| 3725 { | |
| 3726 draw_state = WL_CMDLINE; | |
| 3727 if (cmdwin_type != 0 && wp == curwin) | |
| 3728 { | |
| 3729 /* Draw the cmdline character. */ | |
| 3730 n_extra = 1; | |
| 1340 | 3731 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
|
3732 char_attr = HL_ATTR(HLF_AT); |
| 7 | 3733 } |
| 3734 } | |
| 3735 #endif | |
| 3736 | |
| 3737 #ifdef FEAT_FOLDING | |
| 3738 if (draw_state == WL_FOLD - 1 && n_extra == 0) | |
| 3739 { | |
| 6553 | 3740 int fdc = compute_foldcolumn(wp, 0); |
| 3741 | |
| 7 | 3742 draw_state = WL_FOLD; |
| 6553 | 3743 if (fdc > 0) |
| 7 | 3744 { |
|
10466
34b50194f82d
commit https://github.com/vim/vim/commit/6270660611a151c5d0f614a5f0248ccdc80ed971
Christian Brabandt <cb@256bit.org>
parents:
10392
diff
changeset
|
3745 /* 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
|
3746 * already be in use. */ |
|
10690
206ab11fa76e
patch 8.0.0235: memory leak in diff mode
Christian Brabandt <cb@256bit.org>
parents:
10538
diff
changeset
|
3747 vim_free(p_extra_free); |
|
10466
34b50194f82d
commit https://github.com/vim/vim/commit/6270660611a151c5d0f614a5f0248ccdc80ed971
Christian Brabandt <cb@256bit.org>
parents:
10392
diff
changeset
|
3748 p_extra_free = alloc(12 + 1); |
|
34b50194f82d
commit https://github.com/vim/vim/commit/6270660611a151c5d0f614a5f0248ccdc80ed971
Christian Brabandt <cb@256bit.org>
parents:
10392
diff
changeset
|
3749 |
|
34b50194f82d
commit https://github.com/vim/vim/commit/6270660611a151c5d0f614a5f0248ccdc80ed971
Christian Brabandt <cb@256bit.org>
parents:
10392
diff
changeset
|
3750 if (p_extra_free != NULL) |
|
34b50194f82d
commit https://github.com/vim/vim/commit/6270660611a151c5d0f614a5f0248ccdc80ed971
Christian Brabandt <cb@256bit.org>
parents:
10392
diff
changeset
|
3751 { |
|
34b50194f82d
commit https://github.com/vim/vim/commit/6270660611a151c5d0f614a5f0248ccdc80ed971
Christian Brabandt <cb@256bit.org>
parents:
10392
diff
changeset
|
3752 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
|
3753 n_extra = fdc; |
|
34b50194f82d
commit https://github.com/vim/vim/commit/6270660611a151c5d0f614a5f0248ccdc80ed971
Christian Brabandt <cb@256bit.org>
parents:
10392
diff
changeset
|
3754 p_extra_free[n_extra] = NUL; |
|
34b50194f82d
commit https://github.com/vim/vim/commit/6270660611a151c5d0f614a5f0248ccdc80ed971
Christian Brabandt <cb@256bit.org>
parents:
10392
diff
changeset
|
3755 p_extra = p_extra_free; |
|
34b50194f82d
commit https://github.com/vim/vim/commit/6270660611a151c5d0f614a5f0248ccdc80ed971
Christian Brabandt <cb@256bit.org>
parents:
10392
diff
changeset
|
3756 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
|
3757 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
|
3758 } |
| 7 | 3759 } |
| 3760 } | |
| 3761 #endif | |
| 3762 | |
| 3763 #ifdef FEAT_SIGNS | |
| 3764 if (draw_state == WL_SIGN - 1 && n_extra == 0) | |
| 3765 { | |
| 3766 draw_state = WL_SIGN; | |
| 3767 /* Show the sign column when there are any signs in this | |
| 3768 * buffer or when using Netbeans. */ | |
|
9852
4eea48b76d03
commit https://github.com/vim/vim/commit/95ec9d6a6ab3117d60ff638670a803d43974ba51
Christian Brabandt <cb@256bit.org>
parents:
9848
diff
changeset
|
3769 if (signcolumn_on(wp)) |
| 7 | 3770 { |
| 2661 | 3771 int text_sign; |
| 7 | 3772 # ifdef FEAT_SIGN_ICONS |
| 2661 | 3773 int icon_sign; |
| 7 | 3774 # endif |
| 3775 | |
| 3776 /* Draw two cells with the sign value or blank. */ | |
| 3777 c_extra = ' '; | |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
3778 char_attr = HL_ATTR(HLF_SC); |
| 7 | 3779 n_extra = 2; |
| 3780 | |
| 5921 | 3781 if (row == startrow |
| 3782 #ifdef FEAT_DIFF | |
| 3783 + filler_lines && filler_todo <= 0 | |
| 3784 #endif | |
| 3785 ) | |
| 7 | 3786 { |
| 3787 text_sign = buf_getsigntype(wp->w_buffer, lnum, | |
| 3788 SIGN_TEXT); | |
| 3789 # ifdef FEAT_SIGN_ICONS | |
| 3790 icon_sign = buf_getsigntype(wp->w_buffer, lnum, | |
| 3791 SIGN_ICON); | |
| 3792 if (gui.in_use && icon_sign != 0) | |
| 3793 { | |
| 3794 /* Use the image in this position. */ | |
| 3795 c_extra = SIGN_BYTE; | |
| 3796 # ifdef FEAT_NETBEANS_INTG | |
| 3797 if (buf_signcount(wp->w_buffer, lnum) > 1) | |
| 3798 c_extra = MULTISIGN_BYTE; | |
| 3799 # endif | |
| 3800 char_attr = icon_sign; | |
| 3801 } | |
| 3802 else | |
| 3803 # endif | |
| 3804 if (text_sign != 0) | |
| 3805 { | |
| 3806 p_extra = sign_get_text(text_sign); | |
| 3807 if (p_extra != NULL) | |
| 3808 { | |
| 3809 c_extra = NUL; | |
| 835 | 3810 n_extra = (int)STRLEN(p_extra); |
| 7 | 3811 } |
| 3812 char_attr = sign_get_attr(text_sign, FALSE); | |
| 3813 } | |
| 3814 } | |
| 3815 } | |
| 3816 } | |
| 3817 #endif | |
| 3818 | |
| 3819 if (draw_state == WL_NR - 1 && n_extra == 0) | |
| 3820 { | |
| 3821 draw_state = WL_NR; | |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
3822 /* 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
|
3823 * 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
|
3824 if ((wp->w_p_nu || wp->w_p_rnu) |
| 7 | 3825 && (row == startrow |
| 3826 #ifdef FEAT_DIFF | |
| 3827 + filler_lines | |
| 3828 #endif | |
| 3829 || vim_strchr(p_cpo, CPO_NUMCOL) == NULL)) | |
| 3830 { | |
| 3831 /* Draw the line number (empty space after wrapping). */ | |
| 3832 if (row == startrow | |
| 3833 #ifdef FEAT_DIFF | |
| 3834 + filler_lines | |
| 3835 #endif | |
| 3836 ) | |
| 3837 { | |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
3838 long num; |
| 4065 | 3839 char *fmt = "%*ld "; |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
3840 |
|
4736
3f2319a953b3
updated for version 7.3.1115
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
3841 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
|
3842 /* 'number' + 'norelativenumber' */ |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
3843 num = (long)lnum; |
|
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
3844 else |
| 4065 | 3845 { |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
3846 /* 'relativenumber', don't use negative numbers */ |
| 2675 | 3847 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
|
3848 if (num == 0 && wp->w_p_nu && wp->w_p_rnu) |
| 4065 | 3849 { |
|
4736
3f2319a953b3
updated for version 7.3.1115
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
3850 /* 'number' + 'relativenumber' */ |
| 4065 | 3851 num = lnum; |
| 3852 fmt = "%-*ld "; | |
| 3853 } | |
| 3854 } | |
| 3855 | |
| 3856 sprintf((char *)extra, fmt, | |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
3857 number_width(wp), num); |
| 7 | 3858 if (wp->w_skipcol > 0) |
| 3859 for (p_extra = extra; *p_extra == ' '; ++p_extra) | |
| 3860 *p_extra = '-'; | |
| 3861 #ifdef FEAT_RIGHTLEFT | |
| 3862 if (wp->w_p_rl) /* reverse line numbers */ | |
| 3863 rl_mirror(extra); | |
| 3864 #endif | |
| 3865 p_extra = extra; | |
| 3866 c_extra = NUL; | |
| 3867 } | |
| 3868 else | |
| 3869 c_extra = ' '; | |
| 13 | 3870 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
|
3871 char_attr = HL_ATTR(HLF_N); |
| 743 | 3872 #ifdef FEAT_SYN_HL |
| 3873 /* When 'cursorline' is set highlight the line number of | |
| 3427 | 3874 * the current line differently. |
| 3875 * TODO: Can we use CursorLine instead of CursorLineNr | |
| 3876 * when CursorLineNr isn't set? */ | |
|
5078
22ac43fb6d30
updated for version 7.3.1282
Bram Moolenaar <bram@vim.org>
parents:
5068
diff
changeset
|
3877 if ((wp->w_p_cul || wp->w_p_rnu) |
| 4065 | 3878 && 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
|
3879 char_attr = HL_ATTR(HLF_CLN); |
| 743 | 3880 #endif |
| 7 | 3881 } |
| 3882 } | |
| 3883 | |
| 5995 | 3884 #ifdef FEAT_LINEBREAK |
| 3885 if (wp->w_p_brisbr && draw_state == WL_BRI - 1 | |
| 3886 && n_extra == 0 && *p_sbr != NUL) | |
| 3887 /* draw indent after showbreak value */ | |
| 3888 draw_state = WL_BRI; | |
| 3889 else if (wp->w_p_brisbr && draw_state == WL_SBR && n_extra == 0) | |
| 3890 /* After the showbreak, draw the breakindent */ | |
| 3891 draw_state = WL_BRI - 1; | |
| 3892 | |
| 3893 /* draw 'breakindent': indent wrapped text accordingly */ | |
| 3894 if (draw_state == WL_BRI - 1 && n_extra == 0) | |
| 3895 { | |
| 3896 draw_state = WL_BRI; | |
|
10392
957a1d560bda
commit https://github.com/vim/vim/commit/6c896867c4f5d759616028ef7cbfce2a9ed32600
Christian Brabandt <cb@256bit.org>
parents:
10349
diff
changeset
|
3897 /* 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
|
3898 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
|
3899 && (row != startrow || need_showbreak) |
| 5995 | 3900 # ifdef FEAT_DIFF |
| 3901 && filler_lines == 0 | |
| 6834 | 3902 # endif |
| 5995 | 3903 ) |
| 3904 { | |
|
10392
957a1d560bda
commit https://github.com/vim/vim/commit/6c896867c4f5d759616028ef7cbfce2a9ed32600
Christian Brabandt <cb@256bit.org>
parents:
10349
diff
changeset
|
3905 char_attr = 0; |
| 6834 | 3906 # ifdef FEAT_DIFF |
| 5995 | 3907 if (diff_hlf != (hlf_T)0) |
| 6106 | 3908 { |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
3909 char_attr = HL_ATTR(diff_hlf); |
| 6834 | 3910 # ifdef FEAT_SYN_HL |
| 6106 | 3911 if (wp->w_p_cul && lnum == wp->w_cursor.lnum) |
| 3912 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
|
3913 HL_ATTR(HLF_CUL)); |
| 6834 | 3914 # endif |
| 6106 | 3915 } |
| 6834 | 3916 # endif |
| 6028 | 3917 p_extra = NULL; |
| 5995 | 3918 c_extra = ' '; |
| 3919 n_extra = get_breakindent_win(wp, | |
| 3920 ml_get_buf(wp->w_buffer, lnum, FALSE)); | |
| 3921 /* Correct end of highlighted area for 'breakindent', | |
| 3922 * required when 'linebreak' is also set. */ | |
| 3923 if (tocol == vcol) | |
| 3924 tocol += n_extra; | |
| 3925 } | |
| 3926 } | |
| 3927 #endif | |
| 3928 | |
| 7 | 3929 #if defined(FEAT_LINEBREAK) || defined(FEAT_DIFF) |
| 3930 if (draw_state == WL_SBR - 1 && n_extra == 0) | |
| 3931 { | |
| 3932 draw_state = WL_SBR; | |
| 3933 # ifdef FEAT_DIFF | |
| 3934 if (filler_todo > 0) | |
| 3935 { | |
| 3936 /* Draw "deleted" diff line(s). */ | |
| 3937 if (char2cells(fill_diff) > 1) | |
| 3938 c_extra = '-'; | |
| 3939 else | |
| 3940 c_extra = fill_diff; | |
| 3941 # ifdef FEAT_RIGHTLEFT | |
| 3942 if (wp->w_p_rl) | |
| 3943 n_extra = col + 1; | |
| 3944 else | |
| 3945 # endif | |
| 3946 n_extra = W_WIDTH(wp) - col; | |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
3947 char_attr = HL_ATTR(HLF_DED); |
| 7 | 3948 } |
| 3949 # endif | |
| 3950 # ifdef FEAT_LINEBREAK | |
| 3951 if (*p_sbr != NUL && need_showbreak) | |
| 3952 { | |
| 3953 /* Draw 'showbreak' at the start of each broken line. */ | |
| 3954 p_extra = p_sbr; | |
| 3955 c_extra = NUL; | |
| 3956 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
|
3957 char_attr = HL_ATTR(HLF_AT); |
| 7 | 3958 need_showbreak = FALSE; |
| 6503 | 3959 vcol_sbr = vcol + MB_CHARLEN(p_sbr); |
| 7 | 3960 /* Correct end of highlighted area for 'showbreak', |
| 3961 * required when 'linebreak' is also set. */ | |
| 3962 if (tocol == vcol) | |
| 3963 tocol += n_extra; | |
|
5068
6a7ae677d6a1
updated for version 7.3.1277
Bram Moolenaar <bram@vim.org>
parents:
4916
diff
changeset
|
3964 #ifdef FEAT_SYN_HL |
|
6a7ae677d6a1
updated for version 7.3.1277
Bram Moolenaar <bram@vim.org>
parents:
4916
diff
changeset
|
3965 /* combine 'showbreak' with 'cursorline' */ |
|
5078
22ac43fb6d30
updated for version 7.3.1282
Bram Moolenaar <bram@vim.org>
parents:
5068
diff
changeset
|
3966 if (wp->w_p_cul && lnum == wp->w_cursor.lnum) |
| 6106 | 3967 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
|
3968 HL_ATTR(HLF_CUL)); |
|
5068
6a7ae677d6a1
updated for version 7.3.1277
Bram Moolenaar <bram@vim.org>
parents:
4916
diff
changeset
|
3969 #endif |
| 7 | 3970 } |
| 3971 # endif | |
| 3972 } | |
| 3973 #endif | |
| 3974 | |
| 3975 if (draw_state == WL_LINE - 1 && n_extra == 0) | |
| 3976 { | |
| 3977 draw_state = WL_LINE; | |
| 3978 if (saved_n_extra) | |
| 3979 { | |
| 3980 /* Continue item from end of wrapped line. */ | |
| 3981 n_extra = saved_n_extra; | |
| 3982 c_extra = saved_c_extra; | |
| 3983 p_extra = saved_p_extra; | |
| 3984 char_attr = saved_char_attr; | |
| 3985 } | |
| 3986 else | |
| 3987 char_attr = 0; | |
| 3988 } | |
| 3989 } | |
| 3990 | |
| 3991 /* When still displaying '$' of change command, stop at cursor */ | |
| 3318 | 3992 if (dollar_vcol >= 0 && wp == curwin |
| 819 | 3993 && lnum == wp->w_cursor.lnum && vcol >= (long)wp->w_virtcol |
| 7 | 3994 #ifdef FEAT_DIFF |
| 3995 && filler_todo <= 0 | |
| 3996 #endif | |
| 3997 ) | |
| 3998 { | |
| 3999 SCREEN_LINE(screen_row, W_WINCOL(wp), col, -(int)W_WIDTH(wp), | |
| 4000 wp->w_p_rl); | |
| 819 | 4001 /* Pretend we have finished updating the window. Except when |
| 4002 * 'cursorcolumn' is set. */ | |
| 4003 #ifdef FEAT_SYN_HL | |
| 4004 if (wp->w_p_cuc) | |
| 4005 row = wp->w_cline_row + wp->w_cline_height; | |
| 4006 else | |
| 4007 #endif | |
| 4008 row = wp->w_height; | |
| 7 | 4009 break; |
| 4010 } | |
| 4011 | |
| 4012 if (draw_state == WL_LINE && area_highlighting) | |
| 4013 { | |
| 4014 /* handle Visual or match highlighting in this line */ | |
| 4015 if (vcol == fromcol | |
| 4016 #ifdef FEAT_MBYTE | |
| 4017 || (has_mbyte && vcol + 1 == fromcol && n_extra == 0 | |
| 4018 && (*mb_ptr2cells)(ptr) > 1) | |
| 4019 #endif | |
| 4020 || ((int)vcol_prev == fromcol_prev | |
| 1814 | 4021 && vcol_prev < vcol /* not at margin */ |
| 7 | 4022 && vcol < tocol)) |
| 4023 area_attr = attr; /* start highlighting */ | |
| 4024 else if (area_attr != 0 | |
| 4025 && (vcol == tocol | |
| 4026 || (noinvcur && (colnr_T)vcol == wp->w_virtcol))) | |
| 4027 area_attr = 0; /* stop highlighting */ | |
| 4028 | |
| 4029 #ifdef FEAT_SEARCH_EXTRA | |
| 4030 if (!n_extra) | |
| 4031 { | |
| 4032 /* | |
| 4033 * Check for start/end of search pattern match. | |
| 4034 * After end, check for start/end of next match. | |
| 4035 * When another match, have to check for start again. | |
| 4036 * Watch out for matching an empty string! | |
| 1326 | 4037 * Do this for 'search_hl' and the match list (ordered by |
| 4038 * priority). | |
| 7 | 4039 */ |
| 36 | 4040 v = (long)(ptr - line); |
| 1326 | 4041 cur = wp->w_match_head; |
| 4042 shl_flag = FALSE; | |
| 4043 while (cur != NULL || shl_flag == FALSE) | |
| 4044 { | |
| 4045 if (shl_flag == FALSE | |
| 4046 && ((cur != NULL | |
| 4047 && cur->priority > SEARCH_HL_PRIORITY) | |
| 4048 || cur == NULL)) | |
| 4049 { | |
| 4050 shl = &search_hl; | |
| 4051 shl_flag = TRUE; | |
| 4052 } | |
| 4053 else | |
| 4054 shl = &cur->hl; | |
| 5979 | 4055 if (cur != NULL) |
| 4056 cur->pos.cur = 0; | |
| 4057 pos_inprogress = TRUE; | |
| 4058 while (shl->rm.regprog != NULL | |
| 4059 || (cur != NULL && pos_inprogress)) | |
| 7 | 4060 { |
| 36 | 4061 if (shl->startcol != MAXCOL |
| 4062 && v >= (long)shl->startcol | |
| 4063 && v < (long)shl->endcol) | |
| 7 | 4064 { |
| 6430 | 4065 #ifdef FEAT_MBYTE |
| 4066 int tmp_col = v + MB_PTR2LEN(ptr); | |
| 4067 | |
| 4068 if (shl->endcol < tmp_col) | |
| 4069 shl->endcol = tmp_col; | |
| 4070 #endif | |
| 7 | 4071 shl->attr_cur = shl->attr; |
| 6947 | 4072 #ifdef FEAT_CONCEAL |
| 4073 if (cur != NULL && syn_name2id((char_u *)"Conceal") | |
| 4074 == cur->hlg_id) | |
| 4075 { | |
|
8907
5deb9e8f4292
commit https://github.com/vim/vim/commit/4d585022023b96f6507e8cae5ed8fc8d926f5140
Christian Brabandt <cb@256bit.org>
parents:
8872
diff
changeset
|
4076 has_match_conc = |
|
5deb9e8f4292
commit https://github.com/vim/vim/commit/4d585022023b96f6507e8cae5ed8fc8d926f5140
Christian Brabandt <cb@256bit.org>
parents:
8872
diff
changeset
|
4077 v == (long)shl->startcol ? 2 : 1; |
| 6947 | 4078 match_conc = cur->conceal_char; |
| 4079 } | |
| 4080 else | |
|
8907
5deb9e8f4292
commit https://github.com/vim/vim/commit/4d585022023b96f6507e8cae5ed8fc8d926f5140
Christian Brabandt <cb@256bit.org>
parents:
8872
diff
changeset
|
4081 has_match_conc = match_conc = 0; |
| 6947 | 4082 #endif |
| 7 | 4083 } |
| 6430 | 4084 else if (v == (long)shl->endcol) |
| 7 | 4085 { |
| 4086 shl->attr_cur = 0; | |
|
9992
3e3b0ce24b61
commit https://github.com/vim/vim/commit/e17bdffff78ebd6a4e3cff26754cc667557ea810
Christian Brabandt <cb@256bit.org>
parents:
9939
diff
changeset
|
4087 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
|
4088 shl == &search_hl ? NULL : cur); |
| 5979 | 4089 pos_inprogress = cur == NULL || cur->pos.cur == 0 |
| 6947 | 4090 ? FALSE : TRUE; |
| 7 | 4091 |
| 4092 /* Need to get the line again, a multi-line regexp | |
| 4093 * may have made it invalid. */ | |
| 4094 line = ml_get_buf(wp->w_buffer, lnum, FALSE); | |
| 4095 ptr = line + v; | |
| 4096 | |
| 4097 if (shl->lnum == lnum) | |
| 4098 { | |
| 36 | 4099 shl->startcol = shl->rm.startpos[0].col; |
| 7 | 4100 if (shl->rm.endpos[0].lnum == 0) |
| 36 | 4101 shl->endcol = shl->rm.endpos[0].col; |
| 7 | 4102 else |
| 36 | 4103 shl->endcol = MAXCOL; |
| 4104 | |
| 4105 if (shl->startcol == shl->endcol) | |
| 7 | 4106 { |
| 4107 /* highlight empty match, try again after | |
| 4108 * it */ | |
| 4109 #ifdef FEAT_MBYTE | |
| 4110 if (has_mbyte) | |
| 474 | 4111 shl->endcol += (*mb_ptr2len)(line |
| 36 | 4112 + shl->endcol); |
| 7 | 4113 else |
| 4114 #endif | |
| 36 | 4115 ++shl->endcol; |
| 7 | 4116 } |
| 4117 | |
| 4118 /* Loop to check if the match starts at the | |
| 4119 * current position */ | |
| 4120 continue; | |
| 4121 } | |
| 4122 } | |
| 4123 break; | |
| 4124 } | |
| 1326 | 4125 if (shl != &search_hl && cur != NULL) |
| 4126 cur = cur->next; | |
| 4127 } | |
| 4128 | |
| 4129 /* Use attributes from match with highest priority among | |
| 4130 * 'search_hl' and the match list. */ | |
| 4131 search_attr = search_hl.attr_cur; | |
| 4132 cur = wp->w_match_head; | |
| 4133 shl_flag = FALSE; | |
| 4134 while (cur != NULL || shl_flag == FALSE) | |
| 4135 { | |
| 4136 if (shl_flag == FALSE | |
| 4137 && ((cur != NULL | |
| 4138 && cur->priority > SEARCH_HL_PRIORITY) | |
| 4139 || cur == NULL)) | |
| 699 | 4140 { |
| 1326 | 4141 shl = &search_hl; |
| 4142 shl_flag = TRUE; | |
| 699 | 4143 } |
| 1326 | 4144 else |
| 4145 shl = &cur->hl; | |
| 4146 if (shl->attr_cur != 0) | |
| 4147 search_attr = shl->attr_cur; | |
| 4148 if (shl != &search_hl && cur != NULL) | |
| 4149 cur = cur->next; | |
| 4150 } | |
| 7 | 4151 } |
| 4152 #endif | |
| 4153 | |
| 4154 #ifdef FEAT_DIFF | |
| 674 | 4155 if (diff_hlf != (hlf_T)0) |
| 7 | 4156 { |
| 1295 | 4157 if (diff_hlf == HLF_CHD && ptr - line >= change_start |
| 4158 && n_extra == 0) | |
| 7 | 4159 diff_hlf = HLF_TXD; /* changed text */ |
| 1295 | 4160 if (diff_hlf == HLF_TXD && ptr - line > change_end |
| 4161 && n_extra == 0) | |
| 7 | 4162 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
|
4163 line_attr = HL_ATTR(diff_hlf); |
| 6106 | 4164 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
|
4165 line_attr = hl_combine_attr(line_attr, HL_ATTR(HLF_CUL)); |
| 674 | 4166 } |
| 4167 #endif | |
| 4168 | |
| 4169 /* Decide which of the highlight attributes to use. */ | |
| 4170 attr_pri = TRUE; | |
| 6717 | 4171 #ifdef LINE_ATTR |
| 674 | 4172 if (area_attr != 0) |
| 6717 | 4173 char_attr = hl_combine_attr(line_attr, area_attr); |
| 674 | 4174 else if (search_attr != 0) |
| 6717 | 4175 char_attr = hl_combine_attr(line_attr, search_attr); |
| 674 | 4176 /* Use line_attr when not in the Visual or 'incsearch' area |
| 4177 * (area_attr may be 0 when "noinvcur" is set). */ | |
| 4178 else if (line_attr != 0 && ((fromcol == -10 && tocol == MAXCOL) | |
| 1842 | 4179 || vcol < fromcol || vcol_prev < fromcol_prev |
| 4180 || vcol >= tocol)) | |
| 674 | 4181 char_attr = line_attr; |
| 6717 | 4182 #else |
| 4183 if (area_attr != 0) | |
| 4184 char_attr = area_attr; | |
| 4185 else if (search_attr != 0) | |
| 4186 char_attr = search_attr; | |
| 674 | 4187 #endif |
| 4188 else | |
| 4189 { | |
| 4190 attr_pri = FALSE; | |
| 4191 #ifdef FEAT_SYN_HL | |
| 4192 if (has_syntax) | |
| 4193 char_attr = syntax_attr; | |
| 4194 else | |
| 4195 #endif | |
| 4196 char_attr = 0; | |
| 4197 } | |
| 7 | 4198 } |
| 4199 | |
| 4200 /* | |
| 4201 * Get the next character to put on the screen. | |
| 4202 */ | |
| 4203 /* | |
| 1340 | 4204 * The "p_extra" points to the extra stuff that is inserted to |
| 4205 * represent special characters (non-printable stuff) and other | |
| 4206 * things. When all characters are the same, c_extra is used. | |
| 4207 * "p_extra" must end in a NUL to avoid mb_ptr2len() reads past | |
| 4208 * "p_extra[n_extra]". | |
| 7 | 4209 * For the '$' of the 'list' option, n_extra == 1, p_extra == "". |
| 4210 */ | |
| 4211 if (n_extra > 0) | |
| 4212 { | |
| 4213 if (c_extra != NUL) | |
| 4214 { | |
| 4215 c = c_extra; | |
| 4216 #ifdef FEAT_MBYTE | |
| 4217 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
|
4218 if (enc_utf8 && utf_char2len(c) > 1) |
| 7 | 4219 { |
| 4220 mb_utf8 = TRUE; | |
| 714 | 4221 u8cc[0] = 0; |
| 819 | 4222 c = 0xc0; |
| 7 | 4223 } |
| 4224 else | |
| 4225 mb_utf8 = FALSE; | |
| 4226 #endif | |
| 4227 } | |
| 4228 else | |
| 4229 { | |
| 4230 c = *p_extra; | |
| 4231 #ifdef FEAT_MBYTE | |
| 4232 if (has_mbyte) | |
| 4233 { | |
| 4234 mb_c = c; | |
| 4235 if (enc_utf8) | |
| 4236 { | |
| 4237 /* If the UTF-8 character is more than one byte: | |
| 4238 * 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
|
4239 mb_l = utfc_ptr2len(p_extra); |
| 7 | 4240 mb_utf8 = FALSE; |
| 4241 if (mb_l > n_extra) | |
| 4242 mb_l = 1; | |
| 4243 else if (mb_l > 1) | |
| 4244 { | |
| 714 | 4245 mb_c = utfc_ptr2char(p_extra, u8cc); |
| 7 | 4246 mb_utf8 = TRUE; |
| 819 | 4247 c = 0xc0; |
| 7 | 4248 } |
| 4249 } | |
| 4250 else | |
| 4251 { | |
| 4252 /* if this is a DBCS character, put it in "mb_c" */ | |
| 4253 mb_l = MB_BYTE2LEN(c); | |
| 4254 if (mb_l >= n_extra) | |
| 4255 mb_l = 1; | |
| 4256 else if (mb_l > 1) | |
| 4257 mb_c = (c << 8) + p_extra[1]; | |
| 4258 } | |
| 504 | 4259 if (mb_l == 0) /* at the NUL at end-of-line */ |
| 4260 mb_l = 1; | |
| 4261 | |
| 7 | 4262 /* If a double-width char doesn't fit display a '>' in the |
| 4263 * last column. */ | |
| 504 | 4264 if (( |
| 7 | 4265 # ifdef FEAT_RIGHTLEFT |
| 4266 wp->w_p_rl ? (col <= 0) : | |
| 4267 # endif | |
| 504 | 4268 (col >= W_WIDTH(wp) - 1)) |
| 7 | 4269 && (*mb_char2cells)(mb_c) == 2) |
| 4270 { | |
| 4271 c = '>'; | |
| 4272 mb_c = c; | |
| 4273 mb_l = 1; | |
| 4274 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
|
4275 multi_attr = HL_ATTR(HLF_AT); |
| 7 | 4276 /* put the pointer back to output the double-width |
| 4277 * character at the start of the next line. */ | |
| 4278 ++n_extra; | |
| 4279 --p_extra; | |
| 4280 } | |
| 4281 else | |
| 4282 { | |
| 4283 n_extra -= mb_l - 1; | |
| 4284 p_extra += mb_l - 1; | |
| 4285 } | |
| 4286 } | |
| 4287 #endif | |
| 4288 ++p_extra; | |
| 4289 } | |
| 4290 --n_extra; | |
| 4291 } | |
| 4292 else | |
| 4293 { | |
|
10986
62bcadce6c82
patch 8.0.0382: warning in tiny build for unused variable
Christian Brabandt <cb@256bit.org>
parents:
10982
diff
changeset
|
4294 #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
|
4295 int c0; |
|
10986
62bcadce6c82
patch 8.0.0382: warning in tiny build for unused variable
Christian Brabandt <cb@256bit.org>
parents:
10982
diff
changeset
|
4296 #endif |
|
10982
5e20c9f96cd5
patch 8.0.0380: with 'linebreak' double wide char wraps badly
Christian Brabandt <cb@256bit.org>
parents:
10928
diff
changeset
|
4297 |
| 6026 | 4298 if (p_extra_free != NULL) |
| 4299 { | |
| 4300 vim_free(p_extra_free); | |
| 4301 p_extra_free = NULL; | |
| 4302 } | |
| 7 | 4303 /* |
| 4304 * Get a character from the line itself. | |
| 4305 */ | |
|
10988
b5de553d6062
patch 8.0.0383: misplaced #ifdef
Christian Brabandt <cb@256bit.org>
parents:
10986
diff
changeset
|
4306 c = *ptr; |
|
10986
62bcadce6c82
patch 8.0.0382: warning in tiny build for unused variable
Christian Brabandt <cb@256bit.org>
parents:
10982
diff
changeset
|
4307 #ifdef FEAT_LINEBREAK |
|
10988
b5de553d6062
patch 8.0.0383: misplaced #ifdef
Christian Brabandt <cb@256bit.org>
parents:
10986
diff
changeset
|
4308 c0 = *ptr; |
|
10986
62bcadce6c82
patch 8.0.0382: warning in tiny build for unused variable
Christian Brabandt <cb@256bit.org>
parents:
10982
diff
changeset
|
4309 #endif |
| 7 | 4310 #ifdef FEAT_MBYTE |
| 4311 if (has_mbyte) | |
| 4312 { | |
| 4313 mb_c = c; | |
| 4314 if (enc_utf8) | |
| 4315 { | |
| 4316 /* If the UTF-8 character is more than one byte: Decode it | |
| 4317 * 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
|
4318 mb_l = utfc_ptr2len(ptr); |
| 7 | 4319 mb_utf8 = FALSE; |
| 4320 if (mb_l > 1) | |
| 4321 { | |
| 714 | 4322 mb_c = utfc_ptr2char(ptr, u8cc); |
| 7 | 4323 /* Overlong encoded ASCII or ASCII with composing char |
| 4324 * is displayed normally, except a NUL. */ | |
| 4325 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
|
4326 { |
|
62bcadce6c82
patch 8.0.0382: warning in tiny build for unused variable
Christian Brabandt <cb@256bit.org>
parents:
10982
diff
changeset
|
4327 c = mb_c; |
|
62bcadce6c82
patch 8.0.0382: warning in tiny build for unused variable
Christian Brabandt <cb@256bit.org>
parents:
10982
diff
changeset
|
4328 # ifdef FEAT_LINEBREAK |
|
62bcadce6c82
patch 8.0.0382: warning in tiny build for unused variable
Christian Brabandt <cb@256bit.org>
parents:
10982
diff
changeset
|
4329 c0 = mb_c; |
|
62bcadce6c82
patch 8.0.0382: warning in tiny build for unused variable
Christian Brabandt <cb@256bit.org>
parents:
10982
diff
changeset
|
4330 # endif |
|
62bcadce6c82
patch 8.0.0382: warning in tiny build for unused variable
Christian Brabandt <cb@256bit.org>
parents:
10982
diff
changeset
|
4331 } |
| 7 | 4332 mb_utf8 = TRUE; |
| 507 | 4333 |
| 4334 /* At start of the line we can have a composing char. | |
| 4335 * Draw it as a space with a composing char. */ | |
| 4336 if (utf_iscomposing(mb_c)) | |
| 4337 { | |
| 1326 | 4338 int i; |
| 4339 | |
| 714 | 4340 for (i = Screen_mco - 1; i > 0; --i) |
| 4341 u8cc[i] = u8cc[i - 1]; | |
| 4342 u8cc[0] = mb_c; | |
| 507 | 4343 mb_c = ' '; |
| 4344 } | |
| 7 | 4345 } |
| 4346 | |
| 4347 if ((mb_l == 1 && c >= 0x80) | |
| 4348 || (mb_l >= 1 && mb_c == 0) | |
| 4349 || (mb_l > 1 && (!vim_isprintc(mb_c) | |
| 1401 | 4350 # ifdef UNICODE16 |
| 4351 || mb_c >= 0x10000 | |
| 4352 # endif | |
| 4353 ))) | |
| 7 | 4354 { |
| 4355 /* | |
| 4356 * Illegal UTF-8 byte: display as <xx>. | |
| 4357 * Non-BMP character : display as ? or fullwidth ?. | |
| 4358 */ | |
| 1401 | 4359 # ifdef UNICODE16 |
| 7 | 4360 if (mb_c < 0x10000) |
| 1401 | 4361 # endif |
| 7 | 4362 { |
| 4363 transchar_hex(extra, mb_c); | |
| 714 | 4364 # ifdef FEAT_RIGHTLEFT |
| 7 | 4365 if (wp->w_p_rl) /* reverse */ |
| 4366 rl_mirror(extra); | |
| 714 | 4367 # endif |
| 7 | 4368 } |
| 1401 | 4369 # ifdef UNICODE16 |
| 7 | 4370 else if (utf_char2cells(mb_c) != 2) |
| 4371 STRCPY(extra, "?"); | |
| 4372 else | |
| 4373 /* 0xff1f in UTF-8: full-width '?' */ | |
| 4374 STRCPY(extra, "\357\274\237"); | |
| 1401 | 4375 # endif |
| 7 | 4376 |
| 4377 p_extra = extra; | |
| 4378 c = *p_extra; | |
| 4379 mb_c = mb_ptr2char_adv(&p_extra); | |
| 4380 mb_utf8 = (c >= 0x80); | |
| 4381 n_extra = (int)STRLEN(p_extra); | |
| 4382 c_extra = NUL; | |
| 4383 if (area_attr == 0 && search_attr == 0) | |
| 4384 { | |
| 4385 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
|
4386 extra_attr = HL_ATTR(HLF_8); |
| 7 | 4387 saved_attr2 = char_attr; /* save current attr */ |
| 4388 } | |
| 4389 } | |
| 4390 else if (mb_l == 0) /* at the NUL at end-of-line */ | |
| 4391 mb_l = 1; | |
| 4392 #ifdef FEAT_ARABIC | |
| 4393 else if (p_arshape && !p_tbidi && ARABIC_CHAR(mb_c)) | |
| 4394 { | |
| 4395 /* Do Arabic shaping. */ | |
| 714 | 4396 int pc, pc1, nc; |
| 4397 int pcc[MAX_MCO]; | |
| 7 | 4398 |
| 4399 /* The idea of what is the previous and next | |
| 4400 * character depends on 'rightleft'. */ | |
| 4401 if (wp->w_p_rl) | |
| 4402 { | |
| 4403 pc = prev_c; | |
| 4404 pc1 = prev_c1; | |
| 4405 nc = utf_ptr2char(ptr + mb_l); | |
| 714 | 4406 prev_c1 = u8cc[0]; |
| 7 | 4407 } |
| 4408 else | |
| 4409 { | |
| 714 | 4410 pc = utfc_ptr2char(ptr + mb_l, pcc); |
| 7 | 4411 nc = prev_c; |
| 714 | 4412 pc1 = pcc[0]; |
| 7 | 4413 } |
| 4414 prev_c = mb_c; | |
| 4415 | |
| 714 | 4416 mb_c = arabic_shape(mb_c, &c, &u8cc[0], pc, pc1, nc); |
| 7 | 4417 } |
| 4418 else | |
| 4419 prev_c = mb_c; | |
| 4420 #endif | |
| 4421 } | |
| 4422 else /* enc_dbcs */ | |
| 4423 { | |
| 4424 mb_l = MB_BYTE2LEN(c); | |
| 4425 if (mb_l == 0) /* at the NUL at end-of-line */ | |
| 4426 mb_l = 1; | |
| 4427 else if (mb_l > 1) | |
| 4428 { | |
| 4429 /* We assume a second byte below 32 is illegal. | |
| 4430 * Hopefully this is OK for all double-byte encodings! | |
| 4431 */ | |
| 4432 if (ptr[1] >= 32) | |
| 4433 mb_c = (c << 8) + ptr[1]; | |
| 4434 else | |
| 4435 { | |
| 4436 if (ptr[1] == NUL) | |
| 4437 { | |
| 4438 /* head byte at end of line */ | |
| 4439 mb_l = 1; | |
| 4440 transchar_nonprint(extra, c); | |
| 4441 } | |
| 4442 else | |
| 4443 { | |
| 4444 /* illegal tail byte */ | |
| 4445 mb_l = 2; | |
| 4446 STRCPY(extra, "XX"); | |
| 4447 } | |
| 4448 p_extra = extra; | |
| 4449 n_extra = (int)STRLEN(extra) - 1; | |
| 4450 c_extra = NUL; | |
| 4451 c = *p_extra++; | |
| 4452 if (area_attr == 0 && search_attr == 0) | |
| 4453 { | |
| 4454 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
|
4455 extra_attr = HL_ATTR(HLF_8); |
| 7 | 4456 saved_attr2 = char_attr; /* save current attr */ |
| 4457 } | |
| 4458 mb_c = c; | |
| 4459 } | |
| 4460 } | |
| 4461 } | |
| 4462 /* If a double-width char doesn't fit display a '>' in the | |
| 4463 * last column; the character is displayed at the start of the | |
| 4464 * next line. */ | |
| 4465 if (( | |
| 4466 # ifdef FEAT_RIGHTLEFT | |
| 4467 wp->w_p_rl ? (col <= 0) : | |
| 4468 # endif | |
| 4469 (col >= W_WIDTH(wp) - 1)) | |
| 4470 && (*mb_char2cells)(mb_c) == 2) | |
| 4471 { | |
| 4472 c = '>'; | |
| 4473 mb_c = c; | |
| 4474 mb_utf8 = FALSE; | |
| 4475 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
|
4476 multi_attr = HL_ATTR(HLF_AT); |
| 7 | 4477 /* Put pointer back so that the character will be |
| 4478 * displayed at the start of the next line. */ | |
| 4479 --ptr; | |
| 4480 } | |
| 4481 else if (*ptr != NUL) | |
| 4482 ptr += mb_l - 1; | |
| 4483 | |
| 4484 /* 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
|
4485 * a '<' in the first column. Don't do this for unprintable |
| 4352 | 4486 * 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
|
4487 if (n_skip > 0 && mb_l > 1 && n_extra == 0) |
| 7 | 4488 { |
| 4489 n_extra = 1; | |
| 3586 | 4490 c_extra = MB_FILLER_CHAR; |
| 7 | 4491 c = ' '; |
| 4492 if (area_attr == 0 && search_attr == 0) | |
| 4493 { | |
| 4494 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
|
4495 extra_attr = HL_ATTR(HLF_AT); |
| 7 | 4496 saved_attr2 = char_attr; /* save current attr */ |
| 4497 } | |
| 4498 mb_c = c; | |
| 4499 mb_utf8 = FALSE; | |
| 4500 mb_l = 1; | |
| 4501 } | |
| 4502 | |
| 4503 } | |
| 4504 #endif | |
| 4505 ++ptr; | |
| 4506 | |
| 4507 if (extra_check) | |
| 4508 { | |
| 743 | 4509 #ifdef FEAT_SPELL |
| 221 | 4510 int can_spell = TRUE; |
| 743 | 4511 #endif |
| 4512 | |
| 4513 #ifdef FEAT_SYN_HL | |
| 7 | 4514 /* Get syntax attribute, unless still at the start of the line |
| 4515 * (double-wide char that doesn't fit). */ | |
| 221 | 4516 v = (long)(ptr - line); |
| 4517 if (has_syntax && v > 0) | |
| 7 | 4518 { |
| 4519 /* Get the syntax attribute for the character. If there | |
| 4520 * is an error, disable syntax highlighting. */ | |
| 4521 save_did_emsg = did_emsg; | |
| 4522 did_emsg = FALSE; | |
| 4523 | |
| 221 | 4524 syntax_attr = get_syntax_attr((colnr_T)v - 1, |
| 743 | 4525 # ifdef FEAT_SPELL |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
4526 has_spell ? &can_spell : |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
4527 # endif |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
4528 NULL, FALSE); |
| 7 | 4529 |
| 4530 if (did_emsg) | |
| 482 | 4531 { |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
4532 wp->w_s->b_syn_error = TRUE; |
| 482 | 4533 has_syntax = FALSE; |
| 4534 } | |
| 7 | 4535 else |
| 4536 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
|
4537 #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
|
4538 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
|
4539 has_syntax = FALSE; |
|
998d2cf59caa
patch 8.0.0647: syntax highlighting can make cause a freeze
Christian Brabandt <cb@256bit.org>
parents:
11521
diff
changeset
|
4540 #endif |
| 7 | 4541 |
| 4542 /* Need to get the line again, a multi-line regexp may | |
| 4543 * have made it invalid. */ | |
| 4544 line = ml_get_buf(wp->w_buffer, lnum, FALSE); | |
| 4545 ptr = line + v; | |
| 4546 | |
| 674 | 4547 if (!attr_pri) |
| 7 | 4548 char_attr = syntax_attr; |
| 301 | 4549 else |
| 303 | 4550 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
|
4551 # 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
|
4552 /* 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
|
4553 * 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
|
4554 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
|
4555 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
|
4556 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
|
4557 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
|
4558 # endif |
| 7 | 4559 } |
| 743 | 4560 #endif |
| 4561 | |
| 4562 #ifdef FEAT_SPELL | |
| 301 | 4563 /* Check spelling (unless at the end of the line). |
| 319 | 4564 * Only do this when there is no syntax highlighting, the |
| 4565 * @Spell cluster is not used or the current syntax item | |
| 4566 * contains the @Spell cluster. */ | |
| 348 | 4567 if (has_spell && v >= word_end && v > cur_checked_col) |
| 221 | 4568 { |
| 230 | 4569 spell_attr = 0; |
| 743 | 4570 # ifdef FEAT_SYN_HL |
| 674 | 4571 if (!attr_pri) |
| 230 | 4572 char_attr = syntax_attr; |
| 743 | 4573 # endif |
| 4574 if (c != 0 && ( | |
| 4575 # ifdef FEAT_SYN_HL | |
| 4576 !has_syntax || | |
| 4577 # endif | |
| 4578 can_spell)) | |
| 221 | 4579 { |
| 348 | 4580 char_u *prev_ptr, *p; |
| 4581 int len; | |
| 534 | 4582 hlf_T spell_hlf = HLF_COUNT; |
| 221 | 4583 # ifdef FEAT_MBYTE |
| 336 | 4584 if (has_mbyte) |
| 4585 { | |
| 4586 prev_ptr = ptr - mb_l; | |
| 4587 v -= mb_l - 1; | |
| 4588 } | |
| 4589 else | |
| 221 | 4590 # endif |
| 336 | 4591 prev_ptr = ptr - 1; |
| 348 | 4592 |
| 4593 /* Use nextline[] if possible, it has the start of the | |
| 4594 * next line concatenated. */ | |
| 4595 if ((prev_ptr - line) - nextlinecol >= 0) | |
| 4596 p = nextline + (prev_ptr - line) - nextlinecol; | |
| 4597 else | |
| 4598 p = prev_ptr; | |
| 835 | 4599 cap_col -= (int)(prev_ptr - line); |
| 625 | 4600 len = spell_check(wp, p, &spell_hlf, &cap_col, |
| 4601 nochange); | |
| 348 | 4602 word_end = v + len; |
| 301 | 4603 |
| 4604 /* In Insert mode only highlight a word that | |
| 4605 * doesn't touch the cursor. */ | |
| 534 | 4606 if (spell_hlf != HLF_COUNT |
| 301 | 4607 && (State & INSERT) != 0 |
| 4608 && wp->w_cursor.lnum == lnum | |
| 4609 && wp->w_cursor.col >= | |
| 4610 (colnr_T)(prev_ptr - line) | |
| 4611 && wp->w_cursor.col < (colnr_T)word_end) | |
| 221 | 4612 { |
| 534 | 4613 spell_hlf = HLF_COUNT; |
| 301 | 4614 spell_redraw_lnum = lnum; |
| 221 | 4615 } |
| 348 | 4616 |
| 534 | 4617 if (spell_hlf == HLF_COUNT && p != prev_ptr |
| 348 | 4618 && (p - nextline) + len > nextline_idx) |
| 4619 { | |
| 4620 /* Remember that the good word continues at the | |
| 4621 * start of the next line. */ | |
| 4622 checked_lnum = lnum + 1; | |
| 835 | 4623 checked_col = (int)((p - nextline) + len - nextline_idx); |
| 348 | 4624 } |
| 386 | 4625 |
| 534 | 4626 /* Turn index into actual attributes. */ |
| 4627 if (spell_hlf != HLF_COUNT) | |
| 4628 spell_attr = highlight_attr[spell_hlf]; | |
| 4629 | |
| 386 | 4630 if (cap_col > 0) |
| 4631 { | |
| 4632 if (p != prev_ptr | |
| 4633 && (p - nextline) + cap_col >= nextline_idx) | |
| 4634 { | |
| 4635 /* Remember that the word in the next line | |
| 4636 * must start with a capital. */ | |
| 4637 capcol_lnum = lnum + 1; | |
| 835 | 4638 cap_col = (int)((p - nextline) + cap_col |
| 4639 - nextline_idx); | |
| 386 | 4640 } |
| 4641 else | |
| 4642 /* Compute the actual column. */ | |
| 835 | 4643 cap_col += (int)(prev_ptr - line); |
| 386 | 4644 } |
| 221 | 4645 } |
| 4646 } | |
| 4647 if (spell_attr != 0) | |
| 348 | 4648 { |
| 674 | 4649 if (!attr_pri) |
| 348 | 4650 char_attr = hl_combine_attr(char_attr, spell_attr); |
| 4651 else | |
| 4652 char_attr = hl_combine_attr(spell_attr, char_attr); | |
| 4653 } | |
| 7 | 4654 #endif |
| 4655 #ifdef FEAT_LINEBREAK | |
| 4656 /* | |
| 221 | 4657 * Found last space before word: check for line break. |
| 7 | 4658 */ |
|
10982
5e20c9f96cd5
patch 8.0.0380: with 'linebreak' double wide char wraps badly
Christian Brabandt <cb@256bit.org>
parents:
10928
diff
changeset
|
4659 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
|
4660 && VIM_ISBREAK(c) && !VIM_ISBREAK((int)*ptr)) |
| 7 | 4661 { |
| 6681 | 4662 # ifdef FEAT_MBYTE |
| 6693 | 4663 int mb_off = has_mbyte ? (*mb_head_off)(line, ptr - 1) : 0; |
| 6681 | 4664 # endif |
| 5995 | 4665 char_u *p = ptr - ( |
| 7 | 4666 # ifdef FEAT_MBYTE |
| 6693 | 4667 mb_off + |
| 7 | 4668 # endif |
| 5995 | 4669 1); |
| 6681 | 4670 |
| 5995 | 4671 /* TODO: is passing p for start of the line OK? */ |
| 6026 | 4672 n_extra = win_lbr_chartabsize(wp, line, p, (colnr_T)vcol, |
| 5995 | 4673 NULL) - 1; |
| 6371 | 4674 if (c == TAB && n_extra + col > W_WIDTH(wp)) |
| 4675 n_extra = (int)wp->w_buffer->b_p_ts | |
| 4676 - vcol % (int)wp->w_buffer->b_p_ts - 1; | |
| 4677 | |
| 6681 | 4678 # ifdef FEAT_MBYTE |
| 6693 | 4679 c_extra = mb_off > 0 ? MB_FILLER_CHAR : ' '; |
| 6681 | 4680 # else |
| 7 | 4681 c_extra = ' '; |
| 6681 | 4682 # endif |
|
11129
f4ea50924c6d
patch 8.0.0452: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11127
diff
changeset
|
4683 if (VIM_ISWHITE(c)) |
|
5174
42d592dbbec3
updated for version 7.4a.013
Bram Moolenaar <bram@vim.org>
parents:
5126
diff
changeset
|
4684 { |
|
42d592dbbec3
updated for version 7.4a.013
Bram Moolenaar <bram@vim.org>
parents:
5126
diff
changeset
|
4685 #ifdef FEAT_CONCEAL |
|
42d592dbbec3
updated for version 7.4a.013
Bram Moolenaar <bram@vim.org>
parents:
5126
diff
changeset
|
4686 if (c == TAB) |
|
42d592dbbec3
updated for version 7.4a.013
Bram Moolenaar <bram@vim.org>
parents:
5126
diff
changeset
|
4687 /* See "Tab alignment" below. */ |
|
42d592dbbec3
updated for version 7.4a.013
Bram Moolenaar <bram@vim.org>
parents:
5126
diff
changeset
|
4688 FIX_FOR_BOGUSCOLS; |
|
42d592dbbec3
updated for version 7.4a.013
Bram Moolenaar <bram@vim.org>
parents:
5126
diff
changeset
|
4689 #endif |
| 6026 | 4690 if (!wp->w_p_list) |
| 4691 c = ' '; | |
|
5174
42d592dbbec3
updated for version 7.4a.013
Bram Moolenaar <bram@vim.org>
parents:
5126
diff
changeset
|
4692 } |
| 7 | 4693 } |
| 4694 #endif | |
| 4695 | |
|
7344
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
4696 /* '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
|
4697 */ |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
4698 if (wp->w_p_list |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
4699 && (((c == 160 |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
4700 #ifdef FEAT_MBYTE |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
4701 || (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
|
4702 #endif |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
4703 ) && lcs_nbsp) |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
4704 || (c == ' ' && lcs_space && ptr - line <= trailcol))) |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
4705 { |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
4706 c = (c == ' ') ? lcs_space : lcs_nbsp; |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
4707 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
|
4708 { |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
4709 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
|
4710 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
|
4711 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
|
4712 } |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
4713 #ifdef FEAT_MBYTE |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
4714 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
|
4715 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
|
4716 { |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
4717 mb_utf8 = TRUE; |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
4718 u8cc[0] = 0; |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
4719 c = 0xc0; |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
4720 } |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
4721 else |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
4722 mb_utf8 = FALSE; |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
4723 #endif |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
4724 } |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
4725 |
| 7 | 4726 if (trailcol != MAXCOL && ptr > line + trailcol && c == ' ') |
| 4727 { | |
| 4728 c = lcs_trail; | |
| 674 | 4729 if (!attr_pri) |
| 7 | 4730 { |
| 4731 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
|
4732 extra_attr = HL_ATTR(HLF_8); |
| 7 | 4733 saved_attr2 = char_attr; /* save current attr */ |
| 4734 } | |
| 4735 #ifdef FEAT_MBYTE | |
| 4736 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
|
4737 if (enc_utf8 && utf_char2len(c) > 1) |
| 7 | 4738 { |
| 4739 mb_utf8 = TRUE; | |
| 714 | 4740 u8cc[0] = 0; |
| 819 | 4741 c = 0xc0; |
| 7 | 4742 } |
| 4743 else | |
| 4744 mb_utf8 = FALSE; | |
| 4745 #endif | |
| 4746 } | |
| 4747 } | |
| 4748 | |
| 4749 /* | |
| 4750 * Handling of non-printable characters. | |
| 4751 */ | |
|
7697
f04e2b6feea2
commit https://github.com/vim/vim/commit/88e8f9f14434a7cd538d0c159dc432bea869a5bd
Christian Brabandt <cb@256bit.org>
parents:
7603
diff
changeset
|
4752 if (!vim_isprintc(c)) |
| 7 | 4753 { |
| 4754 /* | |
| 4755 * when getting a character from the file, we may have to | |
| 4756 * turn it into something else on the way to putting it | |
| 4757 * into "ScreenLines". | |
| 4758 */ | |
| 4759 if (c == TAB && (!wp->w_p_list || lcs_tab1)) | |
| 4760 { | |
| 6026 | 4761 int tab_len = 0; |
| 6503 | 4762 long vcol_adjusted = vcol; /* removed showbreak length */ |
| 4763 #ifdef FEAT_LINEBREAK | |
| 4764 /* only adjust the tab_len, when at the first column | |
| 4765 * after the showbreak value was drawn */ | |
| 4766 if (*p_sbr != NUL && vcol == vcol_sbr && wp->w_p_wrap) | |
| 4767 vcol_adjusted = vcol - MB_CHARLEN(p_sbr); | |
| 4768 #endif | |
| 7 | 4769 /* tab amount depends on current column */ |
| 6026 | 4770 tab_len = (int)wp->w_buffer->b_p_ts |
| 6503 | 4771 - vcol_adjusted % (int)wp->w_buffer->b_p_ts - 1; |
| 4772 | |
| 6026 | 4773 #ifdef FEAT_LINEBREAK |
| 6100 | 4774 if (!wp->w_p_lbr || !wp->w_p_list) |
| 6026 | 4775 #endif |
| 4776 /* tab amount depends on current column */ | |
| 4777 n_extra = tab_len; | |
| 4778 #ifdef FEAT_LINEBREAK | |
| 4779 else | |
| 4780 { | |
| 4781 char_u *p; | |
| 4782 int len = n_extra; | |
| 4783 int i; | |
| 4784 int saved_nextra = n_extra; | |
| 4785 | |
| 6172 | 4786 #ifdef FEAT_CONCEAL |
| 6627 | 4787 if (vcol_off > 0) |
| 6172 | 4788 /* there are characters to conceal */ |
| 4789 tab_len += vcol_off; | |
| 6520 | 4790 /* boguscols before FIX_FOR_BOGUSCOLS macro from above |
| 4791 */ | |
| 4792 if (wp->w_p_list && lcs_tab1 && old_boguscols > 0 | |
| 4793 && n_extra > tab_len) | |
| 4794 tab_len += n_extra - tab_len; | |
| 4795 #endif | |
| 4796 | |
| 6026 | 4797 /* if n_extra > 0, it gives the number of chars, to |
| 4798 * use for a tab, else we need to calculate the width | |
| 4799 * for a tab */ | |
| 4800 #ifdef FEAT_MBYTE | |
| 4801 len = (tab_len * mb_char2len(lcs_tab2)); | |
| 4802 if (n_extra > 0) | |
| 4803 len += n_extra - tab_len; | |
| 4804 #endif | |
| 4805 c = lcs_tab1; | |
| 4806 p = alloc((unsigned)(len + 1)); | |
| 4807 vim_memset(p, ' ', len); | |
| 4808 p[len] = NUL; | |
|
10690
206ab11fa76e
patch 8.0.0235: memory leak in diff mode
Christian Brabandt <cb@256bit.org>
parents:
10538
diff
changeset
|
4809 vim_free(p_extra_free); |
| 6026 | 4810 p_extra_free = p; |
| 4811 for (i = 0; i < tab_len; i++) | |
| 4812 { | |
| 4813 #ifdef FEAT_MBYTE | |
| 4814 mb_char2bytes(lcs_tab2, p); | |
| 4815 p += mb_char2len(lcs_tab2); | |
| 4816 n_extra += mb_char2len(lcs_tab2) | |
| 4817 - (saved_nextra > 0 ? 1 : 0); | |
| 4818 #else | |
| 4819 p[i] = lcs_tab2; | |
| 4820 #endif | |
| 4821 } | |
| 4822 p_extra = p_extra_free; | |
| 6172 | 4823 #ifdef FEAT_CONCEAL |
| 4824 /* n_extra will be increased by FIX_FOX_BOGUSCOLS | |
| 4825 * macro below, so need to adjust for that here */ | |
| 6627 | 4826 if (vcol_off > 0) |
| 6172 | 4827 n_extra -= vcol_off; |
| 4828 #endif | |
| 6026 | 4829 } |
| 4830 #endif | |
| 3984 | 4831 #ifdef FEAT_CONCEAL |
| 6627 | 4832 { |
| 4833 int vc_saved = vcol_off; | |
| 4834 | |
| 4835 /* Tab alignment should be identical regardless of | |
| 4836 * 'conceallevel' value. So tab compensates of all | |
| 4837 * previous concealed characters, and thus resets | |
| 4838 * vcol_off and boguscols accumulated so far in the | |
| 4839 * line. Note that the tab can be longer than | |
| 4840 * 'tabstop' when there are concealed characters. */ | |
| 4841 FIX_FOR_BOGUSCOLS; | |
| 4842 | |
| 4843 /* Make sure, the highlighting for the tab char will be | |
| 4844 * correctly set further below (effectively reverts the | |
| 4845 * FIX_FOR_BOGSUCOLS macro */ | |
| 4846 if (n_extra == tab_len + vc_saved && wp->w_p_list | |
| 6520 | 4847 && lcs_tab1) |
| 6627 | 4848 tab_len += vc_saved; |
| 4849 } | |
| 3984 | 4850 #endif |
| 7 | 4851 #ifdef FEAT_MBYTE |
| 4852 mb_utf8 = FALSE; /* don't draw as UTF-8 */ | |
| 4853 #endif | |
| 4854 if (wp->w_p_list) | |
| 4855 { | |
| 4856 c = lcs_tab1; | |
| 6026 | 4857 #ifdef FEAT_LINEBREAK |
| 4858 if (wp->w_p_lbr) | |
| 4859 c_extra = NUL; /* using p_extra from above */ | |
| 4860 else | |
| 4861 #endif | |
| 4862 c_extra = lcs_tab2; | |
| 4863 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
|
4864 extra_attr = HL_ATTR(HLF_8); |
| 7 | 4865 saved_attr2 = char_attr; /* save current attr */ |
| 4866 #ifdef FEAT_MBYTE | |
| 4867 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
|
4868 if (enc_utf8 && utf_char2len(c) > 1) |
| 7 | 4869 { |
| 4870 mb_utf8 = TRUE; | |
| 714 | 4871 u8cc[0] = 0; |
| 819 | 4872 c = 0xc0; |
| 7 | 4873 } |
| 4874 #endif | |
| 4875 } | |
| 4876 else | |
| 4877 { | |
| 4878 c_extra = ' '; | |
| 4879 c = ' '; | |
| 4880 } | |
| 4881 } | |
| 36 | 4882 else if (c == NUL |
| 6799 | 4883 && (wp->w_p_list |
| 36 | 4884 || ((fromcol >= 0 || fromcol_prev >= 0) |
| 4885 && tocol > vcol | |
| 4886 && VIsual_mode != Ctrl_V | |
| 4887 && ( | |
| 4888 # ifdef FEAT_RIGHTLEFT | |
| 4889 wp->w_p_rl ? (col >= 0) : | |
| 4890 # endif | |
| 4891 (col < W_WIDTH(wp))) | |
| 4892 && !(noinvcur | |
| 1850 | 4893 && lnum == wp->w_cursor.lnum |
| 36 | 4894 && (colnr_T)vcol == wp->w_virtcol))) |
| 6815 | 4895 && lcs_eol_one > 0) |
| 7 | 4896 { |
| 36 | 4897 /* Display a '$' after the line or highlight an extra |
| 4898 * character if the line break is included. */ | |
| 7 | 4899 #if defined(FEAT_DIFF) || defined(LINE_ATTR) |
| 4900 /* For a diff line the highlighting continues after the | |
| 4901 * "$". */ | |
| 4902 if ( | |
| 4903 # ifdef FEAT_DIFF | |
| 534 | 4904 diff_hlf == (hlf_T)0 |
| 7 | 4905 # ifdef LINE_ATTR |
| 4906 && | |
| 4907 # endif | |
| 4908 # endif | |
| 4909 # ifdef LINE_ATTR | |
| 4910 line_attr == 0 | |
| 4911 # endif | |
| 4912 ) | |
| 4913 #endif | |
| 4914 { | |
| 4915 #ifdef FEAT_VIRTUALEDIT | |
| 4916 /* In virtualedit, visual selections may extend | |
| 4917 * beyond end of line. */ | |
| 4918 if (area_highlighting && virtual_active() | |
| 4919 && tocol != MAXCOL && vcol < tocol) | |
| 4920 n_extra = 0; | |
| 4921 else | |
| 4922 #endif | |
| 4923 { | |
| 4924 p_extra = at_end_str; | |
| 4925 n_extra = 1; | |
| 4926 c_extra = NUL; | |
| 4927 } | |
| 4928 } | |
| 6799 | 4929 if (wp->w_p_list && lcs_eol > 0) |
| 36 | 4930 c = lcs_eol; |
| 4931 else | |
| 4932 c = ' '; | |
| 7 | 4933 lcs_eol_one = -1; |
| 4934 --ptr; /* put it back at the NUL */ | |
| 674 | 4935 if (!attr_pri) |
| 7 | 4936 { |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
4937 extra_attr = HL_ATTR(HLF_AT); |
| 7 | 4938 n_attr = 1; |
| 4939 } | |
| 4940 #ifdef FEAT_MBYTE | |
| 4941 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
|
4942 if (enc_utf8 && utf_char2len(c) > 1) |
| 7 | 4943 { |
| 4944 mb_utf8 = TRUE; | |
| 714 | 4945 u8cc[0] = 0; |
| 819 | 4946 c = 0xc0; |
| 7 | 4947 } |
| 4948 else | |
| 4949 mb_utf8 = FALSE; /* don't draw as UTF-8 */ | |
| 4950 #endif | |
| 4951 } | |
| 4952 else if (c != NUL) | |
| 4953 { | |
| 4954 p_extra = transchar(c); | |
| 6064 | 4955 if (n_extra == 0) |
| 4956 n_extra = byte2cells(c) - 1; | |
| 7 | 4957 #ifdef FEAT_RIGHTLEFT |
| 4958 if ((dy_flags & DY_UHEX) && wp->w_p_rl) | |
| 4959 rl_mirror(p_extra); /* reverse "<12>" */ | |
| 4960 #endif | |
| 4961 c_extra = NUL; | |
| 6026 | 4962 #ifdef FEAT_LINEBREAK |
| 4963 if (wp->w_p_lbr) | |
| 4964 { | |
| 4965 char_u *p; | |
| 4966 | |
| 4967 c = *p_extra; | |
| 4968 p = alloc((unsigned)n_extra + 1); | |
| 4969 vim_memset(p, ' ', n_extra); | |
| 4970 STRNCPY(p, p_extra + 1, STRLEN(p_extra) - 1); | |
| 4971 p[n_extra] = NUL; | |
|
10690
206ab11fa76e
patch 8.0.0235: memory leak in diff mode
Christian Brabandt <cb@256bit.org>
parents:
10538
diff
changeset
|
4972 vim_free(p_extra_free); |
| 6026 | 4973 p_extra_free = p_extra = p; |
| 4974 } | |
| 4975 else | |
| 4976 #endif | |
| 4977 { | |
| 4978 n_extra = byte2cells(c) - 1; | |
| 4979 c = *p_extra++; | |
| 4980 } | |
| 674 | 4981 if (!attr_pri) |
| 7 | 4982 { |
| 4983 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
|
4984 extra_attr = HL_ATTR(HLF_8); |
| 7 | 4985 saved_attr2 = char_attr; /* save current attr */ |
| 4986 } | |
| 4987 #ifdef FEAT_MBYTE | |
| 4988 mb_utf8 = FALSE; /* don't draw as UTF-8 */ | |
| 4989 #endif | |
| 4990 } | |
| 4991 #ifdef FEAT_VIRTUALEDIT | |
| 4992 else if (VIsual_active | |
| 4993 && (VIsual_mode == Ctrl_V | |
| 4994 || VIsual_mode == 'v') | |
| 4995 && virtual_active() | |
| 4996 && tocol != MAXCOL | |
| 4997 && vcol < tocol | |
| 4998 && ( | |
| 4999 # ifdef FEAT_RIGHTLEFT | |
| 5000 wp->w_p_rl ? (col >= 0) : | |
| 5001 # endif | |
| 5002 (col < W_WIDTH(wp)))) | |
| 5003 { | |
| 5004 c = ' '; | |
| 5005 --ptr; /* put it back at the NUL */ | |
| 5006 } | |
| 5007 #endif | |
| 910 | 5008 #if defined(LINE_ATTR) |
| 7 | 5009 else if (( |
| 5010 # ifdef FEAT_DIFF | |
| 910 | 5011 diff_hlf != (hlf_T)0 || |
| 7 | 5012 # endif |
| 5013 line_attr != 0 | |
| 5014 ) && ( | |
| 5015 # ifdef FEAT_RIGHTLEFT | |
| 5016 wp->w_p_rl ? (col >= 0) : | |
| 5017 # endif | |
|
2553
37d3f90f5203
Conceal feature caused the 'cursorline' highlighting to stop early.
Bram Moolenaar <bram@vim.org>
parents:
2520
diff
changeset
|
5018 (col |
|
37d3f90f5203
Conceal feature caused the 'cursorline' highlighting to stop early.
Bram Moolenaar <bram@vim.org>
parents:
2520
diff
changeset
|
5019 # ifdef FEAT_CONCEAL |
|
37d3f90f5203
Conceal feature caused the 'cursorline' highlighting to stop early.
Bram Moolenaar <bram@vim.org>
parents:
2520
diff
changeset
|
5020 - boguscols |
|
37d3f90f5203
Conceal feature caused the 'cursorline' highlighting to stop early.
Bram Moolenaar <bram@vim.org>
parents:
2520
diff
changeset
|
5021 # endif |
|
37d3f90f5203
Conceal feature caused the 'cursorline' highlighting to stop early.
Bram Moolenaar <bram@vim.org>
parents:
2520
diff
changeset
|
5022 < W_WIDTH(wp)))) |
| 7 | 5023 { |
| 5024 /* Highlight until the right side of the window */ | |
| 5025 c = ' '; | |
| 5026 --ptr; /* put it back at the NUL */ | |
| 867 | 5027 |
| 5028 /* Remember we do the char for line highlighting. */ | |
| 5029 ++did_line_attr; | |
| 5030 | |
| 5031 /* don't do search HL for the rest of the line */ | |
| 5032 if (line_attr != 0 && char_attr == search_attr && col > 0) | |
| 5033 char_attr = line_attr; | |
| 7 | 5034 # ifdef FEAT_DIFF |
| 5035 if (diff_hlf == HLF_TXD) | |
| 5036 { | |
| 5037 diff_hlf = HLF_CHD; | |
| 5038 if (attr == 0 || char_attr != attr) | |
| 6106 | 5039 { |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
5040 char_attr = HL_ATTR(diff_hlf); |
| 6106 | 5041 if (wp->w_p_cul && lnum == wp->w_cursor.lnum) |
| 5042 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
|
5043 HL_ATTR(HLF_CUL)); |
| 6106 | 5044 } |
| 7 | 5045 } |
| 5046 # endif | |
| 5047 } | |
| 5048 #endif | |
| 5049 } | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5050 |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5051 #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
|
5052 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
|
5053 && (wp != curwin || lnum != wp->w_cursor.lnum || |
| 6947 | 5054 conceal_cursor_line(wp) ) |
|
8907
5deb9e8f4292
commit https://github.com/vim/vim/commit/4d585022023b96f6507e8cae5ed8fc8d926f5140
Christian Brabandt <cb@256bit.org>
parents:
8872
diff
changeset
|
5055 && ( (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
|
5056 && !(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
|
5057 && 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
|
5058 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5059 char_attr = conceal_attr; |
|
8907
5deb9e8f4292
commit https://github.com/vim/vim/commit/4d585022023b96f6507e8cae5ed8fc8d926f5140
Christian Brabandt <cb@256bit.org>
parents:
8872
diff
changeset
|
5060 if ((prev_syntax_id != syntax_seqnr || has_match_conc > 1) |
| 6947 | 5061 && (syn_get_sub_char() != NUL || match_conc |
| 5062 || 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
|
5063 && 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
|
5064 { |
|
a96dd77ce213
For conceal mode: when two different syntax items follow each other, show the
Bram Moolenaar <bram@vim.org>
parents:
2364
diff
changeset
|
5065 /* 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
|
5066 * character. */ |
| 6947 | 5067 if (match_conc) |
| 5068 c = match_conc; | |
| 5069 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
|
5070 c = syn_get_sub_char(); |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5071 else if (lcs_conceal != NUL) |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5072 c = lcs_conceal; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5073 else |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5074 c = ' '; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5075 |
|
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
|
5076 prev_syntax_id = syntax_seqnr; |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5077 |
|
2332
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
5078 if (n_extra > 0) |
|
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
5079 vcol_off += n_extra; |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5080 vcol += n_extra; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5081 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
|
5082 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5083 # ifdef FEAT_RIGHTLEFT |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5084 if (wp->w_p_rl) |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5085 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5086 col -= n_extra; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5087 boguscols -= n_extra; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5088 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5089 else |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5090 # endif |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5091 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5092 boguscols += n_extra; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5093 col += n_extra; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5094 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5095 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5096 n_extra = 0; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5097 n_attr = 0; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5098 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5099 else if (n_skip == 0) |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5100 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5101 is_concealing = TRUE; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5102 n_skip = 1; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5103 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5104 # ifdef FEAT_MBYTE |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5105 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
|
5106 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
|
5107 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5108 mb_utf8 = TRUE; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5109 u8cc[0] = 0; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5110 c = 0xc0; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5111 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5112 else |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5113 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
|
5114 # endif |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5115 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5116 else |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5117 { |
|
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 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
|
5119 is_concealing = FALSE; |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5120 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5121 #endif /* FEAT_CONCEAL */ |
| 7 | 5122 } |
| 5123 | |
|
2378
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
5124 #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
|
5125 /* 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
|
5126 * 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
|
5127 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
|
5128 && 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
|
5129 && 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
|
5130 && (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
|
5131 { |
|
7603
d3892f6c917e
commit https://github.com/vim/vim/commit/e39b3d9fb4e4006684c33847d1ef6a0d742699dd
Christian Brabandt <cb@256bit.org>
parents:
7344
diff
changeset
|
5132 # ifdef FEAT_RIGHTLEFT |
|
d3892f6c917e
commit https://github.com/vim/vim/commit/e39b3d9fb4e4006684c33847d1ef6a0d742699dd
Christian Brabandt <cb@256bit.org>
parents:
7344
diff
changeset
|
5133 if (wp->w_p_rl) |
|
d3892f6c917e
commit https://github.com/vim/vim/commit/e39b3d9fb4e4006684c33847d1ef6a0d742699dd
Christian Brabandt <cb@256bit.org>
parents:
7344
diff
changeset
|
5134 wp->w_wcol = W_WIDTH(wp) - col + boguscols - 1; |
|
d3892f6c917e
commit https://github.com/vim/vim/commit/e39b3d9fb4e4006684c33847d1ef6a0d742699dd
Christian Brabandt <cb@256bit.org>
parents:
7344
diff
changeset
|
5135 else |
|
d3892f6c917e
commit https://github.com/vim/vim/commit/e39b3d9fb4e4006684c33847d1ef6a0d742699dd
Christian Brabandt <cb@256bit.org>
parents:
7344
diff
changeset
|
5136 # endif |
|
d3892f6c917e
commit https://github.com/vim/vim/commit/e39b3d9fb4e4006684c33847d1ef6a0d742699dd
Christian Brabandt <cb@256bit.org>
parents:
7344
diff
changeset
|
5137 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
|
5138 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
|
5139 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
|
5140 } |
|
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
5141 #endif |
|
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
5142 |
| 7 | 5143 /* Don't override visual selection highlighting. */ |
| 5144 if (n_attr > 0 | |
| 5145 && draw_state == WL_LINE | |
| 674 | 5146 && !attr_pri) |
| 7 | 5147 char_attr = extra_attr; |
| 5148 | |
| 42 | 5149 #if defined(FEAT_XIM) && defined(FEAT_GUI_GTK) |
| 7 | 5150 /* XIM don't send preedit_start and preedit_end, but they send |
| 5151 * preedit_changed and commit. Thus Vim can't set "im_is_active", use | |
| 5152 * im_is_preediting() here. */ | |
| 5153 if (xic != NULL | |
| 1850 | 5154 && lnum == wp->w_cursor.lnum |
| 7 | 5155 && (State & INSERT) |
| 5156 && !p_imdisable | |
| 5157 && im_is_preediting() | |
| 5158 && draw_state == WL_LINE) | |
| 5159 { | |
| 5160 colnr_T tcol; | |
| 5161 | |
| 5162 if (preedit_end_col == MAXCOL) | |
| 1850 | 5163 getvcol(curwin, &(wp->w_cursor), &tcol, NULL, NULL); |
| 7 | 5164 else |
| 5165 tcol = preedit_end_col; | |
| 5166 if ((long)preedit_start_col <= vcol && vcol < (long)tcol) | |
| 5167 { | |
| 5168 if (feedback_old_attr < 0) | |
| 5169 { | |
| 5170 feedback_col = 0; | |
| 5171 feedback_old_attr = char_attr; | |
| 5172 } | |
| 5173 char_attr = im_get_feedback_attr(feedback_col); | |
| 5174 if (char_attr < 0) | |
| 5175 char_attr = feedback_old_attr; | |
| 5176 feedback_col++; | |
| 5177 } | |
| 5178 else if (feedback_old_attr >= 0) | |
| 5179 { | |
| 5180 char_attr = feedback_old_attr; | |
| 5181 feedback_old_attr = -1; | |
| 5182 feedback_col = 0; | |
| 5183 } | |
| 5184 } | |
| 5185 #endif | |
| 5186 /* | |
| 5187 * Handle the case where we are in column 0 but not on the first | |
| 5188 * character of the line and the user wants us to show us a | |
| 5189 * special character (via 'listchars' option "precedes:<char>". | |
| 5190 */ | |
| 5191 if (lcs_prec_todo != NUL | |
| 6276 | 5192 && wp->w_p_list |
| 7 | 5193 && (wp->w_p_wrap ? wp->w_skipcol > 0 : wp->w_leftcol > 0) |
| 5194 #ifdef FEAT_DIFF | |
| 5195 && filler_todo <= 0 | |
| 5196 #endif | |
| 5197 && draw_state > WL_NR | |
| 5198 && c != NUL) | |
| 5199 { | |
| 5200 c = lcs_prec; | |
| 5201 lcs_prec_todo = NUL; | |
| 5202 #ifdef FEAT_MBYTE | |
| 3586 | 5203 if (has_mbyte && (*mb_char2cells)(mb_c) > 1) |
| 5204 { | |
| 5205 /* Double-width character being overwritten by the "precedes" | |
| 5206 * character, need to fill up half the character. */ | |
| 5207 c_extra = MB_FILLER_CHAR; | |
| 5208 n_extra = 1; | |
| 5209 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
|
5210 extra_attr = HL_ATTR(HLF_AT); |
| 3586 | 5211 } |
| 7 | 5212 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
|
5213 if (enc_utf8 && utf_char2len(c) > 1) |
| 7 | 5214 { |
| 5215 mb_utf8 = TRUE; | |
| 714 | 5216 u8cc[0] = 0; |
| 819 | 5217 c = 0xc0; |
| 7 | 5218 } |
| 5219 else | |
| 5220 mb_utf8 = FALSE; /* don't draw as UTF-8 */ | |
| 5221 #endif | |
| 674 | 5222 if (!attr_pri) |
| 7 | 5223 { |
| 5224 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
|
5225 char_attr = HL_ATTR(HLF_AT); /* later copied to char_attr */ |
| 7 | 5226 n_attr3 = 1; |
| 5227 } | |
| 5228 } | |
| 5229 | |
| 5230 /* | |
| 867 | 5231 * At end of the text line or just after the last character. |
| 7 | 5232 */ |
| 867 | 5233 if (c == NUL |
| 910 | 5234 #if defined(LINE_ATTR) |
| 867 | 5235 || did_line_attr == 1 |
| 5236 #endif | |
| 5237 ) | |
| 5238 { | |
| 5239 #ifdef FEAT_SEARCH_EXTRA | |
| 5240 long prevcol = (long)(ptr - line) - (c == NUL); | |
| 1437 | 5241 |
| 5242 /* we're not really at that column when skipping some text */ | |
| 1439 | 5243 if ((long)(wp->w_p_wrap ? wp->w_skipcol : wp->w_leftcol) > prevcol) |
| 1437 | 5244 ++prevcol; |
| 867 | 5245 #endif |
| 5246 | |
|
2332
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
5247 /* Invert at least one char, used for Visual and empty line or |
| 7 | 5248 * highlight match at end of line. If it's beyond the last |
| 5249 * char on the screen, just overwrite that one (tricky!) Not | |
| 5250 * needed when a '$' was displayed for 'list'. */ | |
| 1326 | 5251 #ifdef FEAT_SEARCH_EXTRA |
| 5252 prevcol_hl_flag = FALSE; | |
|
9885
4e8b05fa12c6
commit https://github.com/vim/vim/commit/4f416e41243ca151b95d39d81ce23d00b1484755
Christian Brabandt <cb@256bit.org>
parents:
9877
diff
changeset
|
5253 if (!search_hl.is_addpos && prevcol == (long)search_hl.startcol) |
| 1326 | 5254 prevcol_hl_flag = TRUE; |
| 5255 else | |
| 5256 { | |
| 5257 cur = wp->w_match_head; | |
| 5258 while (cur != NULL) | |
| 5259 { | |
|
9885
4e8b05fa12c6
commit https://github.com/vim/vim/commit/4f416e41243ca151b95d39d81ce23d00b1484755
Christian Brabandt <cb@256bit.org>
parents:
9877
diff
changeset
|
5260 if (!cur->hl.is_addpos && prevcol == (long)cur->hl.startcol) |
| 1326 | 5261 { |
| 5262 prevcol_hl_flag = TRUE; | |
| 5263 break; | |
| 5264 } | |
| 5265 cur = cur->next; | |
| 5266 } | |
| 5267 } | |
| 5268 #endif | |
| 7 | 5269 if (lcs_eol == lcs_eol_one |
| 1850 | 5270 && ((area_attr != 0 && vcol == fromcol |
| 5271 && (VIsual_mode != Ctrl_V | |
| 5272 || lnum == VIsual.lnum | |
| 5273 || lnum == curwin->w_cursor.lnum) | |
| 5274 && c == NUL) | |
| 7 | 5275 #ifdef FEAT_SEARCH_EXTRA |
| 5276 /* highlight 'hlsearch' match at end of line */ | |
| 1326 | 5277 || (prevcol_hl_flag == TRUE |
| 910 | 5278 # if defined(LINE_ATTR) |
| 867 | 5279 && did_line_attr <= 1 |
| 5280 # endif | |
| 5281 ) | |
| 7 | 5282 #endif |
| 5283 )) | |
| 5284 { | |
| 5285 int n = 0; | |
| 5286 | |
| 5287 #ifdef FEAT_RIGHTLEFT | |
| 5288 if (wp->w_p_rl) | |
| 5289 { | |
| 5290 if (col < 0) | |
| 5291 n = 1; | |
| 5292 } | |
| 5293 else | |
| 5294 #endif | |
| 5295 { | |
| 5296 if (col >= W_WIDTH(wp)) | |
| 5297 n = -1; | |
| 5298 } | |
| 5299 if (n != 0) | |
| 5300 { | |
| 5301 /* At the window boundary, highlight the last character | |
| 5302 * instead (better than nothing). */ | |
| 5303 off += n; | |
| 5304 col += n; | |
| 5305 } | |
| 5306 else | |
| 5307 { | |
| 5308 /* Add a blank character to highlight. */ | |
| 5309 ScreenLines[off] = ' '; | |
| 5310 #ifdef FEAT_MBYTE | |
| 5311 if (enc_utf8) | |
| 5312 ScreenLinesUC[off] = 0; | |
| 5313 #endif | |
| 5314 } | |
| 5315 #ifdef FEAT_SEARCH_EXTRA | |
| 5316 if (area_attr == 0) | |
| 5317 { | |
| 1326 | 5318 /* Use attributes from match with highest priority among |
| 5319 * 'search_hl' and the match list. */ | |
| 5320 char_attr = search_hl.attr; | |
| 5321 cur = wp->w_match_head; | |
| 5322 shl_flag = FALSE; | |
| 5323 while (cur != NULL || shl_flag == FALSE) | |
| 699 | 5324 { |
| 1326 | 5325 if (shl_flag == FALSE |
| 5326 && ((cur != NULL | |
| 5327 && cur->priority > SEARCH_HL_PRIORITY) | |
| 5328 || cur == NULL)) | |
| 699 | 5329 { |
| 1326 | 5330 shl = &search_hl; |
| 5331 shl_flag = TRUE; | |
| 699 | 5332 } |
| 1326 | 5333 else |
| 5334 shl = &cur->hl; | |
|
9885
4e8b05fa12c6
commit https://github.com/vim/vim/commit/4f416e41243ca151b95d39d81ce23d00b1484755
Christian Brabandt <cb@256bit.org>
parents:
9877
diff
changeset
|
5335 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
|
5336 && (shl == &search_hl || !shl->is_addpos)) |
| 1326 | 5337 char_attr = shl->attr; |
| 5338 if (shl != &search_hl && cur != NULL) | |
| 5339 cur = cur->next; | |
| 699 | 5340 } |
| 7 | 5341 } |
| 5342 #endif | |
| 5343 ScreenAttrs[off] = char_attr; | |
| 5344 #ifdef FEAT_RIGHTLEFT | |
| 5345 if (wp->w_p_rl) | |
| 1437 | 5346 { |
| 7 | 5347 --col; |
| 1437 | 5348 --off; |
| 5349 } | |
| 7 | 5350 else |
| 5351 #endif | |
| 1437 | 5352 { |
| 7 | 5353 ++col; |
| 1437 | 5354 ++off; |
| 5355 } | |
| 743 | 5356 ++vcol; |
| 1437 | 5357 #ifdef FEAT_SYN_HL |
| 5358 eol_hl_off = 1; | |
| 5359 #endif | |
| 743 | 5360 } |
| 867 | 5361 } |
| 5362 | |
| 5363 /* | |
| 5364 * At end of the text line. | |
| 5365 */ | |
| 5366 if (c == NUL) | |
| 5367 { | |
| 743 | 5368 #ifdef FEAT_SYN_HL |
| 1850 | 5369 if (eol_hl_off > 0 && vcol - eol_hl_off == (long)wp->w_virtcol |
| 5370 && lnum == wp->w_cursor.lnum) | |
| 1437 | 5371 { |
| 5372 /* highlight last char after line */ | |
| 5373 --col; | |
| 5374 --off; | |
| 5375 --vcol; | |
| 5376 } | |
| 5377 | |
|
2314
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5378 /* Highlight 'cursorcolumn' & 'colorcolumn' past end of the line. */ |
| 758 | 5379 if (wp->w_p_wrap) |
| 5380 v = wp->w_skipcol; | |
| 5381 else | |
| 5382 v = wp->w_leftcol; | |
|
2314
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5383 |
| 820 | 5384 /* check if line ends before left margin */ |
| 5385 if (vcol < v + col - win_col_off(wp)) | |
| 5386 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
|
5387 #ifdef FEAT_CONCEAL |
|
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
5388 /* 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
|
5389 * edge for 'cursorcolumn'. */ |
|
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
5390 col -= boguscols; |
|
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
5391 boguscols = 0; |
|
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
5392 #endif |
|
2314
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5393 |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5394 if (draw_color_col) |
|
2332
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
5395 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
|
5396 |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5397 if (((wp->w_p_cuc |
|
2332
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
5398 && (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
|
5399 && (int)wp->w_virtcol < |
|
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
5400 W_WIDTH(wp) * (row - startrow + 1) + v |
|
2314
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5401 && lnum != wp->w_cursor.lnum) |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5402 || draw_color_col) |
| 743 | 5403 # ifdef FEAT_RIGHTLEFT |
| 5404 && !wp->w_p_rl | |
| 5405 # endif | |
| 5406 ) | |
| 5407 { | |
|
2314
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5408 int rightmost_vcol = 0; |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5409 int i; |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5410 |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5411 if (wp->w_p_cuc) |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5412 rightmost_vcol = wp->w_virtcol; |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5413 if (draw_color_col) |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5414 /* determine rightmost colorcolumn to possibly draw */ |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5415 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
|
5416 if (rightmost_vcol < color_cols[i]) |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5417 rightmost_vcol = color_cols[i]; |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5418 |
| 743 | 5419 while (col < W_WIDTH(wp)) |
| 5420 { | |
| 5421 ScreenLines[off] = ' '; | |
| 5422 #ifdef FEAT_MBYTE | |
| 5423 if (enc_utf8) | |
| 5424 ScreenLinesUC[off] = 0; | |
| 5425 #endif | |
| 5426 ++col; | |
|
2356
eb1f2554cac5
Fix 'colorcolumn' adjecent columns not highlighted after end of line.
Bram Moolenaar <bram@vim.org>
parents:
2349
diff
changeset
|
5427 if (draw_color_col) |
|
eb1f2554cac5
Fix 'colorcolumn' adjecent columns not highlighted after end of line.
Bram Moolenaar <bram@vim.org>
parents:
2349
diff
changeset
|
5428 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
|
5429 &color_cols); |
|
eb1f2554cac5
Fix 'colorcolumn' adjecent columns not highlighted after end of line.
Bram Moolenaar <bram@vim.org>
parents:
2349
diff
changeset
|
5430 |
|
2332
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
5431 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
|
5432 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
|
5433 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
|
5434 ScreenAttrs[off++] = HL_ATTR(HLF_MC); |
|
2314
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5435 else |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5436 ScreenAttrs[off++] = 0; |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5437 |
|
2332
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
5438 if (VCOL_HLC >= rightmost_vcol) |
| 743 | 5439 break; |
|
2314
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5440 |
| 743 | 5441 ++vcol; |
| 5442 } | |
| 5443 } | |
| 5444 #endif | |
| 7 | 5445 |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5446 SCREEN_LINE(screen_row, W_WINCOL(wp), col, |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5447 (int)W_WIDTH(wp), wp->w_p_rl); |
| 7 | 5448 row++; |
| 5449 | |
| 5450 /* | |
| 5451 * Update w_cline_height and w_cline_folded if the cursor line was | |
| 5452 * updated (saves a call to plines() later). | |
| 5453 */ | |
| 5454 if (wp == curwin && lnum == curwin->w_cursor.lnum) | |
| 5455 { | |
| 5456 curwin->w_cline_row = startrow; | |
| 5457 curwin->w_cline_height = row - startrow; | |
| 5458 #ifdef FEAT_FOLDING | |
| 5459 curwin->w_cline_folded = FALSE; | |
| 5460 #endif | |
| 5461 curwin->w_valid |= (VALID_CHEIGHT|VALID_CROW); | |
| 5462 } | |
| 5463 | |
| 5464 break; | |
| 5465 } | |
| 5466 | |
| 5467 /* line continues beyond line end */ | |
| 5468 if (lcs_ext | |
| 5469 && !wp->w_p_wrap | |
| 5470 #ifdef FEAT_DIFF | |
| 5471 && filler_todo <= 0 | |
| 5472 #endif | |
| 5473 && ( | |
| 5474 #ifdef FEAT_RIGHTLEFT | |
| 5475 wp->w_p_rl ? col == 0 : | |
| 5476 #endif | |
| 5477 col == W_WIDTH(wp) - 1) | |
| 5478 && (*ptr != NUL | |
| 1555 | 5479 || (wp->w_p_list && lcs_eol_one > 0) |
| 7 | 5480 || (n_extra && (c_extra != NUL || *p_extra != NUL)))) |
| 5481 { | |
| 5482 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
|
5483 char_attr = HL_ATTR(HLF_AT); |
| 7 | 5484 #ifdef FEAT_MBYTE |
| 5485 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
|
5486 if (enc_utf8 && utf_char2len(c) > 1) |
| 7 | 5487 { |
| 5488 mb_utf8 = TRUE; | |
| 714 | 5489 u8cc[0] = 0; |
| 819 | 5490 c = 0xc0; |
| 7 | 5491 } |
| 5492 else | |
| 5493 mb_utf8 = FALSE; | |
| 5494 #endif | |
| 5495 } | |
| 5496 | |
| 743 | 5497 #ifdef FEAT_SYN_HL |
|
2314
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5498 /* advance to the next 'colorcolumn' */ |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5499 if (draw_color_col) |
|
2332
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
5500 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
|
5501 |
| 743 | 5502 /* 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
|
5503 * highlight the cursor position itself. |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5504 * 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
|
5505 * 'cursorcolumn' */ |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5506 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
|
5507 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
|
5508 && search_attr == 0 && area_attr == 0) |
|
2314
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5509 { |
|
2332
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
5510 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
|
5511 && lnum != wp->w_cursor.lnum) |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5512 { |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5513 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
|
5514 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
|
5515 } |
|
2346
b38c324bdc36
Fix: 'colorcolumn' interfered with concealed text.
Bram Moolenaar <bram@vim.org>
parents:
2338
diff
changeset
|
5516 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
|
5517 { |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5518 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
|
5519 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
|
5520 } |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5521 } |
| 743 | 5522 #endif |
| 5523 | |
| 7 | 5524 /* |
| 5525 * Store character to be displayed. | |
| 5526 * Skip characters that are left of the screen for 'nowrap'. | |
| 5527 */ | |
| 5528 vcol_prev = vcol; | |
| 5529 if (draw_state < WL_LINE || n_skip <= 0) | |
| 5530 { | |
| 5531 /* | |
| 5532 * Store the character. | |
| 5533 */ | |
| 5534 #if defined(FEAT_RIGHTLEFT) && defined(FEAT_MBYTE) | |
| 5535 if (has_mbyte && wp->w_p_rl && (*mb_char2cells)(mb_c) > 1) | |
| 5536 { | |
| 5537 /* A double-wide character is: put first halve in left cell. */ | |
| 5538 --off; | |
| 5539 --col; | |
| 5540 } | |
| 5541 #endif | |
| 5542 ScreenLines[off] = c; | |
| 5543 #ifdef FEAT_MBYTE | |
| 5544 if (enc_dbcs == DBCS_JPNU) | |
|
2069
63613d8d7e4d
updated for version 7.2.354
Bram Moolenaar <bram@zimbu.org>
parents:
2055
diff
changeset
|
5545 { |
|
63613d8d7e4d
updated for version 7.2.354
Bram Moolenaar <bram@zimbu.org>
parents:
2055
diff
changeset
|
5546 if ((mb_c & 0xff00) == 0x8e00) |
|
63613d8d7e4d
updated for version 7.2.354
Bram Moolenaar <bram@zimbu.org>
parents:
2055
diff
changeset
|
5547 ScreenLines[off] = 0x8e; |
| 7 | 5548 ScreenLines2[off] = mb_c & 0xff; |
|
2069
63613d8d7e4d
updated for version 7.2.354
Bram Moolenaar <bram@zimbu.org>
parents:
2055
diff
changeset
|
5549 } |
| 7 | 5550 else if (enc_utf8) |
| 5551 { | |
| 5552 if (mb_utf8) | |
| 5553 { | |
| 1326 | 5554 int i; |
| 5555 | |
| 7 | 5556 ScreenLinesUC[off] = mb_c; |
| 819 | 5557 if ((c & 0xff) == 0) |
| 5558 ScreenLines[off] = 0x80; /* avoid storing zero */ | |
| 714 | 5559 for (i = 0; i < Screen_mco; ++i) |
| 5560 { | |
| 5561 ScreenLinesC[i][off] = u8cc[i]; | |
| 5562 if (u8cc[i] == 0) | |
| 5563 break; | |
| 5564 } | |
| 7 | 5565 } |
| 5566 else | |
| 5567 ScreenLinesUC[off] = 0; | |
| 5568 } | |
| 5569 if (multi_attr) | |
| 5570 { | |
| 5571 ScreenAttrs[off] = multi_attr; | |
| 5572 multi_attr = 0; | |
| 5573 } | |
| 5574 else | |
| 5575 #endif | |
| 5576 ScreenAttrs[off] = char_attr; | |
| 5577 | |
| 5578 #ifdef FEAT_MBYTE | |
| 5579 if (has_mbyte && (*mb_char2cells)(mb_c) > 1) | |
| 5580 { | |
| 5581 /* Need to fill two screen columns. */ | |
| 5582 ++off; | |
| 5583 ++col; | |
| 5584 if (enc_utf8) | |
| 5585 /* UTF-8: Put a 0 in the second screen char. */ | |
| 5586 ScreenLines[off] = 0; | |
| 5587 else | |
| 5588 /* DBCS: Put second byte in the second screen char. */ | |
| 5589 ScreenLines[off] = mb_c & 0xff; | |
|
7287
6fcadba9ec7a
commit https://github.com/vim/vim/commit/32a214e78df0120f92fe049eab1385c60f0cdb0b
Christian Brabandt <cb@256bit.org>
parents:
7233
diff
changeset
|
5590 if (draw_state > WL_NR |
|
6fcadba9ec7a
commit https://github.com/vim/vim/commit/32a214e78df0120f92fe049eab1385c60f0cdb0b
Christian Brabandt <cb@256bit.org>
parents:
7233
diff
changeset
|
5591 #ifdef FEAT_DIFF |
|
6fcadba9ec7a
commit https://github.com/vim/vim/commit/32a214e78df0120f92fe049eab1385c60f0cdb0b
Christian Brabandt <cb@256bit.org>
parents:
7233
diff
changeset
|
5592 && filler_todo <= 0 |
|
6fcadba9ec7a
commit https://github.com/vim/vim/commit/32a214e78df0120f92fe049eab1385c60f0cdb0b
Christian Brabandt <cb@256bit.org>
parents:
7233
diff
changeset
|
5593 #endif |
|
6fcadba9ec7a
commit https://github.com/vim/vim/commit/32a214e78df0120f92fe049eab1385c60f0cdb0b
Christian Brabandt <cb@256bit.org>
parents:
7233
diff
changeset
|
5594 ) |
|
6fcadba9ec7a
commit https://github.com/vim/vim/commit/32a214e78df0120f92fe049eab1385c60f0cdb0b
Christian Brabandt <cb@256bit.org>
parents:
7233
diff
changeset
|
5595 ++vcol; |
| 7 | 5596 /* When "tocol" is halfway a character, set it to the end of |
| 5597 * the character, otherwise highlighting won't stop. */ | |
| 5598 if (tocol == vcol) | |
| 5599 ++tocol; | |
| 5600 #ifdef FEAT_RIGHTLEFT | |
| 5601 if (wp->w_p_rl) | |
| 5602 { | |
| 5603 /* now it's time to backup one cell */ | |
| 5604 --off; | |
| 5605 --col; | |
| 5606 } | |
| 5607 #endif | |
| 5608 } | |
| 5609 #endif | |
| 5610 #ifdef FEAT_RIGHTLEFT | |
| 5611 if (wp->w_p_rl) | |
| 5612 { | |
| 5613 --off; | |
| 5614 --col; | |
| 5615 } | |
| 5616 else | |
| 5617 #endif | |
| 5618 { | |
| 5619 ++off; | |
| 5620 ++col; | |
| 5621 } | |
| 5622 } | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5623 #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
|
5624 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
|
5625 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5626 --n_skip; |
|
2332
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
5627 ++vcol_off; |
|
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
5628 if (n_extra > 0) |
|
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
5629 vcol_off += n_extra; |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5630 if (wp->w_p_wrap) |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5631 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5632 /* |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5633 * Special voodoo required if 'wrap' is on. |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5634 * |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5635 * 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
|
5636 * 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
|
5637 * 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
|
5638 * 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
|
5639 * |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5640 * 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
|
5641 * 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
|
5642 * 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
|
5643 * of bad columns we have advanced. |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5644 */ |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5645 if (n_extra > 0) |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5646 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5647 vcol += n_extra; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5648 # ifdef FEAT_RIGHTLEFT |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5649 if (wp->w_p_rl) |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5650 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5651 col -= n_extra; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5652 boguscols -= n_extra; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5653 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5654 else |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5655 # endif |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5656 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5657 col += n_extra; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5658 boguscols += n_extra; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5659 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5660 n_extra = 0; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5661 n_attr = 0; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5662 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5663 |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5664 |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5665 # ifdef FEAT_MBYTE |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5666 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
|
5667 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5668 /* Need to fill two screen columns. */ |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5669 # ifdef FEAT_RIGHTLEFT |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5670 if (wp->w_p_rl) |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5671 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5672 --boguscols; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5673 --col; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5674 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5675 else |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5676 # endif |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5677 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5678 ++boguscols; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5679 ++col; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5680 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5681 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5682 # endif |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5683 |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5684 # ifdef FEAT_RIGHTLEFT |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5685 if (wp->w_p_rl) |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5686 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5687 --boguscols; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5688 --col; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5689 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5690 else |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5691 # endif |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5692 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5693 ++boguscols; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5694 ++col; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5695 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5696 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5697 else |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5698 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5699 if (n_extra > 0) |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5700 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5701 vcol += n_extra; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5702 n_extra = 0; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5703 n_attr = 0; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5704 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5705 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5706 |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5707 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5708 #endif /* FEAT_CONCEAL */ |
| 7 | 5709 else |
| 5710 --n_skip; | |
| 5711 | |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
5712 /* 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
|
5713 * column. */ |
| 1849 | 5714 if (draw_state > WL_NR |
| 7 | 5715 #ifdef FEAT_DIFF |
| 5716 && filler_todo <= 0 | |
| 5717 #endif | |
| 5718 ) | |
| 5719 ++vcol; | |
| 5720 | |
| 743 | 5721 #ifdef FEAT_SYN_HL |
| 5722 if (vcol_save_attr >= 0) | |
| 5723 char_attr = vcol_save_attr; | |
| 5724 #endif | |
| 5725 | |
| 7 | 5726 /* restore attributes after "predeces" in 'listchars' */ |
| 5727 if (draw_state > WL_NR && n_attr3 > 0 && --n_attr3 == 0) | |
| 5728 char_attr = saved_attr3; | |
| 5729 | |
| 5730 /* restore attributes after last 'listchars' or 'number' char */ | |
| 5731 if (n_attr > 0 && draw_state == WL_LINE && --n_attr == 0) | |
| 5732 char_attr = saved_attr2; | |
| 5733 | |
| 5734 /* | |
| 5735 * At end of screen line and there is more to come: Display the line | |
| 1378 | 5736 * so far. If there is no more to display it is caught above. |
| 7 | 5737 */ |
| 5738 if (( | |
| 5739 #ifdef FEAT_RIGHTLEFT | |
| 5740 wp->w_p_rl ? (col < 0) : | |
| 5741 #endif | |
| 5742 (col >= W_WIDTH(wp))) | |
| 5743 && (*ptr != NUL | |
| 5744 #ifdef FEAT_DIFF | |
| 5745 || filler_todo > 0 | |
| 5746 #endif | |
| 2724 | 5747 || (wp->w_p_list && lcs_eol != NUL && p_extra != at_end_str) |
| 7 | 5748 || (n_extra != 0 && (c_extra != NUL || *p_extra != NUL))) |
| 5749 ) | |
| 5750 { | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5751 #ifdef FEAT_CONCEAL |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5752 SCREEN_LINE(screen_row, W_WINCOL(wp), col - boguscols, |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5753 (int)W_WIDTH(wp), wp->w_p_rl); |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5754 boguscols = 0; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5755 #else |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5756 SCREEN_LINE(screen_row, W_WINCOL(wp), col, |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5757 (int)W_WIDTH(wp), wp->w_p_rl); |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5758 #endif |
| 7 | 5759 ++row; |
| 5760 ++screen_row; | |
| 5761 | |
| 5762 /* When not wrapping and finished diff lines, or when displayed | |
| 5763 * '$' and highlighting until last column, break here. */ | |
| 5764 if ((!wp->w_p_wrap | |
| 5765 #ifdef FEAT_DIFF | |
| 5766 && filler_todo <= 0 | |
| 5767 #endif | |
| 5768 ) || lcs_eol_one == -1) | |
| 5769 break; | |
| 5770 | |
| 5771 /* When the window is too narrow draw all "@" lines. */ | |
| 5772 if (draw_state != WL_LINE | |
| 5773 #ifdef FEAT_DIFF | |
| 5774 && filler_todo <= 0 | |
| 5775 #endif | |
| 5776 ) | |
| 5777 { | |
| 5778 win_draw_end(wp, '@', ' ', row, wp->w_height, HLF_AT); | |
|
8643
24b43dd167eb
commit https://github.com/vim/vim/commit/44a2f923c00f1384c9ecde12fb5b4711bc20702e
Christian Brabandt <cb@256bit.org>
parents:
8627
diff
changeset
|
5779 #ifdef FEAT_WINDOWS |
| 7 | 5780 draw_vsep_win(wp, row); |
| 5781 #endif | |
| 5782 row = endrow; | |
| 5783 } | |
| 5784 | |
| 5785 /* When line got too long for screen break here. */ | |
| 5786 if (row == endrow) | |
| 5787 { | |
| 5788 ++row; | |
| 5789 break; | |
| 5790 } | |
| 5791 | |
| 5792 if (screen_cur_row == screen_row - 1 | |
| 5793 #ifdef FEAT_DIFF | |
| 5794 && filler_todo <= 0 | |
| 5795 #endif | |
|
10349
cf988222b150
commit https://github.com/vim/vim/commit/a1f4cb93ba50ea9e40cd4b1f5592b8a6d1398660
Christian Brabandt <cb@256bit.org>
parents:
10307
diff
changeset
|
5796 #ifdef FEAT_WINDOWS |
|
cf988222b150
commit https://github.com/vim/vim/commit/a1f4cb93ba50ea9e40cd4b1f5592b8a6d1398660
Christian Brabandt <cb@256bit.org>
parents:
10307
diff
changeset
|
5797 && W_WIDTH(wp) == Columns |
|
cf988222b150
commit https://github.com/vim/vim/commit/a1f4cb93ba50ea9e40cd4b1f5592b8a6d1398660
Christian Brabandt <cb@256bit.org>
parents:
10307
diff
changeset
|
5798 #endif |
|
cf988222b150
commit https://github.com/vim/vim/commit/a1f4cb93ba50ea9e40cd4b1f5592b8a6d1398660
Christian Brabandt <cb@256bit.org>
parents:
10307
diff
changeset
|
5799 ) |
| 7 | 5800 { |
| 5801 /* Remember that the line wraps, used for modeless copy. */ | |
| 5802 LineWraps[screen_row - 1] = TRUE; | |
| 5803 | |
| 5804 /* | |
| 5805 * Special trick to make copy/paste of wrapped lines work with | |
| 5806 * xterm/screen: write an extra character beyond the end of | |
| 5807 * the line. This will work with all terminal types | |
| 5808 * (regardless of the xn,am settings). | |
| 5809 * Only do this on a fast tty. | |
| 5810 * Only do this if the cursor is on the current line | |
| 5811 * (something has been written in it). | |
| 5812 * Don't do this for the GUI. | |
| 5813 * Don't do this for double-width characters. | |
| 5814 * Don't do this for a window not at the right screen border. | |
| 5815 */ | |
| 5816 if (p_tf | |
| 5817 #ifdef FEAT_GUI | |
| 5818 && !gui.in_use | |
| 5819 #endif | |
| 5820 #ifdef FEAT_MBYTE | |
| 5821 && !(has_mbyte | |
| 1378 | 5822 && ((*mb_off2cells)(LineOffset[screen_row], |
| 5823 LineOffset[screen_row] + screen_Columns) | |
| 5824 == 2 | |
| 7 | 5825 || (*mb_off2cells)(LineOffset[screen_row - 1] |
| 1378 | 5826 + (int)Columns - 2, |
| 5827 LineOffset[screen_row] + screen_Columns) | |
| 5828 == 2)) | |
| 7 | 5829 #endif |
| 5830 ) | |
| 5831 { | |
| 5832 /* First make sure we are at the end of the screen line, | |
| 5833 * then output the same character again to let the | |
| 5834 * terminal know about the wrap. If the terminal doesn't | |
| 5835 * auto-wrap, we overwrite the character. */ | |
| 5836 if (screen_cur_col != W_WIDTH(wp)) | |
| 5837 screen_char(LineOffset[screen_row - 1] | |
| 5838 + (unsigned)Columns - 1, | |
| 5839 screen_row - 1, (int)(Columns - 1)); | |
| 5840 | |
| 5841 #ifdef FEAT_MBYTE | |
| 5842 /* When there is a multi-byte character, just output a | |
| 5843 * space to keep it simple. */ | |
| 148 | 5844 if (has_mbyte && MB_BYTE2LEN(ScreenLines[LineOffset[ |
| 5845 screen_row - 1] + (Columns - 1)]) > 1) | |
| 7 | 5846 out_char(' '); |
| 5847 else | |
| 5848 #endif | |
| 5849 out_char(ScreenLines[LineOffset[screen_row - 1] | |
| 5850 + (Columns - 1)]); | |
| 5851 /* force a redraw of the first char on the next line */ | |
| 5852 ScreenAttrs[LineOffset[screen_row]] = (sattr_T)-1; | |
| 5853 screen_start(); /* don't know where cursor is now */ | |
| 5854 } | |
| 5855 } | |
| 5856 | |
| 5857 col = 0; | |
| 5858 off = (unsigned)(current_ScreenLine - ScreenLines); | |
| 5859 #ifdef FEAT_RIGHTLEFT | |
| 5860 if (wp->w_p_rl) | |
| 5861 { | |
| 5862 col = W_WIDTH(wp) - 1; /* col is not used if breaking! */ | |
| 5863 off += col; | |
| 5864 } | |
| 5865 #endif | |
| 5866 | |
| 5867 /* reset the drawing state for the start of a wrapped line */ | |
| 5868 draw_state = WL_START; | |
| 5869 saved_n_extra = n_extra; | |
| 5870 saved_p_extra = p_extra; | |
| 5871 saved_c_extra = c_extra; | |
| 5872 saved_char_attr = char_attr; | |
| 5873 n_extra = 0; | |
| 5874 lcs_prec_todo = lcs_prec; | |
| 5875 #ifdef FEAT_LINEBREAK | |
| 5876 # ifdef FEAT_DIFF | |
| 5877 if (filler_todo <= 0) | |
| 5878 # endif | |
| 5879 need_showbreak = TRUE; | |
| 5880 #endif | |
| 5881 #ifdef FEAT_DIFF | |
| 5882 --filler_todo; | |
| 5883 /* When the filler lines are actually below the last line of the | |
| 5884 * file, don't draw the line itself, break here. */ | |
| 5885 if (filler_todo == 0 && wp->w_botfill) | |
| 5886 break; | |
| 5887 #endif | |
| 5888 } | |
| 5889 | |
| 5890 } /* for every character in the line */ | |
| 5891 | |
| 743 | 5892 #ifdef FEAT_SPELL |
| 386 | 5893 /* After an empty line check first word for capital. */ |
| 5894 if (*skipwhite(line) == NUL) | |
| 5895 { | |
| 5896 capcol_lnum = lnum + 1; | |
| 5897 cap_col = 0; | |
| 5898 } | |
| 5899 #endif | |
| 5900 | |
|
10690
206ab11fa76e
patch 8.0.0235: memory leak in diff mode
Christian Brabandt <cb@256bit.org>
parents:
10538
diff
changeset
|
5901 vim_free(p_extra_free); |
| 7 | 5902 return row; |
| 5903 } | |
| 5904 | |
| 714 | 5905 #ifdef FEAT_MBYTE |
|
7805
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7697
diff
changeset
|
5906 static int comp_char_differs(int, int); |
| 714 | 5907 |
| 5908 /* | |
| 5909 * 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
|
5910 * Only to be used when ScreenLinesUC[off_from] != 0. |
| 714 | 5911 */ |
| 5912 static int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
5913 comp_char_differs(int off_from, int off_to) |
| 714 | 5914 { |
| 5915 int i; | |
| 5916 | |
| 5917 for (i = 0; i < Screen_mco; ++i) | |
| 5918 { | |
| 5919 if (ScreenLinesC[i][off_from] != ScreenLinesC[i][off_to]) | |
| 5920 return TRUE; | |
| 5921 if (ScreenLinesC[i][off_from] == 0) | |
| 5922 break; | |
| 5923 } | |
| 5924 return FALSE; | |
| 5925 } | |
| 5926 #endif | |
| 5927 | |
| 7 | 5928 /* |
| 5929 * Check whether the given character needs redrawing: | |
| 5930 * - the (first byte of the) character is different | |
| 5931 * - the attributes are different | |
| 5932 * - the character is multi-byte and the next byte is different | |
| 1616 | 5933 * - the character is two cells wide and the second cell differs. |
| 7 | 5934 */ |
| 5935 static int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
5936 char_needs_redraw(int off_from, int off_to, int cols) |
| 7 | 5937 { |
| 5938 if (cols > 0 | |
| 5939 && ((ScreenLines[off_from] != ScreenLines[off_to] | |
| 5940 || ScreenAttrs[off_from] != ScreenAttrs[off_to]) | |
| 5941 | |
| 5942 #ifdef FEAT_MBYTE | |
| 5943 || (enc_dbcs != 0 | |
| 5944 && MB_BYTE2LEN(ScreenLines[off_from]) > 1 | |
| 5945 && (enc_dbcs == DBCS_JPNU && ScreenLines[off_from] == 0x8e | |
| 5946 ? ScreenLines2[off_from] != ScreenLines2[off_to] | |
| 5947 : (cols > 1 && ScreenLines[off_from + 1] | |
| 5948 != ScreenLines[off_to + 1]))) | |
| 5949 || (enc_utf8 | |
| 5950 && (ScreenLinesUC[off_from] != ScreenLinesUC[off_to] | |
| 5951 || (ScreenLinesUC[off_from] != 0 | |
| 1616 | 5952 && comp_char_differs(off_from, off_to)) |
| 3759 | 5953 || ((*mb_off2cells)(off_from, off_from + cols) > 1 |
| 5954 && ScreenLines[off_from + 1] | |
| 5955 != ScreenLines[off_to + 1]))) | |
| 7 | 5956 #endif |
| 5957 )) | |
| 5958 return TRUE; | |
| 5959 return FALSE; | |
| 5960 } | |
| 5961 | |
| 5962 /* | |
| 5963 * Move one "cooked" screen line to the screen, but only the characters that | |
| 5964 * have actually changed. Handle insert/delete character. | |
| 5965 * "coloff" gives the first column on the screen for this line. | |
| 5966 * "endcol" gives the columns where valid characters are. | |
| 5967 * "clear_width" is the width of the window. It's > 0 if the rest of the line | |
| 5968 * needs to be cleared, negative otherwise. | |
| 5969 * "rlflag" is TRUE in a rightleft window: | |
| 5970 * When TRUE and "clear_width" > 0, clear columns 0 to "endcol" | |
| 5971 * When FALSE and "clear_width" > 0, clear columns "endcol" to "clear_width" | |
| 5972 */ | |
| 5973 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
5974 screen_line( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
5975 int row, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
5976 int coloff, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
5977 int endcol, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
5978 int clear_width |
| 7 | 5979 #ifdef FEAT_RIGHTLEFT |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
5980 , int rlflag |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
5981 #endif |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
5982 ) |
| 7 | 5983 { |
| 5984 unsigned off_from; | |
| 5985 unsigned off_to; | |
| 1378 | 5986 #ifdef FEAT_MBYTE |
| 5987 unsigned max_off_from; | |
| 5988 unsigned max_off_to; | |
| 5989 #endif | |
| 7 | 5990 int col = 0; |
|
8643
24b43dd167eb
commit https://github.com/vim/vim/commit/44a2f923c00f1384c9ecde12fb5b4711bc20702e
Christian Brabandt <cb@256bit.org>
parents:
8627
diff
changeset
|
5991 #if defined(FEAT_GUI) || defined(UNIX) || defined(FEAT_WINDOWS) |
| 7 | 5992 int hl; |
| 5993 #endif | |
| 5994 int force = FALSE; /* force update rest of the line */ | |
| 5995 int redraw_this /* bool: does character need redraw? */ | |
| 5996 #ifdef FEAT_GUI | |
| 5997 = TRUE /* For GUI when while-loop empty */ | |
| 5998 #endif | |
| 5999 ; | |
| 6000 int redraw_next; /* redraw_this for next character */ | |
| 6001 #ifdef FEAT_MBYTE | |
| 6002 int clear_next = FALSE; | |
| 6003 int char_cells; /* 1: normal char */ | |
| 6004 /* 2: occupies two display cells */ | |
| 6005 # define CHAR_CELLS char_cells | |
| 6006 #else | |
| 6007 # define CHAR_CELLS 1 | |
| 6008 #endif | |
| 6009 | |
| 3413 | 6010 /* Check for illegal row and col, just in case. */ |
| 6011 if (row >= Rows) | |
| 6012 row = Rows - 1; | |
| 6013 if (endcol > Columns) | |
| 6014 endcol = Columns; | |
| 6015 | |
| 7 | 6016 # ifdef FEAT_CLIPBOARD |
| 6017 clip_may_clear_selection(row, row); | |
| 6018 # endif | |
| 6019 | |
| 6020 off_from = (unsigned)(current_ScreenLine - ScreenLines); | |
| 6021 off_to = LineOffset[row] + coloff; | |
| 1378 | 6022 #ifdef FEAT_MBYTE |
| 6023 max_off_from = off_from + screen_Columns; | |
| 6024 max_off_to = LineOffset[row] + screen_Columns; | |
| 6025 #endif | |
| 7 | 6026 |
| 6027 #ifdef FEAT_RIGHTLEFT | |
| 6028 if (rlflag) | |
| 6029 { | |
| 6030 /* Clear rest first, because it's left of the text. */ | |
| 6031 if (clear_width > 0) | |
| 6032 { | |
| 6033 while (col <= endcol && ScreenLines[off_to] == ' ' | |
| 6034 && ScreenAttrs[off_to] == 0 | |
| 6035 # ifdef FEAT_MBYTE | |
| 6036 && (!enc_utf8 || ScreenLinesUC[off_to] == 0) | |
| 6037 # endif | |
| 6038 ) | |
| 6039 { | |
| 6040 ++off_to; | |
| 6041 ++col; | |
| 6042 } | |
| 6043 if (col <= endcol) | |
| 6044 screen_fill(row, row + 1, col + coloff, | |
| 6045 endcol + coloff + 1, ' ', ' ', 0); | |
| 6046 } | |
| 6047 col = endcol + 1; | |
| 6048 off_to = LineOffset[row] + col + coloff; | |
| 6049 off_from += col; | |
| 6050 endcol = (clear_width > 0 ? clear_width : -clear_width); | |
| 6051 } | |
| 6052 #endif /* FEAT_RIGHTLEFT */ | |
| 6053 | |
| 6054 redraw_next = char_needs_redraw(off_from, off_to, endcol - col); | |
| 6055 | |
| 6056 while (col < endcol) | |
| 6057 { | |
| 6058 #ifdef FEAT_MBYTE | |
| 6059 if (has_mbyte && (col + 1 < endcol)) | |
| 1378 | 6060 char_cells = (*mb_off2cells)(off_from, max_off_from); |
| 7 | 6061 else |
| 6062 char_cells = 1; | |
| 6063 #endif | |
| 6064 | |
| 6065 redraw_this = redraw_next; | |
| 6066 redraw_next = force || char_needs_redraw(off_from + CHAR_CELLS, | |
| 6067 off_to + CHAR_CELLS, endcol - col - CHAR_CELLS); | |
| 6068 | |
| 6069 #ifdef FEAT_GUI | |
| 6070 /* If the next character was bold, then redraw the current character to | |
| 6071 * remove any pixels that might have spilt over into us. This only | |
| 6072 * happens in the GUI. | |
| 6073 */ | |
| 6074 if (redraw_next && gui.in_use) | |
| 6075 { | |
| 6076 hl = ScreenAttrs[off_to + CHAR_CELLS]; | |
| 743 | 6077 if (hl > HL_ALL) |
| 6078 hl = syn_attr2attr(hl); | |
| 6079 if (hl & HL_BOLD) | |
| 7 | 6080 redraw_this = TRUE; |
| 6081 } | |
| 6082 #endif | |
| 6083 | |
| 6084 if (redraw_this) | |
| 6085 { | |
| 6086 /* | |
| 6087 * Special handling when 'xs' termcap flag set (hpterm): | |
| 6088 * Attributes for characters are stored at the position where the | |
| 6089 * cursor is when writing the highlighting code. The | |
| 6090 * start-highlighting code must be written with the cursor on the | |
| 6091 * first highlighted character. The stop-highlighting code must | |
| 6092 * be written with the cursor just after the last highlighted | |
| 6093 * character. | |
| 6094 * Overwriting a character doesn't remove it's highlighting. Need | |
| 6095 * to clear the rest of the line, and force redrawing it | |
| 6096 * completely. | |
| 6097 */ | |
| 6098 if ( p_wiv | |
| 6099 && !force | |
| 6100 #ifdef FEAT_GUI | |
| 6101 && !gui.in_use | |
| 6102 #endif | |
| 6103 && ScreenAttrs[off_to] != 0 | |
| 6104 && ScreenAttrs[off_from] != ScreenAttrs[off_to]) | |
| 6105 { | |
| 6106 /* | |
| 6107 * Need to remove highlighting attributes here. | |
| 6108 */ | |
| 6109 windgoto(row, col + coloff); | |
| 6110 out_str(T_CE); /* clear rest of this screen line */ | |
| 6111 screen_start(); /* don't know where cursor is now */ | |
| 6112 force = TRUE; /* force redraw of rest of the line */ | |
| 6113 redraw_next = TRUE; /* or else next char would miss out */ | |
| 6114 | |
| 6115 /* | |
| 6116 * If the previous character was highlighted, need to stop | |
| 6117 * highlighting at this character. | |
| 6118 */ | |
| 6119 if (col + coloff > 0 && ScreenAttrs[off_to - 1] != 0) | |
| 6120 { | |
| 6121 screen_attr = ScreenAttrs[off_to - 1]; | |
| 6122 term_windgoto(row, col + coloff); | |
| 6123 screen_stop_highlight(); | |
| 6124 } | |
| 6125 else | |
| 6126 screen_attr = 0; /* highlighting has stopped */ | |
| 6127 } | |
| 6128 #ifdef FEAT_MBYTE | |
| 6129 if (enc_dbcs != 0) | |
| 6130 { | |
| 6131 /* Check if overwriting a double-byte with a single-byte or | |
| 6132 * the other way around requires another character to be | |
| 6133 * redrawn. For UTF-8 this isn't needed, because comparing | |
| 6134 * ScreenLinesUC[] is sufficient. */ | |
| 6135 if (char_cells == 1 | |
| 6136 && col + 1 < endcol | |
| 1378 | 6137 && (*mb_off2cells)(off_to, max_off_to) > 1) |
| 7 | 6138 { |
| 6139 /* Writing a single-cell character over a double-cell | |
| 6140 * character: need to redraw the next cell. */ | |
| 6141 ScreenLines[off_to + 1] = 0; | |
| 6142 redraw_next = TRUE; | |
| 6143 } | |
| 6144 else if (char_cells == 2 | |
| 6145 && col + 2 < endcol | |
| 1378 | 6146 && (*mb_off2cells)(off_to, max_off_to) == 1 |
| 6147 && (*mb_off2cells)(off_to + 1, max_off_to) > 1) | |
| 7 | 6148 { |
| 6149 /* Writing the second half of a double-cell character over | |
| 6150 * a double-cell character: need to redraw the second | |
| 6151 * cell. */ | |
| 6152 ScreenLines[off_to + 2] = 0; | |
| 6153 redraw_next = TRUE; | |
| 6154 } | |
| 6155 | |
| 6156 if (enc_dbcs == DBCS_JPNU) | |
| 6157 ScreenLines2[off_to] = ScreenLines2[off_from]; | |
| 6158 } | |
| 6159 /* When writing a single-width character over a double-width | |
| 6160 * character and at the end of the redrawn text, need to clear out | |
| 6161 * the right halve of the old character. | |
| 6162 * Also required when writing the right halve of a double-width | |
| 6163 * char over the left halve of an existing one. */ | |
| 6164 if (has_mbyte && col + char_cells == endcol | |
| 6165 && ((char_cells == 1 | |
| 1378 | 6166 && (*mb_off2cells)(off_to, max_off_to) > 1) |
| 7 | 6167 || (char_cells == 2 |
| 1378 | 6168 && (*mb_off2cells)(off_to, max_off_to) == 1 |
| 6169 && (*mb_off2cells)(off_to + 1, max_off_to) > 1))) | |
| 7 | 6170 clear_next = TRUE; |
| 6171 #endif | |
| 6172 | |
| 6173 ScreenLines[off_to] = ScreenLines[off_from]; | |
| 6174 #ifdef FEAT_MBYTE | |
| 6175 if (enc_utf8) | |
| 6176 { | |
| 6177 ScreenLinesUC[off_to] = ScreenLinesUC[off_from]; | |
| 6178 if (ScreenLinesUC[off_from] != 0) | |
| 6179 { | |
| 714 | 6180 int i; |
| 6181 | |
| 6182 for (i = 0; i < Screen_mco; ++i) | |
| 6183 ScreenLinesC[i][off_to] = ScreenLinesC[i][off_from]; | |
| 7 | 6184 } |
| 6185 } | |
| 6186 if (char_cells == 2) | |
| 6187 ScreenLines[off_to + 1] = ScreenLines[off_from + 1]; | |
| 6188 #endif | |
| 6189 | |
| 6190 #if defined(FEAT_GUI) || defined(UNIX) | |
| 1843 | 6191 /* The bold trick makes a single column of pixels appear in the |
| 6192 * next character. When a bold character is removed, the next | |
| 7 | 6193 * character should be redrawn too. This happens for our own GUI |
| 6194 * and for some xterms. */ | |
| 6195 if ( | |
| 6196 # ifdef FEAT_GUI | |
| 6197 gui.in_use | |
| 6198 # endif | |
| 6199 # if defined(FEAT_GUI) && defined(UNIX) | |
| 6200 || | |
| 6201 # endif | |
| 6202 # ifdef UNIX | |
| 6203 term_is_xterm | |
| 6204 # endif | |
| 6205 ) | |
| 6206 { | |
| 6207 hl = ScreenAttrs[off_to]; | |
| 743 | 6208 if (hl > HL_ALL) |
| 6209 hl = syn_attr2attr(hl); | |
| 6210 if (hl & HL_BOLD) | |
| 7 | 6211 redraw_next = TRUE; |
| 6212 } | |
| 6213 #endif | |
| 6214 ScreenAttrs[off_to] = ScreenAttrs[off_from]; | |
| 6215 #ifdef FEAT_MBYTE | |
| 819 | 6216 /* For simplicity set the attributes of second half of a |
| 6217 * double-wide character equal to the first half. */ | |
| 6218 if (char_cells == 2) | |
| 6219 ScreenAttrs[off_to + 1] = ScreenAttrs[off_from]; | |
| 6220 | |
| 7 | 6221 if (enc_dbcs != 0 && char_cells == 2) |
| 6222 screen_char_2(off_to, row, col + coloff); | |
| 6223 else | |
| 6224 #endif | |
| 6225 screen_char(off_to, row, col + coloff); | |
| 6226 } | |
| 6227 else if ( p_wiv | |
| 6228 #ifdef FEAT_GUI | |
| 6229 && !gui.in_use | |
| 6230 #endif | |
| 6231 && col + coloff > 0) | |
| 6232 { | |
| 6233 if (ScreenAttrs[off_to] == ScreenAttrs[off_to - 1]) | |
| 6234 { | |
| 6235 /* | |
| 6236 * Don't output stop-highlight when moving the cursor, it will | |
| 6237 * stop the highlighting when it should continue. | |
| 6238 */ | |
| 6239 screen_attr = 0; | |
| 6240 } | |
| 6241 else if (screen_attr != 0) | |
| 6242 screen_stop_highlight(); | |
| 6243 } | |
| 6244 | |
| 6245 off_to += CHAR_CELLS; | |
| 6246 off_from += CHAR_CELLS; | |
| 6247 col += CHAR_CELLS; | |
| 6248 } | |
| 6249 | |
| 6250 #ifdef FEAT_MBYTE | |
| 6251 if (clear_next) | |
| 6252 { | |
| 6253 /* Clear the second half of a double-wide character of which the left | |
| 6254 * half was overwritten with a single-wide character. */ | |
| 6255 ScreenLines[off_to] = ' '; | |
| 6256 if (enc_utf8) | |
| 6257 ScreenLinesUC[off_to] = 0; | |
| 6258 screen_char(off_to, row, col + coloff); | |
| 6259 } | |
| 6260 #endif | |
| 6261 | |
| 6262 if (clear_width > 0 | |
| 6263 #ifdef FEAT_RIGHTLEFT | |
| 6264 && !rlflag | |
| 6265 #endif | |
| 6266 ) | |
| 6267 { | |
| 6268 #ifdef FEAT_GUI | |
| 6269 int startCol = col; | |
| 6270 #endif | |
| 6271 | |
| 6272 /* blank out the rest of the line */ | |
| 6273 while (col < clear_width && ScreenLines[off_to] == ' ' | |
| 6274 && ScreenAttrs[off_to] == 0 | |
| 6275 #ifdef FEAT_MBYTE | |
| 6276 && (!enc_utf8 || ScreenLinesUC[off_to] == 0) | |
| 6277 #endif | |
| 6278 ) | |
| 6279 { | |
| 6280 ++off_to; | |
| 6281 ++col; | |
| 6282 } | |
| 6283 if (col < clear_width) | |
| 6284 { | |
| 6285 #ifdef FEAT_GUI | |
| 6286 /* | |
| 6287 * In the GUI, clearing the rest of the line may leave pixels | |
| 6288 * behind if the first character cleared was bold. Some bold | |
| 6289 * fonts spill over the left. In this case we redraw the previous | |
| 6290 * character too. If we didn't skip any blanks above, then we | |
| 6291 * only redraw if the character wasn't already redrawn anyway. | |
| 6292 */ | |
| 996 | 6293 if (gui.in_use && (col > startCol || !redraw_this)) |
| 7 | 6294 { |
| 6295 hl = ScreenAttrs[off_to]; | |
| 6296 if (hl > HL_ALL || (hl & HL_BOLD)) | |
| 996 | 6297 { |
| 6298 int prev_cells = 1; | |
| 6299 # ifdef FEAT_MBYTE | |
| 6300 if (enc_utf8) | |
| 6301 /* for utf-8, ScreenLines[char_offset + 1] == 0 means | |
| 6302 * that its width is 2. */ | |
| 6303 prev_cells = ScreenLines[off_to - 1] == 0 ? 2 : 1; | |
| 6304 else if (enc_dbcs != 0) | |
| 6305 { | |
| 6306 /* find previous character by counting from first | |
| 6307 * column and get its width. */ | |
| 6308 unsigned off = LineOffset[row]; | |
| 1378 | 6309 unsigned max_off = LineOffset[row] + screen_Columns; |
| 996 | 6310 |
| 6311 while (off < off_to) | |
| 6312 { | |
| 1378 | 6313 prev_cells = (*mb_off2cells)(off, max_off); |
| 996 | 6314 off += prev_cells; |
| 6315 } | |
| 6316 } | |
| 6317 | |
| 6318 if (enc_dbcs != 0 && prev_cells > 1) | |
| 6319 screen_char_2(off_to - prev_cells, row, | |
| 6320 col + coloff - prev_cells); | |
| 6321 else | |
| 6322 # endif | |
| 6323 screen_char(off_to - prev_cells, row, | |
| 6324 col + coloff - prev_cells); | |
| 6325 } | |
| 7 | 6326 } |
| 6327 #endif | |
| 6328 screen_fill(row, row + 1, col + coloff, clear_width + coloff, | |
| 6329 ' ', ' ', 0); | |
|
8643
24b43dd167eb
commit https://github.com/vim/vim/commit/44a2f923c00f1384c9ecde12fb5b4711bc20702e
Christian Brabandt <cb@256bit.org>
parents:
8627
diff
changeset
|
6330 #ifdef FEAT_WINDOWS |
| 7 | 6331 off_to += clear_width - col; |
| 6332 col = clear_width; | |
| 6333 #endif | |
| 6334 } | |
| 6335 } | |
| 6336 | |
| 6337 if (clear_width > 0) | |
| 6338 { | |
|
8643
24b43dd167eb
commit https://github.com/vim/vim/commit/44a2f923c00f1384c9ecde12fb5b4711bc20702e
Christian Brabandt <cb@256bit.org>
parents:
8627
diff
changeset
|
6339 #ifdef FEAT_WINDOWS |
| 7 | 6340 /* For a window that's left of another, draw the separator char. */ |
| 6341 if (col + coloff < Columns) | |
| 6342 { | |
| 6343 int c; | |
| 6344 | |
| 6345 c = fillchar_vsep(&hl); | |
| 6477 | 6346 if (ScreenLines[off_to] != (schar_T)c |
| 7 | 6347 # ifdef FEAT_MBYTE |
| 714 | 6348 || (enc_utf8 && (int)ScreenLinesUC[off_to] |
| 6349 != (c >= 0x80 ? c : 0)) | |
| 7 | 6350 # endif |
| 6351 || ScreenAttrs[off_to] != hl) | |
| 6352 { | |
| 6353 ScreenLines[off_to] = c; | |
| 6354 ScreenAttrs[off_to] = hl; | |
| 6355 # ifdef FEAT_MBYTE | |
| 6356 if (enc_utf8) | |
| 6357 { | |
| 6358 if (c >= 0x80) | |
| 6359 { | |
| 6360 ScreenLinesUC[off_to] = c; | |
| 714 | 6361 ScreenLinesC[0][off_to] = 0; |
| 7 | 6362 } |
| 6363 else | |
| 6364 ScreenLinesUC[off_to] = 0; | |
| 6365 } | |
| 6366 # endif | |
| 6367 screen_char(off_to, row, col + coloff); | |
| 6368 } | |
| 6369 } | |
| 6370 else | |
| 6371 #endif | |
| 6372 LineWraps[row] = FALSE; | |
| 6373 } | |
| 6374 } | |
| 6375 | |
| 474 | 6376 #if defined(FEAT_RIGHTLEFT) || defined(PROTO) |
| 7 | 6377 /* |
| 474 | 6378 * Mirror text "str" for right-left displaying. |
| 6379 * Only works for single-byte characters (e.g., numbers). | |
| 7 | 6380 */ |
| 474 | 6381 void |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6382 rl_mirror(char_u *str) |
| 7 | 6383 { |
| 6384 char_u *p1, *p2; | |
| 6385 int t; | |
| 6386 | |
| 6387 for (p1 = str, p2 = str + STRLEN(str) - 1; p1 < p2; ++p1, --p2) | |
| 6388 { | |
| 6389 t = *p1; | |
| 6390 *p1 = *p2; | |
| 6391 *p2 = t; | |
| 6392 } | |
| 6393 } | |
| 6394 #endif | |
| 6395 | |
| 6396 #if defined(FEAT_WINDOWS) || defined(PROTO) | |
| 6397 /* | |
| 6398 * mark all status lines for redraw; used after first :cd | |
| 6399 */ | |
| 6400 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6401 status_redraw_all(void) |
| 7 | 6402 { |
| 6403 win_T *wp; | |
| 6404 | |
|
9649
fd9727ae3c49
commit https://github.com/vim/vim/commit/2932359000b2f918d5fade79ea4d124d5943cd07
Christian Brabandt <cb@256bit.org>
parents:
9645
diff
changeset
|
6405 FOR_ALL_WINDOWS(wp) |
| 7 | 6406 if (wp->w_status_height) |
| 6407 { | |
| 6408 wp->w_redr_status = TRUE; | |
| 6409 redraw_later(VALID); | |
| 6410 } | |
| 6411 } | |
| 6412 | |
| 6413 /* | |
| 6414 * mark all status lines of the current buffer for redraw | |
| 6415 */ | |
| 6416 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6417 status_redraw_curbuf(void) |
| 7 | 6418 { |
| 6419 win_T *wp; | |
| 6420 | |
|
9649
fd9727ae3c49
commit https://github.com/vim/vim/commit/2932359000b2f918d5fade79ea4d124d5943cd07
Christian Brabandt <cb@256bit.org>
parents:
9645
diff
changeset
|
6421 FOR_ALL_WINDOWS(wp) |
| 7 | 6422 if (wp->w_status_height != 0 && wp->w_buffer == curbuf) |
| 6423 { | |
| 6424 wp->w_redr_status = TRUE; | |
| 6425 redraw_later(VALID); | |
| 6426 } | |
| 6427 } | |
| 6428 | |
| 6429 /* | |
| 6430 * Redraw all status lines that need to be redrawn. | |
| 6431 */ | |
| 6432 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6433 redraw_statuslines(void) |
| 7 | 6434 { |
| 6435 win_T *wp; | |
| 6436 | |
|
9649
fd9727ae3c49
commit https://github.com/vim/vim/commit/2932359000b2f918d5fade79ea4d124d5943cd07
Christian Brabandt <cb@256bit.org>
parents:
9645
diff
changeset
|
6437 FOR_ALL_WINDOWS(wp) |
| 7 | 6438 if (wp->w_redr_status) |
| 6439 win_redr_status(wp); | |
| 673 | 6440 if (redraw_tabline) |
| 677 | 6441 draw_tabline(); |
| 7 | 6442 } |
| 6443 #endif | |
| 6444 | |
|
8643
24b43dd167eb
commit https://github.com/vim/vim/commit/44a2f923c00f1384c9ecde12fb5b4711bc20702e
Christian Brabandt <cb@256bit.org>
parents:
8627
diff
changeset
|
6445 #if (defined(FEAT_WILDMENU) && defined(FEAT_WINDOWS)) || defined(PROTO) |
| 7 | 6446 /* |
| 6447 * Redraw all status lines at the bottom of frame "frp". | |
| 6448 */ | |
| 6449 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6450 win_redraw_last_status(frame_T *frp) |
| 7 | 6451 { |
| 6452 if (frp->fr_layout == FR_LEAF) | |
| 6453 frp->fr_win->w_redr_status = TRUE; | |
| 6454 else if (frp->fr_layout == FR_ROW) | |
| 6455 { | |
| 6456 for (frp = frp->fr_child; frp != NULL; frp = frp->fr_next) | |
| 6457 win_redraw_last_status(frp); | |
| 6458 } | |
| 6459 else /* frp->fr_layout == FR_COL */ | |
| 6460 { | |
| 6461 frp = frp->fr_child; | |
| 6462 while (frp->fr_next != NULL) | |
| 6463 frp = frp->fr_next; | |
| 6464 win_redraw_last_status(frp); | |
| 6465 } | |
| 6466 } | |
| 6467 #endif | |
| 6468 | |
|
8643
24b43dd167eb
commit https://github.com/vim/vim/commit/44a2f923c00f1384c9ecde12fb5b4711bc20702e
Christian Brabandt <cb@256bit.org>
parents:
8627
diff
changeset
|
6469 #ifdef FEAT_WINDOWS |
| 7 | 6470 /* |
| 6471 * Draw the verticap separator right of window "wp" starting with line "row". | |
| 6472 */ | |
| 6473 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6474 draw_vsep_win(win_T *wp, int row) |
| 7 | 6475 { |
| 6476 int hl; | |
| 6477 int c; | |
| 6478 | |
| 6479 if (wp->w_vsep_width) | |
| 6480 { | |
| 6481 /* draw the vertical separator right of this window */ | |
| 6482 c = fillchar_vsep(&hl); | |
| 6483 screen_fill(W_WINROW(wp) + row, W_WINROW(wp) + wp->w_height, | |
| 6484 W_ENDCOL(wp), W_ENDCOL(wp) + 1, | |
| 6485 c, ' ', hl); | |
| 6486 } | |
| 6487 } | |
| 6488 #endif | |
| 6489 | |
| 6490 #ifdef FEAT_WILDMENU | |
|
7805
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7697
diff
changeset
|
6491 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
|
6492 static int skip_status_match_char(expand_T *xp, char_u *s); |
| 7 | 6493 |
| 6494 /* | |
| 1378 | 6495 * Get the length of an item as it will be shown in the status line. |
| 7 | 6496 */ |
| 6497 static int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6498 status_match_len(expand_T *xp, char_u *s) |
| 7 | 6499 { |
| 6500 int len = 0; | |
| 6501 | |
| 6502 #ifdef FEAT_MENU | |
| 6503 int emenu = (xp->xp_context == EXPAND_MENUS | |
| 6504 || xp->xp_context == EXPAND_MENUNAMES); | |
| 6505 | |
| 6506 /* Check for menu separators - replace with '|'. */ | |
| 6507 if (emenu && menu_is_separator(s)) | |
| 6508 return 1; | |
| 6509 #endif | |
| 6510 | |
| 6511 while (*s != NUL) | |
| 6512 { | |
| 1685 | 6513 s += skip_status_match_char(xp, s); |
| 42 | 6514 len += ptr2cells(s); |
|
11127
506f5d8b7d8b
patch 8.0.0451: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11121
diff
changeset
|
6515 MB_PTR_ADV(s); |
| 7 | 6516 } |
| 6517 | |
| 6518 return len; | |
| 6519 } | |
| 6520 | |
| 6521 /* | |
| 1685 | 6522 * Return the number of characters that should be skipped in a status match. |
| 277 | 6523 * These are backslashes used for escaping. Do show backslashes in help tags. |
| 6524 */ | |
| 6525 static int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6526 skip_status_match_char(expand_T *xp, char_u *s) |
| 277 | 6527 { |
| 1685 | 6528 if ((rem_backslash(s) && xp->xp_context != EXPAND_HELP) |
| 277 | 6529 #ifdef FEAT_MENU |
| 6530 || ((xp->xp_context == EXPAND_MENUS | |
| 6531 || xp->xp_context == EXPAND_MENUNAMES) | |
| 6532 && (s[0] == '\t' || (s[0] == '\\' && s[1] != NUL))) | |
| 6533 #endif | |
| 1685 | 6534 ) |
| 6535 { | |
| 6536 #ifndef BACKSLASH_IN_FILENAME | |
| 6537 if (xp->xp_shell && csh_like_shell() && s[1] == '\\' && s[2] == '!') | |
| 6538 return 2; | |
| 6539 #endif | |
| 6540 return 1; | |
| 6541 } | |
| 6542 return 0; | |
| 277 | 6543 } |
| 6544 | |
| 6545 /* | |
| 7 | 6546 * Show wildchar matches in the status line. |
| 6547 * Show at least the "match" item. | |
| 6548 * We start at item 'first_match' in the list and show all matches that fit. | |
| 6549 * | |
| 6550 * If inversion is possible we use it. Else '=' characters are used. | |
| 6551 */ | |
| 6552 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6553 win_redr_status_matches( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6554 expand_T *xp, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6555 int num_matches, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6556 char_u **matches, /* list of matches */ |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6557 int match, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6558 int showtail) |
| 7 | 6559 { |
| 6560 #define L_MATCH(m) (showtail ? sm_gettail(matches[m]) : matches[m]) | |
| 6561 int row; | |
| 6562 char_u *buf; | |
| 6563 int len; | |
| 1378 | 6564 int clen; /* length in screen cells */ |
| 7 | 6565 int fillchar; |
| 6566 int attr; | |
| 6567 int i; | |
| 6568 int highlight = TRUE; | |
| 6569 char_u *selstart = NULL; | |
| 6570 int selstart_col = 0; | |
| 6571 char_u *selend = NULL; | |
| 6572 static int first_match = 0; | |
| 6573 int add_left = FALSE; | |
| 6574 char_u *s; | |
| 6575 #ifdef FEAT_MENU | |
| 6576 int emenu; | |
| 6577 #endif | |
| 6578 #if defined(FEAT_MBYTE) || defined(FEAT_MENU) | |
| 6579 int l; | |
| 6580 #endif | |
| 6581 | |
| 6582 if (matches == NULL) /* interrupted completion? */ | |
| 6583 return; | |
| 6584 | |
| 39 | 6585 #ifdef FEAT_MBYTE |
| 6586 if (has_mbyte) | |
| 6587 buf = alloc((unsigned)Columns * MB_MAXBYTES + 1); | |
| 6588 else | |
| 6589 #endif | |
| 6590 buf = alloc((unsigned)Columns + 1); | |
| 7 | 6591 if (buf == NULL) |
| 6592 return; | |
| 6593 | |
| 6594 if (match == -1) /* don't show match but original text */ | |
| 6595 { | |
| 6596 match = 0; | |
| 6597 highlight = FALSE; | |
| 6598 } | |
| 6599 /* count 1 for the ending ">" */ | |
| 6600 clen = status_match_len(xp, L_MATCH(match)) + 3; | |
| 6601 if (match == 0) | |
| 6602 first_match = 0; | |
| 6603 else if (match < first_match) | |
| 6604 { | |
| 6605 /* jumping left, as far as we can go */ | |
| 6606 first_match = match; | |
| 6607 add_left = TRUE; | |
| 6608 } | |
| 6609 else | |
| 6610 { | |
| 6611 /* check if match fits on the screen */ | |
| 6612 for (i = first_match; i < match; ++i) | |
| 6613 clen += status_match_len(xp, L_MATCH(i)) + 2; | |
| 6614 if (first_match > 0) | |
| 6615 clen += 2; | |
| 6616 /* jumping right, put match at the left */ | |
| 6617 if ((long)clen > Columns) | |
| 6618 { | |
| 6619 first_match = match; | |
| 6620 /* if showing the last match, we can add some on the left */ | |
| 6621 clen = 2; | |
| 6622 for (i = match; i < num_matches; ++i) | |
| 6623 { | |
| 6624 clen += status_match_len(xp, L_MATCH(i)) + 2; | |
| 6625 if ((long)clen >= Columns) | |
| 6626 break; | |
| 6627 } | |
| 6628 if (i == num_matches) | |
| 6629 add_left = TRUE; | |
| 6630 } | |
| 6631 } | |
| 6632 if (add_left) | |
| 6633 while (first_match > 0) | |
| 6634 { | |
| 6635 clen += status_match_len(xp, L_MATCH(first_match - 1)) + 2; | |
| 6636 if ((long)clen >= Columns) | |
| 6637 break; | |
| 6638 --first_match; | |
| 6639 } | |
| 6640 | |
| 6641 fillchar = fillchar_status(&attr, TRUE); | |
| 6642 | |
| 6643 if (first_match == 0) | |
| 6644 { | |
| 6645 *buf = NUL; | |
| 6646 len = 0; | |
| 6647 } | |
| 6648 else | |
| 6649 { | |
| 6650 STRCPY(buf, "< "); | |
| 6651 len = 2; | |
| 6652 } | |
| 6653 clen = len; | |
| 6654 | |
| 6655 i = first_match; | |
| 6656 while ((long)(clen + status_match_len(xp, L_MATCH(i)) + 2) < Columns) | |
| 6657 { | |
| 6658 if (i == match) | |
| 6659 { | |
| 6660 selstart = buf + len; | |
| 6661 selstart_col = clen; | |
| 6662 } | |
| 6663 | |
| 6664 s = L_MATCH(i); | |
| 6665 /* Check for menu separators - replace with '|' */ | |
| 6666 #ifdef FEAT_MENU | |
| 6667 emenu = (xp->xp_context == EXPAND_MENUS | |
| 6668 || xp->xp_context == EXPAND_MENUNAMES); | |
| 6669 if (emenu && menu_is_separator(s)) | |
| 6670 { | |
| 6671 STRCPY(buf + len, transchar('|')); | |
| 6672 l = (int)STRLEN(buf + len); | |
| 6673 len += l; | |
| 6674 clen += l; | |
| 6675 } | |
| 6676 else | |
| 6677 #endif | |
| 6678 for ( ; *s != NUL; ++s) | |
| 6679 { | |
| 1685 | 6680 s += skip_status_match_char(xp, s); |
| 7 | 6681 clen += ptr2cells(s); |
| 6682 #ifdef FEAT_MBYTE | |
| 474 | 6683 if (has_mbyte && (l = (*mb_ptr2len)(s)) > 1) |
| 7 | 6684 { |
| 6685 STRNCPY(buf + len, s, l); | |
| 6686 s += l - 1; | |
| 6687 len += l; | |
| 6688 } | |
| 6689 else | |
| 6690 #endif | |
| 6691 { | |
| 6692 STRCPY(buf + len, transchar_byte(*s)); | |
| 6693 len += (int)STRLEN(buf + len); | |
| 6694 } | |
| 6695 } | |
| 6696 if (i == match) | |
| 6697 selend = buf + len; | |
| 6698 | |
| 6699 *(buf + len++) = ' '; | |
| 6700 *(buf + len++) = ' '; | |
| 6701 clen += 2; | |
| 6702 if (++i == num_matches) | |
| 6703 break; | |
| 6704 } | |
| 6705 | |
| 6706 if (i != num_matches) | |
| 6707 { | |
| 6708 *(buf + len++) = '>'; | |
| 6709 ++clen; | |
| 6710 } | |
| 6711 | |
| 6712 buf[len] = NUL; | |
| 6713 | |
| 6714 row = cmdline_row - 1; | |
| 6715 if (row >= 0) | |
| 6716 { | |
| 6717 if (wild_menu_showing == 0) | |
| 6718 { | |
| 6719 if (msg_scrolled > 0) | |
| 6720 { | |
| 6721 /* Put the wildmenu just above the command line. If there is | |
| 6722 * no room, scroll the screen one line up. */ | |
| 6723 if (cmdline_row == Rows - 1) | |
| 6724 { | |
| 6725 screen_del_lines(0, 0, 1, (int)Rows, TRUE, NULL); | |
| 6726 ++msg_scrolled; | |
| 6727 } | |
| 6728 else | |
| 6729 { | |
| 6730 ++cmdline_row; | |
| 6731 ++row; | |
| 6732 } | |
| 6733 wild_menu_showing = WM_SCROLLED; | |
| 6734 } | |
| 6735 else | |
| 6736 { | |
| 6737 /* Create status line if needed by setting 'laststatus' to 2. | |
| 6738 * Set 'winminheight' to zero to avoid that the window is | |
| 6739 * resized. */ | |
| 6740 if (lastwin->w_status_height == 0) | |
| 6741 { | |
| 6742 save_p_ls = p_ls; | |
| 6743 save_p_wmh = p_wmh; | |
| 6744 p_ls = 2; | |
| 6745 p_wmh = 0; | |
| 6746 last_status(FALSE); | |
| 6747 } | |
| 6748 wild_menu_showing = WM_SHOWN; | |
| 6749 } | |
| 6750 } | |
| 6751 | |
| 6752 screen_puts(buf, row, 0, attr); | |
| 6753 if (selstart != NULL && highlight) | |
| 6754 { | |
| 6755 *selend = NUL; | |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
6756 screen_puts(selstart, row, selstart_col, HL_ATTR(HLF_WM)); |
| 7 | 6757 } |
| 6758 | |
| 6759 screen_fill(row, row + 1, clen, (int)Columns, fillchar, fillchar, attr); | |
| 6760 } | |
| 6761 | |
|
8643
24b43dd167eb
commit https://github.com/vim/vim/commit/44a2f923c00f1384c9ecde12fb5b4711bc20702e
Christian Brabandt <cb@256bit.org>
parents:
8627
diff
changeset
|
6762 #ifdef FEAT_WINDOWS |
| 7 | 6763 win_redraw_last_status(topframe); |
| 6764 #else | |
| 6765 lastwin->w_redr_status = TRUE; | |
| 6766 #endif | |
| 6767 vim_free(buf); | |
| 6768 } | |
| 6769 #endif | |
| 6770 | |
| 6771 #if defined(FEAT_WINDOWS) || defined(PROTO) | |
| 6772 /* | |
| 6773 * Redraw the status line of window wp. | |
| 6774 * | |
| 6775 * If inversion is possible we use it. Else '=' characters are used. | |
| 6776 */ | |
| 6777 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6778 win_redr_status(win_T *wp) |
| 7 | 6779 { |
| 6780 int row; | |
| 6781 char_u *p; | |
| 6782 int len; | |
| 6783 int fillchar; | |
| 6784 int attr; | |
| 6785 int this_ru_col; | |
| 1910 | 6786 static int busy = FALSE; |
| 6787 | |
| 6788 /* It's possible to get here recursively when 'statusline' (indirectly) | |
| 6789 * invokes ":redrawstatus". Simply ignore the call then. */ | |
| 6790 if (busy) | |
| 6791 return; | |
| 6792 busy = TRUE; | |
| 7 | 6793 |
| 6794 wp->w_redr_status = FALSE; | |
| 6795 if (wp->w_status_height == 0) | |
| 6796 { | |
| 6797 /* no status line, can only be last window */ | |
| 6798 redraw_cmdline = TRUE; | |
| 6799 } | |
| 540 | 6800 else if (!redrawing() |
| 6801 #ifdef FEAT_INS_EXPAND | |
| 6802 /* don't update status line when popup menu is visible and may be | |
| 6803 * drawn over it */ | |
| 6804 || pum_visible() | |
| 6805 #endif | |
| 6806 ) | |
| 7 | 6807 { |
| 6808 /* Don't redraw right now, do it later. */ | |
| 6809 wp->w_redr_status = TRUE; | |
| 6810 } | |
| 6811 #ifdef FEAT_STL_OPT | |
| 40 | 6812 else if (*p_stl != NUL || *wp->w_p_stl != NUL) |
| 7 | 6813 { |
| 6814 /* redraw custom status line */ | |
| 1983 | 6815 redraw_custom_statusline(wp); |
| 7 | 6816 } |
| 6817 #endif | |
| 6818 else | |
| 6819 { | |
| 6820 fillchar = fillchar_status(&attr, wp == curwin); | |
| 6821 | |
| 685 | 6822 get_trans_bufname(wp->w_buffer); |
| 7 | 6823 p = NameBuff; |
| 6824 len = (int)STRLEN(p); | |
| 6825 | |
| 6826 if (wp->w_buffer->b_help | |
| 6827 #ifdef FEAT_QUICKFIX | |
| 6828 || wp->w_p_pvw | |
| 6829 #endif | |
| 6830 || bufIsChanged(wp->w_buffer) | |
| 6831 || wp->w_buffer->b_p_ro) | |
| 6832 *(p + len++) = ' '; | |
| 6833 if (wp->w_buffer->b_help) | |
| 6834 { | |
| 809 | 6835 STRCPY(p + len, _("[Help]")); |
| 7 | 6836 len += (int)STRLEN(p + len); |
| 6837 } | |
| 6838 #ifdef FEAT_QUICKFIX | |
| 6839 if (wp->w_p_pvw) | |
| 6840 { | |
| 6841 STRCPY(p + len, _("[Preview]")); | |
| 6842 len += (int)STRLEN(p + len); | |
| 6843 } | |
| 6844 #endif | |
| 6845 if (bufIsChanged(wp->w_buffer)) | |
| 6846 { | |
| 6847 STRCPY(p + len, "[+]"); | |
| 6848 len += 3; | |
| 6849 } | |
| 6850 if (wp->w_buffer->b_p_ro) | |
| 6851 { | |
|
4795
8360a59aa04b
updated for version 7.3.1144
Bram Moolenaar <bram@vim.org>
parents:
4736
diff
changeset
|
6852 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
|
6853 len += (int)STRLEN(p + len); |
| 7 | 6854 } |
| 6855 | |
| 6856 this_ru_col = ru_col - (Columns - W_WIDTH(wp)); | |
| 6857 if (this_ru_col < (W_WIDTH(wp) + 1) / 2) | |
| 6858 this_ru_col = (W_WIDTH(wp) + 1) / 2; | |
| 6859 if (this_ru_col <= 1) | |
| 6860 { | |
| 6861 p = (char_u *)"<"; /* No room for file name! */ | |
| 6862 len = 1; | |
| 6863 } | |
| 6864 else | |
| 6865 #ifdef FEAT_MBYTE | |
| 6866 if (has_mbyte) | |
| 6867 { | |
| 6868 int clen = 0, i; | |
| 6869 | |
| 6870 /* Count total number of display cells. */ | |
|
2338
da6ec32d8d8f
Added strwidth() and strchars() functions.
Bram Moolenaar <bram@vim.org>
parents:
2332
diff
changeset
|
6871 clen = mb_string2cells(p, -1); |
|
da6ec32d8d8f
Added strwidth() and strchars() functions.
Bram Moolenaar <bram@vim.org>
parents:
2332
diff
changeset
|
6872 |
| 7 | 6873 /* Find first character that will fit. |
| 6874 * Going from start to end is much faster for DBCS. */ | |
| 6875 for (i = 0; p[i] != NUL && clen >= this_ru_col - 1; | |
| 474 | 6876 i += (*mb_ptr2len)(p + i)) |
| 7 | 6877 clen -= (*mb_ptr2cells)(p + i); |
| 6878 len = clen; | |
| 6879 if (i > 0) | |
| 6880 { | |
| 6881 p = p + i - 1; | |
| 6882 *p = '<'; | |
| 6883 ++len; | |
| 6884 } | |
| 6885 | |
| 6886 } | |
| 6887 else | |
| 6888 #endif | |
| 6889 if (len > this_ru_col - 1) | |
| 6890 { | |
| 6891 p += len - (this_ru_col - 1); | |
| 6892 *p = '<'; | |
| 6893 len = this_ru_col - 1; | |
| 6894 } | |
| 6895 | |
| 6896 row = W_WINROW(wp) + wp->w_height; | |
| 6897 screen_puts(p, row, W_WINCOL(wp), attr); | |
| 6898 screen_fill(row, row + 1, len + W_WINCOL(wp), | |
| 6899 this_ru_col + W_WINCOL(wp), fillchar, fillchar, attr); | |
| 6900 | |
|
9645
123d3c102035
commit https://github.com/vim/vim/commit/73ac0c4281a3606651604a3cbcc334bfb3859a87
Christian Brabandt <cb@256bit.org>
parents:
9489
diff
changeset
|
6901 if (get_keymap_str(wp, (char_u *)"<%s>", NameBuff, MAXPATHL) |
| 7 | 6902 && (int)(this_ru_col - len) > (int)(STRLEN(NameBuff) + 1)) |
| 6903 screen_puts(NameBuff, row, (int)(this_ru_col - STRLEN(NameBuff) | |
| 6904 - 1 + W_WINCOL(wp)), attr); | |
| 6905 | |
| 6906 #ifdef FEAT_CMDL_INFO | |
| 6907 win_redr_ruler(wp, TRUE); | |
| 6908 #endif | |
| 6909 } | |
| 6910 | |
| 6911 /* | |
| 6912 * May need to draw the character below the vertical separator. | |
| 6913 */ | |
| 6914 if (wp->w_vsep_width != 0 && wp->w_status_height != 0 && redrawing()) | |
| 6915 { | |
| 6916 if (stl_connected(wp)) | |
| 6917 fillchar = fillchar_status(&attr, wp == curwin); | |
| 6918 else | |
| 6919 fillchar = fillchar_vsep(&attr); | |
| 6920 screen_putchar(fillchar, W_WINROW(wp) + wp->w_height, W_ENDCOL(wp), | |
| 6921 attr); | |
| 6922 } | |
| 1910 | 6923 busy = FALSE; |
| 7 | 6924 } |
| 6925 | |
| 680 | 6926 #ifdef FEAT_STL_OPT |
| 6927 /* | |
| 6928 * Redraw the status line according to 'statusline' and take care of any | |
| 6929 * errors encountered. | |
| 6930 */ | |
| 6931 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6932 redraw_custom_statusline(win_T *wp) |
| 680 | 6933 { |
| 1983 | 6934 static int entered = FALSE; |
|
8847
470ea7526cc6
commit https://github.com/vim/vim/commit/a742e084b677f76c67e9e52c4f9fb9ab24002e20
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
6935 int saved_did_emsg = did_emsg; |
| 1983 | 6936 |
| 6937 /* When called recursively return. This can happen when the statusline | |
| 6938 * contains an expression that triggers a redraw. */ | |
| 6939 if (entered) | |
| 6940 return; | |
| 6941 entered = TRUE; | |
| 680 | 6942 |
|
8847
470ea7526cc6
commit https://github.com/vim/vim/commit/a742e084b677f76c67e9e52c4f9fb9ab24002e20
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
6943 did_emsg = FALSE; |
| 680 | 6944 win_redr_custom(wp, FALSE); |
|
8847
470ea7526cc6
commit https://github.com/vim/vim/commit/a742e084b677f76c67e9e52c4f9fb9ab24002e20
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
6945 if (did_emsg) |
| 1983 | 6946 { |
| 6947 /* When there is an error disable the statusline, otherwise the | |
| 6948 * display is messed up with errors and a redraw triggers the problem | |
| 6949 * again and again. */ | |
| 680 | 6950 set_string_option_direct((char_u *)"statusline", -1, |
| 6951 (char_u *)"", OPT_FREE | (*wp->w_p_stl != NUL | |
| 694 | 6952 ? OPT_LOCAL : OPT_GLOBAL), SID_ERROR); |
| 1983 | 6953 } |
|
8847
470ea7526cc6
commit https://github.com/vim/vim/commit/a742e084b677f76c67e9e52c4f9fb9ab24002e20
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
6954 did_emsg |= saved_did_emsg; |
| 1983 | 6955 entered = FALSE; |
| 680 | 6956 } |
| 6957 #endif | |
| 6958 | |
| 7 | 6959 /* |
| 6960 * Return TRUE if the status line of window "wp" is connected to the status | |
| 6961 * line of the window right of it. If not, then it's a vertical separator. | |
| 6962 * Only call if (wp->w_vsep_width != 0). | |
| 6963 */ | |
| 6964 int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6965 stl_connected(win_T *wp) |
| 7 | 6966 { |
| 6967 frame_T *fr; | |
| 6968 | |
| 6969 fr = wp->w_frame; | |
| 6970 while (fr->fr_parent != NULL) | |
| 6971 { | |
| 6972 if (fr->fr_parent->fr_layout == FR_COL) | |
| 6973 { | |
| 6974 if (fr->fr_next != NULL) | |
| 6975 break; | |
| 6976 } | |
| 6977 else | |
| 6978 { | |
| 6979 if (fr->fr_next != NULL) | |
| 6980 return TRUE; | |
| 6981 } | |
| 6982 fr = fr->fr_parent; | |
| 6983 } | |
| 6984 return FALSE; | |
| 6985 } | |
| 6986 | |
| 6987 #endif /* FEAT_WINDOWS */ | |
| 6988 | |
| 6989 #if defined(FEAT_WINDOWS) || defined(FEAT_STL_OPT) || defined(PROTO) | |
| 6990 /* | |
| 6991 * Get the value to show for the language mappings, active 'keymap'. | |
| 6992 */ | |
| 6993 int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6994 get_keymap_str( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6995 win_T *wp, |
|
9645
123d3c102035
commit https://github.com/vim/vim/commit/73ac0c4281a3606651604a3cbcc334bfb3859a87
Christian Brabandt <cb@256bit.org>
parents:
9489
diff
changeset
|
6996 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
|
6997 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
|
6998 int len) /* length of buffer */ |
| 7 | 6999 { |
| 7000 char_u *p; | |
| 7001 | |
| 7002 if (wp->w_buffer->b_p_iminsert != B_IMODE_LMAP) | |
| 7003 return FALSE; | |
| 7004 | |
| 7005 { | |
| 7006 #ifdef FEAT_EVAL | |
| 7007 buf_T *old_curbuf = curbuf; | |
| 7008 win_T *old_curwin = curwin; | |
| 7009 char_u *s; | |
| 7010 | |
| 7011 curbuf = wp->w_buffer; | |
| 7012 curwin = wp; | |
| 7013 STRCPY(buf, "b:keymap_name"); /* must be writable */ | |
| 7014 ++emsg_skip; | |
| 714 | 7015 s = p = eval_to_string(buf, NULL, FALSE); |
| 7 | 7016 --emsg_skip; |
| 7017 curbuf = old_curbuf; | |
| 7018 curwin = old_curwin; | |
| 7019 if (p == NULL || *p == NUL) | |
| 7020 #endif | |
| 7021 { | |
| 7022 #ifdef FEAT_KEYMAP | |
| 7023 if (wp->w_buffer->b_kmap_state & KEYMAP_LOADED) | |
| 7024 p = wp->w_buffer->b_p_keymap; | |
| 7025 else | |
| 7026 #endif | |
| 7027 p = (char_u *)"lang"; | |
| 7028 } | |
|
9645
123d3c102035
commit https://github.com/vim/vim/commit/73ac0c4281a3606651604a3cbcc334bfb3859a87
Christian Brabandt <cb@256bit.org>
parents:
9489
diff
changeset
|
7029 if (vim_snprintf((char *)buf, len, (char *)fmt, p) > len - 1) |
| 7 | 7030 buf[0] = NUL; |
| 7031 #ifdef FEAT_EVAL | |
| 7032 vim_free(s); | |
| 7033 #endif | |
| 7034 } | |
| 7035 return buf[0] != NUL; | |
| 7036 } | |
| 7037 #endif | |
| 7038 | |
| 7039 #if defined(FEAT_STL_OPT) || defined(PROTO) | |
| 7040 /* | |
| 677 | 7041 * Redraw the status line or ruler of window "wp". |
| 7042 * When "wp" is NULL redraw the tab pages line from 'tabline'. | |
| 7 | 7043 */ |
| 7044 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7045 win_redr_custom( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7046 win_T *wp, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7047 int draw_ruler) /* TRUE or FALSE */ |
| 7 | 7048 { |
| 5539 | 7049 static int entered = FALSE; |
| 7 | 7050 int attr; |
| 7051 int curattr; | |
| 7052 int row; | |
| 7053 int col = 0; | |
| 7054 int maxwidth; | |
| 7055 int width; | |
| 7056 int n; | |
| 7057 int len; | |
| 7058 int fillchar; | |
| 7059 char_u buf[MAXPATHL]; | |
| 1983 | 7060 char_u *stl; |
| 7 | 7061 char_u *p; |
| 681 | 7062 struct stl_hlrec hltab[STL_MAX_ITEM]; |
| 7063 struct stl_hlrec tabtab[STL_MAX_ITEM]; | |
| 677 | 7064 int use_sandbox = FALSE; |
| 2693 | 7065 win_T *ewp; |
| 7066 int p_crb_save; | |
| 7 | 7067 |
| 5539 | 7068 /* There is a tiny chance that this gets called recursively: When |
| 7069 * redrawing a status line triggers redrawing the ruler or tabline. | |
| 7070 * Avoid trouble by not allowing recursion. */ | |
| 7071 if (entered) | |
| 7072 return; | |
| 7073 entered = TRUE; | |
| 7074 | |
| 7 | 7075 /* setup environment for the task at hand */ |
| 677 | 7076 if (wp == NULL) |
| 7077 { | |
| 7078 /* Use 'tabline'. Always at the first line of the screen. */ | |
| 1983 | 7079 stl = p_tal; |
| 677 | 7080 row = 0; |
| 707 | 7081 fillchar = ' '; |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
7082 attr = HL_ATTR(HLF_TPF); |
| 677 | 7083 maxwidth = Columns; |
| 7084 # ifdef FEAT_EVAL | |
| 681 | 7085 use_sandbox = was_set_insecurely((char_u *)"tabline", 0); |
| 677 | 7086 # endif |
| 7087 } | |
| 40 | 7088 else |
| 677 | 7089 { |
| 7090 row = W_WINROW(wp) + wp->w_height; | |
| 7091 fillchar = fillchar_status(&attr, wp == curwin); | |
| 7092 maxwidth = W_WIDTH(wp); | |
| 7093 | |
| 7094 if (draw_ruler) | |
| 7095 { | |
| 1983 | 7096 stl = p_ruf; |
| 677 | 7097 /* advance past any leading group spec - implicit in ru_col */ |
| 1983 | 7098 if (*stl == '%') |
| 7099 { | |
| 7100 if (*++stl == '-') | |
| 7101 stl++; | |
| 7102 if (atoi((char *)stl)) | |
| 7103 while (VIM_ISDIGIT(*stl)) | |
| 7104 stl++; | |
| 7105 if (*stl++ != '(') | |
| 7106 stl = p_ruf; | |
| 677 | 7107 } |
|
8643
24b43dd167eb
commit https://github.com/vim/vim/commit/44a2f923c00f1384c9ecde12fb5b4711bc20702e
Christian Brabandt <cb@256bit.org>
parents:
8627
diff
changeset
|
7108 #ifdef FEAT_WINDOWS |
| 677 | 7109 col = ru_col - (Columns - W_WIDTH(wp)); |
| 7110 if (col < (W_WIDTH(wp) + 1) / 2) | |
| 7111 col = (W_WIDTH(wp) + 1) / 2; | |
| 7 | 7112 #else |
| 677 | 7113 col = ru_col; |
| 7114 if (col > (Columns + 1) / 2) | |
| 7115 col = (Columns + 1) / 2; | |
| 7116 #endif | |
| 7117 maxwidth = W_WIDTH(wp) - col; | |
| 7 | 7118 #ifdef FEAT_WINDOWS |
| 677 | 7119 if (!wp->w_status_height) |
| 7120 #endif | |
| 7121 { | |
| 7122 row = Rows - 1; | |
| 7123 --maxwidth; /* writing in last column may cause scrolling */ | |
| 7124 fillchar = ' '; | |
| 7125 attr = 0; | |
| 7126 } | |
| 7127 | |
| 7128 # ifdef FEAT_EVAL | |
| 681 | 7129 use_sandbox = was_set_insecurely((char_u *)"rulerformat", 0); |
| 677 | 7130 # endif |
| 7131 } | |
| 7132 else | |
| 7133 { | |
| 7134 if (*wp->w_p_stl != NUL) | |
| 1983 | 7135 stl = wp->w_p_stl; |
| 677 | 7136 else |
| 1983 | 7137 stl = p_stl; |
| 677 | 7138 # ifdef FEAT_EVAL |
| 681 | 7139 use_sandbox = was_set_insecurely((char_u *)"statusline", |
| 7140 *wp->w_p_stl == NUL ? 0 : OPT_LOCAL); | |
| 677 | 7141 # endif |
| 7142 } | |
| 7143 | |
|
8643
24b43dd167eb
commit https://github.com/vim/vim/commit/44a2f923c00f1384c9ecde12fb5b4711bc20702e
Christian Brabandt <cb@256bit.org>
parents:
8627
diff
changeset
|
7144 #ifdef FEAT_WINDOWS |
| 677 | 7145 col += W_WINCOL(wp); |
| 7146 #endif | |
| 7147 } | |
| 7148 | |
| 7 | 7149 if (maxwidth <= 0) |
| 5539 | 7150 goto theend; |
| 677 | 7151 |
| 2693 | 7152 /* Temporarily reset 'cursorbind', we don't want a side effect from moving |
| 7153 * the cursor away and back. */ | |
| 7154 ewp = wp == NULL ? curwin : wp; | |
| 7155 p_crb_save = ewp->w_p_crb; | |
| 7156 ewp->w_p_crb = FALSE; | |
| 7157 | |
| 1983 | 7158 /* Make a copy, because the statusline may include a function call that |
| 7159 * might change the option value and free the memory. */ | |
| 7160 stl = vim_strsave(stl); | |
| 2693 | 7161 width = build_stl_str_hl(ewp, buf, sizeof(buf), |
| 1983 | 7162 stl, use_sandbox, |
| 681 | 7163 fillchar, maxwidth, hltab, tabtab); |
| 1983 | 7164 vim_free(stl); |
| 2693 | 7165 ewp->w_p_crb = p_crb_save; |
| 2661 | 7166 |
| 7167 /* Make all characters printable. */ | |
| 7168 p = transstr(buf); | |
| 7169 if (p != NULL) | |
| 7170 { | |
| 7171 vim_strncpy(buf, p, sizeof(buf) - 1); | |
| 7172 vim_free(p); | |
| 7173 } | |
| 7174 | |
| 7175 /* fill up with "fillchar" */ | |
| 835 | 7176 len = (int)STRLEN(buf); |
| 1883 | 7177 while (width < maxwidth && len < (int)sizeof(buf) - 1) |
| 7 | 7178 { |
| 7179 #ifdef FEAT_MBYTE | |
| 7180 len += (*mb_char2bytes)(fillchar, buf + len); | |
| 7181 #else | |
| 7182 buf[len++] = fillchar; | |
| 7183 #endif | |
| 7184 ++width; | |
| 7185 } | |
| 7186 buf[len] = NUL; | |
| 7187 | |
| 681 | 7188 /* |
| 7189 * Draw each snippet with the specified highlighting. | |
| 7190 */ | |
| 7 | 7191 curattr = attr; |
| 7192 p = buf; | |
| 681 | 7193 for (n = 0; hltab[n].start != NULL; n++) |
| 7194 { | |
| 7195 len = (int)(hltab[n].start - p); | |
| 7 | 7196 screen_puts_len(p, len, row, col, curattr); |
| 7197 col += vim_strnsize(p, len); | |
| 681 | 7198 p = hltab[n].start; |
| 7199 | |
| 7200 if (hltab[n].userhl == 0) | |
| 7 | 7201 curattr = attr; |
| 681 | 7202 else if (hltab[n].userhl < 0) |
| 7203 curattr = syn_id2attr(-hltab[n].userhl); | |
| 7 | 7204 #ifdef FEAT_WINDOWS |
| 680 | 7205 else if (wp != NULL && wp != curwin && wp->w_status_height != 0) |
| 681 | 7206 curattr = highlight_stlnc[hltab[n].userhl - 1]; |
| 7 | 7207 #endif |
| 7208 else | |
| 681 | 7209 curattr = highlight_user[hltab[n].userhl - 1]; |
| 7 | 7210 } |
| 7211 screen_puts(p, row, col, curattr); | |
| 681 | 7212 |
| 7213 if (wp == NULL) | |
| 7214 { | |
| 7215 /* Fill the TabPageIdxs[] array for clicking in the tab pagesline. */ | |
| 7216 col = 0; | |
| 7217 len = 0; | |
| 7218 p = buf; | |
| 7219 fillchar = 0; | |
| 7220 for (n = 0; tabtab[n].start != NULL; n++) | |
| 7221 { | |
| 7222 len += vim_strnsize(p, (int)(tabtab[n].start - p)); | |
| 7223 while (col < len) | |
| 7224 TabPageIdxs[col++] = fillchar; | |
| 7225 p = tabtab[n].start; | |
| 7226 fillchar = tabtab[n].userhl; | |
| 7227 } | |
| 7228 while (col < Columns) | |
| 7229 TabPageIdxs[col++] = fillchar; | |
| 7230 } | |
| 5539 | 7231 |
| 7232 theend: | |
| 7233 entered = FALSE; | |
| 7 | 7234 } |
| 7235 | |
| 7236 #endif /* FEAT_STL_OPT */ | |
| 7237 | |
| 7238 /* | |
| 7239 * Output a single character directly to the screen and update ScreenLines. | |
| 7240 */ | |
| 7241 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7242 screen_putchar(int c, int row, int col, int attr) |
| 7 | 7243 { |
| 3549 | 7244 char_u buf[MB_MAXBYTES + 1]; |
| 7245 | |
| 7 | 7246 #ifdef FEAT_MBYTE |
| 3549 | 7247 if (has_mbyte) |
| 7248 buf[(*mb_char2bytes)(c, buf)] = NUL; | |
| 7249 else | |
| 7250 #endif | |
| 7251 { | |
| 7252 buf[0] = c; | |
| 7253 buf[1] = NUL; | |
| 7254 } | |
| 7 | 7255 screen_puts(buf, row, col, attr); |
| 7256 } | |
| 7257 | |
| 7258 /* | |
| 7259 * Get a single character directly from ScreenLines into "bytes[]". | |
| 7260 * Also return its attribute in *attrp; | |
| 7261 */ | |
| 7262 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7263 screen_getbytes(int row, int col, char_u *bytes, int *attrp) |
| 7 | 7264 { |
| 7265 unsigned off; | |
| 7266 | |
| 7267 /* safety check */ | |
| 7268 if (ScreenLines != NULL && row < screen_Rows && col < screen_Columns) | |
| 7269 { | |
| 7270 off = LineOffset[row] + col; | |
| 7271 *attrp = ScreenAttrs[off]; | |
| 7272 bytes[0] = ScreenLines[off]; | |
| 7273 bytes[1] = NUL; | |
| 7274 | |
| 7275 #ifdef FEAT_MBYTE | |
| 7276 if (enc_utf8 && ScreenLinesUC[off] != 0) | |
| 7277 bytes[utfc_char2bytes(off, bytes)] = NUL; | |
| 7278 else if (enc_dbcs == DBCS_JPNU && ScreenLines[off] == 0x8e) | |
| 7279 { | |
| 7280 bytes[0] = ScreenLines[off]; | |
| 7281 bytes[1] = ScreenLines2[off]; | |
| 7282 bytes[2] = NUL; | |
| 7283 } | |
| 7284 else if (enc_dbcs && MB_BYTE2LEN(bytes[0]) > 1) | |
| 7285 { | |
| 7286 bytes[1] = ScreenLines[off + 1]; | |
| 7287 bytes[2] = NUL; | |
| 7288 } | |
| 7289 #endif | |
| 7290 } | |
| 7291 } | |
| 7292 | |
| 714 | 7293 #ifdef FEAT_MBYTE |
|
7805
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7697
diff
changeset
|
7294 static int screen_comp_differs(int, int*); |
| 714 | 7295 |
| 7296 /* | |
| 7297 * Return TRUE if composing characters for screen posn "off" differs from | |
| 7298 * composing characters in "u8cc". | |
|
2124
dc8a5699253b
updated for version 7.2.406
Bram Moolenaar <bram@zimbu.org>
parents:
2122
diff
changeset
|
7299 * Only to be used when ScreenLinesUC[off] != 0. |
| 714 | 7300 */ |
| 7301 static int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7302 screen_comp_differs(int off, int *u8cc) |
| 714 | 7303 { |
| 7304 int i; | |
| 7305 | |
| 7306 for (i = 0; i < Screen_mco; ++i) | |
| 7307 { | |
| 7308 if (ScreenLinesC[i][off] != (u8char_T)u8cc[i]) | |
| 7309 return TRUE; | |
| 7310 if (u8cc[i] == 0) | |
| 7311 break; | |
| 7312 } | |
| 7313 return FALSE; | |
| 7314 } | |
| 7315 #endif | |
| 7316 | |
| 7 | 7317 /* |
| 7318 * Put string '*text' on the screen at position 'row' and 'col', with | |
| 7319 * attributes 'attr', and update ScreenLines[] and ScreenAttrs[]. | |
| 7320 * Note: only outputs within one row, message is truncated at screen boundary! | |
| 7321 * Note: if ScreenLines[], row and/or col is invalid, nothing is done. | |
| 7322 */ | |
| 7323 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7324 screen_puts( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7325 char_u *text, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7326 int row, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7327 int col, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7328 int attr) |
| 7 | 7329 { |
| 7330 screen_puts_len(text, -1, row, col, attr); | |
| 7331 } | |
| 7332 | |
| 7333 /* | |
| 7334 * Like screen_puts(), but output "text[len]". When "len" is -1 output up to | |
| 7335 * a NUL. | |
| 7336 */ | |
| 7337 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7338 screen_puts_len( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7339 char_u *text, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7340 int textlen, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7341 int row, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7342 int col, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7343 int attr) |
| 7 | 7344 { |
| 7345 unsigned off; | |
| 7346 char_u *ptr = text; | |
| 5923 | 7347 int len = textlen; |
| 7 | 7348 int c; |
| 7349 #ifdef FEAT_MBYTE | |
| 1378 | 7350 unsigned max_off; |
| 7 | 7351 int mbyte_blen = 1; |
| 7352 int mbyte_cells = 1; | |
| 7353 int u8c = 0; | |
| 714 | 7354 int u8cc[MAX_MCO]; |
| 7 | 7355 int clear_next_cell = FALSE; |
| 7356 # ifdef FEAT_ARABIC | |
| 7357 int prev_c = 0; /* previous Arabic character */ | |
| 714 | 7358 int pc, nc, nc1; |
| 7359 int pcc[MAX_MCO]; | |
| 7 | 7360 # endif |
| 7361 #endif | |
| 1843 | 7362 #if defined(FEAT_MBYTE) || defined(FEAT_GUI) || defined(UNIX) |
| 7363 int force_redraw_this; | |
| 7364 int force_redraw_next = FALSE; | |
| 7365 #endif | |
| 7366 int need_redraw; | |
| 7 | 7367 |
| 7368 if (ScreenLines == NULL || row >= screen_Rows) /* safety check */ | |
| 7369 return; | |
| 1843 | 7370 off = LineOffset[row] + col; |
| 7 | 7371 |
| 1668 | 7372 #ifdef FEAT_MBYTE |
| 7373 /* When drawing over the right halve of a double-wide char clear out the | |
| 7374 * left halve. Only needed in a terminal. */ | |
| 1685 | 7375 if (has_mbyte && col > 0 && col < screen_Columns |
| 1668 | 7376 # ifdef FEAT_GUI |
| 7377 && !gui.in_use | |
| 7378 # endif | |
| 7379 && mb_fix_col(col, row) != col) | |
| 1843 | 7380 { |
| 7381 ScreenLines[off - 1] = ' '; | |
| 7382 ScreenAttrs[off - 1] = 0; | |
| 7383 if (enc_utf8) | |
| 7384 { | |
| 7385 ScreenLinesUC[off - 1] = 0; | |
| 7386 ScreenLinesC[0][off - 1] = 0; | |
| 7387 } | |
| 7388 /* redraw the previous cell, make it empty */ | |
| 7389 screen_char(off - 1, row, col - 1); | |
| 7390 /* force the cell at "col" to be redrawn */ | |
| 7391 force_redraw_next = TRUE; | |
| 7392 } | |
| 7393 #endif | |
| 7394 | |
| 1378 | 7395 #ifdef FEAT_MBYTE |
| 7396 max_off = LineOffset[row] + screen_Columns; | |
| 7397 #endif | |
| 1340 | 7398 while (col < screen_Columns |
| 7399 && (len < 0 || (int)(ptr - text) < len) | |
| 7400 && *ptr != NUL) | |
| 7 | 7401 { |
| 7402 c = *ptr; | |
| 7403 #ifdef FEAT_MBYTE | |
| 7404 /* check if this is the first byte of a multibyte */ | |
| 7405 if (has_mbyte) | |
| 7406 { | |
| 7407 if (enc_utf8 && len > 0) | |
| 474 | 7408 mbyte_blen = utfc_ptr2len_len(ptr, (int)((text + len) - ptr)); |
| 7 | 7409 else |
| 474 | 7410 mbyte_blen = (*mb_ptr2len)(ptr); |
| 7 | 7411 if (enc_dbcs == DBCS_JPNU && c == 0x8e) |
| 7412 mbyte_cells = 1; | |
| 7413 else if (enc_dbcs != 0) | |
| 7414 mbyte_cells = mbyte_blen; | |
| 7415 else /* enc_utf8 */ | |
| 7416 { | |
| 7417 if (len >= 0) | |
| 714 | 7418 u8c = utfc_ptr2char_len(ptr, u8cc, |
| 7 | 7419 (int)((text + len) - ptr)); |
| 7420 else | |
| 714 | 7421 u8c = utfc_ptr2char(ptr, u8cc); |
| 7 | 7422 mbyte_cells = utf_char2cells(u8c); |
| 1401 | 7423 # ifdef UNICODE16 |
| 7 | 7424 /* Non-BMP character: display as ? or fullwidth ?. */ |
| 7425 if (u8c >= 0x10000) | |
| 7426 { | |
| 7427 u8c = (mbyte_cells == 2) ? 0xff1f : (int)'?'; | |
| 7428 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
|
7429 attr = HL_ATTR(HLF_8); |
| 7 | 7430 } |
| 1401 | 7431 # endif |
| 7 | 7432 # ifdef FEAT_ARABIC |
| 7433 if (p_arshape && !p_tbidi && ARABIC_CHAR(u8c)) | |
| 7434 { | |
| 7435 /* Do Arabic shaping. */ | |
| 7436 if (len >= 0 && (int)(ptr - text) + mbyte_blen >= len) | |
| 7437 { | |
| 7438 /* Past end of string to be displayed. */ | |
| 7439 nc = NUL; | |
| 7440 nc1 = NUL; | |
| 7441 } | |
| 7442 else | |
| 714 | 7443 { |
| 1994 | 7444 nc = utfc_ptr2char_len(ptr + mbyte_blen, pcc, |
| 7445 (int)((text + len) - ptr - mbyte_blen)); | |
| 714 | 7446 nc1 = pcc[0]; |
| 7447 } | |
| 7 | 7448 pc = prev_c; |
| 7449 prev_c = u8c; | |
| 714 | 7450 u8c = arabic_shape(u8c, &c, &u8cc[0], nc, nc1, pc); |
| 7 | 7451 } |
| 7452 else | |
| 7453 prev_c = u8c; | |
| 7454 # endif | |
|
2055
4aa4510d548c
updated for version 7.2.341
Bram Moolenaar <bram@zimbu.org>
parents:
2008
diff
changeset
|
7455 if (col + mbyte_cells > screen_Columns) |
|
4aa4510d548c
updated for version 7.2.341
Bram Moolenaar <bram@zimbu.org>
parents:
2008
diff
changeset
|
7456 { |
|
4aa4510d548c
updated for version 7.2.341
Bram Moolenaar <bram@zimbu.org>
parents:
2008
diff
changeset
|
7457 /* 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
|
7458 * 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
|
7459 c = '>'; |
|
4aa4510d548c
updated for version 7.2.341
Bram Moolenaar <bram@zimbu.org>
parents:
2008
diff
changeset
|
7460 mbyte_cells = 1; |
|
4aa4510d548c
updated for version 7.2.341
Bram Moolenaar <bram@zimbu.org>
parents:
2008
diff
changeset
|
7461 } |
| 7 | 7462 } |
| 7463 } | |
| 7464 #endif | |
| 7465 | |
| 1843 | 7466 #if defined(FEAT_MBYTE) || defined(FEAT_GUI) || defined(UNIX) |
| 7467 force_redraw_this = force_redraw_next; | |
| 7468 force_redraw_next = FALSE; | |
| 7469 #endif | |
| 7470 | |
| 7471 need_redraw = ScreenLines[off] != c | |
| 7 | 7472 #ifdef FEAT_MBYTE |
| 7473 || (mbyte_cells == 2 | |
| 7474 && ScreenLines[off + 1] != (enc_dbcs ? ptr[1] : 0)) | |
| 7475 || (enc_dbcs == DBCS_JPNU | |
| 7476 && c == 0x8e | |
| 7477 && ScreenLines2[off] != ptr[1]) | |
| 7478 || (enc_utf8 | |
|
2124
dc8a5699253b
updated for version 7.2.406
Bram Moolenaar <bram@zimbu.org>
parents:
2122
diff
changeset
|
7479 && (ScreenLinesUC[off] != |
|
dc8a5699253b
updated for version 7.2.406
Bram Moolenaar <bram@zimbu.org>
parents:
2122
diff
changeset
|
7480 (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
|
7481 || (ScreenLinesUC[off] != 0 |
|
dc8a5699253b
updated for version 7.2.406
Bram Moolenaar <bram@zimbu.org>
parents:
2122
diff
changeset
|
7482 && screen_comp_differs(off, u8cc)))) |
| 7 | 7483 #endif |
| 7484 || ScreenAttrs[off] != attr | |
| 1843 | 7485 || exmode_active; |
| 7486 | |
| 7487 if (need_redraw | |
| 7488 #if defined(FEAT_MBYTE) || defined(FEAT_GUI) || defined(UNIX) | |
| 7489 || force_redraw_this | |
| 7490 #endif | |
| 7 | 7491 ) |
| 7492 { | |
| 7493 #if defined(FEAT_GUI) || defined(UNIX) | |
| 7494 /* The bold trick makes a single row of pixels appear in the next | |
| 7495 * character. When a bold character is removed, the next | |
| 7496 * character should be redrawn too. This happens for our own GUI | |
| 1843 | 7497 * and for some xterms. */ |
| 7498 if (need_redraw && ScreenLines[off] != ' ' && ( | |
| 7 | 7499 # ifdef FEAT_GUI |
| 7500 gui.in_use | |
| 7501 # endif | |
| 7502 # if defined(FEAT_GUI) && defined(UNIX) | |
| 7503 || | |
| 7504 # endif | |
| 7505 # ifdef UNIX | |
| 7506 term_is_xterm | |
| 7507 # endif | |
| 1843 | 7508 )) |
| 7509 { | |
| 7510 int n = ScreenAttrs[off]; | |
| 7511 | |
| 7512 if (n > HL_ALL) | |
| 7513 n = syn_attr2attr(n); | |
| 7514 if (n & HL_BOLD) | |
| 7515 force_redraw_next = TRUE; | |
| 7 | 7516 } |
| 7517 #endif | |
| 7518 #ifdef FEAT_MBYTE | |
| 7519 /* When at the end of the text and overwriting a two-cell | |
| 7520 * character with a one-cell character, need to clear the next | |
| 7521 * cell. Also when overwriting the left halve of a two-cell char | |
| 7522 * with the right halve of a two-cell char. Do this only once | |
| 7523 * (mb_off2cells() may return 2 on the right halve). */ | |
| 7524 if (clear_next_cell) | |
| 7525 clear_next_cell = FALSE; | |
| 7526 else if (has_mbyte | |
| 7527 && (len < 0 ? ptr[mbyte_blen] == NUL | |
| 7528 : ptr + mbyte_blen >= text + len) | |
| 1378 | 7529 && ((mbyte_cells == 1 && (*mb_off2cells)(off, max_off) > 1) |
| 7 | 7530 || (mbyte_cells == 2 |
| 1378 | 7531 && (*mb_off2cells)(off, max_off) == 1 |
| 7532 && (*mb_off2cells)(off + 1, max_off) > 1))) | |
| 7 | 7533 clear_next_cell = TRUE; |
| 7534 | |
| 7535 /* Make sure we never leave a second byte of a double-byte behind, | |
| 7536 * it confuses mb_off2cells(). */ | |
| 7537 if (enc_dbcs | |
| 1378 | 7538 && ((mbyte_cells == 1 && (*mb_off2cells)(off, max_off) > 1) |
| 7 | 7539 || (mbyte_cells == 2 |
| 1378 | 7540 && (*mb_off2cells)(off, max_off) == 1 |
| 7541 && (*mb_off2cells)(off + 1, max_off) > 1))) | |
| 7 | 7542 ScreenLines[off + mbyte_blen] = 0; |
| 7543 #endif | |
| 7544 ScreenLines[off] = c; | |
| 7545 ScreenAttrs[off] = attr; | |
| 7546 #ifdef FEAT_MBYTE | |
| 7547 if (enc_utf8) | |
| 7548 { | |
| 714 | 7549 if (c < 0x80 && u8cc[0] == 0) |
| 7 | 7550 ScreenLinesUC[off] = 0; |
| 7551 else | |
| 7552 { | |
| 714 | 7553 int i; |
| 7554 | |
| 7 | 7555 ScreenLinesUC[off] = u8c; |
| 714 | 7556 for (i = 0; i < Screen_mco; ++i) |
| 7557 { | |
| 7558 ScreenLinesC[i][off] = u8cc[i]; | |
| 7559 if (u8cc[i] == 0) | |
| 7560 break; | |
| 7561 } | |
| 7 | 7562 } |
| 7563 if (mbyte_cells == 2) | |
| 7564 { | |
| 7565 ScreenLines[off + 1] = 0; | |
| 7566 ScreenAttrs[off + 1] = attr; | |
| 7567 } | |
| 7568 screen_char(off, row, col); | |
| 7569 } | |
| 7570 else if (mbyte_cells == 2) | |
| 7571 { | |
| 7572 ScreenLines[off + 1] = ptr[1]; | |
| 7573 ScreenAttrs[off + 1] = attr; | |
| 7574 screen_char_2(off, row, col); | |
| 7575 } | |
| 7576 else if (enc_dbcs == DBCS_JPNU && c == 0x8e) | |
| 7577 { | |
| 7578 ScreenLines2[off] = ptr[1]; | |
| 7579 screen_char(off, row, col); | |
| 7580 } | |
| 7581 else | |
| 7582 #endif | |
| 7583 screen_char(off, row, col); | |
| 7584 } | |
| 7585 #ifdef FEAT_MBYTE | |
| 7586 if (has_mbyte) | |
| 7587 { | |
| 7588 off += mbyte_cells; | |
| 7589 col += mbyte_cells; | |
| 7590 ptr += mbyte_blen; | |
| 7591 if (clear_next_cell) | |
| 5923 | 7592 { |
| 7593 /* This only happens at the end, display one space next. */ | |
| 7 | 7594 ptr = (char_u *)" "; |
| 5923 | 7595 len = -1; |
| 7596 } | |
| 7 | 7597 } |
| 7598 else | |
| 7599 #endif | |
| 7600 { | |
| 7601 ++off; | |
| 7602 ++col; | |
| 7603 ++ptr; | |
| 7604 } | |
| 7605 } | |
| 1843 | 7606 |
| 7607 #if defined(FEAT_MBYTE) || defined(FEAT_GUI) || defined(UNIX) | |
| 7608 /* If we detected the next character needs to be redrawn, but the text | |
| 7609 * doesn't extend up to there, update the character here. */ | |
| 7610 if (force_redraw_next && col < screen_Columns) | |
| 7611 { | |
| 7612 # ifdef FEAT_MBYTE | |
| 7613 if (enc_dbcs != 0 && dbcs_off2cells(off, max_off) > 1) | |
| 7614 screen_char_2(off, row, col); | |
| 7615 else | |
| 7616 # endif | |
| 7617 screen_char(off, row, col); | |
| 7618 } | |
| 7619 #endif | |
| 7 | 7620 } |
| 7621 | |
| 7622 #ifdef FEAT_SEARCH_EXTRA | |
| 7623 /* | |
| 1326 | 7624 * Prepare for 'hlsearch' highlighting. |
| 7 | 7625 */ |
| 7626 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7627 start_search_hl(void) |
| 7 | 7628 { |
| 7629 if (p_hls && !no_hlsearch) | |
| 7630 { | |
| 7631 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
|
7632 search_hl.attr = HL_ATTR(HLF_L); |
| 1521 | 7633 # ifdef FEAT_RELTIME |
| 7634 /* Set the time limit to 'redrawtime'. */ | |
| 7635 profile_setlimit(p_rdt, &search_hl.tm); | |
| 7636 # endif | |
| 7 | 7637 } |
| 7638 } | |
| 7639 | |
| 7640 /* | |
| 1326 | 7641 * Clean up for 'hlsearch' highlighting. |
| 7 | 7642 */ |
| 7643 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7644 end_search_hl(void) |
| 7 | 7645 { |
| 7646 if (search_hl.rm.regprog != NULL) | |
| 7647 { | |
|
4805
66803af09906
updated for version 7.3.1149
Bram Moolenaar <bram@vim.org>
parents:
4795
diff
changeset
|
7648 vim_regfree(search_hl.rm.regprog); |
| 7 | 7649 search_hl.rm.regprog = NULL; |
| 7650 } | |
| 7651 } | |
| 7652 | |
| 7653 /* | |
|
2284
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7654 * 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
|
7655 */ |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7656 static void |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7657 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
|
7658 { |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7659 matchitem_T *cur; |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7660 |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7661 /* 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
|
7662 * match */ |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7663 cur = wp->w_match_head; |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7664 while (cur != NULL) |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7665 { |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7666 cur->hl.rm = cur->match; |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7667 if (cur->hlg_id == 0) |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7668 cur->hl.attr = 0; |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7669 else |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7670 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
|
7671 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
|
7672 cur->hl.lnum = 0; |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7673 cur->hl.first_lnum = 0; |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7674 # ifdef FEAT_RELTIME |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7675 /* 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
|
7676 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
|
7677 # endif |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7678 cur = cur->next; |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7679 } |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7680 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
|
7681 search_hl.lnum = 0; |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7682 search_hl.first_lnum = 0; |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7683 /* 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
|
7684 } |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7685 |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7686 /* |
| 7 | 7687 * Advance to the match in window "wp" line "lnum" or past it. |
| 7688 */ | |
| 7689 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7690 prepare_search_hl(win_T *wp, linenr_T lnum) |
| 7 | 7691 { |
| 1326 | 7692 matchitem_T *cur; /* points to the match list */ |
| 7693 match_T *shl; /* points to search_hl or a match */ | |
| 7694 int shl_flag; /* flag to indicate whether search_hl | |
| 7695 has been processed or not */ | |
| 5979 | 7696 int pos_inprogress; /* marks that position match search is |
| 7697 in progress */ | |
| 7 | 7698 int n; |
| 7699 | |
| 7700 /* | |
| 7701 * When using a multi-line pattern, start searching at the top | |
| 7702 * of the window or just after a closed fold. | |
| 1326 | 7703 * Do this both for search_hl and the match list. |
| 7 | 7704 */ |
| 1326 | 7705 cur = wp->w_match_head; |
| 7706 shl_flag = FALSE; | |
| 7707 while (cur != NULL || shl_flag == FALSE) | |
| 7708 { | |
| 7709 if (shl_flag == FALSE) | |
| 7710 { | |
| 7711 shl = &search_hl; | |
| 7712 shl_flag = TRUE; | |
| 7713 } | |
| 7714 else | |
| 7715 shl = &cur->hl; | |
| 7 | 7716 if (shl->rm.regprog != NULL |
| 7717 && shl->lnum == 0 | |
| 7718 && re_multiline(shl->rm.regprog)) | |
| 7719 { | |
| 7720 if (shl->first_lnum == 0) | |
| 7721 { | |
| 7722 # ifdef FEAT_FOLDING | |
| 7723 for (shl->first_lnum = lnum; | |
| 7724 shl->first_lnum > wp->w_topline; --shl->first_lnum) | |
| 7725 if (hasFoldingWin(wp, shl->first_lnum - 1, | |
| 7726 NULL, NULL, TRUE, NULL)) | |
| 7727 break; | |
| 7728 # else | |
| 7729 shl->first_lnum = wp->w_topline; | |
| 7730 # endif | |
| 7731 } | |
| 5979 | 7732 if (cur != NULL) |
| 7733 cur->pos.cur = 0; | |
| 7734 pos_inprogress = TRUE; | |
| 7 | 7735 n = 0; |
| 5979 | 7736 while (shl->first_lnum < lnum && (shl->rm.regprog != NULL |
| 7737 || (cur != NULL && pos_inprogress))) | |
| 7738 { | |
|
9992
3e3b0ce24b61
commit https://github.com/vim/vim/commit/e17bdffff78ebd6a4e3cff26754cc667557ea810
Christian Brabandt <cb@256bit.org>
parents:
9939
diff
changeset
|
7739 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
|
7740 shl == &search_hl ? NULL : cur); |
| 5979 | 7741 pos_inprogress = cur == NULL || cur->pos.cur == 0 |
| 7742 ? FALSE : TRUE; | |
| 7 | 7743 if (shl->lnum != 0) |
| 7744 { | |
| 7745 shl->first_lnum = shl->lnum | |
| 7746 + shl->rm.endpos[0].lnum | |
| 7747 - shl->rm.startpos[0].lnum; | |
| 7748 n = shl->rm.endpos[0].col; | |
| 7749 } | |
| 7750 else | |
| 7751 { | |
| 7752 ++shl->first_lnum; | |
| 7753 n = 0; | |
| 7754 } | |
| 7755 } | |
| 7756 } | |
| 1326 | 7757 if (shl != &search_hl && cur != NULL) |
| 7758 cur = cur->next; | |
| 7 | 7759 } |
| 7760 } | |
| 7761 | |
| 7762 /* | |
| 1326 | 7763 * Search for a next 'hlsearch' or match. |
| 7 | 7764 * Uses shl->buf. |
| 7765 * Sets shl->lnum and shl->rm contents. | |
| 7766 * Note: Assumes a previous match is always before "lnum", unless | |
| 7767 * shl->lnum is zero. | |
| 7768 * Careful: Any pointers for buffer lines will become invalid. | |
| 7769 */ | |
| 7770 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7771 next_search_hl( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7772 win_T *win, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7773 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
|
7774 linenr_T lnum, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7775 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
|
7776 matchitem_T *cur) /* to retrieve match positions if any */ |
| 7 | 7777 { |
| 7778 linenr_T l; | |
| 7779 colnr_T matchcol; | |
| 7780 long nmatched; | |
| 7781 | |
| 7782 if (shl->lnum != 0) | |
| 7783 { | |
| 7784 /* Check for three situations: | |
| 7785 * 1. If the "lnum" is below a previous match, start a new search. | |
| 7786 * 2. If the previous match includes "mincol", use it. | |
| 7787 * 3. Continue after the previous match. | |
| 7788 */ | |
| 7789 l = shl->lnum + shl->rm.endpos[0].lnum - shl->rm.startpos[0].lnum; | |
| 7790 if (lnum > l) | |
| 7791 shl->lnum = 0; | |
| 7792 else if (lnum < l || shl->rm.endpos[0].col > mincol) | |
| 7793 return; | |
| 7794 } | |
| 7795 | |
| 7796 /* | |
| 7797 * Repeat searching for a match until one is found that includes "mincol" | |
| 7798 * or none is found in this line. | |
| 7799 */ | |
| 7800 called_emsg = FALSE; | |
| 7801 for (;;) | |
| 7802 { | |
| 1521 | 7803 #ifdef FEAT_RELTIME |
| 7804 /* Stop searching after passing the time limit. */ | |
| 7805 if (profile_passed_limit(&(shl->tm))) | |
| 7806 { | |
| 7807 shl->lnum = 0; /* no match found in time */ | |
| 7808 break; | |
| 7809 } | |
| 7810 #endif | |
| 7 | 7811 /* Three situations: |
| 7812 * 1. No useful previous match: search from start of line. | |
| 7813 * 2. Not Vi compatible or empty match: continue at next character. | |
| 7814 * Break the loop if this is beyond the end of the line. | |
| 7815 * 3. Vi compatible searching: continue at end of previous match. | |
| 7816 */ | |
| 7817 if (shl->lnum == 0) | |
| 7818 matchcol = 0; | |
| 7819 else if (vim_strchr(p_cpo, CPO_SEARCH) == NULL | |
| 7820 || (shl->rm.endpos[0].lnum == 0 | |
| 685 | 7821 && shl->rm.endpos[0].col <= shl->rm.startpos[0].col)) |
| 7822 { | |
| 688 | 7823 char_u *ml; |
| 685 | 7824 |
| 7825 matchcol = shl->rm.startpos[0].col; | |
| 688 | 7826 ml = ml_get_buf(shl->buf, lnum, FALSE) + matchcol; |
| 685 | 7827 if (*ml == NUL) |
| 7828 { | |
| 7829 ++matchcol; | |
| 7 | 7830 shl->lnum = 0; |
| 7831 break; | |
| 7832 } | |
| 685 | 7833 #ifdef FEAT_MBYTE |
| 7834 if (has_mbyte) | |
| 7835 matchcol += mb_ptr2len(ml); | |
| 7836 else | |
| 7837 #endif | |
| 7838 ++matchcol; | |
| 7 | 7839 } |
| 7840 else | |
| 7841 matchcol = shl->rm.endpos[0].col; | |
| 7842 | |
| 7843 shl->lnum = lnum; | |
| 5979 | 7844 if (shl->rm.regprog != NULL) |
| 7845 { | |
| 6394 | 7846 /* Remember whether shl->rm is using a copy of the regprog in |
| 7847 * cur->match. */ | |
| 7848 int regprog_is_copy = (shl != &search_hl && cur != NULL | |
| 7849 && shl == &cur->hl | |
| 7850 && 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
|
7851 int timed_out = FALSE; |
| 6394 | 7852 |
| 5979 | 7853 nmatched = vim_regexec_multi(&shl->rm, win, shl->buf, lnum, |
| 7854 matchcol, | |
| 1521 | 7855 #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
|
7856 &(shl->tm), &timed_out |
| 1521 | 7857 #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
|
7858 NULL, NULL |
| 5979 | 7859 #endif |
| 7860 ); | |
| 6394 | 7861 /* Copy the regprog, in case it got freed and recompiled. */ |
| 7862 if (regprog_is_copy) | |
| 7863 cur->match.regprog = cur->hl.rm.regprog; | |
| 7864 | |
|
11521
578df034735d
patch 8.0.0643: when a pattern search is slow Vim becomes unusable
Christian Brabandt <cb@256bit.org>
parents:
11516
diff
changeset
|
7865 if (called_emsg || got_int || timed_out) |
| 5979 | 7866 { |
| 7867 /* Error while handling regexp: stop using this regexp. */ | |
| 7868 if (shl == &search_hl) | |
| 7869 { | |
| 7870 /* don't free regprog in the match list, it's a copy */ | |
| 7871 vim_regfree(shl->rm.regprog); | |
| 7872 SET_NO_HLSEARCH(TRUE); | |
| 7873 } | |
| 7874 shl->rm.regprog = NULL; | |
| 7875 shl->lnum = 0; | |
| 7876 got_int = FALSE; /* avoid the "Type :quit to exit Vim" | |
| 7877 message */ | |
| 7878 break; | |
| 7879 } | |
| 7880 } | |
| 7881 else if (cur != NULL) | |
| 7882 nmatched = next_search_hl_pos(shl, lnum, &(cur->pos), matchcol); | |
| 5987 | 7883 else |
| 7884 nmatched = 0; | |
| 7 | 7885 if (nmatched == 0) |
| 7886 { | |
| 7887 shl->lnum = 0; /* no match found */ | |
| 7888 break; | |
| 7889 } | |
| 7890 if (shl->rm.startpos[0].lnum > 0 | |
| 7891 || shl->rm.startpos[0].col >= mincol | |
| 7892 || nmatched > 1 | |
| 7893 || shl->rm.endpos[0].col > mincol) | |
| 7894 { | |
| 7895 shl->lnum += shl->rm.startpos[0].lnum; | |
| 7896 break; /* useful match found */ | |
| 7897 } | |
| 7898 } | |
| 7899 } | |
| 7900 | |
|
10287
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
7901 /* |
|
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
7902 * 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
|
7903 * Return zero otherwise. |
|
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
7904 */ |
| 5979 | 7905 static int |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7906 next_search_hl_pos( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7907 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
|
7908 linenr_T lnum, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7909 posmatch_T *posmatch, /* match positions */ |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7910 colnr_T mincol) /* minimal column for a match */ |
| 5979 | 7911 { |
| 7912 int i; | |
|
10287
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
7913 int found = -1; |
|
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
7914 |
| 5979 | 7915 for (i = posmatch->cur; i < MAXPOSMATCH; i++) |
| 7916 { | |
|
10273
489eae19cad9
commit https://github.com/vim/vim/commit/a6c27ee6db2c328e0ab0e6d143e2a295a0bb9c9a
Christian Brabandt <cb@256bit.org>
parents:
10247
diff
changeset
|
7917 llpos_T *pos = &posmatch->pos[i]; |
|
489eae19cad9
commit https://github.com/vim/vim/commit/a6c27ee6db2c328e0ab0e6d143e2a295a0bb9c9a
Christian Brabandt <cb@256bit.org>
parents:
10247
diff
changeset
|
7918 |
|
489eae19cad9
commit https://github.com/vim/vim/commit/a6c27ee6db2c328e0ab0e6d143e2a295a0bb9c9a
Christian Brabandt <cb@256bit.org>
parents:
10247
diff
changeset
|
7919 if (pos->lnum == 0) |
| 5979 | 7920 break; |
|
10287
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
7921 if (pos->len == 0 && pos->col < mincol) |
| 5979 | 7922 continue; |
|
10273
489eae19cad9
commit https://github.com/vim/vim/commit/a6c27ee6db2c328e0ab0e6d143e2a295a0bb9c9a
Christian Brabandt <cb@256bit.org>
parents:
10247
diff
changeset
|
7923 if (pos->lnum == lnum) |
| 5979 | 7924 { |
|
10287
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
7925 if (found >= 0) |
|
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
7926 { |
|
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
7927 /* 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
|
7928 * them */ |
|
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
7929 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
|
7930 { |
|
489eae19cad9
commit https://github.com/vim/vim/commit/a6c27ee6db2c328e0ab0e6d143e2a295a0bb9c9a
Christian Brabandt <cb@256bit.org>
parents:
10247
diff
changeset
|
7931 llpos_T tmp = *pos; |
|
489eae19cad9
commit https://github.com/vim/vim/commit/a6c27ee6db2c328e0ab0e6d143e2a295a0bb9c9a
Christian Brabandt <cb@256bit.org>
parents:
10247
diff
changeset
|
7932 |
|
10287
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
7933 *pos = posmatch->pos[found]; |
|
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
7934 posmatch->pos[found] = tmp; |
| 5979 | 7935 } |
| 7936 } | |
| 7937 else | |
|
10287
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
7938 found = i; |
| 5979 | 7939 } |
| 7940 } | |
| 7941 posmatch->cur = 0; | |
|
10287
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
7942 if (found >= 0) |
|
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
7943 { |
|
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
7944 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
|
7945 ? 0 : posmatch->pos[found].col - 1; |
|
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
7946 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
|
7947 ? MAXCOL : start + posmatch->pos[found].len; |
|
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 shl->lnum = lnum; |
| 5979 | 7950 shl->rm.startpos[0].lnum = 0; |
| 7951 shl->rm.startpos[0].col = start; | |
| 7952 shl->rm.endpos[0].lnum = 0; | |
| 7953 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
|
7954 shl->is_addpos = TRUE; |
|
10287
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
7955 posmatch->cur = found + 1; |
|
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
7956 return 1; |
|
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
7957 } |
|
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
7958 return 0; |
| 5979 | 7959 } |
| 5985 | 7960 #endif |
| 5979 | 7961 |
| 7 | 7962 static void |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7963 screen_start_highlight(int attr) |
| 7 | 7964 { |
| 7965 attrentry_T *aep = NULL; | |
| 7966 | |
| 7967 screen_attr = attr; | |
| 7968 if (full_screen | |
| 7969 #ifdef WIN3264 | |
| 7970 && termcap_active | |
| 7971 #endif | |
| 7972 ) | |
| 7973 { | |
| 7974 #ifdef FEAT_GUI | |
| 7975 if (gui.in_use) | |
| 7976 { | |
| 7977 char buf[20]; | |
| 7978 | |
| 681 | 7979 /* The GUI handles this internally. */ |
| 7980 sprintf(buf, IF_EB("\033|%dh", ESC_STR "|%dh"), attr); | |
| 7 | 7981 OUT_STR(buf); |
| 7982 } | |
| 7983 else | |
| 7984 #endif | |
| 7985 { | |
| 7986 if (attr > HL_ALL) /* special HL attr. */ | |
| 7987 { | |
|
8969
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
7988 if (IS_CTERM) |
| 7 | 7989 aep = syn_cterm_attr2entry(attr); |
| 7990 else | |
| 7991 aep = syn_term_attr2entry(attr); | |
| 7992 if (aep == NULL) /* did ":syntax clear" */ | |
| 7993 attr = 0; | |
| 7994 else | |
| 7995 attr = aep->ae_attr; | |
| 7996 } | |
| 7997 if ((attr & HL_BOLD) && T_MD != NULL) /* bold */ | |
| 7998 out_str(T_MD); | |
|
8969
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
7999 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
|
8000 #ifdef FEAT_TERMGUICOLORS |
|
773d627cac0b
commit https://github.com/vim/vim/commit/61be73bb0f965a895bfb064ea3e55476ac175162
Christian Brabandt <cb@256bit.org>
parents:
8977
diff
changeset
|
8001 (p_tgc ? |
|
9939
ccb6461b82df
commit https://github.com/vim/vim/commit/1b58cdd160c2e0ada0f638679a2aa27e4665fc48
Christian Brabandt <cb@256bit.org>
parents:
9885
diff
changeset
|
8002 (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
|
8003 #endif |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8004 (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
|
8005 #ifdef FEAT_TERMGUICOLORS |
|
8969
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8006 ) |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8007 #endif |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8008 ) |
| 681 | 8009 /* If the Normal FG color has BOLD attribute and the new HL |
| 8010 * has a FG color defined, clear BOLD. */ | |
| 8011 out_str(T_ME); | |
| 7 | 8012 if ((attr & HL_STANDOUT) && T_SO != NULL) /* standout */ |
| 8013 out_str(T_SO); | |
| 205 | 8014 if ((attr & (HL_UNDERLINE | HL_UNDERCURL)) && T_US != NULL) |
| 8015 /* underline or undercurl */ | |
| 7 | 8016 out_str(T_US); |
| 8017 if ((attr & HL_ITALIC) && T_CZH != NULL) /* italic */ | |
| 8018 out_str(T_CZH); | |
| 8019 if ((attr & HL_INVERSE) && T_MR != NULL) /* inverse (reverse) */ | |
| 8020 out_str(T_MR); | |
| 8021 | |
| 8022 /* | |
| 8023 * Output the color or start string after bold etc., in case the | |
| 8024 * bold etc. override the color setting. | |
| 8025 */ | |
| 8026 if (aep != NULL) | |
| 8027 { | |
|
9027
773d627cac0b
commit https://github.com/vim/vim/commit/61be73bb0f965a895bfb064ea3e55476ac175162
Christian Brabandt <cb@256bit.org>
parents:
8977
diff
changeset
|
8028 #ifdef FEAT_TERMGUICOLORS |
|
773d627cac0b
commit https://github.com/vim/vim/commit/61be73bb0f965a895bfb064ea3e55476ac175162
Christian Brabandt <cb@256bit.org>
parents:
8977
diff
changeset
|
8029 if (p_tgc) |
|
8969
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8030 { |
|
9939
ccb6461b82df
commit https://github.com/vim/vim/commit/1b58cdd160c2e0ada0f638679a2aa27e4665fc48
Christian Brabandt <cb@256bit.org>
parents:
9885
diff
changeset
|
8031 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
|
8032 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
|
8033 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
|
8034 term_bg_rgb_color(aep->ae_u.cterm.bg_rgb); |
| 7 | 8035 } |
| 8036 else | |
|
8969
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8037 #endif |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8038 { |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8039 if (t_colors > 1) |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8040 { |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8041 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
|
8042 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
|
8043 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
|
8044 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
|
8045 } |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8046 else |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8047 { |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8048 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
|
8049 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
|
8050 } |
| 7 | 8051 } |
| 8052 } | |
| 8053 } | |
| 8054 } | |
| 8055 } | |
| 8056 | |
| 8057 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8058 screen_stop_highlight(void) |
| 7 | 8059 { |
| 8060 int do_ME = FALSE; /* output T_ME code */ | |
| 8061 | |
| 8062 if (screen_attr != 0 | |
| 8063 #ifdef WIN3264 | |
| 8064 && termcap_active | |
| 8065 #endif | |
| 8066 ) | |
| 8067 { | |
| 8068 #ifdef FEAT_GUI | |
| 8069 if (gui.in_use) | |
| 8070 { | |
| 8071 char buf[20]; | |
| 8072 | |
| 8073 /* use internal GUI code */ | |
| 8074 sprintf(buf, IF_EB("\033|%dH", ESC_STR "|%dH"), screen_attr); | |
| 8075 OUT_STR(buf); | |
| 8076 } | |
| 8077 else | |
| 8078 #endif | |
| 8079 { | |
| 8080 if (screen_attr > HL_ALL) /* special HL attr. */ | |
| 8081 { | |
| 8082 attrentry_T *aep; | |
| 8083 | |
|
8969
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8084 if (IS_CTERM) |
| 7 | 8085 { |
| 8086 /* | |
| 8087 * Assume that t_me restores the original colors! | |
| 8088 */ | |
| 8089 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
|
8090 if (aep != NULL && |
|
9027
773d627cac0b
commit https://github.com/vim/vim/commit/61be73bb0f965a895bfb064ea3e55476ac175162
Christian Brabandt <cb@256bit.org>
parents:
8977
diff
changeset
|
8091 #ifdef FEAT_TERMGUICOLORS |
|
773d627cac0b
commit https://github.com/vim/vim/commit/61be73bb0f965a895bfb064ea3e55476ac175162
Christian Brabandt <cb@256bit.org>
parents:
8977
diff
changeset
|
8092 (p_tgc ? |
|
9939
ccb6461b82df
commit https://github.com/vim/vim/commit/1b58cdd160c2e0ada0f638679a2aa27e4665fc48
Christian Brabandt <cb@256bit.org>
parents:
9885
diff
changeset
|
8093 (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
|
8094 || 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
|
8095 #endif |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8096 (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
|
8097 #ifdef FEAT_TERMGUICOLORS |
|
8969
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8098 ) |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8099 #endif |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8100 ) |
| 7 | 8101 do_ME = TRUE; |
| 8102 } | |
| 8103 else | |
| 8104 { | |
| 8105 aep = syn_term_attr2entry(screen_attr); | |
| 8106 if (aep != NULL && aep->ae_u.term.stop != NULL) | |
| 8107 { | |
| 8108 if (STRCMP(aep->ae_u.term.stop, T_ME) == 0) | |
| 8109 do_ME = TRUE; | |
| 8110 else | |
| 8111 out_str(aep->ae_u.term.stop); | |
| 8112 } | |
| 8113 } | |
| 8114 if (aep == NULL) /* did ":syntax clear" */ | |
| 8115 screen_attr = 0; | |
| 8116 else | |
| 8117 screen_attr = aep->ae_attr; | |
| 8118 } | |
| 8119 | |
| 8120 /* | |
| 8121 * Often all ending-codes are equal to T_ME. Avoid outputting the | |
| 8122 * same sequence several times. | |
| 8123 */ | |
| 8124 if (screen_attr & HL_STANDOUT) | |
| 8125 { | |
| 8126 if (STRCMP(T_SE, T_ME) == 0) | |
| 8127 do_ME = TRUE; | |
| 8128 else | |
| 8129 out_str(T_SE); | |
| 8130 } | |
| 205 | 8131 if (screen_attr & (HL_UNDERLINE | HL_UNDERCURL)) |
| 7 | 8132 { |
| 8133 if (STRCMP(T_UE, T_ME) == 0) | |
| 8134 do_ME = TRUE; | |
| 8135 else | |
| 8136 out_str(T_UE); | |
| 8137 } | |
| 8138 if (screen_attr & HL_ITALIC) | |
| 8139 { | |
| 8140 if (STRCMP(T_CZR, T_ME) == 0) | |
| 8141 do_ME = TRUE; | |
| 8142 else | |
| 8143 out_str(T_CZR); | |
| 8144 } | |
| 8145 if (do_ME || (screen_attr & (HL_BOLD | HL_INVERSE))) | |
| 8146 out_str(T_ME); | |
| 8147 | |
|
9027
773d627cac0b
commit https://github.com/vim/vim/commit/61be73bb0f965a895bfb064ea3e55476ac175162
Christian Brabandt <cb@256bit.org>
parents:
8977
diff
changeset
|
8148 #ifdef FEAT_TERMGUICOLORS |
|
773d627cac0b
commit https://github.com/vim/vim/commit/61be73bb0f965a895bfb064ea3e55476ac175162
Christian Brabandt <cb@256bit.org>
parents:
8977
diff
changeset
|
8149 if (p_tgc) |
|
8969
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8150 { |
|
9939
ccb6461b82df
commit https://github.com/vim/vim/commit/1b58cdd160c2e0ada0f638679a2aa27e4665fc48
Christian Brabandt <cb@256bit.org>
parents:
9885
diff
changeset
|
8151 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
|
8152 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
|
8153 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
|
8154 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
|
8155 } |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8156 else |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8157 #endif |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8158 { |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8159 if (t_colors > 1) |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8160 { |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8161 /* set Normal cterm colors */ |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8162 if (cterm_normal_fg_color != 0) |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8163 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
|
8164 if (cterm_normal_bg_color != 0) |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8165 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
|
8166 if (cterm_normal_fg_bold) |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8167 out_str(T_MD); |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8168 } |
| 7 | 8169 } |
| 8170 } | |
| 8171 } | |
| 8172 screen_attr = 0; | |
| 8173 } | |
| 8174 | |
| 8175 /* | |
| 8176 * Reset the colors for a cterm. Used when leaving Vim. | |
| 8177 * The machine specific code may override this again. | |
| 8178 */ | |
| 8179 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8180 reset_cterm_colors(void) |
| 7 | 8181 { |
|
8969
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8182 if (IS_CTERM) |
| 7 | 8183 { |
| 8184 /* set Normal cterm colors */ | |
|
9027
773d627cac0b
commit https://github.com/vim/vim/commit/61be73bb0f965a895bfb064ea3e55476ac175162
Christian Brabandt <cb@256bit.org>
parents:
8977
diff
changeset
|
8185 #ifdef FEAT_TERMGUICOLORS |
|
9939
ccb6461b82df
commit https://github.com/vim/vim/commit/1b58cdd160c2e0ada0f638679a2aa27e4665fc48
Christian Brabandt <cb@256bit.org>
parents:
9885
diff
changeset
|
8186 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
|
8187 || cterm_normal_bg_gui_color != INVALCOLOR) |
|
ccb6461b82df
commit https://github.com/vim/vim/commit/1b58cdd160c2e0ada0f638679a2aa27e4665fc48
Christian Brabandt <cb@256bit.org>
parents:
9885
diff
changeset
|
8188 : (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
|
8189 #else |
| 7 | 8190 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
|
8191 #endif |
| 7 | 8192 { |
| 8193 out_str(T_OP); | |
| 8194 screen_attr = -1; | |
| 8195 } | |
| 8196 if (cterm_normal_fg_bold) | |
| 8197 { | |
| 8198 out_str(T_ME); | |
| 8199 screen_attr = -1; | |
| 8200 } | |
| 8201 } | |
| 8202 } | |
| 8203 | |
| 8204 /* | |
| 8205 * Put character ScreenLines["off"] on the screen at position "row" and "col", | |
| 8206 * using the attributes from ScreenAttrs["off"]. | |
| 8207 */ | |
| 8208 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8209 screen_char(unsigned off, int row, int col) |
| 7 | 8210 { |
| 8211 int attr; | |
| 8212 | |
| 8213 /* Check for illegal values, just in case (could happen just after | |
| 8214 * resizing). */ | |
| 8215 if (row >= screen_Rows || col >= screen_Columns) | |
| 8216 return; | |
| 8217 | |
| 6602 | 8218 /* Outputting a character in the last cell on the screen may scroll the |
| 8219 * screen up. Only do it when the "xn" termcap property is set, otherwise | |
| 8220 * mark the character invalid (update it when scrolled up). */ | |
| 8221 if (*T_XN == NUL | |
| 8222 && row == screen_Rows - 1 && col == screen_Columns - 1 | |
| 7 | 8223 #ifdef FEAT_RIGHTLEFT |
| 8224 /* account for first command-line character in rightleft mode */ | |
| 8225 && !cmdmsg_rl | |
| 8226 #endif | |
| 8227 ) | |
| 8228 { | |
| 8229 ScreenAttrs[off] = (sattr_T)-1; | |
| 8230 return; | |
| 8231 } | |
| 8232 | |
| 8233 /* | |
| 8234 * Stop highlighting first, so it's easier to move the cursor. | |
| 8235 */ | |
|
8643
24b43dd167eb
commit https://github.com/vim/vim/commit/44a2f923c00f1384c9ecde12fb5b4711bc20702e
Christian Brabandt <cb@256bit.org>
parents:
8627
diff
changeset
|
8236 #if defined(FEAT_CLIPBOARD) || defined(FEAT_WINDOWS) |
| 7 | 8237 if (screen_char_attr != 0) |
| 8238 attr = screen_char_attr; | |
| 8239 else | |
| 8240 #endif | |
| 8241 attr = ScreenAttrs[off]; | |
| 8242 if (screen_attr != attr) | |
| 8243 screen_stop_highlight(); | |
| 8244 | |
| 8245 windgoto(row, col); | |
| 8246 | |
| 8247 if (screen_attr != attr) | |
| 8248 screen_start_highlight(attr); | |
| 8249 | |
| 8250 #ifdef FEAT_MBYTE | |
| 8251 if (enc_utf8 && ScreenLinesUC[off] != 0) | |
| 8252 { | |
| 8253 char_u buf[MB_MAXBYTES + 1]; | |
| 8254 | |
| 8255 /* Convert UTF-8 character to bytes and write it. */ | |
| 8256 | |
| 8257 buf[utfc_char2bytes(off, buf)] = NUL; | |
| 8258 | |
| 8259 out_str(buf); | |
|
8819
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8817
diff
changeset
|
8260 if (utf_ambiguous_width(ScreenLinesUC[off])) |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8817
diff
changeset
|
8261 screen_cur_col = 9999; |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8817
diff
changeset
|
8262 else if (utf_char2cells(ScreenLinesUC[off]) > 1) |
| 7 | 8263 ++screen_cur_col; |
| 8264 } | |
| 8265 else | |
| 8266 #endif | |
| 8267 { | |
| 8268 #ifdef FEAT_MBYTE | |
| 8269 out_flush_check(); | |
| 8270 #endif | |
| 8271 out_char(ScreenLines[off]); | |
| 8272 #ifdef FEAT_MBYTE | |
| 8273 /* double-byte character in single-width cell */ | |
| 8274 if (enc_dbcs == DBCS_JPNU && ScreenLines[off] == 0x8e) | |
| 8275 out_char(ScreenLines2[off]); | |
| 8276 #endif | |
| 8277 } | |
| 8278 | |
| 8279 screen_cur_col++; | |
| 8280 } | |
| 8281 | |
| 8282 #ifdef FEAT_MBYTE | |
| 8283 | |
| 8284 /* | |
| 8285 * Used for enc_dbcs only: Put one double-wide character at ScreenLines["off"] | |
| 8286 * on the screen at position 'row' and 'col'. | |
| 8287 * The attributes of the first byte is used for all. This is required to | |
| 8288 * output the two bytes of a double-byte character with nothing in between. | |
| 8289 */ | |
| 8290 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8291 screen_char_2(unsigned off, int row, int col) |
| 7 | 8292 { |
| 8293 /* Check for illegal values (could be wrong when screen was resized). */ | |
| 8294 if (off + 1 >= (unsigned)(screen_Rows * screen_Columns)) | |
| 8295 return; | |
| 8296 | |
| 8297 /* Outputting the last character on the screen may scrollup the screen. | |
| 8298 * Don't to it! Mark the character invalid (update it when scrolled up) */ | |
| 8299 if (row == screen_Rows - 1 && col >= screen_Columns - 2) | |
| 8300 { | |
| 8301 ScreenAttrs[off] = (sattr_T)-1; | |
| 8302 return; | |
| 8303 } | |
| 8304 | |
| 8305 /* Output the first byte normally (positions the cursor), then write the | |
| 8306 * second byte directly. */ | |
| 8307 screen_char(off, row, col); | |
| 8308 out_char(ScreenLines[off + 1]); | |
| 8309 ++screen_cur_col; | |
| 8310 } | |
| 8311 #endif | |
| 8312 | |
|
8643
24b43dd167eb
commit https://github.com/vim/vim/commit/44a2f923c00f1384c9ecde12fb5b4711bc20702e
Christian Brabandt <cb@256bit.org>
parents:
8627
diff
changeset
|
8313 #if defined(FEAT_CLIPBOARD) || defined(FEAT_WINDOWS) || defined(PROTO) |
| 7 | 8314 /* |
| 8315 * Draw a rectangle of the screen, inverted when "invert" is TRUE. | |
| 8316 * This uses the contents of ScreenLines[] and doesn't change it. | |
| 8317 */ | |
| 8318 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8319 screen_draw_rectangle( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8320 int row, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8321 int col, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8322 int height, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8323 int width, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8324 int invert) |
| 7 | 8325 { |
| 8326 int r, c; | |
| 8327 int off; | |
| 1378 | 8328 #ifdef FEAT_MBYTE |
| 8329 int max_off; | |
| 8330 #endif | |
| 7 | 8331 |
| 534 | 8332 /* Can't use ScreenLines unless initialized */ |
| 8333 if (ScreenLines == NULL) | |
| 8334 return; | |
| 8335 | |
| 7 | 8336 if (invert) |
| 8337 screen_char_attr = HL_INVERSE; | |
| 8338 for (r = row; r < row + height; ++r) | |
| 8339 { | |
| 8340 off = LineOffset[r]; | |
| 1378 | 8341 #ifdef FEAT_MBYTE |
| 8342 max_off = off + screen_Columns; | |
| 8343 #endif | |
| 7 | 8344 for (c = col; c < col + width; ++c) |
| 8345 { | |
| 8346 #ifdef FEAT_MBYTE | |
| 1378 | 8347 if (enc_dbcs != 0 && dbcs_off2cells(off + c, max_off) > 1) |
| 7 | 8348 { |
| 8349 screen_char_2(off + c, r, c); | |
| 8350 ++c; | |
| 8351 } | |
| 8352 else | |
| 8353 #endif | |
| 8354 { | |
| 8355 screen_char(off + c, r, c); | |
| 8356 #ifdef FEAT_MBYTE | |
| 1378 | 8357 if (utf_off2cells(off + c, max_off) > 1) |
| 7 | 8358 ++c; |
| 8359 #endif | |
| 8360 } | |
| 8361 } | |
| 8362 } | |
| 8363 screen_char_attr = 0; | |
| 8364 } | |
| 8365 #endif | |
| 8366 | |
|
8643
24b43dd167eb
commit https://github.com/vim/vim/commit/44a2f923c00f1384c9ecde12fb5b4711bc20702e
Christian Brabandt <cb@256bit.org>
parents:
8627
diff
changeset
|
8367 #ifdef FEAT_WINDOWS |
| 7 | 8368 /* |
| 8369 * Redraw the characters for a vertically split window. | |
| 8370 */ | |
| 8371 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8372 redraw_block(int row, int end, win_T *wp) |
| 7 | 8373 { |
| 8374 int col; | |
| 8375 int width; | |
| 8376 | |
| 8377 # ifdef FEAT_CLIPBOARD | |
| 8378 clip_may_clear_selection(row, end - 1); | |
| 8379 # endif | |
| 8380 | |
| 8381 if (wp == NULL) | |
| 8382 { | |
| 8383 col = 0; | |
| 8384 width = Columns; | |
| 8385 } | |
| 8386 else | |
| 8387 { | |
| 8388 col = wp->w_wincol; | |
| 8389 width = wp->w_width; | |
| 8390 } | |
| 8391 screen_draw_rectangle(row, col, end - row, width, FALSE); | |
| 8392 } | |
| 8393 #endif | |
| 8394 | |
| 8395 /* | |
| 8396 * Fill the screen from 'start_row' to 'end_row', from 'start_col' to 'end_col' | |
| 8397 * with character 'c1' in first column followed by 'c2' in the other columns. | |
| 8398 * Use attributes 'attr'. | |
| 8399 */ | |
| 8400 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8401 screen_fill( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8402 int start_row, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8403 int end_row, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8404 int start_col, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8405 int end_col, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8406 int c1, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8407 int c2, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8408 int attr) |
| 7 | 8409 { |
| 8410 int row; | |
| 8411 int col; | |
| 8412 int off; | |
| 8413 int end_off; | |
| 8414 int did_delete; | |
| 8415 int c; | |
| 8416 int norm_term; | |
| 8417 #if defined(FEAT_GUI) || defined(UNIX) | |
| 8418 int force_next = FALSE; | |
| 8419 #endif | |
| 8420 | |
| 8421 if (end_row > screen_Rows) /* safety check */ | |
| 8422 end_row = screen_Rows; | |
| 8423 if (end_col > screen_Columns) /* safety check */ | |
| 8424 end_col = screen_Columns; | |
| 8425 if (ScreenLines == NULL | |
| 8426 || start_row >= end_row | |
| 8427 || start_col >= end_col) /* nothing to do */ | |
| 8428 return; | |
| 8429 | |
| 8430 /* it's a "normal" terminal when not in a GUI or cterm */ | |
| 8431 norm_term = ( | |
| 8432 #ifdef FEAT_GUI | |
| 8433 !gui.in_use && | |
| 8434 #endif | |
|
8969
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8435 !IS_CTERM); |
| 7 | 8436 for (row = start_row; row < end_row; ++row) |
| 8437 { | |
| 1668 | 8438 #ifdef FEAT_MBYTE |
| 8439 if (has_mbyte | |
| 8440 # ifdef FEAT_GUI | |
| 8441 && !gui.in_use | |
| 8442 # endif | |
| 8443 ) | |
| 8444 { | |
| 8445 /* When drawing over the right halve of a double-wide char clear | |
| 8446 * out the left halve. When drawing over the left halve of a | |
| 8447 * double wide-char clear out the right halve. Only needed in a | |
| 8448 * terminal. */ | |
| 1685 | 8449 if (start_col > 0 && mb_fix_col(start_col, row) != start_col) |
| 1670 | 8450 screen_puts_len((char_u *)" ", 1, row, start_col - 1, 0); |
| 1677 | 8451 if (end_col < screen_Columns && mb_fix_col(end_col, row) != end_col) |
| 1670 | 8452 screen_puts_len((char_u *)" ", 1, row, end_col, 0); |
| 1668 | 8453 } |
| 8454 #endif | |
| 7 | 8455 /* |
| 8456 * Try to use delete-line termcap code, when no attributes or in a | |
| 8457 * "normal" terminal, where a bold/italic space is just a | |
| 8458 * space. | |
| 8459 */ | |
| 8460 did_delete = FALSE; | |
| 8461 if (c2 == ' ' | |
| 8462 && end_col == Columns | |
| 8463 && can_clear(T_CE) | |
| 8464 && (attr == 0 | |
| 8465 || (norm_term | |
| 8466 && attr <= HL_ALL | |
| 8467 && ((attr & ~(HL_BOLD | HL_ITALIC)) == 0)))) | |
| 8468 { | |
| 8469 /* | |
| 8470 * check if we really need to clear something | |
| 8471 */ | |
| 8472 col = start_col; | |
| 8473 if (c1 != ' ') /* don't clear first char */ | |
| 8474 ++col; | |
| 8475 | |
| 8476 off = LineOffset[row] + col; | |
| 8477 end_off = LineOffset[row] + end_col; | |
| 8478 | |
| 8479 /* skip blanks (used often, keep it fast!) */ | |
| 8480 #ifdef FEAT_MBYTE | |
| 8481 if (enc_utf8) | |
| 8482 while (off < end_off && ScreenLines[off] == ' ' | |
| 8483 && ScreenAttrs[off] == 0 && ScreenLinesUC[off] == 0) | |
| 8484 ++off; | |
| 8485 else | |
| 8486 #endif | |
| 8487 while (off < end_off && ScreenLines[off] == ' ' | |
| 8488 && ScreenAttrs[off] == 0) | |
| 8489 ++off; | |
| 8490 if (off < end_off) /* something to be cleared */ | |
| 8491 { | |
| 8492 col = off - LineOffset[row]; | |
| 8493 screen_stop_highlight(); | |
| 8494 term_windgoto(row, col);/* clear rest of this screen line */ | |
| 8495 out_str(T_CE); | |
| 8496 screen_start(); /* don't know where cursor is now */ | |
| 8497 col = end_col - col; | |
| 8498 while (col--) /* clear chars in ScreenLines */ | |
| 8499 { | |
| 8500 ScreenLines[off] = ' '; | |
| 8501 #ifdef FEAT_MBYTE | |
| 8502 if (enc_utf8) | |
| 8503 ScreenLinesUC[off] = 0; | |
| 8504 #endif | |
| 8505 ScreenAttrs[off] = 0; | |
| 8506 ++off; | |
| 8507 } | |
| 8508 } | |
| 8509 did_delete = TRUE; /* the chars are cleared now */ | |
| 8510 } | |
| 8511 | |
| 8512 off = LineOffset[row] + start_col; | |
| 8513 c = c1; | |
| 8514 for (col = start_col; col < end_col; ++col) | |
| 8515 { | |
| 8516 if (ScreenLines[off] != c | |
| 8517 #ifdef FEAT_MBYTE | |
| 714 | 8518 || (enc_utf8 && (int)ScreenLinesUC[off] |
| 8519 != (c >= 0x80 ? c : 0)) | |
| 7 | 8520 #endif |
| 8521 || ScreenAttrs[off] != attr | |
| 8522 #if defined(FEAT_GUI) || defined(UNIX) | |
| 8523 || force_next | |
| 8524 #endif | |
| 8525 ) | |
| 8526 { | |
| 8527 #if defined(FEAT_GUI) || defined(UNIX) | |
| 8528 /* The bold trick may make a single row of pixels appear in | |
| 8529 * the next character. When a bold character is removed, the | |
| 8530 * next character should be redrawn too. This happens for our | |
| 8531 * own GUI and for some xterms. */ | |
| 8532 if ( | |
| 8533 # ifdef FEAT_GUI | |
| 8534 gui.in_use | |
| 8535 # endif | |
| 8536 # if defined(FEAT_GUI) && defined(UNIX) | |
| 8537 || | |
| 8538 # endif | |
| 8539 # ifdef UNIX | |
| 8540 term_is_xterm | |
| 8541 # endif | |
| 8542 ) | |
| 8543 { | |
| 8544 if (ScreenLines[off] != ' ' | |
| 8545 && (ScreenAttrs[off] > HL_ALL | |
| 8546 || ScreenAttrs[off] & HL_BOLD)) | |
| 8547 force_next = TRUE; | |
| 8548 else | |
| 8549 force_next = FALSE; | |
| 8550 } | |
| 8551 #endif | |
| 8552 ScreenLines[off] = c; | |
| 8553 #ifdef FEAT_MBYTE | |
| 8554 if (enc_utf8) | |
| 8555 { | |
| 8556 if (c >= 0x80) | |
| 8557 { | |
| 8558 ScreenLinesUC[off] = c; | |
| 714 | 8559 ScreenLinesC[0][off] = 0; |
| 7 | 8560 } |
| 8561 else | |
| 8562 ScreenLinesUC[off] = 0; | |
| 8563 } | |
| 8564 #endif | |
| 8565 ScreenAttrs[off] = attr; | |
| 8566 if (!did_delete || c != ' ') | |
| 8567 screen_char(off, row, col); | |
| 8568 } | |
| 8569 ++off; | |
| 8570 if (col == start_col) | |
| 8571 { | |
| 8572 if (did_delete) | |
| 8573 break; | |
| 8574 c = c2; | |
| 8575 } | |
| 8576 } | |
| 8577 if (end_col == Columns) | |
| 8578 LineWraps[row] = FALSE; | |
| 8579 if (row == Rows - 1) /* overwritten the command line */ | |
| 8580 { | |
| 8581 redraw_cmdline = TRUE; | |
| 8582 if (c1 == ' ' && c2 == ' ') | |
| 8583 clear_cmdline = FALSE; /* command line has been cleared */ | |
| 644 | 8584 if (start_col == 0) |
| 8585 mode_displayed = FALSE; /* mode cleared or overwritten */ | |
| 7 | 8586 } |
| 8587 } | |
| 8588 } | |
| 8589 | |
| 8590 /* | |
| 8591 * Check if there should be a delay. Used before clearing or redrawing the | |
| 8592 * screen or the command line. | |
| 8593 */ | |
| 8594 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8595 check_for_delay(int check_msg_scroll) |
| 7 | 8596 { |
| 8597 if ((emsg_on_display || (check_msg_scroll && msg_scroll)) | |
| 8598 && !did_wait_return | |
| 8599 && emsg_silent == 0) | |
| 8600 { | |
| 8601 out_flush(); | |
| 8602 ui_delay(1000L, TRUE); | |
| 8603 emsg_on_display = FALSE; | |
| 8604 if (check_msg_scroll) | |
| 8605 msg_scroll = FALSE; | |
| 8606 } | |
| 8607 } | |
| 8608 | |
| 8609 /* | |
| 8610 * screen_valid - allocate screen buffers if size changed | |
| 3263 | 8611 * If "doclear" is TRUE: clear screen if it has been resized. |
| 7 | 8612 * Returns TRUE if there is a valid screen to write to. |
| 8613 * Returns FALSE when starting up and screen not initialized yet. | |
| 8614 */ | |
| 8615 int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8616 screen_valid(int doclear) |
| 7 | 8617 { |
| 3263 | 8618 screenalloc(doclear); /* allocate screen buffers if size changed */ |
| 7 | 8619 return (ScreenLines != NULL); |
| 8620 } | |
| 8621 | |
| 8622 /* | |
| 8623 * Resize the shell to Rows and Columns. | |
| 8624 * Allocate ScreenLines[] and associated items. | |
| 8625 * | |
| 8626 * There may be some time between setting Rows and Columns and (re)allocating | |
| 8627 * ScreenLines[]. This happens when starting up and when (manually) changing | |
| 8628 * the shell size. Always use screen_Rows and screen_Columns to access items | |
| 8629 * in ScreenLines[]. Use Rows and Columns for positioning text etc. where the | |
| 8630 * final size of the shell is needed. | |
| 8631 */ | |
| 8632 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8633 screenalloc(int doclear) |
| 7 | 8634 { |
| 8635 int new_row, old_row; | |
| 8636 #ifdef FEAT_GUI | |
| 8637 int old_Rows; | |
| 8638 #endif | |
| 8639 win_T *wp; | |
| 8640 int outofmem = FALSE; | |
| 8641 int len; | |
| 8642 schar_T *new_ScreenLines; | |
| 8643 #ifdef FEAT_MBYTE | |
| 8644 u8char_T *new_ScreenLinesUC = NULL; | |
| 714 | 8645 u8char_T *new_ScreenLinesC[MAX_MCO]; |
| 7 | 8646 schar_T *new_ScreenLines2 = NULL; |
| 714 | 8647 int i; |
| 7 | 8648 #endif |
| 8649 sattr_T *new_ScreenAttrs; | |
| 8650 unsigned *new_LineOffset; | |
| 8651 char_u *new_LineWraps; | |
| 671 | 8652 #ifdef FEAT_WINDOWS |
| 681 | 8653 short *new_TabPageIdxs; |
| 671 | 8654 tabpage_T *tp; |
| 8655 #endif | |
| 7 | 8656 static int entered = FALSE; /* avoid recursiveness */ |
| 944 | 8657 static int done_outofmem_msg = FALSE; /* did outofmem message */ |
| 1824 | 8658 #ifdef FEAT_AUTOCMD |
| 8659 int retry_count = 0; | |
| 8660 | |
| 8661 retry: | |
| 8662 #endif | |
| 7 | 8663 /* |
| 8664 * Allocation of the screen buffers is done only when the size changes and | |
| 8665 * when Rows and Columns have been set and we have started doing full | |
| 8666 * screen stuff. | |
| 8667 */ | |
| 8668 if ((ScreenLines != NULL | |
| 8669 && Rows == screen_Rows | |
| 8670 && Columns == screen_Columns | |
| 8671 #ifdef FEAT_MBYTE | |
| 8672 && enc_utf8 == (ScreenLinesUC != NULL) | |
| 8673 && (enc_dbcs == DBCS_JPNU) == (ScreenLines2 != NULL) | |
| 714 | 8674 && p_mco == Screen_mco |
| 7 | 8675 #endif |
| 8676 ) | |
| 8677 || Rows == 0 | |
| 8678 || Columns == 0 | |
| 8679 || (!full_screen && ScreenLines == NULL)) | |
| 8680 return; | |
| 8681 | |
| 8682 /* | |
| 8683 * It's possible that we produce an out-of-memory message below, which | |
| 8684 * will cause this function to be called again. To break the loop, just | |
| 8685 * return here. | |
| 8686 */ | |
| 8687 if (entered) | |
| 8688 return; | |
| 8689 entered = TRUE; | |
| 8690 | |
| 911 | 8691 /* |
| 8692 * Note that the window sizes are updated before reallocating the arrays, | |
| 8693 * thus we must not redraw here! | |
| 8694 */ | |
| 8695 ++RedrawingDisabled; | |
| 8696 | |
| 7 | 8697 win_new_shellsize(); /* fit the windows in the new sized shell */ |
| 8698 | |
| 8699 comp_col(); /* recompute columns for shown command and ruler */ | |
| 8700 | |
| 8701 /* | |
| 8702 * We're changing the size of the screen. | |
| 8703 * - Allocate new arrays for ScreenLines and ScreenAttrs. | |
| 8704 * - Move lines from the old arrays into the new arrays, clear extra | |
| 8705 * lines (unless the screen is going to be cleared). | |
| 8706 * - Free the old arrays. | |
| 8707 * | |
| 8708 * If anything fails, make ScreenLines NULL, so we don't do anything! | |
| 8709 * Continuing with the old ScreenLines may result in a crash, because the | |
| 8710 * size is wrong. | |
| 8711 */ | |
| 671 | 8712 FOR_ALL_TAB_WINDOWS(tp, wp) |
| 7 | 8713 win_free_lsize(wp); |
| 1946 | 8714 #ifdef FEAT_AUTOCMD |
| 8715 if (aucmd_win != NULL) | |
| 8716 win_free_lsize(aucmd_win); | |
| 8717 #endif | |
| 7 | 8718 |
| 8719 new_ScreenLines = (schar_T *)lalloc((long_u)( | |
| 8720 (Rows + 1) * Columns * sizeof(schar_T)), FALSE); | |
| 8721 #ifdef FEAT_MBYTE | |
|
2122
476336a5ae95
updated for version 7.2.404
Bram Moolenaar <bram@zimbu.org>
parents:
2069
diff
changeset
|
8722 vim_memset(new_ScreenLinesC, 0, sizeof(u8char_T *) * MAX_MCO); |
| 7 | 8723 if (enc_utf8) |
| 8724 { | |
| 8725 new_ScreenLinesUC = (u8char_T *)lalloc((long_u)( | |
| 8726 (Rows + 1) * Columns * sizeof(u8char_T)), FALSE); | |
| 714 | 8727 for (i = 0; i < p_mco; ++i) |
|
2124
dc8a5699253b
updated for version 7.2.406
Bram Moolenaar <bram@zimbu.org>
parents:
2122
diff
changeset
|
8728 new_ScreenLinesC[i] = (u8char_T *)lalloc_clear((long_u)( |
| 7 | 8729 (Rows + 1) * Columns * sizeof(u8char_T)), FALSE); |
| 8730 } | |
| 8731 if (enc_dbcs == DBCS_JPNU) | |
| 8732 new_ScreenLines2 = (schar_T *)lalloc((long_u)( | |
| 8733 (Rows + 1) * Columns * sizeof(schar_T)), FALSE); | |
| 8734 #endif | |
| 8735 new_ScreenAttrs = (sattr_T *)lalloc((long_u)( | |
| 8736 (Rows + 1) * Columns * sizeof(sattr_T)), FALSE); | |
| 8737 new_LineOffset = (unsigned *)lalloc((long_u)( | |
| 8738 Rows * sizeof(unsigned)), FALSE); | |
| 8739 new_LineWraps = (char_u *)lalloc((long_u)(Rows * sizeof(char_u)), FALSE); | |
| 671 | 8740 #ifdef FEAT_WINDOWS |
| 681 | 8741 new_TabPageIdxs = (short *)lalloc((long_u)(Columns * sizeof(short)), FALSE); |
| 671 | 8742 #endif |
| 7 | 8743 |
| 677 | 8744 FOR_ALL_TAB_WINDOWS(tp, wp) |
| 7 | 8745 { |
| 8746 if (win_alloc_lines(wp) == FAIL) | |
| 8747 { | |
| 8748 outofmem = TRUE; | |
| 8749 #ifdef FEAT_WINDOWS | |
| 1819 | 8750 goto give_up; |
| 8751 #endif | |
| 8752 } | |
| 8753 } | |
| 1906 | 8754 #ifdef FEAT_AUTOCMD |
| 1946 | 8755 if (aucmd_win != NULL && aucmd_win->w_lines == NULL |
| 8756 && win_alloc_lines(aucmd_win) == FAIL) | |
| 1906 | 8757 outofmem = TRUE; |
| 8758 #endif | |
| 1819 | 8759 #ifdef FEAT_WINDOWS |
| 8760 give_up: | |
| 8761 #endif | |
| 7 | 8762 |
| 714 | 8763 #ifdef FEAT_MBYTE |
| 8764 for (i = 0; i < p_mco; ++i) | |
| 8765 if (new_ScreenLinesC[i] == NULL) | |
| 8766 break; | |
| 8767 #endif | |
| 7 | 8768 if (new_ScreenLines == NULL |
| 8769 #ifdef FEAT_MBYTE | |
| 714 | 8770 || (enc_utf8 && (new_ScreenLinesUC == NULL || i != p_mco)) |
| 7 | 8771 || (enc_dbcs == DBCS_JPNU && new_ScreenLines2 == NULL) |
| 8772 #endif | |
| 8773 || new_ScreenAttrs == NULL | |
| 8774 || new_LineOffset == NULL | |
| 8775 || new_LineWraps == NULL | |
| 671 | 8776 #ifdef FEAT_WINDOWS |
| 8777 || new_TabPageIdxs == NULL | |
| 8778 #endif | |
| 7 | 8779 || outofmem) |
| 8780 { | |
| 944 | 8781 if (ScreenLines != NULL || !done_outofmem_msg) |
| 534 | 8782 { |
| 8783 /* guess the size */ | |
| 8784 do_outofmem_msg((long_u)((Rows + 1) * Columns)); | |
| 8785 | |
| 8786 /* Remember we did this to avoid getting outofmem messages over | |
| 8787 * and over again. */ | |
| 944 | 8788 done_outofmem_msg = TRUE; |
| 534 | 8789 } |
| 7 | 8790 vim_free(new_ScreenLines); |
| 8791 new_ScreenLines = NULL; | |
| 8792 #ifdef FEAT_MBYTE | |
| 8793 vim_free(new_ScreenLinesUC); | |
| 8794 new_ScreenLinesUC = NULL; | |
| 714 | 8795 for (i = 0; i < p_mco; ++i) |
| 8796 { | |
| 8797 vim_free(new_ScreenLinesC[i]); | |
| 8798 new_ScreenLinesC[i] = NULL; | |
| 8799 } | |
| 7 | 8800 vim_free(new_ScreenLines2); |
| 8801 new_ScreenLines2 = NULL; | |
| 8802 #endif | |
| 8803 vim_free(new_ScreenAttrs); | |
| 8804 new_ScreenAttrs = NULL; | |
| 8805 vim_free(new_LineOffset); | |
| 8806 new_LineOffset = NULL; | |
| 8807 vim_free(new_LineWraps); | |
| 8808 new_LineWraps = NULL; | |
| 671 | 8809 #ifdef FEAT_WINDOWS |
| 8810 vim_free(new_TabPageIdxs); | |
| 8811 new_TabPageIdxs = NULL; | |
| 8812 #endif | |
| 7 | 8813 } |
| 8814 else | |
| 8815 { | |
| 944 | 8816 done_outofmem_msg = FALSE; |
| 534 | 8817 |
| 7 | 8818 for (new_row = 0; new_row < Rows; ++new_row) |
| 8819 { | |
| 8820 new_LineOffset[new_row] = new_row * Columns; | |
| 8821 new_LineWraps[new_row] = FALSE; | |
| 8822 | |
| 8823 /* | |
| 8824 * If the screen is not going to be cleared, copy as much as | |
| 8825 * possible from the old screen to the new one and clear the rest | |
| 8826 * (used when resizing the window at the "--more--" prompt or when | |
| 8827 * executing an external command, for the GUI). | |
| 8828 */ | |
| 3263 | 8829 if (!doclear) |
| 7 | 8830 { |
| 8831 (void)vim_memset(new_ScreenLines + new_row * Columns, | |
| 8832 ' ', (size_t)Columns * sizeof(schar_T)); | |
| 8833 #ifdef FEAT_MBYTE | |
| 8834 if (enc_utf8) | |
| 8835 { | |
| 8836 (void)vim_memset(new_ScreenLinesUC + new_row * Columns, | |
| 8837 0, (size_t)Columns * sizeof(u8char_T)); | |
| 714 | 8838 for (i = 0; i < p_mco; ++i) |
| 8839 (void)vim_memset(new_ScreenLinesC[i] | |
| 8840 + new_row * Columns, | |
| 7 | 8841 0, (size_t)Columns * sizeof(u8char_T)); |
| 8842 } | |
| 8843 if (enc_dbcs == DBCS_JPNU) | |
| 8844 (void)vim_memset(new_ScreenLines2 + new_row * Columns, | |
| 8845 0, (size_t)Columns * sizeof(schar_T)); | |
| 8846 #endif | |
| 8847 (void)vim_memset(new_ScreenAttrs + new_row * Columns, | |
| 8848 0, (size_t)Columns * sizeof(sattr_T)); | |
| 8849 old_row = new_row + (screen_Rows - Rows); | |
| 534 | 8850 if (old_row >= 0 && ScreenLines != NULL) |
| 7 | 8851 { |
| 8852 if (screen_Columns < Columns) | |
| 8853 len = screen_Columns; | |
| 8854 else | |
| 8855 len = Columns; | |
| 26 | 8856 #ifdef FEAT_MBYTE |
| 571 | 8857 /* When switching to utf-8 don't copy characters, they |
| 714 | 8858 * may be invalid now. Also when p_mco changes. */ |
| 8859 if (!(enc_utf8 && ScreenLinesUC == NULL) | |
| 8860 && p_mco == Screen_mco) | |
| 26 | 8861 #endif |
| 8862 mch_memmove(new_ScreenLines + new_LineOffset[new_row], | |
| 8863 ScreenLines + LineOffset[old_row], | |
| 8864 (size_t)len * sizeof(schar_T)); | |
| 7 | 8865 #ifdef FEAT_MBYTE |
| 714 | 8866 if (enc_utf8 && ScreenLinesUC != NULL |
| 8867 && p_mco == Screen_mco) | |
| 7 | 8868 { |
| 8869 mch_memmove(new_ScreenLinesUC + new_LineOffset[new_row], | |
| 8870 ScreenLinesUC + LineOffset[old_row], | |
| 8871 (size_t)len * sizeof(u8char_T)); | |
| 714 | 8872 for (i = 0; i < p_mco; ++i) |
| 8873 mch_memmove(new_ScreenLinesC[i] | |
| 8874 + new_LineOffset[new_row], | |
| 8875 ScreenLinesC[i] + LineOffset[old_row], | |
| 7 | 8876 (size_t)len * sizeof(u8char_T)); |
| 8877 } | |
| 8878 if (enc_dbcs == DBCS_JPNU && ScreenLines2 != NULL) | |
| 8879 mch_memmove(new_ScreenLines2 + new_LineOffset[new_row], | |
| 8880 ScreenLines2 + LineOffset[old_row], | |
| 8881 (size_t)len * sizeof(schar_T)); | |
| 8882 #endif | |
| 8883 mch_memmove(new_ScreenAttrs + new_LineOffset[new_row], | |
| 8884 ScreenAttrs + LineOffset[old_row], | |
| 8885 (size_t)len * sizeof(sattr_T)); | |
| 8886 } | |
| 8887 } | |
| 8888 } | |
| 8889 /* Use the last line of the screen for the current line. */ | |
| 8890 current_ScreenLine = new_ScreenLines + Rows * Columns; | |
| 8891 } | |
| 8892 | |
| 356 | 8893 free_screenlines(); |
| 8894 | |
| 7 | 8895 ScreenLines = new_ScreenLines; |
| 8896 #ifdef FEAT_MBYTE | |
| 8897 ScreenLinesUC = new_ScreenLinesUC; | |
| 714 | 8898 for (i = 0; i < p_mco; ++i) |
| 8899 ScreenLinesC[i] = new_ScreenLinesC[i]; | |
| 8900 Screen_mco = p_mco; | |
| 7 | 8901 ScreenLines2 = new_ScreenLines2; |
| 8902 #endif | |
| 8903 ScreenAttrs = new_ScreenAttrs; | |
| 8904 LineOffset = new_LineOffset; | |
| 8905 LineWraps = new_LineWraps; | |
| 671 | 8906 #ifdef FEAT_WINDOWS |
| 8907 TabPageIdxs = new_TabPageIdxs; | |
| 8908 #endif | |
| 7 | 8909 |
| 8910 /* It's important that screen_Rows and screen_Columns reflect the actual | |
| 8911 * size of ScreenLines[]. Set them before calling anything. */ | |
| 8912 #ifdef FEAT_GUI | |
| 8913 old_Rows = screen_Rows; | |
| 8914 #endif | |
| 8915 screen_Rows = Rows; | |
| 8916 screen_Columns = Columns; | |
| 8917 | |
| 8918 must_redraw = CLEAR; /* need to clear the screen later */ | |
| 3263 | 8919 if (doclear) |
| 7 | 8920 screenclear2(); |
| 8921 | |
| 8922 #ifdef FEAT_GUI | |
| 8923 else if (gui.in_use | |
| 8924 && !gui.starting | |
| 8925 && ScreenLines != NULL | |
| 8926 && old_Rows != Rows) | |
| 8927 { | |
| 8928 (void)gui_redraw_block(0, 0, (int)Rows - 1, (int)Columns - 1, 0); | |
| 8929 /* | |
| 8930 * Adjust the position of the cursor, for when executing an external | |
| 8931 * command. | |
| 8932 */ | |
| 8933 if (msg_row >= Rows) /* Rows got smaller */ | |
| 8934 msg_row = Rows - 1; /* put cursor at last row */ | |
| 8935 else if (Rows > old_Rows) /* Rows got bigger */ | |
| 8936 msg_row += Rows - old_Rows; /* put cursor in same place */ | |
| 8937 if (msg_col >= Columns) /* Columns got smaller */ | |
| 8938 msg_col = Columns - 1; /* put cursor at last column */ | |
| 8939 } | |
| 8940 #endif | |
| 8941 | |
| 8942 entered = FALSE; | |
| 911 | 8943 --RedrawingDisabled; |
| 766 | 8944 |
| 8945 #ifdef FEAT_AUTOCMD | |
| 1824 | 8946 /* |
| 8947 * Do not apply autocommands more than 3 times to avoid an endless loop | |
| 8948 * in case applying autocommands always changes Rows or Columns. | |
| 8949 */ | |
| 8950 if (starting == 0 && ++retry_count <= 3) | |
| 8951 { | |
| 766 | 8952 apply_autocmds(EVENT_VIMRESIZED, NULL, NULL, FALSE, curbuf); |
| 1824 | 8953 /* In rare cases, autocommands may have altered Rows or Columns, |
| 8954 * jump back to check if we need to allocate the screen again. */ | |
| 8955 goto retry; | |
| 8956 } | |
| 766 | 8957 #endif |
| 7 | 8958 } |
| 8959 | |
| 8960 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8961 free_screenlines(void) |
| 356 | 8962 { |
| 8963 #ifdef FEAT_MBYTE | |
| 714 | 8964 int i; |
| 8965 | |
| 356 | 8966 vim_free(ScreenLinesUC); |
| 714 | 8967 for (i = 0; i < Screen_mco; ++i) |
| 8968 vim_free(ScreenLinesC[i]); | |
| 356 | 8969 vim_free(ScreenLines2); |
| 8970 #endif | |
| 714 | 8971 vim_free(ScreenLines); |
| 356 | 8972 vim_free(ScreenAttrs); |
| 8973 vim_free(LineOffset); | |
| 8974 vim_free(LineWraps); | |
| 671 | 8975 #ifdef FEAT_WINDOWS |
| 8976 vim_free(TabPageIdxs); | |
| 8977 #endif | |
| 356 | 8978 } |
| 8979 | |
| 8980 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8981 screenclear(void) |
| 7 | 8982 { |
| 8983 check_for_delay(FALSE); | |
| 8984 screenalloc(FALSE); /* allocate screen buffers if size changed */ | |
| 8985 screenclear2(); /* clear the screen */ | |
| 8986 } | |
| 8987 | |
| 8988 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8989 screenclear2(void) |
| 7 | 8990 { |
| 8991 int i; | |
| 8992 | |
| 8993 if (starting == NO_SCREEN || ScreenLines == NULL | |
| 8994 #ifdef FEAT_GUI | |
| 8995 || (gui.in_use && gui.starting) | |
| 8996 #endif | |
| 8997 ) | |
| 8998 return; | |
| 8999 | |
| 9000 #ifdef FEAT_GUI | |
| 9001 if (!gui.in_use) | |
| 9002 #endif | |
| 9003 screen_attr = -1; /* force setting the Normal colors */ | |
| 9004 screen_stop_highlight(); /* don't want highlighting here */ | |
| 9005 | |
| 9006 #ifdef FEAT_CLIPBOARD | |
| 9007 /* disable selection without redrawing it */ | |
| 9008 clip_scroll_selection(9999); | |
| 9009 #endif | |
| 9010 | |
| 9011 /* blank out ScreenLines */ | |
| 9012 for (i = 0; i < Rows; ++i) | |
| 9013 { | |
| 9014 lineclear(LineOffset[i], (int)Columns); | |
| 9015 LineWraps[i] = FALSE; | |
| 9016 } | |
| 9017 | |
| 9018 if (can_clear(T_CL)) | |
| 9019 { | |
| 9020 out_str(T_CL); /* clear the display */ | |
| 9021 clear_cmdline = FALSE; | |
| 644 | 9022 mode_displayed = FALSE; |
| 7 | 9023 } |
| 9024 else | |
| 9025 { | |
| 9026 /* can't clear the screen, mark all chars with invalid attributes */ | |
| 9027 for (i = 0; i < Rows; ++i) | |
| 9028 lineinvalid(LineOffset[i], (int)Columns); | |
| 9029 clear_cmdline = TRUE; | |
| 9030 } | |
| 9031 | |
| 9032 screen_cleared = TRUE; /* can use contents of ScreenLines now */ | |
| 9033 | |
| 9034 win_rest_invalid(firstwin); | |
| 9035 redraw_cmdline = TRUE; | |
| 670 | 9036 #ifdef FEAT_WINDOWS |
| 673 | 9037 redraw_tabline = TRUE; |
| 670 | 9038 #endif |
| 7 | 9039 if (must_redraw == CLEAR) /* no need to clear again */ |
| 9040 must_redraw = NOT_VALID; | |
| 9041 compute_cmdrow(); | |
| 9042 msg_row = cmdline_row; /* put cursor on last line for messages */ | |
| 9043 msg_col = 0; | |
| 9044 screen_start(); /* don't know where cursor is now */ | |
| 9045 msg_scrolled = 0; /* can't scroll back */ | |
| 9046 msg_didany = FALSE; | |
| 9047 msg_didout = FALSE; | |
| 9048 } | |
| 9049 | |
| 9050 /* | |
| 9051 * Clear one line in ScreenLines. | |
| 9052 */ | |
| 9053 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9054 lineclear(unsigned off, int width) |
| 7 | 9055 { |
| 9056 (void)vim_memset(ScreenLines + off, ' ', (size_t)width * sizeof(schar_T)); | |
| 9057 #ifdef FEAT_MBYTE | |
| 9058 if (enc_utf8) | |
| 9059 (void)vim_memset(ScreenLinesUC + off, 0, | |
| 9060 (size_t)width * sizeof(u8char_T)); | |
| 9061 #endif | |
| 9062 (void)vim_memset(ScreenAttrs + off, 0, (size_t)width * sizeof(sattr_T)); | |
| 9063 } | |
| 9064 | |
| 9065 /* | |
| 9066 * Mark one line in ScreenLines invalid by setting the attributes to an | |
| 9067 * invalid value. | |
| 9068 */ | |
| 9069 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9070 lineinvalid(unsigned off, int width) |
| 7 | 9071 { |
| 9072 (void)vim_memset(ScreenAttrs + off, -1, (size_t)width * sizeof(sattr_T)); | |
| 9073 } | |
| 9074 | |
|
8643
24b43dd167eb
commit https://github.com/vim/vim/commit/44a2f923c00f1384c9ecde12fb5b4711bc20702e
Christian Brabandt <cb@256bit.org>
parents:
8627
diff
changeset
|
9075 #ifdef FEAT_WINDOWS |
| 7 | 9076 /* |
| 9077 * Copy part of a Screenline for vertically split window "wp". | |
| 9078 */ | |
| 9079 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9080 linecopy(int to, int from, win_T *wp) |
| 7 | 9081 { |
| 9082 unsigned off_to = LineOffset[to] + wp->w_wincol; | |
| 9083 unsigned off_from = LineOffset[from] + wp->w_wincol; | |
| 9084 | |
| 9085 mch_memmove(ScreenLines + off_to, ScreenLines + off_from, | |
| 9086 wp->w_width * sizeof(schar_T)); | |
| 9087 # ifdef FEAT_MBYTE | |
| 9088 if (enc_utf8) | |
| 9089 { | |
| 714 | 9090 int i; |
| 9091 | |
| 7 | 9092 mch_memmove(ScreenLinesUC + off_to, ScreenLinesUC + off_from, |
| 9093 wp->w_width * sizeof(u8char_T)); | |
| 714 | 9094 for (i = 0; i < p_mco; ++i) |
| 9095 mch_memmove(ScreenLinesC[i] + off_to, ScreenLinesC[i] + off_from, | |
| 9096 wp->w_width * sizeof(u8char_T)); | |
| 7 | 9097 } |
| 9098 if (enc_dbcs == DBCS_JPNU) | |
| 9099 mch_memmove(ScreenLines2 + off_to, ScreenLines2 + off_from, | |
| 9100 wp->w_width * sizeof(schar_T)); | |
| 9101 # endif | |
| 9102 mch_memmove(ScreenAttrs + off_to, ScreenAttrs + off_from, | |
| 9103 wp->w_width * sizeof(sattr_T)); | |
| 9104 } | |
| 9105 #endif | |
| 9106 | |
| 9107 /* | |
| 9108 * Return TRUE if clearing with term string "p" would work. | |
| 9109 * It can't work when the string is empty or it won't set the right background. | |
| 9110 */ | |
| 9111 int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9112 can_clear(char_u *p) |
| 7 | 9113 { |
| 9114 return (*p != NUL && (t_colors <= 1 | |
| 9115 #ifdef FEAT_GUI | |
| 9116 || gui.in_use | |
| 9117 #endif | |
|
9027
773d627cac0b
commit https://github.com/vim/vim/commit/61be73bb0f965a895bfb064ea3e55476ac175162
Christian Brabandt <cb@256bit.org>
parents:
8977
diff
changeset
|
9118 #ifdef FEAT_TERMGUICOLORS |
|
9939
ccb6461b82df
commit https://github.com/vim/vim/commit/1b58cdd160c2e0ada0f638679a2aa27e4665fc48
Christian Brabandt <cb@256bit.org>
parents:
9885
diff
changeset
|
9119 || (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
|
9120 || (!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
|
9121 #else |
|
b6472fd9f5ba
commit https://github.com/vim/vim/commit/d18f672fc9477f3c0cb7cc4ce8d9237ed825c612
Christian Brabandt <cb@256bit.org>
parents:
9282
diff
changeset
|
9122 || cterm_normal_bg_color == 0 |
|
b6472fd9f5ba
commit https://github.com/vim/vim/commit/d18f672fc9477f3c0cb7cc4ce8d9237ed825c612
Christian Brabandt <cb@256bit.org>
parents:
9282
diff
changeset
|
9123 #endif |
|
b6472fd9f5ba
commit https://github.com/vim/vim/commit/d18f672fc9477f3c0cb7cc4ce8d9237ed825c612
Christian Brabandt <cb@256bit.org>
parents:
9282
diff
changeset
|
9124 || *T_UT != NUL)); |
| 7 | 9125 } |
| 9126 | |
| 9127 /* | |
| 9128 * Reset cursor position. Use whenever cursor was moved because of outputting | |
| 9129 * something directly to the screen (shell commands) or a terminal control | |
| 9130 * code. | |
| 9131 */ | |
| 9132 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9133 screen_start(void) |
| 7 | 9134 { |
| 9135 screen_cur_row = screen_cur_col = 9999; | |
| 9136 } | |
| 9137 | |
| 9138 /* | |
| 9139 * Move the cursor to position "row","col" in the screen. | |
| 9140 * This tries to find the most efficient way to move, minimizing the number of | |
| 9141 * characters sent to the terminal. | |
| 9142 */ | |
| 9143 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9144 windgoto(int row, int col) |
| 7 | 9145 { |
| 205 | 9146 sattr_T *p; |
| 7 | 9147 int i; |
| 9148 int plan; | |
| 9149 int cost; | |
| 9150 int wouldbe_col; | |
| 9151 int noinvcurs; | |
| 9152 char_u *bs; | |
| 9153 int goto_cost; | |
| 9154 int attr; | |
| 9155 | |
| 1213 | 9156 #define GOTO_COST 7 /* assume a term_windgoto() takes about 7 chars */ |
| 7 | 9157 #define HIGHL_COST 5 /* assume unhighlight takes 5 chars */ |
| 9158 | |
| 9159 #define PLAN_LE 1 | |
| 9160 #define PLAN_CR 2 | |
| 9161 #define PLAN_NL 3 | |
| 9162 #define PLAN_WRITE 4 | |
| 9163 /* Can't use ScreenLines unless initialized */ | |
| 9164 if (ScreenLines == NULL) | |
| 9165 return; | |
| 9166 | |
| 9167 if (col != screen_cur_col || row != screen_cur_row) | |
| 9168 { | |
| 9169 /* Check for valid position. */ | |
| 9170 if (row < 0) /* window without text lines? */ | |
| 9171 row = 0; | |
| 9172 if (row >= screen_Rows) | |
| 9173 row = screen_Rows - 1; | |
| 9174 if (col >= screen_Columns) | |
| 9175 col = screen_Columns - 1; | |
| 9176 | |
| 9177 /* check if no cursor movement is allowed in highlight mode */ | |
| 9178 if (screen_attr && *T_MS == NUL) | |
| 9179 noinvcurs = HIGHL_COST; | |
| 9180 else | |
| 9181 noinvcurs = 0; | |
| 9182 goto_cost = GOTO_COST + noinvcurs; | |
| 9183 | |
| 9184 /* | |
| 9185 * Plan how to do the positioning: | |
| 9186 * 1. Use CR to move it to column 0, same row. | |
| 9187 * 2. Use T_LE to move it a few columns to the left. | |
| 9188 * 3. Use NL to move a few lines down, column 0. | |
| 9189 * 4. Move a few columns to the right with T_ND or by writing chars. | |
| 9190 * | |
| 9191 * Don't do this if the cursor went beyond the last column, the cursor | |
| 9192 * position is unknown then (some terminals wrap, some don't ) | |
| 9193 * | |
| 1213 | 9194 * First check if the highlighting attributes allow us to write |
| 7 | 9195 * characters to move the cursor to the right. |
| 9196 */ | |
| 9197 if (row >= screen_cur_row && screen_cur_col < Columns) | |
| 9198 { | |
| 9199 /* | |
| 9200 * If the cursor is in the same row, bigger col, we can use CR | |
| 9201 * or T_LE. | |
| 9202 */ | |
| 9203 bs = NULL; /* init for GCC */ | |
| 9204 attr = screen_attr; | |
| 9205 if (row == screen_cur_row && col < screen_cur_col) | |
| 9206 { | |
| 9207 /* "le" is preferred over "bc", because "bc" is obsolete */ | |
| 9208 if (*T_LE) | |
| 9209 bs = T_LE; /* "cursor left" */ | |
| 9210 else | |
| 9211 bs = T_BC; /* "backspace character (old) */ | |
| 9212 if (*bs) | |
| 9213 cost = (screen_cur_col - col) * (int)STRLEN(bs); | |
| 9214 else | |
| 9215 cost = 999; | |
| 9216 if (col + 1 < cost) /* using CR is less characters */ | |
| 9217 { | |
| 9218 plan = PLAN_CR; | |
| 9219 wouldbe_col = 0; | |
| 9220 cost = 1; /* CR is just one character */ | |
| 9221 } | |
| 9222 else | |
| 9223 { | |
| 9224 plan = PLAN_LE; | |
| 9225 wouldbe_col = col; | |
| 9226 } | |
| 9227 if (noinvcurs) /* will stop highlighting */ | |
| 9228 { | |
| 9229 cost += noinvcurs; | |
| 9230 attr = 0; | |
| 9231 } | |
| 9232 } | |
| 9233 | |
| 9234 /* | |
| 9235 * If the cursor is above where we want to be, we can use CR LF. | |
| 9236 */ | |
| 9237 else if (row > screen_cur_row) | |
| 9238 { | |
| 9239 plan = PLAN_NL; | |
| 9240 wouldbe_col = 0; | |
| 9241 cost = (row - screen_cur_row) * 2; /* CR LF */ | |
| 9242 if (noinvcurs) /* will stop highlighting */ | |
| 9243 { | |
| 9244 cost += noinvcurs; | |
| 9245 attr = 0; | |
| 9246 } | |
| 9247 } | |
| 9248 | |
| 9249 /* | |
| 9250 * If the cursor is in the same row, smaller col, just use write. | |
| 9251 */ | |
| 9252 else | |
| 9253 { | |
| 9254 plan = PLAN_WRITE; | |
| 9255 wouldbe_col = screen_cur_col; | |
| 9256 cost = 0; | |
| 9257 } | |
| 9258 | |
| 9259 /* | |
| 9260 * Check if any characters that need to be written have the | |
| 9261 * correct attributes. Also avoid UTF-8 characters. | |
| 9262 */ | |
| 9263 i = col - wouldbe_col; | |
| 9264 if (i > 0) | |
| 9265 cost += i; | |
| 9266 if (cost < goto_cost && i > 0) | |
| 9267 { | |
| 9268 /* | |
| 9269 * Check if the attributes are correct without additionally | |
| 9270 * stopping highlighting. | |
| 9271 */ | |
| 9272 p = ScreenAttrs + LineOffset[row] + wouldbe_col; | |
| 9273 while (i && *p++ == attr) | |
| 9274 --i; | |
| 9275 if (i != 0) | |
| 9276 { | |
| 9277 /* | |
| 9278 * Try if it works when highlighting is stopped here. | |
| 9279 */ | |
| 9280 if (*--p == 0) | |
| 9281 { | |
| 9282 cost += noinvcurs; | |
| 9283 while (i && *p++ == 0) | |
| 9284 --i; | |
| 9285 } | |
| 9286 if (i != 0) | |
| 9287 cost = 999; /* different attributes, don't do it */ | |
| 9288 } | |
| 9289 #ifdef FEAT_MBYTE | |
| 9290 if (enc_utf8) | |
| 9291 { | |
| 9292 /* Don't use an UTF-8 char for positioning, it's slow. */ | |
| 9293 for (i = wouldbe_col; i < col; ++i) | |
| 9294 if (ScreenLinesUC[LineOffset[row] + i] != 0) | |
| 9295 { | |
| 9296 cost = 999; | |
| 9297 break; | |
| 9298 } | |
| 9299 } | |
| 9300 #endif | |
| 9301 } | |
| 9302 | |
| 9303 /* | |
| 9304 * We can do it without term_windgoto()! | |
| 9305 */ | |
| 9306 if (cost < goto_cost) | |
| 9307 { | |
| 9308 if (plan == PLAN_LE) | |
| 9309 { | |
| 9310 if (noinvcurs) | |
| 9311 screen_stop_highlight(); | |
| 9312 while (screen_cur_col > col) | |
| 9313 { | |
| 9314 out_str(bs); | |
| 9315 --screen_cur_col; | |
| 9316 } | |
| 9317 } | |
| 9318 else if (plan == PLAN_CR) | |
| 9319 { | |
| 9320 if (noinvcurs) | |
| 9321 screen_stop_highlight(); | |
| 9322 out_char('\r'); | |
| 9323 screen_cur_col = 0; | |
| 9324 } | |
| 9325 else if (plan == PLAN_NL) | |
| 9326 { | |
| 9327 if (noinvcurs) | |
| 9328 screen_stop_highlight(); | |
| 9329 while (screen_cur_row < row) | |
| 9330 { | |
| 9331 out_char('\n'); | |
| 9332 ++screen_cur_row; | |
| 9333 } | |
| 9334 screen_cur_col = 0; | |
| 9335 } | |
| 9336 | |
| 9337 i = col - screen_cur_col; | |
| 9338 if (i > 0) | |
| 9339 { | |
| 9340 /* | |
| 9341 * Use cursor-right if it's one character only. Avoids | |
| 9342 * removing a line of pixels from the last bold char, when | |
| 9343 * using the bold trick in the GUI. | |
| 9344 */ | |
| 9345 if (T_ND[0] != NUL && T_ND[1] == NUL) | |
| 9346 { | |
| 9347 while (i-- > 0) | |
| 9348 out_char(*T_ND); | |
| 9349 } | |
| 9350 else | |
| 9351 { | |
| 9352 int off; | |
| 9353 | |
| 9354 off = LineOffset[row] + screen_cur_col; | |
| 9355 while (i-- > 0) | |
| 9356 { | |
| 9357 if (ScreenAttrs[off] != screen_attr) | |
| 9358 screen_stop_highlight(); | |
| 9359 #ifdef FEAT_MBYTE | |
| 9360 out_flush_check(); | |
| 9361 #endif | |
| 9362 out_char(ScreenLines[off]); | |
| 9363 #ifdef FEAT_MBYTE | |
| 9364 if (enc_dbcs == DBCS_JPNU | |
| 9365 && ScreenLines[off] == 0x8e) | |
| 9366 out_char(ScreenLines2[off]); | |
| 9367 #endif | |
| 9368 ++off; | |
| 9369 } | |
| 9370 } | |
| 9371 } | |
| 9372 } | |
| 9373 } | |
| 9374 else | |
| 9375 cost = 999; | |
| 9376 | |
| 9377 if (cost >= goto_cost) | |
| 9378 { | |
| 9379 if (noinvcurs) | |
| 9380 screen_stop_highlight(); | |
| 5995 | 9381 if (row == screen_cur_row && (col > screen_cur_col) |
| 9382 && *T_CRI != NUL) | |
| 7 | 9383 term_cursor_right(col - screen_cur_col); |
| 9384 else | |
| 9385 term_windgoto(row, col); | |
| 9386 } | |
| 9387 screen_cur_row = row; | |
| 9388 screen_cur_col = col; | |
| 9389 } | |
| 9390 } | |
| 9391 | |
| 9392 /* | |
| 9393 * Set cursor to its position in the current window. | |
| 9394 */ | |
| 9395 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9396 setcursor(void) |
| 7 | 9397 { |
| 9398 if (redrawing()) | |
| 9399 { | |
| 9400 validate_cursor(); | |
| 9401 windgoto(W_WINROW(curwin) + curwin->w_wrow, | |
| 9402 W_WINCOL(curwin) + ( | |
| 9403 #ifdef FEAT_RIGHTLEFT | |
| 1545 | 9404 /* With 'rightleft' set and the cursor on a double-wide |
| 9405 * character, position it on the leftmost column. */ | |
| 7 | 9406 curwin->w_p_rl ? ((int)W_WIDTH(curwin) - curwin->w_wcol - ( |
| 9407 # ifdef FEAT_MBYTE | |
| 1545 | 9408 (has_mbyte |
| 9409 && (*mb_ptr2cells)(ml_get_cursor()) == 2 | |
| 9410 && vim_isprintc(gchar_cursor())) ? 2 : | |
| 7 | 9411 # endif |
| 9412 1)) : | |
| 9413 #endif | |
| 9414 curwin->w_wcol)); | |
| 9415 } | |
| 9416 } | |
| 9417 | |
| 9418 | |
| 9419 /* | |
| 9420 * insert 'line_count' lines at 'row' in window 'wp' | |
| 9421 * if 'invalid' is TRUE the wp->w_lines[].wl_lnum is invalidated. | |
| 9422 * if 'mayclear' is TRUE the screen will be cleared if it is faster than | |
| 9423 * scrolling. | |
| 9424 * Returns FAIL if the lines are not inserted, OK for success. | |
| 9425 */ | |
| 9426 int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9427 win_ins_lines( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9428 win_T *wp, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9429 int row, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9430 int line_count, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9431 int invalid, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9432 int mayclear) |
| 7 | 9433 { |
| 9434 int did_delete; | |
| 9435 int nextrow; | |
| 9436 int lastrow; | |
| 9437 int retval; | |
| 9438 | |
| 9439 if (invalid) | |
| 9440 wp->w_lines_valid = 0; | |
| 9441 | |
| 9442 if (wp->w_height < 5) | |
| 9443 return FAIL; | |
| 9444 | |
| 9445 if (line_count > wp->w_height - row) | |
| 9446 line_count = wp->w_height - row; | |
| 9447 | |
| 9448 retval = win_do_lines(wp, row, line_count, mayclear, FALSE); | |
| 9449 if (retval != MAYBE) | |
| 9450 return retval; | |
| 9451 | |
| 9452 /* | |
| 9453 * If there is a next window or a status line, we first try to delete the | |
| 9454 * lines at the bottom to avoid messing what is after the window. | |
| 9455 * If this fails and there are following windows, don't do anything to avoid | |
| 9456 * messing up those windows, better just redraw. | |
| 9457 */ | |
| 9458 did_delete = FALSE; | |
| 9459 #ifdef FEAT_WINDOWS | |
| 9460 if (wp->w_next != NULL || wp->w_status_height) | |
| 9461 { | |
| 9462 if (screen_del_lines(0, W_WINROW(wp) + wp->w_height - line_count, | |
| 9463 line_count, (int)Rows, FALSE, NULL) == OK) | |
| 9464 did_delete = TRUE; | |
| 9465 else if (wp->w_next) | |
| 9466 return FAIL; | |
| 9467 } | |
| 9468 #endif | |
| 9469 /* | |
| 9470 * if no lines deleted, blank the lines that will end up below the window | |
| 9471 */ | |
| 9472 if (!did_delete) | |
| 9473 { | |
| 9474 #ifdef FEAT_WINDOWS | |
| 9475 wp->w_redr_status = TRUE; | |
| 9476 #endif | |
| 9477 redraw_cmdline = TRUE; | |
| 9478 nextrow = W_WINROW(wp) + wp->w_height + W_STATUS_HEIGHT(wp); | |
| 9479 lastrow = nextrow + line_count; | |
| 9480 if (lastrow > Rows) | |
| 9481 lastrow = Rows; | |
| 9482 screen_fill(nextrow - line_count, lastrow - line_count, | |
| 9483 W_WINCOL(wp), (int)W_ENDCOL(wp), | |
| 9484 ' ', ' ', 0); | |
| 9485 } | |
| 9486 | |
| 9487 if (screen_ins_lines(0, W_WINROW(wp) + row, line_count, (int)Rows, NULL) | |
| 9488 == FAIL) | |
| 9489 { | |
| 9490 /* deletion will have messed up other windows */ | |
| 9491 if (did_delete) | |
| 9492 { | |
| 9493 #ifdef FEAT_WINDOWS | |
| 9494 wp->w_redr_status = TRUE; | |
| 9495 #endif | |
| 9496 win_rest_invalid(W_NEXT(wp)); | |
| 9497 } | |
| 9498 return FAIL; | |
| 9499 } | |
| 9500 | |
| 9501 return OK; | |
| 9502 } | |
| 9503 | |
| 9504 /* | |
| 9505 * delete "line_count" window lines at "row" in window "wp" | |
| 9506 * If "invalid" is TRUE curwin->w_lines[] is invalidated. | |
| 9507 * If "mayclear" is TRUE the screen will be cleared if it is faster than | |
| 9508 * scrolling | |
| 9509 * Return OK for success, FAIL if the lines are not deleted. | |
| 9510 */ | |
| 9511 int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9512 win_del_lines( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9513 win_T *wp, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9514 int row, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9515 int line_count, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9516 int invalid, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9517 int mayclear) |
| 7 | 9518 { |
| 9519 int retval; | |
| 9520 | |
| 9521 if (invalid) | |
| 9522 wp->w_lines_valid = 0; | |
| 9523 | |
| 9524 if (line_count > wp->w_height - row) | |
| 9525 line_count = wp->w_height - row; | |
| 9526 | |
| 9527 retval = win_do_lines(wp, row, line_count, mayclear, TRUE); | |
| 9528 if (retval != MAYBE) | |
| 9529 return retval; | |
| 9530 | |
| 9531 if (screen_del_lines(0, W_WINROW(wp) + row, line_count, | |
| 9532 (int)Rows, FALSE, NULL) == FAIL) | |
| 9533 return FAIL; | |
| 9534 | |
| 9535 #ifdef FEAT_WINDOWS | |
| 9536 /* | |
| 9537 * If there are windows or status lines below, try to put them at the | |
| 9538 * correct place. If we can't do that, they have to be redrawn. | |
| 9539 */ | |
| 9540 if (wp->w_next || wp->w_status_height || cmdline_row < Rows - 1) | |
| 9541 { | |
| 9542 if (screen_ins_lines(0, W_WINROW(wp) + wp->w_height - line_count, | |
| 9543 line_count, (int)Rows, NULL) == FAIL) | |
| 9544 { | |
| 9545 wp->w_redr_status = TRUE; | |
| 9546 win_rest_invalid(wp->w_next); | |
| 9547 } | |
| 9548 } | |
| 9549 /* | |
| 9550 * If this is the last window and there is no status line, redraw the | |
| 9551 * command line later. | |
| 9552 */ | |
| 9553 else | |
| 9554 #endif | |
| 9555 redraw_cmdline = TRUE; | |
| 9556 return OK; | |
| 9557 } | |
| 9558 | |
| 9559 /* | |
| 9560 * Common code for win_ins_lines() and win_del_lines(). | |
| 9561 * Returns OK or FAIL when the work has been done. | |
| 9562 * Returns MAYBE when not finished yet. | |
| 9563 */ | |
| 9564 static int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9565 win_do_lines( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9566 win_T *wp, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9567 int row, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9568 int line_count, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9569 int mayclear, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9570 int del) |
| 7 | 9571 { |
| 9572 int retval; | |
| 9573 | |
| 9574 if (!redrawing() || line_count <= 0) | |
| 9575 return FAIL; | |
| 9576 | |
|
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
|
9577 /* 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
|
9578 * 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
|
9579 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
|
9580 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
|
9581 |
| 7 | 9582 /* only a few lines left: redraw is faster */ |
| 9583 if (mayclear && Rows - line_count < 5 | |
|
8643
24b43dd167eb
commit https://github.com/vim/vim/commit/44a2f923c00f1384c9ecde12fb5b4711bc20702e
Christian Brabandt <cb@256bit.org>
parents:
8627
diff
changeset
|
9584 #ifdef FEAT_WINDOWS |
| 7 | 9585 && wp->w_width == Columns |
| 9586 #endif | |
| 9587 ) | |
| 9588 { | |
|
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
|
9589 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
|
9590 screenclear(); /* will set wp->w_lines_valid to 0 */ |
| 7 | 9591 return FAIL; |
| 9592 } | |
| 9593 | |
| 9594 /* | |
| 9595 * Delete all remaining lines | |
| 9596 */ | |
| 9597 if (row + line_count >= wp->w_height) | |
| 9598 { | |
| 9599 screen_fill(W_WINROW(wp) + row, W_WINROW(wp) + wp->w_height, | |
| 9600 W_WINCOL(wp), (int)W_ENDCOL(wp), | |
| 9601 ' ', ' ', 0); | |
| 9602 return OK; | |
| 9603 } | |
| 9604 | |
| 9605 /* | |
|
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
|
9606 * When scrolling, the message on the command line should be cleared, |
| 7 | 9607 * 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
|
9608 * Don't do this when avoiding to insert lines. |
| 7 | 9609 */ |
|
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
|
9610 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
|
9611 clear_cmdline = TRUE; |
| 7 | 9612 |
| 9613 /* | |
| 9614 * If the terminal can set a scroll region, use that. | |
| 9615 * Always do this in a vertically split window. This will redraw from | |
| 9616 * ScreenLines[] when t_CV isn't defined. That's faster than using | |
| 9617 * win_line(). | |
| 9618 * 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
|
9619 * 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
|
9620 * scroll-up . |
| 7 | 9621 */ |
| 9622 if (scroll_region | |
|
8643
24b43dd167eb
commit https://github.com/vim/vim/commit/44a2f923c00f1384c9ecde12fb5b4711bc20702e
Christian Brabandt <cb@256bit.org>
parents:
8627
diff
changeset
|
9623 #ifdef FEAT_WINDOWS |
| 7 | 9624 || W_WIDTH(wp) != Columns |
| 9625 #endif | |
| 9626 ) | |
| 9627 { | |
|
8643
24b43dd167eb
commit https://github.com/vim/vim/commit/44a2f923c00f1384c9ecde12fb5b4711bc20702e
Christian Brabandt <cb@256bit.org>
parents:
8627
diff
changeset
|
9628 #ifdef FEAT_WINDOWS |
| 7 | 9629 if (scroll_region && (wp->w_width == Columns || *T_CSV != NUL)) |
| 9630 #endif | |
| 9631 scroll_region_set(wp, row); | |
| 9632 if (del) | |
| 9633 retval = screen_del_lines(W_WINROW(wp) + row, 0, line_count, | |
| 9634 wp->w_height - row, FALSE, wp); | |
| 9635 else | |
| 9636 retval = screen_ins_lines(W_WINROW(wp) + row, 0, line_count, | |
| 9637 wp->w_height - row, wp); | |
|
8643
24b43dd167eb
commit https://github.com/vim/vim/commit/44a2f923c00f1384c9ecde12fb5b4711bc20702e
Christian Brabandt <cb@256bit.org>
parents:
8627
diff
changeset
|
9638 #ifdef FEAT_WINDOWS |
| 7 | 9639 if (scroll_region && (wp->w_width == Columns || *T_CSV != NUL)) |
| 9640 #endif | |
| 9641 scroll_region_reset(); | |
| 9642 return retval; | |
| 9643 } | |
| 9644 | |
| 9645 #ifdef FEAT_WINDOWS | |
| 9646 if (wp->w_next != NULL && p_tf) /* don't delete/insert on fast terminal */ | |
| 9647 return FAIL; | |
| 9648 #endif | |
| 9649 | |
| 9650 return MAYBE; | |
| 9651 } | |
| 9652 | |
| 9653 /* | |
| 9654 * window 'wp' and everything after it is messed up, mark it for redraw | |
| 9655 */ | |
| 9656 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9657 win_rest_invalid(win_T *wp) |
| 7 | 9658 { |
| 9659 #ifdef FEAT_WINDOWS | |
| 9660 while (wp != NULL) | |
| 9661 #else | |
| 9662 if (wp != NULL) | |
| 9663 #endif | |
| 9664 { | |
| 9665 redraw_win_later(wp, NOT_VALID); | |
| 9666 #ifdef FEAT_WINDOWS | |
| 9667 wp->w_redr_status = TRUE; | |
| 9668 wp = wp->w_next; | |
| 9669 #endif | |
| 9670 } | |
| 9671 redraw_cmdline = TRUE; | |
| 9672 } | |
| 9673 | |
| 9674 /* | |
| 9675 * The rest of the routines in this file perform screen manipulations. The | |
| 9676 * given operation is performed physically on the screen. The corresponding | |
| 9677 * change is also made to the internal screen image. In this way, the editor | |
| 9678 * anticipates the effect of editing changes on the appearance of the screen. | |
| 9679 * That way, when we call screenupdate a complete redraw isn't usually | |
| 9680 * necessary. Another advantage is that we can keep adding code to anticipate | |
| 9681 * screen changes, and in the meantime, everything still works. | |
| 9682 */ | |
| 9683 | |
| 9684 /* | |
| 9685 * types for inserting or deleting lines | |
| 9686 */ | |
| 9687 #define USE_T_CAL 1 | |
| 9688 #define USE_T_CDL 2 | |
| 9689 #define USE_T_AL 3 | |
| 9690 #define USE_T_CE 4 | |
| 9691 #define USE_T_DL 5 | |
| 9692 #define USE_T_SR 6 | |
| 9693 #define USE_NL 7 | |
| 9694 #define USE_T_CD 8 | |
| 9695 #define USE_REDRAW 9 | |
| 9696 | |
| 9697 /* | |
| 9698 * insert lines on the screen and update ScreenLines[] | |
| 9699 * 'end' is the line after the scrolled part. Normally it is Rows. | |
| 9700 * When scrolling region used 'off' is the offset from the top for the region. | |
| 9701 * 'row' and 'end' are relative to the start of the region. | |
| 9702 * | |
| 9703 * return FAIL for failure, OK for success. | |
| 9704 */ | |
| 446 | 9705 int |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9706 screen_ins_lines( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9707 int off, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9708 int row, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9709 int line_count, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9710 int end, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9711 win_T *wp) /* NULL or window to use width from */ |
| 7 | 9712 { |
| 9713 int i; | |
| 9714 int j; | |
| 9715 unsigned temp; | |
| 9716 int cursor_row; | |
| 9717 int type; | |
| 9718 int result_empty; | |
| 9719 int can_ce = can_clear(T_CE); | |
| 9720 | |
| 9721 /* | |
| 9722 * FAIL if | |
| 9723 * - there is no valid screen | |
| 9724 * - the screen has to be redrawn completely | |
| 9725 * - the line count is less than one | |
| 9726 * - the line count is more than 'ttyscroll' | |
| 9727 */ | |
| 9728 if (!screen_valid(TRUE) || line_count <= 0 || line_count > p_ttyscroll) | |
| 9729 return FAIL; | |
| 9730 | |
| 9731 /* | |
| 9732 * There are seven ways to insert lines: | |
| 9733 * 0. When in a vertically split window and t_CV isn't set, redraw the | |
| 9734 * characters from ScreenLines[]. | |
| 9735 * 1. Use T_CD (clear to end of display) if it exists and the result of | |
| 9736 * the insert is just empty lines | |
| 9737 * 2. Use T_CAL (insert multiple lines) if it exists and T_AL is not | |
| 9738 * present or line_count > 1. It looks better if we do all the inserts | |
| 9739 * at once. | |
| 9740 * 3. Use T_CDL (delete multiple lines) if it exists and the result of the | |
| 9741 * insert is just empty lines and T_CE is not present or line_count > | |
| 9742 * 1. | |
| 9743 * 4. Use T_AL (insert line) if it exists. | |
| 9744 * 5. Use T_CE (erase line) if it exists and the result of the insert is | |
| 9745 * just empty lines. | |
| 9746 * 6. Use T_DL (delete line) if it exists and the result of the insert is | |
| 9747 * just empty lines. | |
| 9748 * 7. Use T_SR (scroll reverse) if it exists and inserting at row 0 and | |
| 9749 * the 'da' flag is not set or we have clear line capability. | |
| 9750 * 8. redraw the characters from ScreenLines[]. | |
| 9751 * | |
| 9752 * Careful: In a hpterm scroll reverse doesn't work as expected, it moves | |
| 9753 * the scrollbar for the window. It does have insert line, use that if it | |
| 9754 * exists. | |
| 9755 */ | |
| 9756 result_empty = (row + line_count >= end); | |
|
8643
24b43dd167eb
commit https://github.com/vim/vim/commit/44a2f923c00f1384c9ecde12fb5b4711bc20702e
Christian Brabandt <cb@256bit.org>
parents:
8627
diff
changeset
|
9757 #ifdef FEAT_WINDOWS |
| 7 | 9758 if (wp != NULL && wp->w_width != Columns && *T_CSV == NUL) |
| 9759 type = USE_REDRAW; | |
| 9760 else | |
| 9761 #endif | |
| 9762 if (can_clear(T_CD) && result_empty) | |
| 9763 type = USE_T_CD; | |
| 9764 else if (*T_CAL != NUL && (line_count > 1 || *T_AL == NUL)) | |
| 9765 type = USE_T_CAL; | |
| 9766 else if (*T_CDL != NUL && result_empty && (line_count > 1 || !can_ce)) | |
| 9767 type = USE_T_CDL; | |
| 9768 else if (*T_AL != NUL) | |
| 9769 type = USE_T_AL; | |
| 9770 else if (can_ce && result_empty) | |
| 9771 type = USE_T_CE; | |
| 9772 else if (*T_DL != NUL && result_empty) | |
| 9773 type = USE_T_DL; | |
| 9774 else if (*T_SR != NUL && row == 0 && (*T_DA == NUL || can_ce)) | |
| 9775 type = USE_T_SR; | |
| 9776 else | |
| 9777 return FAIL; | |
| 9778 | |
| 9779 /* | |
| 9780 * For clearing the lines screen_del_lines() is used. This will also take | |
| 9781 * care of t_db if necessary. | |
| 9782 */ | |
| 9783 if (type == USE_T_CD || type == USE_T_CDL || | |
| 9784 type == USE_T_CE || type == USE_T_DL) | |
| 9785 return screen_del_lines(off, row, line_count, end, FALSE, wp); | |
| 9786 | |
| 9787 /* | |
| 9788 * If text is retained below the screen, first clear or delete as many | |
| 9789 * lines at the bottom of the window as are about to be inserted so that | |
| 9790 * the deleted lines won't later surface during a screen_del_lines. | |
| 9791 */ | |
| 9792 if (*T_DB) | |
| 9793 screen_del_lines(off, end - line_count, line_count, end, FALSE, wp); | |
| 9794 | |
| 9795 #ifdef FEAT_CLIPBOARD | |
| 9796 /* Remove a modeless selection when inserting lines halfway the screen | |
| 9797 * or not the full width of the screen. */ | |
| 9798 if (off + row > 0 | |
|
8643
24b43dd167eb
commit https://github.com/vim/vim/commit/44a2f923c00f1384c9ecde12fb5b4711bc20702e
Christian Brabandt <cb@256bit.org>
parents:
8627
diff
changeset
|
9799 # ifdef FEAT_WINDOWS |
| 7 | 9800 || (wp != NULL && wp->w_width != Columns) |
| 9801 # endif | |
| 9802 ) | |
| 3674 | 9803 clip_clear_selection(&clip_star); |
| 7 | 9804 else |
| 9805 clip_scroll_selection(-line_count); | |
| 9806 #endif | |
| 9807 | |
| 9808 #ifdef FEAT_GUI | |
| 9809 /* Don't update the GUI cursor here, ScreenLines[] is invalid until the | |
| 9810 * scrolling is actually carried out. */ | |
|
9848
664276833670
commit https://github.com/vim/vim/commit/107abd2ca53c31fd3bb40d77ff296e98eaae2975
Christian Brabandt <cb@256bit.org>
parents:
9754
diff
changeset
|
9811 gui_dont_update_cursor(row + off <= gui.cursor_row); |
| 7 | 9812 #endif |
| 9813 | |
| 9814 if (*T_CCS != NUL) /* cursor relative to region */ | |
| 9815 cursor_row = row; | |
| 9816 else | |
| 9817 cursor_row = row + off; | |
| 9818 | |
| 9819 /* | |
| 9820 * Shift LineOffset[] line_count down to reflect the inserted lines. | |
| 9821 * Clear the inserted lines in ScreenLines[]. | |
| 9822 */ | |
| 9823 row += off; | |
| 9824 end += off; | |
| 9825 for (i = 0; i < line_count; ++i) | |
| 9826 { | |
|
8643
24b43dd167eb
commit https://github.com/vim/vim/commit/44a2f923c00f1384c9ecde12fb5b4711bc20702e
Christian Brabandt <cb@256bit.org>
parents:
8627
diff
changeset
|
9827 #ifdef FEAT_WINDOWS |
| 7 | 9828 if (wp != NULL && wp->w_width != Columns) |
| 9829 { | |
| 9830 /* need to copy part of a line */ | |
| 9831 j = end - 1 - i; | |
| 9832 while ((j -= line_count) >= row) | |
| 9833 linecopy(j + line_count, j, wp); | |
| 9834 j += line_count; | |
| 9835 if (can_clear((char_u *)" ")) | |
| 9836 lineclear(LineOffset[j] + wp->w_wincol, wp->w_width); | |
| 9837 else | |
| 9838 lineinvalid(LineOffset[j] + wp->w_wincol, wp->w_width); | |
| 9839 LineWraps[j] = FALSE; | |
| 9840 } | |
| 9841 else | |
| 9842 #endif | |
| 9843 { | |
| 9844 j = end - 1 - i; | |
| 9845 temp = LineOffset[j]; | |
| 9846 while ((j -= line_count) >= row) | |
| 9847 { | |
| 9848 LineOffset[j + line_count] = LineOffset[j]; | |
| 9849 LineWraps[j + line_count] = LineWraps[j]; | |
| 9850 } | |
| 9851 LineOffset[j + line_count] = temp; | |
| 9852 LineWraps[j + line_count] = FALSE; | |
| 9853 if (can_clear((char_u *)" ")) | |
| 9854 lineclear(temp, (int)Columns); | |
| 9855 else | |
| 9856 lineinvalid(temp, (int)Columns); | |
| 9857 } | |
| 9858 } | |
| 9859 | |
| 9860 screen_stop_highlight(); | |
| 9861 windgoto(cursor_row, 0); | |
| 9862 | |
|
8643
24b43dd167eb
commit https://github.com/vim/vim/commit/44a2f923c00f1384c9ecde12fb5b4711bc20702e
Christian Brabandt <cb@256bit.org>
parents:
8627
diff
changeset
|
9863 #ifdef FEAT_WINDOWS |
| 7 | 9864 /* redraw the characters */ |
| 9865 if (type == USE_REDRAW) | |
| 9866 redraw_block(row, end, wp); | |
| 9867 else | |
| 9868 #endif | |
| 9869 if (type == USE_T_CAL) | |
| 9870 { | |
| 9871 term_append_lines(line_count); | |
| 9872 screen_start(); /* don't know where cursor is now */ | |
| 9873 } | |
| 9874 else | |
| 9875 { | |
| 9876 for (i = 0; i < line_count; i++) | |
| 9877 { | |
| 9878 if (type == USE_T_AL) | |
| 9879 { | |
| 9880 if (i && cursor_row != 0) | |
| 9881 windgoto(cursor_row, 0); | |
| 9882 out_str(T_AL); | |
| 9883 } | |
| 9884 else /* type == USE_T_SR */ | |
| 9885 out_str(T_SR); | |
| 9886 screen_start(); /* don't know where cursor is now */ | |
| 9887 } | |
| 9888 } | |
| 9889 | |
| 9890 /* | |
| 9891 * With scroll-reverse and 'da' flag set we need to clear the lines that | |
| 9892 * have been scrolled down into the region. | |
| 9893 */ | |
| 9894 if (type == USE_T_SR && *T_DA) | |
| 9895 { | |
| 9896 for (i = 0; i < line_count; ++i) | |
| 9897 { | |
| 9898 windgoto(off + i, 0); | |
| 9899 out_str(T_CE); | |
| 9900 screen_start(); /* don't know where cursor is now */ | |
| 9901 } | |
| 9902 } | |
| 9903 | |
| 9904 #ifdef FEAT_GUI | |
| 9905 gui_can_update_cursor(); | |
| 9906 if (gui.in_use) | |
| 9907 out_flush(); /* always flush after a scroll */ | |
| 9908 #endif | |
| 9909 return OK; | |
| 9910 } | |
| 9911 | |
| 9912 /* | |
|
9848
664276833670
commit https://github.com/vim/vim/commit/107abd2ca53c31fd3bb40d77ff296e98eaae2975
Christian Brabandt <cb@256bit.org>
parents:
9754
diff
changeset
|
9913 * 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
|
9914 * "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
|
9915 * 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
|
9916 * "row" and "end" are relative to the start of the region. |
| 7 | 9917 * |
| 9918 * Return OK for success, FAIL if the lines are not deleted. | |
| 9919 */ | |
| 9920 int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9921 screen_del_lines( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9922 int off, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9923 int row, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9924 int line_count, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9925 int end, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9926 int force, /* even when line_count > p_ttyscroll */ |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9927 win_T *wp UNUSED) /* NULL or window to use width from */ |
| 7 | 9928 { |
| 9929 int j; | |
| 9930 int i; | |
| 9931 unsigned temp; | |
| 9932 int cursor_row; | |
| 9933 int cursor_end; | |
| 9934 int result_empty; /* result is empty until end of region */ | |
| 9935 int can_delete; /* deleting line codes can be used */ | |
| 9936 int type; | |
| 9937 | |
| 9938 /* | |
| 9939 * FAIL if | |
| 9940 * - there is no valid screen | |
| 9941 * - the screen has to be redrawn completely | |
| 9942 * - the line count is less than one | |
| 9943 * - the line count is more than 'ttyscroll' | |
| 9944 */ | |
| 9945 if (!screen_valid(TRUE) || line_count <= 0 || | |
| 9946 (!force && line_count > p_ttyscroll)) | |
| 9947 return FAIL; | |
| 9948 | |
| 9949 /* | |
| 9950 * Check if the rest of the current region will become empty. | |
| 9951 */ | |
| 9952 result_empty = row + line_count >= end; | |
| 9953 | |
| 9954 /* | |
| 9955 * We can delete lines only when 'db' flag not set or when 'ce' option | |
| 9956 * available. | |
| 9957 */ | |
| 9958 can_delete = (*T_DB == NUL || can_clear(T_CE)); | |
| 9959 | |
| 9960 /* | |
| 9961 * There are six ways to delete lines: | |
| 9962 * 0. When in a vertically split window and t_CV isn't set, redraw the | |
| 9963 * characters from ScreenLines[]. | |
| 9964 * 1. Use T_CD if it exists and the result is empty. | |
| 9965 * 2. Use newlines if row == 0 and count == 1 or T_CDL does not exist. | |
| 9966 * 3. Use T_CDL (delete multiple lines) if it exists and line_count > 1 or | |
| 9967 * none of the other ways work. | |
| 9968 * 4. Use T_CE (erase line) if the result is empty. | |
| 9969 * 5. Use T_DL (delete line) if it exists. | |
| 9970 * 6. redraw the characters from ScreenLines[]. | |
| 9971 */ | |
|
8643
24b43dd167eb
commit https://github.com/vim/vim/commit/44a2f923c00f1384c9ecde12fb5b4711bc20702e
Christian Brabandt <cb@256bit.org>
parents:
8627
diff
changeset
|
9972 #ifdef FEAT_WINDOWS |
| 7 | 9973 if (wp != NULL && wp->w_width != Columns && *T_CSV == NUL) |
| 9974 type = USE_REDRAW; | |
| 9975 else | |
| 9976 #endif | |
| 9977 if (can_clear(T_CD) && result_empty) | |
| 9978 type = USE_T_CD; | |
| 9979 #if defined(__BEOS__) && defined(BEOS_DR8) | |
| 9980 /* | |
| 9981 * USE_NL does not seem to work in Terminal of DR8 so we set T_DB="" in | |
| 9982 * its internal termcap... this works okay for tests which test *T_DB != | |
| 9983 * NUL. It has the disadvantage that the user cannot use any :set t_* | |
| 9984 * command to get T_DB (back) to empty_option, only :set term=... will do | |
| 9985 * the trick... | |
| 9986 * Anyway, this hack will hopefully go away with the next OS release. | |
| 9987 * (Olaf Seibert) | |
| 9988 */ | |
| 9989 else if (row == 0 && T_DB == empty_option | |
| 9990 && (line_count == 1 || *T_CDL == NUL)) | |
| 9991 #else | |
| 9992 else if (row == 0 && ( | |
| 9993 #ifndef AMIGA | |
| 9994 /* On the Amiga, somehow '\n' on the last line doesn't always scroll | |
| 9995 * up, so use delete-line command */ | |
| 9996 line_count == 1 || | |
| 9997 #endif | |
| 9998 *T_CDL == NUL)) | |
| 9999 #endif | |
| 10000 type = USE_NL; | |
| 10001 else if (*T_CDL != NUL && line_count > 1 && can_delete) | |
| 10002 type = USE_T_CDL; | |
| 10003 else if (can_clear(T_CE) && result_empty | |
|
8643
24b43dd167eb
commit https://github.com/vim/vim/commit/44a2f923c00f1384c9ecde12fb5b4711bc20702e
Christian Brabandt <cb@256bit.org>
parents:
8627
diff
changeset
|
10004 #ifdef FEAT_WINDOWS |
| 7 | 10005 && (wp == NULL || wp->w_width == Columns) |
| 10006 #endif | |
| 10007 ) | |
| 10008 type = USE_T_CE; | |
| 10009 else if (*T_DL != NUL && can_delete) | |
| 10010 type = USE_T_DL; | |
| 10011 else if (*T_CDL != NUL && can_delete) | |
| 10012 type = USE_T_CDL; | |
| 10013 else | |
| 10014 return FAIL; | |
| 10015 | |
| 10016 #ifdef FEAT_CLIPBOARD | |
| 10017 /* Remove a modeless selection when deleting lines halfway the screen or | |
| 10018 * not the full width of the screen. */ | |
| 10019 if (off + row > 0 | |
|
8643
24b43dd167eb
commit https://github.com/vim/vim/commit/44a2f923c00f1384c9ecde12fb5b4711bc20702e
Christian Brabandt <cb@256bit.org>
parents:
8627
diff
changeset
|
10020 # ifdef FEAT_WINDOWS |
| 7 | 10021 || (wp != NULL && wp->w_width != Columns) |
| 10022 # endif | |
| 10023 ) | |
| 3674 | 10024 clip_clear_selection(&clip_star); |
| 7 | 10025 else |
| 10026 clip_scroll_selection(line_count); | |
| 10027 #endif | |
| 10028 | |
| 10029 #ifdef FEAT_GUI | |
| 10030 /* Don't update the GUI cursor here, ScreenLines[] is invalid until the | |
| 10031 * scrolling is actually carried out. */ | |
|
9848
664276833670
commit https://github.com/vim/vim/commit/107abd2ca53c31fd3bb40d77ff296e98eaae2975
Christian Brabandt <cb@256bit.org>
parents:
9754
diff
changeset
|
10032 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
|
10033 && gui.cursor_row < end + off); |
| 7 | 10034 #endif |
| 10035 | |
| 10036 if (*T_CCS != NUL) /* cursor relative to region */ | |
| 10037 { | |
| 10038 cursor_row = row; | |
| 10039 cursor_end = end; | |
| 10040 } | |
| 10041 else | |
| 10042 { | |
| 10043 cursor_row = row + off; | |
| 10044 cursor_end = end + off; | |
| 10045 } | |
| 10046 | |
| 10047 /* | |
| 10048 * Now shift LineOffset[] line_count up to reflect the deleted lines. | |
| 10049 * Clear the inserted lines in ScreenLines[]. | |
| 10050 */ | |
| 10051 row += off; | |
| 10052 end += off; | |
| 10053 for (i = 0; i < line_count; ++i) | |
| 10054 { | |
|
8643
24b43dd167eb
commit https://github.com/vim/vim/commit/44a2f923c00f1384c9ecde12fb5b4711bc20702e
Christian Brabandt <cb@256bit.org>
parents:
8627
diff
changeset
|
10055 #ifdef FEAT_WINDOWS |
| 7 | 10056 if (wp != NULL && wp->w_width != Columns) |
| 10057 { | |
| 10058 /* need to copy part of a line */ | |
| 10059 j = row + i; | |
| 10060 while ((j += line_count) <= end - 1) | |
| 10061 linecopy(j - line_count, j, wp); | |
| 10062 j -= line_count; | |
| 10063 if (can_clear((char_u *)" ")) | |
| 10064 lineclear(LineOffset[j] + wp->w_wincol, wp->w_width); | |
| 10065 else | |
| 10066 lineinvalid(LineOffset[j] + wp->w_wincol, wp->w_width); | |
| 10067 LineWraps[j] = FALSE; | |
| 10068 } | |
| 10069 else | |
| 10070 #endif | |
| 10071 { | |
| 10072 /* whole width, moving the line pointers is faster */ | |
| 10073 j = row + i; | |
| 10074 temp = LineOffset[j]; | |
| 10075 while ((j += line_count) <= end - 1) | |
| 10076 { | |
| 10077 LineOffset[j - line_count] = LineOffset[j]; | |
| 10078 LineWraps[j - line_count] = LineWraps[j]; | |
| 10079 } | |
| 10080 LineOffset[j - line_count] = temp; | |
| 10081 LineWraps[j - line_count] = FALSE; | |
| 10082 if (can_clear((char_u *)" ")) | |
| 10083 lineclear(temp, (int)Columns); | |
| 10084 else | |
| 10085 lineinvalid(temp, (int)Columns); | |
| 10086 } | |
| 10087 } | |
| 10088 | |
| 10089 screen_stop_highlight(); | |
| 10090 | |
|
8643
24b43dd167eb
commit https://github.com/vim/vim/commit/44a2f923c00f1384c9ecde12fb5b4711bc20702e
Christian Brabandt <cb@256bit.org>
parents:
8627
diff
changeset
|
10091 #ifdef FEAT_WINDOWS |
| 7 | 10092 /* redraw the characters */ |
| 10093 if (type == USE_REDRAW) | |
| 10094 redraw_block(row, end, wp); | |
| 10095 else | |
| 10096 #endif | |
| 10097 if (type == USE_T_CD) /* delete the lines */ | |
| 10098 { | |
| 10099 windgoto(cursor_row, 0); | |
| 10100 out_str(T_CD); | |
| 10101 screen_start(); /* don't know where cursor is now */ | |
| 10102 } | |
| 10103 else if (type == USE_T_CDL) | |
| 10104 { | |
| 10105 windgoto(cursor_row, 0); | |
| 10106 term_delete_lines(line_count); | |
| 10107 screen_start(); /* don't know where cursor is now */ | |
| 10108 } | |
| 10109 /* | |
| 10110 * Deleting lines at top of the screen or scroll region: Just scroll | |
| 10111 * the whole screen (scroll region) up by outputting newlines on the | |
| 10112 * last line. | |
| 10113 */ | |
| 10114 else if (type == USE_NL) | |
| 10115 { | |
| 10116 windgoto(cursor_end - 1, 0); | |
| 10117 for (i = line_count; --i >= 0; ) | |
| 10118 out_char('\n'); /* cursor will remain on same line */ | |
| 10119 } | |
| 10120 else | |
| 10121 { | |
| 10122 for (i = line_count; --i >= 0; ) | |
| 10123 { | |
| 10124 if (type == USE_T_DL) | |
| 10125 { | |
| 10126 windgoto(cursor_row, 0); | |
| 10127 out_str(T_DL); /* delete a line */ | |
| 10128 } | |
| 10129 else /* type == USE_T_CE */ | |
| 10130 { | |
| 10131 windgoto(cursor_row + i, 0); | |
| 10132 out_str(T_CE); /* erase a line */ | |
| 10133 } | |
| 10134 screen_start(); /* don't know where cursor is now */ | |
| 10135 } | |
| 10136 } | |
| 10137 | |
| 10138 /* | |
| 10139 * If the 'db' flag is set, we need to clear the lines that have been | |
| 10140 * scrolled up at the bottom of the region. | |
| 10141 */ | |
| 10142 if (*T_DB && (type == USE_T_DL || type == USE_T_CDL)) | |
| 10143 { | |
| 10144 for (i = line_count; i > 0; --i) | |
| 10145 { | |
| 10146 windgoto(cursor_end - i, 0); | |
| 10147 out_str(T_CE); /* erase a line */ | |
| 10148 screen_start(); /* don't know where cursor is now */ | |
| 10149 } | |
| 10150 } | |
| 10151 | |
| 10152 #ifdef FEAT_GUI | |
| 10153 gui_can_update_cursor(); | |
| 10154 if (gui.in_use) | |
| 10155 out_flush(); /* always flush after a scroll */ | |
| 10156 #endif | |
| 10157 | |
| 10158 return OK; | |
| 10159 } | |
| 10160 | |
| 10161 /* | |
| 10162 * show the current mode and ruler | |
| 10163 * | |
| 10164 * If clear_cmdline is TRUE, clear the rest of the cmdline. | |
| 10165 * If clear_cmdline is FALSE there may be a message there that needs to be | |
| 10166 * cleared only if a mode is shown. | |
| 10167 * Return the length of the message (0 if no message). | |
| 10168 */ | |
| 10169 int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
10170 showmode(void) |
| 7 | 10171 { |
| 10172 int need_clear; | |
| 10173 int length = 0; | |
| 10174 int do_mode; | |
| 10175 int attr; | |
| 10176 int nwr_save; | |
| 10177 #ifdef FEAT_INS_EXPAND | |
| 10178 int sub_attr; | |
| 10179 #endif | |
| 10180 | |
| 642 | 10181 do_mode = ((p_smd && msg_silent == 0) |
| 10182 && ((State & INSERT) | |
| 10183 || restart_edit | |
| 5735 | 10184 || VIsual_active)); |
| 7 | 10185 if (do_mode || Recording) |
| 10186 { | |
| 10187 /* | |
| 10188 * Don't show mode right now, when not redrawing or inside a mapping. | |
| 10189 * Call char_avail() only when we are going to show something, because | |
| 10190 * it takes a bit of time. | |
| 10191 */ | |
| 10192 if (!redrawing() || (char_avail() && !KeyTyped) || msg_silent != 0) | |
| 10193 { | |
| 10194 redraw_cmdline = TRUE; /* show mode later */ | |
| 10195 return 0; | |
| 10196 } | |
| 10197 | |
| 10198 nwr_save = need_wait_return; | |
| 10199 | |
| 10200 /* wait a bit before overwriting an important message */ | |
| 10201 check_for_delay(FALSE); | |
| 10202 | |
| 10203 /* if the cmdline is more than one line high, erase top lines */ | |
| 10204 need_clear = clear_cmdline; | |
| 10205 if (clear_cmdline && cmdline_row < Rows - 1) | |
| 10206 msg_clr_cmdline(); /* will reset clear_cmdline */ | |
| 10207 | |
| 10208 /* Position on the last line in the window, column 0 */ | |
| 10209 msg_pos_mode(); | |
| 10210 cursor_off(); | |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
10211 attr = HL_ATTR(HLF_CM); /* Highlight mode */ |
| 7 | 10212 if (do_mode) |
| 10213 { | |
| 10214 MSG_PUTS_ATTR("--", attr); | |
| 10215 #if defined(FEAT_XIM) | |
| 2520 | 10216 if ( |
| 10217 # ifdef FEAT_GUI_GTK | |
| 10218 preedit_get_status() | |
| 1668 | 10219 # else |
| 10220 im_get_status() | |
| 2520 | 10221 # endif |
| 1668 | 10222 ) |
|
2277
f42e0b5ff9e9
Change remaining HAVE_GTK2 to FEAT_GUI_GTK.
Bram Moolenaar <bram@vim.org>
parents:
2269
diff
changeset
|
10223 # ifdef FEAT_GUI_GTK /* most of the time, it's not XIM being used */ |
| 7 | 10224 MSG_PUTS_ATTR(" IM", attr); |
| 10225 # else | |
| 10226 MSG_PUTS_ATTR(" XIM", attr); | |
| 10227 # endif | |
| 10228 #endif | |
| 10229 #if defined(FEAT_HANGULIN) && defined(FEAT_GUI) | |
| 10230 if (gui.in_use) | |
| 10231 { | |
| 10232 if (hangul_input_state_get()) | |
|
7208
2c00f6b312bf
commit https://github.com/vim/vim/commit/72f4cc4a987d123c0ed909c85b9a05f65cef7202
Christian Brabandt <cb@256bit.org>
parents:
7007
diff
changeset
|
10233 { |
|
2c00f6b312bf
commit https://github.com/vim/vim/commit/72f4cc4a987d123c0ed909c85b9a05f65cef7202
Christian Brabandt <cb@256bit.org>
parents:
7007
diff
changeset
|
10234 /* HANGUL */ |
|
2c00f6b312bf
commit https://github.com/vim/vim/commit/72f4cc4a987d123c0ed909c85b9a05f65cef7202
Christian Brabandt <cb@256bit.org>
parents:
7007
diff
changeset
|
10235 if (enc_utf8) |
|
2c00f6b312bf
commit https://github.com/vim/vim/commit/72f4cc4a987d123c0ed909c85b9a05f65cef7202
Christian Brabandt <cb@256bit.org>
parents:
7007
diff
changeset
|
10236 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
|
10237 else |
|
2c00f6b312bf
commit https://github.com/vim/vim/commit/72f4cc4a987d123c0ed909c85b9a05f65cef7202
Christian Brabandt <cb@256bit.org>
parents:
7007
diff
changeset
|
10238 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
|
10239 } |
| 7 | 10240 } |
| 10241 #endif | |
| 10242 #ifdef FEAT_INS_EXPAND | |
| 5946 | 10243 /* CTRL-X in Insert mode */ |
| 10244 if (edit_submode != NULL && !shortmess(SHM_COMPLETIONMENU)) | |
| 7 | 10245 { |
| 10246 /* These messages can get long, avoid a wrap in a narrow | |
| 10247 * window. Prefer showing edit_submode_extra. */ | |
| 10248 length = (Rows - msg_row) * Columns - 3; | |
| 10249 if (edit_submode_extra != NULL) | |
| 10250 length -= vim_strsize(edit_submode_extra); | |
| 10251 if (length > 0) | |
| 10252 { | |
| 10253 if (edit_submode_pre != NULL) | |
| 10254 length -= vim_strsize(edit_submode_pre); | |
| 10255 if (length - vim_strsize(edit_submode) > 0) | |
| 10256 { | |
| 10257 if (edit_submode_pre != NULL) | |
| 10258 msg_puts_attr(edit_submode_pre, attr); | |
| 10259 msg_puts_attr(edit_submode, attr); | |
| 10260 } | |
| 10261 if (edit_submode_extra != NULL) | |
| 10262 { | |
| 10263 MSG_PUTS_ATTR(" ", attr); /* add a space in between */ | |
| 10264 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
|
10265 sub_attr = HL_ATTR(edit_submode_highl); |
| 7 | 10266 else |
| 10267 sub_attr = attr; | |
| 10268 msg_puts_attr(edit_submode_extra, sub_attr); | |
| 10269 } | |
| 10270 } | |
| 10271 length = 0; | |
| 10272 } | |
| 10273 else | |
| 10274 #endif | |
| 10275 { | |
| 10276 #ifdef FEAT_VREPLACE | |
| 10277 if (State & VREPLACE_FLAG) | |
| 10278 MSG_PUTS_ATTR(_(" VREPLACE"), attr); | |
| 10279 else | |
| 10280 #endif | |
| 10281 if (State & REPLACE_FLAG) | |
| 10282 MSG_PUTS_ATTR(_(" REPLACE"), attr); | |
| 10283 else if (State & INSERT) | |
| 10284 { | |
| 10285 #ifdef FEAT_RIGHTLEFT | |
| 10286 if (p_ri) | |
| 10287 MSG_PUTS_ATTR(_(" REVERSE"), attr); | |
| 10288 #endif | |
| 10289 MSG_PUTS_ATTR(_(" INSERT"), attr); | |
| 10290 } | |
| 10291 else if (restart_edit == 'I') | |
| 10292 MSG_PUTS_ATTR(_(" (insert)"), attr); | |
| 10293 else if (restart_edit == 'R') | |
| 10294 MSG_PUTS_ATTR(_(" (replace)"), attr); | |
| 10295 else if (restart_edit == 'V') | |
| 10296 MSG_PUTS_ATTR(_(" (vreplace)"), attr); | |
| 10297 #ifdef FEAT_RIGHTLEFT | |
| 10298 if (p_hkmap) | |
| 10299 MSG_PUTS_ATTR(_(" Hebrew"), attr); | |
| 10300 # ifdef FEAT_FKMAP | |
| 10301 if (p_fkmap) | |
| 10302 MSG_PUTS_ATTR(farsi_text_5, attr); | |
| 10303 # endif | |
| 10304 #endif | |
| 10305 #ifdef FEAT_KEYMAP | |
| 10306 if (State & LANGMAP) | |
| 10307 { | |
| 10308 # ifdef FEAT_ARABIC | |
| 10309 if (curwin->w_p_arab) | |
| 10310 MSG_PUTS_ATTR(_(" Arabic"), attr); | |
| 10311 else | |
| 10312 # endif | |
|
9645
123d3c102035
commit https://github.com/vim/vim/commit/73ac0c4281a3606651604a3cbcc334bfb3859a87
Christian Brabandt <cb@256bit.org>
parents:
9489
diff
changeset
|
10313 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
|
10314 NameBuff, MAXPATHL)) |
|
123d3c102035
commit https://github.com/vim/vim/commit/73ac0c4281a3606651604a3cbcc334bfb3859a87
Christian Brabandt <cb@256bit.org>
parents:
9489
diff
changeset
|
10315 MSG_PUTS_ATTR(NameBuff, attr); |
| 7 | 10316 } |
| 10317 #endif | |
| 10318 if ((State & INSERT) && p_paste) | |
| 10319 MSG_PUTS_ATTR(_(" (paste)"), attr); | |
| 10320 | |
| 10321 if (VIsual_active) | |
| 10322 { | |
| 10323 char *p; | |
| 10324 | |
| 10325 /* Don't concatenate separate words to avoid translation | |
| 10326 * problems. */ | |
| 10327 switch ((VIsual_select ? 4 : 0) | |
| 10328 + (VIsual_mode == Ctrl_V) * 2 | |
| 10329 + (VIsual_mode == 'V')) | |
| 10330 { | |
| 10331 case 0: p = N_(" VISUAL"); break; | |
| 10332 case 1: p = N_(" VISUAL LINE"); break; | |
| 10333 case 2: p = N_(" VISUAL BLOCK"); break; | |
| 10334 case 4: p = N_(" SELECT"); break; | |
| 10335 case 5: p = N_(" SELECT LINE"); break; | |
| 10336 default: p = N_(" SELECT BLOCK"); break; | |
| 10337 } | |
| 10338 MSG_PUTS_ATTR(_(p), attr); | |
| 10339 } | |
| 10340 MSG_PUTS_ATTR(" --", attr); | |
| 10341 } | |
| 644 | 10342 |
| 7 | 10343 need_clear = TRUE; |
| 10344 } | |
| 10345 if (Recording | |
| 10346 #ifdef FEAT_INS_EXPAND | |
| 10347 && edit_submode == NULL /* otherwise it gets too long */ | |
| 10348 #endif | |
| 10349 ) | |
| 10350 { | |
|
7233
9487ea110214
commit https://github.com/vim/vim/commit/a0ed84a26897c994512873a895b9fc54e90c6845
Christian Brabandt <cb@256bit.org>
parents:
7208
diff
changeset
|
10351 recording_mode(attr); |
| 7 | 10352 need_clear = TRUE; |
| 10353 } | |
| 644 | 10354 |
| 10355 mode_displayed = TRUE; | |
| 7 | 10356 if (need_clear || clear_cmdline) |
| 10357 msg_clr_eos(); | |
| 10358 msg_didout = FALSE; /* overwrite this message */ | |
| 10359 length = msg_col; | |
| 10360 msg_col = 0; | |
| 10361 need_wait_return = nwr_save; /* never ask for hit-return for this */ | |
| 10362 } | |
| 10363 else if (clear_cmdline && msg_silent == 0) | |
| 10364 /* Clear the whole command line. Will reset "clear_cmdline". */ | |
| 10365 msg_clr_cmdline(); | |
| 10366 | |
| 10367 #ifdef FEAT_CMDL_INFO | |
| 10368 /* In Visual mode the size of the selected area must be redrawn. */ | |
| 10369 if (VIsual_active) | |
| 10370 clear_showcmd(); | |
| 10371 | |
| 10372 /* If the last window has no status line, the ruler is after the mode | |
| 10373 * message and must be redrawn */ | |
| 10374 if (redrawing() | |
| 10375 # ifdef FEAT_WINDOWS | |
| 10376 && lastwin->w_status_height == 0 | |
| 10377 # endif | |
| 10378 ) | |
| 10379 win_redr_ruler(lastwin, TRUE); | |
| 10380 #endif | |
| 10381 redraw_cmdline = FALSE; | |
| 10382 clear_cmdline = FALSE; | |
| 10383 | |
| 10384 return length; | |
| 10385 } | |
| 10386 | |
| 10387 /* | |
| 10388 * Position for a mode message. | |
| 10389 */ | |
| 10390 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
10391 msg_pos_mode(void) |
| 7 | 10392 { |
| 10393 msg_col = 0; | |
| 10394 msg_row = Rows - 1; | |
| 10395 } | |
| 10396 | |
| 10397 /* | |
| 10398 * Delete mode message. Used when ESC is typed which is expected to end | |
| 10399 * Insert mode (but Insert mode didn't end yet!). | |
| 644 | 10400 * Caller should check "mode_displayed". |
| 7 | 10401 */ |
| 10402 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
10403 unshowmode(int force) |
| 7 | 10404 { |
| 10405 /* | |
|
2055
4aa4510d548c
updated for version 7.2.341
Bram Moolenaar <bram@zimbu.org>
parents:
2008
diff
changeset
|
10406 * Don't delete it right now, when not redrawing or inside a mapping. |
| 7 | 10407 */ |
| 10408 if (!redrawing() || (!force && char_avail() && !KeyTyped)) | |
| 10409 redraw_cmdline = TRUE; /* delete mode later */ | |
| 10410 else | |
|
8817
b7eb7bbd71d0
commit https://github.com/vim/vim/commit/fd773e9e88add7d1ffef890fb9f3a00d613b4326
Christian Brabandt <cb@256bit.org>
parents:
8643
diff
changeset
|
10411 clearmode(); |
|
b7eb7bbd71d0
commit https://github.com/vim/vim/commit/fd773e9e88add7d1ffef890fb9f3a00d613b4326
Christian Brabandt <cb@256bit.org>
parents:
8643
diff
changeset
|
10412 } |
|
b7eb7bbd71d0
commit https://github.com/vim/vim/commit/fd773e9e88add7d1ffef890fb9f3a00d613b4326
Christian Brabandt <cb@256bit.org>
parents:
8643
diff
changeset
|
10413 |
|
b7eb7bbd71d0
commit https://github.com/vim/vim/commit/fd773e9e88add7d1ffef890fb9f3a00d613b4326
Christian Brabandt <cb@256bit.org>
parents:
8643
diff
changeset
|
10414 /* |
|
b7eb7bbd71d0
commit https://github.com/vim/vim/commit/fd773e9e88add7d1ffef890fb9f3a00d613b4326
Christian Brabandt <cb@256bit.org>
parents:
8643
diff
changeset
|
10415 * Clear the mode message. |
|
b7eb7bbd71d0
commit https://github.com/vim/vim/commit/fd773e9e88add7d1ffef890fb9f3a00d613b4326
Christian Brabandt <cb@256bit.org>
parents:
8643
diff
changeset
|
10416 */ |
|
b7eb7bbd71d0
commit https://github.com/vim/vim/commit/fd773e9e88add7d1ffef890fb9f3a00d613b4326
Christian Brabandt <cb@256bit.org>
parents:
8643
diff
changeset
|
10417 void |
|
9282
9f97a6290c63
commit https://github.com/vim/vim/commit/cf089463492fab53b2a5d81517829d22f882f82e
Christian Brabandt <cb@256bit.org>
parents:
9213
diff
changeset
|
10418 clearmode(void) |
|
8817
b7eb7bbd71d0
commit https://github.com/vim/vim/commit/fd773e9e88add7d1ffef890fb9f3a00d613b4326
Christian Brabandt <cb@256bit.org>
parents:
8643
diff
changeset
|
10419 { |
|
b7eb7bbd71d0
commit https://github.com/vim/vim/commit/fd773e9e88add7d1ffef890fb9f3a00d613b4326
Christian Brabandt <cb@256bit.org>
parents:
8643
diff
changeset
|
10420 msg_pos_mode(); |
|
b7eb7bbd71d0
commit https://github.com/vim/vim/commit/fd773e9e88add7d1ffef890fb9f3a00d613b4326
Christian Brabandt <cb@256bit.org>
parents:
8643
diff
changeset
|
10421 if (Recording) |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
10422 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
|
10423 msg_clr_eos(); |
| 7 | 10424 } |
| 10425 | |
|
7233
9487ea110214
commit https://github.com/vim/vim/commit/a0ed84a26897c994512873a895b9fc54e90c6845
Christian Brabandt <cb@256bit.org>
parents:
7208
diff
changeset
|
10426 static void |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
10427 recording_mode(int attr) |
|
7233
9487ea110214
commit https://github.com/vim/vim/commit/a0ed84a26897c994512873a895b9fc54e90c6845
Christian Brabandt <cb@256bit.org>
parents:
7208
diff
changeset
|
10428 { |
|
9487ea110214
commit https://github.com/vim/vim/commit/a0ed84a26897c994512873a895b9fc54e90c6845
Christian Brabandt <cb@256bit.org>
parents:
7208
diff
changeset
|
10429 MSG_PUTS_ATTR(_("recording"), attr); |
|
9487ea110214
commit https://github.com/vim/vim/commit/a0ed84a26897c994512873a895b9fc54e90c6845
Christian Brabandt <cb@256bit.org>
parents:
7208
diff
changeset
|
10430 if (!shortmess(SHM_RECORDING)) |
|
9487ea110214
commit https://github.com/vim/vim/commit/a0ed84a26897c994512873a895b9fc54e90c6845
Christian Brabandt <cb@256bit.org>
parents:
7208
diff
changeset
|
10431 { |
|
9487ea110214
commit https://github.com/vim/vim/commit/a0ed84a26897c994512873a895b9fc54e90c6845
Christian Brabandt <cb@256bit.org>
parents:
7208
diff
changeset
|
10432 char_u s[4]; |
|
9487ea110214
commit https://github.com/vim/vim/commit/a0ed84a26897c994512873a895b9fc54e90c6845
Christian Brabandt <cb@256bit.org>
parents:
7208
diff
changeset
|
10433 sprintf((char *)s, " @%c", Recording); |
|
9487ea110214
commit https://github.com/vim/vim/commit/a0ed84a26897c994512873a895b9fc54e90c6845
Christian Brabandt <cb@256bit.org>
parents:
7208
diff
changeset
|
10434 MSG_PUTS_ATTR(s, attr); |
|
9487ea110214
commit https://github.com/vim/vim/commit/a0ed84a26897c994512873a895b9fc54e90c6845
Christian Brabandt <cb@256bit.org>
parents:
7208
diff
changeset
|
10435 } |
|
9487ea110214
commit https://github.com/vim/vim/commit/a0ed84a26897c994512873a895b9fc54e90c6845
Christian Brabandt <cb@256bit.org>
parents:
7208
diff
changeset
|
10436 } |
|
9487ea110214
commit https://github.com/vim/vim/commit/a0ed84a26897c994512873a895b9fc54e90c6845
Christian Brabandt <cb@256bit.org>
parents:
7208
diff
changeset
|
10437 |
| 667 | 10438 #if defined(FEAT_WINDOWS) |
| 10439 /* | |
| 10440 * Draw the tab pages line at the top of the Vim window. | |
| 10441 */ | |
| 10442 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
10443 draw_tabline(void) |
| 667 | 10444 { |
| 10445 int tabcount = 0; | |
| 10446 tabpage_T *tp; | |
| 10447 int tabwidth; | |
| 10448 int col = 0; | |
| 673 | 10449 int scol = 0; |
| 667 | 10450 int attr; |
| 10451 win_T *wp; | |
| 671 | 10452 win_T *cwp; |
| 10453 int wincount; | |
| 10454 int modified; | |
| 667 | 10455 int c; |
| 10456 int len; | |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
10457 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
|
10458 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
|
10459 int attr_fill = HL_ATTR(HLF_TPF); |
| 673 | 10460 char_u *p; |
| 677 | 10461 int room; |
| 10462 int use_sep_chars = (t_colors < 8 | |
| 10463 #ifdef FEAT_GUI | |
| 10464 && !gui.in_use | |
| 10465 #endif | |
|
9027
773d627cac0b
commit https://github.com/vim/vim/commit/61be73bb0f965a895bfb064ea3e55476ac175162
Christian Brabandt <cb@256bit.org>
parents:
8977
diff
changeset
|
10466 #ifdef FEAT_TERMGUICOLORS |
|
773d627cac0b
commit https://github.com/vim/vim/commit/61be73bb0f965a895bfb064ea3e55476ac175162
Christian Brabandt <cb@256bit.org>
parents:
8977
diff
changeset
|
10467 && !p_tgc |
|
8969
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
10468 #endif |
| 677 | 10469 ); |
| 673 | 10470 |
|
10538
c7f671dfd735
patch 8.0.0159: crash on startup when updating tabline
Christian Brabandt <cb@256bit.org>
parents:
10466
diff
changeset
|
10471 if (ScreenLines == NULL) |
|
c7f671dfd735
patch 8.0.0159: crash on startup when updating tabline
Christian Brabandt <cb@256bit.org>
parents:
10466
diff
changeset
|
10472 return; |
| 673 | 10473 redraw_tabline = FALSE; |
| 667 | 10474 |
| 685 | 10475 #ifdef FEAT_GUI_TABLINE |
| 798 | 10476 /* Take care of a GUI tabline. */ |
| 685 | 10477 if (gui_use_tabline()) |
| 10478 { | |
| 10479 gui_update_tabline(); | |
| 10480 return; | |
| 10481 } | |
| 10482 #endif | |
| 10483 | |
| 10484 if (tabline_height() < 1) | |
| 667 | 10485 return; |
| 10486 | |
| 677 | 10487 #if defined(FEAT_STL_OPT) |
| 681 | 10488 |
| 10489 /* Init TabPageIdxs[] to zero: Clicking outside of tabs has no effect. */ | |
| 10490 for (scol = 0; scol < Columns; ++scol) | |
| 10491 TabPageIdxs[scol] = 0; | |
| 10492 | |
| 677 | 10493 /* Use the 'tabline' option if it's set. */ |
| 10494 if (*p_tal != NUL) | |
| 10495 { | |
|
8872
4d4de770f970
commit https://github.com/vim/vim/commit/f73d3bc253fa79ad220f52f04b93e782e95a9d43
Christian Brabandt <cb@256bit.org>
parents:
8847
diff
changeset
|
10496 int saved_did_emsg = did_emsg; |
| 680 | 10497 |
| 10498 /* Check for an error. If there is one we would loop in redrawing the | |
| 10499 * 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
|
10500 did_emsg = FALSE; |
| 677 | 10501 win_redr_custom(NULL, FALSE); |
|
8872
4d4de770f970
commit https://github.com/vim/vim/commit/f73d3bc253fa79ad220f52f04b93e782e95a9d43
Christian Brabandt <cb@256bit.org>
parents:
8847
diff
changeset
|
10502 if (did_emsg) |
| 680 | 10503 set_string_option_direct((char_u *)"tabline", -1, |
| 694 | 10504 (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
|
10505 did_emsg |= saved_did_emsg; |
| 680 | 10506 } |
| 10507 else | |
| 10508 #endif | |
| 10509 { | |
|
9649
fd9727ae3c49
commit https://github.com/vim/vim/commit/2932359000b2f918d5fade79ea4d124d5943cd07
Christian Brabandt <cb@256bit.org>
parents:
9645
diff
changeset
|
10510 FOR_ALL_TABPAGES(tp) |
| 680 | 10511 ++tabcount; |
| 10512 | |
| 10513 tabwidth = (Columns - 1 + tabcount / 2) / tabcount; | |
| 10514 if (tabwidth < 6) | |
| 10515 tabwidth = 6; | |
| 10516 | |
| 10517 attr = attr_nosel; | |
| 10518 tabcount = 0; | |
| 681 | 10519 scol = 0; |
| 699 | 10520 for (tp = first_tabpage; tp != NULL && col < Columns - 4; |
| 10521 tp = tp->tp_next) | |
| 680 | 10522 { |
| 10523 scol = col; | |
| 10524 | |
| 10525 if (tp->tp_topframe == topframe) | |
| 10526 attr = attr_sel; | |
| 10527 if (use_sep_chars && col > 0) | |
| 10528 screen_putchar('|', 0, col++, attr); | |
| 10529 | |
| 10530 if (tp->tp_topframe != topframe) | |
| 10531 attr = attr_nosel; | |
| 10532 | |
| 10533 screen_putchar(' ', 0, col++, attr); | |
| 10534 | |
| 10535 if (tp == curtab) | |
| 10536 { | |
| 10537 cwp = curwin; | |
| 10538 wp = firstwin; | |
| 10539 } | |
| 10540 else | |
| 10541 { | |
| 10542 cwp = tp->tp_curwin; | |
| 10543 wp = tp->tp_firstwin; | |
| 10544 } | |
| 10545 | |
| 10546 modified = FALSE; | |
| 10547 for (wincount = 0; wp != NULL; wp = wp->w_next, ++wincount) | |
| 10548 if (bufIsChanged(wp->w_buffer)) | |
| 10549 modified = TRUE; | |
| 10550 if (modified || wincount > 1) | |
| 10551 { | |
| 10552 if (wincount > 1) | |
| 10553 { | |
| 10554 vim_snprintf((char *)NameBuff, MAXPATHL, "%d", wincount); | |
| 835 | 10555 len = (int)STRLEN(NameBuff); |
| 699 | 10556 if (col + len >= Columns - 3) |
| 10557 break; | |
| 680 | 10558 screen_puts_len(NameBuff, len, 0, col, |
| 677 | 10559 #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
|
10560 hl_combine_attr(attr, HL_ATTR(HLF_T)) |
| 677 | 10561 #else |
| 6106 | 10562 attr |
| 680 | 10563 #endif |
| 10564 ); | |
| 10565 col += len; | |
| 10566 } | |
| 10567 if (modified) | |
| 10568 screen_puts_len((char_u *)"+", 1, 0, col++, attr); | |
| 10569 screen_putchar(' ', 0, col++, attr); | |
| 10570 } | |
| 10571 | |
| 10572 room = scol - col + tabwidth - 1; | |
| 10573 if (room > 0) | |
| 10574 { | |
| 685 | 10575 /* Get buffer name in NameBuff[] */ |
| 10576 get_trans_bufname(cwp->w_buffer); | |
| 819 | 10577 shorten_dir(NameBuff); |
| 680 | 10578 len = vim_strsize(NameBuff); |
| 10579 p = NameBuff; | |
| 677 | 10580 #ifdef FEAT_MBYTE |
| 680 | 10581 if (has_mbyte) |
| 10582 while (len > room) | |
| 10583 { | |
| 10584 len -= ptr2cells(p); | |
|
11127
506f5d8b7d8b
patch 8.0.0451: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11121
diff
changeset
|
10585 MB_PTR_ADV(p); |
| 680 | 10586 } |
| 10587 else | |
| 10588 #endif | |
| 10589 if (len > room) | |
| 677 | 10590 { |
| 680 | 10591 p += len - room; |
| 10592 len = room; | |
| 677 | 10593 } |
| 699 | 10594 if (len > Columns - col - 1) |
| 10595 len = Columns - col - 1; | |
| 680 | 10596 |
| 835 | 10597 screen_puts_len(p, (int)STRLEN(p), 0, col, attr); |
| 680 | 10598 col += len; |
| 10599 } | |
| 10600 screen_putchar(' ', 0, col++, attr); | |
| 10601 | |
| 10602 /* Store the tab page number in TabPageIdxs[], so that | |
| 10603 * jump_to_mouse() knows where each one is. */ | |
| 10604 ++tabcount; | |
| 10605 while (scol < col) | |
| 10606 TabPageIdxs[scol++] = tabcount; | |
| 10607 } | |
| 10608 | |
| 10609 if (use_sep_chars) | |
| 10610 c = '_'; | |
| 10611 else | |
| 10612 c = ' '; | |
| 10613 screen_fill(0, 1, col, (int)Columns, c, c, attr_fill); | |
| 681 | 10614 |
| 10615 /* Put an "X" for closing the current tab if there are several. */ | |
| 10616 if (first_tabpage->tp_next != NULL) | |
| 10617 { | |
| 10618 screen_putchar('X', 0, (int)Columns - 1, attr_nosel); | |
| 10619 TabPageIdxs[Columns - 1] = -999; | |
| 10620 } | |
| 10621 } | |
| 834 | 10622 |
| 10623 /* Reset the flag here again, in case evaluating 'tabline' causes it to be | |
| 10624 * set. */ | |
| 10625 redraw_tabline = FALSE; | |
| 667 | 10626 } |
| 685 | 10627 |
| 10628 /* | |
| 10629 * Get buffer name for "buf" into NameBuff[]. | |
| 10630 * Takes care of special buffer names and translates special characters. | |
| 10631 */ | |
| 10632 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
10633 get_trans_bufname(buf_T *buf) |
| 685 | 10634 { |
| 10635 if (buf_spname(buf) != NULL) | |
| 3839 | 10636 vim_strncpy(NameBuff, buf_spname(buf), MAXPATHL - 1); |
| 685 | 10637 else |
| 10638 home_replace(buf, buf->b_fname, NameBuff, MAXPATHL, TRUE); | |
| 10639 trans_characters(NameBuff, MAXPATHL); | |
| 10640 } | |
| 667 | 10641 #endif |
| 10642 | |
| 7 | 10643 #if defined(FEAT_WINDOWS) || defined(FEAT_WILDMENU) || defined(FEAT_STL_OPT) |
| 10644 /* | |
| 10645 * Get the character to use in a status line. Get its attributes in "*attr". | |
| 10646 */ | |
| 10647 static int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
10648 fillchar_status(int *attr, int is_curwin) |
| 7 | 10649 { |
| 10650 int fill; | |
| 10651 if (is_curwin) | |
| 10652 { | |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
10653 *attr = HL_ATTR(HLF_S); |
| 7 | 10654 fill = fill_stl; |
| 10655 } | |
| 10656 else | |
| 10657 { | |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
10658 *attr = HL_ATTR(HLF_SNC); |
| 7 | 10659 fill = fill_stlnc; |
| 10660 } | |
| 10661 /* Use fill when there is highlighting, and highlighting of current | |
| 10662 * window differs, or the fillchars differ, or this is not the | |
| 10663 * current window */ | |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
10664 if (*attr != 0 && ((HL_ATTR(HLF_S) != HL_ATTR(HLF_SNC) |
|
10349
cf988222b150
commit https://github.com/vim/vim/commit/a1f4cb93ba50ea9e40cd4b1f5592b8a6d1398660
Christian Brabandt <cb@256bit.org>
parents:
10307
diff
changeset
|
10665 || !is_curwin || ONE_WINDOW) |
| 7 | 10666 || (fill_stl != fill_stlnc))) |
| 10667 return fill; | |
| 10668 if (is_curwin) | |
| 10669 return '^'; | |
| 10670 return '='; | |
| 10671 } | |
| 10672 #endif | |
| 10673 | |
|
8643
24b43dd167eb
commit https://github.com/vim/vim/commit/44a2f923c00f1384c9ecde12fb5b4711bc20702e
Christian Brabandt <cb@256bit.org>
parents:
8627
diff
changeset
|
10674 #ifdef FEAT_WINDOWS |
| 7 | 10675 /* |
| 10676 * Get the character to use in a separator between vertically split windows. | |
| 10677 * Get its attributes in "*attr". | |
| 10678 */ | |
| 10679 static int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
10680 fillchar_vsep(int *attr) |
| 7 | 10681 { |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
10682 *attr = HL_ATTR(HLF_C); |
| 7 | 10683 if (*attr == 0 && fill_vert == ' ') |
| 10684 return '|'; | |
| 10685 else | |
| 10686 return fill_vert; | |
| 10687 } | |
| 10688 #endif | |
| 10689 | |
| 10690 /* | |
| 10691 * Return TRUE if redrawing should currently be done. | |
| 10692 */ | |
| 10693 int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
10694 redrawing(void) |
| 7 | 10695 { |
|
11105
7c7e496e625d
patch 8.0.0440: not enough test coverage in Insert mode
Christian Brabandt <cb@256bit.org>
parents:
11010
diff
changeset
|
10696 #ifdef FEAT_EVAL |
|
7c7e496e625d
patch 8.0.0440: not enough test coverage in Insert mode
Christian Brabandt <cb@256bit.org>
parents:
11010
diff
changeset
|
10697 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
|
10698 return 0; |
|
7c7e496e625d
patch 8.0.0440: not enough test coverage in Insert mode
Christian Brabandt <cb@256bit.org>
parents:
11010
diff
changeset
|
10699 else |
|
7c7e496e625d
patch 8.0.0440: not enough test coverage in Insert mode
Christian Brabandt <cb@256bit.org>
parents:
11010
diff
changeset
|
10700 #endif |
|
7c7e496e625d
patch 8.0.0440: not enough test coverage in Insert mode
Christian Brabandt <cb@256bit.org>
parents:
11010
diff
changeset
|
10701 return (!RedrawingDisabled |
| 7 | 10702 && !(p_lz && char_avail() && !KeyTyped && !do_redraw)); |
| 10703 } | |
| 10704 | |
| 10705 /* | |
| 10706 * Return TRUE if printing messages should currently be done. | |
| 10707 */ | |
| 10708 int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
10709 messaging(void) |
| 7 | 10710 { |
| 10711 return (!(p_lz && char_avail() && !KeyTyped)); | |
| 10712 } | |
| 10713 | |
| 10714 /* | |
| 10715 * Show current status info in ruler and various other places | |
| 10716 * If always is FALSE, only show ruler if position has changed. | |
| 10717 */ | |
| 10718 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
10719 showruler(int always) |
| 7 | 10720 { |
| 10721 if (!always && !redrawing()) | |
| 10722 return; | |
| 574 | 10723 #ifdef FEAT_INS_EXPAND |
| 10724 if (pum_visible()) | |
| 10725 { | |
| 639 | 10726 # ifdef FEAT_WINDOWS |
| 574 | 10727 /* Don't redraw right now, do it later. */ |
| 10728 curwin->w_redr_status = TRUE; | |
| 639 | 10729 # endif |
| 574 | 10730 return; |
| 10731 } | |
| 10732 #endif | |
| 7 | 10733 #if defined(FEAT_STL_OPT) && defined(FEAT_WINDOWS) |
| 40 | 10734 if ((*p_stl != NUL || *curwin->w_p_stl != NUL) && curwin->w_status_height) |
| 680 | 10735 { |
| 1983 | 10736 redraw_custom_statusline(curwin); |
| 680 | 10737 } |
| 7 | 10738 else |
| 10739 #endif | |
| 10740 #ifdef FEAT_CMDL_INFO | |
| 10741 win_redr_ruler(curwin, always); | |
| 10742 #endif | |
| 10743 | |
| 10744 #ifdef FEAT_TITLE | |
| 10745 if (need_maketitle | |
| 10746 # ifdef FEAT_STL_OPT | |
| 10747 || (p_icon && (stl_syntax & STL_IN_ICON)) | |
| 10748 || (p_title && (stl_syntax & STL_IN_TITLE)) | |
| 10749 # endif | |
| 10750 ) | |
| 10751 maketitle(); | |
| 10752 #endif | |
| 1588 | 10753 #ifdef FEAT_WINDOWS |
| 10754 /* Redraw the tab pages line if needed. */ | |
| 10755 if (redraw_tabline) | |
| 10756 draw_tabline(); | |
| 10757 #endif | |
| 7 | 10758 } |
| 10759 | |
| 10760 #ifdef FEAT_CMDL_INFO | |
| 10761 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
10762 win_redr_ruler(win_T *wp, int always) |
| 7 | 10763 { |
| 1869 | 10764 #define RULER_BUF_LEN 70 |
| 10765 char_u buffer[RULER_BUF_LEN]; | |
| 7 | 10766 int row; |
| 10767 int fillchar; | |
| 10768 int attr; | |
| 10769 int empty_line = FALSE; | |
| 10770 colnr_T virtcol; | |
| 10771 int i; | |
| 1869 | 10772 size_t len; |
| 7 | 10773 int o; |
|
8643
24b43dd167eb
commit https://github.com/vim/vim/commit/44a2f923c00f1384c9ecde12fb5b4711bc20702e
Christian Brabandt <cb@256bit.org>
parents:
8627
diff
changeset
|
10774 #ifdef FEAT_WINDOWS |
| 7 | 10775 int this_ru_col; |
| 10776 int off = 0; | |
| 10777 int width = Columns; | |
| 10778 # define WITH_OFF(x) x | |
| 10779 # define WITH_WIDTH(x) x | |
| 10780 #else | |
| 10781 # define WITH_OFF(x) 0 | |
| 10782 # define WITH_WIDTH(x) Columns | |
| 10783 # define this_ru_col ru_col | |
| 10784 #endif | |
| 10785 | |
| 10786 /* If 'ruler' off or redrawing disabled, don't do anything */ | |
| 10787 if (!p_ru) | |
| 10788 return; | |
| 10789 | |
| 10790 /* | |
| 10791 * Check if cursor.lnum is valid, since win_redr_ruler() may be called | |
| 10792 * after deleting lines, before cursor.lnum is corrected. | |
| 10793 */ | |
| 10794 if (wp->w_cursor.lnum > wp->w_buffer->b_ml.ml_line_count) | |
| 10795 return; | |
| 10796 | |
| 10797 #ifdef FEAT_INS_EXPAND | |
| 10798 /* Don't draw the ruler while doing insert-completion, it might overwrite | |
| 10799 * the (long) mode message. */ | |
| 10800 # ifdef FEAT_WINDOWS | |
| 10801 if (wp == lastwin && lastwin->w_status_height == 0) | |
| 10802 # endif | |
| 10803 if (edit_submode != NULL) | |
| 10804 return; | |
| 540 | 10805 /* Don't draw the ruler when the popup menu is visible, it may overlap. */ |
| 10806 if (pum_visible()) | |
| 10807 return; | |
| 7 | 10808 #endif |
| 10809 | |
| 10810 #ifdef FEAT_STL_OPT | |
| 10811 if (*p_ruf) | |
| 10812 { | |
| 680 | 10813 int save_called_emsg = called_emsg; |
| 10814 | |
| 10815 called_emsg = FALSE; | |
| 7 | 10816 win_redr_custom(wp, TRUE); |
| 680 | 10817 if (called_emsg) |
| 10818 set_string_option_direct((char_u *)"rulerformat", -1, | |
| 694 | 10819 (char_u *)"", OPT_FREE, SID_ERROR); |
| 680 | 10820 called_emsg |= save_called_emsg; |
| 7 | 10821 return; |
| 10822 } | |
| 10823 #endif | |
| 10824 | |
| 10825 /* | |
| 10826 * Check if not in Insert mode and the line is empty (will show "0-1"). | |
| 10827 */ | |
| 10828 if (!(State & INSERT) | |
| 10829 && *ml_get_buf(wp->w_buffer, wp->w_cursor.lnum, FALSE) == NUL) | |
| 10830 empty_line = TRUE; | |
| 10831 | |
| 10832 /* | |
| 10833 * Only draw the ruler when something changed. | |
| 10834 */ | |
| 10835 validate_virtcol_win(wp); | |
| 10836 if ( redraw_cmdline | |
| 10837 || always | |
| 10838 || wp->w_cursor.lnum != wp->w_ru_cursor.lnum | |
| 10839 || wp->w_cursor.col != wp->w_ru_cursor.col | |
| 10840 || wp->w_virtcol != wp->w_ru_virtcol | |
| 10841 #ifdef FEAT_VIRTUALEDIT | |
| 10842 || wp->w_cursor.coladd != wp->w_ru_cursor.coladd | |
| 10843 #endif | |
| 10844 || wp->w_topline != wp->w_ru_topline | |
| 10845 || wp->w_buffer->b_ml.ml_line_count != wp->w_ru_line_count | |
| 10846 #ifdef FEAT_DIFF | |
| 10847 || wp->w_topfill != wp->w_ru_topfill | |
| 10848 #endif | |
| 10849 || empty_line != wp->w_ru_empty) | |
| 10850 { | |
| 10851 cursor_off(); | |
| 10852 #ifdef FEAT_WINDOWS | |
| 10853 if (wp->w_status_height) | |
| 10854 { | |
| 10855 row = W_WINROW(wp) + wp->w_height; | |
| 10856 fillchar = fillchar_status(&attr, wp == curwin); | |
| 10857 off = W_WINCOL(wp); | |
| 10858 width = W_WIDTH(wp); | |
| 10859 } | |
| 10860 else | |
| 10861 #endif | |
| 10862 { | |
| 10863 row = Rows - 1; | |
| 10864 fillchar = ' '; | |
| 10865 attr = 0; | |
|
8643
24b43dd167eb
commit https://github.com/vim/vim/commit/44a2f923c00f1384c9ecde12fb5b4711bc20702e
Christian Brabandt <cb@256bit.org>
parents:
8627
diff
changeset
|
10866 #ifdef FEAT_WINDOWS |
| 7 | 10867 width = Columns; |
| 10868 off = 0; | |
| 10869 #endif | |
| 10870 } | |
| 10871 | |
| 10872 /* In list mode virtcol needs to be recomputed */ | |
| 10873 virtcol = wp->w_virtcol; | |
| 10874 if (wp->w_p_list && lcs_tab1 == NUL) | |
| 10875 { | |
| 10876 wp->w_p_list = FALSE; | |
| 10877 getvvcol(wp, &wp->w_cursor, NULL, &virtcol, NULL); | |
| 10878 wp->w_p_list = TRUE; | |
| 10879 } | |
| 10880 | |
| 10881 /* | |
| 10882 * Some sprintfs return the length, some return a pointer. | |
| 10883 * To avoid portability problems we use strlen() here. | |
| 10884 */ | |
| 1869 | 10885 vim_snprintf((char *)buffer, RULER_BUF_LEN, "%ld,", |
| 7 | 10886 (wp->w_buffer->b_ml.ml_flags & ML_EMPTY) |
| 10887 ? 0L | |
| 10888 : (long)(wp->w_cursor.lnum)); | |
| 1869 | 10889 len = STRLEN(buffer); |
| 10890 col_print(buffer + len, RULER_BUF_LEN - len, | |
| 7 | 10891 empty_line ? 0 : (int)wp->w_cursor.col + 1, |
| 10892 (int)virtcol + 1); | |
| 10893 | |
| 10894 /* | |
| 10895 * Add a "50%" if there is room for it. | |
| 10896 * On the last line, don't print in the last column (scrolls the | |
| 10897 * screen up on some terminals). | |
| 10898 */ | |
| 10899 i = (int)STRLEN(buffer); | |
| 1869 | 10900 get_rel_pos(wp, buffer + i + 1, RULER_BUF_LEN - i - 1); |
| 7 | 10901 o = i + vim_strsize(buffer + i + 1); |
| 10902 #ifdef FEAT_WINDOWS | |
| 10903 if (wp->w_status_height == 0) /* can't use last char of screen */ | |
| 10904 #endif | |
| 10905 ++o; | |
|
8643
24b43dd167eb
commit https://github.com/vim/vim/commit/44a2f923c00f1384c9ecde12fb5b4711bc20702e
Christian Brabandt <cb@256bit.org>
parents:
8627
diff
changeset
|
10906 #ifdef FEAT_WINDOWS |
| 7 | 10907 this_ru_col = ru_col - (Columns - width); |
| 10908 if (this_ru_col < 0) | |
| 10909 this_ru_col = 0; | |
| 10910 #endif | |
| 10911 /* Never use more than half the window/screen width, leave the other | |
| 10912 * half for the filename. */ | |
| 10913 if (this_ru_col < (WITH_WIDTH(width) + 1) / 2) | |
| 10914 this_ru_col = (WITH_WIDTH(width) + 1) / 2; | |
| 10915 if (this_ru_col + o < WITH_WIDTH(width)) | |
| 10916 { | |
| 6466 | 10917 /* need at least 3 chars left for get_rel_pos() + NUL */ |
| 10918 while (this_ru_col + o < WITH_WIDTH(width) && RULER_BUF_LEN > i + 4) | |
| 7 | 10919 { |
| 10920 #ifdef FEAT_MBYTE | |
| 10921 if (has_mbyte) | |
| 10922 i += (*mb_char2bytes)(fillchar, buffer + i); | |
| 10923 else | |
| 10924 #endif | |
| 10925 buffer[i++] = fillchar; | |
| 10926 ++o; | |
| 10927 } | |
| 1869 | 10928 get_rel_pos(wp, buffer + i, RULER_BUF_LEN - i); |
| 7 | 10929 } |
| 10930 /* Truncate at window boundary. */ | |
| 10931 #ifdef FEAT_MBYTE | |
| 10932 if (has_mbyte) | |
| 10933 { | |
| 10934 o = 0; | |
| 474 | 10935 for (i = 0; buffer[i] != NUL; i += (*mb_ptr2len)(buffer + i)) |
| 7 | 10936 { |
| 10937 o += (*mb_ptr2cells)(buffer + i); | |
| 10938 if (this_ru_col + o > WITH_WIDTH(width)) | |
| 10939 { | |
| 10940 buffer[i] = NUL; | |
| 10941 break; | |
| 10942 } | |
| 10943 } | |
| 10944 } | |
| 10945 else | |
| 10946 #endif | |
| 10947 if (this_ru_col + (int)STRLEN(buffer) > WITH_WIDTH(width)) | |
| 10948 buffer[WITH_WIDTH(width) - this_ru_col] = NUL; | |
| 10949 | |
| 10950 screen_puts(buffer, row, this_ru_col + WITH_OFF(off), attr); | |
| 10951 i = redraw_cmdline; | |
| 10952 screen_fill(row, row + 1, | |
| 10953 this_ru_col + WITH_OFF(off) + (int)STRLEN(buffer), | |
| 10954 (int)(WITH_OFF(off) + WITH_WIDTH(width)), | |
| 10955 fillchar, fillchar, attr); | |
| 10956 /* don't redraw the cmdline because of showing the ruler */ | |
| 10957 redraw_cmdline = i; | |
| 10958 wp->w_ru_cursor = wp->w_cursor; | |
| 10959 wp->w_ru_virtcol = wp->w_virtcol; | |
| 10960 wp->w_ru_empty = empty_line; | |
| 10961 wp->w_ru_topline = wp->w_topline; | |
| 10962 wp->w_ru_line_count = wp->w_buffer->b_ml.ml_line_count; | |
| 10963 #ifdef FEAT_DIFF | |
| 10964 wp->w_ru_topfill = wp->w_topfill; | |
| 10965 #endif | |
| 10966 } | |
| 10967 } | |
| 10968 #endif | |
| 13 | 10969 |
| 10970 #if defined(FEAT_LINEBREAK) || defined(PROTO) | |
| 10971 /* | |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
10972 * 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
|
10973 * Caller may need to check if 'number' or 'relativenumber' is set. |
| 13 | 10974 * Otherwise it depends on 'numberwidth' and the line count. |
| 10975 */ | |
| 10976 int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
10977 number_width(win_T *wp) |
| 13 | 10978 { |
| 10979 int n; | |
| 10980 linenr_T lnum; | |
| 10981 | |
|
4736
3f2319a953b3
updated for version 7.3.1115
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
10982 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
|
10983 /* cursor line shows "0" */ |
|
3f2319a953b3
updated for version 7.3.1115
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
10984 lnum = wp->w_height; |
|
3f2319a953b3
updated for version 7.3.1115
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
10985 else |
|
3f2319a953b3
updated for version 7.3.1115
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
10986 /* cursor line shows absolute line number */ |
|
3f2319a953b3
updated for version 7.3.1115
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
10987 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
|
10988 |
| 6679 | 10989 if (lnum == wp->w_nrwidth_line_count && wp->w_nuw_cached == wp->w_p_nuw) |
| 13 | 10990 return wp->w_nrwidth_width; |
| 10991 wp->w_nrwidth_line_count = lnum; | |
| 10992 | |
| 10993 n = 0; | |
| 10994 do | |
| 10995 { | |
| 856 | 10996 lnum /= 10; |
| 10997 ++n; | |
| 13 | 10998 } while (lnum > 0); |
| 10999 | |
| 11000 /* 'numberwidth' gives the minimal width plus one */ | |
| 11001 if (n < wp->w_p_nuw - 1) | |
| 11002 n = wp->w_p_nuw - 1; | |
| 11003 | |
| 11004 wp->w_nrwidth_width = n; | |
| 6679 | 11005 wp->w_nuw_cached = wp->w_p_nuw; |
| 13 | 11006 return n; |
| 11007 } | |
| 11008 #endif | |
| 3986 | 11009 |
| 11010 /* | |
| 11011 * Return the current cursor column. This is the actual position on the | |
| 11012 * screen. First column is 0. | |
| 11013 */ | |
| 11014 int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
11015 screen_screencol(void) |
| 3986 | 11016 { |
| 11017 return screen_cur_col; | |
| 11018 } | |
| 11019 | |
| 11020 /* | |
| 11021 * Return the current cursor row. This is the actual position on the screen. | |
| 11022 * First row is 0. | |
| 11023 */ | |
| 11024 int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
11025 screen_screenrow(void) |
| 3986 | 11026 { |
| 11027 return screen_cur_row; | |
| 11028 } |